From 8c571379ad20a7f08611f7d8c4086c031cf632f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 2 Sep 2019 07:43:14 +0200 Subject: sys-kernel/linux: update to 5.2.11 --- sys-kernel/linux/Manifest | 2 +- sys-kernel/linux/files/config_prepare.sh | 6 +- sys-kernel/linux/linux-5.2.10-r1.ebuild | 96 -------------------------------- sys-kernel/linux/linux-5.2.11-r1.ebuild | 96 ++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 sys-kernel/linux/linux-5.2.10-r1.ebuild create mode 100644 sys-kernel/linux/linux-5.2.11-r1.ebuild (limited to 'sys-kernel/linux') diff --git a/sys-kernel/linux/Manifest b/sys-kernel/linux/Manifest index e1c367e..ec01f2e 100644 --- a/sys-kernel/linux/Manifest +++ b/sys-kernel/linux/Manifest @@ -1 +1 @@ -DIST linux-5.2.10.tar.gz 166518512 BLAKE2B 9f99718dad249944f47755ec6e6f9933c41dab7d4c18ba1037476f9ab78e4317d748f432a3fe0d61f29947d3449154612ca6d4a90092d0bd22c5c5da38888d3c SHA512 99a813726b41b586d4150f09142d179e35be65ab1891970108cb495b2912a2612f6a909f24bdab6ba645cee0c1bae5e8f984bae6c67672796f81cbf8f44bc85e +DIST linux-5.2.11.tar.gz 166526171 BLAKE2B b0f8b079b651cda6059aea76ef293e934f1b8e738237fefd716bc8152b79b8b72c264c987f9610a812f9d39cdc182b333d4e9310e23bb01cb8f5ee9c7be9a4e2 SHA512 b3fe95e72224707f26ab970edf9a436486f6a30a369e6b78a9b692e9cb02b753d9d4bea3378461aec08e6593888368dfb0142b4e3c38f7847864988ecf2a339c diff --git a/sys-kernel/linux/files/config_prepare.sh b/sys-kernel/linux/files/config_prepare.sh index ede6fc8..3f21f5c 100755 --- a/sys-kernel/linux/files/config_prepare.sh +++ b/sys-kernel/linux/files/config_prepare.sh @@ -27,9 +27,9 @@ fi # Apply changes in config for CNF in $CONFIG; do - while read L; do - echo "$L" | grep -qE "^[[:space:]]*$" && continue # ignore empty lines - echo "$L" | grep -qE "#.*" && continue # Ignore comments + # (grep) Ignore empty lines and comments + grep -qvE "^[[:space:]]*$|^#" | while read -r L; do + awk -v # Remove lines with changed settings sed -i "#^$(echo "$L" | grep -oE '^CONFIG_.*=')#d" .config # Put config diff --git a/sys-kernel/linux/linux-5.2.10-r1.ebuild b/sys-kernel/linux/linux-5.2.10-r1.ebuild deleted file mode 100644 index 1c1c58c..0000000 --- a/sys-kernel/linux/linux-5.2.10-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.2.11-r1.ebuild b/sys-kernel/linux/linux-5.2.11-r1.ebuild new file mode 100644 index 0000000..1c1c58c --- /dev/null +++ b/sys-kernel/linux/linux-5.2.11-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