aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-10-05 19:07:24 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-10-05 19:08:07 +0000
commit25f1e109e654f01ee6156899b95c4fd6cbe80e1b (patch)
tree43602986160e51672a89ff6ca08be24e45a67bf6
parenta3a664b544cd172d6bdfd05585f2564d4f0fc7ad (diff)
downloadalpine_aports-25f1e109e654f01ee6156899b95c4fd6cbe80e1b.tar.bz2
alpine_aports-25f1e109e654f01ee6156899b95c4fd6cbe80e1b.tar.xz
alpine_aports-25f1e109e654f01ee6156899b95c4fd6cbe80e1b.zip
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.patch25
-rw-r--r--main/alpine-conf/APKBUILD9
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 @@
1From 841c6823ac8a3f1e17af457722c8b7ea2abf8cb4 Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Wed, 30 Sep 2009 12:57:59 +0000
4Subject: [PATCH] setup-disk: check if the devce itself is mounted
5
6this will filter out loop0 device
7---
8 setup-disk.in | 1 +
9 1 files changed, 1 insertions(+), 0 deletions(-)
10
11diff --git a/setup-disk.in b/setup-disk.in
12index 33cc868..c11d20c 100644
13--- a/setup-disk.in
14+++ b/setup-disk.in
15@@ -149,6 +149,7 @@ has_mounted_part() {
16 # parse /proc/mounts for mounted devices
17 for p in $(awk '$1 ~ /^\/dev\// {gsub("/dev/", "", $1); print $1}' \
18 /proc/mounts); do
19+ [ "$p" = "$1" ] && return 0
20 [ -e /sys/block/$1/$p ] && return 0
21 done
22 return 1
23--
241.6.4.4
25
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 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2pkgname=alpine-conf 2pkgname=alpine-conf
3pkgver=2.0_rc7 3pkgver=2.0_rc8
4pkgrel=1 4pkgrel=0
5pkgdesc="Alpine configuration management scripts" 5pkgdesc="Alpine configuration management scripts"
6url=http://git.alpinelinux.org/cgit/$pkgname 6url=http://git.alpinelinux.org/cgit/$pkgname
7depends="openrc" 7depends="openrc"
8source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 8source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
9 0001-setup-disk-check-if-the-devce-itself-is-mounted.patch
10 " 9 "
11license="GPL-2" 10license="GPL-2"
12 11
13build() { 12build() {
14 cd "$srcdir/$pkgname-$pkgver" 13 cd "$srcdir/$pkgname-$pkgver"
15 patch -p1 -i ../0001-setup-disk-check-if-the-devce-itself-is-mounted.patch || return
16 14
17 make || return 1 15 make || return 1
18 make install PREFIX= DESTDIR="$pkgdir" 16 make install PREFIX= DESTDIR="$pkgdir"
@@ -20,5 +18,4 @@ build() {
20 ln -s lbu "$pkgdir"/sbin/lbu_$i 18 ln -s lbu "$pkgdir"/sbin/lbu_$i
21 done 19 done
22} 20}
23md5sums="8b44c02500d646dd64368904762d236e alpine-conf-2.0_rc7.tar.bz2 21md5sums="c84957f015989ed806aa393c398ce901 alpine-conf-2.0_rc8.tar.bz2"
24f51a1948ddf5f035e9e6509e57000ccd 0001-setup-disk-check-if-the-devce-itself-is-mounted.patch"