diff options
| -rw-r--r-- | include/package-defaults.mk | 6 | ||||
| -rw-r--r-- | package/opkg/Makefile | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 2cfce7a92d..2b5cb8671c 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -23,7 +23,11 @@ define Package/Default else VERSION:=$(PKG_RELEASE) endif - PKGARCH:=$(BOARD) + ifneq ($(CONFIG_TARGET_adm5120),y) + PKGARCH:=$(BOARD) + else + PKGARCH:=$(BOARD)_$(ARCH) + endif PRIORITY:=optional DEFAULT:= MENU:= diff --git a/package/opkg/Makefile b/package/opkg/Makefile index 9f5faa3474..864a13b478 100644 --- 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)" \ - HOST_CPU="$(BOARD)" \ + HOST_CPU="$(PKGARCH)" \ 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/ - $(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/ |