From 6cc2ed537e2b4136bded37daa2378e98d41e7945 Mon Sep 17 00:00:00 2001
From: Robert Schneider <mail@shakeme.info>
Date: Thu, 15 Jun 2017 15:23:16 +0200
Subject: [PATCH 1/2] Fix getopts in mkimage-alpine.sh

Signed-off-by: Robert Schneider <mail@shakeme.info>
Upstream-commit: a89d282dbb9eefe043a7a2dcfb146b11ade720d1
Component: engine
---
 components/engine/contrib/mkimage-alpine.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/engine/contrib/mkimage-alpine.sh b/components/engine/contrib/mkimage-alpine.sh
index 47cd35ce62..8df64d68f5 100755
--- a/components/engine/contrib/mkimage-alpine.sh
+++ b/components/engine/contrib/mkimage-alpine.sh
@@ -52,7 +52,7 @@ save() {
 	tar --numeric-owner -C $ROOTFS -c . | xz > rootfs.tar.xz
 }
 
-while getopts "hr:m:s" opt; do
+while getopts "hr:m:sc:" opt; do
 	case $opt in
 		r)
 			REL=$OPTARG
@@ -64,7 +64,7 @@ while getopts "hr:m:s" opt; do
 			SAVE=1
 			;;
 		c)
-			ADDITIONALREPO=community
+			ADDITIONALREPO=$OPTARG
 			;;
 		*)
 			usage
@@ -76,7 +76,7 @@ REL=${REL:-edge}
 MIRROR=${MIRROR:-http://nl.alpinelinux.org/alpine}
 SAVE=${SAVE:-0}
 MAINREPO=$MIRROR/$REL/main
-ADDITIONALREPO=$MIRROR/$REL/community
+ADDITIONALREPO=$MIRROR/$REL/${ADDITIONALREPO:-community}
 ARCH=${ARCH:-$(uname -m)}
 
 tmp

From 01e1289926dd229c9dd54b9f85da8c33c34b3076 Mon Sep 17 00:00:00 2001
From: Robert Schneider <mail@shakeme.info>
Date: Thu, 15 Jun 2017 15:30:08 +0200
Subject: [PATCH 2/2] Add option for architecture to mkimage-alpine.sh

Signed-off-by: Robert Schneider <mail@shakeme.info>
Upstream-commit: 23f0c20b021849283fb422fab735d893c1946f46
Component: engine
---
 components/engine/contrib/mkimage-alpine.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/engine/contrib/mkimage-alpine.sh b/components/engine/contrib/mkimage-alpine.sh
index 8df64d68f5..a271effaa6 100755
--- a/components/engine/contrib/mkimage-alpine.sh
+++ b/components/engine/contrib/mkimage-alpine.sh
@@ -8,7 +8,7 @@ set -e
 }
 
 usage() {
-	printf >&2 '%s: [-r release] [-m mirror] [-s]  [-c additional repository]\n' "$0"
+	printf >&2 '%s: [-r release] [-m mirror] [-s] [-c additional repository] [-a arch]\n' "$0"
 	exit 1
 }
 
@@ -52,7 +52,7 @@ save() {
 	tar --numeric-owner -C $ROOTFS -c . | xz > rootfs.tar.xz
 }
 
-while getopts "hr:m:sc:" opt; do
+while getopts "hr:m:sc:a:" opt; do
 	case $opt in
 		r)
 			REL=$OPTARG
@@ -66,6 +66,9 @@ while getopts "hr:m:sc:" opt; do
 		c)
 			ADDITIONALREPO=$OPTARG
 			;;
+		a)
+			ARCH=$OPTARG
+			;;
 		*)
 			usage
 			;;