| 1 |
commit: 2935575c30c5eb17d842bac7ec968639e5a6c1a5 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 29 18:25:22 2014 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 29 18:25:22 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=2935575c |
| 7 |
|
| 8 |
Update kernel ebuild. |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild | 41 ++++++++++++++-------- |
| 14 |
1 file changed, 27 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild b/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild |
| 17 |
index f0e2f2d..ce38078 100644 |
| 18 |
--- a/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild |
| 19 |
+++ b/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild |
| 20 |
@@ -10,27 +10,28 @@ 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 |
|
| 29 |
+KARCH_amd64="x86_64" |
| 30 |
+KARCH_x86="x86" |
| 31 |
BINPKG_PVR="${PVR}-${INFRA_SUFFIX}" |
| 32 |
-BINPKG_KERNEL="${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}" |
| 33 |
-BINPKG_MODULES="${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}" |
| 34 |
+BINPKG_KERNEL="${PN/-sources/}-kernel-KARCH-${BINPKG_PVR}" |
| 35 |
+BINPKG_MODULES="${PN/-sources/}-modules-KARCH-${BINPKG_PVR}" |
| 36 |
|
| 37 |
-KERNEL_URI="${BINPKG_KERNEL}.tbz2" |
| 38 |
-MODULES_URI="${BINPKG_MODULES}.tbz2" |
| 39 |
+URIBASE="https://distfiles:FetchUbuFetch@××××××××××××××××××××.org/distfiles/" |
| 40 |
|
| 41 |
-CUSTOM_VERSION="${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}-${INFRA_SUFFIX}" |
| 42 |
-KERNEL_BIN="kernel-${KARCH}-${CUSTOM_VERSION}" |
| 43 |
-INITRAMFS_BIN="initramfs-${KARCH}-${CUSTOM_VERSION}" |
| 44 |
-SYSTEMMAP_BIN="System.map-${KARCH}-${CUSTOM_VERSION}" |
| 45 |
+KERNEL_URI_amd64="amd64? ( ${URIBASE}${BINPKG_KERNEL/KARCH/${KARCH_x86_64}}.tbz2 )" |
| 46 |
+KERNEL_URI_x86="x86? ( ${URIBASE}${BINPKG_KERNEL/KARCH/${KARCH_x86}}.tbz2 )" |
| 47 |
+KERNEL_URI="$KERNEL_URI ${KERNEL_URI_amd64}" |
| 48 |
+#KERNEL_URI="$KERNEL_URI ${KERNEL_URI_x86}" |
| 49 |
|
| 50 |
-SRC_URI=" |
| 51 |
- amd64? ( ${KERNEL_URI//--/-x86_64-} ${MODULES_URI//--/-x86_64-} ) |
| 52 |
- x86? ( ${KERNEL_URI//--/-x86-} ${MODULES_URI//--/-x86-} ) |
| 53 |
-" |
| 54 |
+MODULES_URI_amd64="amd64? ( ${URIBASE}${BINPKG_MODULES/KARCH/${KARCH_x86_64}}.tbz2 )" |
| 55 |
+MODULES_URI_x86="x86? ( ${URIBASE}${BINPKG_MODULES/KARCH/${KARCH_x86}}.tbz2 )" |
| 56 |
+MODULES_URI="$MODULES_URI ${MODULES_URI_amd64}" |
| 57 |
+#MODULES_URI="$MODULES_URI ${MODULES_URI_x86}" |
| 58 |
+ |
| 59 |
+SRC_URI="${KERNEL_URI} ${MODULES_URI}" |
| 60 |
DESCRIPTION="Package to install kernel + initramfs for Gentoo infra boxes" |
| 61 |
HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Infrastructure" |
| 62 |
IUSE="" |
| 63 |
@@ -46,6 +47,18 @@ S="${WORKDIR}" |
| 64 |
|
| 65 |
src_install() { |
| 66 |
|
| 67 |
+ # Use is not valid in global scope |
| 68 |
+ use amd64 && KARCH="${KARCH_amd64}" |
| 69 |
+ use x86 && KARCH="${KARCH_x86}" |
| 70 |
+ [ -z "$KARCH" ] && die "Your arch is not supported by this build" |
| 71 |
+ |
| 72 |
+ [ "${KERNEL_REVISION}" != "r0" ] && KERNEL_REVISION_STRING=-${KERNEL_REVISION} |
| 73 |
+ CUSTOM_VERSION="${KERNEL_PV}-${KERNEL_NAME}${KERNEL_REVISION_STRING}-${INFRA_SUFFIX}" |
| 74 |
+ KNAME="genkernel" |
| 75 |
+ KERNEL_BIN="kernel-${KNAME}-${KARCH}-${CUSTOM_VERSION}" |
| 76 |
+ INITRAMFS_BIN="initramfs-${KNAME}-${KARCH}-${CUSTOM_VERSION}" |
| 77 |
+ SYSTEMMAP_BIN="System.map-${KNAME}-${KARCH}-${CUSTOM_VERSION}" |
| 78 |
+ |
| 79 |
# copy the kernel and initramfs |
| 80 |
insinto /boot |
| 81 |
doins "${KERNEL_BIN}" |
Archives