update mkinitcpio.preset

4 files changed, 17 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 291fcbadda7a..3396e210b75d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,16 +9,16 @@ pkgbase = linux-rockchip
 	makedepends = curl
 	makedepends = grep
 	makedepends = sed
-	noextract = linux-rockchip.preset
+	noextract = mkinitcpio.preset
 	noextract = linux-dtb-current-rockchip_20.08.14_armhf.deb
 	noextract = linux-image-current-rockchip_20.08.14_armhf.deb
 	noextract = linux-headers-current-rockchip_20.08.14_armhf.deb
 	options = !strip
-	source = linux-rockchip.preset
+	source = mkinitcpio.preset
 	source = https://apt.armbian.com/pool/main/l/linux-5.8.16-rockchip/linux-dtb-current-rockchip_20.08.14_armhf.deb
 	source = https://apt.armbian.com/pool/main/l/linux-5.8.16-rockchip/linux-image-current-rockchip_20.08.14_armhf.deb
 	source = https://apt.armbian.com/pool/main/l/linux-5.8.16-rockchip/linux-headers-current-rockchip_20.08.14_armhf.deb
-	sha512sums = 966a57dc6ea894b5b74b5f6c3ca0f8ee2ceb6ca8782f7cb0ae56a449f8f178d638ed455c022493fb339d1b685c282c06e30aec602078c3bb3302e1aa4bd810ea
+	sha512sums = 4e479e5c010c5cd6105b104419bbf1886a60174535d17a34ae457f2744598d0f1c4e2b24dc989c038fa2c51b3d076e0acd3210e1492a87db68b1d43840e11e8a
 	sha512sums = 723c3acdc7e3f56b7bb071b0d0ac8f284ba1bc2cb13aa318f30d431c49e635171492cd6648d601272259ed4e61f1ab3ac2555e182da9259d53fc148d0b3436ea
 	sha512sums = 59cea050cb3ca50d6e4c59fd7b2686eaf2762dd8da4bfaae360fb4410f615a5e2107d7c0789e75944620603707a6a6e817619d713c901633277c1fba9e5611d5
 	sha512sums = 961b8f97ad773d8c5da6d7ab3c5cb1268eea1aaff9ebaf2dc692a31aadb451a9a3ac6300078d2dd704e31e5cedb32aa43c023e991f5b592fd4ae7f01056407da
diff --git a/PKGBUILD b/PKGBUILD
index 11018ae4c743..7037c050d3a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,13 +14,13 @@ _pkgfile=$(curl -s -L https://apt.armbian.com/dists/focal/main/binary-armhf/Pack
 _kernver=$(cat Packages | grep 'linux-dtb-current-rockchip.*deb' | head -n 1 | sed -r 's#.*l/linux-(.*)/l.*#\1#')
 
 source=(
-    "$pkgbase.preset"
+    "mkinitcpio.preset"
     "$(cat Packages | grep 'linux-dtb-current-rockchip.*deb' | head -n 1 | sed -r 's#Filename: #https://apt.armbian.com/#')"
     "$(cat Packages | grep 'linux-image-current-rockchip.*deb' | head -n 1 | sed -r 's#Filename: #https://apt.armbian.com/#')"
     "$(cat Packages | grep 'linux-headers-current-rockchip.*deb' | head -n 1 | sed -r 's#Filename: #https://apt.armbian.com/#')"
 )
 sha512sums=(
-    '966a57dc6ea894b5b74b5f6c3ca0f8ee2ceb6ca8782f7cb0ae56a449f8f178d638ed455c022493fb339d1b685c282c06e30aec602078c3bb3302e1aa4bd810ea'
+    '4e479e5c010c5cd6105b104419bbf1886a60174535d17a34ae457f2744598d0f1c4e2b24dc989c038fa2c51b3d076e0acd3210e1492a87db68b1d43840e11e8a'
     "$(cat Packages | grep 'linux-dtb-current-rockchip.*deb' -A 5 | grep SHA512 | head -n 1 | sed -r 's#SHA512: ##')"
     "$(cat Packages | grep 'linux-image-current-rockchip.*deb' -A 5 | grep SHA512 | head -n 1 | sed -r 's#SHA512: ##')"
     "$(cat Packages | grep 'linux-headers-current-rockchip.*deb' -A 5 | grep SHA512 | head -n 1 | sed -r 's#SHA512: ##')"
@@ -58,7 +58,8 @@ package_linux-rockchip() {
     echo "$pkgbase" > "$pkgdir/usr/lib/modules/$_kernver/pkgbase"
     install -Dm644 "boot/vmlinuz-$_kernver" "$pkgdir/usr/lib/modules/$_kernver/vmlinuz"
 
-    install -Dm644 "$pkgbase.preset" "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset"
+    install -Dm644 "mkinitcpio.preset" "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset"
+    sed -r -i "s#\\\$pkgbase#$pkgbase#g" "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset"
 }
 
 package_linux-rockchip-headers() {
diff --git a/linux-rockchip.preset b/linux-rockchip.preset
deleted file mode 100644
index e3e49ce72957..000000000000
--- a/linux-rockchip.preset
+++ /dev/null
@@ -1,10 +0,0 @@
-# mkinitcpio preset file for the 'linux-rockchip' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="$(dd if=/boot/vmlinuz-linux-rockchip skip=$(grep -a -b -o $'\x1f\x8b\x08\x00\x00\x00\x00\x00' /boot/vmlinuz-linux-rockchip | head -n 1 | cut -d ':' -f 1) iflag=skip_bytes 2>&1 | zcat -q | grep -a 'Linux version [0-9]' | sed -r 's#.*([0-9]+.[0-9]+.[0-9]+-[a-zA-Z]+).*#\1#')"
-
-PRESETS=('default')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-rockchip.img"
-#default_options=""
diff --git a/mkinitcpio.preset b/mkinitcpio.preset
new file mode 100644
index 000000000000..7979fca35fae
--- /dev/null
+++ b/mkinitcpio.preset
@@ -0,0 +1,10 @@
+# mkinitcpio preset file for the '$pkgbase' package
+
+ALL_config="/etc/mkinitcpio.conf"
+ALL_kver="$(dd if=/boot/vmlinuz-$pkgbase skip=$(grep -a -b -o $'\x1f\x8b\x08\x00\x00\x00\x00\x00' /boot/vmlinuz-$pkgbase | head -n 1 | cut -d ':' -f 1) iflag=skip_bytes 2>&1 | zcat -q | grep -a 'Linux version [0-9]' | sed -r 's#.*([0-9]+.[0-9]+.[0-9]+-[a-z0-9]+).*#\1#')"
+
+PRESETS=('default')
+
+#default_config="/etc/mkinitcpio.conf"
+default_image="/boot/initramfs-$pkgbase.img"
+#default_options=""