From d5cb134735305134af8410f00768adf4b5254c91 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 5 Dec 2014 21:57:06 +0000 Subject: plymouth: update to 0.9.0 --- abs/core/plymouth/PKGBUILD | 120 +++++++++--------- abs/core/plymouth/gdm-plymouth.service | 14 ++- abs/core/plymouth/kdm-plymouth.service | 8 +- abs/core/plymouth/lightdm-plymouth.service | 15 ++- abs/core/plymouth/lxdm-plymouth.service | 11 +- abs/core/plymouth/plymouth-quit.service.in.patch | 14 +++ .../plymouth/plymouth-set-default-theme.in.patch | 5 +- abs/core/plymouth/plymouth-start.service | 16 +++ abs/core/plymouth/plymouth-update-initrd.patch | 11 +- abs/core/plymouth/plymouth.encrypt_hook | 134 +++++++++++++++++++++ abs/core/plymouth/plymouth.encrypt_install | 49 ++++++++ abs/core/plymouth/plymouth.initcpio_hook | 29 +++-- abs/core/plymouth/plymouth.initcpio_install | 10 +- abs/core/plymouth/slim-plymouth.service | 6 +- abs/core/plymouth/system-release | 1 - 15 files changed, 327 insertions(+), 116 deletions(-) create mode 100644 abs/core/plymouth/plymouth-quit.service.in.patch create mode 100644 abs/core/plymouth/plymouth-start.service create mode 100644 abs/core/plymouth/plymouth.encrypt_hook create mode 100644 abs/core/plymouth/plymouth.encrypt_install delete mode 100644 abs/core/plymouth/system-release diff --git a/abs/core/plymouth/PKGBUILD b/abs/core/plymouth/PKGBUILD index 6126d4f..2563333 100644 --- a/abs/core/plymouth/PKGBUILD +++ b/abs/core/plymouth/PKGBUILD @@ -1,74 +1,84 @@ +# +# Maintainer: Damian01w +# Maintainer: Padfoot +# + pkgname=plymouth -pkgver=0.8.8.52.g37d2e40 -pkgrel=4 -pkgdesc="A graphical boot splash screen with kernel mode-setting support (Git version)" -url="http://cgit.freedesktop.org/cgit/plymouth/" +pkgver=0.9.0 +pkgrel=5 +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' 'v86d') -makedepends=('git' 'docbook-xsl') +makedepends=('docbook-xsl') optdepends=('ttf-dejavu') + options=('!libtool' '!emptydirs') -install=$pkgname.install -groups=('base') + provides=('plymouth') -conflicts=('plymouth') +conflicts=('plymouth-git') backup=('etc/plymouth/plymouthd.conf') -source=('git://anongit.freedesktop.org/plymouth' +source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz2" 'arch-logo.png' - 'encrypt_hook' - 'encrypt_install' + 'plymouth.encrypt_hook' + 'plymouth.encrypt_install' 'gdm-plymouth.service' 'kdm-plymouth.service' - 'kdm-unpatched-plymouth.service' 'lxdm-plymouth.service' 'lightdm-plymouth.service' 'slim-plymouth.service' - 'plymouth.functions' - "$pkgname.install" 'plymouth.initcpio_hook' 'plymouth.initcpio_install' - 'plymouth-quit.service' + 'plymouth-start.service' + 'plymouth-quit.service.in.patch' 'plymouth-set-default-theme.in.patch' - 'plymouth-update-initrd.patch' - 'plymouthd.conf' - 'system-release') + 'plymouth-update-initrd.patch') -pkgver() { - cd "$srcdir"/${pkgname%%-*} - git describe --always | sed 's/-/./g' -} +md5sums=('147150705417f025d036304e97e33c9c' + '65fa2763d5c9bb9f80973ea5e6e3db3e' + 'fbdd5d04e3089a214b9056357434df86' + '65eb269910f1b81e3f0970af456394ca' + 'e336aa51a5b781026ce541c046ee9131' + 'dcacff05835053242f52b9e375248ec3' + '22130f7e6b20d2a43dbed924de75180b' + '870ea3e63c6989e2badf79d1fbafa914' + 'fb2eb948e2198cfb54cc2b710a05ee61' + '32f04fdbd1eb94ade30d1e63fdcdd9b5' + 'a6dca3d57fd38b875d0520ec033dbf66' + '78340207f7391c682601b1b36baed14d' + '165a39dbedcc6e123c8ca05d5b4b2e25' + 'f79edbbb30c71b0dbcd102c7dd31660b' + '0357775c16b5f90f1af485e6a4c80a9e') prepare() { - cd "$srcdir"/${pkgname%%-*} - - patch -Np0 -i ../plymouth-set-default-theme.in.patch - patch -Np0 -i ../plymouth-update-initrd.patch + cd "$srcdir"/${pkgname}-${pkgver} - sed -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \ - -i src/libply-splash-graphics/ply-image.c - - test -f Makefile && make distclean - - return 0 + 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%%-*} - - ./autogen.sh --prefix=/usr \ + 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-drm-renderer \ + --enable-drm \ --enable-tracing \ --enable-pango \ - --with-gdm-autostart-file=yes \ + --enable-gtk=no \ + --with-release-file=/etc/os-release \ --with-logo=/usr/share/plymouth/arch-logo.png \ + --with-background-color=0x000000 \ --with-background-start-color-stop=0x000000 \ --with-background-end-color-stop=0x4D4D4D \ --without-rhgb-compat-link \ @@ -78,41 +88,21 @@ build() { } package() { - cd "$srcdir"/${pkgname%%-*} + cd "$srcdir"/${pkgname}-${pkgver} make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/arch-logo.png" "$pkgdir/usr/share/plymouth/arch-logo.png" - install -Dm644 "$srcdir/encrypt_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt" - install -Dm644 "$srcdir/encrypt_install" "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt" - install -Dm644 "$srcdir/plymouth.functions" "$pkgdir/etc/rc.d/functions.d/plymouth.functions" + 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" - install -Dm644 "$srcdir/plymouthd.conf" "$pkgdir/etc/plymouth/plymouthd.conf" - install -Dm644 "$srcdir/system-release" "$pkgdir/etc/system-release" - # Plymouth<->systemd integration, including units for DMs - for i in {{gdm,kdm{,-unpatched},lxdm,slim,lightdm}-plymouth,plymouth-quit}.service; do + for i in {gdm,kdm,lxdm,slim,lightdm}-plymouth.service; do install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i" done - + + install -Dm644 "$srcdir/plymouth-start.service" "$pkgdir/usr/lib/systemd/system/plymouth-start.service" + cp "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf" } -md5sums=('SKIP' - '65fa2763d5c9bb9f80973ea5e6e3db3e' - '79613b70a0a0be4c33978ef37c30f00a' - '65eb269910f1b81e3f0970af456394ca' - '34d0ed7bbcb3d0ea498de24bc17b2ee9' - '75ec0ac73eb9a1e3f6104df64520d431' - 'ceec65ce58accdb270f3eaa23d794b4a' - '62c3b4e894330a2ca4c2b8fbcaba083c' - 'e6d573b1913f3aa020cbde3863ee80f0' - '225b953976e1c824f62ba406a63c18c7' - 'f0110fba1e77cd22c32d1727399d0b8a' - '95e987cfbc2d30a2cea215394eb9ac20' - '4f3be343eea9956bbc94d615d5f41def' - '7f21ba9a85733ff945c23012cff55a89' - '3bb0b8008edfad9e23703674341766a0' - '42fddd683720dbacbe6e30b4b7892f3c' - '412a1a89ca960370071746b0af8c0ac5' - '37479b134827dc307b3c55bfb2711e99' - 'ab8a557d10f74bec5c94ed6cae34729c') + diff --git a/abs/core/plymouth/gdm-plymouth.service b/abs/core/plymouth/gdm-plymouth.service index d58c0e9..d44d9f3 100644 --- a/abs/core/plymouth/gdm-plymouth.service +++ b/abs/core/plymouth/gdm-plymouth.service @@ -1,13 +1,15 @@ [Unit] Description=GNOME Display Manager -After=systemd-user-sessions.service - -Conflicts=plymouth-quit.service -After=plymouth-quit.service +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service [Service] -ExecStart=/usr/sbin/gdm -nodaemon +ExecStart=/usr/bin/gdm +Restart=always +IgnoreSIGPIPE=no +BusName=org.gnome.DisplayManager StandardOutput=syslog +StandardError=inherit [Install] -Alias=display-manager.service +Alias=display-manager.service \ No newline at end of file diff --git a/abs/core/plymouth/kdm-plymouth.service b/abs/core/plymouth/kdm-plymouth.service index a9e9142..5292ba6 100644 --- a/abs/core/plymouth/kdm-plymouth.service +++ b/abs/core/plymouth/kdm-plymouth.service @@ -1,12 +1,12 @@ [Unit] Description=K Display Manager -After=systemd-user-sessions.service - -Conflicts=plymouth-quit.service -After=plymouth-quit.service +Conflicts=getty@tty1.service plymouth-quit.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service [Service] ExecStart=/usr/bin/kdm -nodaemon +Restart=always +IgnoreSIGPIPE=no StandardOutput=syslog [Install] diff --git a/abs/core/plymouth/lightdm-plymouth.service b/abs/core/plymouth/lightdm-plymouth.service index 47ec47e..a845498 100644 --- a/abs/core/plymouth/lightdm-plymouth.service +++ b/abs/core/plymouth/lightdm-plymouth.service @@ -1,14 +1,13 @@ [Unit] -Description=LightDM Display Manager -After=systemd-user-sessions.service - -Conflicts=plymouth-quit.service -After=plymouth-quit.service +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/sbin/lightdm -StandardOutput=syslog +ExecStart=/usr/bin/lightdm +Restart=always +IgnoreSIGPIPE=no +BusName=org.freedesktop.DisplayManager [Install] -WantedBy=graphical.target Alias=display-manager.service diff --git a/abs/core/plymouth/lxdm-plymouth.service b/abs/core/plymouth/lxdm-plymouth.service index dc6b000..bf4a0a8 100644 --- a/abs/core/plymouth/lxdm-plymouth.service +++ b/abs/core/plymouth/lxdm-plymouth.service @@ -1,13 +1,12 @@ [Unit] Description=LXDE Display Manager -After=systemd-user-sessions.service - -Conflicts=plymouth-quit.service -After=plymouth-quit.service +Conflicts=getty@tty1.service plymouth-quit.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service [Service] -ExecStart=/usr/sbin/lxdm >/dev/null 2>&1 /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() { - msg -n ":: Loading plymouth..." - - /bin/mknod /dev/fb c 29 0 &>/dev/null - #/bin/mount devpts /dev/pts -t devpts - - # plymouth deamon - #/bin/mkdir -p /run/plymouth - /usr/sbin/plymouthd --mode=boot --pid-file=/run/plymouth.pid - - # plymouth frontend /usr/bin/plymouth --show-splash - msg "done." +} + +run_latehook(){ + /usr/bin/plymouth update-root-fs --new-root-dir=/new_root } # vim: set ft=sh: diff --git a/abs/core/plymouth/plymouth.initcpio_install b/abs/core/plymouth/plymouth.initcpio_install index 22cc298..40838ac 100644 --- a/abs/core/plymouth/plymouth.initcpio_install +++ b/abs/core/plymouth/plymouth.initcpio_install @@ -1,6 +1,7 @@ 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" @@ -16,11 +17,10 @@ build() { add_file ${DATADIR}/plymouth/themes/details/details.plymouth add_binary ${PLYMOUTH_PLUGIN_PATH}/details.so - add_file "${PLYMOUTH_LOGO_FILE}" - add_file /etc/system-release /etc/system-release + add_file /etc/os-release add_file /etc/plymouth/plymouthd.conf - add_file ${DATADIR}/plymouth/plymouthd.defaults + 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 @@ -30,7 +30,6 @@ build() { add_binary ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so - #add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/x11.so add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then @@ -39,6 +38,9 @@ build() { 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) diff --git a/abs/core/plymouth/slim-plymouth.service b/abs/core/plymouth/slim-plymouth.service index 8806c7d..df3a107 100644 --- a/abs/core/plymouth/slim-plymouth.service +++ b/abs/core/plymouth/slim-plymouth.service @@ -1,9 +1,7 @@ [Unit] Description=SLiM Simple Login Manager -After=systemd-user-sessions.service - -Conflicts=plymouth-quit.service -After=plymouth-quit.service +Conflicts=getty@tty1.service plymouth-quit.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service [Service] ExecStart=/usr/bin/slim -nodaemon diff --git a/abs/core/plymouth/system-release b/abs/core/plymouth/system-release deleted file mode 100644 index 850183e..0000000 --- a/abs/core/plymouth/system-release +++ /dev/null @@ -1 +0,0 @@ -Arch Linux -- cgit v0.12