From 96cc0713998c294a9440f03dfa8c4adc9cb71f92 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Jul 2023 10:30:48 +0100 Subject: gentoo auto-resync : 26:07:2023 - 10:30:48 --- sys-kernel/Manifest.gz | Bin 4419 -> 4413 bytes sys-kernel/genkernel/Manifest | 5 +- ...genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch | 24 ++ sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild | 323 +++++++++++++++++++++ sys-kernel/genkernel/genkernel-9999.ebuild | 2 +- 5 files changed, 352 insertions(+), 2 deletions(-) create mode 100644 sys-kernel/genkernel/files/genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch create mode 100644 sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz index 26cf12268abb..c314de106e8a 100644 Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest index 1f70e23dd23a..f3ba5a2bb4d4 100644 --- a/sys-kernel/genkernel/Manifest +++ b/sys-kernel/genkernel/Manifest @@ -1,4 +1,5 @@ AUX genkernel-4.3.2-no-color-on-qlist.patch 1119 BLAKE2B 3f8e65bd19d0e4e5c92b7bb8ace0408facfbc7b64849343c7c58e23c2c8a4f5a5fab9f4d34dcd6e643085c8b8989bebf2e2f17c237e96cf00f114f49ab241e66 SHA512 39173c4d87d54b54dc3cf50ab4b4b9247c26e513e6a669b1275975b0ee0238827d3ef55ffbe7ce69a0853a131b4eacae38f745fa5dc55c0b0eba07a8a0f08a0f +AUX genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch 751 BLAKE2B 24bda2e177c4dbc5f9ef9ae13951fcd416d1f764e15eb9d4b67a0e84b7dc7267e1e4c362c1a851721d1716e6d87dd17bf0557dbf3ce41fc6beb1ee4025d54774 SHA512 4413a3e3014a9bfb1f661941d82a42482264b3c1a4007f3086aeacada38bff10abcab49ea1e656b662c0b720528a29cd24e450b70069ae218e76c1e352ade3b1 AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f08dc282e46ec26bd22d9c54bcdc9b2bdcc6a96295de1ab96351d35b304eb176f5d177c221cd8d82180 SHA512 6a5709a410c5c07b7a343ecc141aa72de73d3b4acd0a69c05c61c801835a59dd17d9a528f6b68f12ac00ff4b6e5954b03237472501383aa390eb1365dd69c281 AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca @@ -8,6 +9,7 @@ DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c279 DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada SHA512 17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7 +DIST cryptsetup-2.6.1.tar.xz 11402380 BLAKE2B efd7a64d89d863876de68ff3e89d8c94ad5eca6a8d2236c52c234fbe51e9d9ee303a0c7fe7dac7df10e0062003b9c0aeddc8dc342582106c157ab2d1e742155e SHA512 0cbddbf33cbac2b834ed7e2dd47a9fc787131031a1c729f373f5c974600a838097e9cc0555f13719fc79c384a2a34b404f94ba4cc2f35f0bb1d70aef2233fd18 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d @@ -41,6 +43,7 @@ DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c2610 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33 EBUILD genkernel-4.3.2-r1.ebuild 11786 BLAKE2B e6761e225eec5473f3bca9a4f95406c96a471ad65e8af67743b4ed9e1e9e71df3c51d5fda2595dde0b621c8c02075c352269463e6d38ae5ad472f343424b3961 SHA512 706ee067a77272fcbf29da71d89a1b0c91b85d8042dca48e18f80f8e25b09e73e976db8436ba9289bc55e66a821bd6074ca650df2780930150a271dad6a7bd99 EBUILD genkernel-4.3.3.ebuild 11748 BLAKE2B 49e450af641888d300c9e93b5a99dc3b9444668072c5b0ed526e741a5cac689c51be98d1fd268170355e8fd796cd3ed86396277dc433f7db12017eb5069c6d6d SHA512 aaff91b5ef7f7f5896c27445bb5d0a11ec584c1506183f12881720edc801f40f99bc88a79e31c3cf744319a7c5d56cd2572e741dc7b8ef41640d20f19633138d +EBUILD genkernel-4.3.5-r1.ebuild 11814 BLAKE2B af072c126a1e164577a3afe7f77bb94192d1b599f568ec238019f40171fc5565f00f434670271ce32e8cdf0997dfd27ae72022b328e97c55177980dae5e6c4ca SHA512 d1a8674e26a65727234c9eb896ea19aed66b73713d97f0e15a1287f3f44e43e6eaa6261ac99ffd985c90e041f803004667df77ae85f86b84b69aee3b66d32634 EBUILD genkernel-4.3.5.ebuild 11754 BLAKE2B 3e265e50985a527a9f7ebd1b28a3ab67d920f99e0fe32e8f3d38a6243ecdfe4f261de5da08339d82036ec81af3c9f6efa03f54f110afb00b23735e29353f94bd SHA512 2107334bab0ce97581497c54b5f32972d0727d6934c0dbefb865e9b86ddac1f804dbcd7a60c91fb9b04bf69d8d3c37aa67719b6eb541afbb1969e96a0c0b6d35 -EBUILD genkernel-9999.ebuild 11762 BLAKE2B 75b211af5eb936c54e088095c2a935c555f3c79a8bd136f1967d42b56ec1ad7e2a4c6471cc15434fc50accb30be930028f39d1c0389361afc2d5bf23a4c25f17 SHA512 8cd28c40ba4c5a4a8118e37e070655f43758eeb4bb0dd51131f5ed9d3552b83bea3fa121abd2bbfee9d5e85099f00914d831cc7b3bfd5b2937737ebc3f0c3520 +EBUILD genkernel-9999.ebuild 11762 BLAKE2B d83bb93f298157e1f4e6ec2a44fc1ea235d932532ab8ec5182f5a6aebd30f3e41cae7b560b3e3f01f4de44eb256063707c8742252401c6c2d3fb2957df4f1d01 SHA512 32d835dd3b29047d59c286e344433be875c7f5360b7e4802dc22bb47f243c3d0a9a6a2e83d0177b19e91058991d00f18d2b04c4abd90c7198e2a5c5d56072de2 MISC metadata.xml 480 BLAKE2B 8b1b1655cb13d866985a92755b0696bef00841a7626cb6cd10f39d7a7ad196c1ec2f5895f86e23fc3ee1345c48d7c659346d2bc7bb2a2bdaa9c997511f002fd8 SHA512 5030d4505b077faec4e2eb9cb2dcc47195a1864057bcb5f110314bab97b90b1bdcd3f293f76116a23dd0e694c7c8ee66ed46d39c9b7b0c506b22fe23e86febc4 diff --git a/sys-kernel/genkernel/files/genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch b/sys-kernel/genkernel/files/genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch new file mode 100644 index 000000000000..26caca5de43a --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch @@ -0,0 +1,24 @@ +https://github.com/gentoo/genkernel/commit/231fdfd9f1c1819d19440627ebe0ea58576a9965 + +From 231fdfd9f1c1819d19440627ebe0ea58576a9965 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 5 Jul 2023 21:41:39 +0100 +Subject: [PATCH] gkbuilds: cryptsetup: disable asciidoc + +Signed-off-by: Sam James +--- + gkbuilds/cryptsetup.gkbuild | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild +index 816df609..c084286c 100644 +--- a/gkbuilds/cryptsetup.gkbuild ++++ b/gkbuilds/cryptsetup.gkbuild +@@ -11,6 +11,7 @@ src_configure() { + local myconf=( + --enable-internal-argon2 + --sbindir=/sbin ++ --disable-asciidoc + --disable-nls + --disable-selinux + --disable-ssh-token diff --git a/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild new file mode 100644 index 000000000000..9a46e6c7644d --- /dev/null +++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild @@ -0,0 +1,323 @@ +# Copyright 1999-2023 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=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit bash-completion-r1 python-single-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.79.0" +VERSION_BTRFS_PROGS="5.15" +VERSION_BUSYBOX="1.34.1" +VERSION_COREUTILS="8.32" +VERSION_CRYPTSETUP="2.6.1" +VERSION_DMRAID="1.0.0.rc16-3" +VERSION_DROPBEAR="2020.81" +VERSION_EUDEV="3.2.10" +VERSION_EXPAT="2.4.1" +VERSION_E2FSPROGS="1.46.4" +VERSION_FUSE="2.9.9" +VERSION_GPG="1.4.23" +VERSION_HWIDS="20210613" +VERSION_ISCSI="2.0.878" +VERSION_JSON_C="0.13.1" +VERSION_KMOD="29" +VERSION_LIBAIO="0.3.112" +VERSION_LIBGCRYPT="1.9.4" +VERSION_LIBGPGERROR="1.43" +VERSION_LIBXCRYPT="4.4.36" +VERSION_LVM="2.02.188" +VERSION_LZO="2.10" +VERSION_MDADM="4.1" +VERSION_POPT="1.18" +VERSION_STRACE="5.14" +VERSION_THIN_PROVISIONING_TOOLS="0.9.0" +VERSION_UNIONFS_FUSE="2.0" +VERSION_UTIL_LINUX="2.37.2" +VERSION_XFSPROGS="5.13.0" +VERSION_XZ="5.2.5" +VERSION_ZLIB="1.2.11" +VERSION_ZSTD="1.5.0" +VERSION_KEYUTILS="1.6.3" + +COMMON_URI=" + https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz + https://boostorg.jfrog.io/artifactory/main/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://matt.ucc.asn.au/dropbear/releases/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://github.com/besser82/libxcrypt/archive/v${VERSION_LIBXCRYPT}.tar.gz -> libxcrypt-${VERSION_LIBXCRYPT}.tar.gz + 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 + https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.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/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz + ${COMMON_URI}" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# 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="${PYTHON_DEPS} + app-arch/cpio + >=app-misc/pax-utils-1.2.2 + app-portage/elt-patches + app-portage/portage-utils + dev-util/gperf + sys-apps/sandbox + sys-devel/autoconf + sys-devel/autoconf-archive + sys-devel/automake + sys-devel/bc + sys-devel/bison + sys-devel/flex + sys-devel/libtool + virtual/pkgconfig + elibc_glibc? ( sys-libs/glibc[static-libs(+)] ) + firmware? ( sys-kernel/linux-firmware )" + +if [[ ${PV} == 9999* ]]; then + DEPEND="${DEPEND} app-text/asciidoc" +fi + +PATCHES=( + "${FILESDIR}"/${P}-no-asciidoc-on-cryptsetup.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_LIBXCRYPT:${VERSION_LIBXCRYPT}:"\ + -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 + fperms +x /usr/share/genkernel/path_expander.py + + python_fix_shebang "${ED}"/usr/share/genkernel/path_expander.py + + 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} -gt 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 0a90921d0699..1c6d353d36db 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -17,7 +17,7 @@ VERSION_BOOST="1.79.0" VERSION_BTRFS_PROGS="5.15" VERSION_BUSYBOX="1.34.1" VERSION_COREUTILS="8.32" -VERSION_CRYPTSETUP="2.4.1" +VERSION_CRYPTSETUP="2.6.1" VERSION_DMRAID="1.0.0.rc16-3" VERSION_DROPBEAR="2020.81" VERSION_EUDEV="3.2.10" -- cgit v1.2.3