diff options
author | Kai Kang <kai.kang@windriver.com> | 2015-07-03 15:23:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-08 00:01:23 +0100 |
commit | c4437f17806c10f619cd7bfe699bf122b7f2bde9 (patch) | |
tree | 2ae6fea0c2f32c2d64909116504f5b04958f67b5 /meta/recipes-extended | |
parent | 44544fca58043c1f7f9cad6d9c288ff18bce99fc (diff) | |
download | poky-c4437f17806c10f619cd7bfe699bf122b7f2bde9.tar.gz |
Update alternatives of man pages
Update alternatives of man pages in several packages.
(From OE-Core rev: 2cff20f423fb9e82b44c68504be605c223bd74fb)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/mktemp/mktemp_1.7.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/procps/procps_3.3.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 3 | ||||
-rw-r--r-- | meta/recipes-extended/stat/stat_3.3.bb | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/meta/recipes-extended/mktemp/mktemp_1.7.bb b/meta/recipes-extended/mktemp/mktemp_1.7.bb index b53fc11b1e..fe238eea37 100644 --- a/meta/recipes-extended/mktemp/mktemp_1.7.bb +++ b/meta/recipes-extended/mktemp/mktemp_1.7.bb | |||
@@ -28,3 +28,7 @@ do_install_append () { | |||
28 | ALTERNATIVE_${PN} = "mktemp" | 28 | ALTERNATIVE_${PN} = "mktemp" |
29 | ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp" | 29 | ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp" |
30 | ALTERNATIVE_PRIORITY = "100" | 30 | ALTERNATIVE_PRIORITY = "100" |
31 | |||
32 | ALTERNATIVE_${PN}-doc = "mktemp.1" | ||
33 | ALTERNATIVE_PRIORITY_${PN}-doc = "300" | ||
34 | ALTERNATIVE_LINK_NAME[mktemp.1] = "${mandir}/man1/mktemp.1" | ||
diff --git a/meta/recipes-extended/procps/procps_3.3.10.bb b/meta/recipes-extended/procps/procps_3.3.10.bb index 621b6dd578..65d64ec478 100644 --- a/meta/recipes-extended/procps/procps_3.3.10.bb +++ b/meta/recipes-extended/procps/procps_3.3.10.bb | |||
@@ -52,6 +52,10 @@ ALTERNATIVE_PRIORITY = "100" | |||
52 | 52 | ||
53 | ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" | 53 | ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" |
54 | 54 | ||
55 | ALTERNATIVE_${PN}-doc = "kill.1 uptime.1" | ||
56 | ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" | ||
57 | ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" | ||
58 | |||
55 | python __anonymous() { | 59 | python __anonymous() { |
56 | for prog in d.getVar('base_bindir_progs', True).split(): | 60 | for prog in d.getVar('base_bindir_progs', True).split(): |
57 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) | 61 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) |
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 5451718cce..4313ffe952 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -179,9 +179,10 @@ ALTERNATIVE_${PN}-base = "newgrp groups login su" | |||
179 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" | 179 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" |
180 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" | 180 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" |
181 | 181 | ||
182 | ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3" | 182 | ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3 groups.1" |
183 | ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" | 183 | ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" |
184 | ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" | 184 | ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" |
185 | ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" | ||
185 | 186 | ||
186 | pkg_postinst_${PN} () { | 187 | pkg_postinst_${PN} () { |
187 | if [ "x$D" != "x" ]; then | 188 | if [ "x$D" != "x" ]; then |
diff --git a/meta/recipes-extended/stat/stat_3.3.bb b/meta/recipes-extended/stat/stat_3.3.bb index 8a19b3b7ed..651831e314 100644 --- a/meta/recipes-extended/stat/stat_3.3.bb +++ b/meta/recipes-extended/stat/stat_3.3.bb | |||
@@ -24,5 +24,8 @@ ALTERNATIVE_PRIORITY[stat] = "200" | |||
24 | ALTERNATIVE_LINK_NAME[stat] = "${base_bindir}/stat" | 24 | ALTERNATIVE_LINK_NAME[stat] = "${base_bindir}/stat" |
25 | ALTERNATIVE_TARGET[stat] = "${base_bindir}/stat.stat" | 25 | ALTERNATIVE_TARGET[stat] = "${base_bindir}/stat.stat" |
26 | 26 | ||
27 | ALTERNATIVE_${PN}-doc = "stat.1" | ||
28 | ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" | ||
29 | |||
27 | BBCLASSEXTEND = "native" | 30 | BBCLASSEXTEND = "native" |
28 | 31 | ||