diff options
| author | Jeffrey C Honig <jeffrey.honig@windriver.com> | 2013-02-28 21:19:09 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-07 11:14:40 +0000 |
| commit | 8219b2b9b0a3037212154d6813c35e47504300f7 (patch) | |
| tree | 87a94d08eab3d85487cd2d065e9e2b793e5c6e11 /meta/recipes-core/util-linux/util-linux_2.22.2.bb | |
| parent | 750d475a917cfde03d49cc350a3e1123bda5b1c6 (diff) | |
| download | poky-8219b2b9b0a3037212154d6813c35e47504300f7.tar.gz | |
Resolve sysvinit and util-linux conflicting man pages.
[ CQID: WIND00404316 ]
Use alternatives mechanism to prevent sysvlinux and util-linux
man pages from causing conflicts.
(From OE-Core rev: af97a79d017722d0571d552e390f2881efe228e2)
Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux_2.22.2.bb')
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.22.2.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb index f91784b56d..2f48e0b860 100644 --- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | MAJOR_VERSION = "2.22" | 1 | MAJOR_VERSION = "2.22" |
| 2 | PR = "r1" | 2 | PR = "r2" |
| 3 | require util-linux.inc | 3 | require util-linux.inc |
| 4 | 4 | ||
| 5 | # note that `lscpu' is under GPLv3+ | 5 | # note that `lscpu' is under GPLv3+ |