diff options
| author | Matthieu Crapet <Matthieu.Crapet@ingenico.com> | 2014-01-14 16:09:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-16 12:05:49 +0000 |
| commit | f1f0787cd41c4130d74e2d41bbf582bd62c9e0ee (patch) | |
| tree | 05687865eb1db9dc20304e7353be21748c4efaac | |
| parent | e917b074d65abae4d55af5f2651e73af4217b0c2 (diff) | |
| download | poky-f1f0787cd41c4130d74e2d41bbf582bd62c9e0ee.tar.gz | |
util-linux: add reset.1 manpage in update-alternatives
Adding "doc-pkgs" to IMAGE_FEATURES (in an image recipe) reports a conflict with reset.1 file, present both in util-linux and ncurses-doc packages.
<log>
| Collected errors:
| * check_data_file_clashes: Package util-linux-doc wants to install file /home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/rootfs/usr/share/man/man1/reset.1
| But that file is already provided by package * ncurses-doc
| * opkg_install_cmd: Cannot install package util-linux-doc.
| WARNING: /home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/temp/run.do_rootfs.13877:1 exit 255 from
| opkg-cl -f $INSTALL_CONF_IPK -o $INSTALL_ROOTFS_IPK --force_postinstall --prefer-arch-to-version install `cat $1`
| ERROR: Function failed: do_rootfs (log file is located at /home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/temp/log.do_rootfs.13877)
</log>
Same issue already occured few months ago:
Re: [OE-core] Clashing man pages
https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg38590.html
(From OE-Core rev: 67499dbffd0f7241fd199b7fb94edfe2cebe8a9b)
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 5e726df701..15ccc95499 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
| @@ -176,11 +176,12 @@ ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" | |||
| 176 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | 176 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" |
| 177 | ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" | 177 | ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" |
| 178 | 178 | ||
| 179 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1" | 179 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1" |
| 180 | 180 | ||
| 181 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" | 181 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" |
| 182 | ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" | 182 | ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" |
| 183 | ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" | 183 | ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" |
| 184 | ALTERNATIVE_LINK_NAME[reset.1] = "${mandir}/man1/reset.1" | ||
| 184 | ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" | 185 | ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" |
| 185 | ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" | 186 | ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" |
| 186 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" | 187 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" |