Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-sources/
Date: Sun, 29 Jun 2014 15:02:19
Message-Id: 1404053932.079273646c9e4fe99f80cedb094b2d0cee7bfa7a.jmbsvicetto@gentoo
1 commit: 079273646c9e4fe99f80cedb094b2d0cee7bfa7a
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 29 14:58:52 2014 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 29 14:58:52 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=07927364
7
8 Calling use at global scope is invalid.
9
10 Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
11
12 ---
13 .../infra-kernel-sources-3.15.2.ebuild | 17 +++++++++--------
14 1 file changed, 9 insertions(+), 8 deletions(-)
15
16 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
17 index 623b2f9..093a408 100644
18 --- a/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild
19 +++ b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild
20 @@ -10,18 +10,10 @@ KERNEL_NAME="hardened"
21 KERNEL_PV="$PV"
22 KERNEL_REVISION="$PR"
23 INFRA_SUFFIX="infra27"
24 -use amd64 && KARCH="x86_64"
25 -use x86 && KARCH="x86"
26
27 KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}"
28 KERNEL_PF="${KERNEL_SOURCES}-${KERNEL_PVR}"
29
30 -KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}"
31 -BINPKG_PVR="${PVR}-${INFRA_SUFFIX}"
32 -BINPKG_KERNEL="${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}.tbz2"
33 -BINPKG_MODULES="${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}.tbz2"
34 -KERNEL_CONFIG="${FILESDIR}"/${KERNEL_PF}-${KARCH}-${INFRA_SUFFIX}.config
35 -
36 BUILD_DIR="/home/upload-kernel/"
37
38 DESCRIPTION="Package to build kernel + initramfs for Gentoo infra boxes"
39 @@ -42,6 +34,15 @@ RDEPEND=""
40 S="${WORKDIR}"
41
42 pkg_setup() {
43 + use amd64 && KARCH="x86_64"
44 + use x86 && KARCH="x86"
45 +
46 + KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}"
47 + BINPKG_PVR="${PVR}-${INFRA_SUFFIX}"
48 + BINPKG_KERNEL="${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}.tbz2"
49 + BINPKG_MODULES="${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}.tbz2"
50 + KERNEL_CONFIG="${FILESDIR}"/${KERNEL_PF}-${KARCH}-${INFRA_SUFFIX}.config
51 +
52 [ -d /usr/src/${KERNEL_DIR} ] || die "kernel dir /usr/src/${KERNEL_DIR} missing"
53 [ -f ${KERNEL_CONFIG} ] || die "${KERNEL_CONFIG} missing"
54 # we need to be using flags that will result in binaries working on all infra systems