From 0962f3f886c1db9a5f80167e8ea01c6270b1be34 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 18 Apr 2005 06:20:14 +0000 Subject: Use common rules and templates, uniformize package Makefile, split package in sub-packages, add kernel version to kmod package git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@663 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/fuse/ipkg/fuse-utils.control | 9 ++ package/fuse/ipkg/fuse-utils/CONTROL/control | 9 -- package/fuse/ipkg/kmod-fuse.control | 8 ++ package/fuse/ipkg/kmod-fuse/CONTROL/control | 8 -- package/fuse/ipkg/libfuse-dev/CONTROL/control | 8 -- package/fuse/ipkg/libfuse.control | 9 ++ package/fuse/ipkg/libfuse/CONTROL/control | 9 -- package/fuse/ipkg/rules | 163 -------------------------- package/fuse/ipkg/version | 1 - 9 files changed, 26 insertions(+), 198 deletions(-) create mode 100644 package/fuse/ipkg/fuse-utils.control delete mode 100644 package/fuse/ipkg/fuse-utils/CONTROL/control create mode 100644 package/fuse/ipkg/kmod-fuse.control delete mode 100644 package/fuse/ipkg/kmod-fuse/CONTROL/control delete mode 100644 package/fuse/ipkg/libfuse-dev/CONTROL/control create mode 100644 package/fuse/ipkg/libfuse.control delete mode 100644 package/fuse/ipkg/libfuse/CONTROL/control delete mode 100644 package/fuse/ipkg/rules delete mode 100644 package/fuse/ipkg/version (limited to 'package/fuse/ipkg') diff --git a/package/fuse/ipkg/fuse-utils.control b/package/fuse/ipkg/fuse-utils.control new file mode 100644 index 000000000..4a1b8691c --- /dev/null +++ b/package/fuse/ipkg/fuse-utils.control @@ -0,0 +1,9 @@ +Package: fuse-utils +Priority: optional +Section: admin +Version: [TBDL] +Architecture: [TBDL] +Maintainer: Nico +Source: http://nthill.free.fr/openwrt/sources/fuse2/ +Description: Filesystem in Userspace (utilities) +Depends: kmod-fuse diff --git a/package/fuse/ipkg/fuse-utils/CONTROL/control b/package/fuse/ipkg/fuse-utils/CONTROL/control deleted file mode 100644 index 4a1b8691c..000000000 --- a/package/fuse/ipkg/fuse-utils/CONTROL/control +++ /dev/null @@ -1,9 +0,0 @@ -Package: fuse-utils -Priority: optional -Section: admin -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/fuse2/ -Description: Filesystem in Userspace (utilities) -Depends: kmod-fuse diff --git a/package/fuse/ipkg/kmod-fuse.control b/package/fuse/ipkg/kmod-fuse.control new file mode 100644 index 000000000..9d2e919c7 --- /dev/null +++ b/package/fuse/ipkg/kmod-fuse.control @@ -0,0 +1,8 @@ +Package: kmod-fuse +Priority: optional +Section: kernel +Version: [TBDL] +Architecture: [TBDL] +Maintainer: Nico +Source: http://nthill.free.fr/openwrt/sources/fuse2/ +Description: Filesystem in Userspace (kernel module) diff --git a/package/fuse/ipkg/kmod-fuse/CONTROL/control b/package/fuse/ipkg/kmod-fuse/CONTROL/control deleted file mode 100644 index 9d2e919c7..000000000 --- a/package/fuse/ipkg/kmod-fuse/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: kmod-fuse -Priority: optional -Section: kernel -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/fuse2/ -Description: Filesystem in Userspace (kernel module) diff --git a/package/fuse/ipkg/libfuse-dev/CONTROL/control b/package/fuse/ipkg/libfuse-dev/CONTROL/control deleted file mode 100644 index 9b7d1bb6c..000000000 --- a/package/fuse/ipkg/libfuse-dev/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: libfuse-dev -Priority: optional -Section: devel -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/fuse2/ -Description: Filesystem in Userspace (development files) diff --git a/package/fuse/ipkg/libfuse.control b/package/fuse/ipkg/libfuse.control new file mode 100644 index 000000000..b1d113fc3 --- /dev/null +++ b/package/fuse/ipkg/libfuse.control @@ -0,0 +1,9 @@ +Package: libfuse +Priority: optional +Section: libs +Version: [TBDL] +Architecture: [TBDL] +Maintainer: Nico +Source: http://nthill.free.fr/openwrt/sources/fuse2/ +Description: Filesystem in Userspace (library) +Depends: libpthread diff --git a/package/fuse/ipkg/libfuse/CONTROL/control b/package/fuse/ipkg/libfuse/CONTROL/control deleted file mode 100644 index b1d113fc3..000000000 --- a/package/fuse/ipkg/libfuse/CONTROL/control +++ /dev/null @@ -1,9 +0,0 @@ -Package: libfuse -Priority: optional -Section: libs -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/fuse2/ -Description: Filesystem in Userspace (library) -Depends: libpthread diff --git a/package/fuse/ipkg/rules b/package/fuse/ipkg/rules deleted file mode 100644 index 66321bdba..000000000 --- a/package/fuse/ipkg/rules +++ /dev/null @@ -1,163 +0,0 @@ -#!/usr/bin/make -f - -ifneq ($(strip ${IPKG_RULES_INC}),) - include $(IPKG_RULES_INC) -endif - -## - -PKG_VERSION := $(shell cat ./ipkg/version) -CURRENT_DIR := $(shell pwd) -INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install - -unexport INSTALL_DIR - -I_KMOD_FUSE := ipkg/kmod-fuse -I_LIBFUSE := ipkg/libfuse -I_LIBFUSE_DEV := ipkg/libfuse-dev -I_FUSE_UTILS := ipkg/fuse-utils - -BUILD_DEPS = \ - -CONFIGURE_OPTS = \ - --enable-shared \ - --enable-static \ - --enable-kernel-module \ - --enable-lib \ - --enable-util \ - --disable-example \ - --disable-auto-modprobe \ - --with-kernel=$(LINUX_DIR) \ - -## - -all: package - - -.stamp-configured: $(BUILD_DEPS) - - touch configure.in - touch aclocal.m4 - touch Makefile.in - touch include/config.h.in - touch configure - - rm -rf config.cache - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./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/locate \ - --localstatedir=/var/lib \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - $(CONFIGURE_OPTS) \ - - touch .stamp-configured - - -.stamp-built: .stamp-configured - - $(MAKE) \ - - touch .stamp-built - - -$(INSTALL_DIR)/usr/bin/fusermount: .stamp-built - - mkdir -p $(INSTALL_DIR) - - $(MAKE) \ - DESTDIR="$(INSTALL_DIR)" \ - install - - rm -f $(INSTALL_DIR)/usr/lib/libfuse.la - - -configure: .stamp-configured - - -build: .stamp-built - - -install: $(INSTALL_DIR)/usr/bin/fusermount - - -package: $(INSTALL_DIR)/usr/bin/fusermount - - mkdir -p $(I_KMOD_FUSE)/lib/modules/$(LINUX_VERSION) - cp -fpR $(INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.o \ - $(I_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/ - $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note \ - $(I_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/*.o - - mkdir -p $(I_LIBFUSE)/usr/lib - cp -fpR $(INSTALL_DIR)/usr/lib/libfuse.so.* $(I_LIBFUSE)/usr/lib/ - $(STRIP) $(I_LIBFUSE)/usr/lib/* - - mkdir -p $(I_LIBFUSE_DEV)/usr/include - cp -fpR $(INSTALL_DIR)/usr/include/fuse* $(I_LIBFUSE_DEV)/usr/include/ - mkdir -p $(I_LIBFUSE_DEV)/usr/lib - cp -fpR $(INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(I_LIBFUSE_DEV)/usr/lib/ - mkdir -p $(I_LIBFUSE_DEV)/usr/lib/pkgconfig - cp -fpR $(INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(I_LIBFUSE_DEV)/usr/lib/pkgconfig/ - - mkdir -p $(I_FUSE_UTILS)/usr/bin - cp -fpR $(INSTALL_DIR)/usr/bin/fusermount $(I_FUSE_UTILS)/usr/bin/ - $(STRIP) $(I_FUSE_UTILS)/usr/bin/* - - chmod 0755 ipkg/*/CONTROL/ - chmod 0644 ipkg/*/CONTROL/control - - perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control -ifneq ($(strip $(PKG_VERSION)),) - perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control - perl -pi -e "s/^Vers.*:.*/Version: $(LINUX_VERSION)+$(PKG_VERSION)/g" $(I_KMOD_FUSE)/CONTROL/control -endif - - $(IPKG_BUILD) $(I_KMOD_FUSE) $(IPKG_TARGET_DIR) - $(IPKG_BUILD) $(I_LIBFUSE) $(IPKG_TARGET_DIR) - $(IPKG_BUILD) $(I_LIBFUSE_DEV) $(IPKG_TARGET_DIR) - $(IPKG_BUILD) $(I_FUSE_UTILS) $(IPKG_TARGET_DIR) - - -clean: - - -$(MAKE) \ - DESTDIR="$(INSTALL_DIR)" \ - install clean - - rm -rf .stamp-* \ - $(I_KMOD_FUSE)/lib - $(I_LIBFUSE)/usr - $(I_LIBFUSE_DEV)/usr - $(I_FUSE_UTILS)/usr - - -control: - - @cat $(I_KMOD_FUSE)/CONTROL/control - @echo - @cat $(I_LIBFUSE)/CONTROL/control - @echo - @cat $(I_LIBFUSE_DEV)/CONTROL/control - @echo - @cat $(I_FUSE_UTILS)/CONTROL/control - @echo - - -.PHONY: configure build install package clean control diff --git a/package/fuse/ipkg/version b/package/fuse/ipkg/version deleted file mode 100644 index 2b107ddb1..000000000 --- a/package/fuse/ipkg/version +++ /dev/null @@ -1 +0,0 @@ -2.2.1-1 -- cgit v1.2.3