Commit Graph

2 Commits

Author SHA1 Message Date
Paul Gortmaker 4a660aa437 which: fix it so the manpage will respect alternatives
To fix:

  file /usr/share/man/man1/which.1 conflicts between attempted installs
  of debianutils-doc-4.8.1-r0.core2_64 and which-doc-2.21-r3.core2_64

(From OE-Core rev: ba304046307cd741694b25215b562d5f05c9c7a5)

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-03-17 16:53:04 +00:00
Jussi Kukkonen 3893a4fab9 which: Upgrade 2.20 -> 2.21
* Drop one upstreamed patch, update the other one

(From OE-Core rev: 254ca955ca22944634982f6b138bb3de56863777)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-08-10 12:40:26 -07:00