projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.18 to 3.18.6
[openwrt.git]
/
include
/
package-defaults.mk
diff --git
a/include/package-defaults.mk
b/include/package-defaults.mk
index
a0f859c
..
6a345b6
100644
(file)
--- a/
include/package-defaults.mk
+++ b/
include/package-defaults.mk
@@
-19,6
+19,7
@@
define Package/Default
CATEGORY:=Extra packages
DEPENDS:=
MDEPENDS:=
CATEGORY:=Extra packages
DEPENDS:=
MDEPENDS:=
+ CONFLICTS:=
PROVIDES:=
EXTRA_DEPENDS:=
MAINTAINER:=$(PKG_MAINTAINER)
PROVIDES:=
EXTRA_DEPENDS:=
MAINTAINER:=$(PKG_MAINTAINER)
@@
-32,6
+33,7
@@
define Package/Default
else
VERSION:=$(PKG_RELEASE)
endif
else
VERSION:=$(PKG_RELEASE)
endif
+ ABI_VERSION:=
ifneq ($(PKG_FLAGS),)
PKGFLAGS:=$(PKG_FLAGS)
else
ifneq ($(PKG_FLAGS),)
PKGFLAGS:=$(PKG_FLAGS)
else
@@
-42,7
+44,6
@@
define Package/Default
else
PKGARCH:=$(BOARD)
endif
else
PKGARCH:=$(BOARD)
endif
- PRIORITY:=optional
DEFAULT:=
MENU:=
SUBMENU:=
DEFAULT:=
MENU:=
SUBMENU:=
@@
-53,6
+54,8
@@
define Package/Default
HIDDEN:=
URL:=
VARIANT:=
HIDDEN:=
URL:=
VARIANT:=
+ DEFAULT_VARIANT:=
+ USERID:=
endef
Build/Patch:=$(Build/Patch/Default)
endef
Build/Patch:=$(Build/Patch/Default)
@@
-64,6
+67,7
@@
ifneq ($(strip $(PKG_UNPACK)),)
endif
EXTRA_CXXFLAGS = $(EXTRA_CFLAGS)
endif
EXTRA_CXXFLAGS = $(EXTRA_CFLAGS)
+DISABLE_NLS:=--disable-nls
CONFIGURE_PREFIX:=/usr
CONFIGURE_ARGS = \
CONFIGURE_PREFIX:=/usr
CONFIGURE_ARGS = \
@@
-96,7
+100,9
@@
CONFIGURE_VARS = \
CONFIGURE_PATH = .
CONFIGURE_CMD = ./configure
CONFIGURE_PATH = .
CONFIGURE_CMD = ./configure
-replace_script=$(FIND) $(1) -name $(2) | $(XARGS) chmod u+w; $(FIND) $(1) -name $(2) | $(XARGS) -n1 cp $(SCRIPT_DIR)/$(2);
+replace_script=$(FIND) $(1) -name $(2) | $(XARGS) chmod u+w; \
+ $(FIND) $(1) -name $(2) | $(XARGS) -n1 cp --remove-destination \
+ $(SCRIPT_DIR)/$(2);
define Build/Configure/Default
(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \
define Build/Configure/Default
(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH)/$(strip $(3)); \