[PATCH 0/7] Fix udev dirs

[PATCH 0/7] Fix udev dirs

[Robert Yang]

The following changes since commit 0a2df616a5c3316704742f1dcf37b450920e0280:

  boost: fix CVE-2012-2677 (2016-07-21 07:45:01 +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 (7):
  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

 meta/conf/bitbake.conf                                         |  1 +
 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                |  6 +++++-
 meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb |  2 +-
 7 files changed, 11 insertions(+), 14 deletions(-)

-- 
2.9.0

[PATCH 1/7] bitbake.conf: add eudev's udevdir to FILES_${PN}

[Robert Yang]

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}.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/conf/bitbake.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index af3b181..50df2f0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -285,6 +285,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS}
             ${base_bindir}/* ${base_sbindir}/* \
             ${base_libdir}/*${SOLIBS} \
             ${base_prefix}/lib/udev/rules.d ${prefix}/lib/udev/rules.d \
+            ${base_libdir}/udev/rules.d ${libdir}/udev/rules.d \
             ${datadir}/${BPN} ${libdir}/${BPN}/* \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
-- 
2.9.0

[PATCH 2/7] systemd: install udev.pc

[Robert Yang]

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

[PATCH 3/7] libinput: fix udevdir

[Robert Yang]

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 | 6 +++++-
 1 file changed, 5 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..f0b66de 100644
--- a/meta/recipes-graphics/wayland/libinput_1.3.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.3.0.bb
@@ -20,4 +20,8 @@ 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}"
+
+FILES_${PN} += "${base_libdir}/udev/ ${nonarch_base_libdir}/udev/"
-- 
2.9.0

Re: [PATCH 3/7] libinput: fix udevdir

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

On 25 July 2016 at 08:28, Robert Yang <liezhi.yang@windriver.com> wrote:

> +FILES_${PN} += "${base_libdir}/udev/ ${nonarch_base_libdir}/udev/"
>

Isn't this covered by the bitbake.conf change?

Ross

[-- Attachment #2: Type: text/html, Size: 622 bytes --]

Re: [PATCH 3/7] libinput: fix udevdir

[Robert Yang]

On 07/26/2016 12:55 AM, Burton, Ross wrote:
>
> On 25 July 2016 at 08:28, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     +FILES_${PN} += "${base_libdir}/udev/ ${nonarch_base_libdir}/udev/"
>
>
> Isn't this covered by the bitbake.conf change?

Hi Ross,

No, it is the subdir udev/rules.d in bitbake.conf:

${base_prefix}/lib/udev/rules.d ${prefix}/lib/udev/rules.d
${base_libdir}/udev/rules.d ${libdir}/udev/rules.d

I'd like to update bitbake.conf to lib/udev (no rules.d) if no objections,
then we can drop this patch.

// Robert

>
> Ross
>

Re: [PATCH 3/7] libinput: fix udevdir

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

On 26 July 2016 at 01:49, Robert Yang <liezhi.yang@windriver.com> wrote:

> I'd like to update bitbake.conf to lib/udev (no rules.d) if no objections,
> then we can drop this patch.
>

Just actually looked at what libinput is shipping.  :) This seems sensible
to me.

Ross

[-- Attachment #2: Type: text/html, Size: 732 bytes --]

[PATCH 4/7] ofono: remove duplicated udev setting from FILES_${PN}

[Robert Yang]

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

[PATCH 5/7] mdadm: remove duplicated udev setting from FILES_${PN}

[Robert Yang]

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

[PATCH 6/7] xf86-input-vmmouse: remove duplicated udev setting from FILES_${PN}

[Robert Yang]

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

[PATCH 7/7] eudev: don't move udev directory

[Robert Yang]

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