summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOriginCode2020-06-11 19:29:16 +0800
committerOriginCode2020-06-11 19:35:28 +0800
commitdc95c9e732d6ae183bb57a71c1e67a077579da49 (patch)
tree6eef7a3aeb23db48e0534865f415124bf43c52d0
parent8ef2e81ee14c3de2bf408fae59079289e2f67076 (diff)
downloadaur-dc95c9e732d6ae183bb57a71c1e67a077579da49.tar.gz
linux-froidzen: 5.7.2-zen1
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD20
-rw-r--r--config9
-rw-r--r--sphinx-workaround.patch13
4 files changed, 29 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 98e4e81d0cc..093fc3ef555 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
pkgbase = linux-froidzen
pkgdesc = Linux ZEN with Patches
- pkgver = 5.7.zen1
+ pkgver = 5.7.2.zen1
pkgrel = 1
- url = https://github.com/zen-kernel/zen-kernel/commits/v5.7-zen1
+ url = https://github.com/zen-kernel/zen-kernel/commits/v5.7.2-zen1
arch = x86_64
license = GPL2
makedepends = bc
makedepends = kmod
makedepends = libelf
+ makedepends = pahole
makedepends = xmlto
makedepends = python-sphinx
makedepends = python-sphinx_rtd_theme
@@ -15,17 +16,17 @@ pkgbase = linux-froidzen
makedepends = imagemagick
makedepends = git
options = !strip
- source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.7-zen1
+ source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.7.2-zen1
source = config
- source = sphinx-workaround.patch
- source = aosc-univt.patch::https://raw.githubusercontent.com/AOSC-Dev/aosc-os-abbs/testing/extra-kernel/linux-kernel/autobuild/patches/8000-aosc-feature-univt.patch
+ source = aosc-univt.patch::https://raw.githubusercontent.com/AOSC-Dev/aosc-os-abbs/stable-proposed/extra-kernel/linux-kernel/autobuild/patches/8000-aosc-feature-univt.patch
+ source = https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.7.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
sha256sums = SKIP
- sha256sums = 1810a587d97307e506b1e4d3901b9d1c002f7b44f9c272abf91fe05ff363c010
- sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
- sha256sums = 2b499db6a7ba4926619dfc854dbd947f3e9720b39b7c2f6902b7a7b70eb856f2
+ sha256sums = 761ee8a79e82e0e89190e3c1c7d6b7fe64be4338f614ae6a9b2da8683a31d03d
+ sha256sums = 2d827875db540356c18b604f9f9ac7178bcf0ec605672e29d99d7eeb1ae9721d
+ sha256sums = c28dc0d30bba3eedae9f5cf98a686bdfb25a0326df4e8c417d37a36597d21b37
pkgname = linux-froidzen
pkgdesc = The Linux ZEN with Patches kernel and modules
@@ -36,6 +37,7 @@ pkgname = linux-froidzen
optdepends = linux-firmware: firmware images needed for some devices
provides = VIRTUALBOX-GUEST-MODULES
provides = WIREGUARD-MODULE
+ replaces =
pkgname = linux-froidzen-headers
pkgdesc = Headers and scripts for building modules for the Linux ZEN with Patches kernel
diff --git a/PKGBUILD b/PKGBUILD
index 0f0c21f3bd9..aa43ead843d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: OriginCode <self@origincode.me>
pkgbase=linux-froidzen
-pkgver=5.7.zen1
+pkgver=5.7.2.zen1
pkgrel=1
pkgdesc='Linux ZEN with Patches'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -9,7 +9,7 @@ url="https://github.com/zen-kernel/zen-kernel/commits/$_srctag"
arch=(x86_64)
license=(GPL2)
makedepends=(
- bc kmod libelf
+ bc kmod libelf pahole
xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick
git
)
@@ -18,8 +18,8 @@ _srcname=zen-kernel
source=(
"$_srcname::git+https://github.com/zen-kernel/zen-kernel?signed#tag=$_srctag"
config # the main kernel config file
- sphinx-workaround.patch
- "aosc-univt.patch::https://raw.githubusercontent.com/AOSC-Dev/aosc-os-abbs/testing/extra-kernel/linux-kernel/autobuild/patches/8000-aosc-feature-univt.patch" # CJK Patch
+ "aosc-univt.patch::https://raw.githubusercontent.com/AOSC-Dev/aosc-os-abbs/stable-proposed/extra-kernel/linux-kernel/autobuild/patches/8000-aosc-feature-univt.patch" # CJK Patch
+ "https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-5.7.patch" # UKSM Patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -27,9 +27,9 @@ validpgpkeys=(
'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- '1810a587d97307e506b1e4d3901b9d1c002f7b44f9c272abf91fe05ff363c010'
- '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
- '2b499db6a7ba4926619dfc854dbd947f3e9720b39b7c2f6902b7a7b70eb856f2')
+ '761ee8a79e82e0e89190e3c1c7d6b7fe64be4338f614ae6a9b2da8683a31d03d'
+ '2d827875db540356c18b604f9f9ac7178bcf0ec605672e29d99d7eeb1ae9721d'
+ 'c28dc0d30bba3eedae9f5cf98a686bdfb25a0326df4e8c417d37a36597d21b37')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
@@ -73,6 +73,7 @@ _package() {
optdepends=('crda: to set the correct wireless channels of your country'
'linux-firmware: firmware images needed for some devices')
provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
+ replaces=()
cd $_srcname
local kernver="$(<version)"
@@ -87,7 +88,7 @@ _package() {
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
echo "Installing modules..."
- make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
+ make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install
# remove build and source links
rm "$modulesdir"/{source,build}
@@ -163,6 +164,9 @@ _package-headers() {
esac
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
+ echo "Stripping vmlinux..."
+ strip -v $STRIP_STATIC "$builddir/vmlinux"
+
echo "Adding symlink..."
mkdir -p "$pkgdir/usr/src"
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
diff --git a/config b/config
index a8354bb2148..93bb9c8587c 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.7.0-zen1 Kernel Configuration
+# Linux/x86 5.7.1-zen1 Kernel Configuration
#
#
@@ -10589,7 +10589,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
#
# Compile-time checks and compiler options
#
-# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_DEBUG_INFO_BTF=y
+# CONFIG_GDB_SCRIPTS is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_FRAME_WARN=2048
CONFIG_STRIP_ASM_SYMS=y
diff --git a/sphinx-workaround.patch b/sphinx-workaround.patch
deleted file mode 100644
index 1aa3f1c8f66..00000000000
--- a/sphinx-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/Documentation/conf.py w/Documentation/conf.py
-index 3c7bdf4cd31f..9a0ced58a3e9 100644
---- i/Documentation/conf.py
-+++ w/Documentation/conf.py
-@@ -36,7 +36,7 @@ needs_sphinx = '1.3'
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
- # ones.
--extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain',
-+extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
- 'kfigure', 'sphinx.ext.ifconfig', 'automarkup',
- 'maintainers_include']
-