Changeset 398df5e in freewrt


Ignore:
Timestamp:
Sep 10, 2006, 4:47:16 PM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Children:
1ca76d2
Parents:
6b05a25
Message:

add configfs partition to all models, except netgear, make openswan package a single package including utils and kernel modules, fix some startupscripts for the configfs changes

git-svn-id: ​svn://www.freewrt.org/branches/wbx-target-cleanup@580 afb5a338-a214-0410-bd46-81f09a774fd1

Files:
13 deleted
9 edited
3 moved

Legend:

Unmodified
Added
Removed

  • package/Config.in

    r6b05a25 r398df5e  
    1313source "package/mtd/Config.in"
    1414source "package/nvram/Config.in"
     15source "package/jffs2root/Config.in"
    1516source "package/webif/Config.in"
    1617endmenu
    … …  
    358359        help
    359360          Predefine the URL where "ipkg" looks for packages
    360           @TARGET@ works as placeholder for "<boradtype>-<kernel>" i.e. "brcm-2.4"
     361          @TARGET@ works as placeholder for "<boardtype>-<kernel>" i.e. "brcm-2.4"
    361362             so you can configure different URLs for different targets with a single string
    362363

  • package/Makefile

    r6b05a25 r398df5e  
    9393package-$(FWRT_PACKAGE_IRSSI) += irssi
    9494package-$(FWRT_PACKAGE_JAMVM) += jamvm
     95package-$(FWRT_PACKAGE_JFFS2ROOT) += jffs2root
    9596package-$(FWRT_PACKAGE_JOE) += joe
    9697package-$(FWRT_COMPILE_JPEG) += jpeg
    … …  
    181182package-$(FWRT_COMPILE_OPENSSH) += openssh
    182183package-$(FWRT_COMPILE_OPENSSL) += openssl
    183 package-$(FWRT_COMPILE_OPENSWAN) += openswan
     184package-$(FWRT_PACKAGE_OPENSWAN) += openswan
    184185package-$(FWRT_PACKAGE_OPENVPN) += openvpn
    185186package-$(FWRT_COMPILE_OSIRIS) += osiris

  • package/base-files/default/sbin/mount_root

    r6b05a25 r398df5e  
    88        mount | grep jffs2 >&-
    99        if [ $? = 0 ] ; then
    10                 if [ $(cat /proc/mtd | wc -l) = 6 ]; then
     10                if [ $(cat /proc/mtd | wc -l) = 7 ]; then
    1111                        mtd erase data
    1212                        jffs2root --move --reboot
    … …  
    1717                . /bin/firstboot
    1818                echo "switching to overlay filesystem"
    19                 mount /dev/mtdblock/4 /jffs -t jffs2
     19                mount /dev/mtdblock/5 /jffs -t jffs2
    2020                fopivot /jffs /rom
    2121        fi

  • package/broadcom-wl/Config.in

    r6b05a25 r398df5e  
    11config FWRT_PACKAGE_KMOD_BROADCOM_WL
    2         prompt "kmod-broadcom-wl.............. Kernel driver for Broadcom wireless lan cards"
     2        prompt "kmod-broadcom-wl.................. Kernel driver for Broadcom wireless lan cards"
    33        tristate
    44        default n

  • package/openswan/Config.in

    r6b05a25 r398df5e  
    1 config FWRT_COMPILE_OPENSWAN
     1config FWRT_PACKAGE_OPENSWAN
    22        prompt "openswan.......................... VPN solution using IPsec"
    33        tristate
    … …  
    99         
    1010          http://www.openswan.org/
    11 
    12 config FWRT_PACKAGE_OPENSWAN_UTILS
    13         prompt "openswan-utils..................... VPN solution using IPsec"
    14         tristate
    15         default n
    16         depends FWRT_COMPILE_OPENSWAN
    17         help
    18           OpenSwan is an implementation of IPsec for Linux.
    19          
    20           http://www.openswan.org/
    21 
    22 config FWRT_PACKAGE_KMOD_OPENSWAN
    23         prompt "kmod-openswan..................... VPN solution using IPsec"
    24         tristate
    25         default n
    26         depends FWRT_COMPILE_OPENSWAN
    27         help
    28           OpenSwan is an implementation of IPsec for Linux.
    29          
    30           http://www.openswan.org/
    31 

  • package/openswan/Makefile

    r6b05a25 r398df5e  
    1212include $(TOPDIR)/package/rules.mk
    1313
    14 $(eval $(call PKG_template,OPENSWAN_UTILS,openswan-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    15 $(eval $(call PKG_template,KMOD_OPENSWAN,kmod-openswan,$(KERNEL_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
     14$(eval $(call PKG_template,OPENSWAN,openswan,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
    1615
    1716FLAGS := $(TARGET_CFLAGS) -I$(WRKBUILD)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
    … …  
    4342
    4443$(IPKG_OPENSWAN):
     44        mkdir -p $(PACKAGE_DIR)
    4545        $(MAKE) -C $(WRKBUILD) \
    4646                $(TARGET_CONFIGURE_OPTS) \
    … …  
    6161        $(CP) ../rc.d/init.d/ipsec $(IDIR_OPENSWAN)/etc/init.d/S60ipsec
    6262        find $(WRKBUILD) -name \*.old | xargs rm -rf
    63         mkdir -p $(PACKAGE_DIR)
     63        mkdir -p $(IDIR_OPENSWAN)/lib/modules/$(KERNEL_VERSION)
     64        $(CP) $(WRKBUILD)/modobj*/ipsec.$(KERNEL_MOD_SUFFIX) \
     65                $(IDIR_OPENSWAN)/lib/modules/$(KERNEL_VERSION)/
    6466        $(IPKG_BUILD) $(IDIR_OPENSWAN) $(PACKAGE_DIR)
    6567
    66 $(IPKG_KMOD_OPENSWAN):
    67         mkdir -p $(IDIR_KMOD_OPENSWAN)/lib/modules/$(KERNEL_VERSION)
    68         $(CP) $(WRKBUILD)/modobj*/ipsec.$(KERNEL_MOD_SUFFIX) \
    69                 $(IDIR_KMOD_OPENSWAN)/lib/modules/$(KERNEL_VERSION)/
    70         $(IPKG_BUILD) $(IDIR_KMOD_OPENSWAN) $(PACKAGE_DIR)
    71 

  • package/openswan/ipkg/openswan.control

    r6b05a25 r398df5e  
    22Section: base
    33Priority: optional
    4 Depends: kmod-openswan, libgmp, ip
     4Depends: libgmp, ip
    55Description: Openswan IPSec software

  • target/Config.in

    r6b05a25 r398df5e  
    2121config FWRT_TARGET_ROOTFS_JFFS2
    2222        bool "Development images with writable root filesystem"
     23        select FWRT_PACKAGE_JFFS2ROOT
    2324        help
    2425          Build firmware images with a writable jffs2 root filesystem.

  • target/image/brcm/Makefile

    r6b05a25 r398df5e  
    7171ifeq ($(FS),squashfs)
    7272$(STAGING_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS).trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS) $(KDIR)/vmlinux.lzma
    73         $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) $(KDIR)/root.$(FS) -a 1024 $(MAKE_TRACE)
     73        $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) -a 1024 $(KDIR)/root.$(FS) $(MAKE_TRACE)
    7474endif
    7575
    7676ifeq ($(FS),jffs2)
    7777$(STAGING_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS)-64k.trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS)-64k $(KDIR)/vmlinux.lzma
    78         $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) $(KDIR)/root.$(FS)-64k -a 0x10000 $(MAKE_TRACE)
     78        $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma -a 0x10000 $(KDIR)/root.$(FS)-64k $(MAKE_TRACE)
    7979
    8080$(STAGING_DIR)/freewrt-$(BOARD)-$(KERNEL)-$(FS)-128k.trx: $(KDIR)/loader.tmp.gz $(KDIR)/root.$(FS)-128k $(KDIR)/vmlinux.lzma
    81         $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma $(TRXALIGN) $(KDIR)/root.$(FS)-128k -a 0x20000 $(MAKE_TRACE)
     81        $(STAGING_DIR)/bin/trx -o $@ $(KDIR)/loader.tmp.gz $(KDIR)/vmlinux.lzma -a 0x20000 $(KDIR)/root.$(FS)-128k $(MAKE_TRACE)
    8282endif
    8383

  • target/linux/brcm-2.4/Config.in

    r6b05a25 r398df5e  
    77        select FWRT_PACKAGE_KMOD_BROADCOM_WL
    88        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG
     9        select FWRT_PACKAGE_KMOD_USB
    910        select FWRT_PACKAGE_KMOD_USB_UHCI
    1011        select FWRT_PACKAGE_KMOD_WLCOMPAT
    … …  
    2223        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG
    2324        select FWRT_PACKAGE_KMOD_SWITCH_ROBO
     25        select FWRT_PACKAGE_KMOD_USB
    2426        select FWRT_PACKAGE_KMOD_USB_UHCI
    2527        select FWRT_PACKAGE_KMOD_USB2
    … …  
    3840        select FWRT_PACKAGE_KMOD_BROADCOM_DIAG
    3941        select FWRT_PACKAGE_KMOD_SWITCH_ROBO
     42        select FWRT_PACKAGE_KMOD_USB
    4043        select FWRT_PACKAGE_KMOD_USB_UHCI
    4144        select FWRT_PACKAGE_KMOD_USB2
    … …  
    205208        select FWRT_PACKAGE_KMOD_MADWIFI
    206209        select FWRT_PACKAGE_KMOD_SWITCH_ROBO
     210        select FWRT_PACKAGE_KMOD_USB
    207211        select FWRT_PACKAGE_KMOD_USB_UHCI
    208212        select FWRT_PACKAGE_KMOD_USB2

  • target/linux/brcm-2.4/patches/003-flash-map.patch

    r6b05a25 r398df5e  
    1 diff -Nur linux-2.4.32/drivers/mtd/maps/Config.in linux-2.4.32-freewrt/drivers/mtd/maps/Config.in
    2 --- linux-2.4.32/drivers/mtd/maps/Config.in     Fri Jun 13 16:51:34 2003
    3 +++ linux-2.4.32-freewrt/drivers/mtd/maps/Config.in     Sun Aug 27 20:51:11 2006
    4 @@ -48,6 +48,7 @@
    5  fi
    6  
    7  if [ "$CONFIG_MIPS" = "y" ]; then
    8 +   dep_tristate '  CFI Flash device mapped on Broadcom BCM947XX boards' CONFIG_MTD_BCM947XX $CONFIG_MTD_CFI
    9     dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
    10     dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
    11     dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
    12 diff -Nur linux-2.4.32/drivers/mtd/maps/Makefile linux-2.4.32-freewrt/drivers/mtd/maps/Makefile
    13 --- linux-2.4.32/drivers/mtd/maps/Makefile      Fri Jun 13 16:51:34 2003
    14 +++ linux-2.4.32-freewrt/drivers/mtd/maps/Makefile      Sun Aug 27 20:51:11 2006
    15 @@ -3,6 +3,8 @@
    16  #
    17  # $Id: Makefile,v 1.37 2003/01/24 14:26:38 dwmw2 Exp $
    18  
    19 +EXTRA_CFLAGS := -I$(TOPDIR)/arch/mips/bcm947xx/include
    20 +
    21  BELOW25                := $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
    22  
    23  ifeq ($(BELOW25),y)
    24 @@ -10,6 +12,7 @@
    25  endif
    26  
    27  # Chip mappings
    28 +obj-$(CONFIG_MTD_BCM947XX)     += bcm947xx-flash.o
    29  obj-$(CONFIG_MTD_CDB89712)     += cdb89712.o
    30  obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
    31  obj-$(CONFIG_MTD_CFI_FLAGADM)  += cfi_flagadm.o
    321diff -Nur linux-2.4.32/drivers/mtd/maps/bcm947xx-flash.c linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-flash.c
    33 --- linux-2.4.32/drivers/mtd/maps/bcm947xx-flash.c      Thu Jan  1 01:00:00 1970
    34 +++ linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-flash.c      Sun Aug 27 21:07:17 2006
     2--- linux-2.4.32/drivers/mtd/maps/bcm947xx-flash.c      1970-01-01 01:00:00.000000000 +0100
     3+++ linux-2.4.32-freewrt/drivers/mtd/maps/bcm947xx-flash.c      2006-09-10 15:19:32.000000000 +0200
    354@@ -0,0 +1,346 @@
    365+/*
    … …  
    188157+       { name: "linux", offset: 0, size: 0, },
    189158+       { name: "rootfs", offset: 0, size: 0, },
     159+       { name: "configfs", offset: 0, size: 0, },
    190160+       { name: "nvram", offset: 0, size: 0, },
    191161+       { name: "data", offset: 0, size: 0, },
    192 +       { name: "configfs", offset: 0, size: 0, },
    193162+       { name: NULL, },
    194163+};
    … …  
    250219+
    251220+       /* nvram */
    252 +       bcm947xx_parts[3].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize);
    253 +       bcm947xx_parts[3].size   = ROUNDUP(NVRAM_SPACE, mtd->erasesize);
     221+       bcm947xx_parts[4].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize);
     222+       bcm947xx_parts[4].size   = ROUNDUP(NVRAM_SPACE, mtd->erasesize);
    254223+
    255224+       /* configfs 128 kB before nvram */
    256 +       bcm947xx_parts[5].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize)
     225+       bcm947xx_parts[3].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize)
    257226+               - 128*1024;
    258 +       bcm947xx_parts[5].size   = 128*1024;
     227+       bcm947xx_parts[3].size   = 128*1024;
    259228+
    260229+       /* linux (kernel and rootfs) */
    261230+       bcm947xx_parts[1].offset = bcm947xx_parts[0].size;
    262 +       bcm947xx_parts[1].size   = bcm947xx_parts[5].offset -
     231+       bcm947xx_parts[1].size   = bcm947xx_parts[3].offset -
    263232+               bcm947xx_parts[1].offset;
    264233+
    … …  
    266235+       if (find_root(mtd,size,&bcm947xx_parts[2])==0) {
    267236+               /* entirely jffs2 */
    268 +               bcm947xx_parts[4].name = NULL;
     237+               bcm947xx_parts[5].name = NULL;
    269238+               bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset -
    270 +                       bcm947xx_parts[3].size - bcm947xx_parts[5].size;
     239+                       bcm947xx_parts[4].size - bcm947xx_parts[3].size;
    271240+       } else {
    272241+               /* calculate leftover flash and assign it to a jffs2 partition */
    273 +               bcm947xx_parts[4].offset = bcm947xx_parts[2].offset +
     242+               bcm947xx_parts[5].offset = bcm947xx_parts[2].offset +
    274243+                       bcm947xx_parts[2].size;
    275 +               if ((bcm947xx_parts[4].offset % mtd->erasesize) > 0) {
    276 +                       bcm947xx_parts[4].offset += mtd->erasesize -
    277 +                               (bcm947xx_parts[4].offset % mtd->erasesize);
     244+               if ((bcm947xx_parts[5].offset % mtd->erasesize) > 0) {
     245+                       bcm947xx_parts[5].offset += mtd->erasesize -
     246+                               (bcm947xx_parts[5].offset % mtd->erasesize);
    278247+               }
    279 +               bcm947xx_parts[4].size = bcm947xx_parts[5].offset -
    280 +                       bcm947xx_parts[4].offset;
     248+               bcm947xx_parts[5].size = bcm947xx_parts[3].offset -
     249+                       bcm947xx_parts[5].offset;
    281250+       }
    282251+       return bcm947xx_parts;
    … …  
    380349+module_init(init_bcm947xx_map);
    381350+module_exit(cleanup_bcm947xx_map);
     351diff -Nur linux-2.4.32/drivers/mtd/maps/Config.in linux-2.4.32-freewrt/drivers/mtd/maps/Config.in
     352--- linux-2.4.32/drivers/mtd/maps/Config.in     2003-06-13 16:51:34.000000000 +0200
     353+++ linux-2.4.32-freewrt/drivers/mtd/maps/Config.in     2006-09-09 18:18:10.000000000 +0200
     354@@ -48,6 +48,7 @@
     355 fi
     356 
     357 if [ "$CONFIG_MIPS" = "y" ]; then
     358+   dep_tristate '  CFI Flash device mapped on Broadcom BCM947XX boards' CONFIG_MTD_BCM947XX $CONFIG_MTD_CFI
     359    dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
     360    dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
     361    dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
     362diff -Nur linux-2.4.32/drivers/mtd/maps/Makefile linux-2.4.32-freewrt/drivers/mtd/maps/Makefile
     363--- linux-2.4.32/drivers/mtd/maps/Makefile      2003-06-13 16:51:34.000000000 +0200
     364+++ linux-2.4.32-freewrt/drivers/mtd/maps/Makefile      2006-09-09 18:18:10.000000000 +0200
     365@@ -3,6 +3,8 @@
     366 #
     367 # $Id: Makefile,v 1.37 2003/01/24 14:26:38 dwmw2 Exp $
     368 
     369+EXTRA_CFLAGS := -I$(TOPDIR)/arch/mips/bcm947xx/include
     370+
     371 BELOW25                := $(shell echo $(PATCHLEVEL) | sed s/[1234]/y/)
     372 
     373 ifeq ($(BELOW25),y)
     374@@ -10,6 +12,7 @@
     375 endif
     376 
     377 # Chip mappings
     378+obj-$(CONFIG_MTD_BCM947XX)     += bcm947xx-flash.o
     379 obj-$(CONFIG_MTD_CDB89712)     += cdb89712.o
     380 obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
     381 obj-$(CONFIG_MTD_CFI_FLAGADM)  += cfi_flagadm.o
Note: See TracChangeset for help on using the changeset viewer.