diff options
| author | Tuan M. Hoang <tmhoang@flatglobe.org> | 2018-02-23 16:51:54 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2018-02-27 20:25:53 +0000 |
| commit | c0ce9db148b6d2c6c68c153a3293a5f5ddb9c0d8 (patch) | |
| tree | c89a7bc7865b20b271faae9907a7baf7efcf7f2a /main/alpine-conf | |
| parent | bda5751e08a24a6a33f0940c1e7be6d105496c5b (diff) | |
| download | aports-c0ce9db148b6d2c6c68c153a3293a5f5ddb9c0d8.tar.bz2 aports-c0ce9db148b6d2c6c68c153a3293a5f5ddb9c0d8.tar.xz | |
main/alpine-conf: add s390x bootloader
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/APKBUILD | 6 | ||||
| -rw-r--r-- | main/alpine-conf/s390x-bootloader.patch | 31 |
2 files changed, 35 insertions, 2 deletions
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 613e3c5f8c..2ecbd3ba4b 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.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -9,6 +9,7 @@ license="MIT" depends="openrc>0.13 busybox>=1.26.1-r3" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-update-kernel-handle-vanilla-suffix-in-System.map-co.patch + s390x-bootloader.patch " builddir="$srcdir"/$pkgname-$pkgver @@ -26,4 +27,5 @@ package() { } sha512sums="13fed0532aa84c39d54d2c905f31276c4b8f2d596c33bebd796f36e2e796f2d66c172440c20d19e8753f531204cacecc79ca24cd3ec1b24e3e51de251297207b alpine-conf-3.7.0.tar.xz -fdeb9f0c67a81b545e372199558fc81222f0c6599d42f0731f7fe0398bc0b9deb631c8e98f7147fb63b570ac0e97497d416332ddbfefbb833073df9c1baffee0 0001-update-kernel-handle-vanilla-suffix-in-System.map-co.patch" +fdeb9f0c67a81b545e372199558fc81222f0c6599d42f0731f7fe0398bc0b9deb631c8e98f7147fb63b570ac0e97497d416332ddbfefbb833073df9c1baffee0 0001-update-kernel-handle-vanilla-suffix-in-System.map-co.patch +bb152798caf602d99a22edc127dd1bc61bbfb012f62978f65f7126c0f704ebfa53500c93ff2f0d654e88979ab2f7f2e1f6b58b9d2235689c3f993292db8da7bc s390x-bootloader.patch" diff --git a/main/alpine-conf/s390x-bootloader.patch b/main/alpine-conf/s390x-bootloader.patch new file mode 100644 index 0000000000..30fc6d8179 --- /dev/null +++ b/main/alpine-conf/s390x-bootloader.patch @@ -0,0 +1,31 @@ +diff --git a/setup-disk.in b/setup-disk.in +old mode 100644 +new mode 100755 +index efb7f41..c84c2eb +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -459,6 +459,7 @@ install_mounted_root() { + case "$BOOTLOADER" in + grub) setup_grub "$mnt" "$root" "$modules" "$kernel_opts" "$bootdev" $disks ;; + syslinux) setup_syslinux "$mnt" "$root" "$modules" "$kernel_opts" "$bootdev" ;; ++ zipl) break;; + *) die "Bootloader \"$BOOTLOADER\" not supported!" ;; + esac + +@@ -585,6 +586,8 @@ select_bootloader() { + local bootloader=syslinux + if [ "$ARCH" = "ppc64le" ]; then + bootloader=grub-ieee1275 ++ elif [ "$ARCH" = "s390x" ]; then ++ bootloader=s390-tools + elif [ -n "$USE_EFI" ]; then + bootloader=grub-efi + elif [ "$BOOTLOADER" = "grub" ]; then +@@ -1266,6 +1269,7 @@ if is_efi || [ -n "$USE_EFI" ]; then + fi + + [ "$ARCH" = "ppc64le" ] && BOOTLOADER=grub ++[ "$ARCH" = "s390x" ] && BOOTLOADER=zipl + + dmesg -n1 + |