Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
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
Model registry
Monitor
Service Desk
Analyze
Model experiments
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
alpine
aports
Commits
7cb6b903
Commit
7cb6b903
authored
7 months ago
by
Patrycja Rosa
Browse files
Options
Downloads
Patches
Plain Diff
testing/turnstile: fix dinit backend
can't depend on system, because we don't have it
parent
53a3f22f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
testing/turnstile/APKBUILD
+2
-2
2 additions, 2 deletions
testing/turnstile/APKBUILD
testing/turnstile/no-system-dinit.patch
+6
-2
6 additions, 2 deletions
testing/turnstile/no-system-dinit.patch
with
8 additions
and
4 deletions
testing/turnstile/APKBUILD
+
2
−
2
View file @
7cb6b903
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname
=
turnstile
pkgname
=
turnstile
pkgver
=
0.1.10
pkgver
=
0.1.10
pkgrel
=
2
pkgrel
=
3
pkgdesc
=
"Independent session/login tracker"
pkgdesc
=
"Independent session/login tracker"
url
=
"https://github.com/chimera-linux/turnstile"
url
=
"https://github.com/chimera-linux/turnstile"
arch
=
"all"
arch
=
"all"
...
@@ -41,5 +41,5 @@ sha512sums="
...
@@ -41,5 +41,5 @@ sha512sums="
739e11a01cfcb6c7ae58445619e1986cc6a84f93eae4ebf36b76f1f003baec90bf357eb81da2c116df3564631dff7b3b97c0eb6878d2d14de6457ba66dad5068 turnstile-0.1.10.tar.gz
739e11a01cfcb6c7ae58445619e1986cc6a84f93eae4ebf36b76f1f003baec90bf357eb81da2c116df3564631dff7b3b97c0eb6878d2d14de6457ba66dad5068 turnstile-0.1.10.tar.gz
4798d04b707e3b44467c1e75481a5123dbf4755ef1bdd09ac31d180762f67085a7030c4ba7d1f27b1ef30910785d8739375a730f32647c7d554142fac4d6b824 turnstiled.confd
4798d04b707e3b44467c1e75481a5123dbf4755ef1bdd09ac31d180762f67085a7030c4ba7d1f27b1ef30910785d8739375a730f32647c7d554142fac4d6b824 turnstiled.confd
4824f233704b21e3a4ab931879f88ec716761065fd109038ea9a0c89383580c7a198e2372088b555cb894110b5067c26b99ac9c40c04bf9a2384af1417fa4ad0 turnstiled.initd
4824f233704b21e3a4ab931879f88ec716761065fd109038ea9a0c89383580c7a198e2372088b555cb894110b5067c26b99ac9c40c04bf9a2384af1417fa4ad0 turnstiled.initd
5608dc9f78c387d3ae061d26dc7a4b6ceecb74b00b63ab8f0f78f8d6f8851bffe3a9183a6947828b265949c6a54d17ee44bd343159052dce802d9086ff67a2d8
no-system-dinit.patch
f40e665d87f3ea428463b4322e322165654bdde8ac85aee2ca1cff3108253caf9a9cb9aa54b9679582af1aae75eaccc725e6efe360fc83559260d18b85b3ccea
no-system-dinit.patch
"
"
This diff is collapsed.
Click to expand it.
testing/turnstile/no-system-dinit.patch
+
6
−
2
View file @
7cb6b903
...
@@ -2,7 +2,7 @@ we don't support running dinit system-wide,
...
@@ -2,7 +2,7 @@ we don't support running dinit system-wide,
so remove the code that assumes system dinit
so remove the code that assumes system dinit
diff --git a/backend/dinit b/backend/dinit
diff --git a/backend/dinit b/backend/dinit
index d69710e..
7c5e680
100644
index d69710e..
489bca8
100644
--- a/backend/dinit
--- a/backend/dinit
+++ b/backend/dinit
+++ b/backend/dinit
@@ -85,7 +85,6 @@
set -e
@@ -85,7 +85,6 @@
set -e
...
@@ -13,7 +13,11 @@ index d69710e..7c5e680 100644
...
@@ -13,7 +13,11 @@ index d69710e..7c5e680 100644
if [ -z "$services_dir1" ]; then
if [ -z "$services_dir1" ]; then
services_dir1="${HOME}/.config/dinit.d"
services_dir1="${HOME}/.config/dinit.d"
@@ -113,10 +112,4 @@
depends-on = system
@@ -109,14 +108,7 @@
mkdir -p "${boot_dir}" > /dev/null 2>&1 || :
# this must succeed
cat << EOF > "${DINIT_DIR}/boot"
type = internal
-depends-on = system
waits-for.d = ${boot_dir}
waits-for.d = ${boot_dir}
EOF
EOF
...
...
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