From 663e137198f9c3a0d691a0cfb6714f062cf63a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Thu, 23 Jun 2022 14:21:11 +0200 Subject: [PATCH] [sys-kernel/dracut] bump --- sys-kernel/dracut/Manifest | 2 +- ...dracut-056-r1.ebuild => dracut-057.ebuild} | 6 +- sys-kernel/dracut/dracut-9999.ebuild | 2 +- ...fix-lvm-add-missing-grep-requirement.patch | 36 ------ sys-kernel/dracut/files/056-musl.patch | 33 ------ sys-kernel/dracut/files/056-sysctl-vars.patch | 39 ------- .../files/057-aggressive-strip-typo.patch | 105 ++++++++++++++++++ 7 files changed, 109 insertions(+), 114 deletions(-) rename sys-kernel/dracut/{dracut-056-r1.ebuild => dracut-057.ebuild} (95%) delete mode 100644 sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch delete mode 100644 sys-kernel/dracut/files/056-musl.patch delete mode 100644 sys-kernel/dracut/files/056-sysctl-vars.patch create mode 100644 sys-kernel/dracut/files/057-aggressive-strip-typo.patch diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 13b4cf9..85f48f8 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1 +1 @@ -DIST dracut-056.tar.xz 384196 BLAKE2B e3e4fa3024b401cc954ba6069c54e95912691ff68a838e3c43bfc6a5b284bdee1669c782b30503c0246b7146c545ee8825febefcff93bae76ec46067cb7b87e1 SHA512 19268763e128984d20cab766bbdf2de12fe534ce2562fc688203099ef9b4cf83d0ccd2129499c70cdc6dd4ad53f0ffc2f3378eff5b8a15fda27c23b20f903df2 +DIST dracut-057.tar.gz 481345 BLAKE2B dcf663a1955753256866e9dfa318b0b46a132ea39223ab634d72af1611f7db394c23c1bb4326979a5ee919df6ce3b107c955c9c77ce1ec4f99de835352932901 SHA512 8acdc8db2233a9abbaeea218cc5b1be68c4985088995f42624750783f8d40ecbb7fa97ab4f6468f67c079c8418590ace317c143a92d9305640b48c7c0edd4089 diff --git a/sys-kernel/dracut/dracut-056-r1.ebuild b/sys-kernel/dracut/dracut-057.ebuild similarity index 95% rename from sys-kernel/dracut/dracut-056-r1.ebuild rename to sys-kernel/dracut/dracut-057.ebuild index 3a5352f..27e50da 100644 --- a/sys-kernel/dracut/dracut-056-r1.ebuild +++ b/sys-kernel/dracut/dracut-057.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/dracutdevs/dracut" else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" + SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="Generic initramfs generation tool" @@ -63,9 +63,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch - "${FILESDIR}"/056-sysctl-vars.patch - "${FILESDIR}"/056-musl.patch - "${FILESDIR}"/056-fix-lvm-add-missing-grep-requirement.patch + "${FILESDIR}"/057-aggressive-strip-typo.patch ) src_configure() { diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild index 232aacb..e9206b9 100644 --- a/sys-kernel/dracut/dracut-9999.ebuild +++ b/sys-kernel/dracut/dracut-9999.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/dracutdevs/dracut" else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" + SRC_URI="https://github.com/dracutdevs/dracut/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="Generic initramfs generation tool" diff --git a/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch b/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch deleted file mode 100644 index ca24180..0000000 --- a/sys-kernel/dracut/files/056-fix-lvm-add-missing-grep-requirement.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 79f9d9e1c29a9c8fc046ab20765e5bde2aaa3428 Mon Sep 17 00:00:00 2001 -From: Antonio Alvarez Feijoo -Date: Mon, 11 Apr 2022 08:33:17 +0200 -Subject: [PATCH] fix(lvm): add missing grep requirement - -Since commit https://github.com/dracutdevs/dracut/commit/7ffc5e38 -lvm_scan.sh needs grep. ---- - modules.d/90lvm/module-setup.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh -index 25be0133..aa8c6db8 100755 ---- a/modules.d/90lvm/module-setup.sh -+++ b/modules.d/90lvm/module-setup.sh -@@ -3,7 +3,7 @@ - # called by dracut - check() { - # No point trying to support lvm if the binaries are missing -- require_binaries lvm || return 1 -+ require_binaries lvm grep || return 1 - - [[ $hostonly ]] || [[ $mount_needs ]] && { - for fs in "${host_fs_types[@]}"; do -@@ -48,7 +48,7 @@ installkernel() { - - # called by dracut - install() { -- inst lvm -+ inst_multiple lvm grep - - if [[ $hostonly_cmdline == "yes" ]]; then - local _lvmconf --- -2.35.1 - diff --git a/sys-kernel/dracut/files/056-musl.patch b/sys-kernel/dracut/files/056-musl.patch deleted file mode 100644 index ded1888..0000000 --- a/sys-kernel/dracut/files/056-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ce55a85ed5d902c19d75895508856f96ec2ceb1a Mon Sep 17 00:00:00 2001 -From: Laszlo Gombos -Date: Sun, 20 Feb 2022 22:23:49 -0500 -Subject: [PATCH] fix(install): restore musl support - -__GLIBC_PREREQ is only defined in glibc. ---- - src/install/util.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/install/util.c b/src/install/util.c -index 5721de89e..0af387c27 100644 ---- a/src/install/util.c -+++ b/src/install/util.c -@@ -24,17 +24,15 @@ - #include - #include - #include -+#include - - #include "util.h" - --#if __GLIBC_PREREQ(2, 30) == 0 --#include - #ifndef SYS_gettid - #error "SYS_gettid unavailable on this system" - #endif - - #define gettid() ((pid_t) syscall(SYS_gettid)) --#endif /*__GLIBC_PREREQ */ - - size_t page_size(void) - { diff --git a/sys-kernel/dracut/files/056-sysctl-vars.patch b/sys-kernel/dracut/files/056-sysctl-vars.patch deleted file mode 100644 index 8b50eaa..0000000 --- a/sys-kernel/dracut/files/056-sysctl-vars.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4c355d05587b0432a6dc551b8693dbdc51a07962 Mon Sep 17 00:00:00 2001 -From: Antonio Alvarez Feijoo -Date: Thu, 24 Feb 2022 09:36:02 +0100 -Subject: [PATCH] fix(dracut.sh): error exporting sysctl variables - -- Typo assigning depmodd and depmodconfdir. -- Typo exporting a variable called sysctl instead of sysctld. ---- - dracut.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dracut.sh b/dracut.sh -index 0a3f59741..afc6fd04c 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1798,12 +1798,12 @@ fi - [[ -d $dracutsysrootdir$tmpfilesconfdir ]] || tmpfilesconfdir=/etc/tmpfiles.d - - [[ -d $dracutsysrootdir$depmodd ]] \ -- || sysctld=$(pkg-config libkmod --variable=depmodd 2> /dev/null) -+ || depmodd=$(pkg-config libkmod --variable=depmodd 2> /dev/null) - - [[ -d $dracutsysrootdir$depmodd ]] || depmodd=/usr/lib/depmod.d - - [[ -d $dracutsysrootdir$depmodconfdir ]] \ -- || sysctlconfdir=$(pkg-config libkmod --variable=depmodconfdir 2> /dev/null) -+ || depmodconfdir=$(pkg-config libkmod --variable=depmodconfdir 2> /dev/null) - - [[ -d $dracutsysrootdir$depmodconfdir ]] || depmodconfdir=/etc/depmod.d - -@@ -1820,7 +1820,7 @@ export initdir dracutbasedir \ - dbusinterfacesconfdir dbusservices dbusservicesconfdir dbussession \ - dbussessionconfdir dbussystem dbussystemconfdir dbussystemservices \ - dbussystemservicesconfdir environment environmentconfdir modulesload \ -- modulesloadconfdir sysctl sysctlconfdir sysusers sysusersconfdir \ -+ modulesloadconfdir sysctld sysctlconfdir sysusers sysusersconfdir \ - systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \ - systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \ - hostonly_cmdline loginstall tmpfilesdir tmpfilesconfdir depmodd \ diff --git a/sys-kernel/dracut/files/057-aggressive-strip-typo.patch b/sys-kernel/dracut/files/057-aggressive-strip-typo.patch new file mode 100644 index 0000000..54ed1ad --- /dev/null +++ b/sys-kernel/dracut/files/057-aggressive-strip-typo.patch @@ -0,0 +1,105 @@ +From e4f1dbcc0061113cb58e555724f76a7243788236 Mon Sep 17 00:00:00 2001 +From: Kairui Song +Date: Tue, 21 Jun 2022 14:54:03 +0800 +Subject: [PATCH] fix(dracut): typo error 'aggresive' -> 'aggressive' + +This option was introduced not long ago, but unfortunately it was +misspelled and have affected following up commits. It's not a commonly +used option, at least not yet, so just rename and fix it. + +Signed-off-by: Kairui Song +--- + dracut.sh | 10 +++++----- + man/dracut.8.asc | 2 +- + man/dracut.conf.5.asc | 2 +- + shell-completion/bash/dracut | 2 +- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index a1ea1bc32..8c70befc0 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -124,7 +124,7 @@ Creates initial ramdisk images for preloading modules + --kernel-cmdline [PARAMETERS] + Specify default kernel command line parameters. + --strip Strip binaries in the initramfs. +- --aggresive-strip Strip more than just debug symbol and sections, ++ --aggressive-strip Strip more than just debug symbol and sections, + for a smaller initramfs build. The --strip option must + also be specified. + --nostrip Do not strip binaries in the initramfs. +@@ -409,7 +409,7 @@ rearrange_params() { + --long print-cmdline \ + --long kernel-cmdline: \ + --long strip \ +- --long aggresive-strip \ ++ --long aggressive-strip \ + --long nostrip \ + --long hardlink \ + --long nohardlink \ +@@ -734,7 +734,7 @@ while :; do + early_microcode_l="no" + ;; + --strip) do_strip_l="yes" ;; +- --aggresive-strip) aggresive_strip_l="yes" ;; ++ --aggressive-strip) aggressive_strip_l="yes" ;; + --nostrip) do_strip_l="no" ;; + --hardlink) do_hardlink_l="yes" ;; + --nohardlink) do_hardlink_l="no" ;; +@@ -1033,7 +1033,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) + [[ $drivers_dir_l ]] && drivers_dir=$drivers_dir_l + [[ $do_strip_l ]] && do_strip=$do_strip_l + [[ $do_strip ]] || do_strip=yes +-[[ $aggresive_strip_l ]] && aggresive_strip=$aggresive_strip_l ++[[ $aggressive_strip_l ]] && aggressive_strip=$aggressive_strip_l + [[ $do_hardlink_l ]] && do_hardlink=$do_hardlink_l + [[ $do_hardlink ]] || do_hardlink=yes + [[ $prefix_l ]] && prefix=$prefix_l +@@ -2235,7 +2235,7 @@ if [[ $do_strip == yes ]]; then + fi + done + +- if [[ $aggresive_strip == yes ]]; then ++ if [[ $aggressive_strip == yes ]]; then + # `eu-strip` and `strip` both strips all unneeded parts by default + strip_args=(-p) + else +diff --git a/man/dracut.8.asc b/man/dracut.8.asc +index bfb86f5de..7930ebb02 100644 +--- a/man/dracut.8.asc ++++ b/man/dracut.8.asc +@@ -265,7 +265,7 @@ example: + **--strip**:: + Strip binaries in the initramfs (default). + +-**--aggresive-strip**:: ++**--aggressive-strip**:: + Strip more than just debug symbol and sections, for a smaller initramfs + build. The --strip option must also be specified. + +diff --git a/man/dracut.conf.5.asc b/man/dracut.conf.5.asc +index 96c801292..d9694a5df 100644 +--- a/man/dracut.conf.5.asc ++++ b/man/dracut.conf.5.asc +@@ -106,7 +106,7 @@ Configuration files must have the extension .conf; other extensions are ignored. + *do_strip=*"__{yes|no}__":: + Strip binaries in the initramfs (default=yes). + +-*aggresive_strip=*"__{yes|no}__":: ++*aggressive_strip=*"__{yes|no}__":: + Strip more than just debug symbol and sections, for a smaller initramfs + build. The "do_strip=yes" option must also be specified (default=no). + +diff --git a/shell-completion/bash/dracut b/shell-completion/bash/dracut +index 86de20715..dbc669644 100644 +--- a/shell-completion/bash/dracut ++++ b/shell-completion/bash/dracut +@@ -33,7 +33,7 @@ _dracut() { + --xz --zstd --no-compress --gzip --list-modules --show-modules --keep + --printsize --regenerate-all --noimageifnotneeded --early-microcode + --no-early-microcode --print-cmdline --reproducible --uefi +- --enhanced-cpio --rebuild --aggresive-strip --hostonly-cmdline ++ --enhanced-cpio --rebuild --aggressive-strip --hostonly-cmdline + --no-hostonly-cmdline --no-hostonly-default-device --nofscks + --hostonly-i18n --no-hostonly-i18n --lzo --lz4 --no-reproducible + --no-uefi --no-machineid --version