diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-01 08:49:12 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-08 15:11:28 +0000 |
commit | 5c940c59391c6bd32288141dd55028abe8850f02 (patch) | |
tree | 160117a203a88c1614a5165cd50c005854bf5b59 | |
parent | d14f5925495ac8f522e123b86e70a317e0ac4163 (diff) | |
download | alpine_aports-5c940c59391c6bd32288141dd55028abe8850f02.tar.bz2 alpine_aports-5c940c59391c6bd32288141dd55028abe8850f02.tar.xz alpine_aports-5c940c59391c6bd32288141dd55028abe8850f02.zip |
main/alpine-conf: upgrade to 2.4
(cherry picked from commit 8ccbbcf2593450a4b2a6c280af7070cba881dd7b)
-rw-r--r-- | main/alpine-conf/APKBUILD | 11 | ||||
-rw-r--r-- | main/alpine-conf/setup-disk-fix.patch | 19 |
2 files changed, 4 insertions, 26 deletions
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 239a9f6ae8..64333a38c4 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD | |||
@@ -1,18 +1,16 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=alpine-conf | 2 | pkgname=alpine-conf |
3 | pkgver=2.3 | 3 | pkgver=2.4 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Alpine configuration management scripts" | 5 | pkgdesc="Alpine configuration management scripts" |
6 | url=http://git.alpinelinux.org/cgit/$pkgname | 6 | url=http://git.alpinelinux.org/cgit/$pkgname |
7 | depends="openrc" | 7 | depends="openrc" |
8 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 | 8 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" |
9 | setup-disk-fix.patch" | ||
10 | license="GPL-2" | 9 | license="GPL-2" |
11 | 10 | ||
12 | _builddir="$srcdir"/$pkgname-$pkgver | 11 | _builddir="$srcdir"/$pkgname-$pkgver |
13 | prepare() { | 12 | prepare() { |
14 | cd "$_builddir" | 13 | cd "$_builddir" |
15 | patch -p1 -i "$srcdir"/setup-disk-fix.patch | ||
16 | } | 14 | } |
17 | 15 | ||
18 | build() { | 16 | build() { |
@@ -27,5 +25,4 @@ package() { | |||
27 | ln -s lbu "$pkgdir"/sbin/lbu_$i | 25 | ln -s lbu "$pkgdir"/sbin/lbu_$i |
28 | done | 26 | done |
29 | } | 27 | } |
30 | md5sums="9e7b7602a16fb64a10ded850c508d412 alpine-conf-2.3.tar.bz2 | 28 | md5sums="4c8db8948a21b0435f577d1e0f8d7c8e alpine-conf-2.4.tar.bz2" |
31 | 27b009c1193e396ee145f59cd3844a2c setup-disk-fix.patch" | ||
diff --git a/main/alpine-conf/setup-disk-fix.patch b/main/alpine-conf/setup-disk-fix.patch deleted file mode 100644 index 2fa7aec461..0000000000 --- a/main/alpine-conf/setup-disk-fix.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | commit e149170d4736017c76b09625fa9a4b6a90b5e3a3 | ||
2 | Author: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Wed May 26 13:59:25 2010 +0000 | ||
4 | |||
5 | setup-disk: fix typo in the option handling | ||
6 | |||
7 | diff --git a/setup-disk.in b/setup-disk.in | ||
8 | index 7a485b8..aa4a92f 100644 | ||
9 | --- a/setup-disk.in | ||
10 | +++ b/setup-disk.in | ||
11 | @@ -401,7 +401,7 @@ while getopts "hk:o:r" opt; do | ||
12 | *) usage;; | ||
13 | esac | ||
14 | done | ||
15 | -shift $(( OPTIND - 1)) | ||
16 | +shift $(( $OPTIND - 1)) | ||
17 | |||
18 | if [ -d "$1" ]; then | ||
19 | # install to given mounted root | ||