Commit 5b000f3c authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Acked-by: default avatar&nbsp; Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarChristian Heusel <christian@heusel.eu>
parent b6223c2d

scripts/Makefile.package

+1 −2
Original line number Diff line number Diff line
@@ -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)" \

scripts/package/PKGBUILD

+3 −1
Original line number Diff line number Diff line
@@ -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() {