From 725611a466f2edf12f809d22339b22223af4afe7 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 7 Oct 2006 11:57:20 +0000 Subject: move old kamikaze out of trunk - will put buildroot-ng in there as soon as all the developers are ready git-svn-id: svn://svn.openwrt.org/openwrt/trunk@4944 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/shfs/Config.in | 32 ------- openwrt/package/shfs/Makefile | 42 --------- openwrt/package/shfs/ipkg/shfs-utils.control | 5 - openwrt/package/shfs/patches/101-kmod-build.patch | 103 --------------------- .../shfs/patches/102-utils-build-fixes.patch | 40 -------- 5 files changed, 222 deletions(-) delete mode 100644 openwrt/package/shfs/Config.in delete mode 100644 openwrt/package/shfs/Makefile delete mode 100644 openwrt/package/shfs/ipkg/shfs-utils.control delete mode 100644 openwrt/package/shfs/patches/101-kmod-build.patch delete mode 100644 openwrt/package/shfs/patches/102-utils-build-fixes.patch (limited to 'openwrt/package/shfs') diff --git a/openwrt/package/shfs/Config.in b/openwrt/package/shfs/Config.in deleted file mode 100644 index b7c7cfa85..000000000 --- a/openwrt/package/shfs/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -config BR2_COMPILE_SHFS - tristate - default n - depends BR2_PACKAGE_SHFS_UTILS - -config BR2_PACKAGE_SHFS_UTILS - prompt "shfs-utils........................ ShFS mount/umount utilities" - tristate - select BR2_COMPILE_SHFS - select BR2_PACKAGE_KMOD_SHFS - default m if CONFIG_DEVEL - help - ShFS is a simple and easy to use Linux kernel module which - allows you to mount remote filesystems using a plain shell - (SSH) connection. When using ShFS, you can access all remote - files just like the local ones, only the access is governed - through the transport security of SSH. - - ShFS supports some nice features: - - * file cache for access speedup - * perl and shell code for the remote (server) side - * could preserve uid/gid (root connection) - * number of remote host platforms (Linux, Solaris, Cygwin, ...) - * Linux kernel 2.4.10+ and 2.6 - * arbitrary command used for connection (instead of SSH) - * persistent connection (reconnect after SSH dies) - - http://shfs.sourceforge.net/ - - This package contains the shfs mount/umount utilities. - diff --git a/openwrt/package/shfs/Makefile b/openwrt/package/shfs/Makefile deleted file mode 100644 index b1509a7c4..000000000 --- a/openwrt/package/shfs/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=shfs -PKG_VERSION:=0.35 -PKG_RELEASE:=2 -PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe - -PKG_SOURCE_URL:=@SF/shfs -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_CAT:=zcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(TOPDIR)/package/rules.mk - -$(eval $(call PKG_template,SHFS_UTILS,shfs-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - OFLAGS="$(TARGET_CFLAGS)" \ - CC="$(TARGET_CC)" \ - LINKER="$(TARGET_CC)" \ - KERNEL_SOURCES="$(LINUX_DIR)" \ - ROOT="$(PKG_INSTALL_DIR)" \ - utils utils-install - touch $@ - -$(IPKG_SHFS_UTILS): - install -m0755 -d $(IDIR_SHFS_UTILS)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/shfs{,u}mount $(IDIR_SHFS_UTILS)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mount.shfs $(IDIR_SHFS_UTILS)/usr/sbin/ - $(RSTRIP) $(IDIR_SHFS_UTILS) - $(IPKG_BUILD) $(IDIR_SHFS_UTILS) $(PACKAGE_DIR) - diff --git a/openwrt/package/shfs/ipkg/shfs-utils.control b/openwrt/package/shfs/ipkg/shfs-utils.control deleted file mode 100644 index 869a5d699..000000000 --- a/openwrt/package/shfs/ipkg/shfs-utils.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: shfs-utils -Priority: optional -Section: net -Description: SHell FileSystem Linux mount/umount utilities -Depends: kmod-shfs diff --git a/openwrt/package/shfs/patches/101-kmod-build.patch b/openwrt/package/shfs/patches/101-kmod-build.patch deleted file mode 100644 index 635900472..000000000 --- a/openwrt/package/shfs/patches/101-kmod-build.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- shfs-0.35-orig/shfs/Linux-2.4/Makefile 2004-06-01 15:16:19.000000000 +0200 -+++ shfs-0.35-2/shfs/Linux-2.4/Makefile 2005-04-09 02:34:35.000000000 +0200 -@@ -1,3 +1,17 @@ -+# -+# the original Makefile was trashed and replaced by this one -+# The main reason is that loadable modules should be built with -+# the same compile flags the kernel was built with, so we'd better -+# let the kernel tree build the module for us, like that : -+# -+# make -C $(KERNEL_DIR) SUBDIRS="$(shell pwd)" modules -+# make -C $(KERNEL_DIR) SUBDIRS="$(shell pwd)" modules_install -+# -+# -+# $(TOPDIR)/lib/string.o is needed at link time because the memchr function -+# is not exported on mips (insmod: unresolved symbol memchr) -+# -+ - ifndef KERNEL - KERNEL=$(shell uname -r) - endif -@@ -10,67 +24,30 @@ - KERNEL_SOURCES=${MODULESDIR}/build - endif - --ifeq (${MODVERSIONS},detect) -- ifeq ($(shell test -e ${KERNEL_SOURCES}/include/linux/modversions.h; echo $$?),0) -- MODVERSIONS=yes -- endif --endif -- --ifeq (${MODVERSIONS},yes) --MVER=-DMODVERSIONS -DEXPORT_SYMTAB --endif -- --LINVER=linux-${KERNEL} -- --ALL_TARGETS := shfs.o -- --SEARCHDIRS := -I- -I. -I${KERNEL_SOURCES}/include #-I/usr/src/linux/include/ -+all: all-y - --CC := gcc --CFLAGS = -O2 -fomit-frame-pointer -fno-strict-aliasing -pipe -Wall ${SEARCHDIRS} -DMODULE ${MVER} -D__KERNEL__ -DLINUX --LINKER := ld --LDFLAGS = -r --LOADLIBES := -+O_TARGET := shfs.o - --all: ${ALL_TARGETS} -+shfs-objs := dcache.o dir.o fcache.o file.o inode.o ioctl.o proc.o shell.o symlink.o - --%.o: %.c $(wildcard *.h) -- ${CC} ${CFLAGS} -c $< -o $@ -+obj-y := $(shfs-objs) -+obj-m := $(O_TARGET) - --shfs.o: dcache.o dir.o fcache.o file.o inode.o ioctl.o proc.o shell.o symlink.o -- ${LINKER} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LOADLIBES} -- --tidy: -- ${RM} core dcache.o dir.o fcache.o file.o inode.o ioctl.o proc.o shell.o symlink.o -- --clean: tidy patch-clean -- ${RM} shfs.o -+-include $(TOPDIR)/Rules.make - -+all-y: -+ make -C ${KERNEL_SOURCES} TOPDIR="${KERNEL_SOURCES}" SUBDIRS="$(shell pwd)" modules -+ - install: shfs.o - rm -f ${MODULESDIR}/kernel/fs/shfs/shfs.o - install -m644 -b -D shfs.o ${MODULESDIR}/kernel/fs/shfs/shfs.o -- if [ -x /sbin/depmod -a "${ROOT}" = "/" ]; then /sbin/depmod -aq; fi - - uninstall: - rm -rf ${MODULESDIR}/kernel/fs/shfs -- if [ -x /sbin/depmod -a "${ROOT}" = "/" ]; then /sbin/depmod -aq; fi - --patch: -- rm -rf ${LINVER} ${LINVER}.orig; mkdir ${LINVER}; -- for i in Documentation fs/shfs include/linux; do \ -- mkdir -p ${LINVER}/$$i; \ -- done -- cp ${KERNEL_SOURCES}/Documentation/Configure.help ${LINVER}/Documentation -- cp ${KERNEL_SOURCES}/fs/{Makefile,Config.in} ${LINVER}/fs -- cp -r ${LINVER} ${LINVER}.orig -- cp ../../Changelog *.c shfs_debug.h proc.h ${LINVER}/fs/shfs/ -- cp shfs.h shfs_fs* ${LINVER}/include/linux/ -- (cd ${LINVER}; patch -p1 <../kernel-config.diff) -- find . -type f -name "*.orig" -print | xargs rm -f -- diff -urN ${LINVER}.orig ${LINVER} >${LINVER}.diff; true -- --patch-clean: -- rm -rf ${LINVER} ${LINVER}.orig; -- rm -f ${LINVER}.diff -- --.PHONY : all tidy clean install uninstall patch patch-clean -+clean: -+ rm -f core *.o *.a *.s -+ -+shfs.o: $(shfs-objs) -+ $(LD) -r -o $@ $(shfs-objs) $(TOPDIR)/lib/string.o -+ diff --git a/openwrt/package/shfs/patches/102-utils-build-fixes.patch b/openwrt/package/shfs/patches/102-utils-build-fixes.patch deleted file mode 100644 index affce4357..000000000 --- a/openwrt/package/shfs/patches/102-utils-build-fixes.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- shfs-0.35-orig/shfsmount/Makefile 2004-06-01 15:16:19.000000000 +0200 -+++ shfs-0.35-2/shfsmount/Makefile 2005-04-09 01:27:22.000000000 +0200 -@@ -2,15 +2,16 @@ - SHFS_VERSION=unknown - endif - --SHFSMOUNT := /usr/bin/shfsmount --SHFSUMOUNT := /usr/bin/shfsumount -+SHFSMOUNT := /usr/sbin/shfsmount -+SHFSUMOUNT := /usr/sbin/shfsumount - - ALL_TARGETS := shfsmount shfsumount - - SEARCHDIRS := -I- -I. -I../shfs/Linux-2.4/ - - CC := gcc --CFLAGS = -g -Wall ${SEARCHDIRS} -DSHFS_VERSION=\"${SHFS_VERSION}\" -+OFLAGS = -g -+CFLAGS = $(OFLAGS) -Wall ${SEARCHDIRS} -DSHFS_VERSION=\"${SHFS_VERSION}\" - - LINKER := gcc - LDFLAGS = -@@ -40,12 +41,12 @@ - - - install: shfsmount shfsumount -- install -m755 -b -D shfsmount ${ROOT}${SHFSMOUNT} -- install -m755 -b -D shfsumount ${ROOT}${SHFSUMOUNT} -- if [ ! -d ${ROOT}/sbin ]; then mkdir ${ROOT}/sbin; fi -- ln -fs ${SHFSMOUNT} ${ROOT}/sbin/mount.shfs -+ install -m755 -D shfsmount ${ROOT}${SHFSMOUNT} -+ install -m755 -D shfsumount ${ROOT}${SHFSUMOUNT} -+ if [ ! -d ${ROOT}/usr/sbin ]; then mkdir ${ROOT}/usr/sbin; fi -+ ln -fs ${SHFSMOUNT} ${ROOT}/usr/sbin/mount.shfs - - uninstall: -- rm -f ${ROOT}${SHFSMOUNT} ${ROOT}${SHFSUMOUNT} ${ROOT}/sbin/mount.shfs -+ rm -f ${ROOT}${SHFSMOUNT} ${ROOT}${SHFSUMOUNT} ${ROOT}/usr/sbin/mount.shfs - - .PHONY : all tidy clean install uninstall -- cgit v1.2.3