diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-02 08:45:42 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-12-02 08:46:34 +0000 |
| commit | 5ceca68cf1350eadf48707164b40825925ce6113 (patch) | |
| tree | 6b2859fb1b8e68459915780ed6b24ab92e4556dc | |
| parent | 8286e200f024060f1e8aa083e437ece4b0e125f6 (diff) | |
| download | aports-5ceca68cf1350eadf48707164b40825925ce6113.tar.bz2 aports-5ceca68cf1350eadf48707164b40825925ce6113.tar.xz | |
main/mkinitfs: splash improvement
| -rw-r--r-- | main/mkinitfs/0001-init-fix-splash-fifo-and-make-config-file-optional.patch | 37 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 12 |
2 files changed, 45 insertions, 4 deletions
diff --git a/main/mkinitfs/0001-init-fix-splash-fifo-and-make-config-file-optional.patch b/main/mkinitfs/0001-init-fix-splash-fifo-and-make-config-file-optional.patch new file mode 100644 index 0000000000..47c919138d --- /dev/null +++ b/main/mkinitfs/0001-init-fix-splash-fifo-and-make-config-file-optional.patch @@ -0,0 +1,37 @@ +From 2ec7750ef7d4c6a443b0fb04b1627efabb9d7c03 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Tue, 2 Dec 2014 10:34:35 +0200 +Subject: [PATCH] init: fix splash fifo, and make config file optional + +just having the fbsplash.ppm in boot media activates now splash. +--- + initramfs-init.in | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index ecab5dd..6357965 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -677,9 +677,17 @@ if [ -f "$sysroot/etc/.default_boot_services" -o ! -f "$ovl" ]; then + rm -f "$sysroot/etc/.default_boot_services" + fi + +-if [ "$KOPT_splash" != "no" -a -e $ALPINE_MNT/fbsplash.ppm -a -e $ALPINE_MNT/fbsplash.cfg ]; then ++if [ "$KOPT_splash" != "no" -a -e $ALPINE_MNT/fbsplash.ppm ]; then ++ local config + ebegin "Starting bootsplash (from $ALPINE_MNT)" +- setsid fbsplash -T 16 -s $ALPINE_MNT/fbsplash.ppm -i $ALPINE_MNT/fbsplash.cfg -f $sysroot/$splashfile & ++ mkfifo $sysroot/$splashfile ++ if [ -e $ALPINE_MNT/fbsplash.cfg ]; then ++ config=$ALPINE_MNT/fbsplash.cfg ++ else ++ config=/tmp/fbsplash.cfg ++ echo "IMAGE_ALIGN=CM" > $config ++ fi ++ setsid fbsplash -T 16 -s $ALPINE_MNT/fbsplash.ppm -i $config -f $sysroot/$splashfile & + eend 0 + else + KOPT_splash="no" +-- +2.2.0 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 49d7ce63a9..9eaf0fe74e 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,13 +2,14 @@ pkgname=mkinitfs pkgver=2.7.1 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0 lddtree>=1.25" install="$pkgname.pre-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz + 0001-init-fix-splash-fifo-and-make-config-file-optional.patch " arch="noarch" license="GPL-2" @@ -34,6 +35,9 @@ package() { cd "$_builddir" make install DESTDIR="$pkgdir" || return 1 } -md5sums="9a815b988bb5be3ac3ab09e7904027e6 mkinitfs-2.7.1.tar.xz" -sha256sums="152acf1f4f23b8919a79c6a29590cff2db594ad42dec1b60316e9740366ec43d mkinitfs-2.7.1.tar.xz" -sha512sums="632f9119dccf0911989e8d09d587a553327c9644fd75e50dd58a19590c0a1ac955de1a50a46c68aa711288c480c0408969c725832e9d2e7631ff8c64b12d0217 mkinitfs-2.7.1.tar.xz" +md5sums="9a815b988bb5be3ac3ab09e7904027e6 mkinitfs-2.7.1.tar.xz +68c2d5e5e15b6f691f39b8c26dd9514a 0001-init-fix-splash-fifo-and-make-config-file-optional.patch" +sha256sums="152acf1f4f23b8919a79c6a29590cff2db594ad42dec1b60316e9740366ec43d mkinitfs-2.7.1.tar.xz +8d6b5f6b2024dce0c26846966b236513726ced6d61eca335524b5759f957ecda 0001-init-fix-splash-fifo-and-make-config-file-optional.patch" +sha512sums="632f9119dccf0911989e8d09d587a553327c9644fd75e50dd58a19590c0a1ac955de1a50a46c68aa711288c480c0408969c725832e9d2e7631ff8c64b12d0217 mkinitfs-2.7.1.tar.xz +4cbfc985974b427c6136b28777c39ffd6963bb876d902c182853e7af8311265d2516f6638ea7fb818ddba3a0bdd9109080d62efaedb514b8e6cbea09812adefa 0001-init-fix-splash-fifo-and-make-config-file-optional.patch" |