X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c7ee63dd761a6cf7f863b00181aaa2002784f06b..b8223ca287a2fbaf47f9fa298bb76b7326153964:/include/package-defaults.mk

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 117497d5d..1d29119d8 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -23,10 +23,15 @@ define Package/Default
   else
     VERSION:=$(PKG_RELEASE)
   endif
-  ifneq ($(CONFIG_TARGET_adm5120),y)
-    PKGARCH:=$(BOARD)
+  ifneq ($(PKG_FLAGS),)
+    PKGFLAGS:=$(PKG_FLAGS)
+  else
+    PKGFLAGS:=
+  endif
+  ifneq ($(ARCH_PACKAGES),)
+    PKGARCH:=$(ARCH_PACKAGES)
   else
-    PKGARCH:=$(BOARD)_$(ARCH)
+    PKGARCH:=$(BOARD)
   endif
   PRIORITY:=optional
   DEFAULT:=
@@ -43,7 +48,7 @@ endef
 Build/Patch:=$(Build/Patch/Default)
 ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
-  	$(PKG_UNPACK)
+	$(SH_FUNC) $(PKG_UNPACK)
 	$(Build/Patch)
   endef
 endif