diff options
Diffstat (limited to 'meta-phosphor/recipes-extended')
5 files changed, 53 insertions, 43 deletions
diff --git a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb index 2f17076a7..2e9894f94 100644 --- a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb +++ b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb @@ -8,7 +8,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/pam-ipmi" -SRCREV = "65edb939ef8ffc4d46c7d12e759580c048c5d348" +SRCREV = "c2ef3319b42d86862b479e08e652ab36a26a14db" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb new file mode 100644 index 000000000..bf815ce03 --- /dev/null +++ b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb @@ -0,0 +1,31 @@ +SUMMARY = "sdbus++ dbus API / binding generator" +DESCRIPTION = "Generates bindings against sdbusplus for dbus APIs" + +inherit autotools pkgconfig +inherit obmc-phosphor-python3-autotools + +include sdbusplus-rev.inc + +# Provide these aliases temporarily until everyone can move over to the +# new package name. +PROVIDES_class-native += "sdbusplus-native" +PROVIDES_class-nativesdk += "sdbusplus-nativesdk" + +DEPENDS += " \ + autoconf-archive-native \ + ${PYTHON_PN}-inflection-native \ + ${PYTHON_PN}-mako-native \ + ${PYTHON_PN}-pyyaml-native \ + " + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-inflection \ + ${PYTHON_PN}-mako \ + ${PYTHON_PN}-pyyaml \ + " + +PACKAGECONFIG ??= "transaction" +PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" +PACKAGECONFIG[transaction] = "--enable-transaction,--disable-transaction" + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc new file mode 100644 index 000000000..2c13668ba --- /dev/null +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -0,0 +1,10 @@ +HOMEPAGE = "http://github.com/openbmc/sdbusplus" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +S = "${WORKDIR}/git" + +SRC_URI += "git://github.com/openbmc/sdbusplus" +SRCREV = "afe80cf2e5dc4aefe3b041adeb0230e61929bf12" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index 79d638d51..9cc4cdc3f 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -1,13 +1,10 @@ SUMMARY = "C++ bindings for systemd dbus APIs" DESCRIPTION = "C++ bindings for systemd dbus APIs." -HOMEPAGE = "http://github.com/openbmc/sdbusplus" -PR = "r1" -PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig -inherit obmc-phosphor-python-autotools +inherit obmc-phosphor-python3-autotools + +include sdbusplus-rev.inc DEPENDS += " \ autoconf-archive-native \ @@ -15,43 +12,15 @@ DEPENDS += " \ ${PYTHON_PN}-mako-native \ ${PYTHON_PN}-pyyaml-native \ " -RDEPENDS_sdbus++ += " \ - ${PYTHON_PN} \ - ${PYTHON_PN}-inflection \ - ${PYTHON_PN}-mako \ - ${PYTHON_PN}-pyyaml \ - " - -# sdbus++ has a handful of runtime dependencies on other python packages. -# Bitbake doesn't do anything with RDEPENDS in native context because -# native context doesn't have packages. -# -# While technically sdbus++ doesn't require its runtime dependencies to be -# installed to build, work around the above native context behavior -# by adding a build dependency so that clients don't have to DEPEND -# on sdbus++ runtime dependencies manually. - -DEPENDS_append_class-native = " \ - ${PYTHON_PN}-inflection-native \ - ${PYTHON_PN}-mako-native \ - ${PYTHON_PN}-pyyaml-native \ - " - -SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "ddc0eba2bea1f55dff275726903deecd88ac6f3d" PACKAGECONFIG ??= "libsdbusplus transaction" PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" PACKAGECONFIG[transaction] = "--enable-transaction,--disable-transaction" -S = "${WORKDIR}/git" - -PROVIDES_prepend = "sdbus++ " -PACKAGE_BEFORE_PN = "sdbus++" -FILES_sdbus++_append = " ${bindir}/sdbus++" -PYTHON_AUTOTOOLS_PACKAGE = "sdbus++" - -PACKAGECONFIG_remove_class-native = "libsdbusplus" -PACKAGECONFIG_remove_class-nativesdk = "libsdbusplus" - -BBCLASSEXTEND += "native nativesdk" +# Remove unused sdbus++ contents (included in python3-sdbus++ package). +do_install_append() { + rm ${D}/${bindir}/sdbus++ + rmdir ${D}/${bindir} || true + rm -rf ${D}/${PYTHON_SITEPACKAGES_DIR} + rmdir ${D}/${libdir}/${PYTHON_DIR} || true +} diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index e1440c1b6..4c3822fe4 100644 --- a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb +++ b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb @@ -14,6 +14,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/stdplus" -SRCREV = "3b4c20fe517c23fbe8d1418ee3cdb98b59b2fd30" +SRCREV = "a2d67e20529a1f720c13586553ad2cec1451d5a8" S = "${WORKDIR}/git" |