From 17def7073e7778d5375d2d6fc556ae88b88f50d1 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Mon, 31 Aug 2020 19:47:14 +0200 Subject: sys-kernel/genkernel: drop old Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann --- sys-kernel/genkernel/Manifest | 2 - .../files/genkernel-4.1.0-post-release-fixes.patch | 39 --- sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild | 302 --------------------- 3 files changed, 343 deletions(-) delete mode 100644 sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch delete mode 100644 sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild (limited to 'sys-kernel/genkernel') diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest index 99b6a9d4ee1f..4b5bd174c415 100644 --- a/sys-kernel/genkernel/Manifest +++ b/sys-kernel/genkernel/Manifest @@ -18,11 +18,9 @@ DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71 DIST genkernel-4.0.10.tar.xz 460816 BLAKE2B d5922eede1192bb95ca235106a70118826c2c4c078f741e25954485f142d858bf612f35b94553fc409e4f6641b256a2940f83131c5b4bc7d6dbae85019bee7ff SHA512 29dc29b346b132cc6e7ea5298e49c93d01ba28531928cb7a6125864c7d03b74f70bc74043b220dfbbb6651ad67fcbc3d8ed8a2d0f40d271b83e9a8ab0325a2dd -DIST genkernel-4.1.0.tar.xz 463696 BLAKE2B 74ca0207cdb54e4627d269dd83afa34045c283a2f8fd8fad6c25d566c35d8d2411e4f73e50317e8427717333024d1a4f86485caa58f5275f63273b6c52943873 SHA512 50bf7c051ac2113c14861c6ab30f8db880d9e934cedeb848f14f030286e5445b9f1b4ba1a270c281d8caacb893651325c9df0ce26a782249ca60f9f67e106807 DIST genkernel-4.1.2.tar.xz 465288 BLAKE2B 89e26a861854d0cde808331db4bf3055495e9ec4be16952c495e481a5f9684601603ba22e5edda8f882fcddd68d1e406756cdc519936b90e33fe640107c8e529 SHA512 4b10f25ed8d97ffe075372aac22e0aff7be72405f02d9d8faddcc70063d04719dc93f9836d4f8375afca9b6870fcb15bda6ed796e5b2d2ef208ba3203d229a3e 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 hwids-20200306.tar.gz 3512152 BLAKE2B 6a6ee48598e72f97a90bff8f45aacb699218570ede5b60ed119ebae78de6cd4b92e02f96cf57c83710da699be9a7dcdfdef8d404539e04b664298874b35e54ce SHA512 eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250 DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c diff --git a/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch b/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch deleted file mode 100644 index ef121d9ccc60..000000000000 --- a/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/gen_determineargs.sh -+++ b/gen_determineargs.sh -@@ -1170,6 +1170,14 @@ determine_real_args() { - fi - fi - -+ if isTrue "${INTEGRATED_INITRAMFS}" -+ then -+ if ! isTrue "${BUILD_KERNEL}" || ! isTrue "${BUILD_RAMDISK}" -+ then -+ gen_die "Invalid action specified: --integrated-initramfs option requires action \"all\", i.e. building of kernel and initramfs at the same time!" -+ fi -+ fi -+ - if ! isTrue "${CMD_INSTALL}" - then - if [ -n "${KERNEL_MODULES_PREFIX}" ] ---- a/gen_funcs.sh -+++ b/gen_funcs.sh -@@ -2033,7 +2033,7 @@ kconfig_set_opt() { - else - print_info 3 "$(get_indent ${indentlevel}) - Setting option '${optname}' to '${optval}' in '${kconfig}'..." - sed -i "${kconfig}" \ -- -e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \ -+ -e "s|^#\? \?${optname}[ =].*|${optname}=${optval}|g" \ - || gen_die "Failed to set '${optname}=${optval}' in '${kconfig}'" - - [ ! -f "${KCONFIG_MODIFIED_MARKER}" ] && touch "${KCONFIG_MODIFIED_MARKER}" ---- a/gkbuilds/bcache-tools.gkbuild -+++ b/gkbuilds/bcache-tools.gkbuild -@@ -6,7 +6,7 @@ src_configure() { - } - - src_compile() { -- PKG_CONFIG="$(tc-getPKG_CONFIG) -static" \ -+ PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \ - gkmake V=1 - } - diff --git a/sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild b/sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild deleted file mode 100644 index c5db490b8eb2..000000000000 --- a/sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild +++ /dev/null @@ -1,302 +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="20200306" -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.38" -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_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://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_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 -} -- cgit v1.2.3-65-gdbad