From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- sys-kernel/genkernel/Manifest | 6 +- .../files/genkernel-4.1.2-post-release-fixes.patch | 189 +++++++++++++ sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild | 305 +++++++++++++++++++++ sys-kernel/genkernel/genkernel-4.1.2.ebuild | 303 -------------------- sys-kernel/genkernel/genkernel-9999.ebuild | 2 +- 5 files changed, 499 insertions(+), 306 deletions(-) create mode 100644 sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch create mode 100644 sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild delete mode 100644 sys-kernel/genkernel/genkernel-4.1.2.ebuild (limited to 'sys-kernel/genkernel') diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest index a4b15070e722..d968e4f939b6 100644 --- a/sys-kernel/genkernel/Manifest +++ b/sys-kernel/genkernel/Manifest @@ -1,3 +1,4 @@ +AUX genkernel-4.1.2-post-release-fixes.patch 7326 BLAKE2B fef31b298c8e75dc74e3c883668185bd72578b5232b9dc19aecbc07488dec6ccc0e6d4fa9ba913dbe79945f6191baac3754c2a4074a06e3b5cd2b028cb011575 SHA512 f124cf7b30187b8b0444d1224d250712c00091ade7c357699667e4a3ce1b24f98431fa8ccf756081ffb5af1e649644400e922c057ff45a2f6d653af2860a6d44 AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f08dc282e46ec26bd22d9c54bcdc9b2bdcc6a96295de1ab96351d35b304eb176f5d177c221cd8d82180 SHA512 6a5709a410c5c07b7a343ecc141aa72de73d3b4acd0a69c05c61c801835a59dd17d9a528f6b68f12ac00ff4b6e5954b03237472501383aa390eb1365dd69c281 AUX genkernel.bash 2438 BLAKE2B 31f1eaa826ab12bba07a2dc45b3394e14ceba9bc98b3f0ce609ca48a9306f2aec507787d457abdee18f4a83ea868de787cc6f9bd085298c396ecab6da14df9c3 SHA512 2bfe23606f919577bb2d174ffe18cd00fbb4ce642fb8860b319e059745d46ff8459b99374159f78af9f3aebb0a352a74ccd74c3be581980f5e298293b96e983d AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665 @@ -12,6 +13,7 @@ DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a617 DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c +DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84 @@ -51,6 +53,6 @@ DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c2610 DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387 EBUILD genkernel-3.5.3.3.ebuild 4937 BLAKE2B 1aac344f671f5493855359059d3adfcaba9abe11018056fc8c226ffd69c69aa134fd9352e79adbfe5c3f756d0cfcc811c43974b4ca677c1a17db1dfb98f7f76e SHA512 5b797b3ab3fd7098c8a26e0275b956f85d2d6600ad4f02e0400cee7506846b425afd23ef8b98946999dd715b73d4df4d6196dd574b9563fcb38e03a675de9349 EBUILD genkernel-4.0.10.ebuild 9570 BLAKE2B b5f9eb160cc6e8945fd6506aafcc457037d1344b3631976f891bf0adcf2c56d36f7c6fe89c5d301c65fbab172c3ef71e0bb96b6e99a4ffec3552d3931a20dc95 SHA512 ef809005574e421fd1b3ea0c40e2bb2e0794d658399d94d4f6c5e854bbf2ba2b841b286e92fe12d979805d2f151881a3ca5332d0381037b46ff74bc9695e2a0b -EBUILD genkernel-4.1.2.ebuild 11042 BLAKE2B 76df5a698b3465cbe13c1afa0af599f5b2a72e8efb997a7ba5f5b0e5f051a3670e46bffd9b542ba681005ed3c1d10246ca6c5a1d8364208c0010d4b157e8226b SHA512 7e7a9ae5415e13a10f4224b4f058ce030b086eb70cbc083fd950c7e7e41293cadbb7297c8e1db1bb05f8147109a566f5da8a753dc84ebb440ed0fe991f7ddf62 -EBUILD genkernel-9999.ebuild 11051 BLAKE2B 8613fcc73ce294b38a9829d5d6185e05db6f1b3f4b6be0e49d2ad236da33b6cbf18ca213a111899387706e38239c12d304eb3caa01ae7dd654817bcca17bf7d1 SHA512 68a32e029b50d20db747b40583ef0a33bd2c24a962d94f4c6d363f4fedd22487acd0c779fbe30b8165c1551bda943ac9a477483e09f0d011af25ffe6d092aebd +EBUILD genkernel-4.1.2-r3.ebuild 11099 BLAKE2B e962d01fce990631be9a4246401897da9be9a91b767fb467228e87f69c73eee30518a03e60aa9414da0d98a02ba7a183f9c97f598ec0e393a9b0e4826fdd1380 SHA512 a1f082c0d5d88b6b404d831831c0ab4d7d27289c46674873d93dad652281f0254f63c553b36ae47c6ad0b6cc39db5e48ae6914054b43ffa73f34572a8c266638 +EBUILD genkernel-9999.ebuild 11051 BLAKE2B 5e1183e2337a002afdad154c7e853243c29f1cf00ee30d9afe577a259ff3abd63c55106177a0a31aeb3b24055d5321a4afa94c3ad355fcfae2ac0ae54f0b5467 SHA512 a5bf38d9c4d3de62b655c7718c4fd447f4dc7e7f78c1e5a4828293ef43f58a5959c3da166498bd4dc8901793ccf245d1245c86314e0cc57762276a48ebd461bd MISC metadata.xml 637 BLAKE2B 8498132ea1773f537d7f463fb420e9b7c80f24e6a8e3eefbb88bc942707d37d3c7a0e8a80cbbace2c8068411d06f8a1923efbc23e80e6fa87fa06766af1a6627 SHA512 10753c6db20c7e5d2c805d309aa69945f66d27287bbb240626baa2179263b5cf0e703c589f1951aecc2ed1e7e8259097434cc4e7f36d9dff8e1c6d8f50b684db 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 new file mode 100644 index 000000000000..ec72ab098661 --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch @@ -0,0 +1,189 @@ +--- 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/genkernel-4.1.2-r3.ebuild b/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild new file mode 100644 index 000000000000..1b136ff5852c --- /dev/null +++ b/sys-kernel/genkernel/genkernel-4.1.2-r3.ebuild @@ -0,0 +1,305 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# genkernel-9999 -> latest Git branch "master" +# genkernel-VERSION -> normal genkernel release + +EAPI="7" + +inherit bash-completion-r1 + +# Whenever you bump a GKPKG, check if you have to move +# or add new patches! +VERSION_BCACHE_TOOLS="1.0.8_p20141204" +VERSION_BOOST="1.73.0" +VERSION_BTRFS_PROGS="5.7" +VERSION_BUSYBOX="1.32.0" +VERSION_COREUTILS="8.32" +VERSION_CRYPTSETUP="2.3.4" +VERSION_DMRAID="1.0.0.rc16-3" +VERSION_DROPBEAR="2020.80" +VERSION_EUDEV="3.2.9" +VERSION_EXPAT="2.2.9" +VERSION_E2FSPROGS="1.45.6" +VERSION_FUSE="2.9.9" +VERSION_GPG="1.4.23" +VERSION_HWIDS="20200813.1" +VERSION_ISCSI="2.0.878" +VERSION_JSON_C="0.13.1" +VERSION_KMOD="27" +VERSION_LIBAIO="0.3.112" +VERSION_LIBGCRYPT="1.8.6" +VERSION_LIBGPGERROR="1.39" +VERSION_LVM="2.02.187" +VERSION_LZO="2.10" +VERSION_MDADM="4.1" +VERSION_POPT="1.18" +VERSION_STRACE="5.8" +VERSION_THIN_PROVISIONING_TOOLS="0.8.5" +VERSION_UNIONFS_FUSE="2.0" +VERSION_UTIL_LINUX="2.36" +VERSION_XFSPROGS="5.7.0" +VERSION_XZ="5.2.5" +VERSION_ZLIB="1.2.11" +VERSION_ZSTD="1.4.5" + +COMMON_URI=" + https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz + https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2 + https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz + https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2 + mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz + https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz + https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2 + https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-${VERSION_DROPBEAR}.tar.bz2 + https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz + https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz + https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz + https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz + mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2 + https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz + https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz + https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz + https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz + https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz + mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2 + mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2 + https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz + https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz + https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz + http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz + https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz + https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz + https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz + https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz + https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz + https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz + https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz + https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz +" + +if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" + inherit git-r3 + S="${WORKDIR}/${P}" + SRC_URI="${COMMON_URI}" +else + SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz + ${COMMON_URI}" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" +fi + +DESCRIPTION="Gentoo automatic kernel building scripts" +HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/" + +LICENSE="GPL-2" +SLOT="0" +RESTRICT="" +IUSE="ibm +firmware" + +# Note: +# We need sys-devel/* deps like autoconf or automake at _runtime_ +# because genkernel will usually build things like LVM2, cryptsetup, +# mdadm... during initramfs generation which will require these +# things. +DEPEND="" +RDEPEND="${DEPEND} + app-arch/cpio + >=app-misc/pax-utils-1.2.2 + app-portage/elt-patches + dev-util/gperf + sys-apps/sandbox + sys-devel/autoconf + sys-devel/autoconf-archive + sys-devel/automake + sys-devel/libtool + virtual/pkgconfig + firmware? ( sys-kernel/linux-firmware )" + +if [[ ${PV} == 9999* ]]; then + DEPEND="${DEPEND} app-text/asciidoc" +fi + +PATCHES=( "${FILESDIR}"/${P}-post-release-fixes.patch ) + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-r3_src_unpack + else + local gk_src_file + for gk_src_file in ${A} ; do + if [[ ${gk_src_file} == genkernel-* ]] ; then + unpack "${gk_src_file}" + fi + done + fi +} + +src_prepare() { + default + + if [[ ${PV} == 9999* ]] ; then + einfo "Updating version tag" + GK_V="$(git describe --tags | sed 's:^v::')-git" + sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel + einfo "Producing ChangeLog from Git history..." + pushd "${S}/.git" >/dev/null || die + git log > "${S}"/ChangeLog || die + popd >/dev/null || die + fi + + # Update software.sh + sed -i \ + -e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\ + -e "s:VERSION_BOOST:${VERSION_BOOST}:"\ + -e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\ + -e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\ + -e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\ + -e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\ + -e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\ + -e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\ + -e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\ + -e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\ + -e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\ + -e "s:VERSION_FUSE:${VERSION_FUSE}:"\ + -e "s:VERSION_GPG:${VERSION_GPG}:"\ + -e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\ + -e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\ + -e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\ + -e "s:VERSION_KMOD:${VERSION_KMOD}:"\ + -e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\ + -e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\ + -e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\ + -e "s:VERSION_LVM:${VERSION_LVM}:"\ + -e "s:VERSION_LZO:${VERSION_LZO}:"\ + -e "s:VERSION_MDADM:${VERSION_MDADM}:"\ + -e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\ + -e "s:VERSION_POPT:${VERSION_POPT}:"\ + -e "s:VERSION_STRACE:${VERSION_STRACE}:"\ + -e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\ + -e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\ + -e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\ + -e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\ + -e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\ + -e "s:VERSION_XZ:${VERSION_XZ}:"\ + -e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\ + -e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\ + "${S}"/defaults/software.sh \ + || die "Could not adjust versions" +} + +src_compile() { + if [[ ${PV} == 9999* ]] ; then + emake + fi +} + +src_install() { + insinto /etc + doins "${S}"/genkernel.conf + + doman genkernel.8 + dodoc AUTHORS ChangeLog README TODO + dobin genkernel + rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf + + if use ibm ; then + cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die + else + cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die + fi + + insinto /usr/share/genkernel + doins -r "${S}"/* + + fperms +x /usr/share/genkernel/gen_worker.sh + + newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}" + insinto /etc + doins "${FILESDIR}"/initramfs.mounts + + pushd "${DISTDIR}" &>/dev/null || die + insinto /usr/share/genkernel/distfiles + doins ${A/${P}.tar.xz/} + popd &>/dev/null || die +} + +pkg_postinst() { + # Wiki is out of date + #echo + #elog 'Documentation is available in the genkernel manual page' + #elog 'as well as the following URL:' + #echo + #elog 'https://wiki.gentoo.org/wiki/Genkernel' + #echo + + local replacing_version + for replacing_version in ${REPLACING_VERSIONS} ; do + if ver_test "${replacing_version}" -lt 4 ; then + # This is an upgrade which requires user review + + ewarn "" + ewarn "Genkernel v4.x is a new major release which touches" + ewarn "nearly everything. Be careful, read updated manpage" + ewarn "and pay special attention to program output regarding" + ewarn "changed kernel command-line parameters!" + + # Show this elog only once + break + fi + done + + if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then + ewarn '' + ewarn 'Default kernel filename was changed from "kernel-genkernel--"' + ewarn 'to "vmlinuz-". Please be aware that due to lexical ordering the' + ewarn '*default* boot entry in your boot manager could still point to last kernel' + ewarn 'built with genkernel before that name change, resulting in booting old' + ewarn 'kernel when not paying attention on boot.' + fi + + # Show special warning for users depending on remote unlock capabilities + local gk_config="${EROOT}/etc/genkernel.conf" + if [[ -f "${gk_config}" ]] ; then + if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then + if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then + ewarn "" + ewarn "IMPORTANT: SSH is currently enabled in your genkernel config" + ewarn "file (${gk_config}). However, 'dosshd' is missing from current" + ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled" + ewarn "in genkernel v4+ initramfs!" + fi + fi + + if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then + elog "" + elog "Please remove 'emerge @module-rebuild' from genkernel config" + elog "file (${gk_config}) and make use of new MODULEREBUILD option" + elog "instead." + fi + fi + + local n_root_args=$(grep -o -- '\/dev/null | wc -l) + if [[ ${n_root_args} > 1 ]] ; then + ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!" + ewarn "If you are appending non-persistent device names to kernel command-line," + ewarn "next reboot could fail in case running system and initramfs do not agree" + ewarn "on detected root device name!" + fi + + if [[ -d /run ]] ; then + local permission_run_expected="drwxr-xr-x" + local permission_run=$(stat -c "%A" /run) + if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then + ewarn "Found the following problematic permissions:" + ewarn "" + ewarn " ${permission_run} /run" + ewarn "" + ewarn "Expected:" + ewarn "" + ewarn " ${permission_run_expected} /run" + ewarn "" + ewarn "This is known to be causing problems for any UDEV-enabled service." + fi + fi +} diff --git a/sys-kernel/genkernel/genkernel-4.1.2.ebuild b/sys-kernel/genkernel/genkernel-4.1.2.ebuild deleted file mode 100644 index c48043e79949..000000000000 --- a/sys-kernel/genkernel/genkernel-4.1.2.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# genkernel-9999 -> latest Git branch "master" -# genkernel-VERSION -> normal genkernel release - -EAPI="7" - -inherit bash-completion-r1 - -# Whenever you bump a GKPKG, check if you have to move -# or add new patches! -VERSION_BCACHE_TOOLS="1.0.8_p20141204" -VERSION_BOOST="1.73.0" -VERSION_BTRFS_PROGS="5.7" -VERSION_BUSYBOX="1.32.0" -VERSION_COREUTILS="8.32" -VERSION_CRYPTSETUP="2.3.3" -VERSION_DMRAID="1.0.0.rc16-3" -VERSION_DROPBEAR="2020.80" -VERSION_EUDEV="3.2.9" -VERSION_EXPAT="2.2.9" -VERSION_E2FSPROGS="1.45.6" -VERSION_FUSE="2.9.9" -VERSION_GPG="1.4.23" -VERSION_HWIDS="20200813.1" -VERSION_ISCSI="2.0.878" -VERSION_JSON_C="0.13.1" -VERSION_KMOD="27" -VERSION_LIBAIO="0.3.112" -VERSION_LIBGCRYPT="1.8.6" -VERSION_LIBGPGERROR="1.39" -VERSION_LVM="2.02.187" -VERSION_LZO="2.10" -VERSION_MDADM="4.1" -VERSION_POPT="1.18" -VERSION_STRACE="5.8" -VERSION_THIN_PROVISIONING_TOOLS="0.8.5" -VERSION_UNIONFS_FUSE="2.0" -VERSION_UTIL_LINUX="2.36" -VERSION_XFSPROGS="5.7.0" -VERSION_XZ="5.2.5" -VERSION_ZLIB="1.2.11" -VERSION_ZSTD="1.4.5" - -COMMON_URI=" - https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz - https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2 - https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz - https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2 - mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz - https://www.kernel.org/pub/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz - https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2 - https://dev.gentoo.org/~whissi/dist/dropbear/dropbear-${VERSION_DROPBEAR}.tar.bz2 - https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz - https://github.com/libexpat/libexpat/releases/download/R_${VERSION_EXPAT//\./_}/expat-${VERSION_EXPAT}.tar.xz - https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz - https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz - mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2 - https://github.com/gentoo/hwids/archive/hwids-${VERSION_HWIDS}.tar.gz - https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz - https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz - https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-${VERSION_KMOD}.tar.xz - https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz - mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2 - mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2 - https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz - https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz - https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz - http://ftp.rpm.org/popt/releases/popt-1.x/popt-${VERSION_POPT}.tar.gz - https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz - https://github.com/jthornber/thin-provisioning-tools/archive/v${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz -> thin-provisioning-tools-${VERSION_THIN_PROVISIONING_TOOLS}.tar.gz - https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz - https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz - https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz - https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz - https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz - https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz -" - -if [[ ${PV} == 9999* ]] ; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" - inherit git-r3 - S="${WORKDIR}/${P}" - SRC_URI="${COMMON_URI}" -else - SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz - ${COMMON_URI}" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" -fi - -DESCRIPTION="Gentoo automatic kernel building scripts" -HOMEPAGE="https://wiki.gentoo.org/wiki/Genkernel https://gitweb.gentoo.org/proj/genkernel.git/" - -LICENSE="GPL-2" -SLOT="0" -RESTRICT="" -IUSE="ibm +firmware" - -# Note: -# We need sys-devel/* deps like autoconf or automake at _runtime_ -# because genkernel will usually build things like LVM2, cryptsetup, -# mdadm... during initramfs generation which will require these -# things. -DEPEND="" -RDEPEND="${DEPEND} - app-arch/cpio - >=app-misc/pax-utils-1.2.2 - app-portage/elt-patches - dev-util/gperf - sys-apps/sandbox - sys-devel/autoconf - sys-devel/autoconf-archive - sys-devel/automake - sys-devel/libtool - virtual/pkgconfig - firmware? ( sys-kernel/linux-firmware )" - -if [[ ${PV} == 9999* ]]; then - DEPEND="${DEPEND} app-text/asciidoc" -fi - -src_unpack() { - if [[ ${PV} == 9999* ]]; then - git-r3_src_unpack - else - local gk_src_file - for gk_src_file in ${A} ; do - if [[ ${gk_src_file} == genkernel-* ]] ; then - unpack "${gk_src_file}" - fi - done - fi -} - -src_prepare() { - default - - if [[ ${PV} == 9999* ]] ; then - einfo "Updating version tag" - GK_V="$(git describe --tags | sed 's:^v::')-git" - sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel - einfo "Producing ChangeLog from Git history..." - pushd "${S}/.git" >/dev/null || die - git log > "${S}"/ChangeLog || die - popd >/dev/null || die - fi - - # Update software.sh - sed -i \ - -e "s:VERSION_BCACHE_TOOLS:${VERSION_BCACHE_TOOLS}:"\ - -e "s:VERSION_BOOST:${VERSION_BOOST}:"\ - -e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\ - -e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\ - -e "s:VERSION_COREUTILS:${VERSION_COREUTILS}:"\ - -e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\ - -e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\ - -e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\ - -e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\ - -e "s:VERSION_EXPAT:${VERSION_EXPAT}:"\ - -e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\ - -e "s:VERSION_FUSE:${VERSION_FUSE}:"\ - -e "s:VERSION_GPG:${VERSION_GPG}:"\ - -e "s:VERSION_HWIDS:${VERSION_HWIDS}:"\ - -e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\ - -e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\ - -e "s:VERSION_KMOD:${VERSION_KMOD}:"\ - -e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\ - -e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\ - -e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\ - -e "s:VERSION_LVM:${VERSION_LVM}:"\ - -e "s:VERSION_LZO:${VERSION_LZO}:"\ - -e "s:VERSION_MDADM:${VERSION_MDADM}:"\ - -e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\ - -e "s:VERSION_POPT:${VERSION_POPT}:"\ - -e "s:VERSION_STRACE:${VERSION_STRACE}:"\ - -e "s:VERSION_THIN_PROVISIONING_TOOLS:${VERSION_THIN_PROVISIONING_TOOLS}:"\ - -e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\ - -e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\ - -e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\ - -e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\ - -e "s:VERSION_XZ:${VERSION_XZ}:"\ - -e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\ - -e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\ - "${S}"/defaults/software.sh \ - || die "Could not adjust versions" -} - -src_compile() { - if [[ ${PV} == 9999* ]] ; then - emake - fi -} - -src_install() { - insinto /etc - doins "${S}"/genkernel.conf - - doman genkernel.8 - dodoc AUTHORS ChangeLog README TODO - dobin genkernel - rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf - - if use ibm ; then - cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die - else - cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die - fi - - insinto /usr/share/genkernel - doins -r "${S}"/* - - fperms +x /usr/share/genkernel/gen_worker.sh - - newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}" - insinto /etc - doins "${FILESDIR}"/initramfs.mounts - - pushd "${DISTDIR}" &>/dev/null || die - insinto /usr/share/genkernel/distfiles - doins ${A/${P}.tar.xz/} - popd &>/dev/null || die -} - -pkg_postinst() { - # Wiki is out of date - #echo - #elog 'Documentation is available in the genkernel manual page' - #elog 'as well as the following URL:' - #echo - #elog 'https://wiki.gentoo.org/wiki/Genkernel' - #echo - - local replacing_version - for replacing_version in ${REPLACING_VERSIONS} ; do - if ver_test "${replacing_version}" -lt 4 ; then - # This is an upgrade which requires user review - - ewarn "" - ewarn "Genkernel v4.x is a new major release which touches" - ewarn "nearly everything. Be careful, read updated manpage" - ewarn "and pay special attention to program output regarding" - ewarn "changed kernel command-line parameters!" - - # Show this elog only once - break - fi - done - - if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 0 ]] ; then - ewarn '' - ewarn 'Default kernel filename was changed from "kernel-genkernel--"' - ewarn 'to "vmlinuz-". Please be aware that due to lexical ordering the' - ewarn '*default* boot entry in your boot manager could still point to last kernel' - ewarn 'built with genkernel before that name change, resulting in booting old' - ewarn 'kernel when not paying attention on boot.' - fi - - # Show special warning for users depending on remote unlock capabilities - local gk_config="${EROOT}/etc/genkernel.conf" - if [[ -f "${gk_config}" ]] ; then - if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then - if ! grep -q dosshd /proc/cmdline 2>/dev/null ; then - ewarn "" - ewarn "IMPORTANT: SSH is currently enabled in your genkernel config" - ewarn "file (${gk_config}). However, 'dosshd' is missing from current" - ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled" - ewarn "in genkernel v4+ initramfs!" - fi - fi - - if grep -q -E "^CMD_CALLBACK=.*emerge.*@module-rebuild" "${gk_config}" 2>/dev/null ; then - elog "" - elog "Please remove 'emerge @module-rebuild' from genkernel config" - elog "file (${gk_config}) and make use of new MODULEREBUILD option" - elog "instead." - fi - fi - - local n_root_args=$(grep -o -- '\/dev/null | wc -l) - if [[ ${n_root_args} > 1 ]] ; then - ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!" - ewarn "If you are appending non-persistent device names to kernel command-line," - ewarn "next reboot could fail in case running system and initramfs do not agree" - ewarn "on detected root device name!" - fi - - if [[ -d /run ]] ; then - local permission_run_expected="drwxr-xr-x" - local permission_run=$(stat -c "%A" /run) - if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then - ewarn "Found the following problematic permissions:" - ewarn "" - ewarn " ${permission_run} /run" - ewarn "" - ewarn "Expected:" - ewarn "" - ewarn " ${permission_run_expected} /run" - ewarn "" - ewarn "This is known to be causing problems for any UDEV-enabled service." - fi - fi -} diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index bea998c6e19d..f08e70500a57 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -15,7 +15,7 @@ VERSION_BOOST="1.73.0" VERSION_BTRFS_PROGS="5.7" VERSION_BUSYBOX="1.32.0" VERSION_COREUTILS="8.32" -VERSION_CRYPTSETUP="2.3.3" +VERSION_CRYPTSETUP="2.3.4" VERSION_DMRAID="1.0.0.rc16-3" VERSION_DROPBEAR="2020.80" VERSION_EUDEV="3.2.9" -- cgit v1.2.3