Browse code

Merge pull request #33694 from shakeme/master

Small fix and new option for contrib/mkimage_alpine.sh

Brian Goff authored on 2017/06/21 09:00:30
Showing 1 changed files
... ...
@@ -8,7 +8,7 @@ set -e
8 8
 }
9 9
 
10 10
 usage() {
11
-	printf >&2 '%s: [-r release] [-m mirror] [-s]  [-c additional repository]\n' "$0"
11
+	printf >&2 '%s: [-r release] [-m mirror] [-s] [-c additional repository] [-a arch]\n' "$0"
12 12
 	exit 1
13 13
 }
14 14
 
... ...
@@ -52,7 +52,7 @@ save() {
52 52
 	tar --numeric-owner -C $ROOTFS -c . | xz > rootfs.tar.xz
53 53
 }
54 54
 
55
-while getopts "hr:m:s" opt; do
55
+while getopts "hr:m:sc:a:" opt; do
56 56
 	case $opt in
57 57
 		r)
58 58
 			REL=$OPTARG
... ...
@@ -64,7 +64,10 @@ while getopts "hr:m:s" opt; do
64 64
 			SAVE=1
65 65
 			;;
66 66
 		c)
67
-			ADDITIONALREPO=community
67
+			ADDITIONALREPO=$OPTARG
68
+			;;
69
+		a)
70
+			ARCH=$OPTARG
68 71
 			;;
69 72
 		*)
70 73
 			usage
... ...
@@ -76,7 +79,7 @@ REL=${REL:-edge}
76 76
 MIRROR=${MIRROR:-http://nl.alpinelinux.org/alpine}
77 77
 SAVE=${SAVE:-0}
78 78
 MAINREPO=$MIRROR/$REL/main
79
-ADDITIONALREPO=$MIRROR/$REL/community
79
+ADDITIONALREPO=$MIRROR/$REL/${ADDITIONALREPO:-community}
80 80
 ARCH=${ARCH:-$(uname -m)}
81 81
 
82 82
 tmp