summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-07-03 15:23:49 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-08 00:01:23 +0100
commitc4437f17806c10f619cd7bfe699bf122b7f2bde9 (patch)
tree2ae6fea0c2f32c2d64909116504f5b04958f67b5 /meta
parent44544fca58043c1f7f9cad6d9c288ff18bce99fc (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.23.bb7
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc8
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb6
-rw-r--r--meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb6
-rw-r--r--meta/recipes-extended/mktemp/mktemp_1.7.bb4
-rw-r--r--meta/recipes-extended/procps/procps_3.3.10.bb4
-rw-r--r--meta/recipes-extended/shadow/shadow.inc3
-rw-r--r--meta/recipes-extended/stat/stat_3.3.bb3
8 files changed, 37 insertions, 4 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_8.23.bb b/meta/recipes-core/coreutils/coreutils_8.23.bb
index 70c04a5f11..6e98b7b649 100644
--- a/meta/recipes-core/coreutils/coreutils_8.23.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.23.bb
@@ -93,7 +93,7 @@ inherit update-alternatives
93 93
94ALTERNATIVE_PRIORITY = "100" 94ALTERNATIVE_PRIORITY = "100"
95ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" 95ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df"
96ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1" 96ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1"
97 97
98ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64" 98ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64"
99ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}" 99ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}"
@@ -111,6 +111,11 @@ ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/["
111ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" 111ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}"
112ALTERNATIVE_LINK_NAME[lbracket.1] = "${mandir}/man1/lbracket.1" 112ALTERNATIVE_LINK_NAME[lbracket.1] = "${mandir}/man1/lbracket.1"
113 113
114ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1"
115ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1"
116ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1"
117ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1"
118
114python __anonymous() { 119python __anonymous() {
115 for prog in d.getVar('base_bindir_progs', True).split(): 120 for prog in d.getVar('base_bindir_progs', True).split():
116 d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog)) 121 d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog))
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 60309a51c9..a4072bc6cf 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -187,7 +187,7 @@ ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root"
187ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" 187ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
188ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 188ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
189 189
190ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1" 190ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 reset.1 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3"
191 191
192ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" 192ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
193ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" 193ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1"
@@ -198,6 +198,12 @@ ALTERNATIVE_LINK_NAME[reset.1] = "${mandir}/man1/reset.1"
198ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" 198ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
199ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" 199ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
200ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" 200ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
201ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1"
202ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3"
203ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8"
204ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8"
205ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
206ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3"
201 207
202ALTERNATIVE_util-linux-hwclock = "hwclock" 208ALTERNATIVE_util-linux-hwclock = "hwclock"
203# There seems to be problem, atleast on nslu2, with these, untill they are 209# There seems to be problem, atleast on nslu2, with these, untill they are
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
index b3540887f3..70085e3dfc 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
@@ -91,6 +91,12 @@ ALTERNATIVE_PRIORITY = "100"
91ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" 91ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr"
92ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" 92ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
93 93
94ALTERNATIVE_${PN}-doc = "libblkid.3 blkid.8 findfs.8 fsck.8"
95ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3"
96ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8"
97ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8"
98ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
99
94inherit ptest 100inherit ptest
95SRC_URI += "file://run-ptest" 101SRC_URI += "file://run-ptest"
96SRC_URI += "file://ptest.patch" 102SRC_URI += "file://ptest.patch"
diff --git a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
index 160990c142..33bed75321 100644
--- a/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
+++ b/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
@@ -32,7 +32,7 @@ SRC_URI[sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f
32 32
33S = "${WORKDIR}/uuid-${PV}" 33S = "${WORKDIR}/uuid-${PV}"
34 34
35inherit autotools 35inherit autotools update-alternatives
36 36
37EXTRA_OECONF = "--without-dce --without-cxx --without-perl --without-perl-compat --without-php --without-pgsql" 37EXTRA_OECONF = "--without-dce --without-cxx --without-perl --without-perl-compat --without-php --without-pgsql"
38EXTRA_OECONF = "--includedir=${includedir}/ossp" 38EXTRA_OECONF = "--includedir=${includedir}/ossp"
@@ -57,3 +57,7 @@ FILES_${PN} = "${libdir}/libossp-uuid.so.16*"
57FILES_${PN}-dev += "${bindir}/uuid-config" 57FILES_${PN}-dev += "${bindir}/uuid-config"
58 58
59BBCLASSEXTEND = "native nativesdk" 59BBCLASSEXTEND = "native nativesdk"
60
61ALTERNATIVE_${PN}-doc = "uuid.3"
62ALTERNATIVE_PRIORITY_${PN}-doc = "200"
63ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3"
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 () {
28ALTERNATIVE_${PN} = "mktemp" 28ALTERNATIVE_${PN} = "mktemp"
29ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp" 29ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp"
30ALTERNATIVE_PRIORITY = "100" 30ALTERNATIVE_PRIORITY = "100"
31
32ALTERNATIVE_${PN}-doc = "mktemp.1"
33ALTERNATIVE_PRIORITY_${PN}-doc = "300"
34ALTERNATIVE_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
53ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}" 53ALTERNATIVE_${PN} = "${bindir_progs} ${base_bindir_progs} ${base_sbindir_progs}"
54 54
55ALTERNATIVE_${PN}-doc = "kill.1 uptime.1"
56ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1"
57ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1"
58
55python __anonymous() { 59python __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"
179ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" 179ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login"
180ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" 180ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su"
181 181
182ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3" 182ALTERNATIVE_${PN}-doc = "passwd.5 getspnam.3 groups.1"
183ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" 183ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5"
184ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" 184ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3"
185ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1"
185 186
186pkg_postinst_${PN} () { 187pkg_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"
24ALTERNATIVE_LINK_NAME[stat] = "${base_bindir}/stat" 24ALTERNATIVE_LINK_NAME[stat] = "${base_bindir}/stat"
25ALTERNATIVE_TARGET[stat] = "${base_bindir}/stat.stat" 25ALTERNATIVE_TARGET[stat] = "${base_bindir}/stat.stat"
26 26
27ALTERNATIVE_${PN}-doc = "stat.1"
28ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1"
29
27BBCLASSEXTEND = "native" 30BBCLASSEXTEND = "native"
28 31