diff options
Diffstat (limited to 'openwrt/target')
| -rw-r--r-- | openwrt/target/linux/image/Makefile | 10 | ||||
| -rw-r--r-- | openwrt/target/linux/image/jffs2.mk | 22 | ||||
| -rw-r--r-- | openwrt/target/linux/image/squashfs.mk | 18 | ||||
| -rw-r--r-- | openwrt/target/linux/linux-2.4/Makefile | 44 | ||||
| -rw-r--r-- | openwrt/target/linux/linux-2.4/ar7.mk | 2 | ||||
| -rw-r--r-- | openwrt/target/linux/linux-2.4/broadcom.mk | 10 | ||||
| -rw-r--r-- | openwrt/target/linux/linux-2.4/soekris.mk | 2 | ||||
| -rw-r--r-- | openwrt/target/linux/linux-2.6/Makefile | 33 | ||||
| -rw-r--r-- | openwrt/target/linux/package/openwrt/Makefile | 5 | ||||
| -rw-r--r-- | openwrt/target/linux/rules.mk | 2 | ||||
| -rw-r--r-- | openwrt/target/lzma/Makefile | 24 |
11 files changed, 103 insertions, 69 deletions
diff --git a/openwrt/target/linux/image/Makefile b/openwrt/target/linux/image/Makefile index 1dd48c752..68b1bd39c 100644 --- a/openwrt/target/linux/image/Makefile +++ b/openwrt/target/linux/image/Makefile @@ -15,8 +15,16 @@ include ./tgz.mk endif prepare: + @$(PKG_TRACE) Preparing... + $(MAKE) prepare-targets $(MAKE_TRACE) compile: + @$(PKG_TRACE) Compiling... + $(MAKE) compile-targets $(MAKE_TRACE) install: + @$(PKG_TRACE) Installing... + $(MAKE) install-targets $(MAKE_TRACE) + +.PHONY: prepare compile install $(BOARD)-compile: @$(TRACE) target/linux/image/$(BOARD)/prepare @@ -38,4 +46,6 @@ install-prepare: rebuild: clean prepare compile install clean: + @$(PKG_TRACE) Cleaning... + $(MAKE) clean-targets $(MAKE_TRACE) diff --git a/openwrt/target/linux/image/jffs2.mk b/openwrt/target/linux/image/jffs2.mk index ab8cfbef3..6d6469dcd 100644 --- a/openwrt/target/linux/image/jffs2.mk +++ b/openwrt/target/linux/image/jffs2.mk @@ -2,24 +2,24 @@ JFFS2OPTS := --pad --little-endian --squash #JFFS2OPTS += -Xlzo -msize -Xlzari jffs2-prepare: - $(MAKE) -C jffs2 prepare + $(MAKE) -C jffs2 prepare $(MAKE_TRACE) -jffs2-compile: - $(MAKE) -C jffs2 compile +jffs2-compile: prepare-targets + $(MAKE) -C jffs2 compile $(MAKE_TRACE) jffs2-clean: - $(MAKE) -C jffs2 clean + $(MAKE) -C jffs2 clean $(MAKE_TRACE) rm -f $(KDIR)/root.jffs2* $(KDIR)/root.jffs2-4MB: install-prepare @rm -rf $(KDIR)/root/jffs - $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root + $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root $(MAKE_TRACE) $(KDIR)/root.jffs2-8MB: install-prepare @rm -rf $(KDIR)/root/jffs - $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root + $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root $(MAKE_TRACE) -jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB $(BOARD)-compile +jffs2-install: compile-targets $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB $(BOARD)-compile $(TRACE) target/linux/image/$(BOARD)/install $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB" $(TRACE) target/linux/image/$(BOARD)/install @@ -29,9 +29,9 @@ jffs2-install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin cp $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin -prepare: jffs2-prepare -compile: jffs2-compile -install: jffs2-install +prepare-targets: jffs2-prepare +compile-targets: jffs2-compile +install-targets: jffs2-install install-ib: jffs2-install-ib -clean: jffs2-clean +clean-targets: jffs2-clean diff --git a/openwrt/target/linux/image/squashfs.mk b/openwrt/target/linux/image/squashfs.mk index 00411c05e..30222c6ab 100644 --- a/openwrt/target/linux/image/squashfs.mk +++ b/openwrt/target/linux/image/squashfs.mk @@ -1,18 +1,18 @@ squashfs-prepare: - $(MAKE) -C squashfs prepare + $(MAKE) -C squashfs prepare $(MAKE_TRACE) -squashfs-compile: - $(MAKE) -C squashfs compile +squashfs-compile: prepare-targets + $(MAKE) -C squashfs compile $(MAKE_TRACE) squashfs-clean: - $(MAKE) -C squashfs clean + $(MAKE) -C squashfs clean $(MAKE_TRACE) rm -f $(KDIR)/root.squashfs $(KDIR)/root.squashfs: install-prepare @mkdir -p $(KDIR)/root/jffs - $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le + $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le $(MAKE_TRACE) -squashfs-install: $(KDIR)/root.squashfs $(BOARD)-compile +squashfs-install: install-targets $(KDIR)/root.squashfs $(BOARD)-compile $(TRACE) target/linux/image/$(BOARD)/install $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs" @@ -20,8 +20,8 @@ squashfs-install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin cp $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin -prepare: squashfs-prepare -compile: squashfs-compile -install: squashfs-install +prepare-targets: squashfs-prepare +compile-targets: squashfs-compile +install-targets: squashfs-install install-ib: squashfs-install-ib clean: squashfs-clean diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile index 2754c4230..f455c92bd 100644 --- a/openwrt/target/linux/linux-2.4/Makefile +++ b/openwrt/target/linux/linux-2.4/Makefile @@ -204,6 +204,7 @@ $(PACKAGE_DIR): mkdir -p $(PACKAGE_DIR) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) + @$(PKG_TRACE) Preparing... -mkdir -p $(LINUX_BUILD_DIR) bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) - rm -f $(LINUX_DIR) @@ -211,34 +212,35 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) touch $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked - $(PATCH) $(LINUX_DIR) ./patches/generic - [ -d ./patches/$(BOARD) ] && $(PATCH) $(LINUX_DIR) ./patches/$(BOARD) + $(PATCH) $(LINUX_DIR) ./patches/generic $(MAKE_TRACE) + [ -d ./patches/$(BOARD) ] && $(PATCH) $(LINUX_DIR) ./patches/$(BOARD) $(MAKE_TRACE) touch $(LINUX_DIR)/.patched $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched + @$(PKG_TRACE) Configuring... -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \ $(LINUX_DIR)/Makefile \ $(LINUX_DIR)/arch/*/Makefile $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile - $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/version.h + $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/version.h $(MAKE_TRACE) touch $(LINUX_DIR)/.configured $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured - $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) dep + $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) dep $(MAKE_TRACE) touch $(LINUX_DIR)/.depend_done $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done - $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) + $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(MAKE_TRACE) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux - $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ $(MAKE_TRACE) touch -c $(LINUX_KERNEL) $(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) $(LINUX_IMAGE) rm -rf $(LINUX_BUILD_DIR)/modules - $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules - $(MAKE) -C $(LINUX_DIR) DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install + $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules $(MAKE_TRACE) + $(MAKE) -C $(LINUX_DIR) DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE) touch $(LINUX_DIR)/.modules_done $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured @@ -249,11 +251,6 @@ $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured $(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done @mkdir -p $(STAMP_DIR) @$(MAKE) $(TARGETS) - ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR) - @$(TRACE) target/linux/package - $(MAKE) -C $(TOPDIR)/target/linux/package \ - $(KPKG_MAKEOPTS) \ - compile touch $@ $(TARGET_MODULES_DIR): @@ -262,7 +259,7 @@ $(TARGET_MODULES_DIR): $(KERNEL_IPKG): rm -rf $(KERNEL_IDIR) mkdir -p $(KERNEL_IDIR)/etc - $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(PKG_RELEASE) $(ARCH) echo 'Package: kernel-$(LINUX_VERSION)-$(BOARD)' >> $(KERNEL_IDIR)/CONTROL/control if [ -f ./config/$(BOARD).modules ]; then \ cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \ @@ -271,7 +268,14 @@ $(KERNEL_IPKG): source: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured -compile: $(STAMP_DIR)/.linux-compile +compile: + @$(PKG_TRACE) Compiling... + $(MAKE) $(STAMP_DIR)/.linux-compile $(MAKE_TRACE) + ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR) + @$(TRACE) target/linux/package + $(MAKE) -C $(TOPDIR)/target/linux/package \ + $(KPKG_MAKEOPTS) \ + compile install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG) rm -rf $(LINUX_BUILD_DIR)/root* @@ -280,23 +284,25 @@ install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG) $(MAKE) -C $(TOPDIR)/target/linux/package \ $(KPKG_MAKEOPTS) \ install - [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true + { [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true } $(MAKE_TRACE) mostlyclean: + @$(PKG_TRACE) Cleaning... rm -f $(STAMP_DIR)/.linux-compile rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked - $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean + $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean $(MAKE_TRACE) rm -f $(LINUX_KERNEL) $(LINUX_IMAGE) rebuild: -$(MAKE) mostlyclean if [ -f $(LINUX_KERNEL) ]; then \ - $(MAKE) clean; \ + $(MAKE) clean $(MAKE_TRACE); \ fi - $(MAKE) compile + $(MAKE) compile $(MAKE_TRACE) clean: + @$(PKG_TRACE) Cleaning... rm -f $(STAMP_DIR)/.linux-compile rm -rf $(LINUX_BUILD_DIR) rm -f $(TARGETS) diff --git a/openwrt/target/linux/linux-2.4/ar7.mk b/openwrt/target/linux/linux-2.4/ar7.mk index db613b0c5..8fd797bf4 100644 --- a/openwrt/target/linux/linux-2.4/ar7.mk +++ b/openwrt/target/linux/linux-2.4/ar7.mk @@ -12,7 +12,7 @@ ATM_FIRMWARE_FILE=$(ATM_FIRMWARE_DIR).tar.gz ATM_FIRMWARE_MD5SUM=8bfcb31109796502d66b11baaeb2fba6 $(DL_DIR)/$(ATM_FIRMWARE_FILE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(ATM_FIRMWARE_FILE) $(ATM_FIRMWARE_MD5SUM) $(DOWNLOAD_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(ATM_FIRMWARE_FILE) $(ATM_FIRMWARE_MD5SUM) $(DOWNLOAD_SITE) $(MAKE_TRACE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(ATM_FIRMWARE_FILE) $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.drivers-unpacked diff --git a/openwrt/target/linux/linux-2.4/broadcom.mk b/openwrt/target/linux/linux-2.4/broadcom.mk index bde9e1491..8419c5e85 100644 --- a/openwrt/target/linux/linux-2.4/broadcom.mk +++ b/openwrt/target/linux/linux-2.4/broadcom.mk @@ -27,10 +27,10 @@ LINUX_ET_DRIVER=kernel-source-et-0.11.tar.gz LINUX_ET_MD5SUM=bdc23ab59440793e35cab039457f6358 $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) $(LINUX_BINARY_WL_MD5SUM) $(LINUX_BINARY_DRIVER_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) $(LINUX_BINARY_WL_MD5SUM) $(LINUX_BINARY_DRIVER_SITE) $(MAKE_TRACE) $(DL_DIR)/$(LINUX_ET_DRIVER): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_ET_DRIVER) $(LINUX_ET_MD5SUM) $(LINUX_BINARY_DRIVER_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_ET_DRIVER) $(LINUX_ET_MD5SUM) $(LINUX_BINARY_DRIVER_SITE) $(MAKE_TRACE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) $(DL_DIR)/$(LINUX_ET_DRIVER) $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.drivers-unpacked @@ -42,11 +42,11 @@ $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked zcat $(DL_DIR)/$(LINUX_ET_DRIVER) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - # copy binary wlan driver mkdir -p $(LINUX_DIR)/drivers/net/{et,wl} - cp -a $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl + cp -fpR $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl # copy proprietary et source - cp -a $(BUILD_DIR)/et/* $(LINUX_DIR)/drivers/net/et + cp -fpR $(BUILD_DIR)/et/* $(LINUX_DIR)/drivers/net/et mkdir -p $(LINUX_DIR)/arch/mips/bcm947xx/include/ - cp -a $(BUILD_DIR)/et/*.h $(LINUX_DIR)/arch/mips/bcm947xx/include/ + cp -fpR $(BUILD_DIR)/et/*.h $(LINUX_DIR)/arch/mips/bcm947xx/include/ touch $@ linux-dirclean: drivers-clean diff --git a/openwrt/target/linux/linux-2.4/soekris.mk b/openwrt/target/linux/linux-2.4/soekris.mk index fdfbbf9b9..8b308a0a5 100644 --- a/openwrt/target/linux/linux-2.4/soekris.mk +++ b/openwrt/target/linux/linux-2.4/soekris.mk @@ -11,7 +11,7 @@ $(eval $(call KMOD_template,WD1100,wd1100,\ $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux - $(MAKE) -C $(LINUX_DIR) TOPDIR=$(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage + $(MAKE) -C $(LINUX_DIR) TOPDIR=$(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE) cp -f $(LINUX_DIR)/arch/i386/boot/bzImage $@ touch $@ diff --git a/openwrt/target/linux/linux-2.6/Makefile b/openwrt/target/linux/linux-2.6/Makefile index b61adf625..7c254755d 100644 --- a/openwrt/target/linux/linux-2.6/Makefile +++ b/openwrt/target/linux/linux-2.6/Makefile @@ -179,9 +179,11 @@ $(PACKAGE_DIR): $(DL_DIR)/$(LINUX_SOURCE): -mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE) + @$(PKG_TRACE) Downloading... + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE) $(MAKE_TRACE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) + @$(PKG_TRACE) Preparing... -mkdir -p $(LINUX_BUILD_DIR) bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) - rm -f $(LINUX_DIR) @@ -189,26 +191,27 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) touch $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked - $(PATCH) $(LINUX_DIR) ./patches/generic - [ -d ./patches/$(BOARD) ] && $(PATCH) $(LINUX_DIR) ./patches/$(BOARD) + $(PATCH) $(LINUX_DIR) ./patches/generic $(MAKE_TRACE) + [ -d ./patches/$(BOARD) ] && $(PATCH) $(LINUX_DIR) ./patches/$(BOARD) $(MAKE_TRACE) touch $(LINUX_DIR)/.patched $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched + @$(PKG_TRACE) Configuring... -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config - $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig + $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig $(MAKE_TRACE) touch $(LINUX_DIR)/.configured $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.configured - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(MAKE_TRACE) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux - $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ $(MAKE_TRACE) touch -c $(LINUX_KERNEL) $(LINUX_DIR)/.modules_done: $(LINUX_KERNEL) $(LINUX_IMAGE) rm -rf $(LINUX_BUILD_DIR)/modules - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) modules $(MAKE_TRACE) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE) touch $(LINUX_DIR)/.modules_done $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured @@ -228,11 +231,17 @@ $(KERNEL_IPKG): cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \ fi $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR) - + +$(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done + @mkdir -p $(STAMP_DIR) + @$(MAKE) $(TARGETS) + touch $@ source: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured -compile: $(LINUX_DIR)/.modules_done $(TARGETS) +compile: + @$(PKG_TRACE) Compiling... + $(MAKE) $(STAMP_DIR)/.linux-compile $(MAKE_TRACE) ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR) @$(TRACE) target/linux/package $(MAKE) -C $(TOPDIR)/target/linux/package \ @@ -246,7 +255,7 @@ install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG) $(MAKE) -C $(TOPDIR)/target/linux/package \ $(KPKG_MAKEOPTS) \ install - [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true + @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true } $(MAKE_TRACE) mostlyclean: rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done @@ -262,5 +271,7 @@ rebuild: $(MAKE) compile clean: + @$(PKG_TRACE) Cleaning... + rm -f $(STAMP_DIR)/.linux-compile rm -rf $(LINUX_BUILD_DIR) rm -f $(TARGETS) diff --git a/openwrt/target/linux/package/openwrt/Makefile b/openwrt/target/linux/package/openwrt/Makefile index d1f867351..ef2c1cea0 100644 --- a/openwrt/target/linux/package/openwrt/Makefile +++ b/openwrt/target/linux/package/openwrt/Makefile @@ -42,8 +42,11 @@ $(IPKG_OPENWRT): $(IDIR_OPENWRT) $(RSTRIP) $(IDIR_OPENWRT) $(IPKG_BUILD) $(IDIR_OPENWRT) $(PACKAGE_DIR) -install: compile +install: compile openwrt-install + +openwrt-install: $(IPKG) install $(IPKG_OPENWRT) + compile: install-dev $(IPKG_OPENWRT) install-dev: mkdir -p $(STAGING_DIR)/usr/include diff --git a/openwrt/target/linux/rules.mk b/openwrt/target/linux/rules.mk index 606efb6d9..2c0fa09c5 100644 --- a/openwrt/target/linux/rules.mk +++ b/openwrt/target/linux/rules.mk @@ -43,7 +43,7 @@ ifneq ($(6),) done endif $(8) - $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) + $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) $(MAKE_TRACE) endef diff --git a/openwrt/target/lzma/Makefile b/openwrt/target/lzma/Makefile index ac25703b5..17c029532 100644 --- a/openwrt/target/lzma/Makefile +++ b/openwrt/target/lzma/Makefile @@ -17,19 +17,22 @@ LZMA_ALONE_DIR=$(LZMA_DIR)/SRC/7zip/Compress/LZMA_Alone TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma $(DL_DIR)/$(LZMA_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) + @$(PKG_TRACE) Downloading... + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE) $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) + @$(PKG_TRACE) Preparing... @rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR) unzip -q $^ -d $(LZMA_DIR) - patch -d $(LZMA_DIR) -p1 < lzma-406-zlib-stream.patch + patch -d $(LZMA_DIR) -p1 < lzma-406-zlib-stream.patch $(MAKE_TRACE) touch $(LZMA_DIR)/.unpacked - -$(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.unpacked - $(MAKE) -C $(LZMA_LIB_DIR) - -$(LZMA_ALONE_DIR)/lzma: $(LZMA_DIR)/.unpacked - $(MAKE) -C $(LZMA_ALONE_DIR) + +$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built +$(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked + @$(PKG_TRACE) Compiling... + $(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE) + $(MAKE) -C $(LZMA_ALONE_DIR) $(MAKE_TRACE) + touch $@ lzma: $(TARGETS) cp -f $^ $(LZMA_DIR) @@ -37,8 +40,9 @@ lzma: $(TARGETS) lzma-source: $(DL_DIR)/$(LZMA_SOURCE) lzma-clean: - -$(MAKE) -C $(LZMA_LIB_DIR) clean - -$(MAKE) -C $(LZMA_ALONE_DIR) clean + @$(PKG_TRACE) Cleaining... + -$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE) + -$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE) rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma lzma-dirclean: |