diff options
7 files changed, 13 insertions, 28 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb index 8b4459e7c..19da7388c 100644 --- a/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb +++ b/meta-phosphor/common/recipes-phosphor/dbus/obmc-rest.bb @@ -21,6 +21,6 @@ SRC_URI += " \ git://github.com/openbmc/phosphor-rest-server \ " -SRCREV = "275ec270684cd3b946674d02462bc9ed1890360e" +SRCREV = "f481dfc6b059677d06c158a5e23cfffab56edc3f" S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb index aa8cc945b..1de0cc4b3 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged.bb @@ -10,8 +10,8 @@ SYSTEMD_SERVICE_${PN} = "btbridged.service" inherit obmc-phosphor-host-ipmi-hw S = "${WORKDIR}/git" -SRC_URI += "git://github.com/openbmc/btbridge file://makefile.patch" -SRCREV="e71c7941a35949c0b93ce5e7864ab35447d30df2" +SRC_URI += "git://github.com/openbmc/btbridge" +SRCREV="eee5a2c00faf794a40bf11650e7c0585adc88932" # This is how linux-libc-headers says to include custom uapi headers EXTRA_OEMAKE_append = "CFLAGS=-I${STAGING_KERNEL_DIR}/include/uapi" diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch b/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch deleted file mode 100644 index 7cb1abea7..000000000 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/btbridged/makefile.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/Makefile b/Makefile -index a55897f..52e1063 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,7 @@ --CPPFLAGS=$(shell pkg-config --cflags libsystemd) --LDFLAGS=$(shell pkg-config --libs libsystemd) -+all: btbridged - --EXE = btbridged -- --all: $(EXE) -+btbridged: btbridged.c -+ $(CC) $(CFLAGS) `pkg-config --cflags --libs libsystemd` $^ -o $@ - - clean: -- rm -rf *.o $(EXE) -+ rm -f *.o btbridge diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb index 26eea2a7d..d61b2e6d4 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb @@ -18,14 +18,17 @@ TARGET_CFLAGS += "-std=gnu++14" SRC_URI += "git://github.com/openbmc/ipmi-fru-parser" -SRCREV = "1c779b8570849a52dac828538c36a59798f4583a" +SRCREV = "20656b1e15bebd7bc2754bd680f045e253bd2809" FILES_${PN} += "${libdir}/host-ipmid/*.so" FILES_${PN}-dbg += "${libdir}/host-ipmid/.debug" S = "${WORKDIR}/git" -do_install() { - install -m 0755 -d ${D}${libdir}/host-ipmid - install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/ +do_install() { + oe_runmake install DESTDIR=${D} LIBDIR=${libdir} BINDIR=${sbindir} } + + +# install -m 0755 -d ${D}${libdir}/host-ipmid +# install -m 0755 ${S}/*.so ${D}${libdir}/host-ipmid/
\ No newline at end of file diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb index 739388969..c20bd9ac9 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb @@ -14,7 +14,7 @@ inherit obmc-phosphor-c-daemon SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "f0d4635fa2b417bd0eef3f19ae98e56ec615e703" +SRCREV = "7e478ce6b065a8bbd2de0ac00934e43cc1639501" S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb index c27937a0c..78856ddf8 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb @@ -12,7 +12,7 @@ inherit obmc-phosphor-c-daemon SRC_URI += "git://github.com/openbmc/phosphor-event" -SRCREV = "0a4a39e46622a9d6d4719b14f8955866fdb51a20" +SRCREV = "bebdb23ea092df6cde23e6da2a8940bd84de4810" RDEPENDS_${PN} += "libsystemd" DEPENDS += "systemd" diff --git a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb index c3d240a3a..b8259a052 100644 --- a/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb +++ b/meta-phosphor/common/recipes-phosphor/skeleton/skeleton.bb @@ -16,7 +16,7 @@ DEPENDS += "glib-2.0" RDEPENDS_${PN} += "python-subprocess python-tftpy" SRC_URI += "git://github.com/openbmc/skeleton" -SRCREV = "af915f1251b4989f41829f9ae8589b42ef81efd7" +SRCREV = "4732708e4e10411145f7eb4652f23dbfac341a2d" S = "${WORKDIR}" |
