WWang Huaikbuild: buildtar: Remove unused $dirs
| 文件 | 最后提交记录 | 最后更新时间 |
|---|---|---|
scripts: package: adapt to UOS/deepin Secure Boot signing routine Connect to our signing server during build time and sign the kernel image as it gets installed to the temporary Debian packaging directory. Co-authored-by: 李成刚 <lichenggang@uniontech.com> Signed-off-by: Mingcong Bai <baimingcong@uniontech.com> Signed-off-by: 李成刚 <lichenggang@uniontech.com> Signed-off-by: Meng Tang <tangmeng@uniontech.com> | 1 年前 | |
UPSTREAM: kbuild: deb-pkg: don't set KBUILD_BUILD_VERSION unconditionally In ThinPro, we use the convention <upstream_ver>+hp<patchlevel> for the kernel package. This does not have a dash in the name or version. This is built by editing ".version" before a build, and setting EXTRAVERSION="+hp" and KDEB_PKGVERSION make variables: echo 68 > .version make -j<n> EXTRAVERSION="+hp" bindeb-pkg KDEB_PKGVERSION=6.12.2+hp69 .deb name: linux-image-6.12.2+hp_6.12.2+hp69_amd64.deb Since commit 7d4f07d5cb71 ("kbuild: deb-pkg: squash scripts/package/deb-build-option to debian/rules"), this no longer works. The deb build logic changed, even though, the commit message implies that the logic should be unmodified. Before, KBUILD_BUILD_VERSION was not set if the KDEB_PKGVERSION did not contain a dash. After the change KBUILD_BUILD_VERSION is always set to KDEB_PKGVERSION. Since this determines UTS_VERSION, the uname output to look off: (now) uname -a: version 6.12.2+hp ... #6.12.2+hp69 (expected) uname -a: version 6.12.2+hp ... #69 Update 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 <alexandru.gagniuc@hp.com> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> (cherry picked from commit 62604063621fb075c7966286bdddcb057d883fa8) Signed-off-by: Han Gao <gaohan@iscas.ac.cn> | 7 个月前 | |
UPSTREAM: kbuild: deb-pkg: Don't fail if modules.order is missing Kernels built without CONFIG_MODULES might still want to create -dbg deb packages but install_linux_image_dbg() assumes modules.order always exists. This obviously isn't true if no modules were built, so we should skip 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 <mfleming@cloudflare.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> (cherry picked from commit bcbbf493f2fa6fa1f0832f6b5b4c80a65de242d6) Signed-off-by: Han Gao <gaohan@iscas.ac.cn> | 7 个月前 | |
kbuild: buildtar: Remove unused $dirs mainline inclusion from mainline-v6.8-rc1 category: bugfix The shell variable $dirs is not used any more since 1fc9095846cc ("kbuild: tar-pkg: use tar rules in scripts/Makefile.package"), therefore remove it". Fixes: 1fc9095846cc ("kbuild: tar-pkg: use tar rules in scripts/Makefile.package") Signed-off-by: Petr Vorel <pvorel@suse.cz> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> (cherry picked from commit 884f55f152cb028056bf9efe557a2d7346e932f5) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> | 1 个月前 | |
BACKPORT: UPSTREAM: kbuild: package: add -e and -u options to some shell scripts Set -e to make these scripts fail on the first error. Set -u because these scripts are invoked by Makefile, and do not work properly 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.html Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> (cherry picked from commit c0414419758b2521c2038847960af258c678db8d) [ Han Gao: remove mkspec modify ] Signed-off-by: Han Gao <gaohan@iscas.ac.cn> | 7 个月前 | |
kbuild: Keep .config in linux-headers for old dkms This was removed in 43eaad8716("kbuild: slim down package for building external modules"). But old versions of dkms still want the .config file, so keep it. | 3 个月前 | |
kbuild: rpm-pkg: simplify installkernel %post commit 358de8b4f201bc05712484b15f0109b1ae3516a8 upstream. The new installkernel application that is now included in systemd-udev package allows installation although destination files are already present in the boot directory of the kernel package, but is failing with the implemented workaround for the old installkernel application from grubby package. For the new installkernel application, as Davide says: <<The %post currently does a shuffling dance before calling installkernel. This isn't actually necessary afaict, and the current implementation ends up triggering downstream issues such as https://github.com/systemd/systemd/issues/29568 This commit simplifies the logic to remove the shuffling. For reference, the original logic was added in commit 3c9c7a14b627("rpm-pkg: add %post section to create initramfs and grub hooks").>> But we need to keep the old behavior as well, because the old installkernel application from grubby package, does not allow this simplification and we need to be backward compatible to avoid issues with the different packages. Mimic Fedora shipping process and store vmlinuz, config amd System.map in the module directory instead of the boot directory. In this way, we will avoid the commented problem for all the cases, because the new destination files are not going to exist in the boot directory of the kernel package. Replace installkernel tool with kernel-install tool, because the latter is more complete. Besides, after installkernel tool execution, check to complete if the correct package files vmlinuz, System.map and config files are present in /boot directory, and if necessary, copy manually for install operation. In this way, take into account if files were not previously copied from /usr/lib/kernel/install.d/* scripts and if the suitable files for the requested package are present (it could be others if the rpm files were replace with a new pacakge with the same release and a different build). Tested with Fedora 38, Fedora 39, RHEL 9, Oracle Linux 9.3, openSUSE Tumbleweed and openMandrive ROME, using dnf/zypper and rpm tools. cc: stable@vger.kernel.org Co-Developed-by: Davide Cavalca <dcavalca@meta.com> Signed-off-by: Jose Ignacio Tornos Martinez <jtornosm@redhat.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit f165d04c41a390c3a999d767302e6e385694897a) | 1 年前 | |
Revert "BACKPORT: UPSTREAM: kbuild: move init/build-version to scripts/" deepin inclusion category: bugfix This reverts commit 1195f54484374e5e72786204eab763022e7b7aaf. Our release scripts echo version to init/build-version: echo "echo $build_version_id" > init/build-verion (should sync to scripts) This change should be reverted after we modified the script. And this is different to upstream version, we will use the upstream version. Signed-off-by: Wentao Guan <guanwentao@uniontech.com> | 7 个月前 | |
Revert "BACKPORT: UPSTREAM: kbuild: move init/build-version to scripts/" deepin inclusion category: bugfix This reverts commit 1195f54484374e5e72786204eab763022e7b7aaf. Our release scripts echo version to init/build-version: echo "echo $build_version_id" > init/build-verion (should sync to scripts) This change should be reverted after we modified the script. And this is different to upstream version, we will use the upstream version. Signed-off-by: Wentao Guan <guanwentao@uniontech.com> | 7 个月前 | |
scripts/package: snap-pkg target Following in footsteps of other targets like 'deb-pkg, 'rpm-pkg' and 'tar-pkg', this patch adds a 'snap-pkg' target for the creation of a Linux kernel snap package using the kbuild infrastructure. A snap, in its general form, is a self contained, sandboxed, universal package and it is intended to work across multiple distributions and/or devices. A snap package is distributed as a single compressed squashfs filesystem. A kernel snap is a snap package carrying the Linux kernel, kernel modules, accessory files (DTBs, System.map, etc) and a manifesto file. The purpose of a kernel snap is to carry the Linux kernel during the creation of a system image, eg. Ubuntu Core, and its subsequent upgrades. For more information on snap packages: https://snapcraft.io/docs/ Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> | 8 年前 |