mirror of
https://github.com/pentoo/pentoo-overlay
synced 2025-12-06 16:33:09 +01:00
pentoo-sources: 5.8.1, and use the new cpu microcode loading mechanisms while we are at it
This commit is contained in:
parent
c8ec41ac6d
commit
b4a70657d3
10 changed files with 24007 additions and 26 deletions
|
|
@ -1 +1 @@
|
|||
#sys-firmware/intel-microcode initramfs
|
||||
sys-firmware/intel-microcode initramfs
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
sys-kernel/genkernel crypt cryptsetup
|
||||
#sys-kernel/linux-firmware initramfs
|
||||
sys-kernel/linux-firmware initramfs
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ update_kernel() {
|
|||
fi
|
||||
|
||||
#then we set genkernel options as needed
|
||||
genkernelopts="--kernel-config=/usr/share/pentoo-sources/config-${ARCH}-${bestkern_pv} --disklabel --microcode --microcode-initramfs --compress-initramfs-type=xz --bootloader=grub2 --save-config --kernel-filename=kernel-genkernel-%%ARCH%%-%%KV%% --initramfs-filename=initramfs-genkernel-%%ARCH%%-%%KV%% --systemmap-filename=System.map-genkernel-%%ARCH%%-%%KV%% --kernel-localversion=UNSET --module-rebuild --save-config"
|
||||
genkernelopts="--kernel-config=/usr/share/pentoo-sources/config-${ARCH}-${bestkern_pv} --disklabel --compress-initramfs-type=xz --bootloader=grub2 --save-config --kernel-filename=kernel-genkernel-%%ARCH%%-%%KV%% --initramfs-filename=initramfs-genkernel-%%ARCH%%-%%KV%% --systemmap-filename=System.map-genkernel-%%ARCH%%-%%KV%% --kernel-localversion=UNSET --module-rebuild --save-config"
|
||||
if grep -q btrfs /etc/fstab || grep -q btrfs /proc/cmdline; then
|
||||
genkernelopts="${genkernelopts} --btrfs"
|
||||
fi
|
||||
|
|
@ -426,38 +426,55 @@ main_upgrades() {
|
|||
fi
|
||||
fi
|
||||
|
||||
#if we are in catalyst, update the extra binpkgs
|
||||
if [ -n "${clst_target}" ]; then
|
||||
mkdir -p /etc/portage/profile
|
||||
#add kde
|
||||
echo 'pentoo/pentoo-desktop kde' >> /etc/portage/profile/package.use
|
||||
#required for kde
|
||||
echo 'media-libs/mesa wayland' >> /etc/portage/profile/package.use
|
||||
#add in all the opencl stuff
|
||||
echo 'pentoo/pentoo-cracking amdopencl intel-opencl' >> /etc/portage/profile/package.use
|
||||
#add in pentoo-extra to build more binpkgs
|
||||
echo 'USE="pentoo-extra"' >> /etc/portage/profile/make.defaults
|
||||
emerge --buildpkg @changed-deps || safe_exit
|
||||
emerge --buildpkg --usepkg --onlydeps --oneshot --deep --update --newuse --changed-deps --newrepo pentoo/pentoo || safe_exit
|
||||
etc-update --automode -5 || safe_exit
|
||||
fi
|
||||
#if we are in catalyst, update the extra binpkgs
|
||||
if [ -n "${clst_target}" ]; then
|
||||
mkdir -p /etc/portage/profile
|
||||
#add kde
|
||||
echo 'pentoo/pentoo-desktop kde' >> /etc/portage/profile/package.use
|
||||
#required for kde
|
||||
echo 'media-libs/mesa wayland' >> /etc/portage/profile/package.use
|
||||
#add in all the opencl stuff
|
||||
echo 'pentoo/pentoo-cracking amdopencl intel-opencl' >> /etc/portage/profile/package.use
|
||||
#add in pentoo-extra to build more binpkgs
|
||||
echo 'USE="pentoo-extra"' >> /etc/portage/profile/make.defaults
|
||||
emerge --buildpkg @changed-deps || safe_exit
|
||||
emerge --buildpkg --usepkg --onlydeps --oneshot --deep --update --newuse --changed-deps --newrepo pentoo/pentoo || safe_exit
|
||||
etc-update --automode -5 || safe_exit
|
||||
fi
|
||||
|
||||
if portageq list_preserved_libs /; then
|
||||
FEATURES="-getbinpkg" emerge @preserved-rebuild --usepkg=n --buildpkg=y || safe_exit
|
||||
fi
|
||||
FEATURES="-getbinpkg" smart-live-rebuild 2>&1 || safe_exit
|
||||
revdep-rebuild -i -v -- --usepkg=n --buildpkg=y || safe_exit
|
||||
emerge --deep --update --newuse -kb --changed-deps --newrepo @world || emerge --deep --update --newuse -kb --newrepo @world || safe_exit
|
||||
if portageq list_preserved_libs /; then
|
||||
FEATURES="-getbinpkg" emerge @preserved-rebuild --usepkg=n --buildpkg=y || safe_exit
|
||||
fi
|
||||
FEATURES="-getbinpkg" smart-live-rebuild 2>&1 || safe_exit
|
||||
revdep-rebuild -i -v -- --usepkg=n --buildpkg=y || safe_exit
|
||||
emerge --deep --update --newuse -kb --changed-deps --newrepo @world || emerge --deep --update --newuse -kb --newrepo @world || safe_exit
|
||||
}
|
||||
|
||||
mount_boot() {
|
||||
#so since portage is no longer allowed to mount /boot, we need to do it
|
||||
if grep '/boot' /etc/fstab | grep -q noauto; then
|
||||
#pretty much going to trust fstab and ignore failures here
|
||||
mount /boot
|
||||
fi
|
||||
}
|
||||
|
||||
umount_boot() {
|
||||
if grep '/boot' /etc/fstab | grep -q noauto; then
|
||||
#it's set to noauto, so always leave it
|
||||
umount /boot
|
||||
fi
|
||||
}
|
||||
|
||||
#execution begins here
|
||||
main_checks
|
||||
|
||||
mount_boot
|
||||
if [ -z "${KERNEL_ONLY}" ]; then
|
||||
main_upgrades
|
||||
else
|
||||
emerge --update sys-kernel/pentoo-sources sys-kernel/genkernel sys-kernel/linux-firmware sys-firmware/intel-microcode --oneshot || safe_exit
|
||||
fi
|
||||
umount_boot
|
||||
|
||||
#we need to do the clean BEFORE we drop the extra flags otherwise all the packages we just built are removed
|
||||
currkern="$(uname -r)"
|
||||
|
|
|
|||
|
|
@ -4,5 +4,9 @@ DIST genpatches-5.4-51.extras.tar.xz 1768 BLAKE2B b464b9c9ac573b159211c51f9b131e
|
|||
DIST genpatches-5.7-16.base.tar.xz 629080 BLAKE2B bf273eb71644c7bf00840b0de0a19417efcea421eff2b6c4f08e09dc878e512bee326a6e8a8697faf3e1c2e026019b38eecd3d8837185d9b314e716dfe28a741 SHA512 204aede767226dcd07558b3a5541793073bca0af3bb2bd46fec9fd32f60bd8819f45e99bdda0bbf171a24dafe7615397e10cc040d911d6dae4cbacf869218214
|
||||
DIST genpatches-5.7-16.experimental.tar.xz 14140 BLAKE2B 966caa1b06506d220175d627b48093cc8a60c950ba95aaf5777f0479489dd7c0a0406b2deecade284c481e98321ff8638019c02ca364b0559ab53c33edaf1bb9 SHA512 cd99dd22d7b2e49017a1171f5b8200e06ceee9b325088b7e314e6cc858f39de15f8b238e716fbbc005868632c9bc3c455232fde80b220d667c4a9d11496e051c
|
||||
DIST genpatches-5.7-16.extras.tar.xz 1768 BLAKE2B 62eb6dbb2e1dbabde212cb64f581d94da12243e1ff0c339e1552f8795ec21e46afe1b6fffaf214ff44c5d7afc88c59097414c7d2d383a199ca9207e56a1ef08b SHA512 fdf9c96fcd7c03fdfc520dc16872b01d685d0555ab8e0c21cba54fac06caf979438eb64aae9ce5a960ffb40abc12ed3dde6866ab4d2a3b7d094783f1a53d2199
|
||||
DIST genpatches-5.8-3.base.tar.xz 17408 BLAKE2B bfc58558204cedcad1fa9cfd169ea215ebbc030f28a001d6b172d1cdee92c873c9b832adc829837cdd73b5af506946769a3884790c6cd212fae32389772b3080 SHA512 bd05a93aa5b3b28cf25dc680614ddc59cd9902c94a5a2a5408fb9e2888b78c769587265239351e6c97a174b593908bc0b88e8dd2e04f9e36182079d0502a239b
|
||||
DIST genpatches-5.8-3.experimental.tar.xz 14244 BLAKE2B 987c226636d57ce593267cfdf1b21f2d7a9720125c6b28561d81f8a495a16e8bdc920d6bbfb5ab2ae30365a2f5d19b40aaeb8cc48a26c78dc1ee1356b2238668 SHA512 589373fe3cc63c3731c590ffe37fd27a6ca29f502873fa31dd7d39a904b94efd16d7fdbbc6957fb6eae9996868da5ac3e644bed68feedeaf83d148f33ec63a54
|
||||
DIST genpatches-5.8-3.extras.tar.xz 1764 BLAKE2B 69fdcc9611225cbfc37820038eb3591497b859f81ac52cf5c80c330389eb32aaea7dde31f15268dd71e5b09dcfba67a58e80c41dbb6f04b03ee07840ceeb0388 SHA512 2aad14d765210d56f9a61ca8d26a08d6fdb43551925cab58c801ff9c0b63ecf85db1d79a9d213db0a0b9c3c6166da8726d10055d8fa689b11f7bbb07907c3b99
|
||||
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
|
||||
DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
|
||||
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
10957
sys-kernel/pentoo-sources/files/config-amd64-5.8.1
Normal file
10957
sys-kernel/pentoo-sources/files/config-amd64-5.8.1
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1 +1 @@
|
|||
config-amd64-5.7.15
|
||||
config-amd64-5.8.1
|
||||
10215
sys-kernel/pentoo-sources/files/config-x86-5.8.1
Normal file
10215
sys-kernel/pentoo-sources/files/config-x86-5.8.1
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1 +1 @@
|
|||
config-x86-5.7.15
|
||||
config-x86-5.8.1
|
||||
60
sys-kernel/pentoo-sources/pentoo-sources-5.8.1.ebuild
Normal file
60
sys-kernel/pentoo-sources/pentoo-sources-5.8.1.ebuild
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras experimental"
|
||||
K_GENPATCHES_VER="3"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
detect_arch
|
||||
|
||||
KEYWORDS="amd64 x86"
|
||||
HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/"
|
||||
IUSE="experimental pax_kernel pentoo-experimental"
|
||||
|
||||
DESCRIPTION="Pentoo kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
|
||||
|
||||
SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
|
||||
|
||||
pkg_setup() {
|
||||
if use pax_kernel; then
|
||||
die "pax_kernel is no longer available, you MUST ensure the use flag is no longer set"
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
#default
|
||||
kernel-2_src_unpack
|
||||
#penpatches
|
||||
eapply -s "${FILESDIR}/4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch"
|
||||
eapply -s "${FILESDIR}/4004_zd1211rw-inject+dbi-fix-4.7ish.patch"
|
||||
eapply -s "${FILESDIR}/4005_ipw2200-inject-4.7ish.patch"
|
||||
eapply -s "${FILESDIR}/4400_logo_larry_the_cow.patch"
|
||||
#experimental penpatches
|
||||
if use pentoo-experimental; then
|
||||
eapply -s "${FILESDIR}/4008_cfg80211-decouple-us-from-the-RTNL-exp-4.8.patch"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
kernel-2_src_install
|
||||
insinto /usr/share/${PN}
|
||||
if use amd64; then
|
||||
doins "${FILESDIR}"/config-amd64-${PV}
|
||||
elif use x86; then
|
||||
doins "${FILESDIR}"/config-x86-${PV}
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "For more info on this patchset, and how to report problems, see:"
|
||||
einfo "${HOMEPAGE}"
|
||||
ewarn "The official pentoo kernel config is now installed with the kernel in /usr/share/pentoo-sources"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kernel-2_pkg_postrm
|
||||
}
|
||||
Loading…
Reference in a new issue