From 7cd48b335108de7f6e029fc2e2e0aae1d1b6011b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 11 Oct 2021 08:51:23 +0200 Subject: sys-kernel/linux: update to 5.14.11 --- sys-kernel/linux/Manifest | 2 +- sys-kernel/linux/linux-5.14.11-r1.ebuild | 116 +++++++++++++++++++++++++++++++ sys-kernel/linux/linux-5.14.9-r1.ebuild | 116 ------------------------------- 3 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 sys-kernel/linux/linux-5.14.11-r1.ebuild delete mode 100644 sys-kernel/linux/linux-5.14.9-r1.ebuild diff --git a/sys-kernel/linux/Manifest b/sys-kernel/linux/Manifest index 00831a2..bc1ffb5 100644 --- a/sys-kernel/linux/Manifest +++ b/sys-kernel/linux/Manifest @@ -1 +1 @@ -DIST linux-5.14.9.tar.gz 196162182 BLAKE2B c68a08560be322d2b6b2d5f54358456cfd476416ce405deb22a20dc05728d8dd0d8db0be4a5b3f201870e307a8d03c96a5cfe982aa51d543d552158fa05b4417 SHA512 2ab0420acde4aac7794719419f55d57b7c85895cc892fd76225700f9381d47541600d1448075227eadda6853739b392e4428e4628ad166eeceb7fe50869c6ed3 +DIST linux-5.14.11.tar.gz 196182933 BLAKE2B d528214f98164b109571361a5351d9be1d534dbf544bf1537ee87cee5b0eb29a407338c5ce3928945cb534465d375c74a4e5d01013678bb49fb456cb1a61fd2a SHA512 2e29443587366b8d0d7d782a1bcccb25ff682de264765d788010d0f9285428f582ab5b3c07304901bf9d975baa35cdb363b58780982ab45cec3651f754f75e7d diff --git a/sys-kernel/linux/linux-5.14.11-r1.ebuild b/sys-kernel/linux/linux-5.14.11-r1.ebuild new file mode 100644 index 0000000..b0483f6 --- /dev/null +++ b/sys-kernel/linux/linux-5.14.11-r1.ebuild @@ -0,0 +1,116 @@ +# 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="amd intel initramfs ucode" + +RDEPEND="initramfs? ( sys-boot/myinitramfs )" +DEPEND=" + sys-devel/bc + dev-libs/elfutils + dev-util/pahole + app-arch/cpio +" + +src_configure() { + # Fix ARCH variable + [ "$ARCH" = "amd64" ] && ARCH="x86" + + "${FILESDIR}"/config_prepare.sh $(usev amd) $(usev intel) \ + || die "Configuration application failed" +} + +src_install() { + emake modules_install INSTALL_MOD_PATH="${D}" + for dir in "build" "source"; do + rm "${D}/lib/modules/${PV}/$dir" + ln -sf "../../../usr/src/${P}" "${D}/lib/modules/${PV}/$dir" + done + + 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/${P}" +} + +# 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() { + local cfgs=( + "/boot/syslinux.cfg" + "/boot/syslinux/syslinux.cfg" + "/boot/EFI/BOOT/syslinux.cfg" + "/boot/extlinux.conf" + ) + for cfg in "${cfgs[@]}"; do + if [ -f "${ROOT}${cfg}" ]; then + echo "${ROOT}${cfg}" + return 0 + fi + done + eerror "Can't locate syslinux configuration!" +} + +pkg_postinst() { + # Add label to syslinux config if there is non yet + local syslinux initrd args + local syslinux="$(sysfile)" + if ! grep -q "^LABEL gentoo-${PV}$" "${syslinux}"; then + if $(use initramfs); then + if $(use ucode); then + if $(use intel); then + initrd="\tINITRD /intel-uc.img,/initramfs-gentoo\n" + else + initrd="\tINITRD /ucode.cpio,/initramfs-gentoo\n" + fi + 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 + local syslinux="$(sysfile)" + sed -i "/^LABEL gentoo-${PV}\(\|-recovery\)$/,/^$/d" "${syslinux}" || eerror "Removing label from syslinux fonfiguration failed!" +} + +pkg_postrm() { + # Remove any residue files + rm -rf "/usr/src/${P}" "/lib/modules/${PV}" + + src_link +} diff --git a/sys-kernel/linux/linux-5.14.9-r1.ebuild b/sys-kernel/linux/linux-5.14.9-r1.ebuild deleted file mode 100644 index b0483f6..0000000 --- a/sys-kernel/linux/linux-5.14.9-r1.ebuild +++ /dev/null @@ -1,116 +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="amd intel initramfs ucode" - -RDEPEND="initramfs? ( sys-boot/myinitramfs )" -DEPEND=" - sys-devel/bc - dev-libs/elfutils - dev-util/pahole - app-arch/cpio -" - -src_configure() { - # Fix ARCH variable - [ "$ARCH" = "amd64" ] && ARCH="x86" - - "${FILESDIR}"/config_prepare.sh $(usev amd) $(usev intel) \ - || die "Configuration application failed" -} - -src_install() { - emake modules_install INSTALL_MOD_PATH="${D}" - for dir in "build" "source"; do - rm "${D}/lib/modules/${PV}/$dir" - ln -sf "../../../usr/src/${P}" "${D}/lib/modules/${PV}/$dir" - done - - 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/${P}" -} - -# 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() { - local cfgs=( - "/boot/syslinux.cfg" - "/boot/syslinux/syslinux.cfg" - "/boot/EFI/BOOT/syslinux.cfg" - "/boot/extlinux.conf" - ) - for cfg in "${cfgs[@]}"; do - if [ -f "${ROOT}${cfg}" ]; then - echo "${ROOT}${cfg}" - return 0 - fi - done - eerror "Can't locate syslinux configuration!" -} - -pkg_postinst() { - # Add label to syslinux config if there is non yet - local syslinux initrd args - local syslinux="$(sysfile)" - if ! grep -q "^LABEL gentoo-${PV}$" "${syslinux}"; then - if $(use initramfs); then - if $(use ucode); then - if $(use intel); then - initrd="\tINITRD /intel-uc.img,/initramfs-gentoo\n" - else - initrd="\tINITRD /ucode.cpio,/initramfs-gentoo\n" - fi - 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 - local syslinux="$(sysfile)" - sed -i "/^LABEL gentoo-${PV}\(\|-recovery\)$/,/^$/d" "${syslinux}" || eerror "Removing label from syslinux fonfiguration failed!" -} - -pkg_postrm() { - # Remove any residue files - rm -rf "/usr/src/${P}" "/lib/modules/${PV}" - - src_link -} -- cgit v1.2.3