diff options
Diffstat (limited to 'sys-kernel/genkernel/files')
4 files changed, 26 insertions, 185 deletions
diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch deleted file mode 100644 index 48dada2f980d..000000000000 --- a/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch +++ /dev/null @@ -1,130 +0,0 @@ -modules_load: add crc32c - -commit 7308d72c3280da22cd94337b0eb248cdc53cb842 upstream. - -Bug: https://bugs.gentoo.org/655110 - ---- a/arch/alpha/modules_load -+++ b/arch/alpha/modules_load -@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/arm/modules_load -+++ b/arch/arm/modules_load -@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/ia64/modules_load -+++ b/arch/ia64/modules_load -@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" -+ -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/mips/modules_load -+++ b/arch/mips/modules_load -@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/parisc/modules_load -+++ b/arch/parisc/modules_load -@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/parisc64/modules_load -+++ b/arch/parisc64/modules_load -@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" -+ -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/ppc/modules_load -+++ b/arch/ppc/modules_load -@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/ppc64/modules_load -+++ b/arch/ppc64/modules_load -@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" -+ -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/s390/modules_load -+++ b/arch/s390/modules_load -@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/sparc/modules_load -+++ b/arch/sparc/modules_load -@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/sparc64/modules_load -+++ b/arch/sparc64/modules_load -@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" -+ -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/um/modules_load -+++ b/arch/um/modules_load -@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - # Filesystems - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - -+# Crypto -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" ---- a/arch/x86/modules_load -+++ b/arch/x86/modules_load -@@ -29,4 +29,4 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - - # Crypto --MODULES_CRYPTO="sha256_generic cbc aes_generic aes_586 aesni-intel xts" -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic aes_586 aesni-intel xts" ---- a/arch/x86_64/modules_load -+++ b/arch/x86_64/modules_load -@@ -28,4 +28,4 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - - # Crypto --MODULES_CRYPTO="sha256_generic cbc aes_generic aes-x86_64 aesni-intel xts" -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic aes-x86_64 aesni-intel xts" ---- a/defaults/modules_load -+++ b/defaults/modules_load -@@ -28,4 +28,4 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd xhci-hcd x - MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" - - # Crypto --MODULES_CRYPTO="sha256_generic cbc aes_generic xts" -+MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts" diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch deleted file mode 100644 index 9e55301228a0..000000000000 --- a/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/gen_bootloader.sh b/gen_bootloader.sh -index 4bbd303..fdca749 100755 ---- a/gen_bootloader.sh -+++ b/gen_bootloader.sh -@@ -49,8 +49,10 @@ set_bootloader_grub2() { - fi - - print_info 1 "You can customize Grub2 parameters in /etc/default/grub." -- print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..." -- grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || gen_die "grub2-mkconfig failed" -+ print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..." -+ grub-mkconfig -o "${GRUB_CONF}" 2> /dev/null || -+ grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || -+ gen_die "grub-mkconfig failed" - [ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' "${GRUB_CONF}" - } - diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch b/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch deleted file mode 100644 index 1a85c4985998..000000000000 --- a/sys-kernel/genkernel/files/genkernel-3.4.52.4-system-map.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4fb8318037a8ea12f54b7c711d702b432113f233 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 27 Mar 2016 02:04:41 -0400 -Subject: [PATCH] adjust System.map die check for #570822 - -Builds with newer genkernel have been failing in catalyst like so: -* ERROR: Could not copy System.map from kerncache for the kernel package! - -The code that added it seems to have been meant to check the minkernpackage/ -subdir where the file was renamed instead of the current subdir. Change the -check to simplify verify the mv didn't fail instead of duplicating the file -name entirely. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - gen_package.sh | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/gen_package.sh b/gen_package.sh -index 9dd166b..b08ff03 100755 ---- a/gen_package.sh -+++ b/gen_package.sh -@@ -45,11 +45,8 @@ gen_minkernpackage() { - if [ "${KERNCACHE}" != "" ] - then - /bin/tar -xj -C ${TEMP}/minkernpackage -f ${KERNCACHE} System.map-${ARCH}-${KV} -- mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} -- if [ ! -f System.map-${KNAME}-${ARCH}-${KV} ] -- then -+ mv minkernpackage/{System.map-${ARCH}-${KV},System.map-${KNAME}-${ARCH}-${KV}} || - gen_die 'Could not copy System.map from kerncache for the kernel package!' -- fi - else - cp "${KERNEL_OUTPUTDIR}/System.map" "${TEMP}/minkernpackage/System.map-${KNAME}-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!'; - fi --- -2.7.4 - diff --git a/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch b/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch new file mode 100644 index 000000000000..be7bcf169ce5 --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch @@ -0,0 +1,26 @@ +commit 2948a542da6964a4f61a71fd5253c97f803eac34 +Author: Thomas Deutschmann <whissi@gentoo.org> +AuthorDate: Sun Apr 12 01:12:38 2020 +0200 +Commit: Thomas Deutschmann <whissi@gentoo.org> +CommitDate: Sun Apr 12 01:12:38 2020 +0200 + + gen_determineargs.sh: determine_real_args(): Quote $SANDBOX_ON + + $SANDBOX_ON can be unset causing 'unary operator expected' error. + + Fixes c0e013c ("gen_determineargs.sh: determine_real_args(): Error out early when already running within a sandbox") + Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> + +diff --git a/gen_determineargs.sh b/gen_determineargs.sh +index 95ec4021..b1c038d3 100755 +--- a/gen_determineargs.sh ++++ b/gen_determineargs.sh +@@ -1012,7 +1012,7 @@ determine_real_args() { + SANDBOX_COMMAND= + if isTrue "${SANDBOX}" + then +- if [ ${SANDBOX_ON} -eq 1 ] ++ if [[ "${SANDBOX_ON}" == "1" ]] + then + gen_die "SANDBOX_ON=1 detected -- You cannot use --sandbox when already running within a sandbox!" + fi |