From 7cb6b903eafcc23f41d0c162d57a5df29f112eb9 Mon Sep 17 00:00:00 2001 From: ptrcnull Date: Mon, 16 Sep 2024 23:05:40 +0200 Subject: [PATCH] testing/turnstile: fix dinit backend can't depend on system, because we don't have it --- testing/turnstile/APKBUILD | 4 ++-- testing/turnstile/no-system-dinit.patch | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/testing/turnstile/APKBUILD b/testing/turnstile/APKBUILD index fcb774465a1..3d5f82435d7 100644 --- a/testing/turnstile/APKBUILD +++ b/testing/turnstile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Patrycja Rosa pkgname=turnstile pkgver=0.1.10 -pkgrel=2 +pkgrel=3 pkgdesc="Independent session/login tracker" url="https://github.com/chimera-linux/turnstile" arch="all" @@ -41,5 +41,5 @@ sha512sums=" 739e11a01cfcb6c7ae58445619e1986cc6a84f93eae4ebf36b76f1f003baec90bf357eb81da2c116df3564631dff7b3b97c0eb6878d2d14de6457ba66dad5068 turnstile-0.1.10.tar.gz 4798d04b707e3b44467c1e75481a5123dbf4755ef1bdd09ac31d180762f67085a7030c4ba7d1f27b1ef30910785d8739375a730f32647c7d554142fac4d6b824 turnstiled.confd 4824f233704b21e3a4ab931879f88ec716761065fd109038ea9a0c89383580c7a198e2372088b555cb894110b5067c26b99ac9c40c04bf9a2384af1417fa4ad0 turnstiled.initd -5608dc9f78c387d3ae061d26dc7a4b6ceecb74b00b63ab8f0f78f8d6f8851bffe3a9183a6947828b265949c6a54d17ee44bd343159052dce802d9086ff67a2d8 no-system-dinit.patch +f40e665d87f3ea428463b4322e322165654bdde8ac85aee2ca1cff3108253caf9a9cb9aa54b9679582af1aae75eaccc725e6efe360fc83559260d18b85b3ccea no-system-dinit.patch " diff --git a/testing/turnstile/no-system-dinit.patch b/testing/turnstile/no-system-dinit.patch index bc82b031293..f26a9519dcf 100644 --- a/testing/turnstile/no-system-dinit.patch +++ b/testing/turnstile/no-system-dinit.patch @@ -2,7 +2,7 @@ we don't support running dinit system-wide, so remove the code that assumes system dinit diff --git a/backend/dinit b/backend/dinit -index d69710e..7c5e680 100644 +index d69710e..489bca8 100644 --- a/backend/dinit +++ b/backend/dinit @@ -85,7 +85,6 @@ set -e @@ -13,7 +13,11 @@ index d69710e..7c5e680 100644 if [ -z "$services_dir1" ]; then 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} EOF