diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-02 21:32:22 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-02 21:32:22 +0000 |
| commit | 70e567fc01d37f30de5dac5bcd942b1ef2366f26 (patch) | |
| tree | 6b0fbda1ae52632cebea04050dc5ec1677d86354 | |
| parent | b2da7e7293d926fb1f48b461da5750796656915c (diff) | |
| download | aports-70e567fc01d37f30de5dac5bcd942b1ef2366f26.tar.bz2 aports-70e567fc01d37f30de5dac5bcd942b1ef2366f26.tar.xz | |
main/alpine-conf: make update-kernel exit on mksquashfs errors
| -rw-r--r-- | main/alpine-conf/0001-update-kernel-make-mksquashfs-exit-on-error.patch | 28 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 36 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-update-kernel-make-mksquashfs-exit-on-error.patch b/main/alpine-conf/0001-update-kernel-make-mksquashfs-exit-on-error.patch new file mode 100644 index 0000000000..04f0721de0 --- /dev/null +++ b/main/alpine-conf/0001-update-kernel-make-mksquashfs-exit-on-error.patch @@ -0,0 +1,28 @@ +From 0bd627de56f28063d9fcef455587d0b7d11a00a6 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 2 Dec 2016 21:29:51 +0000 +Subject: [PATCH] update-kernel: make mksquashfs exit on error + +mksquashfs will ignore errors and continue by default by design. This is +definitively not the behavior we want so we tell it to explicitly exit +on error. +--- + update-kernel.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/update-kernel.in b/update-kernel.in +index 3e147c8..6d24649 100644 +--- a/update-kernel.in ++++ b/update-kernel.in +@@ -259,7 +259,7 @@ find $ROOT/lib/modules -type f -name "*.ko" | xargs modinfo -F firmware | sort - + install -pD $ROOT/lib/firmware/$FW $MODLOOP/modules/firmware/$FW + fi + done +-_exec mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz ++_exec mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz -exit-on-error + + _exec mkinitfs $MKINITFS_ARGS -q -b $ROOT -F "$features base squashfs" \ + -o "$STAGING/initramfs-$FLAVOR" "$KVER" +-- +2.11.0 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 84792fdeae..249a5b2f04 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.5.0_rc1 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" license="MIT" depends="openrc>0.13" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz + 0001-update-kernel-make-mksquashfs-exit-on-error.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -24,6 +25,9 @@ package() { done } -md5sums="41e9c47129275bee279170afa7c25925 alpine-conf-3.5.0_rc1.tar.xz" -sha256sums="d93733e2dd630fc5627ec1eb71a71f633bcda7c75f3b65593542dc0a756bd580 alpine-conf-3.5.0_rc1.tar.xz" -sha512sums="9b77085ba719bdcfc9f9b186636f1724528270eed29e8e266fa947c91e4ee86e6253405c73b59a7977763da6e85089b57a80fd09457120a8394f5d1c786bf29b alpine-conf-3.5.0_rc1.tar.xz" +md5sums="41e9c47129275bee279170afa7c25925 alpine-conf-3.5.0_rc1.tar.xz +d816842b84cab6ea988368e690a89d2d 0001-update-kernel-make-mksquashfs-exit-on-error.patch" +sha256sums="d93733e2dd630fc5627ec1eb71a71f633bcda7c75f3b65593542dc0a756bd580 alpine-conf-3.5.0_rc1.tar.xz +ce316da5b3b3d5300a72aa5b5cbb7ad057859bec127337b7bf52c271f5aa746c 0001-update-kernel-make-mksquashfs-exit-on-error.patch" +sha512sums="9b77085ba719bdcfc9f9b186636f1724528270eed29e8e266fa947c91e4ee86e6253405c73b59a7977763da6e85089b57a80fd09457120a8394f5d1c786bf29b alpine-conf-3.5.0_rc1.tar.xz +af620eb0029bf4a8466986ca82966325467d77f05dc9e56771583737e3af19cb2bf33b461095aa17eb913d7eecee57df5747ec5f753482f022d02c24bd1c95ea 0001-update-kernel-make-mksquashfs-exit-on-error.patch" |