From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B86FA1397F1 for ; Thu, 20 Aug 2015 02:45:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A62E14245; Thu, 20 Aug 2015 02:45:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97EF214245 for ; Thu, 20 Aug 2015 02:45:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B12AD340901 for ; Thu, 20 Aug 2015 02:45:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 150E3163 for ; Thu, 20 Aug 2015 02:45:05 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1440038661.fe18e46695d8fe442a8075cf165eeb7b8e1434a2.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/genkernel/genkernel-3.4.52.2.ebuild sys-kernel/genkernel/genkernel-9999.ebuild X-VCS-Directories: sys-kernel/genkernel/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: fe18e46695d8fe442a8075cf165eeb7b8e1434a2 X-VCS-Branch: master Date: Thu, 20 Aug 2015 02:45:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 20093998-4ed1-4ff7-be30-f3773511c80e X-Archives-Hash: 56626e7940ca34c63d3aed7381f15016 commit: fe18e46695d8fe442a8075cf165eeb7b8e1434a2 Author: Zero_Chaos gentoo org> AuthorDate: Thu Aug 20 02:37:19 2015 +0000 Commit: Richard Farina gentoo org> CommitDate: Thu Aug 20 02:44:21 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe18e466 sys-kernel/genkernel: minor ebuid cleanup wrt eapi5 and matching latest tagged ebuild to live ebuild Package-Manager: portage-2.2.20.1 sys-kernel/genkernel/genkernel-3.4.52.2.ebuild | 70 +++++++++++--------------- sys-kernel/genkernel/genkernel-9999.ebuild | 4 +- 2 files changed, 32 insertions(+), 42 deletions(-) diff --git a/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild index 35cc851..a0bd94d 100644 --- a/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild +++ b/sys-kernel/genkernel/genkernel-3.4.52.2.ebuild @@ -5,7 +5,7 @@ # genkernel-9999 -> latest Git branch "master" # genkernel-VERSION -> normal genkernel release -EAPI="5" +EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12 VERSION_BUSYBOX='1.20.2' VERSION_DMRAID='1.0.0.rc16-3' @@ -52,26 +52,36 @@ HOMEPAGE="http://www.gentoo.org" LICENSE="GPL-2" SLOT="0" RESTRICT="" -IUSE="crypt cryptsetup ibm selinux" # Keep 'crypt' in to keep 'use crypt' below working! +IUSE="cryptsetup ibm selinux" DEPEND="sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )" RDEPEND="${DEPEND} - cryptsetup? ( sys-fs/cryptsetup ) - app-arch/cpio - >=app-misc/pax-utils-0.2.1 - !=app-misc/pax-utils-0.2.1 + ! "${S}"/ChangeLog || die popd >/dev/null || die fi - use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh + if use selinux ; then + sed -i 's/###//g' "${S}"/gen_compile.sh || die + fi # Update software.sh sed -i \ @@ -97,12 +109,6 @@ src_prepare() { "${S}"/defaults/software.sh \ || die "Could not adjust versions" - # sparc doesn't need crosscompiler anymore - # remove this after >3.4.51.2 - sed -i -e "s:^DEFAULT_KERNEL_CC:#DEFAULT_KERNEL_CC:g" \ - "${S}"/arch/sparc64/config.sh \ - || die "Could not remove sparc64 crosscompiler config" - epatch_user } @@ -118,32 +124,24 @@ src_install() { 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}"/* - use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \ - cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6 - - # Copy files to /var/cache/genkernel/src - GKDISTDIR=/usr/share/genkernel/distfiles/ - elog "Copying files to ${GKDISTDIR}..." - insinto $GKDISTDIR - doins "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 - doins "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 - doins "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz - doins "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 - doins "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz - doins "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 - doins "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 - doins "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz newbashcomp "${FILESDIR}"/genkernel.bash "${PN}" insinto /etc doins "${FILESDIR}"/initramfs.mounts + + cd "${DISTDIR}" + insinto /usr/share/genkernel/distfiles + doins ${A/${P}.tar.bz2/} } pkg_postinst() { @@ -156,17 +154,9 @@ pkg_postinst() { ewarn "This package is known to not work with reiser4. If you are running" ewarn "reiser4 and have a problem, do not file a bug. We know it does not" ewarn "work and we don't plan on fixing it since reiser4 is the one that is" - ewarn "broken in this regard. Try using a sane filesystem like ext3 or" - ewarn "even reiser3." + ewarn "broken in this regard. Try using a sane filesystem like ext4." echo ewarn "The LUKS support has changed from versions prior to 3.4.4. Now," ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah." echo - if use crypt && ! use cryptsetup ; then - ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)." - ewarn "Please set flag 'cryptsetup' for this very package if you would like" - ewarn "to have genkernel create an initramfs with LUKS support." - ewarn "Sorry for the inconvenience." - echo - fi } diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index a473b5a..0280e2a 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -113,7 +113,7 @@ src_prepare() { } src_compile() { - if [[ ${PV} == 9999* ]] ; then + if [[ ${PV} == 9999* ]]; then emake fi } @@ -125,7 +125,7 @@ src_install() { doman genkernel.8 dodoc AUTHORS ChangeLog README TODO dobin genkernel - rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf || die + rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf if use ibm ; then cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die