summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-10-27 16:48:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-02 16:18:29 +0000
commitaea2d8c02c7abd7ecbabae8b3932ceb7a01cb20d (patch)
tree11e419c0fceecd67e09f98feafc0adb7e1015b6a /meta/recipes-devtools/rpm
parentd005b787dfe2c9bcaefe41836f9b1c3008105171 (diff)
downloadpoky-aea2d8c02c7abd7ecbabae8b3932ceb7a01cb20d.tar.gz
recipes-devtools: 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: bb67ddeb2eed3e25c626a279ef53a7e8c7bfe6f2) 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/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb6
-rw-r--r--meta/recipes-devtools/rpm/rpmresolve_1.0.bb2
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index e838f40faa..3268160d86 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -91,13 +91,13 @@ acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
91 91
92# Specify the default rpm macros in terms of adjustable variables 92# Specify the default rpm macros in terms of adjustable variables
93rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros" 93rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros"
94rpm_macros_virtclass-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros" 94rpm_macros_class-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros"
95 95
96# sqlite lua tcl augeas nss gcrypt neon xz xar keyutils perl selinux 96# sqlite lua tcl augeas nss gcrypt neon xz xar keyutils perl selinux
97 97
98# Note: perl and sqlite w/o db specified does not currently work. 98# Note: perl and sqlite w/o db specified does not currently work.
99# tcl, augeas, nss, gcrypt, xar and keyutils support is untested. 99# tcl, augeas, nss, gcrypt, xar and keyutils support is untested.
100PACKAGECONFIG_virtclass-native ??= "db bzip2 zlib beecrypt openssl libelf python" 100PACKAGECONFIG_class-native ??= "db bzip2 zlib beecrypt openssl libelf python"
101PACKAGECONFIG ??= "db bzip2 zlib beecrypt openssl libelf python" 101PACKAGECONFIG ??= "db bzip2 zlib beecrypt openssl libelf python"
102 102
103PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2," 103PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2,"
@@ -431,7 +431,7 @@ do_install_append() {
431 rm -f ${D}/usr/lib/rpm/bin/api-sanity-checker.pl 431 rm -f ${D}/usr/lib/rpm/bin/api-sanity-checker.pl
432} 432}
433 433
434do_install_append_virtclass-native() { 434do_install_append_class-native() {
435 create_wrapper ${D}/${bindir}/rpm \ 435 create_wrapper ${D}/${bindir}/rpm \
436 RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \ 436 RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \
437 RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \ 437 RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \
diff --git a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb b/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
index ea542e1cc3..48c52c0403 100644
--- a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
+++ b/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
@@ -19,7 +19,7 @@ do_install() {
19 install -m 0755 rpmresolve ${D}${bindir} 19 install -m 0755 rpmresolve ${D}${bindir}
20} 20}
21 21
22do_install_append_virtclass-native() { 22do_install_append_class-native() {
23 create_wrapper ${D}/${bindir}/rpmresolve \ 23 create_wrapper ${D}/${bindir}/rpmresolve \
24 RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \ 24 RPM_USRLIBRPM=${STAGING_LIBDIR_NATIVE}/rpm \
25 RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \ 25 RPM_ETCRPM=${STAGING_ETCDIR_NATIVE}/rpm \