diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-10-05 19:07:24 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-10-05 19:09:16 +0000 |
| commit | c6f2744c00f1c1061bbae6ad13c64c478cf20d17 (patch) | |
| tree | 43602986160e51672a89ff6ca08be24e45a67bf6 | |
| parent | c5bd88369aff02c5f5dbcba51ffeacfa23956f53 (diff) | |
| download | aports-c6f2744c00f1c1061bbae6ad13c64c478cf20d17.tar.bz2 aports-c6f2744c00f1c1061bbae6ad13c64c478cf20d17.tar.xz | |
main/alpine-conf: upgrade to 2.0_rc8
Fixes #177
| -rw-r--r-- | main/alpine-conf/0001-setup-disk-check-if-the-devce-itself-is-mounted.patch | 25 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 9 |
2 files changed, 3 insertions, 31 deletions
diff --git a/main/alpine-conf/0001-setup-disk-check-if-the-devce-itself-is-mounted.patch b/main/alpine-conf/0001-setup-disk-check-if-the-devce-itself-is-mounted.patch deleted file mode 100644 index 28050509f8..0000000000 --- a/main/alpine-conf/0001-setup-disk-check-if-the-devce-itself-is-mounted.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 841c6823ac8a3f1e17af457722c8b7ea2abf8cb4 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 30 Sep 2009 12:57:59 +0000 -Subject: [PATCH] setup-disk: check if the devce itself is mounted - -this will filter out loop0 device ---- - setup-disk.in | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/setup-disk.in b/setup-disk.in -index 33cc868..c11d20c 100644 ---- a/setup-disk.in -+++ b/setup-disk.in -@@ -149,6 +149,7 @@ has_mounted_part() { - # parse /proc/mounts for mounted devices - for p in $(awk '$1 ~ /^\/dev\// {gsub("/dev/", "", $1); print $1}' \ - /proc/mounts); do -+ [ "$p" = "$1" ] && return 0 - [ -e /sys/block/$1/$p ] && return 0 - done - return 1 --- -1.6.4.4 - diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 485805e28e..82be2b4592 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,18 +1,16 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=2.0_rc7 -pkgrel=1 +pkgver=2.0_rc8 +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-check-if-the-devce-itself-is-mounted.patch " license="GPL-2" build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ../0001-setup-disk-check-if-the-devce-itself-is-mounted.patch || return make || return 1 make install PREFIX= DESTDIR="$pkgdir" @@ -20,5 +18,4 @@ build() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="8b44c02500d646dd64368904762d236e alpine-conf-2.0_rc7.tar.bz2 -f51a1948ddf5f035e9e6509e57000ccd 0001-setup-disk-check-if-the-devce-itself-is-mounted.patch" +md5sums="c84957f015989ed806aa393c398ce901 alpine-conf-2.0_rc8.tar.bz2" |