Skip to contentSkip to conversation

systemd: move libgudev back to $rootlibdir

PATCH In review Hongxu Jia 1 participant 3 messages Oct 17, 2014

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

cover systemd: move libgudev back to $rootlibdir

The following changes since commit ccf5a4d2342c4fd40e4e0b332ea7e34e0bf175d4:

build-appliance-image: Update to dizzy head revision (2014-10-11 08:11:17 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-systemd
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-systemd

Hongxu Jia (1):
systemd: move libgudev back to $rootlibdir

 meta/recipes-core/systemd/systemd_216.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 systemd: move libgudev back to $rootlibdir

While upgrading systemd to 216, we manually moved libgudev to ${rootlibdir} in do_install task to keep backward compatibility.

But libdir in libgudev-1.0.la is still ${libdir}, that caused libgudev could not be found by libtool.

Add the missing revision to libgudev-1.0.la

---
 meta/recipes-core/systemd/systemd_216.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_216.bb +2 -1
index ebf9395..053825d 100644
@@ -130,7 +130,8 @@ do_install() {
 	fi
 
 	# Move libgudev back to ${rootlibdir} to keep backward compatibility
-	[ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev*
+	[ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev* && \
+        sed -i "s#^libdir=.*#libdir='${rootlibdir}'#" ${D}${rootlibdir}/libgudev-1.0.la
 
         # Delete journal README, as log can be symlinked inside volatile.
         rm -f ${D}/${localstatedir}/log/README
Signature · 1 line
1.9.1
author
#2 lore raw
In reply to Hongxu Jia

Please drop this, I think Martin's "systemd: don't move libgudev around, it breaks libgudev-1.0.la" is better. We indeed do not need the "backward compatibility"

//Hongxu

Quoted 15 lines · Hongxu Jia

The following changes since commit ccf5a4d2342c4fd40e4e0b332ea7e34e0bf175d4:

   build-appliance-image: Update to dizzy head revision (2014-10-11 08:11:17 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-systemd
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-systemd

Hongxu Jia (1):
systemd: move libgudev back to $rootlibdir

  meta/recipes-core/systemd/systemd_216.bb | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)