[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel/, sys-kernel/infra-kernel-sources/, net-analyzer/ocsng/
commit: 3cc4ae7084a14d3ef2db330425c942fba8ea7324 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Tue Apr 26 11:17:08 2016 + Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Tue Apr 26 11:17:08 2016 + URL:https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=3cc4ae70 Drop herd. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> net-analyzer/ocsng/metadata.xml | 1 - sys-kernel/infra-kernel-sources/metadata.xml | 1 - sys-kernel/infra-kernel/metadata.xml | 1 - 3 files changed, 3 deletions(-) diff --git a/net-analyzer/ocsng/metadata.xml b/net-analyzer/ocsng/metadata.xml index c5d38be..16552aa 100644 --- a/net-analyzer/ocsng/metadata.xml +++ b/net-analyzer/ocsng/metadata.xml @@ -1,7 +1,6 @@ https://www.gentoo.org/dtd/metadata.dtd;> - jmbsvice...@gentoo.org Jorge Manuel B. S. Vicetto diff --git a/sys-kernel/infra-kernel-sources/metadata.xml b/sys-kernel/infra-kernel-sources/metadata.xml index b5ab302..3653fc6 100644 --- a/sys-kernel/infra-kernel-sources/metadata.xml +++ b/sys-kernel/infra-kernel-sources/metadata.xml @@ -1,7 +1,6 @@ https://www.gentoo.org/dtd/metadata.dtd;> - jmbsvice...@gentoo.org Jorge Manuel B. S. Vicetto diff --git a/sys-kernel/infra-kernel/metadata.xml b/sys-kernel/infra-kernel/metadata.xml index b5ab302..3653fc6 100644 --- a/sys-kernel/infra-kernel/metadata.xml +++ b/sys-kernel/infra-kernel/metadata.xml @@ -1,7 +1,6 @@ https://www.gentoo.org/dtd/metadata.dtd;> - jmbsvice...@gentoo.org Jorge Manuel B. S. Vicetto
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-sources/, sys-kernel/infra-kernel/
commit: 1c8b4d6d89a5bb9a94568f37293a2db594a5824f
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Sun Jun 29 14:38:41 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Sun Jun 29 14:38:41 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=1c8b4d6d
Bump kernel version and update SRC_URI.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT
gentoo.org
---
.../infra-kernel-sources-3.15.2.ebuild | 164 +
.../infra-kernel/infra-kernel-3.13.6-r3.ebuild | 5 +-
...3.13.6-r3.ebuild = infra-kernel-3.15.2.ebuild} | 5 +-
3 files changed, 172 insertions(+), 2 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
new file mode 100644
index 000..623b2f9
--- /dev/null
+++ b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit flag-o-matic
+
+KERNEL_SOURCES=hardened-sources
+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
+HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Infrastructure;
+IUSE=
+
+LICENSE=GPL-2
+SLOT=0
+KEYWORDS=~amd64 ~x86
+
+DEPEND=
+ sys-apps/fakeroot
+ sys-fs/lvm2
+ =sys-kernel/genkernel-3.4.49.1
+ =sys-kernel/${KERNEL_PF}
+RDEPEND=
+
+S=${WORKDIR}
+
+pkg_setup() {
+ [ -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
+ strip-flags
+ filter-flags -march=* -mtune=* -mcpu=* -frecord-gcc-switches
+ use amd64 append-flags -march=x86-64 -mtune=generic
+ use x86 append-flags -march=pentium3 -mtune=generic
+}
+
+src_unpack() {
+ mkdir -p ${T}/{cache,tmp,kernel-output}
+}
+
+src_prepare() {
+ # copy the kernel sources, this is potentially large, but nothing we
can do.
+ # if it's dirty, the build will fail
+ # symlinks do not work either
+ mkdir -p ${S}/usr/src
+ cp -a /usr/src/${KERNEL_DIR} ${S}/usr/src || die
+ cd ${S}/usr/src/${KERNEL_DIR}
+ _ARCH=$ARCH
+ unset ARCH
+ emake mrproper || die Failed to cleanup
+ export ARCH=$_ARCH
+}
+
+# This deliberately runs a very sterile genkernel
+# that IGNORES the system /etc/genkernel.conf
+# so that we get more reproducable builds
+# almost all the options are easy with this except GK_SHARE
+# fakeroot is here because genkernel uses mknod still
+# which fails as non-root
+genkernel_sterile() {
+ _DISTDIR=${DISTDIR}
+ # the parsing of --config seems to be broken in v3.4.44.2
+ #--config=${emptyconfig} \
+ emptyconfig=${T}/empty
+ touch ${emptyconfig}
+ CMD_GK_CONFIG=${emptyconfig} \
+ GK_SHARE=${ROOT}/usr/share/genkernel \
+ DISTDIR=${ROOT}//usr/share/genkernel/distfiles \
+ CFLAGS=${CFLAGS} \
+ CXXFLAGS=${CXXFLAGS} \
+ fakeroot genkernel \
+ --loglevel=1 \
+ --no-menuconfig \
+ --no-gconfig \
+ --no-xconfig \
+ --no-save-config \
+ --oldconfig \
+ --no-clean \
+ --no-mrproper \
+ --no-symlink \
+ --no-mountboot \
+ --no-lvm \
+ --no-mdadm \
+ --no-dmraid \
+ --no-multipath \
+ --no-iscsi \
+ --no-disklabel \
+ --no-luks \
+ --no-gpg \
+ --no-busybox \
+ --no-postclear \
+ --no-install \
+ --no-zfs \
+ --no-keymap \
+ --no-e2fsprogs \
+ --no-unionfs \
+ --no-netboot \
+ --compress-initramfs \
+ --ramdisk-modules \
+ --no-debug-cleanup \
+ $@
+}
+
+src_compile() {
+
+ addpredict /etc/kernels
+ addpredict /dev
+
+ # call genkernel to build the kernel + initramfs
+ genkernel_sterile \
+ --loglevel=5 \
+
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-sources/
commit: c533623ce820740f52170469e126038982d0b3be
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Sun Jun 29 15:46:46 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Sun Jun 29 15:46:46 2014 +
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/files/
commit: 25e62d2f68ba75101ee373ec8eba60c7f6ce4cc3 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo DOT org AuthorDate: Sun Jun 29 15:49:16 2014 + Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org CommitDate: Sun Jun 29 15:49:16 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=25e62d2f Add karch to the kernel config file name. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo.org --- 15.2-infra27.config = hardened-sources-3.15.2-x86_64-infra27.config} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sys-kernel/infra-kernel-sources/files/hardened-sources-3.15.2-infra27.config b/sys-kernel/infra-kernel-sources/files/hardened-sources-3.15.2-x86_64-infra27.config similarity index 100% rename from sys-kernel/infra-kernel-sources/files/hardened-sources-3.15.2-infra27.config rename to sys-kernel/infra-kernel-sources/files/hardened-sources-3.15.2-x86_64-infra27.config
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel/
commit: f98a16256ef6cd9bca297abf614b785de3bb5ffe Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo DOT org AuthorDate: Sun Jun 29 17:57:15 2014 + Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org CommitDate: Sun Jun 29 17:57:15 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=f98a1625 Update Manifest. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo.org --- sys-kernel/infra-kernel/Manifest | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-kernel/infra-kernel/Manifest b/sys-kernel/infra-kernel/Manifest index 69fffa7..59f1499 100644 --- a/sys-kernel/infra-kernel/Manifest +++ b/sys-kernel/infra-kernel/Manifest @@ -2,3 +2,5 @@ DIST infra-kernel-kernel-1.0-infra26.tbz2 8666996 SHA256 48aad43feec1989f6692e6f DIST infra-kernel-modules-1.0-infra26.tbz2 7970774 SHA256 68dfedc7704fdcaba0ddab75e3bdff69325aedf867e5a862fb28d88c453f622a SHA512 74815fc6786f62907c8d40269f530a702cce8d607838476a88243439ac3c38644aefa2a20e7db7e81376d49b292d2f48ccbd21316aee284783589253b03cebf2 WHIRLPOOL 82a1d85dc74e78da1d61d9280d95e5baaf486748c82057bffbe3340f779a0e6bdab0ec7f7cd0698ec13fd12ed68b1c6ec4567f76a11d817f779c46b84fb98af5 DIST infra-kernel-kernel-x86_64-3.13.6-r3-infra27.tbz2 9350068 SHA256 fd2f6b3b538fbb5815ca3a89978ce92a5503fdb45ef5c0a1e94abdbe2695c8e0 SHA512 53e9f6b10eba83a015ecc38b84b2437edb579d1fed0ce7008d054635e38816cce34236d66514a014938f034e9e9e5aefac45540d6661cc78d35ef3158c6bfbd6 WHIRLPOOL 8b5c47a343506bb29c0df5af6f2a94da1582bc0db9c4bdfba4be7d7da4aec3bb3ccbb526219b4e3f03c07dd0a21eadba2627289e2f812f03c9fa08796e215de6 DIST infra-kernel-modules-x86_64-3.13.6-r3-infra27.tbz2 8603252 SHA256 6e4d60cc8a390e95ea6eb6f0b82df64548642f7454dd6d2f6914c54e9afcb0e2 SHA512 4e6d6ba8e10e35674911353d7532d1ecfdbf599cf502108d7830543810a083e91c054e8e1bf81a82d706ecf173dbab6c5c6a3abcff6cf4ce0a3759a0c9e8 WHIRLPOOL 46d0e68f65e3bd00c1e4a9985dad0e185214f067e286d0be1e06b1ca9131ba659d3d95fd393ee3ac6ec5ae22a924234be0b6d9d480ac738fef7bbcf413db8658 +DIST infra-kernel-kernel-x86_64-3.15.2-infra27.tbz2 9506184 SHA256 b4150b413913d5d11d3be01de348bcef2c61275dd7815eaa1553bdd9b1183c0c SHA512 13f09060e5ce7042f41d96846e5e1c7dccc0822a2de1c7c51c2e24130c2a3197fa7fa00d9fb3b52dfc2c79d9eae3dbca73c19cd3e8e8cf928a09f545516f4a99 WHIRLPOOL e97600fb02915c29a56dc87cc0cde5d11cadac8ab4b849d62d57b25656c7048cc2f326d74cc58591f55212989c6549c72a6620e5c56a32934ee47642b25a75f5 +DIST infra-kernel-modules-x86_64-3.15.2-infra27.tbz2 8699256 SHA256 f2109c6f4f570065a3bd09ba582886c70c567a1e4bd9b72fca0a4d165e631012 SHA512 84b5bdfa28ef6924931dc392bc94d5aee0578196dac3c8de2e91d9338600ae60d6408e4dccd1ff979d3ee1fc834819b0441633004d7397422edbd70c1d8bb962 WHIRLPOOL 16b5e07bc4ec48b06282d3b46bd476e192bbc4e24538d31cf24777b0e72be58f076e50f42a217f75123113fb48767a330759fa5845e6967c0f7108561a63ee74
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel/
commit: 2935575c30c5eb17d842bac7ec968639e5a6c1a5
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Sun Jun 29 18:25:22 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Sun Jun 29 18:25:22 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=2935575c
Update kernel ebuild.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT
gentoo.org
---
sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild | 41 ++
1 file changed, 27 insertions(+), 14 deletions(-)
diff --git a/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
b/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
index f0e2f2d..ce38078 100644
--- a/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
+++ b/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
@@ -10,27 +10,28 @@ 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}
+KARCH_amd64=x86_64
+KARCH_x86=x86
BINPKG_PVR=${PVR}-${INFRA_SUFFIX}
-BINPKG_KERNEL=${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}
-BINPKG_MODULES=${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}
+BINPKG_KERNEL=${PN/-sources/}-kernel-KARCH-${BINPKG_PVR}
+BINPKG_MODULES=${PN/-sources/}-modules-KARCH-${BINPKG_PVR}
-KERNEL_URI=${BINPKG_KERNEL}.tbz2
-MODULES_URI=${BINPKG_MODULES}.tbz2
+URIBASE=https://distfiles:fetchubufe...@portage.infra.gentoo.org/distfiles/;
-CUSTOM_VERSION=${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}-${INFRA_SUFFIX}
-KERNEL_BIN=kernel-${KARCH}-${CUSTOM_VERSION}
-INITRAMFS_BIN=initramfs-${KARCH}-${CUSTOM_VERSION}
-SYSTEMMAP_BIN=System.map-${KARCH}-${CUSTOM_VERSION}
+KERNEL_URI_amd64=amd64? (
${URIBASE}${BINPKG_KERNEL/KARCH/${KARCH_x86_64}}.tbz2 )
+KERNEL_URI_x86=x86? ( ${URIBASE}${BINPKG_KERNEL/KARCH/${KARCH_x86}}.tbz2 )
+KERNEL_URI=$KERNEL_URI ${KERNEL_URI_amd64}
+#KERNEL_URI=$KERNEL_URI ${KERNEL_URI_x86}
-SRC_URI=
- amd64? ( ${KERNEL_URI//--/-x86_64-} ${MODULES_URI//--/-x86_64-} )
- x86? ( ${KERNEL_URI//--/-x86-} ${MODULES_URI//--/-x86-} )
-
+MODULES_URI_amd64=amd64? (
${URIBASE}${BINPKG_MODULES/KARCH/${KARCH_x86_64}}.tbz2 )
+MODULES_URI_x86=x86? ( ${URIBASE}${BINPKG_MODULES/KARCH/${KARCH_x86}}.tbz2 )
+MODULES_URI=$MODULES_URI ${MODULES_URI_amd64}
+#MODULES_URI=$MODULES_URI ${MODULES_URI_x86}
+
+SRC_URI=${KERNEL_URI} ${MODULES_URI}
DESCRIPTION=Package to install kernel + initramfs for Gentoo infra boxes
HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Infrastructure;
IUSE=
@@ -46,6 +47,18 @@ S=${WORKDIR}
src_install() {
+ # Use is not valid in global scope
+ use amd64 KARCH=${KARCH_amd64}
+ use x86 KARCH=${KARCH_x86}
+ [ -z $KARCH ] die Your arch is not supported by this build
+
+ [ ${KERNEL_REVISION} != r0 ]
KERNEL_REVISION_STRING=-${KERNEL_REVISION}
+
CUSTOM_VERSION=${KERNEL_PV}-${KERNEL_NAME}${KERNEL_REVISION_STRING}-${INFRA_SUFFIX}
+ KNAME=genkernel
+ KERNEL_BIN=kernel-${KNAME}-${KARCH}-${CUSTOM_VERSION}
+ INITRAMFS_BIN=initramfs-${KNAME}-${KARCH}-${CUSTOM_VERSION}
+ SYSTEMMAP_BIN=System.map-${KNAME}-${KARCH}-${CUSTOM_VERSION}
+
# copy the kernel and initramfs
insinto /boot
doins ${KERNEL_BIN}
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel/
commit: 56d863d43e8baaad06b54d505b66bb81d91727fb
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Sun Jun 29 18:31:59 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Sun Jun 29 18:31:59 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=56d863d4
I'm not using mirrors for these ebuilds.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT
gentoo.org
---
sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
b/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
index ce38078..569 100644
--- a/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
+++ b/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
@@ -19,15 +19,13 @@ BINPKG_PVR=${PVR}-${INFRA_SUFFIX}
BINPKG_KERNEL=${PN/-sources/}-kernel-KARCH-${BINPKG_PVR}
BINPKG_MODULES=${PN/-sources/}-modules-KARCH-${BINPKG_PVR}
-URIBASE=https://distfiles:fetchubufe...@portage.infra.gentoo.org/distfiles/;
-
-KERNEL_URI_amd64=amd64? (
${URIBASE}${BINPKG_KERNEL/KARCH/${KARCH_x86_64}}.tbz2 )
-KERNEL_URI_x86=x86? ( ${URIBASE}${BINPKG_KERNEL/KARCH/${KARCH_x86}}.tbz2 )
+KERNEL_URI_amd64=amd64? ( ${BINPKG_KERNEL/KARCH/${KARCH_x86_64}}.tbz2 )
+KERNEL_URI_x86=x86? ( ${BINPKG_KERNEL/KARCH/${KARCH_x86}}.tbz2 )
KERNEL_URI=$KERNEL_URI ${KERNEL_URI_amd64}
#KERNEL_URI=$KERNEL_URI ${KERNEL_URI_x86}
-MODULES_URI_amd64=amd64? (
${URIBASE}${BINPKG_MODULES/KARCH/${KARCH_x86_64}}.tbz2 )
-MODULES_URI_x86=x86? ( ${URIBASE}${BINPKG_MODULES/KARCH/${KARCH_x86}}.tbz2 )
+MODULES_URI_amd64=amd64? ( ${BINPKG_MODULES/KARCH/${KARCH_x86_64}}.tbz2 )
+MODULES_URI_x86=x86? ( ${BINPKG_MODULES/KARCH/${KARCH_x86}}.tbz2 )
MODULES_URI=$MODULES_URI ${MODULES_URI_amd64}
#MODULES_URI=$MODULES_URI ${MODULES_URI_x86}
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel/
commit: 9d56b753f360387fc4c3da68d6b0e5174f06b67b
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Sun Jun 29 18:33:26 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Sun Jun 29 18:33:26 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=9d56b753
Use the correct variable name.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT
gentoo.org
---
sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
b/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
index 569..384eece 100644
--- a/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
+++ b/sys-kernel/infra-kernel/infra-kernel-3.15.2.ebuild
@@ -19,12 +19,12 @@ BINPKG_PVR=${PVR}-${INFRA_SUFFIX}
BINPKG_KERNEL=${PN/-sources/}-kernel-KARCH-${BINPKG_PVR}
BINPKG_MODULES=${PN/-sources/}-modules-KARCH-${BINPKG_PVR}
-KERNEL_URI_amd64=amd64? ( ${BINPKG_KERNEL/KARCH/${KARCH_x86_64}}.tbz2 )
+KERNEL_URI_amd64=amd64? ( ${BINPKG_KERNEL/KARCH/${KARCH_amd64}}.tbz2 )
KERNEL_URI_x86=x86? ( ${BINPKG_KERNEL/KARCH/${KARCH_x86}}.tbz2 )
KERNEL_URI=$KERNEL_URI ${KERNEL_URI_amd64}
#KERNEL_URI=$KERNEL_URI ${KERNEL_URI_x86}
-MODULES_URI_amd64=amd64? ( ${BINPKG_MODULES/KARCH/${KARCH_x86_64}}.tbz2 )
+MODULES_URI_amd64=amd64? ( ${BINPKG_MODULES/KARCH/${KARCH_amd64}}.tbz2 )
MODULES_URI_x86=x86? ( ${BINPKG_MODULES/KARCH/${KARCH_x86}}.tbz2 )
MODULES_URI=$MODULES_URI ${MODULES_URI_amd64}
#MODULES_URI=$MODULES_URI ${MODULES_URI_x86}
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel/
commit: b1b543b60ed29620493ae2b8c5fb6aafdb574afe Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo DOT org AuthorDate: Thu Jun 26 04:10:58 2014 + Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org CommitDate: Thu Jun 26 04:10:58 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=b1b543b6 Update Manifest for infra-kernel. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo.org --- sys-kernel/infra-kernel/Manifest | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-kernel/infra-kernel/Manifest b/sys-kernel/infra-kernel/Manifest index 57ef83e..69fffa7 100644 --- a/sys-kernel/infra-kernel/Manifest +++ b/sys-kernel/infra-kernel/Manifest @@ -1,2 +1,4 @@ DIST infra-kernel-kernel-1.0-infra26.tbz2 8666996 SHA256 48aad43feec1989f6692e6f0cbc2a15c53edd8b488bb4c6e5dc5247d77045171 SHA512 f11b1e77b600942de2876b812d0d098a12a1f8c2b71c4763e6902cd7c7acc8df6a6d74194cb91d20012aa1d83012d582035dc23d2a2bb0baa5a5bcd8061c8084 WHIRLPOOL f335b13a123d918c952e534b221a09a515464f09190ce6a55060893babf8af894753893cba243fa2db9fb2be208d93fd571315c8c7bb1726bb305e7aefc0aa37 DIST infra-kernel-modules-1.0-infra26.tbz2 7970774 SHA256 68dfedc7704fdcaba0ddab75e3bdff69325aedf867e5a862fb28d88c453f622a SHA512 74815fc6786f62907c8d40269f530a702cce8d607838476a88243439ac3c38644aefa2a20e7db7e81376d49b292d2f48ccbd21316aee284783589253b03cebf2 WHIRLPOOL 82a1d85dc74e78da1d61d9280d95e5baaf486748c82057bffbe3340f779a0e6bdab0ec7f7cd0698ec13fd12ed68b1c6ec4567f76a11d817f779c46b84fb98af5 +DIST infra-kernel-kernel-x86_64-3.13.6-r3-infra27.tbz2 9350068 SHA256 fd2f6b3b538fbb5815ca3a89978ce92a5503fdb45ef5c0a1e94abdbe2695c8e0 SHA512 53e9f6b10eba83a015ecc38b84b2437edb579d1fed0ce7008d054635e38816cce34236d66514a014938f034e9e9e5aefac45540d6661cc78d35ef3158c6bfbd6 WHIRLPOOL 8b5c47a343506bb29c0df5af6f2a94da1582bc0db9c4bdfba4be7d7da4aec3bb3ccbb526219b4e3f03c07dd0a21eadba2627289e2f812f03c9fa08796e215de6 +DIST infra-kernel-modules-x86_64-3.13.6-r3-infra27.tbz2 8603252 SHA256 6e4d60cc8a390e95ea6eb6f0b82df64548642f7454dd6d2f6914c54e9afcb0e2 SHA512 4e6d6ba8e10e35674911353d7532d1ecfdbf599cf502108d7830543810a083e91c054e8e1bf81a82d706ecf173dbab6c5c6a3abcff6cf4ce0a3759a0c9e8 WHIRLPOOL 46d0e68f65e3bd00c1e4a9985dad0e185214f067e286d0be1e06b1ca9131ba659d3d95fd393ee3ac6ec5ae22a924234be0b6d9d480ac738fef7bbcf413db8658
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-source/
commit: 201cc2669e7e474db6f993b1712953a5686aac25
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Fri Jun 20 19:33:25 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Fri Jun 20 19:33:25 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=201cc266
Let's try using --kernname.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT
gentoo.org
---
sys-kernel/infra-kernel-source/infra-kernel-source-3.13.6-r3.ebuild | 1 +
1 file changed, 1 insertion(+)
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
index eb0eabe..cf5a4a6 100644
--- 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
@@ -140,6 +140,7 @@ src_compile() {
--e2fsprogs \
--mdadm --mdadm-config=${FILESDIR}/mdadm.conf-1.0 \
\
+ --kernname=${PN}-${KARCH}
--minkernpackage=${T}/${BINPKG_KERNEL} \
--modulespackage=${T}/${BINPKG_MODULES} \
\
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel/, sys-kernel/infra-kernel-source/
commit: 8ec836a36cb09955f758534207f7a792c93adb80
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Fri Jun 20 19:30:46 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Fri Jun 20 19:30:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=8ec836a3
Add updates from infra overlay.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT
gentoo.org
---
.../infra-kernel-source-3.13.6-r3.ebuild | 10 +-
...ernel-1.0.ebuild = infra-kernel-3.13.6-r3.ebuild} | 19 +--
2 files changed, 14 insertions(+), 15 deletions(-)
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
index 273eb6e..eb0eabe 100644
--- 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
@@ -7,8 +7,8 @@ inherit flag-o-matic
KERNEL_SOURCES=hardened-sources
KERNEL_NAME=hardened
-KERNEL_PV=3.13.6
-KERNEL_REVISION=r3
+KERNEL_PV=$PV
+KERNEL_REVISION=$PR
INFRA_SUFFIX=infra27
KERNEL_PVR=${KERNEL_PV}-${KERNEL_REVISION}
@@ -16,8 +16,8 @@ KERNEL_PF=${KERNEL_SOURCES}-${KERNEL_PVR}
KERNEL_DIR=linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}
BINPKG_PVR=${PVR}-${INFRA_SUFFIX}
-BINPKG_KERNEL=${PN/-source/}-kernel-${BINPKG_PVR}.tbz2
-BINPKG_MODULES=${PN/-source/}-modules-${BINPKG_PVR}.tbz2
+BINPKG_KERNEL=${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}.tbz2
+BINPKG_MODULES=${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}.tbz2
KERNEL_CONFIG=${FILESDIR}/${KERNEL_PF}-${INFRA_SUFFIX}.config
BUILD_DIR=/home/upload-kernel/
@@ -46,7 +46,7 @@ pkg_setup() {
strip-flags
filter-flags -march=* -mtune=* -mcpu=* -frecord-gcc-switches
use amd64 append-flags -march=x86-64 -mtune=generic
- use x86 append-flags -march=pentium4 -mtune=generic
+ use x86 append-flags -march=pentium3 -mtune=generic
}
src_unpack() {
diff --git a/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild
b/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild
similarity index 71%
rename from sys-kernel/infra-kernel/infra-kernel-1.0.ebuild
rename to sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild
index 0ef992a..1031ed3 100644
--- a/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild
+++ b/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild
@@ -7,25 +7,23 @@ EAPI=5
inherit mount-boot multilib
KERNEL_NAME=hardened
-KERNEL_PV=3.13.2
-KERNEL_REVISION=r3
-INFRA_SUFFIX=infra26
+KERNEL_PV=$PV
+KERNEL_REVISION=$PR
+INFRA_SUFFIX=infra27
KARCH=x86_64
KERNEL_PVR=${KERNEL_PV}-${KERNEL_REVISION}
KERNEL_PF=${KERNEL_SOURCES}-${KERNEL_PVR}
BINPKG_PVR=${PVR}-${INFRA_SUFFIX}
-BINPKG_KERNEL=${PN/-source/}-kernel-${BINPKG_PVR}.tbz2
-BINPKG_MODULES=${PN/-source/}-modules-${BINPKG_PVR}.tbz2
+BINPKG_KERNEL=${PN/-source/}-kernel-${KARCH}-${BINPKG_PVR}
+BINPKG_MODULES=${PN/-source/}-modules-${KARCH}-${BINPKG_PVR}
-#KERNEL_URI=http://www.jmbsvicetto.name/gentoo-infra/${BINPKG_KERNEL};
-#MODULES_URI=http://www.jmbsvicetto.name/gentoo-infra/${BINPKG_MODULES};
-KERNEL_URI=mirror:://gentoo/${BINPKG_KERNEL}.tbz2
-MODULES_URI=mirror:://gentoo/${BINPKG_MODULES}.tbz2
+KERNEL_URI=${BINPKG_KERNEL}.tbz2
+MODULES_URI=${BINPKG_MODULES}.tbz2
CUSTOM_VERSION=${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}-${INFRA_SUFFIX}
-KERNEL_BIN=kernel-${CUSTOM_VERSION}
+KERNEL_BIN=kernel-${KARCH}-${CUSTOM_VERSION}
INITRAMFS_BIN=initramfs-${KARCH}-${CUSTOM_VERSION}
SYSTEMMAP_BIN=System.map-${KARCH}-${CUSTOM_VERSION}
@@ -33,6 +31,7 @@ SRC_URI=${KERNEL_URI} ${MODULES_URI}
DESCRIPTION=Package to install kernel + initramfs for Gentoo infra boxes
HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Infrastructure;
IUSE=
+RESTRICT=fetch
LICENSE=GPL-2
SLOT=0
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-sources/files/, sys-kernel/infra-kernel-source/files/, ...
commit: 65e65c08557ecae68ea658e282801390389d3247
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Fri Jun 20 19:37:54 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Fri Jun 20 19:37:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=65e65c08
Rename kernel package s/source/sources/.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT
gentoo.org
---
.../infra-kernel-source-3.8.2-r1.ebuild| 162 -
.../hardened-sources-3.13.2-r3-infra25.config | 0
.../hardened-sources-3.13.2-r3-infra26.config | 0
.../hardened-sources-3.13.6-r3-infra27.config | 0
.../files/hardened-sources-3.8.2-r1-infra25.config | 0
.../files/mdadm.conf-1.0 | 0
.../infra-kernel-sources-3.13.2-r3.ebuild} | 0
.../infra-kernel-sources-3.13.6-r3.ebuild} | 0
.../metadata.xml | 0
9 files changed, 162 deletions(-)
diff --git a/sys-kernel/infra-kernel-source/infra-kernel-source-3.8.2-r1.ebuild
b/sys-kernel/infra-kernel-source/infra-kernel-source-3.8.2-r1.ebuild
deleted file mode 100644
index f69d1eb..000
--- a/sys-kernel/infra-kernel-source/infra-kernel-source-3.8.2-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit flag-o-matic
-
-KERNEL_SOURCES=hardened-sources
-KERNEL_NAME=hardened
-KERNEL_PV=3.8.2
-KERNEL_REVISION=r1
-INFRA_SUFFIX=infra25
-
-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/-source/}-kernel-${BINPKG_PVR}.tbz2
-BINPKG_MODULES=${PN/-source/}-modules-${BINPKG_PVR}.tbz2
-KERNEL_CONFIG=${FILESDIR}/${KERNEL_PF}-${INFRA_SUFFIX}.config
-
-BUILD_DIR=/home/upload-kernel/
-
-DESCRIPTION=Package to build kernel + initramfs for Gentoo infra boxes
-HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Infrastructure;
-IUSE=
-
-LICENSE=GPL-2
-SLOT=0
-KEYWORDS=~amd64 ~x86
-
-DEPEND=
- sys-apps/fakeroot
- sys-fs/lvm2
- =sys-kernel/genkernel-3.4.49.1
- =sys-kernel/${KERNEL_PF}
-RDEPEND=
-
-S=${WORKDIR}
-
-pkg_setup() {
- [ -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
- strip-flags
- filter-flags -march=* -mtune=* -mcpu=* -frecord-gcc-switches
- use amd64 append-flags -march=x86-64 -mtune=generic
- use x86 append-flags -march=pentium4 -mtune=generic
-}
-
-src_unpack() {
- mkdir -p ${T}/{cache,tmp,kernel-output}
-}
-
-src_prepare() {
- # copy the kernel sources, this is potentially large, but nothing we
can do.
- # if it's dirty, the build will fail
- # symlinks do not work either
- mkdir -p ${S}/usr/src
- cp -a /usr/src/${KERNEL_DIR} ${S}/usr/src || die
- cd ${S}/usr/src/${KERNEL_DIR}
- _ARCH=$ARCH
- unset ARCH
- emake mrproper || die Failed to cleanup
- export ARCH=$_ARCH
-}
-
-# This deliberately runs a very sterile genkernel
-# that IGNORES the system /etc/genkernel.conf
-# so that we get more reproducable builds
-# almost all the options are easy with this except GK_SHARE
-# fakeroot is here because genkernel uses mknod still
-# which fails as non-root
-genkernel_sterile() {
- _DISTDIR=${DISTDIR}
- # the parsing of --config seems to be broken in v3.4.44.2
- #--config=${emptyconfig} \
- emptyconfig=${T}/empty
- touch ${emptyconfig}
- CMD_GK_CONFIG=${emptyconfig} \
- GK_SHARE=${ROOT}/usr/share/genkernel \
- DISTDIR=${ROOT}/var/cache/genkernel/src/ \
- CFLAGS=${CFLAGS} \
- CXXFLAGS=${CXXFLAGS} \
- fakeroot genkernel \
- --loglevel=1 \
- --no-menuconfig \
- --no-gconfig \
- --no-xconfig \
- --no-save-config \
- --oldconfig \
- --no-clean \
- --no-mrproper \
- --no-symlink \
- --no-mountboot \
- --no-lvm \
- --no-mdadm \
- --no-dmraid \
- --no-multipath \
- --no-iscsi \
- --no-disklabel \
- --no-luks \
- --no-gpg \
- --no-busybox \
- --no-postclear \
- --no-install \
- --no-zfs \
- --no-keymap \
- --no-e2fsprogs \
- --no-unionfs \
- --no-netboot \
- --compress-initramfs \
- --ramdisk-modules \
-
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel/
commit: 87f418d8ced3216a2b428a656fee8aa285e19fd2
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Fri Jun 20 19:38:57 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Fri Jun 20 19:38:57 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=87f418d8
Fix kernel name s/source/sources/.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT
gentoo.org
---
sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild
b/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild
index 1031ed3..1bb839d 100644
--- a/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild
+++ b/sys-kernel/infra-kernel/infra-kernel-3.13.6-r3.ebuild
@@ -16,8 +16,8 @@ KERNEL_PVR=${KERNEL_PV}-${KERNEL_REVISION}
KERNEL_PF=${KERNEL_SOURCES}-${KERNEL_PVR}
BINPKG_PVR=${PVR}-${INFRA_SUFFIX}
-BINPKG_KERNEL=${PN/-source/}-kernel-${KARCH}-${BINPKG_PVR}
-BINPKG_MODULES=${PN/-source/}-modules-${KARCH}-${BINPKG_PVR}
+BINPKG_KERNEL=${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}
+BINPKG_MODULES=${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}
KERNEL_URI=${BINPKG_KERNEL}.tbz2
MODULES_URI=${BINPKG_MODULES}.tbz2
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-sources/
commit: 03831c6290be177299c7caaa08cc16145bb384b7
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Fri Jun 20 19:55:45 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Fri Jun 20 19:55:45 2014 +
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} \
\
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-source/
commit: 22371984d77b67548218ba890440d9eabea35775
Author: Robin H. Johnson robbat2 AT orbis-terrarum DOT net
AuthorDate: Mon Apr 14 01:36:52 2014 +
Commit: Robin H. Johnson robbat2 AT gentoo DOT org
CommitDate: Mon Apr 14 01:36:52 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=22371984
Update genkernel version.
Signed-off-by: Robin H. Johnson robbat2 AT orbis-terrarum.net
---
sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
b/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
index 80dd854..124622e 100644
--- a/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
+++ b/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
@@ -32,7 +32,7 @@ KEYWORDS=~amd64 ~x86
DEPEND=
sys-apps/fakeroot
sys-fs/lvm2
- =sys-kernel/genkernel-
+ =sys-kernel/genkernel-3.4.49.1
=sys-kernel/${KERNEL_PF}
RDEPEND=
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-source/files/
commit: 69579fb89d1e4e5cfb0341f1cfbe55b39c9c89c9 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo DOT org AuthorDate: Mon Apr 14 03:50:53 2014 + Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org CommitDate: Mon Apr 14 03:50:53 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=69579fb8 Bump localversion. --- .../infra-kernel-source/files/hardened-sources-3.13.2-r3-infra26.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-kernel/infra-kernel-source/files/hardened-sources-3.13.2-r3-infra26.config b/sys-kernel/infra-kernel-source/files/hardened-sources-3.13.2-r3-infra26.config index ea84645..6959f0e 100644 --- a/sys-kernel/infra-kernel-source/files/hardened-sources-3.13.2-r3-infra26.config +++ b/sys-kernel/infra-kernel-source/files/hardened-sources-3.13.2-r3-infra26.config @@ -49,7 +49,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE= # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION=-infra25 +CONFIG_LOCALVERSION=-infra26 CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel/
commit: e0bdb7549970a4308aa5ee85c5c0df62050e9929
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT gentoo
DOT org
AuthorDate: Mon Apr 14 04:37:46 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Mon Apr 14 04:37:46 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=e0bdb754
Update config to reflect changes in infra-kernel-source and allow correct
installation.
---
sys-kernel/infra-kernel/Manifest| 4 +--
sys-kernel/infra-kernel/infra-kernel-1.0.ebuild | 34 ++---
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/sys-kernel/infra-kernel/Manifest b/sys-kernel/infra-kernel/Manifest
index 03692f0..57ef83e 100644
--- a/sys-kernel/infra-kernel/Manifest
+++ b/sys-kernel/infra-kernel/Manifest
@@ -1,2 +1,2 @@
-DIST initramfs-genkernel-x86_64-3.13.2-r3 13 SHA256
b7db4277a870e10e671cdadb7516a5f1c8013dc81615f8febec85d335d049267 SHA512
06daf39d030c98ea542ef3004fe6305476c15fce718f515855f888d24b5abc1fd4bd7783ccc655e646e8c4f1aeb640f7ae0d38fbf49332c3475bdd1db3723ec0
WHIRLPOOL
e8b407e332f8573c3fe4e23cdda76143f4f29b024f323692f5377eb433c843695eb8448fb26889ff863f1afb86f61a7cf1ee99f40f553e9d8dbc83f76e80a9ba
-DIST kernel-genkernel-x86_64-3.13.2-r3 13 SHA256
b7db4277a870e10e671cdadb7516a5f1c8013dc81615f8febec85d335d049267 SHA512
06daf39d030c98ea542ef3004fe6305476c15fce718f515855f888d24b5abc1fd4bd7783ccc655e646e8c4f1aeb640f7ae0d38fbf49332c3475bdd1db3723ec0
WHIRLPOOL
e8b407e332f8573c3fe4e23cdda76143f4f29b024f323692f5377eb433c843695eb8448fb26889ff863f1afb86f61a7cf1ee99f40f553e9d8dbc83f76e80a9ba
+DIST infra-kernel-kernel-1.0-infra26.tbz2 8666996 SHA256
48aad43feec1989f6692e6f0cbc2a15c53edd8b488bb4c6e5dc5247d77045171 SHA512
f11b1e77b600942de2876b812d0d098a12a1f8c2b71c4763e6902cd7c7acc8df6a6d74194cb91d20012aa1d83012d582035dc23d2a2bb0baa5a5bcd8061c8084
WHIRLPOOL
f335b13a123d918c952e534b221a09a515464f09190ce6a55060893babf8af894753893cba243fa2db9fb2be208d93fd571315c8c7bb1726bb305e7aefc0aa37
+DIST infra-kernel-modules-1.0-infra26.tbz2 7970774 SHA256
68dfedc7704fdcaba0ddab75e3bdff69325aedf867e5a862fb28d88c453f622a SHA512
74815fc6786f62907c8d40269f530a702cce8d607838476a88243439ac3c38644aefa2a20e7db7e81376d49b292d2f48ccbd21316aee284783589253b03cebf2
WHIRLPOOL
82a1d85dc74e78da1d61d9280d95e5baaf486748c82057bffbe3340f779a0e6bdab0ec7f7cd0698ec13fd12ed68b1c6ec4567f76a11d817f779c46b84fb98af5
diff --git a/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild
b/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild
index 7dad7f7..0ef992a 100644
--- a/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild
+++ b/sys-kernel/infra-kernel/infra-kernel-1.0.ebuild
@@ -6,15 +6,30 @@ EAPI=5
inherit mount-boot multilib
-KERNEL_SOURCES=hardened-sources
+KERNEL_NAME=hardened
KERNEL_PV=3.13.2
KERNEL_REVISION=r3
-KERNEL_VERSION=${KERNEL_PV}-${KERNEL_REVISION}
-GENKERNEL_NAME=genkernel-x86_64-${KERNEL_PV}-hardened-${KERNEL_REVISION}
-KERNEL_URI=mirror:://gentoo-infra/${PN}-kernel-${PVR}.tbz2
-MODULES_URI=mirror:://gentoo-infra/${PN}-modules-${PVR}.tbz2
+INFRA_SUFFIX=infra26
+KARCH=x86_64
-SRC_URI=${KERNEL_URI} ${INIT_URI}
+KERNEL_PVR=${KERNEL_PV}-${KERNEL_REVISION}
+KERNEL_PF=${KERNEL_SOURCES}-${KERNEL_PVR}
+
+BINPKG_PVR=${PVR}-${INFRA_SUFFIX}
+BINPKG_KERNEL=${PN/-source/}-kernel-${BINPKG_PVR}.tbz2
+BINPKG_MODULES=${PN/-source/}-modules-${BINPKG_PVR}.tbz2
+
+#KERNEL_URI=http://www.jmbsvicetto.name/gentoo-infra/${BINPKG_KERNEL};
+#MODULES_URI=http://www.jmbsvicetto.name/gentoo-infra/${BINPKG_MODULES};
+KERNEL_URI=mirror:://gentoo/${BINPKG_KERNEL}.tbz2
+MODULES_URI=mirror:://gentoo/${BINPKG_MODULES}.tbz2
+
+CUSTOM_VERSION=${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}-${INFRA_SUFFIX}
+KERNEL_BIN=kernel-${CUSTOM_VERSION}
+INITRAMFS_BIN=initramfs-${KARCH}-${CUSTOM_VERSION}
+SYSTEMMAP_BIN=System.map-${KARCH}-${CUSTOM_VERSION}
+
+SRC_URI=${KERNEL_URI} ${MODULES_URI}
DESCRIPTION=Package to install kernel + initramfs for Gentoo infra boxes
HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Infrastructure;
IUSE=
@@ -31,12 +46,13 @@ src_install() {
# copy the kernel and initramfs
insinto /boot
- doins kernel-${GENKERNEL_NAME}
- doins initramfs-${GENKERNEL_NAME}
+ doins ${KERNEL_BIN}
+ doins ${INITRAMFS_BIN}
+ doins ${SYSTEMMAP_BIN}
# copy the modules dir
insinto /$(get_libdir)/modules
- doins -r ${KERNEL_PV}-hardened-${KERNEL_REVISION}
+ doins -r lib/modules/${CUSTOM_VERSION}
}
pkg_preinst() {
[gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-source/
commit: 2d13d6890c9f2f70bb330838531288daf09c
Author: Robin H. Johnson robbat2 AT gentoo DOT org
AuthorDate: Sun Apr 6 02:27:11 2014 +
Commit: Jorge Manuel B. S. Vicetto jmbsvicetto AT gentoo DOT org
CommitDate: Sun Apr 6 02:27:11 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=2d13
Add Robin's updates.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) jmbsvicetto AT
gentoo.org
---
.../infra-kernel-source-1.0.ebuild | 67 +++---
1 file changed, 59 insertions(+), 8 deletions(-)
diff --git a/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
b/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
index d839633..4d11e97 100644
--- a/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
+++ b/sys-kernel/infra-kernel-source/infra-kernel-source-1.0.ebuild
@@ -26,7 +26,7 @@ KEYWORDS=~amd64 ~x86
DEPEND=
sys-fs/lvm2
- sys-kernel/genkernel
+ =sys-kernel/genkernel-
=sys-kernel/${KERNEL_SOURCES}-${KERNEL_VERSION}
@@ -34,8 +34,54 @@ S=${WORKDIR}
src_unpack() {
# copy the kernel sources
- mkdir -p usr/src
- cp -a /usr/src/linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}
usr/src || die
+ #mkdir -p usr/src
+ #cp -a /usr/src/linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}
usr/src || die
+ mkdir -p ${T}/{cache,tmp,kernel-output}
+}
+
+# This deliberately runs a very sterile genkernel
+# that IGNORES the system /etc/genkernel.conf
+# so that we get more reproducable builds
+# almost all the options are easy with this except GK_SHARE
+genkernel_sterile() {
+ _DISTDIR=${DISTDIR}
+ # the parsing of --config seems to be broken in v3.4.44.2
+ #--config=${emptyconfig} \
+ emptyconfig=${T}/empty
+ touch ${emptyconfig}
+ CMD_GK_CONFIG=${emptyconfig} \
+ GK_SHARE=${ROOT}/usr/share/genkernel \
+ DISTDIR=${ROOT}/var/cache/genkernel/src/ \
+ genkernel \
+ --loglevel=1 \
+ --no-menuconfig \
+ --no-gconfig \
+ --no-xconfig \
+ --no-save-config \
+ --oldconfig \
+ --no-clean \
+ --no-mrproper \
+ --no-symlink \
+ --no-mountboot \
+ --no-lvm \
+ --no-mdadm \
+ --no-dmraid \
+ --no-multipath \
+ --no-iscsi \
+ --no-disklabel \
+ --no-luks \
+ --no-gpg \
+ --no-busybox \
+ --no-postclear \
+ --no-install \
+ --no-zfs \
+ --no-keymap \
+ --no-e2fsprogs \
+ --no-unionfs \
+ --no-netboot \
+ --compress-initramfs \
+ --ramdisk-modules \
+ $@
}
src_compile() {
@@ -44,13 +90,18 @@ src_compile() {
addpredict /dev
# call genkernel to build the kernel + initramfs
- genkernel --minkernpackage=/${KERNEL_PKG}
--modulespackage=/${MODULES_PKG} \
+ genkernel_sterile \
+ --loglevel=5 \
+ --makeopts=${MAKEOPTS} \
+ --logfile=${T}/genkernel.log --cachedir=${T}/cache
--tempdir=${T}/tmp \
+ --minkernpackage=${T}/${KERNEL_PKG}
--modulespackage=${T}/${MODULES_PKG} \
--kernel-config=${FILESDIR}/${KERNEL_SOURCES}-${KERNEL_VERSION}.config \
+
--kerneldir=/usr/src/linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION} \
+ --kernel-outputdir=${T}/kernel-output \
+ --module-prefix=${T} \
+ --lvm --disklabel --busybox \
--mdadm --mdadm-config=${FILESDIR}/mdadm.conf \
- --lvm --disklabel --busybox --no-install --no-save-config \
- --logfile=${T}/genkernel.log --cachedir=${T}/cache
--tempdir=${T}/tmp \
-
--kerneldir=${S}/usr/src/linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}
\
- --module-prefix=${T} all
+ all
}
pkg_preinst() {
