| 1 |
commit: d03adad41e937c58379d6d0c240626f19097af30 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 1 04:36:49 2021 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 1 04:37:13 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d03adad4 |
| 7 |
|
| 8 |
releases/portage/isos: remove genkernel workarounds |
| 9 |
|
| 10 |
in https://gitweb.gentoo.org/repo/gentoo.git/commit/sys-kernel/genkernel?id=0151b485d8a614b366cb15241f8cab4e4bd4b38d |
| 11 |
genkernel 4.2.5 got stable, which includes required functionality |
| 12 |
We can finally drop hacks. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/796272 |
| 15 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 16 |
|
| 17 |
.../portage/isos/env/sys-kernel/genkernel-4.2.3 | 35 ---------------- |
| 18 |
.../portage/isos/patches/genkernel-ppc64-iso.patch | 47 ---------------------- |
| 19 |
2 files changed, 82 deletions(-) |
| 20 |
|
| 21 |
diff --git a/releases/portage/isos/env/sys-kernel/genkernel-4.2.3 b/releases/portage/isos/env/sys-kernel/genkernel-4.2.3 |
| 22 |
deleted file mode 100644 |
| 23 |
index f766cde6..00000000 |
| 24 |
--- a/releases/portage/isos/env/sys-kernel/genkernel-4.2.3 |
| 25 |
+++ /dev/null |
| 26 |
@@ -1,35 +0,0 @@ |
| 27 |
-post_src_unpack() { |
| 28 |
- if use arm64 || use ppc64; then |
| 29 |
- einfo "hooked by ${BASH_SOURCE[0]} in ${FUNCNAME[0]}" |
| 30 |
- local patchfile |
| 31 |
- patchfile="${PORTAGE_CONFIGROOT%/}/etc/portage/patches/genkernel-ppc64-iso.patch" |
| 32 |
- if [[ -f ${patchfile} ]]; then |
| 33 |
- einfo "found genkernel patch for bug https://bugs.gentoo.org/796272" |
| 34 |
- cd "${S}" || die |
| 35 |
- eapply "${patchfile}" |
| 36 |
- else |
| 37 |
- ewarn "no genkernel patch found, skipping hook" |
| 38 |
- fi |
| 39 |
- fi |
| 40 |
-} |
| 41 |
- |
| 42 |
-post_pkg_postinst() { |
| 43 |
- einfo "hooked by ${BASH_SOURCE[0]} in ${FUNCNAME[0]}" |
| 44 |
- einfo "cleaning up bug https://bugs.gentoo.org/796272 workarounds" |
| 45 |
- # cleanup after ourselves, we don't want workarounds shipped to users |
| 46 |
- # and don't want updating all the spec files with new removal directives. |
| 47 |
- local envfile patchfile |
| 48 |
- envfile="${PORTAGE_CONFIGROOT%/}/etc/portage/env/sys-kernel/genkernel" |
| 49 |
- patchfile="${PORTAGE_CONFIGROOT%/}/etc/portage/patches/genkernel-ppc64-iso.patch" |
| 50 |
- |
| 51 |
- local _x |
| 52 |
- for _x in "${envfile}" "${patchfile}"; do |
| 53 |
- if [[ -f ${_x} ]]; then |
| 54 |
- rm -vf "${_x}" |
| 55 |
- fi |
| 56 |
- done |
| 57 |
- rmdir -v --ignore-fail-on-non-empty "${PORTAGE_CONFIGROOT%/}/etc/portage/env/sys-kernel" |
| 58 |
- rmdir -v --ignore-fail-on-non-empty "${PORTAGE_CONFIGROOT%/}/etc/portage/env" |
| 59 |
- rmdir -v --ignore-fail-on-non-empty "${PORTAGE_CONFIGROOT%/}/etc/portage/patches" |
| 60 |
-} |
| 61 |
- |
| 62 |
|
| 63 |
diff --git a/releases/portage/isos/patches/genkernel-ppc64-iso.patch b/releases/portage/isos/patches/genkernel-ppc64-iso.patch |
| 64 |
deleted file mode 100644 |
| 65 |
index 61c85942..00000000 |
| 66 |
--- a/releases/portage/isos/patches/genkernel-ppc64-iso.patch |
| 67 |
+++ /dev/null |
| 68 |
@@ -1,47 +0,0 @@ |
| 69 |
-From 628e1a30b384a900cf7095cf86441fed7a0300dc Mon Sep 17 00:00:00 2001 |
| 70 |
-From: Georgy Yakovlev <gyakovlev@g.o> |
| 71 |
-Date: Fri, 14 May 2021 22:05:33 -0700 |
| 72 |
-Subject: [PATCH] defaults/initrd.scripts: don't skip top level devices with |
| 73 |
- partitions |
| 74 |
- |
| 75 |
-ppc64 media should be mounted as /dev/sdX, not as /dev/sdX1 |
| 76 |
-this loop was skipping /dev/sdX if /dev/sdX1 is present. |
| 77 |
- |
| 78 |
-Bug: https://bugs.gentoo.org/796272 |
| 79 |
-Signed-off-by: Georgy Yakovlev <gyakovlev@g.o> |
| 80 |
---- |
| 81 |
- defaults/initrd.scripts | 18 ------------------ |
| 82 |
- 1 file changed, 18 deletions(-) |
| 83 |
- |
| 84 |
-diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 85 |
-index 5ec8adb..bfc36cf 100644 |
| 86 |
---- a/defaults/initrd.scripts |
| 87 |
-+++ b/defaults/initrd.scripts |
| 88 |
-@@ -178,24 +178,6 @@ findmediamount() { |
| 89 |
- # Check for a block device to mount |
| 90 |
- if [ -b "${x}" ] |
| 91 |
- then |
| 92 |
-- skip=0 |
| 93 |
-- bsn=$(basename "${x}") |
| 94 |
-- # |
| 95 |
-- # If disk and it has at least one partition, skip. |
| 96 |
-- # We use /sys/block/${bsn}/${bsn}[0-9]* to make sure that we |
| 97 |
-- # don't skip device mapper devices. Even the craziest scenario |
| 98 |
-- # deserves a fair chance. |
| 99 |
-- # |
| 100 |
-- # shellcheck disable=SC2045 |
| 101 |
-- for part in $(ls /sys/block/${bsn}/${bsn}*[0-9]* 2>/dev/null) |
| 102 |
-- do |
| 103 |
-- skip=1 |
| 104 |
-- break; |
| 105 |
-- done |
| 106 |
-- if [ ${skip} -eq 1 ] |
| 107 |
-- then |
| 108 |
-- continue |
| 109 |
-- fi |
| 110 |
- good_msg "Attempting to mount media: ${x}" ${CRYPT_SILENT} |
| 111 |
- |
| 112 |
- CDROOT_TYPE=$(determine_fs "${x}" "${CDROOT_TYPE}") |
| 113 |
--- |
| 114 |
-2.31.1 |
| 115 |
- |
Archives