| 1 |
commit: 8ec836a36cb09955f758534207f7a792c93adb80 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 20 19:30:46 2014 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 20 19:30:46 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=8ec836a3 |
| 7 |
|
| 8 |
Add updates from infra overlay. |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
.../infra-kernel-source-3.13.6-r3.ebuild | 10 +++++----- |
| 14 |
...ernel-1.0.ebuild => infra-kernel-3.13.6-r3.ebuild} | 19 +++++++++---------- |
| 15 |
2 files changed, 14 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-kernel/infra-kernel-source/infra-kernel-source-3.13.6-r3.ebuild b/sys-kernel/infra-kernel-source/infra-kernel-source-3.13.6-r3.ebuild |
| 18 |
index 273eb6e..eb0eabe 100644 |
| 19 |
--- a/sys-kernel/infra-kernel-source/infra-kernel-source-3.13.6-r3.ebuild |
| 20 |
+++ b/sys-kernel/infra-kernel-source/infra-kernel-source-3.13.6-r3.ebuild |
| 21 |
@@ -7,8 +7,8 @@ inherit flag-o-matic |
| 22 |
|
| 23 |
KERNEL_SOURCES="hardened-sources" |
| 24 |
KERNEL_NAME="hardened" |
| 25 |
-KERNEL_PV="3.13.6" |
| 26 |
-KERNEL_REVISION="r3" |
| 27 |
+KERNEL_PV="$PV" |
| 28 |
+KERNEL_REVISION="$PR" |
| 29 |
INFRA_SUFFIX="infra27" |
| 30 |
|
| 31 |
KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}" |
| 32 |
@@ -16,8 +16,8 @@ KERNEL_PF="${KERNEL_SOURCES}-${KERNEL_PVR}" |
| 33 |
|
| 34 |
KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}" |
| 35 |
BINPKG_PVR="${PVR}-${INFRA_SUFFIX}" |
| 36 |
-BINPKG_KERNEL="${PN/-source/}-kernel-${BINPKG_PVR}.tbz2" |
| 37 |
-BINPKG_MODULES="${PN/-source/}-modules-${BINPKG_PVR}.tbz2" |
| 38 |
+BINPKG_KERNEL="${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}.tbz2" |
| 39 |
+BINPKG_MODULES="${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}.tbz2" |
| 40 |
KERNEL_CONFIG="${FILESDIR}"/${KERNEL_PF}-${INFRA_SUFFIX}.config |
| 41 |
|
| 42 |
BUILD_DIR="/home/upload-kernel/" |
| 43 |
@@ -46,7 +46,7 @@ pkg_setup() { |
| 44 |
strip-flags |
| 45 |
filter-flags -march=* -mtune=* -mcpu=* -frecord-gcc-switches |
| 46 |
use amd64 && append-flags -march=x86-64 -mtune=generic |
| 47 |
- use x86 && append-flags -march=pentium4 -mtune=generic |
| 48 |
+ use x86 && append-flags -march=pentium3 -mtune=generic |
| 49 |
} |
| 50 |
|
| 51 |
src_unpack() { |
| 52 |
|
| 53 |
diff --git a/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild b/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild |
| 54 |
similarity index 71% |
| 55 |
rename from sys-kernel/infra-kernel/infra-kernel-1.0.ebuild |
| 56 |
rename to sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild |
| 57 |
index 0ef992a..1031ed3 100644 |
| 58 |
--- a/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild |
| 59 |
+++ b/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild |
| 60 |
@@ -7,25 +7,23 @@ EAPI=5 |
| 61 |
inherit mount-boot multilib |
| 62 |
|
| 63 |
KERNEL_NAME="hardened" |
| 64 |
-KERNEL_PV="3.13.2" |
| 65 |
-KERNEL_REVISION="r3" |
| 66 |
-INFRA_SUFFIX="infra26" |
| 67 |
+KERNEL_PV="$PV" |
| 68 |
+KERNEL_REVISION="$PR" |
| 69 |
+INFRA_SUFFIX="infra27" |
| 70 |
KARCH="x86_64" |
| 71 |
|
| 72 |
KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}" |
| 73 |
KERNEL_PF="${KERNEL_SOURCES}-${KERNEL_PVR}" |
| 74 |
|
| 75 |
BINPKG_PVR="${PVR}-${INFRA_SUFFIX}" |
| 76 |
-BINPKG_KERNEL="${PN/-source/}-kernel-${BINPKG_PVR}.tbz2" |
| 77 |
-BINPKG_MODULES="${PN/-source/}-modules-${BINPKG_PVR}.tbz2" |
| 78 |
+BINPKG_KERNEL="${PN/-source/}-kernel-${KARCH}-${BINPKG_PVR}" |
| 79 |
+BINPKG_MODULES="${PN/-source/}-modules-${KARCH}-${BINPKG_PVR}" |
| 80 |
|
| 81 |
-#KERNEL_URI="http://www.jmbsvicetto.name/gentoo-infra/${BINPKG_KERNEL}" |
| 82 |
-#MODULES_URI="http://www.jmbsvicetto.name/gentoo-infra/${BINPKG_MODULES}" |
| 83 |
-KERNEL_URI="mirror:://gentoo/${BINPKG_KERNEL}.tbz2" |
| 84 |
-MODULES_URI="mirror:://gentoo/${BINPKG_MODULES}.tbz2" |
| 85 |
+KERNEL_URI="${BINPKG_KERNEL}.tbz2" |
| 86 |
+MODULES_URI="${BINPKG_MODULES}.tbz2" |
| 87 |
|
| 88 |
CUSTOM_VERSION="${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}-${INFRA_SUFFIX}" |
| 89 |
-KERNEL_BIN="kernel-${CUSTOM_VERSION}" |
| 90 |
+KERNEL_BIN="kernel-${KARCH}-${CUSTOM_VERSION}" |
| 91 |
INITRAMFS_BIN="initramfs-${KARCH}-${CUSTOM_VERSION}" |
| 92 |
SYSTEMMAP_BIN="System.map-${KARCH}-${CUSTOM_VERSION}" |
| 93 |
|
| 94 |
@@ -33,6 +31,7 @@ SRC_URI="${KERNEL_URI} ${MODULES_URI}" |
| 95 |
DESCRIPTION="Package to install kernel + initramfs for Gentoo infra boxes" |
| 96 |
HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Infrastructure" |
| 97 |
IUSE="" |
| 98 |
+RESTRICT="fetch" |
| 99 |
|
| 100 |
LICENSE="GPL-2" |
| 101 |
SLOT="0" |
Archives