From 1730739ac5b3667caa8bfd6515135558cc2e7e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 20 Jun 2017 13:23:17 +0200 Subject: Linux v4.11.6 --- sys-kernel/linux/Manifest | 2 +- sys-kernel/linux/linux-4.11.3-r2.ebuild | 74 --------------------------------- sys-kernel/linux/linux-4.11.6-r2.ebuild | 74 +++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 sys-kernel/linux/linux-4.11.3-r2.ebuild create mode 100644 sys-kernel/linux/linux-4.11.6-r2.ebuild diff --git a/sys-kernel/linux/Manifest b/sys-kernel/linux/Manifest index 092cb44..e0d7326 100644 --- a/sys-kernel/linux/Manifest +++ b/sys-kernel/linux/Manifest @@ -1 +1 @@ -DIST linux-4.11.3.tar.gz 147155032 SHA256 b70c23f6c14d4b2ba8827bcc50b78201e399be7ed39dff92b24a27f82a2d59ee SHA512 9a681dd9dee31419359e1d102644d0180240522df171631c575f0f4becbb8ea8d8589b4972b885fbf8fe971856a1e9ad6736df5db23f471e04c0d9e0c4784380 WHIRLPOOL 4020cf15ae7eb2f341dcce0e07bf8382bf4fb6ca94ba1b20abd66784f84d527868058870f2ac6ec9259c5ed582e68411b74587bba2a55fe8ea717f79ca528309 +DIST linux-4.11.6.tar.gz 147169967 SHA256 ddab77cf00eb6f439366f9373b34181d1fcdc9a72fe2155af572ff832ba55441 SHA512 d8ae8c51878120e713a9bec7938463ffcdc53d2c8a05bfd90e7db3f405f6aa972c61a1b0639afc5c9a5b3f90cc316e5a2bf0e3e68f5d01b4d7aa84561d09091c WHIRLPOOL 66737c48e1aa23d733cdc29f4b3a2dafa2e6b01398ff7d253bb0746cb55f2d1b57bb7a3673df64b4972216e5ed7addb22ae2707aeb33dcc7a23ed7b36d5a0f8b diff --git a/sys-kernel/linux/linux-4.11.3-r2.ebuild b/sys-kernel/linux/linux-4.11.3-r2.ebuild deleted file mode 100644 index 0dcdd3e..0000000 --- a/sys-kernel/linux/linux-4.11.3-r2.ebuild +++ /dev/null @@ -1,74 +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-stable.git/snapshot/linux-stable-${VER}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/linux-stable-${VER}" - -LICENSE="GPLv2" -SLOT="${PV}" -KEYWORDS="amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - sys-boot/myinitramfs" - -src_configure() { - # Fix ARCH variable - [ "$ARCH" = "amd64" ] && ARCH="x86" - - "${FILESDIR}"/config_prepare.sh || 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 - ) -} - -pkg_postinst() { - # Add label to syslinux config if there is non yet - SYSLINUX="${ROOT}/boot/syslinux/syslinux.cfg" - if ! grep -q "^LABEL gentoo-${PV}$" "${SYSLINUX}"; then - 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\tINITRD ../initramfs-gentoo\n" "${SYSLINUX}" || eerror "Adding label to syslinux configuration failed!" - sed -i "/^## Dynamic recovery labels ##$/a LABEL gentoo-${PV}\n\tMENU LABEL Gentoo ${PV} - Recovery\n\tLINUX ../bzlinux-${PV}\n\tAPPEND ${ARGS} recovery\n\tINITRD ../initramfs-gentoo\n" "${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 - sed -i "/^LABEL gentoo-${PV}(|-recovery)$/,/^$/d" /boot/syslinux/syslinux.cfg || eerror "Removing label from syslinux fonfiguration failed!" -} - -pkg_postrm() { - src_link -} diff --git a/sys-kernel/linux/linux-4.11.6-r2.ebuild b/sys-kernel/linux/linux-4.11.6-r2.ebuild new file mode 100644 index 0000000..0dcdd3e --- /dev/null +++ b/sys-kernel/linux/linux-4.11.6-r2.ebuild @@ -0,0 +1,74 @@ +# 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-stable.git/snapshot/linux-stable-${VER}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/linux-stable-${VER}" + +LICENSE="GPLv2" +SLOT="${PV}" +KEYWORDS="amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + sys-boot/myinitramfs" + +src_configure() { + # Fix ARCH variable + [ "$ARCH" = "amd64" ] && ARCH="x86" + + "${FILESDIR}"/config_prepare.sh || 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 + ) +} + +pkg_postinst() { + # Add label to syslinux config if there is non yet + SYSLINUX="${ROOT}/boot/syslinux/syslinux.cfg" + if ! grep -q "^LABEL gentoo-${PV}$" "${SYSLINUX}"; then + 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\tINITRD ../initramfs-gentoo\n" "${SYSLINUX}" || eerror "Adding label to syslinux configuration failed!" + sed -i "/^## Dynamic recovery labels ##$/a LABEL gentoo-${PV}\n\tMENU LABEL Gentoo ${PV} - Recovery\n\tLINUX ../bzlinux-${PV}\n\tAPPEND ${ARGS} recovery\n\tINITRD ../initramfs-gentoo\n" "${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 + sed -i "/^LABEL gentoo-${PV}(|-recovery)$/,/^$/d" /boot/syslinux/syslinux.cfg || eerror "Removing label from syslinux fonfiguration failed!" +} + +pkg_postrm() { + src_link +} -- cgit v1.2.3 From 4eaaece69bdd26229e2c4b7e8c1985535edef0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 21 Jun 2017 18:20:16 +0200 Subject: Revert "Drop latex" This reverts commit 257bf4556c063cd62c261fe120c789b40a9f8797. --- profiles/cynerd-laptop/parent | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/cynerd-laptop/parent b/profiles/cynerd-laptop/parent index 7a68153..a9a880b 100644 --- a/profiles/cynerd-laptop/parent +++ b/profiles/cynerd-laptop/parent @@ -3,4 +3,5 @@ ../laptop ../qemu ../devel +../latex ../steam -- cgit v1.2.3