diff options
author | abelian424 | 2021-02-24 09:46:35 +0600 |
---|---|---|
committer | abelian424 | 2021-02-24 09:46:35 +0600 |
commit | ef84a794c505f235dd3c8a13a1b79721718dd0f0 (patch) | |
tree | 141a8c965f2eef748e0ca82354950d1ada2d7aa6 | |
parent | 9b8e6c46368d532ad7f4707dc82f275e13d93a0a (diff) | |
download | aur-ef84a794c505f235dd3c8a13a1b79721718dd0f0.tar.gz |
Updated to 5.10.18
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | 90-cleanup.hook | 14 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rwxr-xr-x | cleanup | 10 | ||||
-rw-r--r-- | prepare | 120 |
5 files changed, 131 insertions, 53 deletions
@@ -1,7 +1,7 @@ pkgbase = linux-mainline-bcachefs pkgdesc = Linux-tkg with bcachefs - pkgver = 5.10.15 - pkgrel = 120 + pkgver = 5.10.18 + pkgrel = 127 url = http://www.kernel.org/ arch = x86_64 license = GPL2 @@ -32,8 +32,8 @@ pkgbase = linux-mainline-bcachefs source = https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v5.8%2B.patch source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/config.x86_64 source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/config_hardened.x86_64 - source = 90-cleanup.hook - source = cleanup + source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/90-cleanup.hook + source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/cleanup source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0002-clear-patches.patch source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0003-glitched-base.patch @@ -47,6 +47,7 @@ pkgbase = linux-mainline-bcachefs source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0005-glitched-pds.patch source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0006-add-acs-overrides_iommu.patch source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0007-v5.10-fsync.patch + source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0007-v5.10-futex2_interface.patch source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0008-5.10-bcachefs.patch source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0009-glitched-ondemand-bmq.patch source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0009-glitched-bmq.patch @@ -57,10 +58,12 @@ pkgbase = linux-mainline-bcachefs source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/ryzen-desktop-profile.cfg source = https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/generic-desktop-profile.cfg sha256sums = dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43 - sha256sums = 9541437bd4a68d10d1f40f91080683fb6b8d99def258681b2fa74540d4f74082 + sha256sums = 97c728530644bc698f523f7f91e416963315a6fb755eb77eb420135e5f179ee5 sha256sums = SKIP sha256sums = 458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a - sha256sums = fc126c14140668cc4bdbc8886fb8bc05ae734c5cf1e20b719b40b36d1dae255a + sha256sums = eb1da1a028a1c967222b5bdac1db2b2c4d8285bafd714892f6fc821c10416341 + sha256sums = SKIP + sha256sums = SKIP sha256sums = 1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898 sha256sums = 66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997 sha256sums = f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6 @@ -76,7 +79,8 @@ pkgbase = linux-mainline-bcachefs sha256sums = fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320 sha256sums = 19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a sha256sums = b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456 - sha256sums = 26b4b7b4832c5eff53bb679a410dd6300b956d4c51763512ebebf4fd99eed873 + sha256sums = 47c05c6e7e1280dca137ed2139dac7da0d026a27d5590fd386748d1827288a61 + sha256sums = c5dd103953b8830640538ba30ff511028bd93310f95e4f5587a6ed5e6414a60d sha256sums = 9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177 sha256sums = a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911 sha256sums = e308292fc42840a2366280ea7cf26314e92b931bb11f04ad4830276fc0326ee1 diff --git a/90-cleanup.hook b/90-cleanup.hook deleted file mode 100644 index 99f5221b76a1..000000000000 --- a/90-cleanup.hook +++ /dev/null @@ -1,14 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/modules/*/ -Target = !usr/lib/modules/*/?* - -[Action] -Description = Cleaning up... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/cleanup -NeedsTargets - @@ -33,7 +33,7 @@ else fi pkgname=("${pkgbase}" "${pkgbase}-headers") pkgver="${_basekernel}"."${_sub}" -pkgrel=120 +pkgrel=127 pkgdesc='Linux-tkg with bcachefs' arch=('x86_64') # no i686 in here url="http://www.kernel.org/" @@ -51,8 +51,8 @@ options=('!strip' 'docs') "https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v5.8%2B.patch" "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/config.x86_64" # stock Arch config "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/config_hardened.x86_64" # hardened Arch config - 90-cleanup.hook - cleanup + "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/90-cleanup.hook" + "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/5.10/cleanup" # ARCH Patches "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch" # TkG @@ -68,6 +68,7 @@ options=('!strip' 'docs') "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0005-glitched-pds.patch" "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0006-add-acs-overrides_iommu.patch" "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0007-v5.10-fsync.patch" + "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0007-v5.10-futex2_interface.patch" "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0008-5.10-bcachefs.patch" "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0009-glitched-ondemand-bmq.patch" "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0009-glitched-bmq.patch" @@ -75,14 +76,16 @@ options=('!strip' 'docs') "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0011-ZFS-fix.patch" "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0012-linux-hardened.patch" "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-patches/5.10/0012-misc-additions.patch" - "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/ryzen-desktop-profile.cfg" - "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/generic-desktop-profile.cfg" + "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/ryzen-desktop-profile.cfg" + "https://raw.githubusercontent.com/Frogging-Family/linux-tkg/master/linux-tkg-config/generic-desktop-profile.cfg" ) sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43' - 'fc126c14140668cc4bdbc8886fb8bc05ae734c5cf1e20b719b40b36d1dae255a' + '97c728530644bc698f523f7f91e416963315a6fb755eb77eb420135e5f179ee5' 'SKIP' '458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a' 'eb1da1a028a1c967222b5bdac1db2b2c4d8285bafd714892f6fc821c10416341' + 'SKIP' + 'SKIP' '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898' '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997' 'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6' @@ -98,15 +101,16 @@ options=('!strip' 'docs') 'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' 'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456' - '26b4b7b4832c5eff53bb679a410dd6300b956d4c51763512ebebf4fd99eed873' + '47c05c6e7e1280dca137ed2139dac7da0d026a27d5590fd386748d1827288a61' + 'c5dd103953b8830640538ba30ff511028bd93310f95e4f5587a6ed5e6414a60d' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'e308292fc42840a2366280ea7cf26314e92b931bb11f04ad4830276fc0326ee1' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104' '105f51e904d80f63c1421203e093b612fc724edefd3e388b64f8d371c0b3a842' '7fb1104c167edb79ec8fbdcde97940ed0f806aa978bdd14d0c665a1d76d25c24' - 'SKIP' - 'SKIP') + 'SKIP' + 'SKIP') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase diff --git a/cleanup b/cleanup deleted file mode 100755 index c00c08d82679..000000000000 --- a/cleanup +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -for _f in /usr/lib/modules/*tkg*; do - if [[ ! -e ${_f}/vmlinuz ]]; then - rm -rf "$_f" - fi -done - -# vim:set ft=sh sw=2 et: - @@ -1,11 +1,11 @@ #!/bin/bash -ver54=97 +ver54=100 ver57=19 ver58=18 ver59=16 -ver510=15 -ver511=rc7 +ver510=18 +ver511=1 _tkg_initscript() { @@ -103,8 +103,9 @@ _tkg_initscript() { elif [ "$_cpusched" = "muqss" ] || [ "$_cpusched" = "MuQSS" ]; then echo "_cpusched=\"MuQSS\"" > "${_path}"/cpuschedset else - if [ "$_nofallback" != "true" ]; then - warning "Something is wrong with your cpusched selection. Do you want to fallback to CFS (default)?" + if [ "$_nofallback" != "true" ] && ! [[ ${_CPUSCHEDARRAY[*]} =~ "$_cpusched" ]]; then + warning "Your cpusched selection ( $_cpusched ) is not available for the selected kernel version." + msg2 "Do you want to fallback to CFS (default)?" read -rp "`echo $' > N/y : '`" _fallback; fi if [[ "$_fallback" =~ [yY] ]] || [ "$_nofallback" = "true" ]; then @@ -114,6 +115,7 @@ _tkg_initscript() { exit 1 fi fi + if [ -n "$_custom_pkgbase" ]; then echo "_custom_pkgbase=\"${_custom_pkgbase}\"" >> "${_path}"/cpuschedset fi @@ -385,8 +387,89 @@ _tkg_srcprep() { sed -i -e 's/# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set/CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y/' ./.config sed -i -e 's/CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"/CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lz4"/' ./.config sed -i -e 's/# CONFIG_CMDLINE_BOOL is not set/CONFIG_CMDLINE_BOOL=y/' ./.config - if [ "$_config_expert" = "true" ]; then + if [ "$_futex2" = "true" ]; then sed -i -e 's/# CONFIG_EXPERT is not set/CONFIG_EXPERT=y/' ./.config + echo -e "# CONFIG_DEBUG_RSEQ is not set\n +# CONFIG_PC104 is not set\n +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set\n +# CONFIG_SLOB is not set\n +# CONFIG_PROCESSOR_SELECT is not set\n +# CONFIG_SUSPEND_SKIP_SYNC is not set\n +# CONFIG_DPM_WATCHDOG is not set\n +# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set\n +# CONFIG_PCI_CNB20LE_QUIRK is not set\n +# CONFIG_ISA_BUS is not set\n +CONFIG_KVM_WERROR=y\n +# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set\n +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set\n +# CONFIG_PCIE_BUS_TUNE_OFF is not set\n +CONFIG_PCIE_BUS_DEFAULT=y\n +# CONFIG_PCIE_BUS_SAFE is not set\n +# CONFIG_PCIE_BUS_PERFORMANCE is not set\n +# CONFIG_PCIE_BUS_PEER2PEER is not set\n +# CONFIG_PATA_PLATFORM is not set\n +# CONFIG_TTY_PRINTK is not set\n +# CONFIG_GPIO_SYSFS is not set\n +# CONFIG_VIDEO_TDA1997X is not set\n +# CONFIG_VIDEO_TLV320AIC23B is not set\n +# CONFIG_VIDEO_ADV7180 is not set\n +# CONFIG_VIDEO_ADV7183 is not set\n +# CONFIG_VIDEO_ADV7604 is not set\n +# CONFIG_VIDEO_ADV7842 is not set\n +# CONFIG_VIDEO_BT819 is not set\n +# CONFIG_VIDEO_BT856 is not set\n +# CONFIG_VIDEO_BT866 is not set\n +# CONFIG_VIDEO_KS0127 is not set\n +# CONFIG_VIDEO_ML86V7667 is not set\n +# CONFIG_VIDEO_SAA7110 is not set\n +# CONFIG_VIDEO_TC358743 is not set\n +# CONFIG_VIDEO_TVP514X is not set\n +# CONFIG_VIDEO_TVP7002 is not set\n +# CONFIG_VIDEO_TW9910 is not set\n +# CONFIG_VIDEO_VPX3220 is not set\n +# CONFIG_VIDEO_SAA7185 is not set\n +# CONFIG_VIDEO_ADV7170 is not set\n +# CONFIG_VIDEO_ADV7175 is not set\n +# CONFIG_VIDEO_ADV7343 is not set\n +# CONFIG_VIDEO_ADV7393 is not set\n +# CONFIG_VIDEO_ADV7511 is not set\n +# CONFIG_VIDEO_AD9389B is not set\n +# CONFIG_VIDEO_AK881X is not set\n +# CONFIG_VIDEO_THS8200 is not set\n +# CONFIG_VIDEO_THS7303 is not set\n +# CONFIG_VIDEO_I2C is not set\n +# CONFIG_VIDEO_ST_MIPID02 is not set\n +# CONFIG_VIDEO_GS1662 is not set\n +# CONFIG_MEDIA_TUNER_MSI001 is not set\n +# CONFIG_DVB_S5H1432 is not set\n +# CONFIG_DVB_DIB9000 is not set\n +# CONFIG_DVB_CXD2880 is not set\n +# CONFIG_DVB_MN88443X is not set\n +# CONFIG_DVB_LNBH29 is not set\n +# CONFIG_DVB_LGS8GL5 is not set\n +# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set\n +# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set\n +# CONFIG_DRM_I915_WERROR is not set\n +# CONFIG_DRM_I915_DEBUG is not set\n +# CONFIG_DRM_I915_DEBUG_MMIO is not set\n +# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set\n +# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set\n +# CONFIG_DRM_I915_DEBUG_GUC is not set\n +# CONFIG_DRM_I915_SELFTEST is not set\n +# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set\n +# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set\n +# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set\n +# CONFIG_FB_INTEL is not set\n +# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set\n +# CONFIG_USB_KBD is not set\n +# CONFIG_USB_MOUSE is not set\n +# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set\n +# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set\n +CONFIG_PAHOLE_HAS_SPLIT_BTF=y\n +CONFIG_DEBUG_INFO_BTF_MODULES=y\n +# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set\n +# CONFIG_WIRELESS_WDS is not set\n +# CONFIG_UNWINDER_GUESS is not set" >> ./.config fi echo "CONFIG_CMDLINE=\"${_custom_commandline}\"" >> ./.config echo "# CONFIG_CMDLINE_OVERRIDE is not set" >> ./.config @@ -506,7 +589,7 @@ _tkg_srcprep() { plain "1: Deboost and requeue task. (default)" plain "2: Set rq skip task." if [ "${_cpusched}" = "MuQSS" ]; then - read -rp "`echo $'\n 0. Supposedly best option for gaming performance - could lead to stability issues on some (AMD) platforms when combined with MuQSS\n > 1. Default and recommended option for MuQSS - could lead to stability issues on some (Intel) platforms\n 2. Can be a good option with low rr_interval on MuQSS\n [0-2?]: '`" CONDITION0; + read -rp "`echo $'\n 0. Supposedly best option for gaming performance,\n but might lead to stability issues on some (AMD) platforms when combined with MuQSS\n > 1. Default and recommended option for MuQSS - could lead to stability issues on some (Intel) platforms\n 2. Can be a good option with low rr_interval on MuQSS\n [0-2?]: '`" CONDITION0; else read -rp "`echo $'\n > 0. Recommended option for gaming on PDS - "tkg" default\n 1. Default, but can lead to stability issues on some platforms\n 2. Can be a good option with low rr_interval on MuQSS\n [0-2?]: '`" CONDITION0; fi @@ -888,8 +971,23 @@ _tkg_srcprep() { tkgpatch="$srcdir/0007-v${_basekernel}-fsync.patch" && _tkg_patcher fi + # futex2 support + if [ -z "$_futex2" ]; then + plain "" + plain "Enable support for futex2, an experimental replacement for esync and fsync in Valve Proton 5.13 experimental" + plain "Can be enabled alongside regular fsync patchset to have a fallback option" + plain "https://gitlab.collabora.com/tonyk/linux/-/tree/futex2-dev" + plain "https://github.com/ValveSoftware/Proton/issues/4568" + read -rp "`echo $' > N/y : '`" CONDITION10; + fi + if [[ "$CONDITION10" =~ [yY] ]] || [ "$_futex2" = "true" ]; then + msg2 "Patching futex2 support" + tkgpatch="$srcdir/0007-v${_basekernel}-futex2_interface.patch" && _tkg_patcher + echo "CONFIG_FUTEX2=y" >> ./.config + fi + # ZFS fix - if [ "$_basever" != "59" ]; then + if [ "$_basever" = "54" ] || [ "$_basever" = "57" ] || [ "$_basever" = "58" ]; then if [ -z "$_zfsfix" ]; then plain "" plain "Add back missing symbol for AES-NI/AVX support on ZFS" @@ -964,11 +1062,7 @@ _tkg_srcprep() { read -rp "`echo $' > N/y : '`" CONDITIONMPDB; fi if [[ "$CONDITIONMPDB" =~ [yY] ]] || [ "$_modprobeddb" = "true" ]; then - if [ "$_config_expert" = "true" ];then - make LSMOD=${HOME}/.config/modprobed.db localmodconfig ${llvm_opt} - else - yes "" | make LSMOD=${HOME}/.config/modprobed.db localmodconfig ${llvm_opt} - fi + yes "" | make LSMOD=${HOME}/.config/modprobed.db localmodconfig ${llvm_opt} fi if [ true = "$_config_fragments" ]; then |