From d6135021e72c4a9f6bc4a9adca6e8d79b6107492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 11 Jan 2018 17:13:02 +0100 Subject: Update kernel and compile more stuff to kernel it self --- sys-kernel/linux/Manifest | 2 +- sys-kernel/linux/files/overlay.config | 15 +++++- sys-kernel/linux/linux-4.14.12-r4.ebuild | 91 -------------------------------- sys-kernel/linux/linux-4.14.13-r1.ebuild | 91 ++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 93 deletions(-) delete mode 100644 sys-kernel/linux/linux-4.14.12-r4.ebuild create mode 100644 sys-kernel/linux/linux-4.14.13-r1.ebuild (limited to 'sys-kernel/linux') diff --git a/sys-kernel/linux/Manifest b/sys-kernel/linux/Manifest index bee3cc7..b19ce3d 100644 --- a/sys-kernel/linux/Manifest +++ b/sys-kernel/linux/Manifest @@ -1 +1 @@ -DIST linux-4.14.12.tar.gz 157717827 SHA256 99a5fd45bd01e677788bf10b1ab0aecec1dd94d643fb39297de4617aaa65690d SHA512 ccf8022e85dd868eb5ef00ea944c2453fb25265b9e9561dd9a4b2c11182d41081ea879de567431d677a3ed210ec4453866eccc32c6cb04583ffcb349f6b752f4 WHIRLPOOL bec338fe5099ae0041448c01e98f1dcc679fa14fd0c4f67430175e0ddb21caacf83f3835c0337c088702533aebf472980bcda3a6796804b182eefd43dd3b2817 +DIST linux-4.14.13.tar.gz 157723326 SHA256 51fa2aee12ce770099c5cb9aabd073b2ecfadc0afabad700252a603d94ffd611 SHA512 36adb784daff7dcdf60122bbfe2141adb67bd0164189510ffaa4b13f6d03f0e03435cd5ffc5e5677b974cf98ed49e6fce1b75ddbbb06984028663e19f5fc3f00 WHIRLPOOL d6eefbf5f93c663685a0a92687813ba14b3858b4fce5099e5bdd417f6ad0195a4ca3dc917a301a9f2203728f1f89993bcbe4e082aeb84cf28dd4916539590661 diff --git a/sys-kernel/linux/files/overlay.config b/sys-kernel/linux/files/overlay.config index 2daf871..92baf7b 100644 --- a/sys-kernel/linux/files/overlay.config +++ b/sys-kernel/linux/files/overlay.config @@ -16,8 +16,10 @@ CONFIG_KEYBOARD_ATKBD=y CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_BLK_DEV_SD=y -# Compile BTRFS in kernel +# Compile BTRFS to kernel (used for root) CONFIG_BTRFS_FS=y +# Compile FAT to kernel (used for efi partition) +CONFIG_VFAT_FS=y # Cryptsetup CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y @@ -38,9 +40,20 @@ CONFIG_USB_HID=y CONFIG_I2C_HID=y CONFIG_HID_ASUS=y +# Compile to kernel also other filesytems so we can use it if we need it +CONFIG_EXT4_FS=y +CONFIG_OVERLAY_FS=y +CONFIG_SQUASHFS=y + # Scrollback buffer size CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=1024 +# Intel i915 driver (video) +CONFIG_AGP=y +#CONFIG_AGP_INTEL=y # Do we need this? Is this for us? +CONFIG_DRM=y +CONFIG_DRM_I915=y + # X input CONFIG_INPUT_EVDEV=y diff --git a/sys-kernel/linux/linux-4.14.12-r4.ebuild b/sys-kernel/linux/linux-4.14.12-r4.ebuild deleted file mode 100644 index 43f0192..0000000 --- a/sys-kernel/linux/linux-4.14.12-r4.ebuild +++ /dev/null @@ -1,91 +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="virt +initramfs" - -DEPEND="sys-devel/bc" - -src_configure() { - # Fix ARCH variable - [ "$ARCH" = "amd64" ] && ARCH="x86" - - "${FILESDIR}"/config_prepare.sh $(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" - PFIX=".." - elif [ -f "${ROOT}/boot/EFI/BOOT/syslinux.cfg" ]; then - SYSLINUX="${ROOT}/boot/EFI/BOOT/syslinux.cfg" - PFIX="../../.." - elif [ -f "${ROOT}/boot/extlinux.conf" ]; then - SYSLINUX="${ROOT}/boot/extlinux.conf" - PFIX="." - else - eerror "Can't locate syslinux configuration!" - fi -} - -pkg_postinst() { - sysfile - # Add label to syslinux config if there is non yet - if ! grep -q "^LABEL gentoo-${PV}$" "${SYSLINUX}"; then - if $(use initramfs); then - INITRD="\tINITRD ${PFIX}/initramfs-gentoo\n" - 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 ${PFIX}/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 ${PFIX}/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() { - sysfile - # Remove label from syslinux config - 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-4.14.13-r1.ebuild b/sys-kernel/linux/linux-4.14.13-r1.ebuild new file mode 100644 index 0000000..43f0192 --- /dev/null +++ b/sys-kernel/linux/linux-4.14.13-r1.ebuild @@ -0,0 +1,91 @@ +# 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="virt +initramfs" + +DEPEND="sys-devel/bc" + +src_configure() { + # Fix ARCH variable + [ "$ARCH" = "amd64" ] && ARCH="x86" + + "${FILESDIR}"/config_prepare.sh $(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" + PFIX=".." + elif [ -f "${ROOT}/boot/EFI/BOOT/syslinux.cfg" ]; then + SYSLINUX="${ROOT}/boot/EFI/BOOT/syslinux.cfg" + PFIX="../../.." + elif [ -f "${ROOT}/boot/extlinux.conf" ]; then + SYSLINUX="${ROOT}/boot/extlinux.conf" + PFIX="." + else + eerror "Can't locate syslinux configuration!" + fi +} + +pkg_postinst() { + sysfile + # Add label to syslinux config if there is non yet + if ! grep -q "^LABEL gentoo-${PV}$" "${SYSLINUX}"; then + if $(use initramfs); then + INITRD="\tINITRD ${PFIX}/initramfs-gentoo\n" + 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 ${PFIX}/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 ${PFIX}/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() { + sysfile + # Remove label from syslinux config + sed -i "/^LABEL gentoo-${PV}\(\|-recovery\)$/,/^$/d" "${SYSLINUX}" || eerror "Removing label from syslinux fonfiguration failed!" +} + +pkg_postrm() { + src_link +} -- cgit v1.2.3