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/dbus/Makefile            | 21 ++++++++++-----------
 package/dbus/files/dbus.init     |  3 ++-
 package/dbus/files/dbus.postinst |  6 ++++++
 package/dbus/ipkg/dbus.control   |  5 -----
 package/dbus/ipkg/dbus.postinst  |  6 ------
 5 files changed, 18 insertions(+), 23 deletions(-)
 create mode 100644 package/dbus/files/dbus.postinst
 delete mode 100644 package/dbus/ipkg/dbus.control
 delete mode 100644 package/dbus/ipkg/dbus.postinst

(limited to 'package/dbus')

diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index ec8b29777..b240bc043 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -6,14 +6,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dbus
-PKG_VERSION:=		1.0.2
-PKG_RELEASE:=		7
-PKG_MD5SUM:=		0552a9b54beb4a044951b7cdbc8fc855
-MASTER_SITES:=		http://dbus.freedesktop.org/releases/dbus/
+PKG_VERSION:=		1.0.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ce328423db5743fe9006d39113b5324d
+PKG_DESCR:=		DBUS library
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libexpat
+PKG_URL:=		http://dbus.freedesktop.org
+PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-tests \
@@ -30,9 +34,7 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		confprog auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_DBUS}/etc
-	${INSTALL_DIR} ${IDIR_DBUS}/usr/lib
-	${INSTALL_DIR} ${IDIR_DBUS}/usr/bin
+	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib ${IDIR_DBUS}/usr/bin
 	${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus
 	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/
 	${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/
@@ -40,8 +42,5 @@ post-install:
 		$(STAGING_DIR)/usr/include/dbus-1.0/dbus/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-launch ${IDIR_DBUS}/usr/bin/
-	${INSTALL_DIR} ${IDIR_DBUS}/etc/init.d
-	${INSTALL_BIN} ./files/dbus.init \
-		${IDIR_DBUS}/etc/init.d/dbus
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init
index dd1761271..3484c4522 100644
--- a/package/dbus/files/dbus.init
+++ b/package/dbus/files/dbus.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG dbus
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/dbus/files/dbus.postinst b/package/dbus/files/dbus.postinst
new file mode 100644
index 000000000..8dd0a50c8
--- /dev/null
+++ b/package/dbus/files/dbus.postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+gid=$(get_next_gid)
+add_group messagebus $gid
+add_user messagebus $(get_next_uid) $gid /var/run/dbus
+add_rcconf dbus dbus NO
diff --git a/package/dbus/ipkg/dbus.control b/package/dbus/ipkg/dbus.control
deleted file mode 100644
index d1cecbd8a..000000000
--- a/package/dbus/ipkg/dbus.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: dbus
-Priority: optional
-Section: net
-Description: DBUS library
-Depends: libexpat
diff --git a/package/dbus/ipkg/dbus.postinst b/package/dbus/ipkg/dbus.postinst
deleted file mode 100644
index 8dd0a50c8..000000000
--- a/package/dbus/ipkg/dbus.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-gid=$(get_next_gid)
-add_group messagebus $gid
-add_user messagebus $(get_next_uid) $gid /var/run/dbus
-add_rcconf dbus dbus NO
-- 
cgit v1.2.3