Merged Arch PKGBUILD changes

2 files changed, 7 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 121f832c7980..9ec2ad27f667 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -32,5 +32,6 @@ pkgname = linux-xanmod-rt
 	optdepends = linux-firmware: firmware images needed for some devices
 
 pkgname = linux-xanmod-rt-headers
-	pkgdesc = Header files and scripts for building modules for Xanmod Linux kernel
+	pkgdesc = Headers and scripts for building modules for the Linux Xanmod real-time version kernel
+	depends = pahole
 
diff --git a/PKGBUILD b/PKGBUILD
index 0f5424e74b2b..293b4a0ed6e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -200,14 +200,15 @@ _package() {
   echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 
   msg2 "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}
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for Xanmod Linux kernel"
+  pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+  depends=(pahole)
 
   cd linux-${_major}
   local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
@@ -276,6 +277,8 @@ _package-headers() {
     esac
   done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
 
+  msg2 "Stripping vmlinux..."
+  strip -v $STRIP_STATIC "$builddir/vmlinux"
   msg2 "Adding symlink..."
   mkdir -p "$pkgdir/usr/src"
   ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"