From 3defeb00b3a0b379b87cb3674bc6065c17f36687 Mon Sep 17 00:00:00 2001 From: David P Date: Wed, 22 Mar 2017 09:45:03 -0300 Subject: Removed plymouth --- pcr/plymouth/PKGBUILD | 110 ------------------- pcr/plymouth/gdm-plymouth.service | 16 --- pcr/plymouth/lightdm-plymouth.service | 13 --- pcr/plymouth/lightdm.service | 15 --- pcr/plymouth/lxdm-plymouth.service | 13 --- pcr/plymouth/plymouth-deactivate.service | 9 -- pcr/plymouth/plymouth-quit.service.in.patch | 14 --- pcr/plymouth/plymouth-set-default-theme.in.patch | 15 --- pcr/plymouth/plymouth-start.path | 10 -- pcr/plymouth/plymouth-start.service | 16 --- pcr/plymouth/plymouth-update-initrd.patch | 9 -- pcr/plymouth/plymouth.encrypt_hook | 134 ----------------------- pcr/plymouth/plymouth.encrypt_install | 49 --------- pcr/plymouth/plymouth.initcpio_hook | 23 ---- pcr/plymouth/plymouth.initcpio_install | 60 ---------- pcr/plymouth/sddm-plymouth.service | 13 --- pcr/plymouth/slim-plymouth.service | 14 --- 17 files changed, 533 deletions(-) delete mode 100644 pcr/plymouth/PKGBUILD delete mode 100644 pcr/plymouth/gdm-plymouth.service delete mode 100644 pcr/plymouth/lightdm-plymouth.service delete mode 100644 pcr/plymouth/lightdm.service delete mode 100644 pcr/plymouth/lxdm-plymouth.service delete mode 100644 pcr/plymouth/plymouth-deactivate.service delete mode 100644 pcr/plymouth/plymouth-quit.service.in.patch delete mode 100644 pcr/plymouth/plymouth-set-default-theme.in.patch delete mode 100644 pcr/plymouth/plymouth-start.path delete mode 100644 pcr/plymouth/plymouth-start.service delete mode 100644 pcr/plymouth/plymouth-update-initrd.patch delete mode 100644 pcr/plymouth/plymouth.encrypt_hook delete mode 100644 pcr/plymouth/plymouth.encrypt_install delete mode 100644 pcr/plymouth/plymouth.initcpio_hook delete mode 100644 pcr/plymouth/plymouth.initcpio_install delete mode 100644 pcr/plymouth/sddm-plymouth.service delete mode 100644 pcr/plymouth/slim-plymouth.service (limited to 'pcr/plymouth') diff --git a/pcr/plymouth/PKGBUILD b/pcr/plymouth/PKGBUILD deleted file mode 100644 index 84c2baf06..000000000 --- a/pcr/plymouth/PKGBUILD +++ /dev/null @@ -1,110 +0,0 @@ -# Maintainer: David P. -# Contributor: Sebastian Lau -# Contributor Damian01w -# Contributor: Padfoot - -pkgname=plymouth -pkgver=0.9.2 -pkgrel=12 -pkgdesc="A graphical boot splash screen with kernel mode-setting support" -url="http://www.freedesktop.org/wiki/Software/Plymouth/" - -arch=('i686' 'x86_64') -license=('GPL') - -depends=('libdrm' 'pango' 'systemd') -makedepends=('docbook-xsl') -optdepends=('ttf-dejavu') - -options=('!libtool' '!emptydirs') - -provides=('plymouth') -conflicts=('plymouth-git') -backup=('etc/plymouth/plymouthd.conf') - -source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz2" - 'plymouth.encrypt_hook' - 'plymouth.encrypt_install' - 'gdm-plymouth.service' - 'lxdm-plymouth.service' - 'lightdm-plymouth.service' - 'slim-plymouth.service' - 'sddm-plymouth.service' - 'plymouth-deactivate.service' - 'plymouth-start.service' - 'plymouth-start.path' - 'plymouth.initcpio_hook' - 'plymouth.initcpio_install' - 'plymouth-quit.service.in.patch' - 'plymouth-set-default-theme.in.patch' - 'plymouth-update-initrd.patch') - -md5sums=('ff420994deb7ea203df678df92e7ab7d' - 'fbdd5d04e3089a214b9056357434df86' - '65eb269910f1b81e3f0970af456394ca' - 'ae6e97bb1104bb12cbca6738e3fb872d' - '1430ae2ec501d600f8f6771454dc9bbe' - '870ea3e63c6989e2badf79d1fbafa914' - 'a3cfc30df846b2d7057a29e7fbe8733a' - 'f803c315739f46128b99232d64c268ca' - '006847d16b852c7a50ee2f241fd9647e' - '78340207f7391c682601b1b36baed14d' - '672ad913e2383483bcb4599a0a6bee48' - '32f04fdbd1eb94ade30d1e63fdcdd9b5' - 'a6dca3d57fd38b875d0520ec033dbf66' - '165a39dbedcc6e123c8ca05d5b4b2e25' - 'f79edbbb30c71b0dbcd102c7dd31660b' - '0357775c16b5f90f1af485e6a4c80a9e') - -prepare() { - cd "$srcdir"/${pkgname}-${pkgver} - patch -p1 -i $srcdir/plymouth-set-default-theme.in.patch - patch -p1 -i $srcdir/plymouth-update-initrd.patch - patch -p1 -i $srcdir/plymouth-quit.service.in.patch -} - -build() { - cd "$srcdir"/${pkgname}-${pkgver} - - LDFLAGS="$LDFLAGS -ludev" ./configure --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --sbindir=/usr/bin \ - --enable-systemd-integration \ - --enable-drm \ - --enable-tracing \ - --enable-pango \ - --enable-gtk=no \ - --with-release-file=/etc/os-release \ - --with-background-color=0x000000 \ - --with-background-start-color-stop=0x000000 \ - --with-background-end-color-stop=0x4D4D4D \ - --without-rhgb-compat-link \ - --without-system-root-install - - make -} - -package() { - cd "$srcdir"/${pkgname}-${pkgver} - - make DESTDIR="$pkgdir" install - - - install -Dm644 "$srcdir/plymouth.encrypt_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt" - install -Dm644 "$srcdir/plymouth.encrypt_install" "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt" - install -Dm644 "$srcdir/plymouth.initcpio_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth" - install -Dm644 "$srcdir/plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/plymouth" - - for i in {gdm,sddm,lxdm,slim,lightdm}-plymouth.service; do - install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i" - done - - install -Dm644 "$srcdir/plymouth-deactivate.service" "$pkgdir/usr/lib/systemd/system/plymouth-deactivate.service" - install -Dm644 "$srcdir/plymouth-start.service" "$pkgdir/usr/lib/systemd/system/plymouth-start.service" - install -Dm644 "$srcdir/plymouth-start.path" "$pkgdir/usr/lib/systemd/system/plymouth-start.path" - install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf" -} diff --git a/pcr/plymouth/gdm-plymouth.service b/pcr/plymouth/gdm-plymouth.service deleted file mode 100644 index e1bd77b4d..000000000 --- a/pcr/plymouth/gdm-plymouth.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=GNOME Display Manager -Conflicts=getty@tty1.service plymouth-quit.service -Wants=plymouth-deactivate.service -After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service - -[Service] -ExecStart=/usr/bin/gdm -Restart=always -IgnoreSIGPIPE=no -BusName=org.gnome.DisplayManager -StandardOutput=syslog -StandardError=inherit - -[Install] -Alias=display-manager.service diff --git a/pcr/plymouth/lightdm-plymouth.service b/pcr/plymouth/lightdm-plymouth.service deleted file mode 100644 index a845498fd..000000000 --- a/pcr/plymouth/lightdm-plymouth.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Light Display Manager -Conflicts=getty@tty1.service plymouth-quit.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service - -[Service] -ExecStart=/usr/bin/lightdm -Restart=always -IgnoreSIGPIPE=no -BusName=org.freedesktop.DisplayManager - -[Install] -Alias=display-manager.service diff --git a/pcr/plymouth/lightdm.service b/pcr/plymouth/lightdm.service deleted file mode 100644 index b2fcd8292..000000000 --- a/pcr/plymouth/lightdm.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Light Display Manager -Documentation=man:lightdm(1) -Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service - -[Service] -ExecStart=/usr/bin/lightdm -Restart=always -IgnoreSIGPIPE=no -BusName=org.freedesktop.DisplayManager - -[Install] -Alias=display-manager.service - diff --git a/pcr/plymouth/lxdm-plymouth.service b/pcr/plymouth/lxdm-plymouth.service deleted file mode 100644 index 33e0ea741..000000000 --- a/pcr/plymouth/lxdm-plymouth.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=LXDE Display Manager -Conflicts=getty@tty1.service plymouth-quit.service -Wants=plymouth-deactivate.service -After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service - -[Service] -ExecStart=/usr/sbin/lxdm -Restart=always -IgnoreSIGPIPE=no - -[Install] -Alias=display-manager.service diff --git a/pcr/plymouth/plymouth-deactivate.service b/pcr/plymouth/plymouth-deactivate.service deleted file mode 100644 index 2c6f34954..000000000 --- a/pcr/plymouth/plymouth-deactivate.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Deactivate Plymouth Boot Screen -After=rc-local.service plymouth-start.service systemd-user-sessions.service -Before=getty@tty1.service - -[Service] -ExecStart=/usr/bin/plymouth deactivate -Type=oneshot -TimeoutSec=20 diff --git a/pcr/plymouth/plymouth-quit.service.in.patch b/pcr/plymouth/plymouth-quit.service.in.patch deleted file mode 100644 index ec3435cea..000000000 --- a/pcr/plymouth/plymouth-quit.service.in.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -aur plymouth-0.8.8.src/systemd-units/plymouth-quit.service.in plymouth-0.8.8.patch/systemd-units/plymouth-quit.service.in ---- plymouth-0.8.8.src/systemd-units/plymouth-quit.service.in 2012-09-27 02:50:53.000000000 +1000 -+++ plymouth-0.8.8.patch/systemd-units/plymouth-quit.service.in 2014-02-11 16:36:58.813194805 +1100 -@@ -1,8 +1,9 @@ - [Unit] - Description=Terminate Plymouth Boot Screen - After=rc-local.service plymouth-start.service systemd-user-sessions.service -+Before=getty@tty1.service - - [Service] --ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit -+ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash - Type=oneshot - TimeoutSec=20 diff --git a/pcr/plymouth/plymouth-set-default-theme.in.patch b/pcr/plymouth/plymouth-set-default-theme.in.patch deleted file mode 100644 index 808a64474..000000000 --- a/pcr/plymouth/plymouth-set-default-theme.in.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -aur plymouth-0.8.8.src/scripts/plymouth-set-default-theme.in plymouth-0.8.8.patch/scripts/plymouth-set-default-theme.in ---- plymouth-0.8.8.src/scripts/plymouth-set-default-theme.in 2012-10-27 02:01:45.000000000 +1100 -+++ plymouth-0.8.8.patch/scripts/plymouth-set-default-theme.in 2014-01-26 09:55:34.337189615 +1100 -@@ -173,7 +173,10 @@ - exit $? - fi - --if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then -+if [ -z ${THEME_NAME} ]; then -+ echo "Please specify a theme name" -+ exit 1 -+elif [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then - echo "${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth does not exist" > /dev/stderr - exit 1 - fi diff --git a/pcr/plymouth/plymouth-start.path b/pcr/plymouth/plymouth-start.path deleted file mode 100644 index 6a8c957a0..000000000 --- a/pcr/plymouth/plymouth-start.path +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Automatically Start Plymouth Boot Screen - -[Path] -PathExistsGlob=/sys/class/graphics/fb*/device/drm/ -Unit=plymouth-start.service - -[Install] -WantedBy=sysinit.target - diff --git a/pcr/plymouth/plymouth-start.service b/pcr/plymouth/plymouth-start.service deleted file mode 100644 index b0f442f05..000000000 --- a/pcr/plymouth/plymouth-start.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Show Plymouth Boot Screen -DefaultDependencies=no -Wants=systemd-ask-password-plymouth.path systemd-vconsole-setup.service -After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service -Before=systemd-ask-password-plymouth.service -ConditionKernelCommandLine=!plymouth.enable=0 - -[Service] -ExecStart=/usr/bin/plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session -ExecStartPost=-/usr/bin/plymouth show-splash -Type=forking -KillMode=none -SendSIGKILL=no -[Install] -WantedBy=sysinit.target diff --git a/pcr/plymouth/plymouth-update-initrd.patch b/pcr/plymouth/plymouth-update-initrd.patch deleted file mode 100644 index 47d88a60d..000000000 --- a/pcr/plymouth/plymouth-update-initrd.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -aur plymouth-0.9.0.src/scripts/plymouth-update-initrd plymouth-0.9.0.patch/scripts/plymouth-update-initrd ---- plymouth-0.9.0.src/scripts/plymouth-update-initrd 2014-01-16 08:14:47.000000000 +1100 -+++ plymouth-0.9.0.patch/scripts/plymouth-update-initrd 2014-05-21 19:04:16.802594001 +1000 -@@ -1,2 +1,4 @@ - #!/bin/bash --dracut -f -+find /etc/mkinitcpio.d/ -name \*.preset -a \! -name example.preset | while read p; do -+ mkinitcpio -p $p -+done diff --git a/pcr/plymouth/plymouth.encrypt_hook b/pcr/plymouth/plymouth.encrypt_hook deleted file mode 100644 index 963cc06e7..000000000 --- a/pcr/plymouth/plymouth.encrypt_hook +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/bash - -run_hook() { - modprobe -a -q dm-crypt >/dev/null 2>&1 - [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" - - # Get keyfile if specified - ckeyfile="/crypto_keyfile.bin" - if [ -n "$cryptkey" ]; then - IFS=: read ckdev ckarg1 ckarg2 </dev/null 2>&1 - umount /ckey - ;; - *) - # Read raw data from the block device - # ckarg1 is numeric: ckarg1=offset, ckarg2=length - dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 - ;; - esac - fi - [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." - fi - - if [ -n "${cryptdevice}" ]; then - DEPRECATED_CRYPT=0 - IFS=: read cryptdev cryptname cryptoptions <&2 - ;; - esac - done - - if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then - if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - dopassphrase=1 - # If keyfile exists, try to use that - if [ -f ${ckeyfile} ]; then - if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then - dopassphrase=0 - else - echo "Invalid keyfile. Reverting to passphrase." - fi - fi - # Ask for a passphrase - if [ ${dopassphrase} -gt 0 ]; then - echo - echo "A password is required to access the ${cryptname} volume:" - plymouth ask-for-password --prompt="Password for ${cryptname} volume" --dont-pause-progress --number-of-tries=5 --command="/sbin/cryptsetup luksOpen --key-file=- ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}" - sleep 2 - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 - fi - elif [ -n "${crypto}" ]; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - msg "Non-LUKS encrypted device found..." - if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then - err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" - err "Non-LUKS decryption not attempted..." - return 1 - fi - exe="cryptsetup create $cryptname $resolved $cryptargs" - IFS=: read c_hash c_cipher c_keysize c_offset c_skip </dev/null 2>&1 - # first trigger graphics and tty subsystem - udevadm trigger --action=add --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty >/dev/null 2>&1 - - udevadm settle --timeout=30 2>&1 - - /usr/bin/mknod /dev/fb c 29 &>/dev/null - /usr/bin/mkdir -p /dev/pts - /usr/bin/mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts || true - /usr/bin/plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session -} - -run_hook() { - /usr/bin/plymouth --show-splash -} - -run_latehook(){ - /usr/bin/plymouth update-root-fs --new-root-dir=/new_root -} - -# vim: set ft=sh: diff --git a/pcr/plymouth/plymouth.initcpio_install b/pcr/plymouth/plymouth.initcpio_install deleted file mode 100644 index 40838ac4f..000000000 --- a/pcr/plymouth/plymouth.initcpio_install +++ /dev/null @@ -1,60 +0,0 @@ -build() { - add_dir /dev/pts - add_dir /usr/share/plymouth/themes - add_dir /var/run/plymouth - - DATADIR="/usr/share" - PLYMOUTH_LOGO_FILE="${DATADIR}/plymouth/arch-logo.png" - PLYMOUTH_THEME_NAME="$(/usr/bin/plymouth-set-default-theme)" - PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')" - PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)" - - add_binary /usr/bin/plymouthd - add_binary /usr/bin/plymouth - - add_file ${DATADIR}/plymouth/themes/text/text.plymouth - add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so - add_file ${DATADIR}/plymouth/themes/details/details.plymouth - add_binary ${PLYMOUTH_PLUGIN_PATH}/details.so - - add_file "${PLYMOUTH_LOGO_FILE}" - add_file /etc/os-release - add_file /etc/plymouth/plymouthd.conf - add_file ${DATADIR}/plymouth/plymouthd.defaults - - if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then - echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr - exit 1 - fi - - add_binary ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so - - add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so - add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so - - if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then - for x in ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do - [ ! -f "$x" ] && break - add_file $x - done - fi - - add_file /usr/lib/udev/rules.d/70-uaccess.rules - add_file /usr/lib/udev/rules.d/71-seat.rules - - # suppress a warning in glib (which the label control uses) - # about uid 0 by building a dummy NSS stack (LP #649917) - add_file /etc/passwd - add_file /etc/nsswitch.conf - add_binary "$(readlink -e /lib/libnss_files.so.2)" - add_file /lib/libnss_files.so.2 - - add_runscript -} - -help() { - echo "This hook includes plymouth in the initramfs image." -} - -# vim: set ft=sh: -#EOF diff --git a/pcr/plymouth/sddm-plymouth.service b/pcr/plymouth/sddm-plymouth.service deleted file mode 100644 index 5c08c3a1b..000000000 --- a/pcr/plymouth/sddm-plymouth.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Simple Desktop Display Manager -Documentation=man:sddm(1) man:sddm.conf(5) -Conflicts=getty@tty1.service -Wants=plymouth-deactivate.service -After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service - -[Service] -ExecStart=/usr/bin/sddm -Restart=always - -[Install] -Alias=display-manager.service diff --git a/pcr/plymouth/slim-plymouth.service b/pcr/plymouth/slim-plymouth.service deleted file mode 100644 index 6ee9a6b4c..000000000 --- a/pcr/plymouth/slim-plymouth.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=SLiM Simple Login Manager -Conflicts=getty@tty1.service plymouth-quit.service -Wants=plymouth-deactivate.service -After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service - -[Service] -ExecStart=/usr/bin/slim -nodaemon -Restart=always -IgnoreSIGPIPE=no -StandardOutput=syslog - -[Install] -Alias=display-manager.service -- cgit v1.2.2