From e3042a6ffae0358c573f611c5a56d02484013d71 Mon Sep 17 00:00:00 2001 From: Antoine Fontaine Date: Thu, 18 Jun 2020 11:59:59 +0200 Subject: [PATCH] raspberry-pi{,0,3,4}: enable swclock (MR 1336) Following discussions in https://gitlab.com/postmarketOS/pmaports/-/issues/398, swclock has been removed from postmarketos-base to avoid setting time incorrectly on devices with a hardware clock. The various raspberry pi don't have an hardware clock. This activate swclock back. --- device/testing/device-raspberry-pi/APKBUILD | 2 +- .../device-raspberry-pi-kernel-rpi.post-install | 2 ++ .../device-raspberry-pi-kernel-rpi2.post-install | 2 ++ device/testing/device-raspberry-pi0/APKBUILD | 2 +- .../device-raspberry-pi0/device-raspberry-pi0.post-install | 2 ++ device/testing/device-raspberry-pi3/APKBUILD | 2 +- .../device-raspberry-pi3/device-raspberry-pi3.post-install | 2 ++ device/testing/device-raspberry-pi4/APKBUILD | 2 +- .../device-raspberry-pi4/device-raspberry-pi4.post-install | 2 ++ 9 files changed, 14 insertions(+), 4 deletions(-) diff --git a/device/testing/device-raspberry-pi/APKBUILD b/device/testing/device-raspberry-pi/APKBUILD index 8d1807dd5..6af464a93 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=12 +pkgrel=13 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 fe848edfb..4bfa05923 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,4 +1,6 @@ #!/bin/sh +rc-service 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 ba0ae33be..e611062f3 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,4 +1,6 @@ #!/bin/sh +rc-service 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 cdbbfcb0c..5b2095c06 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=6 +pkgrel=7 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 4c763a1ae..430fd9b79 100644 --- a/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-install +++ b/device/testing/device-raspberry-pi0/device-raspberry-pi0.post-install @@ -1,4 +1,6 @@ #!/bin/sh +rc-service 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 c83762ad8..b759a020d 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=10 +pkgrel=11 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 9b143ac53..123f1fd6b 100644 --- a/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-install +++ b/device/testing/device-raspberry-pi3/device-raspberry-pi3.post-install @@ -1,5 +1,7 @@ #!/bin/sh +rc-service 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 b399b47d7..0d7513abc 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=4 +pkgrel=5 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 cb9398f06..fe2a64e38 100644 --- a/device/testing/device-raspberry-pi4/device-raspberry-pi4.post-install +++ b/device/testing/device-raspberry-pi4/device-raspberry-pi4.post-install @@ -1,4 +1,6 @@ #!/bin/sh +rc-service add swclock boot + cd /boot/dtbs-rpi4/ find . -type f -regex ".*\.dtbo\?$" -exec install -Dm644 {} /boot/{} \;