diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-05-26 14:03:37 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-05-26 14:05:51 +0000 |
| commit | 878a7a8ce20fefa96d991a7f3744b433ca1bbba2 (patch) | |
| tree | 545eaec3de948f28bda0f8d2b69c1772c9df885a | |
| parent | 229ead728746f8d7ad8f03bdadf975de3a985f1c (diff) | |
| download | aports-878a7a8ce20fefa96d991a7f3744b433ca1bbba2.tar.bz2 aports-878a7a8ce20fefa96d991a7f3744b433ca1bbba2.tar.xz | |
main/alpine-conf: bugfix for setup-disk
(cherry picked from commit 85c7ebe3d5c03a151d18135ebcda83f7a57fdcd0)
| -rw-r--r-- | main/alpine-conf/APKBUILD | 13 | ||||
| -rw-r--r-- | main/alpine-conf/setup-disk-fix.patch | 19 |
2 files changed, 29 insertions, 3 deletions
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 1f4bbf3fd..239a9f6ae 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,14 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.3 -pkgrel=0 +pkgrel=1 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" +source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 + setup-disk-fix.patch" license="GPL-2" _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + patch -p1 -i "$srcdir"/setup-disk-fix.patch +} + build() { cd "$_builddir" make || return 1 @@ -21,4 +27,5 @@ package() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="9e7b7602a16fb64a10ded850c508d412 alpine-conf-2.3.tar.bz2" +md5sums="9e7b7602a16fb64a10ded850c508d412 alpine-conf-2.3.tar.bz2 +27b009c1193e396ee145f59cd3844a2c setup-disk-fix.patch" diff --git a/main/alpine-conf/setup-disk-fix.patch b/main/alpine-conf/setup-disk-fix.patch new file mode 100644 index 000000000..2fa7aec46 --- /dev/null +++ b/main/alpine-conf/setup-disk-fix.patch @@ -0,0 +1,19 @@ +commit e149170d4736017c76b09625fa9a4b6a90b5e3a3 +Author: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed May 26 13:59:25 2010 +0000 + + setup-disk: fix typo in the option handling + +diff --git a/setup-disk.in b/setup-disk.in +index 7a485b8..aa4a92f 100644 +--- a/setup-disk.in ++++ b/setup-disk.in +@@ -401,7 +401,7 @@ while getopts "hk:o:r" opt; do + *) usage;; + esac + done +-shift $(( OPTIND - 1)) ++shift $(( $OPTIND - 1)) + + if [ -d "$1" ]; then + # install to given mounted root |