[sys-kernel/dracut] bump
This commit is contained in:
parent
5de428735c
commit
a50691f316
@ -1 +1 @@
|
|||||||
DIST dracut-057.tar.gz 481345 BLAKE2B dcf663a1955753256866e9dfa318b0b46a132ea39223ab634d72af1611f7db394c23c1bb4326979a5ee919df6ce3b107c955c9c77ce1ec4f99de835352932901 SHA512 8acdc8db2233a9abbaeea218cc5b1be68c4985088995f42624750783f8d40ecbb7fa97ab4f6468f67c079c8418590ace317c143a92d9305640b48c7c0edd4089
|
DIST dracut-059.tar.gz 486487 BLAKE2B 86bbe18875cd3507e187b724cab212dc82e1daca7cedf79aeef13c34601adfff72bf2c0ba4c652e715b43c9a16f7be6a4a2b29dc75bef014640e1ec07c8d455b SHA512 196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af36d109214dc4a10b2dc2d3bd19e844f7f51c2bdec087e064ea11f75124032d
|
||||||
|
|||||||
@ -64,9 +64,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
|
|||||||
|
|
||||||
PATCHES=(
|
PATCHES=(
|
||||||
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
|
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
|
||||||
"${FILESDIR}"/057-aggressive-strip-typo.patch
|
"${FILESDIR}"/gentoo-network-r1.patch
|
||||||
"${FILESDIR}"/057-virtiofs-split-usr.patch
|
|
||||||
"${FILESDIR}"/057-i18n-keymaps.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
@ -148,9 +146,6 @@ pkg_postinst() {
|
|||||||
optfeature "Networking support" net-misc/networkmanager
|
optfeature "Networking support" net-misc/networkmanager
|
||||||
optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
|
optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
|
||||||
sys-apps/iproute2 "net-misc/iputils[arping]"
|
sys-apps/iproute2 "net-misc/iputils[arping]"
|
||||||
optfeature \
|
|
||||||
"Measure performance of the boot process for later visualisation" \
|
|
||||||
app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
|
|
||||||
optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs
|
optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs
|
||||||
optfeature "Load kernel modules and drop this privilege for real init" \
|
optfeature "Load kernel modules and drop this privilege for real init" \
|
||||||
sys-libs/libcap
|
sys-libs/libcap
|
||||||
@ -64,6 +64,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
|
|||||||
|
|
||||||
PATCHES=(
|
PATCHES=(
|
||||||
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
|
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
|
||||||
|
"${FILESDIR}"/gentoo-network-r1.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
@ -145,9 +146,6 @@ pkg_postinst() {
|
|||||||
optfeature "Networking support" net-misc/networkmanager
|
optfeature "Networking support" net-misc/networkmanager
|
||||||
optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
|
optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
|
||||||
sys-apps/iproute2 "net-misc/iputils[arping]"
|
sys-apps/iproute2 "net-misc/iputils[arping]"
|
||||||
optfeature \
|
|
||||||
"Measure performance of the boot process for later visualisation" \
|
|
||||||
app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
|
|
||||||
optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs
|
optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs
|
||||||
optfeature "Load kernel modules and drop this privilege for real init" \
|
optfeature "Load kernel modules and drop this privilege for real init" \
|
||||||
sys-libs/libcap
|
sys-libs/libcap
|
||||||
|
|||||||
@ -1,105 +0,0 @@
|
|||||||
From e4f1dbcc0061113cb58e555724f76a7243788236 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kairui Song <kasong@tencent.com>
|
|
||||||
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 <kasong@tencent.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
From bef99c5120809cc5603e51dcc1987767205f241f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
|
|
||||||
Date: Mon, 27 Jun 2022 13:19:41 +0200
|
|
||||||
Subject: [PATCH] fix(i18n): add required includes for keymaps
|
|
||||||
|
|
||||||
Commit https://github.com/dracutdevs/dracut/commit/f3441cc7 removed shell
|
|
||||||
options but didn't adapt all the code that requires nullglob and globstar.
|
|
||||||
This caused the initrd to be generated without the required includes for
|
|
||||||
keymaps.
|
|
||||||
---
|
|
||||||
modules.d/10i18n/module-setup.sh | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
|
|
||||||
index 35bda36fb..6fd5fd433 100755
|
|
||||||
--- a/modules.d/10i18n/module-setup.sh
|
|
||||||
+++ b/modules.d/10i18n/module-setup.sh
|
|
||||||
@@ -63,7 +63,9 @@ install() {
|
|
||||||
readarray -t INCLUDES < <("$CMD" '^include ' "$MAP" | while read -r _ a _ || [ -n "$a" ]; do echo "${a//\"/}"; done)
|
|
||||||
|
|
||||||
for INCL in "${INCLUDES[@]}"; do
|
|
||||||
- for FN in "$dracutsysrootdir""${kbddir}"/keymaps/**/"$INCL"*; do
|
|
||||||
+ local -a FNS
|
|
||||||
+ mapfile -t -d '' FNS < <(find "${dracutsysrootdir}${kbddir}"/keymaps/ -type f -name "${INCL}*" -print0)
|
|
||||||
+ for FN in "${FNS[@]}"; do
|
|
||||||
[[ -f $FN ]] || continue
|
|
||||||
[[ -v KEYMAPS["$FN"] ]] || findkeymap "$FN"
|
|
||||||
done
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
From dd63cc0a25f9fb34a2f28306c06a668d66564463 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mike Gilbert <floppym@gentoo.org>
|
|
||||||
Date: Mon, 4 Jul 2022 19:08:45 -0400
|
|
||||||
Subject: [PATCH] fix(virtiofs): make shebangs work on split-usr systems
|
|
||||||
|
|
||||||
Fixes: c29325a982013a315418cdb2318e90cf77e387b5
|
|
||||||
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
|
|
||||||
---
|
|
||||||
modules.d/95virtiofs/module-setup.sh | 2 +-
|
|
||||||
modules.d/95virtiofs/mount-virtiofs.sh | 2 +-
|
|
||||||
modules.d/95virtiofs/parse-virtiofs.sh | 2 +-
|
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/modules.d/95virtiofs/module-setup.sh b/modules.d/95virtiofs/module-setup.sh
|
|
||||||
index e5f209e0a..70c10584a 100755
|
|
||||||
--- a/modules.d/95virtiofs/module-setup.sh
|
|
||||||
+++ b/modules.d/95virtiofs/module-setup.sh
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/bash
|
|
||||||
+#!/bin/bash
|
|
||||||
|
|
||||||
# called by dracut
|
|
||||||
check() {
|
|
||||||
diff --git a/modules.d/95virtiofs/mount-virtiofs.sh b/modules.d/95virtiofs/mount-virtiofs.sh
|
|
||||||
index 507911cf5..c7e31d041 100755
|
|
||||||
--- a/modules.d/95virtiofs/mount-virtiofs.sh
|
|
||||||
+++ b/modules.d/95virtiofs/mount-virtiofs.sh
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/sh
|
|
||||||
+#!/bin/sh
|
|
||||||
|
|
||||||
if [ "${fstype}" = "virtiofs" -o "${root%%:*}" = "virtiofs" ]; then
|
|
||||||
if ! { modprobe virtiofs || strstr "$(cat /proc/filesystems)" virtiofs; }; then
|
|
||||||
diff --git a/modules.d/95virtiofs/parse-virtiofs.sh b/modules.d/95virtiofs/parse-virtiofs.sh
|
|
||||||
index 8b8cf760d..760e41385 100755
|
|
||||||
--- a/modules.d/95virtiofs/parse-virtiofs.sh
|
|
||||||
+++ b/modules.d/95virtiofs/parse-virtiofs.sh
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/sh
|
|
||||||
+#!/bin/sh
|
|
||||||
# Accepted formats:
|
|
||||||
# rootfstype=virtiofs root=<tag>
|
|
||||||
# root=virtiofs:<tag>
|
|
||||||
29
sys-kernel/dracut/files/gentoo-network-r1.patch
Normal file
29
sys-kernel/dracut/files/gentoo-network-r1.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From 5443396f3cb591f2589888b25e07f21f03989057 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Laszlo Gombos <laszlo.gombos@gmail.com>
|
||||||
|
Date: Sat, 24 Dec 2022 01:48:04 +0000
|
||||||
|
Subject: [PATCH] When no systemd then only network-legacy is supported
|
||||||
|
|
||||||
|
Bug: https://github.com/dracutdevs/dracut/issues/1756
|
||||||
|
---
|
||||||
|
modules.d/40network/module-setup.sh | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
|
||||||
|
index 1ab13ef..da49947 100755
|
||||||
|
--- a/modules.d/40network/module-setup.sh
|
||||||
|
+++ b/modules.d/40network/module-setup.sh
|
||||||
|
@@ -16,6 +16,11 @@ depends() {
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
+ # When systemd is not available only network-legacy is supported
|
||||||
|
+ if [ -z "$network_handler" ] && ! find_binary systemctl > /dev/null; then
|
||||||
|
+ network_handler="network-legacy"
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
if [ -z "$network_handler" ]; then
|
||||||
|
if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
|
||||||
|
network_handler="network-wicked"
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user