From 5a46532946760ffb7b836da1f4b5e32421b77e0e Mon Sep 17 00:00:00 2001 From: David P Date: Wed, 5 Jan 2022 13:42:37 -0500 Subject: updpkg: libre/linux-libre-lts 5.10.89-1 Signed-off-by: David P --- ...-modern-gcc-plugin-infrastructure-requres.patch | 76 ---------------------- libre/linux-libre-lts/PKGBUILD | 20 +++--- libre/linux-libre-lts/config.i686 | 29 ++++++--- libre/linux-libre-lts/config.x86_64 | 13 ++-- 4 files changed, 38 insertions(+), 100 deletions(-) delete mode 100644 libre/linux-libre-lts/0002-gcc-plugins-modern-gcc-plugin-infrastructure-requres.patch diff --git a/libre/linux-libre-lts/0002-gcc-plugins-modern-gcc-plugin-infrastructure-requres.patch b/libre/linux-libre-lts/0002-gcc-plugins-modern-gcc-plugin-infrastructure-requres.patch deleted file mode 100644 index 8e6cee084..000000000 --- a/libre/linux-libre-lts/0002-gcc-plugins-modern-gcc-plugin-infrastructure-requres.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 50b29ce228d0622eae2b9854c5e4b9334c540a7a Mon Sep 17 00:00:00 2001 -From: Levente Polyak -Date: Thu, 1 Sep 2021 22:19:19 +0200 -Subject: [PATCH] gcc-plugins: modern gcc plugin infrastructure requres c++11 - std - -Bump the used std to c++11 to avoid detection failure. This fixes the -support check on modern gcc plugin infrastructure that requires a -minimum standard of c++11 to compile. - -This effectively requires GCC 4.8.1. - -Signed-off-by: Levente Polyak ---- - scripts/gcc-plugin.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh -index b79fd0bea838..7abc00f60a8b 100755 ---- a/scripts/gcc-plugin.sh -+++ b/scripts/gcc-plugin.sh -@@ -8,7 +8,7 @@ srctree=$(dirname "$0") - gccplugins_dir=$($* -print-file-name=plugin) - - # we need a c++ compiler that supports the designated initializer GNU extension --$HOSTCC -c -x c++ -std=gnu++98 - -fsyntax-only -I $srctree/gcc-plugins -I $gccplugins_dir/include 2>/dev/null </dev/null < -Date: Sat Dec 26 13:21:58 2020 -0500 - - gcc-plugins: fix gcc 11 indigestion with plugins... - - Fedora Rawhide has started including gcc 11,and the g++ compiler - throws a wobbly when it hits scripts/gcc-plugins: - - HOSTCXX scripts/gcc-plugins/latent_entropy_plugin.so - In file included from /usr/include/c++/11/type_traits:35, - from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/system.h:244, - from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/gcc-plugin.h:28, - from scripts/gcc-plugins/gcc-common.h:7, - from scripts/gcc-plugins/latent_entropy_plugin.c:78: - /usr/include/c++/11/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO - C++ 2011 standard. This support must be enabled with the -std=c++11 or -std=gnu++11 compiler options. - 32 | #error This file requires compiler and library support \ - - In fact, it works just fine with c++11, which has been in gcc since 4.8, - and we now require 4.9 as a minimum. - - Signed-off-by: Valdis Kletnieks - Acked-by: Josh Poimboeuf - Signed-off-by: Kees Cook - Link: https://lore.kernel.org/r/82487.1609006918@turing-police - -diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile -index d66949bfeba4..b5487cce69e8 100644 ---- a/scripts/gcc-plugins/Makefile -+++ b/scripts/gcc-plugins/Makefile -@@ -22,9 +22,9 @@ always-y += $(GCC_PLUGIN) - GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin) - - plugin_cxxflags = -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \ -- -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++98 \ -+ -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \ - -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \ -- -ggdb -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat \ -+ -ggdb -Wno-narrowing -Wno-unused-variable \ - -Wno-format-diag - - plugin_ldflags = -shared diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 653a7ac84..f01cff8ba 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -16,17 +16,17 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-lts -pkgver=5.10.72 +pkgver=5.10.89 pkgrel=1 pkgdesc='LTS Linux-libre' -rcnver=5.10.72 -rcnrel=armv7-x53 +rcnver=5.10.83 +rcnrel=armv7-x58 url='https://linux-libre.fsfla.org/' arch=(i686 x86_64 armv7h) license=(GPL2) makedepends=( bc kmod libelf pahole cpio perl tar xz - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick + xmlto python-sphinx python-sphinx_rtd_theme python-six graphviz imagemagick ) options=('!strip') _srcname=linux-5.10 @@ -46,7 +46,6 @@ source=( 0002-fix-Atmel-maXTouch-touchscreen-support.patch # Arch Linux patches 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-gcc-plugins-modern-gcc-plugin-infrastructure-requres.patch ) source_i686=( # avoid using zstd compression in ultra mode (exhausts virtual memory) @@ -62,7 +61,7 @@ validpgpkeys=( ) sha512sums=('4bf48611e8a217931c2347f1aa3257da5ba210f263fb35edef43e935fd3fcab5333fc884198fe6ab180cc11ed11dd48b71dff4071b85f18830a6bf9e1c2cf97f' 'SKIP' - 'a25bf1a32e8dba38a910eae4d6436f2a6716807e810655f0170f8ea90d136aa353057fd8cc5d05281ca8a684efef7ef4036ac96039f8d122f62d5b1f362229c3' + 'c09d808befd38f246c8f3224fee702a389fa6456aff6b8d5ba86f55e3647e1473cba4e43f4095a6d97d98f5474dc791ce5008de58003c9419b12cee517f6cb88' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -70,16 +69,15 @@ sha512sums=('4bf48611e8a217931c2347f1aa3257da5ba210f263fb35edef43e935fd3fcab5333 'SKIP' '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' 'SKIP' - '42e5e4913993650bb9bb22accbc1c272e8e0be4891e5bb82fb7c0f140d56bdc6f5282f353d53d49e4aa3a010d464c64001fb6d14d615c6778c10bec204435ea3' - 'd6e61670635d717e84c2c3caca17fcc284d23cab85768246fece85b274e8668933392fe66c2d2f0d742fe5b4fab2e799a18389b32c21c075f8c54c68ea224950' + '161302c378c95fe95d8c9f3aae9b673f1555068495eb50e13cec69da023276c08b603a3bec909d70ecc31631bb15ceabc8def654ca2f2b1cad883c6a74306b7d' + '58bf82d41b28741edd5170dfb42a055888834d6a4afe0372f21fc5b233baffc3b0f83fdd44e2b80b900eda87ac89d7703f6a9af7460481f9c947df6d19602907' '6012fa7b97c15ada82f0c205ea983bebac8b672ca498e22f524d219bdd8715784b24ce7d457803e8221a945c3daff95c4e467f70a420b9c2aa95d627f2d160a9' '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - 'aed7844c51ec705ef1ef5d9f1adf27939073c99d4fcc97051bed2fba1ec161fdde4c57cbe039209fb86c72918493bea55ed26189c1dda3dbea3a3a7019363818' - 'd1db702f9e3a09288ad591361b89ec35b991e421494553e61cc3998037cb6c60627d77d7b7e41f7e7fdab90245a4ee2e4844d68ce96eeaa021dde8548f2673f7') + 'aed7844c51ec705ef1ef5d9f1adf27939073c99d4fcc97051bed2fba1ec161fdde4c57cbe039209fb86c72918493bea55ed26189c1dda3dbea3a3a7019363818') sha512sums_i686=('3a346ff5e0fdefafd28bc3dd0e4b6cd68e3f0014e59d1611d99f2edb8d074fd32649eeb0894a7e340e4f907b5cfc0e08e0753e0427a68dc113bb22835a892968') -sha512sums_armv7h=('cf29c386ccfaa33a14bb9028bbc8d783b2e872b420e96174e6040faf93d0a1d73d4df75a7d4fb0b8a0dbaae32593b698d16da47436aa29b8b483bdf4c91bb515' +sha512sums_armv7h=('1744202d19e9cc501d80373f734e9c9715ccdb1723d72abd9fa6fb47cfd5d60157fb4ae95d2cbfe38296c4428df304f8ca290ad232a21804744b702b0783cada' 'SKIP') _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}") diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 41510652b..cea729f14 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.56-gnu Kernel Configuration +# Linux/x86 5.10.89-gnu1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y @@ -843,6 +843,9 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y +CONFIG_GCC_PLUGINS=y +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set +# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -2224,7 +2227,7 @@ CONFIG_MTD_BLOCK=m # CONFIG_SM_FTL is not set # CONFIG_MTD_OOPS is not set # CONFIG_MTD_SWAP is not set -# CONFIG_MTD_PARTITIONED_MASTER is not set +CONFIG_MTD_PARTITIONED_MASTER=y # # RAM/ROM/Flash chip drivers @@ -2236,7 +2239,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y -CONFIG_MTD_RAM=m +# CONFIG_MTD_RAM is not set CONFIG_MTD_ROM=m # CONFIG_MTD_ABSENT is not set # end of RAM/ROM/Flash chip drivers @@ -2247,7 +2250,7 @@ CONFIG_MTD_ROM=m # CONFIG_MTD_COMPLEX_MAPPINGS is not set # CONFIG_MTD_PHYSMAP is not set # CONFIG_MTD_INTEL_VR_NOR is not set -CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_PLATRAM is not set # end of Mapping drivers for chip access # @@ -2259,7 +2262,9 @@ CONFIG_MTD_PLATRAM=m # CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 CONFIG_MTD_BLOCK2MTD=m # @@ -8131,7 +8136,7 @@ CONFIG_ALTERA_MSGDMA=m CONFIG_INTEL_IDMA64=m CONFIG_PCH_DMA=m CONFIG_PLX_DMA=m -CONFIG_XILINX_ZYNQMP_DPDMA=m +# CONFIG_XILINX_ZYNQMP_DPDMA is not set CONFIG_QCOM_HIDMA_MGMT=m CONFIG_QCOM_HIDMA=m CONFIG_DW_DMAC_CORE=y @@ -8347,6 +8352,7 @@ CONFIG_FWTTY_MAX_TOTAL_PORTS=64 CONFIG_FWTTY_MAX_CARD_PORTS=32 CONFIG_GS_FPGABOOT=m CONFIG_UNISYSSPAR=y +# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set # CONFIG_FB_TFT is not set CONFIG_MOST_COMPONENTS=m CONFIG_MOST_NET=m @@ -9831,11 +9837,17 @@ CONFIG_LSM="lockdown,yama" # # Kernel hardening options # +CONFIG_GCC_PLUGIN_STRUCTLEAK=y # # Memory initialization # -CONFIG_INIT_STACK_NONE=y +# CONFIG_INIT_STACK_NONE is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set +# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set +CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y +# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set +# CONFIG_GCC_PLUGIN_STACKLEAK is not set CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set # end of Memory initialization @@ -10077,7 +10089,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS="" CONFIG_SECONDARY_TRUSTED_KEYRING=y CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" -# CONFIG_SYSTEM_REVOCATION_LIST is not set +CONFIG_SYSTEM_REVOCATION_LIST=y +CONFIG_SYSTEM_REVOCATION_KEYS="" # end of Certificates for signature checking CONFIG_BINARY_PRINTF=y diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 994646e12..b828a0dd4 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.72-gnu1 Kernel Configuration +# Linux/x86 5.10.89-gnu1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y @@ -852,6 +852,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_LOCK_EVENT_COUNTS=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_ARCH_HAS_CC_PLATFORM=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_STATIC_CALL_INLINE=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y @@ -2253,7 +2254,7 @@ CONFIG_MTD_BLOCK=m # CONFIG_SM_FTL is not set # CONFIG_MTD_OOPS is not set # CONFIG_MTD_SWAP is not set -# CONFIG_MTD_PARTITIONED_MASTER is not set +CONFIG_MTD_PARTITIONED_MASTER=y # # RAM/ROM/Flash chip drivers @@ -2265,7 +2266,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y CONFIG_MTD_MAP_BANK_WIDTH_4=y CONFIG_MTD_CFI_I1=y CONFIG_MTD_CFI_I2=y -CONFIG_MTD_RAM=m +# CONFIG_MTD_RAM is not set CONFIG_MTD_ROM=m # CONFIG_MTD_ABSENT is not set # end of RAM/ROM/Flash chip drivers @@ -2276,7 +2277,7 @@ CONFIG_MTD_ROM=m # CONFIG_MTD_COMPLEX_MAPPINGS is not set # CONFIG_MTD_PHYSMAP is not set # CONFIG_MTD_INTEL_VR_NOR is not set -CONFIG_MTD_PLATRAM=m +# CONFIG_MTD_PLATRAM is not set # end of Mapping drivers for chip access # @@ -2288,7 +2289,9 @@ CONFIG_MTD_PLATRAM=m # CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m -# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 CONFIG_MTD_BLOCK2MTD=m # -- cgit v1.2.3