* [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la
@ 2014-10-04 2:27 Martin Jansa
2014-10-04 2:30 ` Martin Jansa
2014-10-17 7:08 ` ChenQi
0 siblings, 2 replies; 9+ messages in thread
From: Martin Jansa @ 2014-10-04 2:27 UTC (permalink / raw)
To: openembedded-core
* libgudev-1.0.la still references /usr/lib and this change was breaking gypsy (detected in navit) and
network-manager-applet
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la
2014-10-04 2:27 [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la Martin Jansa
@ 2014-10-04 2:30 ` Martin Jansa
2014-10-24 9:04 ` Martin Jansa
2014-10-17 7:08 ` ChenQi
1 sibling, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2014-10-04 2:30 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2512 bytes --]
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).
> 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
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la
2014-10-04 2:27 [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la Martin Jansa
2014-10-04 2:30 ` Martin Jansa
@ 2014-10-17 7:08 ` ChenQi
1 sibling, 0 replies; 9+ messages in thread
From: ChenQi @ 2014-10-17 7:08 UTC (permalink / raw)
To: openembedded-core
On 10/04/2014 10:27 AM, Martin Jansa wrote:
> * libgudev-1.0.la still references /usr/lib and this change was breaking gypsy (detected in navit) and
> network-manager-applet
>
> 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"
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la
2014-10-04 2:30 ` Martin Jansa
@ 2014-10-24 9:04 ` Martin Jansa
2014-10-24 10:29 ` Burton, Ross
0 siblings, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2014-10-24 9:04 UTC (permalink / raw)
To: openembedded-core
[-- 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 --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la
2014-10-24 9:04 ` Martin Jansa
@ 2014-10-24 10:29 ` Burton, Ross
2014-10-31 8:21 ` Andreas Müller
0 siblings, 1 reply; 9+ messages in thread
From: Burton, Ross @ 2014-10-24 10:29 UTC (permalink / raw)
To: Martin Jansa; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
On 24 October 2014 10:04, Martin Jansa <martin.jansa@gmail.com> wrote:
> 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
[-- Attachment #2: Type: text/html, Size: 695 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la
2014-10-24 10:29 ` Burton, Ross
@ 2014-10-31 8:21 ` Andreas Müller
2014-11-27 21:29 ` Ash Charles
0 siblings, 1 reply; 9+ messages in thread
From: Andreas Müller @ 2014-10-31 8:21 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On Fri, Oct 24, 2014 at 12:29 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 24 October 2014 10:04, Martin Jansa <martin.jansa@gmail.com> wrote:
>>
>> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la
2014-10-31 8:21 ` Andreas Müller
@ 2014-11-27 21:29 ` Ash Charles
2014-11-28 17:23 ` Burton, Ross
0 siblings, 1 reply; 9+ messages in thread
From: Ash Charles @ 2014-11-27 21:29 UTC (permalink / raw)
To: Andreas Müller; +Cc: OE-core
I cherry-picked this patch onto dizzy and it unbroke my build. Is it
possible/reasonable for it to be included in dizzy?
--Ash
On Fri, Oct 31, 2014 at 1:21 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Fri, Oct 24, 2014 at 12:29 PM, Burton, Ross <ross.burton@intel.com> wrote:
>>
>> On 24 October 2014 10:04, Martin Jansa <martin.jansa@gmail.com> wrote:
>>>
>>> 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
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la
2014-11-27 21:29 ` Ash Charles
@ 2014-11-28 17:23 ` Burton, Ross
2014-12-04 16:56 ` Ash Charles
0 siblings, 1 reply; 9+ messages in thread
From: Burton, Ross @ 2014-11-28 17:23 UTC (permalink / raw)
To: Ash Charles, Armin Kuster; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 1006 bytes --]
I can't see why not. CC'ing Armin, the dizzy maintainer.
On 27 November 2014 at 21:29, Ash Charles <ashcharles@gmail.com> wrote:
> I cherry-picked this patch onto dizzy and it unbroke my build. Is it
> possible/reasonable for it to be included in dizzy?
> --Ash
>
> On Fri, Oct 31, 2014 at 1:21 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
> > On Fri, Oct 24, 2014 at 12:29 PM, Burton, Ross <ross.burton@intel.com>
> wrote:
> >>
> >> On 24 October 2014 10:04, Martin Jansa <martin.jansa@gmail.com> wrote:
> >>>
> >>> 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
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 1913 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la
2014-11-28 17:23 ` Burton, Ross
@ 2014-12-04 16:56 ` Ash Charles
0 siblings, 0 replies; 9+ messages in thread
From: Ash Charles @ 2014-12-04 16:56 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
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
On Fri, Nov 28, 2014 at 9:23 AM, Burton, Ross <ross.burton@intel.com> wrote:
> I can't see why not. CC'ing Armin, the dizzy maintainer.
>
> On 27 November 2014 at 21:29, Ash Charles <ashcharles@gmail.com> wrote:
>>
>> I cherry-picked this patch onto dizzy and it unbroke my build. Is it
>> possible/reasonable for it to be included in dizzy?
>> --Ash
>>
>> On Fri, Oct 31, 2014 at 1:21 AM, Andreas Müller
>> <schnitzeltony@googlemail.com> wrote:
>> > On Fri, Oct 24, 2014 at 12:29 PM, Burton, Ross <ross.burton@intel.com>
>> > wrote:
>> >>
>> >> On 24 October 2014 10:04, Martin Jansa <martin.jansa@gmail.com> wrote:
>> >>>
>> >>> 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
>> > Openembedded-core@lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-12-04 16:57 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-04 2:27 [WIP][PATCH] systemd: don't move libgudev around, it breaks libgudev-1.0.la Martin Jansa
2014-10-04 2:30 ` Martin Jansa
2014-10-24 9:04 ` Martin Jansa
2014-10-24 10:29 ` Burton, Ross
2014-10-31 8:21 ` Andreas Müller
2014-11-27 21:29 ` Ash Charles
2014-11-28 17:23 ` Burton, Ross
2014-12-04 16:56 ` Ash Charles
2014-10-17 7:08 ` ChenQi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox