diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
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>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch index 0c4e10237..9149ee21f 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch @@ -1,4 +1,7 @@ -[PATCH] fix a building failure +From 1b2b6a61c9f82157cd2e0c3744f6c07e07aeb0bd Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 4 Mar 2019 01:11:30 -0800 +Subject: [PATCH] fix a building failure Upstream-Status: Inappropriate [configuration] @@ -6,17 +9,18 @@ building failed since native does not generate import_executables.cmake In fact, our building system will export the needed commands Signed-off-by: Roy Li <rongqing.li@windriver.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1ce1c5..83b3a7e 100644 +index fc30750..4f9110e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -350,11 +350,6 @@ MYSQL_CHECK_READLINE() +@@ -347,11 +347,6 @@ CHECK_PCRE() - CHECK_JEMALLOC() + CHECK_SYSTEMD() -IF(CMAKE_CROSSCOMPILING) - SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") @@ -24,8 +28,8 @@ index c1ce1c5..83b3a7e 100644 -ENDIF() - # - # Setup maintainer mode options by the end. Platform checks are + # Setup maintainer mode options. Platform checks are # not run with the warning options as to not perturb fragile checks -- -1.9.1 +2.17.1 |