kevin/linux
1
Fork 0
Code

kbuild: pacman-pkg: do not override objtree

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2024-08-16 23:18:15 +09:00
parent b6223c2de6
commit 5b000f3cbb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/Makefile.package
View File

@ -147,8 +147,7 @@ snap-pkg:
PHONY += pacman-pkg PHONY += pacman-pkg
pacman-pkg: pacman-pkg:
@ln -srf $(srctree)/scripts/package/PKGBUILD $(objtree)/PKGBUILD @ln -srf $(srctree)/scripts/package/PKGBUILD $(objtree)/PKGBUILD
+objtree="$(realpath $(objtree))" \ +BUILDDIR="$(realpath $(objtree))/pacman" \
BUILDDIR="$(realpath $(objtree))/pacman" \
CARCH="$(UTS_MACHINE)" \ CARCH="$(UTS_MACHINE)" \
KBUILD_MAKEFLAGS="$(MAKEFLAGS)" \ KBUILD_MAKEFLAGS="$(MAKEFLAGS)" \
KBUILD_REVISION="$(shell $(srctree)/scripts/build-version)" \ KBUILD_REVISION="$(shell $(srctree)/scripts/build-version)" \

4
scripts/package/PKGBUILD
View File

@ -40,7 +40,9 @@ _prologue() {
# MAKEFLAGS from makepkg.conf override the ones inherited from kbuild. # MAKEFLAGS from makepkg.conf override the ones inherited from kbuild.
# Bypass this override with a custom variable. # Bypass this override with a custom variable.
export MAKEFLAGS="${KBUILD_MAKEFLAGS}" export MAKEFLAGS="${KBUILD_MAKEFLAGS}"
cd "${objtree}"
# Kbuild works in the output directory, where this PKGBUILD is located.
cd "$(dirname "${BASH_SOURCE[0]}")"
} }
build() { build() {