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-graphics/harfbuzz/harfbuzz_1.8.8.bb b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb
similarity index 75%
rename from poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb
rename to poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb
index b904d93..4b292d8 100644
--- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb
+++ b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb
@@ -11,8 +11,8 @@
DEPENDS = "glib-2.0 cairo fontconfig freetype"
SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2"
-SRC_URI[md5sum] = "81dbce82d6471ec2b2a627ce02d03e5d"
-SRC_URI[sha256sum] = "a8e5c86e4d99e1cc9865ec1b8e9b05b98e413c2a885cd11f8e9bb9502dd3e3a9"
+SRC_URI[md5sum] = "531de9df7c8a5405dd9c6a873fcee8c2"
+SRC_URI[sha256sum] = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"
inherit autotools pkgconfig lib_package gtk-doc
@@ -27,12 +27,6 @@
--without-graphite2 \
"
-do_configure_prepend() {
- # This is ancient and can get used instead of the patched one we ship,
- # so delete it. In 1.8.9 this should be removed upstream.
- rm -f ${S}/m4/pkg.m4
-}
-
PACKAGES =+ "${PN}-icu ${PN}-icu-dev"
LEAD_SONAME = "libharfbuzz.so"
@@ -43,4 +37,4 @@
${libdir}/pkgconfig/harfbuzz-icu.pc \
"
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"