Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kbuild: pacman-pkg: do not override objtree

objtree is defined and exported by the top-level Makefile. I prefer
not to override it.

There is no need to pass the absolute path of objtree. PKGBUILD can
detect it by itself.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by:  Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Christian Heusel <christian@heusel.eu>

+4 -3
+1 -2
scripts/Makefile.package
··· 147 147 PHONY += pacman-pkg 148 148 pacman-pkg: 149 149 @ln -srf $(srctree)/scripts/package/PKGBUILD $(objtree)/PKGBUILD 150 - +objtree="$(realpath $(objtree))" \ 151 - BUILDDIR="$(realpath $(objtree))/pacman" \ 150 + +BUILDDIR="$(realpath $(objtree))/pacman" \ 152 151 CARCH="$(UTS_MACHINE)" \ 153 152 KBUILD_MAKEFLAGS="$(MAKEFLAGS)" \ 154 153 KBUILD_REVISION="$(shell $(srctree)/scripts/build-version)" \
+3 -1
scripts/package/PKGBUILD
··· 40 40 # MAKEFLAGS from makepkg.conf override the ones inherited from kbuild. 41 41 # Bypass this override with a custom variable. 42 42 export MAKEFLAGS="${KBUILD_MAKEFLAGS}" 43 - cd "${objtree}" 43 + 44 + # Kbuild works in the output directory, where this PKGBUILD is located. 45 + cd "$(dirname "${BASH_SOURCE[0]}")" 44 46 } 45 47 46 48 build() {