summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--0001-kernel-config-cfs-r3.patch (renamed from 0001-kernel-config-cfs-r2.patch)102
-rwxr-xr-xgentoox_build.sh6
2 files changed, 38 insertions, 70 deletions
diff --git a/0001-kernel-config-cfs-r2.patch b/0001-kernel-config-cfs-r3.patch
index bdd4f2a..b03f90c 100644
--- a/0001-kernel-config-cfs-r2.patch
+++ b/0001-kernel-config-cfs-r3.patch
@@ -1,18 +1,5 @@
---- .config-artix 2020-01-15 10:57:22.023350807 -0600
-+++ .config 2020-01-15 11:05:05.118358275 -0600
-@@ -1,10 +1,10 @@
- #
- # Automatically generated file; DO NOT EDIT.
--# Linux/x86 5.4.7-artix1 Kernel Configuration
-+# Linux/x86 5.4.12-gentoo Kernel Configuration
- #
-
- #
--# Compiler: gcc (GCC) 9.2.0
-+# Compiler: gcc (Gentoo 9.2.0-r2 p3) 9.2.0
- #
- CONFIG_CC_IS_GCC=y
- CONFIG_GCC_VERSION=90200
+--- .config-artix 2020-02-06 15:13:27.532359813 +0000
++++ .config 2020-02-06 15:13:13.388358678 +0000
@@ -13,6 +13,7 @@
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_INLINE=y
@@ -21,7 +8,7 @@
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
-@@ -35,9 +36,9 @@
+@@ -34,9 +35,9 @@
# CONFIG_KERNEL_GZIP is not set
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
@@ -33,7 +20,7 @@
CONFIG_DEFAULT_HOSTNAME="artixlinux"
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
-@@ -168,7 +169,7 @@
+@@ -169,7 +170,7 @@
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_CFS_BANDWIDTH=y
@@ -42,7 +29,7 @@
CONFIG_UCLAMP_TASK_GROUP=y
CONFIG_CGROUP_PIDS=y
CONFIG_CGROUP_RDMA=y
-@@ -186,7 +187,6 @@
+@@ -187,7 +188,6 @@
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
CONFIG_USER_NS=y
@@ -50,7 +37,7 @@
CONFIG_PID_NS=y
CONFIG_NET_NS=y
CONFIG_CHECKPOINT_RESTORE=y
-@@ -201,7 +201,8 @@
+@@ -202,7 +202,8 @@
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
CONFIG_RD_LZ4=y
@@ -104,7 +91,7 @@
CONFIG_X86_TSC=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_CMOV=y
-@@ -455,9 +485,9 @@
+@@ -454,9 +484,9 @@
CONFIG_SECCOMP=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
@@ -117,7 +104,7 @@
CONFIG_SCHED_HRTICK=y
CONFIG_KEXEC=y
CONFIG_KEXEC_FILE=y
-@@ -483,7 +513,7 @@
+@@ -482,7 +512,7 @@
# CONFIG_CMDLINE_BOOL is not set
CONFIG_MODIFY_LDT_SYSCALL=y
CONFIG_HAVE_LIVEPATCH=y
@@ -126,38 +113,17 @@
# end of Processor type and features
CONFIG_ARCH_HAS_ADD_PAGES=y
-@@ -697,11 +727,14 @@
- #
+@@ -698,7 +728,9 @@
# EFI (Extensible Firmware Interface) Support
#
--# CONFIG_EFI_VARS is not set
+ # CONFIG_EFI_VARS is not set
+CONFIG_EFI_VARS=y
CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=y
-+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
CONFIG_EFI_RUNTIME_MAP=y
# CONFIG_EFI_FAKE_MEMMAP is not set
- CONFIG_EFI_RUNTIME_WRAPPERS=y
-+# CONFIG_EFI_BOOTLOADER_CONTROL is not set
- CONFIG_EFI_CAPSULE_LOADER=m
- # CONFIG_EFI_TEST is not set
- CONFIG_APPLE_PROPERTIES=y
-@@ -860,14 +893,9 @@
- CONFIG_PLUGIN_HOSTCC="g++"
- CONFIG_HAVE_GCC_PLUGINS=y
- CONFIG_GCC_PLUGINS=y
--
--#
--# GCC plugins
--#
- # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
- # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
- # CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
--# end of GCC plugins
- # end of General architecture-dependent options
-
- CONFIG_RT_MUTEXES=y
-@@ -889,8 +917,8 @@
+ CONFIG_EFI_SOFT_RESERVE=y
+@@ -882,8 +914,8 @@
CONFIG_MODULE_SIG_SHA512=y
CONFIG_MODULE_SIG_HASH="sha512"
CONFIG_MODULE_COMPRESS=y
@@ -168,7 +134,7 @@
CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_MODULES_TREE_LOOKUP=y
-@@ -2583,9 +2611,9 @@
+@@ -2553,9 +2585,9 @@
#
# SCSI device support
#
@@ -180,7 +146,7 @@
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
CONFIG_SCSI_PROC_FS=y
-@@ -2735,7 +2763,7 @@
+@@ -2705,7 +2737,7 @@
CONFIG_SCSI_DH_ALUA=m
# end of SCSI device support
@@ -189,7 +155,7 @@
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_ACPI=y
CONFIG_SATA_ZPODD=y
-@@ -2744,7 +2772,7 @@
+@@ -2714,7 +2746,7 @@
#
# Controllers with non-SFF native interface
#
@@ -198,7 +164,7 @@
CONFIG_SATA_MOBILE_LPM_POLICY=3
CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_AHCI_CEVA=m
-@@ -6619,7 +6647,10 @@
+@@ -6607,7 +6639,10 @@
CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
# end of Console display driver support
@@ -210,7 +176,7 @@
# end of Graphics support
CONFIG_SOUND=m
-@@ -7164,11 +7195,11 @@
+@@ -7159,11 +7194,11 @@
#
# HID support
#
@@ -225,7 +191,7 @@
#
# Special HID drivers
-@@ -7287,16 +7318,9 @@
+@@ -7282,16 +7317,9 @@
#
# USB HID support
#
@@ -243,7 +209,7 @@
# end of USB HID support
#
-@@ -7340,23 +7364,22 @@
+@@ -7335,23 +7363,22 @@
# USB Host Controller Drivers
#
CONFIG_USB_C67X00_HCD=m
@@ -272,7 +238,7 @@
CONFIG_USB_OHCI_HCD_PLATFORM=m
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_U132_HCD=m
-@@ -9507,14 +9530,14 @@
+@@ -9519,14 +9546,14 @@
CONFIG_FS_IOMAP=y
# CONFIG_EXT2_FS is not set
# CONFIG_EXT3_FS is not set
@@ -290,7 +256,7 @@
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_PROC_INFO=y
-@@ -9526,7 +9549,7 @@
+@@ -9538,7 +9565,7 @@
CONFIG_JFS_SECURITY=y
# CONFIG_JFS_DEBUG is not set
CONFIG_JFS_STATISTICS=y
@@ -299,7 +265,7 @@
CONFIG_XFS_QUOTA=y
CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
-@@ -9542,7 +9565,7 @@
+@@ -9554,7 +9581,7 @@
CONFIG_OCFS2_FS_STATS=y
CONFIG_OCFS2_DEBUG_MASKLOG=y
# CONFIG_OCFS2_DEBUG_FS is not set
@@ -308,7 +274,7 @@
CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
-@@ -9550,7 +9573,7 @@
+@@ -9562,7 +9589,7 @@
# CONFIG_BTRFS_ASSERT is not set
# CONFIG_BTRFS_FS_REF_VERIFY is not set
CONFIG_NILFS2_FS=m
@@ -317,7 +283,7 @@
CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
-@@ -9620,9 +9643,9 @@
+@@ -9632,9 +9659,9 @@
#
# DOS/FAT/NT Filesystems
#
@@ -330,7 +296,7 @@
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_FAT_DEFAULT_UTF8=y
-@@ -9954,7 +9977,7 @@
+@@ -9966,7 +9993,7 @@
# end of Kernel hardening options
# end of Security options
@@ -339,7 +305,7 @@
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
CONFIG_ASYNC_XOR=m
-@@ -10046,9 +10069,9 @@
+@@ -10060,9 +10087,9 @@
#
# Digest
#
@@ -350,8 +316,8 @@
+CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32_PCLMUL=m
CONFIG_CRYPTO_XXHASH=m
- CONFIG_CRYPTO_CRCT10DIF=y
-@@ -10202,7 +10225,7 @@
+ CONFIG_CRYPTO_BLAKE2B=m
+@@ -10238,7 +10265,7 @@
#
# Library routines
#
@@ -360,7 +326,7 @@
CONFIG_RAID6_PQ_BENCHMARK=y
CONFIG_PACKING=y
CONFIG_BITREVERSE=y
-@@ -10217,7 +10240,7 @@
+@@ -10253,7 +10280,7 @@
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_CRC_CCITT=y
@@ -369,7 +335,7 @@
CONFIG_CRC_T10DIF=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC32=y
-@@ -10229,7 +10252,7 @@
+@@ -10265,7 +10292,7 @@
CONFIG_CRC64=m
CONFIG_CRC4=m
CONFIG_CRC7=m
@@ -378,7 +344,7 @@
CONFIG_CRC8=m
CONFIG_XXHASH=y
# CONFIG_RANDOM32_SELFTEST is not set
-@@ -10565,6 +10588,7 @@
+@@ -10670,6 +10697,7 @@
# CONFIG_TEST_STATIC_KEYS is not set
# CONFIG_TEST_KMOD is not set
# CONFIG_TEST_MEMCAT_P is not set
@@ -386,9 +352,9 @@
# CONFIG_TEST_OBJAGG is not set
# CONFIG_TEST_STACKINIT is not set
# CONFIG_TEST_MEMINIT is not set
-@@ -10607,3 +10631,18 @@
- # CONFIG_UNWINDER_FRAME_POINTER is not set
- # CONFIG_UNWINDER_GUESS is not set
+@@ -10677,3 +10705,18 @@
+ # CONFIG_HYPERV_TESTING is not set
+ # end of Kernel Testing and Coverage
# end of Kernel hacking
+
+#
diff --git a/gentoox_build.sh b/gentoox_build.sh
index 3acd8b3..6238cba 100755
--- a/gentoox_build.sh
+++ b/gentoox_build.sh
@@ -190,18 +190,19 @@ if [[ ! -f '/tmp/gentoox-kernelpatches-applied' ]]; then
git clone https://github.com/graysky2/kernel_gcc_patch.git
wget --quiet https://gitlab.com/post-factum/pf-kernel/commit/cf7a8ad26e0bd6ca8afba89f53d2e9dc43ee2598.diff -O O3-always-available.diff
#wget --quiet -m -np -c 'ck.kolivas.org/patches/5.0/5.5/5.5-ck1/patches/'
- wget --quiet https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.5/aufs-patches/0001-aufs-20200127.patch
+ wget --quiet https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.5/aufs-patches/0001-aufs-20200203.patch
wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux55-tkg/linux55-tkg-patches/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux55-tkg/linux55-tkg-patches/0002-clear-patches.patch
wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux55-tkg/linux55-tkg-patches/0006-add-acs-overrides_iommu.patch
wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux55-tkg/linux55-tkg-patches/0007-v5.5-fsync.patch
wget --quiet https://git.froggi.es/tkg/PKGBUILDS/raw/master/linux55-tkg/linux55-tkg-patches/0011-ZFS-fix.patch
+ wget --quiet https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/5.5/wireguard-patches/0001-WireGuard-20200205.patch
patch -p1 < kernel_gcc_patch/enable_additional_cpu_optimizations_for_gcc_v9.1+_kernel_v5.5+.patch
patch -p1 < O3-always-available.diff
#for f in ck.kolivas.org/patches/5.0/5.5/5.5-ck1/patches/*.patch; do patch -p1 < "\$f"; done
patch -p0 < ../$KERNEL_CONFIG_DIFF
- patch -p1 < 0001-aufs-20200127.patch
+ patch -p1 < 0001-aufs-20200203.patch
echo -e "CONFIG_AUFS_FS=y\nCONFIG_AUFS_BRANCH_MAX_127=y\nCONFIG_AUFS_BRANCH_MAX_511=n\nCONFIG_AUFS_BRANCH_MAX_1023=n\nCONFIG_AUFS_BRANCH_MAX_32767=n\nCONFIG_AUFS_HNOTIFY=y\nCONFIG_AUFS_EXPORT=n\nCONFIG_AUFS_XATTR=y\nCONFIG_AUFS_FHSM=y\nCONFIG_AUFS_RDU=n\nCONFIG_AUFS_DIRREN=n\nCONFIG_AUFS_SHWH=n\nCONFIG_AUFS_BR_RAMFS=y\nCONFIG_AUFS_BR_FUSE=n\nCONFIG_AUFS_BR_HFSPLUS=n\nCONFIG_AUFS_DEBUG=n" >> .config
sed -i "s/CONFIG_ISO9660_FS=m/CONFIG_ISO9660_FS=y/" .config
patch -p1 < 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -209,6 +210,7 @@ if [[ ! -f '/tmp/gentoox-kernelpatches-applied' ]]; then
patch -p1 < 0006-add-acs-overrides_iommu.patch
patch -p1 < 0007-v5.5-fsync.patch
patch -p1 < 0011-ZFS-fix.patch
+ patch -p1 < 0001-WireGuard-20200205.patch
sed -i 's/CONFIG_DEFAULT_HOSTNAME="artixlinux"/CONFIG_DEFAULT_HOSTNAME="gentoox"/' .config
make oldconfig
touch /tmp/gentoox-kernelpatches-applied