summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2004-08-12 06:43:18 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2004-08-12 06:43:18 +0000
commite2784f3bce41605cdae551531a6621ae9c1c043d (patch)
tree22752a601529b6191cdb4ca51cd33cf419daf621
parent512afda668386575e4d146d22161ca3afa3af728 (diff)
moved root.tar.gz to sources/openwrt/root
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@135 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--obsolete-buildroot/Makefile13
-rw-r--r--obsolete-buildroot/make/openwrt.mk7
2 files changed, 10 insertions, 10 deletions
diff --git a/obsolete-buildroot/Makefile b/obsolete-buildroot/Makefile
index 3f0164afd..7b60dd519 100644
--- a/obsolete-buildroot/Makefile
+++ b/obsolete-buildroot/Makefile
@@ -98,9 +98,9 @@ INSTALL_LIBGCJ:=false
# The list of stuff to build for the target filesystem
#
#############################################################
-TARGETS:=host-sed gcc3_3 ipkg-utils openwrt-base openwrt-code.bin
+TARGETS:=host-sed openwrt-code.bin
-PACKAGES:=oidentd iproute2 sched-modules wshaper
+PACKAGES:=oidentd iproute2 sched-modules wshaper zlib openssl openssh pppoecd
#############################################################
#
@@ -194,7 +194,10 @@ OPENWRT_IPK_DIR=$(SOURCE_DIR)/openwrt/ipkg
$(BUILD_DIR)/Packages : $(PACKAGES_IPK)
(cd $(BUILD_DIR) ; $(IPKG_MAKE_INDEX) . > Packages)
-world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS) $(PACKAGES_IPK) $(BUILD_DIR)/Packages
+world: $(DL_DIR) $(TARGETS_SOURCE) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
+ @echo "ALL DONE."
+
+packages: ipkg-utils $(PACKAGES_IPK) $(BUILD_DIR)/Packages
@echo "ALL DONE."
.PHONY: all world clean dirclean distclean source $(TARGETS) \
@@ -223,9 +226,9 @@ $(STAGING_DIR):
ln -fs ../$(REAL_GNU_TARGET_NAME)/include $(STAGING_DIR)/usr/include
-$(TARGET_DIR): $(DL_DIR)/$(OPENWRT_ROOT_SKEL)
+$(TARGET_DIR):
rm -rf $(TARGET_DIR)
- zcat $(DL_DIR)/$(OPENWRT_ROOT_SKEL) | tar -C $(BUILD_DIR) -xf -
+ cp -a $(SOURCE_DIR)/openwrt/root/ $(TARGET_DIR)
-find $(TARGET_DIR) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1
source: $(TARGETS_SOURCE)
diff --git a/obsolete-buildroot/make/openwrt.mk b/obsolete-buildroot/make/openwrt.mk
index e839a0a5c..5867046a7 100644
--- a/obsolete-buildroot/make/openwrt.mk
+++ b/obsolete-buildroot/make/openwrt.mk
@@ -23,7 +23,7 @@
# Currently the dependencies are not all handled. But that's true of
# our buildroot in general, since it wasn't really set up for end users.
-OPENWRT_TARGETS:= openwrt-linux openwrt-kmodules.tar.bz2 \
+OPENWRT_TARGETS:= gcc3_3 openwrt-linux openwrt-kmodules.tar.bz2 \
openwrt-shared openwrt-mtd openwrt-nvram openwrt-wlconf \
bridge dnsmasq1 iptables wtools busybox \
openwrt-rootprep
@@ -34,8 +34,6 @@ openwrt-base: $(OPENWRT_TARGETS)
######################################################################
-ifneq ($(filter $(TARGETS),openwrt-base),)
-
WRT54G_SOURCE=wrt54gs.2.07.1.tgz
WRT54G_SITE=http://www.linksys.com/support/opensourcecode/wrt54gs/2.07.1
WRT54G_DIR=$(BUILD_DIR)/WRT54GS
@@ -204,7 +202,7 @@ openwrt-rootprep:
######################################################################
-openwrt-prune:
+openwrt-prune: openwrt-base
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
# remove unneeded uClibc libs
rm -rf $(TARGET_DIR)/lib/libthread_db*
@@ -237,4 +235,3 @@ openwrt-g-code.bin: openwrt-gs-code.bin
openwrt-code.bin: openwrt-gs-code.bin openwrt-g-code.bin
######################################################################
-endif