Skip to contentSkip to conversation

bluez5: change configuration directory mode

PATCH Superseded [email protected] 2 participants 2 messages Oct 5, 2022 – Oct 6, 2022

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 bluez5: change configuration directory mode

From: Ming Liu <[email protected]>

Change configuration directory mode from 0755 to 0555, this fixes a following warning when bluetoothd starts:
| ConfigurationDirectory 'bluetooth' already exists but the mode is different. | (File system: 755 ConfigurationDirectoryMode: 555)

---
 meta/recipes-connectivity/bluez5/bluez5.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/bluez5/bluez5.inc +1 -1
index 79d4645ca8..9f5c78b81e 100644
@@ -82,7 +82,7 @@ do_install:append() {
 	install -d ${D}${INIT_D_DIR}
 	install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
 
-	install -d ${D}${sysconfdir}/bluetooth/
+	install -m 0555 -d ${D}${sysconfdir}/bluetooth/
 	if [ -f ${S}/profiles/network/network.conf ]; then
 		install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
 	fi
Signature · 1 line
2.25.1
#1 lore raw

Hello Ming Liu,

Quoted 17 lines · On Wed, 5 Oct 2022 21:51:28 +0200 "Ming Liu" <[email protected]> wrote:

From: Ming Liu <[email protected]>

Change configuration directory mode from 0755 to 0555, this fixes a following warning when bluetoothd starts:
| ConfigurationDirectory 'bluetooth' already exists but the mode is different. | (File system: 755 ConfigurationDirectoryMode: 555)

---
 meta/recipes-connectivity/bluez5/bluez5.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/bluez5/bluez5.inc +0 -0
index 79d4645ca8..9f5c78b81e 100644

meta/recipes-connectivity/bluez5/bluez5.inc do_install:append() { · line 85

Quoted 5 lines
meta/recipes-connectivity/bluez5/bluez5.inc +1 -1
@@ -82,7 +82,7 @@ do_install:append() {
 	install -d ${D}${INIT_D_DIR}
 	install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
 
-	install -d ${D}${sysconfdir}/bluetooth/
+	install -m 0555 -d ${D}${sysconfdir}/bluetooth/

This change triggers errors in the do_testsdk task of core-image-sato, as reported by the autobuilders:

Exception: subprocess.CalledProcessError: Command '['rm', '-rf', '/home/pokybuild/yocto-worker/qemumips64/build/build/tmp/work/qemumips64-poky-linux/core-image-sato/1.0-r0/testimage-sdk/']' returned non-zero exit status 1.

Some logs are:

https://autobuilder.yoctoproject.org/typhoon/#/builders/74/builds/5911/steps/15/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/5909/steps/15/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/53/builds/5960/steps/16/logs/stdio

The reason, not visible in those logs, is that the new permissions do not allow removing files in ${sysconfdir}/bluetooth/.

Your patch looks legitimate after the upstream change [1] so I'm afraid I don't know which would be the best solution here. Some ideas that come to mind, least ugly first:

1) chmod -R ugo+w on the entire tree before calling 'rm'
2) revert the upstream patch -- not good for oe-core maintainability

BTW please mention [1] in your commit message should you send a new patch to handle this issue.

[1]
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=00cfb36e20e3c35db2150e7d0351ad7b8442e2d8

Signature · 3 lines
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com