Changeset 30292


Ignore:
Timestamp:
2012-02-05T17:46:45+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] dbus: merge r28015, r28027, r28947

Location:
branches/packages_10.03.2/utils/dbus
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/utils/dbus/Makefile

    r20486 r30292  
    11# 
    2 # Copyright (C) 2007-2009 OpenWrt.org 
     2# Copyright (C) 2007-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010# Make sure to also update the dbus-x package 
    1111PKG_NAME:=dbus 
    12 PKG_VERSION:=1.2.4.6permissive 
     12PKG_VERSION:=1.4.14 
    1313PKG_RELEASE:=2 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus/ 
    17 PKG_MD5SUM:=1a158fe326b078d1377a977121888496 
     17PKG_MD5SUM:=ae6de2562a57516cfabaf56903375ba9 
    1818 
    1919PKG_FIXUP:=libtool 
     
    5555$(call Package/dbus/Default) 
    5656 TITLE+= (daemon) 
    57  DEPENDS:= +libexpat +libdbus 
     57 DEPENDS:= +libexpat +libdbus +librt 
    5858endef 
    5959 
     
    8888        --disable-console-owner-file \ 
    8989        --disable-doxygen-docs \ 
    90         --disable-gcov \ 
     90        --disable-compiler_coverage \ 
    9191        --disable-selinux \ 
    9292        --disable-tests \ 
  • branches/packages_10.03.2/utils/dbus/files/dbus.init

    r12741 r30292  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2007-2008 OpenWrt.org 
    3  
    4 SSD=start-stop-daemon 
    5 PIDF=/var/run/dbus.pid 
    6 PROG=/usr/sbin/dbus-daemon 
    7 ARGS=--system 
     2# Copyright (C) 2007-2011 OpenWrt.org 
    83 
    94START=60 
     5 
     6SERVICE_PID_FILE=/var/run/dbus.pid 
     7 
    108start() { 
    11         if [ -x /usr/bin/dbus-uuidgen ]; then 
    12                 mkdir -p /var/lib/dbus/ 
    13                 /usr/bin/dbus-uuidgen --ensure 
    14         fi 
    15  
    16         mkdir -p /var/run/dbus 
    17         $SSD -S -p $PIDF -q -x $PROG -- $ARGS 
     9        mkdir -m 0755 -p /var/lib/dbus 
     10        mkdir -m 0755 -p /var/run/dbus 
     11        [ -x /usr/bin/dbus-uuidgen ] && /usr/bin/dbus-uuidgen --ensure 
     12        service_start /usr/sbin/dbus-daemon --system 
    1813} 
    1914 
    2015stop() { 
    21         $SSD -K -p $PIDF -q 
     16        service_stop /usr/sbin/dbus-daemon && rm $SERVICE_PID_FILE 
    2217} 
    23  
    24 status() { 
    25         ps | grep -q "^ *$(cat $PIDF 2>/dev/null) *.*$PROG" 
    26 } 
    27  
Note: See TracChangeset for help on using the changeset viewer.