From 30cefadcce87469c0cbb285c80d92dae420450fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 29 Sep 2019 13:58:39 +0200 Subject: Fix previous commit --- sys-kernel/linux/Manifest | 2 +- sys-kernel/linux/linux-5.2.15-r1.ebuild | 96 --------------------------------- sys-kernel/linux/linux-5.3.1-r1.ebuild | 96 +++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 97 deletions(-) delete mode 100644 sys-kernel/linux/linux-5.2.15-r1.ebuild create mode 100644 sys-kernel/linux/linux-5.3.1-r1.ebuild (limited to 'sys-kernel/linux') diff --git a/sys-kernel/linux/Manifest b/sys-kernel/linux/Manifest index 68ee345..40692cf 100644 --- a/sys-kernel/linux/Manifest +++ b/sys-kernel/linux/Manifest @@ -1 +1 @@ -DIST linux-5.2.15.tar.gz 166531633 BLAKE2B 8a5a21571e6a91b7de5e9641547e7b44f1ef4a371efb2970b0be76fe5a04c37d40141a5811c6669ecc9a4fc3169b262c17491c6916aa245c21582b795f91fd19 SHA512 35daa552abe5a595e525c01cbcfb6718bec5aff0332b7d5e35ad04d5444899f90dfdcd20cb4d4d6fbdd9a7fc115253d56d1ca2ea18ee0b5114fe94e7c95dae7e +DIST linux-5.3.1.tar.gz 170278477 BLAKE2B 57191b7ae0596f0f17b0848bb9913488c0b02ffb42115c0d12f8135be35974ceeb0e63d48fe9a23defe0d05a06ca548624cca5c1a69f58218cd01cdb175e107b SHA512 fc69c688de100d09da031b2322738f8f0492dde31c79ecc8675dd4e06fedfe51887b46bb4607382563a7bad6aad51340c0d4a4e319eafb096095db3a90cd3d24 diff --git a/sys-kernel/linux/linux-5.2.15-r1.ebuild b/sys-kernel/linux/linux-5.2.15-r1.ebuild deleted file mode 100644 index 1c1c58c..0000000 --- a/sys-kernel/linux/linux-5.2.15-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -VER="${PV%-r*}" -REV="r${PV##*-r}" - -DESCRIPTION="Linux kernel" -HOMEPAGE="http://kernel.org/" -SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/snapshot/linux-${VER}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/linux-${VER}" - -LICENSE="GPLv2" -SLOT="${PV}" -KEYWORDS="amd64 ~x86" -IUSE="virt initramfs amd intel ucode" - -DEPEND=" - sys-devel/bc - dev-libs/elfutils" - -src_configure() { - # Fix ARCH variable - [ "$ARCH" = "amd64" ] && ARCH="x86" - - "${FILESDIR}"/config_prepare.sh $(usev amd) $(usev intel) $(usev virt) \ - || die "Configuration application failed" -} - -src_install() { - emake modules_install INSTALL_MOD_PATH="${D}" INSTALL_FW_PATH="${D}/lib/firmware/${PV}" - - dodir /boot - insinto /boot - newins "${S}/arch/$ARCH/boot/bzImage" "bzlinux-${PV}" - - # Package source (kind of annoying because of some packages expecting it) - emake clean - dodir /usr/src - cp -a "${S}" "${D}/usr/src/linux-${PV}" -} - -# Link /usr/src/linux to newest kernel -src_link() { - ( - cd "${ROOT}/usr/src" - rm -f linux - ln -s $(ls | grep "linux-" | sort | tail -1) linux - ) -} - -sysfile() { - if [ -f "${ROOT}/boot/syslinux/syslinux.cfg" ]; then - SYSLINUX="${ROOT}/boot/syslinux/syslinux.cfg" - elif [ -f "${ROOT}/boot/EFI/BOOT/syslinux.cfg" ]; then - SYSLINUX="${ROOT}/boot/EFI/BOOT/syslinux.cfg" - elif [ -f "${ROOT}/boot/extlinux.conf" ]; then - SYSLINUX="${ROOT}/boot/extlinux.conf" - else - eerror "Can't locate syslinux configuration!" - fi -} - -pkg_postinst() { - # Add label to syslinux config if there is non yet - sysfile - if ! grep -q "^LABEL gentoo-${PV}$" "${SYSLINUX}"; then - if $(use initramfs); then - if $(use ucode); then - INITRD="\tINITRD /ucode.cpio,/initramfs-gentoo\n" - else - INITRD="\tINITRD /initramfs-gentoo\n" - fi - fi - ARGS="$(grep -E "^# ARGS: " "${SYSLINUX}" | sed 's/^# ARGS: //')" - if [ -n "$ARGS" ]; then - sed -i "/^## Dynamic labels ##$/a LABEL gentoo-${PV}\n\tMENU LABEL Gentoo ${PV}\n\tLINUX /bzlinux-${PV}\n\tAPPEND ${ARGS}\n$INITRD" "${SYSLINUX}" || eerror "Adding label to syslinux configuration failed!" - sed -i "/^## Dynamic recovery labels ##$/a LABEL gentoo-${PV}-recovery\n\tMENU LABEL Gentoo ${PV} - Recovery\n\tLINUX /bzlinux-${PV}\n\tAPPEND ${ARGS} recovery\n$INITRD" "${SYSLINUX}" || eerror "Adding recovery label to syslinux configuration failed!" - else - eerror "Adding label to syslinux configuration failed as there are no arguments" - fi - fi - - src_link -} - -pkg_prerm() { - # Remove label from syslinux config - sysfile - sed -i "/^LABEL gentoo-${PV}\(\|-recovery\)$/,/^$/d" "${SYSLINUX}" || eerror "Removing label from syslinux fonfiguration failed!" -} - -pkg_postrm() { - src_link -} diff --git a/sys-kernel/linux/linux-5.3.1-r1.ebuild b/sys-kernel/linux/linux-5.3.1-r1.ebuild new file mode 100644 index 0000000..1c1c58c --- /dev/null +++ b/sys-kernel/linux/linux-5.3.1-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +VER="${PV%-r*}" +REV="r${PV##*-r}" + +DESCRIPTION="Linux kernel" +HOMEPAGE="http://kernel.org/" +SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/snapshot/linux-${VER}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/linux-${VER}" + +LICENSE="GPLv2" +SLOT="${PV}" +KEYWORDS="amd64 ~x86" +IUSE="virt initramfs amd intel ucode" + +DEPEND=" + sys-devel/bc + dev-libs/elfutils" + +src_configure() { + # Fix ARCH variable + [ "$ARCH" = "amd64" ] && ARCH="x86" + + "${FILESDIR}"/config_prepare.sh $(usev amd) $(usev intel) $(usev virt) \ + || die "Configuration application failed" +} + +src_install() { + emake modules_install INSTALL_MOD_PATH="${D}" INSTALL_FW_PATH="${D}/lib/firmware/${PV}" + + dodir /boot + insinto /boot + newins "${S}/arch/$ARCH/boot/bzImage" "bzlinux-${PV}" + + # Package source (kind of annoying because of some packages expecting it) + emake clean + dodir /usr/src + cp -a "${S}" "${D}/usr/src/linux-${PV}" +} + +# Link /usr/src/linux to newest kernel +src_link() { + ( + cd "${ROOT}/usr/src" + rm -f linux + ln -s $(ls | grep "linux-" | sort | tail -1) linux + ) +} + +sysfile() { + if [ -f "${ROOT}/boot/syslinux/syslinux.cfg" ]; then + SYSLINUX="${ROOT}/boot/syslinux/syslinux.cfg" + elif [ -f "${ROOT}/boot/EFI/BOOT/syslinux.cfg" ]; then + SYSLINUX="${ROOT}/boot/EFI/BOOT/syslinux.cfg" + elif [ -f "${ROOT}/boot/extlinux.conf" ]; then + SYSLINUX="${ROOT}/boot/extlinux.conf" + else + eerror "Can't locate syslinux configuration!" + fi +} + +pkg_postinst() { + # Add label to syslinux config if there is non yet + sysfile + if ! grep -q "^LABEL gentoo-${PV}$" "${SYSLINUX}"; then + if $(use initramfs); then + if $(use ucode); then + INITRD="\tINITRD /ucode.cpio,/initramfs-gentoo\n" + else + INITRD="\tINITRD /initramfs-gentoo\n" + fi + fi + ARGS="$(grep -E "^# ARGS: " "${SYSLINUX}" | sed 's/^# ARGS: //')" + if [ -n "$ARGS" ]; then + sed -i "/^## Dynamic labels ##$/a LABEL gentoo-${PV}\n\tMENU LABEL Gentoo ${PV}\n\tLINUX /bzlinux-${PV}\n\tAPPEND ${ARGS}\n$INITRD" "${SYSLINUX}" || eerror "Adding label to syslinux configuration failed!" + sed -i "/^## Dynamic recovery labels ##$/a LABEL gentoo-${PV}-recovery\n\tMENU LABEL Gentoo ${PV} - Recovery\n\tLINUX /bzlinux-${PV}\n\tAPPEND ${ARGS} recovery\n$INITRD" "${SYSLINUX}" || eerror "Adding recovery label to syslinux configuration failed!" + else + eerror "Adding label to syslinux configuration failed as there are no arguments" + fi + fi + + src_link +} + +pkg_prerm() { + # Remove label from syslinux config + sysfile + sed -i "/^LABEL gentoo-${PV}\(\|-recovery\)$/,/^$/d" "${SYSLINUX}" || eerror "Removing label from syslinux fonfiguration failed!" +} + +pkg_postrm() { + src_link +} -- cgit v1.2.3