| Submitter | Martin Jansa |
|---|---|
| Date | July 20, 2012, 10:49 a.m. |
| Message ID | <1342781343-16277-1-git-send-email-Martin.Jansa@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/32715/ |
| State | Accepted |
| Commit | 05085b2aac7ac2789e3382cfad339474a5d6f0c6 |
| Headers | show |
Comments
On 07/20/2012 03:49 AM, Martin Jansa wrote: > * fixes http://lists.linuxtogo.org/pipermail/openembedded-core/2012-June/024586.html > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > meta/recipes-core/util-linux/util-linux.inc | 3 ++- > meta/recipes-core/util-linux/util-linux_2.21.2.bb | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc > index 688a5be..00e5d7c 100644 > --- a/meta/recipes-core/util-linux/util-linux.inc > +++ b/meta/recipes-core/util-linux/util-linux.inc > @@ -136,7 +136,8 @@ ALTERNATIVE_${PN} += "setsid chrt flock hwclock" > ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" > ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" > ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" > -ALTERNATIVE_LINK_NAME[reset] = "${base_bindir}/reset" > +ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset" > +ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" > ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" > ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" > ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" > diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb > index 7f2c2a9..0f5fdc6 100644 > --- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb > +++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb > @@ -1,5 +1,5 @@ > MAJOR_VERSION = "2.21" > -PR = "r0" > +PR = "r1" > require util-linux.inc > > # note that `lscpu' is under GPLv3+ > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 688a5be..00e5d7c 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -136,7 +136,8 @@ ALTERNATIVE_${PN} += "setsid chrt flock hwclock" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" -ALTERNATIVE_LINK_NAME[reset] = "${base_bindir}/reset" +ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset" +ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb index 7f2c2a9..0f5fdc6 100644 --- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb @@ -1,5 +1,5 @@ MAJOR_VERSION = "2.21" -PR = "r0" +PR = "r1" require util-linux.inc # note that `lscpu' is under GPLv3+
* fixes http://lists.linuxtogo.org/pipermail/openembedded-core/2012-June/024586.html Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/recipes-core/util-linux/util-linux.inc | 3 ++- meta/recipes-core/util-linux/util-linux_2.21.2.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)