diff options
author | graysky | 2019-08-25 13:20:42 -0400 |
---|---|---|
committer | graysky | 2019-08-25 13:20:42 -0400 |
commit | 663ce3d2e72a4576dad411bfc10da280be8dcba1 (patch) | |
tree | af2e1f0dd5d483df3d848ad04f82ff45165ece1d | |
parent | 923dc49ec6ca24c282257213825993a241c4b131 (diff) | |
download | aur-663ce3d2e72a4576dad411bfc10da280be8dcba1.tar.gz |
Update to 5.2.10-1
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | 0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch | 328 | ||||
-rw-r--r-- | PKGBUILD | 57 |
3 files changed, 36 insertions, 369 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-ck - pkgver = 5.2.9 + pkgver = 5.2.10 pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 @@ -9,32 +9,30 @@ pkgbase = linux-ck makedepends = bc makedepends = libelf options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.9.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.9.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.10.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.10.tar.sign source = config source = 60-linux.hook source = 90-linux.hook source = linux.preset - source = enable_additional_cpu_optimizations-20190714.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190714.tar.gz + source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz source = http://ck.kolivas.org/patches/5.0/5.2/5.2-ck1/patch-5.2-ck1.xz source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch source = 0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch - source = 0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = b6f02a4b306ca5cd314d72615bfc2650166969613135da202630e6c4e1b5d4e6 + sha256sums = 6096c4387c2a296de9136080942d11ae3f1bd28129b6952f7133c570e43bfc49 sha256sums = SKIP sha256sums = 1c4d5500a3b4995035c2e940fc0ad2a2dae7be047c8eb20c097444e348258f87 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 - sha256sums = 2466fb4aecc66d1b258b4cbdb2f215b5099f266d8c4386bb62ad1a0acd0caf5b + sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5 sha256sums = f1abc13a8d859fbf6350040e45d7f04ad551a6d39f113ba96fbbd820118c0e36 sha256sums = 91fafa76bf9cb32159ac7f22191b3589278b91e65bc4505cf2fc6013b8037bf3 sha256sums = 63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9 sha256sums = fc96300831506965383ef30bc46b72735dc45bb97dea2ccb8b9450c005d2f020 - sha256sums = ef926edbd866d95464eb86f7565de572eb97ecfa0369d3b2e078016a0e71a871 pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.192 @@ -44,12 +42,12 @@ pkgname = linux-ck depends = kmod depends = mkinitcpio optdepends = crda: to set the correct wireless channels of your country - provides = linux-ck=5.2.9 + provides = linux-ck=5.2.10 backup = etc/mkinitcpio.d/linux-ck.preset pkgname = linux-ck-headers pkgdesc = Header files and scripts for building modules for Linux-ck kernel depends = linux-ck - provides = linux-ck-headers=5.2.9 - provides = linux-headers=5.2.9 + provides = linux-ck-headers=5.2.10 + provides = linux-headers=5.2.10 diff --git a/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch b/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch deleted file mode 100644 index 67a9c762ccc1..000000000000 --- a/0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch +++ /dev/null @@ -1,328 +0,0 @@ -From e7cae1276332a8d1a94e1e0e272c8b9209bdd83f Mon Sep 17 00:00:00 2001 -From: Haim Dreyfuss <haim.dreyfuss@intel.com> -Date: Wed, 27 Feb 2019 16:43:45 +0200 -Subject: [PATCH 4/6] iwlwifi: Add support for SAR South Korea limitation - -South Korea is adding a more strict SAR limit called "Limb SAR". -Currently, WGDS SAR offset group 3 is not used (not mapped to any country). -In order to be able to comply with South Korea new restriction: -- OEM will use WGDS SAR offset group 3 to South Korea limitation. -- OEM will change WGDS revision to 1 (currently latest revision is 0) - to notify that Korea Limb SAR applied. -- Driver will read the WGDS table and pass the values to FW (as usual) -- Driver will pass to FW an indication that Korea Limb SAR is applied - in case table revision is 1. - -Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com> -Signed-off-by: Luca Coelho <luciano.coelho@intel.com> ---- - drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 28 ++++++---- - drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 5 +- - .../net/wireless/intel/iwlwifi/fw/api/power.h | 12 ++++ - drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + - drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 55 ++++++++++++++----- - drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 + - 6 files changed, 76 insertions(+), 28 deletions(-) - -diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c -index 405038ce98d6..7573af2d88ce 100644 ---- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c -+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c -@@ -97,7 +97,7 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_object); - - union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, - union acpi_object *data, -- int data_size) -+ int data_size, int *tbl_rev) - { - int i; - union acpi_object *wifi_pkg; -@@ -113,16 +113,19 @@ union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, - /* - * We need at least two packages, one for the revision and one - * for the data itself. Also check that the revision is valid -- * (i.e. it is an integer set to 0). -+ * (i.e. it is an integer smaller than 2, as we currently support only -+ * 2 revisions). - */ - if (data->type != ACPI_TYPE_PACKAGE || - data->package.count < 2 || - data->package.elements[0].type != ACPI_TYPE_INTEGER || -- data->package.elements[0].integer.value != 0) { -+ data->package.elements[0].integer.value > 1) { - IWL_DEBUG_DEV_RADIO(dev, "Unsupported packages structure\n"); - return ERR_PTR(-EINVAL); - } - -+ *tbl_rev = data->package.elements[0].integer.value; -+ - /* loop through all the packages to find the one for WiFi */ - for (i = 1; i < data->package.count; i++) { - union acpi_object *domain; -@@ -151,14 +154,15 @@ int iwl_acpi_get_mcc(struct device *dev, char *mcc) - { - union acpi_object *wifi_pkg, *data; - u32 mcc_val; -- int ret; -+ int ret, tbl_rev; - - data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD); - if (IS_ERR(data)) - return PTR_ERR(data); - -- wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE); -- if (IS_ERR(wifi_pkg)) { -+ wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE, -+ &tbl_rev); -+ if (IS_ERR(wifi_pkg) || tbl_rev != 0) { - ret = PTR_ERR(wifi_pkg); - goto out_free; - } -@@ -185,6 +189,7 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev) - { - union acpi_object *data, *wifi_pkg; - u64 dflt_pwr_limit; -+ int tbl_rev; - - data = iwl_acpi_get_object(dev, ACPI_SPLC_METHOD); - if (IS_ERR(data)) { -@@ -193,8 +198,8 @@ u64 iwl_acpi_get_pwr_limit(struct device *dev) - } - - wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, -- ACPI_SPLC_WIFI_DATA_SIZE); -- if (IS_ERR(wifi_pkg) || -+ ACPI_SPLC_WIFI_DATA_SIZE, &tbl_rev); -+ if (IS_ERR(wifi_pkg) || tbl_rev != 0 || - wifi_pkg->package.elements[1].integer.value != ACPI_TYPE_INTEGER) { - dflt_pwr_limit = 0; - goto out_free; -@@ -211,14 +216,15 @@ IWL_EXPORT_SYMBOL(iwl_acpi_get_pwr_limit); - int iwl_acpi_get_eckv(struct device *dev, u32 *extl_clk) - { - union acpi_object *wifi_pkg, *data; -- int ret; -+ int ret, tbl_rev; - - data = iwl_acpi_get_object(dev, ACPI_ECKV_METHOD); - if (IS_ERR(data)) - return PTR_ERR(data); - -- wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE); -- if (IS_ERR(wifi_pkg)) { -+ wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_ECKV_WIFI_DATA_SIZE, -+ &tbl_rev); -+ if (IS_ERR(wifi_pkg) || tbl_rev != 0) { - ret = PTR_ERR(wifi_pkg); - goto out_free; - } -diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h -index f5704e16643f..991a23450999 100644 ---- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h -+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h -@@ -97,7 +97,7 @@ - void *iwl_acpi_get_object(struct device *dev, acpi_string method); - union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, - union acpi_object *data, -- int data_size); -+ int data_size, int *tbl_rev); - - /** - * iwl_acpi_get_mcc - read MCC from ACPI, if available -@@ -131,7 +131,8 @@ static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method) - - static inline union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev, - union acpi_object *data, -- int data_size) -+ int data_size, -+ int *tbl_rev) - { - return ERR_PTR(-ENOENT); - } -diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h -index 01f003c6cff9..f195db398bed 100644 ---- a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h -+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h -@@ -419,14 +419,26 @@ struct iwl_per_chain_offset_group { - struct iwl_per_chain_offset hb; - } __packed; /* PER_CHAIN_LIMIT_OFFSET_GROUP_S_VER_1 */ - -+/** -+ * struct iwl_geo_tx_power_profile_cmd_v1 - struct for GEO_TX_POWER_LIMIT cmd. -+ * @ops: operations, value from &enum iwl_geo_per_chain_offset_operation -+ * @table: offset profile per band. -+ */ -+struct iwl_geo_tx_power_profiles_cmd_v1 { -+ __le32 ops; -+ struct iwl_per_chain_offset_group table[IWL_NUM_GEO_PROFILES]; -+} __packed; /* GEO_TX_POWER_LIMIT_VER_1 */ -+ - /** - * struct iwl_geo_tx_power_profile_cmd - struct for GEO_TX_POWER_LIMIT cmd. - * @ops: operations, value from &enum iwl_geo_per_chain_offset_operation - * @table: offset profile per band. -+ * @table_revision: BIOS table revision. - */ - struct iwl_geo_tx_power_profiles_cmd { - __le32 ops; - struct iwl_per_chain_offset_group table[IWL_NUM_GEO_PROFILES]; -+ __le32 table_revision; - } __packed; /* GEO_TX_POWER_LIMIT */ - - /** -diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h -index de9243d30135..a74f34a8dffb 100644 ---- a/drivers/net/wireless/intel/iwlwifi/fw/file.h -+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h -@@ -286,6 +286,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t; - * SCAN_OFFLOAD_PROFILES_QUERY_RSP_S. - * @IWL_UCODE_TLV_API_MBSSID_HE: This ucode supports v2 of - * STA_CONTEXT_DOT11AX_API_S -+ * @IWL_UCODE_TLV_CAPA_SAR_TABLE_VER: This ucode supports different sar -+ * version tables. - * - * @NUM_IWL_UCODE_TLV_API: number of bits used - */ -@@ -318,6 +320,7 @@ enum iwl_ucode_tlv_api { - IWL_UCODE_TLV_API_MBSSID_HE = (__force iwl_ucode_tlv_api_t)52, - IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE = (__force iwl_ucode_tlv_api_t)53, - IWL_UCODE_TLV_API_FTM_RTT_ACCURACY = (__force iwl_ucode_tlv_api_t)54, -+ IWL_UCODE_TLV_API_SAR_TABLE_VER = (__force iwl_ucode_tlv_api_t)55, - - NUM_IWL_UCODE_TLV_API - #ifdef __CHECKER__ -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -index 559f6df1a74d..8a3e542c47b2 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c -@@ -682,15 +682,15 @@ static int iwl_mvm_sar_get_wrds_table(struct iwl_mvm *mvm) - { - union acpi_object *wifi_pkg, *table, *data; - bool enabled; -- int ret; -+ int ret, tbl_rev; - - data = iwl_acpi_get_object(mvm->dev, ACPI_WRDS_METHOD); - if (IS_ERR(data)) - return PTR_ERR(data); - - wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data, -- ACPI_WRDS_WIFI_DATA_SIZE); -- if (IS_ERR(wifi_pkg)) { -+ ACPI_WRDS_WIFI_DATA_SIZE, &tbl_rev); -+ if (IS_ERR(wifi_pkg) || tbl_rev != 0) { - ret = PTR_ERR(wifi_pkg); - goto out_free; - } -@@ -719,15 +719,15 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm) - { - union acpi_object *wifi_pkg, *data; - bool enabled; -- int i, n_profiles, ret; -+ int i, n_profiles, ret, tbl_rev; - - data = iwl_acpi_get_object(mvm->dev, ACPI_EWRD_METHOD); - if (IS_ERR(data)) - return PTR_ERR(data); - - wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data, -- ACPI_EWRD_WIFI_DATA_SIZE); -- if (IS_ERR(wifi_pkg)) { -+ ACPI_EWRD_WIFI_DATA_SIZE, &tbl_rev); -+ if (IS_ERR(wifi_pkg) || tbl_rev != 0) { - ret = PTR_ERR(wifi_pkg); - goto out_free; - } -@@ -778,7 +778,7 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm) - static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm) - { - union acpi_object *wifi_pkg, *data; -- int i, j, ret; -+ int i, j, ret, tbl_rev; - int idx = 1; - - data = iwl_acpi_get_object(mvm->dev, ACPI_WGDS_METHOD); -@@ -786,12 +786,13 @@ static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm) - return PTR_ERR(data); - - wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data, -- ACPI_WGDS_WIFI_DATA_SIZE); -- if (IS_ERR(wifi_pkg)) { -+ ACPI_WGDS_WIFI_DATA_SIZE, &tbl_rev); -+ if (IS_ERR(wifi_pkg) || tbl_rev > 1) { - ret = PTR_ERR(wifi_pkg); - goto out_free; - } - -+ mvm->geo_rev = tbl_rev; - for (i = 0; i < ACPI_NUM_GEO_PROFILES; i++) { - for (j = 0; j < ACPI_GEO_TABLE_SIZE; j++) { - union acpi_object *entry; -@@ -878,15 +879,29 @@ int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm) - { - struct iwl_geo_tx_power_profiles_resp *resp; - int ret; -+ u16 len; -+ void *data; -+ struct iwl_geo_tx_power_profiles_cmd geo_cmd; -+ struct iwl_geo_tx_power_profiles_cmd_v1 geo_cmd_v1; -+ struct iwl_host_cmd cmd; -+ -+ if (fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_SAR_TABLE_VER)) { -+ geo_cmd.ops = -+ cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE); -+ len = sizeof(geo_cmd); -+ data = &geo_cmd; -+ } else { -+ geo_cmd_v1.ops = -+ cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE); -+ len = sizeof(geo_cmd_v1); -+ data = &geo_cmd_v1; -+ } - -- struct iwl_geo_tx_power_profiles_cmd geo_cmd = { -- .ops = cpu_to_le32(IWL_PER_CHAIN_OFFSET_GET_CURRENT_TABLE), -- }; -- struct iwl_host_cmd cmd = { -+ cmd = (struct iwl_host_cmd){ - .id = WIDE_ID(PHY_OPS_GROUP, GEO_TX_POWER_LIMIT), -- .len = { sizeof(geo_cmd), }, -+ .len = { len, }, - .flags = CMD_WANT_SKB, -- .data = { &geo_cmd }, -+ .data = { data }, - }; - - ret = iwl_mvm_send_cmd(mvm, &cmd); -@@ -956,6 +971,16 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm) - i, j, value[1], value[2], value[0]); - } - } -+ -+ cmd.table_revision = cpu_to_le32(mvm->geo_rev); -+ -+ if (!fw_has_api(&mvm->fw->ucode_capa, -+ IWL_UCODE_TLV_API_SAR_TABLE_VER)) { -+ return iwl_mvm_send_cmd_pdu(mvm, cmd_wide_id, 0, -+ sizeof(struct iwl_geo_tx_power_profiles_cmd_v1), -+ &cmd); -+ } -+ - return iwl_mvm_send_cmd_pdu(mvm, cmd_wide_id, 0, sizeof(cmd), &cmd); - } - -diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h -index 88af1f0ba3f0..ed8fc9a9204c 100644 ---- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h -+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h -@@ -1184,6 +1184,7 @@ struct iwl_mvm { - #ifdef CONFIG_ACPI - struct iwl_mvm_sar_profile sar_profiles[ACPI_SAR_PROFILE_NUM]; - struct iwl_mvm_geo_profile geo_profiles[ACPI_NUM_GEO_PROFILES]; -+ u32 geo_rev; - #endif - }; - --- -2.22.0 - @@ -35,27 +35,27 @@ _makenconfig= # 16. Intel Nehalem (MNEHALEM) # 17. Intel Westmere (MWESTMERE) # 18. Intel Silvermont (MSILVERMONT) -# 19. Intel Sandy Bridge (MSANDYBRIDGE) -# 20. Intel Ivy Bridge (MIVYBRIDGE) -# 21. Intel Haswell (MHASWELL) -# 22. Intel Broadwell (MBROADWELL) -# 23. Intel Skylake (MSKYLAKE) -# 24. Intel Skylake X (MSKYLAKEX) -# 25. Intel Cannon Lake (MCANNONLAKE) -# 26. Intel Ice Lake (MICELAKE) -# 27. Generic-x86-64 (GENERIC_CPU) -# 28. Native optimizations autodetected by GCC (MNATIVE) +# 19. Intel Goldmont (MGOLDMONT) +# 20. Intel Goldmont Plus (MGOLDMONTPLUS) +# 21. Intel Sandy Bridge (MSANDYBRIDGE) +# 22. Intel Ivy Bridge (MIVYBRIDGE) +# 23. Intel Haswell (MHASWELL) +# 24. Intel Broadwell (MBROADWELL) +# 25. Intel Skylake (MSKYLAKE) +# 26. Intel Skylake X (MSKYLAKEX) +# 27. Intel Cannon Lake (MCANNONLAKE) +# 28. Intel Ice Lake (MICELAKE) +# 29. Intel Cascade Lake (MCASCADELAKE) +# 30. Generic-x86-64 (GENERIC_CPU) +# 31. Native optimizations autodetected by GCC (MNATIVE) _subarch= -# Compile ONLY probed modules -# Build in only the modules that you currently have probed in your system VASTLY -# reducing the number of modules built and the build time. -# -# WARNING - ALL modules must be probed BEFORE you begin making the pkg! +# Compile ONLY used modules to VASTLYreduce the number of modules built +# and the build time. # # To keep track of which modules are needed for your specific system/hardware, # give module_db script a try: https://aur.archlinux.org/packages/modprobed-db -# This PKGBUILD will call it directly to probe all the modules you have logged! +# This PKGBUILD read the database kept if it exists # # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db _localmodcfg= @@ -63,7 +63,7 @@ _localmodcfg= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -_srcver=5.2.9-arch1 +_srcver=5.2.10-arch1 pkgver=${_srcver%-*} pkgrel=1 _ckpatchversion=1 @@ -73,7 +73,7 @@ license=(GPL2) makedepends=(kmod inetutils bc libelf) options=('!strip') _ckpatch="patch-5.2-ck${_ckpatchversion}" -_gcc_more_v='20190714' +_gcc_more_v='20190822' source=( "https://www.kernel.org/pub/linux/kernel/v5.x/linux-$pkgver.tar".{xz,sign} config # the main kernel config file @@ -85,24 +85,22 @@ source=( 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch 0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch - 0004-iwlwifi-Add-support-for-SAR-South-Korea-limitation.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('b6f02a4b306ca5cd314d72615bfc2650166969613135da202630e6c4e1b5d4e6' +sha256sums=('6096c4387c2a296de9136080942d11ae3f1bd28129b6952f7133c570e43bfc49' 'SKIP' '1c4d5500a3b4995035c2e940fc0ad2a2dae7be047c8eb20c097444e348258f87' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' 'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - '2466fb4aecc66d1b258b4cbdb2f215b5099f266d8c4386bb62ad1a0acd0caf5b' + '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5' 'f1abc13a8d859fbf6350040e45d7f04ad551a6d39f113ba96fbbd820118c0e36' '91fafa76bf9cb32159ac7f22191b3589278b91e65bc4505cf2fc6013b8037bf3' '63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9' - 'fc96300831506965383ef30bc46b72735dc45bb97dea2ccb8b9450c005d2f020' - 'ef926edbd866d95464eb86f7565de572eb97ecfa0369d3b2e078016a0e71a871') + 'fc96300831506965383ef30bc46b72735dc45bb97dea2ccb8b9450c005d2f020') _kernelname=${pkgbase#linux} : ${_kernelname:=-ARCH} @@ -149,13 +147,12 @@ prepare() { ### Optionally load needed modules for the make localmodconfig # See https://aur.archlinux.org/packages/modprobed-db if [ -n "$_localmodcfg" ]; then - msg "If you have modprobed-db installed, running it in recall mode now" - if [ -e /usr/bin/modprobed-db ]; then - [[ -x /usr/bin/sudo ]] || { - echo "Cannot call modprobe with sudo. Install sudo and configure it to work with this user." - exit 1; } - sudo /usr/bin/modprobed-db recall - make localmodconfig + if [ -f $HOME/.config/modprobed.db ]; then + msg2 "Running Steven Rostedt's make localmodconfig now" + make LSMOD=$HOME/.config/modprobed.db localmodconfig + else + msg2 "No modprobed.db data found" + exit1 fi fi |