diff options
Diffstat (limited to 'meta-openembedded/meta-oe')
12 files changed, 208 insertions, 77 deletions
diff --git a/meta-openembedded/meta-oe/licenses/wxWidgets b/meta-openembedded/meta-oe/licenses/wxWidgets deleted file mode 100644 index 0f6b9d6a8b..0000000000 --- a/meta-openembedded/meta-oe/licenses/wxWidgets +++ /dev/null @@ -1,54 +0,0 @@ - wxWindows Library Licence, Version 3.1 - ====================================== - - Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al - - Everyone is permitted to copy and distribute verbatim copies - of this licence document, but changing it is not allowed. - - WXWINDOWS LIBRARY LICENCE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public Licence as published by - the Free Software Foundation; either version 2 of the Licence, or (at - your option) any later version. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library - General Public Licence for more details. - - You should have received a copy of the GNU Library General Public Licence - along with this software, usually in a file named COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301 USA. - - EXCEPTION NOTICE - - 1. As a special exception, the copyright holders of this library give - permission for additional uses of the text contained in this release of - the library as licenced under the wxWindows Library Licence, applying - either version 3.1 of the Licence, or (at your option) any later version of - the Licence as published by the copyright holders of version - 3.1 of the Licence document. - - 2. The exception is that you may use, copy, link, modify and distribute - under your own terms, binary object code versions of works based - on the Library. - - 3. If you copy code from files distributed under the terms of the GNU - General Public Licence or the GNU Library General Public Licence into a - copy of this library, as this licence permits, the exception does not - apply to the code that you add in this way. To avoid misleading anyone as - to the status of such modified files, you must delete this exception - notice from such code and/or adjust the licensing conditions notice - accordingly. - - 4. If you write modifications of your own for this library, it is your - choice whether to permit this exception to apply to your modifications. - If you do not wish that, you must delete the exception notice from such - code and/or adjust the licensing conditions notice accordingly. - - - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/files/0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/files/0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch new file mode 100644 index 0000000000..cff37fb5dc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/files/0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch @@ -0,0 +1,32 @@ +From 73fcf0b54f4c1fc07a2aa003dddaeb5a97177cce Mon Sep 17 00:00:00 2001 +From: Potin Lai <potin.lai@quantatw.com> +Date: Thu, 31 Mar 2022 08:44:31 +0800 +Subject: [PATCH 1/1] fix undefined bswap32 and bswap64 errors for MIPS machine + +Replace bswap32 and bswap64 with internal defined version (__bswap_X) + +Upstream Status: Submitted [libimobiledevice-devel@libimobiledevice.org] + +Signed-off-by: Potin Lai <potin.lai@quantatw.com> +--- + include/endianness.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/endianness.h b/include/endianness.h +index 099877a..88b63db 100644 +--- a/include/endianness.h ++++ b/include/endianness.h +@@ -113,8 +113,8 @@ + && !defined(__FLOAT_WORD_ORDER__)) \ + || (defined(__FLOAT_WORD_ORDER__) \ + && __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__) +-#define float_bswap64(x) bswap64(x) +-#define float_bswap32(x) bswap32(x) ++#define float_bswap64(x) __bswap_64(x) ++#define float_bswap32(x) __bswap_32(x) + #else + #define float_bswap64(x) (x) + #define float_bswap32(x) (x) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb new file mode 100644 index 0000000000..d5d90ea137 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "Library with common code used by the libraries and tools around the libimobiledevice project" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=6ab17b41640564434dda85c06b7124f7 \ +" + +HOMEPAGE = "http://www.libimobiledevice.org/" + +DEPENDS = "libplist" + +PV = "1.0.0+git${SRCPV}" + +SRCREV = "ecb0996fd2a3b0539153dd3ef901d137bf498ffe" +SRC_URI = "\ + git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master \ + file://0001-fix-undefined-bswap32-and-bswap64-errors-for-MIPS-ma.patch \ +" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb new file mode 100644 index 0000000000..c36837aca7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "The libirecovery library allows communication with iBoot/iBSS of iOS devices via USB" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6 \ +" + +HOMEPAGE = "http://www.libimobiledevice.org/" + +DEPENDS = "libimobiledevice-glue libusb1" + +PV = "1.0.1+git${SRCPV}" + +SRCREV = "e19094594552b7bed60418ffe6f46f455e6bb78f" +SRC_URI = "git://github.com/libimobiledevice/libirecovery;protocol=https;branch=master" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.9.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.10.bb index a8541f0d0b..374922e146 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.9.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.10.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http;branch=master;protocol=https" -SRCREV = "3b7ae6348bc917d42c04efa962e4868c09bbde9f" +SRCREV = "eff2da4875725509fc97641b118d6badf3e3a08f" DEPENDS = "openssl" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch index db123e4a10..878675f30d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mariadb-openssl3.patch @@ -1,4 +1,4 @@ -From c80991c79f701dac42c630af4bd39593b0c7efb4 Mon Sep 17 00:00:00 2001 +From 1626955f3a2107ec4c7fd927ebfa3c6c1d2b09b8 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub <wlad@mariadb.com> Date: Mon, 8 Nov 2021 18:48:19 +0100 Subject: [PATCH] MDEV-25785 Add support for OpenSSL 3.0 @@ -29,19 +29,22 @@ Summary of changes Patch from Fedora https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-openssl3.patch -Upstream-Status: Pending +Upstream-Status: Backport [https://github.com/MariaDB/server/commit/d42c2efbaa06a0307c2f0fd8fa87819ff50bbd7e] Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- - cmake/ssl.cmake | 19 ++++- + cmake/ssl.cmake | 21 +++++- + include/mysql/service_my_crypt.h | 2 +- include/ssl_compat.h | 3 +- mysql-test/lib/openssl.cnf | 2 +- mysql-test/main/ssl_cipher.result | 6 +- mysql-test/main/ssl_cipher.test | 2 +- mysys_ssl/my_crypt.cc | 46 +++++++----- unittest/mysys/aes-t.c | 121 ++++++++++++++++++++++-------- - 7 files changed, 141 insertions(+), 58 deletions(-) - + 8 files changed, 143 insertions(+), 60 deletions(-) +diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake +index a6793cf3..64c93ff9 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -118,7 +118,7 @@ MACRO (MYSQL_CHECK_SSL) @@ -88,6 +91,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> ELSE() IF(WITH_SSL STREQUAL "system") MESSAGE(FATAL_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL support") +diff --git a/include/mysql/service_my_crypt.h b/include/mysql/service_my_crypt.h +index 2a232117..bb038aaa 100644 +--- a/include/mysql/service_my_crypt.h ++++ b/include/mysql/service_my_crypt.h +@@ -45,7 +45,7 @@ extern "C" { + /* The max key length of all supported algorithms */ + #define MY_AES_MAX_KEY_LENGTH 32 + +-#define MY_AES_CTX_SIZE 656 ++#define MY_AES_CTX_SIZE 672 + + enum my_aes_mode { + MY_AES_ECB, MY_AES_CBC +diff --git a/include/ssl_compat.h b/include/ssl_compat.h +index 8dc12254..6db1baab 100644 --- a/include/ssl_compat.h +++ b/include/ssl_compat.h @@ -24,7 +24,7 @@ @@ -107,6 +125,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt) #define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX) +diff --git a/mysql-test/lib/openssl.cnf b/mysql-test/lib/openssl.cnf +index b9ab37ac..7cd6f748 100644 --- a/mysql-test/lib/openssl.cnf +++ b/mysql-test/lib/openssl.cnf @@ -9,4 +9,4 @@ ssl_conf = ssl_section @@ -115,6 +135,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> [system_default_section] -CipherString = ALL:@SECLEVEL=1 +CipherString = ALL:@SECLEVEL=0 +diff --git a/mysql-test/main/ssl_cipher.result b/mysql-test/main/ssl_cipher.result +index 930d384e..66d817b7 100644 --- a/mysql-test/main/ssl_cipher.result +++ b/mysql-test/main/ssl_cipher.result @@ -61,8 +61,8 @@ connect ssl_con,localhost,root,,,,,SSL; @@ -129,9 +151,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> +1 disconnect ssl_con; connection default; +diff --git a/mysql-test/main/ssl_cipher.test b/mysql-test/main/ssl_cipher.test +index 36549d76..d4cdcffb 100644 --- a/mysql-test/main/ssl_cipher.test +++ b/mysql-test/main/ssl_cipher.test -@@ -98,6 +98,6 @@ let $restart_parameters=--ssl-cipher=AES +@@ -98,6 +98,6 @@ let $restart_parameters=--ssl-cipher=AES128-SHA; source include/restart_mysqld.inc; connect (ssl_con,localhost,root,,,,,SSL); SHOW STATUS LIKE 'Ssl_cipher'; @@ -139,6 +163,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> +SELECT VARIABLE_VALUE like '%AES128-SHA%' FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher_list'; disconnect ssl_con; connection default; +diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc +index e512eee9..4d7ebc7b 100644 --- a/mysys_ssl/my_crypt.cc +++ b/mysys_ssl/my_crypt.cc @@ -29,11 +29,7 @@ @@ -164,7 +190,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> MyCTX_nopad() : MyCTX() { } ~MyCTX_nopad() { } -@@ -112,7 +109,7 @@ public: +@@ -112,7 +109,7 @@ class MyCTX_nopad : public MyCTX compile_time_assert(MY_AES_CTX_SIZE >= sizeof(MyCTX_nopad)); this->key= key; this->klen= klen; @@ -173,7 +199,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> if (ivlen) memcpy(oiv, iv, ivlen); DBUG_ASSERT(ivlen == 0 || ivlen == sizeof(oiv)); -@@ -123,26 +120,41 @@ public: +@@ -123,26 +120,41 @@ class MyCTX_nopad : public MyCTX return res; } @@ -223,7 +249,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> */ uchar mask[MY_AES_BLOCK_SIZE]; uint mlen; -@@ -154,10 +166,10 @@ public: +@@ -154,10 +166,10 @@ class MyCTX_nopad : public MyCTX return rc; DBUG_ASSERT(mlen == sizeof(mask)); @@ -237,6 +263,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> return MY_AES_OK; } }; +diff --git a/unittest/mysys/aes-t.c b/unittest/mysys/aes-t.c +index 34704e06..cbec2760 100644 --- a/unittest/mysys/aes-t.c +++ b/unittest/mysys/aes-t.c @@ -21,27 +21,96 @@ @@ -331,12 +359,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + /* Compare with non-bytewise encryption result*/ + ok(dst_len == dst_len2 && memcmp(dst, dst2, dst_len) == 0, + "memcmp bytewise %s %u", mode_str, src_len); - } ++ } + else + { + int dst_len_real= my_aes_get_size(mode, src_len); + ok(dst_len_real= dst_len, "my_aes_get_size"); -+ } + } + my_md5(md5, (char *) dst, dst_len); + ok(dst_len == dlen, "md5 len"); + ok(memcmp(md5, hash, sizeof(md5)) == 0, "md5"); @@ -383,3 +411,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> DO_TEST_P(MY_AES_ECB, 200, '.', 208, "\xd8\x73\x8e\x3a\xbc\x66\x99\x13\x7f\x90\x23\x52\xee\x97\x6f\x9a"); DO_TEST_P(MY_AES_ECB, 128, '?', 144, "\x19\x58\x33\x85\x4c\xaa\x7f\x06\xd1\xb2\xec\xd7\xb7\x6a\xa9\x5b"); DO_TEST_P(MY_AES_CBC, 159, '%', 160, "\x4b\x03\x18\x3d\xf1\xa7\xcd\xa1\x46\xb3\xc6\x8a\x92\xc0\x0f\xc9"); +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch index 637e54b2b8..555ed47ad6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch @@ -12,10 +12,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e30d3db934..8f93c57108 100644 +index 4063020552..253d415210 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -37,7 +37,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE) +@@ -43,7 +43,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE) # Initialize variables for quick access to wx root dir in sub dirs set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(wxBINARY_DIR ${CMAKE_BINARY_DIR}) @@ -25,10 +25,10 @@ index e30d3db934..8f93c57108 100644 # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION file(READ include/wx/version.h WX_VERSION_H_CONTENTS) diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake -index 6978cc2725..ed16ee5635 100644 +index 91d11acba2..f361d50a27 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake -@@ -52,7 +52,7 @@ function(wx_write_config_inplace) +@@ -57,7 +57,7 @@ function(wx_write_config_inplace) execute_process( COMMAND ${CMAKE_COMMAND} -E create_symlink @@ -53,7 +53,7 @@ index c33dd3946c..51e47e05b3 100644 + RUNTIME_OUTPUT_DIRECTORY "${wxOUTPUT_DIR}" ) - if(MSVC) + if(wxBUILD_PIC) diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake index 968dff859e..c850c51844 100644 --- a/build/cmake/install.cmake diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch new file mode 100644 index 0000000000..0f78cc134e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch @@ -0,0 +1,28 @@ +It appends system name to library names for cross compile. For example, the +library name is libwx_baseu-3.1-Linux.so rather than libwx_baseu-3.1.so. It is +not appropriate for oe. + +Upstream-Status: Pending [oe specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + build/cmake/functions.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake +index 53cd6a1ace..95efa17fe4 100644 +--- a/build/cmake/functions.cmake ++++ b/build/cmake/functions.cmake +@@ -211,9 +211,9 @@ function(wx_set_target_properties target_name is_base) + endif() + else() + set(cross_target "") +- if (CMAKE_CROSSCOMPILING) +- set(cross_target "-${CMAKE_SYSTEM_NAME}") +- endif () ++ #if (CMAKE_CROSSCOMPILING) ++ # set(cross_target "-${CMAKE_SYSTEM_NAME}") ++ #endif () + + set_target_properties(${target_name} + PROPERTIES diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb index b4420a18ea..f9349b02ab 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb @@ -3,10 +3,10 @@ DESCRIPTION = "wxWidgets is a free and open source cross-platform C++ framework HOMEPAGE = "https://www.wxwidgets.org/" BUGTRACKER = "https://trac.wxwidgets.org/" -# wxWidgets licence is a modified version of LGPL explicitly allowing not +# WXwindows licence is a modified version of LGPL explicitly allowing not # distributing the sources of an application using the library even in the # case of static linking. -LICENSE = "wxWidgets" +LICENSE = "WXwindows" LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=981f50a934828620b08f44d75db557c6" inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt', 'cmake_qt5', 'cmake', d)} @@ -26,15 +26,16 @@ SRC_URI = " \ file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \ file://fix-libdir-for-multilib.patch \ file://respect-DESTDIR-when-create-link.patch \ + file://not-append-system-name-to-lib-name.patch \ " -PV = "3.1.4" -SRCREV= "6cdaedd42ba59331b3dc4ead50e0bac76ae14c19" +SRCREV= "9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1" S = "${WORKDIR}/git" # These can be either 'builtin' or 'sys' and builtin means cloned soures are # build. So these cannot be PACKAGECONFIGs and let's use libs where we can (see # DEPENDS) EXTRA_OECMAKE += " \ + -DwxUSE_GLCANVAS_EGL=OFF \ -DwxUSE_LIBJPEG=sys \ -DwxUSE_LIBPNG=sys \ -DwxUSE_LIBTIFF=sys \ @@ -46,6 +47,7 @@ EXTRA_OECMAKE:append:libc-musl = " \ " PACKAGECONFIG ?= "gtk ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" +PACKAGECONFIG:remove:class-native = "opengl" # Note on toolkit-PACKAGECONFIGs: select exactly one of 'no_gui' / 'gtk' / 'qt' PACKAGECONFIG[no_gui] = "-DwxUSE_GUI=OFF,,,,,qt gtk opengl" @@ -69,9 +71,10 @@ PACKAGECONFIG[gstreamer] = "-DwxUSE_MEDIACTRL=ON,-DwxUSE_MEDIACTRL=OFF,gstreamer PACKAGECONFIG[libsecret] = "-DwxUSE_SECRETSTORE=ON,-DwxUSE_SECRETSTORE=OFF,libsecret,,,no_gui" PACKAGECONFIG[lzma] = "-DwxUSE_LIBLZMA=ON,-DwxUSE_LIBLZMA=OFF,xz" PACKAGECONFIG[mspack] = "-DwxUSE_LIBMSPACK=ON,-DwxUSE_LIBMSPACK=OFF,libmspack" -PACKAGECONFIG[opengl] = ",,libglu" +PACKAGECONFIG[opengl] = "-DwxUSE_OPENGL=ON,-DwxUSE_OPENGL=OFF,libglu" PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,libsdl2" PACKAGECONFIG[webkit] = "-DwxUSE_WEBVIEW_WEBKIT=ON,-DwxUSE_WEBVIEW_WEBKIT=OFF,webkitgtk,,,no_gui" +PACKAGECONFIG[curl] = "-DwxUSE_WEBREQUEST_CURL=ON,-DwxUSE_WEBREQUEST_CURL=OFF,curl" do_compile:append() { # if not at re-compile @@ -108,3 +111,5 @@ FILES:${PN}-dev += " \ ${libdir}/wx/include/ \ ${libdir}/wx/config/ \ " + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb b/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb new file mode 100644 index 0000000000..fc07c6e698 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "A command-line application to restore firmware files to iOS devices" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ +" + +HOMEPAGE = "http://www.libimobiledevice.org/" + +DEPENDS = "libirecovery libimobiledevice libzip curl" + +PV = "1.0.1+git${SRCPV}" + +SRCREV = "280575bb95977241e240ed081a2602d68746443e" +SRC_URI = "git://github.com/libimobiledevice/idevicerestore;protocol=https;branch=master" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-genconfig.py-update-shebang.patch b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-genconfig.py-update-shebang.patch new file mode 100644 index 0000000000..10d17f57d8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/0001-genconfig.py-update-shebang.patch @@ -0,0 +1,33 @@ +From b09ff147e9383d33e6adbcb356b52236610fceda Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Fri, 1 Apr 2022 10:00:00 +0800 +Subject: [PATCH] genconfig.py: update shebang + +It fails to call genconfig.py if no /usr/bin/python on build machine: + +| ./genconfig.py mcelog.conf config-intro.man > mcelog.conf.5 +| /bin/sh: ./genconfig.py: /usr/bin/python: bad interpreter: No such file or directory +| Makefile:71: recipe for target 'mcelog.conf.5' failed + +Update shebang with 'env python3' instead. + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + genconfig.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/genconfig.py b/genconfig.py +index ce9987f..982cac6 100755 +--- a/genconfig.py ++++ b/genconfig.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python3 + # generate man config documentation from mcelog.conf example + # genconfig.py mcelog.conf intro.html + from __future__ import print_function +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_180.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_180.bb index 249e2421c4..a64aacabf9 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_180.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_180.bb @@ -5,8 +5,10 @@ and should run on all Linux systems that need error handling." HOMEPAGE = "https://mcelog.org/" SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ +SRC_URI = "\ + git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ file://run-ptest \ + file://0001-genconfig.py-update-shebang.patch \ " SRCREV = "4146c9296a0cbd26f1c5e411cb44877f350053bd" |