From 87ea0c55196b864cb8eabbf2a5ffe5ceeb6b05ce Mon Sep 17 00:00:00 2001
From: Daniele Debernardi <drebrez@gmail.com>
Date: Tue, 10 Mar 2020 02:04:33 +0100
Subject: [PATCH] device-raspberry-pi*: fix boot error caused by missing dtb
 files (!1047)

The upstream linux-rpi package has been modified: the dtb files
are now located in /boot/dtbs.
---
 device/testing/device-raspberry-pi/APKBUILD                 | 6 +++---
 .../device-raspberry-pi-kernel-rpi.post-upgrade             | 1 +
 .../device-raspberry-pi-kernel-rpi2.post-install            | 3 +--
 .../device-raspberry-pi-kernel-rpi2.post-upgrade            | 1 +
 device/testing/device-raspberry-pi0/APKBUILD                | 4 ++--
 .../device-raspberry-pi0/device-raspberry-pi0.post-install  | 3 +--
 .../device-raspberry-pi0/device-raspberry-pi0.post-upgrade  | 1 +
 device/testing/device-raspberry-pi3/APKBUILD                | 4 ++--
 .../device-raspberry-pi3/device-raspberry-pi3.post-install  | 3 +--
 .../device-raspberry-pi3/device-raspberry-pi3.post-upgrade  | 1 +
 device/testing/device-raspberry-pi4/APKBUILD                | 4 ++--
 .../device-raspberry-pi4/device-raspberry-pi4.post-upgrade  | 1 +
 12 files changed, 17 insertions(+), 15 deletions(-)
 create mode 120000 device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-upgrade
 create mode 120000 device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-upgrade
 create mode 120000 device/testing/device-raspberry-pi0/device-raspberry-pi0.post-upgrade
 create mode 120000 device/testing/device-raspberry-pi3/device-raspberry-pi3.post-upgrade
 create mode 120000 device/testing/device-raspberry-pi4/device-raspberry-pi4.post-upgrade

diff --git a/device/testing/device-raspberry-pi/APKBUILD b/device/testing/device-raspberry-pi/APKBUILD
index 525dce15b..bfafc1a99 100644
--- a/device/testing/device-raspberry-pi/APKBUILD
+++ b/device/testing/device-raspberry-pi/APKBUILD
@@ -3,7 +3,7 @@
 pkgname="device-raspberry-pi"
 pkgdesc="Raspberry Pi"
 pkgver=0.1
-pkgrel=10
+pkgrel=11
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -39,14 +39,14 @@ package() {
 kernel_rpi() {
 	pkgdesc="Kernel for the Raspberry Pi 1 (from Alpine, depends on non free firmware!)"
 	depends="$pkgname linux-rpi"
-	install="$subpkgname.post-install"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }
 
 kernel_rpi2() {
 	pkgdesc="Kernel for the Raspberry Pi 2 (from Alpine, depends on non free firmware!)"
 	depends="$pkgname linux-rpi2"
-	install="$subpkgname.post-install"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-upgrade b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-upgrade
new file mode 120000
index 000000000..6761fa3e4
--- /dev/null
+++ b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-upgrade
@@ -0,0 +1 @@
+device-raspberry-pi-kernel-rpi.post-install
\ No newline at end of file
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-install b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-install
index 1c51c1647..ba0ae33be 100644
--- a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-install
+++ b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-install
@@ -1,5 +1,4 @@
 #!/bin/sh
 
-kernver=$(cat /usr/share/kernel/rpi2/kernel.release)
-cd /usr/lib/linux-${kernver}/
+cd /boot/dtbs-rpi2
 find . -type f -regex ".*\.dtbo\?$" -exec install -Dm644 {} /boot/{} \;
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-upgrade b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-upgrade
new file mode 120000
index 000000000..c2c74682c
--- /dev/null
+++ b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi2.post-upgrade
@@ -0,0 +1 @@
+device-raspberry-pi-kernel-rpi2.post-install
\ No newline at end of file
diff --git a/device/testing/device-raspberry-pi0/APKBUILD b/device/testing/device-raspberry-pi0/APKBUILD
index 3dc9e10be..2225ca7d5 100644
--- a/device/testing/device-raspberry-pi0/APKBUILD
+++ b/device/testing/device-raspberry-pi0/APKBUILD
@@ -3,14 +3,14 @@
 pkgname="device-raspberry-pi0"
 pkgdesc="Raspberry Pi Zero"
 pkgver=0.1
-pkgrel=4
+pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
 options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi bluetooth-raspberry-pi"
 makedepends="devicepkg-dev"
-install="$pkgname.post-install"
+install="$pkgname.post-install $pkgname.post-upgrade"
 source="deviceinfo config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules"
 
 build() {
diff --git a/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-install b/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-install
index 65c5c53ba..4c763a1ae 100644
--- a/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-install
+++ b/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-install
@@ -1,5 +1,4 @@
 #!/bin/sh
 
-kernver=$(cat /usr/share/kernel/rpi/kernel.release)
-cd /usr/lib/linux-${kernver}/
+cd /boot/dtbs-rpi/
 find . -type f -regex ".*\.dtbo\?$" -exec install -Dm644 {} /boot/{} \;
diff --git a/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-upgrade b/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-upgrade
new file mode 120000
index 000000000..4f83aa8ac
--- /dev/null
+++ b/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-upgrade
@@ -0,0 +1 @@
+device-raspberry-pi0.post-install
\ No newline at end of file
diff --git a/device/testing/device-raspberry-pi3/APKBUILD b/device/testing/device-raspberry-pi3/APKBUILD
index b6f632c18..ed58e2372 100644
--- a/device/testing/device-raspberry-pi3/APKBUILD
+++ b/device/testing/device-raspberry-pi3/APKBUILD
@@ -3,14 +3,14 @@
 pkgname="device-raspberry-pi3"
 pkgdesc="Raspberry Pi 3B/3B+"
 pkgver=0.1
-pkgrel=8
+pkgrel=9
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi mesa-dri-vc4 bluetooth-raspberry-pi"
 makedepends="devicepkg-dev"
-install="$pkgname.post-install"
+install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="$pkgname-weston"
 source="deviceinfo config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules weston.ini networkmanager.conf"
 
diff --git a/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-install b/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-install
index d4eb393c8..9b143ac53 100644
--- a/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-install
+++ b/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-kernver=$(cat /usr/share/kernel/rpi/kernel.release)
-cd /usr/lib/linux-${kernver}/
+cd /boot/dtbs-rpi/
 find . -type f -regex ".*\.dtbo\?$" -exec install -Dm644 {} /boot/{} \;
 
diff --git a/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-upgrade b/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-upgrade
new file mode 120000
index 000000000..68426b3f2
--- /dev/null
+++ b/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-upgrade
@@ -0,0 +1 @@
+device-raspberry-pi3.post-install
\ No newline at end of file
diff --git a/device/testing/device-raspberry-pi4/APKBUILD b/device/testing/device-raspberry-pi4/APKBUILD
index 713500bb3..d71fce4a8 100644
--- a/device/testing/device-raspberry-pi4/APKBUILD
+++ b/device/testing/device-raspberry-pi4/APKBUILD
@@ -4,14 +4,14 @@
 pkgname="device-raspberry-pi4"
 pkgdesc="Raspberry Pi 4"
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi4"
 makedepends="devicepkg-dev"
-install="$pkgname.post-install"
+install="$pkgname.post-install $pkgname.post-upgrade"
 source="deviceinfo config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules"
 
 build() {
diff --git a/device/testing/device-raspberry-pi4/device-raspberry-pi4.post-upgrade b/device/testing/device-raspberry-pi4/device-raspberry-pi4.post-upgrade
new file mode 120000
index 000000000..59f4c3865
--- /dev/null
+++ b/device/testing/device-raspberry-pi4/device-raspberry-pi4.post-upgrade
@@ -0,0 +1 @@
+device-raspberry-pi4.post-install
\ No newline at end of file