From 34cdab19744c5a3319db7aa1d867bd3d928c8807 Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 19 Apr 2005 06:37:37 +0000 Subject: Change shfs, uniformize package makefile git-svn-id: svn://svn.openwrt.org/openwrt/trunk@684 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/shfs/ipkg/kmod-shfs.control | 8 ++ .../package/shfs/ipkg/kmod-shfs/CONTROL/control | 8 -- openwrt/package/shfs/ipkg/rules | 111 --------------------- openwrt/package/shfs/ipkg/shfs-utils.control | 9 ++ .../package/shfs/ipkg/shfs-utils/CONTROL/control | 9 -- openwrt/package/shfs/ipkg/version | 1 - 6 files changed, 17 insertions(+), 129 deletions(-) create mode 100644 openwrt/package/shfs/ipkg/kmod-shfs.control delete mode 100644 openwrt/package/shfs/ipkg/kmod-shfs/CONTROL/control delete mode 100644 openwrt/package/shfs/ipkg/rules create mode 100644 openwrt/package/shfs/ipkg/shfs-utils.control delete mode 100644 openwrt/package/shfs/ipkg/shfs-utils/CONTROL/control delete mode 100644 openwrt/package/shfs/ipkg/version (limited to 'openwrt/package/shfs/ipkg') diff --git a/openwrt/package/shfs/ipkg/kmod-shfs.control b/openwrt/package/shfs/ipkg/kmod-shfs.control new file mode 100644 index 000000000..b7ce61293 --- /dev/null +++ b/openwrt/package/shfs/ipkg/kmod-shfs.control @@ -0,0 +1,8 @@ +Package: kmod-shfs +Priority: optional +Section: net +Version: [TBDL] +Architecture: [TBDL] +Maintainer: Nico +Source: http://nthill.free.fr/openwrt/sources/shfs/ +Description: SHell FileSystem Linux kernel module diff --git a/openwrt/package/shfs/ipkg/kmod-shfs/CONTROL/control b/openwrt/package/shfs/ipkg/kmod-shfs/CONTROL/control deleted file mode 100644 index b7ce61293..000000000 --- a/openwrt/package/shfs/ipkg/kmod-shfs/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: kmod-shfs -Priority: optional -Section: net -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/shfs/ -Description: SHell FileSystem Linux kernel module diff --git a/openwrt/package/shfs/ipkg/rules b/openwrt/package/shfs/ipkg/rules deleted file mode 100644 index 2297c9888..000000000 --- a/openwrt/package/shfs/ipkg/rules +++ /dev/null @@ -1,111 +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_SHFS := ipkg/kmod-shfs -I_SHFS_UTILS := ipkg/shfs-utils - -BUILD_DEPS = \ - -## - -all: package - - -.stamp-configured: $(BUILD_DEPS) - - touch .stamp-configured - - -.stamp-built: .stamp-configured - - $(MAKE) \ - OFLAGS="$(TARGET_CFLAGS)" \ - CC="$(TARGET_CC)" \ - LINKER="$(TARGET_CC)" \ - KERNEL="$(LINUX_VERSION)" \ - KERNEL_SOURCES="$(LINUX_DIR)" \ - all - - touch .stamp-built - - -$(INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/shfs.o: .stamp-built - - mkdir -p $(INSTALL_DIR) - - $(MAKE) \ - ROOT="$(INSTALL_DIR)" \ - KERNEL="$(LINUX_VERSION)" \ - KERNEL_SOURCES="$(LINUX_DIR)" \ - install - - -configure: .stamp-configured - - -build: .stamp-built - - -install: $(INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/shfs.o - - -package: $(INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/shfs.o - - mkdir -p $(I_KMOD_SHFS)/lib/modules/$(LINUX_VERSION) - cp -fpR $(INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.o \ - $(I_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/ - $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note \ - $(I_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/*.o - - mkdir -p $(I_SHFS_UTILS)/usr/sbin - cp -fpR $(INSTALL_DIR)/usr/sbin/shfs{,u}mount $(I_SHFS_UTILS)/usr/sbin/ - cp -fpR $(INSTALL_DIR)/usr/sbin/mount.shfs $(I_SHFS_UTILS)/usr/sbin/ - $(STRIP) $(I_SHFS_UTILS)/usr/sbin/shfs* - - 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_SHFS)/CONTROL/control -endif - - $(IPKG_BUILD) $(I_KMOD_SHFS) $(IPKG_TARGET_DIR) - $(IPKG_BUILD) $(I_SHFS_UTILS) $(IPKG_TARGET_DIR) - - -clean: - - -$(MAKE) \ - ROOT="$(INSTALL_DIR)" \ - KERNEL="$(LINUX_VERSION)" \ - KERNEL_SOURCES="$(LINUX_DIR)" \ - uninstall clean - - rm -rf .stamp-* \ - $(INSTALL_DIR) \ - $(I_KMOD_SHFS)/lib \ - $(I_SHFS_UTILS)/usr \ - - -control: - - @cat $(I_KMOD_SHFS)/CONTROL/control - @echo - @cat $(I_SHFS_UTILS)/CONTROL/control - @echo - - -.PHONY: configure build install package clean control diff --git a/openwrt/package/shfs/ipkg/shfs-utils.control b/openwrt/package/shfs/ipkg/shfs-utils.control new file mode 100644 index 000000000..af3b897f2 --- /dev/null +++ b/openwrt/package/shfs/ipkg/shfs-utils.control @@ -0,0 +1,9 @@ +Package: shfs-utils +Priority: optional +Section: net +Version: [TBDL] +Architecture: [TBDL] +Maintainer: Nico +Source: http://nthill.free.fr/openwrt/sources/shfs/ +Description: SHell FileSystem Linux mount/umount utilities +Depends: kmod-shfs diff --git a/openwrt/package/shfs/ipkg/shfs-utils/CONTROL/control b/openwrt/package/shfs/ipkg/shfs-utils/CONTROL/control deleted file mode 100644 index af3b897f2..000000000 --- a/openwrt/package/shfs/ipkg/shfs-utils/CONTROL/control +++ /dev/null @@ -1,9 +0,0 @@ -Package: shfs-utils -Priority: optional -Section: net -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/shfs/ -Description: SHell FileSystem Linux mount/umount utilities -Depends: kmod-shfs diff --git a/openwrt/package/shfs/ipkg/version b/openwrt/package/shfs/ipkg/version deleted file mode 100644 index 3a36fd678..000000000 --- a/openwrt/package/shfs/ipkg/version +++ /dev/null @@ -1 +0,0 @@ -0.35-2 -- cgit v1.2.3