Changeset 398df5e in freewrt for package

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

Location:

package

Files:

• Config.in (modified) (2 diffs)
• Makefile (modified) (2 diffs)
• base-files/default/sbin/mount_root (modified) (2 diffs)
• broadcom-wl/Config.in (modified) (1 diff)
• openswan/Config.in (modified) (2 diffs)
• openswan/Makefile (modified) (3 diffs)
• openswan/ipkg/kmod-openswan.control (deleted)
• openswan/ipkg/openswan.conffiles (moved) (moved from package/openswan/ipkg/openswan-utils.conffiles )
• openswan/ipkg/openswan.control (moved) (moved from package/openswan/ipkg/openswan-utils.control ) (1 diff)

package/Config.in

@@ -13 +13 @@
 source "package/mtd/Config.in"
 source "package/nvram/Config.in"
+source "package/jffs2root/Config.in"
 source "package/webif/Config.in"
 endmenu
@@ -358 +359 @@
         help
           Predefine the URL where "ipkg" looks for packages
-          @TARGET@ works as placeholder for "<boradtype>-<kernel>" i.e. "brcm-2.4"
+          @TARGET@ works as placeholder for "<boardtype>-<kernel>" i.e. "brcm-2.4"
              so you can configure different URLs for different targets with a single string
 

package/Makefile

@@ -93 +93 @@
 package-$(FWRT_PACKAGE_IRSSI) += irssi
 package-$(FWRT_PACKAGE_JAMVM) += jamvm
+package-$(FWRT_PACKAGE_JFFS2ROOT) += jffs2root
 package-$(FWRT_PACKAGE_JOE) += joe
 package-$(FWRT_COMPILE_JPEG) += jpeg
@@ -181 +182 @@
 package-$(FWRT_COMPILE_OPENSSH) += openssh
 package-$(FWRT_COMPILE_OPENSSL) += openssl
-package-$(FWRT_COMPILE_OPENSWAN) += openswan
+package-$(FWRT_PACKAGE_OPENSWAN) += openswan
 package-$(FWRT_PACKAGE_OPENVPN) += openvpn
 package-$(FWRT_COMPILE_OSIRIS) += osiris

package/base-files/default/sbin/mount_root

@@ -8 +8 @@
         mount | grep jffs2 >&-
         if [ $? = 0 ] ; then
-                if [ $(cat /proc/mtd | wc -l) = 6 ]; then
+                if [ $(cat /proc/mtd | wc -l) = 7 ]; then
                         mtd erase data
                         jffs2root --move --reboot
@@ -17 +17 @@
                 . /bin/firstboot
                 echo "switching to overlay filesystem"
-                mount /dev/mtdblock/4 /jffs -t jffs2
+                mount /dev/mtdblock/5 /jffs -t jffs2
                 fopivot /jffs /rom
         fi

package/broadcom-wl/Config.in

@@ -1 +1 @@
 config FWRT_PACKAGE_KMOD_BROADCOM_WL
-        prompt "kmod-broadcom-wl.............. Kernel driver for Broadcom wireless lan cards"
+        prompt "kmod-broadcom-wl.................. Kernel driver for Broadcom wireless lan cards"
         tristate
         default n

package/openswan/Config.in

@@ -1 @@
-config FWRT_COMPILE_OPENSWAN
+config FWRT_PACKAGE_OPENSWAN
         prompt "openswan.......................... VPN solution using IPsec"
         tristate
@@ -9 +9 @@
           
           http://www.openswan.org/
-
-config FWRT_PACKAGE_OPENSWAN_UTILS
-        prompt "openswan-utils..................... VPN solution using IPsec"
-        tristate
-        default n
-        depends FWRT_COMPILE_OPENSWAN
-        help
-          OpenSwan is an implementation of IPsec for Linux.
-          
-          http://www.openswan.org/
-
-config FWRT_PACKAGE_KMOD_OPENSWAN
-        prompt "kmod-openswan..................... VPN solution using IPsec"
-        tristate
-        default n
-        depends FWRT_COMPILE_OPENSWAN
-        help
-          OpenSwan is an implementation of IPsec for Linux.
-          
-          http://www.openswan.org/
-

package/openswan/Makefile

@@ -12 +12 @@
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,OPENSWAN_UTILS,openswan-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,KMOD_OPENSWAN,kmod-openswan,$(KERNEL_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
+$(eval $(call PKG_template,OPENSWAN,openswan,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 FLAGS := $(TARGET_CFLAGS) -I$(WRKBUILD)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
@@ -43 +42 @@
 
 $(IPKG_OPENSWAN):
+        mkdir -p $(PACKAGE_DIR)
         $(MAKE) -C $(WRKBUILD) \
                 $(TARGET_CONFIGURE_OPTS) \
@@ -61 +61 @@
         $(CP) ../rc.d/init.d/ipsec $(IDIR_OPENSWAN)/etc/init.d/S60ipsec
         find $(WRKBUILD) -name \*.old | xargs rm -rf
-        mkdir -p $(PACKAGE_DIR)
+        mkdir -p $(IDIR_OPENSWAN)/lib/modules/$(KERNEL_VERSION)
+        $(CP) $(WRKBUILD)/modobj*/ipsec.$(KERNEL_MOD_SUFFIX) \
+                $(IDIR_OPENSWAN)/lib/modules/$(KERNEL_VERSION)/
         $(IPKG_BUILD) $(IDIR_OPENSWAN) $(PACKAGE_DIR)
 
-$(IPKG_KMOD_OPENSWAN):
-        mkdir -p $(IDIR_KMOD_OPENSWAN)/lib/modules/$(KERNEL_VERSION)
-        $(CP) $(WRKBUILD)/modobj*/ipsec.$(KERNEL_MOD_SUFFIX) \
-                $(IDIR_KMOD_OPENSWAN)/lib/modules/$(KERNEL_VERSION)/
-        $(IPKG_BUILD) $(IDIR_KMOD_OPENSWAN) $(PACKAGE_DIR)
-

package/openswan/ipkg/openswan.control

@@ -2 +2 @@
 Section: base
 Priority: optional
-Depends: kmod-openswan, libgmp, ip
+Depends: libgmp, ip
 Description: Openswan IPSec software