From 4b10cbf7e21b60f523ed103c1f0e3678f6850cca Mon Sep 17 00:00:00 2001
From: Sergey Lisov <sleirsgoevy@gmail.com>
Date: Fri, 27 Sep 2024 21:57:56 +0300
Subject: [PATCH] device-samsung-a6lte: fix Bluetooth init.d script (MR 5646)
It seems that bootmac's commandline argument parsing was rewritten, and
it no longer accepts multiple flags in one argument. Change the
invocation to work around that.
[ci:skip-build]: already built successfully in CI
---
device/testing/device-samsung-a6lte/APKBUILD | 4 ++--
.../testing/device-samsung-a6lte/etc-init.d-hciattach-ttySAC0 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/device/testing/device-samsung-a6lte/APKBUILD b/device/testing/device-samsung-a6lte/APKBUILD
index d1dba182580..c76d75cfedb 100644
--- a/device/testing/device-samsung-a6lte/APKBUILD
+++ b/device/testing/device-samsung-a6lte/APKBUILD
@@ -1,7 +1,7 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-samsung-a6lte
pkgdesc="Samsung Galaxy A6 2018"
-pkgver=4
+pkgver=5
pkgrel=0
url="https://postmarketos.org"
license="MIT"
@@ -102,7 +102,7 @@ e787dd30a667fd886a46bb0b670bd2771a8fc78fddc39bb86405fdda6024bc1211b82f89664b7cfc
9c0f939c97582d9c03fb62386527569b7f08dd6c8350c8ac6cf9f70d6d5da61d5fc95997b413c4fdb671379ab35caedb631b9af33c7a1e8f3388b3fb56d9b435 device-samsung-a6lte-downstream-quirks.post-install
95b46ef54f2b92edefcdc3742a1d36b7c52066daeeb5002f25b4de144d52e3cda8e3981c8b44d608dcfaf6ec5a89066d1e53e9c1eccbaf03c262b6c162efe532 deviceinfo
3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438 etc-conf.d-samsungipcd
-5e23fd88baa4694ef48ec9590f948e11101be1e472c626f88011a182534a16520eb00c95a10ea77a773123892036188e2e0783540f3b8f8fe158da5e06568e02 etc-init.d-hciattach-ttySAC0
+f9716fc70bf3508d2f9e83d908f1c13103403f01ebb784acec6cdf3e959e92b63c75e49b0120abe1ada5a50d768dcf30b8472630da1172fc826485e97024d85e etc-init.d-hciattach-ttySAC0
203b832a7080d5f1351c5e024e444f9fe509f6e0fd4b376a60c7d73359b7e356863a4f15caf9b2e4e733dc44d2971722083e7c69ca94a012eb004b4b8ded9d09 etc-init.d-udev-settle
7caddfe4659c969a33adcc27a760bc78d4f70ca4b7a4a5ec28a6411c12f3e6dd6d427b59f75976a737a5fe0f09806f8b6d65798f6358bd1e1954ad2a28fbfdc8 etc-init.d-wlan0-up
861270c6bc0b2a3e6cd389c21c8c895e62de8cf8bec6fcf23c178f8cbaae855d62b0ee98692671ab4f518d84cb43dd0b2fe46f5a609f65af6a6c06e0fdbb6d0c etc-lightdm-lightdm.conf
diff --git a/device/testing/device-samsung-a6lte/etc-init.d-hciattach-ttySAC0 b/device/testing/device-samsung-a6lte/etc-init.d-hciattach-ttySAC0
index fecf21e5c30..e5f5eb6635a 100644
--- a/device/testing/device-samsung-a6lte/etc-init.d-hciattach-ttySAC0
+++ b/device/testing/device-samsung-a6lte/etc-init.d-hciattach-ttySAC0
@@ -21,7 +21,7 @@ start () {
if ! [[ -d /sys/class/bluetooth/hci0 ]]; then
# on the vendor kernel we have to do a manual hciattach
# since we unregistered the rfkill, we won't be able to restart, so this cannot be a "real" service
- hciattach /dev/ttySAC0 bcm43xx 3000000 flow nosleep "$(bootmac -gb)"
+ hciattach /dev/ttySAC0 bcm43xx 3000000 flow nosleep "$(bootmac -g -b)"
fi
eend $?
}
--
GitLab