All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] busybox: move watch to /usr/bin for compatibility with procps
Date: Tue, 17 Apr 2012 11:44:35 +0100	[thread overview]
Message-ID: <1334659475.616.73.camel@ted> (raw)
In-Reply-To: <F744A0A9-A640-4453-8119-18D2DF60364E@dominion.thruhere.net>

On Tue, 2012-04-17 at 11:40 +0200, Koen Kooi wrote:
> Ping

It merged three weeks ago:

http://git.openembedded.org/openembedded-core/commit/?id=fa8b2d2bed63fa4fc2af45f094998b0f9e69d272

?

Cheers,

Richard


> Op 24 mrt. 2012, om 20:46 heeft Andreas Oberritter het volgende geschreven:
> 
> > Commit 68dc2a3fa30c03a196d650de34d0c657a7b85454 broke opkg upgrade:
> > 
> > | update-alternatives: Error: cannot register alternative watch to
> > | /usr/bin/watch since it is already registered to /bin/watch
> > 
> > Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> > ---
> > * Martin, can you please verify whether this really helps? I've built a
> >  rootfs with both busybox watch and procps installed. I didn't actually
> >  do an opkg upgrade.
> > 
> > .../busybox/busybox-1.19.4/watch.in.usr-bin.patch  |   29 ++++++++++++++++++++
> > meta/recipes-core/busybox/busybox_1.19.4.bb        |    3 +-
> > 2 files changed, 31 insertions(+), 1 deletions(-)
> > create mode 100644 meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch
> > 
> > diff --git a/meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch
> > new file mode 100644
> > index 0000000..e8e1edf
> > --- /dev/null
> > +++ b/meta/recipes-core/busybox/busybox-1.19.4/watch.in.usr-bin.patch
> > @@ -0,0 +1,29 @@
> > +Upstream-Status: Inappropriate [configuration]
> > +
> > +From f2372ab626a395d067704f4c318180fb6039de15 Mon Sep 17 00:00:00 2001
> > +From: Andreas Oberritter <obi@opendreambox.org>
> > +Date: Sat, 24 Mar 2012 17:36:48 +0100
> > +Subject: [PATCH] watch: move from /bin to /usr/bin for compatibility with
> > + procps
> > +
> > +Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> > +---
> > + include/applets.src.h |    2 +-
> > + 1 files changed, 1 insertions(+), 1 deletions(-)
> > +
> > +diff --git a/include/applets.src.h b/include/applets.src.h
> > +index 87d9cbb..c148a8c 100644
> > +--- a/include/applets.src.h
> > ++++ b/include/applets.src.h
> > +@@ -404,7 +404,7 @@ IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
> > + IF_VOLNAME(APPLET(volname, BB_DIR_USR_BIN, BB_SUID_DROP))
> > + /* Needs to be run by root or be suid root - needs to write to /dev/TTY: */
> > + IF_WALL(APPLET(wall, BB_DIR_USR_BIN, BB_SUID_REQUIRE))
> > +-IF_WATCH(APPLET(watch, BB_DIR_BIN, BB_SUID_DROP))
> > ++IF_WATCH(APPLET(watch, BB_DIR_USR_BIN, BB_SUID_DROP))
> > + IF_WATCHDOG(APPLET(watchdog, BB_DIR_SBIN, BB_SUID_DROP))
> > + IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP))
> > + IF_WGET(APPLET(wget, BB_DIR_USR_BIN, BB_SUID_DROP))
> > +-- 
> > +1.7.5.4
> > +
> > diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
> > index dff616d..3f22669 100644
> > --- a/meta/recipes-core/busybox/busybox_1.19.4.bb
> > +++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
> > @@ -1,5 +1,5 @@
> > require busybox.inc
> > -PR = "r0"
> > +PR = "r1"
> > 
> > SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
> >            file://udhcpscript.patch \
> > @@ -8,6 +8,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
> >            file://get_header_tar.patch \
> >            file://busybox-appletlib-dependency.patch \
> >            file://run-parts.in.usr-bin.patch \
> > +           file://watch.in.usr-bin.patch \
> >            file://busybox-udhcpc-no_deconfig.patch \
> >            file://find-touchscreen.sh \
> >            file://busybox-cron \
> > -- 
> > 1.7.5.4
> > 
> > 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 





  reply	other threads:[~2012-04-17 10:54 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-24 19:46 [PATCH] busybox: move watch to /usr/bin for compatibility with procps Andreas Oberritter
2012-03-26  9:26 ` Martin Jansa
2012-03-26 11:02   ` Richard Purdie
2012-03-26 11:11     ` Martin Jansa
2012-04-17  9:40 ` Koen Kooi
2012-04-17 10:44   ` Richard Purdie [this message]
2012-04-17 10:46     ` Koen Kooi
2012-04-17 10:51       ` Martin Jansa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1334659475.616.73.camel@ted \
    --to=richard.purdie@linuxfoundation.org \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.