gentoo resync : 27.10.2021

2 files changed, 0 insertions, 72 deletions

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch b/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch
deleted file mode 100644
index ab74620e0fa7..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e43878aa62e563fcefa7c1da5c44017816ac65b4 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 29 Sep 2021 20:15:56 +0200
-Subject: defaults/software.sh: dropbear needs libxcrypt
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- defaults/software.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/defaults/software.sh b/defaults/software.sh
-index 54836ad..9f64ab0 100644
---- a/defaults/software.sh
-+++ b/defaults/software.sh
-@@ -67,7 +67,7 @@ GKPKG_DMRAID_BINPKG="${GKPKG_DMRAID_BINPKG:-%%CACHE%%/dmraid-${GKPKG_DMRAID_PV}-
- 
- GKPKG_DROPBEAR_PN="dropbear"
- GKPKG_DROPBEAR_PV="${GKPKG_DROPBEAR_PV:-VERSION_DROPBEAR}"
--GKPKG_DROPBEAR_DEPS="zlib"
-+GKPKG_DROPBEAR_DEPS="zlib libxcrypt"
- GKPKG_DROPBEAR_SRCTAR="${GKPKG_DROPBEAR_SRCTAR:-${DISTDIR}/dropbear-${GKPKG_DROPBEAR_PV}.tar.bz2}"
- GKPKG_DROPBEAR_SRCDIR="${GKPKG_DROPBEAR_SRCDIR:-dropbear-${GKPKG_DROPBEAR_PV}}"
- GKPKG_DROPBEAR_BINPKG="${GKPKG_DROPBEAR_BINPKG:-%%CACHE%%/dropbear-${GKPKG_DROPBEAR_PV}-%%ARCH%%.tar.xz}"
--- 
-cgit v1.2.3-18-g5258
-
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
deleted file mode 100644
index 09ac6422e16d..000000000000
--- a/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c869ac450ae286908cfed582b0c51fe327555833 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 30 Sep 2021 23:12:52 +0200
-Subject: gen_initramfs.sh: append_modprobed(): Adopt changes from
- sys-apps/baselayout-2.8
-
-In >=sys-apps/baselayout-2.8, /etc/modprobe.d was moved to /lib/modprobe.d.
-
-This commit will try to copy /etc/modprobe.d and /lib/modprobe.d but will
-no longer fail if one directory is missing.
-
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- gen_initramfs.sh | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/gen_initramfs.sh b/gen_initramfs.sh
-index 8f11127..56d6a03 100755
---- a/gen_initramfs.sh
-+++ b/gen_initramfs.sh
-@@ -1832,10 +1832,19 @@ append_modprobed() {
- 	mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
- 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
- 
--	mkdir -p "${TDIR}"/etc || gen_die "Failed to create '${TDIR}/etc'!"
-+	local modprobe_dir
-+	for modprobe_dir in /etc/modprobe.d /lib/modprobe.d
-+	do
-+		if [[ ! -e "${modprobe_dir}" ]]; then
-+			print_info 5 "'${modprobe_dir}' does not exist; Skipping ..."
-+			continue
-+		fi
-+
-+		mkdir -p "${TDIR}${modprobe_dir}" || gen_die "Failed to create '${TDIR}${modprobe_dir}'!"
- 
--	cp -rL "/etc/modprobe.d" "${TDIR}"/etc/ 2>/dev/null \
--		|| gen_die "Failed to copy '/etc/modprobe.d'!"
-+		cp -aL "${modprobe_dir}"/. "${TDIR}${modprobe_dir}" 2>/dev/null \
-+			|| gen_die "Failed to copy '${modprobe_dir}'!"
-+	done
- 
- 	cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
- 	log_future_cpio_content
--- 
-cgit v1.2.3-18-g5258
-