diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 47d8f22d33..01ade7d344 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc | |||
@@ -57,24 +57,24 @@ do_install_append() { | |||
57 | 57 | ||
58 | install -d ${D}${sysconfdir}/bluetooth/ | 58 | install -d ${D}${sysconfdir}/bluetooth/ |
59 | if [ -f ${S}/profiles/network/network.conf ]; then | 59 | if [ -f ${S}/profiles/network/network.conf ]; then |
60 | install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ | 60 | install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/ |
61 | fi | 61 | fi |
62 | if [ -f ${S}/profiles/input/input.conf ]; then | 62 | if [ -f ${S}/profiles/input/input.conf ]; then |
63 | install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ | 63 | install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/ |
64 | fi | 64 | fi |
65 | 65 | ||
66 | if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then | 66 | if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then |
67 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth | 67 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth |
68 | fi | 68 | fi |
69 | 69 | ||
70 | # Install desired tools that upstream leaves in build area | 70 | # Install desired tools that upstream leaves in build area |
71 | for f in ${NOINST_TOOLS} ; do | 71 | for f in ${NOINST_TOOLS} ; do |
72 | install -m 755 ${B}/$f ${D}/${bindir} | 72 | install -m 755 ${B}/$f ${D}/${bindir} |
73 | done | 73 | done |
74 | 74 | ||
75 | # Patch python tools to use Python 3; they should be source compatible, but | 75 | # Patch python tools to use Python 3; they should be source compatible, but |
76 | # still refer to Python 2 in the shebang | 76 | # still refer to Python 2 in the shebang |
77 | sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* | 77 | sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/* |
78 | } | 78 | } |
79 | 79 | ||
80 | PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" | 80 | PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools" |
@@ -84,8 +84,8 @@ FILES_${PN} += " \ | |||
84 | ${systemd_unitdir}/ ${datadir}/dbus-1 \ | 84 | ${systemd_unitdir}/ ${datadir}/dbus-1 \ |
85 | ${libdir}/cups \ | 85 | ${libdir}/cups \ |
86 | " | 86 | " |
87 | FILES_${PN}-dev += "\ | 87 | FILES_${PN}-dev += " \ |
88 | ${libdir}/bluetooth/plugins/*.la \ | 88 | ${libdir}/bluetooth/plugins/*.la \ |
89 | " | 89 | " |
90 | 90 | ||
91 | FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ | 91 | FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ |
@@ -115,10 +115,10 @@ INITSCRIPT_NAME_${PN} = "bluetooth" | |||
115 | EXCLUDE_FROM_WORLD = "1" | 115 | EXCLUDE_FROM_WORLD = "1" |
116 | 116 | ||
117 | do_compile_ptest() { | 117 | do_compile_ptest() { |
118 | oe_runmake buildtests | 118 | oe_runmake buildtests |
119 | } | 119 | } |
120 | 120 | ||
121 | do_install_ptest() { | 121 | do_install_ptest() { |
122 | cp -r ${B}/unit/ ${D}${PTEST_PATH} | 122 | cp -r ${B}/unit/ ${D}${PTEST_PATH} |
123 | rm -f ${D}${PTEST_PATH}/unit/*.o | 123 | rm -f ${D}${PTEST_PATH}/unit/*.o |
124 | } | 124 | } |