summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD20
-rw-r--r--config3
3 files changed, 33 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1abc712158d4..8ad7de200e10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-aufs
pkgdesc = Linux AUFS
pkgver = 5.12.11
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/sfjro/aufs5-standalone
arch = x86_64
license = GPL2
@@ -22,7 +22,13 @@ pkgbase = linux-aufs
source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.11.tar.sign
source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.12/aufs-patches/0001-aufs-20210517.patch
source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.12/cpu-patches-v5-sep/0001-cpu-5.12-merge-graysky-s-patchset.patch
- source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.12/arch-patches-v6/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.12/arch-patches-v7-sep/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.12/arch-patches-v7-sep/0002-x86-setup-Consolidate-early-memory-reservations.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.12/arch-patches-v7-sep/0003-x86-setup-Merge-several-reservations-of-start-of-mem.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.12/arch-patches-v7-sep/0004-x86-setup-Move-trim_snb_memory-later-in-setup_arch-t.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.12/arch-patches-v7-sep/0005-x86-setup-always-reserve-the-first-1M-of-RAM.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.12/arch-patches-v7-sep/0006-x86-setup-remove-CONFIG_X86_RESERVE_LOW-and-reservel.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.12/arch-patches-v7-sep/0007-x86-crash-remove-crash_reserve_low_1M.patch
source = config
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
@@ -30,8 +36,14 @@ pkgbase = linux-aufs
sha512sums = SKIP
sha512sums = bf0e8fffff709d60d020c14bbff1666d1065e9b934094c9d7642f471dba7d831293fea89fb0068d98685a2c6da4b4b8a852283ed03434f157ad1f45d109529e9
sha512sums = 488586fe0e9613a651a0c145a13e82d92bfe713076dde38c859f165b74c2c3bb9063828e6b90f2929af05bf1e1d032d4b209380b4b56a4ad998ddb6829680bac
- sha512sums = 1908055c446f04ef0a0a5a19579836d2f5dc60d7989677f85f084a7186a6327b240291feed8d25e320e72efa114b243a325362e2dbfbf7f4f3fb89bbdd3819be
- sha512sums = b6c8a485426b0316c852c1d6fb0eba07c12b10aa219e92747dd4bd03f86edc67830f2ae871319c7c3193b43e9a01749a68377ecbb09b329bd447fbd97189f29b
+ sha512sums = dc6e19ca9e43ecc94e3fd4eb2c6c6fb40e802f22eae707b091e8d5c4a80603cd5c6236072b5759234226369066ab276ef56514b65dc2a59ea18ff47c6e36108f
+ sha512sums = 6b67c87e6480664844e35d001169b0238279789c0cef3b0d4b0acef87a6c4d0eaf62ceacdaf98ed5358f813c9955212fa34c925cdf21b4bf2c0b74d76d15ccde
+ sha512sums = c189f8833280fd1751d2013b486be48f71d691204ba3a774842a6e7ebf72f83ca88b42914d841479e5a09dfa05a302b17bd20712e3787086290810895fb64659
+ sha512sums = aba9f959ad1a698e1e6230ad3be1df4173cd731a8d1b822523185387a6dde00dba6e4f0facf44bf4d6004b236627914374384508c933f46a94bf3b936b514516
+ sha512sums = d60e24ef65402bcc9c10e424eeae5fe033f08c4a12d98299e885109e9e9cadbf726fc083bb3dcd0b5d821e7ee84aa1feb97695c7905f202bc0bbe4f3e5104fee
+ sha512sums = 9d8dc471c35c868794dbed30df0ba95e856707d48bc53d0f15b6dcb6659faf389a56ef4177f3961a45c864bfd224add4e126640f9283898e4d836c3180935450
+ sha512sums = fb84fc91e6be7b696aaf98177a124c321673c5e43c80daad8590faea13500624f5e759dac44a0eb6b6003ccccb793ca34ce27c65ccc96fb7253b0b3038df68cf
+ sha512sums = 9054cdddf241ccebc074eb83883ef86e73468a34226f1d3839a3ad6a78f8e990dd8067fba7435bf747be27177c68793a54e32b469dbc7f0d6b1e2b8f83fb038a
pkgname = linux-aufs
pkgdesc = The Linux AUFS kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 7ae7c3bee303..9dec44be8d15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -51,7 +51,7 @@ _major=5.12
_minor=11
pkgver=${_major}.${_minor}
_srcname=linux-${pkgver}
-pkgrel=2
+pkgrel=3
pkgdesc='Linux AUFS'
arch=('x86_64')
url="https://github.com/sfjro/aufs5-standalone"
@@ -71,7 +71,13 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
"https://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.sign"
"${_lucjanpath}/${_aufs_path}/${_aufs_patch}"
"${_lucjanpath}/${_compiler_path}/${_compiler_patch}"
- "${_lucjanpath}/arch-patches-v6/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0002-x86-setup-Consolidate-early-memory-reservations.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0003-x86-setup-Merge-several-reservations-of-start-of-mem.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0004-x86-setup-Move-trim_snb_memory-later-in-setup_arch-t.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0005-x86-setup-always-reserve-the-first-1M-of-RAM.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0006-x86-setup-remove-CONFIG_X86_RESERVE_LOW-and-reservel.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0007-x86-crash-remove-crash_reserve_low_1M.patch"
# the main kernel config files
'config')
@@ -311,8 +317,14 @@ sha512sums=('2001467f50c0bdeb59469f61b20e446a9719be934df0ddc17d6e8f9cd0a00c64e9a
'SKIP'
'bf0e8fffff709d60d020c14bbff1666d1065e9b934094c9d7642f471dba7d831293fea89fb0068d98685a2c6da4b4b8a852283ed03434f157ad1f45d109529e9'
'488586fe0e9613a651a0c145a13e82d92bfe713076dde38c859f165b74c2c3bb9063828e6b90f2929af05bf1e1d032d4b209380b4b56a4ad998ddb6829680bac'
- '1908055c446f04ef0a0a5a19579836d2f5dc60d7989677f85f084a7186a6327b240291feed8d25e320e72efa114b243a325362e2dbfbf7f4f3fb89bbdd3819be'
- 'b6c8a485426b0316c852c1d6fb0eba07c12b10aa219e92747dd4bd03f86edc67830f2ae871319c7c3193b43e9a01749a68377ecbb09b329bd447fbd97189f29b')
+ 'dc6e19ca9e43ecc94e3fd4eb2c6c6fb40e802f22eae707b091e8d5c4a80603cd5c6236072b5759234226369066ab276ef56514b65dc2a59ea18ff47c6e36108f'
+ '6b67c87e6480664844e35d001169b0238279789c0cef3b0d4b0acef87a6c4d0eaf62ceacdaf98ed5358f813c9955212fa34c925cdf21b4bf2c0b74d76d15ccde'
+ 'c189f8833280fd1751d2013b486be48f71d691204ba3a774842a6e7ebf72f83ca88b42914d841479e5a09dfa05a302b17bd20712e3787086290810895fb64659'
+ 'aba9f959ad1a698e1e6230ad3be1df4173cd731a8d1b822523185387a6dde00dba6e4f0facf44bf4d6004b236627914374384508c933f46a94bf3b936b514516'
+ 'd60e24ef65402bcc9c10e424eeae5fe033f08c4a12d98299e885109e9e9cadbf726fc083bb3dcd0b5d821e7ee84aa1feb97695c7905f202bc0bbe4f3e5104fee'
+ '9d8dc471c35c868794dbed30df0ba95e856707d48bc53d0f15b6dcb6659faf389a56ef4177f3961a45c864bfd224add4e126640f9283898e4d836c3180935450'
+ 'fb84fc91e6be7b696aaf98177a124c321673c5e43c80daad8590faea13500624f5e759dac44a0eb6b6003ccccb793ca34ce27c65ccc96fb7253b0b3038df68cf'
+ '9054cdddf241ccebc074eb83883ef86e73468a34226f1d3839a3ad6a78f8e990dd8067fba7435bf747be27177c68793a54e32b469dbc7f0d6b1e2b8f83fb038a')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
diff --git a/config b/config
index e4d247781503..1b50008f5e01 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.12.7-arch1 Kernel Configuration
+# Linux/x86 5.12.11-arch1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
CONFIG_CC_IS_GCC=y
@@ -487,7 +487,6 @@ CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=m
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW=64
CONFIG_MTRR=y
CONFIG_MTRR_SANITIZER=y
CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1