projects
/
oweals
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d657a15
)
another batch of V= stuff
author
Felix Fietkau
<nbd@openwrt.org>
Sat, 22 Oct 2005 16:14:30 +0000
(16:14 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sat, 22 Oct 2005 16:14:30 +0000
(16:14 +0000)
SVN-Revision: 2244
openwrt/Makefile
patch
|
blob
|
history
openwrt/package/rules.mk
patch
|
blob
|
history
openwrt/target/linux/Makefile
patch
|
blob
|
history
openwrt/target/linux/linux-2.4/Makefile
patch
|
blob
|
history
openwrt/target/linux/linux-2.6/Makefile
patch
|
blob
|
history
openwrt/target/linux/package/Makefile
patch
|
blob
|
history
openwrt/target/lzma/Makefile
patch
|
blob
|
history
diff --git
a/openwrt/Makefile
b/openwrt/Makefile
index 6dee969827b4ba612313cd9a510bd7d7dd26abf5..edeb1f41ee5a9ea1d4491490f4799891725c5489 100644
(file)
--- a/
openwrt/Makefile
+++ b/
openwrt/Makefile
@@
-60,6
+60,7
@@
include .config.cmd
world: $(DL_DIR) $(BUILD_DIR) configtest
$(MAKE) toolchain/install target/compile package/compile root_clean package/install target/install package_index
world: $(DL_DIR) $(BUILD_DIR) configtest
$(MAKE) toolchain/install target/compile package/compile root_clean package/install target/install package_index
+ $(TRACE) Build complete.
.PHONY: all world clean dirclean distclean image_clean target_clean source configtest
.PHONY: all world clean dirclean distclean image_clean target_clean source configtest
@@
-107,7
+108,7
@@
target_clean: root_clean
clean: dirclean
dirclean:
clean: dirclean
dirclean:
- @$(TRACE)
Cleaning...
+ @$(TRACE)
dirclean
@$(MAKE) -C $(CONFIG) clean
rm -rf $(BUILD_DIR)
@$(MAKE) -C $(CONFIG) clean
rm -rf $(BUILD_DIR)
diff --git
a/openwrt/package/rules.mk
b/openwrt/package/rules.mk
index 504eb1518f3c2e3cc7b5e7a450350de2772adb3a..cde92c3888e7287dc1f5d947adffafaff1afd8f4 100644
(file)
--- a/
openwrt/package/rules.mk
+++ b/
openwrt/package/rules.mk
@@
-37,7
+37,7
@@
endef
ifneq ($(strip $(PKG_SOURCE)),)
$(DL_DIR)/$(PKG_SOURCE):
ifneq ($(strip $(PKG_SOURCE)),)
$(DL_DIR)/$(PKG_SOURCE):
- @$(
PKG
_TRACE) "downloading... "
+ @$(
CMD
_TRACE) "downloading... "
$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE)
endif
$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE)
endif
@@
-55,7
+55,7
@@
endif
all: compile
source: $(DL_DIR)/$(PKG_SOURCE)
all: compile
source: $(DL_DIR)/$(PKG_SOURCE)
-prepare:
+prepare:
source
@[ -f $(PKG_BUILD_DIR)/.prepared ] || { \
$(CMD_TRACE) "preparing... "; \
$(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \
@[ -f $(PKG_BUILD_DIR)/.prepared ] || { \
$(CMD_TRACE) "preparing... "; \
$(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \
diff --git
a/openwrt/target/linux/Makefile
b/openwrt/target/linux/Makefile
index ae7545a46414ae51b16b0b76e60a8aee6b2824f2..fe3c6ca9f8587dad5304bb3557b6fabee79b5d0e 100644
(file)
--- a/
openwrt/target/linux/Makefile
+++ b/
openwrt/target/linux/Makefile
@@
-9,23
+9,23
@@
IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
define kernel_template
$(1)/$(2)-clean:
define kernel_template
$(1)/$(2)-clean:
- $(TRACE) target/linux/linux-$(
2
)/clean
+ $(TRACE) target/linux/linux-$(
1
)/clean
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
$(1)/$(2)-prepare:
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" clean
$(1)/$(2)-prepare:
- $(TRACE) target/linux/linux-$(
2
)/prepare
+ $(TRACE) target/linux/linux-$(
1
)/prepare
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
$(1)/$(2)-compile:
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" prepare
$(1)/$(2)-compile:
- $(TRACE) target/linux/linux-$(
2
)/compile
+ $(TRACE) target/linux/linux-$(
1
)/compile
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
$(1)/$(2)-rebuild:
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" compile
$(1)/$(2)-rebuild:
- $(TRACE) target/linux/linux-$(
2
)/rebuild
+ $(TRACE) target/linux/linux-$(
1
)/rebuild
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
$(1)/$(2)-install:
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" rebuild
$(1)/$(2)-install:
- $(TRACE) target/linux/linux-$(
2
)/install
+ $(TRACE) target/linux/linux-$(
1
)/install
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
$(1)/$(2)-image: $(1)/$(2)-install
$(MAKE) -C linux-$(1) KERNEL="$(1)" BOARD="$(2)" install
$(1)/$(2)-image: $(1)/$(2)-install
diff --git
a/openwrt/target/linux/linux-2.4/Makefile
b/openwrt/target/linux/linux-2.4/Makefile
index c3417bdcba4be098811d06d914db2ea3a78f9857..bd1dd6c5d3c7b22cc79a4661d8f751fcabecbc9c 100644
(file)
--- a/
openwrt/target/linux/linux-2.4/Makefile
+++ b/
openwrt/target/linux/linux-2.4/Makefile
@@
-204,7
+204,6
@@
$(PACKAGE_DIR):
mkdir -p $(PACKAGE_DIR)
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
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)
-mkdir -p $(LINUX_BUILD_DIR)
bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) -
rm -f $(LINUX_DIR)
@@
-217,7
+216,6
@@
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
touch $(LINUX_DIR)/.patched
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
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 \
-cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \
$(LINUX_DIR)/Makefile \
@@
-269,7
+267,7
@@
$(KERNEL_IPKG):
if [ -f ./config/$(BOARD).modules ]; then \
cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
fi
if [ -f ./config/$(BOARD).modules ]; then \
cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
fi
- $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
+ $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
$(MAKE_TRACE)
source: $(DL_DIR)/$(LINUX_SOURCE)
prepare: $(LINUX_DIR)/.configured
source: $(DL_DIR)/$(LINUX_SOURCE)
prepare: $(LINUX_DIR)/.configured
diff --git
a/openwrt/target/linux/linux-2.6/Makefile
b/openwrt/target/linux/linux-2.6/Makefile
index 489f13693532aa020927e9c9a3e2d9150df2e0c1..75f6ea049d56d36ef8254257ad5e58605842ea27 100644
(file)
--- a/
openwrt/target/linux/linux-2.6/Makefile
+++ b/
openwrt/target/linux/linux-2.6/Makefile
@@
-179,11
+179,9
@@
$(PACKAGE_DIR):
$(DL_DIR)/$(LINUX_SOURCE):
-mkdir -p $(DL_DIR)
$(DL_DIR)/$(LINUX_SOURCE):
-mkdir -p $(DL_DIR)
- @$(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)
$(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)
-mkdir -p $(LINUX_BUILD_DIR)
bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) -
rm -f $(LINUX_DIR)
@@
-196,7
+194,6
@@
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
touch $(LINUX_DIR)/.patched
$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
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_TRACE)
touch $(LINUX_DIR)/.configured
-cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config
$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig $(MAKE_TRACE)
touch $(LINUX_DIR)/.configured
@@
-230,7
+227,7
@@
$(KERNEL_IPKG):
if [ -f ./config/$(BOARD).modules ]; then \
cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
fi
if [ -f ./config/$(BOARD).modules ]; then \
cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
fi
- $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
+ $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR)
$(MAKE_TRACE)
$(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done
@mkdir -p $(STAMP_DIR)
$(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done
@mkdir -p $(STAMP_DIR)
diff --git
a/openwrt/target/linux/package/Makefile
b/openwrt/target/linux/package/Makefile
index c69705bfe43f3b6a3d74da0a5cc659b632ba5ff5..97d20251e614e8c64916d066d5a3d1b5c0987a62 100644
(file)
--- a/
openwrt/target/linux/package/Makefile
+++ b/
openwrt/target/linux/package/Makefile
@@
-49,7
+49,7
@@
MAKEOPTS:= BOARD="$(BOARD)" \
@$(CMD_TRACE) " done"
@$(END_TRACE)
@$(CMD_TRACE) " done"
@$(END_TRACE)
-%-install:
%-compile
+%-install:
@$(START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: "
$(MAKE) -C $(patsubst %-install,%,$@) \
$(MAKEOPTS) \
@$(START_TRACE) "target/linux/package/$(patsubst %-install,%,$@)-install: "
$(MAKE) -C $(patsubst %-install,%,$@) \
$(MAKEOPTS) \
diff --git
a/openwrt/target/lzma/Makefile
b/openwrt/target/lzma/Makefile
index 17c029532bb82d3669cc1279881dd404b9848534..8969e3d241c06e6fffd8141ce6c9dc92a7dbd348 100644
(file)
--- a/
openwrt/target/lzma/Makefile
+++ b/
openwrt/target/lzma/Makefile
@@
-17,11
+17,9
@@
LZMA_ALONE_DIR=$(LZMA_DIR)/SRC/7zip/Compress/LZMA_Alone
TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
$(DL_DIR)/$(LZMA_SOURCE):
TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma
$(DL_DIR)/$(LZMA_SOURCE):
- @$(PKG_TRACE) Downloading...
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) $(MAKE_TRACE)
$(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)
$(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 $(MAKE_TRACE)
@rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR)
unzip -q $^ -d $(LZMA_DIR)
patch -d $(LZMA_DIR) -p1 < lzma-406-zlib-stream.patch $(MAKE_TRACE)
@@
-29,7
+27,6
@@
$(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)
$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built
$(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked
$(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 $@
$(MAKE) -C $(LZMA_LIB_DIR) $(MAKE_TRACE)
$(MAKE) -C $(LZMA_ALONE_DIR) $(MAKE_TRACE)
touch $@
@@
-40,7
+37,6
@@
lzma: $(TARGETS)
lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
lzma-clean:
lzma-source: $(DL_DIR)/$(LZMA_SOURCE)
lzma-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
-$(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