From 5acda3eaeabae9045609539303a8c12c4ce401f1 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 25 Apr 2016 12:01:08 +0200 Subject: merge with latest dev version --- .../data/etc/systemd/system/plymouth-quit.service | 9 +++++++++ .../plymouth/data/etc/tmpfiles.d/plymouth.conf | 2 ++ core/modules/plymouth/module.build | 20 ++++++++++++++++++++ core/modules/plymouth/module.conf | 15 +++++++++++++++ core/modules/plymouth/module.conf.debian | 7 +++++++ core/modules/plymouth/module.conf.opensuse | 7 +++++++ core/modules/plymouth/module.conf.ubuntu | 7 +++++++ 7 files changed, 67 insertions(+) create mode 100644 core/modules/plymouth/data/etc/systemd/system/plymouth-quit.service create mode 100644 core/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf create mode 100644 core/modules/plymouth/module.build create mode 100644 core/modules/plymouth/module.conf create mode 100644 core/modules/plymouth/module.conf.debian create mode 100644 core/modules/plymouth/module.conf.opensuse create mode 100644 core/modules/plymouth/module.conf.ubuntu (limited to 'core/modules/plymouth') diff --git a/core/modules/plymouth/data/etc/systemd/system/plymouth-quit.service b/core/modules/plymouth/data/etc/systemd/system/plymouth-quit.service new file mode 100644 index 00000000..0ed4fa49 --- /dev/null +++ b/core/modules/plymouth/data/etc/systemd/system/plymouth-quit.service @@ -0,0 +1,9 @@ +[Unit] +Description=Terminate Plymouth Boot Screen +Before=display-manager.service +After=systemd-user-sessions.service + +[Service] +ExecStart=-/bin/plymouth quit +Type=oneshot +TimeoutSec=20 diff --git a/core/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf b/core/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf new file mode 100644 index 00000000..9dfffcbe --- /dev/null +++ b/core/modules/plymouth/data/etc/tmpfiles.d/plymouth.conf @@ -0,0 +1,2 @@ +d /var/run/plymouth 0755 root root + diff --git a/core/modules/plymouth/module.build b/core/modules/plymouth/module.build new file mode 100644 index 00000000..67b7734e --- /dev/null +++ b/core/modules/plymouth/module.build @@ -0,0 +1,20 @@ +#!/bin/bash + +fetch_source() { + download_untar "$REQUIRED_URL" "src/" +} + +build() { + cd "src/$REQUIRED_VERSION" + pinfo "Running configure" + ./configure --enable-systemd-integration --disable-gtk --disable-static --prefix="$REQUIRED_PREFIX"|| perror "failed." + pinfo "Running make" + make || perror "failed" + pinfo "Running make install" + DESTDIR="${MODULE_BUILD_DIR}" make install || perror "failed" + cd - +} + +post_copy() { + : +} diff --git a/core/modules/plymouth/module.conf b/core/modules/plymouth/module.conf new file mode 100644 index 00000000..d8827529 --- /dev/null +++ b/core/modules/plymouth/module.conf @@ -0,0 +1,15 @@ +REQUIRED_VERSION="plymouth-0.8.6.1" +REQUIRED_URL="http://www.freedesktop.org/software/plymouth/releases/${REQUIRED_VERSION}.tar.bz2" +REQUIRED_PREFIX="/usr" +REQUIRED_BINARIES=" + plymouth + plymouthd +" +REQUIRED_DIRECTORIES=" + $REQUIRED_PREFIX/bin + $REQUIRED_PREFIX/etc + $REQUIRED_PREFIX/lib + $REQUIRED_PREFIX/sbin + $REQUIRED_PREFIX/var/lib + $REQUIRED_PREFIX/var/spool +" diff --git a/core/modules/plymouth/module.conf.debian b/core/modules/plymouth/module.conf.debian new file mode 100644 index 00000000..0c6e00a4 --- /dev/null +++ b/core/modules/plymouth/module.conf.debian @@ -0,0 +1,7 @@ +REQUIRED_INSTALLED_PACKAGES=" + libpng-dev + libpango1.0-dev + libcairo-dev + libgtk2.0-dev + libdrm-dev +" diff --git a/core/modules/plymouth/module.conf.opensuse b/core/modules/plymouth/module.conf.opensuse new file mode 100644 index 00000000..034af2ad --- /dev/null +++ b/core/modules/plymouth/module.conf.opensuse @@ -0,0 +1,7 @@ +REQUIRED_INSTALLED_PACKAGES=" + libpng12-devel + pango-devel + cairo-devel + gtk2-devel + libdrm-devel +" diff --git a/core/modules/plymouth/module.conf.ubuntu b/core/modules/plymouth/module.conf.ubuntu new file mode 100644 index 00000000..0c6e00a4 --- /dev/null +++ b/core/modules/plymouth/module.conf.ubuntu @@ -0,0 +1,7 @@ +REQUIRED_INSTALLED_PACKAGES=" + libpng-dev + libpango1.0-dev + libcairo-dev + libgtk2.0-dev + libdrm-dev +" -- cgit v1.2.3-55-g7522