summaryrefslogtreecommitdiff
path: root/package/dbus
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-30 20:39:07 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-30 20:39:07 +0200
commitba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (patch)
tree10c726d162bc0ded85eb7aeacf8f246bd39ad63a /package/dbus
parentbbd610f15a71b27c955175cb98392b114717fd47 (diff)
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
Diffstat (limited to 'package/dbus')
-rw-r--r--package/dbus/Makefile21
-rw-r--r--package/dbus/files/dbus.init3
-rw-r--r--package/dbus/files/dbus.postinst (renamed from package/dbus/ipkg/dbus.postinst)0
-rw-r--r--package/dbus/ipkg/dbus.control5
4 files changed, 12 insertions, 17 deletions
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/ipkg/dbus.postinst b/package/dbus/files/dbus.postinst
index 8dd0a50c8..8dd0a50c8 100644
--- a/package/dbus/ipkg/dbus.postinst
+++ b/package/dbus/files/dbus.postinst
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