Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88731dfbff2b94d5560cbf5e4abeae54cee2a542
commit 88731dfbff2b94d5560cbf5e4abeae54cee2a542 Author: Miklos Vajna <vmik...@frugalware.org> Date: Sat Aug 27 08:47:43 2011 +0200 bluez-4.95-1-i686 - version bump - drop no longer necessary rc script diff --git a/NEWS b/NEWS index d6524f2..13c60b5 100644 --- a/NEWS +++ b/NEWS @@ -3,9 +3,12 @@ Frugalware (1.6) pre1: pending * Package updates: * Linux 3.0 + * GNU C Library 2.14 * GCC 4.6 * KDE SC 4.7 * Perl 5.14 + * New features + * rsyslog is the new default syslog daemon Frugalware (1.5) diff --git a/source/apps/bluez/FrugalBuild b/source/apps/bluez/FrugalBuild index 48eb3a1..de5e46c 100644 --- a/source/apps/bluez/FrugalBuild +++ b/source/apps/bluez/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=bluez -pkgver=4.91 +pkgver=4.95 pkgrel=1 pkgdesc="Library to use the BlueZ Linux Bluetooth stack" url="http://bluez.sourceforge.net/"; @@ -11,22 +11,19 @@ groups=('apps') archs=('i686' 'x86_64' 'ppc') up2date="Flasttar http://www.bluez.org/download/"; source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.gz \ - rc.bluetooth bluetooth.default Fix_netdevgroup.diff \ + Fix_netdevgroup.diff \ install-systemd-unit-files.patch) -sha1sums=('4cb62c406efed648ea34e5f4ad717e2bb1d51912' \ - 'c9db2651400cc9261798afcc7e438acffbd2cc37' \ - 'b54b6eb3606edcbac635f32f94d0afe32091c89f' \ +sha1sums=('9e7a9461ab77e219ad32914a2832660ddf56cd35' \ '21f7a64b47eb9578c91799a341a3a7ef67d786b6' \ - '00734341bcee052f77a6d3cd7b7ab420b51e2d58') + '16ab9ca2a58177f5d2c4c981169bba51b0d4a26e') conflicts=('bluez-utils' 'bluez-libs') provides=('bluez-utils' 'bluez-libs') replaces=('bluez-utils' 'bluez-libs') -backup=(etc/sysconfig/bluetooth etc/bluetooth/rfcomm.conf etc/bluetooth/uart.conf) +backup=(etc/bluetooth/rfcomm.conf etc/bluetooth/uart.conf) #--enable-gstreamer disable for now build() { - Ffile bluetooth.default /etc/sysconfig/bluetooth Fpatchall Fautoreconf Fmake --enable-serial \ @@ -48,7 +45,6 @@ build() { --enable-udevrules \ --with-systemdsystemunitdir=/lib/systemd/system Fmakeinstall - Frcd2 bluetooth } # optimization OK diff --git a/source/apps/bluez/bluetooth.default b/source/apps/bluez/bluetooth.default deleted file mode 100644 index 7a930e3..0000000 --- a/source/apps/bluez/bluetooth.default +++ /dev/null @@ -1,6 +0,0 @@ -# Bluetooth configuraton file - -# Run rfcomm (allowed values are "true" and "false") -RFCOMM_ENABLE=false - - diff --git a/source/apps/bluez/bluez.install b/source/apps/bluez/bluez.install index d0e5d34..812e02f 100644 --- a/source/apps/bluez/bluez.install +++ b/source/apps/bluez/bluez.install @@ -1,6 +1,5 @@ post_install() { - chkconfig --add rc.bluetooth # bluetoothd supports bus activation, no systemctl enable here systemctl daemon-reload >/dev/null 2>&1 } @@ -9,13 +8,14 @@ post_upgrade() { systemctl daemon-reload >/dev/null 2>&1 systemctl try-restart bluetooth.service >/dev/null 2>&1 + # can be removed after Frugalware-1.6 + rm -f /etc/rc.d/rc?.d/???rc.bluetooth } pre_remove() { systemctl stop bluetooth.service >/dev/null 2>&1 systemctl disable bluetooth.service >/dev/null 2>&1 - chkconfig --del rc.bluetooth } post_remove() diff --git a/source/apps/bluez/install-systemd-unit-files.patch b/source/apps/bluez/install-systemd-unit-files.patch index d4b905d..ce5d992 100644 --- a/source/apps/bluez/install-systemd-unit-files.patch +++ b/source/apps/bluez/install-systemd-unit-files.patch @@ -1,4 +1,4 @@ -From d3cf8827053a239009d35995c0e06744d2bd331a Mon Sep 17 00:00:00 2001 +From 65e42b8b83337533d2ef1d9651d614a5b927982a Mon Sep 17 00:00:00 2001 From: Lennart Poettering <lenn...@poettering.net> Date: Wed, 21 Jul 2010 19:20:44 +0200 Subject: [PATCH] systemd: install systemd unit files @@ -10,29 +10,19 @@ that bluetoothd is not started twice at the same time. Makefile.am | 21 ++++++++++++++++++--- configure.ac | 9 +++++++++ scripts/.gitignore | 1 + - scripts/bluetooth.service.in | 12 ++++++++++++ + scripts/bluetooth.service.in | 13 +++++++++++++ scripts/org.bluez.service | 5 +++++ - 5 files changed, 45 insertions(+), 3 deletions(-) + 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 scripts/.gitignore create mode 100644 scripts/bluetooth.service.in create mode 100644 scripts/org.bluez.service diff --git a/Makefile.am b/Makefile.am -index 6044082..3ed5bcc 100644 +index a21bd7d..e1c5c80 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -346,7 +346,8 @@ endif - CLEANFILES += $(rules_DATA) - - EXTRA_DIST += scripts/bluetooth.rules \ -- scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules -+ scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules \ -+ scripts/bluetooth.service.in scripts/org.bluez.service - - if PCMCIA - udevdir = $(libexecdir)/udev -@@ -354,6 +355,20 @@ udevdir = $(libexecdir)/udev - dist_udev_SCRIPTS = scripts/bluetooth_serial +@@ -367,10 +367,25 @@ endif + rules_DATA = $(foreach file,$(udev_files), scripts/97-$(notdir $(file))) endif +if HAVE_SYSTEMD @@ -49,15 +39,21 @@ index 6044082..3ed5bcc 100644 + +endif + + CLEANFILES += $(rules_DATA) + + EXTRA_DIST += scripts/bluetooth.rules \ +- scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules ++ scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules \ ++ scripts/bluetooth.service.in scripts/org.bluez.service + EXTRA_DIST += doc/manager-api.txt \ doc/adapter-api.txt doc/device-api.txt \ - doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \ -@@ -378,9 +393,9 @@ pkgconfigdir = $(libdir)/pkgconfig +@@ -397,9 +412,9 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = bluez.pc --DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib -+DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib --with-systemdsystemunitdir= +-DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles ++DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --with-systemdsystemunitdir= -DISTCLEANFILES = $(pkgconfig_DATA) +DISTCLEANFILES = $(pkgconfig_DATA) scripts/bluetooth.service @@ -65,12 +61,12 @@ index 6044082..3ed5bcc 100644 MAINTAINERCLEANFILES = Makefile.in \ aclocal.m4 configure config.h.in config.sub config.guess \ diff --git a/configure.ac b/configure.ac -index 3348ee8..5244f73 100644 +index 6b0b024..861e1bc 100644 --- a/configure.ac +++ b/configure.ac -@@ -56,5 +56,14 @@ if (test "${enable_capng}" = "yes"); then - AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.]) +@@ -71,5 +71,14 @@ if (test -n "${path_systemdunit}"); then fi + AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}") +# systemd + @@ -82,7 +78,7 @@ index 3348ee8..5244f73 100644 +AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"]) + AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml - src/bluetoothd.8 bluez.pc) + src/bluetoothd.8 src/bluetooth.service bluez.pc) diff --git a/scripts/.gitignore b/scripts/.gitignore new file mode 100644 index 0000000..4b9f765 @@ -92,10 +88,10 @@ index 0000000..4b9f765 +bluetooth.service diff --git a/scripts/bluetooth.service.in b/scripts/bluetooth.service.in new file mode 100644 -index 0000000..f95b0b0 +index 0000000..d0089ea --- /dev/null +++ b/scripts/bluetooth.service.in -@@ -0,0 +1,12 @@ +@@ -0,0 +1,13 @@ +[Unit] +Description=Bluetooth Manager +After=syslog.target @@ -108,9 +104,10 @@ index 0000000..f95b0b0 + +[Install] +WantedBy=bluetooth.target ++Alias=dbus-org.bluez.service diff --git a/scripts/org.bluez.service b/scripts/org.bluez.service new file mode 100644 -index 0000000..2a3b057 +index 0000000..dd7ae8f --- /dev/null +++ b/scripts/org.bluez.service @@ -0,0 +1,5 @@ @@ -118,7 +115,7 @@ index 0000000..2a3b057 +Name=org.bluez +Exec=/bin/false +User=root -+SystemdService=bluetooth.service ++SystemdService=dbus-org.bluez.service -- -1.7.3.2 +1.7.5.4 diff --git a/source/apps/bluez/rc.bluetooth b/source/apps/bluez/rc.bluetooth deleted file mode 100644 index af24eda..0000000 --- a/source/apps/bluez/rc.bluetooth +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -# (c) 2010 bouleetbil <bouleet...@frogdev.info> -# rc.bluetooth for FrugalWare -# distributed under GPL License - - -# chkconfig: 2345 98 12 -# description: Bluetooth management daemon - -source /lib/initscripts/functions -TEXTDOMAIN=bluetooth -TEXTDOMAINDIR=/lib/initscripts/messages -daemon="bluetooth" - -actions=(restart start status stop) - - -[ -e /etc/sysconfig/bluetooth ] && . /etc/sysconfig/bluetooth - -rc_start() -{ - start_msg - udevadm trigger --subsystem-match=bluetooth --action=add - - if [ "$RFCOMM_ENABLE" = "true" ]; then - submsg "$startrfcomm" - rfcomm -f /etc/bluetooth/rfcomm.conf bind all || true - ok $? - fi - ok $? -} - -rc_stop() -{ - stop_msg - rfcomm release all &> /dev/null - ok $? -} - -rc_exec $1
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
