commit: 32835a1e91593000cc89140c51e1833a80dae760 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue May 17 20:15:46 2022 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue May 17 20:16:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32835a1e
sys-kernel/genkernel: Revbump only for ia64, so we get an iso again Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> .../files/genkernel-4.2.6-devicemanager.patch | 72 +++++ sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild | 319 +++++++++++++++++++++ 2 files changed, 391 insertions(+) diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-devicemanager.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-devicemanager.patch new file mode 100644 index 000000000000..f1c5787ed657 --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-4.2.6-devicemanager.patch @@ -0,0 +1,72 @@ +From 110cffbf0a10a6dabe902eecb9c139663ad737af Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <flop...@gentoo.org> +Date: Sun, 15 May 2022 12:37:51 -0400 +Subject: [PATCH] gen_initramfs.sh: append devicemanager only for specific + modules + +dmraid +luks +lvm +multipath + +Bug: https://bugs.gentoo.org/749957 +Signed-off-by: Mike Gilbert <flop...@gentoo.org> +--- + gen_funcs.sh | 9 +++++++++ + gen_initramfs.sh | 11 +++++++---- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/gen_funcs.sh b/gen_funcs.sh +index 500caf2..db396e3 100755 +--- a/gen_funcs.sh ++++ b/gen_funcs.sh +@@ -22,6 +22,15 @@ isTrue() { + return 1 + } + ++anyTrue() { ++ local x ++ for x ++ do ++ isTrue "${x}" && return 0 ++ done ++ return 1 ++} ++ + set_color_vars() { + if ! isTrue "${NOCOLOR}" + then +diff --git a/gen_initramfs.sh b/gen_initramfs.sh +index 4ec296e..0b74f4c 100755 +--- a/gen_initramfs.sh ++++ b/gen_initramfs.sh +@@ -2007,11 +2007,14 @@ append_auxiliary() { + } + + append_data() { +- local name=$1 var=$2 ++ [ $# -eq 0 ] && gen_die "append_data() called with zero arguments" ++ ++ local name=$1 + local func="append_${name}" + +- [ $# -eq 0 ] && gen_die "append_data() called with zero arguments" +- if [ $# -eq 1 ] || isTrue "${var}" ++ shift ++ ++ if [ $# -eq 0 ] || anyTrue "$@" + then + print_info 1 "$(get_indent 1)>> Appending ${name} cpio data ..." + ${func} || gen_die "${func}() failed!" +@@ -2037,7 +2040,7 @@ create_initramfs() { + append_data 'base_layout' + append_data 'util-linux' + append_data 'eudev' +- append_data 'devicemanager' ++ append_data 'devicemanager' "${DMRAID}" "${LVM}" "${LUKS}" "${MULTIPATH}" + append_data 'auxiliary' "${BUSYBOX}" + append_data 'busybox' "${BUSYBOX}" + append_data 'b2sum' "${B2SUM}" +-- +2.35.1 + diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild new file mode 100644 index 000000000000..1c4c56cc5a82 --- /dev/null +++ b/sys-kernel/genkernel/genkernel-4.2.6-r3.ebuild @@ -0,0 +1,319 @@ +# Copyright 1999-2022 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" + +PYTHON_COMPAT=( python3_{7..10} ) + +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.76.0" +VERSION_BTRFS_PROGS="5.15" +VERSION_BUSYBOX="1.34.1" +VERSION_COREUTILS="8.32" +VERSION_CRYPTSETUP="2.4.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.26" +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" + +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 +" + +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="~ia64" +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 + dev-util/gperf + sys-apps/sandbox + sys-devel/autoconf + sys-devel/autoconf-archive + sys-devel/automake + 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}-devicemanager.patch + "${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch + "${FILESDIR}"/${P}-fuse-glibc-2.34.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-<ARCH>-<KV>"' + ewarn 'to "vmlinuz-<KV>". 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 -- '\<root=' /proc/cmdline 2>/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 +}
