ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 13:48:06 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

- correctly copy .config when scripts/env is used in the buildroot - prevent user provides PACKAGES from overriding per-profile defaults

Browse Source 
SVN-Revision: 21213
This commit is contained in:
Jo-Philipp Wich 2010-04-27 22:16:40 +00:00
parent ea5b74da62
commit cdd44e7984
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/imagebuilder/Makefile
View File

@ -23,9 +23,10 @@ all: compile
$(BIN_DIR)/$(IB_NAME).tar.bz2: clean $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host $(PKG_BUILD_DIR)/target mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host $(PKG_BUILD_DIR)/target
-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
$(CP) \ $(CP) \
$(INCLUDE_DIR) $(SCRIPT_DIR) \ $(INCLUDE_DIR) $(SCRIPT_DIR) \
$(TOPDIR)/rules.mk $(TOPDIR)/.config \ $(TOPDIR)/rules.mk \
./files/Makefile \ ./files/Makefile \
$(TMP_DIR)/.targetinfo \ $(TMP_DIR)/.targetinfo \
$(TMP_DIR)/.packageinfo \ $(TMP_DIR)/.packageinfo \

26
target/imagebuilder/files/Makefile
View File

@ -62,8 +62,8 @@ IPKG:= \
define Profile define Profile
$(eval $(call Profile/Default)) $(eval $(call Profile/Default))
$(eval $(call Profile/$(1))) $(eval $(call Profile/$(1)))
ifeq ($(PROFILE),) ifeq ($(USER_PROFILE),)
PROFILE:=$(1) USER_PROFILE:=$(1)
endif endif
$(1)_NAME:=$(NAME) $(1)_NAME:=$(NAME)
$(1)_PACKAGES:=$(PACKAGES) $(1)_PACKAGES:=$(PACKAGES)
@ -73,7 +73,7 @@ endef
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
info: FORCE _call_info: FORCE
echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"' echo 'Current Target: "$(BOARD)$(if $(SUBTARGET), ($(BOARDNAME)))"'
echo 'Default Packages: $(DEFAULT_PACKAGES)' echo 'Default Packages: $(DEFAULT_PACKAGES)'
echo 'Available Profiles:' echo 'Available Profiles:'
@ -84,19 +84,19 @@ $(TOPDIR)/tmp/ipkg.conf: FORCE
@echo 'dest root /' > $@ @echo 'dest root /' > $@
@echo 'src packages file:$(PACKAGE_DIR)' >> $@ @echo 'src packages file:$(PACKAGE_DIR)' >> $@
BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel) BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
# "-pkgname" in the package list means remove "pkgname" from the package list # "-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)) BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
image: _call_image:
echo 'Building images for $(BOARD)$(if $($(PROFILE)_NAME), - $($(PROFILE)_NAME))' echo 'Building images for $(BOARD)$(if $($(USER_PROFILE)_NAME), - $($(USER_PROFILE)_NAME))'
echo 'Packages: $(BUILD_PACKAGES)' echo 'Packages: $(BUILD_PACKAGES)'
echo echo
rm -rf $(TARGET_DIR) rm -rf $(TARGET_DIR)
mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR)
$(MAKE) package_index $(MAKE) package_index
$(MAKE) package_install $(MAKE) package_install
ifneq ($(FILES),) ifneq ($(USER_FILES),)
$(MAKE) copy_files $(MAKE) copy_files
endif endif
$(MAKE) package_postinst $(MAKE) package_postinst
@ -118,7 +118,7 @@ package_install: FORCE
copy_files: FORCE copy_files: FORCE
@echo @echo
@echo Copying extra files @echo Copying extra files
$(CP) $(FILES)/* $(TARGET_DIR)/ $(CP) $(USER_FILES)/* $(TARGET_DIR)/
package_postinst: FORCE package_postinst: FORCE
@echo @echo
@ -140,5 +140,15 @@ clean:
rm -rf tmp $(TARGET_DIR) $(BIN_DIR) rm -rf tmp $(TARGET_DIR) $(BIN_DIR)
info:
(unset PROFILE FILES PACKAGES MAKEFLAGS; $(MAKE) -s _call_info)
image:
(unset PROFILE FILES PACKAGES MAKEFLAGS; \
$(MAKE) _call_image \
$(if $(PROFILE),USER_PROFILE="$(PROFILE)") \
$(if $(FILES),USER_FILES="$(FILES)") \
$(if $(PACKAGES),USER_PACKAGES="$(PACKAGES)"))
.SILENT: help info image .SILENT: help info image