From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 8 Sep 2010 05:46:37 +0000 (+0000)
Subject: [imagebuilder] fix arch detection pattern to cope with underscores in board name... 
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/cbcb7e2471677594c9a54d64a4f73003c75d8245

[imagebuilder] fix arch detection pattern to cope with underscores in board name, e.g. "adm5120_mips"


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22980 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/imagebuilder/files/opkg-generate-config.sh b/target/imagebuilder/files/opkg-generate-config.sh
index a385d9fa9..d8fb0e406 100755
--- a/target/imagebuilder/files/opkg-generate-config.sh
+++ b/target/imagebuilder/files/opkg-generate-config.sh
@@ -12,7 +12,8 @@ TARGETDIR="${1}"
 PKGARCH=
 for pkg in $TOPDIR/packages/*.ipk; do
 	if [ -f "$pkg" ]; then
-		PKGARCH="${pkg##*_}"
+		PKGARCH="${pkg##*/}"
+		PKGARCH="${PKGARCH#*_*_}"
 		PKGARCH="${PKGARCH%.ipk}"
 		[ "$PKGARCH" = all ] || break
 	fi