| Submitter | Andreas Oberritter |
|---|---|
| Date | March 23, 2012, 4:37 p.m. |
| Message ID | <1332520659-12233-1-git-send-email-obi@opendreambox.org> |
| Download | mbox | patch |
| Permalink | /patch/24327/ |
| State | Accepted |
| Commit | 68dc2a3fa30c03a196d650de34d0c657a7b85454 |
| Headers | show |
Comments
On 03/23/2012 09:37 AM, Andreas Oberritter wrote: > * pwdx, pgrep and watch may be provided by busybox. > * Use update-alternatives to avoid conflict. > > Signed-off-by: Andreas Oberritter<obi@opendreambox.org> > --- > meta/recipes-extended/procps/procps_3.2.8.bb | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb > index 27d2b5c..683badc 100644 > --- a/meta/recipes-extended/procps/procps_3.2.8.bb > +++ b/meta/recipes-extended/procps/procps_3.2.8.bb > @@ -1,11 +1,12 @@ > require procps.inc > > -PR = "r5" > +PR = "r6" > > inherit update-alternatives > > ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \ > - ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps" > + ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps \ > + ${bindir}/pgrep ${bindir}/pwdx ${bindir}/watch" > ALTERNATIVE_PRIORITY = "110" > > SRC_URI += "file://procmodule.patch \ Merged this along with the sysvinit and ppp patches. Thanks Sau!
Patch
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb index 27d2b5c..683badc 100644 --- a/meta/recipes-extended/procps/procps_3.2.8.bb +++ b/meta/recipes-extended/procps/procps_3.2.8.bb @@ -1,11 +1,12 @@ require procps.inc -PR = "r5" +PR = "r6" inherit update-alternatives ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \ - ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps" + ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps \ + ${bindir}/pgrep ${bindir}/pwdx ${bindir}/watch" ALTERNATIVE_PRIORITY = "110" SRC_URI += "file://procmodule.patch \
* pwdx, pgrep and watch may be provided by busybox. * Use update-alternatives to avoid conflict. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- meta/recipes-extended/procps/procps_3.2.8.bb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)