Fix config checks for Image Builder and SDK - only build them when requested. Clear all packages from bin/packages at the beginning of package/compile when the Image Builder is selected, because the Image Builder can't handle multiple versions of the same package.
SVN-Revision: 6102
This commit is contained in:
parent
fd9477a18f
commit
351d0d4b07
4 changed files with 15 additions and 6 deletions
|
@ -50,7 +50,9 @@ prereq: $(PREREQ_PACKAGES)
|
|||
download: $(DOWNLOAD_PACKAGES)
|
||||
compile-targets: $(COMPILE_PACKAGES)
|
||||
compile:
|
||||
@-rm -f $(PACKAGE_DIR)/*.ipk
|
||||
$(MAKE) compile-targets
|
||||
|
||||
install-targets: $(INSTALL_PACKAGES)
|
||||
install:
|
||||
rm -rf $(BUILD_DIR)/root
|
||||
|
|
|
@ -20,7 +20,15 @@ IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
|
|||
download: $(patsubst %,%-download,$(TARGETS-y))
|
||||
prepare: linux-prepare
|
||||
compile: linux-compile image_compile
|
||||
install: image_clean linux-install sdk_install image_install imagebuilder_install
|
||||
install: image_clean linux-install image_install
|
||||
|
||||
ifeq ($(CONFIG_SDK),y)
|
||||
install: sdk_install
|
||||
endif
|
||||
ifeq ($(CONFIG_IB),y)
|
||||
install: imagebuilder_install
|
||||
endif
|
||||
|
||||
clean: linux-clean sdk-clean imagebuilder-clean image_clean
|
||||
|
||||
prereq: FORCE
|
||||
|
|
|
@ -18,7 +18,7 @@ IB_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
|
|||
|
||||
all: compile
|
||||
|
||||
$(BIN_DIR)/$(IB_NAME).tar.bz2: FORCE
|
||||
$(BIN_DIR)/$(IB_NAME).tar.bz2: clean
|
||||
rm -rf $(IB_BUILD_DIR)
|
||||
mkdir -p $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin $(IB_BUILD_DIR)/target/linux
|
||||
$(CP) \
|
||||
|
@ -43,5 +43,5 @@ prepare:
|
|||
compile: $(BIN_DIR)/$(IB_NAME).tar.bz2
|
||||
install: compile
|
||||
|
||||
clean:
|
||||
clean: FORCE
|
||||
rm -rf $(IB_BUILD_DIR) $(BIN_DIR)/$(IB_NAME).tar.bz2
|
||||
|
|
|
@ -18,8 +18,7 @@ SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
|
|||
|
||||
all: compile
|
||||
|
||||
$(BIN_DIR)/$(SDK_NAME).tar.bz2:
|
||||
rm -rf $(SDK_BUILD_DIR)
|
||||
$(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
|
||||
mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
|
||||
$(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
|
||||
$(TAR) -cf - -C $(TOPDIR) --exclude=ccache/ staging_dir_$(ARCH) | \
|
||||
|
@ -45,7 +44,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
|
|||
download:
|
||||
prepare:
|
||||
compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2
|
||||
install:
|
||||
install: compile
|
||||
|
||||
clean:
|
||||
rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2
|
||||
|
|
Loading…
Reference in a new issue