Skip to contentSkip to conversation

busybox: fix FILES_${PN}-syslog assignment

PATCH In review Andreas Oberritter 3 participants 5 messages Mar 20, 2013 – Mar 26, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 busybox: fix FILES_${PN}-syslog assignment

This variable was assigned twice.

---
 meta/recipes-core/busybox/busybox.inc |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-core/busybox/busybox.inc +1 -2
index ddd2976..e936e59 100644
@@ -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"
 
Signature · 1 line
1.7.10.4
#2 lore raw
Quoted 7 lines · Ross
Quoted 3 lines · Andreas Oberritter

This variable was assigned twice.

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

Quoted 6 lines

Ross

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

#3 lore raw

Hi Khem,

Quoted 7 lines · Khem Raj

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

#4 lore raw
Quoted 7 lines · Ross

Hi Khem,

Quoted 4 lines · Khem Raj

Ross, I have 198 update pactch in branch here

http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/systemd-198&id=51d4993c7375a7339a3ee91cf6b24da25b2d9b50

Quoted 8 lines
Quoted 3 lines

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

Quoted 2 lines

Ross