Changeset 580

Show
Ignore:
Timestamp:
09/10/06 16:47:16 (2 years ago)
Author:
wbx
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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/wbx-target-cleanup/package/Config.in

    r571 r580  
    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 

  • branches/wbx-target-cleanup/package/Makefile

    r578 r580  
    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 

  • branches/wbx-target-cleanup/package/base-files/default/sbin/mount_root

    r375 r580  
    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 

  • branches/wbx-target-cleanup/package/broadcom-wl/Config.in

    r555 r580  
    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 

  • branches/wbx-target-cleanup/package/openswan/Config.in

    r561 r580  
    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  

  • branches/wbx-target-cleanup/package/openswan/Makefile

    r561 r580  
    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  

  • branches/wbx-target-cleanup/package/openswan/ipkg/openswan.control

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

  • branches/wbx-target-cleanup/target/Config.in

    r546 r580  
    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. 

  • branches/wbx-target-cleanup/target/image/brcm/Makefile

    r578 r580  
    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 

  • branches/wbx-target-cleanup/target/linux/brcm-2.4/Config.in

    r578 r580  
    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