[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel/

[Jorge Manuel B. S. Vicetto]

commit:     e0bdb7549970a4308aa5ee85c5c0df62050e9929
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo 
<DOT> org>
AuthorDate: Mon Apr 14 04:37:46 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Apr 14 04:37:46 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=e0bdb754

Update config to reflect changes in infra-kernel-source and allow correct 
installation.

---
 sys-kernel/infra-kernel/Manifest                |  4 +--
 sys-kernel/infra-kernel/infra-kernel-1.0.ebuild | 34 ++++++++++++++++++-------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/sys-kernel/infra-kernel/Manifest b/sys-kernel/infra-kernel/Manifest
index 03692f0..57ef83e 100644
--- a/sys-kernel/infra-kernel/Manifest
+++ b/sys-kernel/infra-kernel/Manifest
@@ -1,2 +1,2 @@
-DIST initramfs-genkernel-x86_64-3.13.2-r3 13 SHA256 
b7db4277a870e10e671cdadb7516a5f1c8013dc81615f8febec85d335d049267 SHA512 
06daf39d030c98ea542ef3004fe6305476c15fce718f515855f888d24b5abc1fd4bd7783ccc655e646e8c4f1aeb640f7ae0d38fbf49332c3475bdd1db3723ec0
 WHIRLPOOL 
e8b407e332f8573c3fe4e23cdda76143f4f29b024f323692f5377eb433c843695eb8448fb26889ff863f1afb86f61a7cf1ee99f40f553e9d8dbc83f76e80a9ba
-DIST kernel-genkernel-x86_64-3.13.2-r3 13 SHA256 
b7db4277a870e10e671cdadb7516a5f1c8013dc81615f8febec85d335d049267 SHA512 
06daf39d030c98ea542ef3004fe6305476c15fce718f515855f888d24b5abc1fd4bd7783ccc655e646e8c4f1aeb640f7ae0d38fbf49332c3475bdd1db3723ec0
 WHIRLPOOL 
e8b407e332f8573c3fe4e23cdda76143f4f29b024f323692f5377eb433c843695eb8448fb26889ff863f1afb86f61a7cf1ee99f40f553e9d8dbc83f76e80a9ba
+DIST infra-kernel-kernel-1.0-infra26.tbz2 8666996 SHA256 
48aad43feec1989f6692e6f0cbc2a15c53edd8b488bb4c6e5dc5247d77045171 SHA512 
f11b1e77b600942de2876b812d0d098a12a1f8c2b71c4763e6902cd7c7acc8df6a6d74194cb91d20012aa1d83012d582035dc23d2a2bb0baa5a5bcd8061c8084
 WHIRLPOOL 
f335b13a123d918c952e534b221a09a515464f09190ce6a55060893babf8af894753893cba243fa2db9fb2be208d93fd571315c8c7bb1726bb305e7aefc0aa37
+DIST infra-kernel-modules-1.0-infra26.tbz2 7970774 SHA256 
68dfedc7704fdcaba0ddab75e3bdff69325aedf867e5a862fb28d88c453f622a SHA512 
74815fc6786f62907c8d40269f530a702cce8d607838476a88243439ac3c38644aefa2a20e7db7e81376d49b292d2f48ccbd21316aee284783589253b03cebf2
 WHIRLPOOL 
82a1d85dc74e78da1d61d9280d95e5baaf486748c82057bffbe3340f779a0e6bdab0ec7f7cd0698ec13fd12ed68b1c6ec4567f76a11d817f779c46b84fb98af5

diff --git a/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild 
b/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild
index 7dad7f7..0ef992a 100644
--- a/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild
+++ b/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild
@@ -6,15 +6,30 @@ EAPI=5
 
 inherit mount-boot multilib
 
-KERNEL_SOURCES="hardened-sources"
+KERNEL_NAME="hardened"
 KERNEL_PV="3.13.2"
 KERNEL_REVISION="r3"
-KERNEL_VERSION="${KERNEL_PV}-${KERNEL_REVISION}"
-GENKERNEL_NAME="genkernel-x86_64-${KERNEL_PV}-hardened-${KERNEL_REVISION}"
-KERNEL_URI="mirror:://gentoo-infra/${PN}-kernel-${PVR}.tbz2"
-MODULES_URI="mirror:://gentoo-infra/${PN}-modules-${PVR}.tbz2"
+INFRA_SUFFIX="infra26"
+KARCH="x86_64"
 
-SRC_URI="${KERNEL_URI} ${INIT_URI}"
+KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}"
+KERNEL_PF="${KERNEL_SOURCES}-${KERNEL_PVR}"
+
+BINPKG_PVR="${PVR}-${INFRA_SUFFIX}"
+BINPKG_KERNEL="${PN/-source/}-kernel-${BINPKG_PVR}.tbz2"
+BINPKG_MODULES="${PN/-source/}-modules-${BINPKG_PVR}.tbz2"
+
+#KERNEL_URI="http://www.jmbsvicetto.name/gentoo-infra/${BINPKG_KERNEL}";
+#MODULES_URI="http://www.jmbsvicetto.name/gentoo-infra/${BINPKG_MODULES}";
+KERNEL_URI="mirror:://gentoo/${BINPKG_KERNEL}.tbz2"
+MODULES_URI="mirror:://gentoo/${BINPKG_MODULES}.tbz2"
+
+CUSTOM_VERSION="${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}-${INFRA_SUFFIX}"
+KERNEL_BIN="kernel-${CUSTOM_VERSION}"
+INITRAMFS_BIN="initramfs-${KARCH}-${CUSTOM_VERSION}"
+SYSTEMMAP_BIN="System.map-${KARCH}-${CUSTOM_VERSION}"
+
+SRC_URI="${KERNEL_URI} ${MODULES_URI}"
 DESCRIPTION="Package to install kernel + initramfs for Gentoo infra boxes"
 HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Infrastructure";
 IUSE=""
@@ -31,12 +46,13 @@ src_install() {
 
        # copy the kernel and initramfs
        insinto /boot
-       doins "kernel-${GENKERNEL_NAME}"
-       doins "initramfs-${GENKERNEL_NAME}"
+       doins "${KERNEL_BIN}"
+       doins "${INITRAMFS_BIN}"
+       doins "${SYSTEMMAP_BIN}"
 
        # copy the modules dir
        insinto /$(get_libdir)/modules
-       doins -r "${KERNEL_PV}-hardened-${KERNEL_REVISION}"
+       doins -r "lib/modules/${CUSTOM_VERSION}"
 }
 
 pkg_preinst() {