Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/
Date: Thu, 30 Sep 2021 22:28:13
Message-Id: 1633040840.e31cc3aa827f1d83fd9e7d23a4bc32149d8e6ae2.whissi@gentoo
1 commit: e31cc3aa827f1d83fd9e7d23a4bc32149d8e6ae2
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 30 22:26:15 2021 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 30 22:27:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31cc3aa
7
8 sys-kernel/genkernel: adopt changes from >=sys-apps/baselayout-2.8
9
10 Package-Manager: Portage-3.0.26, Repoman-3.0.3
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 .../files/genkernel-4.2.4-modprobe-d-fix.patch | 46 ++++++++++++++++++++++
14 ...l-4.2.4-r1.ebuild => genkernel-4.2.4-r2.ebuild} | 5 ++-
15 2 files changed, 50 insertions(+), 1 deletion(-)
16
17 diff --git a/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch b/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch
18 new file mode 100644
19 index 00000000000..09ac6422e16
20 --- /dev/null
21 +++ b/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch
22 @@ -0,0 +1,46 @@
23 +From c869ac450ae286908cfed582b0c51fe327555833 Mon Sep 17 00:00:00 2001
24 +From: Thomas Deutschmann <whissi@g.o>
25 +Date: Thu, 30 Sep 2021 23:12:52 +0200
26 +Subject: gen_initramfs.sh: append_modprobed(): Adopt changes from
27 + sys-apps/baselayout-2.8
28 +
29 +In >=sys-apps/baselayout-2.8, /etc/modprobe.d was moved to /lib/modprobe.d.
30 +
31 +This commit will try to copy /etc/modprobe.d and /lib/modprobe.d but will
32 +no longer fail if one directory is missing.
33 +
34 +Signed-off-by: Thomas Deutschmann <whissi@g.o>
35 +---
36 + gen_initramfs.sh | 15 ++++++++++++---
37 + 1 file changed, 12 insertions(+), 3 deletions(-)
38 +
39 +diff --git a/gen_initramfs.sh b/gen_initramfs.sh
40 +index 8f11127..56d6a03 100755
41 +--- a/gen_initramfs.sh
42 ++++ b/gen_initramfs.sh
43 +@@ -1832,10 +1832,19 @@ append_modprobed() {
44 + mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
45 + cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
46 +
47 +- mkdir -p "${TDIR}"/etc || gen_die "Failed to create '${TDIR}/etc'!"
48 ++ local modprobe_dir
49 ++ for modprobe_dir in /etc/modprobe.d /lib/modprobe.d
50 ++ do
51 ++ if [[ ! -e "${modprobe_dir}" ]]; then
52 ++ print_info 5 "'${modprobe_dir}' does not exist; Skipping ..."
53 ++ continue
54 ++ fi
55 ++
56 ++ mkdir -p "${TDIR}${modprobe_dir}" || gen_die "Failed to create '${TDIR}${modprobe_dir}'!"
57 +
58 +- cp -rL "/etc/modprobe.d" "${TDIR}"/etc/ 2>/dev/null \
59 +- || gen_die "Failed to copy '/etc/modprobe.d'!"
60 ++ cp -aL "${modprobe_dir}"/. "${TDIR}${modprobe_dir}" 2>/dev/null \
61 ++ || gen_die "Failed to copy '${modprobe_dir}'!"
62 ++ done
63 +
64 + cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
65 + log_future_cpio_content
66 +--
67 +cgit v1.2.3-18-g5258
68 +
69
70 diff --git a/sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild b/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild
71 similarity index 99%
72 rename from sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild
73 rename to sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild
74 index f8f6847a650..dfef98dec33 100644
75 --- a/sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild
76 +++ b/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild
77 @@ -125,7 +125,10 @@ if [[ ${PV} == 9999* ]]; then
78 DEPEND="${DEPEND} app-text/asciidoc"
79 fi
80
81 -PATCHES=( "${FILESDIR}"/${P}-fix-dropbear-depend.patch )
82 +PATCHES=(
83 + "${FILESDIR}"/${P}-fix-dropbear-depend.patch
84 + "${FILESDIR}"/${P}-modprobe-d-fix.patch
85 +)
86
87 src_unpack() {
88 if [[ ${PV} == 9999* ]]; then