From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 May 2009 20:39:07 +0200
Subject: optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig
---
 package/davfs2/Makefile               | 24 +++++++++++++-----------
 package/davfs2/files/davfs2.conffiles |  2 ++
 package/davfs2/files/davfs2.postinst  |  5 +++++
 package/davfs2/ipkg/davfs2.conffiles  |  2 --
 package/davfs2/ipkg/davfs2.control    |  4 ----
 package/davfs2/ipkg/davfs2.postinst   |  5 -----
 6 files changed, 20 insertions(+), 22 deletions(-)
 create mode 100644 package/davfs2/files/davfs2.conffiles
 create mode 100644 package/davfs2/files/davfs2.postinst
 delete mode 100644 package/davfs2/ipkg/davfs2.conffiles
 delete mode 100644 package/davfs2/ipkg/davfs2.control
 delete mode 100644 package/davfs2/ipkg/davfs2.postinst

(limited to 'package/davfs2')

diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index 4e90b1a05..d84ae0f1b 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -9,11 +9,22 @@ PKG_NAME=		davfs2
 PKG_VERSION=		1.3.3
 PKG_RELEASE=		1
 PKG_MD5SUM=		57def26e4d6d63527e01612d10fd0515
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dav/}
+PKG_DESCR:=		WebDAV filesystem
+PKG_SECTION:=		admin
+PKG_URL:=		http://savannah.nongnu.org/projects/davfs2
+PKG_SITES=		${MASTER_SITE_SOURCEFORGE:=dav/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DAVFS2,davfs2,${PKG_VERSION}-${PKG_RELEASE}))
+ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y)
+PKG_DEPENDS:=			fuse-utils, kmod-fuse, libfuse, libiconv, neon
+else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y)
+PKG_DEPENDS:=			kmod-fs-coda, libiconv, neon
+else
+PKG_DEPENDS:=			kmod-fs-coda, fuse-utils, kmod-fuse, libfuse, libiconv, neon
+endif
+
+$(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-neon
@@ -21,14 +32,6 @@ CONFIGURE_ENV+=		LIBS=-liconv
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
-ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y)
-DEPS=			fuse-utils, kmod-fuse, libfuse, libiconv, neon
-else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y)
-DEPS=			kmod-fs-coda, libiconv, neon
-else
-DEPS=			kmod-fs-coda, fuse-utils, kmod-fuse, libfuse, libiconv, neon
-endif
-
 post-install:
 	${INSTALL_DIR} ${IDIR_DAVFS2}/etc/davfs2
 	${INSTALL_DIR} ${IDIR_DAVFS2}/usr/sbin
@@ -38,6 +41,5 @@ post-install:
 		${IDIR_DAVFS2}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/umount.davfs \
 		${IDIR_DAVFS2}/usr/sbin
-	echo 'Depends: ${DEPS}' >>${IDIR_DAVFS2}/CONTROL/control
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/davfs2/files/davfs2.conffiles b/package/davfs2/files/davfs2.conffiles
new file mode 100644
index 000000000..c831d9d59
--- /dev/null
+++ b/package/davfs2/files/davfs2.conffiles
@@ -0,0 +1,2 @@
+/etc/davfs2/davfs2.conf
+/etc/davfs2/secrets
diff --git a/package/davfs2/files/davfs2.postinst b/package/davfs2/files/davfs2.postinst
new file mode 100644
index 000000000..1d333c4a6
--- /dev/null
+++ b/package/davfs2/files/davfs2.postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+gid=$(get_next_gid)
+add_group davfs2 $gid
+add_user davfs2 $(get_next_uid) $gid /nonexistent
diff --git a/package/davfs2/ipkg/davfs2.conffiles b/package/davfs2/ipkg/davfs2.conffiles
deleted file mode 100644
index c831d9d59..000000000
--- a/package/davfs2/ipkg/davfs2.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/davfs2/davfs2.conf
-/etc/davfs2/secrets
diff --git a/package/davfs2/ipkg/davfs2.control b/package/davfs2/ipkg/davfs2.control
deleted file mode 100644
index 87d85e9df..000000000
--- a/package/davfs2/ipkg/davfs2.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: davfs2
-Priority: optional
-Section: admin
-Description: WebDAV filesystem
diff --git a/package/davfs2/ipkg/davfs2.postinst b/package/davfs2/ipkg/davfs2.postinst
deleted file mode 100644
index 1d333c4a6..000000000
--- a/package/davfs2/ipkg/davfs2.postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-gid=$(get_next_gid)
-add_group davfs2 $gid
-add_user davfs2 $(get_next_uid) $gid /nonexistent
-- 
cgit v1.2.3