diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-11-11 13:23:05 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-15 12:05:28 +0000 |
| commit | 4cedec6e16a6a25c4e0715489af418ba944c1f86 (patch) | |
| tree | 109c2849f793eab657d352cb85b0132ce962b036 | |
| parent | f7388d20c2d6ed282a1503760109b56ff5849065 (diff) | |
| download | poky-4cedec6e16a6a25c4e0715489af418ba944c1f86.tar.gz | |
time: use u-a for time, conflicts with busybox
* it was reported here:
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009409.html
(From OE-Core rev: 4ed8241b58ad3180311fc20cb6ef26acf44058b4)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/time/time.inc | 10 | ||||
| -rw-r--r-- | meta/recipes-extended/time/time_1.7.bb | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/meta/recipes-extended/time/time.inc b/meta/recipes-extended/time/time.inc index 2d9dab8e85..401288b0ce 100644 --- a/meta/recipes-extended/time/time.inc +++ b/meta/recipes-extended/time/time.inc | |||
| @@ -6,3 +6,13 @@ SECTION = "utils" | |||
| 6 | LICENSE = "GPLv2+" | 6 | LICENSE = "GPLv2+" |
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" |
| 8 | 8 | ||
| 9 | inherit update-alternatives | ||
| 10 | |||
| 11 | do_install_append () { | ||
| 12 | mv ${D}${bindir}/time ${D}${bindir}/time.${PN} | ||
| 13 | } | ||
| 14 | |||
| 15 | ALTERNATIVE_NAME = "time" | ||
| 16 | ALTERNATIVE_LINK = "${bindir}/time" | ||
| 17 | ALTERNATIVE_PATH = "${bindir}/time.${PN}" | ||
| 18 | ALTERNATIVE_PRIORITY = "100" | ||
diff --git a/meta/recipes-extended/time/time_1.7.bb b/meta/recipes-extended/time/time_1.7.bb index 35afb1ea5a..c38608fd9e 100644 --- a/meta/recipes-extended/time/time_1.7.bb +++ b/meta/recipes-extended/time/time_1.7.bb | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | require time.inc | 1 | require time.inc |
| 2 | 2 | ||
| 3 | PR = "r1" | ||
| 4 | |||
| 3 | SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \ | 5 | SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \ |
| 4 | file://debian.patch" | 6 | file://debian.patch" |
| 5 | 7 | ||
