[backfire] merge r22980

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22981 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/imagebuilder/files/opkg-generate-config.sh b/target/imagebuilder/files/opkg-generate-config.sh
index a385d9fa9b93b988c7407622aa444a36b8435848..d8fb0e40653b2598914ded34e9e9c005853f8131 100755 (executable)
--- 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