diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-04 13:26:52 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-04 15:39:25 +0200 |
| commit | 2aa7bb6f997363ec2c9cd23c1c95d230f8adf315 (patch) | |
| tree | 1c9d281b7933e5ae725936de9b415e6eeed3454a /main/mkinitfs | |
| parent | 6525b7aa7fbb97336a7656a5408d6505c2ac7ca3 (diff) | |
| download | aports-2aa7bb6f997363ec2c9cd23c1c95d230f8adf315.tar.bz2 aports-2aa7bb6f997363ec2c9cd23c1c95d230f8adf315.tar.xz | |
main/mkintfs: fix init to work with busybox 1.25
Diffstat (limited to 'main/mkinitfs')
| -rw-r--r-- | main/mkinitfs/0001-init-dont-use-local-in-global-scope.patch | 40 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 12 |
2 files changed, 48 insertions, 4 deletions
diff --git a/main/mkinitfs/0001-init-dont-use-local-in-global-scope.patch b/main/mkinitfs/0001-init-dont-use-local-in-global-scope.patch new file mode 100644 index 0000000000..3cb4f7c03d --- /dev/null +++ b/main/mkinitfs/0001-init-dont-use-local-in-global-scope.patch @@ -0,0 +1,40 @@ +From 46de24c44c1b1c3a5fe92e5c4d28c650798bd8d7 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 4 Aug 2016 13:24:46 +0200 +Subject: [PATCH] init: dont use local in global scope + +--- + initramfs-init.in | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 639826c..6b03fbb 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -479,12 +479,11 @@ 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}" ++ num="${fbdev#/dev/fb}" + for img in /media/*/fbsplash$num.ppm; do +- local config="${img%.*}.cfg" ++ config="${img%.*}.cfg" + [ -e "$config" ] || config=/tmp/fbsplash.cfg + fbsplash -s "$img" -d "$fbdev" -i "$config" + break +@@ -498,7 +497,7 @@ fi + if [ -n "$fbsplash" ] && [ -e "$fbsplash" ]; then + ebegin "Starting bootsplash" + mkfifo $sysroot/$splashfile +- local config="${fbsplash%.*}.cfg" ++ config="${fbsplash%.*}.cfg" + [ -e "$config" ] || config=/tmp/fbsplash.cfg + setsid fbsplash -T 16 -s "$fbsplash" -i $config -f $sysroot/$splashfile & + eend 0 +-- +2.9.1 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index c3028d3c92..3ceba68d2a 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=3.0.5 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=2 pkgdesc="Tool to generate initramfs images for Alpine" url="http://git.alpinelinux.org/cgit/mkinitfs" makedepends_build="" @@ -13,6 +13,7 @@ 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-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch + 0001-init-dont-use-local-in-global-scope.patch " arch="all" license="GPL2" @@ -30,8 +31,11 @@ package() { } md5sums="de3f95912a542dfabbf0573620549a29 mkinitfs-3.0.5.tar.xz -a4227598291fa7338ad1128bfef3720c 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch" +a4227598291fa7338ad1128bfef3720c 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch +a74631b5f40001dd259a2a6ebcaec544 0001-init-dont-use-local-in-global-scope.patch" sha256sums="3f13619f161c506796b91f2db17644eba25c2ffc923aa0c8fff0213d1f660aa4 mkinitfs-3.0.5.tar.xz -17547dbc77bd19d940550ea6243b44212d21a6797aee4202e4e22c31143bf9e6 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch" +17547dbc77bd19d940550ea6243b44212d21a6797aee4202e4e22c31143bf9e6 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch +7253cd8ebc1487e4bfb98d81edd68b24a4364e9fa8e48c73fc6903f2077b056e 0001-init-dont-use-local-in-global-scope.patch" sha512sums="246f25ce3fb65ea19dbe611ad44a106930c28b2c7111908462d4a252433011280715b2cf87ee81cc6f0860679fd1d0a109d03040647498137e42b22ccc711662 mkinitfs-3.0.5.tar.xz -35b4cf3f74e394d87b321d335ec4dff6973bfd9a38cdc81609e21e025ee3fb9af7d2744cf9941531603df829af1f7fba433074915ba88a688d375cfe40dad07a 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch" +35b4cf3f74e394d87b321d335ec4dff6973bfd9a38cdc81609e21e025ee3fb9af7d2744cf9941531603df829af1f7fba433074915ba88a688d375cfe40dad07a 0001-init-add-support-for-ttyMFD-and-ttyUSB-serial-consol.patch +ca1bd66bc6d366dc74da389397f3e0d81b3afa21a534269230ab33f415e633b19ce54327b78713847461b67d6d23a85019c79e1fbbf1a964ee0bd26013ddf33f 0001-init-dont-use-local-in-global-scope.patch" |