Changes in rules

62604063 - kbuild: deb-pkg: don't set KBUILD_BUILD_VERSION unconditionally

Fri, 14 Mar 2025 13:10:53 +0000

kbuild: deb-pkg: don't set KBUILD_BUILD_VERSION unconditionallyIn ThinPro, we use the convention +hp forthe kernel package. This does not have a dash in the name or version.This is built by editing ".version" before a build, and settingEXTRAVERSION="+hp" and KDEB_PKGVERSION make variables: echo 68 > .version make -j EXTRAVERSION="+hp" bindeb-pkg KDEB_PKGVERSION=6.12.2+hp69 .deb name: linux-image-6.12.2+hp_6.12.2+hp69_amd64.debSince commit 7d4f07d5cb71 ("kbuild: deb-pkg: squashscripts/package/deb-build-option to debian/rules"), this no longerworks. The deb build logic changed, even though, the commit messageimplies that the logic should be unmodified.Before, KBUILD_BUILD_VERSION was not set if the KDEB_PKGVERSION didnot contain a dash. After the change KBUILD_BUILD_VERSION is alwaysset to KDEB_PKGVERSION. Since this determines UTS_VERSION, the unameoutput to look off: (now) uname -a: version 6.12.2+hp ... #6.12.2+hp69 (expected) uname -a: version 6.12.2+hp ... #69Update the debian/rules logic to restore the original behavior.Fixes: 7d4f07d5cb71 ("kbuild: deb-pkg: squash scripts/package/deb-build-option to debian/rules")Signed-off-by: Alexandru Gagniuc Reviewed-by: Nicolas Schier Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/debian/rules

a7a05b1b - kbuild: deb-pkg: add comment about future removal of KDEB_COMPRESS

Fri, 14 Mar 2025 09:53:35 +0000

kbuild: deb-pkg: add comment about future removal of KDEB_COMPRESS'man dpkg-deb' describes as follows: DPKG_DEB_COMPRESSOR_TYPE Sets the compressor type to use (since dpkg 1.21.10). The -Z option overrides this value.When commit 1a7f0a34ea7d ("builddeb: allow selection of .deb compressor")was applied, dpkg-deb did not support this environment variable.Later, dpkg commit c10aeffc6d71 ("dpkg-deb: Add support forDPKG_DEB_COMPRESSOR_TYPE/LEVEL") introduced support forDPKG_DEB_COMPRESSOR_TYPE, which provides the same functionality asKDEB_COMPRESS.KDEB_COMPRESS is still useful for users of older dpkg versions, but Iwould like to remove this redundant functionality in the future.This commit adds comments to notify users of the planned removal and toencourage migration to DPKG_DEB_COMPRESSOR_TYPE where possible.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/debian/rules

f96beb84 - kbuild: deb-pkg: call more misc debhelper commands

Sat, 13 Jan 2024 10:43:39 +0000

kbuild: deb-pkg: call more misc debhelper commandsUse dh_prep instead of removing old build directories manually.Use dh_clean instead of removing build directories and debian/filesmanually.Call dh_testdir and dh_testroot for preliminary checks.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

1d7bae8f - kbuild: deb-pkg: build binary-arch in parallel

Sat, 13 Jan 2024 10:43:38 +0000

kbuild: deb-pkg: build binary-arch in parallel'make deb-pkg' builds build-arch in parallel, but binary-arch serially.Given that all binary packages are independent of one another, they canbe built in parallel.I am uncertain whether debian/files is robust against a race condition.Just in case, make dh_gencontrol (dpkg-gencontrol) output to separatedebian/*.files, which are then concatenated into debian/files.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

caf400c8 - kbuild: deb-pkg: make debian/rules quiet for 'make deb-pkg'

Sat, 13 Jan 2024 10:43:37 +0000

kbuild: deb-pkg: make debian/rules quiet for 'make deb-pkg'Add $(Q) to the commands in debian/rules to make them quiet when thepackage built is initiated by 'make deb-pkg' or when the 'terse' tagis set to DEB_BUILD_OPTIONS.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

cc3df32c - kbuild: deb-pkg: show verbose log for direct package builds

Sat, 13 Jan 2024 10:43:36 +0000

kbuild: deb-pkg: show verbose log for direct package buildsWhen the Debian package build is initiated by Kbuild ('make deb-pkg'or 'make bindeb-pkg'), the log messages are displayed in the shortform, which is the Kbuild default.Otherwise, let's show verbose messages (unless the 'terse' tag is setin DEB_BUILD_OPTION), as suggested by Debian Policy: "The package buildshould be as verbose as reasonably possible, except where the terse tagis included in DEB_BUILD_OPTIONS." [1]This is what the Debian kernel also does. [2][1]: https://www.debian.org/doc/debian-policy/ch-source.html#main-building-script-debian-rules[2]: https://salsa.debian.org/kernel-team/linux/-/blob/debian/6.7-1_exp1/debian/rules.real#L36Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

1b5e9465 - kbuild: deb-pkg: move 'make headers' to build-arch

Sat, 30 Dec 2023 13:51:56 +0000

kbuild: deb-pkg: move 'make headers' to build-archStrictly speaking, 'make headers' should be a part of build-archinstead of binary-arch.'make headers' constructs ready-to-copy UAPI headers in the kerneldirectory.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

5e73758b - kbuild: deb-pkg: use more debhelper commands in builddeb

Tue, 26 Dec 2023 13:52:43 +0000

kbuild: deb-pkg: use more debhelper commands in builddebCommit 36862e14e316 ("kbuild: deb-pkg: use dh_listpackages to knowenabled packages") started to require the debhelper tool suite.Use more dh_* commands in create_package(): - dh_installdocs to install copyright - dh_installchangelogs to install changelog - dh_compress to compress changelog - dh_fixperms to replace the raw chmod command - dh_gencontrol to replace the raw dpkg-gencontrol command - dh_md5sums to record the md5sum of included files - dh_builddeb to replace the raw dpkg-deb commandSet DEB_RULES_REQUIRES_ROOT to 'no' in case debian/rules is executeddirectly.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

68e262f8 - kbuild: deb-pkg: remove unneeded '-f $srctree/Makefile' in debian/rules

Tue, 26 Dec 2023 13:52:42 +0000

kbuild: deb-pkg: remove unneeded '-f $srctree/Makefile' in debian/rulesThis is unneeded because the Makefile in the output directory wrapsthe top-level Makefile in the srctree.Just run $(MAKE) irrespective of the build location.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

eaf80f7f - kbuild: deb-pkg: allow to run debian/rules from output directory

Tue, 26 Dec 2023 13:52:41 +0000

kbuild: deb-pkg: allow to run debian/rules from output directory'make O=... deb-pkg' creates the debian directory in the outputdirectory. However, currently it is impossible to run debian/rulescreated in the separate output directory.This commit delays the $(srctree) expansion by escaping '$' and byquoting the entire command, making it possible to run debian/rules inthe output directory.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

159956f3 - kbuild: deb-pkg: set DEB_* variables if debian/rules is directly executed

Tue, 26 Dec 2023 13:52:40 +0000

kbuild: deb-pkg: set DEB_* variables if debian/rules is directly executedSince commit 491b146d4c13 ("kbuild: builddeb: Eliminate debian/archuse"), direct execution of debian/rules results in the following error: dpkg-architecture: error: unknown option 'DEB_HOST_MULTIARCH'The current code: dpkg-architecture -a$DEB_HOST_ARCH -qDEB_HOST_MULTIARCH... does not look sensible because: - For this code to work correctly, DEB_HOST_ARCH must be pre-defined, which is true when the packages are built via dpkg-buildpackage. In this case, DEB_HOST_MULTIARCH is also likely defined, hence there is no need to query DEB_HOST_MULTIARCH in the first place. - If DEB_HOST_MULTIARCH is undefined, DEB_HOST_ARCH is likely undefined too. So, you cannot query DEB_HOST_MULTIARCH in this way. This is mostly the case where debian/rules is directly executed.When debian/rules is directly executed, querying DEB_HOST_MUCHARCH isnot enough because we need to know DEB_{BUILD,HOST}_GNU_TYPE as well.All DEB_* variables are defined when the package build is initiated bydpkg-buildpackage, but otherwise, let's call dpkg-architecture to setall DEB_* environment variables.This requires dpkg 1.20.6 or newer because --print-format optionwas added in dpkg commit 7c54fa2b232e ("dpkg-architecture: Add a--print-format option").Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

7d4f07d5 - kbuild: deb-pkg: squash scripts/package/deb-build-option to debian/rules

Tue, 26 Dec 2023 13:52:39 +0000

kbuild: deb-pkg: squash scripts/package/deb-build-option to debian/rulesThe binary-arch target needs to use the same CROSS_COMPILE as used inbuild-arch; otherwise, 'make run-command' may attempt to resync the.config file.Squash scripts/package/deb-build-option into debian/rules, as it is asmall amount of code.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

466e6fc4 - kbuild: deb-pkg: factor out common Make options in debian/rules

Tue, 26 Dec 2023 13:52:38 +0000

kbuild: deb-pkg: factor out common Make options in debian/rulesThis avoids code duplication between binary-arch and built-arch.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules

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/package/debian/rules

d9287ea8 - kbuild: deb-pkg: split debian/rules

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

kbuild: deb-pkg: split debian/rulesdebian/rules is generated by shell, but the escape sequence (\$) isunreadable.debian/rules embeds only two variables (ARCH and KERNELRELEASE).Split them out to debian/rules.vars, and check-in the rest of Makefilecode to scripts/package/debian/rules.Signed-off-by: Masahiro Yamada Tested-by: Nathan Chancellor Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/debian/rules