Skip to contentSkip to conversation

systemd: don't move libgudev around, it breaks libgudev-1.0.la

PATCH In review Martin Jansa 5 participants 9 messages Oct 4, 2014 – Dec 4, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 systemd: don't move libgudev around, it breaks libgudev-1.0.la

* libgudev-1.0.la still references /usr/lib and this change was breaking gypsy (detected in navit) and network-manager-applet

---
 meta/recipes-core/systemd/systemd_216.bb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
meta/recipes-core/systemd/systemd_216.bb +4 -5
index ebf9395..2779823 100644
@@ -129,9 +129,6 @@ do_install() {
 		sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
 	fi
 
-	# Move libgudev back to ${rootlibdir} to keep backward compatibility
-	[ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev*
-
         # Delete journal README, as log can be symlinked inside volatile.
         rm -f ${D}/${localstatedir}/log/README
 
@@ -171,10 +168,10 @@ python populate_packages_prepend (){
     systemdlibdir = d.getVar("rootlibdir", True)
     do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
 }
-PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
+PACKAGES_DYNAMIC += "^lib(udev|systemd).*"
 
 PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \
-             ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh"
+             ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh libgudev"
 
 SYSTEMD_PACKAGES = "${PN}-binfmt"
 SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
@@ -188,6 +185,8 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze"
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
+FILES_libgudev = "${libdir}/libgudev*${SOLIBS}"
+
 # The test cases need perl and bash to run correctly.
 RDEPENDS_${PN}-ptest += "perl bash"
 FILES_${PN}-ptest += "${libdir}/udev/rules.d"
Signature · 1 line
2.1.1
#1 lore raw
Quoted 2 lines · Martin Jansa

* libgudev-1.0.la still references /usr/lib and this change was breaking gypsy (detected in navit) and network-manager-applet

sending as WIP mostly because I don't know what "backward compatibility" issues required this move to be added when upgrading to 216

only issue I've noticed was unpacked libgudev files, so I've added the libgudev package manually (instead of expecting split-package to create it dynamically).

Quoted 44 lines
---
 meta/recipes-core/systemd/systemd_216.bb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
meta/recipes-core/systemd/systemd_216.bb +4 -5
index ebf9395..2779823 100644
@@ -129,9 +129,6 @@ do_install() {
 		sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
 	fi
 
-	# Move libgudev back to ${rootlibdir} to keep backward compatibility
-	[ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev*
-
         # Delete journal README, as log can be symlinked inside volatile.
         rm -f ${D}/${localstatedir}/log/README
 
@@ -171,10 +168,10 @@ python populate_packages_prepend (){
     systemdlibdir = d.getVar("rootlibdir", True)
     do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
 }
-PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
+PACKAGES_DYNAMIC += "^lib(udev|systemd).*"
 
 PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \
-             ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh"
+             ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh libgudev"
 
 SYSTEMD_PACKAGES = "${PN}-binfmt"
 SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
@@ -188,6 +185,8 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze"
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
+FILES_libgudev = "${libdir}/libgudev*${SOLIBS}"
+
 # The test cases need perl and bash to run correctly.
 RDEPENDS_${PN}-ptest += "perl bash"
 FILES_${PN}-ptest += "${libdir}/udev/rules.d"
Signature · 1 line
2.1.1
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 10 lines · Martin Jansa
Quoted 2 lines · Martin Jansa

* libgudev-1.0.la still references /usr/lib and this change was breaking gypsy (detected in navit) and network-manager-applet

sending as WIP mostly because I don't know what "backward compatibility" issues required this move to be added when upgrading to 216

only issue I've noticed was unpacked libgudev files, so I've added the libgudev package manually (instead of expecting split-package to create it dynamically).

Should I resend without WIP tag now when ChenQi confirmed that moving libgudev isn't needed?

Quoted 47 lines
Quoted 44 lines
---
 meta/recipes-core/systemd/systemd_216.bb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
meta/recipes-core/systemd/systemd_216.bb +4 -5
index ebf9395..2779823 100644
@@ -129,9 +129,6 @@ do_install() {
 		sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
 	fi
 
-	# Move libgudev back to ${rootlibdir} to keep backward compatibility
-	[ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev*
-
         # Delete journal README, as log can be symlinked inside volatile.
         rm -f ${D}/${localstatedir}/log/README
 
@@ -171,10 +168,10 @@ python populate_packages_prepend (){
     systemdlibdir = d.getVar("rootlibdir", True)
     do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
 }
-PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
+PACKAGES_DYNAMIC += "^lib(udev|systemd).*"
 
 PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \
-             ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh"
+             ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh libgudev"
 
 SYSTEMD_PACKAGES = "${PN}-binfmt"
 SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
@@ -188,6 +185,8 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze"
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
+FILES_libgudev = "${libdir}/libgudev*${SOLIBS}"
+
 # The test cases need perl and bash to run correctly.
 RDEPENDS_${PN}-ptest += "perl bash"
 FILES_${PN}-ptest += "${libdir}/udev/rules.d"
Signature · 1 line
2.1.1
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw
Quoted 3 lines · Martin Jansa

Should I resend without WIP tag now when ChenQi confirmed that moving libgudev isn't needed?

No need, I've merged it into my staging branch already.

Thanks,
Ross

#4 lore raw
Quoted 9 lines · Ross
Quoted 3 lines · Martin Jansa

Should I resend without WIP tag now when ChenQi confirmed that moving libgudev isn't needed?

No need, I've merged it into my staging branch already.

This should go into dizzy - right?

Andreas

#5 lore raw

I cherry-picked this patch onto dizzy and it unbroke my build. Is it possible/reasonable for it to be included in dizzy?
--Ash

Quoted 18 lines · Andreas Müller
Quoted 9 lines · Ross
Quoted 3 lines · Martin Jansa

Should I resend without WIP tag now when ChenQi confirmed that moving libgudev isn't needed?

No need, I've merged it into my staging branch already.

This should go into dizzy - right?

Andreas
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#6 lore raw

I can't see why not. CC'ing Armin, the dizzy maintainer.

Quoted 26 lines · Ash Charles

I cherry-picked this patch onto dizzy and it unbroke my build. Is it possible/reasonable for it to be included in dizzy?
--Ash

Quoted 1 line · Andreas Müller

On Fri, Oct 24, 2014 at 12:29 PM, Burton, Ross <[email protected]>

Quoted 17 lines · wrote:
Quoted 9 lines · Martin Jansa
Quoted 3 lines

Should I resend without WIP tag now when ChenQi confirmed that moving libgudev isn't needed?

No need, I've merged it into my staging branch already.

This should go into dizzy - right?

Andreas
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#7 lore raw

Hi Armin,

Would it be possible to cherry-pick this commit "systemd: don't move libgudev around, it breaks libgudev-1.0.la" (7807d1d8b9535a87ba3e5ab7df21a2954708333f on oe-core, 41ae2056e6b6f17a1d9fe7408596a448f3e605ad on poky) to the dizzy branch?

Thanks,

Ash

Quoted 31 lines · Ross

I can't see why not. CC'ing Armin, the dizzy maintainer.

Quoted 26 lines · Ash Charles

I cherry-picked this patch onto dizzy and it unbroke my build. Is it possible/reasonable for it to be included in dizzy?
--Ash

Quoted 19 lines · Andreas Müller
Quoted 9 lines · Ross
Quoted 3 lines · Martin Jansa

Should I resend without WIP tag now when ChenQi confirmed that moving libgudev isn't needed?

No need, I've merged it into my staging branch already.

This should go into dizzy - right?

Andreas
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#8 lore raw
In reply to Martin Jansa
Quoted 36 lines · Martin Jansa

* libgudev-1.0.la still references /usr/lib and this change was breaking gypsy (detected in navit) and network-manager-applet

---
  meta/recipes-core/systemd/systemd_216.bb | 9 ++++-----
  1 file changed, 4 insertions(+), 5 deletions(-)
meta/recipes-core/systemd/systemd_216.bb +2 -5
index ebf9395..2779823 100644
@@ -129,9 +129,6 @@ do_install() {
  		sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
  	fi
 
-	# Move libgudev back to ${rootlibdir} to keep backward compatibility
-	[ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev*
-
          # Delete journal README, as log can be symlinked inside volatile.
          rm -f ${D}/${localstatedir}/log/README
 
@@ -171,10 +168,10 @@ python populate_packages_prepend (){
      systemdlibdir = d.getVar("rootlibdir", True)
      do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
  }
-PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
+PACKAGES_DYNAMIC += "^lib(udev|systemd).*"
 
  PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \
-             ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh"
+             ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh libgudev"
 
  SYSTEMD_PACKAGES = "${PN}-binfmt"
  SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"

meta/recipes-core/systemd/systemd_216.bb FILES_${PN}-analyze = "${bindir}/systemd-analyze" · line 192

Quoted 8 lines
meta/recipes-core/systemd/systemd_216.bb +2 -0
@@ -188,6 +185,8 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze"
  FILES_${PN}-initramfs = "/init"
  RDEPENDS_${PN}-initramfs = "${PN}"
 
+FILES_libgudev = "${libdir}/libgudev*${SOLIBS}"
+
  # The test cases need perl and bash to run correctly.
  RDEPENDS_${PN}-ptest += "perl bash"
  FILES_${PN}-ptest += "${libdir}/udev/rules.d"