add special handling for the adm5120 target, which uses subtargets for different...

SVN-Revision: 17101

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 2cfce7a92dc418ea54b20a207459a1d2088f29da..2b5cb8671cc1e9f555fb31411547e967a4148eab 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -23,7 +23,11 @@ define Package/Default
   else
     VERSION:=$(PKG_RELEASE)
   endif
   else
     VERSION:=$(PKG_RELEASE)
   endif

-  PKGARCH:=$(BOARD)
+  ifneq ($(CONFIG_TARGET_adm5120),y)
+    PKGARCH:=$(BOARD)
+  else
+    PKGARCH:=$(BOARD)_$(ARCH)
+  endif

   PRIORITY:=optional
   DEFAULT:=
   MENU:=
   PRIORITY:=optional
   DEFAULT:=
   MENU:=

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 9f5faa347475a0d4003b34d2b077bfe50a5e614d..864a13b4789fc7deea15bb8689ff05c273b76e45 100644 (file)
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -59,7 +59,7 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               HOST_CPU="$(BOARD)" \
+               HOST_CPU="$(PKGARCH)" \

                all install
 endef
 
                all install
 endef
 


@@ -68,7 +68,7 @@ define Package/opkg/install
        $(INSTALL_DIR) $(1)/bin
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/bin
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/

-       $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/opkg.conf
+       $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg.conf

        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopkg.so.* $(1)/usr/lib/
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopkg.so.* $(1)/usr/lib/