Changes in Makefile.package

cb08a026 - kbuild: rpm-pkg: disable kernel-devel package when cross-compiling

Tue, 22 Oct 2024 18:16:57 +0000

kbuild: rpm-pkg: disable kernel-devel package when cross-compilingSince commit f1d87664b82a ("kbuild: cross-compile linux-headers packagewhen possible"), 'make binrpm-pkg' may attempt to cross-compile thekernel-devel package, but it fails under certain circumstances.For example, when CONFIG_MODULE_SIG_FORMAT is enabled on openSUSETumbleweed, the following command fails: $ make ARCH=arm64 CROSS_COMPILE=aarch64-suse-linux- binrpm-pkg [ snip ] Rebuilding host programs with aarch64-suse-linux-gcc... HOSTCC /home/masahiro/ref/linux/rpmbuild/BUILDROOT/kernel-6.12.0_rc4-1.aarch64/usr/src/kernels/6.12.0-rc4/scripts/kallsyms HOSTCC /home/masahiro/ref/linux/rpmbuild/BUILDROOT/kernel-6.12.0_rc4-1.aarch64/usr/src/kernels/6.12.0-rc4/scripts/sorttable HOSTCC /home/masahiro/ref/linux/rpmbuild/BUILDROOT/kernel-6.12.0_rc4-1.aarch64/usr/src/kernels/6.12.0-rc4/scripts/asn1_compiler HOSTCC /home/masahiro/ref/linux/rpmbuild/BUILDROOT/kernel-6.12.0_rc4-1.aarch64/usr/src/kernels/6.12.0-rc4/scripts/sign-file /home/masahiro/ref/linux/rpmbuild/BUILDROOT/kernel-6.12.0_rc4-1.aarch64/usr/src/kernels/6.12.0-rc4/scripts/sign-file.c:25:10: fatal error: openssl/opensslv.h: No such file or directory 25 | #include | ^~~~~~~~~~~~~~~~~~~~ compilation terminated.I believe this issue is less common on Fedora because the disto's cross-compilier cannot link user-space programs. Hence, CONFIG_CC_CAN_LINK isunset.On Fedora 40, the package information explains this limitation clearly: $ dnf info gcc-aarch64-linux-gnu [ snip ] Description : Cross-build GNU C compiler. : : Only building kernels is currently supported. Support for cross-building : user space programs is not currently provided as that would massively multiply : the number of packages.Anyway, cross-compiling RPM packages is somewhat challenging.This commit disables the kernel-devel package when cross-compilingbecause I did not come up with a better solution.Fixes: f1d87664b82a ("kbuild: cross-compile linux-headers package when possible")Signed-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor List of files: /linux-6.15/scripts/Makefile.package

5b000f3c - kbuild: pacman-pkg: do not override objtree

Fri, 16 Aug 2024 14:18:15 +0000

kbuild: pacman-pkg: do not override objtreeobjtree is defined and exported by the top-level Makefile. I prefernot to override it.There is no need to pass the absolute path of objtree. PKGBUILD candetect it by itself.Signed-off-by: Masahiro Yamada Acked-by: Thomas Weißschuh Reviewed-by: Nathan Chancellor Reviewed-by: Christian Heusel List of files: /linux-6.15/scripts/Makefile.package

c8578539 - kbuild: add script and target to generate pacman package

Sat, 20 Jul 2024 09:18:12 +0000

kbuild: add script and target to generate pacman packagepacman is the package manager used by Arch Linux and its derivates.Creating native packages from the kernel tree has multiple advantages:* The package triggers the correct hooks for initramfs generation and bootloader configuration* Uninstallation is complete and also invokes the relevant hooks* New UAPI headers can be installed without any manual bookkeepingThe PKGBUILD file is a modified version of the one used for thedownstream Arch Linux "linux" package.Extra steps that should not be necessary for a development kernel havebeen removed and an UAPI header package has been added.Signed-off-by: Thomas Weißschuh Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

c6156653 - kbuild: Fix build target deb-pkg: ln: failed to create hard link

Sun, 16 Jun 2024 05:34:54 +0000

kbuild: Fix build target deb-pkg: ln: failed to create hard linkThe make deb-pkg target calls debian-orig which attempts to eitherhard link the source .tar to the build-output location or copy thesource .tar to the build-output location. The test to determinewhether to ln or cp is incorrectly expanded by Make and consequentlyalways attempts to ln the source .tar. This fix corrects the escapingof '$' so that the test is expanded by the shell rather than by Makeand appropriately selects between ln and cp.Fixes: b44aa8c96e9e ("kbuild: deb-pkg: make .orig tarball a hard link if possible")Signed-off-by: Thayne Harbaugh Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

e2bad142 - kbuild: unexport abs_srctree and abs_objtree

Wed, 06 Mar 2024 10:42:22 +0000

kbuild: unexport abs_srctree and abs_objtreeCommit 25b146c5b8ce ("kbuild: allow Kbuild to start from any directory")exported abs_srctree and abs_objtree to avoid recomputation after thesub-make. However, this approach turned out to be fragile.Commit 5fa94ceb793e ("kbuild: set correct abs_srctree and abs_objtreefor package builds") moved them above "ifneq ($(sub_make_done),1)",eliminating the need for exporting them.These are only needed in the top Makefile. If an absolute path isrequired in sub-directories, you can use $(abspath ) or $(realpath )as needed.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.package

53243e09 - kbuild: deb-pkg: remove the fakeroot builds support

Tue, 28 Nov 2023 23:53:56 +0000

kbuild: deb-pkg: remove the fakeroot builds supportIn 2017, the dpkg suite introduced the rootless builds support with thefollowing commits: - 2436807c87b0 ("dpkg-deb: Add support for rootless builds") - fca1bfe84068 ("dpkg-buildpackage: Add support for rootless builds")This feature is available in the default dpkg on Debian 10 and Ubuntu20.04.Remove the old method.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

ef6609ad - kbuild: remove the last use of old cmd_src_tar rule in packaging

Thu, 23 Nov 2023 07:18:24 +0000

kbuild: remove the last use of old cmd_src_tar rule in packagingThe rpm-pkg and deb-pkg targets have transitioned to using 'git archive'for tarball creation.Although the old cmd_src_tar is still used by snap-pkg, there is no needto pack and unpack a tarball solely for passing the source to snapcraft.Instead, you can use 'source-type: local' to tell the source location tosnapcraft.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

259b8bd1 - kbuild: deb-pkg: apply short -R and -j options

Sun, 05 Nov 2023 21:56:22 +0000

kbuild: deb-pkg: apply short -R and -j optionsThe long version --rules-file and --jobs are available since 1.18.8while their short analogues -R and -j have been added since 1.14.7.The option --rules-file the way it works currently was introduced in thecommit 5cd52673aabdf5eaa58181972119a41041fc85f2 of dpkg dated 23.07.18with the following changelog entry:* Fix dpkg-buildpackage option --rules-file parsing. It was trying to parse it as --rules-target, which due to the ordering was a no-op.The current behavior of the long version --rules-file is guaranteed tobe in use starting 1.19.1 and might cause build failures for someversions newer than 1.18.8 even in spite of being documented that way.Signed-off-by: Dmitrii Bundin Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

a55d4aee - kbuild: make binrpm-pkg always produce kernel-devel package

Sun, 01 Oct 2023 12:38:22 +0000

kbuild: make binrpm-pkg always produce kernel-devel packageThe generation of the kernel-devel package is disabled for binrpm-pkgpresumably because it was quite big (>= 200MB) and took a long time topackage.Commit fe66b5d2ae72 ("kbuild: refactor kernel-devel RPM package andlinux-headers Deb package") reduced the package size to 12MB, and nowit is quick to build. It won't hurt to have binrpm-pkg generate it bydefault.If you want to skip the kernel-devel package generation, you can passRPMOPTS='--without devel': $ make binrpm-pkg RPMOPTS='--without devel'Signed-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor List of files: /linux-6.15/scripts/Makefile.package

ffa46bbc - kbuild: rpm-pkg: generate kernel.spec in rpmbuild/SPECS/

Sat, 30 Sep 2023 10:38:47 +0000

kbuild: rpm-pkg: generate kernel.spec in rpmbuild/SPECS/kernel.spec is the last piece that resides outside the rpmbuild/directory. Move all the RPM-related files to rpmbuild/ consistently.Signed-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor List of files: /linux-6.15/scripts/Makefile.package

ed79c34d - kbuild: deb-pkg: support DEB_BUILD_OPTIONS=parallel=N in debian/rules

Sun, 20 Aug 2023 22:18:02 +0000

kbuild: deb-pkg: support DEB_BUILD_OPTIONS=parallel=N in debian/rules'make srcdeb-pkg' generates a source package, which you can buildlater by using dpkg-buildpackage.In older dpkg versions, 'dpkg-buildpackage --jobs=N' sets not onlyDEB_BUILD_OPTIONS but also MAKEFLAGS. Hence, passing -j or --jobsto dpkg-buildpackage was enough for kicking the parallel execution.The behavior was changed by commit 1d0ea9b2ba3f ("dpkg-buildpackage:Change -j, --jobs semantics to non-force mode") of dpkg project. [1]Since then, 'dpkg-buildpackage --jobs=N' sets only DEB_BUILD_OPTIONS,which is not parsed by the current debian/rules. To build the packagein parallel, you need to pass the alternative --jobs-force option orset the MAKEFLAGS environment variable.Debian policy [2] suggests the following code snippet for debian/rules. ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endifI tweaked the code to filter out parallel=1 and passed --jobs=1 todpkg-buildpackage from scripts/Makefile.package. It is needed to force'make deb-pkg' without the -j option to run in serial. Please note thatdpkg-buildpackage sets parallel= in DEB_BUILD_OPTIONS by default(that is, --jobs=auto is the default) and --jobs=1 is needed to restorethe serial execution. When dpkg-buildpackage is invoked from Kbuild,the number of jobs is inherited from the top level Makefile. Passing--jobs=1 to dpkg-buildpackage allows debian/rules to skip parsingDEB_BUILD_OPTIONS.[1] https://salsa.debian.org/dpkg-team/dpkg/-/commit/1d0ea9b2ba3f6a2de5b1a6ff55f3df7b71f73db6[2] https://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-optionsReported-by: Bastian Germann Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

4b970e43 - kbuild: deb-pkg: use Debian compliant shebang for debian/rules

Tue, 01 Aug 2023 12:19:25 +0000

kbuild: deb-pkg: use Debian compliant shebang for debian/rulesDebian Policy "4.9. Main building script: debian/rules" requires"debian/rules must start with the line #!/usr/bin/make -f". [1]Currently, Kbuild does not follow this policy.When Kbuild generates debian/rules, "#!$(command -v $MAKE) -f" isexpanded by shell. The resuling string may not be "#!/usr/bin/make -f".There was a reason to opt out the Debian policy.If you run '/path/to/my/custom/make deb-pkg', debian/rules must also beinvoked by the same Make program. If #!/usr/bin/make were hard-coded indebian/rules, the sub-make would be executed by a possibly differentMake version.This is problematic due to the MAKEFLAGS incompatibility, especially thejob server flag. Old Make versions used --jobserver-fds to propagate jobserver file descriptors, but Make >= 4.2 uses --jobserver-auth. The flagdisagreement between the parent/child Makes would result in a processfork explosion.However, having a non-standard path in the shebang causes another issue;the generated source package is not portable as such a path does notexist in other build environments.This commit solves those conflicting demands.Hard-code '#!/usr/bin/make -f' in debian/rules to create a portable andDebian-compliant source package.Pass '--rules-file=$(MAKE) -f debian/rules' when dpkg-buildpackage isinvoked from Makefile so that debian/rules is executed by the same Makeprogram as used to start Kbuild.[1] https://www.debian.org/doc/debian-policy/ch-source.html#main-building-script-debian-rulesSigned-off-by: Masahiro Yamada Tested-by: Nathan Chancellor Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/Makefile.package

783c55ae - kbuild: rpm-pkg: skip build dependency check on non-rpm systems

Sat, 22 Jul 2023 04:48:06 +0000

kbuild: rpm-pkg: skip build dependency check on non-rpm systemsCommit 8818039f959b ("kbuild: add ability to make source rpm buildableusing koji") added the BuildRequires: field.Checking the build dependency is fine, but one annoyance is that'make (bin)rpm-pkg' fails on non-rpm systems [1]. For example, Debianprovides rpmbuild via 'apt install rpm', but of course cannot meet therequirement listed in the BuildRequires: field.It is possible to pass RPMOPTS=--nodeps to work around it, but it isreasonable to do it automatically.If 'rpm -q rpm' fails, it is not an RPM-managed system. (The command'rpm' is not installed at all, or was installed by other means.)In that case, pass --nodeps to skip the build dependency check.[1]: https://lore.kernel.org/linux-kbuild/Y6mkdYQYmjUz7bqV@li-4a3a4a4c-28e5-11b2-a85c-a8d192c6f089.ibm.com/Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

37477496 - kbuild: rpm-pkg: refactor *rpm-pkg targets

Sat, 22 Jul 2023 04:48:05 +0000

kbuild: rpm-pkg: refactor *rpm-pkg targetsMerge the similar build targets.Also, make the output location consistent.Previously, source packages were created in the build directory,while binary packages under ~/rpmbuild/RPMS/.Now, Kbuild creates the rpmbuild/ directory in the build directory,and saves all packages under it.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

6db9ced4 - kbuild: rpm-pkg: build the kernel in-place for rpm-pkg

Sat, 22 Jul 2023 04:48:04 +0000

kbuild: rpm-pkg: build the kernel in-place for rpm-pkgCurrently, 'make rpm-pkg' always builds the kernel from the pristinesource tree in the ~/rpmbuild/BUILD/ directory.Build the kernel incrementally just like 'make binrpm-pkg'.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

975667d0 - kbuild: rpm-pkg: rename binkernel.spec to kernel.spec

Sat, 22 Jul 2023 04:48:03 +0000

kbuild: rpm-pkg: rename binkernel.spec to kernel.specNow kernel.spec and binkernel.spec have the exactly same contents.Use kernel.spec for binrpm-pkg as well.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

2a291fc3 - kbuild: rpm-pkg: introduce %{with_devel} switch to select devel package

Sat, 22 Jul 2023 04:48:01 +0000

kbuild: rpm-pkg: introduce %{with_devel} switch to select devel packagescripts/package/mkspec preprocesses the spec file by sed, but it isunreadable. This commit removes the last portion of the sed scripting.Remove the $S$M prefixes from the conditionally generated lines.Instead, surround the code with %if %{with_devel} ... %endif.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

1789fc91 - kbuild: rpm-pkg: invoke the kernel build from rpmbuild for binrpm-pkg

Sat, 22 Jul 2023 04:47:59 +0000

kbuild: rpm-pkg: invoke the kernel build from rpmbuild for binrpm-pkgTo reduce the preprocess of the spec file, invoke the kernel buildfrom rpmbuild.Run init/build-version to increment the release number not only forbinrpm-pkg but also for srcrpm-pkg and rpm-pkg.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

76a48b8f - kbuild: add a phony target to run a command with Kbuild env vars

Sat, 22 Jul 2023 04:47:55 +0000

kbuild: add a phony target to run a command with Kbuild env varsThere are some cases where we want to run a command with the sameenvironment variables as Kbuild uses. For example, 'make coccicheck'invokes scripts/coccicheck from the top Makefile so that the script canreference to ${LINUXINCLUDE}, ${KBUILD_EXTMOD}, etc. The top Makefiledefines several phony targets that run a script.We do it also for an internally used script, which results in a somewhatcomplex call graph.One example: debian/rules binary-arch -> make intdeb-pkg -> scripts/package/builddebIt is also tedious to add a dedicated target like 'intdeb-pkg' for eachuse case.Add a generic target 'run-command' to run an arbitrary command in anenvironment with all Kbuild variables set.The usage is: $ make run-command KBUILD_RUN_COMMAND=The concept is similar to: $ dpkg-architecture -c This executes in an environment which has all DEB_* variablesdefined.Convert the existing 'make intdeb-pkg'.Another possible usage is to interrogate a Make variable. $ make run-command KBUILD_RUN_COMMAND='echo $(KBUILD_CFLAGS)'might be useful to see KBUILD_CFLAGS set by the top Makefile.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package

19286825 - kbuild: rpm-pkg: do not hard-code $MAKE in spec file

Sat, 22 Jul 2023 04:47:50 +0000

kbuild: rpm-pkg: do not hard-code $MAKE in spec fileCurrently, $MAKE will expand to the GNU Make program that created thesource RPM. This is problematic if you carry it to a different buildhost to run 'rpmbuild' there.Consider this command: $ /path/to/my/custom/make srcrpm-pkgThe spec file in the SRPM will record '/path/to/my/custom/make', whichexists only on that build environment.To create a portable SRPM, the spec file should avoid hard-coding $MAKE.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/Makefile.package