add internal package build dependencies to rules.mk to remove duplicate code

[openwrt.git] / obsolete-buildroot / Makefile

diff --git a/obsolete-buildroot/Makefile b/obsolete-buildroot/Makefile
index 7b60dd5..45c1e85 100644 (file)
--- a/obsolete-buildroot/Makefile
+++ b/obsolete-buildroot/Makefile
@@ -28,21 +28,18 @@
 #
 #############################################################
 
 #
 #############################################################
 

-SNAPSHOT:=20040807
+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)
 

-# directory used by 'make publish'
-PUB_DIR:=/var/www/html/testsite/ipkg
-

 # Command used to download source code
 WGET:=wget --passive-ftp
 
 # Command used to download source code
 WGET:=wget --passive-ftp
 


@@ -100,7 +97,7 @@ INSTALL_LIBGCJ:=false
 #############################################################
 TARGETS:=host-sed openwrt-code.bin
 
 #############################################################
 TARGETS:=host-sed openwrt-code.bin
 

-PACKAGES:=oidentd iproute2 sched-modules wshaper zlib openssl openssh pppoecd
+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

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


@@ -149,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/' \


@@ -191,13 +188,16 @@ TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
 PACKAGES_IPK:=$(patsubst %,%-ipk,$(PACKAGES))
 OPENWRT_IPK_DIR=$(SOURCE_DIR)/openwrt/ipkg
 
 PACKAGES_IPK:=$(patsubst %,%-ipk,$(PACKAGES))
 OPENWRT_IPK_DIR=$(SOURCE_DIR)/openwrt/ipkg
 

-$(BUILD_DIR)/Packages : $(PACKAGES_IPK)
-       (cd $(BUILD_DIR) ; $(IPKG_MAKE_INDEX) . > Packages)
-

 world: $(DL_DIR) $(TARGETS_SOURCE) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
        @echo "ALL DONE."
 
 world: $(DL_DIR) $(TARGETS_SOURCE) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
        @echo "ALL DONE."
 

-packages: ipkg-utils $(PACKAGES_IPK) $(BUILD_DIR)/Packages
+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) \


@@ -240,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
 


@@ -253,14 +255,6 @@ distclean:
                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
 

-publish:       
-       chmod 644 $(BUILD_DIR)/Packages
-       chmod 644 $(BUILD_DIR)/Packages.filelist
-       chmod 644 $(BUILD_DIR)/*.ipk
-       cp $(BUILD_DIR)/Packages $(PUB_DIR)
-       cp $(BUILD_DIR)/Packages.filelist $(PUB_DIR)
-       cp $(BUILD_DIR)/*.ipk $(PUB_DIR)
-

 sourceball: 
        rm -rf $(BUILD_DIR)
        set -e; \
 sourceball: 
        rm -rf $(BUILD_DIR)
        set -e; \