diff options
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-don-t-install-syslinux-for-data-only.patch | 54 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 | ||||
| -rw-r--r-- | main/alpine-conf/git.patch | 54 |
3 files changed, 116 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-disk-don-t-install-syslinux-for-data-only.patch b/main/alpine-conf/0001-setup-disk-don-t-install-syslinux-for-data-only.patch new file mode 100644 index 0000000000..963e803b68 --- /dev/null +++ b/main/alpine-conf/0001-setup-disk-don-t-install-syslinux-for-data-only.patch @@ -0,0 +1,54 @@ +From 0dd1f10889920ec8a63f6072601786c0acc9a249 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 20 May 2016 09:55:42 +0000 +Subject: [PATCH] setup-disk: don't install syslinux for data-only + +--- + setup-disk.in | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/setup-disk.in b/setup-disk.in +index ad0bdb7..0df6d96 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -458,7 +458,7 @@ init_progs() { + btrfs) fstools="$fstools btrfs-progs";; + esac + done +- apk add --quiet sfdisk $lvmpkg $raidpkg syslinux $fstools $@ ++ apk add --quiet sfdisk $lvmpkg $raidpkg $fstools $@ + } + + show_disk_info() { +@@ -505,7 +505,9 @@ setup_partitions() { + echo "w" | fdisk $diskdev >/dev/null + + # fix the MBR while here so extlinux can boot +- cat "$MBR" > $diskdev ++ if [ -f "$MBR" ]; then ++ cat "$MBR" > $diskdev ++ fi + + local start=1M + local line= +@@ -771,7 +773,7 @@ native_disk_install_lvm() { + local lvm_size= + local root_dev=/dev/$vgname/lv_root + +- init_progs || return 1 ++ init_progs syslinux || return 1 + confirm_erase $@ || return 1 + + if [ -n "$USE_RAID" ]; then +@@ -802,7 +804,7 @@ native_disk_install() { + local root_size= + local root_dev= boot_dev= swap_dev= + +- init_progs || return 1 ++ init_progs syslinux || return 1 + confirm_erase $@ || return 1 + + if [ -n "$USE_RAID" ]; then +-- +2.8.2 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index c64da9ed2b..619467e4b9 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.4.0 -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-setup-disk-don-t-install-syslinux-for-data-only.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -24,6 +25,9 @@ package() { done } -md5sums="4bea789ad26d94e9df8684fa8f01cbee alpine-conf-3.4.0.tar.xz" -sha256sums="4f66c10aa7834f60ce5697487d6d8c47780bc954aa443976d957b4e8bbbfa61e alpine-conf-3.4.0.tar.xz" -sha512sums="c652dfc0660f7483a10342cd2f374ec60b4329448476fad5bc93b5b31501529e08062d25248b5f4792643252b18cacb430273c08a3e0b7b901104f414733cb75 alpine-conf-3.4.0.tar.xz" +md5sums="4bea789ad26d94e9df8684fa8f01cbee alpine-conf-3.4.0.tar.xz +aee178615c62bd51a468415b20ade309 0001-setup-disk-don-t-install-syslinux-for-data-only.patch" +sha256sums="4f66c10aa7834f60ce5697487d6d8c47780bc954aa443976d957b4e8bbbfa61e alpine-conf-3.4.0.tar.xz +23c0e2c18cbb1c374d966cdf645ed74ea9ba59e7f1b98fe0e9696d79dfeb2d2f 0001-setup-disk-don-t-install-syslinux-for-data-only.patch" +sha512sums="c652dfc0660f7483a10342cd2f374ec60b4329448476fad5bc93b5b31501529e08062d25248b5f4792643252b18cacb430273c08a3e0b7b901104f414733cb75 alpine-conf-3.4.0.tar.xz +408d6590030432c5173266db6038471f697578091954a2accc2f4778fad3b56484eb7caf40d566f1fb7a8a6db1f57a35ac4c0f5faec53604fb2852aa2dd13497 0001-setup-disk-don-t-install-syslinux-for-data-only.patch" diff --git a/main/alpine-conf/git.patch b/main/alpine-conf/git.patch new file mode 100644 index 0000000000..963e803b68 --- /dev/null +++ b/main/alpine-conf/git.patch @@ -0,0 +1,54 @@ +From 0dd1f10889920ec8a63f6072601786c0acc9a249 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 20 May 2016 09:55:42 +0000 +Subject: [PATCH] setup-disk: don't install syslinux for data-only + +--- + setup-disk.in | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/setup-disk.in b/setup-disk.in +index ad0bdb7..0df6d96 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -458,7 +458,7 @@ init_progs() { + btrfs) fstools="$fstools btrfs-progs";; + esac + done +- apk add --quiet sfdisk $lvmpkg $raidpkg syslinux $fstools $@ ++ apk add --quiet sfdisk $lvmpkg $raidpkg $fstools $@ + } + + show_disk_info() { +@@ -505,7 +505,9 @@ setup_partitions() { + echo "w" | fdisk $diskdev >/dev/null + + # fix the MBR while here so extlinux can boot +- cat "$MBR" > $diskdev ++ if [ -f "$MBR" ]; then ++ cat "$MBR" > $diskdev ++ fi + + local start=1M + local line= +@@ -771,7 +773,7 @@ native_disk_install_lvm() { + local lvm_size= + local root_dev=/dev/$vgname/lv_root + +- init_progs || return 1 ++ init_progs syslinux || return 1 + confirm_erase $@ || return 1 + + if [ -n "$USE_RAID" ]; then +@@ -802,7 +804,7 @@ native_disk_install() { + local root_size= + local root_dev= boot_dev= swap_dev= + +- init_progs || return 1 ++ init_progs syslinux || return 1 + confirm_erase $@ || return 1 + + if [ -n "$USE_RAID" ]; then +-- +2.8.2 + |