summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-05-03 08:40:36 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-05-03 08:44:48 +0000
commita61fd63a82565b4ea9167e4122683d5b63f80ba5 (patch)
tree7d730f7a2a6cf8b7cd55adeab6f8df51ce5e24a4 /main
parent98a9a9ca14b28394dc8827edd32eaee422b3bfcc (diff)
downloadaports-a61fd63a82565b4ea9167e4122683d5b63f80ba5.tar.bz2
aports-a61fd63a82565b4ea9167e4122683d5b63f80ba5.tar.xz
main/alpine-conf: fixes for setup-disk and setup-apkrepos
- add raid kernel module to /etc/modules - fix boudle slashes in url
Diffstat (limited to 'main')
-rw-r--r--main/alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch27
-rw-r--r--main/alpine-conf/0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch37
-rw-r--r--main/alpine-conf/APKBUILD10
3 files changed, 71 insertions, 3 deletions
diff --git a/main/alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch b/main/alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch
new file mode 100644
index 000000000..704a2a95f
--- /dev/null
+++ b/main/alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch
@@ -0,0 +1,27 @@
+From c23761a2c183f30c22a1811ba2e13b4c933f744f Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 3 May 2011 06:04:38 +0000
+Subject: [PATCH 1/2] setup-apkrepos: avoid double // in url
+
+---
+ setup-apkrepos.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup-apkrepos.in b/setup-apkrepos.in
+index 21eb802..d4e8d80 100755
+--- a/setup-apkrepos.in
++++ b/setup-apkrepos.in
+@@ -102,8 +102,8 @@ get_alpine_release() {
+
+ add_mirror() {
+ local mirror="$1"
+- echo "$mirror/$release/main" >> $APKREPOS_PATH
+- echo "#$mirror/$release/testing" >> $APKREPOS_PATH
++ echo "${mirror%/}/${release}/main" >> $APKREPOS_PATH
++ echo "#${mirror%/}/${release}/testing" >> $APKREPOS_PATH
+ echo "" >> $APKREPOS_PATH
+ echo "Added mirror $(get_hostname_from_url $mirror)"
+ }
+--
+1.7.4.5
+
diff --git a/main/alpine-conf/0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch b/main/alpine-conf/0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch
new file mode 100644
index 000000000..08c2964f3
--- /dev/null
+++ b/main/alpine-conf/0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch
@@ -0,0 +1,37 @@
+From 1a62591fa4176e9068e89f52194c4bac29e529a0 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 3 May 2011 08:34:01 +0000
+Subject: [PATCH 2/2] setup-disk: add raidmodules to /etc/modules if needed
+
+---
+ setup-disk.in | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/setup-disk.in b/setup-disk.in
+index ffbbc43..b27f76b 100644
+--- a/setup-disk.in
++++ b/setup-disk.in
+@@ -564,12 +564,20 @@ setup_var() {
+ rmdir /.var
+
+ /etc/init.d/syslog --quiet restart
++ setup_mdadm_conf
+ }
+
+ setup_mdadm_conf() {
++ local mods= mod=
+ if [ -n "$USE_RAID" ]; then
+ mdadm --detail --scan > /etc/mdadm.conf
+ rc-update --quiet add mdadm-raid boot
++ mods=$(awk '/^raid/ {print $1}' /proc/modules)
++ for mod in $mods; do
++ if ! grep -q "^$mod" /etc/modules; then
++ echo $mod >> /etc/modules
++ fi
++ done
+ fi
+ }
+
+--
+1.7.4.5
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 656e1f12a..a29c989cb 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,11 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=2.8.0
-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.git/snapshot/$pkgname-$pkgver.tar.bz2
+ 0001-setup-apkrepos-avoid-double-in-url.patch
+ 0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch
"
arch="all"
license="GPL-2"
@@ -25,7 +27,7 @@ prepare() {
build() {
cd "$_builddir"
- make || return 1
+ make VERSION=$pkgver-r$pkgrel || return 1
}
package() {
@@ -35,4 +37,6 @@ package() {
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
-md5sums="067f87974e78c895ec3a7404061c11d0 alpine-conf-2.8.0.tar.bz2"
+md5sums="067f87974e78c895ec3a7404061c11d0 alpine-conf-2.8.0.tar.bz2
+17cd6f91f68b4bbb1bc180dd17857e70 0001-setup-apkrepos-avoid-double-in-url.patch
+1403684c448c416733544bc13c660e86 0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch"