5.4.154-2 (clr 5.4.153-146) re-add STRIP modules and vmlinux

2 files changed, 11 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ef5d03658db..a3a7b9561c40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-clear-lts2019
 	pkgdesc = Clear Linux lts2019
 	pkgver = 5.4.154
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/clearlinux-pkgs/linux-lts2019
 	arch = x86_64
 	license = GPL2
@@ -10,6 +10,7 @@ pkgbase = linux-clear-lts2019
 	makedepends = git
 	makedepends = kmod
 	makedepends = libelf
+	makedepends = pahole
 	makedepends = xmlto
 	options = !strip
 	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
@@ -39,3 +40,4 @@ pkgname = linux-clear-lts2019
 
 pkgname = linux-clear-lts2019-headers
 	pkgdesc = Headers and scripts for building modules for the Clear Linux lts2019 kernel
+	depends = pahole
diff --git a/PKGBUILD b/PKGBUILD
index 658c8ced3b7a..3aa951c76654 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -79,12 +79,12 @@ _srcname=linux-${_major}
 _clr=${_major}.153-146
 pkgbase=linux-clear-lts2019
 pkgver=${_major}.${_minor}
-pkgrel=1
+pkgrel=2
 pkgdesc='Clear Linux lts2019'
 arch=('x86_64')
 url="https://github.com/clearlinux-pkgs/linux-lts2019"
 license=('GPL2')
-makedepends=('bc' 'cpio' 'git' 'kmod' 'libelf' 'xmlto')
+makedepends=('bc' 'cpio' 'git' 'kmod' 'libelf' 'pahole' 'xmlto')
 options=('!strip')
 _gcc_more_v='20210914'
 source=(
@@ -226,7 +226,7 @@ prepare() {
 
 build() {
     cd ${_srcname}
-    make bzImage modules
+    make all
 }
 
 _package() {
@@ -252,7 +252,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}
@@ -260,6 +260,7 @@ _package() {
 
 _package-headers() {
     pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+    depends=(pahole)
 
     cd ${_srcname}
     local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
@@ -331,6 +332,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"