EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove old trace/verbose junk

Browse Source 
SVN-Revision: 3755
This commit is contained in:
Felix Fietkau 2006-05-10 20:32:22 +00:00
parent f243e1cc49
commit d3f5fda543
19 changed files with 79 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openwrt/Makefile
View File

@ -38,10 +38,6 @@ endif
endif endif
export OPENWRTVERSION export OPENWRTVERSION
ifeq ($(shell ./scripts/timestamp.pl -p .pkginfo package),package)
.pkginfo: pkginfo-clean
endif
.pkginfo: .pkginfo:
@echo Collecting package info... @echo Collecting package info...
@-for makefile in package/*/Makefile; do \ @-for makefile in package/*/Makefile; do \
@ -49,6 +45,10 @@ endif
$(MAKE) DUMP=1 -f $$makefile 2>&- || true; \ $(MAKE) DUMP=1 -f $$makefile 2>&- || true; \
done > $@ done > $@
ifeq ($(shell ./scripts/timestamp.pl -p .pkginfo package),package)
.pkginfo: pkginfo-clean
endif
.config.in: .pkginfo .config.in: .pkginfo
./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@ ./scripts/gen_menuconfig.pl < $< > $@ || rm -f $@

50
openwrt/package/Makefile
View File

@ -8,53 +8,15 @@ clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
compile: $(COMPILE_PACKAGES) compile: $(COMPILE_PACKAGES)
install: base-files-install $(INSTALL_PACKAGES) install: base-files-install $(INSTALL_PACKAGES)
$(COMPILE_PACKAGES): base-files-compile $(STAMP_DIR) $(TARGET_DIR):
$(INSTALL_PACKAGES): base-files-install
$(STAMP_DIR):
mkdir -p $@ mkdir -p $@
$(TARGET_DIR):
mkdir -p $(TARGET_DIR)
%-prepare: $(STAMP_DIR) $(TARGET_DIR) %-prepare: $(STAMP_DIR) $(TARGET_DIR)
@[ -f $(STAMP_DIR)/.$@ ] || { \ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
$(START_TRACE) "package/$(patsubst %-prepare,%,$@)-prepare: "; \
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
touch $(STAMP_DIR)/.$@; \
$(CMD_TRACE) " done"; \
$(END_TRACE); \
} \
}
%-compile: %-compile: $(STAMP_DIR) $(TARGET_DIR)
@[ -f $(STAMP_DIR)/.$@ ] || { \ $(MAKE) -C $(patsubst %-compile,%,$@) compile
$(START_TRACE) "package/$(patsubst %-compile,%,$@)-compile: "; \
$(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
touch $(STAMP_DIR)/.$@; \
$(CMD_TRACE) " done"; \
$(END_TRACE); \
} \
}
%-install: %-compile %-clean: $(STAMP_DIR) $(TARGET_DIR)
@$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: " $(MAKE) -C $(patsubst %-clean,%,$@) clean
@$(MAKE) -C $(patsubst %-install,%,$@) install
@$(CMD_TRACE) " done"
@$(END_TRACE)
%-rebuild:
@$(START_TRACE) "package/$(patsubst %-rebuild,%,$@)-rebuild: "
@rm -f $(STAMP_DIR)/.$(patsubst %-rebuild,%,$@)-*
$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
@$(CMD_TRACE) " done"
@$(END_TRACE)
%-clean:
@$(START_TRACE) "package/$(patsubst %-clean,%,$@)-clean: "
@$(MAKE) -C $(patsubst %-clean,%,$@) clean
@rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
@$(CMD_TRACE) " done"
@$(END_TRACE)

47
openwrt/package/rules.mk
View File

@ -164,8 +164,7 @@ endef
ifneq ($(strip $(PKG_SOURCE)),) ifneq ($(strip $(PKG_SOURCE)),)
$(DL_DIR)/$(PKG_SOURCE): $(DL_DIR)/$(PKG_SOURCE):
@$(CMD_TRACE) "downloading... " $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE)
$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
endif endif
@ -237,42 +236,24 @@ ifneq ($(DUMP),)
dumpinfo: dumpinfo:
$(DUMPINFO) $(DUMPINFO)
else else
source: $(DL_DIR)/$(PKG_SOURCE)
prepare: source
@[ -f $(PKG_BUILD_DIR)/.prepared ] || { \
$(CMD_TRACE) "preparing... "; \
$(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \
}
configure: prepare
@[ -f $(PKG_BUILD_DIR)/.configured ] || { \
$(CMD_TRACE) "configuring... "; \
$(MAKE) $(PKG_BUILD_DIR)/.configured $(MAKE_TRACE); \
}
compile-targets:
compile: configure
@$(CMD_TRACE) "compiling... "
@$(MAKE) compile-targets $(MAKE_TRACE)
install-targets:
install:
@$(CMD_TRACE) "installing... "
@$(MAKE) install-targets $(MAKE_TRACE)
rebuild:
$(CMD_TRACE) "rebuilding... "
$(MAKE) package-clean compile $(MAKE_TRACE)
$(PACKAGE_DIR): $(PACKAGE_DIR):
mkdir -p $@ mkdir -p $@
source: $(DL_DIR)/$(PKG_SOURCE)
prepare: $(PKG_BUILD_DIR)/.prepared
configure: $(PKG_BUILD_DIR)/.configured
compile-targets:
compile: compile-targets
install-targets:
install: install-targets
clean-targets: clean-targets:
clean: clean:
@$(CMD_TRACE) "cleaning... " @$(MAKE) clean-targets
@$(MAKE) clean-targets $(MAKE_TRACE)
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
endif endif
.PHONY: all source prepare compile install clean rebuild dumpinfo compile-targets install-targets clean-targets .PHONY: all source prepare compile install clean dumpinfo compile-targets install-targets clean-targets

32
openwrt/rules.mk
View File

@ -9,38 +9,6 @@ ifeq ($(V),)
V=5 V=5
endif endif
ifneq ($(V),0)
TRACE:=echo "---> "
START_TRACE:=echo -n "---> "
END_TRACE:=echo
else
START_TRACE:=:
END_TRACE:=:
TRACE:=:
endif
ifeq (${shell [ "$(V)" -ge 5 ] && echo 1},)
CMD_TRACE:=:
PKG_TRACE:=:
else
CMD_TRACE:=echo -n
PKG_TRACE:=echo "------> "
endif
ifeq (${shell [ "$(V)" -ge 10 ] && echo 1},)
EXTRA_MAKEFLAGS:=-s
MAKE_TRACE:=2>&1 >&/dev/null || { echo "Build failed. Please re-run make with V=99 to see what's going on"; /bin/false; }
else
MAKE_TRACE:=
EXTRA_MAKEFLAGS:=
TRACE:=:
PKG_TRACE:=:
CMD_TRACE:=:
START_TRACE:=:
END_TRACE:=:
endif
CP=cp -fpR CP=cp -fpR
MAKE1=make MAKE1=make
MAKEFLAGS=-j$(CONFIG_JLEVEL) V=$(V) $(EXTRA_MAKEFLAGS) MAKEFLAGS=-j$(CONFIG_JLEVEL) V=$(V) $(EXTRA_MAKEFLAGS)

6
openwrt/target/Makefile
View File

@ -20,22 +20,16 @@ linux/package/%:
$(MAKE) -C $(TOPDIR)/target/linux $(patsubst linux/%,%,$@) $(MAKE) -C $(TOPDIR)/target/linux $(patsubst linux/%,%,$@)
%-clean: %-clean:
@$(TRACE) target/$(patsubst %-clean,%,$@)-clean
$(MAKE) -C $(patsubst %-clean,%,$@) clean $(MAKE) -C $(patsubst %-clean,%,$@) clean
%-prepare: %-prepare:
@$(TRACE) target/$(patsubst %-prepare,%,$@)-prepare
$(MAKE) -C $(patsubst %-prepare,%,$@) prepare $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
%-compile: %-prepare %-compile: %-prepare
@$(TRACE) target/$(patsubst %-compile,%,$@)-compile
$(MAKE) -C $(patsubst %-compile,%,$@) compile $(MAKE) -C $(patsubst %-compile,%,$@) compile
%-rebuild: %-rebuild:
@$(TRACE) target/$(patsubst %-rebuild,%,$@)-rebuild
$(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
%-install: %-compile %-install: %-compile
@$(TRACE) target/$(patsubst %-install,%,$@)-install
$(MAKE) -C $(patsubst %-install,%,$@) install $(MAKE) -C $(patsubst %-install,%,$@) install
linux-imagebuilder: linux-imagebuilder:
@$(TRACE) target/linux/imagebuilder
$(MAKE) -C linux imagebuilder $(MAKE) -C linux imagebuilder

9
openwrt/target/linux/Makefile
View File

@ -9,31 +9,24 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
define kernel_template define kernel_template
$(1)/$(2)-clean: $(1)/$(2)-clean:
@$(TRACE) target/linux/$(2)-$(1)-clean
$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean $(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
$(1)/$(2)-prepare: $(1)/$(2)-prepare:
@$(TRACE) target/linux/$(2)-$(1)-prepare
$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare $(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
$(1)/$(2)-compile: $(1)/$(2)-compile:
@$(TRACE) target/linux/$(2)-$(1)-compile
$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile $(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
$(1)/$(2)-rebuild: $(1)/$(2)-rebuild:
@$(TRACE) target/linux/$(2)-$(1)-rebuild
$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild $(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
$(1)/$(2)-install: $(1)/$(2)-install:
@$(TRACE) target/linux/$(2)-$(1)-install
$(MAKE) -C $(2)-$(1) BOARD="$(2)" install $(MAKE) -C $(2)-$(1) BOARD="$(2)" install
$(1)/$(2)-image: $(1)/$(2)-install $(1)/$(2)-image: $(1)/$(2)-install
@$(TRACE) target/linux/image-install
$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
$(1)/$(2)-install-ib: $(1)/$(2)-install-ib:
@$(TRACE) target/linux/image-install-ib
$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
@ -76,10 +69,8 @@ install: $(BIN_DIR)/$(IB_NAME).tar.bz2
endif endif
prepare: prepare:
@$(TRACE) target/linux/image-prepare
$(MAKE) -C image prepare $(MAKE) -C image prepare
compile: compile:
@$(TRACE) target/linux/image-compile
$(MAKE) -C image compile $(MAKE) -C image compile
install: install:
rebuild: rebuild:

4
openwrt/target/linux/ar531x-2.4/Makefile
View File

@ -10,8 +10,8 @@ include ../generic-$(KERNEL)/modules.mk
include ../kernel.mk include ../kernel.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
@$(CP) config $(LINUX_DIR)/.config @$(CP) config $(LINUX_DIR)/.config
touch $@ touch $@

6
openwrt/target/linux/ar7-2.4/Makefile
View File

@ -31,8 +31,8 @@ include ../kernel.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
@$(CP) config $(LINUX_DIR)/.config @$(CP) config $(LINUX_DIR)/.config
touch $@ touch $@
@ -47,7 +47,7 @@ ATM_FIRMWARE_FILE=$(ATM_FIRMWARE_DIR).tar.gz
ATM_FIRMWARE_MD5SUM=8bfcb31109796502d66b11baaeb2fba6 ATM_FIRMWARE_MD5SUM=8bfcb31109796502d66b11baaeb2fba6
$(DL_DIR)/$(ATM_FIRMWARE_FILE): $(DL_DIR)/$(ATM_FIRMWARE_FILE):
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(ATM_FIRMWARE_FILE) $(ATM_FIRMWARE_MD5SUM) $(DOWNLOAD_SITE) $(MAKE_TRACE) $(SCRIPT_DIR)/download.pl $(DL_DIR) $(ATM_FIRMWARE_FILE) $(ATM_FIRMWARE_MD5SUM) $(DOWNLOAD_SITE)
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(ATM_FIRMWARE_FILE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(ATM_FIRMWARE_FILE)
$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.drivers-unpacked $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.drivers-unpacked

6
openwrt/target/linux/au1000-2.6/Makefile
View File

@ -12,13 +12,13 @@ include ../kernel.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
@$(CP) config $(LINUX_DIR)/.config @$(CP) config $(LINUX_DIR)/.config
touch $@ touch $@
$(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage
$(CP) $(LINUX_DIR)/vmlinux $@ $(CP) $(LINUX_DIR)/vmlinux $@
touch $@ touch $@

6
openwrt/target/linux/brcm-2.4/Makefile
View File

@ -28,8 +28,8 @@ include ../kernel.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
@$(CP) config $(LINUX_DIR)/.config @$(CP) config $(LINUX_DIR)/.config
touch $@ touch $@
@ -44,7 +44,7 @@ LINUX_BINARY_WL_DRIVER=kernel-binary-wl-0.6.tar.gz
LINUX_BINARY_WL_MD5SUM=4fc1d5b46bcb7a17d6d5dd31da9c8d7f LINUX_BINARY_WL_MD5SUM=4fc1d5b46bcb7a17d6d5dd31da9c8d7f
$(DL_DIR)/$(LINUX_BINARY_WL_DRIVER): $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER):
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) $(LINUX_BINARY_WL_MD5SUM) $(LINUX_BINARY_DRIVER_SITE) $(MAKE_TRACE) $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) $(LINUX_BINARY_WL_MD5SUM) $(LINUX_BINARY_DRIVER_SITE)
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER)
$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.drivers-unpacked $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.drivers-unpacked

11
openwrt/target/linux/image/Makefile
View File

@ -15,22 +15,19 @@ include ./tgz.mk
endif endif
prepare: prepare:
$(MAKE) prepare-targets $(MAKE_TRACE) $(MAKE) prepare-targets
compile: compile:
$(MAKE) compile-targets $(MAKE_TRACE) $(MAKE) compile-targets
install: install:
$(MAKE) install-targets $(MAKE_TRACE) $(MAKE) install-targets
.PHONY: prepare compile install .PHONY: prepare compile install
$(BOARD)-compile: $(BOARD)-compile:
@$(TRACE) target/linux/image/$(BOARD)-prepare
$(MAKE) -C $(BOARD) prepare $(MAKE) -C $(BOARD) prepare
@$(TRACE) target/linux/image/$(BOARD)-compile
$(MAKE) -C $(BOARD) compile $(MAKE) -C $(BOARD) compile
install-ib: install-ib:
@$(TRACE) target/linux/image/$(BOARD)-install-ib
-$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib -$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib
mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
$(CP) $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ $(CP) $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
@ -44,4 +41,4 @@ install-prepare:
rebuild: clean prepare compile install rebuild: clean prepare compile install
clean: clean:
$(MAKE) clean-targets $(MAKE_TRACE) $(MAKE) clean-targets

12
openwrt/target/linux/image/jffs2.mk
View File

@ -7,31 +7,29 @@ endif
#JFFS2OPTS += -Xlzo -msize -Xlzari #JFFS2OPTS += -Xlzo -msize -Xlzari
jffs2-prepare: jffs2-prepare:
$(MAKE) -C jffs2 prepare $(MAKE_TRACE) $(MAKE) -C jffs2 prepare
jffs2-compile: prepare-targets jffs2-compile: prepare-targets
$(MAKE) -C jffs2 compile $(MAKE_TRACE) $(MAKE) -C jffs2 compile
jffs2-clean: jffs2-clean:
$(MAKE) -C jffs2 clean $(MAKE_TRACE) $(MAKE) -C jffs2 clean
rm -f $(KDIR)/root.jffs2* rm -f $(KDIR)/root.jffs2*
$(KDIR)/root.jffs2-4MB: install-prepare $(KDIR)/root.jffs2-4MB: install-prepare
@rm -rf $(KDIR)/root/jffs @rm -rf $(KDIR)/root/jffs
$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root $(MAKE_TRACE) $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root
$(KDIR)/root.jffs2-8MB: install-prepare $(KDIR)/root.jffs2-8MB: install-prepare
@rm -rf $(KDIR)/root/jffs @rm -rf $(KDIR)/root/jffs
$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root $(MAKE_TRACE) $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root
ifeq ($(IB),) ifeq ($(IB),)
jffs2-install: compile-targets $(BOARD)-compile jffs2-install: compile-targets $(BOARD)-compile
endif endif
jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB
$(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB" $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-4MB"
$(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB" $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="jffs2-8MB"
jffs2-install-ib: compile-targets jffs2-install-ib: compile-targets

9
openwrt/target/linux/image/squashfs.mk
View File

@ -5,25 +5,24 @@ ifeq ($(ARCH),mips)
endif endif
squashfs-prepare: squashfs-prepare:
$(MAKE) -C squashfs prepare $(MAKE_TRACE) $(MAKE) -C squashfs prepare
squashfs-compile: prepare-targets squashfs-compile: prepare-targets
$(MAKE) -C squashfs compile $(MAKE_TRACE) $(MAKE) -C squashfs compile
squashfs-clean: squashfs-clean:
$(MAKE) -C squashfs clean $(MAKE_TRACE) $(MAKE) -C squashfs clean
rm -f $(KDIR)/root.squashfs rm -f $(KDIR)/root.squashfs
$(KDIR)/root.squashfs: install-prepare $(KDIR)/root.squashfs: install-prepare
@mkdir -p $(KDIR)/root/jffs @mkdir -p $(KDIR)/root/jffs
$(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -$(endian) $(MAKE_TRACE) $(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -$(endian)
ifeq ($(IB),) ifeq ($(IB),)
squashfs-install: compile-targets $(BOARD)-compile squashfs-install: compile-targets $(BOARD)-compile
endif endif
squashfs-install: $(KDIR)/root.squashfs squashfs-install: $(KDIR)/root.squashfs
$(TRACE) target/linux/image/$(BOARD)/install
$(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs" $(MAKE) -C $(BOARD) install KERNEL="$(KERNEL)" FS="squashfs"
squashfs-install-ib: compile-targets squashfs-install-ib: compile-targets

40
openwrt/target/linux/kernel.mk
View File

@ -13,7 +13,7 @@ $(PACKAGE_DIR):
$(DL_DIR)/$(LINUX_SOURCE): $(DL_DIR)/$(LINUX_SOURCE):
-mkdir -p $(DL_DIR) -mkdir -p $(DL_DIR)
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE) $(MAKE_TRACE) $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-mkdir -p $(LINUX_BUILD_DIR) -mkdir -p $(LINUX_BUILD_DIR)
@ -28,37 +28,36 @@ $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
$(LINUX_DIR)/Makefile \ $(LINUX_DIR)/Makefile \
$(LINUX_DIR)/arch/*/Makefile $(LINUX_DIR)/arch/*/Makefile
$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
touch $@ touch $@
$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep
touch $@ touch $@
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
else else
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
touch $@ touch $@
endif endif
$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile $(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile
$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH)
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
$(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ $(MAKE_TRACE) $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
touch -c $(LINUX_KERNEL) touch -c $(LINUX_KERNEL)
$(LINUX_DIR)/.modules_done: $(LINUX_DIR)/.modules_done:
rm -rf $(LINUX_BUILD_DIR)/modules rm -rf $(LINUX_BUILD_DIR)/modules
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules $(MAKE_TRACE) $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE) $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install
touch $(LINUX_DIR)/.modules_done touch $(LINUX_DIR)/.modules_done
$(STAMP_DIR)/.linux-compile: $(STAMP_DIR)/.linux-compile:
@$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE) @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG)
ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE) ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
@$(TRACE) target/linux/package-compile
$(MAKE) -C $(TOPDIR)/target/linux/package \ $(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \ $(KPKG_MAKEOPTS) \
compile compile
@ -73,7 +72,7 @@ pkg-install:
$(MAKE) -C $(TOPDIR)/target/linux/package \ $(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \ $(KPKG_MAKEOPTS) \
install install
@{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true; } $(MAKE_TRACE) [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS)
$(KERNEL_IPKG): $(KERNEL_IPKG):
rm -rf $(KERNEL_IDIR) rm -rf $(KERNEL_IDIR)
@ -82,33 +81,30 @@ $(KERNEL_IPKG):
if [ -f ./config/$(BOARD).modules ]; then \ if [ -f ./config/$(BOARD).modules ]; then \
cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \ cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
fi fi
$(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR) $(MAKE_TRACE) $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
source: $(DL_DIR)/$(LINUX_SOURCE) source: $(DL_DIR)/$(LINUX_SOURCE)
prepare: prepare:
@mkdir -p $(STAMP_DIR) $(PACKAGE_DIR) @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR)
@$(MAKE) $(LINUX_DIR)/.configured $(MAKE_TRACE) @$(MAKE) $(LINUX_DIR)/.configured
compile: prepare $(STAMP_DIR)/.linux-compile compile: prepare $(STAMP_DIR)/.linux-compile
install: compile install: compile
@$(TRACE) target/linux/package-install $(MAKE) $(KPKG_MAKEOPTS) pkg-install
$(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE) $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL)
$(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)
mostlyclean: mostlyclean:
rm -f $(STAMP_DIR)/.linux-compile rm -f $(STAMP_DIR)/.linux-compile
rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
$(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean $(MAKE_TRACE) $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean
rm -f $(LINUX_KERNEL) rm -f $(LINUX_KERNEL)
rebuild: rebuild:
-$(MAKE) mostlyclean -$(MAKE) mostlyclean
if [ -f $(LINUX_KERNEL) ]; then \ @[ -f $(LINUX_KERNEL) ] && $(MAKE) clean
$(MAKE) clean $(MAKE_TRACE); \ $(MAKE) compile
fi
$(MAKE) compile $(MAKE_TRACE)
clean: clean:
rm -f $(STAMP_DIR)/.linux-compile rm -f $(STAMP_DIR)/.linux-compile

12
openwrt/target/linux/package/Makefile
View File

@ -32,34 +32,22 @@ install: $(patsubst %,%-install,$(package-y))
KPKG_MAKEOPTS += BUILD_DIR="$(LINUX_BUILD_DIR)" KPKG_MAKEOPTS += BUILD_DIR="$(LINUX_BUILD_DIR)"
%-prepare: %-prepare:
@$(START_TRACE) "target/linux/package/$(patsubst %-prepare,%,$@)/prepare: "
$(MAKE) -C $(patsubst %-prepare,%,$@) \ $(MAKE) -C $(patsubst %-prepare,%,$@) \
$(KPKG_MAKEOPTS) \ $(KPKG_MAKEOPTS) \
prepare prepare
@$(CMD_TRACE) " done"
@$(END_TRACE)
%-compile: %-compile:
@$(START_TRACE) "target/linux/package/$(patsubst %-compile,%,$@)-compile: "
$(MAKE) -C $(patsubst %-compile,%,$@) \ $(MAKE) -C $(patsubst %-compile,%,$@) \
$(KPKG_MAKEOPTS) \ $(KPKG_MAKEOPTS) \
compile compile
@$(CMD_TRACE) " done"
@$(END_TRACE)
%-install: %-install:
@$(START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: "
$(MAKE) -C $(patsubst %-install,%,$@) \ $(MAKE) -C $(patsubst %-install,%,$@) \
$(KPKG_MAKEOPTS) \ $(KPKG_MAKEOPTS) \
install install
@$(CMD_TRACE) " done"
@$(END_TRACE)
%-clean: %-clean:
@$(START_TRACE) "target/linux/package/$(patsubst %-clean,%,$@)-clean: "
@$(MAKE) -C $(patsubst %-clean,%,$@) \ @$(MAKE) -C $(patsubst %-clean,%,$@) \
$(KPKG_MAKEOPTS) \ $(KPKG_MAKEOPTS) \
clean clean
@$(CMD_TRACE) " done"
@$(END_TRACE)

2
openwrt/target/linux/rules.mk
View File

@ -77,7 +77,7 @@ ifneq ($(6),)
done done
endif endif
$(8) $(8)
$(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) $(MAKE_TRACE) $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR)
endef endef

6
openwrt/target/linux/x86-2.4/Makefile
View File

@ -17,13 +17,13 @@ include ../kernel.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
@$(CP) config $(LINUX_DIR)/.config @$(CP) config $(LINUX_DIR)/.config
touch $@ touch $@
$(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux
$(MAKE) -C $(LINUX_DIR) TOPDIR=$(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) TOPDIR=$(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage
$(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@ $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@
touch $@ touch $@

6
openwrt/target/linux/x86-2.6/Makefile
View File

@ -12,13 +12,13 @@ include ../kernel.mk
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches
[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
@$(CP) config $(LINUX_DIR)/.config @$(CP) config $(LINUX_DIR)/.config
touch $@ touch $@
$(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage
$(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@ $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@
touch $@ touch $@

12
openwrt/target/lzma/Makefile
View File

@ -17,18 +17,18 @@ LZMA_ALONE_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone
TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
$(DL_DIR)/$(LZMA_SOURCE): $(DL_DIR)/$(LZMA_SOURCE):
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE) $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE)
$(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) $(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)
@rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR) @rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR)
tar xjf $^ -C $(LZMA_DIR) tar xjf $^ -C $(LZMA_DIR)
patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch $(MAKE_TRACE) patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch
touch $(LZMA_DIR)/.unpacked touch $(LZMA_DIR)/.unpacked
$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built $(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built
$(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked $(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked
$(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE) $(MAKE) -C $(LZMA_LIB_DIR)
$(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) $(MAKE_TRACE) $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR)
touch $@ touch $@
lzma: $(TARGETS) lzma: $(TARGETS)
@ -37,8 +37,8 @@ lzma: $(TARGETS)
lzma-source: $(DL_DIR)/$(LZMA_SOURCE) lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
lzma-clean: lzma-clean:
-$(MAKE) -C $(LZMA_LIB_DIR) clean $(MAKE_TRACE) -$(MAKE) -C $(LZMA_LIB_DIR) clean
-$(MAKE) -C $(LZMA_ALONE_DIR) clean $(MAKE_TRACE) -$(MAKE) -C $(LZMA_ALONE_DIR) clean
rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma
lzma-dirclean: lzma-dirclean: