diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2012-10-27 16:48:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-02 16:18:29 +0000 |
commit | d005b787dfe2c9bcaefe41836f9b1c3008105171 (patch) | |
tree | f6840a662b7f625f98f033303d0fcbcb87564e30 /meta | |
parent | cc1f50fca85dc48a237a518b8afe8563225ea8fa (diff) | |
download | poky-d005b787dfe2c9bcaefe41836f9b1c3008105171.tar.gz |
recipes-extended: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
(From OE-Core rev: 528b4ab831c7b0bc1412318d29e2b7f9cf711d57)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.05.bb | 10 | ||||
-rw-r--r-- | meta/recipes-extended/groff/groff_1.20.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/gzip/gzip_1.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/perl/libtimedate-perl_1.20.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/pigz/pigz.inc | 2 | ||||
-rw-r--r-- | meta/recipes-extended/stat/stat_3.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo_4.13a.bb | 6 | ||||
-rw-r--r-- | meta/recipes-extended/unzip/unzip_6.0.bb | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb index d03b57d33a..6e160cd3e0 100644 --- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb +++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb | |||
@@ -25,7 +25,7 @@ ALTERNATIVE_PRIORITY = "100" | |||
25 | ALTERNATIVE_${PN} = "bunzip2 bzcat" | 25 | ALTERNATIVE_${PN} = "bunzip2 bzcat" |
26 | 26 | ||
27 | #install binaries to bzip2-native under sysroot for replacement-native | 27 | #install binaries to bzip2-native under sysroot for replacement-native |
28 | EXTRA_OECONF_virtclass-native += "--bindir=${STAGING_BINDIR_NATIVE}/${PN}" | 28 | EXTRA_OECONF_class-native += "--bindir=${STAGING_BINDIR_NATIVE}/${PN}" |
29 | do_configure_prepend () { | 29 | do_configure_prepend () { |
30 | cp ${WORKDIR}/configure.ac ${S}/ | 30 | cp ${WORKDIR}/configure.ac ${S}/ |
31 | cp ${WORKDIR}/Makefile.am ${S}/ | 31 | cp ${WORKDIR}/Makefile.am ${S}/ |
@@ -42,6 +42,6 @@ FILES_libbz2-staticdev = "${libdir}/*.a" | |||
42 | SECTION_libbz2-staticdev = "devel" | 42 | SECTION_libbz2-staticdev = "devel" |
43 | RDEPENDS_libbz2-staticdev = "libbz2-dev (= ${EXTENDPKGV})" | 43 | RDEPENDS_libbz2-staticdev = "libbz2-dev (= ${EXTENDPKGV})" |
44 | 44 | ||
45 | PROVIDES_append_virtclass-native = " bzip2-replacement-native" | 45 | PROVIDES_append_class-native = " bzip2-replacement-native" |
46 | BBCLASSEXTEND = "native nativesdk" | 46 | BBCLASSEXTEND = "native nativesdk" |
47 | 47 | ||
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb index 1c18b217da..1fdcb997e7 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.05.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.05.bb | |||
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c5326026692dbed183f0558f926580f8" | |||
18 | PR = "r3" | 18 | PR = "r3" |
19 | 19 | ||
20 | DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" | 20 | DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" |
21 | DEPENDS_virtclass-native = "" | 21 | DEPENDS_class-native = "" |
22 | 22 | ||
23 | SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz" | 23 | SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz" |
24 | 24 | ||
@@ -30,7 +30,7 @@ SRC_URI = "${SRC_URI_BASE} \ | |||
30 | file://ghostscript-9.05-NOT-check-endian.patch \ | 30 | file://ghostscript-9.05-NOT-check-endian.patch \ |
31 | " | 31 | " |
32 | 32 | ||
33 | SRC_URI_virtclass-native = "${SRC_URI_BASE}" | 33 | SRC_URI_class-native = "${SRC_URI_BASE}" |
34 | 34 | ||
35 | SRC_URI[md5sum] = "f7c6f0431ca8d44ee132a55d583212c1" | 35 | SRC_URI[md5sum] = "f7c6f0431ca8d44ee132a55d583212c1" |
36 | SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207" | 36 | SRC_URI[sha256sum] = "593f77f7584704bdf9de41598a084a4208c3ad3b940a1de1faaf8f59a15cc207" |
@@ -80,18 +80,18 @@ do_install_append () { | |||
80 | chown -R root:lp ${D}${sysconfdir}/cups | 80 | chown -R root:lp ${D}${sysconfdir}/cups |
81 | } | 81 | } |
82 | 82 | ||
83 | python do_patch_virtclass-native () { | 83 | python do_patch_class-native () { |
84 | pass | 84 | pass |
85 | } | 85 | } |
86 | 86 | ||
87 | do_compile_virtclass-native () { | 87 | do_compile_class-native () { |
88 | mkdir -p obj | 88 | mkdir -p obj |
89 | for i in genarch genconf mkromfs echogs gendev genht; do | 89 | for i in genarch genconf mkromfs echogs gendev genht; do |
90 | oe_runmake obj/aux/$i | 90 | oe_runmake obj/aux/$i |
91 | done | 91 | done |
92 | } | 92 | } |
93 | 93 | ||
94 | do_install_virtclass-native () { | 94 | do_install_class-native () { |
95 | install -d ${D}${bindir}/ghostscript-${PV} | 95 | install -d ${D}${bindir}/ghostscript-${PV} |
96 | for i in genarch genconf mkromfs echogs gendev genht; do | 96 | for i in genarch genconf mkromfs echogs gendev genht; do |
97 | install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i | 97 | install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i |
diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb index c7da1b4178..157365b2a7 100644 --- a/meta/recipes-extended/groff/groff_1.20.1.bb +++ b/meta/recipes-extended/groff/groff_1.20.1.bb | |||
@@ -14,7 +14,7 @@ SRC_URI[md5sum] = "48fa768dd6fdeb7968041dd5ae8e2b02" | |||
14 | SRC_URI[sha256sum] = "b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805" | 14 | SRC_URI[sha256sum] = "b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805" |
15 | 15 | ||
16 | DEPENDS = "groff-native" | 16 | DEPENDS = "groff-native" |
17 | DEPENDS_virtclass-native = "" | 17 | DEPENDS_class-native = "" |
18 | 18 | ||
19 | inherit autotools | 19 | inherit autotools |
20 | 20 | ||
@@ -44,7 +44,7 @@ do_install_append() { | |||
44 | done | 44 | done |
45 | } | 45 | } |
46 | 46 | ||
47 | do_install_append_virtclass-native() { | 47 | do_install_append_class-native() { |
48 | # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location | 48 | # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location |
49 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. | 49 | # for target as /usr/bin/perl, so fix it to /usr/bin/perl. |
50 | for i in afmtodit mmroff; do | 50 | for i in afmtodit mmroff; do |
diff --git a/meta/recipes-extended/gzip/gzip_1.5.bb b/meta/recipes-extended/gzip/gzip_1.5.bb index 2c6917d234..f7b859374a 100644 --- a/meta/recipes-extended/gzip/gzip_1.5.bb +++ b/meta/recipes-extended/gzip/gzip_1.5.bb | |||
@@ -2,7 +2,7 @@ require gzip.inc | |||
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r0" |
4 | 4 | ||
5 | PROVIDES_append_virtclass-native = " gzip-replacement-native" | 5 | PROVIDES_append_class-native = " gzip-replacement-native" |
6 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" | 6 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" |
7 | 7 | ||
8 | BBCLASSEXTEND = "native" | 8 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-extended/perl/libtimedate-perl_1.20.bb b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb index 12439cf727..780f77484c 100644 --- a/meta/recipes-extended/perl/libtimedate-perl_1.20.bb +++ b/meta/recipes-extended/perl/libtimedate-perl_1.20.bb | |||
@@ -13,7 +13,7 @@ inherit cpan allarch | |||
13 | 13 | ||
14 | BBCLASSEXTEND = "native" | 14 | BBCLASSEXTEND = "native" |
15 | 15 | ||
16 | RDEPENDS_${PN}_virtclass-native = "" | 16 | RDEPENDS_${PN}_class-native = "" |
17 | RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local" | 17 | RDEPENDS_${PN} += "perl-module-carp perl-module-exporter perl-module-strict perl-module-time-local" |
18 | 18 | ||
19 | SRC_URI[md5sum] = "7da7452bce4c684e4238e6d09b390200" | 19 | SRC_URI[md5sum] = "7da7452bce4c684e4238e6d09b390200" |
diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc index 3721c9786e..c897f15d7d 100644 --- a/meta/recipes-extended/pigz/pigz.inc +++ b/meta/recipes-extended/pigz/pigz.inc | |||
@@ -12,7 +12,7 @@ PR = "r1" | |||
12 | SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz \ | 12 | SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz \ |
13 | file://ldflags.patch" | 13 | file://ldflags.patch" |
14 | 14 | ||
15 | PROVIDES_virtclass-native += "gzip-native" | 15 | PROVIDES_class-native += "gzip-native" |
16 | 16 | ||
17 | DEPENDS = "zlib" | 17 | DEPENDS = "zlib" |
18 | 18 | ||
diff --git a/meta/recipes-extended/stat/stat_3.3.bb b/meta/recipes-extended/stat/stat_3.3.bb index b7666f065c..73e0873f81 100644 --- a/meta/recipes-extended/stat/stat_3.3.bb +++ b/meta/recipes-extended/stat/stat_3.3.bb | |||
@@ -18,7 +18,7 @@ do_install() { | |||
18 | install -m 644 stat.1 ${D}${mandir}/man1 | 18 | install -m 644 stat.1 ${D}${mandir}/man1 |
19 | } | 19 | } |
20 | 20 | ||
21 | #do_install_virtclass-native() { | 21 | #do_install_class-native() { |
22 | # install -d ${D}${bindir} | 22 | # install -d ${D}${bindir} |
23 | # install -m 755 stat ${D}${bindir} | 23 | # install -m 755 stat ${D}${bindir} |
24 | #} | 24 | #} |
diff --git a/meta/recipes-extended/texinfo/texinfo_4.13a.bb b/meta/recipes-extended/texinfo/texinfo_4.13a.bb index 50892ce2cf..327faabddd 100644 --- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb +++ b/meta/recipes-extended/texinfo/texinfo_4.13a.bb | |||
@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010" | |||
9 | PR = "r5" | 9 | PR = "r5" |
10 | 10 | ||
11 | DEPENDS = "zlib ncurses texinfo-native" | 11 | DEPENDS = "zlib ncurses texinfo-native" |
12 | DEPENDS_virtclass-native = "zlib-native ncurses-native" | 12 | DEPENDS_class-native = "zlib-native ncurses-native" |
13 | 13 | ||
14 | TARGET_PATCH = "file://use_host_makedoc.patch" | 14 | TARGET_PATCH = "file://use_host_makedoc.patch" |
15 | TARGET_PATCH_virtclass-native = "" | 15 | TARGET_PATCH_class-native = "" |
16 | 16 | ||
17 | SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \ | 17 | SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \ |
18 | file://texinfo-4.12-zlib.patch \ | 18 | file://texinfo-4.12-zlib.patch \ |
@@ -44,7 +44,7 @@ do_install_append() { | |||
44 | mkdir -p ${D}${datadir}/${tex_texinfo} | 44 | mkdir -p ${D}${datadir}/${tex_texinfo} |
45 | install -p -m644 doc/texinfo.tex doc/txi-??.tex ${D}${datadir}/${tex_texinfo} | 45 | install -p -m644 doc/texinfo.tex doc/txi-??.tex ${D}${datadir}/${tex_texinfo} |
46 | } | 46 | } |
47 | do_install_append_virtclass-native() { | 47 | do_install_append_class-native() { |
48 | install -m 755 info/makedoc ${D}${bindir} | 48 | install -m 755 info/makedoc ${D}${bindir} |
49 | } | 49 | } |
50 | 50 | ||
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index e11f9f7781..a1547fc3b9 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb | |||
@@ -16,7 +16,7 @@ S = "${WORKDIR}/unzip60" | |||
16 | EXTRA_OEMAKE += "STRIP=true LF2=''" | 16 | EXTRA_OEMAKE += "STRIP=true LF2=''" |
17 | 17 | ||
18 | export LD = "${CC}" | 18 | export LD = "${CC}" |
19 | LD_virtclass-native = "${CC}" | 19 | LD_class-native = "${CC}" |
20 | 20 | ||
21 | do_compile() { | 21 | do_compile() { |
22 | oe_runmake -f unix/Makefile generic | 22 | oe_runmake -f unix/Makefile generic |