summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Gorski2022-04-08 20:30:46 +0200
committerPiotr Gorski2022-04-08 20:30:46 +0200
commit75de88530b5ccb6341c5d0c1191d8122723afa65 (patch)
tree460095da48b987aecf233464385e4b414074440b
parentb6a7beeb802c20555fe3ff26b523625d3baee3a0 (diff)
downloadaur-75de88530b5ccb6341c5d0c1191d8122723afa65.tar.gz
Sync with Arch
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
-rw-r--r--.SRCINFO25
-rw-r--r--PKGBUILD30
-rw-r--r--config3
3 files changed, 41 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b58579edec76..b5acd44ad9fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
pkgbase = linux-aufs
pkgdesc = Linux AUFS
pkgver = 5.17.2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/sfjro/aufs5-standalone
arch = x86_64
license = GPL2
- makedepends = kmod
makedepends = bc
makedepends = libelf
makedepends = python-sphinx
@@ -22,8 +21,14 @@ pkgbase = linux-aufs
source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.2.tar.sign
source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/aufs-patches/0001-aufs-20220404.patch
source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/cpu-patches-sep/0001-cpu-5.17-merge-graysky-s-patchset.patch
- source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/arch-patches-v3-sep/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/arch-patches-v3-sep/0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/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.17/arch-patches-v7-sep/0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/arch-patches-v7-sep/0003-Revert-swiotlb-rework-fix-info-leak-with-DMA_FROM_DE.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/arch-patches-v7-sep/0004-tick-Detect-and-fix-jiffies-update-stall.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/arch-patches-v7-sep/0005-tick-rcu-Remove-obsolete-rcu_needs_cpu-parameters.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/arch-patches-v7-sep/0006-tick-rcu-Stop-allowing-RCU_SOFTIRQ-in-idle.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/arch-patches-v7-sep/0007-lib-irq_poll-Declare-IRQ_POLL-softirq-vector-as-ksof.patch
+ source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/5.17/arch-patches-v7-sep/0008-x86-speculation-Restore-speculation-related-MSRs-dur.patch
source = config
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
@@ -31,9 +36,15 @@ pkgbase = linux-aufs
sha512sums = SKIP
sha512sums = 31704f773849882f5184c14c5a4cf26009a8de8fdd4cba1f37b6ea5ac17d95e4e26e63e5b117638d1a035d7a343484c293f8a0d000c1844b814a6fa27a72ac1c
sha512sums = b63921b6246bd1b9545a8042d76334bef8a7ee46e5404c5efec4a842a455a84046e92423b2bc6d950f19dcf85805d7493fe71d6d177e3b46b52a279b0a44d0c9
- sha512sums = 8782f82cd86a0ab7ef4eec1f69f172b5327ee36a1e0a1381eebca007e1160e5f6bf8512ab26e1ebba233c1dfb9658ba810f0d47b5d9118c326c17000f40fda4e
- sha512sums = cb69c6d058c676dbf7246569e7b399a8305c7292b37561dd37a149977398c3deabee47197260b54f549b88d569064aae542ecadf2f931258664dbc4b8f9c9f18
- sha512sums = 613459cdf13b5057b0f0ecc0ae64422c60519b39857bf27afb9d3c07647a96ffa2c6f7b46a8f67ae110fe5edcc29dce5e923907642766c1fc94d00e949e42a89
+ sha512sums = 34e79bf291dfd07339533a3b3673eaad36e9a4ebda7c5f59011547491f3810cffc010b679205488c7ab83abe9fd1a390c7c14ac095d602d93bfa1510bf0ee012
+ sha512sums = 123313035a93de83bc92ed7c8b0d7107e3948aba419b49a28ba0697a5486e6df088d85d9ac1cfaefcef3ef35f5ea3842fc27aeff720ec732205f03785d8d0cf0
+ sha512sums = ecb305148411e33e45084cd3c05a98de3ff4db389b2fb7d7299dc346af61b2cbd8bbaf5462e55b3c99aa4f9741e515c9d3b7fc3dd9a3c1bbe65dbb67a0e14ab5
+ sha512sums = fa6867deb695c6e5657ffdfe50b6b69407f06f70c166633a60ed008873446aa4b8a4dba2ef6f9deb9b9bacf08f07ff5bb7df8076a98daaa9d2532e6cb4b6efeb
+ sha512sums = e8f16281e3aabb434b186f3090f9f33641f3bd5ad3b56d8e9403fd708a6a77873183ffb8c74d379b5f6f9489260e56f2cbb4302b09372000590a5f7aeb20bb2f
+ sha512sums = f558a06a30751a48ecdfce19a924145d26fa6656af8f7c1a5cd73ed2f285c3705f21035eb8c0c125f7b3a78866eec63d2f7c6fcd663decb8378e70158c9d0145
+ sha512sums = 90430dbee56f062ee72e0535e9f591cfc9c6818e90c89601f76e163d79b93ae58375d6b9308dd23d3ba96dfde7bda4ac4192c735897b4549712e804f9e778649
+ sha512sums = 61b8e404af7a0352e5f48b7fe8dd1466feec0f16b7a439465e1097d9ed8992eeb374560f2411e52ce4ad00c3b9b406086ffe6a9794d8e53fa06a0407ea3c6229
+ sha512sums = 134633333081af1502ed252998c7c67b8fdb4e160afdbcfa72746ccbcab704acda7c13f7c72d0e67f4b0833354fe773b0b323cece2782334b497c7c7e7fa7673
pkgname = linux-aufs
pkgdesc = The Linux AUFS kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 61ea2881779e..1aa0db702306 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -51,13 +51,13 @@ _major=5.17
_minor=2
pkgver=${_major}.${_minor}
_srcname=linux-${pkgver}
-pkgrel=1
+pkgrel=2
pkgdesc='Linux AUFS'
arch=('x86_64')
url="https://github.com/sfjro/aufs5-standalone"
license=('GPL2')
options=('!strip')
-makedepends=('kmod' 'bc' 'libelf' 'python-sphinx' 'python-sphinx_rtd_theme'
+makedepends=('bc' 'libelf' 'python-sphinx' 'python-sphinx_rtd_theme'
'graphviz' 'imagemagick' 'pahole' 'cpio' 'perl' 'tar' 'xz')
#_lucjanpath="https://raw.githubusercontent.com/sirlucjan/kernel-patches/master/${_major}"
_lucjanpath="https://gitlab.com/sirlucjan/kernel-patches/raw/master/${_major}"
@@ -71,8 +71,14 @@ 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-v3-sep/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
- "${_lucjanpath}/arch-patches-v3-sep/0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0003-Revert-swiotlb-rework-fix-info-leak-with-DMA_FROM_DE.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0004-tick-Detect-and-fix-jiffies-update-stall.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0005-tick-rcu-Remove-obsolete-rcu_needs_cpu-parameters.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0006-tick-rcu-Stop-allowing-RCU_SOFTIRQ-in-idle.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0007-lib-irq_poll-Declare-IRQ_POLL-softirq-vector-as-ksof.patch"
+ "${_lucjanpath}/arch-patches-v7-sep/0008-x86-speculation-Restore-speculation-related-MSRs-dur.patch"
# the main kernel config files
'config')
@@ -195,8 +201,8 @@ _package() {
# Used by mkinitcpio to name the kernel
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
- echo "Installing modules..."
- make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install
+ make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
+ DEPMOD=/doesnt/exist modules_install # Suppress depmod
# remove build and source links
rm "$modulesdir"/{source,build}
@@ -316,9 +322,15 @@ sha512sums=('d62537333c1cedf839e95bfcbf757f45dd063f27ecf7fbba910f04663c9bb259438
'SKIP'
'31704f773849882f5184c14c5a4cf26009a8de8fdd4cba1f37b6ea5ac17d95e4e26e63e5b117638d1a035d7a343484c293f8a0d000c1844b814a6fa27a72ac1c'
'b63921b6246bd1b9545a8042d76334bef8a7ee46e5404c5efec4a842a455a84046e92423b2bc6d950f19dcf85805d7493fe71d6d177e3b46b52a279b0a44d0c9'
- '8782f82cd86a0ab7ef4eec1f69f172b5327ee36a1e0a1381eebca007e1160e5f6bf8512ab26e1ebba233c1dfb9658ba810f0d47b5d9118c326c17000f40fda4e'
- 'cb69c6d058c676dbf7246569e7b399a8305c7292b37561dd37a149977398c3deabee47197260b54f549b88d569064aae542ecadf2f931258664dbc4b8f9c9f18'
- '613459cdf13b5057b0f0ecc0ae64422c60519b39857bf27afb9d3c07647a96ffa2c6f7b46a8f67ae110fe5edcc29dce5e923907642766c1fc94d00e949e42a89')
+ '34e79bf291dfd07339533a3b3673eaad36e9a4ebda7c5f59011547491f3810cffc010b679205488c7ab83abe9fd1a390c7c14ac095d602d93bfa1510bf0ee012'
+ '123313035a93de83bc92ed7c8b0d7107e3948aba419b49a28ba0697a5486e6df088d85d9ac1cfaefcef3ef35f5ea3842fc27aeff720ec732205f03785d8d0cf0'
+ 'ecb305148411e33e45084cd3c05a98de3ff4db389b2fb7d7299dc346af61b2cbd8bbaf5462e55b3c99aa4f9741e515c9d3b7fc3dd9a3c1bbe65dbb67a0e14ab5'
+ 'fa6867deb695c6e5657ffdfe50b6b69407f06f70c166633a60ed008873446aa4b8a4dba2ef6f9deb9b9bacf08f07ff5bb7df8076a98daaa9d2532e6cb4b6efeb'
+ 'e8f16281e3aabb434b186f3090f9f33641f3bd5ad3b56d8e9403fd708a6a77873183ffb8c74d379b5f6f9489260e56f2cbb4302b09372000590a5f7aeb20bb2f'
+ 'f558a06a30751a48ecdfce19a924145d26fa6656af8f7c1a5cd73ed2f285c3705f21035eb8c0c125f7b3a78866eec63d2f7c6fcd663decb8378e70158c9d0145'
+ '90430dbee56f062ee72e0535e9f591cfc9c6818e90c89601f76e163d79b93ae58375d6b9308dd23d3ba96dfde7bda4ac4192c735897b4549712e804f9e778649'
+ '61b8e404af7a0352e5f48b7fe8dd1466feec0f16b7a439465e1097d9ed8992eeb374560f2411e52ce4ad00c3b9b406086ffe6a9794d8e53fa06a0407ea3c6229'
+ '134633333081af1502ed252998c7c67b8fdb4e160afdbcfa72746ccbcab704acda7c13f7c72d0e67f4b0833354fe773b0b323cece2782334b497c7c7e7fa7673')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
diff --git a/config b/config
index 157705e28397..e653accb9e6e 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.17.1-arch1 Kernel Configuration
+# Linux/x86 5.17.2-arch1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
@@ -3109,6 +3109,7 @@ CONFIG_NET_DSA_XRS700X=m
CONFIG_NET_DSA_XRS700X_I2C=m
CONFIG_NET_DSA_XRS700X_MDIO=m
CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
CONFIG_NET_DSA_REALTEK_SMI=m
CONFIG_NET_DSA_SMSC_LAN9303=m
CONFIG_NET_DSA_SMSC_LAN9303_I2C=m