Changeset 214

Timestamp:

01/28/07 11:01:19 (5 years ago)

Author:

root

Message:

Made sure make from scratch works.

Location:

floppyfw

Files:

• Makefile (modified) (6 diffs)
• configs/config-busybox (modified) (10 diffs)
• configs/config-kernel (modified) (1 diff)
• devkitstuff/Readme.devkit (modified) (1 diff)
• package/add/add.mk (modified) (1 diff)
• package/bridgeutils/bridgeutils.mk (modified) (2 diffs)
• package/busybox/busybox.mk (modified) (3 diffs)
• package/fakeident/fakeident.mk (modified) (1 diff)
• package/hostap/hostap.mk (modified) (1 diff)
• package/iproute2/iproute2.mk (modified) (1 diff)
• package/ipset/ipset.mk (modified) (4 diffs)
• package/iptables/iptables.mk (modified) (3 diffs)
• package/libpcap/libpcap.mk (modified) (1 diff)
• package/linux/linux.mk (modified) (5 diffs)
• package/madwifi/madwifi.mk (modified) (1 diff)
• package/patch-o-matic/patch-o-matic.mk (modified) (3 diffs)
• package/uclibc/uclibc.mk (modified) (2 diffs)
• package/wpa_supplicant/wpa_supplicant.mk (modified) (1 diff)
• scripts/capsfix.pl (modified) (1 diff)
• scripts/capsfix.sh (modified) (1 diff)

floppyfw/Makefile

@@ -67 +67 @@
 #
 ##############################################################
-TARGETS:=uclib linux busybox 
+TARGETS:=uclibc linux busybox 
 include package/Makefile.in
-include target/Makefile.in
+# include target/Makefile.in
 
 #############################################################
@@ -81 +81 @@
 
 all:   world
+
+echotarg: 
+        echo $(TARGETS)
 
 # In this section, we need .config
@@ -98 +101 @@
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
 
-world: $(TMP_DIR) $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) \
-        $(TARGET_PACKAGES_DIR) $(TARGETS)
+world: echotarg $(TMP_DIR) $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) \
+        $(TARGET_DIR) $(TARGET_PACKAGES_DIR) $(TARGETS)
 
 .PHONY: all world clean dirclean distclean source $(TARGETS) \
@@ -120 +123 @@
         mkdir -p $(BUILD_DIR)
         # Can put it here anyway.
-        mkdir -p $(BUILD_DIR)/modules
+        mkdir -p $(MODULES_DIR)/modules
 
 $(TOOL_BUILD_DIR):
@@ -128 +131 @@
         mkdir -p $(STAGING_DIR)/lib
         mkdir -p $(STAGING_DIR)/include
-        mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
-        ln -snf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
-
-$(TARGET_DIR):
-        if [ -f "$(TARGET_SKELETON)" ] ; then \
-                $(ZCAT) $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \
-        fi;
-        if [ -d "$(TARGET_SKEL_DIR)" ] ; then \
-                cp -fa $(TARGET_SKEL_DIR)/* $(TARGET_DIR)/; \
-        fi;
-        touch $(STAGING_DIR)/.fakeroot.00000
-        -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
-        -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
+        # mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)
+        # ln -snf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
+
+# TARGET_DIR and INITRD_MASTER are created in initrd.mk and add.mk
+
+#$(TARGET_DIR): $(TMP_DIR) $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) \
+#       $(TARGET_PACKAGES_DIR)
+#       if [ -f "$(TARGET_SKELETON)" ] ; then \
+#               $(ZCAT) $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \
+#       fi;
+#       if [ -d "$(TARGET_SKEL_DIR)" ] ; then \
+#               cp -fa $(TARGET_SKEL_DIR)/* $(TARGET_DIR)/; \
+#       fi;
+#       touch $(STAGING_DIR)/.fakeroot.00000
+#       -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
+#       -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
 
 $(TARGET_PACKAGES_DIR):
@@ -231 +237 @@
 
 veryclean:
-        $(RM) -r $(INITRD_MASTER) 
-        $(RM) -r $(BUILD_DIR)/initrd.sq 
-        $(RM) -r $(ADD_MASTER) 
-        $(RM) $(BUILD_DIR)/*.ffw $(BUILD_DIR)/*.bz2
         $(RM) -r $(BUILD_DIR)
-        $(RM) -r $(MODULES_BASE_DIR)
-        $(RM) $(PACKAGES_DIR)/*.ffw $(PACKAGES_DIR)/*.bz2
-        $(RM) -r isoimage*
-        $(RM) -r soekris.tar.bz2
-        $(RM) -r flash.tar.bz2
         # Dangerous..
         $(RM) -r floppy*

floppyfw/configs/config-busybox

@@ -20 +20 @@
 CONFIG_FEATURE_INSTALLER=y
 # CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_GETOPT_LONG is not set
+CONFIG_GETOPT_LONG=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
@@ -27 +27 @@
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 # CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 
 #
@@ -38 +39 @@
 # USING_CROSS_COMPILER is not set
 CROSS_COMPILER_PREFIX=""
-EXTRA_CFLAGS_OPTIONS=""
 # CONFIG_BUILD_AT_ONCE is not set
 
@@ -76 +76 @@
 CONFIG_BUNZIP2=y
 # CONFIG_CPIO is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_DPKG=y
+CONFIG_DPKG_DEB=y
+CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
 # CONFIG_GUNZIP is not set
 # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
@@ -103 +103 @@
 #
 # CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
+
+#
+# Common options for dpkg and dpkg_deb
+#
+CONFIG_FEATURE_DEB_TAR_GZ=y
 # CONFIG_FEATURE_DEB_TAR_BZ2 is not set
 # CONFIG_FEATURE_DEB_TAR_LZMA is not set
@@ -260 +264 @@
 # CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
 # CONFIG_START_STOP_DAEMON is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
 # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
 # CONFIG_WHICH is not set
@@ -335 +340 @@
 # CONFIG_FEATURE_SECURETTY is not set
 CONFIG_PASSWD=y
-CONFIG_CRYPTPW=y
 # CONFIG_SU is not set
 # CONFIG_SULOGIN is not set
@@ -406 +410 @@
 # CONFIG_MDEV is not set
 # CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
 # CONFIG_MKSWAP is not set
 # CONFIG_FEATURE_MKSWAP_V0 is not set
@@ -545 +550 @@
 # CONFIG_FEATURE_TFTP_PUT is not set
 # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_FEATURE_TFTP_DEBUG is not set
+# CONFIG_DEBUG_TFTP is not set
 CONFIG_TRACEROUTE=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
@@ -554 +559 @@
 # udhcp Server/Client
 #
-CONFIG_UDHCPD=y
-CONFIG_UDHCPC=y
-# CONFIG_DUMPLEASES is not set
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_UDHCPC=y
+CONFIG_APP_DUMPLEASES=y
 CONFIG_FEATURE_UDHCP_SYSLOG=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set

floppyfw/configs/config-kernel

@@ -1111 +1111 @@
 #
 CONFIG_VGA_CONSOLE=y
-CONFIG_VIDEO_SELECT=y
+# CONFIG_VIDEO_SELECT is not set
 CONFIG_MDA_CONSOLE=m
 

floppyfw/devkitstuff/Readme.devkit

@@ -30 +30 @@
 
 # svn co http://www.zelow.no/svn/floppyfw
+
+# cd floppyfw
 
 If you want to work on the 3.0 series:

floppyfw/package/add/add.mk

@@ -7 +7 @@
 ########################
 
-ADD_MASTER=$(BUILD_DIR)/add
+TARGET_DIR=$(BUILD_DIR)/add
 
-$(ADD_MASTER):
-        mkdir -p $(ADD_MASTER)
-        cp -a skeletons/add/* $(ADD_MASTER)/.
-        -find $(ADD_MASTER) -type d -name CVS -exec $(RM) -r {} \; > /dev/null 2>&1
-        -find $(ADD_MASTER) -type d -name .svn -exec $(RM) -r {} \; > /dev/null 2>&1
+$(TARGET_DIR):
+        mkdir -p $(TARGET_DIR)
+        cp -a skeletons/add/* $(TARGET_DIR)/.
+        -find $(TARGET_DIR) -type d -name CVS -exec $(RM) -r {} \; > /dev/null 2>&1
+        -find $(TARGET_DIR) -type d -name .svn -exec $(RM) -r {} \; > /dev/null 2>&1
         
 
-add-package: $(ADD_MASTER)
+add-package: $(TARGET_DIR)
         #
         # Scripts:
         #
-        cp $(FILES_DIR)/udhcpcrenew.sh $(ADD_MASTER)/etc/.
-        cp $(FILES_DIR)/renew-dnsmasq.sh $(ADD_MASTER)/etc/.
-        # cp $(FILES_DIR)/fakeleases.sh $(ADD_MASTER)/etc/.
-        cp $(FILES_DIR)/udhcpd.conf.sh $(ADD_MASTER)/etc/.
-        cp $(FILES_DIR)/dmz-udhcpd.conf.sh $(ADD_MASTER)/etc/.
-        cp $(FILES_DIR)/login.ini $(ADD_MASTER)/etc/.
-        cp $(FILES_DIR)/profile $(ADD_MASTER)/etc/.
-        cp $(FILES_DIR)/busybox.conf $(ADD_MASTER)/etc/.
-        cp $(FILES_DIR)/dmz-fw.ini $(ADD_MASTER)/etc/firewall/.
-        cp $(FILES_DIR)/wshaper.htb $(ADD_MASTER)/sbin/.
+        cp $(FILES_DIR)/udhcpcrenew.sh $(TARGET_DIR)/etc/.
+        cp $(FILES_DIR)/renew-dnsmasq.sh $(TARGET_DIR)/etc/.
+        # cp $(FILES_DIR)/fakeleases.sh $(TARGET_DIR)/etc/.
+        cp $(FILES_DIR)/udhcpd.conf.sh $(TARGET_DIR)/etc/.
+        cp $(FILES_DIR)/dmz-udhcpd.conf.sh $(TARGET_DIR)/etc/.
+        cp $(FILES_DIR)/login.ini $(TARGET_DIR)/etc/.
+        cp $(FILES_DIR)/profile $(TARGET_DIR)/etc/.
+        cp $(FILES_DIR)/busybox.conf $(TARGET_DIR)/etc/.
+        cp $(FILES_DIR)/dmz-fw.ini $(TARGET_DIR)/etc/firewall/.
+        cp $(FILES_DIR)/wshaper.htb $(TARGET_DIR)/sbin/.
         [ -d /usr/i386-uclibc-linux ] || mkdir /usr/i386-uclibc-linux
         [ -d /usr/i386-uclibc-linux/lib ] || ln -sf /lib /usr/i386-uclibc-linux/lib
 
-        echo $(FLOPPYFW_VERSION) > $(ADD_MASTER)/etc/floppyfw_version
-        $(RM) $(ADD_MASTER)/etc/version
-        ln -s $(ADD_MASTER)/etc/floppyfw_version $(ADD_MASTER)/etc/version
+        echo $(FLOPPYFW_VERSION) > $(TARGET_DIR)/etc/floppyfw_version
+        $(RM) $(TARGET_DIR)/etc/version
+        ln -s $(TARGET_DIR)/etc/floppyfw_version $(TARGET_DIR)/etc/version
 
-        chown -R root.root $(ADD_MASTER)
+        chown -R root.root $(TARGET_DIR)
         
-        (cd $(ADD_MASTER); $(RM) -r tmp/*; tar -cpvf $(TMP_DIR)/add.tar *);
+        (cd $(TARGET_DIR); $(RM) -r tmp/*; tar -cpvf $(TMP_DIR)/add.tar *);
         $(LZMAC) $(TMP_DIR)/add.tar > $(BUILD_DIR)/add.ffw
         /usr/bin/bzip2 -9 $(TMP_DIR)/add.tar

floppyfw/package/bridgeutils/bridgeutils.mk

@@ -31 +31 @@
                 CFLAGS="$(TARGET_CFLAGS)" \
                 CC="$(TARGET_CC)" \
-                --prefix=$(ADD_MASTER) \
+                --prefix=$(TARGET_DIR) \
                 --with-linux-headers=$(LINUX_DIR)/include/linux \
         );
@@ -39 +39 @@
         $(MAKE) -C $(BRIDGECTL_DIR)
 
-$(ADD_MASTER)/sbin/brctl: $(BRIDGECTL_DIR)/brctl/brctl $(ADD_MASTER)
-        @mkdir -p $(ADD_MASTER)/sbin $(ADD_MASTER)/lib
-        cp -a $(BRIDGECTL_DIR)/brctl/brctl $(ADD_MASTER)/sbin/
-        cp -a $(BRIDGECTL_DIR)/brctl/brctld $(ADD_MASTER)/sbin/
-        cp -a $(BRIDGECTL_DIR)/libbridge/libbridge.a $(ADD_MASTER)/lib/
-        -$(SSTRIP) $(ADD_MASTER)/sbin/brctl
-        -$(SSTRIP) $(ADD_MASTER)/sbin/brctld
-        -$(STRIP) $(ADD_MASTER)/lib/libbridge.a
+$(TARGET_DIR)/sbin/brctl: $(BRIDGECTL_DIR)/brctl/brctl $(TARGET_DIR)
+        @mkdir -p $(TARGET_DIR)/sbin $(TARGET_DIR)/lib
+        cp -a $(BRIDGECTL_DIR)/brctl/brctl $(TARGET_DIR)/sbin/
+        cp -a $(BRIDGECTL_DIR)/brctl/brctld $(TARGET_DIR)/sbin/
+        cp -a $(BRIDGECTL_DIR)/libbridge/libbridge.a $(TARGET_DIR)/lib/
+        -$(SSTRIP) $(TARGET_DIR)/sbin/brctl
+        -$(SSTRIP) $(TARGET_DIR)/sbin/brctld
+        -$(STRIP) $(TARGET_DIR)/lib/libbridge.a
 
-bridgeutils: linux-source-configured $(ADD_MASTER)/sbin/brctl
+bridgeutils: linux-source-configured $(TARGET_DIR)/sbin/brctl
 
 bridgeutils-clean:
         -$(MAKE) -C $(BRIDGECTL_DIR) clean
-        $(RM) $(ADD_MASTER)/sbin/brctl
+        $(RM) $(TARGET_DIR)/sbin/brctl
 
 bridgeutils-dirclean:
-        $(RM) $(ADD_MASTER)/sbin/brctl $(ADD_MASTER)/sbin/brctld \
-                $(ADD_MASTER)/lib/libbridge.a
+        $(RM) $(TARGET_DIR)/sbin/brctl $(TARGET_DIR)/sbin/brctld \
+                $(TARGET_DIR)/lib/libbridge.a
 
 

floppyfw/package/busybox/busybox.mk

@@ -45 +45 @@
         touch $(BUSYBOX_DIR)/.configured
 
+busybox-source: $(BUSYBOX_DIR)/.unpacked
+        echo Kildekodeherja
+
 $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
         $(MAKE) CC="$(TARGET_CC)" PREFIX="$(INITRD_MASTER)" -C $(BUSYBOX_DIR)
@@ -59 +62 @@
 
 busybox: $(INITRD_MASTER) $(INITRD_MASTER)/bin/busybox
+        echo Busyboxherja
 
 busybox-clean:
@@ -75 +79 @@
 #
 #############################################################
-ifeq (,y)
-TARGETS+=busybox
-endif
-ifeq (,m)
-TARGETS+=busybox
-endif
+#ifeq (BR2_PACKAGE_BUSYBOX,y)
+#TARGETS+=busybox
+#endif

floppyfw/package/fakeident/fakeident.mk

@@ -27 +27 @@
                 identd identd.c
 
-$(ADD_MASTER)/sbin/identd: $(FAKEIDENT_DIR)/identd
-        cp -a $(FAKEIDENT_DIR)/identd $(ADD_MASTER)/sbin/identd
-        -$(SSTRIP) $(ADD_MASTER)/sbin/identd
+$(TARGET_DIR)/sbin/identd: $(FAKEIDENT_DIR)/identd
+        cp -a $(FAKEIDENT_DIR)/identd $(TARGET_DIR)/sbin/identd
+        -$(SSTRIP) $(TARGET_DIR)/sbin/identd
 
-fakeident: $(ADD_MASTER)/sbin/identd
+fakeident: $(TARGET_DIR)/sbin/identd
 
 fakeident-clean:
         $(RM) $(FAKEIDENT_DIR)/identd
-        $(RM) $(ADD_MASTER)/sbin/identd
+        $(RM) $(TARGET_DIR)/sbin/identd
 
 fakeident-dirclean:
         $(RM) -r $(FAKEIDENT_DIR)
-        $(RM) $(ADD_MASTER)/sbin/identd
+        $(RM) $(TARGET_DIR)/sbin/identd
 
 

floppyfw/package/hostap/hostap.mk

@@ -10 +10 @@
 HOSTAP_VERSION=0.4.5
 
-HOSTAP_SITE=http://hostap.epitest.fi/releases/
+#HOSTAP_SITE=http://hostap.epitest.fi/releases/
+HOSTAP_SITE=http://downloads.openwrt.org/sources/
+
 
 HOSTAP_PKG_DIR=$(TARGET_PACKAGES_DIR)/hostap-$(FLOPPYFW_VERSION)

floppyfw/package/iproute2/iproute2.mk

@@ -62 +62 @@
         $(RM) $(IPROUTE2_PKG_DIR)/etc/iproute2/*
 
-$(ADD_MASTER)/sbin/ip: $(IPROUTE2_DIR)/ip/ip
-        cp $(IPROUTE2_DIR)/ip/ip $(ADD_MASTER)/sbin/.
-        cp $(IPROUTE2_DIR)/tc/tc $(ADD_MASTER)/sbin/.
-        $(SSTRIP) $(ADD_MASTER)/sbin/ip
-        $(SSTRIP) $(ADD_MASTER)/sbin/tc
-        $(RM) $(ADD_MASTER)/etc/iproute2/*
-        mkdir -p $(ADD_MASTER)/etc/iproute2
-        cp -a $(IPROUTE2_DIR)/etc/iproute2 $(ADD_MASTER)/etc/.
+$(TARGET_DIR)/sbin/ip: $(IPROUTE2_DIR)/ip/ip
+        cp $(IPROUTE2_DIR)/ip/ip $(TARGET_DIR)/sbin/.
+        cp $(IPROUTE2_DIR)/tc/tc $(TARGET_DIR)/sbin/.
+        $(SSTRIP) $(TARGET_DIR)/sbin/ip
+        $(SSTRIP) $(TARGET_DIR)/sbin/tc
+        $(RM) $(TARGET_DIR)/etc/iproute2/*
+        mkdir -p $(TARGET_DIR)/etc/iproute2
+        cp -a $(IPROUTE2_DIR)/etc/iproute2 $(TARGET_DIR)/etc/.
 
 iproute2: linux-source-configured $(IPROUTE2_PKG_DIR)/sbin/ss \
-                $(ADD_MASTER)/sbin/ip
+                $(TARGET_DIR)/sbin/ip
 
 iproute2-clean:

floppyfw/package/ipset/ipset.mk

@@ -24 +24 @@
                 KERNEL_DIR=$(BUILD_DIR)/linux \
                 DO_IPV6=0  \
-                DESTDIR=$(ADD_MASTER)/ \
+                DESTDIR=$(TARGET_DIR)/ \
                 PREFIX=/        \
                 BINDIR=/sbin    \
@@ -33 +33 @@
                 COPT_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
 
-$(ADD_MASTER)/sbin/ipset: $(IPSET_BUILD_DIR)/ipset
-        $(RM) $(ADD_MASTER)/lib/ipset/*
+$(TARGET_DIR)/sbin/ipset: $(IPSET_BUILD_DIR)/ipset
+        $(RM) $(TARGET_DIR)/lib/ipset/*
         $(MAKE) -C $(IPSET_BUILD_DIR) \
                 KERNEL_DIR=$(BUILD_DIR)/linux \
                 DO_IPV6=0  \
-                DESTDIR=$(ADD_MASTER)/ \
+                DESTDIR=$(TARGET_DIR)/ \
                 PREFIX=/        \
                 BINDIR=/sbin    \
@@ -47 +47 @@
                 COPT_FLAGS="$(TARGET_CFLAGS) -DNDEBUG" \
                 install
-        $(RM) -r $(ADD_MASTER)$(TMP_DIR)/*
-        $(RM) -r $(ADD_MASTER)/usr$(TMP_DIR)/*
-        -$(SSTRIP) $(ADD_MASTER)/sbin/ipset
-        -$(SSTRIP) $(ADD_MASTER)/lib/ipset/*
+        $(RM) -r $(TARGET_DIR)$(TMP_DIR)/*
+        $(RM) -r $(TARGET_DIR)/usr$(TMP_DIR)/*
+        -$(SSTRIP) $(TARGET_DIR)/sbin/ipset
+        -$(SSTRIP) $(TARGET_DIR)/lib/ipset/*
 
-ipset: $(ADD_MASTER)/sbin/ipset 
+ipset: $(TARGET_DIR)/sbin/ipset 
 
 ipset-source: $(DL_DIR)/$(IPSET_SOURCE)
@@ -60 +60 @@
                 KERNEL_DIR=$(BUILD_DIR)/linux \
                 DO_IPV6=0  \
-                DESTDIR=$(ADD_MASTER)/ \
+                DESTDIR=$(TARGET_DIR)/ \
                 PREFIX=/        \
                 BINDIR=/sbin    \

floppyfw/package/iptables/iptables.mk

@@ -20 +20 @@
          $(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)/$(IPTABLES_SOURCE) 
 
-$(IPTABLES_BUILD_DIR)/.unpacked: $(BUILD_DIR) $(DL_DIR)/$(IPTABLES_SOURCE)
+$(IPTABLES_BUILD_DIR)/.unpacked: $(TARGET_DIR) $(DL_DIR)/$(IPTABLES_SOURCE)
         bzcat $(DL_DIR)/$(IPTABLES_SOURCE) | \
                 tar $(TAR_VERBOSE) -C $(BUILD_DIR) -xf -
@@ -57 +57 @@
         $(RM) $(IPTABLES_PKG_DIR)/sbin/iptables-restore
         $(RM) $(IPTABLES_PKG_DIR)/sbin/iptables-save
-        # I hate doing this: (and I really want gcc 3.4)
         $(RM) $(IPTABLES_PKG_DIR)/lib/iptables/libipt_sctp.so
         $(RM) $(IPTABLES_PKG_DIR)/lib/iptables/libipt_dscp.so
@@ -71 +70 @@
 
 iptables-source: $(DL_DIR)/$(IPTABLES_SOURCE)
+        echo Iptablessource.
 
 iptables-clean:

floppyfw/package/libpcap/libpcap.mk

@@ -78 +78 @@
         rm -rf $(LIBPCAP_PKG_DIR)/usr/man
 
-libpcap: uclibc $(LIBPCAP_DIR)/libpcap.a
+libpcap: $(LIBPCAP_DIR)/libpcap.a
 
 libpcap-clean:

floppyfw/package/linux/linux.mk

@@ -40 +40 @@
 # Used by pcmcia-cs and others
 LINUX_SOURCE_DIR=$(LINUX_DIR)
+LINUX_MODULES_DEP=$(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
 
 #LINUX_CC_OPTS="-Os -pipe"
@@ -48 +49 @@
          $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE)
 
-$(LINUX_DIR)/.unpacked: patch-o-matic hostap-driver-source \
+$(LINUX_DIR)/.unpacked: \
+                busybox-source patch-o-matic-source hostap-driver-source \
                 $(IPTABLES_BUILD_DIR)/.configured $(DL_DIR)/$(LINUX_SOURCE) 
         # Just to make sure it's gone.
@@ -121 +123 @@
                 $(LINUX_DIR)/.config
 endif
-
 # Don't need this right now.
 #ifeq ($(filter $(TARGETS),madwifi), madwifi)
@@ -127 +128 @@
 #               $(LINUX_DIR)/.config
 #endif
-
         $(SED) 's/^EXTRAVERSION\s=\s(.*)/EXTRAVERSION = $$1-floppyfw-$(FLOPPYFW_VERSION)/;' \
                 $(LINUX_DIR)/Makefile
@@ -152 +152 @@
         touch -c $(LINUX_KERNEL)
 
-$(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(LINUX_KERNEL)
+$(LINUX_MODULES_DEP): $(LINUX_KERNEL)
         # Modutils-version
-        #/sbin/depmod -aen -F $(LINUX_DIR)/System.map -b $(MODULES_DIR)/lib/modules/$(LINUX_VERSION) > $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+        #/sbin/depmod -aen -F $(LINUX_DIR)/System.map -b $(MODULES_DIR)/lib/modules/$(LINUX_VERSION) > $(LINUX_MODULES_DEP)
         #/sbin/depmod -aen -F $(LINUX_DIR)/System.map -b $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)
         # busybox perl.
+        [ -f  $(LINUX_MODULES_DEP) ] && cp $(LINUX_MODULES_DEP) $(LINUX_MODULES_DEP).org
+
         [ -d $(MODULES_DIR)/lib/modules/$(LINUX_VERSION) ] && \
         $(BUSYBOX_DIR)/examples/depmod.pl -n \
                 -b $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/ \
                 -F $(LINUX_DIR)/System.map \
-                > $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+                > $(LINUX_MODULES_DEP)
+
+        [ -f  $(LINUX_MODULES_DEP) ] && cp $(LINUX_MODULES_DEP) $(LINUX_MODULES_DEP).precaps
 
         (cd $(MODULES_DIR) ; \
-                cat $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep \
-                | $(SCRIPTS_DIR)/capsfix.pl > $(TMP_DIR)/moddep
-                )
+                cat $(LINUX_MODULES_DEP) \
+                        | $(SCRIPTS_DIR)/capsfix.pl ./ > $(TMP_DIR)/moddep \
+                );
 
-        mv $(TMP_DIR)/moddep $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+        mv $(TMP_DIR)/moddep $(LINUX_MODULES_DEP)
 
-linux:  \
-patch-o-matic \
-                hostap-driver-source \
+linux:  busybox-source patch-o-matic-source hostap-driver-source \
                 $(IPTABLES_BUILD_DIR)/.configured \
-                $(LINUX_KERNEL) \
-                $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+                $(LINUX_MODULES_DEP)
+                # $(LINUX_KERNEL) 
+                
 
-linux-depmod: linux $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+linux-depmod: linux $(LINUX_MODULES_DEP)
 
 linux-source: $(DL_DIR)/$(LINUX_SOURCE)

floppyfw/package/madwifi/madwifi.mk

@@ -43 +43 @@
                 BINDIR=/usr/bin \
                 DESTDIR=$(MADWIFI_PKG_DIR) \
-                C $(MADWIFI_DIR) install
+                -C $(MADWIFI_DIR) install
         -$(RM) -r $(MADWIFI_PKG_DIR)/usr/man
         -$(SSTRIP) $(MADWIFI_PKG_DIR)/usr/bin/*

floppyfw/package/patch-o-matic/patch-o-matic.mk

@@ -2 +2 @@
 #
 # patch-o-matic
+#
+# The real patcing is done in the linux kernel makefiles, this just
+# unpacks the source.
 #
 #############################################################
@@ -17 +20 @@
          $(WGET) -P $(DL_DIR) $(PATCH_O_MATIC_SOURCE_URL)$(PATCH_O_MATIC_SOURCE)
 
-patch-o-matic-source: $(DL_DIR)/$(PATCH_O_MATIC_SOURCE)
-
-$(PATCH_O_MATIC_DIR)/.unpacked: $(BUILD_DIR) $(DL_DIR)/$(PATCH_O_MATIC_SOURCE)
+$(PATCH_O_MATIC_DIR)/.unpacked: $(DL_DIR)/$(PATCH_O_MATIC_SOURCE)
         bzcat $(DL_DIR)/$(PATCH_O_MATIC_SOURCE) | tar $(TAR_VERBOSE) \
                 -C $(BUILD_DIR) -xvf -
@@ -26 +27 @@
         # cp -a $(PATCH_DIR)/kernel-pom/string $(PATCH_O_MATIC_DIR)/patchlets/.
         touch $(PATCH_O_MATIC_DIR)/.unpacked
+
+patch-o-matic-source: $(PATCH_O_MATIC_DIR)/.unpacked
 
 patch-o-matic: $(PATCH_O_MATIC_DIR)/.unpacked

floppyfw/package/uclibc/uclibc.mk

@@ -9 +9 @@
 UCLIBC_LIBDIR=/lib
 
-$(INITRD_MASTER)/lib/libc.so.0: 
+$(INITRD_MASTER)/lib/libc.so.0: $(INITRD_MASTER)
         #
         # Just copying the library-files:
@@ -22 +22 @@
         -rmdir $(INITRD_MASTER)/lib/modules
 
-$(ADD_MASTER)/lib/libdl.so.0: 
+$(TARGET_DIR)/lib/libdl.so.0: 
 
-        cp -a $(UCLIBC_LIBDIR)/libdl* $(ADD_MASTER)/lib/.
-        cp -a $(UCLIBC_LIBDIR)/libpthread* $(ADD_MASTER)/lib/.
-        cp -a $(UCLIBC_LIBDIR)/libresolv* $(ADD_MASTER)/lib/.
-        cp -a $(UCLIBC_LIBDIR)/libutil* $(ADD_MASTER)/lib/.
+        cp -a $(UCLIBC_LIBDIR)/libdl* $(TARGET_DIR)/lib/.
+        cp -a $(UCLIBC_LIBDIR)/libpthread* $(TARGET_DIR)/lib/.
+        cp -a $(UCLIBC_LIBDIR)/libresolv* $(TARGET_DIR)/lib/.
+        cp -a $(UCLIBC_LIBDIR)/libutil* $(TARGET_DIR)/lib/.
 
-        cp -a $(UCLIBC_LIBDIR)/libnsl* $(ADD_MASTER)/lib/.
+        cp -a $(UCLIBC_LIBDIR)/libnsl* $(TARGET_DIR)/lib/.
 
         # This one does not belong here
-        -cp -a $(UCLIBC_LIBDIR)/libz* $(ADD_MASTER)/lib/.
+        -cp -a $(UCLIBC_LIBDIR)/libz* $(TARGET_DIR)/lib/.
 
-        -$(RM) $(ADD_MASTER)/lib/*.a
-        -rmdir $(ADD_MASTER)/lib/modules
+        -$(RM) $(TARGET_DIR)/lib/*.a
+        -rmdir $(TARGET_DIR)/lib/modules
 
         # Sick, but it works.
-        -$(SSTRIP) $(ADD_MASTER)/lib/*
+        -$(SSTRIP) $(TARGET_DIR)/lib/*
 
 
-uclibc: $(INITRD_MASTER) $(ADD_MASTER) $(INITRD_MASTER)/lib/libc.so.0 \
-        $(ADD_MASTER)/lib/libdl.so.0
+uclibc: $(INITRD_MASTER) $(TARGET_DIR) $(INITRD_MASTER)/lib/libc.so.0 \
+        $(TARGET_DIR)/lib/libdl.so.0
 
 uclibc-clean:
         -$(RM) -r $(INITRD_MASTER)/lib/*
-        -$(RM) $(ADD_MASTER)/lib/libcrypt*
-        -$(RM) $(ADD_MASTER)/lib/libdl*
-        -$(RM) $(ADD_MASTER)/lib/libpth*
-        -$(RM) $(ADD_MASTER)/lib/libres*
-        -$(RM) $(ADD_MASTER)/lib/libu*
-        -$(RM) $(ADD_MASTER)/lib/libnsl*
+        -$(RM) $(TARGET_DIR)/lib/libcrypt*
+        -$(RM) $(TARGET_DIR)/lib/libdl*
+        -$(RM) $(TARGET_DIR)/lib/libpth*
+        -$(RM) $(TARGET_DIR)/lib/libres*
+        -$(RM) $(TARGET_DIR)/lib/libu*
+        -$(RM) $(TARGET_DIR)/lib/libnsl*
 
 uclibc-dirclean: uclibc-clean

floppyfw/package/wpa_supplicant/wpa_supplicant.mk

@@ -21 +21 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
-WPA_SUPPLICANT_SITE=http://hostap.epitest.fi/releases/
+
+#WPA_SUPPLICANT_SITE=http://hostap.epitest.fi/releases/
+WPA_SUPPLICANT_SITE=http://downloads.openwrt.org/sources/
+
 WPA_SUPPLICANT_VERSION=0.3.8
 WPA_SUPPLICANT_SOURCE=wpa_supplicant-$(WPA_SUPPLICANT_VERSION).tar.gz

floppyfw/scripts/capsfix.pl

@@ -14 +14 @@
 # use strict;
 
-my $dir = "2.4-std";
-# my $dir = "test";
+my $dir = $ARGV[0];
 
 my %files;

floppyfw/scripts/capsfix.sh

@@ -8 +8 @@
 
 cat 2.4-std/lib/modules/$KERNELVERSION/modules.dep | ./capsfix.pl > /tmp/moddep
+
 # mv /tmp/moddep 2.4-std/lib/modules/$KERNELVERSION/modules.dep