From 5d11ab4e2fd23ec334b366fd32b312b0cac48e58 Mon Sep 17 00:00:00 2001
From: Sergey Lisov <sleirsgoevy@gmail.com>
Date: Thu, 1 Sep 2022 12:38:13 +0000
Subject: [PATCH] Codestyle fixes
---
device/testing/device-samsung-a6lte/APKBUILD | 12 +++++++-----
.../device-samsung-a6lte/etc-init.d-udev-settle | 2 ++
.../device-samsung-a6lte/etc-lightdm-lightdm.conf | 1 +
device/testing/linux-samsung-a6lte/APKBUILD | 2 +-
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/device/testing/device-samsung-a6lte/APKBUILD b/device/testing/device-samsung-a6lte/APKBUILD
index ac352e6ab3d..17fe913710a 100644
--- a/device/testing/device-samsung-a6lte/APKBUILD
+++ b/device/testing/device-samsung-a6lte/APKBUILD
@@ -8,19 +8,19 @@ license="MIT"
arch="aarch64"
options="!check !archcheck"
depends="
- linux-samsung-a6lte
+ alsa-utils
firmware-samsung-a6lte
+ linux-samsung-a6lte
mesa-dri-gallium
mkbootimg
- postmarketos-base
- alsa-utils
+ msm-fb-refresher
pipewire
pipewire-pulse
- msm-fb-refresher
+ postmarketos-base
"
replaces="
- pipewire-media-session
lightdm
+ pipewire-media-session
udev-init-scripts-openrc
"
makedepends="devicepkg-dev"
@@ -34,6 +34,8 @@ source="
usr-share-pipewire-media-session.d-alsa-monitor.conf
"
+# pulseaudio does not seem to work on this device. Will use pipewire-pulse instead.
+
build() {
devicepkg_build $startdir $pkgname
}
diff --git a/device/testing/device-samsung-a6lte/etc-init.d-udev-settle b/device/testing/device-samsung-a6lte/etc-init.d-udev-settle
index 11c8cd9d73f..c9bbd741153 100644
--- a/device/testing/device-samsung-a6lte/etc-init.d-udev-settle
+++ b/device/testing/device-samsung-a6lte/etc-init.d-udev-settle
@@ -9,6 +9,8 @@ depend() {
keyword -containers
}
+# udev-settle takes 3 minutes to start (and fails anyway, after which the device boots). Nuking it.
+
start() {
ebegin "Not waiting for uevents to be processed"
eend $?
diff --git a/device/testing/device-samsung-a6lte/etc-lightdm-lightdm.conf b/device/testing/device-samsung-a6lte/etc-lightdm-lightdm.conf
index 0399ea87625..e29030da134 100644
--- a/device/testing/device-samsung-a6lte/etc-lightdm-lightdm.conf
+++ b/device/testing/device-samsung-a6lte/etc-lightdm-lightdm.conf
@@ -26,6 +26,7 @@
#lock-memory=true
#user-authority-in-system-dir=false
#guest-account-script=guest-account
+# Next line: elogind reports that the session CanGraphical=no. Let lightdm ignore that bogus status.
logind-check-graphical=false
#log-directory=/var/log/lightdm
#run-directory=/var/run/lightdm
diff --git a/device/testing/linux-samsung-a6lte/APKBUILD b/device/testing/linux-samsung-a6lte/APKBUILD
index d0f27048872..4ac4b2c30a6 100644
--- a/device/testing/linux-samsung-a6lte/APKBUILD
+++ b/device/testing/linux-samsung-a6lte/APKBUILD
@@ -18,9 +18,9 @@ makedepends="
devicepkg-dev
dtbtool-exynos
flex
+ gcc4
openssl-dev
perl
- gcc4
"
if [ "${CC:0:5}" != "gcc4-" ]; then
--
GitLab