commit: 8ec836a36cb09955f758534207f7a792c93adb80 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> AuthorDate: Fri Jun 20 19:30:46 2014 +0000 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> CommitDate: Fri Jun 20 19:30:46 2014 +0000 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"