selecting zlib automatically in Config.in does not mean it will

[openwrt.git] / obsolete-buildroot / Makefile

diff --git a/obsolete-buildroot/Makefile b/obsolete-buildroot/Makefile
index cf68d06..45c1e85 100644 (file)
--- a/obsolete-buildroot/Makefile
+++ b/obsolete-buildroot/Makefile
@@ -28,14 +28,14 @@
 #
 #############################################################
 
 #
 #############################################################
 

-SNAPSHOT:=20040531
+SNAPSHOT:=20050101

 
 ARCH:=mipsel
 
 ARCH:=mipsel

-USE_UCLIBC_SNAPSHOT:=$(SNAPSHOT)
+#USE_UCLIBC_SNAPSHOT:=$(SNAPSHOT)

 USE_UCLIBC_LDSO_0_9_24:=false
 USE_UCLIBC_LDSO_0_9_24:=false

-USE_BUSYBOX_SNAPSHOT:=$(SNAPSHOT)
-USE_NETFILTER_SNAPSHOT:=$(SNAPSHOT)
-USE_BRIDGE_VERSION:=0.9.7
+#USE_BUSYBOX_SNAPSHOT:=$(SNAPSHOT)
+USE_NETFILTER_SNAPSHOT:=20041009
+USE_BRIDGE_VERSION:=1.0.4

 BUILD_WITH_LARGEFILE:=true
 
 OPTIMIZE_FOR_CPU=$(ARCH)
 BUILD_WITH_LARGEFILE:=true
 
 OPTIMIZE_FOR_CPU=$(ARCH)


@@ -95,7 +95,9 @@ INSTALL_LIBGCJ:=false
 # The list of stuff to build for the target filesystem
 #
 #############################################################
 # The list of stuff to build for the target filesystem
 #
 #############################################################

-TARGETS:=host-sed gcc3_3 openwrt-base openwrt-code.bin
+TARGETS:=host-sed openwrt-code.bin
+
+PACKAGES:=oidentd iproute2 kmod-sched wshaper zlib openssl openssh pppoecd dropbear chillispot dhcp-fwd ip6tables kmod-ipt6 kmod-ipv6 kmod-nfs kmod-ppp-async kmod-ppp-mppe-mppc ppp pppoecd pptp-server kmod-tun fprobe libpcap libpthread pptp-client vsftpd matrixssl ntpclient radvd strace

 
 #############################################################
 #
 
 #############################################################
 #


@@ -144,8 +146,8 @@ GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
 KERNEL_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CC=$(TARGET_CROSS)gcc
 KERNEL_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CC=$(TARGET_CROSS)gcc

-STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
-
+#STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note --strip-unneeded
+STRIP=$(STAGING_DIR)/bin/sstrip

 
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
        -e 's/sparc.*/sparc/' \
 
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
        -e 's/sparc.*/sparc/' \


@@ -176,14 +178,26 @@ else
 DISABLE_NLS:=--disable-nls
 endif
 
 DISABLE_NLS:=--disable-nls
 endif
 

-

 all:   world
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
 
 all:   world
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
 

-world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
+
+PACKAGES_IPK:=$(patsubst %,%-ipk,$(PACKAGES))
+OPENWRT_IPK_DIR=$(SOURCE_DIR)/openwrt/ipkg
+
+world: $(DL_DIR) $(TARGETS_SOURCE) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
+       @echo "ALL DONE."
+
+packages: ipkg-utils $(PACKAGES_IPK)
+       -@mkdir -p $(BASE_DIR)/packages
+       { \
+               cd $(BASE_DIR)/packages; \
+               mv $(BUILD_DIR)/*.ipk .; \
+               $(IPKG_MAKE_INDEX) . > Packages; \
+       }

        @echo "ALL DONE."
 
 .PHONY: all world clean dirclean distclean source $(TARGETS) \
        @echo "ALL DONE."
 
 .PHONY: all world clean dirclean distclean source $(TARGETS) \


@@ -212,11 +226,9 @@ $(STAGING_DIR):
        ln -fs ../$(REAL_GNU_TARGET_NAME)/include $(STAGING_DIR)/usr/include
 
 
        ln -fs ../$(REAL_GNU_TARGET_NAME)/include $(STAGING_DIR)/usr/include
 
 

-$(TARGET_DIR): $(DL_DIR)/$(OPENWRT_ROOT_SKEL)
+$(TARGET_DIR):

        rm -rf $(TARGET_DIR)
        rm -rf $(TARGET_DIR)

-       #zcat $(SOURCE_DIR)/skel.tar.gz | tar -C $(BUILD_DIR) -xf -
-       zcat $(DL_DIR)/$(OPENWRT_ROOT_SKEL) | tar -C $(BUILD_DIR) -xf -
-       #cp -a $(SOURCE_DIR)/target_skeleton/* $(TARGET_DIR)/
+       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)
        -find $(TARGET_DIR) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1
 
 source: $(TARGETS_SOURCE)


@@ -228,11 +240,13 @@ source: $(TARGETS_SOURCE)
 #############################################################
 clean:
        rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(IMAGE) \
 #############################################################
 clean:
        rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(IMAGE) \

+               $(BASE_DIR)/packages \

                openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
                openwrt-kmodules.tar.bz2
 
 dirclean: $(TARGETS_DIRCLEAN)
        rm -rf $(TARGET_DIR) $(STAGING_DIR) $(IMAGE) \
                openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
                openwrt-kmodules.tar.bz2
 
 dirclean: $(TARGETS_DIRCLEAN)
        rm -rf $(TARGET_DIR) $(STAGING_DIR) $(IMAGE) \

+               $(BASE_DIR)/packages \

                openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
                openwrt-kmodules.tar.bz2
 
                openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
                openwrt-kmodules.tar.bz2