commit: 984274fe58862939780d17e7f61ace8e9609780b Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Jul 25 09:33:25 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Jul 25 21:32:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984274fe
sys-kernel/genkernel: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/21781 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/genkernel-4.1.2-post-release-fixes.patch | 189 --------------------- .../files/genkernel-4.2.1-post-release-fixes.patch | 29 ---- sys-kernel/genkernel/files/genkernel.bash | 73 -------- 3 files changed, 291 deletions(-) diff --git a/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch b/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch deleted file mode 100644 index ec72ab09866..00000000000 --- a/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch +++ /dev/null @@ -1,189 +0,0 @@ ---- a/defaults/initrd.defaults -+++ b/defaults/initrd.defaults -@@ -101,9 +101,11 @@ GK_UDEV_TIMEOUT=120 - GK_USERINTERACTION_DISABLED_STATEFILE='/tmp/user-interaction.disabled' - - CRYPT_ENV_FILE='/etc/CRYPT_ENV.conf' --CRYPT_KEYFILE_ROOT='/tmp/root.key' --CRYPT_KEYFILE_SWAP='/tmp/swap.key' -+CRYPT_ROOT_KEYDEV_FSTYPE='auto' -+CRYPT_ROOT_KEYFILE='/tmp/root.key' - CRYPT_ROOT_OPENED_LOCKFILE='/tmp/ROOT.opened' -+CRYPT_SWAP_KEYDEV_FSTYPE='auto' -+CRYPT_SWAP_KEYFILE='/tmp/swap.key' - CRYPT_SWAP_OPENED_LOCKFILE='/tmp/SWAP.opened' - - ZFS_ENC_ENV_FILE='/etc/ZFS_ENC_ENV.conf' ---- a/defaults/initrd.scripts -+++ b/defaults/initrd.scripts -@@ -1780,7 +1780,7 @@ openLUKS() { - exit 1 - fi - -- case $1 in -+ case ${1} in - root) - local TYPE=ROOT - ;; -@@ -1789,8 +1789,12 @@ openLUKS() { - ;; - esac - -- eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$1" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' -- eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' -+ local LUKS_NAME="${1}" -+ eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' -+ eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' -+ eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' -+ eval local LUKS_KEYDEV_FSTYPE='"${CRYPT_'${TYPE}'_KEYDEV_FSTYPE}"' -+ eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' - eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"' - local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0 - local mntkey="/mnt/key/" crypt_filter_ret= -@@ -1886,7 +1890,10 @@ openLUKS() { - # At this point a device was recognized, now let's see if the key is there - [ ! -d "${mntkey}" ] && mkdir -p "${mntkey}" >/dev/null 2>&1 - -- if ! run mount -n -o ro ${REAL_LUKS_KEYDEV} ${mntkey} >/dev/null 2>&1 -+ # determine fs -- 'auto' will not trigger module loading! -+ LUKS_KEYDEV_FSTYPE=$(determine_fs "${REAL_LUKS_KEYDEV}" "${LUKS_KEYDEV_FSTYPE}") -+ -+ if ! run mount -n -t ${LUKS_KEYDEV_FSTYPE} -o ro ${REAL_LUKS_KEYDEV} ${mntkey} >/dev/null 2>&1 - then - KEYDEV_ERROR=1 - bad_msg "Mounting of device ${REAL_LUKS_KEYDEV} failed." ${CRYPT_SILENT} ---- a/defaults/linuxrc -+++ b/defaults/linuxrc -@@ -2,7 +2,7 @@ - - # shellcheck source=initrd.defaults - . /etc/initrd.defaults --# shellche2ck source=initrd.scripts -+# shellcheck source=initrd.scripts - . /etc/initrd.scripts - - # shellcheck source=/dev/null -@@ -257,6 +257,9 @@ do - root_keydev=*) - CRYPT_ROOT_KEYDEV=${x#*=} - ;; -+ root_keydev_fstype=*) -+ CRYPT_ROOT_KEYDEV_FSTYPE=${x#*=} -+ ;; - root_trim=*) - CRYPT_ROOT_TRIM=${x#*=} - ;; -@@ -266,6 +269,9 @@ do - swap_keydev=*) - CRYPT_SWAP_KEYDEV=${x#*=} - ;; -+ swap_keydev_fstype=*) -+ CRYPT_SWAP_KEYDEV_FSTYPE=${x#*=} -+ ;; - real_resume=*|resume=*) - REAL_RESUME=${x#*=} - ;; ---- a/defaults/login-remote.sh -+++ b/defaults/login-remote.sh -@@ -24,10 +24,10 @@ fi - receivefile() { - case ${1} in - root) -- file=${CRYPT_KEYFILE_ROOT} -+ file=${CRYPT_ROOT_KEYFILE} - ;; - swap) -- file=${CRYPT_KEYFILE_SWAP} -+ file=${CRYPT_SWAP_KEYFILE} - ;; - '') - bad_msg "No keyfile specified." "${CRYPT_SILENT}" ---- a/defaults/unlock-luks.sh -+++ b/defaults/unlock-luks.sh -@@ -43,8 +43,11 @@ main() { - exit 1 - fi - -- eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="${NAME}" LUKS_KEY='"${CRYPT_KEYFILE_'${TYPE}'}"' -- eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"' -+ local LUKS_NAME="${NAME}" -+ eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' -+ eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEYFILE}"' -+ eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' -+ eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"' - - while true - do ---- a/doc/genkernel.8.txt -+++ b/doc/genkernel.8.txt -@@ -646,6 +646,9 @@ recognized by the kernel itself. - root_key. If unset while using root_key, it will automatically - look for the device in every boot. - -+*root_keydev_fstype*=<...>:: -+ Used filesystem for *root_keydev*. See *rootfstype* for more details. -+ - *root_trim*=(yes|no):: - Enables TRIM support for a LUKS-based root device. Only useful - with SSD setups. Have a look at 'https://en.wikipedia.org/wiki/TRIM' -@@ -657,6 +660,9 @@ recognized by the kernel itself. - *swap_keydev*=<...>:: - Same as root_keydev for swap. - -+*swap_keydev_fstype*=<...>:: -+ Used filesystem for *swap_keydev*. See *rootfstype* for more details. -+ - *crypt_silent*:: - Set this to silent all the output related to the cryptographic - software, and in case your encrypted device isn't open with the -@@ -790,7 +796,8 @@ when not set. This will allow remote user to provide answer through - *rootfstype*=<...>:: - Specify the file system type to mount the real root filesystem as. - This can be useful when support for ext2/ext3/ext4 are -- in competition. Default is "auto". -+ in competition or used filesystem was not built into kernel. -+ Default is "auto". - - *docache*:: - *nocache*:: ---- a/gen_determineargs.sh -+++ b/gen_determineargs.sh -@@ -415,7 +415,6 @@ determine_real_args() { - set_config_with_override BOOL GENZIMAGE CMD_GENZIMAGE "no" - set_config_with_override BOOL KEYMAP CMD_KEYMAP "yes" - set_config_with_override BOOL DOKEYMAPAUTO CMD_DOKEYMAPAUTO "no" -- set_config_with_override STRING BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG - set_config_with_override STRING STRIP_TYPE CMD_STRIP_TYPE "modules" - set_config_with_override BOOL INSTALL CMD_INSTALL "yes" - set_config_with_override BOOL CLEANUP CMD_CLEANUP "yes" ---- a/gen_funcs.sh -+++ b/gen_funcs.sh -@@ -1853,7 +1853,7 @@ check_disk_space_requirements() { - gen_die "--check-free-disk-space-bootdir value '${CHECK_FREE_DISK_SPACE_BOOTDIR}' is not a valid number!" - fi - -- available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }') -+ available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${BOOTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }') - if [ -n "${available_free_disk_space}" ] - then - print_info 2 '' 1 0 -@@ -1890,7 +1890,7 @@ check_disk_space_requirements() { - gen_die "--check-free-disk-space-kerneloutputdir value '${CHECK_FREE_DISK_SPACE_KERNELOUTPUTDIR}' is not a valid number!" - fi - -- available_free_disk_space=$(unset POSIXLY_CORRECT && df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }') -+ available_free_disk_space=$(unset POSIXLY_CORRECT && LC_ALL="C" df -BM "${KERNEL_OUTPUTDIR}" | awk '$3 ~ /[0-9]+/ { print $4 }') - if [ -n "${available_free_disk_space}" ] - then - print_info 2 '' 1 0 ---- a/genkernel.conf -+++ b/genkernel.conf -@@ -378,7 +378,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux" - # Compress generated initramfs - #COMPRESS_INITRD="yes" - --# Types of compression: best, xz, lzma, bzip2, gzip, lzop, fastest -+# Types of compression: best, xz, lzma, bzip2, gzip, lzop, lz4, zstd, fastest - # "best" selects the best available compression method - # "fastest" selects the fastest available compression method - #COMPRESS_INITRD_TYPE="best" diff --git a/sys-kernel/genkernel/files/genkernel-4.2.1-post-release-fixes.patch b/sys-kernel/genkernel/files/genkernel-4.2.1-post-release-fixes.patch deleted file mode 100644 index f04dbc8c951..00000000000 --- a/sys-kernel/genkernel/files/genkernel-4.2.1-post-release-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cdaef312247a3ed18c9fdcea084058e5f25a7f3e Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann <[email protected]> -Date: Sat, 27 Mar 2021 17:07:21 +0100 -Subject: defaults/modules_load: Add support for Lenovo / Thinkpad devices - -Support for IBM/Lenovo devices that are not fully compliant with HID standard. - -Reported-by: Patrick Lauer <[email protected]> -Signed-off-by: Thomas Deutschmann <[email protected]> ---- - defaults/modules_load | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/defaults/modules_load b/defaults/modules_load -index 1cc1478..cee5f4d 100644 ---- a/defaults/modules_load -+++ b/defaults/modules_load -@@ -24,7 +24,7 @@ MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp" - # Hardware (Pluggable) - MODULES_FIREWIRE="ieee1394 ohci1394 sbp2" - MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds ide-cs firmware_class" --MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci usb-ohci hid usb-storage uas uhci-hcd ohci-hcd usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus" -+MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci usb-ohci hid usb-storage uas uhci-hcd ohci-hcd usbhid hid-generic sl811-hcd hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey hid-gyration hid-lenovo hid-logitech hid-logitech-dj hid-microsoft hid-monterey hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus" - - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse virtiofs loop squashfs aufs overlay cramfs configfs fscrypto msdos" --- -cgit v1.2.3 - diff --git a/sys-kernel/genkernel/files/genkernel.bash b/sys-kernel/genkernel/files/genkernel.bash deleted file mode 100644 index ed6b1c16604..00000000000 --- a/sys-kernel/genkernel/files/genkernel.bash +++ /dev/null @@ -1,73 +0,0 @@ -# genkernel (8) completion -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# Written by Aron Griffis <[email protected]> - -_genkernel() -{ - declare cur prev genkernel_help actions params - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - prev=${COMP_WORDS[COMP_CWORD-1]} - - # extract initial list of params/actions from genkernel --help - genkernel_help=$(command genkernel --help) - actions=( $(<<<"$genkernel_help" sed -n \ - '/^Available Actions:/,/^$/s/^[[:space:]]\+\([^[:space:]]\+\).*/\1/p') ) - params=( $(<<<"$genkernel_help" egrep -oe '--[^[:space:]]{2,}') ) - - # attempt to complete the current parameter based on the list - COMPREPLY=($(compgen -W "${params[*]/=*/=} ${actions[*]}" -- "$cur")) - - # if we don't have a rhs to complete - if [[ ${#COMPREPLY[@]} -gt 1 ]]; then - return - elif [[ ${#COMPREPLY[@]} -eq 0 && $cur != --*=* ]]; then - return - elif [[ ${#COMPREPLY[@]} -eq 1 && $COMPREPLY != --*= ]]; then - # using nospace completion, add an explicit space - COMPREPLY="${COMPREPLY} " - return - fi - - # we have a unique lhs and need to complete the rhs - declare args lhs rhs - if [[ ${#COMPREPLY[@]} -eq 1 ]]; then - lhs=$COMPREPLY - else - lhs=${cur%%=*}= - rhs=${cur#*=} - fi - - # genkernel's help gives clues as to what belongs on the rhs. - # extract the clue for the current parameter - args=" ${params[*]} " - args="${args##* $lhs}" - args="${args%% *}" - - # generate a list of completions for the argument; this replaces args with - # an array of results - args=( $(case $args in - ('<0-5>') compgen -W "$(echo {1..5})" -- "$rhs" ;; - ('<outfile>'|'<file>') compgen -A file -o plusdirs -- "$rhs" ;; - ('<dir>') compgen -A directory -S / -- "$rhs" ;; - ('<tbz2>') compgen -G '*.tbz2' -G '*.tar.bz2' -o plusdirs -- "$rhs" ;; - (*) compgen -o bashdefault -- "$rhs" ;; # punt - esac) ) - - # we're using nospace completion to prevent spaces after paths that aren't - # "done" yet. So do some hacking to the args to add spaces after - # non-directories. - declare slash=/ - args=( "${args[@]/%/ }" ) # add space to all - args=( "${args[@]/%$slash /$slash}" ) # remove space from dirs - - # recreate COMPREPLY - if [[ $cur == "$lhs"* ]]; then - COMPREPLY=( "${args[@]}" ) - elif [[ ${#args[@]} -gt 0 ]]; then - COMPREPLY=( "${args[@]/#/$lhs}" ) - fi -} - -complete -o nospace -F _genkernel genkernel
