Ticket #3759: bluez5.patch

File bluez5.patch, 16.0 KB (added by Armin K, 10 years ago)

  • BOOK/general/sysutils/bluez.xml

     
    66
    77  <!ENTITY bluez-download-http "http://www.kernel.org/pub/linux/bluetooth/bluez-&bluez-version;.tar.xz">
    88  <!ENTITY bluez-download-ftp  "ftp://ftp.kernel.org/pub/linux/bluetooth/bluez-&bluez-version;.tar.xz">
    9   <!ENTITY bluez-md5sum        "c828c172f01f20c6ecd7f407894956a2">
    10   <!ENTITY bluez-size          "868 KB">
    11   <!ENTITY bluez-buildsize     "42 MB">
    12   <!ENTITY bluez-time          "0.8 SBU">
     9  <!ENTITY bluez-md5sum        "81f2ce3bc9a9ebe58ccfce6660031611">
     10  <!ENTITY bluez-size          "1.2 MB">
     11  <!ENTITY bluez-buildsize     "62 MB">
     12  <!ENTITY bluez-time          "0.5 SBU">
    1313]>
    1414
    1515<sect1 id="bluez" xreflabel="BlueZ-&bluez-version;">
    … …  
    7474
    7575    <bridgehead renderas="sect4">Required</bridgehead>
    7676    <para role="required">
    77       <xref linkend="dbus"/> and
    78       <xref linkend="glib2"/>
     77      <xref linkend="dbus"/>,
     78      <xref linkend="glib2"/>, and
     79      <xref linkend="libical"/>
    7980    </para>
    8081
    81     <bridgehead renderas="sect4">Optional</bridgehead>
    82     <para role="optional">
    83       <xref linkend="alsa-lib"/>,
    84       <xref linkend="check"/>,
    85       <xref linkend="gst-plugins-base"/>,
    86       <xref linkend="libsndfile"/>, and
    87       <xref linkend="libusb-compat"/>
    88     </para>
    89 
    9082    <para condition="html" role="usernotes">
    9183      User Notes: <ulink url="&blfs-wiki;/bluez"/>
    9284    </para>
    … …  
    129121      commands:
    130122    </para>
    131123
    132 <screen><userinput>
    133 ./configure --prefix=/usr        \
    134             --sysconfdir=/etc    \
    135             --localstatedir=/var \
    136             --libexecdir=/lib    \
    137             --enable-bccmd       \
    138             --enable-dfutool     \
    139             --enable-dund        \
    140             --enable-hid2hci     \
    141             --enable-hidd        \
    142             --enable-pand        \
    143             --enable-tools       \
    144             --enable-wiimote     \
    145             --disable-test       \
    146             --without-systemdunitdir &amp;&amp;
     124<screen><userinput>./configure --prefix=/usr         \
     125            --sysconfdir=/etc     \
     126            --localstatedir=/var  \
     127            --libexecdir=/usr/lib \
     128            --enable-library &amp;&amp;
    147129make</userinput></screen>
    148130
    149131    <para>
    … …  
    157139<screen role="root"><userinput>make install</userinput></screen>
    158140
    159141    <para>
    160       Install required configuration files as the
     142      Install the main configuration file as the
    161143      <systemitem class="username">root</systemitem> user:
    162144    </para>
    163145
    164 <screen role="root"><userinput>for CONFFILE in audio input network serial ; do
    165     install -v -m644 ${CONFFILE}/${CONFFILE}.conf /etc/bluetooth/${CONFFILE}.conf
    166 done
    167 unset CONFFILE</userinput></screen>
     146<screen role="root"><userinput>install -v -dm755 /etc/bluetooth &amp;&amp;
     147install -v -m644 src/main.conf /etc/bluetooth/main.conf</userinput></screen>
    168148
    169149    <para>
    170150      If desired, install the API documentation as the
    … …  
    171151      <systemitem class="username">root</systemitem> user:
    172152    </para>
    173153
    174 <screen role="root"><userinput>install -v -m755 -d /usr/share/doc/bluez-&bluez-version; &amp;&amp;
     154<screen role="root"><userinput>install -v -dm755 /usr/share/doc/bluez-&bluez-version; &amp;&amp;
    175155install -v -m644 doc/*.txt /usr/share/doc/bluez-&bluez-version;</userinput></screen>
     156
    176157  </sect2>
    177158
    178159
    … …  
    180161    <title>Command Explanations</title>
    181162
    182163    <para>
    183       <parameter>--enable-bccmd</parameter>: This switch enables building of the BCCMD
    184       interface utility.
     164      <parameter>--enable-library</parameter>: This switch enables building of the
     165      <application>BlueZ</application> 4 compatibility library which is required by
     166      some applications.
    185167    </para>
    186168
    187     <para>
    188       <parameter>--enable-dfutool</parameter>: This switch enables building of the DFU
    189       firmware upgrade utility.
    190     </para>
    191 
    192     <para>
    193       <parameter>--enable-dund</parameter>: This switch enables building of the DUN daemon.
    194     </para>
    195 
    196     <para>
    197       <parameter>--enable-hid2hci</parameter>: This switch enables building of the HID
    198       mode switching utility.
    199     </para>
    200 
    201     <para>
    202       <parameter>--enable-hidd</parameter>: This switch enables building of the HID daemon.
    203     </para>
    204 
    205     <para>
    206       <parameter>--enable-pand</parameter>: This switch enables building of the PAN daemon.
    207     </para>
    208 
    209     <para>
    210       <parameter>--enable-tools</parameter>: This switch enables building of the Bluetooth
    211       utilities.
    212     </para>
    213 
    214     <para>
    215       <parameter>--enable-wiimote</parameter>: This switch enables building of the Wii
    216       Remote plugin.
    217     </para>
    218 
    219     <para>
    220       <parameter>--disable-test</parameter>: This switch disables installation of the
    221       test programs.
    222     </para>
    223 
    224     <para>
    225       <parameter>--without-systemdunitdir</parameter>: This switch disables installation
    226       of the systemd units.
    227     </para>
    228 
    229     <para>
    230       <option>--enable-cups</option>: This switch enables CUPS backend support. Note
    231       that CUPS does not need to be installed for this support.
    232     </para>
    233 
    234     <!-- These options are automatically found and used if the packages are
    235          available. There is no need to use these switches.
    236     <para>
    237       <option>-enable-alsa</option>: This switch enables ALSA support. Use if you
    238       have <xref linkend="alsa-lib"/> installed.
    239     </para>
    240 
    241     <para>
    242       <option>-enable-gstreamer</option>: This switch enables GStreamer support. Use
    243       if you have <xref linkend="gst-plugins-base"/> installed.
    244     </para>
    245 
    246     <para>
    247       <option>-enable-usb</option>: This switch enables USB support. Use if you have
    248       <xref linkend="libusb-compat"/> installed.
    249     </para> -->
    250 
    251169  </sect2>
    252170
    253171  <sect2 role="configuration">
    … …  
    256174    <sect3 id="bluez-config">
    257175      <title>Config Files</title>
    258176      <para>
    259         <filename>/etc/bluetooth/audio.conf</filename>,
    260         <filename>/etc/bluetooth/input.conf</filename>,
    261         <filename>/etc/bluetooth/main.conf</filename>,
    262         <filename>/etc/bluetooth/network.conf</filename>,
    263         <filename>/etc/bluetooth/rfcomm.conf</filename> and
    264         <filename>/etc/bluetooth/serial.conf</filename>
     177        <filename>/etc/bluetooth/main.conf</filename>
    265178      </para>
    266179
    267180      <indexterm zone="bluez bluez-config">
    268181        <primary
    269         sortas="e-etc-bluetooth-audio.conf">/etc/bluetooth/audio.conf</primary>
    270       </indexterm>
    271 
    272       <indexterm zone="bluez bluez-config">
    273         <primary
    274         sortas="e-etc-bluetooth-input.conf">/etc/bluetooth/input.conf</primary>
    275       </indexterm>
    276 
    277       <indexterm zone="bluez bluez-config">
    278         <primary
    279182        sortas="e-etc-bluetooth-main.conf">/etc/bluetooth/main.conf</primary>
    280183      </indexterm>
    281184
    282       <indexterm zone="bluez bluez-config">
    283         <primary
    284         sortas="e-etc-bluetooth-network.conf">/etc/bluetooth/network.conf</primary>
    285       </indexterm>
    286 
    287       <indexterm zone="bluez bluez-config">
    288         <primary
    289         sortas="e-etc-bluetooth-rfcomm.conf">/etc/bluetooth/rfcomm.conf</primary>
    290       </indexterm>
    291 
    292       <indexterm zone="bluez bluez-config">
    293         <primary
    294         sortas="e-etc-bluetooth-serial.conf">/etc/bluetooth/serial.conf</primary>
    295       </indexterm>
    296 
    297185    </sect3>
    298186
    299187    <sect3  id="bluez-init">
    … …  
    311199      </indexterm>
    312200
    313201<screen role="root"><userinput>make install-bluetooth</userinput></screen>
     202
    314203    </sect3>
     204
    315205  </sect2>
    316206
    317207  <sect2 role="content">
    … …  
    324214
    325215      <seglistitem>
    326216        <seg>
    327           bccmd, bluetoothd, ciptool, dfutool, dund, gatttool,
    328           hciattach, hciconfig, hcitool, hid2hci, hidd, l2ping,
    329           pand, rfcomm, and sdptool
     217          bccmd, bluemoon, bluetoothctl, bluetoothd, btmon, ciptool,
     218          hciattach, hciconfig, hcidump, hcitool, hid2hci, l2ping,
     219          l2test, obexd, rctest, rfcomm, and sdptool
    330220        </seg>
    331221        <seg>
    332222          libbluetooth.so
    … …  
    334224        <seg>
    335225          /etc/bluetooth,
    336226          /usr/include/bluetooth,
    337           /usr/lib/bluetooth,
    338           /usr/share/doc/bluez-&bluez-version;, and
    339           /var/lib/bluetooth
     227          /usr/lib/bluetooth, and
     228          /usr/share/doc/bluez-&bluez-version;
    340229        </seg>
    341230      </seglistitem>
    342231    </segmentedlist>
    … …  
    384273        </listitem>
    385274      </varlistentry>
    386275
    387       <varlistentry id="dfutool">
    388         <term><command>dfutool</command></term>
    389         <listitem>
    390           <para>
    391             is used to verify, archive and upgrade firmware files.
    392           </para>
    393           <indexterm zone="bluez dfutool">
    394             <primary sortas="b-dfutool">dfutool</primary>
    395           </indexterm>
    396         </listitem>
    397       </varlistentry>
    398 
    399       <varlistentry id="dund">
    400         <term><command>dund</command></term>
    401         <listitem>
    402           <para>
    403             is the Bluetooth dial-up networking daemon.
    404           </para>
    405           <indexterm zone="bluez dund">
    406             <primary sortas="b-dund">dund</primary>
    407           </indexterm>
    408         </listitem>
    409       </varlistentry>
    410 
    411276      <varlistentry id="hciattach">
    412277        <term><command>hciattach</command></term>
    413278        <listitem>
    … …  
    459324        </listitem>
    460325      </varlistentry>
    461326
    462       <varlistentry id="hidd">
    463         <term><command>hidd</command></term>
    464         <listitem>
    465           <para>
    466             is the Bluetooth HID daemon.
    467           </para>
    468           <indexterm zone="bluez hidd">
    469             <primary sortas="b-hidd">hidd</primary>
    470           </indexterm>
    471         </listitem>
    472       </varlistentry>
    473 
    474327      <varlistentry id="l2ping">
    475328        <term><command>l2ping</command></term>
    476329        <listitem>
    … …  
    484337        </listitem>
    485338      </varlistentry>
    486339
    487       <varlistentry id="pand">
    488         <term><command>pand</command></term>
     340      <varlistentry id="rctest">
     341        <term><command>rctest</command></term>
    489342        <listitem>
    490343          <para>
    491             is the Bluetooth daemon that allows you to connect to
    492             ethernet networks using Bluetooth.
     344            is used to test RFCOMM communications on the
     345            Bluetooth stack.
    493346          </para>
    494           <indexterm zone="bluez pand">
    495             <primary sortas="b-pand">pand</primary>
     347          <indexterm zone="bluez rctest">
     348            <primary sortas="b-rctest">rctest</primary>
    496349          </indexterm>
    497350        </listitem>
    498351      </varlistentry>
    … …  
    527380        <term><filename class="libraryfile">libbluetooth.so</filename></term>
    528381        <listitem>
    529382          <para>
    530             contains the <application>BlueZ</application> API functions.
     383            contains the <application>BlueZ</application> 4 API functions.
    531384          </para>
    532385          <indexterm zone="bluez libbluetooth">
    533386            <primary sortas="c-libbluetooth">libbluetooth.so</primary>

  • BOOK/general.ent

     
    332332<!ENTITY acpid-version                "2.0.21">
    333333<!ENTITY at-version                   "3.1.14">
    334334<!ENTITY autofs-version               "5.0.8">
    335 <!ENTITY bluez-version                "4.101">
     335<!ENTITY bluez-version                "5.14">
    336336<!ENTITY colord-version               "1.0.6">    <!-- Even minors only -->
    337337<!ENTITY cpio-version                 "2.11">
    338338<!ENTITY dbus-version                 "1.8.0">   <!-- Even minors only -->

  • bootscripts/Makefile

     
    103103
    104104install-bluetooth: create-dirs
    105105        install -m ${MODE} blfs/init.d/bluetooth ${EXTDIR}/rc.d/init.d/bluetooth
    106         install -m ${CONFMODE} blfs/sysconfig/bluetooth ${EXTDIR}/sysconfig/bluetooth
    107106        ln -sf  ../init.d/bluetooth ${EXTDIR}/rc.d/rc0.d/K27bluetooth
    108107        ln -sf  ../init.d/bluetooth ${EXTDIR}/rc.d/rc1.d/K27bluetooth
    109108        ln -sf  ../init.d/bluetooth ${EXTDIR}/rc.d/rc2.d/S35bluetooth
    … …  
    585584
    586585uninstall-bluetooth:
    587586        rm -f ${EXTDIR}/rc.d/init.d/bluetooth
    588         rm -f ${EXTDIR}/sysconfig/bluetooth
    589587        rm -f ${EXTDIR}/rc.d/rc0.d/K27bluetooth
    590588        rm -f ${EXTDIR}/rc.d/rc1.d/K27bluetooth
    591589        rm -f ${EXTDIR}/rc.d/rc2.d/S35bluetooth

  • bootscripts/blfs/init.d/bluetooth

     
    2424
    2525. /lib/lsb/init-functions
    2626
    27 HIDD_ENABLE="false"
    28 PAND_ENABLE="false"
    29 DUND_ENABLE="false"
    30 
    31 RFCOMM_ENABLE="false"
    32 
    33 HIDD_OPTIONS=""
    34 PAND_OPTIONS=""
    35 DUND_OPTIONS=""
    36 
    37 if [ -f "/etc/sysconfig/bluetooth" ]; then
    38    . /etc/sysconfig/bluetooth
    39 fi
    40 
    4127case "${1}" in
    4228   start)
    43 
    44       log_info_msg "Starting Bluetooth daemon bluetooth \n"
    45       start_daemon /usr/sbin/bluetoothd
    46 
    47       if [ "$HIDD_ENABLE" = "true" ]; then
    48         log_info_msg "Starting Bluetooth HID daemon hidd \n"
    49         start_daemon /usr/sbin/hidd "$HIDD_OPTIONS"
    50       fi
    51 
    52       if [ "$RFCOMM_ENABLE" = "true" ]; then
    53         /usr/bin/rfcomm -f /etc/bluetooth/rfcomm.conf bind all || true
    54       fi
    55 
    56       if [ "$PAND_ENABLE" = "true" ]; then
    57         log_info_msg "Starting Bluetooth PAN daemon pand \n"
    58         start_daemon /usr/bin/pand "$PAND_OPTIONS"
    59       fi
    60 
    61       if [ "$DUND_ENABLE" = "true" ]; then
    62         log_info_msg "Starting Bluetooth DUN daemon dund \n"
    63         start_daemon /usr/bin/dund "$DUND_OPTIONS"
    64       fi
     29      log_info_msg "Starting Bluetooth daemon bluetoothd"
     30      start_daemon /usr/lib/bluetooth/bluetoothd
    6531      evaluate_retval
    66 
    6732      ;;
    6833
    6934   stop)
    70 
    71       if [ "$DUND_ENABLE" = "true" ]; then
    72         log_info_msg "Stopping Bluetooth DUN daemon dund \n"
    73         killproc /usr/bin/dund
    74       fi
    75 
    76       if [ "$PAND_ENABLE" = "true" ]; then
    77         log_info_msg "Stopping Bluetooth PAN daemon pand \n"
    78         killproc /usr/bin/pand
    79       fi
    80 
    81       if [ "$RFCOMM_ENABLE" = "true" ]; then
    82         /usr/bin/rfcomm release all || true
    83       fi
    84 
    85       if [ "$HIDD_ENABLE" = "true" ]; then
    86         log_info_msg "Stopping Bluetooth HID daemon hidd \n"
    87         killproc /usr/sbin/hidd
    88       fi
    89 
    90       log_info_msg "Stopping Bluetooth daemon bluetoothd \n"
    91       killproc /usr/sbin/bluetoothd
     35      log_info_msg "Stopping Bluetooth daemon bluetoothd"
     36      killproc /usr/lib/bluetooth/bluetoothd
    9237      evaluate_retval
    93 
    9438      ;;
    9539
    9640   restart)
    97 
    9841      ${0} stop
    9942      sleep 1
    10043      ${0} start
    101 
    10244      ;;
    10345
    10446   status)
    105 
    106       statusproc /usr/sbin/bluetoothd
    107 
    108       if [ "$HIDD_ENABLE" = "true" ]; then
    109         statusproc /usr/sbin/hidd
    110       fi
    111 
    112       if [ "$PAND_ENABLE" = "true" ]; then
    113         statusproc /usr/bin/pand
    114       fi
    115 
    116       if [ "$DUND_ENABLE" = "true" ]; then
    117         statusproc /usr/bin/dund
    118       fi
    119 
     47      statusproc /usr/lib/bluetooth/bluetoothd
    12048      ;;
    12149
    12250   *)

  • bootscripts/blfs/sysconfig/bluetooth

     
    1 # Begin /etc/sysconfig/bluetooth
    2 
    3 # Run the bluetooth HID daemon (default: false)
    4 #HIDD_ENABLE="true"
    5 
    6 # Activate rfcomm ports (default: false)
    7 #RFCOMM_ENABLE="true"
    8 
    9 # Run bluetooth dial-up networking daemon (default: false)
    10 # Note: You need to pass coressponding options to the daemon
    11 # since it does not run without any options.
    12 #DUND_ENABLE="true"
    13 
    14 # Run bluetooth PAN daemon (default: false)
    15 # Note: You need to pass coressponding options to the daemon
    16 # since it does not run without any options.
    17 #PAND_ENABLE="true"
    18 
    19 # Options for hidd, dund and pand (default: none)
    20 
    21 # See man 1 hidd for available options.
    22 #HIDD_OPTIONS=""
    23 
    24 # See man 1 dund for available options.
    25 #DUND_OPTIONS=""
    26 
    27 # See man 1 pand for available options.
    28 #PAND_OPTIONS=""
    29 
    30 # End /etc/sysconfig/bluetooth