update PKGBUILD

5 files changed, 13 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56dd192282ec..8638b15d4834 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,39 +5,31 @@ pkgbase = linux-rockchip
 	arch = armv7h
 	license = GPL2
 	noextract = linux.preset
-	noextract = 60-linux.hook
-	noextract = 90-linux.hook
 	noextract = linux-dtb-current-rockchip_21.02.0-trunk.13_armhf.deb
 	noextract = linux-image-current-rockchip_21.02.0-trunk.13_armhf.deb
 	noextract = linux-headers-current-rockchip_21.02.0-trunk.13_armhf.deb
 	options = !strip
 	source = linux.preset
-	source = 60-linux.hook
-	source = 90-linux.hook
 	source = https://beta.armbian.com/pool/main/l/linux-5.9.12-rockchip/linux-dtb-current-rockchip_21.02.0-trunk.13_armhf.deb
 	source = https://beta.armbian.com/pool/main/l/linux-5.9.12-rockchip/linux-image-current-rockchip_21.02.0-trunk.13_armhf.deb
 	source = https://beta.armbian.com/pool/main/l/linux-5.9.12-rockchip/linux-headers-current-rockchip_21.02.0-trunk.13_armhf.deb
 	sha512sums = a492aae17ee4a316ce03faf9f1b284b2529c485f4b092cc4a1f865a6c68d482fd356fd30efa296c116975a3bdf3922f5bf03912a8d0e76f4ab24aa6ab9f8c276
-	sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a
-	sha512sums = a8fc668de860cf7b44269e35f879d130ccbc7db84d159ffcac6a92c02324f09c08fb57cccad18332f423bf2153c928633fa681ee96482c778dc76bffe80dd4f5
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
 
 pkgname = linux-rockchip
 	pkgdesc = The Linux Kernel and modules - ARMv7 multi-platform rockchip
-	install = linux-rockchip.install
 	depends = coreutils
 	depends = linux-firmware
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux=5.9.12
 	provides = WIREGUARD-MODULE
 	conflicts = linux
 	backup = etc/mkinitcpio.d/linux-rockchip.preset
 
 pkgname = linux-rockchip-headers
 	pkgdesc = Header files and scripts for building modules for linux kernel - ARMv7 multi-platform rockchip
-	provides = linux-headers=5.9.12
 	conflicts = linux-headers
+
diff --git a/60-linux.hook b/60-linux.hook
deleted file mode 100644
index b33873c854fb..000000000000
--- a/60-linux.hook
+++ /dev/null
@@ -1,12 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/modules/%KERNVER%/*
-Target = usr/lib/modules/%EXTRAMODULES%/*
-
-[Action]
-Description = Updating %PKGBASE% module dependencies...
-When = PostTransaction
-Exec = /usr/bin/depmod %KERNVER%
diff --git a/90-linux.hook b/90-linux.hook
deleted file mode 100644
index 6ad74b4564c5..000000000000
--- a/90-linux.hook
+++ /dev/null
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = boot/zImage
-Target = usr/lib/initcpio/*
-
-[Action]
-Description = Updating %PKGBASE% initcpios...
-When = PostTransaction
-Exec = /usr/bin/mkinitcpio -p %PKGBASE%
diff --git a/PKGBUILD b/PKGBUILD
index 4742eeaabca3..44e9f5ef8ad2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,16 +15,12 @@ license=('GPL2')
 options=('!strip')
 source=(
   "linux.preset"
-  "60-linux.hook"
-  "90-linux.hook"
   "https://beta.armbian.com/pool/main/l/linux-$_kernver/linux-dtb-current-${_target}_${_armbver}-trunk.${_armbrel}_armhf.deb"
   "https://beta.armbian.com/pool/main/l/linux-$_kernver/linux-image-current-${_target}_${_armbver}-trunk.${_armbrel}_armhf.deb"
   "https://beta.armbian.com/pool/main/l/linux-$_kernver/linux-headers-current-${_target}_${_armbver}-trunk.${_armbrel}_armhf.deb"
 )
 sha512sums=(
   'a492aae17ee4a316ce03faf9f1b284b2529c485f4b092cc4a1f865a6c68d482fd356fd30efa296c116975a3bdf3922f5bf03912a8d0e76f4ab24aa6ab9f8c276'
-  '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
-  'a8fc668de860cf7b44269e35f879d130ccbc7db84d159ffcac6a92c02324f09c08fb57cccad18332f423bf2153c928633fa681ee96482c778dc76bffe80dd4f5'
   'SKIP'
   'SKIP'
   'SKIP'
@@ -42,9 +38,8 @@ _package() {
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
   backup=("etc/mkinitcpio.d/$pkgbase.preset")
-  provides=("linux=$pkgver" "WIREGUARD-MODULE")
+  provides=('WIREGUARD-MODULE')
   conflicts=('linux')
-  install="$pkgname.install"
 
   cd "$srcdir"
 
@@ -53,20 +48,13 @@ _package() {
   ar x "linux-image-current-${_target}_${_armbver}-trunk.${_armbrel}_armhf.deb"
   tar -xf data.tar.xz
 
-  install -Dm644 "boot/vmlinuz-$_kernver" "$pkgdir/boot/zImage"
+  install -dm755 "$pkgdir/boot"
   cp -r "boot/dtb-$_kernver" "$pkgdir/boot/dtbs"
+  ln -s "vmlinuz-$pkgbase" "$pkgdir/boot/zImage"
 
   install -dm755 "$pkgdir/usr"
   cp -r lib "$pkgdir/usr/lib"
 
-  # make room for external modules
-  local _extramodules="extramodules-$(echo $_kernver | sed -r 's|^([0-9]+.[0-9]+).*|\1|')-armv7"
-  ln -s "../$_extramodules" "$pkgdir/usr/lib/modules/$_kernver/extramodules"
-
-  # add real version for building modules and running depmod from hook
-  echo "$_kernver" |
-    install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules/$_extramodules/version"
-
   # sed expression for following substitutions
   local _subst="
     s|%PKGBASE%|$pkgbase|g
@@ -78,16 +66,15 @@ _package() {
   sed "$_subst" ../linux.preset |
     install -Dm644 /dev/stdin "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset"
 
-  # install pacman hooks
-  sed "$_subst" ../60-linux.hook |
-    install -Dm644 /dev/stdin "$pkgdir/usr/share/libalpm/hooks/60-$pkgbase.hook"
-  sed "$_subst" ../90-linux.hook |
-    install -Dm644 /dev/stdin "$pkgdir/usr/share/libalpm/hooks/90-$pkgbase.hook"
+  # install boot image
+  install -Dm644 "boot/vmlinuz-$_kernver" "$pkgdir/usr/lib/modules/$_kernver/vmlinuz"
+
+  # used by mkinitcpio to name the kernel
+  echo "$pkgbase" | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules/$_kernver/pkgbase"
 }
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for linux kernel - $_desc"
-  provides=("linux-headers=$pkgver")
   conflicts=('linux-headers')
 
   cd "$srcdir"
@@ -102,6 +89,10 @@ _package-headers() {
 
   install -Dm644 "boot/config-$_kernver" "$pkgdir/usr/lib/modules/$_kernver/build/.config"
   install -Dm644 "boot/System.map-$_kernver" "$pkgdir/usr/lib/modules/$_kernver/build/System.map"
+
+  # add real version for building modules and running depmod from hook
+  echo "$_kernver" |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules/$_kernver/build/version"
 }
 
 for _p in "${pkgname[@]}"; do
diff --git a/linux-rockchip.install b/linux-rockchip.install
deleted file mode 100644
index 127de9cfd3a1..000000000000
--- a/linux-rockchip.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_remove() {
-  rm -f boot/initramfs-linux.img
-}