diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-02-19 09:11:24 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-02-19 09:11:24 +0200 |
| commit | c3f010a020d363ac7513ac2491b05542674e475a (patch) | |
| tree | 77cdd7447e98003691ddacda7b7288535e8aea43 /main/mkinitfs | |
| parent | e6935a7a5b06168e47752d92216a72d079d5daa2 (diff) | |
| download | aports-c3f010a020d363ac7513ac2491b05542674e475a.tar.bz2 aports-c3f010a020d363ac7513ac2491b05542674e475a.tar.xz | |
main/mkinitfs: support splash image for multiple fbdevs
Diffstat (limited to 'main/mkinitfs')
| -rw-r--r-- | main/mkinitfs/0001-init-support-individual-splash-image-per-fbdev.patch | 54 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 12 |
2 files changed, 62 insertions, 4 deletions
diff --git a/main/mkinitfs/0001-init-support-individual-splash-image-per-fbdev.patch b/main/mkinitfs/0001-init-support-individual-splash-image-per-fbdev.patch new file mode 100644 index 0000000000..ce9bcd5f69 --- /dev/null +++ b/main/mkinitfs/0001-init-support-individual-splash-image-per-fbdev.patch @@ -0,0 +1,54 @@ +From f7f60d610e921146415db59b501a78bde8f6bf1f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 17 Feb 2016 13:45:50 +0200 +Subject: [PATCH] init: support individual splash image per fbdev + +--- + initramfs-init.in | 24 +++++++++++++++--------- + 1 file changed, 15 insertions(+), 9 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index e18652a..10bc3ea 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -472,22 +472,28 @@ if [ -f "$sysroot/etc/.default_boot_services" -o ! -f "$ovl" ]; then + fi + + if [ "$KOPT_splash" != "no" ]; then ++ echo "IMAGE_ALIGN=CM" > /tmp/fbsplash.cfg ++ local fbdev img ++ for fbdev in /dev/fb[0-9]; do ++ [ -e "$fbdev" ] || break ++ local num="${fbdev#/dev/fb}" ++ for img in /media/*/fbsplash$num.ppm; do ++ local config="${img%.*}.cfg" ++ [ -e "$config" ] || config=/tmp/fbsplash.cfg ++ fbsplash -s "$img" -d "$fbdev" -i "$config" ++ break ++ done ++ done + for fbsplash in /media/*/fbsplash.ppm; do +- if [ -e "$fbsplash" ]; then +- break; +- fi ++ [ -e "$fbsplash" ] && break + done + fi + + if [ -n "$fbsplash" ] && [ -e "$fbsplash" ]; then +- local config + ebegin "Starting bootsplash" + mkfifo $sysroot/$splashfile +- config="${fbsplash%.*}.cfg" +- if ! [ -e "$config" ]; then +- config=/tmp/fbsplash.cfg +- echo "IMAGE_ALIGN=CM" > $config +- fi ++ local config="${fbsplash%.*}.cfg" ++ [ -e "$config" ] || config=/tmp/fbsplash.cfg + setsid fbsplash -T 16 -s "$fbsplash" -i $config -f $sysroot/$splashfile & + eend 0 + else +-- +2.7.1 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 6e7b73ff8f..f5ef3f7d5b 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=3.0.3 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url="http://git.alpinelinux.org/cgit/mkinitfs" makedepends="kmod-dev util-linux-dev cryptsetup-dev linux-headers" @@ -10,6 +10,7 @@ depends="acct busybox apk-tools>=2.0 lddtree>=1.25" install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz + 0001-init-support-individual-splash-image-per-fbdev.patch " arch="all" license="GPL2" @@ -35,6 +36,9 @@ package() { cd "$_builddir" make install DESTDIR="$pkgdir" || return 1 } -md5sums="3bd3f1ecf741edd1383b3ea2a1a1e535 mkinitfs-3.0.3.tar.xz" -sha256sums="42f6681e45e6655b25b8e3fdcb6ba75d38dc65d968cd2b2d33e57542aca23c6e mkinitfs-3.0.3.tar.xz" -sha512sums="3ab240c6fe5c44310da91933865fca0c6fdb1a0a54a4af1d33e9a5e1f682b7b2d5b55cd967899edbd5f99e5d76602df0410fc6d3a1dceb154f9bcb6e1b05b462 mkinitfs-3.0.3.tar.xz" +md5sums="3bd3f1ecf741edd1383b3ea2a1a1e535 mkinitfs-3.0.3.tar.xz +03234f681afa68660f8aa452fb32b158 0001-init-support-individual-splash-image-per-fbdev.patch" +sha256sums="42f6681e45e6655b25b8e3fdcb6ba75d38dc65d968cd2b2d33e57542aca23c6e mkinitfs-3.0.3.tar.xz +e798f60474e0e337809c2aa281cfbb869e358e7dca68dc25ebdf884824866b78 0001-init-support-individual-splash-image-per-fbdev.patch" +sha512sums="3ab240c6fe5c44310da91933865fca0c6fdb1a0a54a4af1d33e9a5e1f682b7b2d5b55cd967899edbd5f99e5d76602df0410fc6d3a1dceb154f9bcb6e1b05b462 mkinitfs-3.0.3.tar.xz +5772a3ef7dacd9cc39f305e3c5267f74b8d2c76df5a73bb49400ce1c5b272f1ff559215c2009c806e03ae27c1990a0fe8728c584d8b0fe45529f17ea6b3ff47a 0001-init-support-individual-splash-image-per-fbdev.patch" |