projects
/
openwrt-working-2016
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename the Profile template that the image builder uses to prevent name conflicts...
[openwrt-working-2016/.git]
/
target
/
imagebuilder
/
files
/
Makefile
diff --git
a/target/imagebuilder/files/Makefile
b/target/imagebuilder/files/Makefile
index fbcfa0d49aa5a2a795f733483891ddb802fb8dbf..b36e2f2e31235308813a0ed781b8099a818b8ed5 100644
(file)
--- a/
target/imagebuilder/files/Makefile
+++ b/
target/imagebuilder/files/Makefile
@@
-37,7
+37,7
@@
define Profile/Default
PACKAGES:=
endef
PACKAGES:=
endef
-define Profile
+define
Add
Profile
$(eval $(call Profile/Default))
$(eval $(call Profile/$(1)))
ifneq ($(ID),)
$(eval $(call Profile/Default))
$(eval $(call Profile/$(1)))
ifneq ($(ID),)
@@
-87,6
+87,8
@@
$(TOPDIR)/tmp/ipkg.conf: FORCE
BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel)
BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD)-$(KERNEL),$(BUILD_PACKAGES))
BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel)
BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD)-$(KERNEL),$(BUILD_PACKAGES))
+# "-pkgname" in the package list means remove "pkgname" from the package list
+BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
image:
if [ -z "$($(PROFILE)_NAME)" ]; then \
image:
if [ -z "$($(PROFILE)_NAME)" ]; then \