archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-18 22:54:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

alarm/raspberrypi-utils to 20240203-2

Browse source 
Revert offending commit: a6d5075417
This commit is contained in:
graysky 2024-02-03 11:44:18 -05:00
parent a94a8e152e
commit 53197603fd
2 changed files with 49 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
alarm/raspberrypi-utils/0001-Revert-dtmerge-Make-i2c_arm-vc-creation-conditional.patch Normal file
View file

@ -0,0 +1,38 @@
From ec97b31b7e3c0bfaba2ca4ce2e6dcb9af11901ea Mon Sep 17 00:00:00 2001
From: graysky <therealgraysky@proton.me>
Date: Sat, 3 Feb 2024 11:42:33 -0500
Subject: [PATCH] Revert "dtmerge: Make i2c_arm/vc creation conditional"
This reverts commit a6d50754172884d9809d90db3253b689270ad04f.
---
dtmerge/dtmerge.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/dtmerge/dtmerge.c b/dtmerge/dtmerge.c
index 7f027fd..2d2b81c 100644
--- a/dtmerge/dtmerge.c
+++ b/dtmerge/dtmerge.c
@@ -109,14 +109,12 @@ int main(int argc, char **argv)
"compatible", &compatible_len);
dtoverlay_init_map(overlay_dir, compatible, compatible_len);
- if (!dtoverlay_get_alias(base_dtb, "i2c"))
- {
- err = dtoverlay_set_synonym(base_dtb, "i2c_arm", "i2c0");
- err = dtoverlay_set_synonym(base_dtb, "i2c_vc", "i2c1");
- err = dtoverlay_set_synonym(base_dtb, "i2c_baudrate", "i2c0_baudrate");
- err = dtoverlay_set_synonym(base_dtb, "i2c_arm_baudrate", "i2c0_baudrate");
- err = dtoverlay_set_synonym(base_dtb, "i2c_vc_baudrate", "i2c1_baudrate");
- };
+ err = dtoverlay_set_synonym(base_dtb, "i2c", "i2c0");
+ err = dtoverlay_set_synonym(base_dtb, "i2c_arm", "i2c0");
+ err = dtoverlay_set_synonym(base_dtb, "i2c_vc", "i2c1");
+ err = dtoverlay_set_synonym(base_dtb, "i2c_baudrate", "i2c0_baudrate");
+ err = dtoverlay_set_synonym(base_dtb, "i2c_arm_baudrate", "i2c0_baudrate");
+ err = dtoverlay_set_synonym(base_dtb, "i2c_vc_baudrate", "i2c1_baudrate");
if (strcmp(overlay_file, "-") == 0)
{
--
2.43.0

14
alarm/raspberrypi-utils/PKGBUILD
View file

@ -2,7 +2,7 @@
pkgname=raspberrypi-utils
pkgver=20240203
pkgrel=1
pkgrel=2
_commit=b5191011dd47e22e4d6ca99fd6acef6004994a6b
pkgdesc="Legacy scripts and simple applications for Raspberry Pi"
arch=('aarch64' 'armv7h')
@ -14,9 +14,17 @@ replaces=('raspberrypi-firmware')
conflicts=('raspberrypi-firmware')
options=(!strip)
source=("utils-$pkgver-$pkgrel-${_commit:0:10}.tar.gz::https://github.com/raspberrypi/utils/archive/$_commit.tar.gz"
10-raspberrypi-utils.rules)
10-raspberrypi-utils.rules
0001-Revert-dtmerge-Make-i2c_arm-vc-creation-conditional.patch
)
md5sums=('2c54ac5fb4295da4cfc8d37106418458'
'a0423d9850cc56a15967e103c351c335')
'a0423d9850cc56a15967e103c351c335'
'5cab163f641a28e258740a6ba3b13021')
prepare() {
cd "utils-$_commit"
patch -p1 -i ../0001-Revert-dtmerge-Make-i2c_arm-vc-creation-conditional.patch
}
build() {
cd "utils-$_commit"