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:50:25
Message-Id: 1404056806.c533623ce820740f52170469e126038982d0b3be.jmbsvicetto@gentoo
1 commit: c533623ce820740f52170469e126038982d0b3be
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 29 15:46:46 2014 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 29 15:46:46 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=c533623c
7
8 Add suport for non-rX kernel versions.
9
10 Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
11
12 ---
13 .../infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild | 11 ++++++++---
14 1 file changed, 8 insertions(+), 3 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 093a408..01460d3 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 @@ -8,10 +8,16 @@ inherit flag-o-matic
21 KERNEL_SOURCES="hardened-sources"
22 KERNEL_NAME="hardened"
23 KERNEL_PV="$PV"
24 -KERNEL_REVISION="$PR"
25 INFRA_SUFFIX="infra27"
26
27 -KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}"
28 +if [[ ${PR} != r0 ]]; then
29 + KERNEL_REVISION="$PR"
30 + KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}"
31 + KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}"
32 +else
33 + KERNEL_PVR="${KERNEL_PV}"
34 + KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}"
35 +fi
36 KERNEL_PF="${KERNEL_SOURCES}-${KERNEL_PVR}"
37
38 BUILD_DIR="/home/upload-kernel/"
39 @@ -37,7 +43,6 @@ pkg_setup() {
40 use amd64 && KARCH="x86_64"
41 use x86 && KARCH="x86"
42
43 - KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}"
44 BINPKG_PVR="${PVR}-${INFRA_SUFFIX}"
45 BINPKG_KERNEL="${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}.tbz2"
46 BINPKG_MODULES="${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}.tbz2"