diff options
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpmresolve_1.0.bb | 2 |
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 |
93 | rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros" | 93 | rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros" |
94 | rpm_macros_virtclass-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros" | 94 | rpm_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. |
100 | PACKAGECONFIG_virtclass-native ??= "db bzip2 zlib beecrypt openssl libelf python" | 100 | PACKAGECONFIG_class-native ??= "db bzip2 zlib beecrypt openssl libelf python" |
101 | PACKAGECONFIG ??= "db bzip2 zlib beecrypt openssl libelf python" | 101 | PACKAGECONFIG ??= "db bzip2 zlib beecrypt openssl libelf python" |
102 | 102 | ||
103 | PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2," | 103 | PACKAGECONFIG[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 | ||
434 | do_install_append_virtclass-native() { | 434 | do_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 | ||
22 | do_install_append_virtclass-native() { | 22 | do_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 \ |