summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle K <kylek389@gmail.com>2021-02-14 02:32:53 -0600
committerKyle K <kylek389@gmail.com>2021-02-14 02:32:53 -0600
commit6ba17b88abf0c3538d56c2d584d9923e693eaedc (patch)
tree1b0b80e83e88abf6cb5821feea449ff1c52fff01
parent139442d1b6b9e8787e163bdcbbec8b367a3f9e90 (diff)
downloadgentoox-6ba17b88abf0c3538d56c2d584d9923e693eaedc.tar.gz
gentoox-6ba17b88abf0c3538d56c2d584d9923e693eaedc.tar.bz2
gentoox-6ba17b88abf0c3538d56c2d584d9923e693eaedc.zip
drop out-of-tree kswap patches that were causing gcc to spin a core at 100% usage at ./configure phase of many packages
-rwxr-xr-xgentoox_build.sh15
1 files changed, 9 insertions, 6 deletions
diff --git a/gentoox_build.sh b/gentoox_build.sh
index 782c621..ad2bcaa 100755
--- a/gentoox_build.sh
+++ b/gentoox_build.sh
@@ -206,8 +206,8 @@ echo -n > /etc/portage/package.accept_keywords
#unmask gcc/glibc to prompt installation of masked 9999 packages
echo 'sys-devel/gcc' >> /etc/portage/package.unmask/gcc
echo 'sys-devel/gcc **' >> /etc/portage/package.accept_keywords
-#echo 'sys-libs/glibc' >> /etc/portage/package.unmask/glibc
-#echo 'sys-libs/glibc **' >> /etc/portage/package.accept_keywords
+echo 'sys-libs/glibc' >> /etc/portage/package.unmask/glibc
+echo 'sys-libs/glibc **' >> /etc/portage/package.accept_keywords
emerge -v1 gcc # install latest gcc now that it has been unmasked
emerge -v gentoo-sources # presence of /usr/src/linux is required below
@@ -247,13 +247,16 @@ if [[ ! -f '/tmp/gentoox-kernelpatches-applied' ]]; then
wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/aufs-patches/0001-aufs-20210111.patch
wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/android-patches/0001-android-patches.patch
wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/arch-patches-v14/0001-arch-patches.patch
- wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/btrfs-patches-v12/0001-btrfs-patches.patch
+ wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/btrfs-patches-v13/0001-btrfs-patches.patch
wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/clearlinux-patches/0001-clearlinux-patches.patch
wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/cpu-patches-v2/0001-cpu-patches.patch
- wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/fixes-miscellaneous-v11/0001-fixes-miscellaneous.patch
+ #wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/fixes-miscellaneous-v11/0001-fixes-miscellaneous.patch
+ # the kswap patches from above's repo were causing gcc to spin a core at 100% usage at ./configure phase of many packages such as lynx or samba. discard them.
+ git clone --depth 1 --filter=blob:none --sparse https://gitlab.com/sirlucjan/kernel-patches.git sirlucjan; cd sirlucjan
+ git sparse-checkout init --cone; git sparse-checkout set 5.10/fixes-miscellaneous-v11-sep; rm -f 5.10/fixes-miscellaneous-v11-sep/*-mm-*; cd ..
wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/futex-trunk-patches-v2/0001-futex-resync-from-gitlab.collabora.com.patch
#wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/futex2-trunk-patches-v3/0001-futex2-resync-from-gitlab.collabora.com.patch
- wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/ntfs3-patches-v6/0001-ntfs3-patches.patch
+ wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/ntfs3-patches-v7/0001-ntfs3-patches.patch
wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/zstd-dev-patches/0001-zstd-dev-patches.patch
wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.10/zstd-patches-v3/0001-init-add-support-for-zstd-compressed-modules.patch
@@ -286,7 +289,7 @@ if [[ ! -f '/tmp/gentoox-kernelpatches-applied' ]]; then
patch -p1 < 0001-arch-patches.patch
patch -p1 < 0001-btrfs-patches.patch
patch -p1 < 0001-clearlinux-patches.patch
- patch -p1 < 0001-fixes-miscellaneous.patch
+ for f in sirlucjan/5.10/fixes-miscellaneous-v11-sep/*.patch; do patch -p1 < "\$f"; done
patch -p1 < 0001-futex-resync-from-gitlab.collabora.com.patch
#patch -p1 < 0001-futex2-resync-from-gitlab.collabora.com.patch
patch -p1 < ../0011-ZFS-fix.patch