mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
bluez5: cleanup tabs and spaces
(From OE-Core rev: 476e730df93223033ba2b3b36cdc47abb3ba30ae) Signed-off-by: Marc Ferland <ferlandm@amotus.ca> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
934087843e
commit
6d0cfe6a70
@@ -57,24 +57,24 @@ do_install_append() {
|
|||||||
|
|
||||||
install -d ${D}${sysconfdir}/bluetooth/
|
install -d ${D}${sysconfdir}/bluetooth/
|
||||||
if [ -f ${S}/profiles/network/network.conf ]; then
|
if [ -f ${S}/profiles/network/network.conf ]; then
|
||||||
install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
|
install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
|
||||||
fi
|
fi
|
||||||
if [ -f ${S}/profiles/input/input.conf ]; then
|
if [ -f ${S}/profiles/input/input.conf ]; then
|
||||||
install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
|
install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
|
if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
|
||||||
sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
|
sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Install desired tools that upstream leaves in build area
|
# Install desired tools that upstream leaves in build area
|
||||||
for f in ${NOINST_TOOLS} ; do
|
for f in ${NOINST_TOOLS} ; do
|
||||||
install -m 755 ${B}/$f ${D}/${bindir}
|
install -m 755 ${B}/$f ${D}/${bindir}
|
||||||
done
|
done
|
||||||
|
|
||||||
# Patch python tools to use Python 3; they should be source compatible, but
|
# Patch python tools to use Python 3; they should be source compatible, but
|
||||||
# still refer to Python 2 in the shebang
|
# still refer to Python 2 in the shebang
|
||||||
sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
|
sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
|
||||||
}
|
}
|
||||||
|
|
||||||
PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
|
PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
|
||||||
@@ -84,8 +84,8 @@ FILES_${PN} += " \
|
|||||||
${systemd_unitdir}/ ${datadir}/dbus-1 \
|
${systemd_unitdir}/ ${datadir}/dbus-1 \
|
||||||
${libdir}/cups \
|
${libdir}/cups \
|
||||||
"
|
"
|
||||||
FILES_${PN}-dev += "\
|
FILES_${PN}-dev += " \
|
||||||
${libdir}/bluetooth/plugins/*.la \
|
${libdir}/bluetooth/plugins/*.la \
|
||||||
"
|
"
|
||||||
|
|
||||||
FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
|
FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
|
||||||
@@ -115,10 +115,10 @@ INITSCRIPT_NAME_${PN} = "bluetooth"
|
|||||||
EXCLUDE_FROM_WORLD = "1"
|
EXCLUDE_FROM_WORLD = "1"
|
||||||
|
|
||||||
do_compile_ptest() {
|
do_compile_ptest() {
|
||||||
oe_runmake buildtests
|
oe_runmake buildtests
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install_ptest() {
|
do_install_ptest() {
|
||||||
cp -r ${B}/unit/ ${D}${PTEST_PATH}
|
cp -r ${B}/unit/ ${D}${PTEST_PATH}
|
||||||
rm -f ${D}${PTEST_PATH}/unit/*.o
|
rm -f ${D}${PTEST_PATH}/unit/*.o
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user