From 46a635746c320950c7edabc1d1a0c12960c0c0e7 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 17 Jun 2006 08:34:53 +0000 Subject: move fuse from target/linux/package/ to package/, update to v2.5.3, add userland lib, util and dev stuff from trunk. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3966 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/package/fuse/Config.in | 19 ----- target/linux/package/fuse/Makefile | 80 ---------------------- target/linux/package/fuse/ipkg/kmod-fuse.control | 4 -- .../package/fuse/patches/101-kmod_build.patch | 46 ------------- 4 files changed, 149 deletions(-) delete mode 100644 target/linux/package/fuse/Config.in delete mode 100644 target/linux/package/fuse/Makefile delete mode 100644 target/linux/package/fuse/ipkg/kmod-fuse.control delete mode 100644 target/linux/package/fuse/patches/101-kmod_build.patch (limited to 'target/linux') diff --git a/target/linux/package/fuse/Config.in b/target/linux/package/fuse/Config.in deleted file mode 100644 index d51229522..000000000 --- a/target/linux/package/fuse/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config PACKAGE_KMOD_FUSE - prompt "kmod-fuse......................... FUSE kernel module" - tristate - default m if DEVEL - help - With FUSE it is possible to implement a fully functional - filesystem in a userspace program. - - Features include: - - * Simple library API - * Simple installation (no need to patch or recompile the kernel) - * Secure implementation - * Userspace - kernel interface is very efficient - * Usable by non privileged users - * Runs on Linux kernels 2.4.X and 2.6.X - * Has proven very stable over time - - http://fuse.sourceforge.net/ diff --git a/target/linux/package/fuse/Makefile b/target/linux/package/fuse/Makefile deleted file mode 100644 index e9922bcd3..000000000 --- a/target/linux/package/fuse/Makefile +++ /dev/null @@ -1,80 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk -include ../../rules.mk - -PKG_NAME:=fuse -PKG_VERSION:=2.5.2 -PKG_RELEASE:=1 -PKG_MD5SUM:=ea565debe6c7486963bef05c45c50361 - -PKG_SOURCE_URL:=@SF/$(PKG_NAME) -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,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)))) - -$(PKG_BUILD_DIR)/.configured: - (cd $(PKG_BUILD_DIR); \ - rm -rf config.{cache,status} ; \ - touch configure.in ; \ - touch aclocal.m4 ; \ - touch Makefile.in ; \ - touch include/config.h.in ; \ - touch configure ; \ - $(TARGET_CONFIGURE_OPTS) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - --enable-shared \ - --enable-static \ - --disable-rpath \ - --enable-kernel-module \ - --disable-lib \ - --disable-util \ - --disable-example \ - --disable-auto-modprobe \ - --with-kernel=$(LINUX_DIR) \ - --disable-mtab \ - ); - touch $@ - -$(PKG_BUILD_DIR)/.built: - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - PATH="$(TARGET_PATH)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - SUBDIRS="kernel" \ - all install - touch $@ - -$(IPKG_KMOD_FUSE): - mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION) - $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ - $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/ - $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR) - diff --git a/target/linux/package/fuse/ipkg/kmod-fuse.control b/target/linux/package/fuse/ipkg/kmod-fuse.control deleted file mode 100644 index 1a9d32203..000000000 --- a/target/linux/package/fuse/ipkg/kmod-fuse.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: kmod-fuse -Priority: optional -Section: sys -Description: Filesystem in Userspace (kernel module) diff --git a/target/linux/package/fuse/patches/101-kmod_build.patch b/target/linux/package/fuse/patches/101-kmod_build.patch deleted file mode 100644 index e541d4714..000000000 --- a/target/linux/package/fuse/patches/101-kmod_build.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nur fuse-2.5.2/kernel/Makefile.in fuse-2.5.2.patched/kernel/Makefile.in ---- fuse-2.5.2/kernel/Makefile.in 2006-02-02 18:04:52.000000000 +0100 -+++ fuse-2.5.2.patched/kernel/Makefile.in 2006-03-28 20:17:13.000000000 +0200 -@@ -54,23 +54,8 @@ - - ifeq ($(majver), 2.4) - --CC = gcc --LD = ld --CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -pipe @KERNELCFLAGS@ --CPPFLAGS = -I@kernelsrc@/include -I. -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"$(VERSION)\" @KERNELCPPFLAGS@ -- - fuse_objs = dev.o dir.o file.o inode.o compat/parser.o - --SUFFIXES = .c .o .s -- --all-spec: fuse.o -- --.c.o: -- $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -- --fuse.o: $(fuse_objs) -- $(LD) -r -o fuse.o $(fuse_objs) -- - fuse_headers = fuse_i.h fuse_kernel.h - - dev.o: $(fuse_headers) -@@ -78,6 +63,18 @@ - file.o: $(fuse_headers) - inode.o: $(fuse_headers) - -+EXTRA_CFLAGS += -DFUSE_VERSION=\"$(VERSION)\" -+ -+O_TARGET := fuse.o -+ -+obj-y := $(fuse_objs) -+obj-m := $(O_TARGET) -+ -+-include $(TOPDIR)/Rules.make -+ -+all-spec: -+ $(MAKE) -C @kernelsrc@ TOPDIR=@kernelsrc@ SUBDIRS=$(PWD) modules -+ - else - - EXTRA_CFLAGS += -DFUSE_VERSION=\"$(VERSION)\" -- cgit v1.2.3