projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
atheros: add fstype to combined image file name
[openwrt/openwrt.git]
/
include
/
package-defaults.mk
diff --git
a/include/package-defaults.mk
b/include/package-defaults.mk
index e7d74b1ae122b1a1204e2fcd99dcd86768af39fe..017a86d1e8d0d4309d10602093be10aa90b16d1e 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:=
@@
-33,6
+37,7
@@
define Package/Default
KCONFIG:=
BUILDONLY:=
URL:=
KCONFIG:=
BUILDONLY:=
URL:=
+ VARIANT:=
endef
Build/Patch:=$(Build/Patch/Default)
endef
Build/Patch:=$(Build/Patch/Default)
@@
-61,7
+66,8
@@
CONFIGURE_ARGS = \
--mandir=$(CONFIGURE_PREFIX)/man \
--infodir=$(CONFIGURE_PREFIX)/info \
$(DISABLE_NLS) \
--mandir=$(CONFIGURE_PREFIX)/man \
--infodir=$(CONFIGURE_PREFIX)/info \
$(DISABLE_NLS) \
- $(DISABLE_LARGEFILE)
+ $(DISABLE_LARGEFILE) \
+ $(DISABLE_IPV6)
CONFIGURE_VARS = \
$(TARGET_CONFIGURE_OPTS) \
CONFIGURE_VARS = \
$(TARGET_CONFIGURE_OPTS) \
@@
-84,8
+90,7
@@
define Build/Configure/Default
$(2) \
$(CONFIGURE_CMD) \
$(CONFIGURE_ARGS) \
$(2) \
$(CONFIGURE_CMD) \
$(CONFIGURE_ARGS) \
- $(1) \
- $(DISABLE_IPV6); \
+ $(1); \
fi; \
)
endef
fi; \
)
endef