Changeset 218 for floppyfw

Timestamp:

02/07/07 10:08:06 (5 years ago)

Author:

root

Message:

Way too much for one commit (as usual) but this is the 2.6 preparation and also fixes on the make system.

Location:

floppyfw

Files:

• Makefile (modified) (4 diffs)
• TODO (modified) (1 diff)
• package/Config.in (modified) (1 diff)
• package/linux/Config.in (modified) (2 diffs)
• package/linux/linux-2.6.mk (modified) (4 diffs)
• package/linux/linux.mk (modified) (9 diffs)
• package/patch-o-matic/Config.in (modified) (1 diff)
• package/tcpdump/Config.in (modified) (1 diff)
• patches/kernel-2.6 (added)

floppyfw/Makefile

@@ -67 +67 @@
 #
 ##############################################################
-TARGETS:=uclibc linux busybox 
+# We need these so we just put them here.
+TARGETS:=uclibc linux busybox
 include package/Makefile.in
 # include target/Makefile.in
@@ -77 +78 @@
 #
 #############################################################
-
-
 
 all:   world
@@ -99 +98 @@
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
+TARGETS_SOURCE_CONFIGURED:=$(patsubst %,%-source-configured,$(TARGETS))
 TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
+TARGETS_MENUCONFIG:=$(patsubst %,%-menuconfig,$(TARGETS))
 
 world: echotarg $(TMP_DIR) $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) \
@@ -107 +108 @@
 .PHONY: all world clean dirclean distclean source $(TARGETS) \
         $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
-        $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR) floppy
+        $(TARGETS_SOURCE_CONFIGURED) $(TARGETS_MENUCONFIG) \
+        $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR) \
+        floppy
 
 #############################################################

floppyfw/TODO

@@ -11 +11 @@
  - Modulepicking
 
+ - Move the package skeletons and patches to the packages/<PACKAGE> directory.
+
 Kernel 2.6
 

floppyfw/package/Config.in

@@ -3 +3 @@
 comment "You need this (unless you really know what you are doing"
 source "package/busybox/Config.in"
+
+menu "Linux configuration"
+
 source "package/linux/Config.in"
 source "package/patch-o-matic/Config.in"
+
+endmenu
+
+
 source "package/add/Config.in"
 source "package/initrd/Config.in"

floppyfw/package/linux/Config.in

@@ -1 @@
-config BR2_PACKAGE_LINUX
-        bool "linux"
+config BR2_PACKAGE_LINUX_24
+        bool "linux 2.4 kernel series."
         default y
         help
 
+config BR2_PACKAGE_LINUX_26
+        bool "linux 2.6 kernel series."
+        default n
+        help
+
+comment "Network card modules"
+
+config NIC_MODULES
+        string "Network card modules"
+        default "3c509 3c59x 8139cp 8139too pcnet32 r8169 e100 e1000 ne ne2k-pci forcedeth tulip"
+        depends BR2_PACKAGE_LINUX_24 || BR2_PACKAGE_LINUX_26
+
+config LINUX_KCONFIG_24
+        string "Kernel configuration file, has to reside in configs/"
+        depends BR2_PACKAGE_LINUX_24
+        default "config-kernel"
+        help
+          Nice to be able to roll your own kernel config.
+
+config LINUX_KCONFIG_26
+        string "Kernel configuration file, has to reside in configs/"
+        depends BR2_PACKAGE_LINUX_26
+        default "config-kernel-2.6"
+        help
+          Nice to be able to roll your own kernel config.
+
 config EMULATE_FPU
         bool "Floating point/Math emlation"
-        depends BR2_PACKAGE_LINUX
+        depends BR2_PACKAGE_LINUX_24 || BR2_PACKAGE_LINUX_26
         default n
         help
@@ -13 +39 @@
           but at least it will work.
 
-config NIC_MODULES
-        string "Network card modules"
-        default "3c509 3c59x 8139cp 8139too pcnet32 r8169 e100 e1000 ne ne2k-pci forcedeth tulip"
-        depends BR2_PACKAGE_LINUX
-
-config LINUX_KCONFIG
-        string "Kernel configuration file, has to reside in configs/"
-        depends BR2_PACKAGE_LINUX
-        default "config-kernel"
-        help
-          Nice to be able to roll your own kernel config.

floppyfw/package/linux/linux-2.6.mk

@@ -26 +26 @@
 #############################################################
 
+# Encapsulate it all so not end up entangling ourselves in the 2.4 makefile.
+ifeq ($(strip $(BR2_PACKAGE_LINUX_26)),y)
+
 # Version of Linux to download and then apply patches to
-DOWNLOAD_LINUX26_VERSION=2.6.17.13
+DOWNLOAD_LINUX_VERSION=2.6.19.2
 # Version of Linux AFTER patches
-LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION)-floppyfw-$(FLOPPYFW_VERSION)
+LINUX_VERSION=$(DOWNLOAD_LINUX_VERSION)-floppyfw-$(FLOPPYFW_VERSION)
 
-LINUX26_FORMAT=bzImage
-LINUX26_BINLOC=arch/$(ARCH)/boot/$(LINUX26_FORMAT)
+LINUX_FORMAT=bzImage
+LINUX_BINLOC=arch/$(ARCH)/boot/$(LINUX_FORMAT)
 
-LINUX26_DIR=$(BUILD_DIR)/linux-$(LINUX26_VERSION)
-LINUX26_SOURCE=linux-$(DOWNLOAD_LINUX26_VERSION).tar.bz2
-LINUX26_SITE=ftp://ftp.kernel.org/pub/linux/kernel/v2.6
-LINUX26_KCONFIG=$(CONFIG_DIR)/config-linux-2.6
-LINUX26_KERNEL=$(LINUX26_DIR)/vmlinuz
+LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
+LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
+LINUX_SITE=ftp://ftp.kernel.org/pub/linux/kernel/v2.6
+LINUX_KERNEL=$(LINUX_DIR)/vmlinuz
 # Used by pcmcia-cs and others
-LINUX26_SOURCE_DIR=$(LINUX26_DIR)
+LINUX_SOURCE_DIR=$(LINUX_DIR)
 
 UPX=upx-1.11
 
-$(DL_DIR)/$(LINUX26_SOURCE): 
-         $(WGET) -P $(DL_DIR) $(LINUX26_SITE)/$(LINUX26_SOURCE)
+LINUX_KCONFIG_26:=$(strip $(subst ",, $(LINUX_KCONFIG_26)))
+#"
 
-$(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE) 
+$(DL_DIR)/$(LINUX_SOURCE): 
+         $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE)
+
+$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) 
         -$(RM) -r $(MODULES_DIR)/lib
         -$(RM) $(MODULES_DIR)/.stripped
-        -$(RM) -r $(LINUX26_DIR)
-        bzcat $(DL_DIR)/$(LINUX26_SOURCE) | tar $(TAR_VERBOSE) \
+        -$(RM) -r $(LINUX_DIR)
+        bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar $(TAR_VERBOSE) \
                 -C $(BUILD_DIR) -xf -
-ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION))
+ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION))
         # Rename the dir from the downloaded version to the AFTER patch version 
-        mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR)
-        touch $(LINUX26_DIR)/.unpacked
+        mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX_VERSION) $(LINUX_DIR)
+        touch $(LINUX_DIR)/.unpacked
 endif
 
-$(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked
+$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
         mkdir -p $(PATCH_DIR)/kernel
         # Patching the kernel.
-        $(SCRIPTS_DIR)/patch-kernel.sh $(LINUX26_DIR) $(PATCH_DIR)/kernel-2.6 0*
+        $(SCRIPTS_DIR)/patch-kernel.sh $(LINUX_DIR) $(PATCH_DIR)/kernel-2.6 0*
         echo "Patched the kernel with $(PATCH_DIR)/kernel patches"
 
@@ -68 +73 @@
 ifeq ($(filter $(TARGETS),patch-o-matic), patch-o-matic)
         (cd $(PATCH_O_MATIC_DIR); \
-                KERNEL_DIR=$(LINUX26_DIR) \
+                KERNEL_DIR=$(LINUX_DIR) \
                 IPTABLES_DIR=$(IPTABLES_BUILD_DIR) \
                 ./runme --batch $(POM_PATCHES) \
@@ -74 +79 @@
 endif
 ifeq ($(filter $(TARGETS),hostap), hostap)
-        (cd $(LINUX26_DIR); \
-        cat $(HOSTAP_DRIVER_KERNEL_PATCH) | patch -p1 ; \
-        cp $(HOSTAP_DRIVER_DIR)/driver/modules/hostap*.[ch] \
-        drivers/net/wireless/. );
+        #(cd $(LINUX_DIR); \
+        #cat $(HOSTAP_DRIVER_KERNEL_PATCH) | patch -p1 ; \
+        #cp $(HOSTAP_DRIVER_DIR)/driver/modules/hostap*.[ch] \
+        #drivers/net/wireless/. );
 endif
-        touch $(LINUX26_DIR)/.patched
+        touch $(LINUX_DIR)/.patched
 
-$(LINUX26_KCONFIG):
-        @if [ ! -f "$(LINUX26_KCONFIG)" ] ; then \
+$(LINUX_KCONFIG_26):
+        @if [ ! -f "$(LINUX_KCONFIG_26)" ] ; then \
                 echo ""; \
                 echo "You should create a .config for your kernel"; \
-                echo "and install it as $(LINUX26_KCONFIG)"; \
+                echo "and install it as $(LINUX_KCONFIG_26)"; \
                 echo ""; \
                 sleep 5; \
@@ -91 +96 @@
 
 
-$(LINUX26_DIR)/.configured:  $(LINUX26_DIR)/.patched  $(LINUX26_KCONFIG)
-        -cp $(LINUX26_KCONFIG) $(LINUX26_DIR)/.config
+$(LINUX_DIR)/.configured:  $(LINUX_DIR)/.patched  $(LINUX_KCONFIG_26)
+        -cp $(LINUX_KCONFIG_26) $(LINUX_DIR)/.config
 ifeq ($(strip $(EMULATE_FPU)),true)
         $(SED) "s/^.*CONFIG_MATH_EMULATION.*/CONFIG_MATH_EMULATION=y/;" \
-                $(LINUX26_DIR)/.config
+                $(LINUX_DIR)/.config
 else
         $(SED) "s/^.*CONFIG_MATH_EMULATION.*/CONFIG_MATH_EMULATION=n/;" \
-                $(LINUX26_DIR)/.config
+                $(LINUX_DIR)/.config
 endif
         $(SED) 's/^EXTRAVERSION\s=\s(.*)/EXTRAVERSION = $$1-floppyfw-$(FLOPPYFW_VERSION)/;' \
-                $(LINUX26_DIR)/Makefile
-        $(MAKE) -C $(LINUX26_DIR) oldconfig include/linux/version.h
-        touch $(LINUX26_DIR)/.configured
+                $(LINUX_DIR)/Makefile
+        $(MAKE) -C $(LINUX_DIR) oldconfig include/linux/version.h
+        touch $(LINUX_DIR)/.configured
 
-linux26-source-configured: $(LINUX26_DIR)/.configured
+linux-source-configured: $(LINUX_DIR)/.configured
 
-$(LINUX26_DIR)/$(LINUX26_BINLOC): $(LINUX26_DIR)/.configured
-        $(MAKE) CC="$(TARGET_CC)" -C $(LINUX26_DIR) $(LINUX26_FORMAT)
-        $(MAKE) CC="$(TARGET_CC)" -C $(LINUX26_DIR) modules
+$(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.configured
+        $(MAKE) CC="$(TARGET_CC)" -C $(LINUX_DIR) $(LINUX_FORMAT)
+        $(MAKE) CC="$(TARGET_CC)" -C $(LINUX_DIR) modules
 
-$(MODULES_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep: $(LINUX26_DIR)/.configured
+$(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(LINUX_DIR)/.configured
         $(RM) -r $(MODULES_DIR)/lib/modules
-        $(MAKE) -C $(LINUX26_DIR) INSTALL_MOD_PATH=$(MODULES_DIR) modules_install
-        (cd $(MODULES_DIR) ; cat $(MODULES_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep | $(SCRIPTS_DIR)/capsfix.pl > $(TMP_DIR)/moddep)
-        #mv $(MODULES_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep \
-        #       $(MODULES_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep.precaps
-        mv $(TMP_DIR)/moddep $(MODULES_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
-        (cd $(MODULES_DIR)/lib/modules; ln -s $(LINUX26_VERSION)/kernel/drivers .)
+        $(MAKE) -C $(LINUX_DIR) INSTALL_MOD_PATH=$(MODULES_DIR) modules_install
+        (cd $(MODULES_DIR) ; cat $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep | $(SCRIPTS_DIR)/capsfix.pl > $(TMP_DIR)/moddep)
+        #mv $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep \
+        #       $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep.precaps
+        mv $(TMP_DIR)/moddep $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+        (cd $(MODULES_DIR)/lib/modules; ln -s $(LINUX_VERSION)/kernel/drivers .)
         # $(DEPMOD)
 
-$(LINUX26_KERNEL): $(LINUX26_DIR)/$(LINUX26_BINLOC)
-        cp -fa $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL)
-        cp -fa $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL).upx
-        # $(UPX) -9 $(LINUX26_KERNEL).upx
-        touch -c $(LINUX26_KERNEL)
+$(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
+        cp -fa $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL)
+        cp -fa $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL).upx
+        # $(UPX) -9 $(LINUX_KERNEL).upx
+        touch -c $(LINUX_KERNEL)
 
-linux26:  patch-o-matic hostap-driver-source $(IPTABLES_BUILD_DIR)/.configured $(LINUX26_KERNEL) $(MODULES_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
+linux:  patch-o-matic hostap-driver-source $(IPTABLES_BUILD_DIR)/.configured $(LINUX_KERNEL) $(MODULES_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
 
-linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
+linux-source: $(DL_DIR)/$(LINUX_SOURCE)
 
 # This has been renamed so we do _NOT_ by default run this on 'make clean'
-linux26clean: clean
-        $(RM) $(LINUX26_KERNEL)
-        -$(MAKE) -C $(LINUX26_DIR) clean
+linuxclean: clean
+        $(RM) $(LINUX_KERNEL)
+        -$(MAKE) -C $(LINUX_DIR) clean
 
-linux26-dirclean:
-        $(RM) -r $(LINUX26_DIR)
+linux-dirclean:
+        $(RM) -r $(LINUX_DIR)
+
+# End encapsulation
+endif

floppyfw/package/linux/linux.mk

@@ -26 +26 @@
 #############################################################
 
+# Encapsulate:
+ifeq ($(strip $(BR2_PACKAGE_LINUX_24)),y)
+
+
 # Version of Linux to download and then apply patches to
 DOWNLOAD_LINUX_VERSION=2.4.34
@@ -46 +50 @@
 # LINUX_CC_OPTS="-Os -funit-at-a-time  -mregparm=3 -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -fomit-frame-pointer -pipe -mpreferred-stack-boundary=2 -march=i386 -nostdinc -iwithprefix"
 
+LINUX_KCONFIG_24:=$(strip $(subst ",, $(LINUX_KCONFIG_24)))
+#"
+
 DEPMOD=scripts/depmod.pl
 DEPMOD_CMD= [ -d $(MODULES_DIR)/lib/modules/$(LINUX_VERSION) ] && \
@@ -59 +66 @@
                 busybox-source patch-o-matic-source hostap-driver-source \
                 $(IPTABLES_BUILD_DIR)/.configured $(DL_DIR)/$(LINUX_SOURCE) 
+        ARGH!
         # Just to make sure it's gone.
         -$(RM) -r $(MODULES_DIR)/lib
@@ -65 +73 @@
         bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar $(TAR_VERBOSE) \
                 -C $(BUILD_DIR) -xf -
+# I shall not need this!
 ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION))
         # Rename the dir from the downloaded version to the AFTER patch version 
@@ -112 +121 @@
         touch $(LINUX_DIR)/.patched
 
-$(CONFIG_DIR)/$(LINUX_KCONFIG):
-        @if [ ! -f "$(CONFIG_DIR)/$(LINUX_KCONFIG)" ] ; then \
+$(CONFIG_DIR)/$(LINUX_KCONFIG_24):
+        @if [ ! -f "$(CONFIG_DIR)/$(LINUX_KCONFIG_24)" ] ; then \
                 echo ""; \
                 echo "You should create a .config for your kernel"; \
-                echo "and install it as $(CONFIG_DIR)/$(LINUX_KCONFIG)"; \
+                echo "and install it as $(CONFIG_DIR)/$(LINUX_KCONFIG_24)"; \
                 echo ""; \
                 sleep 5; \
         fi;
 
-$(LINUX_DIR)/.configured:  $(LINUX_DIR)/.patched  $(CONFIG_DIR)/$(LINUX_KCONFIG)
-        -cp $(CONFIG_DIR)/$(LINUX_KCONFIG) $(LINUX_DIR)/.config
-ifeq ($(strip $(EMULATE_FPU)),true)
+$(LINUX_DIR)/.configured:  $(LINUX_DIR)/.patched  $(CONFIG_DIR)/$(LINUX_KCONFIG_24)
+        -cp $(CONFIG_DIR)/$(LINUX_KCONFIG_24) $(LINUX_DIR)/.config
+ifeq ($(strip $(EMULATE_FPU)),y)
         $(SED) "s/^.*CONFIG_MATH_EMULATION.*/CONFIG_MATH_EMULATION=y/;" \
                 $(LINUX_DIR)/.config
@@ -141 +150 @@
 
 linux-source-configured: $(LINUX_DIR)/.configured
+        Innom linux-source-configured
 
 $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
@@ -162 +172 @@
         # Modutils-version
         #/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
-
+
+        # Back up first.
+        [ -f  $(LINUX_MODULES_DEP) ] && cp $(LINUX_MODULES_DEP) \
+                $(LINUX_MODULES_DEP).org
+
+        # Run depmod.
         $(DEPMOD_CMD)
 
-        [ -f  $(LINUX_MODULES_DEP) ] && cp $(LINUX_MODULES_DEP) $(LINUX_MODULES_DEP).precaps
+        [ -f  $(LINUX_MODULES_DEP) ] && cp $(LINUX_MODULES_DEP) \
+                $(LINUX_MODULES_DEP).precaps
 
         (cd $(MODULES_DIR) ; \
@@ -187 +200 @@
         ( cd $(LINUX_DIR) ; \
                 make menuconfig ; \
-                cp .config $(CONFIG_DIR)/$(LINUX_KCONFIG) \
+                cp .config $(CONFIG_DIR)/$(LINUX_KCONFIG_24) \
         )
 
@@ -197 +210 @@
 linux-dirclean:
         $(RM) -r $(LINUX_DIR)
+
+# End encapsulation
+endif

floppyfw/package/patch-o-matic/Config.in

@@ -1 +1 @@
 config BR2_PACKAGE_POM
-        bool "patch-o-matic"
+        bool "patch-o-matic (P-O-M)"
         default y
         help
+
+comment "P-O-M Patches"
 
 config POM_PATCHES

floppyfw/package/tcpdump/Config.in

@@ -2 +2 @@
         tristate "tcpdump"
         default n
-        select BR2_PACKAGES_LIBPCAP
+        select BR2_PACKAGE_LIBPCAP
         help