Sync with vanilla Arch kernel PKGBUILD

1 files changed, 10 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 13228d9a7d21..2986b3434049 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -67,7 +67,7 @@ _subarch=
 _localmodcfg=
 
 pkgbase=linux-pds
-_srcver_tag=5.3.5-arch1
+_srcver_tag=5.3.6-arch1
 pkgver=${_srcver_tag//-/.}
 pkgrel=1
 arch=(x86_64)
@@ -114,7 +114,7 @@ validpgpkeys=(
 sha512sums=('SKIP'
             'SKIP'
             '123862129e35063c9cf0b74925e346a7ddaa01ca129dd15bfa4497859cf2bcdd1e6c13aabfbbf544c120f2630e53aac014a5e4f7aeeb932c918c64bd2f993a68'
-            '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
+            '6b57a66b870b2f525e2dedd8f224b89474fd4ec6ea18484b0a67a1a2b9a4fc95d025cac181504406ea42a35d6c1b184c0d4e38c92815022935fc55746c69c7c1'
             '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
             '2aef8b8949fec12d237facc57d5feddf0e7c1c878c94fb4eb8a845c110d5cfcc83492e73475de04ce98069e9ab1bb6b4a0a4559d445fbf264442dd8b0af9a8f1'
@@ -182,8 +182,8 @@ prepare() {
     # do not run 'make olddefconfig' as it sets default options
     yes "" | make config >/dev/null
 
-    make -s kernelrelease > ../version
-    msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)"
+    make -s kernelrelease > version
+    msg2 "Prepared %s version %s" "$pkgbase" "$(<version)"
 
     [[ -z "$_makenconfig" ]] || make nconfig
 
@@ -212,11 +212,10 @@ _package() {
     backup=("etc/mkinitcpio.d/$pkgbase.preset")
     install=linux.install
 
+    cd $_reponame 
     local kernver="$(<version)"
     local modulesdir="$pkgdir/usr/lib/modules/$kernver"
 
-    cd $_reponame 
-
     msg2 "Installing boot image..."
     # systemd expects to find the kernel here to allow hibernation
     # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
@@ -229,13 +228,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}
 
@@ -244,7 +236,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
@@ -271,12 +262,12 @@ _package-headers() {
         "linux-headers=$pkgver"
     )
 
-    local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
-
     cd $_reponame
+    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
@@ -340,7 +331,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"
@@ -354,9 +345,8 @@ _package-docs() {
         "linux-docs=$pkgver"
     )
 
-    local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
-
     cd $_reponame
+    local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
 
     msg2 "Installing documentation..."
     mkdir -p "$builddir"