diff options
Diffstat (limited to 'meta-openembedded/meta-oe')
98 files changed, 552 insertions, 782 deletions
diff --git a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 9182acf449..06c7de3f8b 100644 --- a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -46,6 +46,7 @@ PTESTS_FAST_META_OE:remove:riscv64 = "nodejs" PTESTS_FAST_META_OE:remove:riscv32 = "nodejs" PTESTS_SLOW_META_OE = "\ + c-ares \ fftw \ libusb-compat \ rsyslog \ diff --git a/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf index 4c63f1b399..83a9f7d566 100644 --- a/meta-openembedded/meta-oe/conf/layer.conf +++ b/meta-openembedded/meta-oe/conf/layer.conf @@ -49,6 +49,7 @@ LAYERSERIES_COMPAT_openembedded-layer = "nanbield" LICENSE_PATH += "${LAYERDIR}/licenses" PREFERRED_RPROVIDER_libdevmapper = "lvm2" +PREFERRED_RPROVIDER_libdevmapper-native = "lvm2-native" PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" # Configures whether coreutils or uutils-coreutils is used. PREFERRED_PROVIDER_coreutils = "coreutils" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb index 8ccdc27a8e..bff82fe35d 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb @@ -32,4 +32,4 @@ do_install:append() { install -D -m 0644 ${B}/librwmem/librwmem.a ${D}${libdir}/librwmem.a } -FILES:${PN} += "${libdir}/python3.11/site-packages/pyrwmem" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/pyrwmem" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.3.1.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.4.bb index 868887a47f..e14179891e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.3.1.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.4.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "52e9aa97b39a3309ba5f3a2e0dc127ebe04cadfefc8eb57222a9ebd32e8faa16" +SRC_URI[sha256sum] = "94ee246ced4aa1f31d992f1571baae3282cc73eee76336fa9e9791adfeca13bc" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 037d58cf17..ee5c77a85d 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -145,3 +145,5 @@ SYSTEMD_SERVICE:${PN} = "mongod.service" FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" RDEPENDS:${PN} += "tzdata-core" + +SKIP_RECIPE[mongodb] ?= "Needs porting to python 3.12" diff --git a/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb b/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb index b1f8a7f805..b41ecffae4 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb @@ -3,7 +3,6 @@ DESCRIPTION = "\ This package contains an I2C dev library and the i2c bus scanning \ utility lsi2c. \ " -AUTHOR = "Danielle Costantino" HOMEPAGE = "https://github.com/costad2/i2cdev" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "\ diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.7.1.bb index 0d8923f342..d2b2536bc3 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.6.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.7.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c libnvme" -SRCREV = "bd2f882a49a14b0e21a94c928128b1979e4316fd" +SRCREV = "dcdad6f5d70ffb2fa151f229db048180671eb1fe" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.2.bb index 54e6b778b0..e1fe5e5671 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.20.2.bb @@ -103,26 +103,26 @@ do_install:append() { -i ${D}${bindir}/krb5-config } -PACKAGES =+ "${PN}-admin-server \ - ${PN}-gss-samples \ - ${PN}-k5tls \ - ${PN}-kdc \ - ${PN}-kdc-ldap \ - ${PN}-kpropd \ - ${PN}-otp \ - ${PN}-pkinit \ - ${PN}-spake \ - ${PN}-user \ - libgssapi-krb5 \ - libgssrpc \ - libk5crypto \ - libkadm5clnt-mit \ - libkadm5srv-mit \ - libkdb5 \ - libkrad \ - libkrb5 \ - libkrb5support \ - libverto" +PACKAGE_BEFORE_PN =+ "${PN}-admin-server \ + ${PN}-gss-samples \ + ${PN}-k5tls \ + ${PN}-kdc \ + ${PN}-kdc-ldap \ + ${PN}-kpropd \ + ${PN}-otp \ + ${PN}-pkinit \ + ${PN}-spake \ + ${PN}-user \ + libgssapi-krb5 \ + libgssrpc \ + libk5crypto \ + libkadm5clnt-mit \ + libkadm5srv-mit \ + libkdb5 \ + libkrad \ + libkrb5 \ + libkrb5support \ + libverto" FILES:${PN} = "${libdir}/krb5/plugins/preauth/test.so" FILES:${PN}-doc += "${datadir}/examples" @@ -198,4 +198,4 @@ pkg_postinst:${PN}-kdc () { BBCLASSEXTEND = "native nativesdk" inherit multilib_script -MULTILIB_SCRIPTS = "${PN}-user:${bindir}/krb5-config" +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/krb5-config" diff --git a/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.2.bb index a529032aad..a529032aad 100644 --- a/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.2.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20231224.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20231231.0.bb index 9c4e819c25..b788d6fd03 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.0.20231224.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20231231.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "bea6f5bc96d9a5d11da36d23ee50d952d8bf3a8d" +SRCREV = "e4cb2a0f9ba947d23e526888930bb1487c2cf1d8" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch index fbdf06d692..594503ae2a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-Link-with-libatomic-on-rv32-rv64.patch @@ -1,4 +1,4 @@ -From c321f19ff1cd1251c19d20b17a2d86c4237ce506 Mon Sep 17 00:00:00 2001 +From 54e8dca9b39b8c8a6532576a0286e548f97607fa Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 19 Apr 2022 16:07:19 -0700 Subject: [PATCH] cmake: Link with libatomic on rv32/rv64 @@ -15,12 +15,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b272816685..e1fe1102c4 100644 +index 06e6453b5c..476d7f1576 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -303,6 +303,9 @@ if(UNIX AND NOT HAIKU) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) - set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} rt) +@@ -306,6 +306,9 @@ if(UNIX AND NOT HAIKU) + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} rt) + endif() endif() + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv32") + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} atomic) diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.59.2.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.60.0.bb index c30e52263d..14fca669d3 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.59.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.60.0.bb @@ -20,8 +20,8 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" # RDEPENDS:${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "883e5f76976b86afee87415dc67bde58d9b295a4" -BRANCH = "v1.59.x" +SRCREV_grpc = "0ef13a7555dbaadd4633399242524129eef5e231" +BRANCH = "v1.60.x" SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.6.0.bb b/meta-openembedded/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.0.bb index 2e06b701cc..87f7f1a6df 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jwt-cpp/jwt-cpp_0.7.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8325a5ce4414c65ffdda392e0d96a9ff" SRC_URI = "git://github.com/Thalhammer/jwt-cpp.git;branch=master;protocol=https \ " -SRCREV = "4a537e969891dde542ad8b1a4a214955a83be29f" +SRCREV = "08bcf77a687fb06e34138e9e9fa12a4ecbe12332" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.10.1.bb b/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb index 787ace440c..fef9d3a80e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lapack/lapack_3.12.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Linear Algebra PACKage" URL = "http://www.netlib.org/lapack" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a32c99f24d097c72d1857e533b55642b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d0e7a458f9fcbf0a3ba97cef3128b85d" # Recipe needs FORTRAN support (copied from conf/local.conf.sample.extended) # Enabling FORTRAN @@ -16,7 +16,7 @@ DEPENDS = "libgfortran \ " RDEPENDS:${PN}-ptest += "cmake" -SRCREV = "32b062a33352e05771dcc01b981ebe961bf2e42f" +SRCREV = "04b044e020a3560ccfa9988c8a80a1fb7083fc2e" SRC_URI = "git://github.com/Reference-LAPACK/lapack.git;protocol=https;branch=master \ ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb index 06df0690ac..cadc9843d9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -1,17 +1,15 @@ SUMMARY = "Just-In-Time Compiler for Lua" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=23d6278200de9b48fd1439f80507cba8" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=076b97f5c7e61532f7f6f3865f04da57" HOMEPAGE = "http://luajit.org" SRC_URI = "git://luajit.org/git/luajit-2.0.git;protocol=http;branch=v2.1 \ file://0001-Do-not-strip-automatically-this-leaves-the-stripping.patch \ - file://clang.patch \ file://0001-Use-builtin-for-clear_cache.patch \ " -# Set PV to a version tag and date (YYMMDD) associated with SRCREV if it is later. -PV = "2.1.0~beta3-220721" -SRCREV = "32984282ddae666b3c94cd27538e1c78b49a1877" +PV = "2.1" +SRCREV = "c525bcb9024510cad9e170e12b6209aedb330f83" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb index 112df8c1e8..2451a36be2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb @@ -4,7 +4,7 @@ SECTION = "console/utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "python3 python3-native" +DEPENDS = "python3 python3-native python3-setuptools-native" RDEPENDS:${PN} = "python3 python3-modules" inherit python3native python3targetconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.71.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.72.bb index 7d8d6b69f7..ba3e3fdf7e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.71.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.72.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff inherit cpan -SRCREV = "7cefbaaa9057231b6e9b5765934f06e75994420d" +SRCREV = "fc4f6614ff0c19bb5f332a9c464dcef7267931df" SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb index ecc89d075e..b2266394d6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libconfig-general-perl_2.65.bb @@ -12,8 +12,6 @@ SRC_URI[sha256sum] = "4d6d5754be3a9f30906836f0cc10e554c8832e14e7a1341efb15b05d70 S = "${WORKDIR}/${SRCNAME}-${PV}" -COMPATIBLE_HOST:libc-musl = "null" - EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" inherit cpan diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.17.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb index e5c1ec1c82..6029b7aae9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.17.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.20.bb @@ -3,10 +3,9 @@ SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=12;md5=b2562f94907eeb42e8ce9d45f628e587" -SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz \ - file://0001-Make-function-checks-more-robust-within-shared-libs.patch \ - " -SRC_URI[sha256sum] = "a5f1a83020bc5b5dd6c1b570f48c7546e0a8f7fac10a068740b03925ad9e14e8" +SRC_URI = "http://www.cpan.org/modules/by-module/IO/IO-Tty-${PV}.tar.gz" + +SRC_URI[sha256sum] = "b15309fc85623893289cb9b2b88dfa9ed1e69156b75f29938553a45be6d730af" S = "${WORKDIR}/IO-Tty-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb index 1d9ca9daae..545618a4ec 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb @@ -8,14 +8,14 @@ has been split out into the protobuf-c-rpc project." HOMEPAGE = "https://github.com/protobuf-c/protobuf-c" SECTION = "console/tools" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9f725889e0d77383e26cb42b0b62cea2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d11077c6a2b5d2e64b9f32b61a9b78ba" DEPENDS = "protobuf-native protobuf" SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=next;protocol=https" SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch" -SRCREV = "ba4c55f0e686e0252c451f7163ab529e4b36831a" +SRCREV = "8c201f6e47a53feaab773922a743091eb6c8972a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb new file mode 100644 index 0000000000..f9e3679590 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb @@ -0,0 +1,24 @@ +SUMMARY="SSD1306 OLED I2C drive" +DESCRIPTION = "SSD1306 OLED I2C driver working in Linux" +HOMEPAGE = "https://github.com/armlabs/ssd1306_linux" +SECTION = "console/utils" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=7b694e603a996c3bfdc6093ed1f70c8f" + +SRC_URI = " \ + git://github.com/armlabs/ssd1306_linux.git;protocol=https;branch=master \ +" +SRCREV = "34b42992a43fda69c6ba2557b718601cafe16251" + +S = "${WORKDIR}/git" + +# coreutils provides fmt which is used in the Makefile +DEPENDS = "i2c-tools coreutils-native" + +EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${B}/ssd1306_bin ${D}${bindir} +} diff --git a/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.4.bb b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb index 582c29379a..1643af2546 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.4.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb @@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2" -SRC_URI[sha256sum] = "74aa626fc71e729ee227602870dd29a5a01cd8c9c1c7330837a51da2eb5722cc" +SRC_URI[sha256sum] = "1db4028c9b7f1f778efbf4a9462d65e13f9938f2c22f9e9994e12c49ba97e252" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch deleted file mode 100644 index fa029da2b8..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a701ed30ac1bc2f77d063c237d6ae040a2d53f6b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 16 May 2016 16:52:24 +0300 -Subject: [PATCH] Add 'm' suffix to the python library name. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - swig/python/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/swig/python/CMakeLists.txt -+++ b/swig/python/CMakeLists.txt -@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GE - SET( NAME pyCmpiProvider ) - ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT}) - #TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} ) --TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION} ) -+TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}${PYTHON_ABI} ) - TARGET_LINK_LIBRARIES( ${NAME} pthread ) - TARGET_LINK_LIBRARIES( ${NAME} dl ) - TARGET_LINK_LIBRARIES( ${NAME} util ) diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch index 1d8013be6f..1f147d52f6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch @@ -1,20 +1,19 @@ -From b8e791ce93a467081fb1594b91841e2f57c634a0 Mon Sep 17 00:00:00 2001 +From 3ab3ac2876cbf4a34a94f0d3256a5be9d1202370 Mon Sep 17 00:00:00 2001 From: Qian Lei <qianl.fnst@cn.fujitsu.com> Date: Fri, 16 Jan 2015 18:37:26 +0800 Subject: [PATCH] Fix error Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> ---- Upstream-Status: Pending - +--- swig/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt -index 3976296..8073fc8 100644 +index 93b4755..a7268f0 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt -@@ -27,7 +27,7 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/../cmpi.i" ) +@@ -26,7 +26,7 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/../cmpi.i" ) ADD_CUSTOM_COMMAND ( OUTPUT ${SWIG_OUTPUT} COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..." @@ -23,6 +22,3 @@ index 3976296..8073fc8 100644 COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i --- -1.8.3.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch deleted file mode 100644 index 92e5e5662e..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 070822507befe7c1b8bb1be2d36cb12141d03b8f Mon Sep 17 00:00:00 2001 -From: Qian Lei <qianl.fnst@cn.fujitsu.com> -Date: Tue, 6 Jan 2015 18:38:32 +0800 -Subject: [PATCH] Change the install path in cmakelist - -Upstream-Status: Pending -Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> ---- - swig/python/CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt -index 3976296..93c87c1 100644 ---- a/swig/python/CMakeLists.txt -+++ b/swig/python/CMakeLists.txt -@@ -56,18 +56,18 @@ TARGET_LINK_LIBRARIES( ${NAME} util ) - - INSTALL(TARGETS ${NAME} LIBRARY DESTINATION ${CMPI_LIBRARY_DIR}) - # .py: swig generated --INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmpi.py DESTINATION ${PYTHON_SITE_DIR} ) -+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmpi.py DESTINATION $ENV{ENV_INSTALL_PATH} ) - - - # - # cmpi_pywbem_bindings.py: provider implementation - # --INSTALL(FILES cmpi_pywbem_bindings.py DESTINATION ${PYTHON_SITE_DIR} ) -+INSTALL(FILES cmpi_pywbem_bindings.py DESTINATION $ENV{ENV_INSTALL_PATH} ) - #INSTALL(FILES Py_UnixProcessProvider.py DESTINATION /usr/lib/pycim ) - --INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}${PYTHON_SITE_DIR}/cmpi.py', dfile='${PYTHON_SITE_DIR}/cmpi.py')\")") -+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}$ENV{ENV_INSTALL_PATH}/cmpi.py', dfile='\$ENV{ENV_INSTALL_PATH}/cmpi.py')\")") - --INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}${PYTHON_SITE_DIR}/cmpi_pywbem_bindings.py', dfile='${PYTHON_SITE_DIR}/cmpi_pywbem_bindings.py')\")") -+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"from py_compile import compile; compile('\$ENV{DESTDIR}$ENV{ENV_INSTALL_PATH}/cmpi_pywbem_bindings.py', dfile='$ENV{ENV_INSTALL_PATH}/cmpi_pywbem_bindings.py')\")") - - - --- -1.8.3.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch deleted file mode 100644 index 5d5652a5f2..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 323ced03a66e6cd963d8277b66cfcc7dce740be7 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui@cn.fujitsu.com> -Date: Fri, 17 Jul 2015 01:33:43 -0700 -Subject: [PATCH] fix Xthe build error when python>3.0 - -Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> ---- -Upstream-Status: Pending - - src/target_python.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/target_python.c b/src/target_python.c -index 90b43a1..2b76c9e 100644 ---- a/src/target_python.c -+++ b/src/target_python.c -@@ -167,7 +167,12 @@ PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st) - - Py_SetProgramName("cmpi_swig"); - Py_Initialize(); -- SWIGEXPORT void SWIG_init(void); -+#if PY_VERSION_HEX >= 0x03000000 -+SWIGEXPORT PyObject* -+#else -+ SWIGEXPORT void -+#endif -+ SWIG_init(void); - SWIG_init(); - cmpiMainPyThreadState = PyGILState_GetThisThreadState(); - PyEval_ReleaseThread(cmpiMainPyThreadState); --- -2.1.0 - diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch index 2072da72b5..1f9e2394c3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch @@ -1,4 +1,4 @@ -From 7dd01e33f9dac75f177113de9a8ff458d4263a11 Mon Sep 17 00:00:00 2001 +From 0871fb048a48a02ec598c941e577f13d8d24f574 Mon Sep 17 00:00:00 2001 From: Lei Maohui <leimaohui@cn.fujitsu.com> Date: Mon, 24 Aug 2015 11:00:13 +0900 Subject: [PATCH] cmpi-bindings-0.4.17 no ruby perl @@ -7,17 +7,18 @@ Port from Fedora20 Upstream-Status: Pending Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> + --- swig/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt -index 8b5555c..c2655b9 100644 +index 00bf40c..d3cab38 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt -@@ -15,15 +15,15 @@ IF (PYTHON_LIBRARY) - ENDIF (PYTHON_LINK_LIBS) - ENDIF (PYTHON_LIBRARY) +@@ -49,15 +49,15 @@ ELSE (BUILD_PYTHON2) + MESSAGE(STATUS "*****") + ENDIF (BUILD_PYTHON3) -FIND_PACKAGE(Perl) -IF (PERL_EXECUTABLE) @@ -42,6 +43,3 @@ index 8b5555c..c2655b9 100644 +# ADD_SUBDIRECTORY(ruby) +# OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES ) +#ENDIF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) --- -1.8.4.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch index b99337204d..04abd5e4b9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch @@ -1,12 +1,20 @@ -Port from Fedora20 +From bc32342fa63b8359f985fe1e187e811455c96a50 Mon Sep 17 00:00:00 2001 +From: Qian Lei <qianl.fnst@cn.fujitsu.com> +Date: Tue, 25 Aug 2015 13:19:51 +0800 +Subject: [PATCH] Port from Fedora20 Upstream-Status: Pending Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> -diff -up cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py.orig cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py ---- cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py.orig 2012-03-01 17:05:31.878367281 +0100 -+++ cmpi-bindings-0.4.17/swig/python/cmpi_pywbem_bindings.py 2012-03-01 17:06:34.718110137 +0100 -@@ -350,10 +350,10 @@ class BrokerCIMOMHandle(object): +--- + swig/python/cmpi_pywbem_bindings.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/swig/python/cmpi_pywbem_bindings.py b/swig/python/cmpi_pywbem_bindings.py +index d643990..7f0cc77 100644 +--- a/swig/python/cmpi_pywbem_bindings.py ++++ b/swig/python/cmpi_pywbem_bindings.py +@@ -361,10 +361,10 @@ class BrokerCIMOMHandle(object): allow_null_ns = False else: allow_null_ns = True diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch deleted file mode 100644 index b6a51ec0d2..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Port from Fedora20 - -Upstream-Status: Pending -Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> - -diff -up cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old cmpi-bindings-0.9.5/swig/python/CMakeLists.txt ---- cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old 2013-08-06 15:57:03.576285764 +0200 -+++ cmpi-bindings-0.9.5/swig/python/CMakeLists.txt 2013-08-06 15:57:14.891345941 +0200 -@@ -9,7 +9,7 @@ SET (BUILD_SHARED_LIBS ON) - - FIND_PACKAGE(PythonInterp REQUIRED) - --EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR) -+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR) - - IF (NOT PYTHON_SITE_DIR) - SET (PYTHON_SITE_DIR ${PYTHON_LIB_DIR}) diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb index 3b7453536b..781dc83da9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb @@ -4,39 +4,31 @@ HOMEPAGE = "http://github.com/kkaempf/cmpi-bindings" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064" SECTION = "Development/Libraries" -DEPENDS = "swig-native python3 sblim-cmpi-devel" +DEPENDS = "swig-native sblim-cmpi-devel python3-setuptools-native" SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \ file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ - file://cmpi-bindings-0.9.5-python-lib-dir.patch \ - file://0001-Modify-cmakelist.patch \ file://0001-Fix-error.patch \ - file://0001-fix-the-build-error-when-python-3.0.patch \ - file://0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch \ - " + " -SRCREV = "62f60e065aa1b901f826e4f530c0573ae32d065e" +SRCREV = "69077ee4d249816ed428155fc933dca424167e77" S = "${WORKDIR}/git" -inherit cmake python3native +inherit cmake python3targetconfig EXTRA_OECMAKE = "-DLIB='${baselib}' \ -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ -DPYTHON_ABI=${PYTHON_ABI} \ + -DBUILD_PYTHON3=YES \ + -DPython3_SITE_DIR=${PYTHON_SITEPACKAGES_DIR} \ " # With Ninja it fails with: # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$) OECMAKE_GENERATOR = "Unix Makefiles" -do_configure:prepend() { - export STAGING_LIBDIR=${STAGING_LIBDIR} - export STAGING_INCDIR=${STAGING_INCDIR} - export ENV_INSTALL_PATH=${PYTHON_SITEPACKAGES_DIR} -} - -FILES:${PN} =+"${libdir}/cmpi/libpyCmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*" +FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*" FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index bd4a5b3e89..02f1fcb420 100644 --- a/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://collectd.org/" LICENSE = "GPL-2.0-only & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=1bd21f19f7f0c61a7be8ecacb0e28854" -DEPENDS = "rrdtool curl libpcap libxml2 yajl libgcrypt libtool lvm2" +DEPENDS = "curl libpcap libxml2 yajl libgcrypt libtool lvm2" SRC_URI = "https://collectd.org/files/collectd-${PV}.tar.bz2 \ file://collectd.init \ diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20231002.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20240101.bb index 8887700e8a..988a8ee2b1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20231002.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20240101.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz" -SRC_URI[sha256sum] = "315640ab0719225d5cbcab130585c05f0791fcf073072a5fe9479969aa2b833b" +SRC_URI[sha256sum] = "9419eb52b95837312a76ccb26002c5d624fab53abde0859f1c7364179dc0ebad" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb index ed9f28e073..be420b4837 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb @@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Drop-using-register-storage-classifier.patch" SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" -DEPENDS += "cups python3 libusb1" +DEPENDS += "cups python3 libusb1 python3-setuptools-native" inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb index 3eefda7332..78640934a3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb @@ -23,7 +23,7 @@ CVE_STATUS_LIBLIST = " \ " do_configure:prepend() { - rm ${S}/m4/ax_python_devel.m4 + rm -f ${S}/m4/ax_python_devel.m4 } do_install:append () { diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb index 0142bcbaf5..6fbc28394f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb @@ -24,7 +24,7 @@ CVE_STATUS_LIBLIST = " \ " do_configure:prepend() { - rm ${S}/m4/ax_python_devel.m4 + rm -f ${S}/m4/ax_python_devel.m4 } do_install:append () { diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 0000000000..7eaca66b5c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0001-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,78 @@ +From ad95b7684365dea8335c34527d4c1463c1668af0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> +Date: Fri, 31 Mar 2023 14:52:19 +0200 +Subject: [PATCH] Use setuptools instead of distutils + +distutils is removed from Python 3.12+: +https://peps.python.org/pep-0632/ + +Upstream-Status: Backport [https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + libpwquality.spec.in | 11 ++--------- + python/Makefile.am | 2 +- + python/setup.py.in | 6 +++--- + 3 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/libpwquality.spec.in b/libpwquality.spec.in +index 70a6f53..0809126 100644 +--- a/libpwquality.spec.in ++++ b/libpwquality.spec.in +@@ -33,9 +33,11 @@ BuildRequires: gettext + BuildRequires: pam-devel + %if %{with python2} + BuildRequires: python2-devel ++BuildRequires: python2-setuptools + %endif + %if %{with python3} + BuildRequires: python3-devel ++BuildRequires: python3-setuptools + %endif + + URL: https://github.com/libpwquality/libpwquality/ +@@ -103,15 +105,6 @@ cp -a . %{py3dir} + pushd %{py3dir} + %endif + %if %{with python3} +-# setuptools >= 60 changes the environment to use its bundled copy of distutils +-# by default, not the Python-bundled one. To run the Python's standard library +-# distutils, the environment variable must be set. +-# Although technically setuptools is not needed for this package, if it's +-# pulled by another package, it changes the environment and consequently, +-# the build fails. This was reported in: +-# https://github.com/pypa/setuptools/issues/3143 +-export SETUPTOOLS_USE_DISTUTILS=stdlib +- + %configure \ + --with-securedir=%{_moduledir} \ + --with-pythonsitedir=%{python3_sitearch} \ +diff --git a/python/Makefile.am b/python/Makefile.am +index 1d00c0c..6e51744 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} + + clean-local: + rm -rf py$(PYTHONREV) +diff --git a/python/setup.py.in b/python/setup.py.in +index a741b91..f934c50 100755 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -6,9 +6,9 @@ + + import os + +-from distutils.core import setup, Extension +-from distutils.command.build_ext import build_ext as _build_ext +-from distutils.command.sdist import sdist as _sdist ++from setuptools import setup, Extension ++from setuptools.command.build_ext import build_ext as _build_ext ++from setuptools.command.sdist import sdist as _sdist + + def genconstants(headerfile, outputfile): + hf = open(headerfile, 'r') diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0002-Makefile.am-respect-PYTHONSITEDIR.patch b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0002-Makefile.am-respect-PYTHONSITEDIR.patch new file mode 100644 index 0000000000..cd59a6d887 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/0002-Makefile.am-respect-PYTHONSITEDIR.patch @@ -0,0 +1,26 @@ +From edc51ba1b446913232cdf2945f485392bca72dc7 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 3 Aug 2015 13:43:14 +0800 +Subject: [PATCH] Makefile.am: respect ${PYTHONSITEDIR} + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Backport [https://github.com/libpwquality/libpwquality/commit/5192eab011ada47b0157f8d0524bf5b18bba3bd0] + + python/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/Makefile.am b/python/Makefile.am +index 6e51744..0a3bad5 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} --install-lib=$(pythonsitedir) + + clean-local: + rm -rf py$(PYTHONREV) diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch deleted file mode 100644 index 636b294073..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1ea09e09ab2387c326bb7170835361ece6e25477 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 3 Aug 2015 13:43:14 +0800 -Subject: [PATCH] setup.py.in: add missing python include dir for cross - compiling - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - python/Makefile.am | 2 +- - python/setup.py.in | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/python/Makefile.am b/python/Makefile.am -index 1d00c0c..52816b2 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -14,7 +14,7 @@ all-local: - CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) - - install-exec-local: -- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} -+ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} --install-lib=${DESTDIR}/${PYTHONSITEDIR} - - clean-local: - rm -rf py$(PYTHONREV) -diff --git a/python/setup.py.in b/python/setup.py.in -index a741b91..6759a95 100755 ---- a/python/setup.py.in -+++ b/python/setup.py.in -@@ -33,7 +33,7 @@ class sdist(_sdist): - - pwqmodule = Extension('pwquality', - sources = ['pwquality.c'], -- include_dirs = ['../src'], -+ include_dirs = ['../src', os.path.join(os.environ['STAGING_INCDIR'], os.environ['PYTHON_DIR'])], - library_dirs = ['../src/.libs'], - libraries = ['pwquality']) - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb index 5287430c41..4454496f6c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb @@ -5,10 +5,11 @@ SECTION = "devel/lib" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=6bd2f1386df813a459a0c34fde676fc2" -DEPENDS = "cracklib" +DEPENDS = "cracklib python3-setuptools-native" SRC_URI = "git://github.com/libpwquality/libpwquality;branch=master;protocol=https \ - file://add-missing-python-include-dir-for-cross.patch \ + file://0001-Use-setuptools-instead-of-distutils.patch \ + file://0002-Makefile.am-respect-PYTHONSITEDIR.patch \ " SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a" diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch index dedb4adf9b..bd8f5be05d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch @@ -13,7 +13,7 @@ So using a wildcard helps in using any x86 arch Signed-off-by: Khem Raj <raj.khem@gmail.com> --- -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/eclipse/mraa/pull/1125] CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch deleted file mode 100644 index d1152ed641..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-include-Declare-gVERSION-global-as-extern.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dbb5961f106ec42cd70689d933674c9c37aedfe1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org> -Date: Mon, 13 Apr 2020 20:12:11 +0200 -Subject: include: Declare gVERSION global as 'extern'. - -Fixes build with '-fno-common'. - -Upstream-Status: Submitted [https://github.com/eclipse/mraa/pull/1012] -Signed-off-by: Adrian Bunk <bunk@stusta.de> ---- - include/version.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/version.h b/include/version.h -index 47366ef..3a567a1 100644 ---- a/include/version.h -+++ b/include/version.h -@@ -11,8 +11,8 @@ - extern "C" { - #endif - --const char* gVERSION; --const char* gVERSION_SHORT; -+extern const char* gVERSION; -+extern const char* gVERSION_SHORT; - - #ifdef __cplusplus - } --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-mraa-Use-posix-basename.patch b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-mraa-Use-posix-basename.patch new file mode 100644 index 0000000000..4f07eae631 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0001-mraa-Use-posix-basename.patch @@ -0,0 +1,46 @@ +From 30f78cb2775358dacd10b02c0ba2ec0c3ba2945d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 31 Dec 2023 19:16:35 -0800 +Subject: [PATCH 1/2] mraa: Use posix basename + +Musl has removed the declaration from string.h [1] which exposes the +problem especially with clang-17+ compiler where implicit function +declaration is flagged as error. Use posix basename and make a copy of +string to operate on to emulate GNU basename behaviour. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/eclipse/mraa/pull/1125] + src/mraa.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/mraa.c b/src/mraa.c +index 653ea1fa..b556d045 100644 +--- a/src/mraa.c ++++ b/src/mraa.c +@@ -12,6 +12,7 @@ + #endif + + #include <dlfcn.h> ++#include <libgen.h> + #include <pwd.h> + #include <sched.h> + #include <stddef.h> +@@ -341,9 +342,11 @@ static int + mraa_count_iio_devices(const char* path, const struct stat* sb, int flag, struct FTW* ftwb) + { + // we are only interested in files with specific names +- if (fnmatch(IIO_DEVICE_WILDCARD, basename(path), 0) == 0) { ++ char* tmp = strdup(path); ++ if (fnmatch(IIO_DEVICE_WILDCARD, basename(tmp), 0) == 0) { + num_iio_devices++; + } ++ free(tmp); + return 0; + } + +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0002-gpio-Include-limits.h-for-PATH_MAX.patch b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0002-gpio-Include-limits.h-for-PATH_MAX.patch new file mode 100644 index 0000000000..0e472255a9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa/0002-gpio-Include-limits.h-for-PATH_MAX.patch @@ -0,0 +1,30 @@ +From ffa6f1254066b1d5d99192002043be945ff64297 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 31 Dec 2023 19:18:42 -0800 +Subject: [PATCH 2/2] gpio: Include limits.h for PATH_MAX + +Musl exposes this problem where PATH_MAX is used but limits.h is not +included, it works with glibc perhaps due to limits.h being indirectly +included by another system header. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted [https://github.com/eclipse/mraa/pull/1125] + src/gpio/gpio_chardev.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gpio/gpio_chardev.c b/src/gpio/gpio_chardev.c +index 2cd15968..9f727de7 100644 +--- a/src/gpio/gpio_chardev.c ++++ b/src/gpio/gpio_chardev.c +@@ -12,6 +12,7 @@ + #include <dirent.h> + #include <errno.h> + #include <fcntl.h> ++#include <limits.h> + #include <poll.h> + #include <pthread.h> + #include <signal.h> +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index f1cdf66fc2..61f36d724d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -5,12 +5,13 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd" -SRCREV = "7786c7ded5c9ce7773890d0e3dc27632898fc6b1" +SRCREV = "3c288a09109969eef9c2da7d92d3c62f92a015cc" PV = "2.2.0+git${SRCPV}" SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \ file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \ - file://0001-include-Declare-gVERSION-global-as-extern.patch \ + file://0001-mraa-Use-posix-basename.patch \ + file://0002-gpio-Include-limits.h-for-PATH_MAX.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.19.bb b/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.20.bb index 6b3160f090..5f45d7fbd6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.19.bb +++ b/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.20.bb @@ -11,4 +11,4 @@ DEPENDS = "zstd liburing" SRC_URI = "https://plocate.sesse.net/download/${BP}.tar.gz" -SRC_URI[sha256sum] = "d95bc8ee8a9f79b9f69ce63df53fb85b202139f243bbb84c399555eda22e6165" +SRC_URI[sha256sum] = "9b3d2842a08e69633c0ffa480c139603514ce59f1d021c263e9301324976959f" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.10.bb b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb index 2df5e09194..3e757e6037 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.10.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb @@ -8,7 +8,7 @@ DEPENDS += "hiredis" SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch" -SRCREV = "8b9ce389099608cf9bae617d79d257d2cc05e12f" +SRCREV = "ad6baa121f4c6fbc7622d83d606210ac22549c78" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch index a90f588d2b..45556afa8a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch +++ b/meta-openembedded/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch @@ -18,7 +18,7 @@ index 4802f35..e0e468f 100644 # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build SR_PKG_CHECK([python3], [SRD_PKGLIBS], - [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) -+ [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) AS_IF([test "x$sr_have_python3" = xno], [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb index 0695f99695..a86f4a80d8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" -DEPENDS = "libjpeg-turbo mraa" +DEPENDS = "libjpeg-turbo mraa python3-setuptools-native" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" PV = "2.0.0+git${SRCPV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb index aff555ad54..cc03ab4fea 100644 --- a/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb @@ -27,7 +27,7 @@ DEPENDS += " \ swig-native \ " -PACKAGECONFIG ??= "python3" +PACKAGECONFIG ??= "" PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3" EXTRA_OECONF = "--without-python" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.1.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.2.bb index 577acda59b..d10f5ad413 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.1.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/adw-gtk3_5.2.bb @@ -11,6 +11,6 @@ inherit meson SRC_URI = "git://github.com/lassekongo83/adw-gtk3.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "a3e1050341956fcae53b2b4403affcf2578a42f4" +SRCREV = "8056d8701afbd9b985668916557159432e6ad824" FILES:${PN} = "${datadir}/themes" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.14.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.0.bb index 782833b228..83fb234fb3 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.1.14.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.0.bb @@ -11,7 +11,7 @@ SRC_URI = "\ git://github.com/hughsie/libjcat.git;branch=main;protocol=https \ file://run-ptest \ " -SRCREV = "d9cf9ebc4237252a82f88d9e99bea0c4b398c08a" +SRCREV = "60bb85d53d5da74903ab1e227fbecfa3a3be1b05" S = "${WORKDIR}/git" inherit gobject-introspection gtk-doc meson ptest-gnome vala lib_package diff --git a/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.1.bb b/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.2.bb index 603ebe48d1..b503c6ed9c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/cglm/cglm_0.9.2.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8dc95c4110ba741c43832734b51b7de7" SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https" # Tag v0.9.1 -SRCREV = "cdd4d0e83e9ee79f73aeb0a4fb60b4abd8ecf947" +SRCREV = "c8781615183ce3cb4f5d72caf70f2c01d7d4d2af" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.1.bb b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.2.bb index 40145b873c..2c38ce614b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.2.bb @@ -9,7 +9,7 @@ DEPENDS = "\ " SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" -SRC_URI[sha256sum] = "ec5e44d3cfe6f50f1c64f28a6f0225d958f4f4621726d9c2a04b5a32e5106d23" +SRC_URI[sha256sum] = "5f94a77de25c5398876f0cf431612d782b842f4db154d2139b778c8f196e8969" inherit mime-xdg features_check # depends on virtual/libx11 diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb index 404e86b86a..31dd495fd7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb @@ -24,6 +24,8 @@ SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DENABLE_DOCS=OFF" +PACKAGECONFIG = "readline" +PACKAGECONFIG[readline] = "-DENABLE_READLINE=ON,-DENABLE_READLINE=OFF,readline" CFLAGS += "-fno-strict-aliasing" LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/files/0001-csv-revision-Drop-the-git-revision-info.patch b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/files/0001-csv-revision-Drop-the-git-revision-info.patch new file mode 100644 index 0000000000..98a820bd9e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/files/0001-csv-revision-Drop-the-git-revision-info.patch @@ -0,0 +1,42 @@ +From 0a1af74ed3fae9a9a08b8b1ab89e88c02427ae06 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 10 Jan 2024 05:57:00 +0000 +Subject: [PATCH] csv-revision: Drop the git revision info + +The git revison info is added [1] to make the version more descriptive +to produce an incremental revision number like 1.8.18.13 or 1.8.18.14 +and etc and more clear in terms of "what codebase was used" like +`1.8.18.13.gee01aa5`. But it also introduces the below version +inconsistence. + root@qemux86-64:~# ipmitool -V + ipmitool version 1.8.19.19.gab5ce5b + root@qemux86-64:~# rpm -qa | grep ipmitool + ipmitool-1.8.19-r0.core2_64 + +Considering the version we acutally used in oe is a release version, +the git revision info as [1] is meaningness. So drop the git revsion +info to remove the above version inconsitence. + +[1] https://github.com/ipmitool/ipmitool/commit/ba01dc84b4e225c86eac3f562e629662d752040f + +Upstream-Status: Inappropriate [OE-Specific as we use a release version in oe] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + csv-revision | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/csv-revision b/csv-revision +index 289c133..3fa9f1c 100755 +--- a/csv-revision ++++ b/csv-revision +@@ -1,5 +1,6 @@ + #!/bin/sh + ++exit 0 + git describe --first-parent --tags 2>/dev/null | ( + IFS=- read tag rev hash + if [ $? ] && [ -n "$rev" ]; then +-- +2.35.5 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb index a8279f5755..0f1c8846b4 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb @@ -24,6 +24,7 @@ DEPENDS = "openssl readline ncurses" SRCREV = "ab5ce5baff097ebb6e2a17a171858be213ee68d3" SRC_URI = "git://codeberg.org/ipmitool/ipmitool;protocol=https;branch=master \ ${IANA_ENTERPRISE_NUMBERS} \ + file://0001-csv-revision-Drop-the-git-revision-info.patch \ " IANA_ENTERPRISE_NUMBERS ?= "" diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 291a83aaad..6c97e28545 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -93,6 +93,7 @@ either install it and add it to HOSTTOOLS, or add clang-native from meta-clang t sed -i -e 's|^all: docs|all:|' ${S}/tools/testing/selftests/bpf/Makefile sed -i -e '/mrecord-mcount/d' ${S}/Makefile sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile + sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/scripts/Makefile.* for i in ${TEST_LIST} do oe_runmake -C ${S}/tools/testing/selftests/${i} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb index c02645a6b8..f314d9b6ae 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb @@ -24,6 +24,7 @@ PACKAGECONFIG ??= "media-ctl" PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," PACKAGECONFIG[qv4l2] = ",--disable-qv4l2" PACKAGECONFIG[qvidcap] = ",--disable-qvidcap" +PACKAGECONFIG[v4l2-tracer] = ",--disable-v4l2-tracer,json-c" SRC_URI = "\ git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.24 \ @@ -77,7 +78,9 @@ FILES:${PN} = "${bindir} ${sbindir}" FILES:libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ ${libdir}/libdvbv5*${SOLIBS} \ - ${libdir}/libv4l/*-decomp" + ${libdir}/libv4l/*-decomp \ + ${libdir}/libv4l2tracer.so \ +" FILES:libv4l-dev += "${includedir} ${libdir}/pkgconfig \ ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch new file mode 100644 index 0000000000..d66ad4f268 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch @@ -0,0 +1,35 @@ +From 25e12cf5918884f232cebc34c92bd548fe40c2b3 Mon Sep 17 00:00:00 2001 +From: Anonymous Maarten <anonymous.maarten@gmail.com> +Date: Fri, 9 Dec 2022 19:13:09 +0100 +Subject: [PATCH] cmake: extract libtool from configure.ac and convert to + SOVERSION + +Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/25e12cf5918884f232cebc34c92bd548fe40c2b3] +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + CMakeLists.txt | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index adc73b09..7ae5043f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,18 @@ cmake_minimum_required(VERSION 3.2) + + project(WavPack VERSION 5.6.0) + ++file(READ "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC) ++string(REGEX MATCH "LT_CURRENT=([0-9]+)" LT_CURRENT "${CONFIGURE_AC}") ++set(LT_CURRENT "${CMAKE_MATCH_1}") ++string(REGEX MATCH "LT_REVISION=([0-9]+)" LT_REVISION "${CONFIGURE_AC}") ++set(LT_REVISION "${CMAKE_MATCH_1}") ++string(REGEX MATCH "LT_AGE=([0-9]+)" LT_AGE "${CONFIGURE_AC}") ++set(LT_AGE "${CMAKE_MATCH_1}") ++ ++math(EXPR SOVERSION_MAJOR "${LT_CURRENT}-${LT_AGE}") ++math(EXPR SOVERSION_MINOR "${LT_AGE}") ++math(EXPR SOVERSION_MICRO "${LT_REVISION}") ++ + # Languages + + include(CheckLanguage) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch new file mode 100644 index 0000000000..faddb7b754 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch @@ -0,0 +1,26 @@ +From 7c1dd729302b7f77f65884df4e79301df1490423 Mon Sep 17 00:00:00 2001 +From: Anonymous Maarten <anonymous.maarten@gmail.com> +Date: Fri, 9 Dec 2022 19:23:51 +0100 +Subject: [PATCH] cmake: set SOVERSION and VERSION property of wavpack + +This is used to version .so libraries on Linux + +Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/7c1dd729302b7f77f65884df4e79301df1490423] +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ae5043f..285b295b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -361,6 +361,8 @@ if(BUILD_SHARED_LIBS) + target_link_directories(wavpack PRIVATE "-Wl,-exported_symbols_list,${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym") + endif() + else() ++ set_target_properties(wavpack PROPERTIES SOVERSION "${SOVERSION_MAJOR}") ++ set_target_properties(wavpack PROPERTIES VERSION "${SOVERSION_MAJOR}.${SOVERSION_MINOR}.${SOVERSION_MICRO}") + set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym;\n};\n\nVERS_2 {\n global: sym;\n} VERS_1;\n") + file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") + check_c_linker_flag("-Wl,--version-script=${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map" COMPILER_SUPPORTS_SYMBOL_MAPS) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb deleted file mode 100644 index 9096123939..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.1.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://license.txt;md5=8c1a910e5c2a8b30ec8ffb2ffa63d9b2" - -SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https" -SRCREV = "9ccc3fe4a37d069137ceabe513a4dd9b0a09c1c2" -S = "${WORKDIR}/git" - -inherit autotools lib_package diff --git a/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb new file mode 100644 index 0000000000..7384d2892f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://license.txt;md5=bb5d037e3ad41a3c84c9f2d8bb65a7b4" + +DEPENDS = "openssl" + +SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https \ + file://set-soversion-and-version.patch \ + file://extract-libtool-and-convert-to-soversion.patch \ + " + +SRCREV = "e03e8e29dc618e08e7baba9636e57ba1254874ce" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig lib_package + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.6.4.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb index 2dd7b684e4..92655e3c6f 100644 --- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.6.4.bb +++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main" -SRCREV = "d8371889d070d2f88636434ebd8412708a63e54e" +SRCREV = "986d2485784d57d7a84cc5af50e67bde827b0dc9" inherit cmake pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb index 5380e90223..7136ed6a4c 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb @@ -27,7 +27,7 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_PACKAGES = "auditd" SYSTEMD_SERVICE:auditd = "auditd.service" -DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native" +DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native python3-setuptools-native" EXTRA_OECONF = " --with-libwrap \ --enable-gssapi-krb5=no \ diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb index 52c62cde30..f9fe82a91d 100644 --- a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb +++ b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4 inherit autotools-brokensep pkgconfig python3native -PACKAGECONFIG ?= "ncat nping ndiff pcap" +PACKAGECONFIG ?= "ncat nping pcap" PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre" diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/run-ptest b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/run-ptest index 15971dec05..46572111b5 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/run-ptest @@ -1,6 +1,6 @@ #!/bin/sh -if ./arestest; then +if ./arestest --gtest_filter=-*.Live*; then echo "PASS: c-ares" else echo "FAIL: c-ares" diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch deleted file mode 100644 index 6b225a10cf..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick/0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0912e49d58c2a5f455fabf76ab7dc61cfc44cfb9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 30 Mar 2023 20:50:26 -0700 -Subject: [PATCH] m4: Use autconf provided AC_FUNC_FSEEKO - -This helps in building with autoconf 2.72 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - m4/ac_func_fseeko.m4 | 18 +----------------- - 1 file changed, 1 insertion(+), 17 deletions(-) - -diff --git a/m4/ac_func_fseeko.m4 b/m4/ac_func_fseeko.m4 -index eaeabb978..f9b8859cf 100644 ---- a/m4/ac_func_fseeko.m4 -+++ b/m4/ac_func_fseeko.m4 -@@ -53,20 +53,4 @@ - # -------------- - AN_FUNCTION([ftello], [AC_FUNC_FSEEKO]) - AN_FUNCTION([fseeko], [AC_FUNC_FSEEKO]) --AC_DEFUN([AC_FUNC_FSEEKO], --[_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, -- [ac_cv_sys_largefile_source], -- [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).], -- [[#include <sys/types.h> /* for off_t */ -- #include <stdio.h>]], -- [[int (*fp) (FILE *, off_t, int) = fseeko; -- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);]]) -- --# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug --# in glibc 2.1.3, but that breaks too many other things. --# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. --if test $ac_cv_sys_largefile_source != unknown; then -- AC_DEFINE(HAVE_FSEEKO, 1, -- [Define to 1 if fseeko (and presumably ftello) exists and is declared.]) --fi --])# AC_FUNC_FSEEKO -+AC_FUNC_FSEEKO --- -2.40.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index e59b511a72..dcc951bce8 100644 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb @@ -4,16 +4,15 @@ HOMEPAGE = "https://www.imagemagick.org/" DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ editing raster and vector image files. It can read and write over 200 image file formats." LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ac58ac14f9d9d02cafd2d81ef38fb2cc \ +LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \ file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed" # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" BASE_PV := "${PV}" -PV .= "-8" -SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https \ - file://0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch" -SRCREV = "920f79206ff59f30a4cff22c9c9c393508b82663" +PV .= "-26" +SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" +SRCREV = "570a9a048bb0e3a5c221ca87be9408ae35f711e2" S = "${WORKDIR}/git" @@ -38,7 +37,7 @@ PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2" do_install:append:class-target() { for file in MagickCore-config.im7 MagickWand-config.im7 Magick++-config.im7; do - sed -i 's,${STAGING_DIR_NATIVE},,g' ${D}${bindir}/"$file" + sed -i 's,${STAGING_DIR_TARGET},,g' ${D}${bindir}/"$file" done sed -i 's,${S},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml sed -i 's,${B},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml diff --git a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.8.1.bb b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb index 878d28f137..422d96359c 100644 --- a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f8d2fc4954306888fd0e4b27bef83525" # v2.7.6 -SRCREV = "e6372b88e09a4d1c573b57270de6b40846825a8b" +SRCREV = "9e6661278572009a92a8e125c9b339232a9735a1" SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master \ file://ldflags.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch deleted file mode 100644 index d78ee7a8df..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 51ec4c1f533dee9a499490c1c5bbd23d2191a4a7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 20 Mar 2022 11:14:25 -0700 -Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR - -Do not hardcode library path, this helps it install in right location -independent of platforms, e.g. ppc64 uses lib64 and not lib - -Upstream-Status: Submitted [https://github.com/mfontanini/cppkafka/pull/291] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4e44e6..25ec1ce 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,7 +51,7 @@ option(CPPKAFKA_EXPORT_CMAKE_CONFIG "Generate CMake config, target and version f - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") - - if (NOT CPPKAFKA_CONFIG_DIR) -- set(CPPKAFKA_CONFIG_DIR lib/cmake/${PROJECT_NAME}) -+ set(CPPKAFKA_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - endif() - - # Maintain previous compatibility --- -2.35.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb index fd57e4e283..cf2d933169 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb @@ -9,17 +9,21 @@ file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \ " SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master \ - file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \ " -SRCREV = "5e4b350806d561473138ce7a982e8f6cf2e77733" +SRCREV = "91ac543cbd2228588dcf24a6ca357f8be0f4e5ab" -DEPENDS = "librdkafka boost chrpath-replacement-native" +BASEPV = "0.4.0" +PV = "${BASEPV}+git" + +DEPENDS = "librdkafka curl boost chrpath-replacement-native" inherit cmake +EXTRA_OECMAKE = "-DCPPKAFKA_BUILD_SHARED=ON" + S = "${WORKDIR}/git" do_install:append(){ - chrpath -d ${D}${libdir}/libcppkafka.so.0.3.1 + chrpath -d ${D}${libdir}/libcppkafka.so.${BASEPV} sed -i -e 's|${STAGING_INCDIR}|\$\{includedir\}|g' ${D}${datadir}/pkgconfig/cppkafka.pc } diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch deleted file mode 100644 index ef9cc47d25..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme/0001-test-handle-POSIX-ioctl-prototype.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ca47ba3119365eafac0ab25a86cab9d9a1b29bd4 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sat, 30 Sep 2023 06:38:53 +0100 -Subject: [PATCH] test: handle POSIX ioctl prototype - -glibc has the following prototype for ioctl: int ioctl(int fd, unsigned long request, ...) -POSIX (inc. musl) has the following for ioctl: int ioctl(int fd, int request, ...) - -Check which prototype is used in <sys/ioctl.h> to avoid a conflict and conditionally -define the right one for the system. - -Bug: https://bugs.gentoo.org/914921 -Signed-off-by: Sam James <sam@gentoo.org> -Upstream-Status: Backport [https://github.com/linux-nvme/libnvme/commit/ca47ba3119365eafac0ab25a86cab9d9a1b29bd4] ---- - meson.build | 10 ++++++++++ - test/ioctl/mock.c | 6 +++++- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 6fcf1da..2c979cc 100644 ---- a/meson.build -+++ b/meson.build -@@ -230,6 +230,16 @@ conf.set( - ), - description: 'Is network address and service translation available' - ) -+conf.set( -+ 'HAVE_GLIBC_IOCTL', -+ cc.compiles( -+ '''#include <sys/ioctl.h> -+ int ioctl(int fd, unsigned long request, ...); -+ ''', -+ name: 'ioctl has glibc-style prototype' -+ ), -+ description: 'Is ioctl the glibc interface (rather than POSIX)' -+) - - if cc.has_function_attribute('fallthrough') - conf.set('fallthrough', '__attribute__((__fallthrough__))') -diff --git a/test/ioctl/mock.c b/test/ioctl/mock.c -index e917244..5d2ac94 100644 ---- a/test/ioctl/mock.c -+++ b/test/ioctl/mock.c -@@ -114,7 +114,11 @@ void end_mock_cmds(void) - } \ - }) - -+#ifdef HAVE_GLIBC_IOCTL - int ioctl(int fd, unsigned long request, ...) -+#else -+int ioctl(int fd, int request, ...) -+#endif - { - struct mock_cmds *mock_cmds; - bool result64; -@@ -141,7 +145,7 @@ int ioctl(int fd, unsigned long request, ...) - result64 = true; - break; - default: -- fail("unexpected %s %lu", __func__, request); -+ fail("unexpected %s %lu", __func__, (unsigned long) request); - } - check(mock_cmds->remaining_cmds, - "unexpected %s command", mock_cmds->name); --- -2.40.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.6.bb b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.7.1.bb index 802edac508..985fd7c55c 100644 --- a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.7.1.bb @@ -11,11 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c" -SRCREV = "37a803cf77e224f66d86b1e1d9e74a15f55ea600" +SRCREV = "13ba38387e5446849ae59d3ccd8183cf9aca3145" -SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master \ - file://0001-test-handle-POSIX-ioctl-prototype.patch \ -" +SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb index 911582553c..a45ffe1849 100644 --- a/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb @@ -2,7 +2,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz" -SRC_URI[sha256sum] = "474e9575e1235a0d8e3661f072de0193bab6ea1023363772f698a2cc39d640cf" +SRC_URI[sha256sum] = "1fda0cf64efa46b9684a4ccc17df4386c4cc83254805419222c064bf62ea001f" inherit perlnative autotools diff --git a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.1.bb b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.2.bb index a3bbbe39ef..4d089f3b79 100644 --- a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.2.bb @@ -2,8 +2,8 @@ SUMMARY = "raw image decoder" LICENSE = "LGPL-2.1-only | CDDL-1.0" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f" -SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=master;protocol=https" -SRCREV = "cccb97647fcee56801fa68231fa8a38aa8b52ef7" +SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https" +SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch index 19775fa529..d2d1fb5955 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch @@ -1,4 +1,4 @@ -From 0cade4573334571055127a2d4fe3641e2397948d Mon Sep 17 00:00:00 2001 +From 49a8ae4d6f77434ed9f7a601b9df488b921e4a22 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 20 Mar 2023 21:59:19 -0700 Subject: [PATCH] libgcrypt.c: Fix prototype of des3_encrypt/des3_decrypt @@ -18,15 +18,16 @@ TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- src/libgcrypt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libgcrypt.c b/src/libgcrypt.c -index da5588ad..e482b654 100644 +index f410d997..e3f66781 100644 --- a/src/libgcrypt.c +++ b/src/libgcrypt.c -@@ -469,12 +469,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { +@@ -416,12 +416,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { } static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in, @@ -41,6 +42,3 @@ index da5588ad..e482b654 100644 gcry_cipher_decrypt(cipher->key[0], out, len, in, len); } --- -2.40.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch index 0c7f53029e..d6bc75c3a6 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch @@ -1,4 +1,4 @@ -From d2525ba0bc7b11de12c54ea1a3d1eb862537136d Mon Sep 17 00:00:00 2001 +From 69a89e8f015802f61637fed0d3791d20a594f298 Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 15 Mar 2023 16:51:58 +0800 Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host @@ -9,12 +9,13 @@ not required by unittests, we can skip the search. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + --- tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 22a36f37..aa32ca2e 100644 +index f5c30061..885c926a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES @@ -25,7 +26,7 @@ index 22a36f37..aa32ca2e 100644 # OpenSSH Capabilities are required for all unit tests find_program(SSH_EXECUTABLE NAMES ssh) if (SSH_EXECUTABLE) -@@ -293,6 +294,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) +@@ -302,6 +303,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") endif () @@ -33,6 +34,3 @@ index 22a36f37..aa32ca2e 100644 configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.5.bb b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.6.bb index f33987acf5..31f29c1b7d 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.6.bb @@ -11,7 +11,7 @@ SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ file://run-ptest \ " -SRCREV = "479eca13aaaa46b43e68c52186e3783f06ae6f34" +SRCREV = "10e09e273f69e149389b3e0e5d44b8c221c2e7f6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb index 7ef4d89ce0..cece68c632 100644 --- a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" -SRCREV = "1dee28e51f9175a31955b9791c74c430fe13dc82" +SRCREV = "321ea883b7190d4e85cae5512a12e5eaa8f8731f" SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \ file://run-ptest" @@ -19,7 +19,9 @@ CXXFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" do_install_ptest() { install -Dm 0755 ${B}/xmltest ${D}${PTEST_PATH}/xmltest install -d ${D}${PTEST_PATH}/resources/out - install -Dm 0644 ${B}/resources/*.xml ${D}${PTEST_PATH}/resources/ + for f in ${S}/resources/*.xml; do + install -m 0644 $f ${D}${PTEST_PATH}/resources/ + done } BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.8.bb b/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.9.bb index 2144592286..b29437db1e 100644 --- a/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.9.bb @@ -14,7 +14,7 @@ SRC_URI = "\ file://run-ptest \ " -SRC_URI[sha256sum] = "28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e" +SRC_URI[sha256sum] = "60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf" BINCONFIG = "${bindir}/onig-config" diff --git a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.21.02.21.bb b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb index 781e698cbf..6cacd3722c 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.21.02.21.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fd8857f774dfb0eefe1e80c8f9240a7e" SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master" -SRCREV = "d34bc1a3bdc148e2e1fe64998398e1a0552ab04c" +SRCREV = "748c3930a9b9cb826e631d77439e2cb8f84f5bcf" S = "${WORKDIR}/git" DEPENDS += "opencl-headers virtual/opencl-icd" do_install() { - install -D -m 755 clinfo ${D}${bindir}/clinfo + oe_runmake install PREFIX=${D}${prefix} MANDIR=${D}${mandir} } diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/files/0001-pkcs11-tool-Fix-private-key-import.patch b/meta-openembedded/meta-oe/recipes-support/opensc/files/0001-pkcs11-tool-Fix-private-key-import.patch deleted file mode 100644 index e270a8e2e6..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opensc/files/0001-pkcs11-tool-Fix-private-key-import.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6f868bbcd9e65447f459f74381c09d1e315a32f6 Mon Sep 17 00:00:00 2001 -From: Jakub Jelen <jjelen@redhat.com> -Date: Thu, 1 Dec 2022 20:08:53 +0100 -Subject: [PATCH 1/2] pkcs11-tool: Fix private key import - -Upstream-Status: Backport ---- - src/tools/pkcs11-tool.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c -index aae205fe2cd6..cfee8526d5b0 100644 ---- a/src/tools/pkcs11-tool.c -+++ b/src/tools/pkcs11-tool.c -@@ -3669,13 +3669,13 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) - RSA_get0_factors(r, &r_p, &r_q); - RSA_get0_crt_params(r, &r_dmp1, &r_dmq1, &r_iqmp); - #else -- if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_d) != 1 || -+ if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D, &r_d) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1, &r_p) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || -- EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT3, &r_iqmp) != 1) { - util_fatal("OpenSSL error during RSA private key parsing"); -+ EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { - } - #endif - RSA_GET_BN(rsa, private_exponent, r_d); --- -2.30.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/files/0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch b/meta-openembedded/meta-oe/recipes-support/opensc/files/0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch deleted file mode 100644 index 880a13ac61..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opensc/files/0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 4b5702409e7feea8cb410254285c120c57c10e1b Mon Sep 17 00:00:00 2001 -From: Jakub Jelen <jjelen@redhat.com> -Date: Thu, 1 Dec 2022 20:11:41 +0100 -Subject: [PATCH 2/2] pkcs11-tool: Log more information on OpenSSL errors - -Upstream-Status: Backport ---- - src/tools/pkcs11-tool.c | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c -index cfee8526d5b0..f2e6b1dd91cd 100644 ---- a/src/tools/pkcs11-tool.c -+++ b/src/tools/pkcs11-tool.c -@@ -3641,10 +3641,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) - const BIGNUM *r_dmp1, *r_dmq1, *r_iqmp; - r = EVP_PKEY_get1_RSA(pkey); - if (!r) { -- if (private) -- util_fatal("OpenSSL error during RSA private key parsing"); -- else -- util_fatal("OpenSSL error during RSA public key parsing"); -+ util_fatal("OpenSSL error during RSA %s key parsing: %s", private ? "private" : "public", -+ ERR_error_string(ERR_peek_last_error(), NULL)); - } - - RSA_get0_key(r, &r_n, &r_e, NULL); -@@ -3654,10 +3652,8 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) - BIGNUM *r_dmp1 = NULL, *r_dmq1 = NULL, *r_iqmp = NULL; - if (EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_N, &r_n) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_E, &r_e) != 1) { -- if (private) -- util_fatal("OpenSSL error during RSA private key parsing"); -- else -- util_fatal("OpenSSL error during RSA public key parsing"); -+ util_fatal("OpenSSL error during RSA %s key parsing: %s", private ? "private" : "public", -+ ERR_error_string(ERR_peek_last_error(), NULL)); - } - #endif - RSA_GET_BN(rsa, modulus, r_n); -@@ -3674,8 +3670,9 @@ parse_rsa_pkey(EVP_PKEY *pkey, int private, struct rsakey_info *rsa) - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2, &r_q) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT1, &r_dmp1) != 1 || - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_EXPONENT2, &r_dmq1) != 1 || -- util_fatal("OpenSSL error during RSA private key parsing"); - EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_COEFFICIENT1, &r_iqmp) != 1) { -+ util_fatal("OpenSSL error during RSA private key parsing: %s", -+ ERR_error_string(ERR_peek_last_error(), NULL)); - } - #endif - RSA_GET_BN(rsa, private_exponent, r_d); --- -2.30.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/files/CVE-2023-2977.patch b/meta-openembedded/meta-oe/recipes-support/opensc/files/CVE-2023-2977.patch deleted file mode 100644 index 165fc316bf..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opensc/files/CVE-2023-2977.patch +++ /dev/null @@ -1,54 +0,0 @@ -CVE: CVE-2023-2977 -Upstream-Status: Backport [ https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a ] -Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> - - -From 81944d1529202bd28359bede57c0a15deb65ba8a Mon Sep 17 00:00:00 2001 -From: fullwaywang <fullwaywang@tencent.com> -Date: Mon, 29 May 2023 10:38:48 +0800 -Subject: [PATCH] pkcs15init: correct left length calculation to fix buffer - overrun bug. Fixes #2785 - ---- - src/pkcs15init/pkcs15-cardos.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c -index 9715cf390f..f41f73c349 100644 ---- a/src/pkcs15init/pkcs15-cardos.c -+++ b/src/pkcs15init/pkcs15-cardos.c -@@ -872,7 +872,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) - sc_apdu_t apdu; - u8 rbuf[SC_MAX_APDU_BUFFER_SIZE]; - int r; -- const u8 *p = rbuf, *q; -+ const u8 *p = rbuf, *q, *pp; - size_t len, tlen = 0, ilen = 0; - - sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xca, 0x01, 0x88); -@@ -888,13 +888,13 @@ static int cardos_have_verifyrc_package(sc_card_t *card) - return 0; - - while (len != 0) { -- p = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); -- if (p == NULL) -+ pp = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); -+ if (pp == NULL) - return 0; - if (card->type == SC_CARD_TYPE_CARDOS_M4_3) { - /* the verifyRC package on CardOS 4.3B use Manufacturer ID 0x01 */ - /* and Package Number 0x07 */ -- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x01, &ilen); -+ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x01, &ilen); - if (q == NULL || ilen != 4) - return 0; - if (q[0] == 0x07) -@@ -902,7 +902,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) - } else if (card->type == SC_CARD_TYPE_CARDOS_M4_4) { - /* the verifyRC package on CardOS 4.4 use Manufacturer ID 0x03 */ - /* and Package Number 0x02 */ -- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x03, &ilen); -+ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x03, &ilen); - if (q == NULL || ilen != 4) - return 0; - if (q[0] == 0x02) diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.23.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.24.0.bb index b3fc1f0458..fd64cf9e85 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.23.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.24.0.bb @@ -12,11 +12,8 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" #v0.21.0 -SRCREV = "5497519ea6b4af596628f8f8f2f904bacaa3148f" +SRCREV = "f15d0c5295f3247ae56bf976cf411fec4b47b6ec" SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \ - file://0001-pkcs11-tool-Fix-private-key-import.patch \ - file://0002-pkcs11-tool-Log-more-information-on-OpenSSL-errors.patch \ - file://CVE-2023-2977.patch \ " DEPENDS = "virtual/libiconv openssl" @@ -44,6 +41,7 @@ FILES:${PN} += "\ ${libdir}/pkcs11-spy.so \ " FILES:${PN}-dev += "\ + ${libdir}/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/opensc-pkcs11.so \ ${libdir}/pkcs11/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/pkcs11-spy.so \ diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.0.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.1.bb index e7f4551afa..0862f955b6 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.1.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" DEPENDS = "autoconf-archive-native flex-native" SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "d6c3e2b64510e5ed6fcd3323febf2cc2a8e5fda5a6588c7671f2d77f9f189356" +SRC_URI[sha256sum] = "5edcaf5d4544403bdab6ee2b5d6c02c6f97ea64eebf0825b8d0fa61ba417dada" inherit autotools systemd pkgconfig perlnative @@ -23,11 +23,12 @@ EXTRA_OECONF = " \ S = "${WORKDIR}/pcsc-lite-${PV}" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} udev" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} udev" PACKAGECONFIG:class-native ??= "" PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" +PACKAGECONFIG[polkit] = ",--disable-polkit,polkit" PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" @@ -35,7 +36,8 @@ RRECOMMENDS:${PN} = "ccid" RRECOMMENDS:${PN}:class-native = "" RPROVIDES:${PN}:class-native += "pcsc-lite-lib-native" -FILES:${PN} = "${sbindir}/pcscd" +FILES:${PN} = "${sbindir}/pcscd \ + ${datadir}/polkit-1" FILES:${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" FILES:${PN}-dev = "${includedir} \ ${libdir}/pkgconfig \ diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.6.2.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb index b71fb0427b..97a94ec973 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.6.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb @@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" -SRCREV = "b1018b83346f8a3bc3d42c96f2ed4dc62147cb24" +SRCREV = "53834cd33155ae1f0332102b1baca6ce63660fc5" inherit autotools pkgconfig S = "${WORKDIR}/git" -DEPENDS = "pcsc-lite" +DEPENDS = "pcsc-lite autoconf-archive-native" RDEPENDS:${PN} += " \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','pcsc-lite-systemd', 'pcsc-lite', d)} \ @@ -21,4 +21,5 @@ RDEPENDS:${PN} += " \ libpcsc-perl \ " -FILES:${PN} += "${datadir}/pcsc/smartcard_list.txt" +FILES:${PN} += "${datadir}/pcsc/smartcard_list.txt \ + ${datadir}/pcsc/gscriptor.png" diff --git a/meta-openembedded/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch b/meta-openembedded/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch deleted file mode 100644 index c6b01d06fc..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 9664809da36bd7bada3e44f50cfc042539fb61ee Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Sun, 14 Jul 2019 19:13:21 -0700 -Subject: [PATCH] Fix building with musl - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- - termios2.c | 27 +++++++++++++++++++++++++++ - termios2.h | 5 +++++ - 2 files changed, 32 insertions(+) - -diff --git a/termios2.c b/termios2.c -index 97c3be0..88ff6fc 100644 ---- a/termios2.c -+++ b/termios2.c -@@ -37,6 +37,7 @@ - #include <errno.h> - #include <termios.h> - #include <sys/ioctl.h> -+#include <asm/ioctls.h> - - /* Contains the definition of the termios2 structure and some related - constants that we should normally include from system -@@ -53,6 +54,10 @@ - */ - #define IBAUD0 020000000000 - -+#if !defined(__GLIBC__) -+#define __MAX_BAUD B4000000 -+#endif -+ - int - tc2setattr(int fd, int optional_actions, const struct termios *tios) - { -@@ -79,8 +84,13 @@ tc2setattr(int fd, int optional_actions, const struct termios *tios) - t2.c_cflag = tios->c_cflag; - t2.c_lflag = tios->c_lflag; - t2.c_line = tios->c_line; -+#if !defined(__GLIBC__) -+ t2.c_ispeed = tios->__c_ispeed; -+ t2.c_ospeed = tios->__c_ospeed; -+#else - t2.c_ispeed = tios->c_ispeed; - t2.c_ospeed = tios->c_ospeed; -+#endif - memcpy(&t2.c_cc[0], &tios->c_cc[0], K_NCCS * sizeof (cc_t)); - - return ioctl(fd, cmd, &t2); -@@ -101,8 +111,13 @@ tc2getattr(int fd, struct termios *tios) - tios->c_cflag = t2.c_cflag; - tios->c_lflag = t2.c_lflag; - tios->c_line = t2.c_line; -+#if !defined(__GLIBC__) -+ tios->__c_ispeed = t2.c_ispeed; -+ tios->__c_ospeed = t2.c_ospeed; -+#else - tios->c_ispeed = t2.c_ispeed; - tios->c_ospeed = t2.c_ospeed; -+#endif - memcpy(&tios->c_cc[0], &t2.c_cc[0], K_NCCS * sizeof (cc_t)); - - for (i = K_NCCS; i < NCCS; i++) -@@ -131,7 +146,11 @@ cf2setispeed(struct termios *tios, speed_t speed) - errno = EINVAL; - return -1; - } -+#if !defined(__GLIBC__) -+ tios->__c_ispeed = speed; -+#else - tios->c_ispeed = speed; -+#endif - tios->c_cflag &= ~((CBAUD | CBAUDEX) << IBSHIFT); - tios->c_cflag |= (speed << IBSHIFT); - -@@ -156,7 +175,11 @@ cf2setospeed_custom(struct termios *tios, int speed) - } - tios->c_cflag &= ~(CBAUD | CBAUDEX); - tios->c_cflag |= BOTHER; -+#if !defined(__GLIBC__) -+ tios->__c_ospeed = speed; -+#else - tios->c_ospeed = speed; -+#endif - - return 0; - } -@@ -177,7 +200,11 @@ cf2setispeed_custom(struct termios *tios, int speed) - } else { - tios->c_cflag &= ~((CBAUD | CBAUDEX) << IBSHIFT); - tios->c_cflag |= (BOTHER << IBSHIFT); -+#if !defined(__GLIBC__) -+ tios->__c_ispeed = speed; -+#else - tios->c_ispeed = speed; -+#endif - } - - return 0; -diff --git a/termios2.h b/termios2.h -index e13b0e3..63dd0ce 100644 ---- a/termios2.h -+++ b/termios2.h -@@ -37,8 +37,13 @@ - /* And define these new ones */ - #define cfsetospeed_custom cf2setospeed_custom - #define cfsetispeed_custom cf2setispeed_custom -+#if defined(__linux__) && !defined(__GLIBC__) -+#define cfgetospeed_custom(tiop) ((tiop)->__c_ospeed) -+#define cfgetispeed_custom(tiop) ((tiop)->__c_ispeed) -+#else - #define cfgetospeed_custom(tiop) ((tiop)->c_ospeed) - #define cfgetispeed_custom(tiop) ((tiop)->c_ispeed) -+#endif - - /* Replacements for the standard tcsetattr(3), tcgetattr(3) - * functions. Same user interface, but these use the new termios2 diff --git a/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb index 55dc292710..4ec256bb99 100644 --- a/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb @@ -1,16 +1,15 @@ SUMMARY = "Lightweight and minimal dumb-terminal emulation program" SECTION = "console/utils" LICENSE = "GPL-2.0-or-later" -HOMEPAGE = "https://github.com/npat-efault/picocom" +HOMEPAGE = "https://gitlab.com/wsakernel/picocom" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" -BASEPV = "3.1" +BASEPV = "2023-04" PV = "${BASEPV}+git${SRCPV}" -SRCREV = "90385aabe2b51f39fa130627d46b377569f82d4a" +SRCREV = "12537df0314767d5af35bddddbbca3694e6a0342" -SRC_URI = "git://github.com/npat-efault/picocom;branch=master;protocol=https \ - file://0001-Fix-building-with-musl.patch \ +SRC_URI = "git://gitlab.com/wsakernel/picocom;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb index 4d709fc526..f0824944b9 100644 --- a/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https" -SRCREV = "f6afdbb9288d20d1257122e71d88e53348a53af3" -PV = "3.6.5" +SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460" +PV = "3.6.6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch b/meta-openembedded/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch new file mode 100644 index 0000000000..5a74323bca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch @@ -0,0 +1,31 @@ +From 4aa8cf8c93e1fa6ffeb40fc3473f32b1b83af141 Mon Sep 17 00:00:00 2001 +From: "Ilya A. Kriveshko" <iillyyaa@gmail.com> +Date: Tue, 2 Jan 2024 15:37:10 -0500 +Subject: [PATCH] cmake: respect explicit install prefix + +If CMAKE_INSTALL_PREFIX was supplied externally, use it. This follows +the pattern suggested by cmake documentation in: +https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html + +Upstream-status: Submitted [https://github.com/sierrafoxtrot/srecord/pull/68] +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74b8108c..ac9f464e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,9 +30,9 @@ include(InstallRequiredSystemLibraries) + include(GNUInstallDirs) + + # FHS compliant paths for Linux installation +-if(NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +-# set(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}") +- set(CMAKE_INSTALL_PREFIX "/usr") ++if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ++ AND NOT WIN32 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install prefix" FORCE) + endif() + + # Pull in the rest of the pieces diff --git a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.65.0.bb b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.65.0.bb index 06ce48e65c..3e8a87d07f 100644 --- a/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.65.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.65.0.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = " \ https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}', 2)}/${BP}-Source.tar.gz \ file://0001-Disable-doxygen.patch \ - file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch" + file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \ + file://0001-cmake-respect-explicit-install-prefix.patch" SRC_URI[sha256sum] = "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644" S = "${WORKDIR}/${BP}-Source" diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.3.bb b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb index 6149a7ac49..3c6b7db811 100644 --- a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb @@ -15,7 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ file://no-musttail-arm.patch \ " -SRC_URI[sha256sum] = "0a1a4630045628b3a6fe95da72dc47852cff20d66be1ac6fd0d669c88c13d8e2" +SRC_URI[sha256sum] = "52288b30bda22373442cecb86f9c9a569ad8d4769a1f97b352290ed92a67ed86" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch index 53c119765a..f107f42dab 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch @@ -1,4 +1,4 @@ -From 9ed3b4e628f9254d5c86006fe63c33a1eb02aee5 Mon Sep 17 00:00:00 2001 +From 4d73b85fb1b794c649359bc8a774b0111d36994a Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Tue, 4 Feb 2020 23:39:49 -0800 Subject: [PATCH] nss/nspr: fix for multilib @@ -6,15 +6,16 @@ Subject: [PATCH] nss/nspr: fix for multilib Upstream-Status: Pending Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + --- configure.ac | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac -index b46d97d..39f4318 100644 +index 51621d6..3d23683 100644 --- a/configure.ac +++ b/configure.ac -@@ -920,24 +920,24 @@ fi +@@ -960,24 +960,24 @@ fi dnl Priority 1: User specifies the path to installation if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) @@ -47,6 +48,3 @@ index b46d97d..39f4318 100644 fi fi --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch index 1451ff5647..3a1531deb1 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch @@ -1,4 +1,4 @@ -From c1c980a95d85bcaf8802524d6148783522b300d7 Mon Sep 17 00:00:00 2001 +From 9c861646e034b1c80fafd389279b0a7da90a8ba7 Mon Sep 17 00:00:00 2001 From: Yulong Pei <Yulong.pei@windriver.com> Date: Wed, 21 Jul 2010 22:33:43 +0800 Subject: [PATCH] change finding path of nss and nspr @@ -8,20 +8,21 @@ Upstream-Status: Pending Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + --- - configure.ac | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 951b3eb..1fdeb0f 100644 +index ce8a278..51621d6 100644 --- a/configure.ac +++ b/configure.ac -@@ -866,7 +866,7 @@ MOZILLA_MIN_VERSION="1.4" +@@ -935,7 +935,7 @@ NSS_PACKAGE=mozilla-nss NSPR_INCLUDE_MARKER="nspr/nspr.h" NSPR_LIB_MARKER="libnspr4$shrext" NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" -NSS_INCLUDE_MARKER="nss/nss.h" +NSS_INCLUDE_MARKER="nss3/nss.h" NSS_LIB_MARKER="libnss3$shrext" - NSS_LIBS_LIST="-lnss3 -lsmime3" + NSS_LIBS_LIST="-lnss3 -lsmime3 -lnssutil3" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch index a5a298af0d..7b07628e5f 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch @@ -1,4 +1,7 @@ -xmlsec1: Fix configure QA error caused by host lookup path +From c16d384fb64cf53351e150fb9e9b99cc6ba970b2 Mon Sep 17 00:00:00 2001 +From: Anatol Belski <anbelski@linux.microsoft.com> +Date: Thu, 14 Jan 2021 17:36:23 +0000 +Subject: [PATCH] xmlsec1: Fix configure QA error caused by host lookup path ERROR: mc:my-sdk:xmlsec1-1.2.30-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. @@ -7,9 +10,15 @@ It will eventually arise after the configure QA as the configure script should o Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com> ---- a/configure.ac.orig 2021-01-13 14:37:42.254991177 +0000 -+++ b/configure.ac 2021-01-13 14:40:56.546269330 +0000 -@@ -250,8 +250,8 @@ +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3d23683..baf27b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -286,8 +286,8 @@ fi dnl ========================================================================== dnl Common installation locations dnl ========================================================================== diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch index af598fe749..73c6ddb027 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch @@ -1,4 +1,4 @@ -From 847dc52f5a50e34ee4d6e3dc2c708711747a58ca Mon Sep 17 00:00:00 2001 +From 1b9701faf22f5a17a81a2a2732794d9627499fcb Mon Sep 17 00:00:00 2001 From: Yulong Pei <Yulong.pei@windriver.com> Date: Thu, 21 Jan 2010 14:11:20 +0800 Subject: [PATCH] force to use our own libtool @@ -12,10 +12,10 @@ Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ltmain.sh b/ltmain.sh -index 147d758..a61f16b 100644 +index 1dea62a..bfb9784 100755 --- a/ltmain.sh +++ b/ltmain.sh -@@ -6969,7 +6969,7 @@ func_mode_link () +@@ -7225,7 +7225,7 @@ func_mode_link () dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.3.bb index ff5b6faeb4..7a5f01e4fd 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.3.bb @@ -22,7 +22,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://ensure-search-path-non-host.patch \ " -SRC_URI[sha256sum] = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf" +SRC_URI[sha256sum] = "ab5b9a9ffd6960f46f7466d9d91f174ec37e8c31989237ba6b9eacdd816464f2" inherit autotools-brokensep ptest pkgconfig |