commit: 079273646c9e4fe99f80cedb094b2d0cee7bfa7a
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo
<DOT> org>
AuthorDate: Sun Jun 29 14:58:52 2014 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jun 29 14:58:52 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=07927364
Calling use at global scope is invalid.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT>
gentoo.org>
---
.../infra-kernel-sources-3.15.2.ebuild | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild
b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild
index 623b2f9..093a408 100644
--- a/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild
+++ b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild
@@ -10,18 +10,10 @@ 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}"
-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}-${KARCH}-${INFRA_SUFFIX}.config
-
BUILD_DIR="/home/upload-kernel/"
DESCRIPTION="Package to build kernel + initramfs for Gentoo infra boxes"
@@ -42,6 +34,15 @@ RDEPEND=""
S="${WORKDIR}"
pkg_setup() {
+ use amd64 && KARCH="x86_64"
+ use x86 && KARCH="x86"
+
+ 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}-${KARCH}-${INFRA_SUFFIX}.config
+
[ -d /usr/src/${KERNEL_DIR} ] || die "kernel dir /usr/src/${KERNEL_DIR}
missing"
[ -f ${KERNEL_CONFIG} ] || die "${KERNEL_CONFIG} missing"
# we need to be using flags that will result in binaries working on all
infra systems
