summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2019-10-16 13:13:19 -0700
committerJohn Schoenick2019-10-16 13:13:19 -0700
commit3f25259f67eaee0dd61c0ef8127330492266cbf9 (patch)
treeb8f1767af32c222ac19f1d78db9c15741fe56f63
parentd5cf22e71d9c50ac528062e4c8c5d5a7209223b7 (diff)
downloadaur-3f25259f67eaee0dd61c0ef8127330492266cbf9.tar.gz
Bump upstream for 5.3.6.arch1
-rw-r--r--.SRCINFO10
-rw-r--r--60-linux.hook1
-rw-r--r--PKGBUILD30
3 files changed, 15 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f8c12832359..9953b68367d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Oct 7 21:22:09 UTC 2019
+# Wed Oct 16 20:12:58 UTC 2019
pkgbase = linux
- pkgver = 5.3.5.arch1
+ pkgver = 5.3.6.arch1
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.3.5-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.3.6-arch1
arch = x86_64
license = GPL2
makedepends = xmlto
@@ -17,14 +17,14 @@ pkgbase = linux
makedepends = graphviz
makedepends = imagemagick
options = !strip
- source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.3.5-arch1
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.3.6-arch1
source = config
source = 60-linux.hook
source = 90-linux.hook
source = linux.preset
sha256sums = SKIP
sha256sums = 7d09d1d79a4ecb82502b4483cf989ede3f643e05613de45e12563dfe85d80423
- sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
+ sha256sums = 452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c
sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
diff --git a/60-linux.hook b/60-linux.hook
index b33873c854f..584ce35372b 100644
--- a/60-linux.hook
+++ b/60-linux.hook
@@ -4,7 +4,6 @@ Operation = Install
Operation = Upgrade
Operation = Remove
Target = usr/lib/modules/%KERNVER%/*
-Target = usr/lib/modules/%EXTRAMODULES%/*
[Action]
Description = Updating %PKGBASE% module dependencies...
diff --git a/PKGBUILD b/PKGBUILD
index af095d475a5..c57333ae9e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=linux # Build stock -ARCH kernel
#pkgbase=linux-custom # Build kernel with a different name
-_srcver=5.3.5-arch1
+_srcver=5.3.6-arch1
pkgver=${_srcver//-/.}
pkgrel=1
arch=(x86_64)
@@ -30,7 +30,7 @@ validpgpkeys=(
)
sha256sums=('SKIP'
'7d09d1d79a4ecb82502b4483cf989ede3f643e05613de45e12563dfe85d80423'
- 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
+ '452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c'
'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
@@ -58,8 +58,8 @@ prepare() {
cp ../config .config
make olddefconfig
- make -s kernelrelease > ../version
- msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)"
+ make -s kernelrelease > version
+ msg2 "Prepared %s version %s" "$pkgbase" "$(<version)"
}
build() {
@@ -75,11 +75,10 @@ _package() {
backup=("etc/mkinitcpio.d/$pkgbase.preset")
install=linux.install
+ cd $_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
- cd $_srcname
-
msg2 "Installing boot image..."
# systemd expects to find the kernel here to allow hibernation
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
@@ -92,13 +91,6 @@ _package() {
msg2 "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
- # a place for external modules,
- # with version file for building modules and running depmod from hook
- local extramodules="extramodules$_kernelname"
- local extradir="$pkgdir/usr/lib/modules/$extramodules"
- install -Dt "$extradir" -m644 ../version
- ln -sr "$extradir" "$modulesdir/extramodules"
-
# remove build and source links
rm "$modulesdir"/{source,build}
@@ -107,7 +99,6 @@ _package() {
local subst="
s|%PKGBASE%|$pkgbase|g
s|%KERNVER%|$kernver|g
- s|%EXTRAMODULES%|$extramodules|g
"
# hack to allow specifying an initially nonexisting install file
@@ -129,12 +120,12 @@ _package() {
_package-headers() {
pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
-
cd $_srcname
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
msg2 "Installing build files..."
- install -Dt "$builddir" -m644 Makefile .config Module.symvers System.map vmlinux
+ install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
+ localversion.* version vmlinux
install -Dt "$builddir/kernel" -m644 kernel/Makefile
install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
cp -t "$builddir" -a scripts
@@ -198,7 +189,7 @@ _package-headers() {
msg2 "Adding symlink..."
mkdir -p "$pkgdir/usr/src"
- ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase-$pkgver"
+ ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
msg2 "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir"
@@ -207,9 +198,8 @@ _package-headers() {
_package-docs() {
pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel"
- local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
-
cd $_srcname
+ local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
msg2 "Installing documentation..."
mkdir -p "$builddir"