From 45b97161915ce7872ef7161451a5c83507072a72 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 26 Jan 2017 17:42:36 +0200 Subject: nativesdk-packagegroup-sdk-host: replace smartpm with dnf Signed-off-by: Alexander Kanavin --- meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | 2 +- meta/recipes-devtools/dnf/dnf_git.bb | 1 - meta/recipes-devtools/libcomps/libcomps_git.bb | 2 +- meta/recipes-devtools/libdnf/libdnf_git.bb | 2 +- meta/recipes-devtools/librepo/librepo_git.bb | 2 +- .../recipes-devtools/python-backports-lzma/python-backports-lzma_git.bb | 2 +- meta/recipes-devtools/python/python-iniparse_0.4.bb | 2 +- meta/recipes-devtools/python/python-pygpgme_0.3.bb | 2 +- meta/recipes-devtools/rpm/rpm_git.bb | 2 +- meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb | 2 +- meta/recipes-support/gpgme/gpgme_1.8.0.bb | 2 +- meta/recipes-support/libassuan/libassuan_2.4.3.bb | 2 +- meta/recipes-support/libcheck/libcheck_0.10.0.bb | 1 + 13 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index 2c2abed33c..3283e7370e 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -22,7 +22,7 @@ RDEPENDS_${PN} = "\ nativesdk-automake \ nativesdk-shadow \ nativesdk-makedevs \ - nativesdk-smartpm \ + nativesdk-dnf \ nativesdk-postinst-intercept \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \ " diff --git a/meta/recipes-devtools/dnf/dnf_git.bb b/meta/recipes-devtools/dnf/dnf_git.bb index ff22d6f5f0..018352a6c9 100644 --- a/meta/recipes-devtools/dnf/dnf_git.bb +++ b/meta/recipes-devtools/dnf/dnf_git.bb @@ -28,7 +28,6 @@ DEPENDS += "python-backports-lzma" EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}" BBCLASSEXTEND = "native nativesdk" - RDEPENDS_${PN}_class-target += "python-core python-codecs python-netclient python-email python-threading python-distutils librepo python-shell python-subprocess libcomps libdnf python-sqlite3 python-compression python-pygpgme python-backports-lzma python-rpm python-iniparse python-json python-importlib python-curses python-argparse" # Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in diff --git a/meta/recipes-devtools/libcomps/libcomps_git.bb b/meta/recipes-devtools/libcomps/libcomps_git.bb index 448ea62f67..8ff13b26b6 100644 --- a/meta/recipes-devtools/libcomps/libcomps_git.bb +++ b/meta/recipes-devtools/libcomps/libcomps_git.bb @@ -19,5 +19,5 @@ DEPENDS = "libxml2 expat libcheck" EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}" OECMAKE_SOURCEPATH = "${S}/libcomps" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/libdnf/libdnf_git.bb b/meta/recipes-devtools/libdnf/libdnf_git.bb index 681c0029c5..6e9cfcc862 100644 --- a/meta/recipes-devtools/libdnf/libdnf_git.bb +++ b/meta/recipes-devtools/libdnf/libdnf_git.bb @@ -36,5 +36,5 @@ EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF EXTRA_OECMAKE_append_class-native = " -DWITH_GIR=OFF" EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/librepo/librepo_git.bb b/meta/recipes-devtools/librepo/librepo_git.bb index 70e88c47b9..3f3c5fbcf5 100644 --- a/meta/recipes-devtools/librepo/librepo_git.bb +++ b/meta/recipes-devtools/librepo/librepo_git.bb @@ -20,5 +20,5 @@ inherit cmake distutils-base pkgconfig EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python-backports-lzma/python-backports-lzma_git.bb b/meta/recipes-devtools/python-backports-lzma/python-backports-lzma_git.bb index 6d3b8d569d..93c6684be6 100644 --- a/meta/recipes-devtools/python-backports-lzma/python-backports-lzma_git.bb +++ b/meta/recipes-devtools/python-backports-lzma/python-backports-lzma_git.bb @@ -18,4 +18,4 @@ DEPENDS_append = " xz" RDEPENDS_${PN} += "python-core python-io python-pkgutil" RDEPENDS_${PN}_class-native += "python-core" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python-iniparse_0.4.bb b/meta/recipes-devtools/python/python-iniparse_0.4.bb index f2515759b1..c6d98c2fdf 100644 --- a/meta/recipes-devtools/python/python-iniparse_0.4.bb +++ b/meta/recipes-devtools/python/python-iniparse_0.4.bb @@ -12,6 +12,6 @@ inherit distutils RDEPENDS_${PN} += "python-core" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" S = "${WORKDIR}/iniparse-${PV}" diff --git a/meta/recipes-devtools/python/python-pygpgme_0.3.bb b/meta/recipes-devtools/python/python-pygpgme_0.3.bb index f7dd835eee..ac8bc9d62e 100644 --- a/meta/recipes-devtools/python/python-pygpgme_0.3.bb +++ b/meta/recipes-devtools/python/python-pygpgme_0.3.bb @@ -15,4 +15,4 @@ DEPENDS = "gpgme python" RDEPENDS_${PN} += "python-core" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb index 22a4e71a80..c71a41064c 100644 --- a/meta/recipes-devtools/rpm/rpm_git.bb +++ b/meta/recipes-devtools/rpm/rpm_git.bb @@ -60,7 +60,7 @@ EXTRA_OECONF_append_libc-musl = " --disable-nls" # Also disable plugins, so that rpm doesn't attempt to inhibit shutdown via session dbus EXTRA_OECONF_append_class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" # Direct rpm-native to read configuration from our sysroot, not the one it was compiled in # libmagic also has sysroot path contamination, so override it diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb index 6af996e359..7de36ae9e5 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb @@ -29,7 +29,7 @@ SRC_URI_append_class-native = " file://pkg-config-native.patch" SRC_URI[archive.md5sum] = "0dc6570953112a464a409fb99258ccbc" SRC_URI[archive.sha256sum] = "1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" # Do not check for XML catalogs when building because that # information is not used for anything during build. Recipe diff --git a/meta/recipes-support/gpgme/gpgme_1.8.0.bb b/meta/recipes-support/gpgme/gpgme_1.8.0.bb index 36a95417b2..d3e7880a47 100644 --- a/meta/recipes-support/gpgme/gpgme_1.8.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.8.0.bb @@ -47,7 +47,7 @@ inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT} export PKG_CONFIG='pkg-config' -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" PACKAGES =+ "${PN}-cpp" PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python2-gpg ', '', d)}" diff --git a/meta/recipes-support/libassuan/libassuan_2.4.3.bb b/meta/recipes-support/libassuan/libassuan_2.4.3.bb index 1b3916d734..926c279f90 100644 --- a/meta/recipes-support/libassuan/libassuan_2.4.3.bb +++ b/meta/recipes-support/libassuan/libassuan_2.4.3.bb @@ -28,4 +28,4 @@ do_configure_prepend () { rm -f ${S}/m4/*.m4 } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libcheck/libcheck_0.10.0.bb b/meta/recipes-support/libcheck/libcheck_0.10.0.bb index 9d34198a96..4db2d7528c 100644 --- a/meta/recipes-support/libcheck/libcheck_0.10.0.bb +++ b/meta/recipes-support/libcheck/libcheck_0.10.0.bb @@ -20,5 +20,6 @@ CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk" RREPLACES_${PN} = "check (<= 0.9.5)" RDEPENDS_${PN} += "gawk" RDEPENDS_${PN}_class-native = "" +RDEPENDS_${PN}_class-nativesdk = "" BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg