Changes in builddeb

ac2c30f9 - kbuild: deb-pkg: allow hooks also in /usr/share/kernel

Tue, 03 Dec 2024 16:17:35 +0000

kbuild: deb-pkg: allow hooks also in /usr/share/kernelBy passing an additional directory to run-parts, allow Debian and itsderivatives to ship maintainer scripts in /usr while at the same timeallowing the local admin to override or disable them by placing hooks ofthe same name in /etc. This adds support for the mechanism described inthe UAPI Configuration Files Specification for kernel hooks. The sameidea is also used by udev, systemd or modprobe for their config files.https://uapi-group.org/specifications/specs/configuration_files_specification/This functionality relies on run-parts 5.21 or later. It is theresponsibility of packages installing hooks into /usr/share/kernel toalso declare a Depends: debianutils (>= 5.21).KDEB_HOOKDIR can be used to change the list of directories that issearched. By default, /etc/kernel and /usr/share/kernel are hookdirectories. Since the list of directories in KDEB_HOOKDIR is separatedby spaces, the paths must not contain the space character themselves.Signed-off-by: Johannes Schauer Marin Rodrigues Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb

d9ecb92b - kbuild: deb-pkg: do not include empty hook directories

Tue, 03 Dec 2024 13:59:58 +0000

kbuild: deb-pkg: do not include empty hook directoriesThe linux-image package currently includes empty hook directories(/etc/kernel/{pre,post}{inst,rm}.d/ by default).These directories were perhaps intended as a fail-safe in case nohook scripts exist there.However, they are really unnecessary because the run-parts command isalready guarded by the following check: test -d ${debhookdir}/${script}.d && run-parts ...The only difference is that the run-parts command either runs for emptydirectories (resulting in a no-op) or is skipped entirely.The maintainer scripts will succeed without these dummy directories.The linux-image packages from the Debian kernel do not contain/etc/kernel/*.d/, either.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb

54956567 - kbuild: deb-pkg: Do not install maint scripts for arch 'um'

Thu, 12 Dec 2024 13:05:29 +0000

kbuild: deb-pkg: Do not install maint scripts for arch 'um'Stop installing Debian maintainer scripts when building auser-mode-linux Debian package.Debian maintainer scripts are used for e.g. requesting rebuilds ofinitrd, rebuilding DKMS modules and updating of grub configuration. Asall of this is not relevant for UML but also may lead to failures whileprocessing the kernel hooks, do no more install maintainer scripts forthe UML package.Suggested-by: Masahiro Yamada Signed-off-by: Nicolas Schier Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb

bcbbf493 - kbuild: deb-pkg: Don't fail if modules.order is missing

Thu, 07 Nov 2024 15:05:08 +0000

kbuild: deb-pkg: Don't fail if modules.order is missingKernels built without CONFIG_MODULES might still want to create -dbg debpackages but install_linux_image_dbg() assumes modules.order alwaysexists. This obviously isn't true if no modules were built, so we shouldskip reading modules.order in that case.Fixes: 16c36f8864e3 ("kbuild: deb-pkg: use build ID instead of debug link for dbg package")Signed-off-by: Matt Fleming Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb

e2c31822 - kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profile

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

kbuild: deb-pkg: add pkg.linux-upstream.nokernelheaders build profileSince commit f1d87664b82a ("kbuild: cross-compile linux-headers packagewhen possible"), 'make bindeb-pkg' may attempt to cross-compile thelinux-headers package, but it fails under certain circumstances.For example, when CONFIG_MODULE_SIG_FORMAT is enabled on Debian, thefollowing command fails: $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- bindeb-pkg [ snip ] Rebuilding host programs with aarch64-linux-gnu-gcc... HOSTCC debian/linux-headers-6.12.0-rc4/usr/src/linux-headers-6.12.0-rc4/scripts/kallsyms HOSTCC debian/linux-headers-6.12.0-rc4/usr/src/linux-headers-6.12.0-rc4/scripts/sorttable HOSTCC debian/linux-headers-6.12.0-rc4/usr/src/linux-headers-6.12.0-rc4/scripts/asn1_compiler HOSTCC debian/linux-headers-6.12.0-rc4/usr/src/linux-headers-6.12.0-rc4/scripts/sign-file In file included from /usr/include/openssl/opensslv.h:109, from debian/linux-headers-6.12.0-rc4/usr/src/linux-headers-6.12.0-rc4/scripts/sign-file.c:25: /usr/include/openssl/macros.h:14:10: fatal error: openssl/opensslconf.h: No such file or directory 14 | #include | ^~~~~~~~~~~~~~~~~~~~~~~ compilation terminated.This commit adds a new profile, pkg.linux-upstream.nokernelheaders, toguard the linux-headers package.There are two options to fix the above issue.Option 1: Set the pkg.linux-upstream.nokernelheaders build profile $ DEB_BUILD_PROFILES=pkg.linux-upstream.nokernelheaders \ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- bindeb-pkgThis skips the building of the linux-headers package.Option 2: Install the necessary build dependenciesIf you want to cross-compile the linux-headers package, you need toinstall additional packages.For example, on Debian, the packages necessary for cross-compiling itto arm64 can be installed with the following commands: # dpkg --add-architecture arm64 # apt update # apt install gcc-aarch64-linux-gnu libssl-dev:arm64Fixes: f1d87664b82a ("kbuild: cross-compile linux-headers package when possible")Reported-by: Ron Economos Closes: https://lore.kernel.org/all/b3d4f49e-7ddb-29ba-0967-689232329b53@w6rz.net/Signed-off-by: Masahiro Yamada Tested-by: Ron Economos Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/builddeb

82cb4430 - kbuild: deb-pkg: Remove blank first line from maint scripts

Fri, 04 Oct 2024 07:52:45 +0000

kbuild: deb-pkg: Remove blank first line from maint scriptsThe blank line causes execve() to fail: # strace ./postinst execve("./postinst", ...) = -1 ENOEXEC (Exec format error) strace: exec: Exec format error +++ exited with 1 +++However running the scripts via shell does work (at least with bash)because the shell attempts to execute the file as a shell script whenexecve() fails.Fixes: b611daae5efc ("kbuild: deb-pkg: split image and debug objects staging out into functions")Signed-off-by: Aaron Thompson Reviewed-by: Nathan Chancellor Reviewed-by: Nicolas Schier Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb

c0414419 - kbuild: package: add -e and -u options to some shell scripts

Tue, 02 Jul 2024 18:02:42 +0000

kbuild: package: add -e and -u options to some shell scriptsSet -e to make these scripts fail on the first error.Set -u because these scripts are invoked by Makefile, and do not workproperly without necessary variables defined.I tweaked mkdebian to cope with optional environment variables.Remove the explicit "test -n ..." from install-extmod-build.Both options are described in POSIX. [1][1]: https://pubs.opengroup.org/onlinepubs/009604499/utilities/set.htmlSigned-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/builddeb

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/builddeb

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/builddeb

6185d321 - kbuild: deb-pkg: use debian/ for tmpdir

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

kbuild: deb-pkg: use debian/ for tmpdirUse debian/ for tmpdir, which is the default of debhelper.This simplifies the code.Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/scripts/package/builddeb

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/builddeb

16c36f88 - kbuild: deb-pkg: use build ID instead of debug link for dbg package

Tue, 26 Dec 2023 14:33:59 +0000

kbuild: deb-pkg: use build ID instead of debug link for dbg packageThere are two ways of managing separate debug info files: [1] The executable contains the .gnu_debuglink section, which specifies the name and the CRC of the separate debug info file. [2] The executable contains a build ID, and the corresponding debug info file is placed in the .build-id directory.We could do both, but the former, which 'make deb-pkg' currently does,results in complicated installation steps because we need to manuallystrip the debug sections, create debug links, and re-sign the modules.Besides, it is not working with module compression.This commit abandons the approach [1], and instead opts for [2].Debian kernel commit de26137e2a9f ("Drop not needed extra step to adddebug links") also stopped adding debug links.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb

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/builddeb

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/builddeb

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/package/builddeb

2d7d1bc1 - kbuild: remove stale code for 'source' symlink in packaging scripts

Sun, 01 Oct 2023 14:03:39 +0000

kbuild: remove stale code for 'source' symlink in packaging scriptsSince commit d8131c2965d5 ("kbuild: remove $(MODLIB)/source symlink"),modules_install does not create the 'source' symlink.Remove the stale code from builddeb and kernel.spec.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb

fe66b5d2 - kbuild: refactor kernel-devel RPM package and linux-headers Deb package

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

kbuild: refactor kernel-devel RPM package and linux-headers Deb packageThe kernel-devel RPM package and the linux-headers Debian packageprovide headers and scripts needed for building external modules.They copy the necessary files in slightly different ways - the RPMcopies almost everything except some exclude patterns, while the Debiancopies less number of files. There is no need to maintain different codeto do the same thing.Split the Debian code out to scripts/package/install-extmod-build, whichis called from both of the packages.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb

1240dabe - kbuild: deb-pkg: remove the CONFIG_MODULES check in buildeb

Sun, 25 Jun 2023 18:16:23 +0000

kbuild: deb-pkg: remove the CONFIG_MODULES check in buildebWhen CONFIG_MODULES is disabled for ARCH=um, 'make (bin)deb-pkg' failswith an error like follows: cp: cannot create regular file 'debian/linux-image/usr/lib/uml/modules/6.4.0-rc2+/System.map': No such file or directoryRemove the CONFIG_MODULES check completely so ${pdir}/usr/lib/uml/moduleswill always be created and modules.builtin.(modinfo) will be installedunder it for ARCH=um.Fixes: b611daae5efc ("kbuild: deb-pkg: split image and debug objects staging out into functions")Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb

4243afdb - kbuild: builddeb: always make modules_install, to install modules.builtin*

Thu, 22 Jun 2023 19:19:53 +0000

kbuild: builddeb: always make modules_install, to install modules.builtin*Even for a non-modular kernel, the kernel builds modules.builtin andmodules.builtin.modinfo, with information about the built-in modules.Tools such as initramfs-tools need these files to build a workinginitramfs on some systems, such as those requiring firmware.Now that `make modules_install` works even in non-modular kernels andinstalls these files, unconditionally invoke it when building a Debianpackage.Signed-off-by: Josh Triplett Reviewed-by: Nicolas Schier Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb

491b146d - kbuild: builddeb: Eliminate debian/arch use

Tue, 14 Mar 2023 00:40:22 +0000

kbuild: builddeb: Eliminate debian/arch useIn the builddeb context, the DEB_HOST_ARCH environment variable is setto the same value as debian/arch's content, so use the variable withdpkg-architecture.This is the last use of the debian/arch file during dpkg-buildpackage time.Signed-off-by: Bastian Germann Signed-off-by: Masahiro Yamada List of files: /linux-6.15/scripts/package/builddeb