diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-09-19 07:59:01 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-09-19 07:59:01 +0000 |
| commit | 3fd31ec742200fbd289817eea89af27a7907b374 (patch) | |
| tree | 741e18c09fbecc3ee4f37b402cdc622d4561e205 | |
| parent | caa2c5fa1834f1de765010731edf2952ccac1366 (diff) | |
bluez: fix problems with CONFFILES, rfcomm.conf goes into -compat
| -rw-r--r-- | packages/bluez/bluez-utils3.inc | 9 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils_3.18.bb | 10 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils_3.19.bb | 10 |
3 files changed, 17 insertions, 12 deletions
diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc index ddf90a2248..8f787292ba 100644 --- a/packages/bluez/bluez-utils3.inc +++ b/packages/bluez/bluez-utils3.inc @@ -76,6 +76,7 @@ do_install_append() { rmdir ${D}${bindir} ${D}${sbindir} chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ + install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/ install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ } @@ -86,14 +87,6 @@ INITSCRIPT_PARAMS = "defaults 23 19" PACKAGES =+ "${PN}-compat" -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " FILES_${PN} = " \ ${base_sbindir}/hcid \ diff --git a/packages/bluez/bluez-utils_3.18.bb b/packages/bluez/bluez-utils_3.18.bb index c0a4f460ba..48f147aa69 100644 --- a/packages/bluez/bluez-utils_3.18.bb +++ b/packages/bluez/bluez-utils_3.18.bb @@ -18,6 +18,12 @@ EXTRA_OECONF = " \ --enable-test \ " +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/default/bluetooth"
\ No newline at end of file diff --git a/packages/bluez/bluez-utils_3.19.bb b/packages/bluez/bluez-utils_3.19.bb index c0a4f460ba..48f147aa69 100644 --- a/packages/bluez/bluez-utils_3.19.bb +++ b/packages/bluez/bluez-utils_3.19.bb @@ -18,6 +18,12 @@ EXTRA_OECONF = " \ --enable-test \ " +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/default/bluetooth"
\ No newline at end of file |