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

[Jorge Manuel B. S. Vicetto]

commit:     3331d47a9eb32f88337441036a0f26cbebdedaed
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo 
<DOT> org>
AuthorDate: Thu Jun 26 04:02:00 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jun 26 04:02:00 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=3331d47a

Use KARCH to support amd64 / x86.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> 
gentoo.org>

---
 .../infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild     | 7 ++++---
 sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild              | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild 
b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild
index c719bcb..623b2f9 100644
--- a/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild
+++ b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild
@@ -10,6 +10,8 @@ KERNEL_NAME="hardened"
 KERNEL_PV="$PV"
 KERNEL_REVISION="$PR"
 INFRA_SUFFIX="infra27"
+use amd64 && KARCH="x86_64"
+use x86 && KARCH="x86"
 
 KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}"
 KERNEL_PF="${KERNEL_SOURCES}-${KERNEL_PVR}"
@@ -18,7 +20,7 @@ 
KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}"
 BINPKG_PVR="${PVR}-${INFRA_SUFFIX}"
 BINPKG_KERNEL="${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}.tbz2"
 BINPKG_MODULES="${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}.tbz2"
-KERNEL_CONFIG="${FILESDIR}"/${KERNEL_PF}-${INFRA_SUFFIX}.config
+KERNEL_CONFIG="${FILESDIR}"/${KERNEL_PF}-${KARCH}-${INFRA_SUFFIX}.config
 
 BUILD_DIR="/home/upload-kernel/"
 
@@ -80,7 +82,7 @@ genkernel_sterile() {
        touch "${emptyconfig}"
        CMD_GK_CONFIG="${emptyconfig}" \
        GK_SHARE="${ROOT}"/usr/share/genkernel \
-       DISTDIR="${ROOT}"/var/cache/genkernel/src/ \
+       DISTDIR="${ROOT}"//usr/share/genkernel/distfiles \
        CFLAGS="${CFLAGS}" \
        CXXFLAGS="${CXXFLAGS}" \
        fakeroot genkernel \
@@ -140,7 +142,6 @@ src_compile() {
                --e2fsprogs \
                --mdadm --mdadm-config="${FILESDIR}/mdadm.conf-1.0" \
                \
-               --kernname=${PN}-${KARCH} \
                --minkernpackage="${T}"/${BINPKG_KERNEL} \
                --modulespackage="${T}"/${BINPKG_MODULES} \
                \

diff --git a/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild 
b/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild
index 1bb839d..1fabd15 100644
--- a/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild
+++ b/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild
@@ -10,10 +10,10 @@ KERNEL_NAME="hardened"
 KERNEL_PV="$PV"
 KERNEL_REVISION="$PR"
 INFRA_SUFFIX="infra27"
-KARCH="x86_64"
+use amd64 && KARCH="x86_64"
+use x86 && KARCH="x86"
 
 KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}"
-KERNEL_PF="${KERNEL_SOURCES}-${KERNEL_PVR}"
 
 BINPKG_PVR="${PVR}-${INFRA_SUFFIX}"
 BINPKG_KERNEL="${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}"