[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-sources/

[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-sources/

[Jorge Manuel B. S. Vicetto]

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

[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-sources/

[Jorge Manuel B. S. Vicetto]

commit:     c533623ce820740f52170469e126038982d0b3be
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 29 15:46:46 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Jun 29 15:46:46 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=c533623c

Add suport for non-rX kernel versions.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

---
 .../infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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 093a408..01460d3 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
@@ -8,10 +8,16 @@ inherit flag-o-matic
 KERNEL_SOURCES="hardened-sources"
 KERNEL_NAME="hardened"
 KERNEL_PV="$PV"
-KERNEL_REVISION="$PR"
 INFRA_SUFFIX="infra27"
 
-KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}"
+if [[ ${PR} != r0 ]]; then
+	KERNEL_REVISION="$PR"
+	KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}"
+	KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}"
+else
+	KERNEL_PVR="${KERNEL_PV}"
+	KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}"
+fi
 KERNEL_PF="${KERNEL_SOURCES}-${KERNEL_PVR}"
 
 BUILD_DIR="/home/upload-kernel/"
@@ -37,7 +43,6 @@ 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"

[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-sources/

[Jorge Manuel B. S. Vicetto]

commit:     03831c6290be177299c7caaa08cc16145bb384b7
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 20 19:55:45 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 19:55:45 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=03831c62

Fix kernname.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

---
 sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild
index cf5a4a6..c719bcb 100644
--- a/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild
+++ b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild
@@ -140,7 +140,7 @@ src_compile() {
 		--e2fsprogs \
 		--mdadm --mdadm-config="${FILESDIR}/mdadm.conf-1.0" \
 		\
-		--kernname=${PN}-${KARCH}
+		--kernname=${PN}-${KARCH} \
 		--minkernpackage="${T}"/${BINPKG_KERNEL} \
 		--modulespackage="${T}"/${BINPKG_MODULES} \
 		\