[gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth-openrc-plugin/, sys-boot/plymouth-openrc-plugin/files/

2020-06-06 Thread Joonas Niilola
commit: 4305d0c4b65e28f034bc33f06e1af0e3aa4c0b36
Author: Matt Jolly  footclan  ninja>
AuthorDate: Mon Jun  1 10:04:45 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jun  6 13:54:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4305d0c4

sys-boot/plymouth-openrc-plugin: remove old (v0.1.2)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Joonas Niilola  gentoo.org>

 sys-boot/plymouth-openrc-plugin/Manifest   |  1 -
 ...outh-openrc-plugin-0.1.2-exit-at-mount-ro.patch | 25 
 .../plymouth-openrc-plugin-0.1.2-r1.ebuild | 34 --
 3 files changed, 60 deletions(-)

diff --git a/sys-boot/plymouth-openrc-plugin/Manifest 
b/sys-boot/plymouth-openrc-plugin/Manifest
index 3518abdde47..87affa10eb0 100644
--- a/sys-boot/plymouth-openrc-plugin/Manifest
+++ b/sys-boot/plymouth-openrc-plugin/Manifest
@@ -1,2 +1 @@
-DIST plymouth-openrc-plugin-0.1.2.tar.bz2 8909 BLAKE2B 
0ddebeb0d957cea672eca2faa4c4f12d348e38bf5e5d2947585bdc12c0f9188920a2359a88b2ada5c7872400c12fb224aca24e78ec2ac6bc7fba9bcdd2a0c5bc
 SHA512 
a6c578dcdcc770cf55cf150fbf67e99ef4fac08db17fd8a84ec5f76f96172aa4cb071a0ee695a6d6fe6883e5117c95b096ba5ce8260d71bea33a26909719457d
 DIST v0.1.3.tar.gz 9404 BLAKE2B 
809cfab881ef47565badfc330b77ae07a8bbbddf822cbdb50f2d1d2a0c95f915ac5024e02400ab2ea9d8f98dc466a8a3cbad92805587f77a00e58c9f9d78d388
 SHA512 
b07a4d9d56c8f49d5b0a91799fe0100eac705cd2a266674539948fdc661876474a93d8ed5f329f097a1fc5dc571f3b3c00322191fb77d2a7e32b1ff192ca0a6b

diff --git 
a/sys-boot/plymouth-openrc-plugin/files/plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch
 
b/sys-boot/plymouth-openrc-plugin/files/plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch
deleted file mode 100644
index 7dc5feb2fc1..000
--- 
a/sys-boot/plymouth-openrc-plugin/files/plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9d3485d73244eea61205c4c84b2c37d489d5bbcb Mon Sep 17 00:00:00 2001
-From: tlhonmey 
-Date: Wed, 31 Jan 2018 11:10:48 -0800
-Subject: [PATCH] Exit plymouth when we hit mount-ro rather than localmount.
-
-Newer versions of openrc appear to run localmount almost immediately upon 
shutdown, causing the plugin to send Plymouth the quit command before the 
splash is even displayed, resulting in no splash on shutdown.
-
-The job that cuts us off from writing to /var is now mount-ro, which runs near 
the end like it should and gives Plymouth time to show the splash.

- plymouth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plymouth.c b/plymouth.c
-index e657e82..e9c925b 100644
 a/plymouth.c
-+++ b/plymouth.c
-@@ -240,7 +240,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
- 
- case RC_HOOK_SERVICE_STOP_IN:
- /* Quit Plymouth when we're going to lost write access to /var/... */
--if(strcmp(name, "localmount") == 0 &&
-+if(strcmp(name, "mount-ro") == 0 &&
- strcmp(runlevel, RC_LEVEL_SHUTDOWN) == 0) {
- DBG("ply_quit(PLY_MODE_SHUTDOWN)");
- if(!ply_quit(PLY_MODE_SHUTDOWN))

diff --git 
a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild 
b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild
deleted file mode 100644
index a073ee75df0..000
--- a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Plymouth plugin for OpenRC"
-HOMEPAGE="https://github.com/aidecoe/plymouth-openrc-plugin;
-SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/openrc:="
-RDEPEND="${DEPEND}
-   sys-boot/plymouth"
-
-PATCHES=( "${FILESDIR}/${P}-exit-at-mount-ro.patch" )
-
-src_install() {
-   insinto /$(get_libdir)/rc/plugins
-   doins plymouth.so
-}
-
-pkg_postinst() {
-   ewarn "You need to disable 'rc_interactive' feature in /etc/rc.conf to 
make"
-   ewarn "Plymouth work properly with OpenRC init system."
-
-   if has_version sys-apps/systemd; then
-   eerror "sys-apps/systemd is installed, please uninstall this 
package if you"
-   eerror "are booting with systemd"
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth-openrc-plugin/, sys-boot/plymouth-openrc-plugin/files/

2018-11-12 Thread Georgy Yakovlev
commit: 381c8330770d424a37f1f8800e5d0075c578e612
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Nov 12 19:59:48 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Nov 12 21:07:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381c8330

sys-boot/plymouth-openrc-plugin: EAPI revbump, fixes

Add patch fixing early exit which prevented showing splash on reboot.
EAPI 4->7
Fix license, it clearly says GPL-2 or later.
Touch up ebuild.

While this package is no longer developed it still works fine, and
especially useful at fixing weird plymouth behaviour on boot under
openrc.

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev  gentoo.org>

 ...outh-openrc-plugin-0.1.2-exit-at-mount-ro.patch | 25 
 .../plymouth-openrc-plugin-0.1.2-r1.ebuild | 34 ++
 2 files changed, 59 insertions(+)

diff --git 
a/sys-boot/plymouth-openrc-plugin/files/plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch
 
b/sys-boot/plymouth-openrc-plugin/files/plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch
new file mode 100644
index 000..7dc5feb2fc1
--- /dev/null
+++ 
b/sys-boot/plymouth-openrc-plugin/files/plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch
@@ -0,0 +1,25 @@
+From 9d3485d73244eea61205c4c84b2c37d489d5bbcb Mon Sep 17 00:00:00 2001
+From: tlhonmey 
+Date: Wed, 31 Jan 2018 11:10:48 -0800
+Subject: [PATCH] Exit plymouth when we hit mount-ro rather than localmount.
+
+Newer versions of openrc appear to run localmount almost immediately upon 
shutdown, causing the plugin to send Plymouth the quit command before the 
splash is even displayed, resulting in no splash on shutdown.
+
+The job that cuts us off from writing to /var is now mount-ro, which runs near 
the end like it should and gives Plymouth time to show the splash.
+---
+ plymouth.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plymouth.c b/plymouth.c
+index e657e82..e9c925b 100644
+--- a/plymouth.c
 b/plymouth.c
+@@ -240,7 +240,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
+ 
+ case RC_HOOK_SERVICE_STOP_IN:
+ /* Quit Plymouth when we're going to lost write access to /var/... */
+-if(strcmp(name, "localmount") == 0 &&
++if(strcmp(name, "mount-ro") == 0 &&
+ strcmp(runlevel, RC_LEVEL_SHUTDOWN) == 0) {
+ DBG("ply_quit(PLY_MODE_SHUTDOWN)");
+ if(!ply_quit(PLY_MODE_SHUTDOWN))

diff --git 
a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild 
b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild
new file mode 100644
index 000..a073ee75df0
--- /dev/null
+++ b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Plymouth plugin for OpenRC"
+HOMEPAGE="https://github.com/aidecoe/plymouth-openrc-plugin;
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-apps/openrc:="
+RDEPEND="${DEPEND}
+   sys-boot/plymouth"
+
+PATCHES=( "${FILESDIR}/${P}-exit-at-mount-ro.patch" )
+
+src_install() {
+   insinto /$(get_libdir)/rc/plugins
+   doins plymouth.so
+}
+
+pkg_postinst() {
+   ewarn "You need to disable 'rc_interactive' feature in /etc/rc.conf to 
make"
+   ewarn "Plymouth work properly with OpenRC init system."
+
+   if has_version sys-apps/systemd; then
+   eerror "sys-apps/systemd is installed, please uninstall this 
package if you"
+   eerror "are booting with systemd"
+   fi
+}