From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23D3E158017 for ; Thu, 30 Sep 2021 22:28:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 786F0E08EF; Thu, 30 Sep 2021 22:28:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 134A5E08EF for ; Thu, 30 Sep 2021 22:28:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF2AF342CDA for ; Thu, 30 Sep 2021 22:28:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 97FAFEA for ; Thu, 30 Sep 2021 22:28:07 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1633040840.e31cc3aa827f1d83fd9e7d23a4bc32149d8e6ae2.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild X-VCS-Directories: sys-kernel/genkernel/files/ sys-kernel/genkernel/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: e31cc3aa827f1d83fd9e7d23a4bc32149d8e6ae2 X-VCS-Branch: master Date: Thu, 30 Sep 2021 22:28:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c8eb243-3dd4-4fe5-8768-3e93a5722c34 X-Archives-Hash: 712dd1ca570577dc2614f38b4543f72a commit: e31cc3aa827f1d83fd9e7d23a4bc32149d8e6ae2 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Sep 30 22:26:15 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Sep 30 22:27:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31cc3aa sys-kernel/genkernel: adopt changes from >=sys-apps/baselayout-2.8 Package-Manager: Portage-3.0.26, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> .../files/genkernel-4.2.4-modprobe-d-fix.patch | 46 ++++++++++++++++++++++ ...l-4.2.4-r1.ebuild => genkernel-4.2.4-r2.ebuild} | 5 ++- 2 files changed, 50 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..09ac6422e16 --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch @@ -0,0 +1,46 @@ +From c869ac450ae286908cfed582b0c51fe327555833 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +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 +--- + 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 + diff --git a/sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild b/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild similarity index 99% rename from sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild rename to sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild index f8f6847a650..dfef98dec33 100644 --- a/sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild +++ b/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild @@ -125,7 +125,10 @@ if [[ ${PV} == 9999* ]]; then DEPEND="${DEPEND} app-text/asciidoc" fi -PATCHES=( "${FILESDIR}"/${P}-fix-dropbear-depend.patch ) +PATCHES=( + "${FILESDIR}"/${P}-fix-dropbear-depend.patch + "${FILESDIR}"/${P}-modprobe-d-fix.patch +) src_unpack() { if [[ ${PV} == 9999* ]]; then