* [PATCH V2 1/9] bitbake.conf: add eudev's udevdir to FILES_${PN}
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
@ 2016-07-27 9:27 ` Robert Yang
2016-07-27 9:27 ` [PATCH V2 2/9] systemd: install udev.pc Robert Yang
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-07-27 9:27 UTC (permalink / raw)
To: openembedded-core
* The eudev's udevdir can be ${base_libdir}/udev or ${libdir}/udev, it
doesn't have to be hardcoded to /lib/udev, so add them FILES_${PN}.
* Use /lib/udev rather than /lib/udev/rules.d for FILES_${PN} since
there might be files in /lib/udev except subdir rules.d
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/conf/bitbake.conf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index af3b181..ae2a5df 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -284,7 +284,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
${sysconfdir} ${sharedstatedir} ${localstatedir} \
${base_bindir}/* ${base_sbindir}/* \
${base_libdir}/*${SOLIBS} \
- ${base_prefix}/lib/udev/rules.d ${prefix}/lib/udev/rules.d \
+ ${base_prefix}/lib/udev ${prefix}/lib/udev \
+ ${base_libdir}/udev ${libdir}/udev \
${datadir}/${BPN} ${libdir}/${BPN}/* \
${datadir}/pixmaps ${datadir}/applications \
${datadir}/idl ${datadir}/omf ${datadir}/sounds \
--
2.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 2/9] systemd: install udev.pc
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
2016-07-27 9:27 ` [PATCH V2 1/9] bitbake.conf: add eudev's udevdir to FILES_${PN} Robert Yang
@ 2016-07-27 9:27 ` Robert Yang
2016-07-27 9:27 ` [PATCH V2 3/9] libinput: fix udevdir Robert Yang
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-07-27 9:27 UTC (permalink / raw)
To: openembedded-core
It provides udev, but doesn't install udev.pc, which causes other
recipes failed to figure out udevdir.
Fixed when systemd in DISTRO_FEATURES:
$ bitbake pcmciautils (or btrfs-tools):
Package udev was not found in the pkg-config search path.
Perhaps you should add the directory containing `udev.pc'
to the PKG_CONFIG_PATH environment variable
No package 'udev' found
Their udev rules file may not be installed according to each pkg's
implementation.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-core/systemd/systemd_230.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd_230.bb b/meta/recipes-core/systemd/systemd_230.bb
index 374a197..3c83ebb 100644
--- a/meta/recipes-core/systemd/systemd_230.bb
+++ b/meta/recipes-core/systemd/systemd_230.bb
@@ -202,6 +202,8 @@ do_install() {
install -d ${D}${sysconfdir}/udev/rules.d/
install -d ${D}${sysconfdir}/tmpfiles.d
install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
+ install -d ${D}${libdir}/pkgconfig
+ install -m 0644 ${B}/src/udev/udev.pc ${D}${libdir}/pkgconfig/
install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
--
2.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 3/9] libinput: fix udevdir
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
2016-07-27 9:27 ` [PATCH V2 1/9] bitbake.conf: add eudev's udevdir to FILES_${PN} Robert Yang
2016-07-27 9:27 ` [PATCH V2 2/9] systemd: install udev.pc Robert Yang
@ 2016-07-27 9:27 ` Robert Yang
2016-07-27 9:27 ` [PATCH V2 4/9] ofono: remove duplicated udev setting from FILES_${PN} Robert Yang
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-07-27 9:27 UTC (permalink / raw)
To: openembedded-core
* Use "pkg-config --variable=udevdir udev" to fix udevdir, otherwise it
would use ${libdir}/udev which is incorrect for systemd's udev.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-graphics/wayland/libinput_1.3.0.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/wayland/libinput_1.3.0.bb b/meta/recipes-graphics/wayland/libinput_1.3.0.bb
index 13724d5..c564720 100644
--- a/meta/recipes-graphics/wayland/libinput_1.3.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.3.0.bb
@@ -20,4 +20,6 @@ PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
PACKAGECONFIG[libwacom] = "--enable-libwacom,--disable-libwacom,libwacom"
PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3"
-FILES_${PN} += "${libdir}/udev/"
+UDEVDIR = "`pkg-config --variable=udevdir udev`"
+
+EXTRA_OECONF += "--with-udev-dir=${UDEVDIR}"
--
2.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 4/9] ofono: remove duplicated udev setting from FILES_${PN}
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
` (2 preceding siblings ...)
2016-07-27 9:27 ` [PATCH V2 3/9] libinput: fix udevdir Robert Yang
@ 2016-07-27 9:27 ` Robert Yang
2016-07-27 9:27 ` [PATCH V2 5/9] mdadm: " Robert Yang
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-07-27 9:27 UTC (permalink / raw)
To: openembedded-core
It doesn't have files in udev dir, and bitbake.conf already sets it.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-connectivity/ofono/ofono.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 72bbcac..99cb719 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -36,6 +36,6 @@ PACKAGES =+ "${PN}-tests"
RDEPENDS_${PN} += "dbus"
-FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}"
+FILES_${PN} += "${systemd_unitdir}"
FILES_${PN}-tests = "${libdir}/${BPN}/test"
RDEPENDS_${PN}-tests = "python3 python3-pygobject python3-dbus"
--
2.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 5/9] mdadm: remove duplicated udev setting from FILES_${PN}
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
` (3 preceding siblings ...)
2016-07-27 9:27 ` [PATCH V2 4/9] ofono: remove duplicated udev setting from FILES_${PN} Robert Yang
@ 2016-07-27 9:27 ` Robert Yang
2016-07-27 9:27 ` [PATCH V2 6/9] xf86-input-vmmouse: " Robert Yang
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-07-27 9:27 UTC (permalink / raw)
To: openembedded-core
bitbake.conf already sets it.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-extended/mdadm/mdadm_3.4.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-extended/mdadm/mdadm_3.4.bb b/meta/recipes-extended/mdadm/mdadm_3.4.bb
index 513a3ce..261054e 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.4.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.4.bb
@@ -46,8 +46,6 @@ do_install() {
autotools_do_install
}
-FILES_${PN} += "${base_libdir}/udev/rules.d/*.rules"
-
inherit ptest
do_compile_ptest() {
--
2.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 6/9] xf86-input-vmmouse: remove duplicated udev setting from FILES_${PN}
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
` (4 preceding siblings ...)
2016-07-27 9:27 ` [PATCH V2 5/9] mdadm: " Robert Yang
@ 2016-07-27 9:27 ` Robert Yang
2016-07-27 9:27 ` [PATCH V2 7/9] eudev: don't move udev directory Robert Yang
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-07-27 9:27 UTC (permalink / raw)
To: openembedded-core
bitbake.conf already sets it.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
index 8615b48..92a1b25 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
@@ -23,4 +23,4 @@ do_install_append () {
EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d"
-FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d/ ${datadir}/X11/xorg.conf.d"
+FILES_${PN} += "${datadir}/X11/xorg.conf.d"
--
2.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 7/9] eudev: don't move udev directory
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
` (5 preceding siblings ...)
2016-07-27 9:27 ` [PATCH V2 6/9] xf86-input-vmmouse: " Robert Yang
@ 2016-07-27 9:27 ` Robert Yang
2016-07-27 9:27 ` [PATCH V2 8/9] pcmciautils: remove duplicated udev setting from FILES_${PN} Robert Yang
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-07-27 9:27 UTC (permalink / raw)
To: openembedded-core
The code did "mv ${D}${base_libdir}/udev ${D}${nonarch_base_libdir}"
which is not needed any more, eudev can work with ${base_libdir}/udev.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-core/udev/eudev_3.2.bb | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/meta/recipes-core/udev/eudev_3.2.bb b/meta/recipes-core/udev/eudev_3.2.bb
index 6270617..ac4285b 100644
--- a/meta/recipes-core/udev/eudev_3.2.bb
+++ b/meta/recipes-core/udev/eudev_3.2.bb
@@ -27,7 +27,6 @@ inherit autotools update-rc.d qemu
EXTRA_OECONF = " \
--sbindir=${base_sbindir} \
- --libexecdir=${nonarch_base_libdir} \
--with-rootlibdir=${base_libdir} \
--with-rootprefix= \
"
@@ -53,13 +52,6 @@ do_install_append() {
# Use classic network interface naming scheme
touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules
- # Fix for multilib systems where libs along with confs are installed incorrectly
- if ! [ -d ${D}${nonarch_base_libdir}/udev ]
- then
- install -d ${D}${nonarch_base_libdir}/udev
- mv ${D}${base_libdir}/udev ${D}${nonarch_base_libdir}
- fi
-
# hid2hci has moved to bluez4. removed in udev as of version 169
rm -f ${D}${base_libdir}/udev/hid2hci
}
@@ -75,7 +67,7 @@ PACKAGES =+ "udev-cache"
PACKAGES =+ "eudev-hwdb"
-FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm"
+FILES_${PN} += "${libexecdir} ${base_libdir}/udev ${bindir}/udevadm"
FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
${includedir}/libudev.h ${libdir}/libudev.so \
${includedir}/udev.h ${libdir}/libudev.la \
--
2.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 8/9] pcmciautils: remove duplicated udev setting from FILES_${PN}
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
` (6 preceding siblings ...)
2016-07-27 9:27 ` [PATCH V2 7/9] eudev: don't move udev directory Robert Yang
@ 2016-07-27 9:27 ` Robert Yang
2016-07-27 9:27 ` [PATCH V2 9/9] bluez5: " Robert Yang
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-07-27 9:27 UTC (permalink / raw)
To: openembedded-core
bitbake.conf already sets it.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
index 3556a45..bf0f58a 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
@@ -9,5 +9,3 @@ SRC_URI[md5sum] = "885431c3cefb76ffdad8cb985134e996"
SRC_URI[sha256sum] = "57c27be8f04ef4d535bcfa988567316cc57659fe69068327486dab53791e6558"
PR = "r1"
-
-FILES_${PN} += "*/udev */*/udev"
--
2.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 9/9] bluez5: remove duplicated udev setting from FILES_${PN}
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
` (7 preceding siblings ...)
2016-07-27 9:27 ` [PATCH V2 8/9] pcmciautils: remove duplicated udev setting from FILES_${PN} Robert Yang
@ 2016-07-27 9:27 ` Robert Yang
2016-08-08 5:55 ` [PATCH V2 0/9] Fix udev dirs Robert Yang
2016-09-23 8:47 ` Robert Yang
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-07-27 9:27 UTC (permalink / raw)
To: openembedded-core
bitbake.conf already sets it.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-connectivity/bluez5/bluez5.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 92e360a..ecefb7b 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -79,7 +79,7 @@ ALLOW_EMPTY_libasound-module-bluez = "1"
PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
+FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1"
FILES_${PN}-dev += "\
${libdir}/bluetooth/plugins/*.la \
${libdir}/alsa-lib/*.la \
--
2.9.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH V2 0/9] Fix udev dirs
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
` (8 preceding siblings ...)
2016-07-27 9:27 ` [PATCH V2 9/9] bluez5: " Robert Yang
@ 2016-08-08 5:55 ` Robert Yang
2016-09-23 8:47 ` Robert Yang
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-08-08 5:55 UTC (permalink / raw)
To: openembedded-core, Burton, Ross
Hi Ross,
Do you have any comments please ?
// Robert
On 07/27/2016 05:27 PM, Robert Yang wrote:
> * V2
> - lib/udev/rules.d -> lib/udev in bitbake.conf
> - Remove duplicated udev setting for more recipes
>
> // Robert
>
> The following changes since commit b32d430c3c7dccf3a8d06ab492d648893a05950f:
>
> dpkg: use snapshot.debian.org for SRC_URI (2016-07-26 08:56:08 +0100)
>
> are available in the git repository at:
>
> git://git.openembedded.org/openembedded-core-contrib rbt/udev
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/udev
>
> Robert Yang (9):
> bitbake.conf: add eudev's udevdir to FILES_${PN}
> systemd: install udev.pc
> libinput: fix udevdir
> ofono: remove duplicated udev setting from FILES_${PN}
> mdadm: remove duplicated udev setting from FILES_${PN}
> xf86-input-vmmouse: remove duplicated udev setting from FILES_${PN}
> eudev: don't move udev directory
> pcmciautils: remove duplicated udev setting from FILES_${PN}
> bluez5: remove duplicated udev setting from FILES_${PN}
>
> meta/conf/bitbake.conf | 3 ++-
> meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | 2 --
> meta/recipes-connectivity/bluez5/bluez5.inc | 2 +-
> meta/recipes-connectivity/ofono/ofono.inc | 2 +-
> meta/recipes-core/systemd/systemd_230.bb | 2 ++
> meta/recipes-core/udev/eudev_3.2.bb | 10 +---------
> meta/recipes-extended/mdadm/mdadm_3.4.bb | 2 --
> meta/recipes-graphics/wayland/libinput_1.3.0.bb | 4 +++-
> meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb | 2 +-
> 9 files changed, 11 insertions(+), 18 deletions(-)
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH V2 0/9] Fix udev dirs
2016-07-27 9:27 [PATCH V2 0/9] Fix udev dirs Robert Yang
` (9 preceding siblings ...)
2016-08-08 5:55 ` [PATCH V2 0/9] Fix udev dirs Robert Yang
@ 2016-09-23 8:47 ` Robert Yang
10 siblings, 0 replies; 12+ messages in thread
From: Robert Yang @ 2016-09-23 8:47 UTC (permalink / raw)
To: openembedded-core
Ping, rebased and updated in the repo, these recipes udev dir
maybe incorrect without these fixes.
// Robert
On 07/27/2016 05:27 PM, Robert Yang wrote:
> * V2
> - lib/udev/rules.d -> lib/udev in bitbake.conf
> - Remove duplicated udev setting for more recipes
>
> // Robert
>
> The following changes since commit b32d430c3c7dccf3a8d06ab492d648893a05950f:
>
> dpkg: use snapshot.debian.org for SRC_URI (2016-07-26 08:56:08 +0100)
>
> are available in the git repository at:
>
> git://git.openembedded.org/openembedded-core-contrib rbt/udev
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/udev
>
> Robert Yang (9):
> bitbake.conf: add eudev's udevdir to FILES_${PN}
> systemd: install udev.pc
> libinput: fix udevdir
> ofono: remove duplicated udev setting from FILES_${PN}
> mdadm: remove duplicated udev setting from FILES_${PN}
> xf86-input-vmmouse: remove duplicated udev setting from FILES_${PN}
> eudev: don't move udev directory
> pcmciautils: remove duplicated udev setting from FILES_${PN}
> bluez5: remove duplicated udev setting from FILES_${PN}
>
> meta/conf/bitbake.conf | 3 ++-
> meta/recipes-bsp/pcmciautils/pcmciautils_018.bb | 2 --
> meta/recipes-connectivity/bluez5/bluez5.inc | 2 +-
> meta/recipes-connectivity/ofono/ofono.inc | 2 +-
> meta/recipes-core/systemd/systemd_230.bb | 2 ++
> meta/recipes-core/udev/eudev_3.2.bb | 10 +---------
> meta/recipes-extended/mdadm/mdadm_3.4.bb | 2 --
> meta/recipes-graphics/wayland/libinput_1.3.0.bb | 4 +++-
> meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb | 2 +-
> 9 files changed, 11 insertions(+), 18 deletions(-)
>
^ permalink raw reply [flat|nested] 12+ messages in thread