From 973648db69dd266250500571aab15d8f44697ace Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 10 Aug 2018 10:13:30 +0200 Subject: linux-pae: new version => mew config => new checksum --- extra/linux-pae/PKGBUILD | 6 +++--- extra/linux-pae/config | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD index ac33b0fa..9a5be0f9 100644 --- a/extra/linux-pae/PKGBUILD +++ b/extra/linux-pae/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Thomas Baechler pkgbase=linux-pae # Build stock -ARCH kernel -pkgver=4.17.13 +pkgver=4.17.14 _srcname=linux-${pkgver} pkgrel=1 arch=('i686') @@ -25,9 +25,9 @@ source=( validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('820b3ebb09a165aeceb39822782aca8f3ef044bb9c01015d9c126e2e87563f74' +sha256sums=('c846038df44ee74dd910d19b346044a100f62a5b933eec2264d17008758cbaaf' 'SKIP' - '8744bab5a9ab9fd8eaa885f5757fd9405aec5f958719aee2bacfad9ae159e2ca' + 'acc0be5d140e90ad70f8576082c01eac5e0ca706f053ed2ae7cc56eddb38cf9c' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' diff --git a/extra/linux-pae/config b/extra/linux-pae/config index 2edd47d0..e89891a3 100644 --- a/extra/linux-pae/config +++ b/extra/linux-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.17.13-1 Kernel Configuration +# Linux/x86 4.17.14-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y -- cgit v1.2.3 From 2dac02c36970b3fb35f113c8f2c45b71a23007f4 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 10 Aug 2018 10:27:20 +0200 Subject: core/linux: $_builddir -> $builddir --- core/linux/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 053387f3..465ca897 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -13,7 +13,7 @@ eval "$( \,/tools/objtool" ,d \,arch/x86/Makefile, { a \ - install -t "${_builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu + install -t "${builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu } ' )" -- cgit v1.2.3 From c862570abf08dbe1ad0563dcb21d48442ae28dfb Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 10 Aug 2018 10:43:24 +0200 Subject: core/linux-lts: no CONFIG_CC_STACKPROTECTOR_STRONG --- core/linux-lts/PKGBUILD | 2 +- core/linux-lts/config | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD index 69bb8d85..e0cd2b31 100644 --- a/core/linux-lts/PKGBUILD +++ b/core/linux-lts/PKGBUILD @@ -2,7 +2,7 @@ # fail if upstream's .config changes if [ "${sha256sums[4]}" = 'c645053c4525a1a70d5c10b52257ac136da7e9059b6a4a566a857a3d42046426' ]; then - sha256sums[4]='93082396973984f8cdb0fb5b05ba9e50f35ebd4d766e2aadfd5a69acce1cfab1' + sha256sums[4]='15ac94245d0de07d062665cc14169151179049948119f92949e3bd0fbdb4af41' fi eval "$( diff --git a/core/linux-lts/config b/core/linux-lts/config index a7349a67..0eb4661b 100644 --- a/core/linux-lts/config +++ b/core/linux-lts/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.39 Kernel Configuration +# Linux/x86 4.14.61-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -36,6 +36,7 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_32_SMP=y +CONFIG_X86_32_LAZY_GS=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_PGTABLE_LEVELS=2 @@ -299,10 +300,10 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_GCC_PLUGINS=y # CONFIG_GCC_PLUGINS is not set CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_CC_STACKPROTECTOR=y -# CONFIG_CC_STACKPROTECTOR_NONE is not set +# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR_NONE=y # CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y +# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_THIN_ARCHIVES=y CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -1312,6 +1313,9 @@ CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_SOCKET_IPV6=m CONFIG_NF_TABLES_IPV6=m CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REJECT_IPV6=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m @@ -1319,10 +1323,7 @@ CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m -CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -8520,7 +8521,6 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m -- cgit v1.2.3 From 21ae949aaf08083cbae30d64ee1650adccc365dd Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 10 Aug 2018 11:46:02 +0200 Subject: core/syslinux: patched for minor/major (sysmacros.h) --- core/syslinux/PKGBUILD | 13 +++++++++++++ core/syslinux/syslinux-sysmacros.patch | 11 +++++++++++ 2 files changed, 24 insertions(+) create mode 100644 core/syslinux/PKGBUILD create mode 100644 core/syslinux/syslinux-sysmacros.patch diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD new file mode 100644 index 00000000..410b180a --- /dev/null +++ b/core/syslinux/PKGBUILD @@ -0,0 +1,13 @@ +# include sysmacros.h in extlinux, otherwise you get undefined references +# to minor and major + +source+=(syslinux-sysmacros.patch) +sha1sums+=('52c5233da147acd41d542b1673835be966b561e3') + +eval "$( + declare -f prepare | \ + sed ' + /patch.*efi_no_kbd/a patch -p1 < ../syslinux-sysmacros.patch + ' +)" + diff --git a/core/syslinux/syslinux-sysmacros.patch b/core/syslinux/syslinux-sysmacros.patch new file mode 100644 index 00000000..ee7c4b61 --- /dev/null +++ b/core/syslinux/syslinux-sysmacros.patch @@ -0,0 +1,11 @@ +diff -rauN syslinux/extlinux/main.c syslinux-sysmacros-patch/extlinux/main.c +--- syslinux/extlinux/main.c 2018-08-10 11:28:39.164004538 +0200 ++++ syslinux-sysmacros-patch/extlinux/main.c 2018-08-10 11:33:05.410671208 +0200 +@@ -19,6 +19,7 @@ + */ + + #define _GNU_SOURCE /* Enable everything */ ++#include + #include + /* This is needed to deal with the kernel headers imported into glibc 3.3.3. */ + #include -- cgit v1.2.3