From 7d697fef050867420839611b51b786f8392f5118 Mon Sep 17 00:00:00 2001
From: Newbyte <newbie13xd@gmail.com>
Date: Tue, 9 Feb 2021 22:01:12 +0100
Subject: [PATCH] device-raspberry-pi{,0,3,4}: don't move dtbs (MR 1944)

See https://git.alpinelinux.org/aports/commit/main/linux-rpi/APKBUILD?id=fb542395e33ab9eaab13d5cf40029173240c7836

Closes https://gitlab.com/postmarketOS/pmaports/-/issues/965
---
 device/testing/device-raspberry-pi/APKBUILD                   | 2 +-
 .../device-raspberry-pi-kernel-rpi.post-install               | 3 ---
 .../device-raspberry-pi-kernel-rpi2.post-install              | 3 ---
 device/testing/device-raspberry-pi0/APKBUILD                  | 2 +-
 .../device-raspberry-pi0/device-raspberry-pi0.post-install    | 3 ---
 device/testing/device-raspberry-pi3/APKBUILD                  | 2 +-
 .../device-raspberry-pi3/device-raspberry-pi3.post-install    | 4 ----
 device/testing/device-raspberry-pi4/APKBUILD                  | 2 +-
 .../device-raspberry-pi4/device-raspberry-pi4.post-install    | 3 ---
 9 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/device/testing/device-raspberry-pi/APKBUILD b/device/testing/device-raspberry-pi/APKBUILD
index db3485c65..e351de833 100644
--- a/device/testing/device-raspberry-pi/APKBUILD
+++ b/device/testing/device-raspberry-pi/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-raspberry-pi
 pkgdesc="Raspberry Pi"
 pkgver=0.1
-pkgrel=14
+pkgrel=15
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
diff --git a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-install b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-install
index bcfb7cecb..2fc9041fc 100644
--- a/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-install
+++ b/device/testing/device-raspberry-pi/device-raspberry-pi-kernel-rpi.post-install
@@ -1,6 +1,3 @@
 #!/bin/sh
 
 rc-update add swclock boot
-
-cd /boot/dtbs-rpi
-find . -type f -regex ".*\.dtbo\?$" -exec install -Dm644 {} /boot/{} \;
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 0f52c9923..2fc9041fc 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,6 +1,3 @@
 #!/bin/sh
 
 rc-update add swclock boot
-
-cd /boot/dtbs-rpi2
-find . -type f -regex ".*\.dtbo\?$" -exec install -Dm644 {} /boot/{} \;
diff --git a/device/testing/device-raspberry-pi0/APKBUILD b/device/testing/device-raspberry-pi0/APKBUILD
index e192e6143..e2d83967a 100644
--- a/device/testing/device-raspberry-pi0/APKBUILD
+++ b/device/testing/device-raspberry-pi0/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-raspberry-pi0
 pkgdesc="Raspberry Pi Zero"
 pkgver=0.1
-pkgrel=8
+pkgrel=9
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
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 56980f8e7..2fc9041fc 100644
--- a/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-install
+++ b/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-install
@@ -1,6 +1,3 @@
 #!/bin/sh
 
 rc-update add swclock boot
-
-cd /boot/dtbs-rpi/
-find . -type f -regex ".*\.dtbo\?$" -exec install -Dm644 {} /boot/{} \;
diff --git a/device/testing/device-raspberry-pi3/APKBUILD b/device/testing/device-raspberry-pi3/APKBUILD
index 35c58cee8..ac735c42e 100644
--- a/device/testing/device-raspberry-pi3/APKBUILD
+++ b/device/testing/device-raspberry-pi3/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-raspberry-pi3
 pkgdesc="Raspberry Pi 3B/3B+"
 pkgver=0.1
-pkgrel=12
+pkgrel=13
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
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 1ba849988..2fc9041fc 100644
--- a/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-install
+++ b/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-install
@@ -1,7 +1,3 @@
 #!/bin/sh
 
 rc-update add swclock boot
-
-cd /boot/dtbs-rpi/
-find . -type f -regex ".*\.dtbo\?$" -exec install -Dm644 {} /boot/{} \;
-
diff --git a/device/testing/device-raspberry-pi4/APKBUILD b/device/testing/device-raspberry-pi4/APKBUILD
index f27e1529d..31119b744 100644
--- a/device/testing/device-raspberry-pi4/APKBUILD
+++ b/device/testing/device-raspberry-pi4/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-raspberry-pi4
 pkgdesc="Raspberry Pi 4"
 pkgver=0.1
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
diff --git a/device/testing/device-raspberry-pi4/device-raspberry-pi4.post-install b/device/testing/device-raspberry-pi4/device-raspberry-pi4.post-install
index 944cf67b6..2fc9041fc 100644
--- a/device/testing/device-raspberry-pi4/device-raspberry-pi4.post-install
+++ b/device/testing/device-raspberry-pi4/device-raspberry-pi4.post-install
@@ -1,6 +1,3 @@
 #!/bin/sh
 
 rc-update add swclock boot
-
-cd /boot/dtbs-rpi4/
-find . -type f -regex ".*\.dtbo\?$" -exec install -Dm644 {} /boot/{} \;