diff options
author | Daniel NĂ©ri <dne+alpine@mayonnaise.net> | 2020-05-18 14:39:16 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-05-29 09:59:00 +0000 |
commit | d924c05aa4f8e643279bee47ba55d1d04b6a1097 (patch) | |
tree | 9986e9a4abddf26cddc792efaf9f3a044d25831a | |
parent | eec7e1ea44833de66029deae23def8544907c6c2 (diff) |
main/alpine-conf: avoid unwanted syslinux for setup-disk on mounted root
Upstream bug: alpine-conf#10455.
-rw-r--r-- | main/alpine-conf/0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch | 26 | ||||
-rw-r--r-- | main/alpine-conf/APKBUILD | 9 |
2 files changed, 32 insertions, 3 deletions
diff --git a/main/alpine-conf/0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch b/main/alpine-conf/0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch new file mode 100644 index 00000000000..d7d22b08793 --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch @@ -0,0 +1,26 @@ +From 43e4d0b3d7441611a58ba89dfa3ae69269c16e52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+alpine@mayonnaise.net> +Date: Sat, 2 May 2020 22:02:51 +0000 +Subject: [PATCH] setup-disk: don't add syslinux package for mounted root + install unless requested + +--- + setup-disk.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-disk.in b/setup-disk.in +index 7a3a2a3..86136de 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -1212,7 +1212,7 @@ shift $(( $OPTIND - 1)) + + if [ -d "$1" ]; then + # install to given mounted root +- apk add --quiet syslinux ++ [ "$BOOTLOADER" = "syslinux" ] && apk add --quiet syslinux + install_mounted_root "${1%/}" \ + && echo "You might need fix the MBR to be able to boot" >&2 + exit $? +-- +2.26.2 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 39424ad5aeb..ddf59c27207 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,13 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.9.0 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine configuration management scripts" url="https://git.alpinelinux.org/alpine-conf/about" arch="all" license="MIT" depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3" -source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.bz2" +source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.bz2 + 0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch + " builddir="$srcdir"/$pkgname-$pkgver build() { @@ -23,4 +25,5 @@ package() { done } -sha512sums="c7f7ba8341d7c84aa85f521624de511acbea42337377693099156750462a380e0116c9bde2d3a1595c8942c024f1421e7106566c4c0415c734513ddf5ec08cb2 alpine-conf-3.9.0.tar.bz2" +sha512sums="c7f7ba8341d7c84aa85f521624de511acbea42337377693099156750462a380e0116c9bde2d3a1595c8942c024f1421e7106566c4c0415c734513ddf5ec08cb2 alpine-conf-3.9.0.tar.bz2 +7f29d2993d03d55784c60e87ea8d357744786f7de07f6946ffec24446004e62711b801a8fc5d13e36c2d72abfcaa39f97ab6c7126c70b12601aed851dd93a168 0001-setup-disk-don-t-add-syslinux-package-for-mounted-ro.patch" |