From c505f51ff3501e919c05265521e0cef2ce46128a Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 29 Aug 2017 12:37:17 +0000 Subject: [PATCH] bump to latest version --- PKGBUILD | 14 +++----- ...86_64-and-arm64-ELF_ET_DYN_BASE-base.patch | 35 ------------------- 2 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch diff --git a/PKGBUILD b/PKGBUILD index c8ba750..9e687bd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,8 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-4.12 -pkgver=4.12.8 -pkgrel=2 +pkgver=4.12.9 +pkgrel=1 arch=('i686' 'x86_64') url="https://www.kernel.org/" license=('GPL2') @@ -17,7 +17,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign" 'bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch' 'bonding-ratelimit-failed-speed-duplex-update-warning.patch' - 'mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch' # the main kernel config files 'config.i686' 'config.x86_64' # pacman hook for initramfs regeneration @@ -27,11 +26,10 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" sha256sums=('a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab' 'SKIP' - '32b860911a3bafd5cd5bc813a427c90fad6eafdf607fa64e1b763b16ab605636' + '32c5df9c032d039d17cee0397b74583000053089e1c2fdfdc77acc2edc2d2e76' 'SKIP' '48e0505438bb4ccc7a0e050a896122b490e8f1b1446aa3833841a9d4d7853d68' 'fc606711a922638d5cc4358f47f69f554d9e6eab1cec91f0b49f00911f399722' - 'b830ce777543c0edd20a77d70f204c095f2429bb37151cd4a8c9dfae2af8d51a' 'df55887a43dcbb6bd35fd2fb1ec841427b6ea827334c0880cbc256d4f042a7a1' 'bf84528c592d1841bba0662242f0339a24a1de384c31f28248631e8be9446586' '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' @@ -57,11 +55,7 @@ prepare() { # https://bugzilla.kernel.org/show_bug.cgi?id=196547 patch -Np1 -i ../bonding-ratelimit-failed-speed-duplex-update-warning.patch patch -Np1 -i ../bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch - - # https://github.com/google/sanitizers/issues/837 - # https://patchwork.kernel.org/patch/9886105/ - patch -Np1 -i ../mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch - + cat "${srcdir}/config.${CARCH}" > ./.config if [ "${_kernelname}" != "" ]; then diff --git a/mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch b/mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch deleted file mode 100644 index bf089e0..0000000 --- a/mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h -index acae781f7359..3288c2b36731 100644 ---- a/arch/arm64/include/asm/elf.h -+++ b/arch/arm64/include/asm/elf.h -@@ -114,10 +114,10 @@ - - /* - * This is the base location for PIE (ET_DYN with INTERP) loads. On -- * 64-bit, this is raised to 4GB to leave the entire 32-bit address -+ * 64-bit, this is above 4GB to leave the entire 32-bit address - * space open for things that want to use the area for 32-bit pointers. - */ --#define ELF_ET_DYN_BASE 0x100000000UL -+#define ELF_ET_DYN_BASE (2 * TASK_SIZE_64 / 3) - - #ifndef __ASSEMBLY__ - -diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h -index 1c18d83d3f09..9aeb91935ce0 100644 ---- a/arch/x86/include/asm/elf.h -+++ b/arch/x86/include/asm/elf.h -@@ -247,11 +247,11 @@ extern int force_personality32; - - /* - * This is the base location for PIE (ET_DYN with INTERP) loads. On -- * 64-bit, this is raised to 4GB to leave the entire 32-bit address -+ * 64-bit, this is above 4GB to leave the entire 32-bit address - * space open for things that want to use the area for 32-bit pointers. - */ - #define ELF_ET_DYN_BASE (mmap_is_ia32() ? 0x000400000UL : \ -- 0x100000000UL) -+ (TASK_SIZE / 3 * 2)) - - /* This yields a mask that user programs can use to figure out what - instruction set this CPU supports. This could be done in user space,