reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/poky/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb b/poky/meta/recipes-support/libfm/libfm-extra_1.3.1.bb
similarity index 80%
rename from poky/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb
rename to poky/meta/recipes-support/libfm/libfm-extra_1.3.1.bb
index 734d010..85102a1 100644
--- a/poky/meta/recipes-support/libfm/libfm-extra_1.3.0.2.bb
+++ b/poky/meta/recipes-support/libfm/libfm-extra_1.3.1.bb
@@ -11,8 +11,8 @@
file://0001-nls.m4-Take-it-from-gettext-0.15.patch \
"
-SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b"
-SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72"
+SRC_URI[md5sum] = "c15ecd2c9317e2c385cd3f046d0b61ba"
+SRC_URI[sha256sum] = "96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4"
S = "${WORKDIR}/libfm-${PV}"
diff --git a/poky/meta/recipes-support/libfm/libfm_1.3.0.2.bb b/poky/meta/recipes-support/libfm/libfm_1.3.1.bb
similarity index 92%
rename from poky/meta/recipes-support/libfm/libfm_1.3.0.2.bb
rename to poky/meta/recipes-support/libfm/libfm_1.3.1.bb
index 62d6a51..65a6f8e 100644
--- a/poky/meta/recipes-support/libfm/libfm_1.3.0.2.bb
+++ b/poky/meta/recipes-support/libfm/libfm_1.3.1.bb
@@ -16,8 +16,8 @@
file://0001-Do-not-add-library-path-to-avoid-host-contamination.patch \
"
-SRC_URI[md5sum] = "02a024714d51e0d37afc7bd596a44f3b"
-SRC_URI[sha256sum] = "18d06f7996ce1cf8947df6e106bc0338c6ae0c4138c316f2501f6f6f435c7c72"
+SRC_URI[md5sum] = "c15ecd2c9317e2c385cd3f046d0b61ba"
+SRC_URI[sha256sum] = "96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4"
inherit autotools pkgconfig gtk-doc gettext distro_features_check
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"