X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fbluetooth;h=2a013008586c3569caf73676763042ccb874061d;hp=961b1e603823ab8189afaec3cc5fc2ea3fdd48ba;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=7e49b322847ea181f5421a75a0de0d1e0005f89e

diff --git a/lfs/bluetooth b/lfs/bluetooth
index 961b1e6038..2a01300858 100644
--- a/lfs/bluetooth
+++ b/lfs/bluetooth
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bluetooth
 PAK_VER    = 1
 
-DEPS       = "dbus glib"
+DEPS       = "dbus"
 
 ###############################################################################
 # Top-level Rules
@@ -84,31 +84,35 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_SRC)/bluez*
 	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && tar xzf $(DIR_DL)/bluez-utils-$(VER).tar.gz
+	cd $(DIR_APP) && tar xzf $(DIR_DL)/bluez-firmware-1.2.tar.gz
+	cd $(DIR_APP) && tar xzf $(DIR_DL)/bluez-hcidump-1.42.tar.gz
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure --prefix=/usr \
 	    --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cd $(DIR_SRC) && tar xzf $(DIR_DL)/bluez-utils-$(VER).tar.gz
-	cd $(DIR_SRC)/bluez-utils-$(VER) && ./configure --prefix=/usr \
+	cd $(DIR_APP)/bluez-utils-$(VER) && ./configure --prefix=/usr \
 	    --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib \
 	    --enable-alsa --enable-usb --enable-netlink --enable-tools \
 	    --enable-bccmd --enable-hid2hci --enable-dfutool --enable-hidd \
 	    --enable-pand --enable-dund --enable-cups --enable-test \
 	    --enable-configfiles --enable-pcmciarules
-	cd $(DIR_SRC)/bluez-utils-$(VER) && make $(MAKETUNING)
-	cd $(DIR_SRC)/bluez-utils-$(VER) && make install
-	cd $(DIR_SRC)/bluez-utils-$(VER) && install -m 755 \
+	cd $(DIR_APP)/bluez-utils-$(VER) && make $(MAKETUNING)
+	cd $(DIR_APP)/bluez-utils-$(VER) && make install
+	cd $(DIR_APP)/bluez-utils-$(VER) && install -m 755 \
 		test/passkey-agent /usr/bin/passkey-agent
-	cd $(DIR_SRC) && tar xzf $(DIR_DL)/bluez-firmware-1.2.tar.gz
-	cd $(DIR_SRC)/bluez-firmware-1.2 && ./configure --libdir=/lib
-	cd $(DIR_SRC)/bluez-firmware-1.2 && make $(MAKETUNING)
-	cd $(DIR_SRC)/bluez-firmware-1.2 && make install
-	cd $(DIR_SRC) && tar xzf $(DIR_DL)/bluez-hcidump-1.42.tar.gz
-	cd $(DIR_SRC)/bluez-hcidump-1.42 && ./configure --prefix=/usr \
+	cd $(DIR_APP)/bluez-firmware-1.2 && ./configure --libdir=/lib
+	cd $(DIR_APP)/bluez-firmware-1.2 && make $(MAKETUNING)
+	cd $(DIR_APP)/bluez-firmware-1.2 && make install
+	cd $(DIR_APP)/bluez-hcidump-1.42 && ./configure --prefix=/usr \
 	    --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib
-	cd $(DIR_SRC)/bluez-hcidump-1.42 && make $(MAKETUNING)
-	cd $(DIR_SRC)/bluez-hcidump-1.42 && make install
-	mv -f /etc/udev/bluetooth.rules /etc/udev/rules.d/24-bluetooth.rules
+	cd $(DIR_APP)/bluez-hcidump-1.42 && make $(MAKETUNING)
+	cd $(DIR_APP)/bluez-hcidump-1.42 && make install
+	mv -f /etc/udev/bluetooth.rules /lib/udev/rules.d/24-bluetooth.rules
+	# Patch udev rules for new udev version
+	sed -i -e "s/SYSFS{/ATTRS{/g" /lib/udev/rules.d/24-bluetooth.rules
+	sed -i -e "s/BUS==/SUBSYSTEMS==/g" /lib/udev/rules.d/24-bluetooth.rules
 	# Change bluetooth peername to Hostname-devicenumber
 	sed -i -e 's|name "BlueZ (%d)";|name "%h-%d";|g' /etc/bluetooth/hcid.conf
 	# Create empty config files
@@ -122,5 +126,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	chown nobody:nobody /var/ipfire/bluetooth/settings
 	chmod 644 /var/ipfire/bluetooth/settings
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/bluetooth /var/ipfire/backup/addons/includes/bluetooth
+
+	#install initscripts
+	$(call INSTALL_INITSCRIPT,bluetooth)
+
 	@rm -rf $(DIR_SRC)/bluez*
 	@$(POSTBUILD)