commit: 9a72b6c99f833de0d8f7727fe3172dcee2e5491b Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Tue Jun 23 18:45:56 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Tue Jun 23 18:46:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a72b6c9
sys-kernel/genkernel: bump to v4.0.9 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> sys-kernel/genkernel/Manifest | 1 + sys-kernel/genkernel/genkernel-4.0.9.ebuild | 267 ++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+) diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest index cc99010a705..f3fce593b31 100644 --- a/sys-kernel/genkernel/Manifest +++ b/sys-kernel/genkernel/Manifest @@ -19,6 +19,7 @@ DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe88 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71 DIST genkernel-4.0.7.tar.xz 447900 BLAKE2B 9ceacb41e509db1b6705bebe11bd209d5ede0e24c82e89f49fbee8d8e44d5fd068bfe5990cdfd7cd5dcb7989e7ccb51d13b919492daa9311c102cef427d71796 SHA512 ab9fac291a342b5990ea732f5f7f03f761e3a1dd90a5480c29d697f6dcbefc4759d8e885977cc7aa636c4dbbdae3ee24a8e7f7c9ba211e6c482443d3527e5161 DIST genkernel-4.0.8.tar.xz 455404 BLAKE2B d9f0d6357804bd4dc7d178d089adc343920e57c255f918b3a185fbe86b2ba0d35079587748ca465211b6daa4c9b7a05326e845d94fabce77249bff2f3f97dfca SHA512 7b5465322c6f201c4e398fd55115ff66cd3d0676e7f226e71d26350eaed1d72d970e03efeec37cd5d7445d718942f58f43db1002fcf0c105018246766d9220cc +DIST genkernel-4.0.9.tar.xz 456172 BLAKE2B b457d6fc08edb3e2b2b95aea9160ad96757bfe3af649af96f0dc3206e120deb560001e149a3f4083833b8dc77194d732557d1e30d63227ff18f5e3a0bbcc8d83 SHA512 041abccc8bcbf884cd57173ca83233e2c5aa98d9d22e3e4cd47cd37ba312af2f16a88685afa127c336bb72f2c21dcd2071520c26af41b8597c0c75bcec1f39fa DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1 diff --git a/sys-kernel/genkernel/genkernel-4.0.9.ebuild b/sys-kernel/genkernel/genkernel-4.0.9.ebuild new file mode 100644 index 00000000000..2420686a696 --- /dev/null +++ b/sys-kernel/genkernel/genkernel-4.0.9.ebuild @@ -0,0 +1,267 @@ +# 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_BOOST="1.73.0" +VERSION_BTRFS_PROGS="5.6.1" +VERSION_BUSYBOX="1.31.1" +VERSION_COREUTILS="8.32" +VERSION_CRYPTSETUP="2.3.3" +VERSION_DMRAID="1.0.0.rc16-3" +VERSION_DROPBEAR="2020.79" +VERSION_EXPAT="2.2.9" +VERSION_E2FSPROGS="1.45.6" +VERSION_FUSE="2.9.9" +VERSION_GPG="1.4.23" +VERSION_ISCSI="2.0.878" +VERSION_JSON_C="0.13.1" +VERSION_KMOD="27" +VERSION_LIBAIO="0.3.112" +VERSION_LIBGCRYPT="1.8.5" +VERSION_LIBGPGERROR="1.38" +VERSION_LVM="2.02.187" +VERSION_LZO="2.10" +VERSION_MDADM="4.1" +VERSION_POPT="1.16" +VERSION_STRACE="5.7" +VERSION_THIN_PROVISIONING_TOOLS="0.8.5" +VERSION_UNIONFS_FUSE="2.0" +VERSION_UTIL_LINUX="2.35.2" +VERSION_XFSPROGS="5.6.0" +VERSION_ZLIB="1.2.11" +VERSION_ZSTD="1.4.4" + +COMMON_URI=" + 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://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2 + 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/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/mirror/popt/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://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 + 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_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_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_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-<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 +}
