added my Recipes
This commit is contained in:
@@ -0,0 +1,30 @@
|
||||
From 4c90a66fb7fd9dbb861c5a888fc828f3795fe540 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Brown <ben@demerara.io>
|
||||
Date: Tue, 19 Jul 2022 16:12:12 +0100
|
||||
Subject: [PATCH] Fix daemon install ignoring configured runstatedir
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Ben Brown <ben@demerara.io>
|
||||
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
||||
|
||||
---
|
||||
src/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index ad3655d..abd7a4c 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -37,7 +37,7 @@ escrow_PROGRAMS = plymouthd-fd-escrow
|
||||
|
||||
plymouthd_fd_escrow_SOURCES = plymouthd-fd-escrow.c
|
||||
|
||||
-plymouthdrundir = $(localstatedir)/run/plymouth
|
||||
+plymouthdrundir = $(plymouthruntimedir)
|
||||
plymouthdspooldir = $(localstatedir)/spool/plymouth
|
||||
plymouthdtimedir = $(localstatedir)/lib/plymouth
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 746c690f57b52e6fe21cc2a11b5bb71d25af3128 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Wed, 13 Dec 2017 16:15:57 +0100
|
||||
Subject: [PATCH] Make full path to systemd-tty-ask-password-agent configurable
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.ac | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index aad673e..6b37179 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -48,7 +48,10 @@ PLYMOUTH_LIBS="-lm -lrt -ldl"
|
||||
AC_SUBST(PLYMOUTH_CFLAGS)
|
||||
AC_SUBST(PLYMOUTH_LIBS)
|
||||
|
||||
-AC_PATH_PROG([SYSTEMD_ASK_PASSWORD_AGENT], [systemd-tty-ask-password-agent])
|
||||
+AC_ARG_WITH(systemd-tty-ask-password-agent, AS_HELP_STRING([--with-systemd-tty-ask-password-agent],[path of systemd-tty-ask-password-agent]),SYSTEMD_ASK_PASSWORD_AGENT=${withval},SYSTEMD_ASK_PASSWORD_AGENT=/bin/systemd-tty-ask-password-agent)
|
||||
+AC_SUBST(SYSTEMD_ASK_PASSWORD_AGENT)
|
||||
+
|
||||
+# checked: UDEVADM is not used
|
||||
AC_PATH_PROG([UDEVADM], [udevadm])
|
||||
|
||||
AC_ARG_ENABLE(pango, AS_HELP_STRING([--enable-pango],[enable building with pango, disabled there is no encryption prompts]),enable_pango=$enableval,enable_pango=yes)
|
||||
--
|
||||
2.9.5
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
From 97012d2c38b84fffb32867fb5eeac64a93455626 Mon Sep 17 00:00:00 2001
|
||||
From: Ben Brown <ben@demerara.io>
|
||||
Date: Tue, 19 Jul 2022 16:10:24 +0100
|
||||
Subject: [PATCH] Use standard runstatedir vs custom flag
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
---
|
||||
configure.ac | 11 ++---------
|
||||
1 file changed, 2 insertions(+), 9 deletions(-)
|
||||
|
||||
Signed-off-by: Ben Brown <ben@demerara.io>
|
||||
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 608ad02..34a2f2c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -140,9 +140,7 @@ if test x$enable_systemd_integration = xyes; then
|
||||
AC_SUBST(SYSTEMD_UNIT_DIR)
|
||||
fi
|
||||
|
||||
-AC_ARG_WITH([runtimedir],
|
||||
- AC_HELP_STRING([--with-runtimedir=DIR], [runtime data dir [LOCALSTATEDIR/run]]),
|
||||
- [plymouthruntimedir=${withval}/plymouth], [plymouthruntimedir=""])
|
||||
+AC_ARG_WITH([runtimedir], [], [AC_MSG_ERROR([--with-runtimedir is obsolete, use --runstatedir instead])], [])
|
||||
|
||||
AC_ARG_WITH(system-root-install, AS_HELP_STRING([--with-system-root-install],[Install client in /bin and daemon in /sbin]),with_system_root_install=${withval},with_system_root_install=no)
|
||||
AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = yes])
|
||||
@@ -150,16 +148,11 @@ AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = ye
|
||||
if test x$with_system_root_install = xyes; then
|
||||
plymouthclientdir=/bin
|
||||
plymouthdaemondir=/sbin
|
||||
- if (test -z "${plymouthruntimedir}"); then
|
||||
- plymouthruntimedir=/run/plymouth
|
||||
- fi
|
||||
else
|
||||
plymouthclientdir=$bindir
|
||||
plymouthdaemondir=$sbindir
|
||||
- if (test -z "${plymouthruntimedir}"); then
|
||||
- plymouthruntimedir=$localstatedir/run/plymouth
|
||||
- fi
|
||||
fi
|
||||
+plymouthruntimedir=$runstatedir/plymouth
|
||||
AC_SUBST(plymouthclientdir)
|
||||
AC_SUBST(plymouthdaemondir)
|
||||
AC_SUBST(plymouthruntimedir)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From f270f80d4c36a22a0f7b8de8fb6b1abef6f7b183 Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Tue, 15 Feb 2022 16:23:10 +0800
|
||||
Subject: [PATCH] plymouth : Add the retain-splash option
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Adding the "retain-splash” option to tell plymouth to keep the boot
|
||||
splash’s contents on screen even after plymouth exits to make the
|
||||
splash screen show more friendly on the system which boots so fast.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
systemd-units/plymouth-quit.service.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/systemd-units/plymouth-quit.service.in b/systemd-units/plymouth-quit.service.in
|
||||
index ed9f9b9..147e9ee 100644
|
||||
--- a/systemd-units/plymouth-quit.service.in
|
||||
+++ b/systemd-units/plymouth-quit.service.in
|
||||
@@ -3,7 +3,7 @@ Description=Terminate Plymouth Boot Screen
|
||||
After=rc-local.service plymouth-start.service systemd-user-sessions.service
|
||||
|
||||
[Service]
|
||||
-ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit
|
||||
+ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
TimeoutSec=20
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 658eac007d14d836cb002a5675487bac63d50324 Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Mon, 7 Feb 2022 03:22:12 +0000
|
||||
Subject: [PATCH] plymouth-start.service.in: add related kernel parameter
|
||||
|
||||
Add extra kernel parameter to make the plymouth splash screen
|
||||
display during boot.
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/plymouth/plymouth/-/merge_requests/156]
|
||||
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
systemd-units/plymouth-start.service.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in
|
||||
index 830a62d..c20aabe 100644
|
||||
--- a/systemd-units/plymouth-start.service.in
|
||||
+++ b/systemd-units/plymouth-start.service.in
|
||||
@@ -9,7 +9,7 @@ ConditionVirtualization=!container
|
||||
IgnoreOnIsolate=true
|
||||
|
||||
[Service]
|
||||
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
|
||||
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --kernel-command-line="splash plymouth.ignore-serial-consoles" --pid-file=@plymouthruntimedir@/pid --attach-to-session
|
||||
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
|
||||
Type=forking
|
||||
RemainAfterExit=yes
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From 9d0f8b2e7bc2d1d2b0900fcdf119bb9a2cc4f474 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Tue, 25 Aug 2020 10:49:11 -0400
|
||||
Subject: [PATCH] systemd: switch to KillMode=mixed
|
||||
|
||||
KillMode=none is deprecated, so we need to stop using it.
|
||||
|
||||
For now, use `KillMode=mixed` and `IgnoreOnIsolate=true` instead.
|
||||
|
||||
In the future, we should change plymouth to be able to exit and
|
||||
start again without restarting the active animation, but that's
|
||||
going to require some effort.
|
||||
|
||||
https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/123
|
||||
|
||||
Upstream-Status: Backport [https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/9d0f8b2e7bc2d1d2b0900fcdf119bb9a2cc4f474]
|
||||
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
systemd-units/plymouth-start.service.in | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in
|
||||
index 3d00cc6..830a62d 100644
|
||||
--- a/systemd-units/plymouth-start.service.in
|
||||
+++ b/systemd-units/plymouth-start.service.in
|
||||
@@ -6,11 +6,12 @@ After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.
|
||||
Before=systemd-ask-password-plymouth.service
|
||||
ConditionKernelCommandLine=!plymouth.enable=0
|
||||
ConditionVirtualization=!container
|
||||
+IgnoreOnIsolate=true
|
||||
|
||||
[Service]
|
||||
ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
|
||||
ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
|
||||
Type=forking
|
||||
RemainAfterExit=yes
|
||||
-KillMode=none
|
||||
+KillMode=mixed
|
||||
SendSIGKILL=no
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Reference in New Issue
Block a user