Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pmaports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
postmarketOS
pmaports
Commits
bb6f079f
Unverified
Commit
bb6f079f
authored
4 years ago
by
Maarten van Gompel
Committed by
Oliver Smith
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
sxmo/sxmo-utils: upgrade to 1.2.0 (MR 1789)
[ci:skip-build]: already built successfully in CI
parent
d533a0bd
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#195584
passed
4 years ago
Stage: lint
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sxmo/sxmo-utils/0001-enable-bluetooth-and-modem-drivers-during-crust-susp.patch
+0
-46
0 additions, 46 deletions
...nable-bluetooth-and-modem-drivers-during-crust-susp.patch
sxmo/sxmo-utils/APKBUILD
+6
-9
6 additions, 9 deletions
sxmo/sxmo-utils/APKBUILD
with
6 additions
and
55 deletions
sxmo/sxmo-utils/0001-enable-bluetooth-and-modem-drivers-during-crust-susp.patch
deleted
100644 → 0
+
0
−
46
View file @
d533a0bd
Upstream: yes
https://lists.sr.ht/~mil/sxmo-devel/patches/14544
From a0c6e4c2e293cc2d663c35c4798b2e53462ca54b Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 27 Oct 2020 16:14:49 -0400
Subject: [PATCH] enable bluetooth and modem drivers during crust suspend
With the megi 5.9 kernel and other suspend-related merge requests in
postmarketos, disabling these drivers is no longer needed. All of this
should result in a more reliable suspending system.
Source: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/1651
Signed-off-by: Miles Alan <m@milesalan.com>
---
programs/sxmo_screenlock.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/programs/sxmo_screenlock.c b/programs/sxmo_screenlock.c
index 791511f..34ed5e7 100644
--- a/programs/sxmo_screenlock.c
+++ b/programs/sxmo_screenlock.c
@@ -169,20 +169,6 @@
configuresuspendsettingsandwakeupsources()
//set RTC wake
if (wakeinterval > 0) setup_rtc_wakeup();
- // Temporary hack to disable USB driver that doesn't suspend
- fprintf(stderr, "Disabling buggy USB driver\n");
- writefile(
- "/sys/devices/platform/soc/1c19000.usb/driver/unbind",
- "1c19000.usb"
- );
-
- // Temporary hack to disable Bluetooth driver that crashes on suspend 1/5th the time
- fprintf(stderr, "Disabling buggy Bluetooth driver\n");
- writefile(
- "/sys/bus/serial/drivers/hci_uart_h5/unbind",
- "serial0-0"
- );
-
// E.g. make sure we're using CRUST
fprintf(stderr, "Flip mem_sleep setting to use crust\n");
writefile("/sys/power/mem_sleep", "deep");
--
2.20.1
This diff is collapsed.
Click to expand it.
sxmo/sxmo-utils/APKBUILD
+
6
−
9
View file @
bb6f079f
# Maintainer: Miles Alan <m@milesalan.com>
pkgname
=
sxmo-utils
pkgver
=
1.
1.11
pkgrel
=
1
pkgver
=
1.
2.0
pkgrel
=
0
pkgdesc
=
"Utility scripts, programs, and configs that hold the Sxmo UI environment together"
url
=
"https://git.sr.ht/~mil/sxmo-utils"
arch
=
"all"
...
...
@@ -12,7 +12,8 @@ depends="
sxmo-dwm
sxmo-st
sxmo-surf
sxmo-svkbd
svkbd
lisgd
alsa-utils
autocutsel
...
...
@@ -26,7 +27,6 @@ depends="
geoclue
grep
inotify-tools
lisgd
mediainfo
modemmanager
mpv
...
...
@@ -53,9 +53,7 @@ depends="
"
options
=
"suid !check"
# has no tests
source
=
"
$pkgname
-
$pkgver
.tar.gz::https://git.sr.ht/~mil/sxmo-utils/archive/
$pkgver
.tar.gz
0001-enable-bluetooth-and-modem-drivers-during-crust-susp.patch
"
source
=
"
$pkgname
-
$pkgver
.tar.gz::https://git.sr.ht/~mil/sxmo-utils/archive/
$pkgver
.tar.gz"
install
=
"
$pkgname
.post-install
$pkgname
.pre-deinstall"
package
()
{
...
...
@@ -70,5 +68,4 @@ package() {
chmod
u+s
$pkgdir
/usr/bin/sxmo_screenlock
}
sha512sums
=
"e1a23a0899f5a6bc25a3fe0d20401ccb218b6f0150f3cc06dda822c81075af9b08d59b310acf1310844c44b0adc0f1973c3d0a74ea53c4e7d8e1ab2132eb1684 sxmo-utils-1.1.11.tar.gz
7afe015b5f7a0c6fb644f0268d5558e02ee4d141d0c7f6167ce262c42e2ca767d7b4cdd9fc5cc52ca516bbbbb513d720fec5fd70269ef93f1511d5b6e6017fbd 0001-enable-bluetooth-and-modem-drivers-during-crust-susp.patch"
sha512sums
=
"bb765a1392492acbd6bb56ec870dcb4adf0decafd719678ba3e937c8bc592233b86f0e2bb8e034b572d6e9a1eeaa283a12731d26344cffb13be6d3e758ee3888 sxmo-utils-1.2.0.tar.gz"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment