Aug 16, 2024 16:18:56 Masahiro Yamada <masahiroy@xxxxxxxxxx>: > objtree is defined and exported by the top-level Makefile. I prefer > not to override it. > > There is no need to pass the absolute pass of objtree. PKGBUILD can s/pass/path/g > detect it by itself. > > Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> Acked-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx> > --- > > scripts/Makefile.package | 3 +-- > scripts/package/PKGBUILD | 4 +++- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/scripts/Makefile.package b/scripts/Makefile.package > index 4a80584ec771..2c261a0d42b0 100644 > --- a/scripts/Makefile.package > +++ b/scripts/Makefile.package > @@ -147,8 +147,7 @@ snap-pkg: > PHONY += pacman-pkg > pacman-pkg: > @ln -srf $(srctree)/scripts/package/PKGBUILD $(objtree)/PKGBUILD > - +objtree="$(realpath $(objtree))" \ > - BUILDDIR="$(realpath $(objtree))/pacman" \ > + BUILDDIR="$(realpath $(objtree))/pacman" \ > CARCH="$(UTS_MACHINE)" \ > KBUILD_MAKEFLAGS="$(MAKEFLAGS)" \ > KBUILD_REVISION="$(shell $(srctree)/scripts/build-version)" \ > diff --git a/scripts/package/PKGBUILD b/scripts/package/PKGBUILD > index e2d9c2601ca9..839cd5e634d2 100644 > --- a/scripts/package/PKGBUILD > +++ b/scripts/package/PKGBUILD > @@ -40,7 +40,9 @@ _prologue() { > # MAKEFLAGS from makepkg.conf override the ones inherited from kbuild. > # Bypass this override with a custom variable. > export MAKEFLAGS="${KBUILD_MAKEFLAGS}" > - cd "${objtree}" > + > + # Kbuild works in the output directory, where this PKGBUILD is located. > + cd "$(dirname "${BASH_SOURCE[0]}")" > } > > build() { > -- > 2.43.0