aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2016-12-07 12:10:30 +0200
committerTimo Teräs <timo.teras@iki.fi>2016-12-07 12:10:30 +0200
commit2de46c6cd7e82ecc88296d1d9f21cd7b4889b04c (patch)
treeba82760f233b570bcd8905068df2ca24f30eff5e /main
parentef1529577f36b31f5a7051ca8ae9b4649a7c6303 (diff)
downloadaports-2de46c6cd7e82ecc88296d1d9f21cd7b4889b04c.tar.bz2
aports-2de46c6cd7e82ecc88296d1d9f21cd7b4889b04c.tar.xz
main/alpine-conf: use busybox losetup always
fixes #6517
Diffstat (limited to 'main')
-rw-r--r--main/alpine-conf/0004-update-kernel-use-busybox-s-losetup-always.patch29
-rw-r--r--main/alpine-conf/APKBUILD12
2 files changed, 37 insertions, 4 deletions
diff --git a/main/alpine-conf/0004-update-kernel-use-busybox-s-losetup-always.patch b/main/alpine-conf/0004-update-kernel-use-busybox-s-losetup-always.patch
new file mode 100644
index 0000000000..242a4e8bc8
--- /dev/null
+++ b/main/alpine-conf/0004-update-kernel-use-busybox-s-losetup-always.patch
@@ -0,0 +1,29 @@
+From bd4e2c5b0a11f09502f9bb9a6d842019a2fb7705 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Wed, 7 Dec 2016 12:06:58 +0200
+Subject: [PATCH] update-kernel: use busybox's losetup always
+
+fixes #6517
+
+The output format of util-linux losetup is different, and there's
+no easy way to get uniform output from these two implementations.
+---
+ update-kernel.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/update-kernel.in b/update-kernel.in
+index cd1edc0..88f266b 100644
+--- a/update-kernel.in
++++ b/update-kernel.in
+@@ -133,7 +133,7 @@ if [ -z "$DESTDIR" ]; then
+ while read MOUNT; do
+ set -- $MOUNT
+ [ $2 = /.modloop ] || continue
+- DESTDIR=$(dirname $(losetup $1 | cut -d " " -f 3))
++ DESTDIR=$(dirname $(busybox losetup $1 | cut -d " " -f 3))
+ MNTDIR=$(dirname "$DESTDIR")
+ break
+ done < /proc/mounts
+--
+2.11.0
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index f53f4abfe0..bfae320857 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=3.5.0_rc1
-pkgrel=2
+pkgrel=3
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
arch="all"
@@ -11,6 +11,7 @@ source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.x
0001-update-kernel-make-mksquashfs-exit-on-error.patch
0002-update-kernel-don-t-install-deps-if-script-runs-in-f.patch
0003-update-kernel-re-exec-under-fakeroot-unless-we-are-s.patch
+ 0004-update-kernel-use-busybox-s-losetup-always.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -30,12 +31,15 @@ package() {
md5sums="41e9c47129275bee279170afa7c25925 alpine-conf-3.5.0_rc1.tar.xz
66238028becd1a648780a7522a71a169 0001-update-kernel-make-mksquashfs-exit-on-error.patch
e85a35805f18a130e1dcba998356e9ca 0002-update-kernel-don-t-install-deps-if-script-runs-in-f.patch
-eb6c5e86ae571d8fc70a65bbcf947525 0003-update-kernel-re-exec-under-fakeroot-unless-we-are-s.patch"
+eb6c5e86ae571d8fc70a65bbcf947525 0003-update-kernel-re-exec-under-fakeroot-unless-we-are-s.patch
+95c3e259f4358227de83ca3df18caacf 0004-update-kernel-use-busybox-s-losetup-always.patch"
sha256sums="d93733e2dd630fc5627ec1eb71a71f633bcda7c75f3b65593542dc0a756bd580 alpine-conf-3.5.0_rc1.tar.xz
8623350fff0f9456137341209172fe1d139035d42d01f16b90a5f6dceadb5d54 0001-update-kernel-make-mksquashfs-exit-on-error.patch
9089418ca27148a33ba39b601d0b2c7808cc8315cebcb017583bfa8e80edbe2c 0002-update-kernel-don-t-install-deps-if-script-runs-in-f.patch
-661534c6828e4cca9398bb74563d51b7661b028241cdcac717614354779ad9ce 0003-update-kernel-re-exec-under-fakeroot-unless-we-are-s.patch"
+661534c6828e4cca9398bb74563d51b7661b028241cdcac717614354779ad9ce 0003-update-kernel-re-exec-under-fakeroot-unless-we-are-s.patch
+985e10ef8404d3edc43987293245b1ed62e8529d817e3e6ee50150295ee6401d 0004-update-kernel-use-busybox-s-losetup-always.patch"
sha512sums="9b77085ba719bdcfc9f9b186636f1724528270eed29e8e266fa947c91e4ee86e6253405c73b59a7977763da6e85089b57a80fd09457120a8394f5d1c786bf29b alpine-conf-3.5.0_rc1.tar.xz
62af2f385a8431696fefb1206e37624605cbab998c59691490ac14435e1487b6a745e678ea8a760ff5c322c6349479def18b25fed6783a802875785f366a6279 0001-update-kernel-make-mksquashfs-exit-on-error.patch
6b08fd7d2703c26d1353022484793597d20b927a37c886ec87e82c4661bf7f562e3a48007a1d659953ec06530355a9f31072923f7160bf4e1999c6a550cf19d6 0002-update-kernel-don-t-install-deps-if-script-runs-in-f.patch
-4ff581357e9d03431f5c45ed9badac51cce23e5f9241230ac2d48b6ba6823129c293577f4030b6c8fcb036d7a6fb5830f3b9e10b1dd0228179d1232d0ea3fca3 0003-update-kernel-re-exec-under-fakeroot-unless-we-are-s.patch"
+4ff581357e9d03431f5c45ed9badac51cce23e5f9241230ac2d48b6ba6823129c293577f4030b6c8fcb036d7a6fb5830f3b9e10b1dd0228179d1232d0ea3fca3 0003-update-kernel-re-exec-under-fakeroot-unless-we-are-s.patch
+7e50e470834ca0bbe70ceb5b89bc75d8a7b879b0b2363db0b691496d187e2e5eb3e1a95cd5ab86ed91e9f9b756003390d8b73424d1d4049f9dbde082102f9e59 0004-update-kernel-use-busybox-s-losetup-always.patch"