Re: [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la

[Martin Jansa <martin.jansa@gmail.com>]

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

On Sat, Oct 04, 2014 at 04:30:40AM +0200, Martin Jansa wrote:
> On Sat, Oct 04, 2014 at 04:27:55AM +0200, Martin Jansa wrote:
> > * 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?

> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta/recipes-core/systemd/systemd_216.bb | 9 ++++-----
> >  1 file changed, 4 insertions(+), 5 deletions(-)
> > 
> > diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
> > index ebf9395..2779823 100644
> > --- a/meta/recipes-core/systemd/systemd_216.bb
> > +++ b/meta/recipes-core/systemd/systemd_216.bb
> > @@ -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"
> > -- 
> > 2.1.1
> > 
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]