From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Sun, 16 Dec 2018 17:11:34 -0800
Subject: reset upstream subtrees to yocto 2.6

Reset the following subtrees on thud HEAD:

  poky: 87e3a9739d
  meta-openembedded: 6094ae18c8
  meta-security: 31dc4e7532
  meta-raspberrypi: a48743dc36
  meta-xilinx: c42016e2e6

Also re-apply backports that didn't make it into thud:
  poky:
    17726d0 systemd-systemctl-native: handle Install wildcards

  meta-openembedded:
    4321a5d libtinyxml2: update to 7.0.1
    042f0a3 libcereal: Add native and nativesdk classes
    e23284f libcereal: Allow empty package
    030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
    179a1b9 gtest: update to 1.8.1

Squashed OpenBMC subtree compatibility updates:
  meta-aspeed:
    Brad Bishop (1):
          aspeed: add yocto 2.6 compatibility

  meta-ibm:
    Brad Bishop (1):
          ibm: prepare for yocto 2.6

  meta-ingrasys:
    Brad Bishop (1):
          ingrasys: set layer compatibility to yocto 2.6

  meta-openpower:
    Brad Bishop (1):
          openpower: set layer compatibility to yocto 2.6

  meta-phosphor:
    Brad Bishop (3):
          phosphor: set layer compatibility to thud
          phosphor: libgpg-error: drop patches
          phosphor: react to fitimage artifact rename

    Ed Tanous (4):
          Dropbear: upgrade options for latest upgrade
          yocto2.6: update openssl options
          busybox: remove upstream watchdog patch
          systemd: Rebase CONFIG_CGROUP_BPF patch

Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 poky/meta/recipes-devtools/python-numpy/python-numpy.inc        | 6 ++++--
 poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.2.bb  | 6 ------
 poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb  | 6 ++++++
 poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.2.bb | 2 --
 poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb | 2 ++
 5 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.2.bb
 create mode 100644 poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb
 delete mode 100644 poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.2.bb
 create mode 100644 poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb

(limited to 'poky/meta/recipes-devtools/python-numpy')

diff --git a/poky/meta/recipes-devtools/python-numpy/python-numpy.inc b/poky/meta/recipes-devtools/python-numpy/python-numpy.inc
index 284f21368..1b51f7baa 100644
--- a/poky/meta/recipes-devtools/python-numpy/python-numpy.inc
+++ b/poky/meta/recipes-devtools/python-numpy/python-numpy.inc
@@ -10,8 +10,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
            file://fix_shebang_f2py.patch \
            file://0001-npy_cpu-Add-riscv-support.patch \
            ${CONFIGFILESURI} "
-SRC_URI[md5sum] = "e39878fafb11828983aeec583dda4a06"
-SRC_URI[sha256sum] = "ddbcda194f49e0cf0663fa8131cb9d7a3b876d14dea0047d3c5fdfaf20adbb40"
+SRC_URI[md5sum] = "e3189ee851c3a0e2e6e4c6e80a711ec8"
+SRC_URI[sha256sum] = "1b4a02758fb68a65ea986d808867f1d6383219c234aef553a8741818e795b529"
 
 UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
@@ -77,6 +77,8 @@ CONFIGFILESURI_riscv64 = " \
 
 S = "${WORKDIR}/numpy-${PV}"
 
+CLEANBROKEN = "1"
+
 # Make the build fail and replace *config.h with proper one
 # This is a ugly, ugly hack - Koen
 do_compile_prepend_class-target() {
diff --git a/poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.2.bb b/poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.2.bb
deleted file mode 100644
index 50137895c..000000000
--- a/poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit setuptools
-require python-numpy.inc
-
-RDEPENDS_${PN}_class-target_append = " \
-    ${PYTHON_PN}-subprocess \
-"
diff --git a/poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb b/poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb
new file mode 100644
index 000000000..50137895c
--- /dev/null
+++ b/poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb
@@ -0,0 +1,6 @@
+inherit setuptools
+require python-numpy.inc
+
+RDEPENDS_${PN}_class-target_append = " \
+    ${PYTHON_PN}-subprocess \
+"
diff --git a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.2.bb b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.2.bb
deleted file mode 100644
index 915e6f8c2..000000000
--- a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.2.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-inherit setuptools3
-require python-numpy.inc
diff --git a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb
new file mode 100644
index 000000000..915e6f8c2
--- /dev/null
+++ b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-numpy.inc
-- 
cgit v1.2.3