aboutsummaryrefslogtreecommitdiffstats
path: root/target/imagebuilder/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-09-08 05:46:37 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-09-08 05:46:37 +0000
commitddeacdb51a55f4b17c32d24680e5519baa203877 (patch)
treede557496c898c8cd17724739e4ef16beac7ccdd6 /target/imagebuilder/files
parentc2739d2e24a5e0c0cf1563509374781955d9b9ad (diff)
downloadupstream-ddeacdb51a55f4b17c32d24680e5519baa203877.tar.gz
upstream-ddeacdb51a55f4b17c32d24680e5519baa203877.tar.bz2
upstream-ddeacdb51a55f4b17c32d24680e5519baa203877.zip
[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
Diffstat (limited to 'target/imagebuilder/files')
-rwxr-xr-xtarget/imagebuilder/files/opkg-generate-config.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/target/imagebuilder/files/opkg-generate-config.sh b/target/imagebuilder/files/opkg-generate-config.sh
index a385d9fa9b..d8fb0e4065 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