Changeset dec4d31 in freewrt

Timestamp:

Sep 4, 2006, 1:25:09 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Children:

32cfff5

Parents:

b3aff4e

Message:

move openswan, shfs, fuse and base-files to packages

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

Files:

• package/Makefile (modified) (2 diffs)
• package/base-files/Makefile (modified) (4 diffs)
• package/base-files/ipkg/base-files-arch.control (added)
• package/fuse/Config.in (modified) (3 diffs)
• package/fuse/Makefile (modified) (5 diffs)
• package/fuse/ipkg/kmod-fuse.control (moved) (moved from target/linux/package/fuse/ipkg/kmod-fuse.control )
• package/fuse/patches/101-kmod_build.patch (moved) (moved from target/linux/package/fuse/patches/101-kmod_build.patch )
• package/openswan/Config.in (modified) (2 diffs)
• package/openswan/Makefile (modified) (6 diffs)
• package/openswan/ipkg/kmod-openswan.control (moved) (moved from target/linux/package/openswan/ipkg/kmod-openswan.control )
• package/openswan/ipkg/openswan-utils.conffiles (moved) (moved from package/openswan/ipkg/openswan.conffiles )
• package/openswan/ipkg/openswan-utils.control (moved) (moved from package/openswan/ipkg/openswan.control )
• package/openswan/patches/101-arp_header.patch (moved) (moved from target/linux/package/openswan/patches/101-arp_header.patch )
• package/shfs/Config.in (modified) (3 diffs)
• package/shfs/Makefile (modified) (4 diffs)
• package/shfs/ipkg/kmod-shfs.control (moved) (moved from target/linux/package/shfs/ipkg/kmod-shfs.control )
• package/shfs/patches/102-gcc4_fix.patch (moved) (moved from target/linux/package/shfs/patches/102-gcc4_fix.patch )
• package/shfs/patches/103-dentry.patch (moved) (moved from target/linux/package/shfs/patches/103-dentry.patch )
• package/shfs/patches/104-use-gmake.patch (moved) (moved from target/linux/package/shfs/patches/104-use-gmake.patch )
• package/shfs/patches/105-ucb-install.patch (moved) (moved from target/linux/package/shfs/patches/105-ucb-install.patch )
• target/linux/brcm-2.4/files/etc/preinit.arch (moved) (moved from target/linux/package/base-files/files/brcm-2.4/etc/preinit.arch )

package/Makefile

@@ -182 +182 @@
 package-$(FWRT_COMPILE_OPENSSH) += openssh
 package-$(FWRT_COMPILE_OPENSSL) += openssl
-package-$(FWRT_PACKAGE_OPENSWAN) += openswan
+package-$(FWRT_COMPILE_OPENSWAN) += openswan
 package-$(FWRT_PACKAGE_OPENVPN) += openvpn
 package-$(FWRT_COMPILE_OSIRIS) += osiris
@@ -312 +312 @@
 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
 compile: $(COMPILE_PACKAGES)
-install: base-files-install $(INSTALL_PACKAGES)
+install: base-files-install $(INSTALL_PACKAGES) base-files-arch-install
 
 $(COMPILE_PACKAGES): base-files-compile

package/base-files/Makefile

@@ -2 +2 @@
 
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/mk/targets.mk
 
 PKG_NAME:=              base-files
 PKG_RELEASE:=           10
 WRKSRC=                 ${WRKDIR}/base-files
-
-BOARD:=$(shell LANG=C grep ^FWRT_LINUX_2 $(TOPDIR)/.config| \
-        head -n 1 | sed -e "s/=y//" \
-        -e "s/.*_//"| tr "[:upper:]" "[:lower:]")
-KERNEL:=$(shell LANG=C grep ^FWRT_LINUX_2 $(TOPDIR)/.config| \
-        head -n 1 | sed -e "s/=y//" \
-        -e "s/FWRT_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]")
 
 REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
@@ -23 +17 @@
 
 IDIR_BASE:=$(WRKBUILD)/base-files
+IDIR_BASE_ARCH:=$(WRKBUILD)/base-files-arch
 IPKG_BASE:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_RELEASE)_$(ARCH).ipk
+IPKG_BASE_ARCH:=$(PACKAGE_DIR)/$(PKG_NAME)_$(BOARD)_$(PKG_RELEASE)_$(ARCH).ipk
 
 UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version}
@@ -147 +143 @@
         $(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR)
 
+$(IPKG_BASE_ARCH):
+        mkdir -p $(IDIR_BASE_ARCH)
+        -[ -d $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/files ] && \
+                $(CP) $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/files $(IDIR_BASE_ARCH)
+        -[ -d $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/$(MODEL)/files ] && \
+                $(CP) target/linux/$(BOARD)-$(KERNEL)/$(MODEL)/files $(IDIR_BASE_ARCH) 
+        $(IPKG_BUILD) $(IDIR_BASE_ARCH) $(PACKAGE_DIR)
+
 package-clean:
         rm -f $(PACKAGES)
@@ -156 +160 @@
         mkdir -p $(TARGET_DIR)
         $(IPKG) install $(PACKAGES_INSTALL)
+
+arch-install:
+        echo foobar
+        $(IPKG) install $(IPKG_BASE_ARCH)

package/fuse/Config.in

@@ -7 +7 @@
         prompt "libfuse........................... FUSE library"
         tristate
-        default m if CONFIG_DEVEL
+        default n
         select FWRT_COMPILE_FUSE
-        select FWRT_PACKAGE_KMOD_FUSE
         select FWRT_PACKAGE_LIBPTHREAD
         help
@@ -34 +33 @@
         prompt   "fuse-utils...................... FUSE utilities"
         tristate
-        default m if CONFIG_DEVEL
+        default n
         depends FWRT_PACKAGE_LIBFUSE
         select FWRT_PACKAGE_LIBPTHREAD
@@ -55 +54 @@
           This package contains the fusermount userland utility.
 
+config FWRT_PACKAGE_KMOD_FUSE
+        prompt   "kmod-fuse....................... FUSE kernel module"
+        tristate
+        default n
+        depends FWRT_PACKAGE_LIBFUSE
+        help
+          With FUSE it is possible to implement a fully functional 
+          filesystem in a userspace program.

package/fuse/Makefile

@@ -1 @@
-# $Id: Makefile 3527 2006-03-28 18:21:42Z wbx $
-
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/mk/targets.mk
 
 PKG_NAME:=fuse
@@ -11 +10 @@
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBFUSE,libfuse,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(KERNEL_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
 
 $(WRKBUILD)/.configured:
@@ -50 +49 @@
                         --enable-static \
                         --disable-rpath \
-                        --disable-kernel-module \
                         --enable-lib \
                         --enable-util \
+                        --enable-kernel-module \
                         --disable-example \
                         --disable-auto-modprobe \
@@ -64 +63 @@
         mkdir -p $(WRKINST)
         $(MAKE) -C $(WRKBUILD) \
+                ARCH="$(ARCH)" \
+                CROSS_COMPILE="$(TARGET_CROSS)" \
+                PATH="$(TARGET_PATH)" \
                 DESTDIR="$(WRKINST)" \
                 all install
@@ -79 +81 @@
         $(RSTRIP) $(IDIR_FUSE_UTILS)
         $(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR)
+
+$(IPKG_KMOD_FUSE):
+        mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(KERNEL_VERSION)
+        $(CP) $(WRKINST)/lib/modules/$(KERNEL_VERSION)/kernel/fs/fuse/fuse.$(KERNEL_MOD_SUFFIX) \
+                $(IDIR_KMOD_FUSE)/lib/modules/$(KERNEL_VERSION)/
+        $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libfuse.so: $(WRKBUILD)/.built

package/openswan/Config.in

@@ -1 @@
-config FWRT_PACKAGE_OPENSWAN
+config FWRT_COMPILE_OPENSWAN
         prompt "openswan.......................... VPN solution using IPsec"
         tristate
-        default m if CONFIG_DEVEL
+        default n
         select FWRT_PACKAGE_IP
         select FWRT_PACKAGE_LIBGMP
-        select FWRT_PACKAGE_KMOD_OPENSWAN
         help
           Openswan is an implementation of IPsec for Linux.
@@ -11 +10 @@
           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

@@ -1 @@
-# $Id: Makefile 3638 2006-04-13 18:28:55Z nbd $
-
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/mk/targets.mk
 
 PKG_NAME:=openswan
@@ -13 +12 @@
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,OPENSWAN,openswan,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(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))))
 
 FLAGS := $(TARGET_CFLAGS) -I$(WRKBUILD)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
@@ -24 +24 @@
                 $(TARGET_CONFIGURE_OPTS) \
                 KERNELSRC="$(LINUX_DIR)" \
-                ARCH="mips" \
+                ARCH="$(ARCH)" \
                 USERCOMPILE="$(FLAGS)" \
                 EXTRA_INCLUDE="-I$(STAGING_DIR)/usr/include" \
@@ -31 +31 @@
                 INC_USRLOCAL="/usr" \
                 programs
+        $(MAKE) -C $(WRKBUILD) \
+                $(TARGET_CONFIGURE_OPTS) \
+                LINUX_RELEASE="$(KERNEL_RELEASE)" \
+                KERNELSRC="$(LINUX_DIR)" \
+                ARCH="$(ARCH)" \
+                CROSS_COMPILE="$(TARGET_CROSS)" \
+                USERCOMPILE="$(FLAGS)" \
+                AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \
+                module
         touch $@
 
@@ -38 +47 @@
                 DESTDIR="$(IDIR_OPENSWAN)" \
                 KERNELSRC="$(LINUX_DIR)" \
-                ARCH="mips" \
+                ARCH="$(ARCH)" \
                 USERCOMPILE="$(FLAGS)" \
                 IPSECDIR="/usr/lib/ipsec" \
@@ -50 +59 @@
         rm -rf $(IDIR_OPENSWAN)/etc/rc.d/rc*.d
         mkdir -p $(IDIR_OPENSWAN)/etc/init.d
-        ln -sf ../rc.d/init.d/ipsec $(IDIR_OPENSWAN)/etc/init.d/S60ipsec
+        $(CP) ../rc.d/init.d/ipsec $(IDIR_OPENSWAN)/etc/init.d/S60ipsec
         find $(WRKBUILD) -name \*.old | xargs rm -rf
         mkdir -p $(PACKAGE_DIR)
         $(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/shfs/Config.in

@@ -3 +3 @@
         default n
         depends FWRT_PACKAGE_SHFS_UTILS
+        depends FWRT_PACKAGE_KMOD_SHFS
 
 config FWRT_PACKAGE_SHFS_UTILS
@@ -8 +9 @@
         tristate
         select FWRT_COMPILE_SHFS
-        select FWRT_PACKAGE_KMOD_SHFS
-        default m if CONFIG_DEVEL
+        default n
         help
           ShFS is a simple and easy to use Linux kernel module which 
@@ -31 +31 @@
           This package contains the shfs mount/umount utilities.
 
+config FWRT_PACKAGE_KMOD_SHFS
+        prompt "kmod-shfs.......................... ShFS mount/umount utilities"
+        tristate
+        select FWRT_COMPILE_SHFS
+        default n
+        help
+          Kernel modules for SHFS.

package/shfs/Makefile

@@ -1 @@
-# $Id: Makefile 3112 2006-02-01 23:53:19Z mbm $
-
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/mk/targets.mk
 
 PKG_NAME:=shfs
@@ -15 +14 @@
 
 $(eval $(call PKG_template,SHFS_UTILS,shfs-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(KERNEL_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(KERNEL_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
 
 $(WRKBUILD)/.configured:
@@ -29 +29 @@
                 ROOT="$(WRKINST)" \
                 utils utils-install
+        $(MAKE) -C $(WRKBUILD) \
+                ARCH="$(ARCH)" \
+                CROSS_COMPILE="$(TARGET_CROSS)" \
+                PATH="$(TARGET_PATH)" \
+                OFLAGS="$(TARGET_CFLAGS)" \
+                CC="$(TARGET_CC)" \
+                LINKER="$(TARGET_CC)" \
+                KERNEL="$(KERNEL_VERSION)" \
+                KERNEL_SOURCES="$(LINUX_DIR)" \
+                ROOT="$(WRKINST)" \
+                module module-install
         touch $@
 
@@ -38 +49 @@
         $(IPKG_BUILD) $(IDIR_SHFS_UTILS) $(PACKAGE_DIR)
 
+$(IPKG_KMOD_SHFS):
+        install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(KERNEL_VERSION)
+        $(CP) $(WRKINST)/lib/modules/$(KERNEL_VERSION)/kernel/fs/shfs/shfs.$(KERNEL_MOD_SUFFIX) \
+                $(IDIR_KMOD_SHFS)/lib/modules/$(KERNEL_VERSION)/
+        $(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR)