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

[Jorge Manuel B. S. Vicetto]

commit:     65e65c08557ecae68ea658e282801390389d3247
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 20 19:37:54 2014 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 19:37:54 2014 +0000
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..0000000
--- 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 \
-		--no-debug-cleanup \
-		"$@"
-}
-
-src_compile() {
-
-	addpredict "/etc/kernels"
-	addpredict "/dev"
-
-	# call genkernel to build the kernel + initramfs
-	genkernel_sterile \
-		--loglevel=5 \
-		--logfile="${T}"/genkernel.log \
-		--cachedir="${T}"/cache \
-		--tempdir="${T}"/tmp \
-		\
-		--makeopts="${MAKEOPTS}" \
-		--kerneldir="/usr/src/${KERNEL_DIR}"  \
-		--kernel-outputdir="${T}/kernel-output" \
-		--kernel-config="${KERNEL_CONFIG}" \
-		--module-prefix="${T}" \
-		\
-		--lvm \
-		--disklabel \
-		--busybox \
-		--e2fsprogs \
-		--mdadm --mdadm-config="${FILESDIR}/mdadm.conf-1.0" \
-		\
-		--minkernpackage="${T}"/${BINPKG_KERNEL} \
-		--modulespackage="${T}"/${BINPKG_MODULES} \
-		\
-		all \
-	|| die "genkernel failed"
-}
-
-src_install() {
-	return 0
-}
-
-pkg_preinst() {
-	# copy the built kernel + initramfs
-	mkdir -p "${BUILD_DIR}"
-	cp -f "${T}"/${BINPKG_KERNEL} "${BUILD_DIR}" || die "Failed to copy kernel package"
-	cp -f "${T}"/${BINPKG_MODULES} "${BUILD_DIR}" || die "Failed to copy module package"
-	einfo "${BINPKG_KERNEL} and ${BINPKG_MODULES} are in ${BUILD_DIR}"
-	# mirror the packages
-	# scp ...
-}

diff --git a/sys-kernel/infra-kernel-source/files/hardened-sources-3.13.2-r3-infra25.config b/sys-kernel/infra-kernel-sources/files/hardened-sources-3.13.2-r3-infra25.config
similarity index 100%
rename from sys-kernel/infra-kernel-source/files/hardened-sources-3.13.2-r3-infra25.config
rename to sys-kernel/infra-kernel-sources/files/hardened-sources-3.13.2-r3-infra25.config

diff --git a/sys-kernel/infra-kernel-source/files/hardened-sources-3.13.2-r3-infra26.config b/sys-kernel/infra-kernel-sources/files/hardened-sources-3.13.2-r3-infra26.config
similarity index 100%
rename from sys-kernel/infra-kernel-source/files/hardened-sources-3.13.2-r3-infra26.config
rename to sys-kernel/infra-kernel-sources/files/hardened-sources-3.13.2-r3-infra26.config

diff --git a/sys-kernel/infra-kernel-source/files/hardened-sources-3.13.6-r3-infra27.config b/sys-kernel/infra-kernel-sources/files/hardened-sources-3.13.6-r3-infra27.config
similarity index 100%
rename from sys-kernel/infra-kernel-source/files/hardened-sources-3.13.6-r3-infra27.config
rename to sys-kernel/infra-kernel-sources/files/hardened-sources-3.13.6-r3-infra27.config

diff --git a/sys-kernel/infra-kernel-source/files/hardened-sources-3.8.2-r1-infra25.config b/sys-kernel/infra-kernel-sources/files/hardened-sources-3.8.2-r1-infra25.config
similarity index 100%
rename from sys-kernel/infra-kernel-source/files/hardened-sources-3.8.2-r1-infra25.config
rename to sys-kernel/infra-kernel-sources/files/hardened-sources-3.8.2-r1-infra25.config

diff --git a/sys-kernel/infra-kernel-source/files/mdadm.conf-1.0 b/sys-kernel/infra-kernel-sources/files/mdadm.conf-1.0
similarity index 100%
rename from sys-kernel/infra-kernel-source/files/mdadm.conf-1.0
rename to sys-kernel/infra-kernel-sources/files/mdadm.conf-1.0

diff --git a/sys-kernel/infra-kernel-source/infra-kernel-source-3.13.2-r3.ebuild b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.2-r3.ebuild
similarity index 100%
rename from sys-kernel/infra-kernel-source/infra-kernel-source-3.13.2-r3.ebuild
rename to sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.2-r3.ebuild

diff --git a/sys-kernel/infra-kernel-source/infra-kernel-source-3.13.6-r3.ebuild b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild
similarity index 100%
rename from sys-kernel/infra-kernel-source/infra-kernel-source-3.13.6-r3.ebuild
rename to sys-kernel/infra-kernel-sources/infra-kernel-sources-3.13.6-r3.ebuild

diff --git a/sys-kernel/infra-kernel-source/metadata.xml b/sys-kernel/infra-kernel-sources/metadata.xml
similarity index 100%
rename from sys-kernel/infra-kernel-source/metadata.xml
rename to sys-kernel/infra-kernel-sources/metadata.xml