| Submitter | Andreas Oberritter |
|---|---|
| Date | March 20, 2013, 9:59 p.m. |
| Message ID | <1363816759-24737-1-git-send-email-obi@opendreambox.org> |
| Download | mbox | patch |
| Permalink | /patch/46581/ |
| State | New |
| Headers | show |
Comments
On 20 March 2013 21:59, Andreas Oberritter <obi@opendreambox.org> wrote: > This variable was assigned twice. > > Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Squashed into my pending systemd branch, thanks Andreas. Ross
On Mar 21, 2013, at 3:55 AM, "Burton, Ross" <ross.burton@intel.com> wrote: > On 20 March 2013 21:59, Andreas Oberritter <obi@opendreambox.org> wrote: >> This variable was assigned twice. >> >> Signed-off-by: Andreas Oberritter <obi@opendreambox.org> > > Squashed into my pending systemd branch, thanks Andreas. > Ross, I have 198 update pactch in branch here http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/systemd-198&id=51d4993c7375a7339a3ee91cf6b24da25b2d9b50 this one is good. Other two I need to address comments can you pick this one too into your branch ? so I can ride with you > Ross > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Hi Khem, On 21 March 2013 18:20, Khem Raj <raj.khem@gmail.com> wrote: > Ross, I have 198 update pactch in branch here > > http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/systemd-198&id=51d4993c7375a7339a3ee91cf6b24da25b2d9b50 > > this one is good. Other two I need to address comments > can you pick this one too into your branch ? > so I can ride with you I hope you don't think that I've been ignoring this - I wanted a stable base to finish the integration branch and a new upstream version wasn't the stability I was after. I'll look at merging this work tomorrow. Ross
On Mar 26, 2013, at 10:18 AM, "Burton, Ross" <ross.burton@intel.com> wrote: > Hi Khem, > > On 21 March 2013 18:20, Khem Raj <raj.khem@gmail.com> wrote: >> Ross, I have 198 update pactch in branch here >> >> http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/systemd-198&id=51d4993c7375a7339a3ee91cf6b24da25b2d9b50 >> >> this one is good. Other two I need to address comments >> can you pick this one too into your branch ? >> so I can ride with you > > I hope you don't think that I've been ignoring this - I wanted a > stable base to finish the integration branch and a new upstream > version wasn't the stability I was after. I'll look at merging this > work tomorrow. OK thanks for replying. I have rebased my branch on top of todays OE-Core > > Ross
Patch
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index ddd2976..e936e59 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -18,12 +18,11 @@ export EXTRA_LDFLAGS = "${LDFLAGS}" PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" -FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf*" +FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${systemd_unitdir}/system/syslog.service" FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh" -FILES_${PN}-syslog = "${systemd_unitdir}/system/syslog.service" INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev ${PN}-hwclock"
This variable was assigned twice. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- meta/recipes-core/busybox/busybox.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)