summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-02-15 16:59:04 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-02-15 17:11:34 +0000
commitb73646786d4ad36502cc05b1aba954de35d0f5b4 (patch)
tree52540a492ce6df937ca98e3b465b00cdaeefb068
parentcb3cefffe7f013a14120ceb62b47d1993d930fed (diff)
downloadaports-1.10_rc2.tar.bz2
aports-1.10_rc2.tar.xz
main/alpine-conf: upgrade to 2.2v1.10_rc2
setup-disk fixes (cherry picked from commit 43faf5accb12673ca1a6eec7d3ff59c5de626cbb)
-rw-r--r--main/alpine-conf/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch36
-rw-r--r--main/alpine-conf/APKBUILD15
2 files changed, 4 insertions, 47 deletions
diff --git a/main/alpine-conf/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch b/main/alpine-conf/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch
deleted file mode 100644
index f5ed92a9..00000000
--- a/main/alpine-conf/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d2dd5ae63d2d5e598dd76d075ea998b4d3062f13 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Sat, 13 Feb 2010 15:25:39 +0000
-Subject: [PATCH] setup-disk: boot fix for mdadm-3.1.1
-
-mdadm 3.1.1 switched to use metadata 1.1 by default. This does not work
-with extlinux so we set metadata to old default manually for /boot.
----
- setup-disk.in | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index a6b9efa..a81172a 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -327,13 +327,15 @@ EOF
- local p= rd=
- for p in $(sfdisk -l $rootdisk_dev 2>/dev/null \
- | awk '/Linux raid/ {print $1}'); do
-+ local opt="--metadata=0.90"
- case "$p" in
- *1) rd=/dev/md0; boot_dev=/dev/md0;;
-- *2) rd=/dev/md1; swap_dev=/dev/md1;;
-+ *2) rd=/dev/md1; swap_dev=/dev/md1
-+ opt= ;;
- *3) rd=/dev/md2; root_dev=/dev/md2;;
- esac
- mdadm --create $rd --level=1 --raid-devices=2 \
-- --quiet --run $p missing
-+ $opt --quiet --run $p missing
- done
- else
- local p=
---
-1.6.6.1
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 26590fec..b9fb4e4e 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,20 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
-pkgver=2.1
-pkgrel=1
+pkgver=2.2
+pkgrel=0
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
depends="openrc"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
- 0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
license="GPL-2"
_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
- cd "$_builddir"
- patch -p1 -i "$srcdir"/0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch
-}
-
build() {
cd "$_builddir"
make || return 1
@@ -27,5 +21,4 @@ package() {
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
-md5sums="d9b13b849abbe5f2061aa8af0c4ac7ce alpine-conf-2.1.tar.bz2
-be3e55fd58e798ec3a235d7220b31811 0001-setup-disk-boot-fix-for-mdadm-3.1.1.patch"
+md5sums="3baf2baa7effc0b1928e757f45357d4d alpine-conf-2.2.tar.bz2"