KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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.

Browse source 
SVN-Revision: 6102
This commit is contained in:
Felix Fietkau 2007-01-14 23:37:40 +00:00
parent fd9477a18f
commit 351d0d4b07
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/Makefile
View file

@ -50,7 +50,9 @@ prereq: $(PREREQ_PACKAGES)
download: $(DOWNLOAD_PACKAGES) download: $(DOWNLOAD_PACKAGES)
compile-targets: $(COMPILE_PACKAGES) compile-targets: $(COMPILE_PACKAGES)
compile: compile:
@-rm -f $(PACKAGE_DIR)/*.ipk
$(MAKE) compile-targets $(MAKE) compile-targets
install-targets: $(INSTALL_PACKAGES) install-targets: $(INSTALL_PACKAGES)
install: install:
rm -rf $(BUILD_DIR)/root rm -rf $(BUILD_DIR)/root

10
target/Makefile
View file

@ -20,7 +20,15 @@ IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
download: $(patsubst %,%-download,$(TARGETS-y)) download: $(patsubst %,%-download,$(TARGETS-y))
prepare: linux-prepare prepare: linux-prepare
compile: linux-compile image_compile 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 clean: linux-clean sdk-clean imagebuilder-clean image_clean
prereq: FORCE prereq: FORCE

4
target/imagebuilder/Makefile
View file

@ -18,7 +18,7 @@ IB_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
all: compile all: compile
$(BIN_DIR)/$(IB_NAME).tar.bz2: FORCE $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
rm -rf $(IB_BUILD_DIR) 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 mkdir -p $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin $(IB_BUILD_DIR)/target/linux
$(CP) \ $(CP) \
@ -43,5 +43,5 @@ prepare:
compile: $(BIN_DIR)/$(IB_NAME).tar.bz2 compile: $(BIN_DIR)/$(IB_NAME).tar.bz2
install: compile install: compile
clean: clean: FORCE
rm -rf $(IB_BUILD_DIR) $(BIN_DIR)/$(IB_NAME).tar.bz2 rm -rf $(IB_BUILD_DIR) $(BIN_DIR)/$(IB_NAME).tar.bz2

5
target/sdk/Makefile
View file

@ -18,8 +18,7 @@ SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
all: compile all: compile
$(BIN_DIR)/$(SDK_NAME).tar.bz2: $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
rm -rf $(SDK_BUILD_DIR)
mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
$(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ $(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
$(TAR) -cf - -C $(TOPDIR) --exclude=ccache/ staging_dir_$(ARCH) | \ $(TAR) -cf - -C $(TOPDIR) --exclude=ccache/ staging_dir_$(ARCH) | \
@ -45,7 +44,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
download: download:
prepare: prepare:
compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2 compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2
install: install: compile
clean: clean:
rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2 rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2