summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-01-04 16:06:57 +0100
committerMichał Górny <mgorny@gentoo.org>2020-01-04 16:06:57 +0100
commit269d880e1ca0b649d211da71e7c72b14d506a7df (patch)
tree14b65c4a17601372163afba91e79773c4b49c532 /sys-kernel
parentsys-kernel/vanilla-kernel: Remove old (diff)
downloadgentoo-269d880e1ca0b649d211da71e7c72b14d506a7df.tar.gz
gentoo-269d880e1ca0b649d211da71e7c72b14d506a7df.tar.bz2
gentoo-269d880e1ca0b649d211da71e7c72b14d506a7df.zip
sys-kernel/vanilla-kernel-bin: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/vanilla-kernel-bin/Manifest2
-rw-r--r--sys-kernel/vanilla-kernel-bin/metadata.xml8
-rw-r--r--sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.6.ebuild174
3 files changed, 4 insertions, 180 deletions
diff --git a/sys-kernel/vanilla-kernel-bin/Manifest b/sys-kernel/vanilla-kernel-bin/Manifest
index a5340a12b78c..ec54297a6eee 100644
--- a/sys-kernel/vanilla-kernel-bin/Manifest
+++ b/sys-kernel/vanilla-kernel-bin/Manifest
@@ -1,6 +1,4 @@
DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
-DIST vanilla-kernel-5.4.6-r1-1.amd64.xpak 89795144 BLAKE2B cca6e78f991cc79165a528d95fa1202b6f99dcf763f890609a0bf3e273cb81e786e39365a89e14282b75e259aa298b7349ee2868ef8437faae400475ad7e1c42 SHA512 de609b831db05c42350fe57e3248be3208c190ff99082088b5d2a1d69ec54734784f8143befbfd397deb9446228781ba25c1e50ecc020a651f6beda30be6ba97
-DIST vanilla-kernel-5.4.6-r1-1.x86.xpak 81308308 BLAKE2B f499c5a8e65d3754fd0e1ba65a2dfa7eb4fa9b8cbdf5e5957186dc40b1c5572dd66433284529b0ca93b7a3073103243d5f45ad8749ca891b1f86d838cbf363be SHA512 f8334097566ce8b1852ec65a5205221a2bb5193fc638756e87f6da2199cde1d1e73f85f9dd60679fccd18be11055c37da873b92a0e209775e7a9926f6ae94134
DIST vanilla-kernel-5.4.7-1.amd64.xpak 67980060 BLAKE2B 6bff3c16edc33dc65eedc55290d83cd26bf23bcf70addff39f43ba0d2fe9a678bc8bd2ba259802c95032132dce14e6866f15c30d66c4be23d82b88fa7e33d2f1 SHA512 edad0f70a46d2398702beeed442a84818d9d34cbd057372ad1175e7c2d944d59f6c5dbe2731658ed4c74eb66ffc3dd542b2589b1e776095c457b6347872d3dc4
DIST vanilla-kernel-5.4.7-1.x86.xpak 59512079 BLAKE2B be8b611d164cb0e17fc9232eebdd642ea3e7926acf0c8628dde6bfe4de9d5600fca8f33aeba039bffce574926d7f1dff5bfa9910ed42553fa168e6104207fa13 SHA512 9d2a59824f7ce0cd01ea5aced3a95c4e2ac44ca4ad82cf5997987f9b0df730650cb8c8c5a83476084e427af345ad4d5515eb996dd2db5d5c7fa21c0eb1d8871e
diff --git a/sys-kernel/vanilla-kernel-bin/metadata.xml b/sys-kernel/vanilla-kernel-bin/metadata.xml
index cd6a1d015181..b78799ea4a87 100644
--- a/sys-kernel/vanilla-kernel-bin/metadata.xml
+++ b/sys-kernel/vanilla-kernel-bin/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>dist-kernel@gentoo.org</email>
+ <name>Distribution Kernel Project</name>
+ </maintainer>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
<use>
<flag name='initramfs'>Build initramfs along with the kernel.</flag>
</use>
diff --git a/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.6.ebuild b/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.6.ebuild
deleted file mode 100644
index 7d051f6f0055..000000000000
--- a/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.6.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit mount-boot
-
-MY_P=vanilla-kernel-${PV}-r1-1
-TCL_VER=10.1
-DESCRIPTION="Pre-built vanilla Linux kernel"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI="
- amd64? (
- https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/vanilla-kernel/${MY_P}.xpak
- -> ${MY_P}.amd64.xpak
- test? (
- https://dev.gentoo.org/~mgorny/dist/tinycorelinux-${TCL_VER}-amd64.qcow2
- )
- )
- x86? (
- https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/vanilla-kernel/${MY_P}.xpak
- -> ${MY_P}.x86.xpak
- test? (
- https://dev.gentoo.org/~mgorny/dist/tinycorelinux-${TCL_VER}-x86.qcow2
- )
- )"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+initramfs test"
-RESTRICT="!test? ( test ) test? ( userpriv )"
-
-# install-DEPEND actually
-# note: we need installkernel with initramfs support!
-RDEPEND="
- || (
- sys-kernel/installkernel-gentoo
- sys-kernel/installkernel-systemd-boot
- )
- initramfs? ( >=sys-kernel/dracut-049-r2 )
- !sys-kernel/vanilla-kernel:${SLOT}"
-BDEPEND="
- test? (
- dev-tcltk/expect
- sys-kernel/dracut
- amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] )
- x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] )
- )"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
- mount-boot_pkg_pretend
-
- ewarn "This is an experimental package. The built kernel and/or initramfs"
- ewarn "may not work at all or fail with your bootloader configuration. Please"
- ewarn "make sure to keep a backup kernel available before testing it."
-}
-
-src_unpack() {
- ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
- tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
- eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
- local image_arch=${ARCH}
- local qemu_arch=$(usex amd64 x86_64 i386)
-
- dracut \
- --conf /dev/null \
- --confdir /dev/null \
- --no-hostonly \
- --kmoddir "lib/modules/${PV}" \
- "${T}/initrd" "${PV}" || die
- cp "${DISTDIR}/tinycorelinux-${TCL_VER}-${image_arch}.qcow2" \
- "${T}/fs.qcow2" || die
-
- cd "${T}" || die
- cat > run.sh <<-EOF || die
- #!/bin/sh
- exec qemu-system-${qemu_arch} \
- -m 256M \
- -display none \
- -no-reboot \
- -kernel '${WORKDIR}/usr/src/linux-${PV}/bzImage' \
- -initrd '${T}/initrd' \
- -serial mon:stdio \
- -hda '${T}/fs.qcow2' \
- -append 'root=/dev/sda console=ttyS0,115200n8'
- EOF
- chmod +x run.sh || die
- # TODO: initramfs does not let core finish starting on some systems,
- # figure out how to make it better at that
- expect - <<-EOF || die "Booting kernel failed"
- set timeout 900
- spawn ./run.sh
- expect {
- "Kernel panic" {
- send_error "\n* Kernel panic"
- exit 1
- }
- "Entering emergency mode" {
- send_error "\n* Initramfs failed to start the system"
- exit 1
- }
- "Core 10.1" {
- send_error "\n* Booted to login"
- exit 0
- }
- timeout {
- send_error "\n* Kernel boot timed out"
- exit 2
- }
- }
- EOF
-}
-
-src_install() {
- mv * "${ED}" || die
-}
-
-pkg_preinst() {
- :
-}
-
-pkg_postinst() {
- if [[ -z ${ROOT} ]]; then
- mount-boot_pkg_preinst
-
- if use initramfs; then
- ebegin "Building initramfs via dracut"
- # putting it alongside kernel image as 'initrd' makes
- # kernel-install happier
- dracut --force "${EROOT}/usr/src/linux-${PV}/initrd" "${PV}"
- eend ${?} || die "Building initramfs failed"
- fi
-
- ebegin "Installing the kernel via installkernel"
- # note: .config is taken relatively to System.map;
- # initrd relatively to bzImage
- installkernel "${PV}" \
- "${EROOT}/usr/src/linux-${PV}/bzImage" \
- "${EROOT}/usr/src/linux-${PV}/System.map"
- eend ${?} || die "Installing the kernel failed"
- fi
-
- local symlink_target=$(readlink "${EROOT}"/usr/src/linux)
- local symlink_ver=${symlink_target#linux-}
- if [[ ${symlink_target} == linux-* && -z ${symlink_ver//[0-9.]/} ]]
- then
- local symlink_pkg=${CATEGORY}/${PN}-${symlink_ver}
- # if the current target is either being replaced, or still
- # installed (probably depclean candidate), update the symlink
- if has "${symlink_ver}" ${REPLACING_VERSIONS} ||
- has_version -r "~${symlink_pkg}"
- then
- ebegin "Updating /usr/src/linux symlink"
- ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
- eend ${?}
- fi
- fi
-}
-
-pkg_prerm() {
- :
-}
-
-pkg_postrm() {
- rm -f "${EROOT}/usr/src/linux-${PV}/initrd" &&
- rmdir --ignore-fail-on-non-empty "${EROOT}/usr/src/linux-${PV}"
-}