From 986ab5183ca7d410559dc9a2763b4e8dc419f124 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 29 May 2012 15:44:14 +0200 Subject: [PATCH] plymouth: remove initramfs-tools support. --- srcpkgs/plymouth/files/plymouth-update-initrd | 4 - srcpkgs/plymouth/files/plymouth.hook | 101 ------------------ srcpkgs/plymouth/files/plymouth.init-bottom | 17 --- srcpkgs/plymouth/files/plymouth.init-premount | 38 ------- srcpkgs/plymouth/template | 16 +-- 5 files changed, 1 insertion(+), 175 deletions(-) delete mode 100644 srcpkgs/plymouth/files/plymouth-update-initrd delete mode 100644 srcpkgs/plymouth/files/plymouth.hook delete mode 100644 srcpkgs/plymouth/files/plymouth.init-bottom delete mode 100644 srcpkgs/plymouth/files/plymouth.init-premount diff --git a/srcpkgs/plymouth/files/plymouth-update-initrd b/srcpkgs/plymouth/files/plymouth-update-initrd deleted file mode 100644 index 7e7d1c42cf3..00000000000 --- a/srcpkgs/plymouth/files/plymouth-update-initrd +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -set -e -update-initramfs -tu diff --git a/srcpkgs/plymouth/files/plymouth.hook b/srcpkgs/plymouth/files/plymouth.hook deleted file mode 100644 index 29effc08cd8..00000000000 --- a/srcpkgs/plymouth/files/plymouth.hook +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -set -e - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -. /usr/share/initramfs-tools/hook-functions - -THEME="$(/usr/sbin/plymouth-set-default-theme || true)" -THEMES="/usr/share/plymouth/themes" - -if [ -n "${THEME}" ]; then - THEME="${THEMES}/${THEME}/${THEME}.plymouth" -else - exit 0 -fi - -PLUGIN_PATH="$(plymouth --get-splash-plugin-path)" - -case "$(basename ${THEME} .plymouth)" in - text) - PLUGINS="details.so text.so" - ;; - - *) - PLUGINS="details.so text.so label.so" - ;; -esac - -MODULE="${PLUGIN_PATH}/$(sed -n 's/^ModuleName=\(.*\)/\1/p' ${THEME}).so" - -# copy plugin and images for current theme -copy_exec "${MODULE}" -mkdir -p "${DESTDIR}/${THEMES}" -IMAGES="$(sed -n 's/^ImageDir=\(.*\)/\1/p' ${THEME})" -# No images in text mode: -if [ -n "${IMAGES}" ]; then - cp -r "${IMAGES}" "${DESTDIR}/${THEMES}" -fi - -# copy binaries and base plugins -copy_exec /bin/plymouth -copy_exec /sbin/plymouthd - -for PLUGIN in ${PLUGINS}; do - copy_exec ${PLUGIN_PATH}/${PLUGIN} -done - -# copy base themes and logo -cp -a "${THEMES}/details" "${DESTDIR}/${THEMES}" -cp -a "${THEMES}/text" "${DESTDIR}/${THEMES}" -cp /etc/os-release "${DESTDIR}/etc" - -case "$(basename ${THEME} .plymouth)" in - text) - - ;; - - *) - # Void splash image - cp /usr/share/void-artwork/splash.png "${DESTDIR}/usr/share/plymouth" - - # copy files for font rendering - mkdir -p "${DESTDIR}/usr/share/fonts/TTF" - mkdir -p "${DESTDIR}/etc/fonts/conf.d" - mkdir -p "${DESTDIR}/var/cache/fontconfig" - cp -a /usr/share/fonts/TTF/DejaVuSerif.ttf "${DESTDIR}/usr/share/fonts/TTF" - cp -a /usr/share/fonts/TTF/DejaVuSans.ttf "${DESTDIR}/usr/share/fonts/TTF" - cp -a /etc/fonts/fonts.conf "${DESTDIR}/etc/fonts" - cp -rL /etc/fonts/conf.d/60-latin.conf "${DESTDIR}/etc/fonts/conf.d" - if [ -d /usr/lib/pango/1.6.0 ]; then - PANGO_DIR=/usr/lib/pango/1.6.0 - fi - copy_exec ${PANGO_DIR}/modules/pango-basic-fc.so - - # copy renderers - copy_exec /usr/lib/plymouth/renderers/frame-buffer.so - copy_exec /usr/lib/plymouth/renderers/drm.so - ;; -esac - -# copy config files -mkdir -p "${DESTDIR}/etc/plymouth" - -if [ -r /etc/plymouth/plymouthd.conf ]; then - cp -a /etc/plymouth/plymouthd.conf "${DESTDIR}/etc/plymouth/" -fi - -cp -a /usr/share/plymouth/plymouthd.defaults "${DESTDIR}/usr/share/plymouth/" diff --git a/srcpkgs/plymouth/files/plymouth.init-bottom b/srcpkgs/plymouth/files/plymouth.init-bottom deleted file mode 100644 index e7d92490246..00000000000 --- a/srcpkgs/plymouth/files/plymouth.init-bottom +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -PREREQ="udev" - -prereqs() -{ - echo "${PREREQ}" -} - -case ${1} in - prereqs) - prereqs - exit 0 - ;; -esac - -/bin/plymouth --newroot=${rootmnt} diff --git a/srcpkgs/plymouth/files/plymouth.init-premount b/srcpkgs/plymouth/files/plymouth.init-premount deleted file mode 100644 index eaacfb6387f..00000000000 --- a/srcpkgs/plymouth/files/plymouth.init-premount +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -PREREQ="udev" - -prereqs() -{ - echo "${PREREQ}" -} - -case ${1} in - prereqs) - prereqs - exit 0 - ;; -esac - -SPLASH="false" - -for ARGUMENT in $(cat /proc/cmdline) -do - case "${ARGUMENT}" in - splash*) - SPLASH="true" - ;; - - nosplash*) - SPLASH="false" - ;; - esac -done - -if [ "${SPLASH}" = "true" ]; then - modprobe i8042 - modprobe atkbd - - /sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid - /bin/plymouth --show-splash -fi diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template index fc455222079..5bd5da74e3d 100644 --- a/srcpkgs/plymouth/template +++ b/srcpkgs/plymouth/template @@ -1,6 +1,7 @@ # Template file for 'plymouth' pkgname=plymouth version=20120111 +revision=1 homepage="http://cgit.freedesktop.org/plymouth" #distfiles="${homepage}/snapshot/$pkgname-$version.tar.bz2" distfiles="http://xbps.nopcode.org/distfiles/plymouth-$version.tar.xz" @@ -28,21 +29,6 @@ make_dirs=" /var/lib/plymouth 0755 root root /var/spool/plymouth 0755 root root" - - pre_configure() { autoreconf -fi } - -post_install() { - rm -f ${DESTDIR}/usr/libexec/plymouth/* - vinstall ${FILESDIR}/plymouth-update-initrd 755 usr/libexec/plymouth - - # initramfs-tools hook - vinstall ${FILESDIR}/plymouth.hook 755 \ - usr/share/initramfs-tools/hooks plymouth - vinstall ${FILESDIR}/plymouth.init-bottom 755 \ - usr/share/initramfs-tools/scripts/init-bottom plymouth - vinstall ${FILESDIR}/plymouth.init-premount 755 \ - usr/share/initramfs-tools/scripts/init-premount plymouth -}