build: move the SH_FUNC eval to the beginning of the opkg control file build command...

[openwrt.git] / include / package-defaults.mk

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 117497d..1d29119 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -23,10 +23,15 @@ define Package/Default
   else
     VERSION:=$(PKG_RELEASE)
   endif
   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
   else

-    PKGARCH:=$(BOARD)_$(ARCH)
+    PKGARCH:=$(BOARD)

   endif
   PRIORITY:=optional
   DEFAULT:=
   endif
   PRIORITY:=optional
   DEFAULT:=


@@ -43,7 +48,7 @@ endef
 Build/Patch:=$(Build/Patch/Default)
 ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
 Build/Patch:=$(Build/Patch/Default)
 ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default

-       $(PKG_UNPACK)
+       $(SH_FUNC) $(PKG_UNPACK)

        $(Build/Patch)
   endef
 endif
        $(Build/Patch)
   endef
 endif