nativesdk-packagegroup-sdk-host: replace smartpm with dnf
(From OE-Core rev: 45b97161915ce7872ef7161451a5c83507072a72) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
df3734551f
commit
d4efcded26
|
@ -22,7 +22,7 @@ RDEPENDS_${PN} = "\
|
||||||
nativesdk-automake \
|
nativesdk-automake \
|
||||||
nativesdk-shadow \
|
nativesdk-shadow \
|
||||||
nativesdk-makedevs \
|
nativesdk-makedevs \
|
||||||
nativesdk-smartpm \
|
nativesdk-dnf \
|
||||||
nativesdk-postinst-intercept \
|
nativesdk-postinst-intercept \
|
||||||
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \
|
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-wayland', '', d)} \
|
||||||
"
|
"
|
||||||
|
|
|
@ -28,7 +28,6 @@ DEPENDS += "python-backports-lzma"
|
||||||
EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}"
|
EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native nativesdk"
|
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"
|
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
|
# Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in
|
||||||
|
|
|
@ -19,5 +19,5 @@ DEPENDS = "libxml2 expat libcheck"
|
||||||
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}"
|
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}"
|
||||||
OECMAKE_SOURCEPATH = "${S}/libcomps"
|
OECMAKE_SOURCEPATH = "${S}/libcomps"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
|
|
|
@ -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-native = " -DWITH_GIR=OFF"
|
||||||
EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF"
|
EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_GIR=OFF"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
|
|
|
@ -20,5 +20,5 @@ inherit cmake distutils-base pkgconfig
|
||||||
|
|
||||||
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}"
|
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR}"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
|
|
|
@ -18,4 +18,4 @@ DEPENDS_append = " xz"
|
||||||
RDEPENDS_${PN} += "python-core python-io python-pkgutil"
|
RDEPENDS_${PN} += "python-core python-io python-pkgutil"
|
||||||
RDEPENDS_${PN}_class-native += "python-core"
|
RDEPENDS_${PN}_class-native += "python-core"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
|
@ -12,6 +12,6 @@ inherit distutils
|
||||||
|
|
||||||
RDEPENDS_${PN} += "python-core"
|
RDEPENDS_${PN} += "python-core"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
S = "${WORKDIR}/iniparse-${PV}"
|
S = "${WORKDIR}/iniparse-${PV}"
|
||||||
|
|
|
@ -15,4 +15,4 @@ DEPENDS = "gpgme python"
|
||||||
|
|
||||||
RDEPENDS_${PN} += "python-core"
|
RDEPENDS_${PN} += "python-core"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
|
@ -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
|
# 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"
|
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
|
# 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
|
# libmagic also has sysroot path contamination, so override it
|
||||||
|
|
|
@ -29,7 +29,7 @@ SRC_URI_append_class-native = " file://pkg-config-native.patch"
|
||||||
SRC_URI[archive.md5sum] = "0dc6570953112a464a409fb99258ccbc"
|
SRC_URI[archive.md5sum] = "0dc6570953112a464a409fb99258ccbc"
|
||||||
SRC_URI[archive.sha256sum] = "1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42"
|
SRC_URI[archive.sha256sum] = "1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42"
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
# Do not check for XML catalogs when building because that
|
# Do not check for XML catalogs when building because that
|
||||||
# information is not used for anything during build. Recipe
|
# information is not used for anything during build. Recipe
|
||||||
|
|
|
@ -47,7 +47,7 @@ inherit autotools texinfo binconfig-disabled pkgconfig ${PYTHON_INHERIT}
|
||||||
|
|
||||||
export PKG_CONFIG='pkg-config'
|
export PKG_CONFIG='pkg-config'
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
||||||
PACKAGES =+ "${PN}-cpp"
|
PACKAGES =+ "${PN}-cpp"
|
||||||
PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python2-gpg ', '', d)}"
|
PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python2-gpg ', '', d)}"
|
||||||
|
|
|
@ -28,4 +28,4 @@ do_configure_prepend () {
|
||||||
rm -f ${S}/m4/*.m4
|
rm -f ${S}/m4/*.m4
|
||||||
}
|
}
|
||||||
|
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
|
@ -20,5 +20,6 @@ CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk"
|
||||||
RREPLACES_${PN} = "check (<= 0.9.5)"
|
RREPLACES_${PN} = "check (<= 0.9.5)"
|
||||||
RDEPENDS_${PN} += "gawk"
|
RDEPENDS_${PN} += "gawk"
|
||||||
RDEPENDS_${PN}_class-native = ""
|
RDEPENDS_${PN}_class-native = ""
|
||||||
|
RDEPENDS_${PN}_class-nativesdk = ""
|
||||||
|
|
||||||
BBCLASSEXTEND = "native nativesdk"
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
Loading…
Reference in New Issue