diff options
Diffstat (limited to 'meta-oe/recipes-support')
707 files changed, 14649 insertions, 11969 deletions
diff --git a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb index 4ea6c8a295..6d64ab71bf 100644 --- a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb +++ b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb @@ -4,12 +4,12 @@ SUMMARY = "Ace is a code editor written in JavaScript. This repository has only LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=794d11c5219c59c9efa2487c2b4066b2" -SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https" +SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https;branch=master" -PV = "02.07.17+git${SRCPV}" +PV = "02.07.17+git" SRCREV = "812e2c56aed246931a667f16c28b096e34597016" -FILES_${PN} = "${datadir}/ace-builds" +FILES:${PN} = "${datadir}/ace-builds" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch b/meta-oe/recipes-support/anthy/anthy/2ch_t.patch index bf9bdb63d7..a0d3f9c25e 100644 --- a/meta-oe/recipes-support/anthy/anthy/2ch_t.patch +++ b/meta-oe/recipes-support/anthy/anthy/2ch_t.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + source: shamelessly stolen from debian ;-) purpose: add some entries particularly useful in Japanese 2channel anonymous website (at least that is my understanding ;-)) diff --git a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch index 47ce007b7f..0b2df01aba 100644 --- a/meta-oe/recipes-support/anthy/anthy/native-helpers.patch +++ b/meta-oe/recipes-support/anthy/anthy/native-helpers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + upstream: not applicable author: pH5 comment: Stage the native anthy helpers mkfiledic, mkdepgraph, mkworddic, diff --git a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch index 1c5c494003..bedb5e0498 100644 --- a/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch +++ b/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + upstream: not applicable source: stolen from debian diff --git a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch b/meta-oe/recipes-support/anthy/anthy/target-helpers.patch index d22c3562a5..fc5c72c051 100644 --- a/meta-oe/recipes-support/anthy/anthy/target-helpers.patch +++ b/meta-oe/recipes-support/anthy/anthy/target-helpers.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurp anthy-9100h.org/calctrans/Makefile.am anthy-9100h/calctrans/Makefile.am --- anthy-9100h.org/calctrans/Makefile.am 2007-10-27 23:02:59.000000000 +0900 +++ anthy-9100h/calctrans/Makefile.am 2014-11-11 17:14:42.152999991 +0900 diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb index 9d78c3457c..f2bf52cdbc 100644 --- a/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb @@ -1,8 +1,7 @@ DESCRIPTION="Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text." -AUTHOR = "Anthy Developers <anthy-dev@lists.sourceforge.jp>" HOMEPAGE = "http://anthy.sourceforge.jp" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a \ file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ " @@ -12,34 +11,34 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \ file://2ch_t.patch \ " -SRC_URI_append_class-target = "file://target-helpers.patch" -SRC_URI_append_class-native = "file://native-helpers.patch" +SRC_URI:append:class-target = " file://target-helpers.patch" +SRC_URI:append:class-native = " file://native-helpers.patch" SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108" SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547" -DEPENDS_class-target = "anthy-native" -RDEPENDS_${PN}_class-target = "libanthy0" +DEPENDS:class-target = "anthy-native" +RDEPENDS:${PN}:class-target = "libanthy0" inherit autotools pkgconfig PACKAGES += "${PN}-el libanthy0 libanthy-dev" -FILES_${PN}-dbg += "${libdir}/.debug" -FILES_libanthy0 = "${libdir}/libanthy.so.* \ +FILES:${PN}-dbg += "${libdir}/.debug" +FILES:libanthy0 = "${libdir}/libanthy.so.* \ ${libdir}/libanthydic.so.* \ ${libdir}/libanthyinput.so.* \ " -FILES_libanthy-dev = "${libdir}/libanthy*.la \ +FILES:libanthy-dev = "${libdir}/libanthy*.la \ ${libdir}/libanthy*.a \ ${libdir}/libanthy*.so \ ${includedir}/anthy \ ${libdir}/pkgconfig/anthy.pc \ " -FILES_${PN}-el = "${datadir}/emacs/*" -FILES_${PN} = "${datadir}/* \ +FILES:${PN}-el = "${datadir}/emacs/*" +FILES:${PN} = "${datadir}/* \ ${bindir}/* \ ${sysconfdir}/anthy-conf \ " diff --git a/meta-oe/recipes-support/asio/asio_1.18.0.bb b/meta-oe/recipes-support/asio/asio_1.28.0.bb index 7709075fe3..84074400a6 100644 --- a/meta-oe/recipes-support/asio/asio_1.18.0.bb +++ b/meta-oe/recipes-support/asio/asio_1.28.0.bb @@ -2,25 +2,24 @@ SUMMARY = "Asio is C++ library for network and low-level I/O programming" DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \ I/O programming that provides developers with a consistent asynchronous \ model using a modern C++ approach." -AUTHOR = "Christopher M. Kohlhoff (chris at kohlhoff dot com)" HOMEPAGE = "http://think-async.com/Asio" SECTION = "libs" LICENSE = "BSL-1.0" DEPENDS = "openssl" -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2 \ + file://0001-Add-the-pkgconfigdir-location.patch \ +" inherit autotools -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084" +LIC_FILES_CHKSUM = "file://COPYING;md5=ff668366bbdb687b6029d33a5fe4b999" -SRC_URI[md5sum] = "ed1f2dc4cf24aa2da8361179ade01682" -SRC_URI[sha256sum] = "9d539e7c09aa6394d512c433c5601c1f26dc4975f022ad7d5e8e57c3b635b370" - -SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" +SRC_URI[sha256sum] = "d0ddc2361abd2f4c823e970aaf8e28b4b31ab21b1a68af16b114fc093661e232" PACKAGECONFIG ??= "boost" diff --git a/meta-oe/recipes-support/asio/files/0001-Add-the-pkgconfigdir-location.patch b/meta-oe/recipes-support/asio/files/0001-Add-the-pkgconfigdir-location.patch new file mode 100644 index 0000000000..75f083b0ed --- /dev/null +++ b/meta-oe/recipes-support/asio/files/0001-Add-the-pkgconfigdir-location.patch @@ -0,0 +1,30 @@ +From 248e87869d748cfb72d3a5d3b2b91ad178172e30 Mon Sep 17 00:00:00 2001 +From: Vasileios Anagnostopoulos <anagnwstopoulos@hotmail.com> +Date: Tue, 9 May 2023 12:48:29 +0200 +Subject: [PATCH] Add the pkgconfigdir location + +This change is necessary, because while building asio in yocto the +compilation is failing and is complaining because the variable is +undefined + +Signed-off-by: Vasileios Anagnostopoulos <anagnwstopoulos@hotmail.com> +Upstream-Status: Submitted [https://github.com/chriskohlhoff/asio/pull/1294] +--- + asio/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index b7760851..bc4f75b3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,7 @@ + AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip + + pkgconfig_DATA = asio.pc ++pkgconfigdir = $(libdir)/pkgconfig + + SUBDIRS = include src + +-- +2.34.1 + diff --git a/meta-oe/recipes-support/atop/atop_2.4.0.bb b/meta-oe/recipes-support/atop/atop_2.4.0.bb index 5bde965196..bb1f53624a 100644 --- a/meta-oe/recipes-support/atop/atop_2.4.0.bb +++ b/meta-oe/recipes-support/atop/atop_2.4.0.bb @@ -10,7 +10,7 @@ utilization, priority, username, state, and exit code." HOMEPAGE = "http://www.atoptool.nl" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "ncurses zlib" @@ -24,6 +24,8 @@ SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ SRC_URI[md5sum] = "1077da884ed94f2bc3c81ac3ab970436" SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69" +CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." + do_compile() { oe_runmake all } @@ -42,15 +44,19 @@ do_install() { rm -f ${D}${sysconfdir}/init.d/atopacct fi + # /var/log/atop will be created in runtime + rm -rf ${D}${localstatedir}/log + rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + # remove atopacct related files rm -rf ${D}${sbindir} ${D}${mandir}/man8 } inherit systemd -SYSTEMD_SERVICE_${PN} = "atop.service atopgpu.service" +SYSTEMD_SERVICE:${PN} = "atop.service atopgpu.service" SYSTEMD_AUTO_ENABLE = "disable" -FILES_${PN} += "${systemd_unitdir}/system-sleep" +FILES:${PN} += "${systemd_unitdir}/system-sleep" -RDEPENDS_${PN} = "procps" +RDEPENDS:${PN} = "procps" diff --git a/meta-oe/recipes-support/augeas/augeas.inc b/meta-oe/recipes-support/augeas/augeas.inc deleted file mode 100644 index 1bbd181c38..0000000000 --- a/meta-oe/recipes-support/augeas/augeas.inc +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Augeas configuration API" -HOMEPAGE = "http://augeas.net/" -BUGTRACKER = "https://fedorahosted.org/augeas/report/1" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" - -SRC_URI = "http://download.augeas.net/${BP}.tar.gz \ - file://sepbuildfix.patch \ - " - -DEPENDS = "readline libxml2" - -inherit autotools pkgconfig - -PACKAGES =+ "${PN}-lenses lib${BPN}" - -FILES_${PN}-lenses = "${datadir}/augeas/lenses" -FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" - -RDEPENDS_lib${BPN} += "${PN}-lenses" -RRECOMMENDS_lib${BPN} += "${PN}" - -LEAD_SONAME = "libaugeas.so" - -do_install_append() { - rm -fr ${D}${datadir}/vim -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libselinux] = "--with-selinux,--without-selinux,libselinux" - -EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" diff --git a/meta-oe/recipes-support/augeas/augeas/0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch b/meta-oe/recipes-support/augeas/augeas/0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch new file mode 100644 index 0000000000..9424be2aa6 --- /dev/null +++ b/meta-oe/recipes-support/augeas/augeas/0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch @@ -0,0 +1,34 @@ +From e5ccf769c2dc7283b56a597fffdb5dc1558e3ce8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 3 Sep 2022 01:23:28 -0700 +Subject: [PATCH] src/internal: Use __GLIBC__ to check for GNU extention + implementation + +__USE_GNU is defined by _GNU_SOURCE and configure explicitly sets this +macro and it does have meaning on musl too, where it may have some level +of GNU compatibility but strerror_r is not one of them. Therefore we +have to check for libc implementation for this to be sure. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/internal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/internal.c b/src/internal.c +index ef83b71..fb326fa 100644 +--- a/src/internal.c ++++ b/src/internal.c +@@ -431,7 +431,7 @@ char *cleanpath(char *path) { + + const char *xstrerror(int errnum, char *buf, size_t len) { + #ifdef HAVE_STRERROR_R +-# ifdef __USE_GNU ++# ifdef __GLIBC__ + /* Annoying linux specific API contract */ + return strerror_r(errnum, buf, len); + # else +-- +2.37.3 + diff --git a/meta-oe/recipes-support/augeas/augeas_1.12.0.bb b/meta-oe/recipes-support/augeas/augeas_1.12.0.bb index d32c4691d2..2c6d4cdc88 100644 --- a/meta-oe/recipes-support/augeas/augeas_1.12.0.bb +++ b/meta-oe/recipes-support/augeas/augeas_1.12.0.bb @@ -1,4 +1,36 @@ -require augeas.inc +SUMMARY = "Augeas configuration API" +HOMEPAGE = "http://augeas.net/" +BUGTRACKER = "https://fedorahosted.org/augeas/report/1" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff" + +SRC_URI = "http://download.augeas.net/${BP}.tar.gz \ + file://sepbuildfix.patch \ + file://0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch \ + " SRC_URI[md5sum] = "74f1c7b8550f4e728486091f6b907175" SRC_URI[sha256sum] = "321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87" + +DEPENDS = "readline libxml2" + +inherit autotools pkgconfig + +PACKAGES =+ "${PN}-lenses lib${BPN}" + +FILES:${PN}-lenses = "${datadir}/augeas/lenses" +FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" + +RDEPENDS:lib${BPN} += "${PN}-lenses" +RRECOMMENDS:lib${BPN} += "${PN}" + +LEAD_SONAME = "libaugeas.so" + +do_install:append() { + rm -fr ${D}${datadir}/vim +} + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" + +EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" diff --git a/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch b/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch new file mode 100644 index 0000000000..bcfafdda55 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch @@ -0,0 +1,86 @@ +From 6be1c45e1f7ee78499bdca76c25ec23a61317134 Mon Sep 17 00:00:00 2001 +From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> +Date: Wed, 20 Mar 2024 14:58:27 +0000 +Subject: [PATCH] Remove cpp unittest compilation + +Upstream-Status: Inappropriate [oe-specific] + +--- + lang/c++/CMakeLists.txt | 61 ----------------------------------------- + 1 file changed, 61 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a3793152..d94ba42d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,70 +131,9 @@ set_target_properties (avrocpp_s PROPERTIES + target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) + target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR}) + +-add_executable (precompile test/precompile.cc) +- +-target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) +- +-macro (gen file ns) +- add_custom_command (OUTPUT ${file}.hh +- COMMAND avrogencpp +- -p - +- -i ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file} +- -o ${file}.hh -n ${ns} -U +- DEPENDS avrogencpp ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file}) +- add_custom_target (${file}_hh DEPENDS ${file}.hh) +-endmacro (gen) +- +-gen (empty_record empty) +-gen (bigrecord testgen) +-gen (bigrecord_r testgen_r) +-gen (bigrecord2 testgen2) +-gen (tweet testgen3) +-gen (union_array_union uau) +-gen (union_map_union umu) +-gen (union_conflict uc) +-gen (recursive rec) +-gen (reuse ru) +-gen (circulardep cd) +-gen (tree1 tr1) +-gen (tree2 tr2) +-gen (crossref cr) +-gen (primitivetypes pt) +-gen (cpp_reserved_words cppres) +- + add_executable (avrogencpp impl/avrogencpp.cc) + target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) + +-enable_testing() +- +-macro (unittest name) +- add_executable (${name} test/${name}.cc) +- target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) +- add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name}) +-endmacro (unittest) +- +-unittest (buffertest) +-unittest (unittest) +-unittest (SchemaTests) +-unittest (LargeSchemaTests) +-unittest (CodecTests) +-unittest (StreamTests) +-unittest (SpecificTests) +-unittest (DataFileTests) +-unittest (JsonTests) +-unittest (AvrogencppTests) +-unittest (CompilerTests) +-unittest (AvrogencppTestReservedWords) +- +-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh) +- +-add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh +- tweet_hh +- union_array_union_hh union_map_union_hh union_conflict_hh +- recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh +- primitivetypes_hh empty_record_hh) +- + include (InstallRequiredSystemLibraries) + + set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}") diff --git a/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch b/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch new file mode 100644 index 0000000000..437a3fa138 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch @@ -0,0 +1,84 @@ +From 86aa3f2333a9b8e6f1c631e6d5cb7296b6e8380b Mon Sep 17 00:00:00 2001 +From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> +Date: Fri, 22 Mar 2024 13:27:38 +0000 +Subject: [PATCH] Add package configuration files + +Upstream-Status: Pending + +--- + lang/c++/CMakeLists.txt | 45 ++++++++++++++++++++++++------ + lang/c++/cmake/AvroCppConfig.cmake | 5 ++++ + 2 files changed, 42 insertions(+), 8 deletions(-) + create mode 100644 lang/c++/cmake/AvroCppConfig.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d94ba42d3..4748b111d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -140,14 +140,18 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}") + + include (CPack) + +-install (TARGETS avrocpp avrocpp_s +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib +- RUNTIME DESTINATION lib) +- +-install (TARGETS avrogencpp RUNTIME DESTINATION bin) +- +-install (DIRECTORY api/ DESTINATION include/avro ++install (TARGETS avrocpp ++ EXPORT AvroCppTargets ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ INCLUDES DESTINATION include) ++ ++install (TARGETS avrogencpp ++ EXPORT AvroCppTargets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ ++install (DIRECTORY api/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/avro + FILES_MATCHING PATTERN *.hh) + + if (NOT CMAKE_BUILD_TYPE) +@@ -155,3 +159,28 @@ if (NOT CMAKE_BUILD_TYPE) + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." + FORCE) + endif (NOT CMAKE_BUILD_TYPE) ++ ++# Create cmake config files ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake" ++ VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH} ++ COMPATIBILITY AnyNewerVersion ++) ++ ++configure_file(cmake/AvroCppConfig.cmake ++ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfig.cmake" ++ COPYONLY ++) ++ ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/avrocpp) ++install(EXPORT AvroCppTargets ++ FILE AvroCppTargets.cmake ++ NAMESPACE AvroCpp:: ++ DESTINATION ${ConfigPackageLocation} ++) ++install(FILES ++ "cmake/AvroCppConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake" ++ DESTINATION ${ConfigPackageLocation} ++ COMPONENT Devel) +diff --git a/cmake/AvroCppConfig.cmake b/cmake/AvroCppConfig.cmake +new file mode 100644 +index 000000000..deb8aaa31 +--- /dev/null ++++ b/cmake/AvroCppConfig.cmake +@@ -0,0 +1,5 @@ ++include(CMakeFindDependencyMacro) ++find_dependency(Boost 1.38 REQUIRED ++ COMPONENTS filesystem iostreams program_options regex system) ++ ++include("${CMAKE_CURRENT_LIST_DIR}/AvroCppTargets.cmake") diff --git a/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch b/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch new file mode 100644 index 0000000000..3e65cb7a72 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++/0003-Update-CXX-standard-to-CXX14.patch @@ -0,0 +1,24 @@ +From 66c08ade24e4472b5af5dca48097ed9a2ec035ec Mon Sep 17 00:00:00 2001 +From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com> +Date: Fri, 5 Apr 2024 11:33:51 +0000 +Subject: [PATCH] Update CXX standard to CXX14 + +Upstream-Status: Inappropriate [oe-specific] + +--- + lang/c++/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4748b111d..1e45c13d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,7 +21,7 @@ cmake_minimum_required (VERSION 3.1) + set (CMAKE_LEGACY_CYGWIN_WIN32 0) + + if (NOT DEFINED CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 11) ++ set(CMAKE_CXX_STANDARD 14) + endif() + + set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb new file mode 100644 index 0000000000..6ec25bdd2b --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb @@ -0,0 +1,22 @@ +SUMMARY = "Apache Avro data serialization system." +HOMEPAGE = "https://avro.apache.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=43abf34d8b9908494f83c55d213a7f89" + +DEPENDS = "boost zlib xz" + +BRANCH = "branch-1.11" +SRCREV = "35ff8b997738e4d983871902d47bfb67b3250734" +SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ + file://0001-Remove-cpp-unittest-compilation.patch \ + file://0002-Add-package-configuration-files.patch \ + file://0003-Update-CXX-standard-to-CXX14.patch \ + " + +S = "${WORKDIR}/git/lang/c++" + +inherit cmake pkgconfig + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/avro/avro-c/0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch b/meta-oe/recipes-support/avro/avro-c/0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch deleted file mode 100644 index 6496b92dfe..0000000000 --- a/meta-oe/recipes-support/avro/avro-c/0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f24f863f3a8ca86f44123a58613f62c3b511da1e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 19 Dec 2019 18:23:41 -0800 -Subject: [PATCH] cmake: Use GNUInstallDirs instead of hard-coded paths - -This ensures that it can be built on platforms where libdir is not -/usr/lib e.g. ppc64 - -Upstream-Status: Submitted [https://github.com/apache/avro/pull/749] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lang/c/CMakeLists.txt | 2 +- - lang/c/src/CMakeLists.txt | 16 +++++++++------- - 2 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/lang/c/CMakeLists.txt b/lang/c/CMakeLists.txt -index 11cbf018e..6c8d7aaf3 100644 ---- a/lang/c/CMakeLists.txt -+++ b/lang/c/CMakeLists.txt -@@ -16,7 +16,7 @@ - # specific language governing permissions and limitations - # under the License. - # --cmake_minimum_required(VERSION 2.4) -+cmake_minimum_required(VERSION 3.1) - project(AvroC) - enable_testing() - -diff --git a/lang/c/src/CMakeLists.txt b/lang/c/src/CMakeLists.txt -index 6f5659750..c1761c8de 100644 ---- a/lang/c/src/CMakeLists.txt -+++ b/lang/c/src/CMakeLists.txt -@@ -106,17 +106,19 @@ install(DIRECTORY - DESTINATION include - FILES_MATCHING PATTERN "*.h") - -+include(GNUInstallDirs) -+ - if (WIN32) - install(TARGETS avro-static -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - else(WIN32) - install(TARGETS avro-static avro-shared -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - endif(WIN32) - -@@ -126,7 +128,7 @@ set(prefix ${CMAKE_INSTALL_PREFIX}) - set(VERSION ${AVRO_VERSION}) - configure_file(avro-c.pc.in avro-c.pc) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/avro-c.pc -- DESTINATION lib/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - add_executable(avrocat avrocat.c) - target_link_libraries(avrocat avro-static) --- -2.24.1 - diff --git a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb new file mode 100644 index 0000000000..bb7f53e459 --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb @@ -0,0 +1,17 @@ +SUMMARY = "Apache Avro data serialization system." +HOMEPAGE = "https://avro.apache.org/" +SECTION = "libs" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" + +DEPENDS = "jansson zlib xz" + +BRANCH = "branch-1.11" +SRCREV = "35ff8b997738e4d983871902d47bfb67b3250734" +SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ + " + +S = "${WORKDIR}/git/lang/c" + +inherit cmake pkgconfig diff --git a/meta-oe/recipes-support/avro/avro-c_1.9.2.bb b/meta-oe/recipes-support/avro/avro-c_1.9.2.bb deleted file mode 100644 index 0642179fb3..0000000000 --- a/meta-oe/recipes-support/avro/avro-c_1.9.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Apache Avro data serialization system." -HOMEPAGE = "http://apr.apache.org/" -SECTION = "libs" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae" - -DEPENDS = "jansson zlib xz" - -BRANCH = "branch-1.9" -SRCREV = "bf20128ca6138a830b2ea13e0490f3df6b035639" -SRC_URI = "git://github.com/apache/avro;branch=${BRANCH} \ - file://0001-cmake-Use-GNUInstallDirs-instead-of-hard-coded-paths.patch;patchdir=../../ \ - " - -S = "${WORKDIR}/git/lang/c" - -inherit cmake diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb index 407de21385..a5a7a63657 100644 --- a/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb +++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb @@ -16,24 +16,22 @@ DESCRIPTION = "The Boehm-Demers-Weiser conservative garbage collector can be\ by replacing malloc with GC_malloc calls, replacing realloc with GC_realloc\ calls, and removing free calls." -HOMEPAGE = "http://www.hboehm.info/gc/" +HOMEPAGE = "https://www.hboehm.info/gc/" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.QUICK;md5=81b447d779e278628c843aef92f088fa" +LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075" DEPENDS = "libatomic-ops" -SRCREV = "d3dede3ce4462cd82a15f161af797ca51654546a" -SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_0" +SRCREV = "e340b2e869e02718de9c9d7fa440ef4b35785388" +SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https" S = "${WORKDIR}/git" inherit autotools pkgconfig -EXTRA_OECONF += "--enable-cpluscplus" +EXTRA_OECONF += "--enable-cplusplus" -CFLAGS_append_libc-musl = " -D_GNU_SOURCE -DNO_GETCONTEXT -DSEARCH_FOR_DATA_START -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" - -FILES_${PN}-doc = "${datadir}" +FILES:${PN}-doc = "${datadir}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb b/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb new file mode 100644 index 0000000000..a48195a15d --- /dev/null +++ b/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb @@ -0,0 +1,25 @@ +SUMMARY = "[Boost::ext].SML (State Machine Language)" +DESCRIPTION = "Your scalable C++14 one header only State Machine Library with no dependencies" +HOMEPAGE = "https://github.com/boost-ext/sml" +BUGTRACKER = "https://github.com/boost-ext/sml/issues" +SECTION = "libs" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e4224ccaecb14d942c71d31bef20d78c" + +DEPENDS += "boost qemu-native" + +SRC_URI = "git://github.com/boost-ext/sml.git;protocol=https;branch=master" +SRCREV = "b7df6180d20422b2724d26007aebb24066f2a6a9" + +S = "${WORKDIR}/git" + +inherit cmake + +# Building benchmarks takes a lot of time and requires additional headers (euml2.hpp) +# Building examples fail with gcc-12 +EXTRA_OECMAKE:append = " -DSML_BUILD_BENCHMARKS:bool=OFF -DSML_BUILD_EXAMPLES=OFF" + +# [boost::ext].XML is a header only C++ library, so the main package will be empty. +ALLOW_EMPTY:${PN} = "1" + +BBCLASSEXTEND = "nativesdk" diff --git a/meta-oe/recipes-support/btop/btop_1.3.2.bb b/meta-oe/recipes-support/btop/btop_1.3.2.bb new file mode 100644 index 0000000000..c473bf0a35 --- /dev/null +++ b/meta-oe/recipes-support/btop/btop_1.3.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "Resource monitor that shows usage and stats for processor, memory, disks, network and processes." +HOMEPAGE = "https://github.com/aristocratos/btop" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +SECTION = "console/utils" + +SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main" +SRCREV = "fd2a2acdad6fbaad76846cb5e802cf2ae022d670" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN} += " \ + ${datadir}/icons \ + ${datadir}/icons/hicolor \ + ${datadir}/icons/hicolor/48x48 \ + ${datadir}/icons/hicolor/scalable \ + ${datadir}/icons/hicolor/48x48/apps \ + ${datadir}/icons/hicolor/48x48/apps/btop.png \ + ${datadir}/icons/hicolor/scalable/apps \ + ${datadir}/icons/hicolor/scalable/apps/btop.svg \ +" diff --git a/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch b/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch deleted file mode 100644 index 8f15f8424c..0000000000 --- a/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f2f1e134bf5d9d0789942848e03006af8d926cf8 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@cn.fujitsu.com> -Date: Tue, 17 Mar 2020 12:53:35 +0800 -Subject: [PATCH] fix configure error : mv libcares.pc.cmakein to - libcares.pc.cmake - -Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a5878d..c2e5740 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -563,7 +563,7 @@ IF (CARES_STATIC) - ENDIF() - - # Write ares_config.h configuration file. This is used only for the build. --CONFIGURE_FILE (libcares.pc.cmakein ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) -+CONFIGURE_FILE (libcares.pc.cmake ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) - - - --- -2.17.1 - diff --git a/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch deleted file mode 100644 index 0eb7e4bbb3..0000000000 --- a/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 12414304245cce6ef0e8b9547949be5109845353 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 24 Jul 2018 13:33:33 +0800 -Subject: [PATCH] cmake: Install libcares.pc - -Prepare and install libcares.pc file during cmake build, so libraries -using pkg-config to find libcares will not fail. - -Signed-off-by: Alexey Firago <alexey_firago@mentor.com> - -update to 1.14.0, fix patch warning - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - CMakeLists.txt | 28 +++++++++++++++++++++++----- - 1 file changed, 23 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd123e1..3a5878d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS}) - - - # Tell C-Ares about libraries to depend on -+# Also pass these libraries to pkg-config file -+SET(CARES_PRIVATE_LIBS_LIST) - IF (HAVE_LIBRESOLV) -- LIST (APPEND CARES_DEPENDENT_LIBS resolv) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lresolv") - ENDIF () - IF (HAVE_LIBNSL) -- LIST (APPEND CARES_DEPENDENT_LIBS nsl) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lnsl") - ENDIF () - IF (HAVE_LIBSOCKET) -- LIST (APPEND CARES_DEPENDENT_LIBS socket) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lsocket") - ENDIF () - IF (HAVE_LIBRT) -- LIST (APPEND CARES_DEPENDENT_LIBS rt) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lrt") - ENDIF () - IF (WIN32) -- LIST (APPEND CARES_DEPENDENT_LIBS ws2_32 Advapi32) -+ LIST (APPEND CARES_PRIVATE_LIBS_LIST "-lws2_32") - ENDIF () - -+string (REPLACE ";" " " CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS_LIST}") - - # When checking for symbols, we need to make sure we set the proper - # headers, libraries, and definitions for the detection to work properly -@@ -554,6 +557,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h) - # Write ares_config.h configuration file. This is used only for the build. - CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h) - -+# Pass required CFLAGS to pkg-config in case of static library -+IF (CARES_STATIC) -+ SET (CPPFLAG_CARES_STATICLIB "-DCARES_STATICLIB") -+ENDIF() -+ -+# Write ares_config.h configuration file. This is used only for the build. -+CONFIGURE_FILE (libcares.pc.cmakein ${PROJECT_BINARY_DIR}/libcares.pc @ONLY) -+ -+ - - # TRANSFORM_MAKEFILE_INC - # -@@ -728,6 +740,12 @@ IF (CARES_INSTALL) - INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - ENDIF () - -+# pkg-config file -+IF (CARES_INSTALL) -+ SET (PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -+ INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION ${PKGCONFIG_INSTALL_DIR}) -+ENDIF () -+ - # Legacy chain-building variables (provided for compatibility with old code). - # Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares). - SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND") --- -2.17.1 - diff --git a/meta-oe/recipes-support/c-ares/c-ares/run-ptest b/meta-oe/recipes-support/c-ares/c-ares/run-ptest new file mode 100644 index 0000000000..66ffd53889 --- /dev/null +++ b/meta-oe/recipes-support/c-ares/c-ares/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh +./arestest --gtest_filter=-*.Live* --gtest_print_time=0 | sed -E '/^\[ RUN/d ; s/\[ OK \]/PASS: / ; s/\[ DISABLED \]/SKIP: / ; s/\[ FAILED \]/FAIL: /' + diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb b/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb deleted file mode 100644 index 67dd701807..0000000000 --- a/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2012-2014 LG Electronics, Inc. -SUMMARY = "c-ares is a C library that resolves names asynchronously." -HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" - -PV = "1.16.0+gitr${SRCPV}" - -SRC_URI = "\ - git://github.com/c-ares/c-ares.git \ - file://cmake-install-libcares.pc.patch \ - file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ -" -SRCREV = "74a1426ba60e2cd7977e53a22ef839c87415066e" - -UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -PACKAGES =+ "${PN}-utils" - -FILES_${PN}-utils = "${bindir}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb new file mode 100644 index 0000000000..2d91ac1731 --- /dev/null +++ b/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb @@ -0,0 +1,30 @@ +# Copyright (c) 2012-2014 LG Electronics, Inc. +SUMMARY = "c-ares is a C library that resolves names asynchronously." +HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" + +SRC_URI = "https://c-ares.org/download/${BPN}-${PV}.tar.gz \ + file://run-ptest" +SRC_URI[sha256sum] = "0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b" + +PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[manpages] = "" +PACKAGECONFIG[tests] = "-DCARES_BUILD_TESTS=ON,-DCARES_BUILD_TESTS=OFF,googletest" + +inherit cmake manpages pkgconfig ptest + +EXTRA_OECMAKE = "-DCARES_STATIC=${@ 'ON' if d.getVar('DISABLE_STATIC') == '' else 'OFF' }" + +do_install_ptest () { + install -d ${D}${PTEST_PATH} + install -m 0755 ${B}/bin/arestest ${D}${PTEST_PATH} + install -m 0755 ${WORKDIR}/run-ptest ${D}${PTEST_PATH} +} + +PACKAGE_BEFORE_PN = "${PN}-utils" + +FILES:${PN}-utils = "${bindir}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb index 621e174ff0..8e38517448 100644 --- a/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb +++ b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb @@ -6,10 +6,10 @@ HOMEPAGE = "https://github.com/vsergeev/c-periphery" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" +LIC_FILES_CHKSUM = "file://LICENSE;md5=be30d45bdc453f70a494c149c2168289" -SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" -SRCREV = "d34077d7ee45fa7d1947cc0174919452fac31597" +SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https;branch=master" +SRCREV = "91f9678d2a35a3af3c633f20165bdde8bea32209" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb index 22b9d0bb98..bf62e8416e 100644 --- a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb +++ b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb @@ -2,13 +2,15 @@ SUMMARY = "Frame handles simultaneous touches" HOMEPAGE = "https://launchpad.net/frame" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit autotools pkgconfig +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar.gz \ file://pessimizing-move.patch" @@ -22,6 +24,6 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--enable-x11, --disable-x11, libxi xext virtual/xserver" PACKAGE_BEFORE_PN += "${PN}-test" -FILES_${PN}-test = "${bindir}/frame-test*" +FILES:${PN}-test = "${bindir}/frame-test*" SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch b/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch index 3b3acab245..4a9d25f326 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch +++ b/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch @@ -13,6 +13,8 @@ fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + libgeis/geis_v1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/0001-provide-function-declaration-with-prototypes.patch b/meta-oe/recipes-support/canonical-multitouch/geis/0001-provide-function-declaration-with-prototypes.patch new file mode 100644 index 0000000000..ddad1404f9 --- /dev/null +++ b/meta-oe/recipes-support/canonical-multitouch/geis/0001-provide-function-declaration-with-prototypes.patch @@ -0,0 +1,690 @@ +From 05fe9751dfb370b0fb726e95bc36674468116db4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 16:57:51 -0700 +Subject: [PATCH] provide function declaration with prototypes + +Fixes build with clang-15+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libgeis/backend/grail/geis_grail_window_grab.c | 2 +- + libgeis/backend/grail/geis_ugsubscription_store.c | 2 +- + libgeis/backend/grail/geis_ugsubscription_store.h | 2 +- + libgeis/backend/test_fixture/geis_backend_test_fixture.c | 4 ++-- + libgeis/geis.c | 2 +- + libgeis/geis_backend_multiplexor.c | 4 ++-- + libgeis/geis_backend_multiplexor.h | 2 +- + libgeis/geis_class.c | 2 +- + libgeis/geis_class.h | 2 +- + libgeis/geis_device.c | 2 +- + libgeis/geis_device.h | 2 +- + libgeis/geis_event_queue.c | 2 +- + libgeis/geis_event_queue.h | 2 +- + libgeis/geis_filter.c | 2 +- + libgeis/geis_filter.h | 2 +- + libgeis/geis_filterable.c | 2 +- + libgeis/geis_filterable.h | 2 +- + libgeis/geis_frame.c | 2 +- + libgeis/geis_frame.h | 2 +- + libgeis/geis_group.c | 2 +- + libgeis/geis_group.h | 2 +- + libgeis/geis_region.c | 2 +- + libgeis/geis_region.h | 2 +- + libgeis/geis_touch.c | 2 +- + libgeis/geis_touch.h | 2 +- + libgeis/server/geis_dbus_client_proxy.c | 2 +- + libgeis/server/geis_dbus_proxy_box.c | 2 +- + libgeis/server/geis_dbus_proxy_box.h | 2 +- + libs/geis-dbus/geis_dbus_dispatcher.c | 2 +- + libs/geis-util/geis_logging.c | 2 +- + testsuite/geis1/check_gesture_attrs.c | 2 +- + testsuite/geis1/check_gesture_types.c | 2 +- + testsuite/geis1/check_instance.c | 2 +- + testsuite/geis1/check_subscription.c | 2 +- + testsuite/geis2/check_attr.c | 2 +- + testsuite/geis2/check_class.c | 2 +- + testsuite/geis2/check_config.c | 2 +- + testsuite/geis2/check_device.c | 2 +- + testsuite/geis2/check_error_codes.c | 2 +- + testsuite/geis2/check_event.c | 2 +- + testsuite/geis2/check_filter.c | 2 +- + testsuite/geis2/check_frame.c | 2 +- + testsuite/geis2/check_geis_new.c | 2 +- + testsuite/geis2/check_general_types.c | 2 +- + testsuite/geis2/check_region.c | 2 +- + testsuite/geis2/check_subscription.c | 2 +- + tools/geis-server/geis-server.c | 2 +- + 47 files changed, 49 insertions(+), 49 deletions(-) + +diff --git a/libgeis/backend/grail/geis_grail_window_grab.c b/libgeis/backend/grail/geis_grail_window_grab.c +index 003adee..f8480ac 100644 +--- a/libgeis/backend/grail/geis_grail_window_grab.c ++++ b/libgeis/backend/grail/geis_grail_window_grab.c +@@ -49,7 +49,7 @@ static const GeisFloat _geis_grail_window_grab_store_growth_factor = 1.7; + + + static GeisGrailWindowGrabStore +-_window_grab_allocate() ++_window_grab_allocate(void) + { + GeisGrailWindowGrabStore wgs = malloc(sizeof(struct GeisGrailWindowGrabStore)); + if (!wgs) +diff --git a/libgeis/backend/grail/geis_ugsubscription_store.c b/libgeis/backend/grail/geis_ugsubscription_store.c +index bb1f0bb..cb7e620 100644 +--- a/libgeis/backend/grail/geis_ugsubscription_store.c ++++ b/libgeis/backend/grail/geis_ugsubscription_store.c +@@ -42,7 +42,7 @@ static const GeisFloat _geis_grail_ugsubscription_store_growth_factor = 1.7; + * Creates a new, empty grail subscription store. + */ + GeisUGSubscriptionStore +-geis_ugsubscription_store_new() ++geis_ugsubscription_store_new(void) + { + GeisUGSubscriptionStore store = geis_bag_new(sizeof(struct GeisUGSubscription), + _geis_grail_ugsubscription_store_default_size, +diff --git a/libgeis/backend/grail/geis_ugsubscription_store.h b/libgeis/backend/grail/geis_ugsubscription_store.h +index a93e1b6..06273ef 100644 +--- a/libgeis/backend/grail/geis_ugsubscription_store.h ++++ b/libgeis/backend/grail/geis_ugsubscription_store.h +@@ -41,7 +41,7 @@ typedef GeisBag GeisUGSubscriptionStore; + * @returns a pointer to a valid store, or NULL to indicate failure. + */ + GeisUGSubscriptionStore +-geis_ugsubscription_store_new(); ++geis_ugsubscription_store_new(void); + + /** + * Destroys a grail subscription store. +diff --git a/libgeis/backend/test_fixture/geis_backend_test_fixture.c b/libgeis/backend/test_fixture/geis_backend_test_fixture.c +index 5912acb..099cde4 100644 +--- a/libgeis/backend/test_fixture/geis_backend_test_fixture.c ++++ b/libgeis/backend/test_fixture/geis_backend_test_fixture.c +@@ -434,7 +434,7 @@ _token_free_subscription_pdata(GeisBackendToken gbtoken GEIS_UNUSED, + } + + __attribute__((constructor)) +-static void _register_test_fixture() ++static void _register_test_fixture(void) + { + geis_register_backend(GEIS_INIT_MOCK_BACKEND, + sizeof(struct GeisBackendTestFixture), +@@ -444,6 +444,6 @@ static void _register_test_fixture() + + /* A dummy routine to force linkage of this module without dlopening it */ + void +-geis_include_backend_test_fixture() ++geis_include_backend_test_fixture(void) + { + } +diff --git a/libgeis/geis.c b/libgeis/geis.c +index 4290d19..3f7bd12 100644 +--- a/libgeis/geis.c ++++ b/libgeis/geis.c +@@ -402,7 +402,7 @@ geis_filterable_attribute_foreach(Geis geis, + * Creates a new empty Geis API instance. + */ + static Geis +-geis_new_empty() ++geis_new_empty(void) + { + geis_error_clear(NULL); + Geis geis = calloc(1, sizeof(struct _Geis)); +diff --git a/libgeis/geis_backend_multiplexor.c b/libgeis/geis_backend_multiplexor.c +index 3f80080..0f76198 100644 +--- a/libgeis/geis_backend_multiplexor.c ++++ b/libgeis/geis_backend_multiplexor.c +@@ -60,7 +60,7 @@ struct _GeisBackendMultiplexor + * Creates a new container for callback info. + */ + static CallbackInfoBag +-_callback_info_bag_new() ++_callback_info_bag_new(void) + { + CallbackInfoBag cbib = calloc(1, sizeof(struct CallbackInfoBag)); + if (!cbib) +@@ -209,7 +209,7 @@ _callback_info_bag_release(CallbackInfoBag cbib, int fd) + * Creates a new backend multiplexor. + */ + GeisBackendMultiplexor +-geis_backend_multiplexor_new() ++geis_backend_multiplexor_new(void) + { + GeisBackendMultiplexor mx = calloc(1, sizeof(struct _GeisBackendMultiplexor)); + if (!mx) +diff --git a/libgeis/geis_backend_multiplexor.h b/libgeis/geis_backend_multiplexor.h +index ff4c318..8e7102e 100644 +--- a/libgeis/geis_backend_multiplexor.h ++++ b/libgeis/geis_backend_multiplexor.h +@@ -74,7 +74,7 @@ typedef void (*GeisBackendFdEventCallback)(int fd, + /** + * Constructs a new back end multiplexor. + */ +-GeisBackendMultiplexor geis_backend_multiplexor_new(); ++GeisBackendMultiplexor geis_backend_multiplexor_new(void); + + /** + * A reasonable default value for the max_events_per_pump parameter to +diff --git a/libgeis/geis_class.c b/libgeis/geis_class.c +index e889e4b..5c26a87 100644 +--- a/libgeis/geis_class.c ++++ b/libgeis/geis_class.c +@@ -46,7 +46,7 @@ static const int gesture_class_bag_growth_constant = 2; + * Creates a new class bag, + */ + GeisGestureClassBag +-geis_gesture_class_bag_new() ++geis_gesture_class_bag_new(void) + { + GeisGestureClassBag bag = calloc(1, sizeof(struct _GeisGestureClassBag)); + if (!bag) +diff --git a/libgeis/geis_class.h b/libgeis/geis_class.h +index 1d60998..724c353 100644 +--- a/libgeis/geis_class.h ++++ b/libgeis/geis_class.h +@@ -35,7 +35,7 @@ typedef struct _GeisGestureClassBag *GeisGestureClassBag; + /** + * Creates a new class bag, + */ +-GeisGestureClassBag geis_gesture_class_bag_new(); ++GeisGestureClassBag geis_gesture_class_bag_new(void); + + /** + * Destroys a gesture class bag. +diff --git a/libgeis/geis_device.c b/libgeis/geis_device.c +index 1f61fc1..ff3216b 100644 +--- a/libgeis/geis_device.c ++++ b/libgeis/geis_device.c +@@ -44,7 +44,7 @@ static const int device_bag_growth_constant = 2; + + + GeisDeviceBag +-geis_device_bag_new() ++geis_device_bag_new(void) + { + GeisDeviceBag bag = calloc(1, sizeof(struct _GeisDeviceBag)); + if (!bag) +diff --git a/libgeis/geis_device.h b/libgeis/geis_device.h +index c411e54..707943b 100644 +--- a/libgeis/geis_device.h ++++ b/libgeis/geis_device.h +@@ -35,7 +35,7 @@ typedef struct _GeisDeviceBag *GeisDeviceBag; + /** + * Creates a new device bag, + */ +-GeisDeviceBag geis_device_bag_new(); ++GeisDeviceBag geis_device_bag_new(void); + + /** + * Destroys a device bag. +diff --git a/libgeis/geis_event_queue.c b/libgeis/geis_event_queue.c +index 0b7d0fb..f357683 100644 +--- a/libgeis/geis_event_queue.c ++++ b/libgeis/geis_event_queue.c +@@ -50,7 +50,7 @@ struct _GeisEventQueue + * Creates a new Geis Event queue. + */ + GeisEventQueue +-geis_event_queue_new() ++geis_event_queue_new(void) + { + GeisEventQueue queue = calloc(1, sizeof(struct _GeisEventQueue)); + if (!queue) +diff --git a/libgeis/geis_event_queue.h b/libgeis/geis_event_queue.h +index e4c186d..5f3da1d 100644 +--- a/libgeis/geis_event_queue.h ++++ b/libgeis/geis_event_queue.h +@@ -41,7 +41,7 @@ typedef struct _GeisEventQueue *GeisEventQueue; + /** + * Creates a new Geis Event queue. + */ +-GeisEventQueue geis_event_queue_new(); ++GeisEventQueue geis_event_queue_new(void); + + /** + * Destroys a Geis Event queue. +diff --git a/libgeis/geis_filter.c b/libgeis/geis_filter.c +index 4fe5da6..83d65a8 100644 +--- a/libgeis/geis_filter.c ++++ b/libgeis/geis_filter.c +@@ -57,7 +57,7 @@ static GeisSize s_filter_oid = 0; + * Creates a new filter bag, + */ + GeisFilterBag +-geis_filter_bag_new() ++geis_filter_bag_new(void) + { + GeisFilterBag bag = calloc(1, sizeof(struct _GeisFilterBag)); + if (!bag) +diff --git a/libgeis/geis_filter.h b/libgeis/geis_filter.h +index 7b613bf..f825bb7 100644 +--- a/libgeis/geis_filter.h ++++ b/libgeis/geis_filter.h +@@ -42,7 +42,7 @@ typedef GeisFilter *GeisFilterIterator; + /** + * Creates a new filter bag, + */ +-GeisFilterBag geis_filter_bag_new(); ++GeisFilterBag geis_filter_bag_new(void); + + /** + * Destroys a filter bag. +diff --git a/libgeis/geis_filterable.c b/libgeis/geis_filterable.c +index 57bd4ac..5fb4b0c 100644 +--- a/libgeis/geis_filterable.c ++++ b/libgeis/geis_filterable.c +@@ -40,7 +40,7 @@ struct FilterableAttributeBag + * Constructs a new filterable attribute bag. + */ + FilterableAttributeBag +-geis_filterable_attribute_bag_new() ++geis_filterable_attribute_bag_new(void) + { + FilterableAttributeBag bag = calloc(1, sizeof(struct FilterableAttributeBag)); + if (!bag) +diff --git a/libgeis/geis_filterable.h b/libgeis/geis_filterable.h +index 6d400fc..63c563d 100644 +--- a/libgeis/geis_filterable.h ++++ b/libgeis/geis_filterable.h +@@ -86,7 +86,7 @@ geis_filterable_attribute_init(GeisFilterableAttribute fa, + * Constructs a new filterable attribute bag. + */ + FilterableAttributeBag +-geis_filterable_attribute_bag_new(); ++geis_filterable_attribute_bag_new(void); + + /** + * Destroys a filterable attribute bag. +diff --git a/libgeis/geis_frame.c b/libgeis/geis_frame.c +index ebe11a1..068d9aa 100644 +--- a/libgeis/geis_frame.c ++++ b/libgeis/geis_frame.c +@@ -57,7 +57,7 @@ struct _GeisFrameSet + * Creates a new, empty frame set. + */ + GeisFrameSet +-geis_frameset_new() ++geis_frameset_new(void) + { + GeisFrameSet frameset = calloc(1, sizeof(struct _GeisFrameSet)); + if (!frameset) +diff --git a/libgeis/geis_frame.h b/libgeis/geis_frame.h +index e0d1eb6..4a4b0ba 100644 +--- a/libgeis/geis_frame.h ++++ b/libgeis/geis_frame.h +@@ -32,7 +32,7 @@ typedef struct _GeisFrameSet *GeisFrameSet; + /** + * Creates a new, empty frame set. + */ +-GeisFrameSet geis_frameset_new(); ++GeisFrameSet geis_frameset_new(void); + + /** + * Destroys a frame set and all framees contained in it. +diff --git a/libgeis/geis_group.c b/libgeis/geis_group.c +index 0829bd4..4c51a39 100644 +--- a/libgeis/geis_group.c ++++ b/libgeis/geis_group.c +@@ -42,7 +42,7 @@ struct _GeisGroupSet + * Creates a new, empty group set. + */ + GeisGroupSet +-geis_groupset_new() ++geis_groupset_new(void) + { + GeisGroupSet groupset = calloc(1, sizeof(struct _GeisGroupSet)); + if (!groupset) +diff --git a/libgeis/geis_group.h b/libgeis/geis_group.h +index 76e0efc..c44ce62 100644 +--- a/libgeis/geis_group.h ++++ b/libgeis/geis_group.h +@@ -31,7 +31,7 @@ + /** + * Creates a new, empty group set. + */ +-GeisGroupSet geis_groupset_new(); ++GeisGroupSet geis_groupset_new(void); + + /** + * Destroys a group set and all groups contained in it. +diff --git a/libgeis/geis_region.c b/libgeis/geis_region.c +index fc8cc1e..18181cb 100644 +--- a/libgeis/geis_region.c ++++ b/libgeis/geis_region.c +@@ -52,7 +52,7 @@ static const int region_bag_growth_constant = 2; + * Constructs a region bag. + */ + GeisRegionBag +-geis_region_bag_new() ++geis_region_bag_new(void) + { + GeisRegionBag bag = calloc(1, sizeof(struct _GeisRegionBag)); + if (!bag) +diff --git a/libgeis/geis_region.h b/libgeis/geis_region.h +index 53a52b8..18d908f 100644 +--- a/libgeis/geis_region.h ++++ b/libgeis/geis_region.h +@@ -49,7 +49,7 @@ typedef struct _GeisRegionBag *GeisRegionBag; + /** + * Creates a new region bag. + */ +-GeisRegionBag geis_region_bag_new(); ++GeisRegionBag geis_region_bag_new(void); + + /** + * Destroys a region bag. +diff --git a/libgeis/geis_touch.c b/libgeis/geis_touch.c +index 74d1b3e..be0f1a7 100644 +--- a/libgeis/geis_touch.c ++++ b/libgeis/geis_touch.c +@@ -43,7 +43,7 @@ struct _GeisTouchSet + * Creates a new, empty touch set. + */ + GeisTouchSet +-geis_touchset_new() ++geis_touchset_new(void) + { + GeisTouchSet touchset = calloc(1, sizeof(struct _GeisTouchSet)); + if (!touchset) +diff --git a/libgeis/geis_touch.h b/libgeis/geis_touch.h +index 62af610..b64c755 100644 +--- a/libgeis/geis_touch.h ++++ b/libgeis/geis_touch.h +@@ -30,7 +30,7 @@ + /** + * Creates a new, empty touch set. + */ +-GeisTouchSet geis_touchset_new(); ++GeisTouchSet geis_touchset_new(void); + + /** + * Destroys a touch set and all touches contained in it. +diff --git a/libgeis/server/geis_dbus_client_proxy.c b/libgeis/server/geis_dbus_client_proxy.c +index 3f1af47..65f229b 100644 +--- a/libgeis/server/geis_dbus_client_proxy.c ++++ b/libgeis/server/geis_dbus_client_proxy.c +@@ -52,7 +52,7 @@ struct GeisDBusClientProxy + * failure. + */ + GeisDBusClientProxy +-_client_proxy_allocate() ++_client_proxy_allocate(void) + { + GeisDBusClientProxy proxy = calloc(1, sizeof(struct GeisDBusClientProxy)); + return proxy; +diff --git a/libgeis/server/geis_dbus_proxy_box.c b/libgeis/server/geis_dbus_proxy_box.c +index 4c7752a..f129bc3 100644 +--- a/libgeis/server/geis_dbus_proxy_box.c ++++ b/libgeis/server/geis_dbus_proxy_box.c +@@ -49,7 +49,7 @@ struct GeisDBusProxyBox + * Constructs a %GeisDBusProxyBox. + */ + GeisDBusProxyBox +-geis_dbus_proxy_box_new() ++geis_dbus_proxy_box_new(void) + { + GeisDBusProxyBox box = calloc(1, sizeof(struct GeisDBusProxyBox)); + if (!box) +diff --git a/libgeis/server/geis_dbus_proxy_box.h b/libgeis/server/geis_dbus_proxy_box.h +index d8a70f5..47e84b7 100644 +--- a/libgeis/server/geis_dbus_proxy_box.h ++++ b/libgeis/server/geis_dbus_proxy_box.h +@@ -47,7 +47,7 @@ typedef struct GeisDBusProxyBoxNode *GeisDBusProxyBoxIterator; + * @returns a valid %GeisDBusProxyBox or NULL on failure. + */ + GeisDBusProxyBox +-geis_dbus_proxy_box_new(); ++geis_dbus_proxy_box_new(void); + + /** + * Destroys a %GeisDBusProxyBox. +diff --git a/libs/geis-dbus/geis_dbus_dispatcher.c b/libs/geis-dbus/geis_dbus_dispatcher.c +index 10c4134..d8a3f9d 100644 +--- a/libs/geis-dbus/geis_dbus_dispatcher.c ++++ b/libs/geis-dbus/geis_dbus_dispatcher.c +@@ -82,7 +82,7 @@ struct GeisDBusDispatcher + * assumption that if you're creating a bag you're going to use it. + */ + static GeisDBusWatchBag +-_geis_dbus_watch_bag_new() ++_geis_dbus_watch_bag_new(void) + { + GeisDBusWatchBag bag = calloc(1, sizeof(struct GeisDBusWatchBag)); + if (!bag) +diff --git a/libs/geis-util/geis_logging.c b/libs/geis-util/geis_logging.c +index a02077b..030a591 100644 +--- a/libs/geis-util/geis_logging.c ++++ b/libs/geis-util/geis_logging.c +@@ -31,7 +31,7 @@ static const char *error_marker = "error"; + + + static int +-reporting_level() ++reporting_level(void) + { + char *level = getenv("GEIS_DEBUG"); + if (level) +diff --git a/testsuite/geis1/check_gesture_attrs.c b/testsuite/geis1/check_gesture_attrs.c +index 2228d2f..d990c7c 100644 +--- a/testsuite/geis1/check_gesture_attrs.c ++++ b/testsuite/geis1/check_gesture_attrs.c +@@ -169,7 +169,7 @@ END_TEST + + + Suite * +-geis1_gesture_attrs_new() ++geis1_gesture_attrs_new(void) + { + Suite *s = suite_create("geis1_gesture_attrs"); + TCase *test; +diff --git a/testsuite/geis1/check_gesture_types.c b/testsuite/geis1/check_gesture_types.c +index 3492062..980f8fb 100644 +--- a/testsuite/geis1/check_gesture_types.c ++++ b/testsuite/geis1/check_gesture_types.c +@@ -62,7 +62,7 @@ START_TEST(gesture_types) + END_TEST + + Suite * +-geis1_gesture_types_new() ++geis1_gesture_types_new(void) + { + Suite *s = suite_create("geis1_gesture_types"); + TCase *test; +diff --git a/testsuite/geis1/check_instance.c b/testsuite/geis1/check_instance.c +index ac897ab..584abfd 100644 +--- a/testsuite/geis1/check_instance.c ++++ b/testsuite/geis1/check_instance.c +@@ -44,7 +44,7 @@ END_TEST + + + Suite * +-geis1_instance_suite_new() ++geis1_instance_suite_new(void) + { + TCase *create; + Suite *s = suite_create("geis1_instance_suite"); +diff --git a/testsuite/geis1/check_subscription.c b/testsuite/geis1/check_subscription.c +index 0797337..e69c332 100644 +--- a/testsuite/geis1/check_subscription.c ++++ b/testsuite/geis1/check_subscription.c +@@ -146,7 +146,7 @@ END_TEST + + + Suite * +-geis1_subscription_new() ++geis1_subscription_new(void) + { + Suite *s = suite_create("geis1_subscription"); + TCase *test; +diff --git a/testsuite/geis2/check_attr.c b/testsuite/geis2/check_attr.c +index 9e01219..58c8ebc 100644 +--- a/testsuite/geis2/check_attr.c ++++ b/testsuite/geis2/check_attr.c +@@ -42,7 +42,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_attr_suite_new() ++geis2_attr_suite_new(void) + { + Suite *s = suite_create("geis2_attr"); + +diff --git a/testsuite/geis2/check_class.c b/testsuite/geis2/check_class.c +index ca7accd..b60d827 100644 +--- a/testsuite/geis2/check_class.c ++++ b/testsuite/geis2/check_class.c +@@ -92,7 +92,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_gesture_class_suite_new() ++geis2_gesture_class_suite_new(void) + { + TCase *gesture_class; + TCase *usage; +diff --git a/testsuite/geis2/check_config.c b/testsuite/geis2/check_config.c +index a9fc9c1..03b3137 100644 +--- a/testsuite/geis2/check_config.c ++++ b/testsuite/geis2/check_config.c +@@ -48,7 +48,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_config_suite_new() ++geis2_config_suite_new(void) + { + Suite *s = suite_create("geis2_configuration"); + +diff --git a/testsuite/geis2/check_device.c b/testsuite/geis2/check_device.c +index 8b3b7be..9583cb5 100644 +--- a/testsuite/geis2/check_device.c ++++ b/testsuite/geis2/check_device.c +@@ -99,7 +99,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_device_suite_new() ++geis2_device_suite_new(void) + { + TCase *device; + TCase *usage; +diff --git a/testsuite/geis2/check_error_codes.c b/testsuite/geis2/check_error_codes.c +index 9c7508d..57e7fc7 100644 +--- a/testsuite/geis2/check_error_codes.c ++++ b/testsuite/geis2/check_error_codes.c +@@ -20,7 +20,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_error_codes_suite_new() ++geis2_error_codes_suite_new(void) + { + Suite *s = suite_create("geis2_error_codes"); + +diff --git a/testsuite/geis2/check_event.c b/testsuite/geis2/check_event.c +index 8ecda1d..c752a30 100644 +--- a/testsuite/geis2/check_event.c ++++ b/testsuite/geis2/check_event.c +@@ -43,7 +43,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_event_suite_new() ++geis2_event_suite_new(void) + { + Suite *s = suite_create("geis2_event"); + +diff --git a/testsuite/geis2/check_filter.c b/testsuite/geis2/check_filter.c +index 3272a2a..afa23e5 100644 +--- a/testsuite/geis2/check_filter.c ++++ b/testsuite/geis2/check_filter.c +@@ -67,7 +67,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_filter_suite_new() ++geis2_filter_suite_new(void) + { + TCase *filter; + TCase *usage; +diff --git a/testsuite/geis2/check_frame.c b/testsuite/geis2/check_frame.c +index dce6faf..3ea3db0 100644 +--- a/testsuite/geis2/check_frame.c ++++ b/testsuite/geis2/check_frame.c +@@ -172,7 +172,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_gesture_frame_suite_new() ++geis2_gesture_frame_suite_new(void) + { + Suite *s = suite_create("geis2_gesture_frame"); + TCase *gesture_frame; +diff --git a/testsuite/geis2/check_geis_new.c b/testsuite/geis2/check_geis_new.c +index 1fb8de2..36cd3e9 100644 +--- a/testsuite/geis2/check_geis_new.c ++++ b/testsuite/geis2/check_geis_new.c +@@ -32,7 +32,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_geis_new_suite_new() ++geis2_geis_new_suite_new(void) + { + Suite *s = suite_create("geis2_geis_init"); + +diff --git a/testsuite/geis2/check_general_types.c b/testsuite/geis2/check_general_types.c +index 79e29bb..0f463d4 100644 +--- a/testsuite/geis2/check_general_types.c ++++ b/testsuite/geis2/check_general_types.c +@@ -20,7 +20,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_general_types_suite_new() ++geis2_general_types_suite_new(void) + { + Suite *s = suite_create("geis2_general_types"); + TCase *create; +diff --git a/testsuite/geis2/check_region.c b/testsuite/geis2/check_region.c +index 3e64e0c..606350a 100644 +--- a/testsuite/geis2/check_region.c ++++ b/testsuite/geis2/check_region.c +@@ -48,7 +48,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_region_suite_new() ++geis2_region_suite_new(void) + { + Suite *s = suite_create("geis2_region"); + TCase *creation; +diff --git a/testsuite/geis2/check_subscription.c b/testsuite/geis2/check_subscription.c +index a45c4ad..17a6779 100644 +--- a/testsuite/geis2/check_subscription.c ++++ b/testsuite/geis2/check_subscription.c +@@ -161,7 +161,7 @@ END_TEST + + /* boilerplate */ + Suite * +-geis2_subscription_suite_new() ++geis2_subscription_suite_new(void) + { + TCase *create; + TCase *usage; +diff --git a/tools/geis-server/geis-server.c b/tools/geis-server/geis-server.c +index 97c8b99..6600d8f 100644 +--- a/tools/geis-server/geis-server.c ++++ b/tools/geis-server/geis-server.c +@@ -23,7 +23,7 @@ + + + int +-main() ++main(void) + { + GeisStatus status; + +-- +2.37.3 + diff --git a/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch b/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch index 389e1b3fd7..7f55ed9eaf 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch +++ b/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- geis-2.2.17/libgeis/geis_subscription.c.orig 2016-06-17 12:04:21.062938443 -0400 +++ geis-2.2.17/libgeis/geis_subscription.c 2016-06-17 12:05:02.934939172 -0400 @@ -237,9 +237,10 @@ diff --git a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb index b9858d279d..139649b975 100644 --- a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb +++ b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb @@ -7,7 +7,7 @@ system-wide input gesture recognition mechanism." HOMEPAGE = "https://launchpad.net/geis" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING.GPL;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ @@ -15,13 +15,14 @@ LIC_FILES_CHKSUM = " \ inherit autotools pkgconfig python3native lib_package features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 opengl" DEPENDS += "grail dbus-glib python3 virtual/libx11 libxext libxi libxcb dbus frame" SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.xz \ file://fix-indentation-for-gcc6.patch \ file://0001-libgeis-Compare-the-first-character-of-string-to-nul.patch \ + file://0001-provide-function-declaration-with-prototypes.patch \ " UPSTREAM_CHECK_URI = "https://launchpad.net/geis/trunk" @@ -31,8 +32,8 @@ SRC_URI[sha256sum] = "8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa2 EXTRA_OECONF = "--disable-integration-tests" -FILES_${PN}-bin = "${bindir}" -RDEPENDS_${PN}-bin = " \ +FILES:${PN}-bin = "${bindir}" +RDEPENDS:${PN}-bin = " \ python3-compression \ python3-core \ python3-crypt \ @@ -45,14 +46,14 @@ RDEPENDS_${PN}-bin = " \ python3-threading \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/geisview \ - ${libdir}/${PYTHON_DIR}/site-packages/geis* \ - ${libdir}/${PYTHON_DIR}/site-packages/_*.so \ + ${PYTHON_SITEPACKAGES_DIR}/geis* \ + ${PYTHON_SITEPACKAGES_DIR}/_*.so \ " -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" +FILES:${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug" -FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/site-packages/_*.la" +FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/_*.la" -FILES_${PN}-staticdev += "${libdir}/${PYTHON_DIR}/site-packages/_*.a" +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_*.a" diff --git a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb index e1d3777252..067052c036 100644 --- a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb +++ b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb @@ -2,16 +2,16 @@ SUMMARY = "Gesture Recognition And Instantiation Library" HOMEPAGE = "https://launchpad.net/grail" -LICENSE = "GPLv3 & LGPLv3" +LICENSE = "GPL-3.0-only & LGPL-3.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ " -inherit autotools pkgconfig +inherit autotools pkgconfig features_check DEPENDS = "frame" -CXXFLAGS_append_toolchain-clang = " -Wno-pessimizing-move" +CXXFLAGS:append:toolchain-clang = " -Wno-pessimizing-move" SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.bz2" UPSTREAM_CHECK_URI = "https://launchpad.net/grail/trunk" @@ -19,9 +19,11 @@ UPSTREAM_CHECK_URI = "https://launchpad.net/grail/trunk" SRC_URI[md5sum] = "0df1b3ec6167920f310e2effe6e2ad44" SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" + PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--with-x11, --without-x11, libxi" PACKAGE_BEFORE_PN += "${PN}-test" -FILES_${PN}-test = "${bindir}/grail-test*" +FILES:${PN}-test = "${bindir}/grail-test*" SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch b/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch index 586ff18c32..e39e7ddd3d 100644 --- a/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch +++ b/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch @@ -1,22 +1,24 @@ +From c82680a21c7411ba63e5815786eeb471720faa29 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +Date: Wed, 6 Nov 2019 20:10:09 +0800 Subject: [PATCH] Add build rule for README. fix do_configure error: Makefile.am: required file `./README' not found +Upstream-Status: Pending Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> + --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am -index 49574a3..a5a7c2a 100644 +index e77c4c4..fd77ecd 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -26,3 +26,4 @@ libtool: $(LIBTOOL_DEPS) +@@ -27,3 +27,4 @@ libtool: $(LIBTOOL_DEPS) ChangeLog: git log --stat --decorate=short > $@ +README: README.md --- -2.7.4 - diff --git a/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch b/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch deleted file mode 100644 index 477cc31ad2..0000000000 --- a/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch +++ /dev/null @@ -1,18 +0,0 @@ -No need to link with libfl. - -Upstream-Status: Pending -Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> - -Index: ccid-1.4.8/src/Makefile.am -=================================================================== ---- ccid-1.4.8.orig/src/Makefile.am -+++ ccid-1.4.8/src/Makefile.am -@@ -53,7 +53,7 @@ PROVIDED_BY_PCSC = debug.c - endif - - libccid_la_SOURCES = $(COMMON) $(USB) $(TOKEN_PARSER) $(PROVIDED_BY_PCSC) $(T1) --libccid_la_LIBADD = $(LEXLIB) $(LIBUSB_LIBS) $(PTHREAD_LIBS) -+libccid_la_LIBADD = $(LIBUSB_LIBS) $(PTHREAD_LIBS) - libccid_la_CFLAGS = $(PCSC_CFLAGS) $(LIBUSB_CFLAGS) $(PTHREAD_CFLAGS) \ - $(SYMBOL_VISIBILITY) -D$(CCID_VERSION) -DSIMCLIST_NO_DUMPRESTORE - libccid_la_LDFLAGS = -avoid-version diff --git a/meta-oe/recipes-support/ccid/ccid_1.4.33.bb b/meta-oe/recipes-support/ccid/ccid_1.4.33.bb deleted file mode 100644 index 3c58894253..0000000000 --- a/meta-oe/recipes-support/ccid/ccid_1.4.33.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Generic USB CCID smart card reader driver" -HOMEPAGE = "https://ccid.apdu.fr/" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "virtual/libusb0 pcsc-lite" -RDEPENDS_${PN} = "pcsc-lite" - -SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ - file://no-dep-on-libfl.patch \ - file://0001-Add-build-rule-for-README.patch \ -" - -SRC_URI[md5sum] = "b11907894ce2d345439635e2b967e7e5" -SRC_URI[sha256sum] = "5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb680e424" - -inherit autotools pkgconfig - -FILES_${PN} += "${libdir}/pcsc/" -FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-oe/recipes-support/ccid/ccid_1.5.5.bb b/meta-oe/recipes-support/ccid/ccid_1.5.5.bb new file mode 100644 index 0000000000..e76881916e --- /dev/null +++ b/meta-oe/recipes-support/ccid/ccid_1.5.5.bb @@ -0,0 +1,18 @@ +SUMMARY = "Generic USB CCID smart card reader driver" +HOMEPAGE = "https://ccid.apdu.fr/" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "autoconf-archive-native virtual/libusb0 pcsc-lite" +RDEPENDS:${PN} = "pcsc-lite" + +SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ + file://0001-Add-build-rule-for-README.patch \ +" + +SRC_URI[sha256sum] = "194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca" + +inherit autotools pkgconfig + +FILES:${PN} += "${libdir}/pcsc/" +FILES:${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb index ac463038aa..18db0721de 100644 --- a/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.0.bb +++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb @@ -1,18 +1,25 @@ DESCRIPTION = "Ceres Solver is an open source C++ library for modeling and solving large, complicated optimization problems." -AUTHOR = "Sameer Agarwal and Keir Mierle and Others" HOMEPAGE = "http://ceres-solver.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=35e00f0c4c96a0820a03e0b31e6416be" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3585a26c9cd9ec0cb36a7d65542878ca" DEPENDS = "libeigen glog" -SRC_URI = "git://github.com/ceres-solver/ceres-solver.git" -SRCREV = "facb199f3eda902360f9e1d5271372b7e54febe1" +SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" +SRCREV = "85331393dc0dff09f6fb9903ab0c4bfa3e134b01" S = "${WORKDIR}/git" inherit cmake +do_configure:prepend() { + # otherwise https://github.com/ceres-solver/ceres-solver/blob/0b748597889f460764f6c980a00c6f502caa3875/cmake/AddGerritCommitHook.cmake#L68 + # will try to fetch https://ceres-solver-review.googlesource.com/tools/hooks/commit-msg durind do_configure + # which sometimes gets stuck (as there is no TIMEOUT set in DOWNLOAD) + # and we really don't need Gerrit's Change-Id tags when just building this + touch ${S}/.git/hooks/commit-msg +} + # We don't want path to eigen3 in ceres-solver RSS to be # used by components which use CeresConfig.cmake from their # own RSS @@ -29,6 +36,6 @@ PACKAGECONFIG[cxsparse] = "-DCXSPARSE=ON,-DCXSPARSE=OFF,suitesparse-cxsparse" PACKAGECONFIG[lapack] = "-DLAPACK=ON,-DLAPACK=OFF,lapack" # Only a static library and headers are created -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dev = "${PN}-staticdev" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dev = "${PN}-staticdev" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-support/ckermit/ckermit/0001-Fix-function-prototype-errors.patch b/meta-oe/recipes-support/ckermit/ckermit/0001-Fix-function-prototype-errors.patch new file mode 100644 index 0000000000..306a2ee52a --- /dev/null +++ b/meta-oe/recipes-support/ckermit/ckermit/0001-Fix-function-prototype-errors.patch @@ -0,0 +1,106 @@ +From f73eade85b7a1b93f7b9ef6ca9ead9d2441f8f84 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 19:01:38 -0700 +Subject: [PATCH] Fix function prototype errors + +Clang 15 is strict, therefore ensure that right headers are pulled in +and also right function prototypes are used. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ckcmai.c | 4 ++++ + ckucmd.c | 2 +- + ckucmd.h | 2 -- + ckucon.c | 2 +- + ckufio.c | 2 +- + ckuusx.c | 2 +- + 6 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/ckcmai.c b/ckcmai.c +index a5640e5..a4e322d 100644 +--- a/ckcmai.c ++++ b/ckcmai.c +@@ -561,6 +561,10 @@ ACKNOWLEDGMENTS: + #include "ckntap.h" + #endif /* NT */ + ++#ifndef VMS ++#include <time.h> /* time() */ ++#endif ++ + #ifndef NOSERVER + /* Text message definitions.. each should be 256 chars long, or less. */ + #ifdef MINIX +diff --git a/ckucmd.c b/ckucmd.c +index 274dc2d..730f20d 100644 +--- a/ckucmd.c ++++ b/ckucmd.c +@@ -7356,7 +7356,7 @@ cmdgetc(timelimit) int timelimit; { /* Get a character from the tty. */ + Returns 0 or greater always. + */ + int +-cmdconchk() { ++cmdconchk(void) { + int x = 0, y; + y = pushc ? 1 : 0; /* Have command character pushed? */ + #ifdef OS2 +diff --git a/ckucmd.h b/ckucmd.h +index 7cd4ced..5c43cc4 100644 +--- a/ckucmd.h ++++ b/ckucmd.h +@@ -280,9 +280,7 @@ _PROTOTYP( int cmdsquo, (int) ); + _PROTOTYP( int cmdgquo, (void) ); + _PROTOTYP( char * ckcvtdate, (char *, int) ); + _PROTOTYP( int cmdgetc, (int)); +-#ifndef NOARROWKEYS + _PROTOTYP( int cmdconchk, (void) ); +-#endif /* NOARROWKEYS */ + + #ifdef CK_RECALL + _PROTOTYP( char * cmgetcmd, (char *) ); +diff --git a/ckucon.c b/ckucon.c +index 50ceb7e..954719e 100644 +--- a/ckucon.c ++++ b/ckucon.c +@@ -39,8 +39,8 @@ _PROTOTYP( static VOID concld, (void) ); + + #ifdef NEXT + #undef NSIG +-#include <sys/wait.h> /* For wait() */ + #endif /* NEXT */ ++#include <sys/wait.h> /* For wait() */ + + #include <signal.h> /* Signals */ + +diff --git a/ckufio.c b/ckufio.c +index b5bfaae..2a8d4e5 100644 +--- a/ckufio.c ++++ b/ckufio.c +@@ -142,8 +142,8 @@ _PROTOTYP( int parser, ( int ) ); + + #ifdef UNIX /* Pointer arg to wait() allowed */ + #define CK_CHILD /* Assume this is safe in all UNIX */ ++#include <sys/wait.h> /* wait() API */ + #endif /* UNIX */ +- + extern int binary, recursive, stathack; + #ifdef CK_CTRLZ + extern int eofmethod; +diff --git a/ckuusx.c b/ckuusx.c +index d332bed..253f992 100644 +--- a/ckuusx.c ++++ b/ckuusx.c +@@ -9144,7 +9144,7 @@ char *s; /* a string */ + #ifndef CK_CURPOS + /* Dummies for when cursor control is not supported */ + int +-ck_curpos(row, col) { ++ck_curpos(int row, int col) { + return(-1); + } + +-- +2.37.3 + diff --git a/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-oe/recipes-support/ckermit/ckermit_302.bb index abeeeccd1d..53f2b9d2c5 100644 --- a/meta-oe/recipes-support/ckermit/ckermit_302.bb +++ b/meta-oe/recipes-support/ckermit/ckermit_302.bb @@ -8,7 +8,9 @@ SECTION = "console/network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=932ca542d6c6cb8a59a0bcd76ab67cc3" -SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV}" +SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV} \ + file://0001-Fix-function-prototype-errors.patch \ + " SRC_URI[md5sum] = "eac4dbf18b45775e4cdee5a7c74762b0" SRC_URI[sha256sum] = "0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711" diff --git a/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch new file mode 100644 index 0000000000..7e6611b6a8 --- /dev/null +++ b/meta-oe/recipes-support/cli11/cli11/0001-Do-not-download-the-catch-framework-during-configure.patch @@ -0,0 +1,41 @@ +From 93557d5c5acf9ebb2c0fa708658e1d36621dd23a Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Wed, 7 Sep 2022 10:05:15 +0900 +Subject: [PATCH] Do not download the catch framework during configure. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + tests/CMakeLists.txt | 15 --------------- + 1 file changed, 15 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 80c4f6a..ae210db 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -74,21 +74,6 @@ if(Catch2_FOUND) + endif() + message(STATUS "Found Catch2") + target_link_libraries(catch_main PUBLIC Catch2::Catch2) +-else() +- message(STATUS "Downloading Catch2") +- +- # FetchContent would be better, but requires newer CMake. +- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/catch2") +- set(url https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp) +- file( +- DOWNLOAD ${url} "${CMAKE_CURRENT_BINARY_DIR}/catch2/catch.hpp" +- STATUS status +- EXPECTED_HASH SHA256=ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc) +- list(GET status 0 error) +- if(error) +- message(FATAL_ERROR "Could not download ${url}, and Catch2 not found on your system.") +- endif() +- target_include_directories(catch_main PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") + endif() + + # Target must already exist +-- +2.25.1 + diff --git a/meta-oe/recipes-support/cli11/cli11_1.9.1.bb b/meta-oe/recipes-support/cli11/cli11_1.9.1.bb deleted file mode 100644 index 5f022d78af..0000000000 --- a/meta-oe/recipes-support/cli11/cli11_1.9.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "C++11 command line parser" -DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." -HOMEPAGE = "https://github.com/CLIUtils/CLI11" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b73927b18d5c6cd8d2ed28a6ad539733" -SRCREV = "5cb3efabce007c3a0230e4cc2e27da491c646b6c" -PV .= "+git${SRCPV}" - -SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=v1" - -S = "${WORKDIR}/git" - -inherit cmake -inherit ptest - -# cli11 is a header only C++ library, so the main package will be empty. -RDEPENDS_${PN}-dev = "" diff --git a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb new file mode 100644 index 0000000000..ef3c951bbf --- /dev/null +++ b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb @@ -0,0 +1,26 @@ +SUMMARY = "C++11 command line parser" +DESCRIPTION = "A command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface." +HOMEPAGE = "https://github.com/CLIUtils/CLI11" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=afb20fe5f67e21074b10b864d9563c11" +SRCREV = "291c58789c031208f08f4f261a858b5b7083e8e2" +PV .= "+git" + +SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \ + https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp \ + file://0001-Do-not-download-the-catch-framework-during-configure.patch" + +SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc" +S = "${WORKDIR}/git" + +do_configure:prepend() { + mkdir -p ${S}/tests/catch2 + cp ${DL_DIR}/catch.hpp ${S}/tests/catch2/catch.hpp +} + +inherit cmake + +# cli11 is a header only C++ library, so the main package will be empty. +RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/cmark/cmark_git.bb b/meta-oe/recipes-support/cmark/cmark_0.31.0.bb index f74a39b500..ce8b4cd493 100644 --- a/meta-oe/recipes-support/cmark/cmark_git.bb +++ b/meta-oe/recipes-support/cmark/cmark_0.31.0.bb @@ -3,12 +3,10 @@ HOMEPAGE = "https://github.com/commonmark/cmark" LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" -SRC_URI = "git://github.com/commonmark/cmark.git" -SRCREV = "8daa6b1495124f0b67e6034130e12d7be83e38bd" +SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" +SRCREV = "8fbf029685482827828b5858444157052f1b0a5f" S = "${WORKDIR}/git" -PV = "0.29.0" - inherit cmake lib_package EXTRA_OECMAKE += " \ diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb index 845041cc43..64dd94a9ed 100644 --- a/meta-oe/recipes-support/colord/colord-native.bb +++ b/meta-oe/recipes-support/colord/colord-native.bb @@ -1,8 +1,8 @@ require ${BPN}.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-native:" -inherit meson native +inherit meson pkgconfig native DEPENDS += " \ meson-native \ diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch index 278b90e076..aae2be8c1e 100644 --- a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch +++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch @@ -89,11 +89,11 @@ index a5e2328..dec509a 100644 +} + diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c -index f231814..2c8fe77 100644 +index 8beec43..398ff7a 100644 --- a/lib/colord/cd-icc.c +++ b/lib/colord/cd-icc.c -@@ -3094,68 +3094,6 @@ out: - return ret; +@@ -3114,68 +3114,6 @@ cd_icc_create_default (CdIcc *icc, GError **error) + return cd_icc_create_default_full (icc, CD_ICC_LOAD_FLAGS_NONE, error); } -/** diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb index df86708e2b..e300222518 100644 --- a/meta-oe/recipes-support/colord/colord.bb +++ b/meta-oe/recipes-support/colord/colord.bb @@ -1,10 +1,10 @@ require ${BPN}.inc -inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd +inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd pkgconfig # polkit and gobject-introspection are mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" +GIR_MESON_OPTION = "" DEPENDS += " \ ${BPN}-native \ @@ -28,18 +28,18 @@ EXTRA_OEMESON = " \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" -SYSTEMD_SERVICE_${PN} = "colord.service" +SYSTEMD_SERVICE:${PN} = "colord.service" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/polkit-1 \ ${datadir}/glib-2.0 \ ${datadir}/color \ ${systemd_user_unitdir} \ - ${libdir}/tmpfiles.d \ + ${nonarch_libdir}/tmpfiles.d \ ${libdir}/colord-plugins \ ${libdir}/colord-sensors \ " USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" +USERADD_PARAM:${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc index 7497fed51e..0ae1a30fe6 100644 --- a/meta-oe/recipes-support/colord/colord.inc +++ b/meta-oe/recipes-support/colord/colord.inc @@ -1,13 +1,12 @@ SUMMARY = "Making color management just work" HOMEPAGE = "https://www.freedesktop.org/software/colord/" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ " -PV = "1.4.4" +PV = "1.4.6" SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "32c2709a6002d9ee750483aaed6379c8" -SRC_URI[sha256sum] = "9a0fe80160bf88efddb582a9fc0169f56065276dc3882c47dddb9eecd048c0a5" +SRC_URI[sha256sum] = "7407631a27bfe5d1b672e7ae42777001c105d860b7b7392283c8c6300de88e6f" diff --git a/meta-oe/recipes-support/consolation/consolation_0.0.8.bb b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb index 90bd560c47..17981b6e9b 100644 --- a/meta-oe/recipes-support/consolation/consolation_0.0.8.bb +++ b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb @@ -5,8 +5,8 @@ supports all pointer devices and settings provided by this library. Similar \ software include gpm and jamd." HOMEPAGE = "https://salsa.debian.org/consolation-team/consolation" SECTION = "console/utils" -LICENSE = "GPL-2.0+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=73ca626e1d9048abfc7d599370650827" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7df9eea2f4dfdda489c116099e6fc062" DEPENDS = " \ libevdev \ @@ -14,16 +14,16 @@ DEPENDS = " \ udev \ " -SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git" -SRCREV = "4581eaece6e49fa2b687efbdbe23b2de452e7902" +SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git;branch=master" +SRCREV = "5ef08f0cd6ede62de14de477b74fc3611108c676" S = "${WORKDIR}/git" inherit autotools pkgconfig systemd -do_install_append() { +do_install:append() { install -d ${D}${systemd_system_unitdir} install -m 644 ${B}/consolation.service ${D}${systemd_system_unitdir} } -SYSTEMD_SERVICE_${PN} = "consolation.service" +SYSTEMD_SERVICE:${PN} = "consolation.service" diff --git a/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch b/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch new file mode 100644 index 0000000000..c93b76619c --- /dev/null +++ b/meta-oe/recipes-support/cpp-netlib/cpp-netlib/a53f123040998744602f190944464af0e159ea19.patch @@ -0,0 +1,30 @@ +From a53f123040998744602f190944464af0e159ea19 Mon Sep 17 00:00:00 2001 +From: jjll <jjll@gmv.com> +Date: Wed, 6 Sep 2023 20:47:41 +0200 +Subject: [PATCH] Compatibility with boost 1.83 + +Upstream-Status: Backport [https://github.com/cpp-netlib/cpp-netlib/pull/902] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libs/network/src/server_request_parsers_impl.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/boost/network/protocol/http/server/impl/parsers.ipp ++++ b/boost/network/protocol/http/server/impl/parsers.ipp +@@ -13,6 +13,7 @@ + #include <tuple> + #include <boost/fusion/include/std_tuple.hpp> + #include <boost/network/protocol/http/message/header.hpp> ++#include <boost/regex/pending/unicode_iterator.hpp> + + #ifdef BOOST_NETWORK_NO_LIB + #ifndef BOOST_NETWORK_INLINE +@@ -32,7 +33,7 @@ typedef std::basic_string<uint32_t> u32_ + template <> // <typename Attrib, typename T, typename Enable> + struct assign_to_container_from_value<std::string, u32_string, void> { + static void call(u32_string const& val, std::string& attr) { +- u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(), ++ boost::u32_to_u8_iterator<u32_string::const_iterator> begin = val.begin(), + end = val.end(); + for (; begin != end; ++begin) attr += *begin; + } diff --git a/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb b/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb new file mode 100644 index 0000000000..bda5177fc4 --- /dev/null +++ b/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Modern C++ network programming libraries." + +# This library provides general purpose network functionality such as +# socket communication to agent libraries. It was designed to be merged +# into boost at some point and follows similar header library approach +# for most functionality. + +SECTION = "libs" +LICENSE = "BSL-1.0 & MIT & Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" +PV = "0.13.0" + +SRCREV = "31d304cdf52b485f465ada433d8905171b61cbff" +SRC_URI = "\ + git://github.com/cpp-netlib/cpp-netlib.git;protocol=https;branch=0.13-release \ + file://a53f123040998744602f190944464af0e159ea19.patch \ +" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +DEPENDS = "zlib boost openssl" + +EXTRA_OECMAKE:append = " -DCPP-NETLIB_BUILD_TESTS=OFF -DCPP-NETLIB_BUILD_EXAMPLES=OFF" + +do_install:append() { + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibConfig.cmake + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibTargets-noconfig.cmake +} diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch index 3ff7f0dd31..b956db22fd 100644 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: new toolchain might have increased the float precision Author: Gianfranco Costamagna <locutusofborg@debian.org> Last-Update: 2017-10-28 diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch index 5f1f8a9f9c..961eaf7646 100644 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch +++ b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Description: Debian forbids calls to external websites. Author: Gianfranco Costamagna <locutus@debian.org> diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb index 5d7dbd8bda..aec7286404 100644 --- a/meta-oe/recipes-support/cpprest/cpprest_2.10.16.bb +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb @@ -11,8 +11,8 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste file://disable-float-tests.patch \ file://disable-outside-tests.patch " -# tag 2.10.16 -SRCREV= "18212a2a7967e12d740bfb957e500892b3463c88" +# tag 2.10.19 +SRCREV= "411a109150b270f23c8c97fa4ec9a0a4a98cdecf" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/cpulimit/cpulimit/0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch b/meta-oe/recipes-support/cpulimit/cpulimit/0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch new file mode 100644 index 0000000000..50d0342ec7 --- /dev/null +++ b/meta-oe/recipes-support/cpulimit/cpulimit/0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch @@ -0,0 +1,41 @@ +From 41cfba0840f58555593fd4bee07db77221043e0b Mon Sep 17 00:00:00 2001 +From: Portia <stephensportia@gmail.com> +Date: Sun, 1 May 2022 12:43:35 +1000 +Subject: [PATCH] Remove sys/sysctl.h and add missing libgen.h include + +- sys/sysctl.h has been deprecated and should be removed +- Adds missing libgen.h include when calling basename() + +Upstream-Status: Inactive-Upstream [2015] +Signed-off-by: Portia <stephensportia@gmail.com> +--- + src/cpulimit.c | 1 - + src/process_group.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cpulimit.c b/src/cpulimit.c +index 50eabea..5b0ec49 100644 +--- a/src/cpulimit.c ++++ b/src/cpulimit.c +@@ -38,7 +38,6 @@ + #include <string.h> + #include <sys/stat.h> + #include <sys/time.h> +-#include <sys/sysctl.h> + #include <sys/resource.h> + #include <sys/types.h> + #include <sys/wait.h> +diff --git a/src/process_group.c b/src/process_group.c +index 06d73a6..d4f6fab 100644 +--- a/src/process_group.c ++++ b/src/process_group.c +@@ -24,6 +24,7 @@ + #include <limits.h> + #include <sys/time.h> + #include <signal.h> ++#include <libgen.h> + + #include <assert.h> + +-- +2.25.1 diff --git a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb new file mode 100644 index 0000000000..f88d3b6ca1 --- /dev/null +++ b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "cpulimit is a tool which limits the CPU usage of a process" +DESCRIPTION = "cpulimit is a simple program that attempts to limit the CPU usage of a process (expressed in percentage, not in CPU time). This is useful to control batch jobs, when you don't want them to eat too much CPU. It does not act on the nice value or other priority stuff, but on the real CPU usage. Besides it is able to adapt itself to the overall system load, dynamically and quickly." +HOMEPAGE = "http://cpulimit.sourceforge.net" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86c1c0d961a437e529db93aa3bb32dc4" +SRCREV ?= "f4d2682804931e7aea02a869137344bb5452a3cd" + +SRC_URI = "git://github.com/opsengine/cpulimit.git;protocol=https;branch=master \ + file://0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch \ + " + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake all +} +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${B}/src/${BPN} ${D}${sbindir}/ +} + +CFLAGS += "-D_GNU_SOURCE ${LDFLAGS}" + diff --git a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb new file mode 100644 index 0000000000..d53e1a276b --- /dev/null +++ b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb @@ -0,0 +1,20 @@ +SUMMARY = "Utility that provides userspace support for reading and writing to the i.MX fuses" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116" + +GO_IMPORT = "github.com/usbarmory/crucible" +SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master" + +GO_INSTALL = "\ + ${GO_IMPORT}/cmd/crucible \ + ${GO_IMPORT}/cmd/habtool \ +" +SRCREV = "dec27cd4e0e0db106c0a21d429c04ca8d36bbdd5" + +export GOPROXY = "https://proxy.golang.org,direct" +# Workaround for network access issue during compile step. +# This needs to be fixed in the recipes buildsystem so that +# it can be accomplished during do_fetch task. +do_compile[network] = "1" + +inherit go-mod diff --git a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb index 3a049e76da..0e994d8b09 100644 --- a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb +++ b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb @@ -4,9 +4,8 @@ SECTION = "System Environment/Libraries" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://../ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" -SRC_URI = "http://ftp.riken.jp/Linux/fedora/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ - http://ftp.riken.jp/Linux/fedora/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" -SRC_URI[md5sum] = "5b7259ef1c8cd9ae801fca7a5cb548c1" +SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ + https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91" do_compile() { @@ -20,4 +19,4 @@ do_install() { install -dm 755 ${D}${libdir}/ctapi } -FILES_${PN} += "${libdir}/ctapi" +FILES:${PN} += "${libdir}/ctapi" diff --git a/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb b/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb new file mode 100644 index 0000000000..f63348a328 --- /dev/null +++ b/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "Cyaml library" +DESCRIPTION = "LibCYAML is a library for reading and writing structured YAML documents." +HOMEPAGE = "https://github.com/tlsa/libcyaml" +SECTION = "libs" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fe6f0e49348c87bddd5d27803dceaaf0" +DEPENDS = " \ + libyaml \ +" +SRCREV = "07ff8654a270ec9b410acd3152b60de9e9f941af" + +SRC_URI = "git://github.com/tlsa/libcyaml.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +EXTRA_OEMAKE = "'PREFIX=""' 'DESTDIR=${D}' 'CFLAGS=${CFLAGS}' 'LIBDIR=${libdir}' 'INCLUDEDIR=${includedir}' 'VARIANT=release'" + +do_compile() { + oe_runmake +} +do_install() { + oe_runmake install +} + +CFLAGS += "-pedantic -Wall -Wextra -O3 -Iinclude"
\ No newline at end of file diff --git a/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-oe/recipes-support/daemonize/daemonize_git.bb index c76632781a..f46dec59fc 100644 --- a/meta-oe/recipes-support/daemonize/daemonize_git.bb +++ b/meta-oe/recipes-support/daemonize/daemonize_git.bb @@ -7,7 +7,7 @@ PV = "1.7.8" inherit autotools SRCREV = "18869a797dab12bf1c917ba3b4782fef484c407c" -SRC_URI = "git://github.com/bmc/daemonize.git \ +SRC_URI = "git://github.com/bmc/daemonize.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch new file mode 100644 index 0000000000..4b332a000e --- /dev/null +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-Fix-signature-of-main-function.patch @@ -0,0 +1,209 @@ +From 269f18d5e6698fdd34fec2798f10c6fe072f3cd5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 23:36:52 -0700 +Subject: [PATCH] Fix signature of main function + +Clang-15 errors out otherewise. +Include needed headers for missing functions + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/chkshsgr.c | 2 +- + src/tai64n.c | 2 +- + src/tai64nlocal.c | 2 +- + src/trycpp.c | 5 +++-- + src/tryflock.c | 4 ++-- + src/trymkffo.c | 2 +- + src/trypoll.c | 3 ++- + src/trysgact.c | 4 ++-- + src/trysgprm.c | 4 ++-- + src/tryshsgr.c | 3 ++- + src/tryulong64.c | 4 ++-- + src/trywaitp.c | 4 ++-- + src/x86cpuid.c | 2 +- + 13 files changed, 22 insertions(+), 19 deletions(-) + +diff --git a/src/chkshsgr.c b/src/chkshsgr.c +index 038afe9..9547a4c 100644 +--- a/src/chkshsgr.c ++++ b/src/chkshsgr.c +@@ -5,7 +5,7 @@ + #include <grp.h> + #include <unistd.h> + +-int main() ++int main(int argc, char *argv[]) + { + gid_t x[4]; + +diff --git a/src/tai64n.c b/src/tai64n.c +index 17bdb82..7096ab3 100644 +--- a/src/tai64n.c ++++ b/src/tai64n.c +@@ -27,7 +27,7 @@ buffer in = BUFFER_INIT(myread,0,inbuf,sizeof inbuf); + + char stamp[TIMESTAMP + 1]; + +-int main() ++int main(int argc, char *argv[]) + { + char ch; + +diff --git a/src/tai64nlocal.c b/src/tai64nlocal.c +index ce16ad8..2435737 100644 +--- a/src/tai64nlocal.c ++++ b/src/tai64nlocal.c +@@ -28,7 +28,7 @@ unsigned long nanosecs; + unsigned long u; + struct tm *t; + +-int main() ++int main(int argc, char *argv[]) + { + char ch; + +diff --git a/src/trycpp.c b/src/trycpp.c +index e4503d4..d96c955 100644 +--- a/src/trycpp.c ++++ b/src/trycpp.c +@@ -1,6 +1,7 @@ + /* Public domain. */ +- +-int main() ++#include <stdio.h> ++#include <stdlib.h> ++int main(int argc, char *argv[]) + { + #ifdef NeXT + printf("nextstep\n"); exit(0); +diff --git a/src/tryflock.c b/src/tryflock.c +index a82ffc2..5ca97d3 100644 +--- a/src/tryflock.c ++++ b/src/tryflock.c +@@ -3,8 +3,8 @@ + #include <sys/types.h> + #include <sys/file.h> + #include <fcntl.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + flock(0,LOCK_EX | LOCK_UN | LOCK_NB); + } +diff --git a/src/trymkffo.c b/src/trymkffo.c +index 9356342..f92414a 100644 +--- a/src/trymkffo.c ++++ b/src/trymkffo.c +@@ -3,7 +3,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + +-void main() ++void main(int argc, char *argv[]) + { + mkfifo("temp-trymkffo",0); + } +diff --git a/src/trypoll.c b/src/trypoll.c +index 6506617..cb888cc 100644 +--- a/src/trypoll.c ++++ b/src/trypoll.c +@@ -3,8 +3,9 @@ + #include <sys/types.h> + #include <fcntl.h> + #include <poll.h> ++#include <unistd.h> + +-int main() ++int main(int argc, char *argv[]) + { + struct pollfd x; + +diff --git a/src/trysgact.c b/src/trysgact.c +index e264ef2..25da013 100644 +--- a/src/trysgact.c ++++ b/src/trysgact.c +@@ -1,8 +1,8 @@ + /* Public domain. */ + + #include <signal.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + struct sigaction sa; + sa.sa_handler = 0; +diff --git a/src/trysgprm.c b/src/trysgprm.c +index a46c82c..5a9491c 100644 +--- a/src/trysgprm.c ++++ b/src/trysgprm.c +@@ -1,8 +1,8 @@ + /* Public domain. */ + + #include <signal.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + sigset_t ss; + +diff --git a/src/tryshsgr.c b/src/tryshsgr.c +index c5ed6d6..d111e40 100644 +--- a/src/tryshsgr.c ++++ b/src/tryshsgr.c +@@ -1,6 +1,7 @@ + /* Public domain. */ + +-int main() ++#include <unistd.h> ++int main(int argc, char *argv[]) + { + short x[4]; + +diff --git a/src/tryulong64.c b/src/tryulong64.c +index 003548a..20a3a40 100644 +--- a/src/tryulong64.c ++++ b/src/tryulong64.c +@@ -1,6 +1,6 @@ + /* Public domain. */ +- +-int main() ++#include <unistd.h> ++int main(int argc, char *argv[]) + { + unsigned long u; + u = 1; +diff --git a/src/trywaitp.c b/src/trywaitp.c +index 319b81f..90bc5aa 100644 +--- a/src/trywaitp.c ++++ b/src/trywaitp.c +@@ -2,8 +2,8 @@ + + #include <sys/types.h> + #include <sys/wait.h> +- +-main() ++void ++main(int argc, char *argv[]) + { + waitpid(0,0,0); + } +diff --git a/src/x86cpuid.c b/src/x86cpuid.c +index f81c593..1cb1ea6 100644 +--- a/src/x86cpuid.c ++++ b/src/x86cpuid.c +@@ -7,7 +7,7 @@ void nope() + exit(1); + } + +-int main() ++int main(int argc, char *argv[]) + { + unsigned long x[4]; + unsigned long y[4]; +-- +2.37.3 + diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch index 30e37cb1d3..139ff30f2e 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch @@ -9,6 +9,8 @@ ERROR: daemontools-0.76-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binar Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + src/conf-ld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff b/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff index ce1959782a..b5eb7d8b1a 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff @@ -4,6 +4,8 @@ Date: Wed, 12 Dec 2007 13:44:15 +0000 Subject: [PATCH] error.h: '#include <errno.h>' instead of 'extern int errno;' --- +Upstream-Status: Pending + daemontools-0.76/src/error.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff b/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff index 73dce90726..16a0148546 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff +++ b/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff @@ -4,6 +4,8 @@ Date: Sun, 24 Feb 2008 10:54:26 +0000 Subject: [PATCH] supervise.c: ./supervise may be a symlink, if it's dangling, create link target --- +Upstream-Status: Pending + daemontools-0.76/src/supervise.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch index 9c07d758ae..98d4a5e45b 100644 --- a/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch +++ b/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + make sure it can be compiled for cross target 1. never try to compile target binary by native gcc diff --git a/meta-oe/recipes-support/daemontools/daemontools/warnings.patch b/meta-oe/recipes-support/daemontools/daemontools/warnings.patch new file mode 100644 index 0000000000..5c9c7114b9 --- /dev/null +++ b/meta-oe/recipes-support/daemontools/daemontools/warnings.patch @@ -0,0 +1,76 @@ +Upstream-Status: Pending + +Fixup misc warnings + +Patch by RiverRat + +http://bugs.gentoo.org/124487 + +--- a/src/chkshsgr.c ++++ b/src/chkshsgr.c +@@ -1,10 +1,13 @@ + /* Public domain. */ + ++#include <sys/types.h> ++#include <stdlib.h> ++#include <grp.h> + #include <unistd.h> + + int main() + { +- short x[4]; ++ gid_t x[4]; + + x[0] = x[1] = 0; + if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1); +--- a/src/matchtest.c ++++ b/src/matchtest.c +@@ -1,3 +1,4 @@ ++#include <unistd.h> + #include "match.h" + #include "buffer.h" + #include "str.h" +--- a/src/multilog.c ++++ b/src/multilog.c +@@ -1,3 +1,4 @@ ++#include <stdio.h> + #include <unistd.h> + #include <sys/types.h> + #include <sys/stat.h> +--- a/src/prot.c ++++ b/src/prot.c +@@ -1,5 +1,8 @@ + /* Public domain. */ + ++#include <sys/types.h> ++#include <unistd.h> ++#include <grp.h> + #include "hasshsgr.h" + #include "prot.h" + +--- a/src/seek_set.c ++++ b/src/seek_set.c +@@ -1,6 +1,7 @@ + /* Public domain. */ + + #include <sys/types.h> ++#include <unistd.h> + #include "seek.h" + + #define SET 0 /* sigh */ +--- a/src/supervise.c ++++ b/src/supervise.c +@@ -1,3 +1,4 @@ ++#include <stdio.h> + #include <unistd.h> + #include <sys/types.h> + #include <sys/stat.h> +--- a/src/pathexec_run.c ++++ b/src/pathexec_run.c +@@ -1,5 +1,6 @@ + /* Public domain. */ + ++#include <unistd.h> + #include "error.h" + #include "stralloc.h" + #include "str.h" diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index f0c5f7d7de..a35b54e3bc 100644 --- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb @@ -15,11 +15,15 @@ SECTION = "System/Servers" LIC_FILES_CHKSUM = "file://src/prot.c;beginline=1;endline=1;md5=96964cadf07e8f8c1e2ffb3b507dd647" LICENSE = "PD" +DEPENDS += "coreutils" + SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ file://0001-error.h-include-errno.h-instead-of-extern-int.diff \ file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff \ file://cross-compile.patch \ file://0001-daemontools-Fix-QA-Issue.patch \ + file://warnings.patch \ + file://0001-Fix-signature-of-main-function.patch \ " SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc" @@ -35,10 +39,10 @@ do_install() { install -d ${D}/${bindir} } -do_install_append_class-target() { +do_install:append:class-target() { install -m755 ${S}/command/* ${D}/${bindir} } inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "svc svok" +ALTERNATIVE:${PN} = "svc svok" diff --git a/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb b/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb new file mode 100644 index 0000000000..a8fd88a9ad --- /dev/null +++ b/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "Double conversion libraries" +DESCRIPTION = "This provides binary-decimal and decimal-binary routines for IEEE doubles." +HOMEPAGE = "https://github.com/google/double-conversion.git" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f" + + +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/google/double-conversion.git;protocol=https;branch=master \ + file://run-ptest \ +" +SRCREV = "4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe" + +inherit cmake ptest + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +# These ptest use ctest (provided by cmake) +RDEPENDS:${PN}-ptest += "cmake" +# Build tests only if ptest is enabled +EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTING=ON', '', d)}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + cp -rf ${B}/test ${D}${PTEST_PATH} + install -m 0644 ${B}/CTestTestfile.cmake ${D}${PTEST_PATH}/ + files=" + CTestTestfile.cmake + test/CTestTestfile.cmake + test/cmake_install.cmake + test/cctest/CTestTestfile.cmake + test/cctest/cmake_install.cmake + " + for file in $files; do + sed -i -e "s|${B}|${PTEST_PATH}|g" -e "s|${S}|${PTEST_PATH}|g" -e "s|${WORKDIR}/recipe-sysroot-native||g" "${D}${PTEST_PATH}/${file}" + done + +} diff --git a/meta-oe/recipes-support/dc/files/run-ptest b/meta-oe/recipes-support/dc/files/run-ptest new file mode 100644 index 0000000000..9240a3f851 --- /dev/null +++ b/meta-oe/recipes-support/dc/files/run-ptest @@ -0,0 +1,23 @@ +#!/bin/sh + +# This script runs tests taken from the github CI for the Double-Conversion library. +# For more information, please see: https://github.com/google/double-conversion/blob/master/.github/workflows/ci.yml#L60 + +# Count the number of failed tests +NUM_FAILS=0 + +# Run all tests using ctest +ctest -V + +# VCount the number of failed tests by checking the LastTest.log file generated by ctest +NUM_FAILS=$(grep -c "Failed" Testing/Temporary/LastTest.log) + +# Run the tests directly as well, just in case we forgot to add it to ctest +test/cctest/cctest +if [ $? -ne 0 ]; then + # If the test failed, increment the number of failed tests + NUM_FAILS=$(expr $NUM_FAILS + 1) +fi + +# Return the number of failed tests +exit $NUM_FAILS diff --git a/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-oe/recipes-support/devmem2/devmem2.bb deleted file mode 100644 index 9bd1eb73d7..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Simple program to read/write from/to any location in memory" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf" -PR = "r7" - -SRC_URI = "http://www.free-electrons.com/pub/mirror/devmem2.c;downloadfilename=devmem2-new.c \ - file://devmem2-fixups-2.patch;apply=yes;striplevel=0 \ - file://0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch" - -S = "${WORKDIR}" - -CFLAGS += "-DFORCE_STRICT_ALIGNMENT" - -python do_unpack_append() { - os.rename("devmem2-new.c", "devmem2.c") -} - -do_compile() { - ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS} -} - -do_install() { - install -d ${D}${bindir} - install devmem2 ${D}${bindir} -} - -SRC_URI[md5sum] = "e23f236e94be4c429aa1ceac0f01544b" -SRC_URI[sha256sum] = "3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639" diff --git a/meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch b/meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch deleted file mode 100644 index 2a57f29891..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 1360a907879dd24041797a3b709d49aeac2ab444 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denys@ti.com> -Date: Tue, 29 May 2018 16:55:42 -0400 -Subject: [PATCH] devmem.c: ensure word is 32-bit and add support for 64-bit - long - -Signed-off-by: Denys Dmytriyenko <denys@ti.com> ---- - devmem2.c | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) - -diff --git a/devmem2.c b/devmem2.c -index 5845381..68131b2 100644 ---- a/devmem2.c -+++ b/devmem2.c -@@ -39,6 +39,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <stdint.h> - #include <unistd.h> - #include <string.h> - #include <errno.h> -@@ -69,7 +70,7 @@ int main(int argc, char **argv) { - if(argc < 2) { - fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" - "\taddress : memory address to act upon\n" -- "\ttype : access operation type : [b]yte, [h]alfword, [w]ord\n" -+ "\ttype : access operation type : [b]yte, [h]alfword, [w]ord, [l]ong\n" - "\tdata : data to be written\n\n", - argv[0]); - exit(1); -@@ -103,9 +104,14 @@ int main(int argc, char **argv) { - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -- data_size = sizeof(unsigned long); -+ data_size = sizeof(uint32_t); - virt_addr = fixup_addr(virt_addr, data_size); -- read_result = *((unsigned long *) virt_addr); -+ read_result = *((uint32_t *) virt_addr); -+ break; -+ case 'l': -+ data_size = sizeof(uint64_t); -+ virt_addr = fixup_addr(virt_addr, data_size); -+ read_result = *((uint64_t *) virt_addr); - break; - default: - fprintf(stderr, "Illegal data type '%c'.\n", access_type); -@@ -129,9 +135,14 @@ int main(int argc, char **argv) { - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -- virt_addr = fixup_addr(virt_addr, sizeof(unsigned long)); -- *((unsigned long *) virt_addr) = write_val; -- read_result = *((unsigned long *) virt_addr); -+ virt_addr = fixup_addr(virt_addr, sizeof(uint32_t)); -+ *((uint32_t *) virt_addr) = write_val; -+ read_result = *((uint32_t *) virt_addr); -+ break; -+ case 'l': -+ virt_addr = fixup_addr(virt_addr, sizeof(uint64_t)); -+ *((uint64_t *) virt_addr) = write_val; -+ read_result = *((uint64_t *) virt_addr); - break; - } - sprintf(fmt_str, "Write at address 0x%%08lX (%%p): 0x%%0%dlX, " --- -2.7.4 - diff --git a/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch b/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch deleted file mode 100644 index 4517797fc7..0000000000 --- a/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- devmem2.c 2004-08-05 01:55:25.000000000 +0200 -+++ devmem2_modif.c 2011-01-13 15:48:37.798799784 +0100 -@@ -45,12 +45,16 @@ - #define MAP_SIZE 4096UL - #define MAP_MASK (MAP_SIZE - 1) - -+static inline void *fixup_addr(void *addr, size_t size); -+ - int main(int argc, char **argv) { - int fd; - void *map_base, *virt_addr; -- unsigned long read_result, writeval; -+ unsigned long read_result, write_val; - off_t target; - int access_type = 'w'; -+ char fmt_str[128]; -+ size_t data_size; - - if(argc < 2) { - fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n" -@@ -79,38 +83,51 @@ - virt_addr = map_base + (target & MAP_MASK); - switch(access_type) { - case 'b': -+ data_size = sizeof(unsigned char); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned char *) virt_addr); - break; - case 'h': -+ data_size = sizeof(unsigned short); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -+ data_size = sizeof(unsigned long); -+ virt_addr = fixup_addr(virt_addr, data_size); - read_result = *((unsigned long *) virt_addr); - break; - default: - fprintf(stderr, "Illegal data type '%c'.\n", access_type); - exit(2); - } -- printf("Value at address 0x%X (%p): 0x%X\n", target, virt_addr, read_result); -+ sprintf(fmt_str, "Read at address 0x%%08lX (%%p): 0x%%0%dlX\n", 2*data_size); -+ printf(fmt_str, (unsigned long)target, virt_addr, read_result); - fflush(stdout); - - if(argc > 3) { -- writeval = strtoul(argv[3], 0, 0); -+ write_val = strtoul(argv[3], 0, 0); - switch(access_type) { - case 'b': -- *((unsigned char *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned char)); -+ *((unsigned char *) virt_addr) = write_val; - read_result = *((unsigned char *) virt_addr); - break; - case 'h': -- *((unsigned short *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned short)); -+ *((unsigned short *) virt_addr) = write_val; - read_result = *((unsigned short *) virt_addr); - break; - case 'w': -- *((unsigned long *) virt_addr) = writeval; -+ virt_addr = fixup_addr(virt_addr, sizeof(unsigned long)); -+ *((unsigned long *) virt_addr) = write_val; - read_result = *((unsigned long *) virt_addr); - break; - } -- printf("Written 0x%X; readback 0x%X\n", writeval, read_result); -+ sprintf(fmt_str, "Write at address 0x%%08lX (%%p): 0x%%0%dlX, " -+ "readback 0x%%0%dlX\n", 2*data_size, 2*data_size); -+ printf(fmt_str, (unsigned long)target, virt_addr, -+ write_val, read_result); - fflush(stdout); - } - -@@ -119,3 +136,12 @@ - return 0; - } - -+static inline void *fixup_addr(void *addr, size_t size) -+{ -+#ifdef FORCE_STRICT_ALIGNMENT -+ unsigned long aligned_addr = (unsigned long)addr; -+ aligned_addr &= ~(size - 1); -+ addr = (void *)aligned_addr; -+#endif -+ return addr; -+} diff --git a/meta-oe/recipes-support/devmem2/devmem2_2.0.bb b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb new file mode 100644 index 0000000000..aee6bfe3da --- /dev/null +++ b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Simple program to read/write from/to any location in memory" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf986297cf" + +SRC_URI = "git://github.com/denix0/devmem2.git;protocol=https;branch=main" +SRCREV = "5b395a946894eb4f4ef5d07c80a50a88573a541e" + +S = "${WORKDIR}/git" + +CFLAGS += "-DFORCE_STRICT_ALIGNMENT" + +do_compile() { + ${CC} -o devmem2 devmem2.c ${CFLAGS} ${LDFLAGS} +} + +do_install() { + install -d ${D}${bindir} + install devmem2 ${D}${bindir} +} diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb index 4305e3b408..4641b0181a 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.11.bb @@ -1,6 +1,6 @@ require dfu-util_${PV}.bb -inherit native deploy +inherit deploy native DEPENDS = "libusb1-native" diff --git a/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb index 8a2ac69347..17547ca83f 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb @@ -1,13 +1,11 @@ DESCRIPTION = "USB Device Firmware Upgrade utility" -AUTHOR = "Harald Welte <laforge@openmoko.org>" HOMEPAGE = "http://dfu-util.sourceforge.net" SECTION = "devel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libusb1" SRC_URI = "http://dfu-util.sourceforge.net/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "233bb1e08ef4b405062445d84e28fde6" -SRC_URI[sha256sum] = "36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833" +SRC_URI[sha256sum] = "b4b53ba21a82ef7e3d4c47df2952adf5fa494f499b6b0b57c58c5d04ae8ff19e" inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/dhex/dhex_0.69.bb b/meta-oe/recipes-support/dhex/dhex_0.69.bb index cfbb2caaf6..3cc870481f 100644 --- a/meta-oe/recipes-support/dhex/dhex_0.69.bb +++ b/meta-oe/recipes-support/dhex/dhex_0.69.bb @@ -1,9 +1,10 @@ SUMMARY = "dhex is a hex editor that includes a diff mode" SECTION = "console/utils" +HOMEPAGE = "http://www.dettus.net/dhex/" DEPENDS = "ncurses" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README.txt;beginline=229;endline=241;md5=6f252a421b65bcecf624382ba3c899da" SRC_URI = "http://www.dettus.net/dhex/dhex_0.69.tar.gz" diff --git a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb index 9fcc278d35..6565097334 100644 --- a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb +++ b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb @@ -1,10 +1,10 @@ SUMMARY = "read temperature sensors in a 1-Wire net" SECTION = "util" DEPENDS = "libusb1" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" -SRC_URI = "git://github.com/bcl/digitemp" +SRC_URI = "git://github.com/bcl/digitemp;branch=master;protocol=https" SRCREV = "a162e63aad35358aab325388f3d5e88121606419" diff --git a/meta-oe/recipes-support/dool/dool_1.3.1.bb b/meta-oe/recipes-support/dool/dool_1.3.1.bb new file mode 100644 index 0000000000..b20f8b4015 --- /dev/null +++ b/meta-oe/recipes-support/dool/dool_1.3.1.bb @@ -0,0 +1,23 @@ +SUMMARY = "Dool is a Python3 compatible fork of Dstat" +DESCRIPTION = "Dool is a command line tool to monitor many aspects of your system: \ +CPU, Memory, Network, Load Average, etc. It also includes a robust plug-in architecture \ +to allow monitoring other system metrics." +HOMEPAGE = "http://dag.wiee.rs/home-made/dstat" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS += "asciidoc-native xmlto-native" +RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell python3-six python3-unixadmin" + +SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \ + " + +SRCREV = "30847c748483bc088549486292232d805b086b1f" + +S = "${WORKDIR}/git" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + + diff --git a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb new file mode 100644 index 0000000000..970844f982 --- /dev/null +++ b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb @@ -0,0 +1,26 @@ +SUMMARY = "driverctl is a device driver control utility for Linux" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +REQUIRED_DISTRO_FEATURES = "systemd" + +DEPENDS = "systemd" +RDEPENDS:${PN} += "bash bash-completion" + +SRC_URI = "git://gitlab.com/driverctl/driverctl.git;branch=master;protocol=https" +SRCREV = "2ba60536eb20ca0a6a751bd8b6501dba84ec45d3" + +S = "${WORKDIR}/git" + +inherit pkgconfig systemd features_check + +do_install () { + oe_runmake install DESTDIR=${D} +} + +FILES:${PN} += " \ + ${libdir} \ + ${datadir} \ + ${systemd_system_unitdir} \ +" + diff --git a/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch b/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch deleted file mode 100644 index 06a8498f3c..0000000000 --- a/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ce0528cb48666843fed2ad10ece5ecb0ac0b8cf8 Mon Sep 17 00:00:00 2001 -From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> -Date: Fri, 15 May 2020 12:38:49 +0900 -Subject: [PATCH] change dstat to python3. - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - dstat | 2 +- - examples/curstest | 2 +- - examples/devtest.py | 2 +- - examples/mmpipe.py | 2 +- - examples/mstat.py | 2 +- - examples/read.py | 2 +- - examples/tdbtest | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/dstat b/dstat -index 9359965..f250f06 100755 ---- a/dstat -+++ b/dstat -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - ### This program is free software; you can redistribute it and/or - ### modify it under the terms of the GNU General Public License -diff --git a/examples/curstest b/examples/curstest -index afc4e70..d720cca 100755 ---- a/examples/curstest -+++ b/examples/curstest -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - import curses, sys - - #c = curses.wrapper(s) -diff --git a/examples/devtest.py b/examples/devtest.py -index 0e9e969..e53babd 100755 ---- a/examples/devtest.py -+++ b/examples/devtest.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - import sys - sys.path.insert(0, '/usr/share/dstat/') -diff --git a/examples/mmpipe.py b/examples/mmpipe.py -index 5c93567..f91515f 100755 ---- a/examples/mmpipe.py -+++ b/examples/mmpipe.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - import select, sys, os - - def readpipe(file, tmout = 0.001): -diff --git a/examples/mstat.py b/examples/mstat.py -index abf4d07..ac157e4 100755 ---- a/examples/mstat.py -+++ b/examples/mstat.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - ### Example2: simple sub-second monitor (ministat) - -diff --git a/examples/read.py b/examples/read.py -index 556b7ae..a925109 100755 ---- a/examples/read.py -+++ b/examples/read.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - ### Example 1: Direct accessing stats - ### This is a quick example showing how you can access dstat data -diff --git a/examples/tdbtest b/examples/tdbtest -index 528a8ea..ae7fef9 100755 ---- a/examples/tdbtest -+++ b/examples/tdbtest -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - import sys, tdb - - db = tdb.tdb('/var/cache/samba/connections.tdb') --- -2.17.1 - diff --git a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-oe/recipes-support/dstat/dstat_0.7.4.bb deleted file mode 100644 index 74af54ca53..0000000000 --- a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "versatile resource statics tool" -DESCRIPTION = "Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat. \ -Dstat overcomes some of their limitations and adds some extra features, more counters \ -and flexibility. Dstat is handy for monitoring systems during performance tuning tests, \ -benchmarks or troubleshooting." -HOMEPAGE = "http://dag.wiee.rs/home-made/dstat" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS += "asciidoc-native xmlto-native" - -SRC_URI = "git://github.com/dagwieers/dstat.git \ - file://0001-change-dstat-to-python3.patch \ - " - -SRCREV = "6f5db0aed26bf8cf2700d4ffe90a9bd3436ac728" - -S = "${WORKDIR}/git" - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -RDEPENDS_${PN} += "python3-core python3-misc python3-resource python3-shell python3-unixadmin" diff --git a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb new file mode 100644 index 0000000000..6eaec800ca --- /dev/null +++ b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Decode EDID data in human-readable format" +DESCRIPTION = "edid-decode decodes EDID monitor description data in human-readable format." +HOMEPAGE = "https://hverkuil.home.xs4all.nl/edid-decode/edid-decode.html" + +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" + +SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" +SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" +PV = "0.0+git" +S = "${WORKDIR}/git" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/eject/eject/eject-timeout.patch b/meta-oe/recipes-support/eject/eject/eject-timeout.patch index de8146f32a..4511e17069 100644 --- a/meta-oe/recipes-support/eject/eject/eject-timeout.patch +++ b/meta-oe/recipes-support/eject/eject/eject-timeout.patch @@ -1,6 +1,6 @@ allow a longer timeout -Upstream-Status: Backport +Upstream-Status: Backport Signed-off-by: Morgan Little <morgan.little@windriver.com> diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb index dec2e7ab4c..dd5489e7db 100644 --- a/meta-oe/recipes-support/eject/eject_2.1.5.bb +++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Eject allows removable media (typically a CD-ROM, floppy disk, tape, or JAZ or ZIP disk) to be ejected under software control." HOMEPAGE = "http://eject.sourceforge.net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" inherit autotools gettext update-alternatives @@ -18,9 +18,8 @@ SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e S = "${WORKDIR}/${BPN}" -PR = "r1" -do_compile_prepend() { +do_compile:prepend() { # PO subdir must be in build directory if [ ! ${S} = ${B} ]; then mkdir -p ${B}/po @@ -28,11 +27,11 @@ do_compile_prepend() { fi } -ALTERNATIVE_${PN} = "volname eject" +ALTERNATIVE:${PN} = "volname eject" ALTERNATIVE_LINK_NAME[volname] = "${bindir}/volname" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" ALTERNATIVE_PRIORITY[volname] = "100" ALTERNATIVE_PRIORITY[eject] = "100" -ALTERNATIVE_${PN}-doc = "eject.1" +ALTERNATIVE:${PN}-doc = "eject.1" ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" diff --git a/meta-oe/recipes-support/emacs/emacs_27.1.bb b/meta-oe/recipes-support/emacs/emacs_29.1.bb index 9b3adcf9d8..5cbe4551c0 100644 --- a/meta-oe/recipes-support/emacs/emacs_27.1.bb +++ b/meta-oe/recipes-support/emacs/emacs_29.1.bb @@ -1,44 +1,77 @@ SUMMARY = "Emacs is the extensible, customizable, self-documenting real-time display editor" HOMEPAGE = "https://www.gnu.org/software/emacs/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "https://ftp.gnu.org/pub/gnu/emacs/emacs-${PV}.tar.xz" +SRC_URI = "https://ftp.gnu.org/pub/gnu/emacs/emacs-${PV}.tar.xz \ + " +SRC_URI:append:class-target = " \ + file://use-emacs-native-tools-for-cross-compiling.patch \ + file://avoid-running-host-binaries-for-sanity.patch \ +" -SRC_URI_append_class-target = " file://usemake-docfile-native.patch" +SRC_URI[sha256sum] = "d2f881a5cc231e2f5a03e86f4584b0438f83edd7598a09d24a21bd8d003e2e01" -SRC_URI[sha256sum] = "4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41" +CVE_STATUS[CVE-2007-6109] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." PACKAGECONFIG[gnutls] = "--with-gnutls=yes,--with-gnutls=no,gnutls" PACKAGECONFIG[kerberos] = "--with-kerberos=yes,--with-kerberos=no,krb5" PACKAGECONFIG[libgmp] = "--with-libgmp=yes,--with-libgmp=no,gmp" +PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" PACKAGECONFIG ??= "gnutls kerberos libgmp" # We could use --without-all but its better to # split it into several packages (size of minimal doesnt change) -EXTRA_OECONF = " --with-x=no --with-dumping=none" +EXTRA_OECONF = " --with-x=no --with-dumping=none --disable-build-details" + +# Disable seccomp, as its a default dependency for gnutls but it doesnt work when cross-compiling emacs +EXTRA_OECONF:append = " ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'ac_cv_have_decl_SECCOMP_FILTER_FLAG_TSYNC=no ac_cv_have_decl_SECCOMP_SET_MODE_FILTER=no', '', d)}" + DEPENDS = "ncurses" -DEPENDS_append_class-target = " emacs-native" +DEPENDS:append:class-target = " emacs-native" -inherit autotools mime-xdg +inherit autotools mime-xdg pkgconfig -do_compile_class-native (){ +# Create the required native tools for the target build +do_compile:class-native (){ cd ${B}/lib-src oe_runmake make-docfile oe_runmake make-fingerprint + cd ${B}/src + oe_runmake bootstrap-emacs } -do_install_class-native(){ + +do_install:class-native(){ install -d ${D}${bindir} install -m 755 ${B}/lib-src/make-docfile ${D}/${bindir}/ install -m 755 ${B}/lib-src/make-fingerprint ${D}/${bindir}/ + install -m 755 ${B}/src/bootstrap-emacs ${D}/${bindir}/ +} + +do_compile:prepend:class-target () { + # export EMACS env variables for the native tools to use to allow calling bootstrap-emacs + export EMACSLOADPATH=${S}/lisp + export EMACSDATA=${S}/etc +} + + +do_install:prepend:class-target(){ + # export EMACS env variables for the native tools to use to allow calling bootstrap-emacs + export EMACSLOADPATH=${S}/lisp + export EMACSDATA=${S}/etc } +# Remove build host references to avoid target pollution +do_compile:prepend () { + sed -i -e 's|${TMPDIR}||g' ${B}/src/config.h + sed -i -e 's|${B}||g' ${B}/src/epaths.h +} -do_install_append(){ +do_install:append(){ # Delete systemd stuff, extend using DISTRO_FEATURES? rm -rf ${D}/${libdir} # Extra stuff which isnt needed @@ -49,7 +82,6 @@ do_install_append(){ chown -R root:root ${D}${datadir} } - # Use a similar strategy to how we build python: # Create three packages # minimal - A working lisp based text editor @@ -58,201 +90,219 @@ do_install_append(){ # The lists of files are long but are worth it # Installing "emacs" installs the base package PACKAGE_BEFORE_PN = "${PN}-minimal ${PN}-base ${PN}-full" -RPROVIDES_${PN}-base = "${PN}" -RDEPENDS_${PN}-base_class-target = "${PN}-minimal" -RDEPENDS_${PN}-full_class-target = "${PN}" +RPROVIDES:${PN}-base = "${PN}" +RDEPENDS:${PN}-base:class-target = "${PN}-minimal" +RDEPENDS:${PN}-full:class-target = "${PN}" # A minimal version of emacs that works -FILES_${PN}-minimal = " \ - ${datadir}/${BPN}/${PV}/lisp/loadup.el \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/byte-run.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/backquote.elc \ - ${datadir}/${BPN}/${PV}/lisp/subr.elc \ - ${datadir}/${BPN}/${PV}/lisp/version.elc \ - ${datadir}/${BPN}/${PV}/lisp/widget.elc \ - ${datadir}/${BPN}/${PV}/lisp/custom.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map-ynp.elc \ - ${datadir}/${BPN}/${PV}/lisp/international/mule.elc \ - ${datadir}/${BPN}/${PV}/lisp/international/mule-conf.elc \ - ${datadir}/${BPN}/${PV}/lisp/env.elc \ - ${datadir}/${BPN}/${PV}/lisp/format.elc \ +# These are kept sorted in alphabetical order +FILES:${PN}-minimal = " \ + ${bindir}/emacs* \ + ${datadir}/${BPN}/${PV}/etc/charsets/ \ + ${datadir}/${BPN}/${PV}/lisp/abbrev.elc \ ${datadir}/${BPN}/${PV}/lisp/bindings.elc \ - ${datadir}/${BPN}/${PV}/lisp/window.elc \ - ${datadir}/${BPN}/${PV}/lisp/files.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/macroexp.elc \ - ${datadir}/${BPN}/${PV}/lisp/cus-face.elc \ - ${datadir}/${BPN}/${PV}/lisp/faces.elc \ + ${datadir}/${BPN}/${PV}/lisp/buff-menu.elc \ ${datadir}/${BPN}/${PV}/lisp/button.elc \ - ${datadir}/${BPN}/${PV}/lisp/loaddefs.el \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/nadvice.elc \ + ${datadir}/${BPN}/${PV}/lisp/case-table.elc \ + ${datadir}/${BPN}/${PV}/lisp/composite.elc \ + ${datadir}/${BPN}/${PV}/lisp/cus-face.elc \ + ${datadir}/${BPN}/${PV}/lisp/cus-start.elc \ + ${datadir}/${BPN}/${PV}/lisp/custom.elc \ + ${datadir}/${BPN}/${PV}/lisp/disp-table.elc \ + ${datadir}/${BPN}/${PV}/lisp/electric.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/backquote.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/byte-opt.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/byte-run.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/bytecomp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cconv.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-generic.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-lib.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-macs.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-preloaded.elc \ - ${datadir}/${BPN}/${PV}/lisp/obarray.elc \ - ${datadir}/${BPN}/${PV}/lisp/abbrev.elc \ - ${datadir}/${BPN}/${PV}/lisp/simple.elc \ - ${datadir}/${BPN}/${PV}/lisp/jka-cmpr-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/debug-early.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/easy-mmode.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/easymenu.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eldoc.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/float-sup.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/gv.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/inline.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/macroexp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map-ynp.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/nadvice.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/oclosure.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/pcase.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/regexp-opt.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/rmc.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/rx.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/shorthands.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/subr-x.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/syntax.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/tabulated-list.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/timer.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/vc/warnings.elc \ + ${datadir}/${BPN}/${PV}/lisp/env.elc \ ${datadir}/${BPN}/${PV}/lisp/epa-hook.elc \ - ${datadir}/${BPN}/${PV}/lisp/international/mule-cmds.elc \ - ${datadir}/${BPN}/${PV}/lisp/case-table.elc \ - ${datadir}/${BPN}/${PV}/lisp/international/charprop.el \ + ${datadir}/${BPN}/${PV}/lisp/facemenu.elc \ + ${datadir}/${BPN}/${PV}/lisp/faces.elc \ + ${datadir}/${BPN}/${PV}/lisp/files.elc \ + ${datadir}/${BPN}/${PV}/lisp/font-core.elc \ + ${datadir}/${BPN}/${PV}/lisp/font-lock.elc \ + ${datadir}/${BPN}/${PV}/lisp/format.elc \ + ${datadir}/${BPN}/${PV}/lisp/frame.elc \ + ${datadir}/${BPN}/${PV}/lisp/help.elc \ + ${datadir}/${BPN}/${PV}/lisp/image.elc \ + ${datadir}/${BPN}/${PV}/lisp/indent.elc \ ${datadir}/${BPN}/${PV}/lisp/international/characters.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/charprop.el \ ${datadir}/${BPN}/${PV}/lisp/international/charscript.elc \ - ${datadir}/${BPN}/${PV}/lisp/composite.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/cp51932.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/emoji-zwj.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/eucjp-ms.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/iso-transl.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule-cmds.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule-conf.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/mule.elc \ + ${datadir}/${BPN}/${PV}/lisp/international/uni*.el \ + ${datadir}/${BPN}/${PV}/lisp/isearch.elc \ + ${datadir}/${BPN}/${PV}/lisp/jit-lock.elc \ + ${datadir}/${BPN}/${PV}/lisp/jka-cmpr-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/jka-compr.elc \ + ${datadir}/${BPN}/${PV}/lisp/keymap.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/burmese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/cham.elc \ ${datadir}/${BPN}/${PV}/lisp/language/chinese.elc \ ${datadir}/${BPN}/${PV}/lisp/language/cyrillic.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/indian.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/sinhala.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/czech.elc \ ${datadir}/${BPN}/${PV}/lisp/language/english.elc \ ${datadir}/${BPN}/${PV}/lisp/language/ethiopic.elc \ ${datadir}/${BPN}/${PV}/lisp/language/european.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/czech.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/slovak.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/romanian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/georgian.elc \ ${datadir}/${BPN}/${PV}/lisp/language/greek.elc \ ${datadir}/${BPN}/${PV}/lisp/language/hebrew.elc \ - ${datadir}/${BPN}/${PV}/lisp/international/cp51932.elc \ - ${datadir}/${BPN}/${PV}/lisp/international/eucjp-ms.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/indian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/indonesian.elc \ ${datadir}/${BPN}/${PV}/lisp/language/japanese.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/khmer.elc \ ${datadir}/${BPN}/${PV}/lisp/language/korean.elc \ ${datadir}/${BPN}/${PV}/lisp/language/lao.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/misc-lang.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/philippine.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/romanian.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/sinhala.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/slovak.elc \ ${datadir}/${BPN}/${PV}/lisp/language/tai-viet.elc \ ${datadir}/${BPN}/${PV}/lisp/language/thai.elc \ ${datadir}/${BPN}/${PV}/lisp/language/tibetan.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/vietnamese.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/misc-lang.elc \ ${datadir}/${BPN}/${PV}/lisp/language/utf-8-lang.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/georgian.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/khmer.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/burmese.elc \ - ${datadir}/${BPN}/${PV}/lisp/language/cham.elc \ - ${datadir}/${BPN}/${PV}/lisp/indent.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-generic.elc \ + ${datadir}/${BPN}/${PV}/lisp/language/vietnamese.elc \ + ${datadir}/${BPN}/${PV}/lisp/ldefs-boot.el \ + ${datadir}/${BPN}/${PV}/lisp/loaddefs.el \ + ${datadir}/${BPN}/${PV}/lisp/loadup.el \ + ${datadir}/${BPN}/${PV}/lisp/menu-bar.elc \ ${datadir}/${BPN}/${PV}/lisp/minibuffer.elc \ - ${datadir}/${BPN}/${PV}/lisp/frame.elc \ - ${datadir}/${BPN}/${PV}/lisp/startup.elc \ - ${datadir}/${BPN}/${PV}/lisp/term/tty-colors.elc \ - ${datadir}/${BPN}/${PV}/lisp/font-core.elc \ - ${datadir}/${BPN}/${PV}/lisp/facemenu.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/syntax.elc \ - ${datadir}/${BPN}/${PV}/lisp/font-lock.elc \ - ${datadir}/${BPN}/${PV}/lisp/jit-lock.elc \ ${datadir}/${BPN}/${PV}/lisp/mouse.elc \ - ${datadir}/${BPN}/${PV}/lisp/select.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/timer.elc \ - ${datadir}/${BPN}/${PV}/lisp/isearch.elc \ + ${datadir}/${BPN}/${PV}/lisp/newcomment.elc \ + ${datadir}/${BPN}/${PV}/lisp/obarray.elc \ + ${datadir}/${BPN}/${PV}/lisp/paren.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/elisp-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/prog-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/register.elc \ + ${datadir}/${BPN}/${PV}/lisp/replace.elc \ ${datadir}/${BPN}/${PV}/lisp/rfn-eshadow.elc \ - ${datadir}/${BPN}/${PV}/lisp/menu-bar.elc \ + ${datadir}/${BPN}/${PV}/lisp/select.elc \ + ${datadir}/${BPN}/${PV}/lisp/simple.elc \ + ${datadir}/${BPN}/${PV}/lisp/startup.elc \ + ${datadir}/${BPN}/${PV}/lisp/subr.elc \ ${datadir}/${BPN}/${PV}/lisp/tab-bar.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp.elc \ + ${datadir}/${BPN}/${PV}/lisp/term/tty-colors.elc \ + ${datadir}/${BPN}/${PV}/lisp/term/xterm.elc \ + ${datadir}/${BPN}/${PV}/lisp/textmodes/fill.elc \ ${datadir}/${BPN}/${PV}/lisp/textmodes/page.elc \ - ${datadir}/${BPN}/${PV}/lisp/register.elc \ ${datadir}/${BPN}/${PV}/lisp/textmodes/paragraphs.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/prog-mode.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/lisp-mode.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/elisp-mode.elc \ ${datadir}/${BPN}/${PV}/lisp/textmodes/text-mode.elc \ - ${datadir}/${BPN}/${PV}/lisp/textmodes/fill.elc \ - ${datadir}/${BPN}/${PV}/lisp/newcomment.elc \ - ${datadir}/${BPN}/${PV}/lisp/replace.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/tabulated-list.elc \ - ${datadir}/${BPN}/${PV}/lisp/buff-menu.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/float-sup.elc \ - ${datadir}/${BPN}/${PV}/lisp/vc/vc-hooks.elc \ - ${datadir}/${BPN}/${PV}/lisp/vc/ediff-hook.elc \ - ${datadir}/${BPN}/${PV}/lisp/uniquify.elc \ - ${datadir}/${BPN}/${PV}/lisp/electric.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eldoc.elc \ - ${datadir}/${BPN}/${PV}/lisp/cus-start.elc \ + ${datadir}/${BPN}/${PV}/lisp/thingatpt.elc \ ${datadir}/${BPN}/${PV}/lisp/tooltip.elc \ - ${datadir}/${BPN}/${PV}/lisp/simple.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/regexp-opt.elc \ - ${datadir}/${BPN}/${PV}/lisp/term/xterm.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/bytecomp.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cconv.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/gv.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/byte-opt.elc \ - ${datadir}/${BPN}/${PV}/lisp/image.elc \ - ${datadir}/${BPN}/${PV}/lisp/ldefs-boot.el \ - ${datadir}/${BPN}/${PV}/lisp/help.elc \ - ${datadir}/${BPN}/${PV}/lisp/international/uni*.el \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/vc/warnings.elc \ - ${datadir}/${BPN}/${PV}/etc/charsets/ \ - ${bindir}/emacs* \ + ${datadir}/${BPN}/${PV}/lisp/uniquify.elc \ + ${datadir}/${BPN}/${PV}/lisp/vc/ediff-hook.elc \ + ${datadir}/${BPN}/${PV}/lisp/vc/vc-hooks.elc \ + ${datadir}/${BPN}/${PV}/lisp/version.elc \ + ${datadir}/${BPN}/${PV}/lisp/widget.elc \ + ${datadir}/${BPN}/${PV}/lisp/window.elc \ ${prefix}/libexec \ " - # What works for "most" is relative, but this can be easily extended if needed -FILES_${PN}-base = " \ - ${datadir}/${BPN}/${PV}/etc/srecode \ +FILES:${PN}-base = " \ ${datadir}/${BPN}/${PV}/etc/e \ ${datadir}/${BPN}/${PV}/etc/forms \ + ${datadir}/${BPN}/${PV}/etc/srecode \ + ${datadir}/${BPN}/${PV}/etc/themes/adwaita-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/deeper-blue-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/light-blue-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/misterioso-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/tango-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/wheatgrass-theme.el \ + ${datadir}/${BPN}/${PV}/etc/themes/wombat-theme.el \ + ${datadir}/${BPN}/${PV}/lisp/ansi-color.elc \ + ${datadir}/${BPN}/${PV}/lisp/auth-source.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/iso8601.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/parse-time.elc \ + ${datadir}/${BPN}/${PV}/lisp/calendar/time-date.elc \ ${datadir}/${BPN}/${PV}/lisp/cedet \ - ${datadir}/${BPN}/${PV}/site-lisp/ \ - ${datadir}/${BPN}/${PV}/lisp/subdirs.el \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-mode.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-defs.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-vars.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-engine.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-styles.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-fonts.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-cmds.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-align.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-menus.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-guess.elc \ + ${datadir}/${BPN}/${PV}/lisp/comint.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-lib.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-macs.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/pcase.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/inline.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/cl-seq.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/easymenu.elc \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/python* \ - ${datadir}/${BPN}/${PV}/lisp/ansi-color.elc \ - ${datadir}/${BPN}/${PV}/lisp/comint.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eieio-core.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eieio.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/inline.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/pcase.elc \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/ring.elc \ + ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/smie.elc \ + ${datadir}/${BPN}/${PV}/lisp/files-x.elc \ + ${datadir}/${BPN}/${PV}/lisp/format-spec.elc \ ${datadir}/${BPN}/${PV}/lisp/json.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/map.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/seq.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/subr-x.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/seq.elc \ + ${datadir}/${BPN}/${PV}/lisp/ls-lisp.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-compat.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-integration.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/tramp-loaddefs.el \ ${datadir}/${BPN}/${PV}/lisp/net/tramp-sh.elc \ ${datadir}/${BPN}/${PV}/lisp/net/tramp.elc \ - ${datadir}/${BPN}/${PV}/lisp/net/tramp-compat.elc \ - ${datadir}/${BPN}/${PV}/lisp/auth-source.elc \ + ${datadir}/${BPN}/${PV}/lisp/net/trampver.elc \ ${datadir}/${BPN}/${PV}/lisp/password-cache.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eieio.elc \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/eieio-core.elc \ - ${datadir}/${BPN}/${PV}/lisp/format-spec.elc \ - ${datadir}/${BPN}/${PV}/lisp/ls-lisp.elc \ - ${datadir}/${BPN}/${PV}/lisp/calendar/parse-time.elc \ - ${datadir}/${BPN}/${PV}/lisp/calendar/iso8601.elc \ - ${datadir}/${BPN}/${PV}/lisp/calendar/time-date.elc \ - ${datadir}/${BPN}/${PV}/lisp/shell.elc \ ${datadir}/${BPN}/${PV}/lisp/pcomplete.elc \ - ${datadir}/${BPN}/${PV}/lisp/net/tramp-integration.elc \ - ${datadir}/${BPN}/${PV}/lisp/files-x.elc \ - ${datadir}/${BPN}/${PV}/lisp/net/trampver.elc \ - ${datadir}/${BPN}/${PV}/lisp/net/tramp-loaddefs.el \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/*perl* \ - ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/smie.elc \ ${datadir}/${BPN}/${PV}/lisp/progmodes/*asm* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/*perl* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-align.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-cmds.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-defs.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-engine.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-fonts.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-guess.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-menus.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-mode.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-styles.elc \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/cc-vars.elc \ ${datadir}/${BPN}/${PV}/lisp/progmodes/cpp* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/executable* \ ${datadir}/${BPN}/${PV}/lisp/progmodes/make* \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/sh-script* \ - ${datadir}/${BPN}/${PV}/etc/themes/adwaita-theme.el \ - ${datadir}/${BPN}/${PV}/etc/themes/wheatgrass-theme.el \ - ${datadir}/${BPN}/${PV}/etc/themes/deeper-blue-theme.el \ - ${datadir}/${BPN}/${PV}/etc/themes/light-blue-theme.el \ - ${datadir}/${BPN}/${PV}/etc/themes/misterioso-theme.el \ - ${datadir}/${BPN}/${PV}/etc/themes/tango-theme.el \ - ${datadir}/${BPN}/${PV}/etc/themes/wombat-theme.el \ ${datadir}/${BPN}/${PV}/lisp/progmodes/prog* \ - ${datadir}/${BPN}/${PV}/lisp/progmodes/executable* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/python* \ + ${datadir}/${BPN}/${PV}/lisp/progmodes/sh-script* \ + ${datadir}/${BPN}/${PV}/lisp/shell.elc \ + ${datadir}/${BPN}/${PV}/lisp/subdirs.el \ + ${datadir}/${BPN}/${PV}/site-lisp/ \ " # Restore FILES for the full package to catch everything left -FILES_${PN}-full = "${FILES_${PN}}" -FILES_${PN}-full_append = " ${datadir}/icons" +FILES:${PN}-full = "${FILES:${PN}}" +FILES:${PN}-full:append = " ${datadir}/icons" # The following does NOT build a native emacs. diff --git a/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch b/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch new file mode 100644 index 0000000000..719ee4bce9 --- /dev/null +++ b/meta-oe/recipes-support/emacs/files/avoid-running-host-binaries-for-sanity.patch @@ -0,0 +1,38 @@ +Upstream-Status: Inappropriate [OE-Specific] + +Emacs introduced a sanity-check for the build artifacts, where it +runs the newly built emacs to perform some checks. + +This is not going to work for us since we are cross-compiling, +we need to avoid running target binaries on the host + +Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org> + +Index: emacs-29.1/Makefile.in +=================================================================== +--- emacs-29.1.orig/Makefile.in ++++ emacs-29.1/Makefile.in +@@ -416,19 +416,10 @@ advice-on-failure: + @exit ${exit-status} + + sanity-check: +- @[ -f .no-advice-on-failure ] && exit 0; true +- @v=$$(src/emacs${EXEEXT} --batch --eval \ +- '(progn (defun f (n) (if (= 0 n) 1 (* n (f (- n 1))))) (princ (f 10)))' \ +- 2> /dev/null); \ +- [ "X$$v" = "X3628800" ] && exit 0; \ +- echo >&2 '***'; \ +- echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \ +- echo >&2 '***'; \ +- cat Makefile | \ +- sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q;};' | \ +- sed 's/^# /*** /' | grep -v '^\*\*\* ADVICE-ON-FAILURE-' >&2; \ +- echo >&2 '***'; \ +- exit 1 ++# The Makefile will try to call the newly built emacs to perform some checks ++# this is not going to work since it was (probably) built for a different architecture. ++# Avoid calling target binaries from the host and simply assume our build artifacts work. ++ exit 0 + + .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 epaths-force-ns-self-contained etc-emacsver + diff --git a/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch b/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch new file mode 100644 index 0000000000..df5e4bd258 --- /dev/null +++ b/meta-oe/recipes-support/emacs/files/use-emacs-native-tools-for-cross-compiling.patch @@ -0,0 +1,106 @@ +Upstream-Status: Inappropriate [OE-Specific] + +When building emacs, it builds some tools for the HOST +that are then used to build for target, such as +make-fingerprint and make-docfile and bootstrap-emacs, +this needs to be adapted to be used by bitbake, otherwise +the compiled executables arent compatible with the HOST. + +We also need to be able to use emacs env variables to +control how bootstrap-emacs is used when cross-compiling. + +Use the above mentioned tools provided by the native +version of the recipe instead. + +Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> + +Index: emacs-29.1/src/Makefile.in +=================================================================== +--- emacs-29.1.orig/src/Makefile.in ++++ emacs-29.1/src/Makefile.in +@@ -1,3 +1,4 @@ ++ + ### @configure_input@ + + # Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2023 Free Software +@@ -508,7 +509,7 @@ ifeq ($(CHECK_STRUCTS),true) + pdumper.o: dmpstruct.h + endif + dmpstruct.h: $(srcdir)/dmpstruct.awk +-dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) ++dmpstruct.h: $(dmpstruct_headers) + $(AM_V_GEN)POSIXLY_CORRECT=1 awk -f $(srcdir)/dmpstruct.awk \ + $(dmpstruct_headers) > $@ + +@@ -610,8 +611,7 @@ SYSTEM_TYPE = @SYSTEM_TYPE@ + ## Strictly speaking, emacs does not depend directly on all of $lisp, + ## since not all pieces are used on all platforms. But DOC depends + ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. +-emacs$(EXEEXT): temacs$(EXEEXT) \ +- lisp.mk $(etc)/DOC $(lisp) \ ++emacs$(EXEEXT): lisp.mk $(etc)/DOC $(lisp) \ + $(lispsource)/international/charprop.el ${charsets} + ifeq ($(SYSTEM_TYPE),cygwin) + find ${top_builddir} -name '*.eln' | rebase -v -O -T - +@@ -654,7 +654,7 @@ endif + $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(doc_obj) + $(AM_V_GEN)$(MKDIR_P) $(etc) + $(AM_V_at)rm -f $(etc)/DOC +- $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ ++ make-docfile -d $(srcdir) \ + $(SOME_MACHINE_OBJECTS) $(doc_obj) > $(etc)/DOC + + $(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \ +@@ -671,7 +671,7 @@ buildobj.h: Makefile + GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) + + gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) +- $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(doc_obj) > globals.tmp ++ make-docfile -d $(srcdir) -g $(doc_obj) > globals.tmp + $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h + $(AM_V_at)echo timestamp > $@ + +@@ -685,7 +685,7 @@ $(LIBEGNU_ARCHIVE): $(config_h) + $(MAKE) -C $(dir $@) all + + ifeq ($(HAVE_PDUMPER),yes) +-MAKE_PDUMPER_FINGERPRINT = $(libsrc)/make-fingerprint$(EXEEXT) ++MAKE_PDUMPER_FINGERPRINT = make-fingerprint + else + MAKE_PDUMPER_FINGERPRINT = + endif +Index: emacs-29.1/lisp/Makefile.in +=================================================================== +--- emacs-29.1.orig/lisp/Makefile.in ++++ emacs-29.1/lisp/Makefile.in +@@ -53,7 +53,7 @@ FIND_DELETE = @FIND_DELETE@ + # We never change directory before running Emacs, so a relative file + # name is fine, and makes life easier. If we need to change + # directory, we can use emacs --chdir. +-EMACS = ../src/emacs${EXEEXT} ++EMACS = bootstrap-emacs + + # Command line flags for Emacs. + +@@ -109,7 +109,7 @@ MAIN_FIRST = ./emacs-lisp/eieio.el ./ema + ./org/oc.el ./org/ol.el ./emacs-lisp/cl-lib.el + + # Prevent any settings in the user environment causing problems. +-unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++unexport EMACSDOC EMACSPATH + + # The actual Emacs command run in the targets below. + emacs = '$(EMACS)' $(EMACSOPT) +Index: emacs-29.1/Makefile.in +=================================================================== +--- emacs-29.1.orig/Makefile.in ++++ emacs-29.1/Makefile.in +@@ -328,7 +328,7 @@ GLIB_COMPILE_SCHEMAS = glib-compile-sche + TRANSFORM = @program_transform_name@ + + # Prevent any settings in the user environment causing problems. +-unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++unexport EMACSDOC EMACSPATH + + # What emacs should be called when installed. + EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` diff --git a/meta-oe/recipes-support/emacs/files/usemake-docfile-native.patch b/meta-oe/recipes-support/emacs/files/usemake-docfile-native.patch deleted file mode 100644 index cc0b05c792..0000000000 --- a/meta-oe/recipes-support/emacs/files/usemake-docfile-native.patch +++ /dev/null @@ -1,85 +0,0 @@ -Upstream-Status: Inappropriate [OE-Specific] - -When building emacs, it builds some tools for the HOST -that are then used to build for target, such as -make-fingerprint and make-docfile, this needs to be -adapted to be used by bitbake, otherwise the compiled -executables arent compatible with the HOST. - -Use the above mentioned tools provided by the native -version of the recipe instead. - -Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> - -Index: emacs-27.1/src/Makefile.in -=================================================================== ---- emacs-27.1.orig/src/Makefile.in -+++ emacs-27.1/src/Makefile.in -@@ -472,7 +472,7 @@ ifeq ($(CHECK_STRUCTS),true) - pdumper.o: dmpstruct.h - endif - dmpstruct.h: $(srcdir)/dmpstruct.awk --dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) -+dmpstruct.h: $(dmpstruct_headers) - $(AM_V_GEN)POSIXLY_CORRECT=1 awk -f $(srcdir)/dmpstruct.awk \ - $(dmpstruct_headers) > $@ - -@@ -566,8 +566,7 @@ ${lispintdir}/characters.elc: ${charscri - ## Strictly speaking, emacs does not depend directly on all of $lisp, - ## since not all pieces are used on all platforms. But DOC depends - ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. --emacs$(EXEEXT): temacs$(EXEEXT) \ -- lisp.mk $(etc)/DOC $(lisp) \ -+emacs$(EXEEXT): lisp.mk $(etc)/DOC $(lisp) \ - $(lispsource)/international/charprop.el ${charsets} - ifeq ($(DUMPING),unexec) - LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump -@@ -596,15 +595,15 @@ endif - ## for the first time, this prevents any variation between configurations - ## in the contents of the DOC file. - ## --$(etc)/DOC: lisp.mk $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) -+$(etc)/DOC: lisp.mk $(obj) $(lisp) - $(AM_V_GEN)$(MKDIR_P) $(etc) - $(AM_V_at)rm -f $(etc)/DOC -- $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ -+ make-docfile -d $(srcdir) \ - $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC -- $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \ -+ make-docfile -a $(etc)/DOC -d $(lispsource) \ - $(shortlisp) - --$(libsrc)/make-docfile$(EXEEXT) $(libsrc)/make-fingerprint$(EXEEXT): \ -+$(libsrc)/make-fingerprint$(EXEEXT): \ - $(lib)/libgnu.a - $(MAKE) -C $(dir $@) $(notdir $@) - -@@ -622,8 +621,8 @@ am__v_GLOBALS_ = $(am__v_GLOBALS_@AM_DEF - am__v_GLOBALS_0 = @echo " GEN " globals.h; - am__v_GLOBALS_1 = - --gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) -- $(AM_V_GLOBALS)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > globals.tmp -+gl-stamp: $(GLOBAL_SOURCES) -+ make-docfile -d $(srcdir) -g $(obj) > globals.tmp - $(AM_V_at)$(top_srcdir)/build-aux/move-if-change globals.tmp globals.h - $(AM_V_at)echo timestamp > $@ - -@@ -637,7 +636,7 @@ $(LIBEGNU_ARCHIVE): $(config_h) - $(MAKE) -C $(dir $@) all - - ifeq ($(HAVE_PDUMPER),yes) -- MAKE_PDUMPER_FINGERPRINT = $(libsrc)/make-fingerprint$(EXEEXT) -+ MAKE_PDUMPER_FINGERPRINT = make-fingerprint - else - MAKE_PDUMPER_FINGERPRINT = - endif -@@ -647,7 +646,7 @@ endif - ## This goes on to affect various things, and the emacs binary fails - ## to start if Vinstallation_directory has the wrong value. - temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(EMACSRES) \ -- $(charsets) $(charscript) $(MAKE_PDUMPER_FINGERPRINT) -+ $(charsets) $(charscript) - $(AM_V_CCLD)$(CC) -o $@.tmp \ - $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ - $(ALLOBJS) $(LIBEGNU_ARCHIVE) $(W32_RES_LINK) $(LIBES) diff --git a/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch b/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch new file mode 100644 index 0000000000..32fa239084 --- /dev/null +++ b/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch @@ -0,0 +1,30 @@ +From c6a59d512706978e8c67f9a2d84ec650f8763368 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 May 2023 18:02:52 -0700 +Subject: [PATCH] Do not use $MKTEMP_PROG in cross-build + +$MKTEMP_PROG points to native location which could be absolute path that +wont exist on target rootfs. Therefore use it from PATH + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4852a2f..d23b384 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -186,7 +186,7 @@ ye_PATH_LOCALE_ALIAS + + dnl Random filename generation in scripts + if test -n "$MKTEMP_PROG"; then +- SHELL_RANDOM_FILENAME='`'$MKTEMP_PROG' /tmp/enca-$$-XXXXXXXX`' ++ SHELL_RANDOM_FILENAME='`mktemp /tmp/enca-$$-XXXXXXXX`' + else + SHELL_RANDOM_FILENAME='/tmp/enca-$$-$RANDOM' + fi +-- +2.40.1 + diff --git a/meta-oe/recipes-support/enca/enca/configure-hack.patch b/meta-oe/recipes-support/enca/enca/configure-hack.patch deleted file mode 100644 index 85abcdcf02..0000000000 --- a/meta-oe/recipes-support/enca/enca/configure-hack.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- enca-1.9/configure.ac.orig 2006-02-15 00:57:39.000000000 -0800 -+++ enca-1.9/configure.ac 2006-02-15 00:57:46.000000000 -0800 -@@ -92,9 +92,6 @@ - dnl And for gtk-doc - gtk_CHECK_GTK_DOC - --dnl Check for good random number sources --AC_CHECK_FILES(/dev/random /dev/urandom /dev/srandom /dev/arandom) -- - dnl Dirty path hack. Helps some people with badly set up search paths. - if test "$prefix" = "NONE"; then - LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" diff --git a/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch b/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch deleted file mode 100644 index 6f6f3e320e..0000000000 --- a/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- enca-1.9/configure.ac.orig 2006-06-29 15:30:44.000000000 +0100 -+++ enca-1.9/configure.ac 2006-06-29 15:31:41.000000000 +0100 -@@ -92,14 +92,15 @@ - dnl And for gtk-doc - gtk_CHECK_GTK_DOC - --dnl Dirty path hack. Helps some people with badly set up search paths. --if test "$prefix" = "NONE"; then -- LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" --else -- LDFLAGS="$LDFLAGS -L$prefix/lib" -- CPPFLAGS="$CPPFLAGS -I$prefix/include" --fi -+# This is really dumb code -+#dnl Dirty path hack. Helps some people with badly set up search paths. -+#if test "$prefix" = "NONE"; then -+# LDFLAGS="$LDFLAGS -L$ac_default_prefix/lib" -+# CPPFLAGS="$CPPFLAGS -I$ac_default_prefix/include" -+#else -+# LDFLAGS="$LDFLAGS -L$prefix/lib" -+# CPPFLAGS="$CPPFLAGS -I$prefix/include" -+#fi - - dnl Checks for libraries. - ye_CHECK_LIBM diff --git a/meta-oe/recipes-support/enca/enca/dont-run-tests.patch b/meta-oe/recipes-support/enca/enca/dont-run-tests.patch index 321d1e6201..1d0170bd73 100644 --- a/meta-oe/recipes-support/enca/enca/dont-run-tests.patch +++ b/meta-oe/recipes-support/enca/enca/dont-run-tests.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: enca-1.9/Makefile.am =================================================================== --- enca-1.9.orig/Makefile.am 2005-11-24 11:21:32.000000000 +0100 diff --git a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch index dbf0fb8ea7..2112d8cfab 100644 --- a/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch +++ b/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch @@ -8,6 +8,8 @@ This patch come straight from the Buildroot source tree. Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> --- +Upstream-Status: Pending + m4/libiconv.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -17,12 +19,12 @@ index fc8c6f8..3a59549 100644 +++ b/m4/libiconv.m4 @@ -17,7 +17,7 @@ AC_REQUIRE([AC_C_CONST])dnl dnl - + dnl Use standard iconv test -AM_ICONV +m4_pattern_allow([AM_ICONV]) - CONVERTOR_LIBS="$CONVERTOR_LIBS $LIBICONV" - + CONVERTER_LIBS="$CONVERTER_LIBS $LIBICONV" + dnl Compile iconvcap.c and run it to determine what encodings iconv actually -- 1.9.3 diff --git a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch index accfbccd6b..756745d839 100644 --- a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch +++ b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch @@ -1,7 +1,8 @@ ---- enca-1.9/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 -+++ enca-1.9/Makefile.am 2006-06-29 15:35:20.000000000 +0100 -@@ -1,8 +1,8 @@ - # @(#) $Id: Makefile.am,v 1.35 2005/11/24 10:21:32 yeti Exp $ +Upstream-Status: Pending + +--- enca-1.19/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100 ++++ enca-1.19/Makefile.am 2006-06-29 15:35:20.000000000 +0100 +@@ -1,7 +1,7 @@ if MAINTAINER_MODE -SUBDIRS = tools data script lib src devel-docs test +SUBDIRS = data script lib src devel-docs test diff --git a/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-oe/recipes-support/enca/enca_1.19.bb index bf19843b2f..774f05f7c4 100644 --- a/meta-oe/recipes-support/enca/enca_1.9.bb +++ b/meta-oe/recipes-support/enca/enca_1.19.bb @@ -1,30 +1,27 @@ SUMMARY = "Enca is an Extremely Naive Charset Analyser" SECTION = "libs" -HOMEPAGE = "http://trific.ath.cx/software/enca/" +HOMEPAGE = "https://cihar.com/software/enca/" DEPENDS += "gettext-native" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" -SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/enca-${PV}.tar.bz2 \ - file://configure-hack.patch \ +SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \ file://dont-run-tests.patch \ - file://configure-remove-dumbness.patch \ file://makefile-remove-tools.patch \ - file://libenca-003-iconv.patch " - -SRC_URI[md5sum] = "b3581e28d68d452286fb0bfe58bed3b3" -SRC_URI[sha256sum] = "02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d" + file://libenca-003-iconv.patch \ + file://0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch" +SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a" inherit autotools -do_configure_prepend() { +do_configure:prepend() { # remove failing test which checks for something that isn't even used sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' ${S}/configure.ac } -do_configure_append() { +do_configure:append() { sed -i s:-I/usr/include::g ${B}/Makefile sed -i s:-I/usr/include::g ${B}/*/Makefile } diff --git a/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch b/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch new file mode 100644 index 0000000000..1568fe96e1 --- /dev/null +++ b/meta-oe/recipes-support/epeg/epeg/0001-configure-Fix-checks-for-libjpeg-and-libexif.patch @@ -0,0 +1,32 @@ +From 4e0c62634b0db6dbad0d41377bb71a8012abd75b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 12:56:54 -0700 +Subject: [PATCH] configure: Fix checks for libjpeg and libexif + +Use the functions from the respective library instead of using main +function which is not part of library + +Upstream-Status: Submitted [https://github.com/mattes/epeg/pull/27] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a4f6ebd..e474b1d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,8 +31,8 @@ AC_SUBST(version_info) + dnl AC_CHECK_FUNCS(fmemopen) + dnl AC_CHECK_FUNCS(open_memstream) + +-AC_CHECK_LIB([jpeg], [main], [], [echo "libjpeg library not found. Please install it before proceeding"; exit -1]) +-AC_CHECK_LIB([exif], [main], [], [echo "libexif library not found. Please install it before proceeding"; exit -1]) ++AC_CHECK_LIB([jpeg], [jpeg_simple_progression], [], [echo "libjpeg library not found. Please install it before proceeding"; exit -1]) ++AC_CHECK_LIB([exif], [exif_data_new_from_file], [], [echo "libexif library not found. Please install it before proceeding"; exit -1]) + + my_includes="" + my_libs="-ljpeg -lexif" +-- +2.37.3 + diff --git a/meta-oe/recipes-support/epeg/epeg_git.bb b/meta-oe/recipes-support/epeg/epeg_git.bb index 8ca574014b..e5277b1579 100644 --- a/meta-oe/recipes-support/epeg/epeg_git.bb +++ b/meta-oe/recipes-support/epeg/epeg_git.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7732a9290ea1e4b034fdc15cf49968d \ file://COPYING-PLAIN;md5=f59cacc08235a546b0c34a5422133035" DEPENDS = "jpeg libexif" -SRC_URI = "git://github.com/mattes/epeg.git" +SRC_URI = "git://github.com/mattes/epeg.git;branch=master;protocol=https \ + file://0001-configure-Fix-checks-for-libjpeg-and-libexif.patch \ + " SRCREV = "9a175cd67eaa61fe45413d8da82da72936567047" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb index 78f8f85c96..147a8069fa 100644 --- a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb +++ b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb @@ -1,11 +1,12 @@ DESCRIPTION = "eSpeak is a compact open source software speech synthesizer" SECTION = "base" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://License.txt;md5=cb7a20edb4c9f5f478de6523dcd7362c" SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \ file://0001-Fix-build-of-shared-library-on-architectures-needing.patch \ file://0002-tr_languages-cast-string_ordinal-init-values.patch \ + file://0001-Drop-using-register-keyword-for-storage-classifier.patch \ " SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3" SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" @@ -19,7 +20,7 @@ inherit siteinfo qemu CXXFLAGS += "-DUSE_PORTAUDIO" TARGET_CC_ARCH += "${LDFLAGS}" -FILES_${PN} += "${datadir}/espeak-data" +FILES:${PN} += "${datadir}/espeak-data" do_configure() { # "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19, use V19 @@ -64,4 +65,4 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/espeak-data/* ${D}${datadir}/espeak-data } -RDEPENDS_${PN} = "portaudio-v19" +RDEPENDS:${PN} = "portaudio-v19" diff --git a/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch b/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch new file mode 100644 index 0000000000..d9c0d08ec9 --- /dev/null +++ b/meta-oe/recipes-support/espeak/files/0001-Drop-using-register-keyword-for-storage-classifier.patch @@ -0,0 +1,38 @@ +From bad6131463275bd8013a82c28fb0b27e882bc801 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 16:07:35 -0800 +Subject: [PATCH] Drop using 'register' keyword for storage classifier + +Its gone from C++17 and newer + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/klatt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/klatt.cpp b/src/klatt.cpp +index b15f77c..9c51bc5 100755 +--- a/src/klatt.cpp ++++ b/src/klatt.cpp +@@ -167,7 +167,7 @@ Output = (rnz.a * input) + (rnz.b * oldin1) + (rnz.c * oldin2) + #ifdef deleted + static double antiresonator(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + return (double)x; +@@ -176,7 +176,7 @@ static double antiresonator(resonator_ptr r, double input) + + static double antiresonator2(resonator_ptr r, double input) + { +- register double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; ++ double x = (double)r->a * (double)input + (double)r->b * (double)r->p1 + (double)r->c * (double)r->p2; + r->p2 = (double)r->p1; + r->p1 = (double)input; + +-- +2.39.1 + diff --git a/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch b/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch index 2590e15841..144c30a62f 100644 --- a/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch +++ b/meta-oe/recipes-support/espeak/files/0001-Fix-build-of-shared-library-on-architectures-needing.patch @@ -10,6 +10,8 @@ patch doesn't affect such architectures. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- +Upstream-Status: Pending + src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb b/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb new file mode 100644 index 0000000000..491f10dda0 --- /dev/null +++ b/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "Kernel evdev device emulation" +DESCRIPTION = "The evemu library and tools are used to describe devices, record data, create devices and replay data from kernel evdev devices." +HOMEPAGE = "https://www.freedesktop.org/wiki/Evemu" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +DEPENDS = "libevdev" + +SRCREV = "86a5627dbeac8d9d9bc34326a758d6a477e876e4" +SRC_URI = "git://git@gitlab.freedesktop.org/libevdev/evemu.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" +PV = "2.7.0+git" + +inherit autotools pkgconfig + +PACKAGES =+ "${PN}-python" +FILES:${PN}-python = "${libdir}/python*/site-packages/*" +RDEPENDS:${PN}-python = "python3" + diff --git a/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch b/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch deleted file mode 100644 index 96146a1957..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 04d5f4805a86302a0e135a28d58a6c1ff6a68d52 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Thu, 30 Jul 2020 23:03:51 +0200 -Subject: [PATCH] Use compiler -fcf-protection only if compiler/arch supports - it -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There have been some PRs they were either rejected or some general suggestion -for more flags suggested. So - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - cmake/compilerFlags.cmake | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake -index 12caf42..455525e 100644 ---- a/cmake/compilerFlags.cmake -+++ b/cmake/compilerFlags.cmake -@@ -26,7 +26,12 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN - # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 - if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) - if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) -- add_compile_options(-fstack-clash-protection -fcf-protection) -+ # Gcc does support -fcf-protection on few arches only -+ CHECK_CXX_COMPILER_FLAG(-fcf-protection COMPILER_SUPPORTS_FCF_PROTECTION) -+ if (COMPILER_SUPPORTS_FCF_PROTECTION) -+ add_compile_options(-fcf-protection) -+ endif() -+ add_compile_options(-fstack-clash-protection) - endif() - - if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 --- -2.21.3 - diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb b/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb deleted file mode 100644 index ed1e8de5c2..0000000000 --- a/meta-oe/recipes-support/exiv2/exiv2_0.27.3.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -DEPENDS = "zlib expat" - -SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" -SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778" - -# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either -inherit dos2unix -SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch" - -S = "${WORKDIR}/${BPN}-${PV}-Source" - -inherit cmake gettext diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb new file mode 100644 index 0000000000..958810cf7a --- /dev/null +++ b/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat brotli libinih" + +SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz" +SRC_URI[sha256sum] = "89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d" +# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either +# inherit dos2unix +S = "${WORKDIR}/${BP}-Source" + +inherit cmake gettext + +do_install:append:class-target() { + # reproducibility: remove build host path + sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ + -e 's:${STAGING_DIR_HOST}::g' +} diff --git a/meta-oe/recipes-support/farsight/libnice_0.1.16.bb b/meta-oe/recipes-support/farsight/libnice_0.1.16.bb deleted file mode 100644 index 7bd6478d4c..0000000000 --- a/meta-oe/recipes-support/farsight/libnice_0.1.16.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Interactive Connectivity Establishment library" -DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactive Connectivity Establishment standard (ICE)." -HOMEPAGE = "http://nice.freedesktop.org/wiki/" - -LICENSE = "LGPLv2.1 & MPLv1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ - file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ -" - -SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz" -SRC_URI[md5sum] = "5ad936c43d3c6d33117b2c64982f2fd9" -SRC_URI[sha256sum] = "06b678066f94dde595a4291588ed27acd085ee73775b8c4e8399e28c01eeefdf" - -DEPENDS = "glib-2.0 gnutls" - -PACKAGECONFIG ??= "gstreamer1.0" -PACKAGECONFIG[gupnp] = "--enable-gupnp,--disable-gupnp,gupnp-igd" -PACKAGECONFIG[gstreamer1.0] = "--with-gstreamer,--without-gstreamer,gstreamer1.0 gstreamer1.0-plugins-base" - -inherit autotools pkgconfig gtk-doc gobject-introspection - -EXTRA_OECONF += "--without-gstreamer-0.10" - -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" -FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" - -do_configure_prepend() { - mkdir ${S}/m4 || true -} - -do_compile_append() { - for i in $(find ${B} -name "*.pc") ; do - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - $i - done -} diff --git a/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch b/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch index 82b1c61e9c..730bb7a965 100644 --- a/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch +++ b/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- fbset-2.1/Makefile.orig 2006-05-28 04:04:27.412095480 +0200 +++ fbset-2.1/Makefile 2006-05-28 04:14:05.379231120 +0200 @@ -2,7 +2,7 @@ diff --git a/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-oe/recipes-support/fbset/fbset-modes.bb index b768553323..aa5f631c38 100644 --- a/meta-oe/recipes-support/fbset/fbset-modes.bb +++ b/meta-oe/recipes-support/fbset/fbset-modes.bb @@ -4,7 +4,6 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PV = "0.1.0" -PR = "r6" SRC_URI = "file://fb.modes" S = "${WORKDIR}" @@ -18,4 +17,4 @@ do_install() { # to disable "all" behavior (found when comparing qemuarm and qemux86 signatures) PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/fb.modes" +CONFFILES:${PN} = "${sysconfdir}/fb.modes" diff --git a/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-oe/recipes-support/fbset/fbset_2.1.bb index fbf834da18..690fee0df3 100644 --- a/meta-oe/recipes-support/fbset/fbset_2.1.bb +++ b/meta-oe/recipes-support/fbset/fbset_2.1.bb @@ -7,14 +7,13 @@ SUMMARY = "The fbset console tool" HOMEPAGE = "http://users.telenet.be/geertu/Linux/fbdev/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://fbset.c;endline=19;md5=bf326f82cdfcac391af208f019c5603f" -RRECOMMENDS_${PN} = "fbset-modes" +RRECOMMENDS:${PN} = "fbset-modes" DEPENDS = "bison-native flex-native" -PR = "r4" -SRC_URI = "http://ftp.debian.org/debian/pool/main/f/fbset/fbset_2.1.orig.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/f/fbset/fbset_2.1.orig.tar.gz \ file://makefile.patch \ file://fbset-2.1-fix-makefile-dep.patch \ file://0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch \ @@ -29,7 +28,7 @@ do_install() { install -m 0644 ${B}/*.8 ${D}${datadir}/man/man8 } -ALTERNATIVE_fbset = "fbset" +ALTERNATIVE:fbset = "fbset" ALTERNATIVE_LINK_NAME[fbset] = "${sbindir}/fbset" ALTERNATIVE_TARGET[fbset] = "${sbindir}/fbset.real" ALTERNATIVE_PRIORITY[fbset] = "55" diff --git a/meta-oe/recipes-support/fftw/fftw/install-bench.patch b/meta-oe/recipes-support/fftw/fftw/install-bench.patch new file mode 100644 index 0000000000..237c1c0c5c --- /dev/null +++ b/meta-oe/recipes-support/fftw/fftw/install-bench.patch @@ -0,0 +1,43 @@ +Upstream-Status: Pending + +--- ./tests/Makefile.am.orig 2021-03-23 11:45:12.756371739 -0400 ++++ ./tests/Makefile.am 2021-03-23 19:29:19.692180793 -0400 +@@ -1,21 +1,21 @@ + AM_CPPFLAGS = -I $(top_srcdir) +-noinst_PROGRAMS = bench ++bin_PROGRAMS = bench@PREC_SUFFIX@ + EXTRA_DIST = check.pl README + + if THREADS +-bench_CFLAGS = $(PTHREAD_CFLAGS) ++bench@PREC_SUFFIX@_CFLAGS = $(PTHREAD_CFLAGS) + if !COMBINED_THREADS + LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la + endif + else + if OPENMP +-bench_CFLAGS = $(OPENMP_CFLAGS) ++bench@PREC_SUFFIX@_CFLAGS = $(OPENMP_CFLAGS) + LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_omp.la + endif + endif + +-bench_SOURCES = bench.c hook.c fftw-bench.c fftw-bench.h +-bench_LDADD = $(LIBFFTWTHREADS) \ ++bench@PREC_SUFFIX@_SOURCES = bench.c hook.c fftw-bench.c fftw-bench.h ++bench@PREC_SUFFIX@_LDADD = $(LIBFFTWTHREADS) \ + $(top_builddir)/libfftw3@PREC_SUFFIX@.la \ + $(top_builddir)/libbench2/libbench2.a $(THREADLIBS) + +--- ./tools/Makefile.am.orig 2021-03-24 08:22:31.845581620 -0400 ++++ ./tools/Makefile.am 2021-03-24 08:24:26.454053573 -0400 +@@ -24,7 +24,7 @@ + endif + + fftw@PREC_SUFFIX@_wisdom_SOURCES = fftw-wisdom.c +-fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench-bench.o \ +-$(top_builddir)/tests/bench-fftw-bench.o $(LIBFFTWTHREADS) \ ++fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench@PREC_SUFFIX@-bench.o \ ++$(top_builddir)/tests/bench@PREC_SUFFIX@-fftw-bench.o $(LIBFFTWTHREADS) \ + $(top_builddir)/libfftw3@PREC_SUFFIX@.la \ + $(top_builddir)/libbench2/libbench2.a $(THREADLIBS) diff --git a/meta-oe/recipes-support/fftw/fftw/run-ptest b/meta-oe/recipes-support/fftw/fftw/run-ptest new file mode 100644 index 0000000000..4d19057975 --- /dev/null +++ b/meta-oe/recipes-support/fftw/fftw/run-ptest @@ -0,0 +1,27 @@ +#!/bin/sh + +cd fftw +/usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/bench +fftw_result=$? +cd ../fftwf +/usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/benchf +fftwf_result=$? +cd ../fftwl +/usr/bin/perl -w ./check.pl -r -c=30 -v `pwd`/benchl +fftwl_result=$? + +if [ $fftw_result = "0" ]; then + echo "PASS: fftw" +else + echo "FAIL: fftw" +fi +if [ $fftwf_result = "0" ]; then + echo "PASS: fftwf" +else + echo "FAIL: fftwf" +fi +if [ $fftwl_result = "0" ]; then + echo "PASS: fftwl" +else + echo "FAIL: fftwl" +fi diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.8.bb b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb index d9e0ea3409..af7117da7b 100644 --- a/meta-oe/recipes-support/fftw/fftw_3.3.8.bb +++ b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb @@ -1,16 +1,17 @@ DESCRIPTION = "FFTW" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SRC_URI = " \ http://www.fftw.org/fftw-${PV}.tar.gz \ file://0001-NEON-autodetection-segfaults-assume-neon-present.patch \ + file://install-bench.patch \ + file://run-ptest \ " -SRC_URI[md5sum] = "8aac833c943d8e90d51b697b27d4384d" -SRC_URI[sha256sum] = "6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303" +SRC_URI[sha256sum] = "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest # we had multiple recipes in the past PROVIDES = "fftwl fftwf" @@ -22,8 +23,8 @@ CFLAGS += "-D_GNU_SOURCE" # neon is optional for arm version < 8 -> check tune features FFTW_NEON = "${@bb.utils.contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)}" # neon is suppored for arm version = 8 -> enable -FFTW_NEON_aarch64 = "--enable-neon" -FFTW_NEON_class-native = "" +FFTW_NEON:aarch64 = "--enable-neon" +FFTW_NEON:class-native = "" do_configure() { # configure fftw @@ -54,6 +55,7 @@ do_configure() { do_compile() { for lib in fftw fftwl fftwf; do cd ${WORKDIR}/build-$lib + test -n "${TOOLCHAIN_OPTIONS}" && sed -i -e 's|${TOOLCHAIN_OPTIONS}||g' config.h autotools_do_compile done } @@ -65,19 +67,37 @@ do_install() { done } +do_install_ptest() { + for lib in fftw fftwl fftwf; do + install -d ${D}${PTEST_PATH}/$lib + install -m 0755 ${S}/tests/check.pl ${D}${PTEST_PATH}/$lib + cd ${WORKDIR}/build-$lib + if [ $lib = "fftw" ]; then + mv ${D}${bindir}/bench ${D}${PTEST_PATH}/$lib + fi + if [ $lib = "fftwl" ]; then + mv ${D}${bindir}/benchl ${D}${PTEST_PATH}/$lib + fi + if [ $lib = "fftwf" ]; then + mv ${D}${bindir}/benchf ${D}${PTEST_PATH}/$lib + fi + done +} PACKAGES =+ "libfftw libfftwl libfftwf" -FILES_libfftw = "${libdir}/libfftw3.so.* ${libdir}/libfftw3_*.so.*" -FILES_libfftwl = "${libdir}/libfftw3l.so.* ${libdir}/libfftw3l_*.so.*" -FILES_libfftwf = "${libdir}/libfftw3f.so.* ${libdir}/libfftw3f_*.so.*" +FILES:libfftw = "${libdir}/libfftw3.so.* ${libdir}/libfftw3_*.so.*" +FILES:libfftwl = "${libdir}/libfftw3l.so.* ${libdir}/libfftw3l_*.so.*" +FILES:libfftwf = "${libdir}/libfftw3f.so.* ${libdir}/libfftw3f_*.so.*" PACKAGES =+ "fftw-wisdom fftwl-wisdom fftwf-wisdom fftw-wisdom-to-conf" -FILES_fftw-wisdom = "${bindir}/fftw-wisdom" -FILES_fftwl-wisdom = "${bindir}/fftwl-wisdom" -FILES_fftwf-wisdom = "${bindir}/fftwf-wisdom" -FILES_fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf" +FILES:fftw-wisdom = "${bindir}/fftw-wisdom" +FILES:fftwl-wisdom = "${bindir}/fftwl-wisdom" +FILES:fftwf-wisdom = "${bindir}/fftwf-wisdom" +FILES:fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf" -FILES_${PN}-dev += "${libdir}/cmake" -RDEPENDS_${PN}-dev = "libfftw libfftwl libfftwf" +FILES:${PN}-dev += "${libdir}/cmake" +RDEPENDS:${PN}-dev = "libfftw libfftwl libfftwf" +RDEPENDS:${PN}-ptest += "perl" +RDEPENDS:${PN}-ptest:remove = "fftw" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb index 2636287e3a..3e8e2cdf77 100644 --- a/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-oe/recipes-support/fltk/fltk-native.bb @@ -2,6 +2,8 @@ require ${BPN}.inc DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native" +SRC_URI += "file://fltk-native-link-libdl.patch" + inherit native EXTRA_OECMAKE += " \ @@ -9,13 +11,13 @@ EXTRA_OECMAKE += " \ -DOPTION_USE_THREADS=OFF \ -DOPTION_USE_XDBE=OFF \ -DOPTION_USE_XFT=OFF \ - -DOPTION_BUILD_EXAMPLES=OFF \ + -DFLTK_BUILD_TEST=OFF \ -DOPTION_USE_XINERAMA=OFF \ -DOPTION_USE_XFIXES=OFF \ -DOPTION_USE_XCURSOR=OFF \ " -do_install_append() { +do_install:append() { # make sure native fltk-config is not used accidentaly rm -f ${D}${bindir}/fltk-config } diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb index 09344cf7d1..82007c4cf4 100644 --- a/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-oe/recipes-support/fltk/fltk.bb @@ -5,14 +5,12 @@ DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " \ - file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch \ - file://0004-Fix-build-error-when-enable-package-config-examples.patch \ -" +SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch" EXTRA_OECMAKE = " \ -DOPTION_BUILD_SHARED_LIBS=ON \ -DOPTION_USE_THREADS=ON \ + -DFLTK_BUILD_TEST=OFF \ -DOPTION_USE_XDBE=ON \ -DOPTION_USE_XFT=ON \ -DFLTK_CONFIG_PATH=${libdir}/cmake \ @@ -20,30 +18,31 @@ EXTRA_OECMAKE = " \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" -PACKAGECONFIG[examples] = "-DOPTION_BUILD_EXAMPLES=ON,-DOPTION_BUILD_EXAMPLES=OFF,fltk-native" PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo" PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl" PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama" PACKAGECONFIG[xfixes] = "-DOPTION_USE_XFIXES=ON,-DOPTION_USE_XFIXES=OFF,libxfixes" PACKAGECONFIG[xcursor] = "-DOPTION_USE_XCURSOR=ON,-DOPTION_USE_XCURSOR=OFF,libxcursor" -do_install_append() { - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/fltk-config +do_install:append() { + sed -i -e 's,${TMPDIR},,g' ${D}${bindir}/fltk-config + sed -i -e 's,${TMPDIR},,g' ${D}${datadir}/fltk/UseFLTK.cmake + sed -i -e 's,${TMPDIR},,g' ${D}${datadir}/fltk/FLTK-Targets.cmake } -python populate_packages_prepend () { +python populate_packages:prepend () { if (d.getVar('DEBIAN_NAMES')): - d.setVar('PKG_${BPN}', 'libfltk${PV}') + d.setVar('PKG:${BPN}', 'libfltk${PV}') } LEAD_SONAME = "libfltk.so" # .desktop / icons / mime only necessary for fluid app -FILES_${PN}-bin += " \ +FILES:${PN}-bin += " \ ${datadir}/applications \ ${datadir}/icons \ ${datadir}/mime \ " # cmake files -FILES_${PN}-dev += "${datadir}/fltk" +FILES:${PN}-dev += "${datadir}/fltk" diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc index 97a1fbfc7e..b1bc83578f 100644 --- a/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-oe/recipes-support/fltk/fltk.inc @@ -1,7 +1,7 @@ SUMMARY = "FLTK is a cross-platform C++ GUI toolkit" HOMEPAGE = "http://www.fltk.org" SECTION = "libs" -LICENSE = "LGPLv2 & FLTK" +LICENSE = "LGPL-2.0-only & FLTK" LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca" SRC_URI = " \ @@ -11,9 +11,8 @@ SRC_URI = " \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.5" -SRC_URI[md5sum] = "0de2b45a1896be2b4a8cafae89b84248" -SRC_URI[sha256sum] = "2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c" +PV = "1.3.8" +SRC_URI[sha256sum] = "1d9832409fc08c908c64ab40ad9fd8b0e8af5d203651eb9690b810f41e2f412d" inherit cmake pkgconfig diff --git a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch index e6e68a0cb8..d1cbb35479 100644 --- a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch +++ b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch @@ -18,6 +18,8 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + src/Fl_Preferences.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch b/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch index cca977c66d..0d91aab3a1 100644 --- a/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch +++ b/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch @@ -1,6 +1,6 @@ From 16010cb1a69ea2326d8102b7f1e34b65aca4b278 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 28 Feb 2017 01:20:42 +0100 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 22 May 2021 12:33:15 +0200 Subject: [PATCH] always build fluid and export pointers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -8,24 +8,24 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- CMake/export.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/export.cmake b/CMake/export.cmake -index 968186a..95e04eb 100644 +index 6e8bc5d..71b6f6c 100644 --- a/CMake/export.cmake +++ b/CMake/export.cmake -@@ -21,7 +21,7 @@ - # final config and export +@@ -20,7 +20,7 @@ ####################################################################### + # Set the fluid executable path --if(CMAKE_CROSSCOMPILING) -+if(FALSE) - find_file(FLUID_PATH - NAMES fluid fluid.exe - PATHS ENV PATH +-if (CMAKE_CROSSCOMPILING) ++if (FALSE) + find_file(FLUID_PATH + NAMES fluid fluid.exe + PATHS ENV PATH -- -2.9.3 +2.31.1 diff --git a/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch b/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch deleted file mode 100644 index 1f2f8aecf7..0000000000 --- a/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bc38fb41044503c9debf5710910c51dd29674b6a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 15 Dec 2017 22:14:01 +0100 -Subject: [PATCH] CMake build: Force shared libs with unsuffixed names -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -For windows build sake CMake complains when a project wants to build shared and -static libraries with same name. This caused the authors of fltk to generate -libraries with names suffixed by '_SHARED' when building fltk with cmake - -autotools builds do not suffix. - -Reasons to build shared libs with correct names: - -* Shared libraries are the preferred choice for embedded devices -* There are projects (e.g yoshimi) expecting shared libraries with unsuffixed - names - as created by autotools build. These projects link against static - libraries by accident causing unusable binaries. - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - CMake/macros.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMake/macros.cmake b/CMake/macros.cmake -index 4def62d..ab675f0 100644 ---- a/CMake/macros.cmake -+++ b/CMake/macros.cmake -@@ -49,7 +49,7 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) - PROPERTIES - VERSION ${FLTK_VERSION_FULL} - SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} -- PREFIX "lib" # for MSVC static/shared coexistence -+ OUTPUT_NAME ${LIBNAME} CLEAN_DIRECT_OUTPUT 1 - ) - endif (${LIBTYPE} STREQUAL "SHARED") - --- -2.9.5 - diff --git a/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch b/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch new file mode 100644 index 0000000000..72bb48a32c --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch @@ -0,0 +1,42 @@ +From b6985abcb03fb09685da4044963e8f085035b208 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 19 Aug 2021 08:06:45 +0200 +Subject: [PATCH] fluid/CMakeLists.txt: Do not export fluid target +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It does not work for us: The executable 'fluid' is not installed in +receipe-sysroot. So fltk cmake config contains an invalid reference. +Consumers of fltk using cmake will fail during configure for this invalid +reference with something like: + +| CMake Error at <...>/recipe-sysroot/usr/share/fltk/FLTK-Targets.cmake:129 (message): +| The imported target "fluid" references the file +| +| "<...>/recipe-sysroot/usr/bin/fluid" +| +| but this file does not exist. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + fluid/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt +index 472c84c..f971121 100644 +--- a/fluid/CMakeLists.txt ++++ b/fluid/CMakeLists.txt +@@ -86,7 +86,6 @@ if (APPLE AND (NOT OPTION_APPLE_X11)) + install (TARGETS fluid DESTINATION ${FLTK_BINDIR}) + else() + install (TARGETS fluid +- EXPORT FLTK-Targets + RUNTIME DESTINATION ${FLTK_BINDIR} + LIBRARY DESTINATION ${FLTK_LIBDIR} + ARCHIVE DESTINATION ${FLTK_LIBDIR} +-- +2.31.1 + diff --git a/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch b/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch deleted file mode 100644 index 974c02fe61..0000000000 --- a/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch +++ /dev/null @@ -1,182 +0,0 @@ -Fix build error when enable package config examples. - -Upstream-Status: Backport [https://github.com/fltk/fltk/commit/16774dd] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - - -From 16774ddc4e000c89e560fde0ced8be9814ef041e Mon Sep 17 00:00:00 2001 -From: Albrecht Schlosser <albrechts.fltk@online.de> -Date: Wed, 8 Feb 2017 02:06:52 +0000 -Subject: [PATCH] Rename test/help demo program to test/help_dialog. - -This change avoids a name conflict with CMake's auto-generated target 'help' -for "Unix Makefiles", "Ninja", and supposedly other generators as well. - - -git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12171 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 ---- - CMake/macros.cmake | 5 ----- - documentation/src/examples.dox | 8 +++---- - test/CMakeLists.txt | 27 +++++++++++++++++++---- - test/demo.menu | 2 +- - test/{help.cxx => help_dialog.cxx} | 6 ++--- - test/{help-test.html => help_dialog.html} | 0 - 6 files changed, 31 insertions(+), 17 deletions(-) - rename test/{help.cxx => help_dialog.cxx} (88%) - rename test/{help-test.html => help_dialog.html} (100%) - -diff --git a/CMake/macros.cmake b/CMake/macros.cmake -index 5b0d0fa..7134fcb 100644 ---- a/CMake/macros.cmake -+++ b/CMake/macros.cmake -@@ -90,11 +90,6 @@ function(CREATE_EXAMPLE NAME SOURCES LIBRARIES) - - set (tname ${NAME}) # target name - -- # rename reserved target name "help" (CMake 2.8.12 and later) -- if (${tname} MATCHES "^help$") -- set (tname "test_help") -- endif (${tname} MATCHES "^help$") -- - foreach(src ${SOURCES}) - if ("${src}" MATCHES "\\.fl$") - list(APPEND flsrcs ${src}) -diff --git a/documentation/src/examples.dox b/documentation/src/examples.dox -index 5105b7b..7961b02 100644 ---- a/documentation/src/examples.dox -+++ b/documentation/src/examples.dox -@@ -60,7 +60,7 @@ you build FLTK, unlike those in the 'test' directory shown below. - </tr> - <tr> - <td> \ref examples_hello </td> --<td> \ref examples_help </td> -+<td> \ref examples_help_dialog </td> - <td> \ref examples_iconize </td> - <td> \ref examples_image </td> - <td> \ref examples_inactive </td> -@@ -326,13 +326,13 @@ easily under FLTK. - tiny demo shows how little is needed to get a functioning application - running with FLTK. Quite impressive, I'd say. - --\subsection examples_help help -+\subsection examples_help_dialog help_dialog - - \par --\c help displays the built-in FLTK help browser. The -+\c help_dialog displays the built-in FLTK help browser. The - Fl_Help_Dialog understands a subset of html and renders - various image formats. This widget makes it easy to provide help --pages to the user without depending on the operating system's -+pages to the user without depending on the operating system's - html browser. - - \subsection examples_iconize iconize -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 22ec9ab..4caffa5 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -1,3 +1,22 @@ -+# -+# "$Id$" -+# -+# CMakeLists.txt used to build test and demo apps by the CMake build system -+# -+# Copyright 2004-2017 by Bill Spitzak and others. -+# -+# This library is free software. Distribution and use rights are outlined in -+# the file "COPYING" which should have been included with this file. If this -+# file is missing or damaged, see the license at: -+# -+# http://www.fltk.org/COPYING.php -+# -+# Please report all bugs and problems on the following page: -+# -+# http://www.fltk.org/str.php -+# -+####################################################################### -+ - set(EXECUTABLE_OUTPUT_PATH ${FLTK_BINARY_DIR}/bin/examples) - - ####################################################################### -@@ -64,7 +83,7 @@ CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images") - CREATE_EXAMPLE(fonts fonts.cxx fltk) - CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms") - CREATE_EXAMPLE(hello hello.cxx fltk) --CREATE_EXAMPLE(help help.cxx "fltk;fltk_images") -+CREATE_EXAMPLE(help_dialog help_dialog.cxx "fltk;fltk_images") - CREATE_EXAMPLE(icon icon.cxx fltk) - CREATE_EXAMPLE(iconize iconize.cxx fltk) - CREATE_EXAMPLE(image image.cxx fltk) -@@ -134,7 +153,7 @@ endif(FLTK_HAVE_CAIRO) - # Note: this is incomplete as of 11 Feb 2015 - # Todo: currently all files are copied, but some of them need configuration: - # - demo.menu: fluid can't be started (wrong path) --# - demo.menu: help (help-test.html) can't find its images (not copied) -+# - demo.menu: help_dialog (help_dialog.html) can't find its images (not copied) - # - maybe more ... - - # prepare for a "better" test file installation path -@@ -149,11 +168,11 @@ configure_file(demo.menu ${TESTFILE_PATH}/demo.menu COPYONLY) - - # use target directory only to avoid redundancy - configure_file(rgb.txt ${TESTFILE_PATH} COPYONLY) --configure_file(help-test.html ${TESTFILE_PATH} COPYONLY) -+configure_file(help_dialog.html ${TESTFILE_PATH} COPYONLY) - configure_file(browser.cxx ${TESTFILE_PATH} COPYONLY) - configure_file(editor.cxx ${TESTFILE_PATH} COPYONLY) - if(APPLE AND NOT OPTION_APPLE_X11) - configure_file(browser.cxx "${TESTFILE_PATH}/browser.app/Contents/Resources/browser.cxx" COPYONLY) - configure_file(rgb.txt ${TESTFILE_PATH}/colbrowser.app/Contents/Resources/rgb.txt COPYONLY) -- configure_file(help-test.html ${TESTFILE_PATH}/help.app/Contents/Resources/help-test.html COPYONLY) -+ configure_file(help_dialog.html ${TESTFILE_PATH}/help_dialog.app/Contents/Resources/help_dialog.html COPYONLY) - endif(APPLE AND NOT OPTION_APPLE_X11) -diff --git a/test/demo.menu b/test/demo.menu -index 337a71c..97e522a 100644 ---- a/test/demo.menu -+++ b/test/demo.menu -@@ -77,7 +77,7 @@ - @o:Font Tests...:@of - @of:Fonts:fonts - @of:UTF-8:utf8 -- @o:HelpDialog:help -+ @o:HelpDialog:help_dialog - @o:Input Choice:input_choice - @o:Preferences:preferences - @o:Threading:threads -diff --git a/test/help.cxx b/test/help_dialog.cxx -similarity index 88% -rename from test/help.cxx -rename to test/help_dialog.cxx -index f5c51d6..7866641 100644 ---- a/test/help.cxx -+++ b/test/help_dialog.cxx -@@ -3,7 +3,7 @@ - // - // Fl_Help_Dialog test program. - // --// Copyright 1999-2010 by Easy Software Products. -+// Copyright 2011-2017 by Bill Spitzak and others. - // - // This library is free software. Distribution and use rights are outlined in - // the file "COPYING" which should have been included with this file. If this -@@ -46,13 +46,13 @@ main(int argc, // I - Number of command-line arguments - strcpy(buf, argv[0]); - char *slash = strrchr(buf, '/'); - if (slash) -- strcpy(slash, "/../Resources/help-test.html"); -+ strcpy(slash, "/../Resources/help_dialog.html"); - help->load(buf); - - #else - - if (argc <= 1) -- help->load("help-test.html"); -+ help->load("help_dialog.html"); - else - help->load(argv[1]); - -diff --git a/test/help-test.html b/test/help_dialog.html -similarity index 100% -rename from test/help-test.html -rename to test/help_dialog.html diff --git a/meta-oe/recipes-support/fltk/fltk/disable_test.patch b/meta-oe/recipes-support/fltk/fltk/disable_test.patch index 1f5fd25e04..fe8be5a652 100644 --- a/meta-oe/recipes-support/fltk/fltk/disable_test.patch +++ b/meta-oe/recipes-support/fltk/fltk/disable_test.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/Makefile.orig 2015-11-26 15:35:31.485357862 +0800 +++ b/Makefile 2015-11-26 15:35:37.037357764 +0800 @@ -18,7 +18,7 @@ diff --git a/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch new file mode 100644 index 0000000000..e140ce2166 --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch @@ -0,0 +1,44 @@ +Upstream-Status: Inappropriate [cross build specific] + +It fails to build fltk-native on Ubuntu 20.04 with glibc 2.31: + +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `fl_dlopen(char const*, char const*)': +| Fl_Native_File_Chooser.cxx:(.text+0x61a): undefined reference to `dlopen' +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `Fl_GTK_File_Chooser::probe_for_GTK_libs()': +| Fl_Native_File_Chooser.cxx:(.text+0xf92): undefined reference to `dlerror' + +The original fix in fltk-native recipe does not work any more because '-ldl' +appears before lib/libfltk.a and causes dlopen() unresolved. The reason why it +doesn't fail on other hosts is that the functions dlopen(), dlerror() etc. have +been moved to libc.so since glibc 2.34 via the commits in glibc: + +0c1c3a771e dlfcn: Move dlopen into libc +add8d7ea01 dlfcn: Move dlvsym into libc +6dfc0207eb dlfcn: Move dlinfo into libc +492560a32e dlfcn: Move dladdr1 into libc +6a1ed32789 dlfcn: Move dlmopen into libc +77f876c0e3 dlfcn: Move dlsym into libc +602252b553 dlfcn: Move dladdr into libc +d8cce17d2a dlfcn: Move dlclose into libc + +Append 'dl' to fltk link items explictly to fix the error. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d153b1c..0fe5c11 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -306,7 +306,7 @@ endif (USE_XFT) + ####################################################################### + + FL_ADD_LIBRARY (fltk STATIC "${STATIC_FILES}") +-target_link_libraries (fltk ${OPTIONAL_LIBS}) ++target_link_libraries (fltk ${OPTIONAL_LIBS} dl) + + ####################################################################### + diff --git a/meta-oe/recipes-support/fmt/fmt_7.0.3.bb b/meta-oe/recipes-support/fmt/fmt_10.2.1.bb index ed3de0b500..1437eb4803 100644 --- a/meta-oe/recipes-support/fmt/fmt_7.0.3.bb +++ b/meta-oe/recipes-support/fmt/fmt_10.2.1.bb @@ -2,14 +2,15 @@ SUMMARY = "open-source formatting library for C++" DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." HOMEPAGE = "https://fmt.dev" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=af88d758f75f3c5c48a967501f24384b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" -SRC_URI += "git://github.com/fmtlib/fmt" -SRCREV = "cd4af11efc9c622896a3e4cb599fa28668ca3d05" +SRC_URI = "git://github.com/fmtlib/fmt;branch=10.x;protocol=https" +SRCREV = "e69e5f977d458f2650bb346dadf2ad30c5320281" S = "${WORKDIR}/git" inherit cmake -inherit ptest EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch new file mode 100644 index 0000000000..87a456d16d --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-const-qualifier-error.patch @@ -0,0 +1,57 @@ +From 761b4df04a141cc8c9507c741e4046c6c6b00491 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Mon, 11 Sep 2023 09:00:39 +0000 +Subject: [PATCH] Fix const qualifier error + +Fixes clang error +error: incompatible function pointer types assigning to 'OBJECT_NEW_FN' (aka 'void *(*)(void *)') from 'void *(const void *)' [-Wincompatible-function-pointer-types] +| obj->fnObjectNew = uwac_event_clone; +| ^ ~~~~~~~~~~~~~~~~ + +https://github.com/FreeRDP/FreeRDP/commit/6e3c00725aae99d03a0baa65430eceddebd9dee8 +Upstream-Status: Backport + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + libfreerdp/codec/rfx.c | 4 ++-- + winpr/include/winpr/collections.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libfreerdp/codec/rfx.c b/libfreerdp/codec/rfx.c +index ccbc5af..eec7365 100644 +--- a/libfreerdp/codec/rfx.c ++++ b/libfreerdp/codec/rfx.c +@@ -153,7 +153,7 @@ static void rfx_tile_init(void* obj) + } + } + +-static void* rfx_decoder_tile_new(void* val) ++static void* rfx_decoder_tile_new(const void* val) + { + RFX_TILE* tile = NULL; + WINPR_UNUSED(val); +@@ -184,7 +184,7 @@ static void rfx_decoder_tile_free(void* obj) + } + } + +-static void* rfx_encoder_tile_new(void* val) ++static void* rfx_encoder_tile_new(const void* val) + { + WINPR_UNUSED(val); + return calloc(1, sizeof(RFX_TILE)); +diff --git a/winpr/include/winpr/collections.h b/winpr/include/winpr/collections.h +index 807f011..b8c8d9d 100644 +--- a/winpr/include/winpr/collections.h ++++ b/winpr/include/winpr/collections.h +@@ -36,7 +36,7 @@ extern "C" + { + #endif + +- typedef void* (*OBJECT_NEW_FN)(void* val); ++ typedef void* (*OBJECT_NEW_FN)(const void* val); + typedef void (*OBJECT_INIT_FN)(void* obj); + typedef void (*OBJECT_UNINIT_FN)(void* obj); + typedef void (*OBJECT_FREE_FN)(void* obj); +-- +2.34.1 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/0002-Do-not-install-tools-a-CMake-targets.patch b/meta-oe/recipes-support/freerdp/freerdp/0002-Do-not-install-tools-a-CMake-targets.patch new file mode 100644 index 0000000000..2e5e6a4240 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0002-Do-not-install-tools-a-CMake-targets.patch @@ -0,0 +1,45 @@ +From 0ddaeae351295e48365657482f165652051bbca2 Mon Sep 17 00:00:00 2001 +From: Andreas Cord-Landwehr <cordlandwehr@kde.org> +Date: Wed, 17 Jan 2024 20:00:58 +0100 +Subject: [PATCH] Do not install tools a CMake targets + +The cli tools are installed manually and thus are missing in the sysroot +folder. Do not export their targets because they do not exist and make +CMake fail when searching for the library. + +Upstream-Status: Inappropriate +Signed-off-by: Andreas Cord-Landwehr <cordlandwehr@kde.org> +--- + winpr/tools/hash-cli/CMakeLists.txt | 2 +- + winpr/tools/makecert-cli/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/winpr/tools/hash-cli/CMakeLists.txt b/winpr/tools/hash-cli/CMakeLists.txt +index 9f8c7a8a0..b6d048fec 100644 +--- a/winpr/tools/hash-cli/CMakeLists.txt ++++ b/winpr/tools/hash-cli/CMakeLists.txt +@@ -43,7 +43,7 @@ set(${MODULE_PREFIX}_LIBS winpr) + + target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) + +-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets) ++install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools) + + if (WITH_DEBUG_SYMBOLS AND MSVC) + install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols) +diff --git a/winpr/tools/makecert-cli/CMakeLists.txt b/winpr/tools/makecert-cli/CMakeLists.txt +index 48fda5b5e..c7cf4bfaf 100644 +--- a/winpr/tools/makecert-cli/CMakeLists.txt ++++ b/winpr/tools/makecert-cli/CMakeLists.txt +@@ -46,7 +46,7 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr) + + set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") + +-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets) ++install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools) + if (WITH_DEBUG_SYMBOLS AND MSVC) + install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols) + endif() +-- +2.40.1 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch b/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch index 0f6f575d02..914f08087b 100644 --- a/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch +++ b/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch @@ -9,6 +9,8 @@ Update it for 2.0.0. Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh> Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + winpr/tools/makecert-cli/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb new file mode 100644 index 0000000000..537d19263d --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "FreeRDP RDP client & server library" +HOMEPAGE = "http://www.freerdp.com" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS = "openssl libusb1 uriparser cairo icu pkcs11-helper zlib jpeg" + +inherit pkgconfig cmake + +SRCREV = "708f3764897e06297469a7b0507b3c9ecc041ad7" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'pam pulseaudio wayland x11', d)} \ + ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'ffmpeg', '', d)} \ + gstreamer cups pcsc \ +" + +EXTRA_OECMAKE = " \ + -DRDTK_FORCE_STATIC_BUILD=ON \ + -DUWAC_FORCE_STATIC_BUILD=ON \ + -DWITH_ADD=ON \ + -DWITH_BINARY_VERSIONING=ON \ + -DWITH_CHANNELS=ON \ + -DWITH_CLIENT_CHANNELS=ON \ + -DWITH_JPEG=ON \ + -DWITH_PKCS11=ON \ + -DWITH_SERVER_CHANNELS=ON \ + -DWITH_SERVER=ON \ + -DPKG_CONFIG_RELOCATABLE=OFF \ + -DWITH_ALSA=OFF \ + -DWITH_CLIENT_SDL=OFF \ + -DWITH_SAMPLE=OFF \ + " + +X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" +PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XV=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XFIXES=ON -DWITH_XDAMAGE=ON -DWITH_XRANDR=ON -DWITH_XKBFILE=ON,-DWITH_X11=OFF -DWITH_SHADOW=OFF,${X11_DEPS}" +PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native libxkbcommon" +PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" +PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" +PACKAGECONFIG[fuse] = "-DWITH_FUSE=ON,-DWITH_FUSE=OFF,fuse3,fuse3" +PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" +PACKAGECONFIG[manpages] = "-DWITH_MANPAGES=ON,-DWITH_MANPAGES=OFF, libxslt-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[ffmpeg] = "-DWITH_DSP_FFMPEG=ON -DWITH_FFMPEG=ON -DWITH_SWSCALE=ON, -DWITH_DSP_FFMPEG=OFF -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF,ffmpeg" +PACKAGECONFIG[krb5] = "-DWITH_KRB5=ON -DWITH_KRB5_NO_NTLM_FALLBACK=OFF,-DWITH_KRB5=OFF,krb5" +PACKAGECONFIG[openh264] = "-DWITH_OPENH264=ON,-DWITH_OPENH264=OFF,openh264" +PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-icd-loader" +PACKAGECONFIG[lame] = "-DWITH_LAME=ON,-DWITH_LAME=OFF,lame" +PACKAGECONFIG[faad] = "-DWITH_FAAD=ON,-DWITH_FAAD=OFF,faad2" +PACKAGECONFIG[faac] = "-DWITH_FAAC=ON,-DWITH_FAAC=OFF,faac" + +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/include/freerdp/buildflags.h + sed -i -e 's|${WORKDIR}||g' ${B}/winpr/include/winpr/buildflags.h +} + +FILES:${PN} += "${datadir}" diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb index d446a31a5d..8de0e39ad7 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.2.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb @@ -3,7 +3,7 @@ DESCRIPTION = "FreeRDP RDP client & server library" HOMEPAGE = "http://www.freerdp.com" -DEPENDS = "openssl alsa-lib pcsc-lite" +DEPENDS = "openssl alsa-lib libusb1" SECTION = "net" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" @@ -13,27 +13,29 @@ inherit pkgconfig cmake gitpkgv PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "d2ba84a6885f57674098fe8e76c5f99d880e580d" -SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0 \ - file://winpr-makecert-Build-with-install-RPATH.patch \ -" +SRCREV = "a38c1be9eee39a9bc22b511fffe96e63fdf8ebe7" +SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ + file://winpr-makecert-Build-with-install-RPATH.patch \ + file://0001-Fix-const-qualifier-error.patch \ + file://0002-Do-not-install-tools-a-CMake-targets.patch \ + " S = "${WORKDIR}/git" EXTRA_OECMAKE += " \ -DWITH_ALSA=ON \ - -DWITH_PCSC=ON \ -DWITH_FFMPEG=OFF \ -DWITH_CUNIT=OFF \ -DWITH_NEON=OFF \ -DBUILD_STATIC_LIBS=OFF \ -DCMAKE_POSITION_INDEPENDANT_CODE=ON \ -DWITH_MANPAGES=OFF \ + -DPROXY_PLUGINDIR=${libdir}/freerdp/proxy/plugins \ " PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ - gstreamer cups \ + gstreamer cups pcsc server \ " X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" @@ -41,44 +43,49 @@ PACKAGECONFIG[x11] = "-DWITH_X11=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCU PACKAGECONFIG[wayland] = "-DWITH_WAYLAND=ON,-DWITH_WAYLAND=OFF,wayland wayland-native libxkbcommon" PACKAGECONFIG[directfb] = "-DWITH_DIRECTFB=ON,-DWITH_DIRECTFB=OFF,directfb" PACKAGECONFIG[pam] = "-DWITH_PAM=ON,-DWITH_PAM=OFF,libpam" +PACKAGECONFIG[pcsc] = "-DWITH_PCSC=ON,-DWITH_PCSC=OFF,pcsc-lite" PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaudio" PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" +PACKAGECONFIG[server] = "-DWITH_SERVER=ON,-DWITH_SERVER=OFF" PACKAGES =+ "libfreerdp" LEAD_SONAME = "libfreerdp.so" -FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" +FILES:libfreerdp = "${libdir}/lib*${SOLIBS}" PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/buildflags.h +} + # we will need winpr-makecert to generate TLS certificates -do_install_append () { +do_install:append () { install -d ${D}${bindir} install -m755 winpr/tools/makecert-cli/winpr-makecert ${D}${bindir} - rm -rf ${D}${libdir}/cmake rm -rf ${D}${libdir}/freerdp } -python populate_packages_prepend () { +python populate_packages:prepend () { freerdp_root = d.expand('${libdir}/freerdp') - do_split_packages(d, freerdp_root, '^(audin_.*)\.so$', + do_split_packages(d, freerdp_root, r'^(audin_.*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='libfreerdp-plugin-audin') - do_split_packages(d, freerdp_root, '^(rdpsnd_.*)\.so$', + do_split_packages(d, freerdp_root, r'^(rdpsnd_.*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='libfreerdp-plugin-rdpsnd') - do_split_packages(d, freerdp_root, '^(tsmf_.*)\.so$', + do_split_packages(d, freerdp_root, r'^(tsmf_.*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='libfreerdp-plugin-tsmf') - do_split_packages(d, freerdp_root, '^([^-]*)\.so$', + do_split_packages(d, freerdp_root, r'^([^-]*)\.so$', output_pattern='libfreerdp-plugin-%s', description='FreeRDP plugin %s', prepend=True, extra_depends='') diff --git a/meta-oe/recipes-support/function2/function2_4.1.0.bb b/meta-oe/recipes-support/function2/function2_4.2.4.bb index 56dc30acdc..98d05f6e25 100644 --- a/meta-oe/recipes-support/function2/function2_4.1.0.bb +++ b/meta-oe/recipes-support/function2/function2_4.2.4.bb @@ -3,10 +3,10 @@ DESCRIPTION = "Provides improved implementations of std::function." HOMEPAGE = "https://naios.github.io/function2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRCREV = "3a0746bf5f601dfed05330aefcb6854354fce07d" -PV .= "+git${SRCPV}" +SRCREV = "a354bd093d2b6e50c9325dbce84d20b4e77aabc6" +PV .= "+git" -SRC_URI += "gitsm://github.com/Naios/function2" +SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -14,7 +14,7 @@ inherit cmake inherit ptest # Installs some data to incorrect top-level /usr directory -do_install_append() { +do_install:append() { mkdir -p ${D}/${datadir}/function2 mv ${D}/${prefix}/Readme.md ${D}/${datadir}/function2/ mv ${D}/${prefix}/LICENSE.txt ${D}/${datadir}/function2/ diff --git a/meta-oe/recipes-support/gd/gd/0001-Fix-deprecared-function-prototypes.patch b/meta-oe/recipes-support/gd/gd/0001-Fix-deprecared-function-prototypes.patch new file mode 100644 index 0000000000..5ac5170721 --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/0001-Fix-deprecared-function-prototypes.patch @@ -0,0 +1,115 @@ +From 6379331cd0647fc6f149f55e4505a9a92e4f159f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 Aug 2022 22:43:26 -0700 +Subject: [PATCH] Fix deprecared function prototypes + +Fixes following errors: +error: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype] + +Upstream-Status: Submitted [https://github.com/libgd/libgd/pull/835] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/gd_nnquant.c | 32 +++++++------------------------- + src/gd_tiff.c | 4 +--- + 2 files changed, 8 insertions(+), 28 deletions(-) + +diff --git a/src/gd_nnquant.c b/src/gd_nnquant.c +index 8b9aa794..013f7160 100644 +--- a/src/gd_nnquant.c ++++ b/src/gd_nnquant.c +@@ -112,12 +112,7 @@ typedef struct { + + /* Initialise network in range (0,0,0,0) to (255,255,255,255) and set parameters + ----------------------------------------------------------------------- */ +-static void initnet(nnq, thepic, len, sample, colours) +-nn_quant *nnq; +-unsigned char *thepic; +-int len; +-int sample; +-int colours; ++static void initnet(nn_quant *nnq, unsigned char *thepic, int len, int sample, int colours) + { + register int i; + register int *p; +@@ -163,9 +158,7 @@ static void unbiasnet(nn_quant *nnq) + } + + /* Output colormap to unsigned char ptr in RGBA format */ +-static void getcolormap(nnq, map) +-nn_quant *nnq; +-unsigned char *map; ++static void getcolormap(nn_quant *nnq, unsigned char *map) + { + int i,j; + for(j=0; j < nnq->netsize; j++) { +@@ -232,9 +225,7 @@ static void inxbuild(nn_quant *nnq) + + /* Search for ABGR values 0..255 (after net is unbiased) and return colour index + ---------------------------------------------------------------------------- */ +-static unsigned int inxsearch(nnq, al,b,g,r) +-nn_quant *nnq; +-register int al, b, g, r; ++static unsigned int inxsearch(nn_quant *nnq, int al, int b, int g, int r) + { + register int i, j, dist, a, bestd; + register int *p; +@@ -306,9 +297,7 @@ register int al, b, g, r; + + /* Search for biased ABGR values + ---------------------------- */ +-static int contest(nnq, al,b,g,r) +-nn_quant *nnq; +-register int al,b,g,r; ++static int contest(nn_quant *nnq, int al, int b, int g, int r) + { + /* finds closest neuron (min dist) and updates freq */ + /* finds best neuron (min dist-bias) and returns position */ +@@ -362,9 +351,7 @@ register int al,b,g,r; + /* Move neuron i towards biased (a,b,g,r) by factor alpha + ---------------------------------------------------- */ + +-static void altersingle(nnq, alpha,i,al,b,g,r) +-nn_quant *nnq; +-register int alpha,i,al,b,g,r; ++static void altersingle(nn_quant *nnq, int alpha, int i,int al, int b, int g, int r) + { + register int *n; + +@@ -382,10 +369,7 @@ register int alpha,i,al,b,g,r; + /* Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in radpower[|i-j|] + --------------------------------------------------------------------------------- */ + +-static void alterneigh(nnq, rad,i,al,b,g,r) +-nn_quant *nnq; +-int rad,i; +-register int al,b,g,r; ++static void alterneigh(nn_quant *nnq, int rad, int i, int al,int b,int g, int r) + { + register int j,k,lo,hi,a; + register int *p, *q; +@@ -429,9 +413,7 @@ register int al,b,g,r; + /* Main Learning Loop + ------------------ */ + +-static void learn(nnq, verbose) /* Stu: N.B. added parameter so that main() could control verbosity. */ +-nn_quant *nnq; +-int verbose; ++static void learn(nn_quant *nnq, int verbose) /* Stu: N.B. added parameter so that main() could control verbosity. */ + { + register int i,j,al,b,g,r; + int radius,rad,alpha,step,delta,samplepixels; +diff --git a/src/gd_tiff.c b/src/gd_tiff.c +index 7f72b610..3d90e61a 100644 +--- a/src/gd_tiff.c ++++ b/src/gd_tiff.c +@@ -446,9 +446,7 @@ BGD_DECLARE(void) gdImageTiffCtx(gdImagePtr image, gdIOCtx *out) + } + + /* Check if we are really in 8bit mode */ +-static int checkColorMap(n, r, g, b) +-int n; +-uint16_t *r, *g, *b; ++static int checkColorMap(int n, uint16_t *r, uint16_t *g, uint16_t *b) + { + while (n-- > 0) + if (*r++ >= 256 || *g++ >= 256 || *b++ >= 256) diff --git a/meta-oe/recipes-support/gd/gd_2.3.0.bb b/meta-oe/recipes-support/gd/gd_2.3.3.bb index 554e07fd3c..cc2c1571e6 100644 --- a/meta-oe/recipes-support/gd/gd_2.3.0.bb +++ b/meta-oe/recipes-support/gd/gd_2.3.3.bb @@ -9,14 +9,15 @@ HOMEPAGE = "http://libgd.github.io/" SECTION = "libs" LICENSE = "GD" -LIC_FILES_CHKSUM = "file://COPYING;md5=8e5bc8627b9494741c905d65238c66b7" +LIC_FILES_CHKSUM = "file://COPYING;md5=ace63adfdac78400fc30fa22ee9c1bb1" DEPENDS = "freetype libpng jpeg zlib tiff" -SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ - " +SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1;protocol=https \ + file://0001-Fix-deprecared-function-prototypes.patch \ + " -SRCREV = "b079fa06223c3ab862c8f0eea58a968727971988" +SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc" S = "${WORKDIR}/git" @@ -33,21 +34,21 @@ EXTRA_OECONF += " --disable-rpath \ EXTRA_OEMAKE = 'LDFLAGS="${LDFLAGS}"' -DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized" +DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" -do_install_append_class-target() { +do_install:append:class-target() { # cleanup buildpaths from gdlib.pc sed -i -e 's#${STAGING_DIR_HOST}##g' ${D}${libdir}/pkgconfig/gdlib.pc } PACKAGES += "${PN}-tools" -FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-tools = "${bindir}/*" +FILES:${PN} = "${libdir}/lib*${SOLIBS}" +FILES:${PN}-tools = "${bindir}/*" PROVIDES += "${PN}-tools" -RPROVIDES_${PN}-tools = "${PN}-tools" -RDEPENDS_${PN}-tools = "perl perl-module-strict" +RPROVIDES:${PN}-tools = "${PN}-tools" +RDEPENDS:${PN}-tools = "perl perl-module-strict" CVE_PRODUCT = "libgd" diff --git a/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb index 118e3c50c8..4d97b1a419 100644 --- a/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb +++ b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Gengetopt is a tool to write command line option parsing code for SECTION = "utils" HOMEPAGE = "https://www.gnu.org/software/gengetopt/gengetopt.html" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb" SRC_URI = "${GNU_MIRROR}/gengetopt/${BPN}-${PV}.tar.xz" @@ -13,4 +13,6 @@ SRC_URI[sha256sum] = "b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab80 inherit autotools texinfo +CXXFLAGS += "-std=c++14" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb index 6eea0c00ec..a9a867b575 100644 --- a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb +++ b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gflags/gflags" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df" -SRC_URI = "git://github.com/gflags/gflags.git" +SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https" SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" S = "${WORKDIR}/git" @@ -13,8 +13,8 @@ inherit cmake EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}" PACKAGES =+ "${PN}-bash-completion" -FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh" +FILES:${PN}-bash-completion += "${bindir}/gflags_completions.sh" -RDEPENDS_${PN}-bash-completion = "bash bash-completion" +RDEPENDS:${PN}-bash-completion = "bash bash-completion" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch new file mode 100644 index 0000000000..3732c62cd0 --- /dev/null +++ b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch @@ -0,0 +1,33 @@ +From 176230435cb4b64ff7f2d97f77a04579ad9ca239 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 Feb 2023 13:14:14 -0800 +Subject: [PATCH] Change SleepForMilliseconds parameter from unsigned int -> long + +Fixes following error on 32bit platforms + +src/googletest.h:631:35: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'long' in initializer list [-Wc++11-narrowing] + const struct timespec req = {0, t * 1000 * 1000}; + ^~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/google/glog/pull/894] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/googletest.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/googletest.h b/src/googletest.h +index 5761361..836b06c 100644 +--- a/src/googletest.h ++++ b/src/googletest.h +@@ -625,7 +625,7 @@ class Thread { + #endif + }; + +-static inline void SleepForMilliseconds(unsigned t) { ++static inline void SleepForMilliseconds(long t) { + #ifndef GLOG_OS_WINDOWS + # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L + const struct timespec req = {0, t * 1000 * 1000}; +-- +2.39.2 + diff --git a/meta-oe/recipes-support/glog/glog/0001-Rework-CMake-glog-VERSION-management.patch b/meta-oe/recipes-support/glog/glog/0001-Rework-CMake-glog-VERSION-management.patch deleted file mode 100644 index f41a6c9724..0000000000 --- a/meta-oe/recipes-support/glog/glog/0001-Rework-CMake-glog-VERSION-management.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4ea11e0d7c0575316a6ccc07a931164ca29c3d2f Mon Sep 17 00:00:00 2001 -From: Corentin Le Molgat <corentinl@google.com> -Date: Mon, 29 Jan 2018 14:59:08 +0100 -Subject: [PATCH] Rework CMake glog VERSION management. - -- Use of Project version properties instead of custom variables -- fix missmatch between VERSION (build version) and SOVERSION (API version) -src: https://cmake.org/cmake/help/latest/prop_tgt/VERSION.html#prop_tgt:VERSION - -Upstream-Status: Backport [https://github.com/google/glog/commit/6b6e38a7d53fe01f42ce34384cf4ba4c50e8cb65] -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - CMakeLists.txt | 23 ++++++++--------------- - 1 file changed, 8 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7415eab..fb4e408 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,23 +8,16 @@ if (POLICY CMP0063) - cmake_policy (SET CMP0063 NEW) - endif (POLICY CMP0063) - --project (google-glog) -+project(glog VERSION 0.3.5 LANGUAGES C CXX) - - enable_testing () - --set (GLOG_MAJOR_VERSION 0) --set (GLOG_MINOR_VERSION 3) --set (GLOG_PATCH_VERSION 5) -- --set (GLOG_VERSION -- ${GLOG_MAJOR_VERSION}.${GLOG_MINOR_VERSION}.${GLOG_PATCH_VERSION}) -- - set (CPACK_PACKAGE_NAME glog) - set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "") --set (CPACK_PACKAGE_VERSION_MAJOR ${GLOG_MAJOR_VERSION}) --set (CPACK_PACKAGE_VERSION_MINOR ${GLOG_MINOR_VERSION}) --set (CPACK_PACKAGE_VERSION_PATCH ${GLOG_PATCH_VERSION}) --set (CPACK_PACKAGE_VERSION ${GLOG_VERSION}) -+set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) -+set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) -+set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) -+set (CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) - - option (WITH_GFLAGS "Use gflags" ON) - option (WITH_THREADS "Enable multithreading support" ON) -@@ -406,8 +399,8 @@ if (gflags_FOUND) - endif (NOT BUILD_SHARED_LIBS) - endif (gflags_FOUND) - --set_target_properties (glog PROPERTIES VERSION ${GLOG_MAJOR_VERSION}) --set_target_properties (glog PROPERTIES SOVERSION ${GLOG_VERSION}) -+set_target_properties (glog PROPERTIES VERSION ${PROJECT_VERSION}) -+set_target_properties (glog PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR}) - - if (WIN32) - target_compile_definitions (glog PUBLIC GLOG_NO_ABBREVIATED_SEVERITIES) -@@ -570,7 +563,7 @@ configure_package_config_file (glog-config.cmake.in - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - - write_basic_package_version_file (glog-config-version.cmake VERSION -- ${GLOG_VERSION} COMPATIBILITY SameMajorVersion) -+ ${PROJECT_VERSION} COMPATIBILITY SameMajorVersion) - - export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) - export (PACKAGE glog) --- -2.17.1 - diff --git a/meta-oe/recipes-support/glog/glog/0002-Find-Libunwind-during-configure.patch b/meta-oe/recipes-support/glog/glog/0002-Find-Libunwind-during-configure.patch deleted file mode 100644 index 15cf67fd2e..0000000000 --- a/meta-oe/recipes-support/glog/glog/0002-Find-Libunwind-during-configure.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -uNr a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake ---- a/cmake/FindLibunwind.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ b/cmake/FindLibunwind.cmake 2018-11-20 15:53:48.799078114 +0100 -@@ -0,0 +1,54 @@ -+# - Try to find libunwind -+# Once done this will define -+# -+# Libunwind_FOUND - system has libunwind -+# unwind - cmake target for libunwind -+ -+find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") -+include (CheckIncludeFile) -+check_include_file (libunwind.h HAVE_LIBUNWIND_H) -+check_include_file (unwind.h HAVE_UNWIND_H) -+ -+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") -+ set(LIBUNWIND_ARCH "arm") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") -+ set(LIBUNWIND_ARCH "aarch64") -+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "corei7-64") -+ set(LIBUNWIND_ARCH "x86_64") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") -+ set(LIBUNWIND_ARCH "x86") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64") -+ set(LIBUNWIND_ARCH "ppc64") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc") -+ set(LIBUNWIND_ARCH "ppc32") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") -+ set(LIBUNWIND_ARCH "mips") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^hppa") -+ set(LIBUNWIND_ARCH "hppa") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ia64") -+ set(LIBUNWIND_ARCH "ia64") -+endif() -+ -+find_library (UNWIND_LIBRARY_PLATFORM NAMES "unwind-${LIBUNWIND_ARCH}" DOC "unwind library platform") -+if (UNWIND_LIBRARY_PLATFORM) -+ set(HAVE_LIB_UNWIND "1") -+endif() -+ -+include(FindPackageHandleStandardArgs) -+# handle the QUIETLY and REQUIRED arguments and set Libunwind_FOUND to TRUE -+# if all listed variables are TRUE -+find_package_handle_standard_args(Libunwind DEFAULT_MSG -+ UNWIND_LIBRARY HAVE_LIBUNWIND_H HAVE_UNWIND_H HAVE_LIB_UNWIND) -+ -+mark_as_advanced (UNWIND_LIBRARY UNWIND_LIBRARY_PLATFORM) -+ -+if (Libunwind_FOUND) -+ add_library(unwind INTERFACE IMPORTED) -+ set_target_properties(unwind PROPERTIES -+ INTERFACE_LINK_LIBRARIES "${UNWIND_LIBRARY};${UNWIND_LIBRARY_PLATFORM}" -+ ) -+else() -+ message("Can't find libunwind library") -+endif() -diff -uNr a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2018-11-20 15:49:07.576278417 +0100 -+++ b/CMakeLists.txt 2018-11-20 15:49:32.106819928 +0100 -@@ -58,7 +58,6 @@ - check_include_file (execinfo.h HAVE_EXECINFO_H) - check_include_file (glob.h HAVE_GLOB_H) - check_include_file (inttypes.h HAVE_INTTYPES_H) --check_include_file (libunwind.h HAVE_LIBUNWIND_H) - check_include_file (memory.h HAVE_MEMORY_H) - check_include_file (pwd.h HAVE_PWD_H) - check_include_file (stdint.h HAVE_STDINT_H) -@@ -74,7 +73,6 @@ - check_include_file (syslog.h HAVE_SYSLOG_H) - check_include_file (ucontext.h HAVE_UCONTEXT_H) - check_include_file (unistd.h HAVE_UNISTD_H) --check_include_file (unwind.h HAVE_UNWIND_H) - - check_include_file_cxx ("ext/hash_map" HAVE_EXT_HASH_MAP) - check_include_file_cxx ("ext/hash_set" HAVE_EXT_HASH_SET) -@@ -109,10 +107,7 @@ - # snprintf as an inline function - check_symbol_exists (snprintf stdio.h HAVE_SNPRINTF) - --check_library_exists (unwind get_static_proc_name "" HAVE_LIB_UNWIND) -- --find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") --mark_as_advanced (UNWIND_LIBRARY) -+find_package(Libunwind) - - check_c_source_compiles (" - #include <stdlib.h> -@@ -376,9 +371,9 @@ - - set_target_properties (glog PROPERTIES POSITION_INDEPENDENT_CODE ON) - --if (UNWIND_LIBRARY) -- target_link_libraries (glog PUBLIC ${UNWIND_LIBRARY}) --endif (UNWIND_LIBRARY) -+if (Libunwind_FOUND) -+ target_link_libraries (glog PUBLIC unwind) -+endif (Libunwind_FOUND) - - if (HAVE_PTHREAD) - target_link_libraries (glog PUBLIC ${CMAKE_THREAD_LIBS_INIT}) -@@ -571,6 +566,7 @@ - install (FILES - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake - DESTINATION lib/cmake/glog) - - install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) -diff -uNr a/glog-config.cmake.in b/glog-config.cmake.in ---- a/glog-config.cmake.in 2018-11-20 15:49:07.576278417 +0100 -+++ b/glog-config.cmake.in 2018-11-20 15:52:32.330418489 +0100 -@@ -4,4 +4,6 @@ - - @gflags_DEPENDENCY@ - -+find_dependency (Libunwind) -+ - include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") diff --git a/meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch b/meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch deleted file mode 100644 index 641f70cb24..0000000000 --- a/meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -uNr a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2018-12-05 12:55:59.630792054 +0100 -+++ b/CMakeLists.txt 2018-12-05 13:00:22.922269200 +0100 -@@ -403,10 +403,15 @@ - - set_target_properties (glog PROPERTIES PUBLIC_HEADER "${GLOG_PUBLIC_H}") - -+set (_glog_CMake_BINDIR ${CMAKE_INSTALL_BINDIR}) -+set (_glog_CMake_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}) -+set (_glog_CMake_LIBDIR ${CMAKE_INSTALL_LIBDIR}) -+set (_glog_CMake_INSTALLDIR ${_glog_CMake_LIBDIR}/cmake/glog) -+ - target_include_directories (glog BEFORE PUBLIC - "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" - "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>" -- "$<INSTALL_INTERFACE:include>" -+ "$<INSTALL_INTERFACE:${_glog_CMake_INCLUDE_DIR}>" - PRIVATE ${CMAKE_CURRENT_BINARY_DIR} - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) - -@@ -543,10 +548,10 @@ - - install (TARGETS glog - EXPORT glog-targets -- RUNTIME DESTINATION bin -- PUBLIC_HEADER DESTINATION include/glog -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ RUNTIME DESTINATION ${_glog_CMake_BINDIR} -+ PUBLIC_HEADER DESTINATION ${_glog_CMake_INCLUDE_DIR}/glog -+ LIBRARY DESTINATION ${_glog_CMake_LIBDIR} -+ ARCHIVE DESTINATION ${_glog_CMake_LIBDIR}) - - if (gflags_FOUND) - set (gflags_DEPENDENCY "find_dependency (gflags ${gflags_VERSION})") -@@ -554,7 +559,7 @@ - - configure_package_config_file (glog-config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake -- INSTALL_DESTINATION lib/cmake/glog -+ INSTALL_DESTINATION ${_glog_CMake_INSTALLDIR} - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - - write_basic_package_version_file (glog-config-version.cmake VERSION -@@ -567,6 +572,7 @@ - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake -- DESTINATION lib/cmake/glog) -+ DESTINATION ${_glog_CMake_INSTALLDIR}) - --install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) -+install (EXPORT glog-targets NAMESPACE glog:: DESTINATION -+ ${_glog_CMake_INSTALLDIR}) -diff -uNr a/glog-config.cmake.in b/glog-config.cmake.in ---- a/glog-config.cmake.in 2018-12-05 12:55:59.630792054 +0100 -+++ b/glog-config.cmake.in 2018-12-05 13:05:19.547196843 +0100 -@@ -4,6 +4,7 @@ - - @gflags_DEPENDENCY@ - -+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") - find_dependency (Libunwind) - - include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") diff --git a/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-oe/recipes-support/glog/glog/libexecinfo.patch new file mode 100644 index 0000000000..a791a40dbc --- /dev/null +++ b/meta-oe/recipes-support/glog/glog/libexecinfo.patch @@ -0,0 +1,40 @@ +From 19d00c15710840910a7397252c14d612746631fe Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 8 Mar 2021 14:58:40 -0800 +Subject: [PATCH] Link libexecinfo if its found, this is needed for musl based + systems + +Fixes +ld: libglog.so.0.4.0: undefined reference to `backtrace' +| collect2: error: ld returned 1 exit status + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 846b444..1553358 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -162,6 +162,7 @@ cmake_pop_check_state () + check_cxx_symbol_exists (snprintf cstdio HAVE_SNPRINTF) + + check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) ++check_library_exists (execinfo backtrace "" HAVE_EXECINFO) + + check_cxx_source_compiles (" + #include <cstdlib> +@@ -629,6 +630,10 @@ if (Unwind_FOUND) + set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})") + endif (Unwind_FOUND) + ++if (HAVE_EXECINFO) ++ target_link_libraries (glog PUBLIC execinfo) ++endif (HAVE_EXECINFO) ++ + if (HAVE_DBGHELP) + target_link_libraries (glog PRIVATE dbghelp) + set (glog_libraries_options_for_static_linking "${glog_libraries_options_for_static_linking} -ldbghelp") diff --git a/meta-oe/recipes-support/glog/glog_0.3.5.bb b/meta-oe/recipes-support/glog/glog_0.3.5.bb deleted file mode 100644 index 56bf515544..0000000000 --- a/meta-oe/recipes-support/glog/glog_0.3.5.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "The glog library implements application-level logging. This \ -library provides logging APIs based on C++-style streams and various helper \ -macros." -HOMEPAGE = "https://github.com/google/glog" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" - -SRC_URI = " \ - git://github.com/google/glog.git;nobranch=1 \ - file://0001-Rework-CMake-glog-VERSION-management.patch \ - file://0002-Find-Libunwind-during-configure.patch \ - file://0003-installation-path-fix.patch \ -" - -SRCREV = "a6a166db069520dbbd653c97c2e5b12e08a8bb26" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ?= "shared unwind" -PACKAGECONFIG_remove_riscv64 = "unwind" -PACKAGECONFIG_remove_riscv32 = "unwind" - -PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" -PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," - -do_configure_append() { - # remove WORKDIR info to improve reproducibility - if [ -f "${B}/config.h" ] ; then - sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h - fi -} diff --git a/meta-oe/recipes-support/glog/glog_0.6.0.bb b/meta-oe/recipes-support/glog/glog_0.6.0.bb new file mode 100644 index 0000000000..ec39604f44 --- /dev/null +++ b/meta-oe/recipes-support/glog/glog_0.6.0.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "The glog library implements application-level logging. This \ +library provides logging APIs based on C++-style streams and various helper \ +macros." +HOMEPAGE = "https://github.com/google/glog" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" + +SRC_URI = " \ + git://github.com/google/glog.git;branch=master;protocol=https \ + file://libexecinfo.patch \ + file://0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch \ +" + +SRCREV = "b33e3bad4c46c8a6345525fd822af355e5ef9446" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ?= "shared unwind 64bit-atomics" +PACKAGECONFIG:remove:riscv64 = "unwind" +PACKAGECONFIG:remove:riscv32 = "unwind 64bit-atomics" +PACKAGECONFIG:remove:mipsarch = "64bit-atomics" +PACKAGECONFIG:remove:armv5 = "64bit-atomics" +PACKAGECONFIG:remove:armv6 = "64bit-atomics" + +PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo" +PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo" + +PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" +PACKAGECONFIG[execinfo] = ",,libexecinfo" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," +PACKAGECONFIG[64bit-atomics] = ",-DCMAKE_CXX_STANDARD_LIBRARIES='-latomic',," + +do_configure:append() { + # remove WORKDIR info to improve reproducibility + if [ -f "${B}/config.h" ] ; then + sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h + fi +} + +FILES:${PN}-dev += "${datadir}/${BPN}/cmake" diff --git a/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb b/meta-oe/recipes-support/gnulib/gnulib_202401.bb index 146747eee1..41675d3587 100644 --- a/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb +++ b/meta-oe/recipes-support/gnulib/gnulib_202401.bb @@ -8,23 +8,20 @@ as a collection of portable idioms to be used in other projects." HOMEPAGE = "http://www.gnu.org/software/gnulib/" SECTION = "devel" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5" -SRCREV = "0d6e3307bbdb8df4d56043d5f373eeeffe4cbef3" +SRCREV = "c99c8d491850dc3a6e0b8604a2729d8bc5c0eff1" -SRC_URI = "git://git.sv.gnu.org/gnulib.git \ +SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=stable-${PV};protocol=https \ " S = "${WORKDIR}/git" -inherit utils - do_install () { - cd ${S} - check_git_config - git checkout master - git clone ${S} ${D}/${datadir}/gnulib + install -d ${D}/${datadir}/gnulib + cp --no-preserve=ownership --recursive ${S}/* ${D}/${datadir}/gnulib/ + cp --no-preserve=ownership --recursive ${S}/.git ${D}/${datadir}/gnulib/ } do_patch[noexec] = "1" diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.3.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.3.bb new file mode 100644 index 0000000000..f945a30f36 --- /dev/null +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.3.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "A microbenchmark support library" +HOMEPAGE = "https://github.com/google/benchmark" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main" +SRCREV = "344117638c8ff7e239044fd0fa7085839fc03021" + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = " \ + -DBUILD_SHARED_LIBS=yes \ + -DBENCHMARK_ENABLE_TESTING=no \ + -DCMAKE_BUILD_TYPE=Release \ +" + +inherit cmake + +FILES:${PN}-dev += "${libdir}/cmake" diff --git a/meta-oe/recipes-support/gosu/gosu_1.17.bb b/meta-oe/recipes-support/gosu/gosu_1.17.bb new file mode 100644 index 0000000000..a29d6bce45 --- /dev/null +++ b/meta-oe/recipes-support/gosu/gosu_1.17.bb @@ -0,0 +1,29 @@ +SUMMARY = "Simple Go-based setuid+setgid+setgroups+exec" +HOMEPAGE = "https://github.com/tianon/gosu" +DESCRIPTION = "This is a simple tool grown out of the simple fact that su and sudo have very strange and often annoying TTY and signal-forwarding behavior." +LICENSE = "Apache-2.0 " +LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +GO_IMPORT = "github.com/tianon/gosu" +SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \ + git://github.com/moby/sys;name=user;destsuffix=${S}/src/github.com/moby/sys;branch=main;protocol=https \ + git://github.com/golang/sys;name=sys;destsuffix=${S}/src/golang.org/x/sys;branch=master;protocol=https \ +" +SRCREV = "0d1847490b448a17eb347e5e357f2c0478df87ad" +#v0.1.0 +SRCREV_user = "c0711cde08c8fa33857a2c28721659267f49b5e2" +#v0.1.0 +SRCREV_sys = "95e765b1cc43ac521bd4fd501e00774e34401449" + +SRCREV_FORMAT .= "_user_sys" + +inherit go + +CGO_ENABLED = "1" + +do_compile:prepend() { + # New Go versions has Go modules support enabled by default + export GO111MODULE=off +} + +RDEPENDS:${PN}-dev += "bash" diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch deleted file mode 100644 index 2fd21c2783..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch +++ /dev/null @@ -1,31 +0,0 @@ -From aa0a63209af6813d87255ec3ab339f2dbbf27d6d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 6 Mar 2017 13:38:46 -0800 -Subject: [PATCH] Support Atomic ops on clang - -clang pretends to be gcc 4.2 which is a lie -it actually supports a lot more features then -gcc 4.2, here it depends on gcc 4.7 to enable -the atomics and fails for clang - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - ---- - src/base/atomicops.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/base/atomicops.h b/src/base/atomicops.h -index dac95be..390733c 100644 ---- a/src/base/atomicops.h -+++ b/src/base/atomicops.h -@@ -124,7 +124,7 @@ - #include "base/atomicops-internals-linuxppc.h" - #elif defined(__GNUC__) && defined(__mips__) - #include "base/atomicops-internals-mips.h" --#elif defined(__GNUC__) && GCC_VERSION >= 40700 -+#elif defined(__GNUC__) && GCC_VERSION >= 40700 || defined(__clang__) - #include "base/atomicops-internals-gcc.h" - #elif defined(__clang__) && CLANG_VERSION >= 30400 - #include "base/atomicops-internals-gcc.h" diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch index ab3ceb964f..2ea54e48c9 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch @@ -12,15 +12,15 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 70b49a3..8154c5c 100644 +index 68fd51c..4cb71fe 100644 --- a/configure.ac +++ b/configure.ac -@@ -51,6 +51,8 @@ case "$host" in - *-cygwin*) default_enable_heap_checker=no; default_enable_cpu_profiler=no;; - *-freebsd*) default_enable_heap_checker=no;; - *-darwin*) default_enable_heap_checker=no;; +@@ -53,6 +53,8 @@ case "$host" in + need_nanosleep=no;; + *-cygwin*) default_enable_cpu_profiler=no;; + *-linux*) default_enable_heap_checker=yes; heap_checker_supported=yes;; + *-musl*) default_enable_heap_checker=no; default_enable_heap_profiler=no; + default_enable_debugalloc=no; default_enable_libunwind=no; esac - # Currently only backtrace works on s390. + # Currently only backtrace works on s390 and OSX. diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch deleted file mode 100644 index cb4ead3176..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 696674a800cb6d2070897a565b92d7e63022a8f1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 16 Jul 2017 15:51:28 -0700 -Subject: [PATCH] fix build with musl libc - -Patch from https://github.com/gperftools/gperftools/pull/765/ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/malloc_hook_mmap_linux.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/malloc_hook_mmap_linux.h b/src/malloc_hook_mmap_linux.h -index e2efb05..66b3110 100644 ---- a/src/malloc_hook_mmap_linux.h -+++ b/src/malloc_hook_mmap_linux.h -@@ -46,6 +46,10 @@ - #include <errno.h> - #include "base/linux_syscall_support.h" - -+#ifndef __GLIBC__ -+typedef off64_t __off64_t; -+#endif -+ - // The x86-32 case and the x86-64 case differ: - // 32b has a mmap2() syscall, 64b does not. - // 64b and 32b have different calling conventions for mmap(). -@@ -175,7 +179,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags, - return result; - } - --# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH) -+# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)) - - extern "C" void* mmap(void *start, size_t length, int prot, int flags, - int fd, off_t offset) __THROW { --- -2.17.1 - diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch new file mode 100644 index 0000000000..1142df0be9 --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch @@ -0,0 +1,59 @@ +From d675808d300278a9e7143428cfecf3fda61cc9a2 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 21 Mar 2024 10:59:29 +0000 +Subject: [PATCH] src/mmap_hook.cc: Fix build for 32bit machine + +Fixed build error on 32bit machine: + +../git/src/mmap_hook.cc:309:31: error: static assertion failed + 309 | static_assert(sizeof(int32_t) == sizeof(off_t), ""); + +This is because oe's off_t is 64bit on both 32 and 64bit system, which is the +default value of glibc, so the assertion would be failed on 32bit system, and +remove mmap() and mmap64() to fix the redefined error. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + src/mmap_hook.cc | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/src/mmap_hook.cc b/src/mmap_hook.cc +index 0a0f62f..27425e4 100644 +--- a/src/mmap_hook.cc ++++ b/src/mmap_hook.cc +@@ -302,30 +302,8 @@ void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t off) _ + + #define HOOKED_MMAP + +-#elif defined(DEFINED_DO_MMAP) && defined(__linux__) && !GOOD_LINUX_SYSTEM +-// Linuxes with 32-bit off_t. We're being careful with mmap64 being +-// 64-bit and mmap being 32-bit. +- +-static_assert(sizeof(int32_t) == sizeof(off_t), ""); +- +-extern "C" void* mmap64(void* start, size_t length, int prot, int flags, int fd, int64_t off) +- __THROW ATTRIBUTE_SECTION(malloc_hook); +-extern "C" void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t off) +- __THROW ATTRIBUTE_SECTION(malloc_hook); +- +-void* mmap(void *start, size_t length, int prot, int flags, int fd, off_t off) __THROW { +- return do_mmap_with_hooks(start, length, prot, flags, fd, off); +-} +- +-void* mmap64(void *start, size_t length, int prot, int flags, int fd, int64_t off) __THROW { +- return do_mmap_with_hooks(start, length, prot, flags, fd, off); +-} +- +-#define HOOKED_MMAP +- + #endif // Linux/32-bit off_t case + +- + #ifdef HOOKED_MMAP + + extern "C" int munmap(void* start, size_t length) __THROW ATTRIBUTE_SECTION(malloc_hook); +-- +2.35.5 + diff --git a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch b/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch index c3c5784186..15eacc8993 100644 --- a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch +++ b/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch @@ -12,11 +12,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> configure.ac | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/configure.ac b/configure.ac -index 8154c5c..063b260 100644 --- a/configure.ac +++ b/configure.ac -@@ -69,6 +69,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __PPC64__])], +@@ -76,6 +76,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [re [default_enable_libunwind=yes default_tcmalloc_pagesize=8]) diff --git a/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch new file mode 100644 index 0000000000..800fa3a84f --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch @@ -0,0 +1,61 @@ +From 328805fd16930deefda400a77e9c2c5d17d04d29 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 13 Mar 2021 00:42:25 -0800 +Subject: [PATCH] Compatibility fixes for musl. + +--- +Upstream-Status: Pending + + src/getpc.h | 4 ++++ + src/stacktrace_powerpc-linux-inl.h | 8 ++++++-- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/getpc.h b/src/getpc.h +index 87d18b6..c569731 100644 +--- a/src/getpc.h ++++ b/src/getpc.h +@@ -68,6 +68,10 @@ + typedef ucontext ucontext_t; + #endif + ++#if defined(__powerpc__) && !defined(PT_NIP) ++#define PT_NIP 32 ++#endif ++ + namespace tcmalloc { + namespace getpc { + +diff --git a/src/stacktrace_powerpc-linux-inl.h b/src/stacktrace_powerpc-linux-inl.h +index 883e7d2..212bd25 100644 +--- a/src/stacktrace_powerpc-linux-inl.h ++++ b/src/stacktrace_powerpc-linux-inl.h +@@ -186,7 +186,7 @@ static int GET_STACK_TRACE_OR_FRAMES { + ucontext_t uc; + // We don't care about the rest, since the IP value is at 'uc' field. + } *sigframe = reinterpret_cast<signal_frame_64*>(current); +- result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[PT_NIP]; ++ result[n] = (void*) sigframe->uc.uc_mcontext.gp_regs[32]; + } + #else + if (sigtramp32_vdso && (sigtramp32_vdso == current->return_addr)) { +@@ -196,7 +196,7 @@ static int GET_STACK_TRACE_OR_FRAMES { + mcontext_t mctx; + // We don't care about the rest, since IP value is at 'mctx' field. + } *sigframe = reinterpret_cast<signal_frame_32*>(current); +- result[n] = (void*) sigframe->mctx.gregs[PT_NIP]; ++ result[n] = (void*) sigframe->mctx.gregs[32]; + } else if (sigtramp32_rt_vdso && (sigtramp32_rt_vdso == current->return_addr)) { + struct rt_signal_frame_32 { + char dummy[64 + 16]; +@@ -204,7 +204,11 @@ static int GET_STACK_TRACE_OR_FRAMES { + ucontext_t uc; + // We don't care about the rest, since IP value is at 'uc' field.A + } *sigframe = reinterpret_cast<rt_signal_frame_32*>(current); ++#if defined(__GLIBC__) + result[n] = (void*) sigframe->uc.uc_mcontext.uc_regs->gregs[PT_NIP]; ++#else ++ result[n] = (void*) sigframe->uc.uc_mcontext.gregs[32]; ++#endif + } + #endif + diff --git a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch b/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch deleted file mode 100644 index 10274a6dec..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 259b420444c52463795b4b582a2ab7511149eea7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 16 Oct 2017 21:26:40 -0700 -Subject: [PATCH] sgidef.h does not exist on musl and its not needed to compile - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - ---- - src/base/linux_syscall_support.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/base/linux_syscall_support.h b/src/base/linux_syscall_support.h -index 70431ca..b23ca59 100644 ---- a/src/base/linux_syscall_support.h -+++ b/src/base/linux_syscall_support.h -@@ -164,7 +164,7 @@ extern "C" { - #include <endian.h> - #include <fcntl.h> - --#ifdef __mips__ -+#if defined(__mips__) && defined(__glibc__) - /* Include definitions of the ABI currently in use. */ - #include <sgidefs.h> - #endif diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.15.bb b/meta-oe/recipes-support/gperftools/gperftools_2.15.bb new file mode 100644 index 0000000000..bd3b2afaea --- /dev/null +++ b/meta-oe/recipes-support/gperftools/gperftools_2.15.bb @@ -0,0 +1,65 @@ +SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" +HOMEPAGE = "https://github.com/gperftools/gperftools" +DESCRIPTION = "The gperftools, previously called google-perftools, package contains some \ +utilities to improve and analyze the performance of C++ programs. \ +Included are an optimized thread-caching malloc() and cpu and heap profiling utilities. \ +" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" + +DEPENDS:append:libc-musl = " libucontext" + +SRCREV = "365060c4213a48adb27f63d5dfad41b3dfbdd62e" +SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https \ + file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ + file://disable_libunwind_aarch64.patch \ + file://0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch \ + " + +SRC_URI:append:libc-musl = " file://ppc-musl.patch" + +inherit autotools + +S = "${WORKDIR}/git" + +# On mips, we have the following error. +# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 +# Segmentation fault (core dumped) +COMPATIBLE_HOST:mipsarch = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" + +# Disable thumb1 +# {standard input}: Assembler messages: +# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' +# Makefile:4538: recipe for target 'src/base/libtcmalloc_la-linuxthreads.lo' failed +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:toolchain-clang:arm = "arm" + +EXTRA_OECONF:append:libc-musl:powerpc64le = " --disable-cpu-profiler" +EXTRA_OECONF:append:libc-musl:powerpc = " --disable-cpu-profiler" +PACKAGECONFIG ?= "libunwind static" +PACKAGECONFIG:remove:arm:libc-musl = "libunwind" +PACKAGECONFIG:remove:riscv64 = "libunwind" +PACKAGECONFIG:remove:riscv32 = "libunwind" + +PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" +PACKAGECONFIG[static] = "--enable-static,--disable-static," + +PACKAGE_BEFORE_PN += "libtcmalloc-minimal" +FILES:libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" + +# pprof tool requires Getopt::long and POSIX perl5 modules. +# Also runs `objdump` on each cpuprofile data file +RDEPENDS:${PN} += " \ + binutils \ + curl \ + perl-module-carp \ + perl-module-cwd \ + perl-module-getopt-long \ + perl-module-overloading \ + perl-module-posix \ +" + +RDEPENDS:${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.8.bb b/meta-oe/recipes-support/gperftools/gperftools_2.8.bb deleted file mode 100644 index 662777b473..0000000000 --- a/meta-oe/recipes-support/gperftools/gperftools_2.8.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Fast, multi-threaded malloc() and nifty performance analysis tools" -HOMEPAGE = "https://github.com/gperftools/gperftools" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" - -SRCREV = "180bfa10d7cb38e8b3784d60943d50e8fcef0dcb" -SRC_URI = "git://github.com/gperftools/gperftools \ - file://0001-Support-Atomic-ops-on-clang.patch \ - file://0001-fix-build-with-musl-libc.patch \ - file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \ - file://disable_libunwind_aarch64.patch \ - file://sgidef.patch \ - " - -inherit autotools - -S = "${WORKDIR}/git" - -# On mips, we have the following error. -# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 -# Segmentation fault (core dumped) -COMPATIBLE_HOST_mipsarch = "null" -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" - -# Disable thumb1 -# {standard input}: Assembler messages: -# {standard input}:434: Error: lo register required -- `ldr pc,[sp]' -# Makefile:4538: recipe for target 'src/base/libtcmalloc_la-linuxthreads.lo' failed -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_toolchain-clang_arm = "arm" - -PACKAGECONFIG ?= "libunwind static" -PACKAGECONFIG_remove_arm_libc-musl = "libunwind" -PACKAGECONFIG_remove_riscv64 = "libunwind" -PACKAGECONFIG_remove_riscv32 = "libunwind" - -PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" -PACKAGECONFIG[static] = "--enable-static,--disable-static," - -PACKAGE_BEFORE_PN += "libtcmalloc-minimal" -FILES_libtcmalloc-minimal = "${libdir}/libtcmalloc_minimal*${SOLIBS} ${libdir}/libtcmalloc_minimal_debug*${SOLIBS}" - -# pprof tool requires Getopt::long and POSIX perl5 modules. -# Also runs `objdump` on each cpuprofile data file -RDEPENDS_${PN} += "binutils perl-module-getopt-long perl-module-posix" - -RDEPENDS_${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" - diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb index 600b25df86..31503e9c62 100644 --- a/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-oe/recipes-support/gpm/gpm_git.bb @@ -4,16 +4,15 @@ for the console and xterm, with sample clients included \ (emacs, etc)." HOMEPAGE = "https://www.nico.schottelius.org/software/gpm" SECTION = "console/utils" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" PV = "1.99.7+git${SRCREV}" -PR = "r2" SRCREV = "e82d1a653ca94aa4ed12441424da6ce780b1e530" DEPENDS = "ncurses bison-native" -SRC_URI = "git://github.com/telmich/gpm;protocol=git \ +SRC_URI = "git://github.com/telmich/gpm;protocol=https;branch=master \ file://init \ file://gpm.service.in \ " @@ -25,15 +24,15 @@ inherit autotools-brokensep update-rc.d systemd texinfo INITSCRIPT_NAME = "gpm" INITSCRIPT_PARAMS = "defaults" -do_configure_prepend() { +do_configure:prepend() { (cd ${S};./autogen.sh;cd -) } -do_install_append () { +do_install:append () { install -d ${D}${systemd_system_unitdir} sed 's:@bindir@:${sbindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service install -D -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/gpm ln -s libgpm.so.2 ${D}${libdir}/libgpm.so } -SYSTEMD_SERVICE_${PN} = "gpm.service" +SYSTEMD_SERVICE:${PN} = "gpm.service" diff --git a/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch index 09a60127a4..5ef39ea33d 100644 --- a/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch +++ b/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Makefile: Append instead of overriding LDFLAGS Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch b/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch new file mode 100644 index 0000000000..1c0f3bfbae --- /dev/null +++ b/meta-oe/recipes-support/gradm/gradm/0001-make-Define-SBINDIR-flag.patch @@ -0,0 +1,69 @@ +From 12bc62ac26df012fc143913b6e046a3cf5127db2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 23 Apr 2022 09:20:49 -0700 +Subject: [PATCH] make: Define SBINDIR flag + +Provides a facility to control install locations of /sbin elements from +environment + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index deed94c..9190fe9 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,6 +25,7 @@ MKNOD=/bin/mknod + CC=/usr/bin/gcc + FIND=/usr/bin/find + LIBS := $(shell if [ "`uname -m`" != "sparc64" -a "`uname -m`" != "x86_64" ]; then echo "-lfl" ; else echo "" ; fi) ++SBINDIR=/sbin + OPT_FLAGS := -O2 + # for older versions of grsecurity, comment the above line and uncomment the below: + #OPT_FLAGS := $(shell if [ "`uname -m`" != "sparc64" ] && [ "`uname -m`" != "x86_64" ]; then echo "-O2" ; else echo "-O2 -m64" ; fi) +@@ -136,15 +137,15 @@ lex.learn_pass1.o: lex.learn_pass1.c learn_pass1.tab.h + lex.learn_pass2.o: lex.learn_pass2.c learn_pass2.tab.h + + install: $(GRADM_BIN) gradm.8 policy grlearn +- @mkdir -p $(DESTDIR)/sbin ++ @mkdir -p $(DESTDIR)$(SBINDIR) + @echo "Installing gradm..." +- @$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)/sbin ++ @$(INSTALL) -m 0755 $(GRADM_BIN) $(DESTDIR)$(SBINDIR) + @if [ -f $(GRADM_PAM) ] ; then \ + echo "Installing gradm_pam..." ; \ +- $(INSTALL) -m 4755 $(GRADM_PAM) $(DESTDIR)/sbin ; \ ++ $(INSTALL) -m 4755 $(GRADM_PAM) $(DESTDIR)$(SBINDIR) ; \ + fi + @echo "Installing grlearn..." +- @$(INSTALL) -m 0700 grlearn $(DESTDIR)/sbin ++ @$(INSTALL) -m 0700 grlearn $(DESTDIR)$(SBINDIR) + @mkdir -p -m 700 $(DESTDIR)$(GRSEC_DIR) + @if [ ! -f $(DESTDIR)$(GRSEC_DIR)/policy ] ; then \ + if [ -f $(DESTDIR)$(GRSEC_DIR)/acl ] ; then \ +@@ -170,15 +171,15 @@ install: $(GRADM_BIN) gradm.8 policy grlearn + echo "KERNEL==\"grsec\", MODE=\"0622\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ + echo "LABEL=\"permissions_end\"" >> $(DESTDIR)/etc/udev/rules.d/80-grsec.rules ; \ + fi +- @if [ -f $(DESTDIR)/sbin/udevadm ] ; then \ +- $(DESTDIR)/sbin/udevadm trigger --action=change ; \ ++ @if [ -f $(DESTDIR)$(SBINDIR)/udevadm ] ; then \ ++ $(DESTDIR)$(SBINDIR)/udevadm trigger --action=change ; \ + fi + @echo "Installing gradm manpage..." + @mkdir -p $(DESTDIR)$(MANDIR)/man8 + @$(INSTALL) -m 0644 gradm.8 $(DESTDIR)$(MANDIR)/man8/$(GRADM_BIN).8 +- @if [ -x /sbin/$(GRADM_BIN) ] ; then \ ++ @if [ -x $(SBINDIR)/$(GRADM_BIN) ] ; then \ + if [ -z $(DESTDIR) ] && [ ! -f $(GRSEC_DIR)/pw ] ; then \ +- /sbin/$(GRADM_BIN) -P ; \ ++ $(SBINDIR)/$(GRADM_BIN) -P ; \ + fi \ + fi + @true +-- +2.36.0 + diff --git a/meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb index 7ed46f82c5..c82b529f96 100644 --- a/meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb +++ b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb @@ -7,16 +7,16 @@ via a password to the kernel and parsing rules to be passed to the \ kernel" HOMEPAGE = "http://grsecurity.net/index.php" SECTION = "admin" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b" DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://grsecurity.net/stable/${BP}.tar.gz \ file://0001-Makefile-remove-strip.patch \ file://0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch \ + file://0001-make-Define-SBINDIR-flag.patch \ " -SRC_URI[md5sum] = "5099c715433981d5a3eed8ded7c5bbc0" -SRC_URI[sha256sum] = "d3a0b6383ff97a2054941d71133c737efae66afdd8eef59346c031ae15c75ff3" +SRC_URI[sha256sum] = "2459290f367a47c8a1ce4ea2ec08359799ea33dc15ed4436439596ce88284fb9" S = "${WORKDIR}/gradm" @@ -35,6 +35,7 @@ do_compile() { do_install() { oe_runmake 'CC=${CC}' \ 'DESTDIR=${D}' \ + 'SBINDIR=${base_sbindir}' \ 'LIBS=' \ 'LLEX=${STAGING_BINDIR_NATIVE}/lex' \ 'FLEX=${STAGING_BINDIR_NATIVE}/flex' \ @@ -45,6 +46,6 @@ do_install() { rm -rf ${D}/dev } -pkg_postinst_ontarget_${PN}() { +pkg_postinst_ontarget:${PN}() { /bin/mknod -m 0622 /dev/grsec c 1 13 } diff --git a/meta-oe/recipes-support/gsl/gsl.inc b/meta-oe/recipes-support/gsl/gsl.inc index 40613930b5..d0fa9344eb 100644 --- a/meta-oe/recipes-support/gsl/gsl.inc +++ b/meta-oe/recipes-support/gsl/gsl.inc @@ -1,9 +1,12 @@ DESCRIPTION = "GNU Scientific Library" HOMEPAGE = "http://www.gnu.org/software/gsl/" SECTION = "libs" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit autotools pkgconfig binconfig LEAD_SONAME = "libgsl.so" + +# Uses fpu_control.h which is glibc only header see ieee-utils/fp-gnuppc.c +COMPATIBLE_HOST:libc-musl:powerpc = "null" diff --git a/meta-oe/recipes-support/gsl/gsl_2.6.bb b/meta-oe/recipes-support/gsl/gsl_2.6.bb deleted file mode 100644 index 367a08321e..0000000000 --- a/meta-oe/recipes-support/gsl/gsl_2.6.bb +++ /dev/null @@ -1,5 +0,0 @@ -include gsl.inc - -SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" -SRC_URI[md5sum] = "bda73a3dd5ff2f30b5956764399db6e7" -SRC_URI[sha256sum] = "b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8" diff --git a/meta-oe/recipes-support/gsl/gsl_2.7.1.bb b/meta-oe/recipes-support/gsl/gsl_2.7.1.bb new file mode 100644 index 0000000000..a4dc1437e2 --- /dev/null +++ b/meta-oe/recipes-support/gsl/gsl_2.7.1.bb @@ -0,0 +1,4 @@ +include gsl.inc + +SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" +SRC_URI[sha256sum] = "dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b" diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch new file mode 100644 index 0000000000..6ae02deb24 --- /dev/null +++ b/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch @@ -0,0 +1,96 @@ +From fa923a50790c907725c822b2fc7d63b2da62b4ad Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 12 Mar 2023 13:34:55 -0700 +Subject: [PATCH] Simplify check for gethostbyname_r() + +This helps build fix with musl. + +Imported from Alpine: https://git.alpinelinux.org/aports/tree/community/gsoap/musl-fixes.patch + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + gsoap/stdsoap2.c | 6 ++---- + gsoap/stdsoap2.cpp | 10 ++-------- + 2 files changed, 4 insertions(+), 12 deletions(-) + +diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c +index 654a1e1..fa31d02 100644 +--- a/gsoap/stdsoap2.c ++++ b/gsoap/stdsoap2.c +@@ -5463,7 +5463,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && defined(HAVE_GETHOSTBYNAME_R) ++#elif defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -5478,8 +5478,6 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + if (!tmpbuf) + break; + } +-#elif defined(HAVE_GETHOSTBYNAME_R) +- hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); + #elif defined(VXWORKS) + /* vxWorks compatible */ + /* If the DNS resolver library resolvLib has been configured in the vxWorks +@@ -23112,7 +23110,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if 1 + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); +diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp +index 654a1e1..5fd5fd6 100644 +--- a/gsoap/stdsoap2.cpp ++++ b/gsoap/stdsoap2.cpp +@@ -5430,7 +5430,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + { + #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) + struct hostent_data ht_data; +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && defined(HAVE_GETHOSTBYNAME_R) ++#elif defined(HAVE_GETHOSTBYNAME_R) + int r; + char *tmpbuf = soap->tmpbuf; + size_t tmplen = sizeof(soap->tmpbuf); +@@ -5463,7 +5463,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && defined(HAVE_GETHOSTBYNAME_R) ++#elif defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -5478,8 +5478,6 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, + if (!tmpbuf) + break; + } +-#elif defined(HAVE_GETHOSTBYNAME_R) +- hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); + #elif defined(VXWORKS) + /* vxWorks compatible */ + /* If the DNS resolver library resolvLib has been configured in the vxWorks +@@ -23112,13 +23110,9 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); +-# else +- return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ +-# endif + # else + return strerror(err); + # endif +-- +2.39.2 + diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.106.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb index 0249d09e48..6d8b53d308 100644 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.106.bb +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb @@ -5,10 +5,9 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip \ - " -SRC_URI[md5sum] = "0925d25bc455047b01d4fe9814d30173" -SRC_URI[sha256sum] = "4e74838baf5437e95ae17aa3efb48bd0621f483bff4424f6255fcf327ff80765" +SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip" +SRC_URI:append:libc-musl = " file://0001-Simplify-check-for-gethostbyname_r.patch" +SRC_URI[sha256sum] = "b65190ebf8c2517d6fafbdc2000bc7bc650d921a02f4aa53eb1e3df267592c4a" inherit autotools @@ -16,14 +15,15 @@ BBCLASSEXTEND = "native" S = "${WORKDIR}/${BPN}-2.8" +EXTRA_OECONF += "--enable-ipv6 --enable-c-locale" PARALLEL_MAKE = "" -EXTRA_OEMAKE_class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" +EXTRA_OEMAKE:class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2" DEPENDS = "openssl zlib flex bison bison-native" -DEPENDS_append_class-target = " gsoap-native" +DEPENDS:append:class-target = " gsoap-native" -do_install_append() { +do_install:append() { install -d ${D}${libdir} for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck do @@ -31,12 +31,12 @@ do_install_append() { done } -do_install_class-native() { +do_install:class-native() { oe_runmake DESTDIR=${D} BINDIR=${D}${bindir} install } -FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" -FILES_${PN} += "${datadir}" -FILES_${PN}-staticdev = "${libdir}" -FILES_${PN}-dev = "${includedir}" -RRECOMMENDS_${PN}-dev = "${PN}-staticdev" +FILES:${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2" +FILES:${PN} += "${datadir}" +FILES:${PN}-staticdev = "${libdir}" +FILES:${PN}-dev = "${includedir}" +RRECOMMENDS:${PN}-dev = "${PN}-staticdev" diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/0001-sata.c-Declare-ata_get_powermode-prototype.patch b/meta-oe/recipes-support/hddtemp/hddtemp/0001-sata.c-Declare-ata_get_powermode-prototype.patch new file mode 100644 index 0000000000..5703d3c241 --- /dev/null +++ b/meta-oe/recipes-support/hddtemp/hddtemp/0001-sata.c-Declare-ata_get_powermode-prototype.patch @@ -0,0 +1,33 @@ +From c5ca31940d1d1889ef2cc6974c18ff24ab406748 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 16:42:23 -0700 +Subject: [PATCH] sata.c: Declare ata_get_powermode prototype + +Fixes build warnings/errors + +sata.c:127:10: error: call to undeclared function 'ata_get_powermode'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +| switch(ata_get_powermode(dsk->fd)) + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/sata.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/sata.c b/src/sata.c +index d67621f..4172245 100644 +--- a/src/sata.c ++++ b/src/sata.c +@@ -52,7 +52,8 @@ + (((u16)(__x) & (u16)0xff00U) >> 8) )); \ + }) + +- ++extern enum e_powermode ata_get_powermode(int device); ++ + static int sata_probe(int device) { + int bus_num; + unsigned char cmd[4] = { WIN_IDENTIFY, 0, 0, 1 }; +-- +2.37.3 + diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch index 1ec6a61b31..1a541e32fd 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Auto-detect disks if none specified Refer to: diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch index 8f6b9c3c4b..78de64c99d 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -ru hddtemp-0.3-beta15.orig/configure.in hddtemp-0.3-beta15/configure.in --- hddtemp-0.3-beta15.orig/configure.in 2005-10-17 20:14:19.000000000 +0100 +++ hddtemp-0.3-beta15/configure.in 2008-06-27 00:00:46.000000000 +0100 diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff index 057b1fd1d3..60953381a1 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff +++ b/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff @@ -6,7 +6,7 @@ Filtered with: filterdiff -p1 -x README -x 'debian/*' -Upstream-Status: unmaintained +Upstream-Status: Inappropriate [unmaintained] Index: hddtemp-0.3-beta15/doc/hddtemp.8 =================================================================== diff --git a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb index d5da2b688a..b204ea4dd6 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb +++ b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb @@ -1,8 +1,7 @@ SUMMARY = "Hard disk temperature monitor daemon" SECTION = "console/network" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" -PR = "r1" SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/hddtemp/hddtemp-0.3-beta15.tar.bz2 \ file://hddtemp-no-nls-support.patch \ @@ -10,6 +9,7 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/hddtemp/hddtemp-0.3-beta15.tar.bz2 \ file://hddtemp-0.3-beta15-autodetect-717479.patch \ file://0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch \ file://0001-configure.ac-Rename-to-configure.ac-and-use-external.patch \ + file://0001-sata.c-Declare-ata_get_powermode-prototype.patch \ file://hddtemp.db \ file://init \ " @@ -21,9 +21,9 @@ LIC_FILES_CHKSUM = "file://GPL-2;md5=eb723b61539feef013de476e68b5c50a" inherit autotools gettext update-rc.d -FILES_${PN} += "/usr/share/misc/hddtemp.db" +FILES:${PN} += "/usr/share/misc/hddtemp.db" -do_install_append() { +do_install:append() { install -d ${D}/usr/share/misc/ install -m 0644 ${WORKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db install -d ${D}${sysconfdir}/init.d diff --git a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch new file mode 100644 index 0000000000..68d9c3a3cf --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch @@ -0,0 +1,96 @@ +From 4fa437782261c0da785d4574ad3a03700f624e66 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 19 Sep 2023 02:56:09 +0000 +Subject: [PATCH] cmake: remove build flags + +Don't generate the build host related info and reemove the build flags +to improve reproducibility. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + config/cmake/libhdf5.settings.cmake.in | 18 +++++++++--------- + src/H5make_libsettings.c | 17 ----------------- + 2 files changed, 9 insertions(+), 26 deletions(-) + +diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in +index f60f0de..f4433c0 100644 +--- a/config/cmake/libhdf5.settings.cmake.in ++++ b/config/cmake/libhdf5.settings.cmake.in +@@ -23,23 +23,23 @@ Linking Options: + ---------------- + Libraries: @BUILD_NAME_EXT@ + Statically Linked Executables: @BUILD_STATIC_EXECS@ +- LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@ ++ LDFLAGS: + H5_LDFLAGS: @H5_LDFLAGS@ + AM_LDFLAGS: @AM_LDFLAGS@ + Extra libraries: @LINK_LIBS@ +- Archiver: @CMAKE_AR@ +- AR_FLAGS: +- Ranlib: @CMAKE_RANLIB@ ++ Archiver: ++ AR_FLAGS: ++ Ranlib: + + Languages: + ---------- + C: YES +- C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@ ++ C Compiler: + CPPFLAGS: @CPPFLAGS@ + H5_CPPFLAGS: @H5_CPPFLAGS@ + AM_CPPFLAGS: @AM_CPPFLAGS@ +- CFLAGS: @CMAKE_C_FLAGS@ +- H5_CFLAGS: @HDF5_CMAKE_C_FLAGS@ ++ CFLAGS: ++ H5_CFLAGS: + AM_CFLAGS: @AM_CFLAGS@ + Shared C Library: @H5_ENABLE_SHARED_LIB@ + Static C Library: @H5_ENABLE_STATIC_LIB@ +@@ -51,11 +51,11 @@ Languages: + AM Fortran Flags: @AM_FCFLAGS@ + Shared Fortran Library: @H5_ENABLE_SHARED_LIB@ + Static Fortran Library: @H5_ENABLE_STATIC_LIB@ +- Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@ ++ Module Directory: + + C++: @HDF5_BUILD_CPP_LIB@ + C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ +- C++ Flags: @CMAKE_CXX_FLAGS@ ++ C++ Flags: + H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ + AM C++ Flags: @AM_CXXFLAGS@ + Shared C++ Library: @H5_ENABLE_SHARED_LIB@ +diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c +index 2661288..7c0f84f 100644 +--- a/src/H5make_libsettings.c ++++ b/src/H5make_libsettings.c +@@ -205,23 +205,6 @@ information about the library build configuration\n"; + fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n"); + fputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */ + +- fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday, +- 1900 + tm->tm_year); +- if (pwd || real_name[0] || host_name[0]) { +- fprintf(rawoutstream, " *\t\t\t"); +- if (real_name[0]) +- fprintf(rawoutstream, "%s <", real_name); +-#ifdef H5_HAVE_GETPWUID +- if (pwd) +- fputs(pwd->pw_name, rawoutstream); +-#endif +- if (host_name[0]) +- fprintf(rawoutstream, "@%s", host_name); +- if (real_name[0]) +- fprintf(rawoutstream, ">"); +- fputc('\n', rawoutstream); +- } +- + fprintf(rawoutstream, " *\n * Purpose:\t\t"); + + for (s = purpose; *s; s++) { +-- +2.35.5 + diff --git a/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch b/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch deleted file mode 100644 index bdc1fa5f96..0000000000 --- a/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1b4fadf550587b46e405d7ccb777dcb00aa791a2 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 29 Jan 2019 15:39:15 +0800 -Subject: [PATCH 1/2] cross compiling support - -Do not generate config files at build time, use pre-generated -files to instead. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - CMakeLists.txt | 6 ++++++ - src/CMakeLists.txt | 23 ----------------------- - 2 files changed, 6 insertions(+), 23 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -770,4 +770,10 @@ endif () - #----------------------------------------------------------------------------- - configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY) - -+#----------------------------------------------------------------------------- -+# Copy the pre-generated files in place -+#----------------------------------------------------------------------------- -+configure_file(H5Tinit.c H5Tinit.c COPYONLY) -+configure_file(H5lib_settings.c H5lib_settings.c COPYONLY) -+ - include (CMakeInstallation.cmake) ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -613,36 +613,9 @@ set (H5_PRIVATE_HEADERS - #----------------------------------------------------------------------------- - add_executable (H5detect ${HDF5_SRC_DIR}/H5detect.c) - TARGET_C_PROPERTIES (H5detect STATIC " " " ") --if (MSVC OR MINGW) -- target_link_libraries (H5detect "ws2_32.lib") --endif () --if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") -- set_property(TARGET H5detect PROPERTY LINK_FLAGS "-O0") --endif () -- --add_custom_command ( -- OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c -- COMMAND $<TARGET_FILE:H5detect> -- ARGS > ${HDF5_BINARY_DIR}/H5Tinit.c -- DEPENDS H5detect --) - - add_executable (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) - TARGET_C_PROPERTIES (H5make_libsettings STATIC " " " ") --if (MSVC OR MINGW) -- target_link_libraries (H5make_libsettings "ws2_32.lib") --endif () --if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") -- set_property(TARGET H5make_libsettings PROPERTY LINK_FLAGS "-O0") --endif () -- --add_custom_command ( -- OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c -- COMMAND $<TARGET_FILE:H5make_libsettings> -- ARGS > ${HDF5_BINARY_DIR}/H5lib_settings.c -- DEPENDS H5make_libsettings -- WORKING_DIRECTORY ${HDF5_BINARY_DIR} --) - - if (GENERATE_ERROR_HEADERS) - find_package (Perl) diff --git a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch index 6f893787f8..f0eb05a1e7 100644 --- a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch +++ b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch @@ -10,20 +10,19 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> CMakeLists.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9af14d5..05100e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -153,18 +153,18 @@ set (HDF5_F90_TEST_LIB_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-static") - set (HDF5_F90_C_TEST_LIB_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-static") - set (HDF5_HL_F90_LIB_TARGET "${HDF5_HL_F90_LIB_CORENAME}-static") - set (HDF5_HL_F90_C_LIB_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-static") +@@ -191,19 +191,19 @@ set (HDF5_HL_F90_C_LIB_TARGET "${HDF + set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") + set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") + set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") -set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}-shared") -set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}-shared") -set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}-shared") -set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}-shared") -set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}-shared") -set (HDF5_TOOLS_LIBSH_TARGET "${HDF5_TOOLS_LIB_CORENAME}-shared") +-set (HDF5_UTILS_LIBSH_TARGET "${HDF5_UTILS_LIB_CORENAME}-shared") -set (HDF5_F90_LIBSH_TARGET "${HDF5_F90_LIB_CORENAME}-shared") -set (HDF5_F90_C_LIBSH_TARGET "${HDF5_F90_C_LIB_CORENAME}-shared") -set (HDF5_F90_TEST_LIBSH_TARGET "${HDF5_F90_TEST_LIB_CORENAME}-shared") @@ -36,6 +35,7 @@ index 9af14d5..05100e3 100644 +set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}") +set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}") +set (HDF5_TOOLS_LIBSH_TARGET "${HDF5_TOOLS_LIB_CORENAME}") ++set (HDF5_UTILS_LIBSH_TARGET "${HDF5_UTILS_LIB_CORENAME}") +set (HDF5_F90_LIBSH_TARGET "${HDF5_F90_LIB_CORENAME}") +set (HDF5_F90_C_LIBSH_TARGET "${HDF5_F90_C_LIB_CORENAME}") +set (HDF5_F90_TEST_LIBSH_TARGET "${HDF5_F90_TEST_LIB_CORENAME}") @@ -45,6 +45,3 @@ index 9af14d5..05100e3 100644 #----------------------------------------------------------------------------- # Define some CMake variables for use later in the project --- -2.7.4 - diff --git a/meta-oe/recipes-support/hdf5/files/H5Tinit-32.c b/meta-oe/recipes-support/hdf5/files/H5Tinit-32.c deleted file mode 100755 index 8057a7ad83..0000000000 --- a/meta-oe/recipes-support/hdf5/files/H5Tinit-32.c +++ /dev/null @@ -1,975 +0,0 @@ -/* Generated automatically by H5detect -- do not edit */ - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Created: Mar 5, 2019 - * root <root@qemuarm> - * - * Purpose: This machine-generated source code contains - * information about the various integer and - * floating point numeric formats found on this - * architecture. The parameters below should be - * checked carefully and errors reported to the - * HDF5 maintainer. - * - * Each of the numeric formats listed below are - * printed from most significant bit to least - * significant bit even though the actual bytes - * might be stored in a different order in - * memory. The integers above each binary byte - * indicate the relative order of the bytes in - * memory; little-endian machines have - * decreasing numbers while big-endian machines - * have increasing numbers. - * - * The fields of the numbers are printed as - * letters with `S' for the mantissa sign bit, - * `M' for the mantissa magnitude, and `E' for - * the exponent. The exponent has an associated - * bias which can be subtracted to find the - * true exponent. The radix point is assumed - * to be before the first `M' bit. Any bit - * of a floating-point value not falling into one - * of these categories is printed as a question - * mark. Bits of integer types are printed as - * `I' for 2's complement and `U' for magnitude. - * - * If the most significant bit of the normalized - * mantissa (always a `1' except for `0.0') is - * not stored then an `implicit=yes' appears - * under the field description. In thie case, - * the radix point is still assumed to be - * before the first `M' but after the implicit - * bit. - * - * Modifications: - * - * DO NOT MAKE MODIFICATIONS TO THIS FILE! - * It was generated by code in `H5detect.c'. - * - *------------------------------------------------------------------------- - */ - -/****************/ -/* Module Setup */ -/****************/ - -#define H5T_PACKAGE /*suppress error about including H5Tpkg.h*/ - - -/***********/ -/* Headers */ -/***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5FLprivate.h" /* Free Lists */ -#include "H5Iprivate.h" /* IDs */ -#include "H5Tpkg.h" /* Datatypes */ - - -/****************/ -/* Local Macros */ -/****************/ - - -/******************/ -/* Local Typedefs */ -/******************/ - - -/********************/ -/* Package Typedefs */ -/********************/ - - -/********************/ -/* Local Prototypes */ -/********************/ - - -/********************/ -/* Public Variables */ -/********************/ - - -/*****************************/ -/* Library Private Variables */ -/*****************************/ - - -/*********************/ -/* Package Variables */ -/*********************/ - - - -/*******************/ -/* Local Variables */ -/*******************/ - - - -/*------------------------------------------------------------------------- - * Function: H5TN_init_interface - * - * Purpose: Initialize pre-defined native datatypes from code generated - * during the library configuration by H5detect. - * - * Return: Success: non-negative - * Failure: negative - * - * Programmer: Robb Matzke - * Wednesday, December 16, 1998 - * - *------------------------------------------------------------------------- - */ -herr_t -H5TN_init_interface(void) -{ - H5T_t *dt = NULL; - herr_t ret_value = SUCCEED; - - FUNC_ENTER_NOAPI(FAIL) - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_SCHAR_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_SCHAR_ALIGN_g = 1; - H5T_NATIVE_SCHAR_COMP_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UCHAR_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UCHAR_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_SHORT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_SHORT_ALIGN_g = 1; - H5T_NATIVE_SHORT_COMP_ALIGN_g = 2; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_USHORT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_USHORT_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_ALIGN_g = 1; - H5T_NATIVE_INT_COMP_ALIGN_g = 4; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_LONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LONG_ALIGN_g = 1; - H5T_NATIVE_LONG_COMP_ALIGN_g = 4; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_ULONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_ULONG_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT8_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST8_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST8_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT16_ALIGN_g = 1; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT16_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST16_ALIGN_g = 1; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST16_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST16_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST16_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST32_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_LLONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LLONG_ALIGN_g = 1; - H5T_NATIVE_LLONG_COMP_ALIGN_g = 8; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_ULLONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_ULLONG_ALIGN_g = 1; - - /* - * 3 2 1 0 - * SEEEEEEE EMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 31; - dt->shared->u.atomic.u.f.epos = 23; - dt->shared->u.atomic.u.f.esize = 8; - dt->shared->u.atomic.u.f.ebias = 0x0000007f; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 23; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_FLOAT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_FLOAT_ALIGN_g = 1; - H5T_NATIVE_FLOAT_COMP_ALIGN_g = 4; - - /* - * 7 6 5 4 - * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM - * 3 2 1 0 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 63; - dt->shared->u.atomic.u.f.epos = 52; - dt->shared->u.atomic.u.f.esize = 11; - dt->shared->u.atomic.u.f.ebias = 0x000003ff; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 52; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_DOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_DOUBLE_ALIGN_g = 1; - H5T_NATIVE_DOUBLE_COMP_ALIGN_g = 8; - - /* - * 7 6 5 4 - * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM - * 3 2 1 0 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 63; - dt->shared->u.atomic.u.f.epos = 52; - dt->shared->u.atomic.u.f.esize = 11; - dt->shared->u.atomic.u.f.ebias = 0x000003ff; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 52; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_LDOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LDOUBLE_ALIGN_g = 1; - H5T_NATIVE_LDOUBLE_COMP_ALIGN_g = 8; - - /* Set the native order for this machine */ - H5T_native_order_g = H5T_ORDER_LE; - - /* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */ - H5T_POINTER_COMP_ALIGN_g = 4; - H5T_HVL_COMP_ALIGN_g = 4; - H5T_HOBJREF_COMP_ALIGN_g = 8; - H5T_HDSETREGREF_COMP_ALIGN_g = 1; - -done: - if(ret_value < 0) { - if(dt != NULL) { - dt->shared = H5FL_FREE(H5T_shared_t, dt->shared); - dt = H5FL_FREE(H5T_t, dt); - } /* end if */ - } /* end if */ - - FUNC_LEAVE_NOAPI(ret_value); -} /* end H5TN_init_interface() */ - -/****************************************/ -/* ALIGNMENT and signal-handling status */ -/****************************************/ -/* Signal() support: yes */ -/* setjmp() support: yes */ -/* longjmp() support: yes */ -/* sigsetjmp() support: yes */ -/* siglongjmp() support: yes */ -/* sigprocmask() support: yes */ - -/******************************/ -/* signal handlers statistics */ -/******************************/ -/* signal_handlers tested: 15 times */ -/* sigbus_handler called: 5 times */ -/* sigsegv_handler called: 5 times */ -/* sigill_handler called: 5 times */ diff --git a/meta-oe/recipes-support/hdf5/files/H5Tinit-64.c b/meta-oe/recipes-support/hdf5/files/H5Tinit-64.c deleted file mode 100644 index 85f79a6ae7..0000000000 --- a/meta-oe/recipes-support/hdf5/files/H5Tinit-64.c +++ /dev/null @@ -1,991 +0,0 @@ -/* Generated automatically by H5detect -- do not edit */ - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Created: Jan 29, 2019 - * root <root@qemux86-64> - * - * Purpose: This machine-generated source code contains - * information about the various integer and - * floating point numeric formats found on this - * architecture. The parameters below should be - * checked carefully and errors reported to the - * HDF5 maintainer. - * - * Each of the numeric formats listed below are - * printed from most significant bit to least - * significant bit even though the actual bytes - * might be stored in a different order in - * memory. The integers above each binary byte - * indicate the relative order of the bytes in - * memory; little-endian machines have - * decreasing numbers while big-endian machines - * have increasing numbers. - * - * The fields of the numbers are printed as - * letters with `S' for the mantissa sign bit, - * `M' for the mantissa magnitude, and `E' for - * the exponent. The exponent has an associated - * bias which can be subtracted to find the - * true exponent. The radix point is assumed - * to be before the first `M' bit. Any bit - * of a floating-point value not falling into one - * of these categories is printed as a question - * mark. Bits of integer types are printed as - * `I' for 2's complement and `U' for magnitude. - * - * If the most significant bit of the normalized - * mantissa (always a `1' except for `0.0') is - * not stored then an `implicit=yes' appears - * under the field description. In thie case, - * the radix point is still assumed to be - * before the first `M' but after the implicit - * bit. - * - * Modifications: - * - * DO NOT MAKE MODIFICATIONS TO THIS FILE! - * It was generated by code in `H5detect.c'. - * - *------------------------------------------------------------------------- - */ - -/****************/ -/* Module Setup */ -/****************/ - -#define H5T_PACKAGE /*suppress error about including H5Tpkg.h*/ - - -/***********/ -/* Headers */ -/***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5FLprivate.h" /* Free Lists */ -#include "H5Iprivate.h" /* IDs */ -#include "H5Tpkg.h" /* Datatypes */ - - -/****************/ -/* Local Macros */ -/****************/ - - -/******************/ -/* Local Typedefs */ -/******************/ - - -/********************/ -/* Package Typedefs */ -/********************/ - - -/********************/ -/* Local Prototypes */ -/********************/ - - -/********************/ -/* Public Variables */ -/********************/ - - -/*****************************/ -/* Library Private Variables */ -/*****************************/ - - -/*********************/ -/* Package Variables */ -/*********************/ - - - -/*******************/ -/* Local Variables */ -/*******************/ - - - -/*------------------------------------------------------------------------- - * Function: H5TN_init_interface - * - * Purpose: Initialize pre-defined native datatypes from code generated - * during the library configuration by H5detect. - * - * Return: Success: non-negative - * Failure: negative - * - * Programmer: Robb Matzke - * Wednesday, December 16, 1998 - * - *------------------------------------------------------------------------- - */ -herr_t -H5TN_init_interface(void) -{ - H5T_t *dt = NULL; - herr_t ret_value = SUCCEED; - - FUNC_ENTER_NOAPI(FAIL) - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_SCHAR_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_SCHAR_ALIGN_g = 1; - H5T_NATIVE_SCHAR_COMP_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UCHAR_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UCHAR_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_SHORT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_SHORT_ALIGN_g = 1; - H5T_NATIVE_SHORT_COMP_ALIGN_g = 2; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_USHORT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_USHORT_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_ALIGN_g = 1; - H5T_NATIVE_INT_COMP_ALIGN_g = 4; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_LONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LONG_ALIGN_g = 1; - H5T_NATIVE_LONG_COMP_ALIGN_g = 8; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_ULONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_ULONG_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT8_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST8_ALIGN_g = 1; - - /* - * 0 - * IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST8_ALIGN_g = 1; - - /* - * 0 - * UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 1; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 8; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST8_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST8_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT16_ALIGN_g = 1; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT16_ALIGN_g = 1; - - /* - * 1 0 - * IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST16_ALIGN_g = 1; - - /* - * 1 0 - * UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 2; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 16; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST16_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST16_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST16_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST16_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST32_ALIGN_g = 1; - - /* - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST32_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST32_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST32_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST32_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_LEAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_LEAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_LEAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_LEAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_INT_FAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_INT_FAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_UINT_FAST64_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_UINT_FAST64_ALIGN_g = 1; - - /* - * 7 6 5 4 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * 3 2 1 0 - * IIIIIIII IIIIIIII IIIIIIII IIIIIIII - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_2; - if((H5T_NATIVE_LLONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LLONG_ALIGN_g = 1; - H5T_NATIVE_LLONG_COMP_ALIGN_g = 8; - - /* - * 7 6 5 4 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * 3 2 1 0 - * UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_INTEGER; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.i.sign = H5T_SGN_NONE; - if((H5T_NATIVE_ULLONG_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_ULLONG_ALIGN_g = 1; - - /* - * 3 2 1 0 - * SEEEEEEE EMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 4; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 32; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 31; - dt->shared->u.atomic.u.f.epos = 23; - dt->shared->u.atomic.u.f.esize = 8; - dt->shared->u.atomic.u.f.ebias = 0x0000007f; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 23; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_FLOAT_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_FLOAT_ALIGN_g = 1; - H5T_NATIVE_FLOAT_COMP_ALIGN_g = 4; - - /* - * 7 6 5 4 - * SEEEEEEE EEEEMMMM MMMMMMMM MMMMMMMM - * 3 2 1 0 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? yes - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 8; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 64; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 63; - dt->shared->u.atomic.u.f.epos = 52; - dt->shared->u.atomic.u.f.esize = 11; - dt->shared->u.atomic.u.f.ebias = 0x000003ff; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 52; - dt->shared->u.atomic.u.f.norm = H5T_NORM_IMPLIED; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_DOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_DOUBLE_ALIGN_g = 1; - H5T_NATIVE_DOUBLE_COMP_ALIGN_g = 8; - - /* - * 15 14 13 12 - * ???????? ???????? ???????? ???????? - * 11 10 9 8 - * ???????? ???????? SEEEEEEE EEEEEEEE - * 7 6 5 4 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * 3 2 1 0 - * MMMMMMMM MMMMMMMM MMMMMMMM MMMMMMMM - * Implicit bit? no - * Alignment: none - */ - if(NULL == (dt = H5T__alloc())) - HGOTO_ERROR(H5E_DATATYPE, H5E_NOSPACE, FAIL, "datatype allocation failed") - dt->shared->state = H5T_STATE_IMMUTABLE; - dt->shared->type = H5T_FLOAT; - dt->shared->size = 16; - dt->shared->u.atomic.order = H5T_ORDER_LE; - dt->shared->u.atomic.offset = 0; - dt->shared->u.atomic.prec = 80; - dt->shared->u.atomic.lsb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.msb_pad = H5T_PAD_ZERO; - dt->shared->u.atomic.u.f.sign = 79; - dt->shared->u.atomic.u.f.epos = 64; - dt->shared->u.atomic.u.f.esize = 15; - dt->shared->u.atomic.u.f.ebias = 0x00003fff; - dt->shared->u.atomic.u.f.mpos = 0; - dt->shared->u.atomic.u.f.msize = 64; - dt->shared->u.atomic.u.f.norm = H5T_NORM_NONE; - dt->shared->u.atomic.u.f.pad = H5T_PAD_ZERO; - if((H5T_NATIVE_LDOUBLE_g = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register ID for built-in datatype") - H5T_NATIVE_LDOUBLE_ALIGN_g = 1; - H5T_NATIVE_LDOUBLE_COMP_ALIGN_g = 16; - - /* Set the native order for this machine */ - H5T_native_order_g = H5T_ORDER_LE; - - /* Structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */ - H5T_POINTER_COMP_ALIGN_g = 8; - H5T_HVL_COMP_ALIGN_g = 8; - H5T_HOBJREF_COMP_ALIGN_g = 8; - H5T_HDSETREGREF_COMP_ALIGN_g = 1; - -done: - if(ret_value < 0) { - if(dt != NULL) { - dt->shared = H5FL_FREE(H5T_shared_t, dt->shared); - dt = H5FL_FREE(H5T_t, dt); - } /* end if */ - } /* end if */ - - FUNC_LEAVE_NOAPI(ret_value); -} /* end H5TN_init_interface() */ - -/****************************************/ -/* ALIGNMENT and signal-handling status */ -/****************************************/ -/* Signal() support: yes */ -/* setjmp() support: yes */ -/* longjmp() support: yes */ -/* sigsetjmp() support: yes */ -/* siglongjmp() support: yes */ -/* sigprocmask() support: yes */ - -/******************************/ -/* signal handlers statistics */ -/******************************/ -/* signal_handlers tested: 15 times */ -/* sigbus_handler called: 5 times */ -/* sigsegv_handler called: 5 times */ -/* sigill_handler called: 5 times */ diff --git a/meta-oe/recipes-support/hdf5/files/H5lib_settings.c b/meta-oe/recipes-support/hdf5/files/H5lib_settings.c deleted file mode 100644 index c243aee121..0000000000 --- a/meta-oe/recipes-support/hdf5/files/H5lib_settings.c +++ /dev/null @@ -1,98 +0,0 @@ -/* Generated automatically by H5make_libsettings -- do not edit */ - - - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * - * Created: Jan 29, 2019 - * root <root@qemux86-64> - * - * Purpose: This machine-generated source code contains - * information about the library build configuration - * - * Modifications: - * - * DO NOT MAKE MODIFICATIONS TO THIS FILE! - * It was generated by code in `H5make_libsettings.c'. - * - *------------------------------------------------------------------------- - */ - -char H5libhdf5_settings[]= - " SUMMARY OF THE HDF5 CONFIGURATION\n" - " =================================\n" - "\n" - "General Information:\n" - "-------------------\n" - " HDF5 Version: 1.8.19\n" - " Configured on: 2019-01-29\n" - " Configured by: Ninja\n" - " Configure mode: CMAKE 3.12.2\n" - " Host system: Linux-4.4.0-31-generic\n" - " Uname information: Linux\n" - " Byte sex: little-endian\n" - " Libraries: \n" - " Installation point: /usr\n" - "\n" - "Compiling Options:\n" - "------------------\n" - " Compilation Mode: \n" - " H5_CFLAGS: \n" - " AM_CFLAGS: \n" - " CPPFLAGS: \n" - " H5_CPPFLAGS: \n" - " AM_CPPFLAGS: \n" - " Shared C Library: YES\n" - " Static C Library: YES\n" - " Statically Linked Executables: OFF\n" - " LDFLAGS: -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed\n" - " AM_LDFLAGS: \n" - " Extra libraries: m;dl\n" - " Debugged Packages: \n" - " API Tracing: OFF\n" - "\n" - "Languages:\n" - "----------\n" - " Fortran: OFF\n" - " Fortran Compiler: \n" - " Fortran 2003 Compiler: \n" - " Fortran Flags: \n" - " H5 Fortran Flags: \n" - " AM Fortran Flags: \n" - " Shared Fortran Library: YES\n" - " Static Fortran Library: YES\n" - "\n" - " H5 C++ Flags: \n" - " AM C++ Flags: \n" - " Shared C++ Library: YES\n" - " Static C++ Library: YES\n" - "\n" - "Features:\n" - "---------\n" - " Parallel HDF5: OFF\n" - " High Level library: ON\n" - " Threadsafety: OFF\n" - " Default API Mapping: v18\n" - " With Deprecated Public Symbols: ON\n" - " I/O filters (external): \n" - " MPE: \n" - " Direct VFD: \n" - " dmalloc: \n" - "Clear file buffers before write: ON\n" - " Using memory checker: OFF\n" - " Function Stack Tracing: OFF\n" - " Strict File Format Checks: OFF\n" - " Optimization Instrumentation: \n" -; - diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb new file mode 100644 index 0000000000..b8a81bb0b7 --- /dev/null +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb @@ -0,0 +1,62 @@ +SUMMARY = "Management suite for extremely large and complex data collections" +DESCRIPTION = "Unique technology suite that makes possible the management of \ +extremely large and complex data collections" +HOMEPAGE = "https://www.hdfgroup.org/" +SECTION = "libs" + +LICENSE = "HDF5" +LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998" + +inherit cmake siteinfo qemu multilib_header multilib_script + +DEPENDS += "qemu-native zlib" + +SRC_URI = " \ + https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ + file://0002-Remove-suffix-shared-from-shared-library-name.patch \ + file://0001-cmake-remove-build-flags.patch \ +" +SRC_URI[sha256sum] = "ea3c5e257ef322af5e77fc1e52ead3ad6bf3bb4ac06480dd17ee3900d7a24cfb" + +FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" + +EXTRA_OECMAKE = " \ + -DHDF5_INSTALL_CMAKE_DIR=${libdir}/cmake \ + -DCMAKE_INSTALL_PREFIX='${prefix}' \ + -DHDF5_INSTALL_LIB_DIR='${baselib}' \ +" +EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper " + +gen_emu() { + # Write out a qemu wrapper that will be used by cmake + # so that it can run target helper binaries through that. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} + +do_unpack[postfuncs] += "gen_emu" + +MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \ + ${PN}:${bindir}/h5hlcc \ +" + +do_install:append() { + # Used for generating config files on target + install -m 755 ${B}/bin/H5detect ${D}${bindir} + install -m 755 ${B}/bin/H5make_libsettings ${D}${bindir} + oe_multilib_header H5pubconf.h + # remove the buildpath + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/hdf5-targets.cmake + sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' ${D}${bindir}/h5hlcc + sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' ${D}${bindir}/h5cc +} + +BBCLASSEXTEND = "native" + +# h5fuse.sh script needs bash +RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb b/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb deleted file mode 100644 index 11285451aa..0000000000 --- a/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Management suite for extremely large and complex data collections" -DESCRIPTION = "Unique technology suite that makes possible the management of \ -extremely large and complex data collections" -HOMEPAGE = "https://www.hdfgroup.org/" -SECTION = "libs" - -LICENSE = "HDF5" -LIC_FILES_CHKSUM = "file://COPYING;md5=57e5351b17591e659eedae107265c606" - -inherit cmake siteinfo - -SRC_URI = " \ - https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ - file://H5lib_settings.c \ - file://H5Tinit-64.c \ - file://H5Tinit-32.c \ - file://0001-cross-compiling-support.patch \ - file://0002-Remove-suffix-shared-from-shared-library-name.patch \ -" -SRC_URI[md5sum] = "2d2408f2a9dfb5c7b79998002e9a90e9" -SRC_URI[sha256sum] = "e5b1b1dee44a64b795a91c3321ab7196d9e0871fe50d42969761794e3899f40d" - -FILES_${PN} += "${libdir}/libhdf5.settings ${datadir}/*" - -EXTRA_OECMAKE = " \ - -DTEST_LFS_WORKS_RUN=0 \ - -DTEST_LFS_WORKS_RUN__TRYRUN_OUTPUT=0 \ - -DH5_PRINTF_LL_TEST_RUN=1 \ - -DH5_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT='8' \ - -DH5_LDOUBLE_TO_LONG_SPECIAL_RUN=0 \ - -DH5_LDOUBLE_TO_LONG_SPECIAL_RUN__TRYRUN_OUTPUT= \ - -DH5_LONG_TO_LDOUBLE_SPECIAL_RUN=0 \ - -DH5_LONG_TO_LDOUBLE_SPECIAL_RUN__TRYRUN_OUTPUT= \ - -DH5_LDOUBLE_TO_LLONG_ACCURATE_RUN=0 \ - -DH5_LDOUBLE_TO_LLONG_ACCURATE_RUN__TRYRUN_OUTPUT= \ - -DH5_LLONG_TO_LDOUBLE_CORRECT_RUN=0 \ - -DH5_LLONG_TO_LDOUBLE_CORRECT_RUN__TRYRUN_OUTPUT= \ - -DH5_NO_ALIGNMENT_RESTRICTIONS_RUN=0 \ - -DH5_NO_ALIGNMENT_RESTRICTIONS_RUN__TRYRUN_OUTPUT= \ - -DCMAKE_INSTALL_PREFIX='${prefix}' \ - -DHDF5_INSTALL_LIB_DIR='${baselib}' \ -" - -do_unpack[postfuncs] += "gen_hd5file" -gen_hd5file() { - install -m 544 ${WORKDIR}/H5lib_settings.c ${S} - install -m 544 ${WORKDIR}/H5Tinit-${SITEINFO_BITS}.c ${S}/H5Tinit.c -} - -do_install_append() { - # Used for generating config files on target - install -m 755 ${B}/bin/H5detect ${D}${bindir} - install -m 755 ${B}/bin/H5make_libsettings ${D}${bindir} -} - -BBCLASSEXTEND = "native" - -SRC_DISTRIBUTE_LICENSES += "HDF5" diff --git a/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb index 5afc4596e8..c7a487ba5c 100644 --- a/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb @@ -1,16 +1,15 @@ SUMMARY = "A Simple library for communicating with USB and Bluetooth HID devices" -AUTHOR = "Alan Ott" HOMEPAGE = "http://www.signal11.us/oss/hidapi/" SECTION = "libs" -LICENSE = "BSD-3-Clause | GPLv3" +LICENSE = "BSD-3-Clause | GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077" DEPENDS = "libusb udev" +RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" inherit autotools pkgconfig -SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https" -PV = "0.9.0" -SRCREV = "7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f" +SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master" +SRCREV = "d3013f0af3f4029d82872c1a9487ea461a56dee4" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch b/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch new file mode 100644 index 0000000000..421d824ee0 --- /dev/null +++ b/meta-oe/recipes-support/hstr/files/0001-Use-OE-specific-checks-for-ncurses.patch @@ -0,0 +1,42 @@ +From f3fb4f12fac75efe0d8f1a923ad5992a7433d0db Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 2 Mar 2022 06:22:15 +0000 +Subject: [PATCH] Use OE-specific checks for ncurses + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + src/include/hstr.h | 2 +- + src/include/hstr_curses.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/include/hstr.h b/src/include/hstr.h +index 5eac881..c47cadb 100644 +--- a/src/include/hstr.h ++++ b/src/include/hstr.h +@@ -26,7 +26,7 @@ + #elif defined(__FreeBSD__) + #include <ncurses.h> + #else +- #include <ncursesw/curses.h> ++ #include <curses.h> + #endif + #include <readline/chardefs.h> + #include <signal.h> +diff --git a/src/include/hstr_curses.h b/src/include/hstr_curses.h +index 8a50ab9..1f081a8 100644 +--- a/src/include/hstr_curses.h ++++ b/src/include/hstr_curses.h +@@ -24,7 +24,7 @@ + #elif defined(__FreeBSD__) + #include <ncurses.h> + #else +-#include <ncursesw/curses.h> ++#include <curses.h> + #endif + + #define color_attr_on(C) if(terminal_has_colors()) { attron(C); } +-- +2.31.1 + diff --git a/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch b/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch new file mode 100644 index 0000000000..832d768ff3 --- /dev/null +++ b/meta-oe/recipes-support/hstr/files/0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch @@ -0,0 +1,33 @@ +From d5ad538adb9fcbad8a3b4e46f266b668301cb1c4 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 2 Mar 2022 05:36:48 +0000 +Subject: [PATCH] configure.ac: Don't use AC_CHECK_FILE + +AC_CHECK_FILE is not suitable for cross-compile, so +remove it to fix configure error: +cannot check for file existence when cross compiling + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 775c795..bd99188 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -116,9 +116,6 @@ AC_TYPE_SIZE_T + AC_FUNC_MALLOC + AC_CHECK_FUNCS([memset strdup strstr]) + +-# Bash@Ubuntu@Windows +-AC_CHECK_FILE(/tmp/hstr-ms-wsl,AC_DEFINE(__MS_WSL__), []) +- + # Bash CLI autocomplete + AC_ARG_WITH([bash-completion-dir], + AS_HELP_STRING([--with-bash-completion-dir[=PATH]], +-- +2.31.1 + diff --git a/meta-oe/recipes-support/hstr/hstr_3.1.0.bb b/meta-oe/recipes-support/hstr/hstr_3.1.0.bb new file mode 100644 index 0000000000..a641feef6f --- /dev/null +++ b/meta-oe/recipes-support/hstr/hstr_3.1.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "bash and zsh shell history suggest box - easily view, navigate, search and manage your command history." +HOMEPAGE = "http://dvorka.github.io/hstr/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +DEPENDS = "ncurses readline" + +SRC_URI = "https://github.com/dvorka/hstr/releases/download/3.1/hstr-${PV}-tarball.tgz \ + file://0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch \ + file://0001-Use-OE-specific-checks-for-ncurses.patch" + +S = "${WORKDIR}/${BPN}" + +SRC_URI[sha256sum] = "4dabf61f045f022bac8bc909e5fd96041af6c53df56d97dfa3cfbf49af4453a5" + +inherit autotools pkgconfig bash-completion diff --git a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch index fc0d86e335..3d113efa15 100644 --- a/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +++ b/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -1,39 +1,47 @@ +From 0d49ee6416e389b9a7ba693588c2eaf129306a01 Mon Sep 17 00:00:00 2001 +From: Paul Barker <pbarker@toganlabs.com> +Date: Sun, 5 Nov 2017 22:07:30 +0000 +Subject: [PATCH] htop: Update to v2.0.2 + We need to use pkg-config to find the ncurses library instead of the ncurses*-config applications. Signed-off-by: Paul Barker <pbarker@toganlabs.com> Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> -Upstream-status: Inappropriate - (`ncurses*-config` can be used outside of OpenEmbedded) +Upstream-Status: Inappropriate [`ncurses*-config` can be used outside of OpenEmbedded] + +--- + configure.ac | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 559dc4d..77aea22 100644 +index e4df238a..2a31b201 100644 --- a/configure.ac +++ b/configure.ac -@@ -185,10 +185,10 @@ m4_define([HTOP_CHECK_LIB], - - AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") +@@ -391,10 +391,10 @@ AC_ARG_ENABLE([unicode], + [], + [enable_unicode=yes]) if test "x$enable_unicode" = xyes; then -- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", -- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", -- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", -+ HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", -+ HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", -+ HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "pkg-config ncurses5", +- HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", +- HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", +- HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "ncursesw5-config", +- HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "ncurses5-config", ++ HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", ++ HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "pkg-config ncursesw6", ++ HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncursesw5", ++ HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "pkg-config ncurses5", HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -@@ -201,8 +201,8 @@ if test "x$enable_unicode" = xyes; then - [AC_CHECK_HEADERS([ncurses/curses.h],[:], - [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) +@@ -416,8 +416,8 @@ if test "x$enable_unicode" = xyes; then + # (at this point we already link against a working ncurses library with wide character support) + AC_SEARCH_LIBS([keypad], [tinfow tinfo]) else -- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", -- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", -+ HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses6", -+ HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "pkg-config ncurses5", - HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], - HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], - missing_libraries="$missing_libraries libncurses" +- HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses6-config], +- HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses5-config], ++ HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses6], ++ HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [pkg-config ncurses5], + HTOP_CHECK_LIB([ncurses6], [doupdate], [HAVE_LIBNCURSES], + HTOP_CHECK_LIB([ncurses], [doupdate], [HAVE_LIBNCURSES], + HTOP_CHECK_LIB([curses], [doupdate], [HAVE_LIBNCURSES], diff --git a/meta-oe/recipes-support/htop/htop_3.0.1.bb b/meta-oe/recipes-support/htop/htop_3.0.1.bb deleted file mode 100644 index d677e36c01..0000000000 --- a/meta-oe/recipes-support/htop/htop_3.0.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Interactive process viewer" -HOMEPAGE = "https://htop.dev" -SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891" - -DEPENDS = "ncurses" - -SRC_URI = "git://github.com/htop-dev/htop.git \ - file://0001-Use-pkg-config.patch \ - " -SRCREV = "dace850fa6e27b5626115b366059258cfe4d60c9" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "cgroup \ - taskstats \ - unicode \ - linux-affinity \ - delayacct" -PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" -PACKAGECONFIG[cgroup] = "--enable-cgroup,--disable-cgroup" -PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" -PACKAGECONFIG[taskstats] = "--enable-taskstats,--disable-taskstats" -PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" -PACKAGECONFIG[linux-affinity] = "--enable-linux-affinity,--disable-linux-affinity" -PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc" -PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid" -PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" diff --git a/meta-oe/recipes-support/htop/htop_3.3.0.bb b/meta-oe/recipes-support/htop/htop_3.3.0.bb new file mode 100644 index 0000000000..cd5b766f0f --- /dev/null +++ b/meta-oe/recipes-support/htop/htop_3.3.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "Interactive process viewer" +HOMEPAGE = "https://htop.dev" +SECTION = "console/utils" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "ncurses" + +SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \ + file://0001-Use-pkg-config.patch \ +" +SRCREV = "68c970c7ef4a0682760ed570b3d82388ae7ccf54" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= " \ + unicode \ + affinity \ + delayacct \ +" +PACKAGECONFIG[unicode] = "--enable-unicode,--disable-unicode" +PACKAGECONFIG[affinity] = "--enable-affinity,--disable-affinity,,,,hwloc" +PACKAGECONFIG[unwind] = "--enable-unwind,--disable-unwind,libunwind" +PACKAGECONFIG[hwloc] = "--enable-hwloc,--disable-hwloc,hwloc,,,affinity" +PACKAGECONFIG[openvz] = "--enable-openvz,--disable-openvz" +PACKAGECONFIG[vserver] = "--enable-vserver,--disable-vserver" +PACKAGECONFIG[ancient-vserver] = "--enable-ancient-vserver,--disable-ancient-vserver" +PACKAGECONFIG[capabilities] = "--enable-capabilities,--disable-capabilities,libcap" +PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" +PACKAGECONFIG[sensors] = "--enable-sensors,--disable-sensors,lmsensors,lmsensors-libsensors" + +FILES:${PN} += "${datadir}/icons/hicolor/scalable/apps/htop.svg" + +RDEPENDS:${PN} += "ncurses-terminfo-base" diff --git a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb index 3da67d1e3a..0ec426afb9 100644 --- a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb +++ b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb @@ -3,69 +3,69 @@ SUMMARY = "Hunspell dictionaries used by Maliit" #Provided by Titus Wormer (wooorm) https://github.com/wooorm/dictionaries LICENSE = "MIT" -LICENSE_dictionaries/bg = "LGPL 2.1" -LICENSE_dictionaries/br = "GPL 3.0" -LICENSE_dictionaries/ca-valencia = "GPL 2.0 & LGPL-2.1" -LICENSE_dictionaries/ca = "GPL 2.0 & LGPL-2.1" -LICENSE_dictionaries/cs = "GPL-2.0" -LICENSE_dictionaries/da = "GPL-2.0" -LICENSE_dictionaries/de-AT = "GPL-3.0" -LICENSE_dictionaries/de-CH = "GPL-3.0" -LICENSE_dictionaries/de = "GPL-3.0" -LICENSE_dictionaries/el-polyton = "GPL-2.0" -LICENSE_dictionaries/el = "GPL-2.0" -LICENSE_dictionaries/en-AU = "LGPL-2.0" -LICENSE_dictionaries/en-CA = "MIT & BSD" -LICENSE_dictionaries/en-GB = "LGPL-2.0" -LICENSE_dictionaries/en-US = "MIT & BSD" -LICENSE_dictionaries/en-ZA = "LGPL 2.1" -LICENSE_dictionaries/eo = "GPL-2.0" -LICENSE_dictionaries/es = "GPL-3.0" -LICENSE_dictionaries/et = "LGPL-2.1" -LICENSE_dictionaries/eu = "GPL-2.0" -LICENSE_dictionaries/fo = "GPL-2.0" -LICENSE_dictionaries/fr = "MPL-2.0" -LICENSE_dictionaries/fur = "GPL-2.0" -LICENSE_dictionaries/fy = "GPL-3.0" -LICENSE_dictionaries/ga = "GPL-2.0" -LICENSE_dictionaries/gd = "GPL-3.0" -LICENSE_dictionaries/gl = "GPL-3.0" -LICENSE_dictionaries/he = "AGPL-3.0" -LICENSE_dictionaries/hr = "GPL-3.0" -LICENSE_dictionaries/hu = "GPL-2.0" -LICENSE_dictionaries/hy-arevela = "GPL-2.0" -LICENSE_dictionaries/hy-arevmda = "GPL-2.0" -LICENSE_dictionaries/ia = "GPL-3.0" -LICENSE_dictionaries/ie = "Apache-2.0" -LICENSE_dictionaries/is = "CC BY-SA 3.0 & CC BY 4.0" -LICENSE_dictionaries/it = "GPL-3.0" -LICENSE_dictionaries/ko = "MPL-1.1 & GPL-2.0 & LGPL-2.1" -LICENSE_dictionaries/la = "GPL-3.0" -LICENSE_dictionaries/lb = "EUPL-1.1" -LICENSE_dictionaries/lt = "Other" -LICENSE_dictionaries/ltg = "LGPL-2.1" -LICENSE_dictionaries/lv = "LGPL-2.1" -LICENSE_dictionaries/mk = "GPL-3.0" -LICENSE_dictionaries/mn = "GPL-2.0" -LICENSE_dictionaries/nb = "GPL-2.0" -LICENSE_dictionaries/nds = "GPL-2.0" -LICENSE_dictionaries/ne = "LGPL-2.1" -LICENSE_dictionaries/nl = "BSD" -LICENSE_dictionaries/nn = "GPL-2.0" -LICENSE_dictionaries/pl = "GPL-3.0" -LICENSE_dictionaries/pt-BR = "LGPL 2.1" -LICENSE_dictionaries/pt = "GPL-2.0" -LICENSE_dictionaries/ro = "GPL-2.0" -LICENSE_dictionaries/ru = "BSD" -LICENSE_dictionaries/rw = "GPL-3.0" -LICENSE_dictionaries/sk = "GPL-2.0" -LICENSE_dictionaries/sl = "GPL-2.0" -LICENSE_dictionaries/sr-Latn = "LGPL 3.0" -LICENSE_dictionaries/sr = "LGPL 3.0" -LICENSE_dictionaries/sv = "LGPL 3.0" -LICENSE_dictionaries/tr = "MIT" -LICENSE_dictionaries/uk = "GPL 2.0" -LICENSE_dictionaries/vi = "GPL 3.0" +LICENSE:dictionaries/bg = "LGPL 2.1" +LICENSE:dictionaries/br = "GPL 3.0" +LICENSE:dictionaries/ca-valencia = "GPL 2.0 & LGPL-2.1-only" +LICENSE:dictionaries/ca = "GPL 2.0 & LGPL-2.1-only" +LICENSE:dictionaries/cs = "GPL-2.0-only" +LICENSE:dictionaries/da = "GPL-2.0-only" +LICENSE:dictionaries/de-AT = "GPL-3.0-only" +LICENSE:dictionaries/de-CH = "GPL-3.0-only" +LICENSE:dictionaries/de = "GPL-3.0-only" +LICENSE:dictionaries/el-polyton = "GPL-2.0-only" +LICENSE:dictionaries/el = "GPL-2.0-only" +LICENSE:dictionaries/en-AU = "LGPL-2.0-only" +LICENSE:dictionaries/en-CA = "MIT & BSD" +LICENSE:dictionaries/en-GB = "LGPL-2.0-only" +LICENSE:dictionaries/en-US = "MIT & BSD" +LICENSE:dictionaries/en-ZA = "LGPL 2.1" +LICENSE:dictionaries/eo = "GPL-2.0-only" +LICENSE:dictionaries/es = "GPL-3.0-only" +LICENSE:dictionaries/et = "LGPL-2.1-only" +LICENSE:dictionaries/eu = "GPL-2.0-only" +LICENSE:dictionaries/fo = "GPL-2.0-only" +LICENSE:dictionaries/fr = "MPL-2.0" +LICENSE:dictionaries/fur = "GPL-2.0-only" +LICENSE:dictionaries/fy = "GPL-3.0-only" +LICENSE:dictionaries/ga = "GPL-2.0-only" +LICENSE:dictionaries/gd = "GPL-3.0-only" +LICENSE:dictionaries/gl = "GPL-3.0-only" +LICENSE:dictionaries/he = "AGPL-3.0-only" +LICENSE:dictionaries/hr = "GPL-3.0-only" +LICENSE:dictionaries/hu = "GPL-2.0-only" +LICENSE:dictionaries/hy-arevela = "GPL-2.0-only" +LICENSE:dictionaries/hy-arevmda = "GPL-2.0-only" +LICENSE:dictionaries/ia = "GPL-3.0-only" +LICENSE:dictionaries/ie = "Apache-2.0" +LICENSE:dictionaries/is = "CC BY-SA 3.0 & CC BY 4.0" +LICENSE:dictionaries/it = "GPL-3.0-only" +LICENSE:dictionaries/ko = "MPL-1.1 & GPL-2.0-only & LGPL-2.1-only" +LICENSE:dictionaries/la = "GPL-3.0-only" +LICENSE:dictionaries/lb = "EUPL-1.1" +LICENSE:dictionaries/lt = "Other" +LICENSE:dictionaries/ltg = "LGPL-2.1-only" +LICENSE:dictionaries/lv = "LGPL-2.1-only" +LICENSE:dictionaries/mk = "GPL-3.0-only" +LICENSE:dictionaries/mn = "GPL-2.0-only" +LICENSE:dictionaries/nb = "GPL-2.0-only" +LICENSE:dictionaries/nds = "GPL-2.0-only" +LICENSE:dictionaries/ne = "LGPL-2.1-only" +LICENSE:dictionaries/nl = "BSD" +LICENSE:dictionaries/nn = "GPL-2.0-only" +LICENSE:dictionaries/pl = "GPL-3.0-only" +LICENSE:dictionaries/pt-BR = "LGPL 2.1" +LICENSE:dictionaries/pt = "GPL-2.0-only" +LICENSE:dictionaries/ro = "GPL-2.0-only" +LICENSE:dictionaries/ru = "BSD" +LICENSE:dictionaries/rw = "GPL-3.0-only" +LICENSE:dictionaries/sk = "GPL-2.0-only" +LICENSE:dictionaries/sl = "GPL-2.0-only" +LICENSE:dictionaries/sr-Latn = "LGPL 3.0" +LICENSE:dictionaries/sr = "LGPL 3.0" +LICENSE:dictionaries/sv = "LGPL 3.0" +LICENSE:dictionaries/tr = "MIT" +LICENSE:dictionaries/uk = "GPL 2.0" +LICENSE:dictionaries/vi = "GPL 3.0" LIC_FILES_CHKSUM = " \ file://dictionaries/bg/license;md5=ab14e2ded1a43b84be9aba2be64b9814 \ file://dictionaries/br/license;md5=2e046c64edc0a4e47fb3ea614e6c82c4 \ @@ -131,21 +131,21 @@ LIC_FILES_CHKSUM = " \ file://dictionaries/vi/license;md5=8d9ecb4e7577ce760029786aba7ecec5 \ " -RDEPENDS_${PN} = "hunspell" +RDEPENDS:${PN} = "hunspell" -PV = "0.0.0+git${SRCPV}" +PV = "0.0.0+git" SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" -SRC_URI = "git://github.com/wooorm/dictionaries.git" +SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=master;protocol=https" S = "${WORKDIR}/git" do_install() { for LANGUAGE in `ls -d1 ${S}/dictionaries/*` ; do - LANGUAGE_DIR=`basename $LANGUAGE` + LANGUAGE_DIR=`basename $LANGUAGE | sed 's:-:_:'` install -D -m0644 $LANGUAGE/index.dic ${D}${datadir}/hunspell/$LANGUAGE_DIR.dic install -D -m0644 $LANGUAGE/index.aff ${D}${datadir}/hunspell/$LANGUAGE_DIR.aff install -D -m0644 $LANGUAGE/LICENSE ${D}${datadir}/hunspell/LICENSE-$LANGUAGE_DIR 2>/dev/null || echo "No LICENSE for language $LANGUAGE" done } -FILES_${PN} = "${datadir}/hunspell" +FILES:${PN} = "${datadir}/hunspell" diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb b/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb deleted file mode 100644 index c2fb4fa05b..0000000000 --- a/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "A spell checker and morphological analyzer library" -HOMEPAGE = "http://hunspell.github.io/" -LICENSE = "GPLv2 | LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=75859989545e37968a99b631ef42722e \ - file://COPYING.LESSER;md5=c96ca6c1de8adc025adfada81d06fba5 \ -" - -SRCREV = "4ddd8ed5ca6484b930b111aec50c2750a6119a0f" -SRC_URI = "git://github.com/${BPN}/${BPN}.git" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig gettext - -RDEPENDS_${PN} = "perl" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb new file mode 100644 index 0000000000..afe75472a5 --- /dev/null +++ b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "A spell checker and morphological analyzer library" +HOMEPAGE = "http://hunspell.github.io/" +LICENSE = "GPL-2.0-only | LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=75859989545e37968a99b631ef42722e \ + file://COPYING.LESSER;md5=c96ca6c1de8adc025adfada81d06fba5 \ +" + +SRCREV = "2969be996acad84b91ab3875b1816636fe61a40e" +SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig gettext + +# ispellaff2myspell: A program to convert ispell affix tables to myspell format +PACKAGES =+ "${PN}-ispell" +FILES:${PN}-ispell = "${bindir}/ispellaff2myspell" +RDEPENDS:${PN}-ispell = "perl" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-oe/recipes-support/hwdata/hwdata_0.381.bb index cc12a6890c..291b273724 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_0.381.bb @@ -2,22 +2,25 @@ DESCRIPTION = "Hardware identification and configuration data" HOMEPAGE = "https://github.com/vcrhonek/hwdata" SECTION = "System/Base" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.340" -SRCREV = "60d9f39b0542607fcc436e7aebf6b05a9ca674ff" -SRC_URI = "git://github.com/vcrhonek/${BPN}.git" +SRCREV = "4463530857af32d9dbfcfa9939c2304b51e5e58d" +SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" +inherit allarch + do_configure() { ${S}/configure --datadir=${datadir} --libdir=${libdir} } +do_compile[noexec] = "1" + do_install() { oe_runmake install DESTDIR=${D} } -FILES_${PN} = "${libdir}/* \ +FILES:${PN} = "${libdir}/* \ ${datadir}/* " diff --git a/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb new file mode 100644 index 0000000000..8218b08084 --- /dev/null +++ b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "A command-line application to restore firmware files to iOS devices" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \ +" + +HOMEPAGE = "http://www.libimobiledevice.org/" + +DEPENDS = "libirecovery libimobiledevice libzip curl libimobiledevice-glue openssl" + +PV = "1.0.1+git" + +SRCREV = "ecae6c6e8ca6b6bad080a1c73f10ffd0e67d75a7" +SRC_URI = "git://github.com/libimobiledevice/idevicerestore;protocol=https;branch=master" + +S = "${WORKDIR}/git" +inherit autotools pkgconfig diff --git a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb index 986984d1ff..017e7d26a6 100644 --- a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb +++ b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb @@ -1,13 +1,13 @@ SUMMARY = "Fast and portable XML parser and Jabber protocol library" HOMEPAGE = "https://github.com/meduketto/iksemel" SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRCREV = "978b733462e41efd5db72bc9974cb3b0d1d5f6fa" -PV = "1.5+git${SRCPV}" +PV = "1.5+git" -SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https \ +SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \ file://fix-configure-option-parsing.patch \ file://avoid-obsolete-gnutls-apis.patch" diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index 70cb237d9e..6ab8a61b9b 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb @@ -4,25 +4,25 @@ 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=41b4fa9af60c88e61484b02c0561181a" +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 .= "_25" -SRC_URI = "git://github.com/ImageMagick/ImageMagick.git " -SRCREV = "8b4e00829eb84d4e7b4da11acf1f98f1e8166e5b" +PV .= "-26" +SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" +SRCREV = "570a9a048bb0e3a5c221ca87be9408ae35f711e2" S = "${WORKDIR}/git" inherit autotools pkgconfig update-alternatives +export ac_cv_sys_file_offset_bits="64" -# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2 -# if someone needs xml support then fix it first -EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl" +EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --enable-largefile" -CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} cxx webp xml" +PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus" PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz" PACKAGECONFIG[jp2] = "--with-jp2,,jasper" PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" @@ -33,19 +33,30 @@ PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools" PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt" +PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2" -FILES_${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \ +do_install:append:class-target() { + for file in MagickCore-config.im7 MagickWand-config.im7 Magick++-config.im7; do + 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 + sed -i 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml + sed -i 's,${HOSTTOOLS_DIR},${bindir},g' ${D}${sysconfdir}/ImageMagick-7/delegates.xml +} + +FILES:${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \ ${datadir}/ImageMagick-7" -FILES_${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a" +FILES:${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a" -FILES_${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*" +FILES:${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "animate compare composite conjure convert display \ +ALTERNATIVE:${PN} = "animate compare composite conjure convert display \ identify import magick-script mogrify montage stream" ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7" @@ -61,7 +72,7 @@ ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7" ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7" ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7" -ALTERNATIVE_${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \ +ALTERNATIVE:${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \ convert.1 display.1 identify.1 import.1 magick-script.1 mogrify.1 montage.1 stream.1" ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1" diff --git a/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb b/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb deleted file mode 100644 index 86553b5a8c..0000000000 --- a/meta-oe/recipes-support/imapfilter/imapfilter_2.6.16.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ccca8573ead8e965c130b6b2946a36ab" - -SRC_URI = "https://codeload.github.com/lefcha/${BPN}/tar.gz/v${PV};downloadfilename=${BP}.tar.gz \ - file://ldflags.patch \ -" -SRC_URI[sha256sum] = "90af9bc9875e03fb5a09a3233287b74dd817867cb18ec9ff52fead615755563e" - -DEPENDS= "openssl lua libpcre" - -EXTRA_OEMAKE_append = " PREFIX=${prefix}" - -do_install(){ - oe_runmake DESTDIR=${D} install - - # No need for manuals at this point, MANDIR is hardcoded to depend on prefix - rm -rf ${D}${prefix}/man -} - -ASNEEDED = "" diff --git a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb new file mode 100644 index 0000000000..422d96359c --- /dev/null +++ b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "IMAPFilter is a mail filtering utility that processes mailboxes based on IMAP queries" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f8d2fc4954306888fd0e4b27bef83525" + +# v2.7.6 +SRCREV = "9e6661278572009a92a8e125c9b339232a9735a1" +SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master \ + file://ldflags.patch \ +" +S = "${WORKDIR}/git" + +DEPENDS= "openssl lua libpcre2" + +EXTRA_OEMAKE:append = " PREFIX=${prefix}" + +do_install(){ + oe_runmake DESTDIR=${D} install + + # No need for manuals at this point, MANDIR is hardcoded to depend on prefix + rm -rf ${D}${prefix}/man +} + +ASNEEDED = "" diff --git a/meta-oe/recipes-support/inih/libinih_58.bb b/meta-oe/recipes-support/inih/libinih_58.bb new file mode 100644 index 0000000000..2bcf2b4bd4 --- /dev/null +++ b/meta-oe/recipes-support/inih/libinih_58.bb @@ -0,0 +1,14 @@ +SUMMARY = "inih (INI Not Invented Here)" +DESCRIPTION = "A .INI file parser written in C that was designed to be small and simple." +HOMEPAGE = "https://github.com/benhoyt/inih" +SECTION = "libs" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202" + +SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" +SRCREV = "5cc5e2c24642513aaa5b19126aad42d0e4e0923e" + +inherit meson pkgconfig diff --git a/meta-oe/recipes-support/inih/libinih_git.bb b/meta-oe/recipes-support/inih/libinih_git.bb deleted file mode 100644 index 227e2a7b7c..0000000000 --- a/meta-oe/recipes-support/inih/libinih_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "C and C++ INI Library" -HOMEPAGE = "http://code.google.com/p/inih/" -PV = "0.0+gitr${SRCPV}" -PKGV = "${GITPKGVTAG}" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde" - -PR = "r3" - -# The github repository provides a cmake and pkg-config integration -SRCREV = "c858aff8c31fa63ef4d1e0176c10e5928cde9a23" -SRC_URI = "git://github.com/OSSystems/inih.git \ - " - -UPSTREAM_CHECK_COMMITS = "1" - -S = "${WORKDIR}/git" - -inherit gitpkgv cmake - -# We don't have libinih since we only have static libraries -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch b/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch new file mode 100644 index 0000000000..4824344f05 --- /dev/null +++ b/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch @@ -0,0 +1,23 @@ +From 1761298b73c759c07e4652ada307f68512a75ff1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 25 Mar 2022 20:44:41 -0700 +Subject: [PATCH] iniparser.pc: Make libpath a variable + +Will set according to baselib that yocto exports. + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + iniparser.pc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/iniparser.pc ++++ b/iniparser.pc +@@ -1,6 +1,6 @@ + prefix=/usr + exec_prefix=/usr +-libdir=${exec_prefix}/lib ++libdir=${exec_prefix}/@baselib@ + includedir=${prefix}/include + datarootdir=${prefix}/share + datadir=${datarootdir} diff --git a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch b/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch index b666f00f70..46c1b0f7ac 100644 --- a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch +++ b/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch @@ -4,6 +4,8 @@ Date: Thu, 13 Feb 2014 07:03:26 -0500 Subject: Add CMake support. --- +Upstream-Status: Pending + CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 CMakeLists.txt diff --git a/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch b/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch new file mode 100644 index 0000000000..db5fb06aac --- /dev/null +++ b/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch @@ -0,0 +1,48 @@ +CVE: CVE-2023-33461 +Upstream-Status: Backport [https://github.com/ndevilla/iniparser/pull/146/commits/ace9871f65d11b5d73f0b9ee8cf5d2807439442d] +Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> + + +From ace9871f65d11b5d73f0b9ee8cf5d2807439442d Mon Sep 17 00:00:00 2001 +From: Antonio <antoniolrt@gmail.com> +Date: Fri, 2 Jun 2023 15:03:10 -0300 +Subject: [PATCH] Handle null return from iniparser_getstring + +Fix handling of NULL returns from iniparser_getstring in +iniparser_getboolean, iniparser_getlongint and iniparser_getdouble, +avoiding a crash. +--- + src/iniparser.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/iniparser.c b/src/iniparser.c +index f1d1658..dbceb20 100644 +--- a/src/iniparser.c ++++ b/src/iniparser.c +@@ -456,7 +456,7 @@ long int iniparser_getlongint(const dictionary * d, const char * key, long int n + const char * str ; + + str = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (str==INI_INVALID_KEY) return notfound ; ++ if (str==NULL || str==INI_INVALID_KEY) return notfound ; + return strtol(str, NULL, 0); + } + +@@ -511,7 +511,7 @@ double iniparser_getdouble(const dictionary * d, const char * key, double notfou + const char * str ; + + str = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (str==INI_INVALID_KEY) return notfound ; ++ if (str==NULL || str==INI_INVALID_KEY) return notfound ; + return atof(str); + } + +@@ -553,7 +553,7 @@ int iniparser_getboolean(const dictionary * d, const char * key, int notfound) + const char * c ; + + c = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (c==INI_INVALID_KEY) return notfound ; ++ if (c==NULL || c==INI_INVALID_KEY) return notfound ; + if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') { + ret = 1 ; + } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') { diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb b/meta-oe/recipes-support/iniparser/iniparser_4.1.bb index f4b553a578..c80668d279 100644 --- a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb +++ b/meta-oe/recipes-support/iniparser/iniparser_4.1.bb @@ -6,12 +6,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e02baf71c76e0650e667d7da133379ac" DEPENDS = "doxygen-native" -SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https \ - file://Add-CMake-support.patch" +PV .= "+git" -# tag 4.1 -SRCREV= "0a38e85c9cde1e099ca3bf70083bd00f89c3e5b6" +SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https;branch=master \ + file://0001-iniparser.pc-Make-libpath-a-variable.patch \ + file://Add-CMake-support.patch \ + file://CVE-2023-33461.patch \ +" + +SRCREV= "deb85ad4936d4ca32cc2260ce43323d47936410d" S = "${WORKDIR}/git" inherit cmake + +do_install:append() { + install -Dm 0644 ${S}/iniparser.pc ${D}${libdir}/pkgconfig/iniparser.pc + sed -i -e 's,@baselib@,${baselib},g' ${D}${libdir}/pkgconfig/iniparser.pc +} + +BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch deleted file mode 100644 index 2c7cd99701..0000000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-Makefile.am-add-build-rule-for-README.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 22bff509e2a0e5640994bc92ded62c383d99bc37 Mon Sep 17 00:00:00 2001 -From: Pierre-Jean Texier <pjtexier@koncepto.io> -Date: Mon, 24 Feb 2020 21:44:45 +0100 -Subject: [PATCH] Makefile.am: add build rule for README - -Fixes: - -| configure.ac:17: installing 'config/config.sub' -| configure.ac:16: installing 'config/install-sh' -| configure.ac:16: installing 'config/missing' -| Makefile.am: error: required file './README' not found -| libinotifytools/src/Makefile.am: installing 'config/depcomp' - -Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/111] - -Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> ---- - Makefile.am | 2 ++ - autogen.sh | 1 - - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 56e4531..d08c8fe 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4 - - SUBDIRS = libinotifytools src man - -+README: README.md -+ - dist-hook: - # Automake official documentation states that dist-hook should assume files - # are not writable. -diff --git a/autogen.sh b/autogen.sh -index 48eb21d..31572c2 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -1,4 +1,3 @@ - #!/bin/sh - --cp README.md README - autoreconf --install "$@" || exit 1 --- -2.7.4 - diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch new file mode 100644 index 0000000000..3b195aae4f --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch @@ -0,0 +1,28 @@ +From 6a57ff26d695aaad096b798879a5dbc5af2cedf5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Dec 2022 10:46:50 -0800 +Subject: [PATCH] configure: Add AC_SYS_LARGEFILE autoconf macro + +This will define _FILE_OFFSET_BITS to be 64 if off_t is 64bit +and we do not need to define lfs64 functions + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index bddf14d..b89a266 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,9 @@ AC_PROG_CC + AM_INIT_AUTOMAKE + LT_INIT + ++# Add option for largefile support ++AC_SYS_LARGEFILE ++ + AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN) + + AC_ARG_ENABLE(doxygen, diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch new file mode 100644 index 0000000000..931244830c --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch @@ -0,0 +1,40 @@ +From 6c3ce01a281a9aa661494d24a862219fc9e2b460 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 16 Dec 2021 14:57:55 -0800 +Subject: [PATCH 2/2] libinotifytools: Bridge differences between + musl/glibc/kernel fnotify.h + +System detects to use sys/fnotify.h and then assumes glibc's definitions +but musl has definitions of its own. perhaps portable thing would be to +use linux/fnotify.h interface directly on linux irrespective of libc + +See the differences discussion here [1] + +[1] https://inbox.vuxu.org/musl/20191112220151.GC27331@x230/T/#ma8700992467200c8792e0fa8508eae656b81aeba + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/154] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libinotifytools/src/inotifytools.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c +index 902eac2..2b96395 100644 +--- a/libinotifytools/src/inotifytools.c ++++ b/libinotifytools/src/inotifytools.c +@@ -55,6 +55,12 @@ struct fanotify_event_fid { + struct fanotify_event_info_fid info; + struct file_handle handle; + }; ++ ++#ifndef __GLIBC__ ++#define val __val ++#define __kernel_fsid_t fsid_t ++#endif ++ + #endif + + /** +-- +2.34.1 + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch new file mode 100644 index 0000000000..c0784ecc73 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch @@ -0,0 +1,119 @@ +From c6093ad63b92f5d25e6826d1c49dc7cee86d3747 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Dec 2022 10:48:10 -0800 +Subject: [PATCH] replace stat64/lstat64 with stat/lstat + +lfs64 functions are not needed when off_t is 64-bit +Additionally this fixes build with musl which does not +export these functions without defining _LARGEFILE64_SOURCE + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libinotifytools/src/inotifytools.c | 8 ++++---- + libinotifytools/src/inotifytools/inotify-nosys.h | 5 ----- + libinotifytools/src/inotifytools/inotifytools.h | 5 ----- + src/common.c | 4 ++-- + src/common.h | 6 +----- + 5 files changed, 7 insertions(+), 21 deletions(-) + +diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c +index 50f6135..3e17ac6 100644 +--- a/libinotifytools/src/inotifytools.c ++++ b/libinotifytools/src/inotifytools.c +@@ -1750,14 +1750,14 @@ int inotifytools_watch_recursively_with_exclude(char const* path, + + static struct dirent * ent; + char * next_file; +- static struct stat64 my_stat; ++ static struct stat my_stat; + ent = readdir( dir ); + // Watch each directory within this directory + while ( ent ) { + if ( (0 != strcmp( ent->d_name, "." )) && + (0 != strcmp( ent->d_name, ".." )) ) { + nasprintf(&next_file,"%s%s", my_path, ent->d_name); +- if ( -1 == lstat64( next_file, &my_stat ) ) { ++ if ( -1 == lstat( next_file, &my_stat ) ) { + error = errno; + free( next_file ); + if ( errno != EACCES ) { +@@ -1840,9 +1840,9 @@ int inotifytools_error() { + * @internal + */ + static int isdir( char const * path ) { +- static struct stat64 my_stat; ++ static struct stat my_stat; + +- if ( -1 == lstat64( path, &my_stat ) ) { ++ if ( -1 == lstat( path, &my_stat ) ) { + if (errno == ENOENT) return 0; + fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno)); + return 0; +diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h +index 01aa45e..97166d4 100644 +--- a/libinotifytools/src/inotifytools/inotify-nosys.h ++++ b/libinotifytools/src/inotifytools/inotify-nosys.h +@@ -13,11 +13,6 @@ + #include <sys/syscall.h> + #include <unistd.h> + +-#ifdef __FreeBSD__ +-#define stat64 stat +-#define lstat64 lstat +-#endif +- + /* + * struct inotify_event - structure read from the inotify device for each event + * +diff --git a/libinotifytools/src/inotifytools/inotifytools.h b/libinotifytools/src/inotifytools/inotifytools.h +index 49936ae..2ec4358 100644 +--- a/libinotifytools/src/inotifytools/inotifytools.h ++++ b/libinotifytools/src/inotifytools/inotifytools.h +@@ -1,11 +1,6 @@ + #ifndef _inotifytools_H + #define _inotifytools_H + +-#ifdef __FreeBSD__ +-#define stat64 stat +-#define lstat64 lstat +-#endif +- + #ifdef __cplusplus + extern "C" + { +diff --git a/src/common.c b/src/common.c +index 5a6fda1..885286e 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -45,9 +45,9 @@ void print_event_descriptions() { + } + + int isdir(char const *path) { +- static struct stat64 my_stat; ++ static struct stat my_stat; + +- if (-1 == lstat64(path, &my_stat)) { ++ if (-1 == lstat(path, &my_stat)) { + if (errno == ENOENT) + return 0; + fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno)); +diff --git a/src/common.h b/src/common.h +index 12d3dde..7f1e34a 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -1,13 +1,9 @@ + #ifndef COMMON_H + #define COMMON_H + +-#ifdef __FreeBSD__ +-#define stat64 stat +-#define lstat64 lstat +-#ifdef ENABLE_FANOTIFY ++#if defined(__FreeBSD__) && defined(ENABLE_FANOTIFY) + #error "FreeBSD does not support fanotify" + #endif +-#endif + + #include <stdbool.h> + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb new file mode 100644 index 0000000000..8a0ae17ad7 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "Command line tools and C library providing a simple interface to inotify" +HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools" +SECTION = "console/devel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" + +SRCREV = "c8bdbc0a2ed822fc7c67c5c3e102d89fe27fb2d0" + +SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ + file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \ + file://0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch \ + file://0003-replace-stat64-lstat64-with-stat-lstat.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools + +EXTRA_OECONF = "--disable-doxygen" + +# workaround until glibc 2.35 is fixed for this [1] +# [1] https://sourceware.org/pipermail/libc-alpha/2021-December/134215.html +CFLAGS += "-Wno-error" + +PACKAGES =+ "libinotifytools" + +FILES:libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb deleted file mode 100644 index f42abeb2ba..0000000000 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Command line tools and C library providing a simple interface to inotify" -AUTHOR = "Rohan McGovern <rohan@mcgovern.id.au>" -HOMEPAGE = "http://wiki.github.com/rvoicilas/inotify-tools" -SECTION = "console/devel" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" - -SRCREV = "cfa93aa19f81d85b63cd64da30c7499890d4c07d" -PV = "3.20.2.2" - -SRC_URI = "git://github.com/rvoicilas/${BPN} \ - file://0001-Makefile.am-add-build-rule-for-README.patch \ - " - -S = "${WORKDIR}/git" - -inherit autotools - -EXTRA_OECONF = "--disable-doxygen" - -PACKAGES =+ "libinotifytools" - -FILES_libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-oe/recipes-support/joe/joe_4.6.bb b/meta-oe/recipes-support/joe/joe_4.6.bb index 674736a68a..ed0bf337b5 100644 --- a/meta-oe/recipes-support/joe/joe_4.6.bb +++ b/meta-oe/recipes-support/joe/joe_4.6.bb @@ -1,7 +1,7 @@ SECTION = "console/utils" SUMMARY = "Console text editor with good functionality, good choice for vi-haters" HOMEPAGE = "http://joe-editor.sourceforge.net/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" diff --git a/meta-oe/recipes-support/lcms/lcms_2.11.bb b/meta-oe/recipes-support/lcms/lcms_2.11.bb deleted file mode 100644 index 4f10f35316..0000000000 --- a/meta-oe/recipes-support/lcms/lcms_2.11.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=9391499b030def18e7bb25bab4bee052" - -SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" -SRC_URI[md5sum] = "598dae499e58f877ff6788254320f43e" -SRC_URI[sha256sum] = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e" - -DEPENDS = "tiff" - -BBCLASSEXTEND = "native" - -S = "${WORKDIR}/lcms2-${PV}" - -inherit autotools diff --git a/meta-oe/recipes-support/lcms/lcms_2.16.bb b/meta-oe/recipes-support/lcms/lcms_2.16.bb new file mode 100644 index 0000000000..8135f83a05 --- /dev/null +++ b/meta-oe/recipes-support/lcms/lcms_2.16.bb @@ -0,0 +1,17 @@ +SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e9ce323c4b71c943a785db90142b228a" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" +SRC_URI[sha256sum] = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51" + +DEPENDS = "tiff" + +BBCLASSEXTEND = "native nativesdk" + +S = "${WORKDIR}/lcms2-${PV}" + +inherit autotools + +CVE_PRODUCT += "littlecms:little_cms_color_engine" diff --git a/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch b/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch deleted file mode 100644 index 9ac0770f96..0000000000 --- a/meta-oe/recipes-support/lcov/files/0001-geninfo-Add-intermediate-text-format-support.patch +++ /dev/null @@ -1,898 +0,0 @@ -From ec3e1f411c332cbc2f2bc7ab7e2175ebf918b37a Mon Sep 17 00:00:00 2001 -From: Peter Oberparleiter <oberpar@linux.ibm.com> -Date: Fri, 24 May 2019 16:56:52 +0200 -Subject: [PATCH 1/2] geninfo: Add intermediate text format support - -This change adds support for parsing the output of gcov's intermediate -text file format as implemented by GCC versions 5 to 8. The use of the -gcov intermediate format should increase processing speed. It also -provides branch coverage data when using the --initial command line -option. - -Users can control whether geninfo uses the intermediate format via the -geninfo_intermediate configuration file option. Valid values are: - - 0: Use normal text format - 1: Use intermediate format - auto: Use intermediate format if available. This is the default. - -Signed-off-by: Peter Oberparleiter <oberpar@linux.ibm.com> ---- - bin/geninfo | 567 ++++++++++++++++++++++++++++++++++++++++++++------- - lcovrc | 3 + - man/lcovrc.5 | 24 +++ - 3 files changed, 521 insertions(+), 73 deletions(-) - -Upstream-Status: Backport -Download URL: https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7 - -diff --git a/bin/geninfo b/bin/geninfo -index f41eaec..0276666 100755 ---- a/bin/geninfo -+++ b/bin/geninfo -@@ -54,6 +54,8 @@ use warnings; - use File::Basename; - use File::Spec::Functions qw /abs2rel catdir file_name_is_absolute splitdir - splitpath catpath/; -+use File::Temp qw(tempfile tempdir); -+use File::Copy qw(copy); - use Getopt::Long; - use Digest::MD5 qw(md5_base64); - use Cwd qw/abs_path/; -@@ -163,13 +165,13 @@ sub solve_relative_path($$); - sub read_gcov_header($); - sub read_gcov_file($); - sub info(@); -+sub process_intermediate($$$); - sub map_llvm_version($); - sub version_to_str($); - sub get_gcov_version(); - sub system_no_output($@); - sub read_config($); - sub apply_config($); --sub get_exclusion_data($); - sub apply_exclusion_data($$); - sub process_graphfile($$); - sub filter_fn_name($); -@@ -264,6 +266,8 @@ our $gcno_split_crc; - our $func_coverage = 1; - our $br_coverage = 0; - our $rc_auto_base = 1; -+our $rc_intermediate = "auto"; -+our $intermediate; - our $excl_line = "LCOV_EXCL_LINE"; - our $excl_br_line = "LCOV_EXCL_BR_LINE"; - -@@ -331,6 +335,7 @@ if ($config || %opt_rc) - "geninfo_compat" => \$opt_compat, - "geninfo_adjust_src_path" => \$rc_adjust_src_path, - "geninfo_auto_base" => \$rc_auto_base, -+ "geninfo_intermediate" => \$rc_intermediate, - "lcov_function_coverage" => \$func_coverage, - "lcov_branch_coverage" => \$br_coverage, - "lcov_excl_line" => \$excl_line, -@@ -460,15 +465,38 @@ if (system_no_output(3, $gcov_tool, "--help") == -1) - } - - ($gcov_version, $gcov_version_string) = get_gcov_version(); -+$gcov_caps = get_gcov_capabilities(); -+ -+# Determine intermediate mode -+if ($rc_intermediate eq "0") { -+ $intermediate = 0; -+} elsif ($rc_intermediate eq "1") { -+ $intermediate = 1; -+} elsif (lc($rc_intermediate) eq "auto") { -+ # Use intermediate format if supported by gcov -+ $intermediate = $gcov_caps->{'intermediate-format'} ? 1 : 0; -+} else { -+ die("ERROR: invalid value for geninfo_intermediate: ". -+ "'$rc_intermediate'\n"); -+} -+ -+if ($intermediate) { -+ info("Using intermediate gcov format\n"); -+ if ($opt_derive_func_data) { -+ warn("WARNING: --derive-func-data is not compatible with ". -+ "intermediate format - ignoring\n"); -+ $opt_derive_func_data = 0; -+ } -+} - - # Determine gcov options --$gcov_caps = get_gcov_capabilities(); - push(@gcov_options, "-b") if ($gcov_caps->{'branch-probabilities'} && - ($br_coverage || $func_coverage)); - push(@gcov_options, "-c") if ($gcov_caps->{'branch-counts'} && - $br_coverage); - push(@gcov_options, "-a") if ($gcov_caps->{'all-blocks'} && -- $opt_gcov_all_blocks && $br_coverage); -+ $opt_gcov_all_blocks && $br_coverage && -+ !$intermediate); - if ($gcov_caps->{'hash-filenames'}) - { - push(@gcov_options, "-x"); -@@ -599,7 +627,7 @@ foreach my $entry (@data_directory) { - gen_info($entry); - } - --if ($initial && $br_coverage) { -+if ($initial && $br_coverage && !$intermediate) { - warn("Note: --initial does not generate branch coverage ". - "data\n"); - } -@@ -768,6 +796,7 @@ sub gen_info($) - my $prefix; - my $type; - my $ext; -+ my $tempdir; - - if ($initial) { - $type = "graph"; -@@ -798,16 +827,22 @@ sub gen_info($) - $prefix = ""; - } - -+ $tempdir = tempdir(CLEANUP => 1); -+ - # Process all files in list - foreach $file (@file_list) { - # Process file -- if ($initial) { -+ if ($intermediate) { -+ process_intermediate($file, $prefix, $tempdir); -+ } elsif ($initial) { - process_graphfile($file, $prefix); - } else { - process_dafile($file, $prefix); - } - } - -+ unlink($tempdir); -+ - # Report whether files were excluded. - if (%excluded_files) { - info("Excluded data for %d files due to include/exclude options\n", -@@ -1058,10 +1093,12 @@ sub process_dafile($$) - - # Try to find base directory automatically if requested by user - if ($rc_auto_base) { -- $base_dir = find_base_from_graph($base_dir, $instr, $graph); -+ $base_dir = find_base_from_source($base_dir, -+ [ keys(%{$instr}), keys(%{$graph}) ]); - } - -- ($instr, $graph) = adjust_graph_filenames($base_dir, $instr, $graph); -+ adjust_source_filenames($instr, $base_dir); -+ adjust_source_filenames($graph, $base_dir); - - # Set $object_dir to real location of object files. This may differ - # from $da_dir if the graph file is just a link to the "real" object -@@ -2017,6 +2054,299 @@ sub read_gcov_file($) - } - - -+# -+# read_intermediate_text(gcov_filename, data) -+# -+# Read gcov intermediate text format in GCOV_FILENAME and add the resulting -+# data to DATA in the following format: -+# -+# data: source_filename -> file_data -+# file_data: concatenated lines of intermediate text data -+# -+ -+sub read_intermediate_text($$) -+{ -+ my ($gcov_filename, $data) = @_; -+ my $fd; -+ my $filename; -+ -+ open($fd, "<", $gcov_filename) or -+ die("ERROR: Could not read $gcov_filename: $!\n"); -+ while (my $line = <$fd>) { -+ if ($line =~ /^file:(.*)$/) { -+ $filename = $1; -+ chomp($filename); -+ } elsif (defined($filename)) { -+ $data->{$filename} .= $line; -+ } -+ } -+ close($fd); -+} -+ -+ -+# -+# intermediate_text_to_info(fd, data, srcdata) -+# -+# Write DATA in info format to file descriptor FD. -+# -+# data: filename -> file_data: -+# file_data: concatenated lines of intermediate text data -+# -+# srcdata: filename -> [ excl, brexcl, checksums ] -+# excl: lineno -> 1 for all lines for which to exclude all data -+# brexcl: lineno -> 1 for all lines for which to exclude branch data -+# checksums: lineno -> source code checksum -+# -+# Note: To simplify processing, gcov data is not combined here, that is counts -+# that appear multiple times for the same lines/branches are not added. -+# This is done by lcov/genhtml when reading the data files. -+# -+ -+sub intermediate_text_to_info($$$) -+{ -+ my ($fd, $data, $srcdata) = @_; -+ my $branch_num = 0; -+ my $c; -+ -+ return if (!%{$data}); -+ -+ print($fd "TN:$test_name\n"); -+ for my $filename (keys(%{$data})) { -+ my ($excl, $brexcl, $checksums); -+ -+ if (defined($srcdata->{$filename})) { -+ ($excl, $brexcl, $checksums) = @{$srcdata->{$filename}}; -+ } -+ -+ print($fd "SF:$filename\n"); -+ for my $line (split(/\n/, $data->{$filename})) { -+ if ($line =~ /^lcount:(\d+),(\d+),?/) { -+ # lcount:<line>,<count> -+ # lcount:<line>,<count>,<has_unexecuted_blocks> -+ if ($checksum && exists($checksums->{$1})) { -+ $c = ",".$checksums->{$1}; -+ } else { -+ $c = ""; -+ } -+ print($fd "DA:$1,$2$c\n") if (!$excl->{$1}); -+ -+ # Intermediate text format does not provide -+ # branch numbers, and the same branch may appear -+ # multiple times on the same line (e.g. in -+ # template instances). Synthesize a branch -+ # number based on the assumptions: -+ # a) the order of branches is fixed across -+ # instances -+ # b) an instance starts with an lcount line -+ $branch_num = 0; -+ } elsif ($line =~ /^function:(\d+),(\d+),([^,]+)$/) { -+ next if (!$func_coverage || $excl->{$1}); -+ -+ # function:<line>,<count>,<name> -+ print($fd "FN:$1,$3\n"); -+ print($fd "FNDA:$2,$3\n"); -+ } elsif ($line =~ /^function:(\d+),\d+,(\d+),([^,]+)$/) { -+ next if (!$func_coverage || $excl->{$1}); -+ -+ # function:<start_line>,<end_line>,<count>, -+ # <name> -+ print($fd "FN:$1,$3\n"); -+ print($fd "FNDA:$2,$3\n"); -+ } elsif ($line =~ /^branch:(\d+),(taken|nottaken|notexec)/) { -+ next if (!$br_coverage || $excl->{$1} || -+ $brexcl->{$1}); -+ -+ # branch:<line>,taken|nottaken|notexec -+ if ($2 eq "taken") { -+ $c = 1; -+ } elsif ($2 eq "nottaken") { -+ $c = 0; -+ } else { -+ $c = "-"; -+ } -+ print($fd "BRDA:$1,0,$branch_num,$c\n"); -+ $branch_num++; -+ } -+ } -+ print($fd "end_of_record\n"); -+ } -+} -+ -+ -+sub get_output_fd($$) -+{ -+ my ($outfile, $file) = @_; -+ my $fd; -+ -+ if (!defined($outfile)) { -+ open($fd, ">", "$file.info") or -+ die("ERROR: Cannot create file $file.info: $!\n"); -+ } elsif ($outfile eq "-") { -+ open($fd, ">&STDOUT") or -+ die("ERROR: Cannot duplicate stdout: $!\n"); -+ } else { -+ open($fd, ">>", $outfile) or -+ die("ERROR: Cannot write to file $outfile: $!\n"); -+ } -+ -+ return $fd; -+} -+ -+ -+# -+# print_gcov_warnings(stderr_file, is_graph, map) -+# -+# Print GCOV warnings in file STDERR_FILE to STDERR. If IS_GRAPH is non-zero, -+# suppress warnings about missing as these are expected. Replace keys found -+# in MAP with their values. -+# -+ -+sub print_gcov_warnings($$$) -+{ -+ my ($stderr_file, $is_graph, $map) = @_; -+ my $fd; -+ -+ if (!open($fd, "<", $stderr_file)) { -+ warn("WARNING: Could not open GCOV stderr file ". -+ "$stderr_file: $!\n"); -+ return; -+ } -+ while (my $line = <$fd>) { -+ next if ($is_graph && $line =~ /cannot open data file/); -+ -+ for my $key (keys(%{$map})) { -+ $line =~ s/\Q$key\E/$map->{$key}/g; -+ } -+ -+ print(STDERR $line); -+ } -+ close($fd); -+} -+ -+ -+# -+# process_intermediate(file, dir, tempdir) -+# -+# Create output for a single file (either a data file or a graph file) using -+# gcov's intermediate option. -+# -+ -+sub process_intermediate($$$) -+{ -+ my ($file, $dir, $tempdir) = @_; -+ my ($fdir, $fbase, $fext); -+ my $data_file; -+ my $errmsg; -+ my %data; -+ my $fd; -+ my $base; -+ my $srcdata; -+ my $is_graph = 0; -+ my ($out, $err, $rc); -+ -+ info("Processing %s\n", abs2rel($file, $dir)); -+ -+ $file = solve_relative_path($cwd, $file); -+ ($fdir, $fbase, $fext) = split_filename($file); -+ -+ $is_graph = 1 if (".$fext" eq $graph_file_extension); -+ -+ if ($is_graph) { -+ # Process graph file - copy to temp directory to prevent -+ # accidental processing of associated data file -+ $data_file = "$tempdir/$fbase$graph_file_extension"; -+ if (!copy($file, $data_file)) { -+ $errmsg = "ERROR: Could not copy file $file"; -+ goto err; -+ } -+ } else { -+ # Process data file in place -+ $data_file = $file; -+ } -+ -+ # Change directory -+ if (!chdir($tempdir)) { -+ $errmsg = "Could not change to directory $tempdir: $!"; -+ goto err; -+ } -+ -+ # Run gcov on data file -+ ($out, $err, $rc) = system_no_output(1 + 2 + 4, $gcov_tool, -+ $data_file, @gcov_options, "-i"); -+ defined($out) && unlink($out); -+ if (defined($err)) { -+ print_gcov_warnings($err, $is_graph, { -+ $data_file => $file, -+ }); -+ unlink($err); -+ } -+ if ($rc) { -+ $errmsg = "GCOV failed for $file"; -+ goto err; -+ } -+ -+ if ($is_graph) { -+ # Remove graph file copy -+ unlink($data_file); -+ } -+ -+ # Parse resulting file(s) -+ for my $gcov_filename (glob("*.gcov")) { -+ read_intermediate_text($gcov_filename, \%data); -+ unlink($gcov_filename); -+ } -+ -+ if (!%data) { -+ warn("WARNING: GCOV did not produce any data for $file\n"); -+ return; -+ } -+ -+ # Determine base directory -+ if (defined($base_directory)) { -+ $base = $base_directory; -+ } else { -+ $base = $fdir; -+ -+ if (is_compat($COMPAT_MODE_LIBTOOL)) { -+ # Avoid files from .libs dirs -+ $base =~ s/\.libs$//; -+ } -+ -+ # Try to find base directory automatically if requested by user -+ if ($rc_auto_base) { -+ $base = find_base_from_source($base, [ keys(%data) ]); -+ } -+ } -+ -+ # Apply base file name to relative source files -+ adjust_source_filenames(\%data, $base); -+ -+ # Remove excluded source files -+ filter_source_files(\%data); -+ -+ # Get data on exclusion markers and checksums if requested -+ if (!$no_markers || $checksum) { -+ $srcdata = get_all_source_data(keys(%data)); -+ } -+ -+ # Generate output -+ $fd = get_output_fd($output_filename, $file); -+ intermediate_text_to_info($fd, \%data, $srcdata); -+ close($fd); -+ -+ chdir($cwd); -+ -+ return; -+ -+err: -+ if ($ignore[$ERROR_GCOV]) { -+ warn("WARNING: $errmsg!\n"); -+ } else { -+ die("ERROR: $errmsg!\n") -+ } -+} -+ -+ - # Map LLVM versions to the version of GCC gcov which they emulate. - - sub map_llvm_version($) -@@ -2151,8 +2481,12 @@ sub int_handler() - # - # MODE & 1: suppress STDOUT - # MODE & 2: suppress STDERR -+# MODE & 4: redirect to temporary files instead of suppressing - # --# Return 0 on success, non-zero otherwise. -+# Return (stdout, stderr, rc): -+# stdout: path to tempfile containing stdout or undef -+# stderr: path to tempfile containing stderr or undef -+# 0 on success, non-zero otherwise - # - - sub system_no_output($@) -@@ -2161,14 +2495,31 @@ sub system_no_output($@) - my $result; - local *OLD_STDERR; - local *OLD_STDOUT; -+ my $stdout_file; -+ my $stderr_file; -+ my $fd; - - # Save old stdout and stderr handles - ($mode & 1) && open(OLD_STDOUT, ">>&", "STDOUT"); - ($mode & 2) && open(OLD_STDERR, ">>&", "STDERR"); - -- # Redirect to /dev/null -- ($mode & 1) && open(STDOUT, ">", "/dev/null"); -- ($mode & 2) && open(STDERR, ">", "/dev/null"); -+ if ($mode & 4) { -+ # Redirect to temporary files -+ if ($mode & 1) { -+ ($fd, $stdout_file) = tempfile(UNLINK => 1); -+ open(STDOUT, ">", $stdout_file) || warn("$!\n"); -+ close($fd); -+ } -+ if ($mode & 2) { -+ ($fd, $stderr_file) = tempfile(UNLINK => 1); -+ open(STDERR, ">", $stderr_file) || warn("$!\n"); -+ close($fd); -+ } -+ } else { -+ # Redirect to /dev/null -+ ($mode & 1) && open(STDOUT, ">", "/dev/null"); -+ ($mode & 2) && open(STDERR, ">", "/dev/null"); -+ } - - debug("system(".join(' ', @_).")\n"); - system(@_); -@@ -2181,8 +2532,18 @@ sub system_no_output($@) - # Restore old handles - ($mode & 1) && open(STDOUT, ">>&", "OLD_STDOUT"); - ($mode & 2) && open(STDERR, ">>&", "OLD_STDERR"); -+ -+ # Remove empty output files -+ if (defined($stdout_file) && -z $stdout_file) { -+ unlink($stdout_file); -+ $stdout_file = undef; -+ } -+ if (defined($stderr_file) && -z $stderr_file) { -+ unlink($stderr_file); -+ $stderr_file = undef; -+ } - -- return $result; -+ return ($stdout_file, $stderr_file, $result); - } - - -@@ -2260,23 +2621,28 @@ sub apply_config($) - - - # --# get_exclusion_data(filename) -+# get_source_data(filename) - # --# Scan specified source code file for exclusion markers and return --# linenumber -> 1 --# for all lines which should be excluded. -+# Scan specified source code file for exclusion markers and checksums. Return -+# ( excl, brexcl, checksums ) where -+# excl: lineno -> 1 for all lines for which to exclude all data -+# brexcl: lineno -> 1 for all lines for which to exclude branch data -+# checksums: lineno -> source code checksum - # - --sub get_exclusion_data($) -+sub get_source_data($) - { - my ($filename) = @_; - my %list; - my $flag = 0; -+ my %brdata; -+ my $brflag = 0; -+ my %checksums; - local *HANDLE; - - if (!open(HANDLE, "<", $filename)) { - warn("WARNING: could not open $filename\n"); -- return undef; -+ return; - } - while (<HANDLE>) { - if (/$EXCL_STOP/) { -@@ -2287,14 +2653,62 @@ sub get_exclusion_data($) - if (/$excl_line/ || $flag) { - $list{$.} = 1; - } -+ if (/$EXCL_BR_STOP/) { -+ $brflag = 0; -+ } elsif (/$EXCL_BR_START/) { -+ $brflag = 1; -+ } -+ if (/$excl_br_line/ || $brflag) { -+ $brdata{$.} = 1; -+ } -+ if ($checksum) { -+ chomp(); -+ $checksums{$.} = md5_base64($_); -+ } - } - close(HANDLE); - -- if ($flag) { -+ if ($flag || $brflag) { - warn("WARNING: unterminated exclusion section in $filename\n"); - } - -- return \%list; -+ return (\%list, \%brdata, \%checksums); -+} -+ -+ -+# -+# get_all_source_data(filenames) -+# -+# Scan specified source code files for exclusion markers and return -+# filename -> [ excl, brexcl, checksums ] -+# excl: lineno -> 1 for all lines for which to exclude all data -+# brexcl: lineno -> 1 for all lines for which to exclude branch data -+# checksums: lineno -> source code checksum -+# -+ -+sub get_all_source_data(@) -+{ -+ my @filenames = @_; -+ my %data; -+ my $failed = 0; -+ -+ for my $filename (@filenames) { -+ my @d; -+ next if (exists($data{$filename})); -+ -+ @d = get_source_data($filename); -+ if (@d) { -+ $data{$filename} = [ @d ]; -+ } else { -+ $failed = 1; -+ } -+ } -+ -+ if ($failed) { -+ warn("WARNING: some exclusion markers may be ignored\n"); -+ } -+ -+ return \%data; - } - - -@@ -2318,35 +2732,17 @@ sub apply_exclusion_data($$) - { - my ($instr, $graph) = @_; - my $filename; -- my %excl_data; -- my $excl_read_failed = 0; -+ my $excl_data; - -- # Collect exclusion marker data -- foreach $filename (sort_uniq_lex(keys(%{$graph}), keys(%{$instr}))) { -- my $excl = get_exclusion_data($filename); -- -- # Skip and note if file could not be read -- if (!defined($excl)) { -- $excl_read_failed = 1; -- next; -- } -- -- # Add to collection if there are markers -- $excl_data{$filename} = $excl if (keys(%{$excl}) > 0); -- } -- -- # Warn if not all source files could be read -- if ($excl_read_failed) { -- warn("WARNING: some exclusion markers may be ignored\n"); -- } -+ ($excl_data) = get_all_source_data(keys(%{$graph}), keys(%{$instr})); - - # Skip if no markers were found -- return ($instr, $graph) if (keys(%excl_data) == 0); -+ return ($instr, $graph) if (!%$excl_data); - - # Apply exclusion marker data to graph -- foreach $filename (keys(%excl_data)) { -+ foreach $filename (keys(%$excl_data)) { - my $function_data = $graph->{$filename}; -- my $excl = $excl_data{$filename}; -+ my $excl = $excl_data->{$filename}->[0]; - my $function; - - next if (!defined($function_data)); -@@ -2384,9 +2780,9 @@ sub apply_exclusion_data($$) - } - - # Apply exclusion marker data to instr -- foreach $filename (keys(%excl_data)) { -+ foreach $filename (keys(%$excl_data)) { - my $line_data = $instr->{$filename}; -- my $excl = $excl_data{$filename}; -+ my $excl = $excl_data->{$filename}->[0]; - my $line; - my @new_data; - -@@ -2468,10 +2864,12 @@ sub process_graphfile($$) - - # Try to find base directory automatically if requested by user - if ($rc_auto_base) { -- $base_dir = find_base_from_graph($base_dir, $instr, $graph); -+ $base_dir = find_base_from_source($base_dir, -+ [ keys(%{$instr}), keys(%{$graph}) ]); - } - -- ($instr, $graph) = adjust_graph_filenames($base_dir, $instr, $graph); -+ adjust_source_filenames($instr, $base_dir); -+ adjust_source_filenames($graph, $base_dir); - - if (!$no_markers) { - # Apply exclusion marker data to graph file data -@@ -2767,11 +3165,11 @@ sub parent_dir($) - } - - # --# find_base_from_graph(base_dir, instr, graph) -+# find_base_from_source(base_dir, source_files) - # --# Try to determine the base directory of the graph file specified by INSTR --# and GRAPH. The base directory is the base for all relative filenames in --# the graph file. It is defined by the current working directory at time -+# Try to determine the base directory of the object file built from -+# SOURCE_FILES. The base directory is the base for all relative filenames in -+# the gcov data. It is defined by the current working directory at time - # of compiling the source file. - # - # This function implements a heuristic which relies on the following -@@ -2781,16 +3179,16 @@ sub parent_dir($) - # - files by the same name are not present in multiple parent directories - # - --sub find_base_from_graph($$$) -+sub find_base_from_source($$) - { -- my ($base_dir, $instr, $graph) = @_; -+ my ($base_dir, $source_files) = @_; - my $old_base; - my $best_miss; - my $best_base; - my %rel_files; - - # Determine list of relative paths -- foreach my $filename (keys(%{$instr}), keys(%{$graph})) { -+ foreach my $filename (@$source_files) { - next if (file_name_is_absolute($filename)); - - $rel_files{$filename} = 1; -@@ -2829,17 +3227,17 @@ sub find_base_from_graph($$$) - } - - # --# adjust_graph_filenames(base_dir, instr, graph) -+# adjust_source_filenames(hash, base_dir) - # --# Make relative paths in INSTR and GRAPH absolute and apply --# geninfo_adjust_src_path setting to graph file data. -+# Transform all keys of HASH to absolute form and apply requested -+# transformations. - # - --sub adjust_graph_filenames($$$) -+sub adjust_source_filenames($$$) - { -- my ($base_dir, $instr, $graph) = @_; -+ my ($hash, $base_dir) = @_; - -- foreach my $filename (keys(%{$instr})) { -+ foreach my $filename (keys(%{$hash})) { - my $old_filename = $filename; - - # Convert to absolute canonical form -@@ -2851,28 +3249,50 @@ sub adjust_graph_filenames($$$) - } - - if ($filename ne $old_filename) { -- $instr->{$filename} = delete($instr->{$old_filename}); -+ $hash->{$filename} = delete($hash->{$old_filename}); - } - } -+} - -- foreach my $filename (keys(%{$graph})) { -- my $old_filename = $filename; - -- # Make absolute -- # Convert to absolute canonical form -- $filename = solve_relative_path($base_dir, $filename); -+# -+# filter_source_files(hash) -+# -+# Remove unwanted source file data from HASH. -+# - -- # Apply adjustment -- if (defined($adjust_src_pattern)) { -- $filename =~ s/$adjust_src_pattern/$adjust_src_replace/g; -+sub filter_source_files($) -+{ -+ my ($hash) = @_; -+ -+ foreach my $filename (keys(%{$hash})) { -+ # Skip external files if requested -+ goto del if (!$opt_external && is_external($filename)); -+ -+ # Apply include patterns -+ if (@include_patterns) { -+ my $keep; -+ -+ foreach my $pattern (@include_patterns) { -+ if ($filename =~ (/^$pattern$/)) { -+ $keep = 1; -+ last; -+ } -+ } -+ goto del if (!$keep); - } - -- if ($filename ne $old_filename) { -- $graph->{$filename} = delete($graph->{$old_filename}); -+ # Apply exclude patterns -+ foreach my $pattern (@exclude_patterns) { -+ goto del if ($filename =~ (/^$pattern$/)); - } -- } -+ next; - -- return ($instr, $graph); -+del: -+ # Remove file data -+ delete($hash->{$filename}); -+ $excluded_files{$filename} = 1; -+ } - } - - # -@@ -3784,6 +4204,7 @@ sub get_gcov_capabilities() - 'c' => 'branch-counts', - 'f' => 'function-summaries', - 'h' => 'help', -+ 'i' => 'intermediate-format', - 'l' => 'long-file-names', - 'n' => 'no-output', - 'o' => 'object-directory', -diff --git a/lcovrc b/lcovrc -index 40f364f..bd4bc3b 100644 ---- a/lcovrc -+++ b/lcovrc -@@ -134,6 +134,9 @@ genhtml_desc_html=0 - # when collecting coverage data. - geninfo_auto_base = 1 - -+# Use gcov intermediate format? Valid values are 0, 1, auto -+geninfo_intermediate = auto -+ - # Directory containing gcov kernel files - # lcov_gcov_dir = /proc/gcov - -diff --git a/man/lcovrc.5 b/man/lcovrc.5 -index f20d273..bf0ce7a 100644 ---- a/man/lcovrc.5 -+++ b/man/lcovrc.5 -@@ -223,6 +223,11 @@ geninfo_compat_libtool = 0 - geninfo_auto_base = 1 - .br - -+# Use gcov intermediate format? Valid values are 0, 1, auto -+.br -+geninfo_intermediate = auto -+.br -+ - # Directory containing gcov kernel files - .br - lcov_gcov_dir = /proc/gcov -@@ -789,6 +794,25 @@ located, and in addition, is different between files of the same project. - Default is 1. - .PP - -+.BR geninfo_intermediate " =" -+.IR 0 | 1 | auto -+.IP -+Specify whether to use gcov intermediate format -+.br -+ -+Use this option to control whether geninfo should use the gcov intermediate -+format while collecting coverage data. The use of the gcov intermediate format -+should increase processing speed. It also provides branch coverage data when -+using the \-\-initial command line option. -+.br -+ -+Valid values are 0 for off, 1 for on, and "auto" to let geninfo automatically -+use immediate format when supported by gcov. -+.br -+ -+Default is "auto". -+.PP -+ - .BR lcov_gcov_dir " =" - .I path_to_kernel_coverage_data - .IP --- -2.17.1 - diff --git a/meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch b/meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch deleted file mode 100644 index 7b180635cd..0000000000 --- a/meta-oe/recipes-support/lcov/files/0002-geninfo-Add-intermediate-JSON-format-support.patch +++ /dev/null @@ -1,247 +0,0 @@ -From e13b2b6f8443da660cafa0679c3b16240843ce9f Mon Sep 17 00:00:00 2001 -From: Peter Oberparleiter <oberpar@linux.ibm.com> -Date: Fri, 24 May 2019 17:16:56 +0200 -Subject: [PATCH 2/2] geninfo: Add intermediate JSON format support - -This change adds support for parsing the output of gcov's intermediate -JSON file format as implemented by GCC version 9. - -Note: The way that the intermediate file format support is implemented -in geninfo removes the need to parse .gcno files directly. Since geninfo -does not include support for parsing GCC 9 .gcno files, using the -intermediate format is the only option for geninfo to collect coverage -data generated by GCC version 9. - -Signed-off-by: Peter Oberparleiter <oberpar@linux.ibm.com> ---- - bin/geninfo | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 160 insertions(+), 2 deletions(-) - -Upstream-Status: Backport -Download URL: https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da - -diff --git a/bin/geninfo b/bin/geninfo -index 0276666..cceb782 100755 ---- a/bin/geninfo -+++ b/bin/geninfo -@@ -59,6 +59,9 @@ use File::Copy qw(copy); - use Getopt::Long; - use Digest::MD5 qw(md5_base64); - use Cwd qw/abs_path/; -+use PerlIO::gzip; -+use JSON qw(decode_json); -+ - if( $^O eq "msys" ) - { - require File::Spec::Win32; -@@ -474,7 +477,8 @@ if ($rc_intermediate eq "0") { - $intermediate = 1; - } elsif (lc($rc_intermediate) eq "auto") { - # Use intermediate format if supported by gcov -- $intermediate = $gcov_caps->{'intermediate-format'} ? 1 : 0; -+ $intermediate = ($gcov_caps->{'intermediate-format'} || -+ $gcov_caps->{'json-format'}) ? 1 : 0; - } else { - die("ERROR: invalid value for geninfo_intermediate: ". - "'$rc_intermediate'\n"); -@@ -2084,6 +2088,48 @@ sub read_intermediate_text($$) - } - - -+# -+# read_intermediate_json(gcov_filename, data, basedir_ref) -+# -+# Read gcov intermediate JSON format in GCOV_FILENAME and add the resulting -+# data to DATA in the following format: -+# -+# data: source_filename -> file_data -+# file_data: GCOV JSON data for file -+# -+# Also store the value for current_working_directory to BASEDIR_REF. -+# -+ -+sub read_intermediate_json($$$) -+{ -+ my ($gcov_filename, $data, $basedir_ref) = @_; -+ my $fd; -+ my $text; -+ my $json; -+ -+ open($fd, "<:gzip", $gcov_filename) or -+ die("ERROR: Could not read $gcov_filename: $!\n"); -+ local $/; -+ $text = <$fd>; -+ close($fd); -+ -+ $json = decode_json($text); -+ if (!defined($json) || !exists($json->{"files"}) || -+ ref($json->{"files"} ne "ARRAY")) { -+ die("ERROR: Unrecognized JSON output format in ". -+ "$gcov_filename\n"); -+ } -+ -+ $$basedir_ref = $json->{"current_working_directory"}; -+ -+ for my $file (@{$json->{"files"}}) { -+ my $filename = $file->{"file"}; -+ -+ $data->{$filename} = $file; -+ } -+} -+ -+ - # - # intermediate_text_to_info(fd, data, srcdata) - # -@@ -2173,6 +2219,104 @@ sub intermediate_text_to_info($$$) - } - - -+# -+# intermediate_json_to_info(fd, data, srcdata) -+# -+# Write DATA in info format to file descriptor FD. -+# -+# data: filename -> file_data: -+# file_data: GCOV JSON data for file -+# -+# srcdata: filename -> [ excl, brexcl, checksums ] -+# excl: lineno -> 1 for all lines for which to exclude all data -+# brexcl: lineno -> 1 for all lines for which to exclude branch data -+# checksums: lineno -> source code checksum -+# -+# Note: To simplify processing, gcov data is not combined here, that is counts -+# that appear multiple times for the same lines/branches are not added. -+# This is done by lcov/genhtml when reading the data files. -+# -+ -+sub intermediate_json_to_info($$$) -+{ -+ my ($fd, $data, $srcdata) = @_; -+ my $branch_num = 0; -+ -+ return if (!%{$data}); -+ -+ print($fd "TN:$test_name\n"); -+ for my $filename (keys(%{$data})) { -+ my ($excl, $brexcl, $checksums); -+ my $file_data = $data->{$filename}; -+ -+ if (defined($srcdata->{$filename})) { -+ ($excl, $brexcl, $checksums) = @{$srcdata->{$filename}}; -+ } -+ -+ print($fd "SF:$filename\n"); -+ -+ # Function data -+ if ($func_coverage) { -+ for my $d (@{$file_data->{"functions"}}) { -+ my $line = $d->{"start_line"}; -+ my $count = $d->{"execution_count"}; -+ my $name = $d->{"name"}; -+ -+ next if (!defined($line) || !defined($count) || -+ !defined($name) || $excl->{$line}); -+ -+ print($fd "FN:$line,$name\n"); -+ print($fd "FNDA:$count,$name\n"); -+ } -+ } -+ -+ # Line data -+ for my $d (@{$file_data->{"lines"}}) { -+ my $line = $d->{"line_number"}; -+ my $count = $d->{"count"}; -+ my $c; -+ my $branches = $d->{"branches"}; -+ my $unexec = $d->{"unexecuted_block"}; -+ -+ next if (!defined($line) || !defined($count) || -+ $excl->{$line}); -+ -+ if (defined($unexec) && $unexec && $count == 0) { -+ $unexec = 1; -+ } else { -+ $unexec = 0; -+ } -+ -+ if ($checksum && exists($checksums->{$line})) { -+ $c = ",".$checksums->{$line}; -+ } else { -+ $c = ""; -+ } -+ print($fd "DA:$line,$count$c\n"); -+ -+ $branch_num = 0; -+ # Branch data -+ if ($br_coverage && !$brexcl->{$line}) { -+ for my $b (@$branches) { -+ my $brcount = $b->{"count"}; -+ -+ if (!defined($brcount) || $unexec) { -+ $brcount = "-"; -+ } -+ print($fd "BRDA:$line,0,$branch_num,". -+ "$brcount\n"); -+ -+ $branch_num++; -+ } -+ } -+ -+ } -+ -+ print($fd "end_of_record\n"); -+ } -+} -+ -+ - sub get_output_fd($$) - { - my ($outfile, $file) = @_; -@@ -2243,6 +2387,8 @@ sub process_intermediate($$$) - my $srcdata; - my $is_graph = 0; - my ($out, $err, $rc); -+ my $json_basedir; -+ my $json_format; - - info("Processing %s\n", abs2rel($file, $dir)); - -@@ -2296,6 +2442,12 @@ sub process_intermediate($$$) - unlink($gcov_filename); - } - -+ for my $gcov_filename (glob("*.gcov.json.gz")) { -+ read_intermediate_json($gcov_filename, \%data, \$json_basedir); -+ unlink($gcov_filename); -+ $json_format = 1; -+ } -+ - if (!%data) { - warn("WARNING: GCOV did not produce any data for $file\n"); - return; -@@ -2304,6 +2456,8 @@ sub process_intermediate($$$) - # Determine base directory - if (defined($base_directory)) { - $base = $base_directory; -+ } elsif (defined($json_basedir)) { -+ $base = $json_basedir; - } else { - $base = $fdir; - -@@ -2331,7 +2485,11 @@ sub process_intermediate($$$) - - # Generate output - $fd = get_output_fd($output_filename, $file); -- intermediate_text_to_info($fd, \%data, $srcdata); -+ if ($json_format) { -+ intermediate_json_to_info($fd, \%data, $srcdata); -+ } else { -+ intermediate_text_to_info($fd, \%data, $srcdata); -+ } - close($fd); - - chdir($cwd); --- -2.17.1 - diff --git a/meta-oe/recipes-support/lcov/lcov_1.14.bb b/meta-oe/recipes-support/lcov/lcov_1.16.bb index 0cc8b31b3f..22d68814ee 100755 --- a/meta-oe/recipes-support/lcov/lcov_1.14.bb +++ b/meta-oe/recipes-support/lcov/lcov_1.16.bb @@ -1,16 +1,14 @@ SUMMARY = "A graphical front-end for gcov" -HOMEPAGE = "http://ltp.sourceforge.net/coverage/lcov.php" +HOMEPAGE = "https://github.com/linux-test-project/lcov" DESCRIPTION = "LCOV is a graphical front-end for GCC's coverage testing \ tool gcov. It collects gcov data for multiple source files and creates \ HTML pages containing the source code annotated with coverage information. \ It also adds overview pages for easy navigation within the file structure. \ LCOV supports statement, function and branch coverage measurement." -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -RDEPENDS_${PN} += " \ - libjson-perl \ - libperlio-gzip-perl \ +RDEPENDS:${PN} += " \ perl \ perl-module-filehandle \ perl-module-getopt-std \ @@ -44,22 +42,16 @@ RDEPENDS_${PN} += " \ perl-module-tie-hash \ " -RDEPENDS_${PN}_append_class-target = " \ +RDEPENDS:${PN}:append:class-target = " \ gcov \ gcov-symlinks \ " - -SRC_URI = " \ - http://downloads.sourceforge.net/ltp/${BP}.tar.gz \ - file://0001-geninfo-Add-intermediate-text-format-support.patch \ - file://0002-geninfo-Add-intermediate-JSON-format-support.patch \ - " - -SRC_URI[md5sum] = "0220d01753469f83921f8f41ae5054c1" -SRC_URI[sha256sum] = "14995699187440e0ae4da57fe3a64adc0a3c5cf14feab971f8db38fb7d8f071a" +SRC_URI = "https://github.com/linux-test-project/lcov/releases/download/v${PV}/lcov-${PV}.tar.gz" +SRC_URI[md5sum] = "bfee0cef50d7b7bd1df03bfadf68dcef" +SRC_URI[sha256sum] = "987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b" do_install() { - oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} + oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} LCOV_PERL_PATH="/usr/bin/env perl" } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb index 4cfb732932..f747ecbf72 100644 --- a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb @@ -1,11 +1,11 @@ SUMMARY = "ATA S.M.A.R.T. Reading and Parsing Library" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "udev" SRCREV = "de6258940960443038b4c1651dfda3620075e870" -SRC_URI = "git://git.0pointer.de/libatasmart.git \ +SRC_URI = "git://git.0pointer.de/libatasmart.git;branch=master \ file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \ " @@ -13,9 +13,9 @@ S = "${WORKDIR}/git" inherit autotools lib_package pkgconfig -do_install_append() { +do_install:append() { sed -i -e s://:/:g -e 's:=${libdir}/libudev.la:-ludev:g' ${D}${libdir}/libatasmart.la } PACKAGES =+ "${PN}-dev-vala" -FILES_${PN}-dev-vala = "${datadir}/vala" +FILES:${PN}-dev-vala = "${datadir}/vala" diff --git a/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch b/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch new file mode 100644 index 0000000000..84dee415ad --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch @@ -0,0 +1,46 @@ +From cbe8bd2948f522062c6170f581e1e265692a9a55 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 24 Oct 2021 18:53:04 +0100 +Subject: [PATCH] Makefile: fix parallel build of examples + +Without the change examples fails to build as: + + $ LANG=C make -j + make -C src + make -C examples + make[1]: Entering directory 'libb64/src' + cc -O3 -Werror -pedantic -I../include -c -o cencode.o cencode.c + make[1]: Entering directory 'libb64/examples' + make[1]: *** No rule to make target 'libb64.a', needed by 'c-example1'. Stop. + make[1]: Leaving directory 'libb64/examples' + make: *** [Makefile:8: all_examples] Error 2 + make: *** Waiting for unfinished jobs.... + cc -O3 -Werror -pedantic -I../include -c -o cdecode.o cdecode.c + ar rv libb64.a cencode.o cdecode.o + ar: creating libb64.a + a - cencode.o + a - cdecode.o + make[1]: Leaving directory 'libb64/src' + +Upstream-Status: Submitted [https://github.com/libb64/libb64/pull/9] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index db40356..aa48c76 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ all_src: + $(MAKE) -C src + all_base64: all_src + $(MAKE) -C base64 +-all_examples: ++all_examples: all_src + $(MAKE) -C examples + + clean: clean_src clean_base64 clean_include clean_examples +-- +2.37.2 + diff --git a/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch new file mode 100644 index 0000000000..b3ee24d9d5 --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch @@ -0,0 +1,27 @@ +From 68f66d1583be670eb8d5f3f38dbd5dd1d63b733c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 27 Mar 2021 21:41:04 -0700 +Subject: [PATCH] example: Do not run the tests + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/Makefile | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/examples/Makefile b/examples/Makefile +index d9667a5..554b346 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -33,11 +33,8 @@ depend: $(SOURCES) + makedepend -f- $(CFLAGS) $(SOURCES) 2> /dev/null 1> depend + + test-c-example1: c-example1 +- ./c-example1 + + test-c-example2: c-example2 +- ./c-example2 loremgibson.txt encoded.txt decoded.txt +- diff -q loremgibson.txt decoded.txt + + test: test-c-example1 test-c-example2 + diff --git a/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch b/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch new file mode 100644 index 0000000000..42e889efc2 --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch @@ -0,0 +1,27 @@ +From 98eaf510f40e384b32c01ad4bd5c3a697fdd8560 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Aug 2022 14:34:38 -0700 +Subject: [PATCH] examples: Use proper function prototype for main + +Upstream-Status: Submitted [https://github.com/libb64/libb64/pull/10] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + examples/c-example1.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/c-example1.c b/examples/c-example1.c +index a0001df..34585dd 100644 +--- a/examples/c-example1.c ++++ b/examples/c-example1.c +@@ -83,7 +83,7 @@ char* decode(const char* input) + } + + +-int main() ++int main(int argc, char** argv) + { + const char* input = "hello world"; + char* encoded; +-- +2.37.2 + diff --git a/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch b/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch new file mode 100644 index 0000000000..f2b8f599c6 --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch @@ -0,0 +1,57 @@ +From 9ec49389f56816d7ac2331296c03d147531a421a Mon Sep 17 00:00:00 2001 +From: Jakub Wilk <jwilk@debian.org> +Date: Sat, 27 Mar 2021 22:01:13 -0700 +Subject: [PATCH] use BUFSIZ as buffer size + +Bug: http://sourceforge.net/tracker/?func=detail&atid=785907&aid=3591336&group_id=152942 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + include/b64/decode.h | 3 ++- + include/b64/encode.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/b64/decode.h b/include/b64/decode.h +index b2362e5..8db1d09 100644 +--- a/include/b64/decode.h ++++ b/include/b64/decode.h +@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64 + #ifndef BASE64_DECODE_H + #define BASE64_DECODE_H + ++#include <cstdio> + #include <iostream> + + namespace base64 +@@ -22,7 +23,7 @@ namespace base64 + base64_decodestate _state; + int _buffersize; + +- decoder(int buffersize_in = BUFFERSIZE) ++ decoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) + { + base64_init_decodestate(&_state); +diff --git a/include/b64/encode.h b/include/b64/encode.h +index c1a5f88..644e4dd 100644 +--- a/include/b64/encode.h ++++ b/include/b64/encode.h +@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64 + #ifndef BASE64_ENCODE_H + #define BASE64_ENCODE_H + ++#include <cstdio> + #include <iostream> + + namespace base64 +@@ -22,7 +23,7 @@ namespace base64 + base64_encodestate _state; + int _buffersize; + +- encoder(int buffersize_in = BUFFERSIZE) ++ encoder(int buffersize_in = BUFSIZ) + : _buffersize(buffersize_in) + { + base64_init_encodestate(&_state); diff --git a/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb new file mode 100644 index 0000000000..e0683b177b --- /dev/null +++ b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "Base64 Encoding/Decoding Routines" +DESCRIPTION = "base64 encoding/decoding library - runtime library \ +libb64 is a library of ANSI C routines for fast encoding/decoding data into \ +and from a base64-encoded format" +HOMEPAGE = "https://github.com/libb64" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=81296a564fa0621472714aae7c763d96" + +PV .= "+2.0.0.2+git" +SRCREV = "ce864b17ea0e24a91e77c7dd3eb2d1ac4175b3f0" + +SRC_URI = "git://github.com/libb64/libb64;protocol=https;branch=master \ + file://0001-example-Do-not-run-the-tests.patch \ + file://0002-use-BUFSIZ-as-buffer-size.patch \ + file://0001-Makefile-fix-parallel-build-of-examples.patch \ + file://0001-examples-Use-proper-function-prototype-for-main.patch \ + " + +S = "${WORKDIR}/git" + +CFLAGS += "-fPIC" + +do_configure () { + : +} + +do_compile () { + oe_runmake + ${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,${BPN}.so.0 src/*.o -o src/${BPN}.so.0 +} + +do_install () { + install -d ${D}${includedir}/b64 + install -Dm 0644 ${B}/src/libb64.a ${D}${libdir}/libb64.a + install -Dm 0644 ${B}/src/libb64.so.0 ${D}${libdir}/libb64.so.0 + ln -s libb64.so.0 ${D}${libdir}/libb64.so + install -Dm 0644 ${S}/include/b64/*.h ${D}${includedir}/b64/ +} diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb index 0aaf188b61..daa01bfc3d 100644 --- a/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb +++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb @@ -1,18 +1,17 @@ DESCRIPTION = "The goal of this project is to provide a tiny library that would \ facilitate the common operations with sizes in bytes." HOMEPAGE = "https://github.com/rhinstaller/libbytesize" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" SECTION = "devel/lib" LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" -B = "${S}" -SRCREV = "732ee8d28492e4bc9b52c29bcb81a5c19388d002" -SRC_URI = "git://github.com/rhinstaller/libbytesize;branch=master" +SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d" +SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https" -inherit gettext autotools python3native +inherit gettext autotools pkgconfig python3native DEPENDS += " \ libpcre2 \ @@ -21,7 +20,7 @@ DEPENDS += " \ gettext-native \ " -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/bytesize" PACKAGECONFIG ??= "python3" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3-core" diff --git a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch index 4e0984f364..89f31f7946 100644 --- a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch +++ b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch @@ -8,6 +8,8 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + src/Makefile.am | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch index ba6fa2c643..1e45441ff9 100644 --- a/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch +++ b/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch @@ -5,6 +5,8 @@ Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland --- +Upstream-Status: Pending + src/canberra-gtk-module.c | 15 +++++++++++++++ src/canberra-gtk.c | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch b/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch new file mode 100644 index 0000000000..57f5486084 --- /dev/null +++ b/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch @@ -0,0 +1,65 @@ +From dfd3ef4caac300f517f8eeb378f0b0f9ba6a9b06 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Tue, 15 Aug 2023 15:41:03 +0200 +Subject: [PATCH] remove dropped gtkdoc templates + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Pending +--- +--- a/gtkdoc/gtk-doc.make 2011-08-25 23:20:22.000000000 +0200 ++++ b/gtkdoc/gtk-doc.make 2023-08-15 18:08:02.430729073 +0200 +@@ -33,9 +33,9 @@ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ ++DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ +- tmpl.stamp sgml.stamp html.stamp pdf.stamp ++ sgml.stamp html.stamp pdf.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -120,27 +120,12 @@ + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +-#### templates #### +- +-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +- @echo ' DOC Rebuilding template files' +- @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +- if test -w $(abs_srcdir) ; then \ +- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ +- fi \ +- fi +- @touch tmpl-build.stamp +- +-tmpl.stamp: tmpl-build.stamp +- @true +- + $(srcdir)/tmpl/*.sgml: + @true + + #### xml #### + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++sgml-build.stamp: $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo ' DOC Building XML' + @-chmod -R u+w $(srcdir) + @_source_dir='' ; \ + --- a/gtkdoc/Makefile.am 2009-01-21 21:52:46.000000000 +0100 ++++ b/gtkdoc/Makefile.am 2023-08-15 17:41:59.002498772 +0200 +@@ -31,10 +31,6 @@ + # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml + MKDB_OPTIONS=--sgml-mode --output-format=xml + +-# Extra options to supply to gtkdoc-mktmpl +-# e.g. MKTMPL_OPTIONS=--only-section-tmpl +-MKTMPL_OPTIONS= +- + # Extra options to supply to gtkdoc-fixref. Not normally needed. + # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html + FIXXREF_OPTIONS= diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb index 1495051d79..95c9479588 100644 --- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb +++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb @@ -1,6 +1,6 @@ SUMMARY = "Implementation of XDG Sound Theme and Name Specifications" DESCRIPTION = "Libcanberra is an implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops." -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03" @@ -12,6 +12,7 @@ SRC_URI = " \ http://0pointer.de/lennart/projects/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \ file://0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch \ + file://0001-remove-dropped-templates.patch \ " SRC_URI[md5sum] = "34cb7e4430afaf6f447c4ebdb9b42072" SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72" @@ -32,32 +33,32 @@ PACKAGECONFIG[gstreamer] = "--enable-gstreamer, --disable-gstreamer, gstreamer1. PACKAGECONFIG[gtk] = "--enable-gtk, --disable-gtk, gtk+" PACKAGECONFIG[gtk3] = "--enable-gtk3, --disable-gtk3, gtk+3" -python populate_packages_prepend() { +python populate_packages:prepend() { plugindir = d.expand('${libdir}/${BPN}-${PV}/') - do_split_packages(d, plugindir, '^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) - do_split_packages(d, plugindir, '^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' ) + do_split_packages(d, plugindir, r'^libcanberra-(.*)\.so$', 'libcanberra-%s', '%s support library', extra_depends='' ) + do_split_packages(d, plugindir, r'^libcanberra-(.*)\.la$', 'libcanberra-%s', '%s support library', extra_depends='' ) } PACKAGES =+ "${PN}-gnome ${PN}-gtk2 ${PN}-gtk3 ${PN}-systemd" PACKAGES_DYNAMIC += "^libcanberra-.*" -FILES_${PN} = "${bindir}/ ${libdir}/${BPN}.so.*" +FILES:${PN} = "${bindir}/ ${libdir}/${BPN}.so.*" -FILES_${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la" +FILES:${PN}-dev += "${datadir}/vala/vapi ${libdir}/*/modules/*.la ${libdir}/*/*.la" -FILES_${PN}-dbg += "${libdir}/${BPN}-${PV}/.debug ${libdir}/gtk-*/modules/.debug" +FILES:${PN}-dbg += "${libdir}/${BPN}-${PV}/.debug ${libdir}/gtk-*/modules/.debug" -FILES_${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \ +FILES:${PN}-gtk2 = "${libdir}/${BPN}-gtk.so.* \ ${libdir}/gtk-2.0/modules/*.so \ ${bindir}/canberra-gtk-play" # -gtk3 ships a symlink to a .so -INSANE_SKIP_${PN}-gtk3 = "dev-so" -FILES_${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \ +INSANE_SKIP:${PN}-gtk3 = "dev-so" +FILES:${PN}-gtk3 = "${libdir}/${BPN}-gtk3.so.* \ ${libdir}/gtk-3.0/modules/*.so \ ${bindir}/canberra-gtk3-play" -FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \ +FILES:${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/ \ ${datadir}/gdm/ ${datadir}/gnome/" -FILES_${PN}-systemd = "${systemd_unitdir}/system/*.service" +FILES:${PN}-systemd = "${systemd_unitdir}/system/*.service" diff --git a/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch b/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch new file mode 100644 index 0000000000..fc30f0ad7c --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-cmake-Use-idirafter-instead-of-isystem.patch @@ -0,0 +1,52 @@ +From ac70933783a70d5387a2bb2849c568e33ba52558 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 01:41:32 -0800 +Subject: [PATCH] cmake: Use -idirafter instead of -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/recipe-sysroot/usr/include/c++/v1/cwchar:113:5: error: <cwchar> tried including <wchar.h> but didn't find libc++'s <wcha +r.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard + Library, and you are probably using compiler flags that make that not be the case. | # error <cwchar> tried including <wchar.h> but didn't find libc++'s <wchar.h> header. \ +| ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/777] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unittests/boost/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unittests/boost/CMakeLists.txt b/unittests/boost/CMakeLists.txt +index 1d733bc7..08e6a169 100644 +--- a/unittests/boost/CMakeLists.txt ++++ b/unittests/boost/CMakeLists.txt +@@ -1,6 +1,6 @@ + file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) + +-include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -idirafter ${Boost_INCLUDE_DIRS}") + + # Build all of the non-special tests + foreach(TEST_SOURCE ${TESTS}) +-- +2.39.1 + diff --git a/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch b/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch new file mode 100644 index 0000000000..9396cc5d01 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-doctest-Do-not-use-unnamed-class.patch @@ -0,0 +1,38 @@ +From 03bbb1b055c41ec652470f775b55a7cf80d664ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 17 Apr 2023 16:46:12 -0700 +Subject: [PATCH] doctest: Do not use unnamed class + +When compiling with clang this results in emitting absolute path into +debug info, especially .debug_str section has + +~(unnamed class at /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/unittests/doctest.h:6428:5) +(unnamed class at /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/unittests/doctest.h:6428:5) + +Therefore use a name for the class instead and help get rid of this +absolute path in debug info. This fixes + +File /usr/lib/libcereal/ptest/tests/.debug/test_unordered_map in package libcereal-dbg contains reference to TMPDIR + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/788] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + unittests/doctest.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unittests/doctest.h b/unittests/doctest.h +index cd5b44d6..e6d8f7f9 100644 +--- a/unittests/doctest.h ++++ b/unittests/doctest.h +@@ -6424,7 +6424,7 @@ void Context::setCout(std::ostream* out) { p->cout = out; } + static class DiscardOStream : public std::ostream + { + private: +- class : public std::streambuf ++ class discardBufStream: public std::streambuf + { + private: + // allowing some buffering decreases the amount of calls to overflow +-- +2.40.0 + diff --git a/meta-oe/recipes-support/libcereal/files/0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch b/meta-oe/recipes-support/libcereal/files/0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch new file mode 100644 index 0000000000..26a8223d19 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch @@ -0,0 +1,54 @@ +From 36054278304945c6aef7d44e58788ca882c67d05 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 15:54:13 -0700 +Subject: [PATCH] sandbox: Do not use int8_t in std::uniform_int_distribution + +Newer versions of libc++ has dropped supporting this usecase since its +an UB see. + +https://reviews.llvm.org/D114920?id=400571 + +Fixes + +uniform_int_distribution.h:162:5: error: static assertion failed due to requirement '__libcpp_random_is_valid_inttype<char>::value': IntType must be a supported integer type + static_assert(__libcpp_random_is_valid_inttype<_IntType>::value, "IntType must be a supported integer type"); + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/sandbox/performance.cpp:261:9: note: in instantiation of template class 'std::uniform_int_distribution<char>' requested here + c = std::uniform_int_distribution<char>(' ', '~')(gen); + ^ +/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/sandbox/performance.cpp:261:9: error: type 'std::uniform_int_distribution<char>' does not provide a call operator + c = std::uniform_int_distribution<char>(' ', '~')(gen); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +2 errors generated. + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/764] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sandbox/performance.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sandbox/performance.cpp b/sandbox/performance.cpp +index f9307870..aca8c78c 100644 +--- a/sandbox/performance.cpp ++++ b/sandbox/performance.cpp +@@ -258,7 +258,7 @@ random_value(std::mt19937 & gen) + { + std::string s(std::uniform_int_distribution<int>(3, 30)(gen), ' '); + for(char & c : s) +- c = std::uniform_int_distribution<char>(' ', '~')(gen); ++ c = static_cast<char>( std::uniform_int_distribution<int>(' ', '~')(gen) ); + return s; + } + +@@ -277,7 +277,7 @@ std::string random_binary_string(std::mt19937 & gen) + { + std::string s(N, ' '); + for(auto & c : s ) +- c = std::uniform_int_distribution<char>('0', '1')(gen); ++ c = static_cast<char>( std::uniform_int_distribution<int>( '0', '1' )(gen) ); + return s; + } + +-- +2.37.3 + diff --git a/meta-oe/recipes-support/libcereal/files/run-ptest b/meta-oe/recipes-support/libcereal/files/run-ptest new file mode 100755 index 0000000000..9bc480aa7f --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/run-ptest @@ -0,0 +1,12 @@ +#!/bin/sh + +cd tests +for atest in test_* ; do + rm -rf tests.log + ./${atest} > tests.log 2>&1 + if [ $? = 0 ] ; then + echo "PASS: ${atest}" + else + echo "FAIL: ${atest}" + fi +done diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb deleted file mode 100644 index 6fc5881c59..0000000000 --- a/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A C++11 library for serialization" -HOMEPAGE = "https://uscilab.github.io/cereal/" - -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e612690af2f575dfd02e2e91443cea23" - -SRCREV = "02eace19a99ce3cd564ca4e379753d69af08c2c8" -SRC_URI = "git://github.com/USCiLab/cereal.git" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DJUST_INSTALL_CEREAL=ON" - -ALLOW_EMPTY_${PN} = "1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb new file mode 100644 index 0000000000..6ad20d6370 --- /dev/null +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -0,0 +1,56 @@ +SUMMARY = "A C++11 library for serialization" +HOMEPAGE = "https://uscilab.github.io/cereal/" + +SECTION = "libs" + +LICENSE = "BSD-3-Clause & MIT & BSL-1.0" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=4921372a1fb38469e667c38b17a1c4b3 \ + file://include/cereal/external/rapidxml/license.txt;md5=d63ab70ba21ca0544b03284958324301 \ + file://include/cereal/external/LICENSE;md5=b07578c9df99c0b8b45eb041efd4a645 \ + file://include/cereal/external/rapidjson/LICENSE;md5=e7abb663111d4ac17cf00323698aff08 \ + file://include/cereal/external/rapidjson/msinttypes/LICENSE;md5=dffce65b98c773976de2e338bd130f46 \ +" + +DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} " + +PROVIDES += "${PN}-dev" + +PV .= "+git" +SRCREV = "ebef1e929807629befafbb2918ea1a08c7194554" +SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \ + file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ + file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ + file://0001-doctest-Do-not-use-unnamed-class.patch \ + file://run-ptest \ +" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig ptest + +CXXFLAGS:append:toolchain-clang = " -Wno-error=c++11-narrowing-const-reference" + +LIBATOMIC:mips = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:riscv32 = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:powerpc = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" + +PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" +PACKAGECONFIG[with-tests] = "-DWITH_WERROR=OFF -DBUILD_TESTS=ON ${LIBATOMIC},," +EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '', '-DJUST_INSTALL_CEREAL=ON', d)} \ + ${@['','-DSKIP_PORTABILITY_TEST=ON'][d.getVar('SITEINFO_BITS') != '32']}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp ${B}/unittests/test_* ${D}${PTEST_PATH}/tests +} + +ALLOW_EMPTY:${PN} = "1" + +RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND = "native nativesdk" + +#it needs to work with CXXFLAGS += " -mlong-double-64" but ppc only supports 128bit long double +COMPATIBLE_HOST:powerpc:libc-musl = "null" +COMPATIBLE_HOST:powerpc64le:libc-musl = "null" diff --git a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb new file mode 100644 index 0000000000..cf2d933169 --- /dev/null +++ b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "high level C++ wrapper for rdkafka" +DESCRIPTION = "cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol." +HOMEPAGE = "https://github.com/mfontanini/cppkafka" +SECTION = "lib" +LICENSE = "BSD-2-Clause" + +LIC_FILES_CHKSUM = " \ +file://LICENSE;md5=d8b4ca15d239dc1485ef495c8f1bcc72 \ +" + +SRC_URI = "git://github.com/mfontanini/cppkafka;protocol=https;branch=master \ +" +SRCREV = "91ac543cbd2228588dcf24a6ca357f8be0f4e5ab" + +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.${BASEPV} + sed -i -e 's|${STAGING_INCDIR}|\$\{includedir\}|g' ${D}${datadir}/pkgconfig/cppkafka.pc +} diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch new file mode 100644 index 0000000000..d9e10469d3 --- /dev/null +++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch @@ -0,0 +1,43 @@ +From 655c5c32b37a2bea12389ed69c0869215fcf5abe Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 3 Sep 2023 11:22:35 +0200 +Subject: [PATCH] CMakeLists.txt: don't fall back CMAKE_INSTALL_LIBDIR to lib + +* testing ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} existence + doesn't really work in cross compilation and on some hosts was causing: + + ERROR: QA Issue: libcyusbserial: Files/directories were installed but not shipped in any package: + /usr/lib/libcyusbserial.so.1 + /usr/lib/libcyusbserial.so + Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. + libcyusbserial: 2 installed and not shipped files. [installed-vs-shipped] + + with multilib using /usr/lib32 or /usr/lib64 when the same didn't + exist on host. + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + lib/CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 2b031cb..53a7263 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -6,15 +6,6 @@ if (NOT CMAKE_INSTALL_LIBDIR) + include(GNUInstallDirs) + endif (NOT CMAKE_INSTALL_LIBDIR) + +-# Fall back to just "lib" if the item provided by GNUInstallDirs doesn't exist +-# For example, on Ubuntu 13.10 with CMake 2.8.11.2, +-# /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} doesn't exist. +-if (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +- message(STATUS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} does not exist. Defaulting libcyusbserial install location to ${CMAKE_INSTALL_PREFIX}/lib.") +- set(CMAKE_INSTALL_LIBDIR lib) +-endif() +- +- + ################################################################################ + # Include paths + ################################################################################ diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb index 74b5e21e23..dd7f457b10 100644 --- a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb +++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb @@ -1,18 +1,20 @@ SUMMARY = "Enable userspace control of Cypress USB-Serial bridge devices" HOMEPAGE = "https://github.com/cyrozap/libcyusbserial" BUGTRACKER = "https://github.com/cyrozap/libcyusbserial/issues" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LESSER.txt;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libusb udev" -PV = "1.0.0+git${SRCPV}" +PV = "1.0.0+git" SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f" -SRC_URI = "git://github.com/cyrozap/${BPN}.git" +SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https \ + file://0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch \ +" S = "${WORKDIR}/git" inherit cmake PACKAGES =+ "${PN}-utils" -FILES_${PN}-utils = "${bindir}/*" +FILES:${PN}-utils = "${bindir}/*" diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc index e5a145ab22..16fe557f76 100644 --- a/meta-oe/recipes-support/libee/libee.inc +++ b/meta-oe/recipes-support/libee/libee.inc @@ -5,7 +5,7 @@ but hopefully convenient API layer above the CEE standard." HOMEPAGE = "http://www.libee.org" SECTION = "base" -LICENSE = "LGPL-2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=1c2687de35e36ba3b999136236a66cd6" SRC_URI = "http://www.libee.org/download/files/download/${BPN}-${PV}.tar.gz\ diff --git a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch index 25e5c6ae02..8bb23aafca 100644 --- a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch +++ b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch @@ -3,7 +3,7 @@ fix parallel compiling problem without specifying libee_convert_DEPENDENCIES = libee.la, libee_convert can't find libee.la when linking as libee is not generated yet. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Yao Zhao <yao.zhao@windriver.com> --- diff --git a/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch new file mode 100644 index 0000000000..84b5a4da9f --- /dev/null +++ b/meta-oe/recipes-support/libeigen/libeigen/0001-Default-eigen_packet_wrapper-constructor.patch @@ -0,0 +1,72 @@ +From cb507309937958c632147de87e8f1231d6698847 Mon Sep 17 00:00:00 2001 +From: Antonio Sanchez <cantonios@google.com> +Date: Tue, 14 Sep 2021 10:57:22 -0700 +Subject: [PATCH] Default eigen_packet_wrapper constructor. + +This makes it trivial, allowing use of `memcpy`. + +Fixes #2326 + +Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/merge_requests/645/diffs?commit_id=cb507309937958c632147de87e8f1231d6698847] +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +* fixes build failures for arm targets with NEON enabled (e.g. -mfpu=neon-vfpv4) + for recipes with -Werror enabled and gcc-11, e.g. fuse-core, robot-localization, + prbt-ikfast-manipulator-plugin, rm-chassis-controllers in meta-ros1-noetic: + +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::pload(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1671:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] + 1671 | memcpy(&res, from, sizeof(Packet4c)); + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here + 159 | struct eigen_packet_wrapper + | ^~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:214, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h: In function 'Packet Eigen::internal::ploadu(const typename Eigen::internal::unpacket_traits<T>::type*) [with Packet = Eigen::internal::eigen_packet_wrapper<int, 2>; typename Eigen::internal::unpacket_traits<T>::type = signed char]': +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h:1716:9: error: 'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} from an array of 'const int8_t' {aka 'const signed char'} [-Werror=class-memaccess] + 1716 | memcpy(&res, from, sizeof(Packet4c)); + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In file included from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/Core:172, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/macros.h:63, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/loss.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/include/fuse_core/constraint.h:37, + from /jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/git/src/constraint.cpp:34: +/jenkins/mjansa/build/ros/webos-noetic-honister/tmp-glibc/work/raspberrypi4-webos-linux-gnueabi/fuse-core/0.4.2-1-r0/recipe-sysroot/usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h:159:8: note: 'Eigen::internal::Packet4c' {aka 'struct Eigen::internal::eigen_packet_wrapper<int, 2>'} declared here + 159 | struct eigen_packet_wrapper + | ^~~~~~~~~~~~~~~~~~~~ +cc1plus: all warnings being treated as errors + +--- + Eigen/src/Core/GenericPacketMath.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h +index 8f8f64f15..72234288e 100644 +--- a/Eigen/src/Core/GenericPacketMath.h ++++ b/Eigen/src/Core/GenericPacketMath.h +@@ -162,7 +162,7 @@ struct eigen_packet_wrapper + { + EIGEN_ALWAYS_INLINE operator T&() { return m_val; } + EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; } +- EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {} ++ EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default; + EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {} + EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) { + m_val = v; +-- +2.17.1 + diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb b/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb deleted file mode 100644 index 6ce318d0b5..0000000000 --- a/meta-oe/recipes-support/libeigen/libeigen_3.3.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." -AUTHOR = "Benoît Jacob and Gaël Guennebaud and others" -HOMEPAGE = "http://eigen.tuxfamily.org/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" - -SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" - -SRCREV = "21ae2afd4edaa1b69782c67a54182d34efe43f9c" - -S = "${WORKDIR}/git" - -inherit cmake - -FILES_${PN} = "${libdir}" -FILES_${PN}-dev = "${includedir} ${datadir}/eigen3/cmake ${datadir}/cmake/Modules ${datadir}/pkgconfig" - -# ${PN} is empty so we need to tweak -dev and -dbg package dependencies -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb new file mode 100644 index 0000000000..72044427dd --- /dev/null +++ b/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." +HOMEPAGE = "http://eigen.tuxfamily.org/" +LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-2.0-only & LGPL-2.1-only & MINPACK" +LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ + file://COPYING.BSD;md5=2dd0510ee95e59ca28834b875bc96596 \ + file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MINPACK;md5=71d91b0f75ce79a75d3108a72bef8116 \ +" + +SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ + file://0001-Default-eigen_packet_wrapper-constructor.patch \ +" + +SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c" + +S = "${WORKDIR}/git" + +inherit cmake + +FILES:${PN}-dev += "${datadir}/eigen3/cmake" + +# ${PN} is empty so we need to tweak -dev and -dbg package dependencies +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libestr/libestr_0.1.11.bb b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb index ff61dd8fd7..2ebf2757d7 100644 --- a/meta-oe/recipes-support/libestr/libestr_0.1.11.bb +++ b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb @@ -1,6 +1,6 @@ SUMMARY = "some essentials for string handling (and a bit more)" HOMEPAGE = "http://libestr.adiscon.com/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9d6c993486c18262afba4ca5bcb894d0" SRC_URI = "http://libestr.adiscon.com/files/download/${BP}.tar.gz" diff --git a/meta-oe/recipes-support/libfann/libfann_git.bb b/meta-oe/recipes-support/libfann/libfann_git.bb index eae24461dc..40f91ac43d 100644 --- a/meta-oe/recipes-support/libfann/libfann_git.bb +++ b/meta-oe/recipes-support/libfann/libfann_git.bb @@ -3,16 +3,16 @@ DESCRIPTION = "Fast Artificial Neural Network (FANN) Library is a free open sour HOMEPAGE = "https://github.com/libfann/fann" SECTION = "libs/devel" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f14599a2f089f6ff8c97e2baa4e3d575" inherit cmake SRCREV ?= "7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1" -SRC_URI = "git://github.com/libfann/fann.git;branch=master \ +SRC_URI = "git://github.com/libfann/fann.git;branch=master;protocol=https \ " -PV = "2.2.0+git${SRCPV}" +PV = "2.2.0+git" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb b/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb new file mode 100644 index 0000000000..08d3f4e84d --- /dev/null +++ b/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "FIDO 2.0 support library" +DESCRIPTION = "libfido2 provides library functionality and command-line tools to \ +communicate with a FIDO device over USB, and to verify attestation and \ +assertion signatures." +HOMEPAGE = "https://developers.yubico.com/libfido2" +LICENSE = "BSD-2-Clause" +SECTION = "libs/network" +DEPENDS = "libcbor openssl zlib udev" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=5f14cb32bdf2b87063e0a2d20c4178d0" + +SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "3601792e320032d428002c4cce8499a4c7b803319051a25a0c9f1f138ffee45a" + +inherit cmake pkgconfig manpages + +PACKAGECONFIG[manpages] = "-DBUILD_MANPAGES:BOOL=ON,-DBUILD_MANPAGES:BOOL=OFF" + +EXTRA_OECMAKE = "-DUDEV_RULES_DIR=${nonarch_base_libdir}/udev/rules.d -DBUILD_EXAMPLES:BOOL=OFF" + +PACKAGE_BEFORE_PN = "${PN}-tools" + +FILES:${PN}-tools = "${bindir}/fido2-*" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb index c33c791110..eae1c02f04 100644 --- a/meta-oe/recipes-support/libftdi/libftdi_1.4.bb +++ b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb @@ -3,17 +3,16 @@ FT232BM/245BM, FT2232C/D and FT232/245R using libusb,\ including the popular bitbang mode." HOMEPAGE = "http://www.intra2net.com/en/developer/libftdi/" SECTION = "libs" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPL-2.1-only & GPL-2.0-only" LIC_FILES_CHKSUM= "\ file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ " -DEPENDS = "libusb1 python3" +DEPENDS = "libusb1 python3 swig-native" SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" -SRC_URI[md5sum] = "0c09fb2bb19a57c839fa6845c6c780a2" -SRC_URI[sha256sum] = "ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74" +SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049" S = "${WORKDIR}/${BPN}1-${PV}" @@ -21,13 +20,21 @@ inherit cmake binconfig pkgconfig python3native PACKAGECONFIG ??= "" PACKAGECONFIG[cpp-wrapper] = "-DFTDI_BUILD_CPP=on -DFTDIPP=on,-DFTDI_BUILD_CPP=off -DFTDIPP=off,boost" +PACKAGECONFIG[ftdi-eeprom] = "-DFTDI_EEPROM=on,-DFTDI_EEPROM=off,libconfuse" -EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +EXTRA_OECMAKE = "-DSTATICLIBS=off -DEXAMPLES=off \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" +do_install:append() { + # remove absolute paths + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/libftdi1/LibFTDI1Config.cmake +} + BBCLASSEXTEND = "native nativesdk" -PACKAGES += "${PN}-python" +PACKAGES =+ "${PN}-python ftdi-eeprom" -FILES_${PN}-python = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES:ftdi-eeprom = "${bindir}/ftdi_eeprom" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/" diff --git a/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb b/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb deleted file mode 100644 index 363ed4d650..0000000000 --- a/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "the Git linkable library" -HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-GCC-exception & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" - -DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" - -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0" -SRCREV = "0ced29612dacb67eefe0c562a5c1d3aab21cce96" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "\ - -DBUILD_CLAR=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLIB_INSTALL_DIR=${libdir} \ - -DREGEX_BACKEND='pcre2' \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest new file mode 100644 index 0000000000..61b9b69fc6 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest @@ -0,0 +1,19 @@ +#!/bin/sh + +testbins="gpiod-test gpio-tools-test gpiod-cxx-test gpiod_py_test.py" + +ptestdir=$(dirname "$(readlink -f "$0")") +cd $ptestdir/tests + +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out 2>&1 + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest new file mode 100644 index 0000000000..29ec0d1027 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest @@ -0,0 +1,24 @@ +#!/bin/sh + +testbins="gpiod-test gpio-tools-test.bash gpiod-cxx-test" + +ptestdir=$(dirname "$(readlink -f "$0")") +cd $ptestdir/tests + +# libgpiod v2 uses gpio-sim - a configfs-based testing module. We need to +# make sure configfs is mounted before running any tests. +modprobe configfs +mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config + +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out 2>&1 + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-oe/recipes-support/libgpiod/libgpiod.inc new file mode 100644 index 0000000000..dc1fb4fe92 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod.inc @@ -0,0 +1,60 @@ +SUMMARY = "C library and tools for interacting with the linux GPIO character device" +RECIPE_MAINTAINER = "Bartosz Golaszewski <brgl@bgdev.pl>" + +inherit autotools pkgconfig ptest + +SRC_URI += " \ + https://www.kernel.org/pub/software/libs/libgpiod/libgpiod-${PV}.tar.xz \ + file://run-ptest \ +" + +PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" + +# Enable cxx bindings by default. +PACKAGECONFIG ?= " \ + cxx \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ +" + +# Always build tools - they don't have any additional +# requirements over the library. +EXTRA_OECONF = "--enable-tools" + +DEPENDS += "autoconf-archive-native" + +PACKAGES =+ "${PN}-tools libgpiodcxx" +FILES:${PN}-tools += " \ + ${bindir}/gpiodetect \ + ${bindir}/gpioinfo \ + ${bindir}/gpioget \ + ${bindir}/gpioset \ + ${bindir}/gpiomon \ +" +FILES:libgpiodcxx = "${libdir}/libgpiodcxx.so.*" + +RRECOMMENDS:${PN}-ptest += "coreutils" + +do_install:append() { + rm -f ${D}${bindir}/gpiod-test + rm -f ${D}${bindir}/gpio-tools-test + rm -f ${D}${bindir}/gpio-tools-test.bats + rm -f ${D}${bindir}/gpiod-cxx-test +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests/ + + # These are the core C library tests + install -m 0755 ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ + + # Tools are always built so let's always install them for ptest even if + # we're not selecting libgpiod-tools. + for tool in ${FILES:${PN}-tools}; do + install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ + done + + if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then + install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/ + fi +} + diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb deleted file mode 100644 index 6433675ca4..0000000000 --- a/meta-oe/recipes-support/libgpiod/libgpiod_1.4.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "C library and tools for interacting with the linux GPIO character device" -AUTHOR = "Bartosz Golaszewski <bgolaszewski@baylibre.com>" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" - -SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "064c2627397e6641c52de09a26951112" -SRC_URI[sha256sum] = "f1cda2789e6a13a92aefc012a76e5a7cc57a1b402d66f71df8719ee314b67699" - -inherit autotools pkgconfig python3native - -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev" -PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" -PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" - -# Enable cxx bindings by default. -PACKAGECONFIG ?= "cxx" - -# Always build tools - they don't have any additional -# requirements over the library. -EXTRA_OECONF = "--enable-tools" - -DEPENDS += "autoconf-archive-native" - -PACKAGES =+ "${PN}-tools libgpiodcxx" -FILES_${PN}-tools = "${bindir}/*" -FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" - -PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" -RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}" -RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb new file mode 100644 index 0000000000..111a5727ba --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb @@ -0,0 +1,45 @@ +require libgpiod.inc + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" + +SRC_URI[sha256sum] = "7b146e12f28fbca3df7557f176eb778c5ccf952ca464698dba8a61b2e1e3f9b5" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:" + +inherit python3native + +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" +PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" + +# Always build tools - they don't have any additional +# requirements over the library. +EXTRA_OECONF = "--enable-tools" + +PACKAGES =+ "${PN}-python" +FILES:${PN}-tools += "${bindir}/gpiofind" +FILES:${PN}-ptest += " \ + ${bindir}/gpiod_py_test.py \ + ${libdir}/libgpiomockup.so.* \ +" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" + +RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '', d)}" +RRECOMMENDS:${PN}-ptest += " \ + kernel-module-gpio-mockup \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-unittest', '', d)} \ +" +RDEPENDS:${PN}-ptest += " \ + python3-packaging \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'bats', '', d)} \ +" + +do_install_ptest:append() { + install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ + + if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then + install -m 0755 ${S}/bindings/python/tests/gpiod_py_test.py ${D}${PTEST_PATH}/tests/ + fi +} diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.1.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.1.bb new file mode 100644 index 0000000000..4c13d67eba --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.1.bb @@ -0,0 +1,31 @@ +require libgpiod.inc + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0" +LIC_FILES_CHKSUM = " \ + file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \ +" + +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" + +SRC_URI[sha256sum] = "b21913f469d3135680d5516f00fdf9f81d5e564e19ffb690927ea7f1d7e312cb" + +# Enable all project features for ptest +PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" +PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit" + +PACKAGES =+ "${PN}-ptest-dev" +FILES:${PN}-tools += "${bindir}/gpionotify" +FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*" +FILES:${PN}-ptest-dev += "${includedir}/gpiosim.h" + +RDEPENDS:${PN}-ptest += " \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \ +" +RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs" + +do_install_ptest:append() { + install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/ + install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h +} diff --git a/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch b/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch deleted file mode 100644 index 41e64d7d80..0000000000 --- a/meta-oe/recipes-support/libgusb/libgusb/0001-generate-version-script-Don-t-hard-code-the-path-of-.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 76c23503ed1002d3aad0118795006fe2128006ae Mon Sep 17 00:00:00 2001 -From: Ting-Wei Lan <lantw@src.gnome.org> -Date: Sat, 21 Mar 2020 22:13:57 +0800 -Subject: [PATCH] generate-version-script: Don't hard-code the path of python3 - -Python can be installed in different directories on different operating -systems, so we can't hard-code the path of it. Instead, use meson to -find it to avoid 'no such file or directory' error on the bad path. - -Upstream-Status: Backport [https://github.com/hughsie/libgusb/pull/36] -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - contrib/generate-version-script.py | 1 - - gusb/meson.build | 4 ++++ - 2 files changed, 4 insertions(+), 1 deletion(-) - mode change 100755 => 100644 contrib/generate-version-script.py - -diff --git a/contrib/generate-version-script.py b/contrib/generate-version-script.py -old mode 100755 -new mode 100644 -index c4ee238ab0ab..0fe2b24e47e3 ---- a/contrib/generate-version-script.py -+++ b/contrib/generate-version-script.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python3 - # pylint: disable=invalid-name,missing-docstring - # - # Copyright (C) 2017 Richard Hughes <richard@hughsie.com> -diff --git a/gusb/meson.build b/gusb/meson.build -index 10a6f537a642..28ca3c63e595 100644 ---- a/gusb/meson.build -+++ b/gusb/meson.build -@@ -142,6 +142,9 @@ libgusb_girtarget = gnome.generate_gir(gusb, - libgusb_gir = libgusb_girtarget[0] - libgusb_typelib = libgusb_girtarget[1] - -+pymod = import('python') -+py_installation = pymod.find_installation('python3') -+ - # Verify the map file is correct -- note we can't actually use the generated - # file for two reasons: - # -@@ -154,6 +157,7 @@ mapfile_target = custom_target('gusb_mapfile', - input: libgusb_girtarget[0], - output: 'libgusb.ver', - command: [ -+ py_installation, - join_paths(meson.source_root(), 'contrib', 'generate-version-script.py'), - 'LIBGUSB', - '@INPUT@', --- -2.17.1 - diff --git a/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb b/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb new file mode 100644 index 0000000000..491b6a7a1d --- /dev/null +++ b/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb @@ -0,0 +1,18 @@ +SUMMARY = "GUsb is a GObject wrapper for libusb1" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "glib-2.0 libusb" + +inherit meson gobject-introspection gtk-doc gettext vala + +PACKAGECONFIG:class-target ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}" +PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false" + +EXTRA_OEMESON:append:class-native = " -Dtests=false -Dintrospection=false" + +SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main;protocol=https" +SRCREV = "332d5b987ffecb824426e88518e05547faf2b520" +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb b/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb deleted file mode 100644 index bd88c8ed4c..0000000000 --- a/meta-oe/recipes-support/libgusb/libgusb_0.3.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "GUsb is a GObject wrapper for libusb1" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "glib-2.0 libusb" - -inherit meson gobject-introspection gtk-doc gettext vala - -SRC_URI = "git://github.com/hughsie/libgusb.git \ - file://0001-generate-version-script-Don-t-hard-code-the-path-of-.patch \ - " -SRCREV = "377917fed85476d615f72279d0c97bc391d0f191" -S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch b/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch deleted file mode 100644 index 332be1b3f7..0000000000 --- a/meta-oe/recipes-support/libharu/libharu/libharu-RELEASE_2_3_0_cmake.patch +++ /dev/null @@ -1,52 +0,0 @@ -Backport from Fedora Project. -https://src.fedoraproject.org/rpms/libharu - -Fix the install destination of some files. - -Upstream-Status: inappropriate - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> - -diff -urp libharu-RELEASE_2_3_0/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/CMakeLists.txt ---- libharu-RELEASE_2_3_0/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 -+++ libharu-RELEASE_2_3_0_cmake/CMakeLists.txt 2017-06-01 15:56:06.533552795 +0700 -@@ -25,7 +25,7 @@ endif(MSVC) - - # information about libharu - set(LIBHPDF_MAJOR 2) --set(LIBHPDF_MINOR 2) -+set(LIBHPDF_MINOR 3) - set(LIBHPDF_PATCH 0) - set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH}) - set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.") -@@ -210,9 +210,9 @@ set( - install(FILES ${haru_HDRS} DESTINATION include) - - # install various files --install(FILES README CHANGES INSTALL DESTINATION .) -+install(FILES README CHANGES INSTALL DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) - if(NOT DEVPAK) -- install(DIRECTORY if DESTINATION .) -+ install(DIRECTORY if DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) - endif(NOT DEVPAK) - if(DEVPAK) - install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .) -diff -urp libharu-RELEASE_2_3_0/src/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt ---- libharu-RELEASE_2_3_0/src/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 -+++ libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt 2017-06-01 16:08:45.425105746 +0700 -@@ -90,11 +90,13 @@ if(LIBHPDF_SHARED) - target_link_libraries(${LIBHPDF_NAME} ${ADDITIONAL_LIBRARIES}) - if(WIN32 AND NOT CYGWIN) - set_target_properties(${LIBHPDF_NAME} PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) -+ else(WIN32 AND NOT CYGWIN) -+ set_target_properties(${LIBHPDF_NAME} PROPERTIES SOVERSION ${LIBHPDF_VERSION}) - endif(WIN32 AND NOT CYGWIN) - install( - TARGETS ${LIBHPDF_NAME} -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} - RUNTIME DESTINATION bin - ) - endif(LIBHPDF_SHARED) diff --git a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-oe/recipes-support/libharu/libharu_2.3.0.bb deleted file mode 100644 index 2d1a37c421..0000000000 --- a/meta-oe/recipes-support/libharu/libharu_2.3.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "free PDF library" -HOMEPAGE = "http://libharu.org" -DESCRIPTION = "libHaru is a library for generating PDF files. \ - It is free, open source, written in ANSI C and cross platform. " - -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://README;md5=3ee6bc1f64d9cc7907f44840c8e50cb1" - -SRC_URI = "git://github.com/libharu/libharu.git;branch=2_3 \ - file://libharu-RELEASE_2_3_0_cmake.patch \ - " - -SRCREV = "4ae1d5f4c84459f130bf1b1ef4c5c330af8eca5d" - -S = "${WORKDIR}/git" - -inherit cmake -DEPENDS += "libpng zlib" - -do_install_append() { - mkdir -p ${D}/${datadir}/libharu - mv ${D}/libharu ${D}/${datadir} -} diff --git a/meta-oe/recipes-support/libharu/libharu_2.4.4.bb b/meta-oe/recipes-support/libharu/libharu_2.4.4.bb new file mode 100644 index 0000000000..02dc499e03 --- /dev/null +++ b/meta-oe/recipes-support/libharu/libharu_2.4.4.bb @@ -0,0 +1,16 @@ +SUMMARY = "free PDF library" +HOMEPAGE = "http://libharu.org" +DESCRIPTION = "libHaru is a library for generating PDF files. \ + It is free, open source, written in ANSI C and cross platform. " + +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE;md5=924546dab2bef90e370d7c0c090ddcf0" + +DEPENDS += "libpng zlib" + +SRC_URI = "git://github.com/libharu/libharu.git;branch=master;protocol=https" +SRCREV = "0c598becaadaef8e3d12b883f9fc2864a118c12d" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-support/libiio/libiio_0.25.bb b/meta-oe/recipes-support/libiio/libiio_0.25.bb new file mode 100644 index 0000000000..2c6d2b5145 --- /dev/null +++ b/meta-oe/recipes-support/libiio/libiio_0.25.bb @@ -0,0 +1,81 @@ +SUMMARY = "Library for interfacing with IIO devices" +HOMEPAGE = "https://wiki.analog.com/resources/tools-software/linux-software/libiio" +SECTION = "libs" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" + +SRCREV = "b6028fdeef888ab45f7c1dd6e4ed9480ae4b55e3" + +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=main" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +SETUPTOOLS_SETUP_PATH ?= "${B}/bindings/python/" + +DEPENDS = " \ + flex-native bison-native libaio \ +" + +inherit cmake python3native systemd setuptools3 pkgconfig + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCPP_BINDINGS=ON \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ + -DUDEV_RULES_INSTALL_DIR=${nonarch_base_libdir}/udev/rules.d \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ +" + +PACKAGECONFIG ??= " \ + usb_backend network_backend serial_backend xml_backend \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'dnssd', '', d)} \ +" + +# network_backend, serial_backend and usb_backend depend on xml_backend, so don't switch it off +XML_BACKEND_DISABLE = "${@bb.utils.contains_any('PACKAGECONFIG', 'network_backend serial_backend usb_backend', '', '-DWITH_XML_BACKEND=off', d)}" + +PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON -DWITH_XML_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1 libxml2" +PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON -DWITH_XML_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" +PACKAGECONFIG[serial_backend] = "-DWITH_SERIAL_BACKEND=ON -DWITH_XML_BACKEND=ON,-DWITH_SERIAL_BACKEND=off,libserialport libxml2" +PACKAGECONFIG[xml_backend] = "-DWITH_XML_BACKEND=ON,${XML_BACKEND_DISABLE},libxml2" +PACKAGECONFIG[dnssd] = "-DHAVE_DNS_SD=ON,-DHAVE_DNS_SD=off,avahi" +PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" + +PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python3" + +# Inheriting setuptools3 incorrectly adds the dependency on python3-core +# to ${PN} instead of to ${PN}-python3 where it belongs. +RDEPENDS:${PN}:remove = "python3-core" +RDEPENDS:${PN}-python3 = "${PN} python3-core python3-ctypes python3-stringold" + +FILES:${PN}-iiod = " \ + ${sbindir}/iiod \ + ${systemd_system_unitdir}/iiod.service \ +" +FILES:${PN}-tests = "${bindir}" +FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" + +SYSTEMD_PACKAGES = "${PN}-iiod" +SYSTEMD_SERVICE:${PN}-iiod = "iiod.service" + +# Explicitly define do_configure, do_compile and do_install because both cmake and setuptools3 have +# EXPORT_FUNCTIONS do_configure do_compile do_install +do_configure() { + cmake_do_configure +} + +do_compile() { + if ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'true', 'false', d)}; then + setuptools3_do_compile + fi + cmake_do_compile +} + +do_install() { + if ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'true', 'false', d)}; then + setuptools3_do_install + fi + cmake_do_install +} diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb deleted file mode 100644 index b308bde171..0000000000 --- a/meta-oe/recipes-support/libiio/libiio_git.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "Library for interfacing with IIO devices" -HOMEPAGE = "https://wiki.analog.com/resources/tools-software/linux-software/libiio" -SECTION = "libs" -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" - -SRCREV = "565bf68eccfdbbf22cf5cb6d792e23de564665c7" -PV = "0.21+git${SRCPV}" - -SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit cmake python3native systemd - -DEPENDS = " \ - flex-native bison-native libaio \ - ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ -" - -EXTRA_OECMAKE = " \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DUDEV_RULES_INSTALL_DIR=${nonarch_base_libdir}/udev/rules.d \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \ -" - -PACKAGECONFIG ??= "usb_backend network_backend" - -PACKAGECONFIG[usb_backend] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2" -PACKAGECONFIG[network_backend] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2" -PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'distutils3-base', '', d)} - -PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" - -RDEPENDS_${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" - -FILES_${PN}-iiod = " \ - ${sbindir}/iiod \ - ${systemd_system_unitdir}/iiod.service \ -" -FILES_${PN}-tests = "${bindir}" -FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" - -SYSTEMD_PACKAGES = "${PN}-iiod" -SYSTEMD_SERVICE_${PN}-iiod = "iiod.service" diff --git a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb new file mode 100644 index 0000000000..ff976ed975 --- /dev/null +++ b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb @@ -0,0 +1,30 @@ +SUMMARY = "iODBC driver manager maintained by OpenLink Software." + +DESCRIPTION = "This kit will provide you with everything you need to \ +develop ODBC-compliant applications under Unix without having to pay \ +royalties to other parties. \ +" + +HOMEPAGE = "http://www.iodbc.org/" + +LICENSE = "LGPL-2.0-only | BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \ + file://LICENSE.BSD;md5=ff3a66a194e500df485da930da7f2c62 \ + " + +SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[sha256sum] = "c74541e3327fc9a1c7ccf103645471c67bc014542d70f572476eb07c0b2dd43c" + +inherit autotools + +EXTRA_OECONF += " --prefix=/usr/local \ + --includedir=/usr/include/iodbc \ + --with-iodbc-inidir=/etc \ + --enable-odbc3 \ + --enable-pthreads \ + --disable-libodbc \ + --disable-static \ + " + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}:${bindir}/iodbc-config" diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb new file mode 100644 index 0000000000..38ffd032ab --- /dev/null +++ b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb @@ -0,0 +1,27 @@ +SUMMARY = "A simple, lightweight JavaScript API for handling cookies." +HOMEPAGE = "https://github.com/js-cookie/js-cookie" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e16cf0e247d84f8999bf55865a9c98cf" + +SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=https;branch=main" + +SRCREV = "ab3f67fc4fad88cdf07b258c08e4164e06bf7506" + +S = "${WORKDIR}/git" + +JQUERYCOOKIEDIR = "${datadir}/javascript/jquery-cookie" +JQUERYCOOKIEDOCDIR = "${docdir}/libjs-jquery-cookie" + +do_install() { + install -d ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/*.js ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/src/*.mjs ${D}${JQUERYCOOKIEDIR} + install -m 0644 ${S}/*.json ${D}${JQUERYCOOKIEDIR} + + install -d ${D}${JQUERYCOOKIEDOCDIR} + install -m 0644 ${S}/*.md ${D}${JQUERYCOOKIEDOCDIR} + +} + +FILES:${PN} += "${datadir}/javascript/jquery-cookie" +FILES:${PN}-doc += "${docdir}/libjs-jquery-cookie" diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb b/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb new file mode 100644 index 0000000000..b6147ffeb2 --- /dev/null +++ b/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A JavaScript library for internationalization and localization that leverages the official Unicode CLDR JSON data" +SECTION = "console/network" +HOMEPAGE = "https://github.com/globalizejs/globalize" +LICENSE = "MIT" + +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=4db68fb4d1d9986d736b35039f2ad9ea" + +SRCREV = "771061fb35f7fd8d7c2c37f5d5bb26115be382bc" +SRC_URI = "git://github.com/globalizejs/globalize;protocol=https;nobranch=1" + +FILES:${PN} = "${datadir}/javascript/jquery-globalize" +FILES:${PN}-doc += "${docdir}/${PN}" + +do_install() { + install -d ${D}${datadir}/javascript/jquery-globalize/ + install -m 0644 ${S}/dist/*.js ${D}${datadir}/javascript/jquery-globalize/ + install -m 0644 ${S}/dist/globalize/*.js ${D}${datadir}/javascript/jquery-globalize/ + + install -d ${D}${docdir}/${PN}/ + install -m 0644 ${S}/LICENSE ${D}${docdir}/${PN}/ +} diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb new file mode 100644 index 0000000000..31c3534b88 --- /dev/null +++ b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Highly customizable checkboxes and radio buttons (jQuery & Zepto)" +SECTION = "console/network" +HOMEPAGE = "http://fronteed.com/iCheck" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://icheck.js;start_line=1;end_line=8;md5=404078d7de9f05ed64d364274f790055" + +SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV}" + +SRCREV = "c8c1af84e4b90b4aea31466aad09bf877619e943" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir}/javascript/jquery-icheck/ + install -m 0644 ${S}/icheck.js ${D}${datadir}/javascript/jquery-icheck/ + install -m 0644 ${S}/icheck.min.js ${D}${datadir}/javascript/jquery-icheck/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/ + install -m 0644 ${S}/skins/all.css ${D}${datadir}/javascript/jquery-icheck/skins/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/flat/ + install -m 0644 ${S}/skins/flat/* ${D}${datadir}/javascript/jquery-icheck/skins/flat/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/futurico/ + install -m 0644 ${S}/skins/futurico/* ${D}${datadir}/javascript/jquery-icheck/skins/futurico/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/line/ + install -m 0644 ${S}/skins/line/* ${D}${datadir}/javascript/jquery-icheck/skins/line/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/minimal/ + install -m 0644 ${S}/skins/minimal/* ${D}${datadir}/javascript/jquery-icheck/skins/minimal/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/polaris/ + install -m 0644 ${S}/skins/polaris/* ${D}${datadir}/javascript/jquery-icheck/skins/polaris/ + + install -d ${D}${datadir}/javascript/jquery-icheck/skins/square/ + install -m 0644 ${S}/skins/square/* ${D}${datadir}/javascript/jquery-icheck/skins/square/ +} + +FILES:${PN} += "${datadir}/javascript/jquery-icheck" + diff --git a/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb index 7f425cdeab..9130b110a8 100644 --- a/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb +++ b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb @@ -1,15 +1,17 @@ SUMMARY = "JavaScript library for dynamic web applications" HOMEPAGE = "https://jquery.com/" -LICENSE = "MIT | BSD | GPL-2" -LIC_FILES_CHKSUM = "file://usr/share/doc/libjs-jquery/copyright;md5=5d1ec6f95e0a91d38e2f71de93ddb00e" +LICENSE = "GPL-2.0-only | MIT" +LIC_FILES_CHKSUM = "file://usr/share/doc/libjs-jquery/copyright;md5=04bfd6e5b918af29f2f79ce44527da62" -SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/${BPN}_${PV}+debian-1ubuntu1~ubuntu12.04.1_all.deb;subdir=${BP}" -SRC_URI[md5sum] = "fa511ab67f6e960c5b6d39a4d665e47f" -SRC_URI[sha256sum] = "190ca18a71e35c8ab2ba73fe5be3c7cc601fe20b45709d801110818f1b602cc1" +SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/${BPN}_${PV}~dfsg-3_all.deb" + +SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a56da33b" JQUERYDIR = "${datadir}/javascript/jquery" JQUERYDOCDIR = "${docdir}/libjs-jquery" +S = "${WORKDIR}" + do_install() { install -d -m 0755 ${D}${JQUERYDIR} install -m 0644 ${S}${JQUERYDIR}/jquery.js ${D}${JQUERYDIR}/ @@ -22,4 +24,4 @@ do_install() { install -m 0644 ${S}${JQUERYDOCDIR}/copyright ${D}${JQUERYDOCDIR}/ } -FILES_${PN} = "/usr/share/javascript/jquery" +FILES:${PN} = "/usr/share/javascript/jquery" diff --git a/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb index 4928b6c3a7..e639ce59d8 100644 --- a/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb +++ b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb @@ -1,6 +1,6 @@ SUMMARY = "Pure-JavaScript CSS selector engine" HOMEPAGE = "https://github.com/jquery/sizzle/wiki" -LICENSE = "GPL-2.0 & MIT & AFL-2.1" +LICENSE = "GPL-2.0-only & MIT & AFL-2.1" LIC_FILES_CHKSUM = "file://MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9" SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/universe/s/sizzle/sizzle_1.10.18.orig.tar.gz" @@ -16,4 +16,4 @@ do_install() { install -m 0644 ${SIZZLEDIR}/*.js ${D}/${datadir}/javascript/sizzle/ } -FILES_${PN} = "${datadir}/javascript/sizzle/" +FILES:${PN} = "${datadir}/javascript/sizzle/" diff --git a/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb b/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb new file mode 100644 index 0000000000..db05422699 --- /dev/null +++ b/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb @@ -0,0 +1,16 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) +SUMMARY = "The simple GObject game controller library" +HOMEPAGE = "https://gnome.pages.gitlab.gnome.org/libmanette/" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libevdev libgudev" + +SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz" +SRC_URI[sha256sum] = "cddd5c02a131072c19c6cde6f2cb2cd57eae7dacb50d14c337efd980baa51a51" + +inherit meson pkgconfig gobject-introspection ptest vala + +FILES:${PN}-ptest =+ "${bindir}/manette-test" +FILES:${PN}-dev =+ "${libdir}/girepository-1.0" diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb deleted file mode 100644 index 2bd8148e3f..0000000000 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.71.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" -HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=57d09285feac8a64efa878e692b14f36" -SECTION = "net" - -DEPENDS = "file" - -SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ -" -SRC_URI[md5sum] = "c7e230e9b899282b43d9a9faa41e893d" -SRC_URI[sha256sum] = "e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182" - -inherit autotools lib_package pkgconfig gettext - -CFLAGS += "-pthread -D_REENTRANT" - -EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" - -PACKAGECONFIG ?= "curl https" -PACKAGECONFIG_append_class-target = "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ -" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," -PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," - -do_compile_append() { - sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc -} diff --git a/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch b/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch index 50cd4d4270..717e3f1f8b 100644 --- a/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch +++ b/meta-oe/recipes-support/libmimetic/libmimetic/0001-libmimetic-Removing-test-directory-from-the-Makefile.patch @@ -15,6 +15,8 @@ aarch64-yoe-linux-musl. Signed-off-by: asmitk01-in <asmitk01@in.ibm.com> Change-Id: I1822b36ad4a1fa5e7b165d8cac3a6e96aca11c35 --- +Upstream-Status: Pending + Makefile.am | 2 +- mimetic/codec/other_codecs.h | 4 ++++ mimetic/contenttype.cxx | 4 ++++ diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb index 590c4ebc28..4d4a5ff109 100644 --- a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb +++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb @@ -2,7 +2,6 @@ SUMMARY = "Mimetic Library for multi-part parsing" DESCRIPTION = "Email library (MIME) written in C++ designed to be easy to use and integrate but yet fast and efficient." -AUTHOR = "Stefano Barbato <stefano@codesink.org>" HOMEPAGE = "http://www.codesink.org/mimetic_mime_library.html" BUGTRACKER = "https://github.com/LadislavSopko/mimetic/issues" @@ -10,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b49da7df0ca479ef01ff7f2d799eabee" SRCREV = "50486af99b4f9b35522d7b3de40b6ce107505279" -SRC_URI += "git://github.com/LadislavSopko/mimetic/ \ +SRC_URI += "git://github.com/LadislavSopko/mimetic/;branch=master;protocol=https \ file://0001-libmimetic-Removing-test-directory-from-the-Makefile.patch \ file://0001-mimetic-Check-for-MMAP_FAILED-return-from-mmap.patch \ " @@ -19,6 +18,6 @@ UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" -CXXFLAGS += "-Wno-narrowing" +CXXFLAGS += "-Wno-narrowing -std=c++14" inherit autotools diff --git a/meta-oe/recipes-support/libmxml/libmxml_3.1.bb b/meta-oe/recipes-support/libmxml/libmxml_3.3.1.bb index 4e77d6cc02..38e270c036 100644 --- a/meta-oe/recipes-support/libmxml/libmxml_3.1.bb +++ b/meta-oe/recipes-support/libmxml/libmxml_3.3.1.bb @@ -4,22 +4,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" HOMEPAGE = "https://www.msweet.org/mxml/" BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" -SRC_URI = "git://github.com/michaelrsweet/mxml.git" -SRCREV = "e483e5fd8a33386fd46967681521bdd2da2b548f" +SRC_URI = "git://github.com/michaelrsweet/mxml.git;branch=master;protocol=https" +SRCREV = "fd47c7d115191c8a6bce2c781ffee41e179530f2" S = "${WORKDIR}/git" -inherit autotools +# Package does not support out of tree builds. +inherit autotools-brokensep PACKAGECONFIG ??= "threads" PACKAGECONFIG[threads] = "--enable-threads,--disable-threads" -# Package does not support out of tree builds. -B = "${S}" - # MXML uses autotools but it explicitly states it does not support autoheader. EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" -do_configure_prepend() { +do_configure:prepend() { # Respect optimization CFLAGS specified by OE. sed -e 's/-Os -g//' -i ${S}/configure.ac diff --git a/meta-oe/recipes-support/libnice/libnice_0.1.22.bb b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb new file mode 100644 index 0000000000..175e10fdf6 --- /dev/null +++ b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb @@ -0,0 +1,30 @@ +SUMMARY = "Interactive Connectivity Establishment library" +DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactive Connectivity Establishment standard (ICE)." +HOMEPAGE = "http://nice.freedesktop.org/wiki/" + +LICENSE = "LGPL-2.1-only & MPL-1.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://COPYING.MPL;md5=3c617710e51cdbe0fc00716f056dfb1a \ +" + +SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz" +SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e" + +DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" + +PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0" +PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," + +GTKDOC_MESON_OPTION = "gtk_doc" +GTKDOC_MESON_ENABLE_FLAG = "enabled" +GTKDOC_MESON_DISABLE_FLAG = "disabled" + +inherit meson gtk-doc gobject-introspection + +EXTRA_OEMESON = "-Dexamples=disabled -Dtests=disabled" + +FILES:${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/pkgconfig" +FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.8.bb b/meta-oe/recipes-support/libnvme/libnvme_1.8.bb new file mode 100644 index 0000000000..3894facecb --- /dev/null +++ b/meta-oe/recipes-support/libnvme/libnvme_1.8.bb @@ -0,0 +1,22 @@ +SUMMARY = "libnvme development C library" +DESCRIPTION = "\ +libnvme provides type definitions for NVMe specification structures, \ +enumerations, and bit fields, helper functions to construct, dispatch, \ +and decode commands and payloads, and utilities to connect, scan, and \ +manage nvme devices on a Linux system." +HOMEPAGE = "https://github.com/linux-nvme/${BPN}" +SECTION = "libs" +LICENSE = "LGPL-2.1-only & CC0-1.0 & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ + file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" +DEPENDS = "json-c" +SRCREV = "bff7dda7e2a0f883d0b89e23fed725c916de3e61" + +SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON += "-Dkeyutils=disabled -Dopenssl=disabled -Dpython=disabled" diff --git a/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch b/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch index 8691eae2b5..2631f4ae73 100644 --- a/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch +++ b/meta-oe/recipes-support/liboauth/liboauth/0001-Support-OpenSSL-1.1.0.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support OpenSSL 1.1.0 Taken from https://github.com/x42/liboauth/issues/9 -Upstream-Status: Submitted[https://github.com/x42/liboauth/issues/9] +Upstream-Status: Submitted [https://github.com/x42/liboauth/issues/9] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/hash.c | 65 ++++++++++++++++++++++++++++++++++++------------------ diff --git a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb index 498764ac83..d4b8170873 100644 --- a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb +++ b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "C library implementing OAuth Core RFC 5849" HOMEPAGE = "http://liboauth.sourceforge.net" -LICENSE = "MIT|GPL-2.0" +LICENSE = "MIT|GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=6266718a5241c045c8099d9be48817df \ file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" SECTION = "libs" diff --git a/meta-oe/recipes-support/libol/libol/configure.patch b/meta-oe/recipes-support/libol/libol/configure.patch deleted file mode 100644 index 87695fb06d..0000000000 --- a/meta-oe/recipes-support/libol/libol/configure.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libol-0.3.18/configure.in -=================================================================== ---- libol-0.3.18.orig/configure.in 2006-03-27 14:44:52.000000000 +0000 -+++ libol-0.3.18/configure.in 2014-07-18 07:05:56.029481372 +0000 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(src/abstract_io.c) -+AC_INIT(libol, "0.3.18") - --AM_INIT_AUTOMAKE(libol, "0.3.18", 1) -+AM_INIT_AUTOMAKE([foreign]) - if test -n "$SNAPSHOT_VERSION"; then - VERSION=$VERSION+$SNAPSHOT_VERSION - fi diff --git a/meta-oe/recipes-support/libol/libol_0.3.18.bb b/meta-oe/recipes-support/libol/libol_0.3.18.bb deleted file mode 100644 index d7adb2b941..0000000000 --- a/meta-oe/recipes-support/libol/libol_0.3.18.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "A tiny C support library" -HOMEPAGE = "https://my.balabit.com/downloads/libol" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" - -SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${BP}.tar.gz \ - file://configure.patch" -SRC_URI[md5sum] = "cbadf4b7ea276dfa85acc38a1cc5ff17" -SRC_URI[sha256sum] = "9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a32005cefe7" - -inherit autotools binconfig - -do_compile_prepend() { - install ${S}/utils/make_class.in ${B}/utils -} - -do_install_append() { - rm -fr ${D}${bindir} -} diff --git a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch b/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch index e00cf80141..0521aaeaff 100644 --- a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch +++ b/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,7 @@ diff --git a/meta-oe/recipes-support/liboop/liboop_1.0.1.bb b/meta-oe/recipes-support/liboop/liboop_1.0.1.bb index 8ba3f72b76..7ad88b7402 100644 --- a/meta-oe/recipes-support/liboop/liboop_1.0.1.bb +++ b/meta-oe/recipes-support/liboop/liboop_1.0.1.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Liboop is a low-level event loop management library for POSIX-based operating systems" HOMEPAGE = "http://www.lysator.liu.se/liboop/" -LICENSE = "GPL-2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8b54f38ccbd44feb80ab90e01af8b700" -SRC_URI = "http://ftp.debian.org/debian/pool/main/libo/liboop/liboop_${PV}.orig.tar.gz \ +SRC_URI = "http://ftp.lysator.liu.se/pub/liboop/liboop-${PV}.tar.gz \ file://tcl_dev.patch \ " diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch new file mode 100644 index 0000000000..778a1f6e1e --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo/0001-meson.build-allow-crosscompiling-gir.patch @@ -0,0 +1,28 @@ +From 123b5a4c5e09f4262d4545a0bc5edb01a19b6b76 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 21 Aug 2023 10:06:55 +0200 +Subject: [PATCH] meson.build: allow crosscompiling gir + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 39b739e..46f2252 100644 +--- a/meson.build ++++ b/meson.build +@@ -29,7 +29,7 @@ libosinfo_pkgconfdir = join_paths(libosinfo_libdir, 'pkgconfig') + + # gobject introspection + gir = find_program('g-ir-scanner', required: get_option('enable-introspection')) +-enable_introspection = gir.found() and not meson.is_cross_build() ++enable_introspection = gir.found() + + # vala + vapi_opt = get_option('enable-vala') +-- +2.41.0 + diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch new file mode 100644 index 0000000000..467c6b4baf --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch @@ -0,0 +1,32 @@ +From 5bbdd06503456784c5ffa22409e8bab50470d673 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:11:45 +0100 +Subject: [PATCH] osinfo: Make xmlError struct constant in + propagate_libxml_error() + +In libxml2 commit v2.12.0~14 the API changed so that +xmlGetLastError() returns pointer to a constant xmlError struct. +Reflect this change in our code. + +Upstream-Status: Backport [https://gitlab.com/libosinfo/libosinfo/-/merge_requests/155] +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + osinfo/osinfo_install_script.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c +index 5800f37..303245a 100644 +--- a/osinfo/osinfo_install_script.c ++++ b/osinfo/osinfo_install_script.c +@@ -769,7 +769,7 @@ static void propagate_libxml_error(GError **error, const char *format, ...) G_GN + + static void propagate_libxml_error(GError **error, const char *format, ...) + { +- xmlErrorPtr err = xmlGetLastError(); ++ const xmlError *err = xmlGetLastError(); + char *prefix; + va_list ap; + +-- +2.44.0 + diff --git a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb new file mode 100644 index 0000000000..8ef7ac3df0 --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "API for managing information about operating systems, hypervisors and the (virtual) hardware devices." +HOMEPAGE = "https://libosinfo.org" + +LICENSE = "LGPL-2.1-only & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2b0e9926530c269f5ae95560370195af" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = " \ + git://gitlab.com/libosinfo/libosinfo.git;branch=main;protocol=https \ + file://0001-meson.build-allow-crosscompiling-gir.patch \ + file://0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch \ +" + +SRCREV = "ca9dd5b810dc04ea38048ae9be491654c8596ef9" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig gtk-doc gobject-introspection vala + +DEPENDS = "glib-2.0 libsoup libxslt" + +VALA_MESON_OPTION = 'enable-vala' +VALA_MESON_ENABLE_FLAG = 'enabled' +VALA_MESON_DISABLE_FLAG = 'disabled' +GIR_MESON_OPTION = "enable-introspection" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +EXTRA_OEMESON += " \ + -Dwith-pci-ids-path=${datadir}/hwdata/pci.ids \ + -Dwith-usb-ids-path=${datadir}/hwdata/usb.ids \ +" + +RDEPENDS:${PN} = "hwdata" diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.10.bb b/meta-oe/recipes-support/libp11/libp11_0.4.12.bb index 7fe0640d94..2237782009 100644 --- a/meta-oe/recipes-support/libp11/libp11_0.4.10.bb +++ b/meta-oe/recipes-support/libp11/libp11_0.4.12.bb @@ -5,12 +5,12 @@ make using PKCS" HOMEPAGE = "https://github.com/OpenSC/libp11" BUGTRACKER = "https://github.com/OpenSC/libp11/issues" SECTION = "Development/Libraries" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" DEPENDS = "libtool openssl" -SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "973d31f3f58d5549ddd8b1f822ce8f72186f9d68" +SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https" +SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf" UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" @@ -20,11 +20,11 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-static" -do_install_append () { +do_install:append () { rm -rf ${D}${docdir}/${BPN} } -FILES_${PN} += "${libdir}/engines*/pkcs11.so" -FILES_${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}" +FILES:${PN} += "${libdir}/engines*/pkcs11.so" +FILES:${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb b/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb new file mode 100644 index 0000000000..a45ffe1849 --- /dev/null +++ b/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb @@ -0,0 +1,9 @@ +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] = "1fda0cf64efa46b9684a4ccc17df4386c4cc83254805419222c064bf62ea001f" + +inherit perlnative autotools + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb new file mode 100644 index 0000000000..4d089f3b79 --- /dev/null +++ b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb @@ -0,0 +1,11 @@ +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=0.21-stable;protocol=https" +SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +DEPENDS = "jpeg jasper lcms" diff --git a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb index 337780789d..15e1ee2438 100644 --- a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb +++ b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb @@ -1,7 +1,7 @@ SUMMARY = "base library for low-level IEEE 1394 accesses" HOMEPAGE = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394" SECTION = "libs" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz" diff --git a/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch b/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch new file mode 100644 index 0000000000..053a4cc2d8 --- /dev/null +++ b/meta-oe/recipes-support/librdkafka/librdkafka/0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch @@ -0,0 +1,30 @@ +From ed1dd35e0e23a98e57567718a0d474fd29cc348a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 19 Mar 2022 21:36:41 -0700 +Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR + +this ensures that it is portable across platforms e.g. ppc64/linux +uses lib64 not lib + +Upstream-Status: Submitted [https://github.com/edenhill/librdkafka/pull/3770] +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 d1129bce..774473fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -219,7 +219,7 @@ configure_file("packaging/cmake/config.h.in" "${GENERATED_DIR}/config.h") + + include(GNUInstallDirs) + +-set(config_install_dir "lib/cmake/${PROJECT_NAME}") ++set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") + +-- +2.35.1 + diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb new file mode 100644 index 0000000000..6148e7cb08 --- /dev/null +++ b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "the Apache Kafka C/C++ client library" +DESCRIPTION = "librdkafka is a C library implementation of the Apache Kafka protocol, \ + providing Producer, Consumer and Admin clients." +HOMEPAGE = "https://github.com/edenhill/librdkafka" +SECTION = "libs" +LICENSE = "BSD-2-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=2be8675acbfdac48935e73897af5f646" + +SRC_URI = "git://github.com/edenhill/librdkafka;protocol=https;branch=master \ + file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR.patch \ + " +SRCREV = "063a9ae7a65cebdf1cc128da9815c05f91a2a996" + +DEPENDS = "zlib openssl zstd" + +inherit cmake + +S = "${WORKDIR}/git" + +FILES:${PN} += "${datadir}" + +EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF" diff --git a/meta-oe/recipes-support/librsync/librsync_2.3.1.bb b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb index 004c93d0f9..3cad665389 100644 --- a/meta-oe/recipes-support/librsync/librsync_2.3.1.bb +++ b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb @@ -1,11 +1,10 @@ SUMMARY = "Remote delta-compression library." -AUTHOR = "Martin Pool, Andrew Tridgell, Donovan Baarda, Adam Schubert" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" -SRC_URI = "git://github.com/librsync/librsync.git" -SRCREV = "27f738650c20fef1285f11d85a34e5094a71c06f" +SRC_URI = "git://github.com/librsync/librsync.git;branch=master;protocol=https" +SRCREV = "e364852674780e43d578e4239128ff7014190ed3" S = "${WORKDIR}/git" DEPENDS = "popt" @@ -13,6 +12,6 @@ DEPENDS = "popt" inherit cmake PACKAGES =+ "rdiff" -FILES_rdiff = "${bindir}/rdiff" +FILES:rdiff = "${bindir}/rdiff" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libsmi/libsmi/0001-Define-createIdentifierRef-prototype-in-yang-complex.patch b/meta-oe/recipes-support/libsmi/libsmi/0001-Define-createIdentifierRef-prototype-in-yang-complex.patch new file mode 100644 index 0000000000..3374f8484e --- /dev/null +++ b/meta-oe/recipes-support/libsmi/libsmi/0001-Define-createIdentifierRef-prototype-in-yang-complex.patch @@ -0,0 +1,53 @@ +From 77b520a8ee193b6d9f12e049f505d8d98204c11c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 17:13:32 -0700 +Subject: [PATCH] Define createIdentifierRef prototype in yang-complex-types.c + +Provide needed prototype to make compiler happy + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/parser-yang.y | 3 ++- + lib/yang-complex-types.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- a/lib/parser-yang.y ++++ b/lib/parser-yang.y +@@ -41,7 +41,8 @@ + #include "yang-complex-types.h" + #include "util.h" + #include "error.h" +- ++#include "yang-check.h" ++ + #ifdef HAVE_DMALLOC_H + #include <dmalloc.h> + #endif +@@ -61,7 +62,8 @@ + #define debug + #endif + +- ++extern void createIdentifierRef(struct _YangNode *node, char* prefix, char* ident); ++extern void smiyyerror(char *msg, Parser *parserPtr); + /* + * NOTE: The argument lvalp ist not really a void pointer. Unfortunately, + * we don't know it better at this point. bison generated C code declares +--- a/lib/yang-complex-types.c ++++ b/lib/yang-complex-types.c +@@ -35,12 +35,13 @@ + #include "yang-data.h" + #include "yang-check.h" + #include "yang-complex-types.h" +- + /* + * Current parser defined in parser-yang. Workaround - can't include data.h + */ + extern Parser *currentParser; + ++extern void createIdentifierRef(struct _YangNode *node, char* prefix, char* ident); ++ + static const int parents_complex_type[] = { + YANG_DECL_MODULE, YANG_DECL_SUBMODULE, YANG_DECL_CONTAINER, + YANG_DECL_LIST, YANG_DECL_RPC, YANG_DECL_INPUT, diff --git a/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch b/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch new file mode 100644 index 0000000000..9354a889a0 --- /dev/null +++ b/meta-oe/recipes-support/libsmi/libsmi/0001-parser-yang-Define-_DEFAULT_SOURCE.patch @@ -0,0 +1,28 @@ +From 86b706f694b822d8028fd36320147767056d2ffa Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 6 Sep 2022 12:09:00 -0700 +Subject: [PATCH] parser-yang: Define _DEFAULT_SOURCE + +This is needed for timegm API + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/parser-yang.y | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/parser-yang.y b/lib/parser-yang.y +index b111607..0ded9d2 100644 +--- a/lib/parser-yang.y ++++ b/lib/parser-yang.y +@@ -21,6 +21,7 @@ + #ifdef BACKEND_YANG + + #define _ISOC99_SOURCE ++#define _DEFAULT_SOURCE + #include <stdio.h> + #include <errno.h> + #include <stdlib.h> +-- +2.37.3 + diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 98cc63eb3b..822b7ffc2b 100644 --- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -1,32 +1,40 @@ SUMMARY = "A Library to Access SMI MIB Information" HOMEPAGE = "https://www.ibr.cs.tu-bs.de/projects/libsmi" -LICENSE = "BSD-3-Clause & tcl" +LICENSE = "BSD-3-Clause & TCL" LIC_FILES_CHKSUM = "file://COPYING;md5=3ad3076f9332343a21636cfd351f05b7" SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \ file://smi.conf \ file://libsmi-fix-the-test-dump-files.patch \ + file://0001-Define-createIdentifierRef-prototype-in-yang-complex.patch \ + file://0001-parser-yang-Define-_DEFAULT_SOURCE.patch \ " SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11" SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3" -RDEPENDS_${PN} += "wget" +DEPENDS += "bison-native flex-native wget-native gawk-native" -inherit autotools +inherit autotools-brokensep update-alternatives +ALTERNATIVE_PRIORITY = "50" +ALTERNATIVE:${PN}-yang = "ietf-interfaces " +ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" -EXTRA_OECONF = "ac_cv_path_SH=${base_bindir}/sh ac_cv_path_WGET=${bindir}/wget" +EXTRA_OECONF:class-native = "ac_cv_path_SH=/bin/sh" +EXTRA_OECONF:class-target = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk" -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/smi.conf ${D}${sysconfdir}/smi.conf } PACKAGES += "${PN}-mibs ${PN}-pibs ${PN}-yang" -FILES_${PN}-mibs += "${datadir}/mibs" -FILES_${PN}-pibs += "${datadir}/pibs" -FILES_${PN}-yang += "${datadir}/yang" +FILES:${PN}-mibs += "${datadir}/mibs" +FILES:${PN}-pibs += "${datadir}/pibs" +FILES:${PN}-yang += "${datadir}/yang" -RRECOMMENDS_${PN} = "${BPN}-mibs" +RRECOMMENDS:${PN} = "${BPN}-mibs" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb index 8b773aefa5..5969220a41 100644 --- a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb +++ b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb @@ -4,13 +4,13 @@ DESCRIPTION = "libsoc is a C library to interface with common peripherals (gpio, HOMEPAGE = "https://github.com/jackmitch/libsoc" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENCE;md5=e0bfebea12a718922225ba987b2126a5" inherit autotools pkgconfig python3-dir SRCREV = "fd1ad6e7823fa76d8db0d3c5884faffa8ffddafb" -SRC_URI = "git://github.com/jackmitch/libsoc.git" +SRC_URI = "git://github.com/jackmitch/libsoc.git;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -21,12 +21,12 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[disabledebug] = "--disable-debug,," PACKAGECONFIG[allboardconfigs] = "--with-board-configs,," PACKAGECONFIG[enableboardconfig] = "--enable-board=${BOARD},," -PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN},,${PYTHON_PN} ${PYTHON_PN}-native" +PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/python3-native/python3,,python3 python3-native" PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \ - '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}" + 'python3-libsoc-staticdev python3-libsoc', '', d)}" -RDEPENDS_${PN} = "libgcc" +RDEPENDS:${PN} = "libgcc" -FILES_${PYTHON_PN}-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" -FILES_${PYTHON_PN}-libsoc += "${PYTHON_SITEPACKAGES_DIR}" +FILES:python3-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" +FILES:python3-libsoc += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch b/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch new file mode 100644 index 0000000000..d2d1fb5955 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch @@ -0,0 +1,44 @@ +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 + +This is to match the prototype for callback functions which are now emitted as +errors by clang16 + +Fixes + +TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:903:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types] + .encrypt = des3_encrypt, + ^~~~~~~~~~~~ +TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:904:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types] + .decrypt = des3_decrypt + ^~~~~~~~~~~~ + +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 f410d997..e3f66781 100644 +--- a/src/libgcrypt.c ++++ b/src/libgcrypt.c +@@ -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, +- void *out, unsigned long len) { ++ void *out, size_t len) { + gcry_cipher_encrypt(cipher->key[0], out, len, in, len); + } + + static void des3_decrypt(struct ssh_cipher_struct *cipher, void *in, +- void *out, unsigned long len) { ++ void *out, size_t len) { + gcry_cipher_decrypt(cipher->key[0], out, len, in, len); + } + diff --git a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch new file mode 100644 index 0000000000..d6bc75c3a6 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch @@ -0,0 +1,36 @@ +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 + +It will search ssh/sshd commands on host when configure. Since they are +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 f5c30061..885c926a 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES + + add_subdirectory(unittests) + ++if (CLIENT_TESTING OR SERVER_TESTING) + # OpenSSH Capabilities are required for all unit tests + find_program(SSH_EXECUTABLE NAMES ssh) + if (SSH_EXECUTABLE) +@@ -302,6 +303,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) + + message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") + endif () ++endif () + + configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) + diff --git a/meta-oe/recipes-support/libssh/libssh/run-ptest b/meta-oe/recipes-support/libssh/libssh/run-ptest new file mode 100644 index 0000000000..6346b72d50 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +tests=$(find * -type f -name 'torture_*') + +for f in $tests +do + if test -x ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + fi +done diff --git a/meta-oe/recipes-support/libssh/libssh_0.10.6.bb b/meta-oe/recipes-support/libssh/libssh_0.10.6.bb new file mode 100644 index 0000000000..31f29c1b7d --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh_0.10.6.bb @@ -0,0 +1,48 @@ +SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol" +HOMEPAGE = "http://www.libssh.org" +SECTION = "libs" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" + +DEPENDS = "zlib openssl" + +SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10 \ + file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \ + file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ + file://run-ptest \ + " +SRCREV = "10e09e273f69e149389b3e0e5d44b8c221c2e7f6" + +S = "${WORKDIR}/git" + +inherit cmake ptest + +PACKAGECONFIG ??= "gcrypt ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, " +PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, " +PACKAGECONFIG[tests] = "-DUNIT_TESTING=1, -DUNIT_TESTING=0, cmocka" + +ARM_INSTRUCTION_SET:armv5 = "arm" + +EXTRA_OECMAKE = " \ + -DWITH_PCAP=1 \ + -DWITH_SFTP=1 \ + -DWITH_ZLIB=1 \ + -DWITH_EXAMPLES=0 \ + " + +do_compile:prepend () { + if [ ${PTEST_ENABLED} = "1" ]; then + sed -i -e 's|${B}|${PTEST_PATH}|g' ${B}/config.h + sed -i -e 's|${S}|${PTEST_PATH}|g' ${B}/config.h + fi +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + cp -f ${B}/tests/unittests/torture_* ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests/unittests + cp -f ${S}/tests/unittests/hello*.sh ${D}${PTEST_PATH}/tests/unittests/ +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb b/meta-oe/recipes-support/libssh/libssh_0.8.9.bb deleted file mode 100644 index 39ed8a8fbb..0000000000 --- a/meta-oe/recipes-support/libssh/libssh_0.8.9.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol" -HOMEPAGE = "http://www.libssh.org" -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" - -DEPENDS = "zlib openssl libgcrypt" - -SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=stable-0.8" -SRCREV = "04685a74df9ce1db1bc116a83a0da78b4f4fa1f8" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ??="" -PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, " - -ARM_INSTRUCTION_SET_armv5 = "arm" - -EXTRA_OECMAKE = " \ - -DWITH_GCRYPT=1 \ - -DWITH_PCAP=1 \ - -DWITH_SFTP=1 \ - -DWITH_ZLIB=1 \ - -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ - " - -do_configure_prepend () { - # Disable building of examples - sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \ - || bbfatal "Failed to disable examples" -} - -TOOLCHAIN = "gcc" diff --git a/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch b/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch deleted file mode 100644 index 001080072b..0000000000 --- a/meta-oe/recipes-support/libssh2/files/CVE-2019-17498.patch +++ /dev/null @@ -1,131 +0,0 @@ -From dedcbd106f8e52d5586b0205bc7677e4c9868f9c Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Fri, 30 Aug 2019 09:57:38 -0700 -Subject: [PATCH] packet.c: improve message parsing (#402) - -* packet.c: improve parsing of packets - -file: packet.c - -notes: -Use _libssh2_get_string API in SSH_MSG_DEBUG/SSH_MSG_DISCONNECT. Additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST. - -Upstream-Status: Backport -CVE: CVE-2019-17498 -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - src/packet.c | 68 ++++++++++++++++++++++------------------------------ - 1 file changed, 29 insertions(+), 39 deletions(-) - -diff --git a/src/packet.c b/src/packet.c -index 38ab629..2e01bfc 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - size_t datalen, int macstate) - { - int rc = 0; -- char *message = NULL; -- char *language = NULL; -+ unsigned char *message = NULL; -+ unsigned char *language = NULL; - size_t message_len = 0; - size_t language_len = 0; - LIBSSH2_CHANNEL *channelp = NULL; -@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - - case SSH_MSG_DISCONNECT: - if(datalen >= 5) { -- size_t reason = _libssh2_ntohu32(data + 1); -+ uint32_t reason = 0; -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr++; /* advance past type */ - -- if(datalen >= 9) { -- message_len = _libssh2_ntohu32(data + 5); -+ _libssh2_get_u32(&buf, &reason); -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - -- if(message_len < datalen-13) { -- /* 9 = packet_type(1) + reason(4) + message_len(4) */ -- message = (char *) data + 9; -- -- language_len = -- _libssh2_ntohu32(data + 9 + message_len); -- language = (char *) data + 9 + message_len + 4; -- -- if(language_len > (datalen-13-message_len)) { -- /* bad input, clear info */ -- language = message = NULL; -- language_len = message_len = 0; -- } -- } -- else -- /* bad size, clear it */ -- message_len = 0; -- } - if(session->ssh_msg_disconnect) { -- LIBSSH2_DISCONNECT(session, reason, message, -- message_len, language, language_len); -+ LIBSSH2_DISCONNECT(session, reason, (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } -+ - _libssh2_debug(session, LIBSSH2_TRACE_TRANS, - "Disconnect(%d): %s(%s)", reason, - message, language); -@@ -539,24 +529,24 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - int always_display = data[1]; - - if(datalen >= 6) { -- message_len = _libssh2_ntohu32(data + 2); -- -- if(message_len <= (datalen - 10)) { -- /* 6 = packet_type(1) + display(1) + message_len(4) */ -- message = (char *) data + 6; -- language_len = _libssh2_ntohu32(data + 6 + -- message_len); -- -- if(language_len <= (datalen - 10 - message_len)) -- language = (char *) data + 10 + message_len; -- } -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr += 2; /* advance past type & always display */ -+ -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - } - - if(session->ssh_msg_debug) { -- LIBSSH2_DEBUG(session, always_display, message, -- message_len, language, language_len); -+ LIBSSH2_DEBUG(session, always_display, -+ (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } - } -+ - /* - * _libssh2_debug will actually truncate this for us so - * that it's not an inordinate about of data -@@ -579,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - uint32_t len = 0; - unsigned char want_reply = 0; - len = _libssh2_ntohu32(data + 1); -- if(datalen >= (6 + len)) { -+ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { - want_reply = data[5 + len]; - _libssh2_debug(session, - LIBSSH2_TRACE_CONN, --- -2.17.1 - diff --git a/meta-oe/recipes-support/libssh2/files/run-ptest b/meta-oe/recipes-support/libssh2/files/run-ptest deleted file mode 100644 index 2a7922f1aa..0000000000 --- a/meta-oe/recipes-support/libssh2/files/run-ptest +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -ptestdir=$(dirname "$(readlink -f "$0")") -for test in $(ls $ptestdir/tests) -do - ./test-driver --test-name $test --log-file $test.log --trs-file $test.trs --color-tests no --enable-hard-errors yes --expect-failure no -- ./tests/$test -done diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb b/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb deleted file mode 100644 index a1d85617a6..0000000000 --- a/meta-oe/recipes-support/libssh2/libssh2_1.9.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "A client-side C library implementing the SSH2 protocol" -HOMEPAGE = "http://www.libssh2.org/" -SECTION = "libs" - -DEPENDS = "zlib" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca" - -SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ - file://CVE-2019-17498.patch \ - file://run-ptest \ -" -SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" -SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" - -inherit autotools pkgconfig ptest - -EXTRA_OECONF += "\ - --with-libz \ - --with-libz-prefix=${STAGING_LIBDIR} \ - " - -# only one of openssl and gcrypt could be set -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[openssl] = "--with-crypto=openssl --with-libssl-prefix=${STAGING_LIBDIR}, , openssl" -PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR}, , libgcrypt" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS_${PN}-ptest = "bash" - -do_compile_ptest() { - sed -i "/\$(MAKE) \$(AM_MAKEFLAGS) check-TESTS/d" tests/Makefile - oe_runmake check -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/tests/.libs/simple ${D}${PTEST_PATH}/tests/ - install -m 0755 ${S}/tests/mansyntax.sh ${D}${PTEST_PATH}/tests/ - install -m 0755 ${S}/test-driver ${D}${PTEST_PATH}/ -} diff --git a/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch new file mode 100644 index 0000000000..2529d5d9d1 --- /dev/null +++ b/meta-oe/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch @@ -0,0 +1,57 @@ +From eacc9e9c62a3857ce1e2e24b81fc22d8ae91f422 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 9 May 2019 22:06:48 +0200 +Subject: [PATCH] Build so-lib +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Stolen from [1] + +[1] https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/snowball/trunk/dynamiclib.diff + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + GNUmakefile | 7 +++++-- + libstemmer/symbol.map | 6 ++++++ + 2 files changed, 11 insertions(+), 2 deletions(-) + create mode 100644 libstemmer/symbol.map + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -170,12 +170,12 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=. + JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) + JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) + +-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations ++CFLAGS=-O2 -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations + CPPFLAGS= + + INCLUDES=-Iinclude + +-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) ++all: snowball$(EXEEXT) libstemmer.a libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) + + algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt + libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt +@@ -225,6 +225,9 @@ libstemmer/libstemmer.o: libstemmer/modu + libstemmer.a: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + $(AR) -cru $@ $^ + ++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ ++ + examples/%.o: examples/%.c + $(CC) $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -c -o $@ $< + +--- /dev/null ++++ b/libstemmer/symbol.map +@@ -0,0 +1,6 @@ ++SB_STEMMER_0 { ++ global: ++ sb_stemmer_*; ++ local: ++ *; ++}; diff --git a/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb new file mode 100644 index 0000000000..be2935a385 --- /dev/null +++ b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Snowball compiler and stemming algorithms" +HOMEPAGE = "https://snowballstem.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=19139aaf3c8c8fa1ca6edd59c072fb9f" + +DEPENDS:append:class-target = " ${BPN}-native" + +SRC_URI = "git://github.com/snowballstem/snowball.git;branch=master;protocol=https \ + file://0001-Build-so-lib.patch \ + " +SRCREV = "48a67a2831005f49c48ec29a5837640e23e54e6b" +S = "${WORKDIR}/git" + +LIBVER = "0.0.0" + +inherit lib_package + +do_compile:prepend:class-target() { + # use native tools + sed -i 's:./snowball :snowball :g' ${S}/GNUmakefile +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${S}/snowball ${D}${bindir} + install -m 755 ${S}/stemwords ${D}${bindir} + + install -d ${D}${libdir} + install -m 755 ${S}/libstemmer.so.${LIBVER} ${D}${libdir}/ + ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so.0 + ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so + + install -d ${D}${includedir} + install -m 644 ${S}/include/*.h ${D}${includedir} +} + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch b/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch index 31c0d29e93..4929eece06 100644 --- a/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch +++ b/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch @@ -4,6 +4,8 @@ Date: Wed, 2 Nov 2016 05:43:43 -0400 Subject: [PATCH] Do not strip libtar. --- +Upstream-Status: Pending + libtar/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch b/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch index 178a970299..efde754be7 100644 --- a/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch +++ b/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch @@ -1,4 +1,6 @@ --- +Upstream-Status: Pending + configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch index a4a17ed85b..f0bd53ee8e 100644 --- a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch +++ b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch @@ -8,6 +8,8 @@ teamnl.c:160:2: error: unknown type name 'fd_set'; did you mean 'fpos_t'? Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + utils/teamnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch new file mode 100644 index 0000000000..96891c9ea7 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-check-the-return-value.patch @@ -0,0 +1,34 @@ +From e86a58271d7d0a3b9cd546251d2527e93898bdb8 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Tue, 21 Dec 2021 11:15:31 +0800 +Subject: [PATCH] team_basic_test.py: check the return value + +Not only print the traceback like before, also check the +return value. + +Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/63] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + scripts/team_basic_test.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index 0b64af2..17588c7 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -203,4 +203,10 @@ def main(): + btest.run() + + if __name__ == "__main__": +- main() ++ try: ++ ret = main() ++ except Exception as esc: ++ ret = 1 ++ import traceback ++ traceback.print_exc() ++ sys.exit(ret) +-- +2.17.1 + diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch new file mode 100644 index 0000000000..69276aba91 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-switch-to-python3.patch @@ -0,0 +1,101 @@ +From 06050e79655f0fa7d9daeda1fbd3a9a2c7736841 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 2 Dec 2021 15:08:25 +0800 +Subject: [PATCH] team_basic_test.py: switch to python3 + +Switch the script team_basic_test.py to python3 + +Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/63] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + scripts/team_basic_test.py | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index faabd18..0b64af2 100755 +--- a/scripts/team_basic_test.py ++++ b/scripts/team_basic_test.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + """ + Basic test. + +@@ -32,11 +32,11 @@ def usage(): + """ + Print usage of this app + """ +- print "Usage: team_basic_test.py [OPTION...]" +- print "" +- print " -h, --help print this message" +- print " -c, --loop-count=NUMBER number of loops (default 1)" +- print " -p, --port=NETDEV port device (can be defined multiple times)" ++ print("Usage: team_basic_test.py [OPTION...]") ++ print("") ++ print(" -h, --help print this message") ++ print(" -c, --loop-count=NUMBER number of loops (default 1)") ++ print(" -p, --port=NETDEV port device (can be defined multiple times)") + sys.exit() + + class CmdExecFailedException(Exception): +@@ -55,15 +55,15 @@ class CmdExecUnexpectedOutputException(Exception): + return "Command execution output unexpected: \"%s\" != \"%s\"" % (self.__output, self.__expected_output) + + def print_output(out_type, string): +- print("%s:\n" ++ print(("%s:\n" + "----------------------------\n" + "%s" +- "----------------------------" % (out_type, string)) ++ "----------------------------" % (out_type, string))) + + def cmd_exec(cmd, expected_output=None, cleaner=False): + cmd = cmd.rstrip(" ") + if not cleaner: +- print("# \"%s\"" % cmd) ++ print(("# \"%s\"" % cmd)) + subp = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + (data_stdout, data_stderr) = subp.communicate() +@@ -74,7 +74,7 @@ def cmd_exec(cmd, expected_output=None, cleaner=False): + if data_stderr: + print_output("Stderr", data_stderr) + raise CmdExecFailedException(subp.returncode) +- output = data_stdout.rstrip() ++ output = (data_stdout.rstrip()).decode() + if expected_output: + if output != expected_output: + raise CmdExecUnexpectedOutputException(output, expected_output) +@@ -166,7 +166,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + os.removedirs("/tmp/team_test/") + + def _run_one_loop(self, run_nr): +- print "RUN #%d" % (run_nr) ++ print("RUN #%d" % (run_nr)) + self._created_teams = [] + try: + for mode_name in self._team_modes: +@@ -176,7 +176,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + cmd_exec("modprobe -r team_mode_loadbalance team_mode_roundrobin team_mode_activebackup team_mode_broadcast team"); + + def run(self): +- for i in xrange(self._loop_count): ++ for i in range(self._loop_count): + self._run_one_loop(i + 1) + + def main(): +@@ -186,8 +186,8 @@ def main(): + "hc:p:", + ["help", "loop-count=", "port="] + ) +- except getopt.GetoptError, err: +- print str(err) ++ except getopt.GetoptError as err: ++ print(str(err)) + usage() + + btest = TeamBasicTest() +-- +2.17.1 + diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-use-python3-interpreter.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-use-python3-interpreter.patch deleted file mode 100644 index e27e4f3291..0000000000 --- a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-use-python3-interpreter.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 571c141b434dff13494c6a3afe621f63a8e610e9 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Mon, 27 Jan 2020 14:29:34 +0000 -Subject: [PATCH] team_basic_test.py: use python3 interpreter - -Use python3 since python2 is EOL and has been removed from several -distributions. - -Upstream-Status: Pending - -Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> ---- - scripts/team_basic_test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py -index b05be9e..ad980e8 100755 ---- a/scripts/team_basic_test.py -+++ b/scripts/team_basic_test.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python3 - """ - Basic test. - --- -2.17.1 - diff --git a/meta-oe/recipes-support/libteam/libteam/0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch new file mode 100644 index 0000000000..5f8e56177e --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch @@ -0,0 +1,46 @@ +From 49693cac37ee35ff673240c8060201efe0d999c2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Aug 2022 22:27:03 -0700 +Subject: [PATCH] teamd: Include missing headers for strrchr and memcmp + +Compiler does not see the prototype for these functions otherwise and +build fails e.g. + +| ../../git/teamd/teamd_phys_port_check.c:52:10: error: call to undeclared library function 'strrchr' with type 'char *(const char *, int)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] +| start = strrchr(link, '/'); +| ^ + +Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/68] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + teamd/teamd_phys_port_check.c | 1 + + teamd/teamd_runner_loadbalance.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/teamd/teamd_phys_port_check.c b/teamd/teamd_phys_port_check.c +index 1eec129..c2454ab 100644 +--- a/teamd/teamd_phys_port_check.c ++++ b/teamd/teamd_phys_port_check.c +@@ -19,6 +19,7 @@ + + #include <stdio.h> + #include <errno.h> ++#include <string.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> +diff --git a/teamd/teamd_runner_loadbalance.c b/teamd/teamd_runner_loadbalance.c +index a581472..421a7c6 100644 +--- a/teamd/teamd_runner_loadbalance.c ++++ b/teamd/teamd_runner_loadbalance.c +@@ -17,6 +17,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include <string.h> + #include <sys/socket.h> + #include <linux/netdevice.h> + #include <team.h> +-- +2.37.2 + diff --git a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch index beabf63ca3..ed877a721e 100644 --- a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch +++ b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch @@ -12,6 +12,8 @@ tinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + teamd/teamd_runner_lacp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/libteam/libteam/run-ptest b/meta-oe/recipes-support/libteam/libteam/run-ptest index b5c6f4ebb9..26f097d587 100644 --- a/meta-oe/recipes-support/libteam/libteam/run-ptest +++ b/meta-oe/recipes-support/libteam/libteam/run-ptest @@ -1,3 +1,8 @@ #!/bin/sh python3 $(dirname $0)/team_basic_test.py +if [ $? -eq 0 ] ; then + echo "PASS: libteam" +else + echo "FAIL: libteam" +fi diff --git a/meta-oe/recipes-support/libteam/libteam_1.31.bb b/meta-oe/recipes-support/libteam/libteam_1.31.bb index 149cfb8d23..6fe10abe01 100644 --- a/meta-oe/recipes-support/libteam/libteam_1.31.bb +++ b/meta-oe/recipes-support/libteam/libteam_1.31.bb @@ -2,16 +2,18 @@ SUMMARY = "Library for controlling team network device" HOMEPAGE = "http://www.libteam.org/" SECTION = "libs/network" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libnl libdaemon jansson" -SRC_URI = "git://github.com/jpirko/libteam \ +SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \ file://0001-include-sys-select.h-for-fd_set-definition.patch \ file://0002-teamd-Re-adjust-include-header-order.patch \ file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ - file://0001-team_basic_test.py-use-python3-interpreter.patch \ + file://0001-team_basic_test.py-switch-to-python3.patch \ + file://0001-team_basic_test.py-check-the-return-value.patch \ + file://0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch \ file://run-ptest \ " SRCREV = "3ee12c6d569977cf1cd30d0da77807a07aa77158" @@ -20,20 +22,26 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig ptest -FILES_${PN} = "${libdir}/libteam${SOLIBS} \ +FILES:${PN} = "${libdir}/libteam${SOLIBS} \ " PACKAGES += "${PN}-dctl ${PN}-utils" -FILES_${PN}-dctl = "${libdir}/libteamdctl${SOLIBS} \ +FILES:${PN}-dctl = "${libdir}/libteamdctl${SOLIBS} \ " -FILES_${PN}-utils = "${bindir}/bond2team \ +FILES:${PN}-utils = "${bindir}/bond2team \ ${bindir}/teamd \ ${bindir}/teamdctl \ ${bindir}/teamnl \ " -RDEPENDS_${PN}-utils = "bash" -RDEPENDS_${PN}-ptest = "python3-core" +RDEPENDS:${PN}-utils = "bash" +RDEPENDS:${PN}-ptest = "python3-core libteam-utils" +# Ensure kernel has these mods enabled features/net/team/team.scc +RRECOMMENDS:${PN} += "kernel-module-team kernel-module-team-mode-activebackup \ + kernel-module-team-mode-broadcast \ + kernel-module-team-mode-loadbalance \ + kernel-module-team-mode-random \ + kernel-module-team-mode-roundrobin" do_install_ptest() { install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/ diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb index 138df9f300..6fbdd071e8 100644 --- a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb +++ b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb @@ -6,7 +6,6 @@ LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://readme.txt;md5=f8f366f3370dda889f60faa7db162cf4" SECTION = "libs" -PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/tinyxml/tinyxml_${@'${PV}'.replace('.', '_')}.tar.gz \ file://enforce-use-stl.patch \ diff --git a/meta-oe/recipes-support/libtinyxml2/files/run-ptest b/meta-oe/recipes-support/libtinyxml2/files/run-ptest new file mode 100644 index 0000000000..870912672e --- /dev/null +++ b/meta-oe/recipes-support/libtinyxml2/files/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh + +for i in `ls xmltest`; do + ./$i + if [ $? -eq 0 ]; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb new file mode 100644 index 0000000000..bcd309282b --- /dev/null +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" +HOMEPAGE = "https://leethomason.github.io/tinyxml2" +SECTION = "libs" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" + +SRCREV = "321ea883b7190d4e85cae5512a12e5eaa8f8731f" +SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \ + file://run-ptest" + +S = "${WORKDIR}/git" + +inherit meson ptest + +EXTRA_OEMESON += " \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true', '', d)} \ + -Ddefault_library=both \ +" + +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 + for f in ${S}/resources/*.xml; do + install -m 0644 $f ${D}${PTEST_PATH}/resources/ + done +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb deleted file mode 100644 index a2491cf9e6..0000000000 --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" -HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" - -SRC_URI = "git://github.com/leethomason/tinyxml2.git" - -SRCREV = "bf15233ad88390461f6ab0dbcf046cce643c5fcb" - -S = "${WORKDIR}/git" - -inherit cmake - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb b/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb new file mode 100644 index 0000000000..4d6c06240d --- /dev/null +++ b/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "LibTomMath is a number theoretic multiple-precision integer library" +HOMEPAGE = "https://www.libtom.net/LibTomMath" +SECTION = "libs" +LICENSE = "Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=23e7e0a32e53a2b1d35f5fd9ef053402" + +DEPENDS = "libtool-cross" + +SRC_URI = "git://github.com/libtom/libtommath.git;protocol=https;branch=master" + +SRCREV = "95d80fd8229d05dd6cb4ec88bc8d4f5377ff00ef" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' 'CFLAGS=${CFLAGS}'" + +do_compile() { + oe_runmake -f makefile.shared +} + +do_install() { + oe_runmake -f makefile.shared install +} diff --git a/meta-oe/recipes-support/liburing/liburing_0.7.bb b/meta-oe/recipes-support/liburing/liburing_2.5.bb index 3a1eaef873..440259ffbd 100644 --- a/meta-oe/recipes-support/liburing/liburing_0.7.bb +++ b/meta-oe/recipes-support/liburing/liburing_2.5.bb @@ -6,19 +6,24 @@ HOMEPAGE = "https://github.com/axboe/liburing" BUGTRACKER = "https://github.com/axboe/liburing/issues" SECTION = "libs" -LICENSE = "LGPLv2.1 | MIT" -LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=d51b5805e2a675685e6a66ca50904cf9" +LICENSE = "LGPL-2.1-only | MIT" +LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" -SRCREV = "45f0735219a615ae848033c47c7e2d85d101d43e" +SRCREV = "f4e42a515cd78c8c9cac2be14222834be5f8df2b" + S = "${WORKDIR}/git" -DEPENDS_append_libc-musl = " libucontext" +DEPENDS:append:libc-musl = " libucontext" XCFLAGS = "-pthread" -XCFLAGS_append_libc-musl = " -lucontext" +XCFLAGS:append:libc-musl = " -lucontext" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" - +do_configure() { + ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} +} do_install () { - oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir} + oe_runmake install DESTDIR=${D} } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch index f4f759c85e..7df44737ad 100644 --- a/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch +++ b/meta-oe/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch @@ -8,21 +8,23 @@ We need the definitions for things like u_intX_t Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> - --- libusb/usb.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libusb/usb.h b/libusb/usb.h -index fa0e6c6..4e88eb8 100644 +index ea62543..18b610a 100644 --- a/libusb/usb.h +++ b/libusb/usb.h -@@ -45,6 +45,8 @@ typedef unsigned __int32 uint32_t; +@@ -46,6 +46,8 @@ typedef unsigned __int32 uint32_t; #include <stdint.h> #endif +#include <sys/types.h> + - /* - * USB spec information - * + /* On linux PATH_MAX is defined in linux/limits.h. */ + #if defined(__linux__) + #include <linux/limits.h> +-- +2.34.1 + diff --git a/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch b/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch new file mode 100644 index 0000000000..faf532cad2 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat/0002-automake-make-example-programs-installable.patch @@ -0,0 +1,24 @@ +From 9dcdfa716e3c3831d9b70472b39dab2fd370f503 Mon Sep 17 00:00:00 2001 +From: Yoann Congal <yoann.congal@smile.fr> +Date: Sun, 26 Feb 2023 16:04:35 +0100 +Subject: [PATCH] automake: make example programs installable + +The example programs are used as tests for ptest, so we need a way to +install them on the rootfs. + +Upstream-Status: Inappropriate [oe-core specific] +--- + examples/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 9bd3efc..f4324c2 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,5 +1,5 @@ + AM_CPPFLAGS = -I$(top_srcdir)/libusb +-noinst_PROGRAMS = lsusb testlibusb ++bin_PROGRAMS = lsusb testlibusb + + lsusb_SOURCES = lsusb.c + lsusb_LDADD = ../libusb/libusb.la diff --git a/meta-oe/recipes-support/libusb/libusb-compat/run-ptest b/meta-oe/recipes-support/libusb/libusb-compat/run-ptest new file mode 100644 index 0000000000..901662d696 --- /dev/null +++ b/meta-oe/recipes-support/libusb/libusb-compat/run-ptest @@ -0,0 +1,14 @@ +#!/bin/sh + +rc=0 +for TEST in lsusb testlibusb; do + if ! ./$TEST ; then + echo "FAIL: $TEST" + rc=$((rc + 1)) + else + echo "PASS: $TEST" + fi +done + +# return number of failed tests +exit $rc diff --git a/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb index 21fa478b6e..57f1f54387 100644 --- a/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb +++ b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb @@ -5,10 +5,13 @@ HOMEPAGE = "http://www.libusb.org/" BUGTRACKER = "http://www.libusb.org/report" SECTION = "libs" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" DEPENDS = "libusb1" +# libusb-compat dlopen() libusb1 so we need to explicitly RDEPENDS on it +RDEPENDS:${PN} += "libusb1" + # Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0), # so here libusb-0.1 is removed completely instead of adding virtual/libusb0. # Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power @@ -19,23 +22,26 @@ BBCLASSEXTEND = "native nativesdk" PE = "1" SRC_URI = " \ - git://github.com/libusb/libusb-compat-0.1.git;protocol=https \ + git://github.com/libusb/libusb-compat-0.1.git;protocol=https;branch=master \ file://0001-usb.h-Include-sys-types.h.patch \ + file://0002-automake-make-example-programs-installable.patch \ + file://run-ptest \ " -SRCREV = "4a27760ec5954ec8605e052a3207afbe0979eeef" +SRCREV = "c497eff1ae8c4cfd4fdff370f04c78fa0584f4f3" S = "${WORKDIR}/git" UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases" BINCONFIG = "${bindir}/libusb-config" -inherit autotools pkgconfig binconfig-disabled lib_package +inherit autotools pkgconfig binconfig-disabled lib_package ptest -EXTRA_OECONF = "--libdir=${base_libdir}" +# examples are used as ptest so enable them at configuration if needed +EXTRA_OECONF += "${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-examples-build', '', d)}" -do_install_append() { - install -d ${D}${libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} - fi +# Move test binaries out of bindir to avoid clashing with a "real" lsusb. +do_install_ptest() { + for bin in lsusb testlibusb; do + mv ${D}${bindir}/$bin ${D}${PTEST_PATH} + done } diff --git a/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch b/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch index 6be49fbca4..16506999e2 100644 --- a/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch +++ b/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch @@ -7,7 +7,7 @@ The include flag should point to the source directory, not the build directory. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Upstream-status: Submitted [https://github.com/libusbg/libusbg/pull/9] +Upstream-Status: Submitted [https://github.com/libusbg/libusbg/pull/9] --- examples/Makefile.am | 2 +- src/Makefile.am | 2 +- diff --git a/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-oe/recipes-support/libusbg/libusbg_git.bb index b1c4663525..716d9c4ce4 100644 --- a/meta-oe/recipes-support/libusbg/libusbg_git.bb +++ b/meta-oe/recipes-support/libusbg/libusbg_git.bb @@ -1,6 +1,6 @@ SUMMARY = "USB Gadget Configfs Library" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" @@ -8,12 +8,12 @@ inherit autotools update-alternatives PV = "0.1.0" SRCREV = "a826d136e0e8fa53815f1ba05893e6dd74208c15" -SRC_URI = "git://github.com/libusbg/libusbg.git \ +SRC_URI = "git://github.com/libusbg/libusbg.git;branch=master;protocol=https \ file://0001-Fix-out-of-tree-builds.patch \ " S = "${WORKDIR}/git" -ALTERNATIVE_${PN} = "gadget-acm-ecm show-gadgets" +ALTERNATIVE:${PN} = "gadget-acm-ecm show-gadgets" ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm" ALTERNATIVE_LINK_NAME[show-gadgets] = "${bindir}/show-gadgets" diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch b/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch new file mode 100644 index 0000000000..24a2760d11 --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch @@ -0,0 +1,796 @@ +From 421b366cafdf954b7e1cd2bbb78b55e04d73c082 Mon Sep 17 00:00:00 2001 +From: Wlodzimierz Lipert <wlodzimierz.lipert@gmail.com> +Date: Mon, 28 Nov 2022 08:29:54 +0100 +Subject: [PATCH] fix: stack-buffer-overflow in usbg_f_foo_attr_val processing. + Changed ABI version from 2 to 3. + +Upstream-Status: Submitted [https://github.com/linux-usb-gadgets/libusbgx/pull/72] + +Signed-off-by: Wlodzimierz Lipert <wlodzimierz.lipert@gmail.com> +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + include/usbg/function/hid.h | 28 ++++++++++++---------------- + include/usbg/function/midi.h | 35 +++++++++++++---------------------- + include/usbg/function/ms.h | 30 +++++++++++------------------- + include/usbg/function/net.h | 34 ++++++++++++++-------------------- + include/usbg/function/uac2.h | 29 +++++++++++++---------------- + include/usbg/usbg_internal.h | 10 +++++----- + src/Makefile.am | 2 +- + src/function/ether.c | 10 +++++----- + src/function/hid.c | 12 ++++++------ + src/function/midi.c | 10 +++++----- + src/function/ms.c | 10 +++++----- + src/function/uac2.c | 10 +++++----- + src/function/uvc.c | 10 +++++----- + src/usbg_common.c | 2 +- + 14 files changed, 101 insertions(+), 131 deletions(-) + +diff --git a/include/usbg/function/hid.h b/include/usbg/function/hid.h +index 3463140..3b3907b 100644 +--- a/include/usbg/function/hid.h ++++ b/include/usbg/function/hid.h +@@ -56,11 +56,6 @@ union usbg_f_hid_attr_val { + unsigned int subclass; + }; + +-#define USBG_F_HID_UINT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_hid_attr_val, protocol, WHAT) +- +-#define USBG_F_HID_RDESC_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_hid_attr_val, report_desc, WHAT) + /** + * @brief Cast from generic function to hid function + * @param[in] f function to be converted to hid funciton. +@@ -137,7 +132,7 @@ int usbg_f_hid_get_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_hid_set_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, +- union usbg_f_hid_attr_val val); ++ const union usbg_f_hid_attr_val *val); + + /** + * @brief Get the minor and major of corresponding character device +@@ -173,8 +168,9 @@ static inline int usbg_f_hid_get_protocol(usbg_f_hid *hf, + static inline int usbg_f_hid_set_protocol(usbg_f_hid *hf, + unsigned int protocol) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_PROTOCOL, +- USBG_F_HID_UINT_TO_ATTR_VAL(protocol)); ++ ++ union usbg_f_hid_attr_val val = {.protocol = protocol}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_PROTOCOL, &val); + } + + /** +@@ -199,8 +195,8 @@ static inline int usbg_f_hid_get_report_desc(usbg_f_hid *hf, + static inline int usbg_f_hid_set_report_desc(usbg_f_hid *hf, + struct usbg_f_hid_report_desc report_desc) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, +- USBG_F_HID_RDESC_TO_ATTR_VAL(report_desc)); ++ union usbg_f_hid_attr_val val = {.report_desc = report_desc}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, &val); + } + + /** +@@ -242,8 +238,8 @@ static inline int usbg_f_hid_set_report_desc_raw(usbg_f_hid *hf, + .len = len, + }; + +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, +- USBG_F_HID_RDESC_TO_ATTR_VAL(report_desc)); ++ union usbg_f_hid_attr_val val = {.report_desc = report_desc}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_DESC, &val); + } + + /** +@@ -268,8 +264,8 @@ static inline int usbg_f_hid_get_report_length(usbg_f_hid *hf, + static inline int usbg_f_hid_set_report_length(usbg_f_hid *hf, + unsigned int report_length) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_LENGTH, +- USBG_F_HID_UINT_TO_ATTR_VAL(report_length)); ++ union usbg_f_hid_attr_val val = {.report_length = report_length}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_REPORT_LENGTH, &val); + } + + /** +@@ -294,8 +290,8 @@ static inline int usbg_f_hid_get_subclass(usbg_f_hid *hf, + static inline int usbg_f_hid_set_subclass(usbg_f_hid *hf, + unsigned int subclass) + { +- return usbg_f_hid_set_attr_val(hf, USBG_F_HID_SUBCLASS, +- USBG_F_HID_UINT_TO_ATTR_VAL(subclass)); ++ union usbg_f_hid_attr_val val = {.subclass = subclass}; ++ return usbg_f_hid_set_attr_val(hf, USBG_F_HID_SUBCLASS, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/midi.h b/include/usbg/function/midi.h +index 39df047..b9d9d4f 100644 +--- a/include/usbg/function/midi.h ++++ b/include/usbg/function/midi.h +@@ -53,15 +53,6 @@ union usbg_f_midi_attr_val { + unsigned int qlen; + }; + +-#define USBG_F_MIDI_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, index, WHAT) +- +-#define USBG_F_MIDI_UINT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, qlen, WHAT) +- +-#define USBG_F_MIDI_CCHAR_PTR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_midi_attr_val, id, WHAT) +- + /** + * @brief Cast from generic function to midi function + * @param[in] f function to be converted to midi funciton. +@@ -126,7 +117,7 @@ int usbg_f_midi_get_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_midi_set_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, +- union usbg_f_midi_attr_val val); ++ const union usbg_f_midi_attr_val *val); + + /** + * @brief Get the index value of MIDI adapter +@@ -148,8 +139,8 @@ static inline int usbg_f_midi_get_index(usbg_f_midi *mf, int *index) + */ + static inline int usbg_f_midi_set_index(usbg_f_midi *mf, int index) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_INDEX, +- USBG_F_MIDI_INT_TO_ATTR_VAL(index)); ++ union usbg_f_midi_attr_val val = {.index = index}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_INDEX, &val); + } + + /** +@@ -188,8 +179,8 @@ int usbg_f_midi_get_id_s(usbg_f_midi *mf, char *buf, int len); + */ + static inline int usbg_f_midi_set_id(usbg_f_midi *mf, const char *id) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_ID, +- USBG_F_MIDI_CCHAR_PTR_TO_ATTR_VAL(id)); ++ union usbg_f_midi_attr_val val = {.id = id}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_ID, &val); + } + + /** +@@ -212,8 +203,8 @@ static inline int usbg_f_midi_get_in_ports(usbg_f_midi *mf, unsigned *in_ports) + */ + static inline int usbg_f_midi_set_in_ports(usbg_f_midi *mf, unsigned in_ports) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_IN_PORTS, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(in_ports)); ++ union usbg_f_midi_attr_val val = {.in_ports = in_ports}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_IN_PORTS, &val); + } + + /** +@@ -236,8 +227,8 @@ static inline int usbg_f_midi_get_out_ports(usbg_f_midi *mf, unsigned *out_ports + */ + static inline int usbg_f_midi_set_out_ports(usbg_f_midi *mf, unsigned out_ports) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_OUT_PORTS, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(out_ports)); ++ union usbg_f_midi_attr_val val = {.out_ports = out_ports}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_OUT_PORTS, &val); + } + + /** +@@ -264,8 +255,8 @@ static inline int usbg_f_midi_get_buflen(usbg_f_midi *mf, int *buflen) + */ + static inline int usbg_f_midi_set_buflen(usbg_f_midi *mf, unsigned buflen) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_BUFLEN, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(buflen)); ++ union usbg_f_midi_attr_val val = {.buflen = buflen}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_BUFLEN, &val); + } + + /** +@@ -288,8 +279,8 @@ static inline int usbg_f_midi_get_qlen(usbg_f_midi *mf, unsigned *qlen) + */ + static inline int usbg_f_midi_set_qlen(usbg_f_midi *mf, unsigned qlen) + { +- return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_QLEN, +- USBG_F_MIDI_UINT_TO_ATTR_VAL(qlen)); ++ union usbg_f_midi_attr_val val = {.qlen = qlen}; ++ return usbg_f_midi_set_attr_val(mf, USBG_F_MIDI_QLEN, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/ms.h b/include/usbg/function/ms.h +index 780464c..f52eb78 100644 +--- a/include/usbg/function/ms.h ++++ b/include/usbg/function/ms.h +@@ -56,14 +56,6 @@ union usbg_f_ms_lun_attr_val { + const char *file; + }; + +-#define USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_ms_lun_attr_val, cdrom, WHAT) +- +-#define USBG_F_MS_LUN_CCHAR_PTR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_ms_lun_attr_val, file, WHAT) +- +- +- + /** + * @brief Cast from generic function to mass storage function + * @param[in] f function to be converted to ms funciton. +@@ -157,7 +149,7 @@ int usbg_f_ms_get_lun_attr_val(usbg_f_ms *mf, int lun_id, + */ + int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + enum usbg_f_ms_lun_attr lattr, +- const union usbg_f_ms_lun_attr_val val); ++ const union usbg_f_ms_lun_attr_val *val); + + /** + * @brief Get the value which determines if lun is visible as a cdrom +@@ -183,8 +175,8 @@ static inline int usbg_f_ms_get_lun_cdrom(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_cdrom(usbg_f_ms *mf, int lun_id, + bool cdrom) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_CDROM, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(cdrom)); ++ union usbg_f_ms_lun_attr_val val = {.cdrom = cdrom}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_CDROM, &val); + } + + /** +@@ -209,8 +201,8 @@ static inline int usbg_f_ms_get_lun_ro(usbg_f_ms *mf, int lun_id, bool *ro) + */ + static inline int usbg_f_ms_set_lun_ro(usbg_f_ms *mf, int lun_id, bool ro) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_RO, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(ro)); ++ union usbg_f_ms_lun_attr_val val = {.ro = ro}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_RO, &val); + } + + /** +@@ -239,8 +231,8 @@ static inline int usbg_f_ms_get_lun_nofua(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_nofua(usbg_f_ms *mf, int lun_id, + bool nofua) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_NOFUA, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(nofua)); ++ union usbg_f_ms_lun_attr_val val = {.nofua = nofua}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_NOFUA, &val); + } + + /** +@@ -267,8 +259,8 @@ static inline int usbg_f_ms_get_lun_removable(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_removable(usbg_f_ms *mf, int lun_id, + bool removable) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_REMOVABLE, +- USBG_F_MS_LUN_BOOL_TO_ATTR_VAL(removable)); ++ union usbg_f_ms_lun_attr_val val = {.removable = removable}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_REMOVABLE, &val); + } + + /** +@@ -313,8 +305,8 @@ int usbg_f_ms_get_lun_file_s(usbg_f_ms *mf, int lun_id, + static inline int usbg_f_ms_set_lun_file(usbg_f_ms *mf, int lun_id, + const char *file) + { +- return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_FILE, +- USBG_F_MS_LUN_CCHAR_PTR_TO_ATTR_VAL(file)); ++ union usbg_f_ms_lun_attr_val val = {.file = file}; ++ return usbg_f_ms_set_lun_attr_val(mf, lun_id, USBG_F_MS_LUN_FILE, &val); + } + + /** +diff --git a/include/usbg/function/net.h b/include/usbg/function/net.h +index b0409f1..06cee30 100644 +--- a/include/usbg/function/net.h ++++ b/include/usbg/function/net.h +@@ -56,12 +56,6 @@ union usbg_f_net_attr_val { + unsigned int protocol; + }; + +-#define USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_net_attr_val, dev_addr, WHAT) +- +-#define USBG_F_NET_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_net_attr_val, qmult, WHAT) +- + /** + * @brief Cast from generic function to net function + * @param[in] f function to be converted to net funciton. +@@ -125,7 +119,7 @@ int usbg_f_net_get_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, +- const union usbg_f_net_attr_val val); ++ const union usbg_f_net_attr_val *val); + + /** + * @brief Get the value of device side MAC address +@@ -136,7 +130,7 @@ int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + static inline int usbg_f_net_get_dev_addr(usbg_f_net *nf, + struct ether_addr *addr) + { +- union usbg_f_net_attr_val val = { .dev_addr = *addr, }; ++ union usbg_f_net_attr_val val = {.dev_addr = *addr}; + return usbg_f_net_get_attr_val(nf, USBG_F_NET_DEV_ADDR, &val); + } + +@@ -149,8 +143,8 @@ static inline int usbg_f_net_get_dev_addr(usbg_f_net *nf, + static inline int usbg_f_net_set_dev_addr(usbg_f_net *nf, + const struct ether_addr *addr) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_DEV_ADDR, +- USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(*addr)); ++ union usbg_f_net_attr_val val = {.dev_addr = *addr}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_DEV_ADDR, &val); + } + + /** +@@ -175,8 +169,8 @@ static inline int usbg_f_net_get_host_addr(usbg_f_net *nf, + static inline int usbg_f_net_set_host_addr(usbg_f_net *nf, + const struct ether_addr *addr) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_HOST_ADDR, +- USBG_F_NET_ETHER_ADDR_TO_ATTR_VAL(*addr)); ++ union usbg_f_net_attr_val val = {.host_addr = *addr}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_HOST_ADDR, &val); + } + + /** +@@ -226,8 +220,8 @@ static inline int usbg_f_net_get_qmult(usbg_f_net *nf, int *qmult) + */ + static inline int usbg_f_net_set_qmult(usbg_f_net *nf, int qmult) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_QMULT, +- USBG_F_NET_INT_TO_ATTR_VAL(qmult)); ++ union usbg_f_net_attr_val val = {.qmult = qmult}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_QMULT, &val); + } + + /** +@@ -250,8 +244,8 @@ static inline int usbg_f_net_get_class(usbg_f_net *nf, unsigned int *class_) + */ + static inline int usbg_f_net_set_class(usbg_f_net *nf, unsigned int class_) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_CLASS, +- USBG_F_NET_INT_TO_ATTR_VAL(class_)); ++ union usbg_f_net_attr_val val = {.class_ = class_}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_CLASS, &val); + } + + /** +@@ -274,8 +268,8 @@ static inline int usbg_f_net_get_subclass(usbg_f_net *nf, int *subclass) + */ + static inline int usbg_f_net_set_subclass(usbg_f_net *nf, unsigned int subclass) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_SUBCLASS, +- USBG_F_NET_INT_TO_ATTR_VAL(subclass)); ++ union usbg_f_net_attr_val val = {.subclass = subclass}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_SUBCLASS, &val); + } + + /** +@@ -298,8 +292,8 @@ static inline int usbg_f_net_get_protocol(usbg_f_net *nf, int *protocol) + */ + static inline int usbg_f_net_set_protocol(usbg_f_net *nf, unsigned int protocol) + { +- return usbg_f_net_set_attr_val(nf, USBG_F_NET_PROTOCOL, +- USBG_F_NET_INT_TO_ATTR_VAL(protocol)); ++ union usbg_f_net_attr_val val = {.protocol = protocol}; ++ return usbg_f_net_set_attr_val(nf, USBG_F_NET_PROTOCOL, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/function/uac2.h b/include/usbg/function/uac2.h +index 6fc4d24..80918ef 100644 +--- a/include/usbg/function/uac2.h ++++ b/include/usbg/function/uac2.h +@@ -110,9 +110,6 @@ union usbg_f_uac2_attr_val { + const char * function_name; + }; + +-#define USBG_F_UAC2_INT_TO_ATTR_VAL(WHAT) \ +- USBG_TO_UNION(usbg_f_uac2_attr_val, c_chmask, WHAT) +- + /** + * @brief Cast from generic function to uac2 function + * @param[in] f function to be converted to uac2 funciton. +@@ -172,7 +169,7 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, + * @return 0 on success usbg_error if error occurred. + */ + int usbg_f_uac2_set_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, +- union usbg_f_uac2_attr_val val); ++ const union usbg_f_uac2_attr_val *val); + + /** + * @brief Get the capture channel mask of UAC2 adapter +@@ -194,8 +191,8 @@ static inline int usbg_f_uac2_get_c_chmask(usbg_f_uac2 *af, int *c_chmask) + */ + static inline int usbg_f_uac2_set_c_chmask(usbg_f_uac2 *af, int c_chmask) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_CHMASK, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_chmask)); ++ union usbg_f_uac2_attr_val val = {.c_chmask = c_chmask}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_CHMASK, &val); + } + + /** +@@ -218,8 +215,8 @@ static inline int usbg_f_uac2_get_c_srate(usbg_f_uac2 *af, int *c_srate) + */ + static inline int usbg_f_uac2_set_c_srate(usbg_f_uac2 *af, int c_srate) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SRATE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_srate)); ++ union usbg_f_uac2_attr_val val = {.c_srate = c_srate}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SRATE, &val); + } + + /** +@@ -242,8 +239,8 @@ static inline int usbg_f_uac2_get_c_ssize(usbg_f_uac2 *af, int *c_ssize) + */ + static inline int usbg_f_uac2_set_c_ssize(usbg_f_uac2 *af, int c_ssize) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SSIZE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(c_ssize)); ++ union usbg_f_uac2_attr_val val = {.c_ssize = c_ssize}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_C_SSIZE, &val); + } + + /** +@@ -266,8 +263,8 @@ static inline int usbg_f_uac2_get_p_chmask(usbg_f_uac2 *af, int *p_chmask) + */ + static inline int usbg_f_uac2_set_p_chmask(usbg_f_uac2 *af, int p_chmask) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_CHMASK, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_chmask)); ++ union usbg_f_uac2_attr_val val = {.p_chmask = p_chmask}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_CHMASK, &val); + } + + /** +@@ -290,8 +287,8 @@ static inline int usbg_f_uac2_get_p_srate(usbg_f_uac2 *af, int *p_srate) + */ + static inline int usbg_f_uac2_set_p_srate(usbg_f_uac2 *af, int p_srate) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SRATE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_srate)); ++ union usbg_f_uac2_attr_val val = {.p_srate = p_srate}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SRATE, &val); + } + + /** +@@ -314,8 +311,8 @@ static inline int usbg_f_uac2_get_p_ssize(usbg_f_uac2 *af, int *p_ssize) + */ + static inline int usbg_f_uac2_set_p_ssize(usbg_f_uac2 *af, int p_ssize) + { +- return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SSIZE, +- USBG_F_UAC2_INT_TO_ATTR_VAL(p_ssize)); ++ union usbg_f_uac2_attr_val val = {.p_ssize = p_ssize}; ++ return usbg_f_uac2_set_attr_val(af, USBG_F_UAC2_P_SSIZE, &val); + } + + #ifdef __cplusplus +diff --git a/include/usbg/usbg_internal.h b/include/usbg/usbg_internal.h +index 1d8dfe2..d6a3e3a 100644 +--- a/include/usbg/usbg_internal.h ++++ b/include/usbg/usbg_internal.h +@@ -322,7 +322,7 @@ void usbg_cleanup_function(struct usbg_function *f); + } + + typedef int (*usbg_attr_get_func)(const char *, const char *, const char *, void *); +-typedef int (*usbg_attr_set_func)(const char *, const char *, const char *, void *); ++typedef int (*usbg_attr_set_func)(const char *, const char *, const char *, const void *); + + static inline int usbg_get_dec(const char *path, const char *name, + const char *attr, void *val) +@@ -331,7 +331,7 @@ static inline int usbg_get_dec(const char *path, const char *name, + } + + static inline int usbg_set_dec(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_dec(path, name, attr, *((int *)val)); + } +@@ -343,7 +343,7 @@ static inline int usbg_get_bool(const char *path, const char *name, + } + + static inline int usbg_set_bool(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_bool(path, name, attr, *((bool *)val)); + } +@@ -355,7 +355,7 @@ static inline int usbg_get_string(const char *path, const char *name, + } + + static inline int usbg_set_string(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + return usbg_write_string(path, name, attr, *(char **)val); + } +@@ -364,7 +364,7 @@ int usbg_get_ether_addr(const char *path, const char *name, const char *attr, + void *val); + + int usbg_set_ether_addr(const char *path, const char *name, const char *attr, +- void *val); ++ const void *val); + + int usbg_get_dev(const char *path, const char *name, const char *attr, + void *val); +diff --git a/src/Makefile.am b/src/Makefile.am +index 634209f..ac97bc8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -7,6 +7,6 @@ else + libusbgx_la_SOURCES += usbg_schemes_none.c + endif + libusbgx_la_LDFLAGS = $(LIBCONFIG_LIBS) +-libusbgx_la_LDFLAGS += -version-info 2:0:0 ++libusbgx_la_LDFLAGS += -version-info 3:0:0 + libusbgx_la_CFLAGS = $(LIBCONFIG_CFLAGS) + AM_CPPFLAGS=-I$(top_srcdir)/include/ -I$(top_builddir)/include/usbg +diff --git a/src/function/ether.c b/src/function/ether.c +index a9eaf33..a1d20f1 100644 +--- a/src/function/ether.c ++++ b/src/function/ether.c +@@ -124,7 +124,7 @@ static int ether_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_net_set_attr_val(nf, i, val); ++ ret = usbg_f_net_set_attr_val(nf, i, &val); + if (ret) + break; + } +@@ -258,8 +258,8 @@ int usbg_f_net_set_attrs(usbg_f_net *nf, + continue; + + ret = usbg_f_net_set_attr_val(nf, i, +- *(union usbg_f_net_attr_val *) +- ((char *)attrs ++ (const union usbg_f_net_attr_val *) ++ ((const char *)attrs + + net_attr[i].offset)); + if (ret) + break; +@@ -277,12 +277,12 @@ int usbg_f_net_get_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, + } + + int usbg_f_net_set_attr_val(usbg_f_net *nf, enum usbg_f_net_attr attr, +- union usbg_f_net_attr_val val) ++ const union usbg_f_net_attr_val *val) + { + return net_attr[attr].ro ? + USBG_ERROR_INVALID_PARAM : + net_attr[attr].set(nf->func.path, nf->func.name, +- net_attr[attr].name, &val); ++ net_attr[attr].name, val); + } + + int usbg_f_net_get_ifname_s(usbg_f_net *nf, char *buf, int len) +diff --git a/src/function/hid.c b/src/function/hid.c +index 4d075cf..895c2c6 100644 +--- a/src/function/hid.c ++++ b/src/function/hid.c +@@ -69,9 +69,9 @@ static int hid_get_report(const char *path, const char *name, const char *attr, + } + + static int hid_set_report(const char *path, const char *name, const char *attr, +- void *val) ++ const void *val) + { +- struct usbg_f_hid_report_desc *report_desc = val; ++ const struct usbg_f_hid_report_desc *report_desc = val; + char *buf = report_desc->desc; + int len = report_desc->len; + int ret; +@@ -239,7 +239,7 @@ static int hid_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_hid_set_attr_val(hf, i, val); ++ ret = usbg_f_hid_set_attr_val(hf, i, &val); + if (ret) + break; + } +@@ -327,7 +327,7 @@ int usbg_f_hid_set_attrs(usbg_f_hid *hf, + continue; + + ret = usbg_f_hid_set_attr_val(hf, i, +- *(union usbg_f_hid_attr_val *) ++ (union usbg_f_hid_attr_val *) + ((char *)attrs + + hid_attr[i].offset)); + if (ret) +@@ -346,11 +346,11 @@ int usbg_f_hid_get_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, + } + + int usbg_f_hid_set_attr_val(usbg_f_hid *hf, enum usbg_f_hid_attr attr, +- union usbg_f_hid_attr_val val) ++ const union usbg_f_hid_attr_val *val) + { + return hid_attr[attr].ro ? + USBG_ERROR_INVALID_PARAM : + hid_attr[attr].set(hf->func.path, hf->func.name, +- hid_attr[attr].name, &val); ++ hid_attr[attr].name, val); + } + +diff --git a/src/function/midi.c b/src/function/midi.c +index 1cedb97..2318b49 100644 +--- a/src/function/midi.c ++++ b/src/function/midi.c +@@ -100,7 +100,7 @@ static int midi_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_midi_set_attr_val(mf, i, val); ++ ret = usbg_f_midi_set_attr_val(mf, i, &val); + if (ret) + break; + } +@@ -185,8 +185,8 @@ int usbg_f_midi_set_attrs(usbg_f_midi *mf, + + for (i = USBG_F_MIDI_ATTR_MIN; i < USBG_F_MIDI_ATTR_MAX; ++i) { + ret = usbg_f_midi_set_attr_val(mf, i, +- *(union usbg_f_midi_attr_val *) +- ((char *)attrs ++ (const union usbg_f_midi_attr_val *) ++ ((const char *)attrs + + midi_attr[i].offset)); + if (ret) + break; +@@ -204,10 +204,10 @@ int usbg_f_midi_get_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, + } + + int usbg_f_midi_set_attr_val(usbg_f_midi *mf, enum usbg_f_midi_attr attr, +- union usbg_f_midi_attr_val val) ++ const union usbg_f_midi_attr_val *val) + { + return midi_attr[attr].set(mf->func.path, mf->func.name, +- midi_attr[attr].name, &val); ++ midi_attr[attr].name, val); + } + + int usbg_f_midi_get_id_s(usbg_f_midi *mf, char *buf, int len) +diff --git a/src/function/ms.c b/src/function/ms.c +index 519b012..5cdd814 100644 +--- a/src/function/ms.c ++++ b/src/function/ms.c +@@ -207,7 +207,7 @@ static int ms_import_lun_attrs(struct usbg_f_ms *mf, int lun_id, + if (ret < 0) + break; + +- ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, val); ++ ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, &val); + if (ret) + break; + } +@@ -605,8 +605,8 @@ int usbg_f_ms_set_lun_attrs(usbg_f_ms *mf, int lun_id, + + for (i = USBG_F_MS_LUN_ATTR_MIN; i < USBG_F_MS_LUN_ATTR_MAX; ++i) { + ret = usbg_f_ms_set_lun_attr_val(mf, lun_id, i, +- *(union usbg_f_ms_lun_attr_val *) +- ((char *)lattrs ++ (const union usbg_f_ms_lun_attr_val *) ++ ((const char *)lattrs + + ms_lun_attr[i].offset)); + if (ret) + break; +@@ -633,7 +633,7 @@ int usbg_f_ms_get_lun_attr_val(usbg_f_ms *mf, int lun_id, + + int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + enum usbg_f_ms_lun_attr lattr, +- union usbg_f_ms_lun_attr_val val) ++ const union usbg_f_ms_lun_attr_val *val) + { + char lpath[USBG_MAX_PATH_LENGTH]; + int ret; +@@ -644,7 +644,7 @@ int usbg_f_ms_set_lun_attr_val(usbg_f_ms *mf, int lun_id, + return USBG_ERROR_PATH_TOO_LONG; + + return ms_lun_attr[lattr].set(lpath, "", +- ms_lun_attr[lattr].name, &val); ++ ms_lun_attr[lattr].name, val); + } + + int usbg_f_ms_get_lun_file_s(usbg_f_ms *mf, int lun_id, +diff --git a/src/function/uac2.c b/src/function/uac2.c +index 9ca8b66..fc06c1d 100644 +--- a/src/function/uac2.c ++++ b/src/function/uac2.c +@@ -125,7 +125,7 @@ static int uac2_libconfig_import(struct usbg_function *f, + if (ret < 0) + break; + +- ret = usbg_f_uac2_set_attr_val(af, i, val); ++ ret = usbg_f_uac2_set_attr_val(af, i, &val); + if (ret) + break; + } +@@ -210,8 +210,8 @@ int usbg_f_uac2_set_attrs(usbg_f_uac2 *af, + + for (i = USBG_F_UAC2_ATTR_MIN; i < USBG_F_UAC2_ATTR_MAX; ++i) { + ret = usbg_f_uac2_set_attr_val(af, i, +- *(union usbg_f_uac2_attr_val *) +- ((char *)attrs ++ (const union usbg_f_uac2_attr_val *) ++ ((const char *)attrs + + uac2_attr[i].offset)); + if (ret) + break; +@@ -229,8 +229,8 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, + } + + int usbg_f_uac2_set_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, +- union usbg_f_uac2_attr_val val) ++ const union usbg_f_uac2_attr_val *val) + { + return uac2_attr[attr].set(af->func.path, af->func.name, +- uac2_attr[attr].name, &val); ++ uac2_attr[attr].name, val); + } +diff --git a/src/function/uvc.c b/src/function/uvc.c +index f39594b..947b94e 100644 +--- a/src/function/uvc.c ++++ b/src/function/uvc.c +@@ -303,7 +303,7 @@ int usbg_f_uvc_get_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr + } + + int usbg_f_uvc_set_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr iattr, +- union usbg_f_uvc_config_attr_val val) ++ const union usbg_f_uvc_config_attr_val *val) + { + char ipath[USBG_MAX_PATH_LENGTH]; + int nmb; +@@ -314,7 +314,7 @@ int usbg_f_uvc_set_config_attr_val(usbg_f_uvc *uvcf, enum usbg_f_uvc_config_attr + return USBG_ERROR_PATH_TOO_LONG; + + return uvc_config_attr[iattr].set(ipath, "", +- uvc_config_attr[iattr].name, &val); ++ uvc_config_attr[iattr].name, val); + } + + int usbg_f_uvc_get_config_attrs(usbg_f_uvc *uvcf, struct usbg_f_uvc_config_attrs *iattrs) +@@ -341,8 +341,8 @@ int usbg_f_uvc_set_config_attrs(usbg_f_uvc *uvcf, const struct usbg_f_uvc_config + + for (i = USBG_F_UVC_FRAME_ATTR_MIN; i < USBG_F_UVC_FRAME_ATTR_MAX; ++i) { + ret = usbg_f_uvc_set_config_attr_val(uvcf, i, +- *(union usbg_f_uvc_config_attr_val *) +- ((char *)iattrs ++ (const union usbg_f_uvc_config_attr_val *) ++ ((const char *)iattrs + + uvc_config_attr[i].offset)); + if (ret) + break; +@@ -774,7 +774,7 @@ static int uvc_import_config(struct usbg_f_uvc *uvcf, config_setting_t *root) + if (ret < 0) + break; + +- ret = usbg_f_uvc_set_config_attr_val(uvcf, i, val); ++ ret = usbg_f_uvc_set_config_attr_val(uvcf, i, &val); + if (ret) + break; + } +diff --git a/src/usbg_common.c b/src/usbg_common.c +index 5f7f4e5..7234649 100644 +--- a/src/usbg_common.c ++++ b/src/usbg_common.c +@@ -337,7 +337,7 @@ int usbg_get_ether_addr(const char *path, const char *name, + } + + int usbg_set_ether_addr(const char *path, const char *name, +- const char *attr, void *val) ++ const char *attr, const void *val) + { + char str_addr[USBG_MAX_STR_LENGTH]; + +-- +2.42.0 + diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch b/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch new file mode 100644 index 0000000000..cc122c844c --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch @@ -0,0 +1,52 @@ +From 4f3f2ad08e6ca132bd1dd388e02b57223bf4219d Mon Sep 17 00:00:00 2001 +From: Ming Liu <liu.ming50@gmail.com> +Date: Sun, 11 Dec 2022 14:11:49 +0100 +Subject: [PATCH] libusbgx: Add interface name for NCM Feature Descriptors + +In commit: abf422bffca4a4767e7e242c44910dbf5ef7094f +[ +Author: Stefan Agner <stefan.agner@toradex.com> +Date: Tue Jan 24 14:22:25 2017 -0800 + + libusbgx: Add interface name for Feature Descriptors + + This adds interface name required for "Feature Descriptors". If + specified, we can assume that a Feature Descriptor with the + interface name of the specified string is understood by the + kernel (e.g. interface.rndis). +] + +it only added Feature Descriptors for RNDIS, NCM also needs that, or +else it could not be recognized by Windows systems. + +Add Feature Descriptors interface name for NCM. + +Upstream-Status: Submitted [https://github.com/linux-usb-gadgets/libusbgx/pull/73] + +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + src/function/ether.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/function/ether.c b/src/function/ether.c +index b1fe1d2..a9eaf33 100644 +--- a/src/function/ether.c ++++ b/src/function/ether.c +@@ -184,8 +184,14 @@ struct usbg_function_type usbg_f_type_subset = { + ETHER_FUNCTION_OPTS + }; + ++static char *ncm_os_desc_ifnames[] = { ++ "ncm", ++ NULL ++}; ++ + struct usbg_function_type usbg_f_type_ncm = { + .name = "ncm", ++ .os_desc_iname = ncm_os_desc_ifnames, + ETHER_FUNCTION_OPTS + }; + +-- +2.25.1 + diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start index 1a106b7851..e80cb2c340 100644..100755 --- a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start +++ b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start @@ -6,6 +6,15 @@ for i in $IMPORT_SCHEMAS; do /usr/bin/gadget-import "$i" /etc/usbgx/"$i".schema done +for script in $(find -L /etc/usbgx.d -type f -exec test -e {} \; -print 2>/dev/null); do + $script +done + for i in $ENABLED_SCHEMAS; do - ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/"$i"/UDC + configured_udc=$(eval 'echo ${UDC_FOR_SCHEMA_'"$i"'}') + if [ -n "${configured_udc}" ] && [ -e "/sys/class/udc/${configured_udc}" ]; then + echo ${configured_udc} > /sys/kernel/config/usb_gadget/"$i"/UDC + else + ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/"$i"/UDC + fi done diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop new file mode 100755 index 0000000000..24b7caed5e --- /dev/null +++ b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop @@ -0,0 +1,13 @@ +#!/bin/sh + +[ -r /etc/default/usbgx ] && . /etc/default/usbgx + +for i in $IMPORT_SCHEMAS; do + if [ -e /sys/kernel/config/usb_gadget/"$i"/idVendor ]; then + if [ -e /sys/kernel/config/usb_gadget/"$i"/idProduct ]; then + idVendor=$(cat /sys/kernel/config/usb_gadget/"$i"/idVendor) + idProduct=$(cat /sys/kernel/config/usb_gadget/"$i"/idProduct) + /usr/bin/gadget-vid-pid-remove ${idVendor}:${idProduct} + fi + fi +done diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service index 74541d3c2d..7210969d62 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service +++ b/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service @@ -1,9 +1,13 @@ [Unit] Description=Load USB gadget schemas +Requires=sys-kernel-config.mount +After=sys-kernel-config.mount [Service] Type=oneshot +RemainAfterExit=yes ExecStart=/usr/bin/gadget-start +ExecStop=/usr/bin/gadget-stop [Install] -WantedBy=multi-user.target +WantedBy=usb-gadget.target diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index 48fc911434..a20ff4eeab 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -1,45 +1,61 @@ SUMMARY = "USB Gadget neXt Configfs Library" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "libconfig" - inherit autotools pkgconfig systemd update-rc.d update-alternatives -PV = "0.2.0+git${SRCPV}" -SRCREV = "45c14ef4d5d7ced0fbf984208de44ced6d5ed898" +PV = "0.2.0+git" +SRCREV = "ec0b01c03fdc7893997b7b32ec1c12c6103f62f3" SRCBRANCH = "master" SRC_URI = " \ - git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH} \ + git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH};protocol=https \ + file://0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch \ + file://0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch \ file://gadget-start \ + file://gadget-stop \ file://usbgx.initd \ file://usbgx.service \ " S = "${WORKDIR}/git" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "usbgx.service" +PACKAGECONFIG ??= "examples gadget-schemes libconfig" +PACKAGECONFIG[libconfig] = "--with-libconfig=yes,--without-libconfig,libconfig" +PACKAGECONFIG[examples] = "--enable-examples,--disable-examples" +PACKAGECONFIG[gadget-schemes] = "--enable-gadget-schemes,--disable-gadget-schemes" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,cmocka" + +PACKAGE_BEFORE_PN = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '${PN}-examples', '', d)}" + +SYSTEMD_PACKAGES = "${PN}-examples" +SYSTEMD_SERVICE:${PN}-examples = "usbgx.service" +SYSTEMD_AUTO_ENABLE:${PN}-examples = "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'enable', 'disable', d)}" +INITSCRIPT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '${PN}-examples', '', d)}" INITSCRIPT_NAME = "usbgx" INITSCRIPT_PARAMS = "defaults" +INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '1', '0', d)}" -EXTRA_OECONF = "--includedir=${includedir}/usbgx" +do_install:append() { + install -Dm 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-start + sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start + install -m 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-stop + sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop -do_install_append() { - install -Dm 0755 ${WORKDIR}/gadget-start ${D}/${bindir}/gadget-start if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -Dm 0644 ${WORKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -Dm 0755 ${WORKDIR}/usbgx.initd ${D}${sysconfdir}/init.d/usbgx - fi + install -Dm 0755 ${WORKDIR}/usbgx.initd ${D}${sysconfdir}/init.d/usbgx + fi } -RDEPENDS_${PN} += "libusbgx-config" +FILES:${PN}-examples = "${bindir}/* ${sysconfdir}/*" +RDEPENDS:${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'libusbgx-config', '', d)}" ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "gadget-acm-ecm show-gadgets" +ALTERNATIVE:${PN}-examples = "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'gadget-acm-ecm show-gadgets', '', d)}" ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm" ALTERNATIVE_LINK_NAME[show-gadgets] = "${bindir}/show-gadgets" diff --git a/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch b/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch index 8140ea3438..00119af11c 100644 --- a/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch +++ b/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch @@ -11,15 +11,13 @@ Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> iface.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -diff --git a/iface.c b/iface.c -index 5951d81..27793f0 100644 --- a/iface.c +++ b/iface.c @@ -43,7 +43,14 @@ __result; })) #endif --#define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter" +-#define UTEMPTER_DEFAULT_PATHNAME LIBEXECDIR "/utempter/utempter" +#ifdef LIBEXECDIR +# define CAT_PATH(DIR1,DIR2) DIR1##DIR2 +# define RAW_UTEMPTER_PATH CAT_PATH(LIBEXECDIR,/utempter/utempter) @@ -31,6 +29,3 @@ index 5951d81..27793f0 100644 static const char *utempter_pathname; static int saved_fd = -1; --- -1.8.3.1 - diff --git a/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch index 2a866c0796..f43f54eaab 100644 --- a/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch +++ b/meta-oe/recipes-support/libutempter/libutempter/0002-Proper-macro-path-generation.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Proper macro path generation. Signed-off-by: iddinev <xidinev@gmail.com> --- +Upstream-Status: Pending + libutempter/iface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch b/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch deleted file mode 100644 index 6ed93355bb..0000000000 --- a/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Naur libutempter-1.1.6.orig/utempter.c libutempter-1.1.6/utempter.c ---- libutempter-1.1.6.orig/utempter.c 2010-11-04 13:14:53.000000000 -0400 -+++ libutempter-1.1.6/utempter.c 2014-06-20 16:37:09.762403323 -0400 -@@ -34,13 +34,7 @@ - #include <sys/stat.h> - #include <utmp.h> - --#ifdef __GLIBC__ - # include <pty.h> --#elif defined(__FreeBSD__) --# include <libutil.h> --#else --# error Unsupported platform --#endif /* __GLIBC__ || __FreeBSD__ */ - - #define DEV_PREFIX "/dev/" - #define DEV_PREFIX_LEN (sizeof(DEV_PREFIX)-1) -@@ -106,17 +100,12 @@ - - static int - write_uwtmp_record(const char *user, const char *term, const char *host, --#ifdef __GLIBC__ - pid_t pid, --#endif - int add) - { - struct utmp ut; - struct timeval tv; -- --#ifdef __GLIBC__ - size_t offset; --#endif - - memset(&ut, 0, sizeof(ut)); - -@@ -128,8 +117,6 @@ - if (host) - strncpy(ut.ut_host, host, sizeof(ut.ut_host)); - --#ifdef __GLIBC__ -- - offset = (strlen(term) <= sizeof(ut.ut_id)) ? 0 : - strlen(term) - sizeof(ut.ut_id); - strncpy(ut.ut_id, term + offset, sizeof(ut.ut_id)); -@@ -156,27 +143,6 @@ - - (void) updwtmp(_PATH_WTMP, &ut); - --#elif defined(__FreeBSD__) -- -- ut.ut_time = tv.tv_sec; -- -- if (add) -- { -- login(&ut); -- } else -- { -- if (logout(term) != 1) -- { --#ifdef UTEMPTER_DEBUG -- fprintf(stderr, "utempter: logout: %s\n", -- strerror(errno)); --#endif -- exit(EXIT_FAILURE); -- } -- } -- --#endif /* __GLIBC__ || __FreeBSD__ */ -- - #ifdef UTEMPTER_DEBUG - fprintf(stderr, - "utempter: DEBUG: utmp/wtmp record %s for terminal '%s'\n", -@@ -255,8 +221,6 @@ - validate_device(device); - - return write_uwtmp_record(pw->pw_name, device + DEV_PREFIX_LEN, host, --#ifdef __GLIBC__ - pid, --#endif - add); - } diff --git a/meta-oe/recipes-support/libutempter/libutempter.bb b/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb index b8a700b7b7..0d2cd135c6 100644 --- a/meta-oe/recipes-support/libutempter/libutempter.bb +++ b/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb @@ -4,17 +4,15 @@ This library provides interface for terminal emulators such as \ screen and xterm to record user sessions to utmp and wtmp files." HOMEPAGE = "ftp://ftp.altlinux.org/pub/people/ldv/utempter" SECTION = "System Environment/Libraries" -LICENSE = "GPLv2 & GPLv2+ & LGPLv2 & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.0-only & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" -SRCREV = "3ef74fff310f09e2601e241b9f042cd39d591018" -PV = "1.1.6-alt2+git${SRCPV}" +SRCREV = "63825e2244629d44dae21132b1065d7ecc0491c0" -SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git \ +SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git;branch=master \ file://0001-Fix-macro-error.patch \ file://0002-Proper-macro-path-generation.patch \ - file://libutempter-remove-glibc-assumption.patch \ - " + " S = "${WORKDIR}/git/${BPN}" @@ -37,6 +35,6 @@ do_install() { rm -f ${D}${libdir}/*.a } -FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN} += "${libexecdir}/utempter/utempter" -FILES_${PN}-dbg += "${libexecdir}/utempter/.debug/utempter" +FILES:${PN} = "${libdir}/*.so.*" +FILES:${PN} += "${libexecdir}/utempter/utempter" +FILES:${PN}-dbg += "${libexecdir}/utempter/.debug/utempter" diff --git a/meta-oe/recipes-support/links/files/ac-prog-cxx.patch b/meta-oe/recipes-support/links/files/ac-prog-cxx.patch index 2dc57a5c83..0406b700d7 100644 --- a/meta-oe/recipes-support/links/files/ac-prog-cxx.patch +++ b/meta-oe/recipes-support/links/files/ac-prog-cxx.patch @@ -3,6 +3,8 @@ From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 30 Jul 2012 23:52:49 +0200 --- +Upstream-Status: Pending + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/links/links-x11_2.20.2.bb b/meta-oe/recipes-support/links/links-x11_2.20.2.bb deleted file mode 100644 index 645fe3b264..0000000000 --- a/meta-oe/recipes-support/links/links-x11_2.20.2.bb +++ /dev/null @@ -1,53 +0,0 @@ -# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. -# The following is the difference between the old and the new license text. -# Please update the LICENSE value if needed, and summarize the changes in -# the commit message via 'License-Update:' tag. -# (example: 'License-Update: copyright years updated.') -# -# The changes: -# -# --- COPYING -# +++ COPYING -# @@ -293,7 +293,7 @@ -# <one line to give the program's name and a brief idea of what it does.> -# Copyright (C) <year> <name of author> -# -# - on, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USAThis program is free software; you can redistribute it and/or modify -# + This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# - -require links.inc - -DEPENDS += "virtual/libx11" -RCONFLICTS_${PN} = "links" - -inherit features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://links2.desktop \ - http://www.xora.org.uk/oe/links2.png;name=icon" - -S = "${WORKDIR}/links-${PV}" - -EXTRA_OECONF = "--enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --without-fb \ - --without-directfb --without-pmshell --without-atheos \ - --with-x --without-gpm" - -do_install_append() { - install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps -} - -SRC_URI[md5sum] = "ee39e612249440d0497535d0dafc3c0e" -SRC_URI[sha256sum] = "4b4f07d0e6261118d1365a5a5bfa31e1eafdbd280cfae6f0e9eedfea51a2f424" -SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" -SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-oe/recipes-support/links/links-x11_2.26.bb b/meta-oe/recipes-support/links/links-x11_2.26.bb new file mode 100644 index 0000000000..4c8d935ccf --- /dev/null +++ b/meta-oe/recipes-support/links/links-x11_2.26.bb @@ -0,0 +1,29 @@ +require links.inc + +DEPENDS += "virtual/libx11" +RCONFLICTS:${PN} = "links" + +inherit features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += " file://links2.desktop \ + http://www.xora.org.uk/oe/links2.png;name=icon" + +SRC_URI[sha256sum] = "f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb" +SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" + +S = "${WORKDIR}/links-${PV}" + +EXTRA_OECONF = "--enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --without-fb \ + --without-directfb --without-pmshell --without-atheos \ + --with-x --without-gpm" + +do_install:append() { + install -d ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps +} diff --git a/meta-oe/recipes-support/links/links.inc b/meta-oe/recipes-support/links/links.inc index d6aa2d2d4e..d772d54aff 100644 --- a/meta-oe/recipes-support/links/links.inc +++ b/meta-oe/recipes-support/links/links.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Links is graphics and text mode WWW \ browser, similar to Lynx." HOMEPAGE = "http://links.twibright.com/" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b0c80473f97008e42e29a9f80fcc55ff" DEPENDS = "jpeg libpng flex openssl zlib" diff --git a/meta-oe/recipes-support/links/links_2.21.bb b/meta-oe/recipes-support/links/links_2.21.bb deleted file mode 100644 index b6048c1d38..0000000000 --- a/meta-oe/recipes-support/links/links_2.21.bb +++ /dev/null @@ -1,15 +0,0 @@ -require links.inc - -DEPENDS += "gpm" -RCONFLICTS_${PN} = "links-x11" - -EXTRA_OECONF = "--enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --with-fb \ - --without-directfb --without-pmshell --without-atheos \ - --without-x" - -SRC_URI[md5sum] = "b88a46733d6932442ed8a6b751aac6b4" -SRC_URI[sha256sum] = "285eed8591c7781ec26213df82786665aaa1b9286782e8a7a1a7e2a6e1630d63" -SRC_URI[icon.md5sum] = "477e8787927c634614bac01b44355a33" -SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" diff --git a/meta-oe/recipes-support/links/links_2.29.bb b/meta-oe/recipes-support/links/links_2.29.bb new file mode 100644 index 0000000000..e3a15d1819 --- /dev/null +++ b/meta-oe/recipes-support/links/links_2.29.bb @@ -0,0 +1,11 @@ +require links.inc + +DEPENDS += "gpm" +RCONFLICTS:${PN} = "links-x11" + +EXTRA_OECONF = "--enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --with-fb \ + --without-directfb --without-pmshell --without-atheos \ + --without-x" +SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" diff --git a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch index 9608b7e753..86edcc2e42 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch +++ b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch @@ -8,6 +8,8 @@ Fixes QA errors about GNU_HASH Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + mib-modules/Makefile | 10 +++++----- tools/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb index 0fb4a6e516..844e5acf90 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb @@ -1,12 +1,12 @@ SUMMARY = "lio-utils" DESCRIPTION = "a simple low-level configuration tool set for the Target+iSCSI (LIO)" HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df" -PV = "4.1+git${SRCPV}" +PV = "4.1+git" -SRC_URI = "git://github.com/Datera/lio-utils.git \ +SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \ file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \ " SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" @@ -55,11 +55,13 @@ do_install() { install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh } -RDEPENDS_${PN} += "python-stringold python-subprocess python-shell \ +SKIP_RECIPE[lio-utils] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}" + +RDEPENDS:${PN} += "python-stringold python-subprocess python-shell \ python-datetime python-textutils python-crypt python-netclient python-email \ bash" -FILES_${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*" +FILES:${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*" # http://errors.yoctoproject.org/Errors/Details/184712/ # python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory diff --git a/meta-oe/recipes-support/lockdev/lockdev/0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch b/meta-oe/recipes-support/lockdev/lockdev/0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch new file mode 100644 index 0000000000..abcf1bc20f --- /dev/null +++ b/meta-oe/recipes-support/lockdev/lockdev/0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch @@ -0,0 +1,28 @@ +From 11c78232aa589d5ed43eea3683e6e3de0362ffdc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Apr 2022 10:00:32 -0700 +Subject: [PATCH] lockdev: Define MAJOR/MINOR for non-glibc case + +gnu_dev_major and gnu_dev_minor are glibc extensions but we do have +major/minor macros on musl too, so use them to define MINOR/MAJOR here + +Upstream-Status: Inappropriate [No active upstream] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lockdev.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/src/lockdev.c ++++ b/src/lockdev.c +@@ -125,8 +125,8 @@ + #include <sys/file.h> + #if defined (__GNU_LIBRARY__) + # include <sys/sysmacros.h> +-# define MAJOR(dev) gnu_dev_major (dev) +-# define MINOR(dev) gnu_dev_minor (dev) ++# define MAJOR(dev) major (dev) ++# define MINOR(dev) minor (dev) + #else + # error "put here a define for MAJOR and MINOR" + #endif diff --git a/meta-oe/recipes-support/lockdev/lockdev/build.patch b/meta-oe/recipes-support/lockdev/lockdev/build.patch index f9fe48b2a6..36daea79af 100644 --- a/meta-oe/recipes-support/lockdev/lockdev/build.patch +++ b/meta-oe/recipes-support/lockdev/lockdev/build.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + commit 0dd47123655c52d68185f06b9da8fb0e1b925400 Author: Ludwig Nussel <ludwig.nussel@suse.de> Date: Tue Feb 9 14:56:23 2010 +0100 diff --git a/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch b/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch index aa8b0f6923..886af121b3 100644 --- a/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch +++ b/meta-oe/recipes-support/lockdev/lockdev/cross_compile.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/Makefile +++ b/Makefile @@ -15,17 +15,18 @@ shared = ${libname}.${VER}.so diff --git a/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb b/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb index 9d8800ebde..a52ca25da4 100644 --- a/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb +++ b/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb @@ -1,26 +1,24 @@ SUMMARY = "Locking devices library" SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM="file://LICENSE;md5=d8045f3b8f929c1cb29a1e3fd737b499" PE = "1" SRC_URI = "http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_${PV}.orig.tar.gz \ - http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_${PV}-1.6.diff.gz;name=debianpatch \ file://cross_compile.patch \ file://build.patch \ + file://0001-lockdev-Define-MAJOR-MINOR-for-non-glibc-case.patch \ " -SRC_URI[md5sum] = "64b9c1b87b125fc348e892e24625524a" SRC_URI[sha256sum] = "ccae635d7ac3fdd50897eceb250872b3d9a191d298f213e7f0c836910d869f82" -SRC_URI[debianpatch.md5sum] = "5ef6267c42fca9145e0af006ccb6aff7" -SRC_URI[debianpatch.sha256sum] = "a5405c6ee5e97e45eeb1c81330a7e9f444a58bda5e6771fa30007516c115007e" inherit lib_package perlnative -CFLAGS += " -D__GNU_LIBRARY__" - TARGET_CC_ARCH += "${LDFLAGS}" -EXTRA_OEMAKE = "basedir=${D}${prefix} baselib=${baselib} LD='${CC}' LD='${CC}'" +CFLAGS:append:libc-musl = " -D__GNU_LIBRARY__" + +EXTRA_OEMAKE = "basedir=${D}${prefix} baselib=${baselib} LD='${CC}'" + do_compile() { oe_runmake shared static } diff --git a/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch index 9ff9d70025..405104a0fc 100644 --- a/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch +++ b/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Use the API properly in the example (format security error fixed). --- +Upstream-Status: Pending + examples/helloworld1/mylog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch b/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch index 4872eb4f5e..dadefec33a 100644 --- a/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch +++ b/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch @@ -1,7 +1,7 @@ The original use of AC_ARG_WITH is buggy and causes expat support to be *disabled* if "--with-expat" is passed to configure. -Upstream status: pending +Upstream-Status: Pending Index: log4c-1.2.4/configure.in =================================================================== diff --git a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb index ef7ad847a6..7d9b9d50f8 100644 --- a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb +++ b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb @@ -1,6 +1,6 @@ SUMMARY = "Log4c is a C library for flexible logging to files, syslog and other destinations" HOMEPAGE = "http://log4c.sourceforge.net" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ diff --git a/meta-oe/recipes-support/log4cpp/files/fix-pc.patch b/meta-oe/recipes-support/log4cpp/files/fix-pc.patch index b8fb42e5fd..b57b5a263c 100644 --- a/meta-oe/recipes-support/log4cpp/files/fix-pc.patch +++ b/meta-oe/recipes-support/log4cpp/files/fix-pc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurd ./log4cpp.orig/configure.in ./log4cpp/configure.in --- ./log4cpp.orig/configure.in 2009-09-07 16:57:46.000000000 -0400 +++ ./log4cpp/configure.in 2016-02-23 12:57:11.567240018 -0500 diff --git a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb index c6f9404d6e..729857eb62 100644 --- a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.3.bb +++ b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb @@ -1,13 +1,12 @@ DESCRIPTION = "A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations." HOMEPAGE = "http://sourceforge.net/projects/log4cpp/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}.tar.gz \ file://fix-pc.patch;striplevel=2 \ " -SRC_URI[md5sum] = "b9e2cee932da987212f2c74b767b4d8b" -SRC_URI[sha256sum] = "2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d" +SRC_URI[sha256sum] = "696113659e426540625274a8b251052cc04306d8ee5c42a0c7639f39ca90c9d6" S = "${WORKDIR}/${BPN}" @@ -19,3 +18,5 @@ EXTRA_OECONF = "\ --enable-html-docs=no \ --enable-latex-docs=no \ " + +CXXFLAGS += "-std=c++14" diff --git a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb b/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb index 5ae36bb67c..3549cb2153 100644 --- a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb +++ b/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb @@ -31,7 +31,7 @@ CACHED_CONFIGUREVARS += " \ # Make sure some files exist for autoreconf. # -do_configure_prepend () { +do_configure:prepend () { touch ${S}/NEWS touch ${S}/ChangeLog touch ${S}/README @@ -39,7 +39,7 @@ do_configure_prepend () { # Create a directory for logfile state info, usually under /var/lib. # -do_install_append () { +do_install:append () { install -d ${D}${lcl_default_state_dir} } @@ -47,6 +47,6 @@ do_install_append () { # PACKAGES += "${PN}-nagios" -FILES_${PN}-nagios = "${nonarch_libdir}/nagios" +FILES:${PN}-nagios = "${nonarch_libdir}/nagios" -RDEPENDS_${PN}-nagios += "bash coreutils sed" +RDEPENDS:${PN}-nagios += "bash coreutils sed" diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch new file mode 100644 index 0000000000..474c2f8ac7 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch @@ -0,0 +1,33 @@ +configure.ac: check egrep + +The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed +from configure.ac, then it fails to substitute '@EGREP@': + +| [GEN] command-lines-input.h +| /bin/bash: line 2: @EGREP@: command not found +| [GEN] command-count.h + +Call AC_PROG_EGREP to fix the error. + +Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 2e52498f9..d9462e22c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -78,6 +78,7 @@ AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_PROG_MKDIR_P + AC_PROG_RANLIB ++AC_PROG_EGREP + AC_CHECK_TOOL([READELF], [readelf]) + AC_CHECK_TOOL(AR, ar) + AC_PATH_TOOL(CFLOW_CMD, cflow) +-- +2.34.1 + diff --git a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch index bb582ed1ff..f46d7f7014 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch @@ -15,6 +15,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Dengke Du <dengke.du@windriver.com> --- +Upstream-Status: Pending + lib/log/log.c | 6 ++++++ tools/lvmcmdline.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch new file mode 100644 index 0000000000..7add3a7bb1 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch @@ -0,0 +1,32 @@ +From 1b9677f40ac547ba19d1cdbfd700901eab0a0d0b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Mar 2024 13:07:28 -0700 +Subject: [PATCH] include libgen.h for basename + +basename prototype has been removed from string.h from latest musl [1] +compilers e.g. clang-18 flags the absense of prototype as error. therefore +include libgen.h for providing it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Submitted [ Sent to maintainer and lvm-devel@redhat.com ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/device/device_id.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/device/device_id.c b/lib/device/device_id.c +index 1422f5d05..8215811bd 100644 +--- a/lib/device/device_id.c ++++ b/lib/device/device_id.c +@@ -25,6 +25,7 @@ + #include "lib/datastruct/str_list.h" + #include "lib/metadata/metadata-exported.h" + ++#include <libgen.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <unistd.h> +-- +2.44.0 + diff --git a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch deleted file mode 100644 index ce8a97ab6f..0000000000 --- a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke.du@windriver.com> -Date: Tue, 25 Oct 2016 11:52:44 +0000 -Subject: [PATCH] Guard use of mallinfo() with __GLIBC__ - -This API is glibc-only - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> - ---- - lib/mm/memlock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: LVM2.2.02.177/lib/mm/memlock.c -=================================================================== ---- LVM2.2.02.177.orig/lib/mm/memlock.c -+++ LVM2.2.02.177/lib/mm/memlock.c -@@ -151,7 +151,7 @@ static void _touch_memory(void *mem, siz - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; diff --git a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch index 517b9a5f28..ed9972a5f9 100644 --- a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch +++ b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch @@ -21,18 +21,18 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac -index e427708..aa374ea 100644 +index b43d8b9be..efe3062c1 100644 --- a/configure.ac +++ b/configure.ac -@@ -1791,8 +1791,6 @@ if test "$BUILD_DMFILEMAPD" = yes; then - fi +@@ -1646,8 +1646,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ + ]) ################################################################################ -AC_PATH_TOOL(MODPROBE_CMD, modprobe, [], [$PATH_SBIN]) - - if test -n "$MODPROBE_CMD"; then + AS_IF([test -n "$MODPROBE_CMD"], [ AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) - fi + ]) -- 2.7.4 diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch index 7117d99a39..7979efbefb 100644 --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch @@ -15,25 +15,26 @@ Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - Update context for lvm2 2.03.02. - Signed-off-by: Kai Kang <kai.kang@windriver.com> + +Update context for lvm2 2.03.16. +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- Makefile.in | 6 +++--- configure.ac | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 6a1a990..80cba91 100644 +index 3b7e0ec..37f14eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ --SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools -+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools +-SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools ++SUBDIRS = libdm conf daemons include lib libdaemon scripts tools ifeq ("@UDEV_RULES@", "yes") SUBDIRS += udev @@ -46,20 +47,20 @@ index 6a1a990..80cba91 100644 libdaemon lib tools daemons libdm \ udev po tools.distclean: test.distclean -@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper +@@ -59,7 +59,7 @@ unit-test run-unit-test: test + daemons.device-mapper: libdm.device-mapper tools.device-mapper: libdm.device-mapper - scripts.device-mapper: include.device-mapper -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper +device-mapper: tools.device-mapper daemons.device-mapper + device_mapper: device-mapper ifeq ("@INTL@", "yes") - lib.pofile: include.pofile diff --git a/configure.ac b/configure.ac -index 7fd0561..4154dc0 100644 +index 6def519..18a5c97 100644 --- a/configure.ac +++ b/configure.ac -@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile +@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc @@ -68,5 +69,5 @@ index 7fd0561..4154dc0 100644 scripts/lvm2-pvscan.service scripts/blkdeactivate.sh -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch index 9f9383ef48..5b9b2d5748 100644 --- a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch +++ b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch @@ -11,23 +11,26 @@ Upstream-Status: Inappropriate [oe specific] Rebase to v2_03_05 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +Rebase to v2_03_16 +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in -index 4bf744a..46766cb 100644 +index c0c96e3..2a99a37 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -2,7 +2,7 @@ Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) Requires=dm-event.socket --After=dm-event.socket dm-event.service lvm2-activation.service -+After=dm-event.socket dm-event.service lvm2-activation.service tmp.mount +-After=dm-event.socket dm-event.service ++After=dm-event.socket dm-event.service tmp.mount Before=local-fs-pre.target shutdown.target DefaultDependencies=no Conflicts=shutdown.target -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb b/meta-oe/recipes-support/lvm2/libdevmapper_2.03.22.bb index be558ce1d2..be558ce1d2 100644 --- a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.06.bb +++ b/meta-oe/recipes-support/lvm2/libdevmapper_2.03.22.bb diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 3c6c7edfc7..d95366f97e 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -1,32 +1,34 @@ HOMEPAGE = "https://www.sourceware.org/lvm2/" SECTION = "utils" DESCRIPTION = "LVM2 is a set of utilities to manage logical volumes in Linux." -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=12713b4d9386533feeb07d6e4831765a \ file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" DEPENDS += "libaio" -SRC_URI = "git://sourceware.org/git/lvm2.git \ +SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ file://lvm.conf \ file://0001-implement-libc-specific-reopen_stream.patch \ - file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ file://0004-tweak-MODPROBE_CMD-for-cross-compile.patch \ file://0001-Avoid-bashisms-in-init-scripts.patch \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ file://reproducible-build.patch \ + file://0001-configure.ac-check-egrep.patch \ + file://0001-include-libgen.h-for-basename.patch \ " -SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02" +SRCREV = "016e469caf856f1eb8dde39df0d1aa2e74225aed" S = "${WORKDIR}/git" -inherit autotools-brokensep pkgconfig systemd license +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" + +inherit autotools-brokensep pkgconfig systemd LVM2_PACKAGECONFIG = "dmeventd" -LVM2_PACKAGECONFIG_append_class-target = " \ +LVM2_PACKAGECONFIG:append:class-target = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ - ${@incompatible_license_contains('GPLv3', '', 'thin-provisioning-tools', d)} \ " # odirect is always enabled because there currently is a bug in @@ -39,6 +41,7 @@ PACKAGECONFIG[dmeventd] = "--enable-dmeventd,--disable-dmeventd" PACKAGECONFIG[odirect] = "--enable-o_direct,--disable-o_direct" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" +# NOTE: Add thin-provisioning-tools only if your distro policy allows GPL-3.0 license PACKAGECONFIG[thin-provisioning-tools] = "--with-thin=internal,--with-thin=none,,thin-provisioning-tools" # Unset user/group to unbreak install. @@ -56,3 +59,6 @@ EXTRA_OECONF = "--with-user= \ --with-thin-restore=${sbindir}/thin_restore \ " +# gold doesn't like multiple dm_bitset_parse_list definitions in libdm/.exported_symbols.DM_1_02_138 and libdm/.exported_symbols.DM_1_02_129 +# after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd", '', d)}" diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch deleted file mode 100644 index 24d5b1b486..0000000000 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 93c93e3b85492e58f9451841e6079d00c497efa4 Mon Sep 17 00:00:00 2001 -From: Jiping Ma <jiping.ma2@windriver.com> -Date: Mon, 25 Feb 2019 13:29:12 +0800 -Subject: [PATCH] "/dev/hdc: open failed: No medium found" will print out in - lvmdiskscan. - -commit [57bb46c5e7f8] introduce this issue. -"/dev/hdc: open failed: No medium found" will be print out -after run lvmdiskscan. change dev_open_readonly() -to dev_open_readonly_quiet() in fuction _dev_get_size_dev(). - -Signed-off-by: Jiping Ma <jiping.ma2@windriver.com> ---- - lib/device/dev-io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c -index dc95131..81a66b0 100644 ---- a/lib/device/dev-io.c -+++ b/lib/device/dev-io.c -@@ -338,7 +338,7 @@ static int _dev_get_size_dev(struct device *dev, uint64_t *size) - } - - if (fd <= 0) { -- if (!dev_open_readonly(dev)) -+ if (!dev_open_readonly_quiet(dev)) - return_0; - fd = dev_fd(dev); - do_close = 1; --- -1.9.1 - diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch index 16de8c0a1f..c0cf836ce8 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch @@ -1,6 +1,6 @@ -From 27b56cb6b5dfc75ea8ddb395dc9ef41fb7a09c93 Mon Sep 17 00:00:00 2001 +From ddf36613f3408ce42f15b03b4e9c6ad8478b97f8 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 2 Sep 2019 23:04:50 -0400 +Date: Tue, 2 Mar 2021 01:33:05 -0800 Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found In oe-core (util-linux and coreutils), the commands locates in @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index d1431e2..54e5a7b 100644 +index 991a0cf85..e59c82472 100644 --- a/configure.ac +++ b/configure.ac -@@ -1495,6 +1495,8 @@ fi +@@ -1660,6 +1660,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [ SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" @@ -27,19 +27,19 @@ index d1431e2..54e5a7b 100644 SBINDIR="$(eval echo $(eval echo $sbindir))" LVM_PATH="$SBINDIR/lvm" AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) -@@ -1721,6 +1723,7 @@ AC_SUBST(SACKPT_CFLAGS) - AC_SUBST(SACKPT_LIBS) - AC_SUBST(SALCK_CFLAGS) - AC_SUBST(SALCK_LIBS) +@@ -1886,6 +1888,7 @@ AC_SUBST(PYTHON2DIR) + AC_SUBST(PYTHON3) + AC_SUBST(PYTHON3DIR) + AC_SUBST(RT_LIBS) +AC_SUBST(BINDIR) AC_SUBST(SBINDIR) AC_SUBST(SELINUX_LIBS) AC_SUBST(SELINUX_PC) diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in -index a4b8a8f..3db4226 100644 +index 7c517b87b..7ef1bb766 100644 --- a/scripts/blkdeactivate.sh.in +++ b/scripts/blkdeactivate.sh.in -@@ -41,13 +41,14 @@ UMOUNT="/bin/umount" +@@ -42,13 +42,14 @@ VDO="/bin/vdo" sbindir="@SBINDIR@" DMSETUP="$sbindir/dmsetup" @@ -55,9 +55,9 @@ index a4b8a8f..3db4226 100644 FINDMNT_READ="read -r mnt" fi DMSETUP_OPTS="" -@@ -55,10 +56,10 @@ LVM_OPTS="" - MDADM_OPTS="" +@@ -57,10 +58,10 @@ MDADM_OPTS="" MPATHD_OPTS="" + VDO_OPTS="" -LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" +LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT" @@ -69,5 +69,5 @@ index a4b8a8f..3db4226 100644 # Do not show tool errors by default (only done/skipping summary # message provided by this script) and no verbose mode by default. -- -2.8.1 +2.29.2 diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch new file mode 100644 index 0000000000..f6b293553d --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch @@ -0,0 +1,29 @@ +lvmdbusd: create dirs for lock file + +Create leading dirs for lvmdbusd lock file, otherwise it fails to start: + +| systemd[1]: Starting LVM2 D-Bus service... +| lvmdbusd[1602]: [1602]: Error during creation of lock file(/var/lock/lvm/lvmdbusd): errno(2), exiting! + +Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/7] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + daemons/lvmdbusd/utils.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py +index d479175f6..830648659 100644 +--- a/daemons/lvmdbusd/utils.py ++++ b/daemons/lvmdbusd/utils.py +@@ -778,6 +778,7 @@ class LockFile(object): + + def __enter__(self): + try: ++ os.makedirs(os.path.dirname(self.lock_file)) + self.fd = os.open(self.lock_file, os.O_CREAT | os.O_RDWR, stat.S_IRUSR | stat.S_IWUSR) + + # Get and set the close on exec and lock the file +-- +2.34.1 + diff --git a/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch new file mode 100644 index 0000000000..3b85a17b61 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch @@ -0,0 +1,55 @@ +Not check python modules pyudev and dbus during configure that they are runtime +dependencies. Deal with them in the package config setting in the recipe. + +Remove $(DESTDIR) from install destination that it is not suitable for oe. And +no generate python cache files too. + +Upstream-Status: Pending [oe specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 4 ++-- + daemons/lvmdbusd/Makefile.in | 6 ++---- + 2 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ee088b3f5..b94ef4e56 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1262,8 +1262,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [ + AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"]) + + # To get this macro, install autoconf-archive package then run autoreconf +- AX_PYTHON_MODULE([pyudev], [Required], python3) +- AX_PYTHON_MODULE([dbus], [Required], python3) ++ # AX_PYTHON_MODULE([pyudev], [Required], python3) ++ # AX_PYTHON_MODULE([dbus], [Required], python3) + ]) + + ################################################################################ +diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in +index 9c2629279..a79daabf7 100644 +--- a/daemons/lvmdbusd/Makefile.in ++++ b/daemons/lvmdbusd/Makefile.in +@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ + top_builddir = @top_builddir@ + + lvmdbuspydir = $(python3dir)/lvmdbusd +-lvmdbusdir = $(DESTDIR)$(lvmdbuspydir) ++lvmdbusdir = $(lvmdbuspydir) + + LVMDBUS_SRCDIR_FILES = \ + automatedproperties.py \ +@@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD) + @echo " [INSTALL] $<" + $(Q) $(INSTALL_DIR) $(sbindir) + $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) +- $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__ ++ $(Q) $(INSTALL_DIR) $(lvmdbusdir) + $(Q) (cd $(srcdir); $(INSTALL_DATA) $(LVMDBUS_SRCDIR_FILES) $(lvmdbusdir)) + $(Q) $(INSTALL_DATA) $(LVMDBUS_BUILDDIR_FILES) $(lvmdbusdir) +- $(Q) PYTHON=$(PYTHON3) $(PYCOMPILE) --destdir "$(DESTDIR)" --basedir "$(lvmdbuspydir)" $(LVMDBUS_SRCDIR_FILES) $(LVMDBUS_BUILDDIR_FILES) +- $(Q) $(CHMOD) 444 $(lvmdbusdir)/__pycache__/*.py[co] + + install_lvm2: install_lvmdbusd + diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb deleted file mode 100644 index bc86810ecb..0000000000 --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.06.bb +++ /dev/null @@ -1,92 +0,0 @@ -require lvm2.inc - -SRC_URI += " \ - file://0001-dev-hdc-open-failed-No-medium-found-will-print-out-i.patch \ - file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ - " - -DEPENDS += "autoconf-archive-native" - -inherit multilib_script - -MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" - -CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" - -do_install_append() { - # Install machine specific configuration file - install -d ${D}${sysconfdir}/lvm - install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf - sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - oe_runmake 'DESTDIR=${D}' install install_systemd_units - sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service - else - oe_runmake 'DESTDIR=${D}' install install_initscripts - mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d - rm -rf ${D}${sysconfdir}/rc.d - fi -} - -PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ - blk-availability.service" -SYSTEMD_AUTO_ENABLE = "disable" - -TARGET_CC_ARCH += "${LDFLAGS}" - -EXTRA_OECONF_append_class-nativesdk = " --with-confdir=${sysconfdir}" - -DEPENDS += "util-linux" -LVM2_PACKAGECONFIG_append_class-target = " \ - udev \ -" -PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" - -PACKAGES =+ "libdevmapper" -FILES_libdevmapper = " \ - ${libdir}/libdevmapper.so.* \ - ${sbindir}/dmsetup \ - ${sbindir}/dmstats \ -" - -FILES_${PN} += " \ - ${libdir}/device-mapper/*.so \ - ${systemd_system_unitdir}/lvm2-pvscan@.service \ -" - -FILES_${PN}-scripts = " \ - ${sbindir}/blkdeactivate \ - ${sbindir}/fsadm \ - ${sbindir}/lvmconf \ - ${sbindir}/lvmdump \ -" -# Specified explicitly for the udev rules, just in case that it does not get picked -# up automatically: -FILES_${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" -RDEPENDS_${PN}-udevrules = "libdevmapper" -RDEPENDS_${PN}_append_class-target = " libdevmapper" -RDEPENDS_${PN}_append_class-nativesdk = " libdevmapper" - -RDEPENDS_${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ - bash \ - util-linux-lsblk \ - util-linux-findmnt \ - coreutils \ -" -RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" - -CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" - -SYSROOT_PREPROCESS_FUNCS_append = " remove_libdevmapper_sysroot_preprocess" -remove_libdevmapper_sysroot_preprocess() { - rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ - ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ - ${SYSROOT_DESTDIR}${sbindir}/dmstats \ - ${SYSROOT_DESTDIR}${includedir}/libdevmapper.h \ - ${SYSROOT_DESTDIR}${libdir}/pkgconfig/devmapper.pc -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb new file mode 100644 index 0000000000..c675d3ded8 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb @@ -0,0 +1,110 @@ +require lvm2.inc + +SRC_URI += " \ + file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ + file://tweak-for-lvmdbusd.patch \ + file://0001-lvmdbusd-create-dirs-for-lock-file.patch \ + " + +DEPENDS += "autoconf-archive-native" + +inherit multilib_script python3native + +MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" + +CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" + +do_install:append() { + # Install machine specific configuration file + install -d ${D}${sysconfdir}/lvm + install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf + sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf + # We don't want init scripts/systemd units for native SDK utilities + if [ "${PN}" != "nativesdk-lvm2" ]; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + oe_runmake 'DESTDIR=${D}' install install_systemd_units + sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service + else + oe_runmake 'DESTDIR=${D}' install install_initscripts + mv ${D}${sysconfdir}/rc.d/init.d ${D}${sysconfdir}/init.d + rm -rf ${D}${sysconfdir}/rc.d + fi + fi + + # following files only exist when package config `dbus` enabled + sed -i -e '1s,#!.*python.*,#!${USRBINPATH}/env python3,' \ + ${D}${sbindir}/lvmdbusd \ + ${D}${PYTHON_SITEPACKAGES_DIR}/lvmdbusd/lvmdb.py \ + ${D}${PYTHON_SITEPACKAGES_DIR}/lvmdbusd/lvm_shell_proxy.py \ + || true +} + +PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'lvm2-lvmdbusd.service', '', d)} \ + blk-availability.service \ + " +SYSTEMD_AUTO_ENABLE = "disable" + +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OECONF:append:class-nativesdk = " --with-confdir=${sysconfdir}" + +DEPENDS += "util-linux" +LVM2_PACKAGECONFIG:append:class-target = " \ + udev \ +" + +PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev" +PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" + +PACKAGES =+ "libdevmapper" +FILES:libdevmapper = " \ + ${libdir}/libdevmapper.so.* \ + ${sbindir}/dmsetup \ + ${sbindir}/dmstats \ +" + +FILES:${PN} += " \ + ${libdir}/device-mapper/*.so \ + ${systemd_system_unitdir}/lvm2-pvscan@.service \ + ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ + ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ +" + +FILES:${PN}-scripts = " \ + ${sbindir}/blkdeactivate \ + ${sbindir}/fsadm \ + ${sbindir}/lvmconf \ + ${sbindir}/lvmdump \ +" +# Specified explicitly for the udev rules, just in case that it does not get picked +# up automatically: +FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" +RDEPENDS:${PN} = "bash" +RDEPENDS:${PN}-udevrules = "libdevmapper" +RDEPENDS:${PN}:append:class-target = " libdevmapper" +RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" + +RDEPENDS:${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ + bash \ + util-linux-lsblk \ + util-linux-findmnt \ + coreutils \ +" +RRECOMMENDS:${PN}:class-target = "${PN}-scripts (= ${EXTENDPKGV})" + +CONFFILES:${PN} += "${sysconfdir}/lvm/lvm.conf" + +SYSROOT_PREPROCESS_FUNCS:append = " remove_libdevmapper_sysroot_preprocess" +remove_libdevmapper_sysroot_preprocess() { + rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ + ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ + ${SYSROOT_DESTDIR}${sbindir}/dmstats \ + ${SYSROOT_DESTDIR}${includedir}/libdevmapper.h \ + ${SYSROOT_DESTDIR}${libdir}/pkgconfig/devmapper.pc +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb b/meta-oe/recipes-support/mailcap/mailcap_2.1.54.bb index 537c458747..8385b63543 100644 --- a/meta-oe/recipes-support/mailcap/mailcap_2.1.49.bb +++ b/meta-oe/recipes-support/mailcap/mailcap_2.1.54.bb @@ -18,8 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dce08227d135cfda1f19d4c0c6689de" SRC_URI = "https://releases.pagure.org/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "d5701a1a541383c0eda328f4a6518751" -SRC_URI[sha256sum] = "f7381516bc1a937348efd1d0e14618e0a2afc5d59fe821dd248632d5601b59b5" +SRC_URI[sha256sum] = "9a4032202fc0d2b0858f41b167389a9cfe52ac24ec282e6479b90765319de113" inherit update-alternatives @@ -27,5 +26,5 @@ do_install() { oe_runmake install DESTDIR=${D} sysconfdir=${sysconfdir} mandir=${mandir} } -ALTERNATIVE_${PN} = "mime.types" +ALTERNATIVE:${PN} = "mime.types" ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" diff --git a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb index 3467d28988..ccc21f418c 100644 --- a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb +++ b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb @@ -1,6 +1,6 @@ DESCRIPTION = "mbuffer is a tool for buffering data streams with a large set of unique features." HOMEPAGE = "http://www.maier-komor.de/mbuffer.html" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/network" diff --git a/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-oe/recipes-support/mcelog/mce-inject_git.bb index cc33cbaf28..a228c3cc06 100644 --- a/meta-oe/recipes-support/mcelog/mce-inject_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-inject_git.bb @@ -4,7 +4,7 @@ software level into a running Linux kernel. This is intended for \ validation of the kernel machine check handler." SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git" +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master" SRCREV = "4cbe46321b4a81365ff3aafafe63967264dbfec5" @@ -12,7 +12,7 @@ UPSTREAM_CHECK_COMMITS = "1" DEPENDS = "bison-native" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://README;beginline=30;md5=94c18755082a2da9c9cf97cba3ad47d6" S = "${WORKDIR}/git" @@ -21,4 +21,4 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' inherit autotools-brokensep -EXTRA_OEMAKE = "destdir=${D}" +EXTRA_OEMAKE = "destdir=${D} CFLAGS='${CFLAGS}'" diff --git a/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-oe/recipes-support/mcelog/mce-test_git.bb index 35fb944702..05e98e86ed 100644 --- a/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -7,25 +7,27 @@ DESCRIPTION = "The MCE test suite is a collection of tools and test scripts for testing the Linux RAS related features, including CPU/Memory error \ containment and recovery, ACPI/APEI support etc." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git \ +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git;branch=master \ file://makefile-remove-ldflags.patch \ file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ " -SRCREV = "7643baf6c3919b3d727e6ba6c2e545dc6a653307" -PV = "20190917+git${SRCPV}" +SRCREV = "025014dedca39d2b8a57a82e52286e72e157d73a" +PV = "20222810+git" -RDEPENDS_${PN} = "mcelog mce-inject dialog bash" +RDEPENDS:${PN} = "mcelog mce-inject dialog bash" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' S ="${WORKDIR}/git" -do_install_append(){ +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + +do_install:append(){ install -d ${D}/opt/mce-test cp -rf ${S}/* ${D}/opt/mce-test/ } -FILES_${PN} += "/opt" +FILES:${PN} += "/opt" diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch new file mode 100644 index 0000000000..3b6fd7d702 --- /dev/null +++ b/meta-oe/recipes-support/mcelog/mcelog/0001-client-Include-string.h-form-mem-function-prototypes.patch @@ -0,0 +1,26 @@ +From c7753f82261d49862d5e0f9691bf87799d36ef0c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 16:20:03 -0700 +Subject: [PATCH] client: Include string.h form mem* function prototypes + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/client.c b/client.c +index 883b1de..e474e55 100644 +--- a/client.c ++++ b/client.c +@@ -16,6 +16,7 @@ + on your Linux system; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #include <stdio.h> ++#include <string.h> + #include <sys/socket.h> + #include <sys/un.h> + #include <unistd.h> +-- +2.37.3 + diff --git a/meta-oe/recipes-support/mcelog/mcelog/run-ptest b/meta-oe/recipes-support/mcelog/mcelog/run-ptest index ba7a2c7683..320240f276 100644 --- a/meta-oe/recipes-support/mcelog/mcelog/run-ptest +++ b/meta-oe/recipes-support/mcelog/mcelog/run-ptest @@ -1,3 +1,9 @@ #!/bin/sh -make -C tests test +make -C tests test | sed -e '/\[PASS\]/ s/^/PASS: /g' \ + -e '/\[FAIL\]/ s/^/FAIL: /g' \ + -e '/\[IGNORE\]/ s/^/SKIP: /g' \ + -e 's/IGNORE:/SKIP:/' \ + -e 's/: \[PASS\]//' \ + -e 's/: \[FAIL\]//' \ + -e 's/: \[IGNORE\]//' diff --git a/meta-oe/recipes-support/mcelog/mcelog_170.bb b/meta-oe/recipes-support/mcelog/mcelog_198.bb index bdb080f418..e302f4175d 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_170.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_198.bb @@ -2,25 +2,34 @@ SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ and should run on all Linux systems that need error handling." -HOMEPAGE = "http://mcelog.org/" +HOMEPAGE = "https://mcelog.org/" SECTION = "System Environment/Base" -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ +SRC_URI = "\ + git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ + file://0001-client-Include-string.h-form-mem-function-prototypes.patch \ file://run-ptest \ " -SRCREV = "391abaac9bdff385934b18134789bcc98b0adeb7" +SRCREV = "ab58f07b9b1a4456fca0f5f41639d5cbecc80e36" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" -inherit autotools-brokensep ptest +inherit ptest COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' -do_install_append() { +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} install -d ${D}${sysconfdir}/cron.hourly install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron @@ -32,4 +41,4 @@ do_install_ptest() { sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test } -RDEPENDS_${PN}-ptest += "make bash mce-inject" +RDEPENDS:${PN}-ptest += "make bash mce-inject" diff --git a/meta-oe/recipes-support/md4c/md4c_0.5.2.bb b/meta-oe/recipes-support/md4c/md4c_0.5.2.bb new file mode 100644 index 0000000000..6c409666fc --- /dev/null +++ b/meta-oe/recipes-support/md4c/md4c_0.5.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "Markdown for C" +DESCRIPTION = "MD4C is Markdown parser implementation in C." +HOMEPAGE = "http://github.com/mity/md4c" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=383f39920f391605af6e8e46e60e2378" + + +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/mity/md4c.git;protocol=https;branch=master \ +" + +SRCREV = "729e6b8b320caa96328968ab27d7db2235e4fb47" + +inherit cmake diff --git a/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch index 9c154a1734..ce139a6387 100644 --- a/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch +++ b/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Undefine REGEX for musl based systems Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + GNUmakefile | 1 - Makefile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch b/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch index 8e8c2b9025..4eeb1d97dc 100644 --- a/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch +++ b/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/2] fileio: Include sys/param.h for MAXNAMLEN Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + fileio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch b/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch index bdd7632be6..ef7811081b 100644 --- a/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch +++ b/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/2] fileio: Define DEFFILEMODE if platform is missing Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + fileio.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-support/mg/mg_20200723.bb b/meta-oe/recipes-support/mg/mg_20230501.bb index b73f937565..ee00003977 100644 --- a/meta-oe/recipes-support/mg/mg_20200723.bb +++ b/meta-oe/recipes-support/mg/mg_20230501.bb @@ -1,16 +1,16 @@ SUMMARY = "A portable version of the mg maintained by the OpenBSD team" HOMEPAGE = "http://homepage.boetes.org/software/mg/" LICENSE = "PD" -LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" +LIC_FILES_CHKSUM = "file://version.c;md5=a8e0b53d89d277bf3b40878ac568bedd" DEPENDS = "ncurses libbsd" SECTION = "console/editors" -SRCREV = "60fa3582f5f735b9d43825f5bdcc4ea5f0740f91" -SRC_URI = "git://github.com/hboetes/mg \ +SRCREV = "f21c2ba36772ffa68d9cfa55305e427d37903b4a" +SRC_URI = "git://github.com/hboetes/mg;branch=master;protocol=https \ file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ " -SRC_URI_append_libc-musl = "\ +SRC_URI:append:libc-musl = "\ file://0001-Undefine-REGEX-for-musl-based-systems.patch \ " diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb index 1137f5012a..46def2a23c 100644 --- a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb +++ b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb @@ -1,20 +1,24 @@ SECTION = "base" SUMMARY = "MIME files 'mime.types' & 'mailcap', and support programs" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://debian/README;md5=36bbe2ace0a05c3fb684b73208fbf30b" +LICENSE = "PD & Bellcore" +LICENSE:${PN} = "PD" +# mailcap.man's license is Bellcore +LICENSE:${PN}-doc = "PD & Bellcore" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=53c851e31d27c3ea8a6217073a5ff01c" DEPENDS = "file" -RDEPENDS_${PN} = "perl" -RRECOMMENDS_${PN} = "file" +RDEPENDS:${PN} = "perl" +RRECOMMENDS:${PN} = "file" -SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}.tar.gz" +SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a" S = "${WORKDIR}/${BPN}" inherit update-alternatives -FILES_${PN} += " ${libdir}/mime" +FILES:${PN} += " ${libdir}/mime" -docdir_append = "/${BPN}" +docdir:append = "/${BPN}" do_install () { install -d ${D}${sysconfdir} @@ -27,22 +31,22 @@ do_install () { install -d ${D}${mandir}/man8 install -m 644 mime.types ${D}${sysconfdir}/ install -m 644 mailcap ${D}${libdir}/mime/ - install -m 644 mailcap.order ${D}${sysconfdir}/ + install -m 644 mailcap.order ${D}${sysconfdir}/ install -m 644 mailcap.man ${D}${mandir}/man5/mailcap.5 - install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 -# install -m 755 install-mime ${D}${sbindir}/ -# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 + install -m 644 mailcap.order.man ${D}${mandir}/man5/mailcap.order.5 +# install -m 755 install-mime ${D}${sbindir}/ +# install -m 644 install-mime.man ${D}${mandir}/man8/install-mime.8 install -m 755 update-mime ${D}${sbindir}/ - install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 + install -m 644 update-mime.man ${D}${mandir}/man8/update-mime.8 install -m 755 run-mailcap ${D}${bindir}/ - install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 -# install -m 644 rfcs/* ${D}${docdir}/ - install -m 644 debian/changelog ${D}${docdir}/changelog.Debian - install -m 644 debian/README ${D}${docdir}/copyright + install -m 644 run-mailcap.man ${D}${mandir}/man1/run-mailcap.1 +# install -m 644 rfcs/* ${D}${docdir}/ + install -m 644 debian/changelog ${D}${docdir}/changelog.Debian + install -m 644 debian/copyright ${D}${docdir}/copyright install -m 755 debian-view ${D}${libdir}/mime/ - install -m 755 playaudio ${D}${libdir}/mime/ + install -m 755 playaudio ${D}${libdir}/mime/ install -m 755 playdsp ${D}${libdir}/mime/ - install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support + install -m 644 mailcap.entries ${D}${libdir}/mime/packages/mime-support cd ${D}${mandir}; gzip -9fv */* cd ${D}${docdir}; gzip -9v * cd ${D}${docdir}; gunzip copyright.gz @@ -56,9 +60,6 @@ do_install () { cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz } -SRC_URI[md5sum] = "d6e5d715e331147352c50c158dbdec6d" -SRC_URI[sha256sum] = "a529c7892cb786f514af71f4ca5a4c3ebc58b538a49ff959c0d97592d38f040a" - ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "mime.types" +ALTERNATIVE:${PN} = "mime.types" ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" diff --git a/meta-oe/recipes-support/monit/monit_5.26.0.bb b/meta-oe/recipes-support/monit/monit_5.33.0.bb index a954682d6b..66d4079a94 100644 --- a/meta-oe/recipes-support/monit/monit_5.26.0.bb +++ b/meta-oe/recipes-support/monit/monit_5.33.0.bb @@ -5,7 +5,7 @@ causal actions in error situations." HOMEPAGE = "http://mmonit.com/monit/" -LICENSE = "AGPL-3.0" +LICENSE = "AGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" @@ -15,8 +15,7 @@ SRC_URI = " \ file://monitrc \ " -SRC_URI[md5sum] = "9f7dc65e902c103e4c5891354994c3df" -SRC_URI[sha256sum] = "87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2" +SRC_URI[sha256sum] = "1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5" DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" @@ -32,14 +31,18 @@ EXTRA_OECONF = "\ --with-ssl-incl-dir=${STAGING_INCDIR} \ " -SYSTEMD_SERVICE_${PN} = "monit.service" +SYSTEMD_SERVICE:${PN} = "monit.service" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "monit" -INITSCRIPT_PARAMS_${PN} = "defaults 89" +INITSCRIPT_NAME:${PN} = "monit" +INITSCRIPT_PARAMS:${PN} = "defaults 89" -do_install_append() { +do_configure:prepend() { + rm -rf ${S}/m4/* +} + +do_install:append() { # Configuration file install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc diff --git a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb index 49899edd73..371281d6e4 100644 --- a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb +++ b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb @@ -1,7 +1,7 @@ SUMMARY = "Mscgen is a small program that parses Message Sequence Chart descriptions and produces PNG, SVG, EPS or server side image maps (ismaps) as the output." HOMEPAGE = "http://www.mcternan.me.uk/mscgen/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b1e6a340187c1cf716513439d07c1d79" SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz" @@ -11,9 +11,9 @@ SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d855 DEPENDS = "gd " -inherit autotools gettext +inherit autotools gettext pkgconfig -do_configure_prepend() { +do_configure:prepend() { sed -i "s#AC_PATH_PROG(GDLIB_CONFIG,gdlib-config)#AC_PATH_PROG([GDLIB_CONFIG],[gdlib-config], ,[${STAGING_BINDIR_CROSS}])#" ${S}/configure.ac } diff --git a/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch b/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch new file mode 100644 index 0000000000..1643c08566 --- /dev/null +++ b/meta-oe/recipes-support/msktutil/msktutil/0001-configure.ac-Remove-native-include-path.patch @@ -0,0 +1,31 @@ +From bf9795ffbda7bb241b708ff261976016efb943b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 23:12:19 -0800 +Subject: [PATCH] configure.ac: Remove native include path + +On OE com_err.h is found in /usr/include too, therefore adding new path +to include search path is not needed. Moreover it fixed QA checks where +it warns about using build system paths. + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index eaac16f..d23d0b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,7 +134,6 @@ fi + # Fedora, RHEL, Centos has com_err.h in /usr/include/et + AC_CHECK_HEADERS([et/com_err.h]) + if test "$ac_cv_header_et_com_err_h" = "yes"; then +- CPPFLAGS="-I/usr/include/et $CPPFLAGS" + AC_DEFINE(HAVE_COM_ERR_H, 1) + fi + +-- +2.39.1 + diff --git a/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb new file mode 100644 index 0000000000..b4f4651e37 --- /dev/null +++ b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "Program for interoperability with Active Directory" +DESCRIPTION = "Msktutil creates user or computer accounts in Active Directory, \ + creates Kerberos keytabs on Unix/Linux systems, adds and removes \ + principals to and from keytabs and changes the user or computer \ + account's password." + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" + +SRC_URI = "https://github.com/msktutil/msktutil/releases/download/${PV}/${BP}.tar.bz2 \ + file://0001-configure.ac-Remove-native-include-path.patch" +SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d" + +DEPENDS += "krb5 cyrus-sasl openldap" + +inherit autotools diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch new file mode 100644 index 0000000000..74ae1530cb --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch @@ -0,0 +1,76 @@ +From 1e1ba9ecc16895bf472eae345d44631b65629611 Mon Sep 17 00:00:00 2001 +From: Benjamin Marzinski <bmarzins@redhat.com> +Date: Thu, 13 Apr 2017 07:22:23 -0500 +Subject: [PATCH 01/12] RH: fixup udev rules for redhat + +The multipath rules need to run after scsi_id is run. This means moving +them after 60-persistent-storage.rules for redhat. Redhat also uses a +different naming scheme for partitions than SuSE. Also, there are some +false warnings that gcc throws because of the changed options. Fix these +too. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Upstream-Status: Pending +--- + Makefile.inc | 2 +- + kpartx/kpartx.rules | 2 +- + multipath/Makefile | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.inc b/Makefile.inc +index 5668e638..de89b21f 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -59,7 +59,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d + modulesloaddir := $(systemd_prefix)lib/modules-load.d + libudevdir := $(systemd_prefix)lib/udev + udevrulesdir := $(libudevdir)/rules.d +-bindir := $(exec_prefix)sbin ++bindir := $(exec_prefix)/usr/sbin + mandir := $(usr_prefix)share/man + LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib) + syslibdir := $(prefix)$(LIB) +diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules +index 1969dee0..d2b28233 100644 +--- a/kpartx/kpartx.rules ++++ b/kpartx/kpartx.rules +@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end" + GOTO="kpartx_end" + + LABEL="run_kpartx" +-RUN+="/sbin/kpartx -un -p -part /dev/$name" ++RUN+="/sbin/kpartx -un /dev/$name" + + LABEL="kpartx_end" +diff --git a/multipath/Makefile b/multipath/Makefile +index 67fb5e62..2ea9e528 100644 +--- a/multipath/Makefile ++++ b/multipath/Makefile +@@ -27,7 +27,7 @@ install: + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 99-z-dm-mpath-late.rules $(DESTDIR)$(udevrulesdir) +- $(Q)$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules ++ $(Q)$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/multipath.conf + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)/man8 +@@ -50,7 +50,7 @@ uninstall: + $(Q)$(RM) $(DESTDIR)$(udevrulesdir)/99-z-dm-mpath-late.rules + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf +- $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules ++ $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules + $(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8 + $(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5 + $(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch b/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch deleted file mode 100644 index cf97b491e1..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5ae81386a8cfea4180738c261cd3f7944a631199 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 3 Jun 2020 16:03:56 -0700 -Subject: [PATCH] fix boolean value with json-c 0.14 - -Patch from Christian Hesse posted here -https://www.spinics.net/lists/dm-devel/msg40646.html - -Upstream json-c 0.14+ removed the TRUE and FALSE defines in commit -0992aac61f8b087efd7094e9ac2b84fa9c040fcd. - -Upstream-Status: Submitted [https://www.spinics.net/lists/dm-devel/msg40646.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - libdmmp/libdmmp_private.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h -index ac85b63f..29400826 100644 ---- a/libdmmp/libdmmp_private.h -+++ b/libdmmp/libdmmp_private.h -@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \ - do { \ - json_type j_type = json_type_null; \ - json_object *j_obj_tmp = NULL; \ -- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \ -+ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \ - _error(ctx, "Invalid JSON output from multipathd IPC: " \ - "key '%s' not found", key); \ - rc = DMMP_ERR_IPC_ERROR; \ -@@ -90,7 +90,7 @@ do { \ - } \ - if (j_obj_tmp == NULL) { \ - _error(ctx, "BUG: Got NULL j_obj_tmp from " \ -- "json_object_object_get_ex() while it return TRUE"); \ -+ "json_object_object_get_ex() while it return 1"); \ - rc = DMMP_ERR_BUG; \ - goto out; \ - } \ --- -2.27.0 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch deleted file mode 100644 index ac87337694..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0001-fix-bug-of-do_compile-and-do_install.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fd90d952edaa4b27e62a29fdba7a201288d440eb Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@cn.fujitsu.com> -Date: Sun, 10 May 2020 21:22:53 +0800 -Subject: [PATCH] fix bug of do_compile and do_install - -when multiple processes make run in parallel, -because of dependency error will occur. - -Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> ---- - Makefile | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 1dee3680..bea0a0b2 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,9 +28,22 @@ all: $(BUILDDIRS) - $(BUILDDIRS): - $(MAKE) -C $@ - --multipath multipathd mpathpersist: libmultipath -+multipath multipathd mpathpersist libmpathpersist : libmultipath - mpathpersist: libmpathpersist - -+DEPS_ON_MULTIPATH := \ -+ multipath \ -+ libmultipath/prioritizers \ -+ libmultipath/checkers \ -+ libmultipath/foreign \ -+ multipathd \ -+ mpathpersist \ -+ libmpathpersist -+ -+$(DEPS_ON_MULTIPATH:=.install): libmultipath.install -+mpathpersist.install: libmpathpersist.install -+libdmmp.install libmultipath/foreign.install: mpathpersist.install -+ - $(BUILDDIRS.clean): - $(MAKE) -C ${@:.clean=} clean - --- -2.17.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch new file mode 100644 index 0000000000..0365a7ef64 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch @@ -0,0 +1,42 @@ +From 389286b25a903be62ce7f964246824fcc20c4c67 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 26 Mar 2024 18:56:55 -0700 +Subject: [PATCH] libmultipath: always use glibc basename() + +There is a use of basename() which expects it to be GNU version of +basename, which is not available in other libcs e.g. musl on Linux +therefore provide a version for such cases + +Upstream-Status: Submitted [https://github.com/opensvc/multipath-tools/pull/84] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libmultipath/configure.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/libmultipath/configure.c b/libmultipath/configure.c +index 4ecf6ba4..e81cc67c 100644 +--- a/libmultipath/configure.c ++++ b/libmultipath/configure.c +@@ -43,6 +43,19 @@ + #include "sysfs.h" + #include "io_err_stat.h" + ++#ifndef __GLIBC__ ++/* ++ * glibc's non-destructive version of basename() ++ * License: LGPL-2.1-or-later ++ */ ++static const char *__basename(const char *filename) ++{ ++ char *p = strrchr(filename, '/'); ++ return p ? p + 1 : filename; ++} ++#define basename(x) __basename(x) ++#endif ++ + /* group paths in pg by host adapter + */ + int group_by_host_adapter(struct pathgroup *pgp, vector adapters) +-- +2.44.0 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch index 21b8ec6b06..4b24bd2d35 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0022-RH-Remove-the-property-blacklist-exception-builtin.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch @@ -1,7 +1,7 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 -00:00:00 2001 From:Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 2 Jul -2014 12:49:53 -0500 Subject: [PATCH] RH: Remove the property blacklist -exception builtin +From bb6db01cc19940bb5162c1cc0c9b5f8e4c209822 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 1 Mar 2024 10:34:06 +0800 +Subject: [PATCH 02/12] RH: Remove the property blacklist exception builtin Multipath set the default property blacklist exceptions to (ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal @@ -15,30 +15,38 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upsteam-Status: Pending -Update patch to 0.8.2 +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Upstream-Status: Pending --- - libmultipath/blacklist.c | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) + libmultipath/blacklist.c | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c -index 00e8dbd..5204501 100644 +index 75100b20..4fdaca76 100644 --- a/libmultipath/blacklist.c +++ b/libmultipath/blacklist.c -@@ -192,12 +192,6 @@ setup_default_blist (struct config * conf) - char * str; +@@ -221,15 +221,6 @@ setup_default_blist (struct config * conf) + struct hwentry *hwe; int i; -- str = STRDUP("^(ram|zram|raw|loop|fd|md|dm-|sr|scd|st|dcssblk)[0-9]"); -- if (!str) -- return 1; -- if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) -- return 1; -- - str = STRDUP("^(td|hd|vd)[a-z]"); - if (!str) +- if (nvme_multipath_enabled()) { +- if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z])", +- ORIGIN_DEFAULT)) +- return 1; +- } else { +- if (store_ble(conf->blist_devnode, "!^(sd[a-z]|dasd[a-z]|nvme[0-9])", +- ORIGIN_DEFAULT)) +- return 1; +- } + if (store_ble(conf->elist_property, "(SCSI_IDENT_|ID_WWN)", ORIGIN_DEFAULT)) return 1; -@@ -437,8 +431,11 @@ filter_property(struct config *conf, struct udev_device *udev, int lvl, + +@@ -464,8 +455,11 @@ filter_property(const struct config *conf, struct udev_device *udev, r = MATCH_NOTHING; } @@ -53,5 +61,5 @@ index 00e8dbd..5204501 100644 static void free_ble(struct blentry *ble) -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch index ea6137f878..54b3bdc863 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0023-RH-don-t-start-without-a-config-file.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch @@ -1,10 +1,7 @@ -From 0bf8ff8dab26201b268b419809844c07e168f17d Mon Sep 17 00:00:00 2001 +From de8ee3480ec7479ed014c197a9d747403f6e0237 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Fri, 23 Nov 2018 17:25:15 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, 15 - Oct 2014 10:39:30 -0500 Subject: [PATCH] RH: don't start without a config - file +Subject: [PATCH 03/12] RH: don't start without a config file If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist all devices when running multipath. A completely blank configuration file @@ -17,32 +14,35 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upstream-Status: Pending -update this patch to new version +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - libmultipath/config.c | 18 ++++++++++++++++++ - libmultipath/config.h | 1 + - multipath/multipath.rules | 1 + - multipathd/multipathd.8 | 2 ++ - multipathd/multipathd.service | 1 + + libmultipath/config.c | 18 ++++++++++++++++++ + libmultipath/config.h | 1 + + multipath/multipath.rules.in | 1 + + multipathd/multipathd.8.in | 2 ++ + multipathd/multipathd.service.in | 1 + 5 files changed, 23 insertions(+) diff --git a/libmultipath/config.c b/libmultipath/config.c -index 5af7af5..e4233f1 100644 +index 83fa7369..8a3a8f37 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -26,6 +26,7 @@ - #include "devmapper.h" #include "mpath_cmd.h" #include "propsel.h" + #include "foreign.h" +#include "version.h" - static int - hwe_strmatch (const struct hwentry *hwe1, const struct hwentry *hwe2) -@@ -743,6 +745,23 @@ load_config (char * file) - goto out; + /* + * We don't support re-initialization after +@@ -959,6 +960,23 @@ int _init_config (const char *file, struct config *conf) } factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); + validate_pctable(conf->overrides, 0, file); + } else { + condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); + if (conf->blist_devnode == NULL) { @@ -64,21 +64,21 @@ index 5af7af5..e4233f1 100644 conf->processed_main_config = 1; diff --git a/libmultipath/config.h b/libmultipath/config.h -index 7d0cd9a..d7fb8e2 100644 +index 384193ab..158cebf0 100644 --- a/libmultipath/config.h +++ b/libmultipath/config.h -@@ -9,6 +9,7 @@ +@@ -10,6 +10,7 @@ #define ORIGIN_DEFAULT 0 #define ORIGIN_CONFIG 1 +#define ORIGIN_NO_CONFIG 2 - /* - * In kernel, fast_io_fail == 0 means immediate failure on rport delete. -diff --git a/multipath/multipath.rules b/multipath/multipath.rules -index 9df11a9..0486bf7 100644 ---- a/multipath/multipath.rules -+++ b/multipath/multipath.rules + enum devtypes { + DEV_NONE, +diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in +index 780bf852..2c518378 100644 +--- a/multipath/multipath.rules.in ++++ b/multipath/multipath.rules.in @@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath" ENV{nompath}=="?*", GOTO="end_mpath" IMPORT{cmdline}="multipath" @@ -87,31 +87,31 @@ index 9df11a9..0486bf7 100644 ENV{DEVTYPE}!="partition", GOTO="test_dev" IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH" -diff --git a/multipathd/multipathd.8 b/multipathd/multipathd.8 -index 94c3f97..ed13efd 100644 ---- a/multipathd/multipathd.8 -+++ b/multipathd/multipathd.8 -@@ -38,6 +38,8 @@ map regains its maximum performance and redundancy. - This daemon executes the external \fBmultipath\fR tool when events occur. - In turn, the multipath tool signals the multipathd daemon when it is done with - devmap reconfiguration, so that it can refresh its failed path list. +diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in +index f1cab3ff..5ae21db1 100644 +--- a/multipathd/multipathd.8.in ++++ b/multipathd/multipathd.8.in +@@ -49,6 +49,8 @@ map regains its maximum performance and redundancy. + With the \fB-k\fR option, \fBmultipathd\fR acts as a client utility that + sends commands to a running instance of the multipathd daemon (see + \fBCOMMANDS\fR below). + +In this Linux distribution, multipathd does not run unless a /etc/multipath.conf file exists. . . .\" ---------------------------------------------------------------------------- -diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service -index ba24983..17434ce 100644 ---- a/multipathd/multipathd.service -+++ b/multipathd/multipathd.service -@@ -4,6 +4,7 @@ Wants=systemd-udev-trigger.service systemd-udev-settle.service - Before=iscsi.service iscsid.service lvm2-activation-early.service - Before=local-fs-pre.target blk-availability.service - After=multipathd.socket systemd-udev-trigger.service systemd-udev-settle.service +diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in +index 6d03ff71..0cd85102 100644 +--- a/multipathd/multipathd.service.in ++++ b/multipathd/multipathd.service.in +@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target + Wants=systemd-udevd-kernel.socket @MODPROBE_UNIT@ + After=systemd-udevd-kernel.socket @MODPROBE_UNIT@ + After=multipathd.socket systemd-remount-fs.service +ConditionPathExists=/etc/multipath.conf + Before=initrd-cleanup.service DefaultDependencies=no Conflicts=shutdown.target - ConditionKernelCommandLine=!nompath -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch new file mode 100644 index 0000000000..91477a44cb --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch @@ -0,0 +1,55 @@ +From f1b74f21875d6d9f0a5ac3d67df40a28b167052a Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 26 Nov 2018 09:19:17 +0800 +Subject: [PATCH 04/12] RH: use rpm optflags if present + +Use the passed in optflags when compiling as an RPM, and keep the +default flags as close as possible to the current fedora flags, while +still being generic. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Makefile.inc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/Makefile.inc b/Makefile.inc +index de89b21f..6ac632ff 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -95,7 +95,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo + MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \ + echo "modprobe@dm_multipath.service") + +-OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 ++ifndef RPM_OPT_FLAGS ++ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 ++else ++ OPTFLAGS = $(RPM_OPT_FLAGS) ++endif ++OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=0 -Werror=implicit-int \ ++ -Werror=implicit-function-declaration -Wno-sign-compare \ ++ -Wno-unused-parameter -Werror=cast-qual \ ++ -Werror=discarded-qualifiers + WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ + -Werror=implicit-function-declaration -Werror=format-security \ + $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) +@@ -105,7 +113,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \ + -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(configdir)\" \ + -DDEFAULT_CONFIGFILE=\"$(configfile)\" -DSTATE_DIR=\"$(statedir)\" \ + -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP +-CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe ++CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe + BIN_CFLAGS := -fPIE -DPIE + LIB_CFLAGS := -fPIC + SHARED_FLAGS := -shared +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch index a1407718d5..c6089612b3 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0025-RH-add-mpathconf.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch @@ -1,9 +1,7 @@ -From eb5a36e6e0caedf06008e48eb77b7bf7c6534ee5 Mon Sep 17 00:00:00 2001 +From 8f52504859704466667e042baf437c2b6272ffb9 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 26 Nov 2018 09:55:12 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Thu, 16 - Oct 2014 15:49:01 -0500 Subject: [PATCH] RH: add mpathconf +Subject: [PATCH 05/12] RH: add mpathconf mpathconf is a program (largely based on lvmcomf) to help users configure /etc/multipath.conf and enable or disable multipathing. It @@ -16,24 +14,26 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upstream-Status: Pending -update this patch to new version +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> +Rebase to 0.9.8 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- libmultipath/config.c | 1 + - multipath/Makefile | 5 + - multipath/mpathconf | 464 ++++++++++++++++++++++++++++++++++++++++++++++++++ - multipath/mpathconf.8 | 101 +++++++++++ - 4 files changed, 571 insertions(+) + multipath/Makefile | 4 + + multipath/mpathconf | 464 ++++++++++++++++++++++++++++++++++++++++++ + multipath/mpathconf.8 | 101 +++++++++ + 4 files changed, 570 insertions(+) create mode 100644 multipath/mpathconf create mode 100644 multipath/mpathconf.8 diff --git a/libmultipath/config.c b/libmultipath/config.c -index e4233f1..b779505 100644 +index 8a3a8f37..a40b41ab 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c -@@ -747,6 +747,7 @@ load_config (char * file) - factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); +@@ -962,6 +962,7 @@ int _init_config (const char *file, struct config *conf) + validate_pctable(conf->overrides, 0, file); } else { condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); + condlog(0, "You can run /sbin/mpathconf to create or modify /etc/multipath.conf"); @@ -41,42 +41,39 @@ index e4233f1..b779505 100644 conf->blist_devnode = vector_alloc(); if (!conf->blist_devnode) { diff --git a/multipath/Makefile b/multipath/Makefile -index b9bbb3c..e720c7f 100644 +index 2ea9e528..6b1fa09e 100644 --- a/multipath/Makefile +++ b/multipath/Makefile -@@ -18,10 +18,12 @@ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so - $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS) - $(GZIP) $(EXEC).8 > $(EXEC).8.gz - $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz -+ $(GZIP) mpathconf.8 > mpathconf.8.gz - +@@ -24,6 +24,7 @@ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ -+ $(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) - $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules -@@ -29,13 +31,16 @@ install: - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) -+ $(INSTALL_PROGRAM) -m 644 mpathconf.8.gz $(DESTDIR)$(man8dir) - - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules - $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules -+ $(RM) $(DESTDIR)$(bindir)/mpathconf - $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz - $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz -+ $(RM) $(DESTDIR)$(man8dir)/mpathconf.8.gz + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(Q)$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ ++ $(Q)$(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) + $(Q)$(INSTALL_PROGRAM) -m 644 99-z-dm-mpath-late.rules $(DESTDIR)$(udevrulesdir) +@@ -34,6 +35,7 @@ install: + $(Q)$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)/man8 + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)/man5 + $(Q)$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(mandir)/man5 ++ $(Q)$(INSTALL_PROGRAM) -m 644 mpathconf.8 $(DESTDIR)$(mandir)/man8 + $(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(modulesloaddir) + ifeq ($(MODPROBE_UNIT),) + $(Q)$(INSTALL_PROGRAM) -m 644 modules-load.conf $(DESTDIR)$(modulesloaddir)/multipath.conf +@@ -51,8 +53,10 @@ uninstall: + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf + $(Q)$(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf + $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules ++ $(Q)$(RM) $(DESTDIR)$(bindir)/mpathconf + $(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8 + $(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5 ++ $(Q)$(RM) $(DESTDIR)$(mandir)/man8/mpathconf.8 + $(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf clean: dep_clean - $(RM) core *.o $(EXEC) *.gz diff --git a/multipath/mpathconf b/multipath/mpathconf new file mode 100644 -index 0000000..e839134 +index 00000000..e8391347 --- /dev/null +++ b/multipath/mpathconf @@ -0,0 +1,464 @@ @@ -546,7 +543,7 @@ index 0000000..e839134 +fi diff --git a/multipath/mpathconf.8 b/multipath/mpathconf.8 new file mode 100644 -index 0000000..4cd3267 +index 00000000..4cd32672 --- /dev/null +++ b/multipath/mpathconf.8 @@ -0,0 +1,101 @@ @@ -652,5 +649,5 @@ index 0000000..4cd3267 +.SH AUTHOR +Benjamin Marzinski <bmarzins@redhat.com> -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch index 5fd6d668e2..8df7de3b48 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch @@ -1,13 +1,7 @@ -From 0f54b3120ca06ff3168cdbf901a27b68c4638398 Mon Sep 17 00:00:00 2001 +From f93248d8e3598ccdc42b6d639107917c9cda268c Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 26 Sep 2019 16:29:48 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep -17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Fri, -17 - Oct 2014 11:20:34 -0500 Subject: [PATCH] RH: add wwids from kernel -cmdline - mpath.wwids with -A +Subject: [PATCH 06/12] RH: add wwids from kernel cmdline mpath.wwids with -A This patch adds another option to multipath, "-A", which reads /proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds @@ -22,8 +16,10 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upstream-Status: Pending -Update this patch to new version 0.8.2 +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> +Rebase to 0.9.8 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- libmultipath/wwids.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ @@ -31,13 +27,13 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 2 files changed, 45 insertions(+) diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c -index 28a2150d..a0bfa851 100644 +index 591cd09b..b01f1b85 100644 --- a/libmultipath/wwids.c +++ b/libmultipath/wwids.c -@@ -454,3 +454,47 @@ int op ## _wwid(const char *wwid) \ - declare_failed_wwid_op(is_failed, false) - declare_failed_wwid_op(mark_failed, true) - declare_failed_wwid_op(unmark_failed, true) +@@ -439,3 +439,47 @@ int unmark_failed_wwid(const char *wwid) + print_failed_wwid_result("unmark_failed", wwid, r); + return r; + } + +int remember_cmdline_wwid(void) +{ @@ -95,5 +91,5 @@ index 0c6ee54d..e32a0b0e 100644 enum { WWID_IS_NOT_FAILED = 0, -- -2.17.1 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch new file mode 100644 index 0000000000..c64b8aeabc --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch @@ -0,0 +1,105 @@ +From 49d0b0279f54ceb96878e8e72e828efbb84a534c Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Fri, 1 Mar 2024 11:45:10 +0800 +Subject: [PATCH 07/12] RH: warn on invalid regex instead of failing + +multipath.conf used to allow "*" as a match everything regular expression, +instead of requiring ".*". Instead of erroring when the old style +regular expressions are used, it should print a warning and convert +them. + +Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> + +Upstream-Status: Pending + +[OP: Rebase to 0.9.3] +[OP: adjusted FREE() -> free(), made set_regex_value() static] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + libmultipath/dict.c | 40 ++++++++++++++++++++++++++++++++++------ + 1 file changed, 34 insertions(+), 6 deletions(-) + +diff --git a/libmultipath/dict.c b/libmultipath/dict.c +index 5af036b7..e494419d 100644 +--- a/libmultipath/dict.c ++++ b/libmultipath/dict.c +@@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr) + return 0; + } + ++static void * ++set_regex_value(vector strvec) ++{ ++ char *buff = set_value(strvec); ++ ++ if (buff && strcmp("*", buff) == 0) { ++ condlog(0, "Invalid regular expression \"*\" in multipath.conf. Using \".*\""); ++ free(buff); ++ return strdup(".*"); ++ } ++ return buff; ++} ++ ++static int ++set_regex(vector strvec, void *ptr, const char *file, int line_nr) ++{ ++ char **str_ptr = (char **)ptr; ++ ++ if (*str_ptr) ++ free(*str_ptr); ++ *str_ptr = set_regex_value(strvec); ++ ++ if (!*str_ptr) ++ return 1; ++ ++ return 0; ++} ++ + static int + set_yes_no(vector strvec, void *ptr, const char *file, int line_nr) + { +@@ -1798,7 +1826,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \ + if (!conf->option) \ + return 1; \ + \ +- buff = set_value(strvec); \ ++ buff = set_regex_value(strvec); \ + if (!buff) \ + return 1; \ + \ +@@ -1818,7 +1846,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \ + if (!conf->option) \ + return 1; \ + \ +- buff = set_value(strvec); \ ++ buff = set_regex_value(strvec); \ + if (!buff) \ + return 1; \ + \ +@@ -1924,16 +1952,16 @@ device_handler(struct config *conf, vector strvec, const char *file, + return 0; + } + +-declare_hw_handler(vendor, set_str) ++declare_hw_handler(vendor, set_regex) + declare_hw_snprint(vendor, print_str) + +-declare_hw_handler(product, set_str) ++declare_hw_handler(product, set_regex) + declare_hw_snprint(product, print_str) + +-declare_hw_handler(revision, set_str) ++declare_hw_handler(revision, set_regex) + declare_hw_snprint(revision, print_str) + +-declare_hw_handler(bl_product, set_str) ++declare_hw_handler(bl_product, set_regex) + declare_hw_snprint(bl_product, print_str) + + declare_hw_arg_str_handler(hwhandler, 0) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0028-RH-reset-default-find_mutipaths-value-to-off.patch b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch index ad03b8acc4..1fa1f3be27 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0028-RH-reset-default-find_mutipaths-value-to-off.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch @@ -1,10 +1,7 @@ -From 16900150e02e5b367a8b33621b393975ad011130 Mon Sep 17 00:00:00 2001 +From fcba3e0d4c8448a2510025acb255c7335413bf56 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 26 Nov 2018 11:12:01 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep 17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Thu, 7 Jun - 2018 17:43:52 -0500 Subject: [PATCH] RH: reset default find_mutipaths value - to off +Subject: [PATCH 08/12] RH: reset default find_mutipaths value to off Upstream has changed to default find_multipaths to "strict". For now Redhat will retain the previous default of "off". @@ -13,18 +10,17 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Upstream-Status: Pending -Update this patch to new version - +Rebase to 0.9.8 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- libmultipath/defaults.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h -index 6576939..a2404b2 100644 +index 64b633f2..a06a8a41 100644 --- a/libmultipath/defaults.h +++ b/libmultipath/defaults.h -@@ -17,7 +17,7 @@ +@@ -23,7 +23,7 @@ #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF #define DEFAULT_VERBOSITY 2 #define DEFAULT_REASSIGN_MAPS 0 @@ -34,5 +30,5 @@ index 6576939..a2404b2 100644 #define DEFAULT_DEV_LOSS_TMO 600 #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON -- -2.7.4 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch new file mode 100644 index 0000000000..041b79a9af --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch @@ -0,0 +1,40 @@ +From 7452549e572b1c40aefe25524bf4bbbf34c952e5 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 4 Jun 2019 11:39:39 +0800 +Subject: [PATCH 09/12] multipath-tools: modify create-config.mk for + cross-compilation + +Do not look for systemd info on the host, and allow us to pass in CFLAGS +using the OPTFLAGS variable. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + create-config.mk | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/create-config.mk b/create-config.mk +index 4d318b96..a65975ba 100644 +--- a/create-config.mk ++++ b/create-config.mk +@@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0) + DEFINES += -DNO_DMEVENTS_POLL + endif + +-SYSTEMD := $(strip $(or $(shell $(PKG_CONFIG) --modversion libsystemd 2>/dev/null | awk '{print $$1}'), \ +- $(shell systemctl --version 2>/dev/null | sed -n 's/systemd \([0-9]*\).*/\1/p'))) +- +- + # $(call TEST_CC_OPTION,option,fallback) + # Test if the C compiler supports the option. + # Evaluates to "option" if yes, and "fallback" otherwise. +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch new file mode 100644 index 0000000000..b48720b8a1 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch @@ -0,0 +1,72 @@ +From 5d2fa3c5975266a6c02214afa6254e6eeeb1baad Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 26 Nov 2018 11:17:41 +0800 +Subject: [PATCH 10/12] Subject: [PATCH] Always use devmapper + +Do not try to compute several _API_ make variables +from host information when cross-compiling. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Aws Ismail <aws.ismail@windriver.com> +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Rebase to 0.9.8 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + create-config.mk | 36 ++++++++---------------------------- + 1 file changed, 8 insertions(+), 28 deletions(-) + +diff --git a/create-config.mk b/create-config.mk +index a65975ba..8ba592f4 100644 +--- a/create-config.mk ++++ b/create-config.mk +@@ -79,34 +79,14 @@ URCU_VERSION = $(shell \ + + DEFINES := + +-ifneq ($(call check_func,dm_task_no_flush,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_FLUSH +-endif +- +-ifneq ($(call check_func,dm_task_get_errno,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_GET_ERRNO +-endif +- +-ifneq ($(call check_func,dm_task_set_cookie,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_COOKIE +-endif +- +-ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(libudev_incdir)/libudev.h),0) +- DEFINES += LIBUDEV_API_RECVBUF +-endif +- +-ifneq ($(call check_func,dm_task_deferred_remove,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_DEFERRED +-endif +- +-ifneq ($(call check_func,dm_hold_control_dev,$(devmapper_incdir)/libdevmapper.h),0) +- DEFINES += LIBDM_API_HOLD_CONTROL +-endif +- +-ifneq ($(call check_var,ELS_DTAG_LNK_INTEGRITY,$(kernel_incdir)/scsi/fc/fc_els.h),0) +- DEFINES += FPIN_EVENT_HANDLER +- FPIN_SUPPORT = 1 +-endif ++DEFINES += LIBDM_API_FLUSH ++DEFINES += LIBDM_API_GET_ERRNO ++DEFINES += LIBDM_API_COOKIE ++DEFINES += LIBUDEV_API_RECVBUF ++DEFINES += LIBDM_API_DEFERRED ++DEFINES += LIBDM_API_HOLD_CONTROL ++DEFINES += FPIN_EVENT_HANDLER ++FPIN_SUPPORT = 1 + + libmount_h := $(shell $(PKG_CONFIG) --variable=includedir mount)/libmount/libmount.h + ifneq ($(call check_func,mnt_unref_cache,$(libmount_h)),0) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch new file mode 100644 index 0000000000..abaea2cfb6 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch @@ -0,0 +1,43 @@ +From 949070286692dfff89213792571da233fe82e440 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@cn.fujitsu.com> +Date: Sun, 10 May 2020 21:22:53 +0800 +Subject: [PATCH 11/12] fix bug of do_compile and do_install + +when multiple processes make run in parallel, +because of dependency error will occur. + +Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> + +[OP: Rebase to 0.9.3] +[OP: Drop dependencies that are already present in the 0.9.3 Makefile] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> + +Upstream-Status: Pending +--- + Makefile | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/Makefile b/Makefile +index 4df5f161..065249c2 100644 +--- a/Makefile ++++ b/Makefile +@@ -91,6 +91,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath + libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath + mpathpersist multipathd: libmpathpersist + ++DEPS_ON_MULTIPATH := \ ++ multipath \ ++ multipathd \ ++ mpathpersist \ ++ libmpathpersist ++ ++$(DEPS_ON_MULTIPATH:=.install): libmultipath.install ++mpathpersist.install: libmpathpersist.install ++libdmmp.install libmultipath/foreign.install: mpathpersist.install ++ + libmultipath/checkers.install \ + libmultipath/prioritizers.install \ + libmultipath/foreign.install: libmultipath.install +-- +2.25.1 + diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch index 2827bb8745..2f774940d6 100644 --- a/meta-oe/recipes-support/multipath-tools/files/0001-add-explicit-dependency-on-libraries.patch +++ b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch @@ -1,7 +1,7 @@ -From 04884263d1de8c427a7a15bd1cf6466ea65d3a0b Mon Sep 17 00:00:00 2001 +From 7a46f43682641436464579d8bf76c382e71ea557 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 25 May 2020 23:22:55 -0700 -Subject: [PATCH] add explicit dependency on libraries +Subject: [PATCH 12/12] add explicit dependency on libraries [snip] gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist @@ -17,24 +17,24 @@ ln -sf libmpathpersist.so.0 libmpathpersist.so Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +[OP: Rebase to 0.9.3] +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> --- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + Makefile | 1 + + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index bea0a0b2..37a77129 100644 +index 065249c2..0444c2ea 100644 --- a/Makefile +++ b/Makefile -@@ -29,7 +29,8 @@ $(BUILDDIRS): - $(MAKE) -C $@ - - multipath multipathd mpathpersist libmpathpersist : libmultipath --mpathpersist: libmpathpersist -+mpathpersist multipathd: libmpathpersist -+libdmmp libmultipath mpathpersist multipath multipathd: libmpathcmd +@@ -90,6 +90,7 @@ libmultipath: libmpathutil + libmpathpersist libmpathvalid multipath multipathd: libmultipath + libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath + mpathpersist multipathd: libmpathpersist ++libmultipath mpathpersist multipath multipathd: libmpathcmd DEPS_ON_MULTIPATH := \ multipath \ -- -2.21.0 +2.25.1 diff --git a/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch deleted file mode 100644 index e88e25617d..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0021-RH-fixup-udev-rules-for-redhat.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Benjamin Marzinski <bmarzins@redhat.com> -Date: Thu, 13 Apr 2017 07:22:23 -0500 -Subject: [PATCH] RH: fixup udev rules for redhat - -The multipath rules need to run after scsi_id is run. This means moving -them after 60-persistent-storage.rules for redhat. Redhat also uses a -different naming scheme for partitions than SuSE. Also, there are some -false warnings that gcc throws because of the changed options. Fix these -too. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> - -Update patch to 0.8.0 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - Makefile.inc | 2 +- - kpartx/kpartx.rules | 2 +- - multipath/Makefile | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index fc728ca..2f0bcea 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -48,7 +48,7 @@ endif - prefix = - exec_prefix = $(prefix) - usr_prefix = $(prefix) --bindir = $(exec_prefix)/sbin -+bindir = $(exec_prefix)/usr/sbin - libudevdir = $(prefix)/$(SYSTEMDPATH)/udev - udevrulesdir = $(libudevdir)/rules.d - multipathdir = $(TOPDIR)/libmultipath -diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules -index 8f99049..8a3a171 100644 ---- a/kpartx/kpartx.rules -+++ b/kpartx/kpartx.rules -@@ -32,6 +32,6 @@ LABEL="mpath_kpartx_end" - GOTO="kpartx_end" - - LABEL="run_kpartx" --RUN+="/sbin/kpartx -un -p -part /dev/$name" -+RUN+="/sbin/kpartx -un /dev/$name" - - LABEL="kpartx_end" -diff --git a/multipath/Makefile b/multipath/Makefile -index 0828a8f..b9bbb3c 100644 ---- a/multipath/Makefile -+++ b/multipath/Makefile -@@ -24,7 +24,7 @@ install: - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) - $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) -@@ -33,7 +33,7 @@ install: - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules -- $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules -+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules - $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz - $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz - --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch deleted file mode 100644 index 17542fd4fd..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0024-RH-use-rpm-optflags-if-present.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 436f7594485e35523269e662c4b5dc3a2c10ff9b Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 26 Nov 2018 09:19:17 +0800 -Subject: [PATCH] From 0000000000000000000000000000000000000000 Mon Sep -17 - 00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Wed, -19 - Apr 2017 06:10:01 -0500 Subject: [PATCH] RH: use rpm optflags if -present - -Use the passed in optflags when compiling as an RPM, and keep the -default flags as close as possible to the current fedora flags, while -still being generic. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> - -Upstream-Status: Pending - -update this patch to new version - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - Makefile.inc | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index 42dbb5bf..55a06c60 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -89,15 +89,23 @@ TEST_CC_OPTION = $(shell \ - echo "$(2)"; \ - fi) - --STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) --ERROR_DISCARDED_QUALIFIERS := $(call TEST_CC_OPTION,-Werror=discarded-qualifiers,) --WNOCLOBBERED := $(call TEST_CC_OPTION,-Wno-clobbered,) -+ifndef RPM_OPT_FLAGS -+ STACKPROT := $(call TEST_CC_OPTION,-fstack-protector-strong,-fstack-protector) -+ OPTFLAGS = -O2 -g -pipe -Wall -Werror=format-security \ -+ -Wp,-D_FORTIFY_SOURCE=2 -fexceptions \ -+ $(STACKPROT) --param=ssp-buffer-size=4 \ -+ -grecord-gcc-switches -+ ifeq ($(shell test -f /usr/lib/rpm/redhat/redhat-hardened-cc1 && echo 1),1) -+ OPTFLAGS += -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -+ endif -+else -+ OPTFLAGS = $(RPM_OPT_FLAGS) -+endif -+OPTFLAGS += -Wextra -Wstrict-prototypes -Wformat=2 -Werror=implicit-int \ -+ -Werror=implicit-function-declaration -Wno-sign-compare \ -+ -Wno-unused-parameter -Werror=cast-qual \ -+ -Werror=discarded-qualifiers - --OPTFLAGS = -O2 -g -pipe -Werror -Wall -Wextra -Wformat=2 -Werror=implicit-int \ -- -Werror=implicit-function-declaration -Werror=format-security \ -- $(WNOCLOBBERED) \ -- -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) \ -- $(STACKPROT) --param=ssp-buffer-size=4 - CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 - CFLAGS := $(OPTFLAGS) -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ - -MMD -MP $(CFLAGS) --- -2.17.1 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch deleted file mode 100644 index c59edbbb27..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0027-RH-warn-on-invalid-regex-instead-of-failing.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 -00:00:00 2001 From: Benjamin Marzinski <bmarzins@redhat.com> Date: Mon, 6 Nov -2017 21:39:28 -0600 Subject: [PATCH] RH: warn on invalid regex instead of -failing - -multipath.conf used to allow "*" as a match everything regular expression, -instead of requiring ".*". Instead of erroring when the old style -regular expressions are used, it should print a warning and convert -them. - -Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> - -Upstream-Status: Pending - -update this patch to 0.8.2 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - libmultipath/dict.c | 29 ++++++++++++++++++++++------- - libmultipath/parser.c | 13 +++++++++++++ - libmultipath/parser.h | 1 + - 3 files changed, 36 insertions(+), 7 deletions(-) - -diff --git a/libmultipath/dict.c b/libmultipath/dict.c -index c6eba0f..05ed3d8 100644 ---- a/libmultipath/dict.c -+++ b/libmultipath/dict.c -@@ -59,6 +59,21 @@ set_str(vector strvec, void *ptr) - } - - static int -+set_regex(vector strvec, void *ptr) -+{ -+ char **str_ptr = (char **)ptr; -+ -+ if (*str_ptr) -+ FREE(*str_ptr); -+ *str_ptr = set_regex_value(strvec); -+ -+ if (!*str_ptr) -+ return 1; -+ -+ return 0; -+} -+ -+static int - set_yes_no(vector strvec, void *ptr) - { - char * buff; -@@ -1415,8 +1430,8 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ - \ - if (!conf->option) \ - return 1; \ -- \ -- buff = set_value(strvec); \ -+ \ -+ buff = set_regex_value(strvec); \ - if (!buff) \ - return 1; \ - \ -@@ -1432,7 +1447,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ - if (!conf->option) \ - return 1; \ - \ -- buff = set_value(strvec); \ -+ buff = set_regex_value(strvec); \ - if (!buff) \ - return 1; \ - \ -@@ -1535,16 +1550,16 @@ device_handler(struct config *conf, vector strvec) - return 0; - } - --declare_hw_handler(vendor, set_str) -+declare_hw_handler(vendor, set_regex) - declare_hw_snprint(vendor, print_str) - --declare_hw_handler(product, set_str) -+declare_hw_handler(product, set_regex) - declare_hw_snprint(product, print_str) - --declare_hw_handler(revision, set_str) -+declare_hw_handler(revision, set_regex) - declare_hw_snprint(revision, print_str) - --declare_hw_handler(bl_product, set_str) -+declare_hw_handler(bl_product, set_regex) - declare_hw_snprint(bl_product, print_str) - - declare_hw_handler(hwhandler, set_str) -diff --git a/libmultipath/parser.c b/libmultipath/parser.c -index e00c5ff..6ca5842 100644 ---- a/libmultipath/parser.c -+++ b/libmultipath/parser.c -@@ -382,6 +382,19 @@ oom: - return NULL; - } - -+void * -+set_regex_value(vector strvec) -+{ -+ char *buff = set_value(strvec); -+ -+ if (buff && strcmp("*", buff) == 0) { -+ condlog(0, "Invalid regular expression \"*\" in multipath.conf. Using \".*\""); -+ FREE(buff); -+ return strdup(".*"); -+ } -+ return buff; -+} -+ - /* non-recursive configuration stream handler */ - static int kw_level = 0; - -diff --git a/libmultipath/parser.h b/libmultipath/parser.h -index 62906e9..b791705 100644 ---- a/libmultipath/parser.h -+++ b/libmultipath/parser.h -@@ -77,6 +77,7 @@ extern void dump_keywords(vector keydump, int level); - extern void free_keywords(vector keywords); - extern vector alloc_strvec(char *string); - extern void *set_value(vector strvec); -+extern void *set_regex_value(vector strvec); - extern int process_file(struct config *conf, char *conf_file); - extern struct keyword * find_keyword(vector keywords, vector v, char * name); - int snprint_keyword(char *buff, int len, char *fmt, struct keyword *kw, --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch b/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch deleted file mode 100644 index 3919f99045..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c3436ec8a502a40579abf62be0a479fa9d7888ad Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 4 Jun 2019 11:39:39 +0800 -Subject: [PATCH] multipath-tools: modify Makefile.inc for cross-compilation - -Do not look for systemd info on the host, and allow us to pass in CFLAGS -using the OPTFLAGS variable. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -Update for version 0.5.0-144-g770e6d0 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -Update for version 0.7.1 - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - -update for version 0.7.7 - -remove change about CFLAGS part, since patch 0024 already have similar function. - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -update for version 0.8.1 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - Makefile.inc | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index 661f141..3f9fd28 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -35,17 +35,6 @@ ifndef RUN - endif - endif - --ifndef SYSTEMD -- ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) -- SYSTEMD = $(shell pkg-config --modversion libsystemd) -- else -- ifeq ($(shell systemctl --version >/dev/null 2>&1 && echo 1), 1) -- SYSTEMD = $(shell systemctl --version 2> /dev/null | \ -- sed -n 's/systemd \([0-9]*\).*/\1/p') -- endif -- endif --endif -- - ifndef SYSTEMDPATH - SYSTEMDPATH=usr/lib - endif --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch deleted file mode 100644 index 3e88b41004..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0030-Always-use-devmapper.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e4acb46b10484d1da6f093257e34f269832e6a37 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 26 Nov 2018 11:17:41 +0800 -Subject: [PATCH] Subject: [PATCH] Always use devmapper - -Do not try to compute several _API_ make variables -from host information when cross-compiling. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -Rebase to 0.7.1 - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - -Rebase to 0.7.7 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -Rebase to 0.7.9 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - libmultipath/Makefile | 19 ++++--------------- - 1 file changed, 4 insertions(+), 15 deletions(-) - -diff --git a/libmultipath/Makefile b/libmultipath/Makefile -index 33f5269..adf6f4a 100644 ---- a/libmultipath/Makefile -+++ b/libmultipath/Makefile -@@ -20,21 +20,10 @@ ifdef SYSTEMD - endif - endif - --ifneq ($(call check_func,dm_task_no_flush,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE --endif -- --ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_COOKIE --endif -- --ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,/usr/include/libudev.h),0) -- CFLAGS += -DLIBUDEV_API_RECVBUF --endif -- --ifneq ($(call check_func,dm_task_deferred_remove,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_DEFERRED --endif -+CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE -+CFLAGS += -DLIBDM_API_COOKIE -+CFLAGS += -DLIBUDEV_API_RECVBUF -+CFLAGS += -DLIBDM_API_DEFERRED - - OBJS = memory.o parser.o vector.o devmapper.o callout.o \ - hwtable.o blacklist.o util.o dmparser.o config.o \ --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch b/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch deleted file mode 100644 index 418c0200f4..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0031-Always-use-devmapper-for-kpartx.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1fe937835311a2d0afbc85ce4a4dbd3c9e0c912f Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 26 Nov 2018 11:19:45 +0800 -Subject: [PATCH] Subject: [PATCH] Always use devmapper for kpartx - -Do not try to compute the LIBDM_API_COOKIE make variable -from host information when cross-compiling. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Aws Ismail <aws.ismail@windriver.com> -Signed-off-by: Joe Slater <joe.slater@windriver.com> - -Rebase to 0.7.1 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> - -Rebase to 0.7.7 -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -Rebase to 0.7.9 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - kpartx/Makefile | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/kpartx/Makefile b/kpartx/Makefile -index 7eb467e..c143321 100644 ---- a/kpartx/Makefile -+++ b/kpartx/Makefile -@@ -8,9 +8,7 @@ LDFLAGS += $(BIN_LDFLAGS) - - LIBDEPS += -ldevmapper - --ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) -- CFLAGS += -DLIBDM_API_COOKIE --endif -+CFLAGS += -DLIBDM_API_COOKIE - - OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ - gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o --- -2.7.4 - diff --git a/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch b/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch deleted file mode 100644 index b35d67cf59..0000000000 --- a/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 35421d03898ac1b38f97a76241e6a29086d0c9f1 Mon Sep 17 00:00:00 2001 -From: Geoff Parker <geoffrey.parker@arthrex.com> -Date: Fri, 9 Oct 2020 17:48:47 +0000 -Subject: [PATCH] libdmmp/Makefile: replace perl with sed in install target to - work with pseudo - -The multipath-tools libdmmp/Makefile install target uses 'perl -i' instead -of 'sed -i' for string substitutions. The perl method creates a temporary file -and overwrites the original which changes the inodes and corrupts the pseudo -db. Changes to pseduo cause a build abort rather than allow possible bad -ownership or permissions settings on the files. 'sed -i' is compatible -with pseudo. - -Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com> ---- - libdmmp/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libdmmp/Makefile b/libdmmp/Makefile -index 1dd3f340..8166075c 100644 ---- a/libdmmp/Makefile -+++ b/libdmmp/Makefile -@@ -34,11 +34,11 @@ install: - $(LN) $(LIBS) $(DESTDIR)$(usrlibdir)/$(DEVLIB) - $(INSTALL_PROGRAM) -m 644 -D \ - $(PKGFILE).in $(DESTDIR)$(pkgconfdir)/$(PKGFILE) -- perl -i -pe 's|__VERSION__|$(LIBDMMP_VERSION)|g' \ -+ sed -i 's|__VERSION__|$(LIBDMMP_VERSION)|g' \ - $(DESTDIR)$(pkgconfdir)/$(PKGFILE) -- perl -i -pe 's|__LIBDIR__|$(usrlibdir)|g' \ -+ sed -i 's|__LIBDIR__|$(usrlibdir)|g' \ - $(DESTDIR)$(pkgconfdir)/$(PKGFILE) -- perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \ -+ sed -i 's|__INCLUDEDIR__|$(includedir)|g' \ - $(DESTDIR)$(pkgconfdir)/$(PKGFILE) - @for file in docs/man/*.3.gz; do \ - $(INSTALL_PROGRAM) -m 644 -D \ --- -2.20.1 - diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb index 331c0cd018..e9f01bd1fe 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb @@ -27,37 +27,35 @@ DEPENDS = "libdevmapper \ json-c \ " -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" -SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ +SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \ file://multipathd.oe \ file://multipath.conf.example \ - file://0021-RH-fixup-udev-rules-for-redhat.patch \ - file://0022-RH-Remove-the-property-blacklist-exception-builtin.patch \ - file://0023-RH-don-t-start-without-a-config-file.patch \ - file://0024-RH-use-rpm-optflags-if-present.patch \ - file://0025-RH-add-mpathconf.patch \ - file://0026-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch \ - file://0027-RH-warn-on-invalid-regex-instead-of-failing.patch \ - file://0028-RH-reset-default-find_mutipaths-value-to-off.patch \ - file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ - file://0030-Always-use-devmapper.patch \ - file://0031-Always-use-devmapper-for-kpartx.patch \ - file://0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch \ - file://0001-fix-bug-of-do_compile-and-do_install.patch \ - file://0001-add-explicit-dependency-on-libraries.patch \ - file://0001-fix-boolean-value-with-json-c-0.14.patch \ + file://0001-RH-fixup-udev-rules-for-redhat.patch \ + file://0002-RH-Remove-the-property-blacklist-exception-builtin.patch \ + file://0003-RH-don-t-start-without-a-config-file.patch \ + file://0004-RH-use-rpm-optflags-if-present.patch \ + file://0005-RH-add-mpathconf.patch \ + file://0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch \ + file://0007-RH-warn-on-invalid-regex-instead-of-failing.patch \ + file://0008-RH-reset-default-find_mutipaths-value-to-off.patch \ + file://0009-multipath-tools-modify-create-config.mk-for-cross-co.patch \ + file://0010-Subject-PATCH-Always-use-devmapper.patch \ + file://0011-fix-bug-of-do_compile-and-do_install.patch \ + file://0012-add-explicit-dependency-on-libraries.patch \ + file://0001-libmultipath-always-use-glibc-basename.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" -SRCREV = "d4915917655b3d205aa0e339ca13080ed8182d0d" +SRCREV = "3daacfdfd110b24a3a7d5a276dcf8512b7039199" S = "${WORKDIR}/git" inherit systemd pkgconfig -SYSTEMD_SERVICE_${PN} = "multipathd.service" +SYSTEMD_SERVICE:${PN} = "multipathd.service" SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" @@ -67,17 +65,22 @@ TARGET_CC_ARCH += "${LDFLAGS}" # that only works on ARM when thumb is disabled. Otherwise one gets: # Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r12,r12,ror#3' # ../Makefile.inc:66: recipe for target 'debug.o' failed -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" # The exact version of SYSTEMD does not matter but should be greater than 209. # EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ OPTFLAGS="${CFLAGS}" \ + prefix=${prefix} \ bindir=${base_sbindir} \ LIB=${base_libdir} libdir=${base_libdir}/multipath \ + usrlibdir=${libdir} \ + plugindir=${base_libdir}/multipath \ unitdir=${systemd_system_unitdir} \ libudevdir=${nonarch_base_libdir}/udev \ + modulesloaddir=${sysconfdir}/modules-load.d \ + tmpfilesdir=${sysconfdir}/tmpfiles.d \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ ' @@ -99,23 +102,24 @@ do_install() { ${D}${sysconfdir}/multipath.conf.example } -FILES_${PN}-dbg += "${base_libdir}/multipath/.debug" +FILES:${PN} += "${systemd_system_unitdir}" +FILES:${PN}-dbg += "${base_libdir}/multipath/.debug" PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${base_libdir}/lib*.so.* \ +FILES:${PN}-libs = "${base_libdir}/lib*.so.* \ ${base_libdir}/multipath/lib*.so*" -RDEPENDS_${PN} += "${PN}-libs bash" +RDEPENDS:${PN} += "${PN}-libs bash libgcc" PROVIDES += "device-mapper-multipath" -RPROVIDES_${PN} += "device-mapper-multipath" -RPROVIDES_${PN}-libs += "device-mapper-multipath-libs" +RPROVIDES:${PN} += "device-mapper-multipath" +RPROVIDES:${PN}-libs += "device-mapper-multipath-libs" -FILES_${PN}-dev += "${base_libdir}/pkgconfig" +FILES:${PN}-dev += "${base_libdir}/pkgconfig" PACKAGES =+ "kpartx" -FILES_kpartx = "${base_sbindir}/kpartx \ +FILES:kpartx = "${base_sbindir}/kpartx \ ${nonarch_base_libdir}/udev/kpartx_id \ " -RDEPENDS_${PN} += "kpartx" +RDEPENDS:${PN} += "kpartx" PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/nano/nano_5.2.bb b/meta-oe/recipes-support/nano/nano_7.2.bb index f2cd2909cf..0642287c98 100644 --- a/meta-oe/recipes-support/nano/nano_5.2.bb +++ b/meta-oe/recipes-support/nano/nano_7.2.bb @@ -1,18 +1,19 @@ +SUMMARY = "Small and friendly console text editor" DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ Not ANOther editor) is an enhanced clone of the \ Pico text editor." HOMEPAGE = "http://www.nano-editor.org/" SECTION = "console/utils" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" DEPENDS = "ncurses file" -RDEPENDS_${PN} = "ncurses-terminfo-base" +RDEPENDS:${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "32c2da43e1ae9a5e43437d8c6e1ec0388af870c7762c479e5bffb5f292bda7e1" +SRC_URI[sha256sum] = "86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch b/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch index 9f2faaa529..6b51f992f5 100644 --- a/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch +++ b/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch @@ -12,6 +12,8 @@ where this option is absent Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch b/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch index a8fea82dc3..cb99daf78c 100644 --- a/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch +++ b/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch @@ -15,6 +15,8 @@ Fixes Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index f37ccde1cb..b10c23984d 100644 --- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -4,26 +4,26 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e7fe20c9be97be5579e3ab5d92d3a218" SECTION = "libs" -SRC_URI = "git://github.com/projectNe10/Ne10.git \ +SRC_URI = "git://github.com/projectNe10/Ne10.git;branch=master;protocol=https \ file://0001-CMakeLists.txt-Remove-mthumb-interwork.patch \ file://0001-Dont-specify-march-explicitly.patch \ " SRCREV = "18c4c982a595dad069cd8df4932aefb1d257591f" S = "${WORKDIR}/git" -PV .= "gitr+${SRCPV}" +PV .= "+git" inherit cmake # Incompatible with archs other than armv7, armv7ve and aarch64 COMPATIBLE_MACHINE = "(^$)" -COMPATIBLE_MACHINE_aarch64 = "(.*)" -COMPATIBLE_MACHINE_armv7a = "(.*)" -COMPATIBLE_MACHINE_armv7ve = "(.*)" +COMPATIBLE_MACHINE:aarch64 = "(.*)" +COMPATIBLE_MACHINE:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}" +COMPATIBLE_MACHINE:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","(.*)","(^$)",d)}" NE10_TARGET_ARCH = "" -NE10_TARGET_ARCH_aarch64 = "aarch64" -NE10_TARGET_ARCH_armv7a = "armv7" -NE10_TARGET_ARCH_armv7ve = "armv7" +NE10_TARGET_ARCH:aarch64 = "aarch64" +NE10_TARGET_ARCH:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" +NE10_TARGET_ARCH:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" EXTRA_OECMAKE = '-DGNULINUX_PLATFORM=ON -DNE10_BUILD_SHARED=ON -DNE10_LINUX_TARGET_ARCH="${NE10_TARGET_ARCH}"' @@ -38,4 +38,4 @@ do_install() { # ERROR: QA Issue: ELF binary 'ne10/1.2.1-r0/packages-split/ne10/usr/lib/libNE10.so.10' has relocations in .text [textrel] # ERROR: QA Issue: ELF binary 'ne10/1.2.1-r0/packages-split/ne10/usr/lib/libNE10.so.10' has relocations in .text [textrel] -INSANE_SKIP_${PN} += "textrel" +INSANE_SKIP:${PN} += "textrel" diff --git a/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch b/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch new file mode 100644 index 0000000000..177a71ec0a --- /dev/null +++ b/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch @@ -0,0 +1,30 @@ +From f477408f1c24ce6e5589e5a99d369279916c7c6e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 Aug 2022 13:11:12 -0700 +Subject: [PATCH] Disable installing documentation + +It does not build + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index ed87a69..c32405c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -125,7 +125,7 @@ Makefile: $(srcdir)/Makefile.in + neon-config: $(srcdir)/neon-config.in + @./config.status neon-config + +-install-docs: install-man install-html ++install-docs: + + install-html: + $(INSTALL) -d $(DESTDIR)$(docdir)/html +-- +2.37.2 + diff --git a/meta-oe/recipes-support/neon/neon/run-ptest b/meta-oe/recipes-support/neon/neon/run-ptest new file mode 100644 index 0000000000..602084a52c --- /dev/null +++ b/meta-oe/recipes-support/neon/neon/run-ptest @@ -0,0 +1,25 @@ +#!/bin/sh + +set -eux + +rm -f debug.log child.log + +ulimit -c unlimited +ulimit -t 120 + +cd test +echo foobar > foobar.txt + +BASIC_TESTS="auth basic redirect request session socket string-tests \ + stubs uri-tests util-tests" +DAV_TESTS="acl3744 lock oldacl props xml xmlreq" +for t in $BASIC_TESTS $DAV_TESTS +do + echo "Running $t..." + if "./$t" + then + echo "PASS:$t" + else + echo "FAIL:$t" + fi +done diff --git a/meta-oe/recipes-support/neon/neon_0.30.2.bb b/meta-oe/recipes-support/neon/neon_0.30.2.bb deleted file mode 100644 index 00b79f6330..0000000000 --- a/meta-oe/recipes-support/neon/neon_0.30.2.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "An HTTP and WebDAV client library with a C interface" -HOMEPAGE = "http://www.webdav.org/neon/" -SECTION = "libs" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ - file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037" - -SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \ - file://pkgconfig.patch \ - " - -SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41" -SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca" - -inherit autotools binconfig-disabled lib_package pkgconfig - -# Enable gnutls or openssl, not both -PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib" -PACKAGECONFIG_class-native = "expat gnutls webdav zlib" - -PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" -PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" -PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" -PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" -PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" -PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" - -EXTRA_OECONF += "--enable-shared" - -do_compile_append() { - oe_runmake -C test -} - -BINCONFIG = "${bindir}/neon-config" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/neon/neon_0.33.0.bb b/meta-oe/recipes-support/neon/neon_0.33.0.bb new file mode 100644 index 0000000000..a0333f4560 --- /dev/null +++ b/meta-oe/recipes-support/neon/neon_0.33.0.bb @@ -0,0 +1,63 @@ +SUMMARY = "An HTTP and WebDAV client library with a C interface" +HOMEPAGE = "http://www.webdav.org/neon/" +SECTION = "libs" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ + file://src/ne_utils.h;beginline=1;endline=20;md5=34c8e338bfa0237561e68d30c3c71133" + +SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \ + file://pkgconfig.patch \ + file://0001-Disable-installing-documentation.patch \ + file://run-ptest \ + " + +SRC_URI[sha256sum] = "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8" + +inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest + +# Enable gnutls or openssl, not both +PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib nls" +PACKAGECONFIG:class-native = "expat gnutls webdav zlib nls" +PACKAGECONFIG:remove:libc-musl = "nls" + +PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" +PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" +PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" +PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" +PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" +PACKAGECONFIG[nls] = ",--disable-nls,gettext-native" +PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" +PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" + +EXTRA_OECONF += "--enable-shared --enable-threadsafe-ssl=posix" + +# Do not install into /usr/local +EXTRA_OEMAKE:append:class-native = " prefix=${prefix_native}" + +do_configure:prepend() { + echo "${PV}" > ${S}/.version +} + +do_compile:append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'nls', 'true', 'false', d)}; then + oe_runmake compile-gmo + fi + oe_runmake -C test +} + +do_install_ptest(){ + BASIC_TESTS="auth basic redirect request session socket string-tests \ + stubs uri-tests util-tests" + DAV_TESTS="acl3744 lock oldacl props xml xmlreq" + mkdir "${D}${PTEST_PATH}/test" + for i in ${BASIC_TESTS} ${DAV_TESTS} + do + install -m 0755 "${B}/test/${i}" \ + "${D}${PTEST_PATH}/test" + done +} + +BINCONFIG = "${bindir}/neon-config" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch b/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch new file mode 100644 index 0000000000..af79efed96 --- /dev/null +++ b/meta-oe/recipes-support/nmon/nmon/0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch @@ -0,0 +1,175 @@ +From eba852316735daec27d4ff11483018ca596312d0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 02:11:49 -0700 +Subject: [PATCH] Fix a lot of -Werror=format-security errors with + mvprintw/mvwprintw + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lmon16m.c | 86 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 43 insertions(+), 43 deletions(-) + +diff --git a/lmon16m.c b/lmon16m.c +index 7e46642..1d53367 100644 +--- a/lmon16m.c ++++ b/lmon16m.c +@@ -5475,20 +5475,20 @@ int main(int argc, char **argv) + /* + *mvwprintw(padsmp,2, 0, "CPU User%% Sys%% Wait%% Idle|0 |25 |50 |75 100|"); + */ +- mvwprintw(padsmp, 1, 0, cpu_line); +- mvwprintw(padsmp, 2, 0, "CPU "); ++ mvwprintw(padsmp, 1, 0, "%s", cpu_line); ++ mvwprintw(padsmp, 2, 0, "%s", "CPU "); + COLOUR wattrset(padsmp, COLOR_PAIR(2)); /* Green */ +- mvwprintw(padsmp, 2, 4, "User%%"); ++ mvwprintw(padsmp, 2, 4, "%s", "User%%"); + COLOUR wattrset(padsmp, COLOR_PAIR(1)); /* Red */ +- mvwprintw(padsmp, 2, 9, " Sys%%"); ++ mvwprintw(padsmp, 2, 9, "%s", " Sys%%"); + COLOUR wattrset(padsmp, COLOR_PAIR(4)); /* Blue */ +- mvwprintw(padsmp, 2, 15, " Wait%%"); ++ mvwprintw(padsmp, 2, 15, "%s", " Wait%%"); + if (p->cpu_total.steal != q->cpu_total.steal) { + COLOUR wattrset(padsmp, COLOR_PAIR(5)); +- mvwprintw(padsmp, 2, 22, "Steal"); ++ mvwprintw(padsmp, 2, 22, "%s", "Steal"); + } else { + COLOUR wattrset(padsmp, COLOR_PAIR(0)); +- mvwprintw(padsmp, 2, 22, " Idle"); ++ mvwprintw(padsmp, 2, 22, "%s", " Idle"); + } + COLOUR wattrset(padsmp, COLOR_PAIR(0)); + mvwprintw(padsmp, 2, 27, +@@ -5579,8 +5579,8 @@ int main(int argc, char **argv) + /* lparcfg gathered above */ + if (lparcfg.smt_mode > 1 + && i % lparcfg.smt_mode == 0) { +- mvwprintw(padsmp, 3 + i, 27, "*"); +- mvwprintw(padsmp, 3 + i, 77, "*"); ++ mvwprintw(padsmp, 3 + i, 27, "%s", "*"); ++ mvwprintw(padsmp, 3 + i, 77, "%s", "*"); + } + #endif + +@@ -5597,7 +5597,7 @@ int main(int argc, char **argv) + 100.0); + } + } /* for (i = 0; i < cpus; i++) */ +- CURSE mvwprintw(padsmp, i + 3, 0, cpu_line); ++ CURSE mvwprintw(padsmp, i + 3, 0, "%s", cpu_line); + #ifdef POWER + /* proc_lparcfg called above in previous ifdef + */ +@@ -5673,7 +5673,7 @@ int main(int argc, char **argv) + 100.0); + } + +- CURSE mvwprintw(padsmp, i + 5, 0, cpu_line); ++ CURSE mvwprintw(padsmp, i + 5, 0, "%s", cpu_line); + i = i + 2; + } /* if (cpus > 1 || !cursed) */ + smp_first_time = 0; +@@ -5704,16 +5704,16 @@ int main(int argc, char **argv) + char *wide10 = + " 10%%-| |-10%%"; + +- mvwprintw(padwide, 1, 0, wide1); +- mvwprintw(padwide, 2, 0, wide2); +- mvwprintw(padwide, 3, 0, wide3); +- mvwprintw(padwide, 4, 0, wide4); +- mvwprintw(padwide, 5, 0, wide5); +- mvwprintw(padwide, 6, 0, wide6); +- mvwprintw(padwide, 7, 0, wide7); +- mvwprintw(padwide, 8, 0, wide8); +- mvwprintw(padwide, 9, 0, wide9); +- mvwprintw(padwide, 10, 0, wide10); ++ mvwprintw(padwide, 1, 0, "%s", wide1); ++ mvwprintw(padwide, 2, 0, "%s", wide2); ++ mvwprintw(padwide, 3, 0, "%s", wide3); ++ mvwprintw(padwide, 4, 0, "%s", wide4); ++ mvwprintw(padwide, 5, 0, "%s", wide5); ++ mvwprintw(padwide, 6, 0, "%s", wide6); ++ mvwprintw(padwide, 7, 0, "%s", wide7); ++ mvwprintw(padwide, 8, 0, "%s", wide8); ++ mvwprintw(padwide, 9, 0, "%s", wide9); ++ mvwprintw(padwide, 10, 0, "%s", wide10); + mvwprintw(padwide, 11, 0, + " CPU +1--------+10-------+20-------+30-------+40-------+50-------+60--+--0%%"); + mvwprintw(padwide, 1, 6, "CPU(s)=%d", cpus); +@@ -5755,16 +5755,16 @@ int main(int argc, char **argv) + rows = 12; + } + if (cpus > 63) { +- mvwprintw(padwide, rows + 0, 0, wide1); +- mvwprintw(padwide, rows + 1, 0, wide2); +- mvwprintw(padwide, rows + 2, 0, wide3); +- mvwprintw(padwide, rows + 3, 0, wide4); +- mvwprintw(padwide, rows + 4, 0, wide5); +- mvwprintw(padwide, rows + 5, 0, wide6); +- mvwprintw(padwide, rows + 6, 0, wide7); +- mvwprintw(padwide, rows + 7, 0, wide8); +- mvwprintw(padwide, rows + 8, 0, wide9); +- mvwprintw(padwide, rows + 9, 0, wide10); ++ mvwprintw(padwide, rows + 0, 0, "%s", wide1); ++ mvwprintw(padwide, rows + 1, 0, "%s", wide2); ++ mvwprintw(padwide, rows + 2, 0, "%s", wide3); ++ mvwprintw(padwide, rows + 3, 0, "%s", wide4); ++ mvwprintw(padwide, rows + 4, 0, "%s", wide5); ++ mvwprintw(padwide, rows + 5, 0, "%s", wide6); ++ mvwprintw(padwide, rows + 6, 0, "%s", wide7); ++ mvwprintw(padwide, rows + 7, 0, "%s", wide8); ++ mvwprintw(padwide, rows + 8, 0, "%s", wide9); ++ mvwprintw(padwide, rows + 9, 0, "%s", wide10); + mvwprintw(padwide, rows + 10, 0, + " CPU +65---+70-------+80-------+90-------+100------+110------+120-----+--0%%"); + if (wide_first_time) { +@@ -5813,16 +5813,16 @@ int main(int argc, char **argv) + rows = 23; + } + if (cpus > 127) { +- mvwprintw(padwide, rows + 0, 0, wide1); +- mvwprintw(padwide, rows + 1, 0, wide2); +- mvwprintw(padwide, rows + 2, 0, wide3); +- mvwprintw(padwide, rows + 3, 0, wide4); +- mvwprintw(padwide, rows + 4, 0, wide5); +- mvwprintw(padwide, rows + 5, 0, wide6); +- mvwprintw(padwide, rows + 6, 0, wide7); +- mvwprintw(padwide, rows + 7, 0, wide8); +- mvwprintw(padwide, rows + 8, 0, wide9); +- mvwprintw(padwide, rows + 9, 0, wide10); ++ mvwprintw(padwide, rows + 0, 0, "%s", wide1); ++ mvwprintw(padwide, rows + 1, 0, "%s", wide2); ++ mvwprintw(padwide, rows + 2, 0, "%s", wide3); ++ mvwprintw(padwide, rows + 3, 0, "%s", wide4); ++ mvwprintw(padwide, rows + 4, 0, "%s", wide5); ++ mvwprintw(padwide, rows + 5, 0, "%s", wide6); ++ mvwprintw(padwide, rows + 6, 0, "%s", wide7); ++ mvwprintw(padwide, rows + 7, 0, "%s", wide8); ++ mvwprintw(padwide, rows + 8, 0, "%s", wide9); ++ mvwprintw(padwide, rows + 9, 0, "%s", wide10); + mvwprintw(padwide, rows + 10, 0, + " CPU +129--------+140------+150------+160------+170------+180------+190--0%%"); + if (wide_first_time) { +@@ -8274,7 +8274,7 @@ I/F Name Recv=KB/s Trans=KB/s packin packout insize outsize Peak->Recv Trans + formatstring = + " PID %%CPU Size Res Res Res Res Shared Faults Command"; + } +- CURSE mvwprintw(padtop, 1, y, formatstring); ++ CURSE mvwprintw(padtop, 1, y, "%s", formatstring); + + if (show_args == ARGS_ONLY) { + formatstring = +@@ -8294,7 +8294,7 @@ I/F Name Recv=KB/s Trans=KB/s packin packout insize outsize Peak->Recv Trans + formatstring = + " Used KB Set Text Data Lib KB Min Maj "; + } +- CURSE mvwprintw(padtop, 2, 1, formatstring); ++ CURSE mvwprintw(padtop, 2, 1, "%s", formatstring); + for (j = 0; j < max_sorted; j++) { + i = topper[j].index; + if (!show_all) { diff --git a/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch b/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch index e8debe56af..6721d2b5e5 100644 --- a/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch +++ b/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch @@ -9,13 +9,15 @@ defines from sys/cdefs.h is used Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - lmon16g.c | 4 ++-- +Upstream-Status: Pending + + lmon16m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/lmon16g.c b/lmon16g.c +diff --git a/lmon16m.c b/lmon16m.c index cb27e09..d2a11c5 100644 ---- a/lmon16g.c -+++ b/lmon16g.c +--- a/lmon16m.c ++++ b/lmon16m.c @@ -63,7 +63,7 @@ static char *SccsId = "nmon " VERSION; #include <fcntl.h> #include <math.h> diff --git a/meta-oe/recipes-support/nmon/nmon_16g.bb b/meta-oe/recipes-support/nmon/nmon_16m.bb index e77faa30ad..d4a357cea0 100644 --- a/meta-oe/recipes-support/nmon/nmon_16g.bb +++ b/meta-oe/recipes-support/nmon/nmon_16m.bb @@ -1,23 +1,22 @@ SUMMARY = "nmon performance monitor" HOMEPAGE = "http://nmon.sf.net" SECTION = "console/utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://${WORKDIR}/Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a" DEPENDS = "ncurses" -DEPENDS_append_libc-musl = " bsd-headers" +DEPENDS:append:libc-musl = " bsd-headers" SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \ ${SOURCEFORGE_MIRROR}/nmon/Documentation.txt;name=doc \ file://0001-lmon16g.c-Adjust-system-headers.patch \ -" -SRC_URI[lmon.md5sum] = "246ccfc74d5af55d992601fc4d3d4a72" -SRC_URI[lmon.sha256sum] = "da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688" -SRC_URI[doc.md5sum] = "dbb13658cf55d687c4f2ff771a696d4a" + file://0001-Fix-a-lot-of-Werror-format-security-errors-with-mvpr.patch \ + " +SRC_URI[lmon.sha256sum] = "2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1" SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278" CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" LDFLAGS += "-ltinfo -lncursesw -lm" -ASNEEDED_pn-nmon = "" +ASNEEDED:pn-nmon = "" S = "${WORKDIR}" diff --git a/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch b/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch new file mode 100644 index 0000000000..8515075fe0 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch @@ -0,0 +1,39 @@ +From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 13:04:56 -0800 +Subject: [PATCH] Fix -Wincompatible-function-pointer-types + +Fixes warnings with clang16 +testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pr/tests/testfile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c +index 79d8a05..42aa6a7 100644 +--- a/pr/tests/testfile.c ++++ b/pr/tests/testfile.c +@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type, + if (native_thread) { + #if defined(_PR_PTHREADS) + pthread_t tid; +- if (!pthread_create(&tid, NULL, start, arg)) { ++ if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) { + return((PRThread *) tid); + } + else { +@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void) + + thrarg.done= 0; + t = create_new_thread(PR_USER_THREAD, +- DirTest, &thrarg, ++ (void (*)(void *))DirTest, &thrarg, + PR_PRIORITY_NORMAL, + PR_LOCAL_THREAD, + PR_UNJOINABLE_THREAD, +-- +2.39.1 + diff --git a/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch b/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch new file mode 100644 index 0000000000..6ebc9c4ae6 --- /dev/null +++ b/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch @@ -0,0 +1,30 @@ +From 13e9d66c24d1dce5179805ae5e1bf940409b4914 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 10 Aug 2022 15:21:07 +0800 +Subject: [PATCH] config/nspr-config.in: don't pass LDFLAGS + +Don't pass LDFLAGS to avoid exposing the build env info. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + config/nspr-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/nspr-config.in b/config/nspr-config.in +index 2cb62a0..2bec715 100755 +--- a/config/nspr-config.in ++++ b/config/nspr-config.in +@@ -136,7 +136,7 @@ if test "$echo_libs" = "yes"; then + if test -n "$lib_nspr"; then + libdirs="$libdirs -lnspr${major_version}" + fi +- os_ldflags="@LDFLAGS@" ++ os_ldflags="LDFLAGS" + for i in $os_ldflags ; do + if echo $i | grep \^-L >/dev/null; then + libdirs="$libdirs $i" +-- +2.25.1 + diff --git a/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch index d2b9bf6420..09855a03dc 100644 --- a/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ b/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch @@ -1,4 +1,4 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 +From 5f6fcaeb0b7a319c8afd32ddb48b3515b63a6c0c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 18 Sep 2017 17:22:43 -0700 Subject: [PATCH] md: Fix build with musl @@ -6,24 +6,17 @@ Subject: [PATCH] md: Fix build with musl The MIPS specific header <sgidefs.h> is not provided by musl linux kernel headers provide <asm/sgidefs.h> which has same definitions -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- pr/include/md/_linux.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +index aa3af78..899826f 100644 --- a/pr/include/md/_linux.cfg +++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include <sgidefs.h> -+#include <asm/sgidefs.h> - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 @@ -511,7 +511,7 @@ #error "Unknown MIPS endianness." #endif diff --git a/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch index 3a04d426a8..dab2a4e291 100644 --- a/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ b/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch @@ -1,4 +1,4 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 +From 4760065a58153e4dae24e4e437a5136592c624bc Mon Sep 17 00:00:00 2001 From: Marek Vasut <marex@denx.de> Date: Sat, 30 Jan 2016 07:18:02 +0100 Subject: [PATCH] Add nios2 support @@ -7,15 +7,14 @@ Add support for the nios2 CPU. Signed-off-by: Marek Vasut <marex@denx.de> Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] + --- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) + pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++ + pr/include/md/_linux.h | 4 +++- + 2 files changed, 48 insertions(+), 1 deletion(-) -Index: nspr/pr/include/md/_linux.cfg -=================================================================== ---- nspr.orig/pr/include/md/_linux.cfg -+++ nspr/pr/include/md/_linux.cfg +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg @@ -975,6 +975,51 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 @@ -68,10 +67,8 @@ Index: nspr/pr/include/md/_linux.cfg #elif defined(__or1k__) #undef IS_LITTLE_ENDIAN -Index: nspr/pr/include/md/_linux.h -=================================================================== ---- nspr.orig/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h +--- a/pr/include/md/_linux.h ++++ b/pr/include/md/_linux.h @@ -55,6 +55,8 @@ #define _PR_SI_ARCHITECTURE "avr32" #elif defined(__m32r__) @@ -81,22 +78,12 @@ Index: nspr/pr/include/md/_linux.h #elif defined(__or1k__) #define _PR_SI_ARCHITECTURE "or1k" #elif defined(__riscv) && (__riscv_xlen == 32) -@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn +@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet #endif -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) +-#if defined(__loongarch__) ++#if defined(__loongarch__) || defined(__nios2__) #if defined(__GNUC__) /* Use GCC built-in functions */ + #define _PR_HAVE_ATOMIC_OPS diff --git a/meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c5dc..0000000000 --- a/meta-oe/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/meta-oe/recipes-support/nspr/nspr_4.29.bb b/meta-oe/recipes-support/nspr/nspr_4.35.bb index 6307c159eb..f8d329398b 100644 --- a/meta-oe/recipes-support/nspr/nspr_4.29.bb +++ b/meta-oe/recipes-support/nspr/nspr_4.35.bb @@ -1,6 +1,6 @@ SUMMARY = "Netscape Portable Runtime Library" HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" +LICENSE = "GPL-2.0-only | MPL-2.0 | LGPL-2.1-only" LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" SECTION = "libs/network" @@ -8,29 +8,29 @@ SECTION = "libs/network" SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ file://remove-rpath-from-tests.patch \ file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ file://0002-Add-nios2-support.patch \ file://0001-md-Fix-build-with-musl.patch \ file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ + file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \ + file://0001-Fix-Wincompatible-function-pointer-types.patch \ file://nspr.pc.in \ -" + " -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ +CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ + -D_PR_HAVE_LARGE_OFF_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" -SRC_URI[md5sum] = "a546926d3c8e887be02c668c1293da92" -SRC_URI[sha256sum] = "22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582" +SRC_URI[sha256sum] = "7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f" CVE_PRODUCT = "netscape_portable_runtime" S = "${WORKDIR}/nspr-${PV}/nspr" -RDEPENDS_${PN}-dev += "perl" +RDEPENDS:${PN}-dev += "perl" TARGET_CC_ARCH += "${LDFLAGS}" TESTS = " \ @@ -160,15 +160,17 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # preferred path upstream. EXTRA_OECONF += "--includedir=${includedir}/nspr" -do_compile_prepend() { +EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt -ldl'" + +do_compile:prepend() { oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export } -do_compile_append() { +do_compile:append() { oe_runmake -C pr/tests } -do_install_append() { +do_install:append() { install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc sed -i \ -e 's:NSPRVERSION:${PV}:g' \ @@ -190,8 +192,8 @@ do_install_append() { rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties } -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ +FILES:${PN} = "${libdir}/lib*.so" +FILES:${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ ${includedir}/* ${datadir}/aclocal/* " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index 65e1500ae5..b7f1b01a14 100644 --- a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -1,4 +1,4 @@ -From 8b67c22b057e158f61c9fdd5b01f37195c6f5ca4 Mon Sep 17 00:00:00 2001 +From 7c8f367faf8848a43a414079189e10270d6c0fcc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 18 Dec 2019 12:29:50 +0100 Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto @@ -15,28 +15,28 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 2 files changed, 5 insertions(+) diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index fe8c526..922f67c 100644 +index 7ee8736..f9b4925 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile -@@ -125,6 +125,8 @@ else - DEFINES += -DNSS_X86 - endif +@@ -142,6 +142,8 @@ endif + endif + endif endif +ifdef NSS_USE_ARM_HW_CRYPTO + DEFINES += -DNSS_USE_ARM_HW_CRYPTO ifeq ($(CPU_ARCH),aarch64) ifdef CC_IS_CLANG DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 -@@ -166,6 +168,7 @@ endif +@@ -183,6 +185,7 @@ endif endif endif endif +endif - ifeq ($(OS_TARGET),OSF1) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD + ifeq (OS2,$(OS_TARGET)) + ASFILES = mpi_x86_os2.s diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c -index c2cc18d..b77f573 100644 +index 2dae724..9ee7fc8 100644 --- a/nss/lib/freebl/gcm.c +++ b/nss/lib/freebl/gcm.c @@ -18,6 +18,7 @@ diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch index 3d90e2d951..2385fd3b9d 100644 --- a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch @@ -1,4 +1,4 @@ -From 8cea16e7550ae14494fbb3a8fe9f5452e6bd1407 Mon Sep 17 00:00:00 2001 +From 46ab1ca6e6fb8e1196e0665a54506dff370f8f2a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 22 Feb 2017 11:36:11 +0200 Subject: [PATCH] nss: fix support cross compiling @@ -10,15 +10,20 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - nss/coreconf/arch.mk | 2 +- + nss/coreconf/arch.mk | 4 ++-- nss/lib/freebl/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk -index 790372d..2563134 100644 +index 17e9fae..bc4180a 100644 --- a/nss/coreconf/arch.mk +++ b/nss/coreconf/arch.mk -@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m) +@@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) + # Attempt to differentiate between sparc and x86 Solaris + # + +-OS_TEST := $(shell uname -m) ++OS_TEST ?= $(shell uname -m) ifeq ($(OS_TEST),i86pc) OS_RELEASE := $(shell uname -r)_$(OS_TEST) else @@ -26,9 +31,9 @@ index 790372d..2563134 100644 + OS_RELEASE ?= $(shell uname -r) endif - # + diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile -index 52d827c..f99f769 100644 +index eeee90a..7ee8736 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile @@ -36,6 +36,12 @@ ifdef USE_64 diff --git a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch index e87dc9f76b..4c9bea30c0 100644 --- a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch +++ b/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch @@ -1,4 +1,4 @@ -From c5b2c6327f3692ed07bf8d212123e0bf08485722 Mon Sep 17 00:00:00 2001 +From f613c9a9107435a40d91329f33f12cfb16927f07 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 7 Mar 2020 08:34:02 -0800 Subject: [PATCH] nss,nspr: Add recipes diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch index 6f02dbcb4b..735b06b5ca 100644 --- a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch +++ b/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch @@ -1,4 +1,4 @@ -From 028ec9c7e9f7a6f083eec987f3ad7e7623398d9d Mon Sep 17 00:00:00 2001 +From 2ce67b1f4b1f582d556ae058da10698bbaa0edc1 Mon Sep 17 00:00:00 2001 From: Ovidiu Panait <ovidiu.panait@windriver.com> Date: Mon, 13 Jul 2020 12:12:31 +0300 Subject: [PATCH] nss: fix incorrect shebang of perl diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch index fbfa828b23..a1897f88d8 100644 --- a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch +++ b/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -1,4 +1,4 @@ -From 2701905e689cf7c1ee7ca2d116f20b5bbc146431 Mon Sep 17 00:00:00 2001 +From f9b2b1c738576a17460aebd005f511f427aa1974 Mon Sep 17 00:00:00 2001 From: Wenzong Fan <wenzong.fan@windriver.com> Date: Sat, 7 Mar 2020 08:34:02 -0800 Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit @@ -15,7 +15,7 @@ on host to install built files, it doesn't need any cross-compling or multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this error. -Upstream-Status: Pending +Upstream-Status: Inappropriate [configuration] Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> =================================================== diff --git a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch index 7dbc1a3721..8c715cc447 100644 --- a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch +++ b/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch @@ -1,4 +1,4 @@ -From dc51214895bcd63fc8eb8d1fe7941cd3e5500620 Mon Sep 17 00:00:00 2001 +From 73edfbdf33fe4e41724e7e947033d8caeec8f3d0 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sat, 7 Mar 2020 08:34:02 -0800 Subject: [PATCH] nss:no rpath for cross compiling diff --git a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch index 5505ae36ac..589b4d5e7f 100644 --- a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch +++ b/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch @@ -1,4 +1,4 @@ -From a550bdf458f11dff46ebddbac94cf48c27d3471e Mon Sep 17 00:00:00 2001 +From cbd367160338847b28fc801a12c74f1c8b5b03ee Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 7 Mar 2020 08:34:02 -0800 Subject: [PATCH] nss does not build on mips with clang because wrong types are @@ -16,7 +16,7 @@ Upstream-Status: Pending 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c -index 626b2fb..052ad36 100644 +index 1b03278..ad895b7 100644 --- a/nss/lib/freebl/pqg.c +++ b/nss/lib/freebl/pqg.c @@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H) diff --git a/meta-oe/recipes-support/nss/nss_3.57.bb b/meta-oe/recipes-support/nss/nss_3.98.bb index 5d9318a922..01501362e2 100644 --- a/meta-oe/recipes-support/nss/nss_3.57.bb +++ b/meta-oe/recipes-support/nss/nss_3.98.bb @@ -9,17 +9,18 @@ HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" SECTION = "libs" DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" +DEPENDS:class-native = "sqlite3-native nspr-native zlib-native" -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" +LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0-or-later & MIT) | (MPL-2.0 & LGPL-2.1-or-later & MIT)" LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132 \ + file://nss/lib/freebl/verified/Hacl_Poly1305_256.c;beginline=1;endline=22;md5=cc22f07b95d28d56baeb757df46ee7c8" VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ +SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ file://nss.pc.in \ file://0001-nss-fix-support-cross-compiling.patch \ file://nss-no-rpath-for-cross-compiling.patch \ @@ -32,7 +33,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ " -SRC_URI[sha256sum] = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382" +SRC_URI[sha256sum] = "f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" @@ -42,33 +43,38 @@ inherit siteinfo TD = "${S}/tentative-dist" TDS = "${S}/tentative-dist-staging" -# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a -# which caused -march conflicts in gcc -TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" - TARGET_CC_ARCH += "${LDFLAGS}" -do_configure_prepend_libc-musl () { +CFLAGS:append:class-native = " -D_XOPEN_SOURCE " + +do_configure:prepend:libc-musl () { sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk } -do_compile_prepend_class-native() { +do_configure:prepend:powerpc64le:toolchain-clang () { + sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk +} + +do_configure:prepend:powerpc64:toolchain-clang () { + sed -i -e 's/\-std=c99/\-std=gnu99/g' ${S}/nss/coreconf/command.mk +} + +do_compile:prepend:class-native() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} } -do_compile_prepend_class-nativesdk() { +do_compile:prepend:class-nativesdk() { export LDFLAGS="" } -do_compile_prepend_class-native() { +do_compile:prepend:class-native() { # Need to set RPATH so that chrpath will do its job correctly RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" } do_compile() { export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - export NSS_ENABLE_WERROR=0 export CROSS_COMPILE=1 export NATIVE_CC="${BUILD_CC}" @@ -76,6 +82,10 @@ do_compile() { export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" export BUILD_OPT=1 + # POSIX.1-2001 states that the behaviour of getcwd() when passing a null + # pointer as the buf argument, is unspecified. + export NATIVE_FLAGS="${NATIVE_FLAGS} -DGETCWD_CANT_MALLOC" + export FREEBL_NO_DEPEND=1 export FREEBL_LOWHASH=1 @@ -84,6 +94,7 @@ do_compile() { export NS_USE_GCC=1 export NSS_USE_SYSTEM_SQLITE=1 export NSS_ENABLE_ECC=1 + export NSS_ENABLE_WERROR=0 ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} @@ -93,7 +104,7 @@ do_compile() { if [ "${TARGET_ARCH}" = "powerpc" ]; then OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + elif [ "${TARGET_ARCH}" = "powerpc64" -o "${TARGET_ARCH}" = "powerpc64le" ]; then OS_TEST=ppc64 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then OS_TEST=mips @@ -110,7 +121,6 @@ do_compile() { fi export NSS_DISABLE_GTESTS=1 - # We can modify CC in the environment, but if we set it via an # argument to make, nsinstall, a host program, will also build with it! # @@ -128,7 +138,7 @@ do_compile() { do_compile[vardepsexclude] += "SITEINFO_BITS" -do_install_prepend_class-nativesdk() { +do_install:prepend:class-nativesdk() { export LDFLAGS="" } @@ -151,7 +161,7 @@ do_install() { if [ "${TARGET_ARCH}" = "powerpc" ]; then OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + elif [ "${TARGET_ARCH}" = "powerpc64" -o "${TARGET_ARCH}" = "powerpc64le" ]; then OS_TEST=ppc64 elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then OS_TEST=mips @@ -205,7 +215,7 @@ do_install() { do_install[vardepsexclude] += "SITEINFO_BITS" -do_install_append() { +do_install:append() { # Create empty .chk files for the NSS libraries at build time. They could # be regenerated at target's boot time. for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do @@ -221,7 +231,7 @@ do_install_append() { sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc } -do_install_append_class-target() { +do_install:append:class-target() { # It used to call certutil to create a blank certificate with empty password at # build time, but the checksum of key4.db changes every time when certutil is called. # It causes non-determinism issue, so provide databases with a blank certificate @@ -236,7 +246,7 @@ do_install_append_class-target() { PACKAGE_WRITE_DEPS += "nss-native" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { for I in $D${libdir}/lib*.chk; do DN=`dirname $I` BN=`basename $I .chk` @@ -249,23 +259,31 @@ pkg_postinst_${PN} () { } PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ +FILES:${PN}-smime = "\ ${bindir}/smime \ " -FILES_${PN} = "\ +FILES:${PN} = "\ ${sysconfdir} \ ${bindir} \ ${libdir}/lib*.chk \ ${libdir}/lib*.so \ " -FILES_${PN}-dev = "\ +FILES:${PN}-dev = "\ ${libdir}/nss \ ${libdir}/pkgconfig/* \ ${includedir}/* \ " -RDEPENDS_${PN}-smime = "perl" +RDEPENDS:${PN}-smime = "perl" BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT += "network_security_services" + +CVE_STATUS_GROUPS += "CVE_STATUS_NSS" +CVE_STATUS_NSS[status] = "not-applicable-config: This only affect the legacy db (libnssdbm), only compiled with --enable-legacy-db" +CVE_STATUS_NSS = "CVE-2017-11695 CVE-2017-11696 CVE-2017-11697 CVE-2017-11698" + +CVE_STATUS[CVE-2022-3479] = "not-applicable-config: vulnerability was introduced in 3.77 and fixed in 3.87" diff --git a/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch deleted file mode 100644 index 78ffb22f89..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch +++ /dev/null @@ -1,32 +0,0 @@ -rename test target as run-test - -Upstream-Statue: Pending - -test target not only compile the test files, but also run them, which is -not suitable for cross-compile environment, so rename it as run-test. - -and define test target to compile the test files. - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index b6db339..de176c4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -124,7 +124,9 @@ regress2: $(check_PROGRAMS) - test_numademo: numademo - ./numademo -t -e 10M - --test: all $(check_PROGRAMS) regress1 regress2 test_numademo -+test: all $(check_PROGRAMS) -+ -+run-test: all $(check_PROGRAMS) regress1 regress2 test_numademo - - TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir; - --- -1.9.1 - diff --git a/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch deleted file mode 100644 index 9812ecc8b3..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 59fd750a84bbe5874dec936d2bee9ef11a1b6505 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Tue, 21 Jul 2015 02:01:22 +0900 -Subject: [PATCH] Fix the test output format - -Upstream-Status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - test/regress | 6 +++--- - test/regress2 | 11 +++++------ - 2 files changed, 8 insertions(+), 9 deletions(-) - -diff --git a/test/regress b/test/regress -index 2ce1705..d086a47 100755 ---- a/test/regress -+++ b/test/regress -@@ -74,6 +74,7 @@ probe_hardware() - if [ $numnodes -lt 2 ] ; then - echo "need at least two nodes with at least $NEEDPAGES each of" - echo "free memory for mempolicy regression tests" -+ echo "FAIL: numa regress" - exit 77 # Skip test - fi - } -@@ -207,10 +208,9 @@ main() - rm A B - - if [ "$EXIT" = 0 ] ; then -- echo '========SUCCESS' -+ echo 'PASS: numactl regress' - else -- echo '========FAILURE' -- exit 1 -+ echo 'FAIL: numactl regress' - fi - } - -diff --git a/test/regress2 b/test/regress2 -index aa6ea41..450c510 100755 ---- a/test/regress2 -+++ b/test/regress2 -@@ -9,12 +9,11 @@ testdir=`dirname "$0"` - export PATH=${builddir}:$PATH - - T() { -- echo "$@" -- if ! $VALGRIND "$@" ; then -- echo $1 FAILED!!!! -- exit 1 -- fi -- echo -+ if ! $VALGRIND "$@" 2>&1 1>/dev/null; then -+ echo "FAIL: $1" -+ else -+ echo "PASS: $1" -+ fi - } - - # still broken --- -1.8.4.2 - diff --git a/meta-oe/recipes-support/numactl/numactl/Makefile b/meta-oe/recipes-support/numactl/numactl/Makefile deleted file mode 100644 index 9a5134c3f2..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -.PHONY: regress1 regress2 - -regress1: - cd test ; ./regress - -regress2: - cd test ; ./regress2 diff --git a/meta-oe/recipes-support/numactl/numactl/run-ptest b/meta-oe/recipes-support/numactl/numactl/run-ptest deleted file mode 100755 index 215f7c25b9..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -make regress1 -make regress2 -if numademo -t -e 10M; then - echo "PASS: numademo" -else - echo "FAIL: numademo" -fi - diff --git a/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-oe/recipes-support/numactl/numactl_git.bb deleted file mode 100644 index 504fe03275..0000000000 --- a/meta-oe/recipes-support/numactl/numactl_git.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Development package for building Applications that use numa" -HOMEPAGE = "http://oss.sgi.com/projects/libnuma/" -DESCRIPTION = "Simple NUMA policy support. It consists of a numactl program \ -to run other programs with a specific NUMA policy and a libnuma to do \ -allocations with NUMA policy in applications." -LICENSE = "GPL-2.0 & LGPL-2.1" -SECTION = "apps" - -inherit autotools-brokensep ptest - -LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" - -SRCREV = "dd6de072c92c892a86e18c0fd0dfa1ba57a9a05d" -PV = "2.0.14+git${SRCPV}" - -SRC_URI = "git://github.com/numactl/numactl \ - file://Fix-the-test-output-format.patch \ - file://Makefile \ - file://run-ptest \ - file://0001-define-run-test-target.patch \ -" - -S = "${WORKDIR}/git" - -# ARM does not currently support NUMA -COMPATIBLE_HOST = "^((?!arm).*)$" - -LDFLAGS_append_riscv64 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" - -do_install() { - oe_runmake DESTDIR=${D} prefix=${D}/usr install - #remove the empty man2 directory - rm -r ${D}${mandir}/man2 -} - -do_compile_ptest() { - oe_runmake test -} - -do_install_ptest() { - #install tests binaries - local test_binaries="distance ftok mbind_mig_pages migrate_pages move_pages \ - mynode nodemap node-parse pagesize prefered randmap realloc_test \ - tbitmap tshared" - - [ ! -d ${D}/${PTEST_PATH}/test ] && mkdir -p ${D}/${PTEST_PATH}/test - for i in $test_binaries; do - install -m 0755 ${B}/test/.libs/$i ${D}${PTEST_PATH}/test - done - - local test_scripts="checktopology checkaffinity printcpu regress regress2 \ - shmtest runltp bind_range" - for i in $test_scripts; do - install -m 0755 ${B}/test/$i ${D}${PTEST_PATH}/test - done - - install -m 0755 ${WORKDIR}/Makefile ${D}${PTEST_PATH}/ - install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ -} - -RDEPENDS_${PN}-ptest = "bash" diff --git a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch index 891592650d..1db9684abd 100644 --- a/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch +++ b/meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch @@ -1,7 +1,7 @@ -From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001 +From 543990bc34a0e5d4f66a9167efb1f3b8de6a3635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> Date: Mon, 6 Jan 2020 16:56:31 +0000 -Subject: [PATCH] build: don't link against (host) system libraries +Subject: [PATCH 1/2] build: don't link against (host) system libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,29 +14,29 @@ Signed-off-by: André Draszik <git@andred.net> 2 files changed, 2 deletions(-) diff --git a/sample/Makefile.am b/sample/Makefile.am -index 22a4989..e935bf0 100644 +index 681cd2a933de..c4f796d36da0 100644 --- a/sample/Makefile.am +++ b/sample/Makefile.am -@@ -3,7 +3,6 @@ - lib_onig = ../src/libonig.la +@@ -4,7 +4,6 @@ lib_onig = ../src/libonig.la LDADD = $(lib_onig) --AM_LDFLAGS = -L$(prefix)/lib + AM_CFLAGS = -Wall +-AM_LDFLAGS = -L$(libdir) AM_CPPFLAGS = -I$(top_srcdir)/src if ENABLE_POSIX_API diff --git a/test/Makefile.am b/test/Makefile.am -index 4d62568..b7a2105 100644 +index 94739a24ab22..a23ef1e2e139 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,6 @@ ## Makefile.am for Oniguruma lib_onig = ../src/libonig.la --AM_LDFLAGS = -L$(prefix)/lib +-AM_LDFLAGS = -L$(libdir) AM_CFLAGS = -Wall -Wno-invalid-source-encoding AM_CPPFLAGS = -I$(top_srcdir)/src -- -2.23.0.rc1 +2.35.1 diff --git a/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch b/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch index 587e5ac1b8..096b8baa79 100644 --- a/meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch +++ b/meta-oe/recipes-support/onig/onig/0002-build-enable-serial-tests-automake-option-for-ptest.patch @@ -1,7 +1,7 @@ -From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001 +From 1ab999aa5a7a21329bab13e05f843e5e029493e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> Date: Mon, 6 Jan 2020 15:10:30 +0000 -Subject: [PATCH] build: enable serial-tests automake option (for ptest) +Subject: [PATCH 2/2] build: enable serial-tests automake option (for ptest) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,14 +15,16 @@ former being what we want. Signed-off-by: André Draszik <git@andred.net> --- +Upstream-Status: Pending + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index ac51e85..48e63ce 100644 +index 079fef9a1a52..058b5504b9b7 100644 --- a/configure.ac +++ b/configure.ac -@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4) +@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.8) AC_CONFIG_MACRO_DIR([m4]) @@ -32,5 +34,5 @@ index ac51e85..48e63ce 100644 -- -2.23.0.rc1 +2.35.1 diff --git a/meta-oe/recipes-support/onig/onig/run-ptest b/meta-oe/recipes-support/onig/onig/run-ptest index 2574d7efa5..fbce336990 100755 --- a/meta-oe/recipes-support/onig/onig/run-ptest +++ b/meta-oe/recipes-support/onig/onig/run-ptest @@ -17,7 +17,7 @@ workdir=$(mktemp -d -t onig.ptest.XXXXXX) status="${workdir}/failed" touch "${status}" -find tests/ -perm -111 -type f -exec sh -c ' +find tests/ -perm -111 -type f ! -path "tests/.debug/*" -exec sh -c ' workdir="${1}" status="${2}" t="${3}" diff --git a/meta-oe/recipes-support/onig/onig_6.9.4.bb b/meta-oe/recipes-support/onig/onig_6.9.9.bb index 50d9f52353..b29437db1e 100644 --- a/meta-oe/recipes-support/onig/onig_6.9.4.bb +++ b/meta-oe/recipes-support/onig/onig_6.9.9.bb @@ -5,17 +5,16 @@ implementations that traditionally exist in different languages. \ Character encoding can be specified per regular expression object." HOMEPAGE = "https://github.com/kkos/oniguruma" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6365c225bb5cc4321d0913f0baffa04" SRC_URI = "\ https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \ file://0001-build-don-t-link-against-host-system-libraries.patch \ - file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \ + file://0002-build-enable-serial-tests-automake-option-for-ptest.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879" -SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53" +SRC_URI[sha256sum] = "60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf" BINCONFIG = "${bindir}/onig-config" @@ -24,10 +23,12 @@ inherit autotools binconfig-disabled ptest BBCLASSEXTEND = "native" do_compile_ptest() { - oe_runmake -C test buildtest-TESTS + oe_runmake -C test buildtest-TESTS } do_install_ptest() { - mkdir -p ${D}${PTEST_PATH}/tests - install -m 0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* + mkdir -p ${D}${PTEST_PATH}/tests + install -m 0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* } + +PROVIDES += "oniguruma" diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch deleted file mode 100644 index 6cb5dfcccb..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 6fb28085e867d7c3ef46577d9ff193a185693bcb Mon Sep 17 00:00:00 2001 -From: Oliver Kurth <okurth@vmware.com> -Date: Mon, 30 Sep 2019 16:24:27 -0700 -Subject: [PATCH] GitHub Issue #367. Remove references to deprecated G_INLINE_FUNC. - -G_INLINE_FUNC was a work-around for compilers that didn't support -static inline. Change uses of it to static inline. - -Upstream-Status: Backport -[https://github.com/vmware/open-vm-tools/commit/89c0d444567eb525e8d083fb564c46d68e96660c] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/include/vmware/tools/plugin.h | 2 +- - open-vm-tools/lib/include/vmware/tools/threadPool.h | 8 ++++---- - open-vm-tools/lib/include/vmware/tools/utils.h | 9 --------- - 3 files changed, 5 insertions(+), 14 deletions(-) - -diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h -index f9acc6a2..deefd1f3 100644 ---- a/open-vm-tools/lib/include/vmware/tools/plugin.h -+++ b/open-vm-tools/lib/include/vmware/tools/plugin.h -@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx { - * - * @return TRUE if COM is initialized when the function returns. - */ --G_INLINE_FUNC gboolean -+static inline gboolean - ToolsCore_InitializeCOM(ToolsAppCtx *ctx) - { - if (!ctx->comInitialized) { -diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h -index 3f2082b3..5880fbcf 100644 ---- a/open-vm-tools/lib/include/vmware/tools/threadPool.h -+++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h -@@ -91,7 +91,7 @@ typedef struct ToolsCorePool { - ******************************************************************************* - */ - --G_INLINE_FUNC ToolsCorePool * -+static inline ToolsCorePool * - ToolsCorePool_GetPool(ToolsAppCtx *ctx) - { - ToolsCorePool *pool = NULL; -@@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx) - ******************************************************************************* - */ - --G_INLINE_FUNC guint -+static inline guint - ToolsCorePool_SubmitTask(ToolsAppCtx *ctx, - ToolsCorePoolCb cb, - gpointer data, -@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx, - ******************************************************************************* - */ - --G_INLINE_FUNC void -+static inline void - ToolsCorePool_CancelTask(ToolsAppCtx *ctx, - guint taskId) - { -@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx, - ******************************************************************************* - */ - --G_INLINE_FUNC gboolean -+static inline gboolean - ToolsCorePool_StartThread(ToolsAppCtx *ctx, - const gchar *threadName, - ToolsCorePoolCb cb, -diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h -index f6574590..a3292d5c 100644 ---- a/open-vm-tools/lib/include/vmware/tools/utils.h -+++ b/open-vm-tools/lib/include/vmware/tools/utils.h -@@ -51,15 +51,6 @@ - # include <sys/time.h> - #endif - -- --/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */ --#if defined(G_PLATFORM_WIN32) --# if defined(G_INLINE_FUNC) --# undef G_INLINE_FUNC --# endif --# define G_INLINE_FUNC static __inline --#endif -- - #ifndef ABS - # define ABS(x) (((x) >= 0) ? (x) : -(x)) - #endif --- -2.23.0 - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch deleted file mode 100644 index 61a681f17f..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch +++ /dev/null @@ -1,78 +0,0 @@ -From caf80e220b055dbce259078be96e899dc78ec1d2 Mon Sep 17 00:00:00 2001 -From: Bartosz Brachaczek <b.brachaczek@gmail.com> -Date: Tue, 12 Nov 2019 14:31:08 +0100 -Subject: [PATCH] Make HgfsConvertFromNtTimeNsec aware of 64-bit time_t on i386 - -I verified that this function behaves as expected on x86_64, i386 with -32-bit time_t, and i386 with 64-bit time_t for the following values of -ntTtime: - -UNIX_EPOCH-1, UNIX_EPOCH, UNIX_EPOCH+1, UNIX_S32_MAX-1, UNIX_S32_MAX, -UNIX_S32_MAX+1, UNIX_S32_MAX*2+1 - -I did not verify whether the use of Div643264 is optimal, performance -wise. - -Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/387] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/hgfs/hgfsUtil.c | 34 +++++++++++++++++-------------- - 1 file changed, 19 insertions(+), 15 deletions(-) - -diff --git a/open-vm-tools/lib/hgfs/hgfsUtil.c b/open-vm-tools/lib/hgfs/hgfsUtil.c -index cc580ab8..49b10040 100644 ---- a/open-vm-tools/lib/hgfs/hgfsUtil.c -+++ b/open-vm-tools/lib/hgfs/hgfsUtil.c -@@ -110,23 +110,21 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format - uint64 ntTime) // IN: Time in Windows NT format - { - #ifdef __i386__ -- uint32 sec; -- uint32 nsec; -+ uint64 sec64; -+ uint32 sec32, nsec; -+#endif - - ASSERT(unixTime); -- /* We assume that time_t is 32bit */ -- ASSERT_ON_COMPILE(sizeof (unixTime->tv_sec) == 4); - -- /* Cap NT time values that are outside of Unix time's range */ -+ if (sizeof (unixTime->tv_sec) == 4) { -+ /* Cap NT time values that are outside of Unix time's range */ - -- if (ntTime >= UNIX_S32_MAX) { -- unixTime->tv_sec = 0x7FFFFFFF; -- unixTime->tv_nsec = 0; -- return 1; -+ if (ntTime >= UNIX_S32_MAX) { -+ unixTime->tv_sec = 0x7FFFFFFF; -+ unixTime->tv_nsec = 0; -+ return 1; -+ } - } --#else -- ASSERT(unixTime); --#endif - - if (ntTime < UNIX_EPOCH) { - unixTime->tv_sec = 0; -@@ -135,9 +133,15 @@ HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format - } - - #ifdef __i386__ -- Div643232(ntTime - UNIX_EPOCH, 10000000, &sec, &nsec); -- unixTime->tv_sec = sec; -- unixTime->tv_nsec = nsec * 100; -+ if (sizeof (unixTime->tv_sec) == 4) { -+ Div643232(ntTime - UNIX_EPOCH, 10000000, &sec32, &nsec); -+ unixTime->tv_sec = sec32; -+ unixTime->tv_nsec = nsec * 100; -+ } else { -+ Div643264(ntTime - UNIX_EPOCH, 10000000, &sec64, &nsec); -+ unixTime->tv_sec = sec64; -+ unixTime->tv_nsec = nsec * 100; -+ } - #else - unixTime->tv_sec = (ntTime - UNIX_EPOCH) / 10000000; - unixTime->tv_nsec = ((ntTime - UNIX_EPOCH) % 10000000) * 100; diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch deleted file mode 100644 index a711f5e5d2..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fc9bf1ce9f1a21150b10736a1c968d4ca6d4eaa3 Mon Sep 17 00:00:00 2001 -From: Martin Kelly <mkelly@xevo.com> -Date: Fri, 7 Apr 2017 15:20:30 -0700 -Subject: [PATCH] configure.ac: don't use dnet-config - -The dnet-config tool doesn't know about cross-compilation, so it injects --I/usr/include into the path, causing compiler errors. So instead find dnet via --ldnet. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Martin Kelly <mkelly@xevo.com> ---- - open-vm-tools/configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/open-vm-tools/configure.ac -+++ b/open-vm-tools/configure.ac -@@ -937,7 +937,7 @@ if test "$with_dnet" = "yes"; then - AC_VMW_CHECK_LIB([dnet], - [DNET], - [], -- [dnet-config], -+ [], - [], - [dnet.h], - [intf_open], -@@ -947,7 +947,7 @@ if test "$with_dnet" = "yes"; then - - if test $have_dnet = "no"; then - AC_MSG_ERROR( -- [dnet-config was not found on your PATH. Please configure without dnet or install dnet - http://libdnet.sourceforge.net]) -+ [dnet was not found. Please configure without dnet (using --without-dnet) or install dnet - http://libdnet.sourceforge.net]) - fi - fi - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-hgfsmounter-Makefile.am-support-usrmerge.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-hgfsmounter-Makefile.am-support-usrmerge.patch deleted file mode 100644 index 82443ee660..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-hgfsmounter-Makefile.am-support-usrmerge.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 33798f3e484ebd3470e9da791b73b4b90ba12bc3 Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Tue, 14 Jan 2020 15:04:03 +0800 -Subject: [PATCH] hgfsmounter/Makefile.am: support usrmerge - -There is a do_package error when enable usrmerge feature due to the -hardcoded sbin directory. Remove this piece of code because we already -create the symbolic link in do_install. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - open-vm-tools/hgfsmounter/Makefile.am | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/open-vm-tools/hgfsmounter/Makefile.am b/open-vm-tools/hgfsmounter/Makefile.am -index 7c1ba1a..58bd3f8 100644 ---- a/open-vm-tools/hgfsmounter/Makefile.am -+++ b/open-vm-tools/hgfsmounter/Makefile.am -@@ -39,9 +39,6 @@ uninstall-hook: - rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs - else - install-exec-hook: -- -$(MKDIR_P) $(DESTDIR)/sbin -- -$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \ -- $(DESTDIR)/sbin/mount.vmhgfs &> /dev/null - uninstall-hook: - rm -f $(DESTDIR)/sbin/mount.vmhgfs - endif !FREEBSD --- -2.7.4 - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-utilBacktrace-Ignore-Warray-bounds.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-utilBacktrace-Ignore-Warray-bounds.patch deleted file mode 100644 index 95664e8552..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-utilBacktrace-Ignore-Warray-bounds.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ac3f93ea087d3a5461fe57fe021d0fe9a959e13c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 25 Dec 2019 15:25:02 -0800 -Subject: [PATCH] utilBacktrace: Ignore -Warray-bounds - -This is new warning with gcc10, until its fixed ignore it like gcc<10 -did - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/user/utilBacktrace.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/open-vm-tools/lib/user/utilBacktrace.c b/open-vm-tools/lib/user/utilBacktrace.c -index b72340ad..97ca53f2 100644 ---- a/open-vm-tools/lib/user/utilBacktrace.c -+++ b/open-vm-tools/lib/user/utilBacktrace.c -@@ -517,6 +517,11 @@ Util_BacktraceWithFunc(int bugNr, // IN: - } else { - outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr); - } -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Warray-bounds" -+ - Util_BacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData); -+#pragma GCC diagnostic pop - #endif - } -+ --- -2.24.1 - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch deleted file mode 100644 index 34628ffbef..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3fa237b3afabc293e563292b8d89265a871626ad Mon Sep 17 00:00:00 2001 -From: Martin Kelly <mkelly@xevo.com> -Date: Mon, 22 May 2017 17:00:05 -0700 -Subject: [PATCH] add #include <sys/sysmacros.h> - -In newer glibc versions, the definition for major() has been moved to -sys/sysmacros.h, and using the older version in <sys/types.h> has been -deprecated. So, add an include for <sys/sysmacros.h>. - -Upstream-Status: Pending - -Signed-off-by: Martin Kelly <mkelly@xevo.com> ---- - open-vm-tools/lib/wiper/wiperPosix.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/open-vm-tools/lib/wiper/wiperPosix.c b/open-vm-tools/lib/wiper/wiperPosix.c -index bd542410..ccf06293 100644 ---- a/open-vm-tools/lib/wiper/wiperPosix.c -+++ b/open-vm-tools/lib/wiper/wiperPosix.c -@@ -43,6 +43,9 @@ - # include <libgen.h> - # endif /* __FreeBSD_version >= 500000 */ - #endif -+#if defined(__linux__) -+#include <sys/sysmacros.h> -+#endif - #include <unistd.h> - - #include "vmware.h" diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch deleted file mode 100644 index 0f64eabc94..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fe56b67a2915a8632ea30604c14241f335dd3c15 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 12 Nov 2019 10:49:46 -0800 -Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - .../lib/hgfsServer/hgfsServerLinux.c | 19 +++++-------------- - 1 file changed, 5 insertions(+), 14 deletions(-) - -diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index 03175623..554da67f 100644 ---- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -2561,20 +2561,11 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information - LOG(4, ("%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__, - attr->specialPerms, attr->ownerPerms, attr->groupPerms, - attr->otherPerms, attr->size)); --#ifdef __FreeBSD__ --# if !defined(VM_X86_64) && __FreeBSD_version >= 500043 --# define FMTTIMET "" --# else --# define FMTTIMET "l" --# endif --#else --# define FMTTIMET "l" --#endif -- LOG(4, ("access: %"FMTTIMET"d/%"FMT64"u \nwrite: %"FMTTIMET"d/%"FMT64"u \n" -- "attr: %"FMTTIMET"d/%"FMT64"u\n", -- stats->st_atime, attr->accessTime, stats->st_mtime, attr->writeTime, -- stats->st_ctime, attr->attrChangeTime)); --#undef FMTTIMET -+ LOG(4, ("access: %jd/%"FMT64"u \nwrite: %jd/%"FMT64"u \n" -+ "attr: %jd/%"FMT64"u\n", -+ (intmax_t)stats->st_atime, attr->accessTime, -+ (intmax_t)stats->st_mtime, attr->writeTime, -+ (intmax_t)stats->st_ctime, attr->attrChangeTime)); - - attr->userId = stats->st_uid; - attr->groupId = stats->st_gid; diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Use-configure-test-for-struct-timespec.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Use-configure-test-for-struct-timespec.patch deleted file mode 100644 index 6d2e498141..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Use-configure-test-for-struct-timespec.patch +++ /dev/null @@ -1,45 +0,0 @@ -From bf9292ff9bd25467a014d6c2070805d163daa4c9 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 09:03:00 +0000 -Subject: [PATCH] Use configure test for struct timespec - -Use the configure script to test for struct time spec instead of trying -to keep track of what platforms has it. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/configure.ac | 1 + - open-vm-tools/lib/include/hgfsUtil.h | 8 +------- - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 713ea683..48ff1ef3 100644 ---- a/open-vm-tools/configure.ac -+++ b/open-vm-tools/configure.ac -@@ -1208,6 +1208,7 @@ AC_TYPE_OFF_T - AC_TYPE_PID_T - AC_TYPE_SIZE_T - AC_CHECK_MEMBERS([struct stat.st_rdev]) -+AC_CHECK_MEMBERS([struct timespec.tv_sec],[],[],[[#include <time.h>]]) - AC_HEADER_TIME - AC_STRUCT_TM - AC_C_VOLATILE -diff --git a/open-vm-tools/lib/include/hgfsUtil.h b/open-vm-tools/lib/include/hgfsUtil.h -index 609f4c00..a3a022d4 100644 ---- a/open-vm-tools/lib/include/hgfsUtil.h -+++ b/open-vm-tools/lib/include/hgfsUtil.h -@@ -53,13 +53,7 @@ - # include <time.h> - # endif - # include "vm_basic_types.h" --# if !defined _STRUCT_TIMESPEC && \ -- !defined _TIMESPEC_DECLARED && \ -- !defined __timespec_defined && \ -- !defined sun && \ -- !defined __FreeBSD__ && \ -- !__APPLE__ && \ -- !defined _WIN32 -+# if !defined HAVE_STRUCT_TIMESPEC_TV_SEC - struct timespec { - time_t tv_sec; - long tv_nsec; diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch deleted file mode 100644 index e107ecf235..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5a795b234c617150915a607776c76377948870a6 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 09:10:14 +0000 -Subject: [PATCH] Fix definition of ALLPERMS and ACCESSPERMS - -The ALLPERMS and ACCESSPERMS defines are not specified in POSIX so -assume it is not there instead of testing for specific implementations. - -This is needed for musl libc. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++--- - open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +-- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index f2b7ce67..0e6351a9 100644 ---- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -105,11 +105,13 @@ typedef struct DirectoryEntry { - #endif - - /* -- * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not defined in the -- * Solaris version of <sys/stat.h>. -+ * ALLPERMS (mode 07777) and ACCESSPERMS (mode 0777) are not specified in -+ * POSIX. - */ --#ifdef sun -+#ifndef ACCESSPERMS - # define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) -+#endif -+#ifndef ALLPERMS - # define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO) - #endif - -diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -index 89133652..7e9c3a91 100644 ---- a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -+++ b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -@@ -52,7 +52,7 @@ - - #define DND_ROOTDIR_PERMS (S_IRWXU | S_IRWXG | S_IRWXO) - #define DND_STAGINGDIR_PERMS (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) --#ifdef sun -+#ifndef ACCESSPERMS - #define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) - #endif - #ifdef __ANDROID__ -@@ -61,7 +61,6 @@ - */ - #define NO_SETMNTENT - #define NO_ENDMNTENT --#define ACCESSPERMS (S_IRWXU | S_IRWXG | S_IRWXO) - #endif - - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch deleted file mode 100644 index c6378b8086..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 719d60978f979cf2e03771a9b8a62e36c92639f9 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 10:05:07 +0000 -Subject: [PATCH] Use configure to test for feature instead of platform - -Test for various functions instead of trying to keep track of what -platform and what version of the given platform has support for what. - -This should make it easier to port to currently unknown platforms and -will solve the issue if a platform add support for a missing feature in -the future. - -The features we test for are: -- getifaddrs -- getauxval -- issetugid -- __secure_getenv - -This is needed for musl libc. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/configure.ac | 4 ++++ - open-vm-tools/lib/misc/idLinux.c | 30 +++++++++++------------- - open-vm-tools/lib/nicInfo/nicInfoPosix.c | 6 ++++- - 3 files changed, 23 insertions(+), 17 deletions(-) - -diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 48ff1ef3..71e684bb 100644 ---- a/open-vm-tools/configure.ac -+++ b/open-vm-tools/configure.ac -@@ -897,6 +897,7 @@ AC_CHECK_FUNCS( - - AC_CHECK_FUNCS([ecvt]) - AC_CHECK_FUNCS([fcvt]) -+AC_CHECK_FUNCS([getifaddrs getauxval issetugid __secure_getenv]) - - AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) - -@@ -1145,10 +1146,13 @@ fi - ### - - AC_CHECK_HEADERS([crypt.h]) -+AC_CHECK_HEADERS([ifaddrs.h]) - AC_CHECK_HEADERS([inttypes.h]) - AC_CHECK_HEADERS([stdint.h]) - AC_CHECK_HEADERS([stdlib.h]) - AC_CHECK_HEADERS([wchar.h]) -+AC_CHECK_HEADERS([net/if.h]) -+AC_CHECK_HEADERS([sys/auxv.h]) - AC_CHECK_HEADERS([sys/inttypes.h]) - AC_CHECK_HEADERS([sys/io.h]) - AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD -diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c -index b950cf84..1dcfb508 100644 ---- a/open-vm-tools/lib/misc/idLinux.c -+++ b/open-vm-tools/lib/misc/idLinux.c -@@ -27,12 +27,9 @@ - #include <sys/syscall.h> - #include <string.h> - #include <unistd.h> --#ifdef __linux__ --#if defined(__GLIBC__) && \ -- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) -+#ifdef HAVE_SYS_AUXV_H - #include <sys/auxv.h> - #endif --#endif - #ifdef __APPLE__ - #include <sys/socket.h> - #include <TargetConditionals.h> -@@ -997,31 +994,32 @@ Id_EndSuperUser(uid_t uid) // IN: - static Bool - IdIsSetUGid(void) - { --#if defined(__ANDROID__) -- /* Android does not have a secure_getenv, so be conservative. */ -- return TRUE; --#else - /* - * We use __secure_getenv, which returns NULL if the binary is -- * setuid or setgid. Alternatives include, -+ * setuid or setgid, when issetugid or getauxval(AT_SECURE) is not -+ * available. Alternatives include, - * -- * a) getauxval(AT_SECURE); not available until glibc 2.16. -- * b) __libc_enable_secure; may not be exported. -+ * a) issetugid(); not (yet?) available in glibc. -+ * b) getauxval(AT_SECURE); not available until glibc 2.16. -+ * c) __libc_enable_secure; may not be exported. - * -- * Use (a) when we are based on glibc 2.16, or newer. -+ * Use (b) when we are based on glibc 2.16, or newer. - */ - --#if defined(__GLIBC__) && \ -- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) -+#if HAVE_ISSETUGID -+ return issetugid(); -+#elif HAVE_GETAUXVAL - return getauxval(AT_SECURE) != 0; --#else -+#elif HAVE___SECURE_GETENV - static const char envName[] = "VMW_SETUGID_TEST"; - - if (setenv(envName, "1", TRUE) == -1) { - return TRUE; /* Conservative */ - } - return __secure_getenv(envName) == NULL; --#endif -+#else -+ /* Android does not have a secure_getenv, so be conservative. */ -+ return TRUE; - #endif - } - #endif -diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c -index a22981d5..b4e08681 100644 ---- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c -+++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c -@@ -34,9 +34,13 @@ - #include <sys/socket.h> - #include <sys/stat.h> - #include <errno.h> --#if defined(__FreeBSD__) || defined(__APPLE__) -+#if HAVE_SYS_SYSCTL_H - # include <sys/sysctl.h> -+#endif -+#if HAVE_IFADDRS_H - # include <ifaddrs.h> -+#endif -+#if HAVE_NET_IF_H - # include <net/if.h> - #endif - #ifndef NO_DNET diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Use-configure-test-for-sys-stat.h-include.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Use-configure-test-for-sys-stat.h-include.patch deleted file mode 100644 index 9a227f9ec7..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Use-configure-test-for-sys-stat.h-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 11adcf43a1e7aa39ee4d82fa567f37e5b0c6ca81 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Wed, 18 Nov 2015 10:41:01 +0000 -Subject: [PATCH] Use configure test for sys/stat.h include - -This is needed for musl libc. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - open-vm-tools/services/plugins/vix/vixTools.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c -index e5273786..cabc4137 100644 ---- a/open-vm-tools/services/plugins/vix/vixTools.c -+++ b/open-vm-tools/services/plugins/vix/vixTools.c -@@ -66,7 +66,7 @@ - #include <unistd.h> - #endif - --#if defined(sun) || defined(__FreeBSD__) || defined(__APPLE__) -+#ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif - diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Fix-subdir-objects-configure-error.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Fix-subdir-objects-configure-error.patch deleted file mode 100644 index 11be2d4a07..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Fix-subdir-objects-configure-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cf1284fda8fb22a2b27cb2ce7962f166166e74c3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 23:48:04 -0700 -Subject: [PATCH] Fix subdir objects configure error - -Fix build on musl while here - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 71e684bb..b76a7966 100644 ---- a/open-vm-tools/configure.ac -+++ b/open-vm-tools/configure.ac -@@ -303,6 +303,7 @@ AC_ARG_ENABLE( - [], - [enable_resolutionkms="auto"]) - -+AM_INIT_AUTOMAKE([subdir-objects]) - AM_INIT_AUTOMAKE - - ### diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-include-poll.h-instead-of-sys-poll.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-include-poll.h-instead-of-sys-poll.h.patch deleted file mode 100644 index 814b9e3b25..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-include-poll.h-instead-of-sys-poll.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e4f0b99d90e26b15106f634caad1c3dea9e09cb8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 23:02:50 -0700 -Subject: [PATCH] include poll.h instead of sys/poll.h - -including sys/poll.h is deprecated - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c -index 65b07109..b41aa29d 100644 ---- a/open-vm-tools/lib/asyncsocket/asyncsocket.c -+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c -@@ -69,8 +69,8 @@ - #else - #include <stddef.h> - #include <ctype.h> -+#include <poll.h> - #include <sys/types.h> --#include <sys/poll.h> - #include <sys/socket.h> - #include <sys/un.h> - #include <netdb.h> diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch deleted file mode 100644 index 9cf54f6f44..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Rename-poll.h-to-vm_poll.h.patch +++ /dev/null @@ -1,742 +0,0 @@ -From 8793466326dd10b0d2dbb83c64beff5cc8c0fc7d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 23:11:58 -0700 -Subject: [PATCH] Rename poll.h to vm_poll.h - -musl libc's system headers pulls in open-vm-tools' poll.h. To avoid this -we rename poll.h to vm_poll.h. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- - open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- - open-vm-tools/lib/include/asyncsocket.h | 2 +- - open-vm-tools/lib/include/pollImpl.h | 2 +- - open-vm-tools/lib/include/{poll.h => vm_poll.h} | 2 +- - open-vm-tools/lib/rpcIn/rpcin.c | 2 +- - .../services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) - ---- a/open-vm-tools/lib/asyncsocket/asyncsocket.c -+++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c -@@ -86,7 +86,7 @@ - #include "random.h" - #include "asyncsocket.h" - #include "asyncSocketBase.h" --#include "poll.h" -+#include "vm_poll.h" - #include "log.h" - #include "err.h" - #include "hostinfo.h" ---- a/open-vm-tools/lib/hgfsServer/hgfsServer.c -+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c -@@ -48,7 +48,7 @@ - #include "hgfsServerOplock.h" - #include "hgfsDirNotify.h" - #include "userlock.h" --#include "poll.h" -+#include "vm_poll.h" - #include "mutexRankLib.h" - #include "vm_basic_asm.h" - #include "unicodeOperations.h" ---- a/open-vm-tools/lib/include/asyncsocket.h -+++ b/open-vm-tools/lib/include/asyncsocket.h -@@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket; - * Or the client can specify its favorite poll class and locking behavior. - * Use of IVmdbPoll is only supported for regular sockets and for Attach. - */ --#include "poll.h" -+#include "vm_poll.h" - struct IVmdbPoll; - typedef struct AsyncSocketPollParams { - int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ ---- a/open-vm-tools/lib/include/pollImpl.h -+++ b/open-vm-tools/lib/include/pollImpl.h -@@ -44,7 +44,7 @@ - #define INCLUDE_ALLOW_USERLEVEL - #include "includeCheck.h" - --#include "poll.h" -+#include "vm_poll.h" - #include "vm_basic_asm.h" - - #if defined(__cplusplus) ---- a/open-vm-tools/lib/include/poll.h -+++ /dev/null -@@ -1,330 +0,0 @@ --/********************************************************* -- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. -- * -- * This program is free software; you can redistribute it and/or modify it -- * under the terms of the GNU Lesser General Public License as published -- * by the Free Software Foundation version 2.1 and no later version. -- * -- * This program is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public -- * License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public License -- * along with this program; if not, write to the Free Software Foundation, Inc., -- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- *********************************************************/ -- --/********************************************************* -- * The contents of this file are subject to the terms of the Common -- * Development and Distribution License (the "License") version 1.0 -- * and no later version. You may not use this file except in -- * compliance with the License. -- * -- * You can obtain a copy of the License at -- * http://www.opensource.org/licenses/cddl1.php -- * -- * See the License for the specific language governing permissions -- * and limitations under the License. -- * -- *********************************************************/ -- -- --#ifndef _POLL_H_ --#define _POLL_H_ -- --#define INCLUDE_ALLOW_USERLEVEL --#define INCLUDE_ALLOW_VMCORE --#include "includeCheck.h" -- --#include "vm_basic_types.h" --#include "vm_basic_defs.h" --#include "vmware.h" --#include "userlock.h" -- --#if defined(__cplusplus) --extern "C" { --#endif -- --#ifdef _WIN32 --#define HZ 100 --#elif defined linux --#include <asm/param.h> --#elif __APPLE__ --#include <TargetConditionals.h> --/* -- * Old SDKs don't define TARGET_OS_IPHONE at all. -- * New ones define it to 0 on Mac OS X, 1 on iOS. -- */ --#if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 --#include <sys/kernel.h> --#endif --#include <sys/poll.h> --#define HZ 100 --#endif --#ifdef __ANDROID__ --/* -- * <poll.h> of android should be included, but its name is same -- * with this file. So its content is put here to avoid conflict. -- */ --#include <asm/poll.h> --#define HZ 100 --typedef unsigned int nfds_t; --int poll(struct pollfd *, nfds_t, long); --#endif -- -- --/* -- * Poll event types: each type has a different reason for firing, -- * or condition that must be met before firing. -- */ -- --typedef enum { -- /* -- * Actual Poll queue types against which you can register callbacks. -- */ -- POLL_VIRTUALREALTIME = -1, /* Negative because it doesn't have its own Q */ -- POLL_VTIME = 0, -- POLL_REALTIME, -- POLL_DEVICE, -- POLL_MAIN_LOOP, -- POLL_NUM_QUEUES --} PollEventType; -- -- --/* -- * Classes of events -- * -- * These are the predefined classes. More can be declared -- * with Poll_AllocClass(). -- */ -- --typedef enum PollClass { -- POLL_CLASS_MAIN, -- POLL_CLASS_PAUSE, -- POLL_CLASS_IPC, -- POLL_CLASS_CPT, -- POLL_CLASS_MKS, -- POLL_FIXED_CLASSES, -- POLL_DEFAULT_FIXED_CLASSES, -- /* Size enum to maximum */ -- POLL_MAX_CLASSES = 31, --} PollClass; -- --/* -- * Do not use; Special pseudo private poll class supported by -- * PollDefault only -- */ --#define POLL_DEFAULT_CLASS_NET POLL_FIXED_CLASSES --#define POLL_DEFAULT_CS_NET PollClassSet_Singleton(POLL_DEFAULT_CLASS_NET) -- --/* -- * Each callback is registered in a set of classes -- */ -- --typedef struct PollClassSet { -- uintptr_t bits; --} PollClassSet; -- --/* An empty PollClassSet. */ --static INLINE PollClassSet --PollClassSet_Empty(void) --{ -- PollClassSet set = { 0 }; -- return set; --} -- --/* A PollClassSet with the single member. */ --static INLINE PollClassSet --PollClassSet_Singleton(PollClass c) --{ -- PollClassSet s = PollClassSet_Empty(); -- -- ASSERT_ON_COMPILE(POLL_MAX_CLASSES < sizeof s.bits * 8); -- ASSERT(c < POLL_MAX_CLASSES); -- -- s.bits = CONST3264U(1) << c; -- return s; --} -- --/* Combine two PollClassSets. */ --static INLINE PollClassSet --PollClassSet_Union(PollClassSet lhs, PollClassSet rhs) --{ -- PollClassSet set; -- set.bits = lhs.bits | rhs.bits; -- return set; --} -- --/* Add single class to PollClassSet. */ --static INLINE PollClassSet --PollClassSet_Include(PollClassSet set, PollClass c) --{ -- return PollClassSet_Union(set, PollClassSet_Singleton(c)); --} -- -- --#define POLL_CS_MAIN PollClassSet_Singleton(POLL_CLASS_MAIN) --#define POLL_CS_PAUSE PollClassSet_Union(POLL_CS_MAIN, \ -- PollClassSet_Singleton(POLL_CLASS_PAUSE)) --#define POLL_CS_CPT PollClassSet_Union(POLL_CS_PAUSE, \ -- PollClassSet_Singleton(POLL_CLASS_CPT)) --#define POLL_CS_IPC PollClassSet_Union(POLL_CS_CPT, \ -- PollClassSet_Singleton(POLL_CLASS_IPC)) --#define POLL_CS_VMDB POLL_CS_PAUSE /* POLL_CLASS_VMDB is retired */ --#define POLL_CS_MKS PollClassSet_Singleton(POLL_CLASS_MKS) --/* -- * DANGER. You don't need POLL_CS_ALWAYS. Really. So don't use it. -- */ --#define POLL_CS_ALWAYS PollClassSet_Union(POLL_CS_CPT, POLL_CS_IPC) -- --/* -- * Poll class-set taxonomy: -- * POLL_CS_MAIN -- * - Unless you NEED another class, use POLL_CS_MAIN. -- * POLL_CS_PAUSE -- * - For callbacks that must occur even if the guest is paused. -- * Most VMDB or Foundry commands are in this category. -- * POLL_CS_CPT -- * - Only for callbacks which can trigger intermediate Checkpoint -- * transitions. -- * The ONLY such callback is Migrate. -- * POLL_CS_IPC -- * - Only for callbacks which can contain Msg_(Post|Hint|Question) -- * responses, and for signal handlers (why)? -- * Vigor, VMDB, and Foundry can contain Msg_* responses. -- * POLL_CS_MKS -- * - Callback runs in MKS thread. -- * POLL_CS_ALWAYS -- * - Only for events that must be processed immediately. -- * The ONLY such callback is OvhdMemVmxSizeCheck. -- */ -- -- --/* -- * Poll_Callback flags -- */ -- --#define POLL_FLAG_PERIODIC 0x01 // keep after firing --#define POLL_FLAG_REMOVE_AT_POWEROFF 0x02 // self-explanatory --#define POLL_FLAG_READ 0x04 // device is ready for reading --#define POLL_FLAG_WRITE 0x08 // device is ready for writing --#define POLL_FLAG_SOCKET 0x10 // device is a Windows socket --#define POLL_FLAG_NO_BULL 0x20 // callback does its own locking --#define POLL_FLAG_WINSOCK 0x40 // Winsock style write events --#define POLL_FLAG_FD 0x80 // device is a Windows file descriptor. --#define POLL_FLAG_ACCEPT_INVALID_FDS 0x100 // For broken 3rd party libs, e.g. curl --#define POLL_FLAG_THUNK_TO_WND 0x200 // thunk callback to window message loop -- -- --typedef void (*PollerFunction)(void *clientData); --typedef void (*PollerFireWrapper)(PollerFunction func, -- void *funcData, -- void *wrapperData); --typedef Bool (*PollerErrorFn)(const char *errorStr); -- --/* -- * Initialisers: -- * -- * For the sake of convenience, we declare the initialisers -- * for custom implmentations here, even though the actual -- * implementations are distinct from the core poll code. -- */ -- --typedef struct PollOptions { -- Bool locked; // Use internal MXUser for locking -- Bool allowFullQueue; // Don't assert when device event queue is full. -- VThreadID windowsMsgThread; // thread that processes Windows messages -- PollerFireWrapper fireWrapperFn; // optional; may be useful for stats -- void *fireWrapperData; // optional -- PollerErrorFn errorFn; // optional; called upon unrecoverable error --} PollOptions; -- -- --void Poll_InitDefault(void); --void Poll_InitDefaultEx(const PollOptions *opts); --void Poll_InitGtk(void); // On top of glib for Linux --void Poll_InitCF(void); // On top of CoreFoundation for OSX -- -- --/* -- * Functions -- */ --int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); --void Poll_Loop(Bool loop, Bool *exit, PollClass c); --void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); --Bool Poll_LockingEnabled(void); --void Poll_Exit(void); -- -- --/* -- * Poll_Callback adds a callback regardless of whether an identical one exists. -- * The exception to this rule is POLL_DEVICE callbacks: there is a maximum of -- * one read and one write callback per fd. -- * -- * Poll_CallbackRemove removes one callback. If there are multiple identical -- * callbacks, which one is removed is an implementation detail. Note that in -- * the case of POLL_DEVICE and POLL_REALTIME callbacks, the fd/delay used to -- * create the callback is not specified when removing, so all callbacks -- * of those types with the same flags, function, and clientData are considered -- * "identical" even if their fd/delay differed. -- */ -- --VMwareStatus Poll_Callback(PollClassSet classSet, -- int flags, -- PollerFunction f, -- void *clientData, -- PollEventType type, -- PollDevHandle info, // fd/microsec delay -- MXUserRecLock *lck); --Bool Poll_CallbackRemove(PollClassSet classSet, -- int flags, -- PollerFunction f, -- void *clientData, -- PollEventType type); --Bool Poll_CallbackRemoveOneByCB(PollClassSet classSet, -- int flags, -- PollerFunction f, -- PollEventType type, -- void **clientData); -- --void Poll_NotifyChange(PollClassSet classSet); -- --/* -- * Wrappers for Poll_Callback and Poll_CallbackRemove that present -- * simpler subsets of those interfaces. -- */ -- --VMwareStatus Poll_CB_Device(PollerFunction f, -- void *clientData, -- PollDevHandle device, -- Bool periodic); -- --Bool Poll_CB_DeviceRemove(PollerFunction f, -- void *clientData, -- Bool periodic); -- -- --VMwareStatus Poll_CB_RTime(PollerFunction f, -- void *clientData, -- int64 delay, // microseconds -- Bool periodic, -- MXUserRecLock *lock); -- --Bool Poll_CB_RTimeRemove(PollerFunction f, -- void *clientData, -- Bool periodic); -- -- --#ifdef _WIN32 --void Poll_SetPumpsWindowsMessages(Bool pumps); --void Poll_SetWindowMessageRecipient(HWND hWnd, UINT msg, Bool alwaysThunk); --Bool Poll_FireWndCallback(void *lparam); --#endif -- --#if defined(__cplusplus) --} // extern "C" --#endif -- --#endif // _POLL_H_ ---- /dev/null -+++ b/open-vm-tools/lib/include/vm_poll.h -@@ -0,0 +1,330 @@ -+/********************************************************* -+ * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU Lesser General Public License as published -+ * by the Free Software Foundation version 2.1 and no later version. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -+ * or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public -+ * License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * along with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ *********************************************************/ -+ -+/********************************************************* -+ * The contents of this file are subject to the terms of the Common -+ * Development and Distribution License (the "License") version 1.0 -+ * and no later version. You may not use this file except in -+ * compliance with the License. -+ * -+ * You can obtain a copy of the License at -+ * http://www.opensource.org/licenses/cddl1.php -+ * -+ * See the License for the specific language governing permissions -+ * and limitations under the License. -+ * -+ *********************************************************/ -+ -+ -+#ifndef _POLL_H_ -+#define _POLL_H_ -+ -+#define INCLUDE_ALLOW_USERLEVEL -+#define INCLUDE_ALLOW_VMCORE -+#include "includeCheck.h" -+ -+#include "vm_basic_types.h" -+#include "vm_basic_defs.h" -+#include "vmware.h" -+#include "userlock.h" -+ -+#if defined(__cplusplus) -+extern "C" { -+#endif -+ -+#ifdef _WIN32 -+#define HZ 100 -+#elif defined linux -+#include <asm/param.h> -+#elif __APPLE__ -+#include <TargetConditionals.h> -+/* -+ * Old SDKs don't define TARGET_OS_IPHONE at all. -+ * New ones define it to 0 on Mac OS X, 1 on iOS. -+ */ -+#if !defined(TARGET_OS_IPHONE) || TARGET_OS_IPHONE == 0 -+#include <sys/kernel.h> -+#endif -+#include <poll.h> -+#define HZ 100 -+#endif -+#ifdef __ANDROID__ -+/* -+ * <poll.h> of android should be included, but its name is same -+ * with this file. So its content is put here to avoid conflict. -+ */ -+#include <asm/poll.h> -+#define HZ 100 -+typedef unsigned int nfds_t; -+int poll(struct pollfd *, nfds_t, long); -+#endif -+ -+ -+/* -+ * Poll event types: each type has a different reason for firing, -+ * or condition that must be met before firing. -+ */ -+ -+typedef enum { -+ /* -+ * Actual Poll queue types against which you can register callbacks. -+ */ -+ POLL_VIRTUALREALTIME = -1, /* Negative because it doesn't have its own Q */ -+ POLL_VTIME = 0, -+ POLL_REALTIME, -+ POLL_DEVICE, -+ POLL_MAIN_LOOP, -+ POLL_NUM_QUEUES -+} PollEventType; -+ -+ -+/* -+ * Classes of events -+ * -+ * These are the predefined classes. More can be declared -+ * with Poll_AllocClass(). -+ */ -+ -+typedef enum PollClass { -+ POLL_CLASS_MAIN, -+ POLL_CLASS_PAUSE, -+ POLL_CLASS_IPC, -+ POLL_CLASS_CPT, -+ POLL_CLASS_MKS, -+ POLL_FIXED_CLASSES, -+ POLL_DEFAULT_FIXED_CLASSES, -+ /* Size enum to maximum */ -+ POLL_MAX_CLASSES = 31, -+} PollClass; -+ -+/* -+ * Do not use; Special pseudo private poll class supported by -+ * PollDefault only -+ */ -+#define POLL_DEFAULT_CLASS_NET POLL_FIXED_CLASSES -+#define POLL_DEFAULT_CS_NET PollClassSet_Singleton(POLL_DEFAULT_CLASS_NET) -+ -+/* -+ * Each callback is registered in a set of classes -+ */ -+ -+typedef struct PollClassSet { -+ uintptr_t bits; -+} PollClassSet; -+ -+/* An empty PollClassSet. */ -+static INLINE PollClassSet -+PollClassSet_Empty(void) -+{ -+ PollClassSet set = { 0 }; -+ return set; -+} -+ -+/* A PollClassSet with the single member. */ -+static INLINE PollClassSet -+PollClassSet_Singleton(PollClass c) -+{ -+ PollClassSet s = PollClassSet_Empty(); -+ -+ ASSERT_ON_COMPILE(POLL_MAX_CLASSES < sizeof s.bits * 8); -+ ASSERT(c < POLL_MAX_CLASSES); -+ -+ s.bits = CONST3264U(1) << c; -+ return s; -+} -+ -+/* Combine two PollClassSets. */ -+static INLINE PollClassSet -+PollClassSet_Union(PollClassSet lhs, PollClassSet rhs) -+{ -+ PollClassSet set; -+ set.bits = lhs.bits | rhs.bits; -+ return set; -+} -+ -+/* Add single class to PollClassSet. */ -+static INLINE PollClassSet -+PollClassSet_Include(PollClassSet set, PollClass c) -+{ -+ return PollClassSet_Union(set, PollClassSet_Singleton(c)); -+} -+ -+ -+#define POLL_CS_MAIN PollClassSet_Singleton(POLL_CLASS_MAIN) -+#define POLL_CS_PAUSE PollClassSet_Union(POLL_CS_MAIN, \ -+ PollClassSet_Singleton(POLL_CLASS_PAUSE)) -+#define POLL_CS_CPT PollClassSet_Union(POLL_CS_PAUSE, \ -+ PollClassSet_Singleton(POLL_CLASS_CPT)) -+#define POLL_CS_IPC PollClassSet_Union(POLL_CS_CPT, \ -+ PollClassSet_Singleton(POLL_CLASS_IPC)) -+#define POLL_CS_VMDB POLL_CS_PAUSE /* POLL_CLASS_VMDB is retired */ -+#define POLL_CS_MKS PollClassSet_Singleton(POLL_CLASS_MKS) -+/* -+ * DANGER. You don't need POLL_CS_ALWAYS. Really. So don't use it. -+ */ -+#define POLL_CS_ALWAYS PollClassSet_Union(POLL_CS_CPT, POLL_CS_IPC) -+ -+/* -+ * Poll class-set taxonomy: -+ * POLL_CS_MAIN -+ * - Unless you NEED another class, use POLL_CS_MAIN. -+ * POLL_CS_PAUSE -+ * - For callbacks that must occur even if the guest is paused. -+ * Most VMDB or Foundry commands are in this category. -+ * POLL_CS_CPT -+ * - Only for callbacks which can trigger intermediate Checkpoint -+ * transitions. -+ * The ONLY such callback is Migrate. -+ * POLL_CS_IPC -+ * - Only for callbacks which can contain Msg_(Post|Hint|Question) -+ * responses, and for signal handlers (why)? -+ * Vigor, VMDB, and Foundry can contain Msg_* responses. -+ * POLL_CS_MKS -+ * - Callback runs in MKS thread. -+ * POLL_CS_ALWAYS -+ * - Only for events that must be processed immediately. -+ * The ONLY such callback is OvhdMemVmxSizeCheck. -+ */ -+ -+ -+/* -+ * Poll_Callback flags -+ */ -+ -+#define POLL_FLAG_PERIODIC 0x01 // keep after firing -+#define POLL_FLAG_REMOVE_AT_POWEROFF 0x02 // self-explanatory -+#define POLL_FLAG_READ 0x04 // device is ready for reading -+#define POLL_FLAG_WRITE 0x08 // device is ready for writing -+#define POLL_FLAG_SOCKET 0x10 // device is a Windows socket -+#define POLL_FLAG_NO_BULL 0x20 // callback does its own locking -+#define POLL_FLAG_WINSOCK 0x40 // Winsock style write events -+#define POLL_FLAG_FD 0x80 // device is a Windows file descriptor. -+#define POLL_FLAG_ACCEPT_INVALID_FDS 0x100 // For broken 3rd party libs, e.g. curl -+#define POLL_FLAG_THUNK_TO_WND 0x200 // thunk callback to window message loop -+ -+ -+typedef void (*PollerFunction)(void *clientData); -+typedef void (*PollerFireWrapper)(PollerFunction func, -+ void *funcData, -+ void *wrapperData); -+typedef Bool (*PollerErrorFn)(const char *errorStr); -+ -+/* -+ * Initialisers: -+ * -+ * For the sake of convenience, we declare the initialisers -+ * for custom implmentations here, even though the actual -+ * implementations are distinct from the core poll code. -+ */ -+ -+typedef struct PollOptions { -+ Bool locked; // Use internal MXUser for locking -+ Bool allowFullQueue; // Don't assert when device event queue is full. -+ VThreadID windowsMsgThread; // thread that processes Windows messages -+ PollerFireWrapper fireWrapperFn; // optional; may be useful for stats -+ void *fireWrapperData; // optional -+ PollerErrorFn errorFn; // optional; called upon unrecoverable error -+} PollOptions; -+ -+ -+void Poll_InitDefault(void); -+void Poll_InitDefaultEx(const PollOptions *opts); -+void Poll_InitGtk(void); // On top of glib for Linux -+void Poll_InitCF(void); // On top of CoreFoundation for OSX -+ -+ -+/* -+ * Functions -+ */ -+int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); -+void Poll_Loop(Bool loop, Bool *exit, PollClass c); -+void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); -+Bool Poll_LockingEnabled(void); -+void Poll_Exit(void); -+ -+ -+/* -+ * Poll_Callback adds a callback regardless of whether an identical one exists. -+ * The exception to this rule is POLL_DEVICE callbacks: there is a maximum of -+ * one read and one write callback per fd. -+ * -+ * Poll_CallbackRemove removes one callback. If there are multiple identical -+ * callbacks, which one is removed is an implementation detail. Note that in -+ * the case of POLL_DEVICE and POLL_REALTIME callbacks, the fd/delay used to -+ * create the callback is not specified when removing, so all callbacks -+ * of those types with the same flags, function, and clientData are considered -+ * "identical" even if their fd/delay differed. -+ */ -+ -+VMwareStatus Poll_Callback(PollClassSet classSet, -+ int flags, -+ PollerFunction f, -+ void *clientData, -+ PollEventType type, -+ PollDevHandle info, // fd/microsec delay -+ MXUserRecLock *lck); -+Bool Poll_CallbackRemove(PollClassSet classSet, -+ int flags, -+ PollerFunction f, -+ void *clientData, -+ PollEventType type); -+Bool Poll_CallbackRemoveOneByCB(PollClassSet classSet, -+ int flags, -+ PollerFunction f, -+ PollEventType type, -+ void **clientData); -+ -+void Poll_NotifyChange(PollClassSet classSet); -+ -+/* -+ * Wrappers for Poll_Callback and Poll_CallbackRemove that present -+ * simpler subsets of those interfaces. -+ */ -+ -+VMwareStatus Poll_CB_Device(PollerFunction f, -+ void *clientData, -+ PollDevHandle device, -+ Bool periodic); -+ -+Bool Poll_CB_DeviceRemove(PollerFunction f, -+ void *clientData, -+ Bool periodic); -+ -+ -+VMwareStatus Poll_CB_RTime(PollerFunction f, -+ void *clientData, -+ int64 delay, // microseconds -+ Bool periodic, -+ MXUserRecLock *lock); -+ -+Bool Poll_CB_RTimeRemove(PollerFunction f, -+ void *clientData, -+ Bool periodic); -+ -+ -+#ifdef _WIN32 -+void Poll_SetPumpsWindowsMessages(Bool pumps); -+void Poll_SetWindowMessageRecipient(HWND hWnd, UINT msg, Bool alwaysThunk); -+Bool Poll_FireWndCallback(void *lparam); -+#endif -+ -+#if defined(__cplusplus) -+} // extern "C" -+#endif -+ -+#endif // _POLL_H_ ---- a/open-vm-tools/lib/rpcIn/rpcin.c -+++ b/open-vm-tools/lib/rpcIn/rpcin.c -@@ -57,7 +57,7 @@ - - #if defined(VMTOOLS_USE_VSOCKET) - # include <glib.h> --# include "poll.h" -+# include "vm_poll.h" - # include "asyncsocket.h" - # include "vmci_defs.h" - #include "dataMap.h" diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch deleted file mode 100644 index 784b4fc6c5..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e86a259e1ce19c70ecfdece69ab53a07c63a34e1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 23:16:53 -0700 -Subject: [PATCH] use posix strerror_r unless on gnu libc system - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/err/errPosix.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/open-vm-tools/lib/err/errPosix.c b/open-vm-tools/lib/err/errPosix.c -index c81b4c13..7a403640 100644 ---- a/open-vm-tools/lib/err/errPosix.c -+++ b/open-vm-tools/lib/err/errPosix.c -@@ -31,6 +31,7 @@ - #include <errno.h> - #include <string.h> - #include <locale.h> -+#include <stdio.h> - - #include "vmware.h" - #include "errInt.h" -@@ -63,11 +64,13 @@ ErrErrno2String(Err_Number errorNumber, // IN - { - char *p; - --#if defined(__linux__) && !defined(__ANDROID__) -+#if defined(__GLIBC__) && !defined(__ANDROID__) - p = strerror_r(errorNumber, buf, bufSize); - #else -- p = strerror(errorNumber); --#endif -+ if (strerror_r(errorNumber, buf, bufSize) != 0) -+ snprintf(buf, bufSize, "unknown error %i", errorNumber); -+ p = buf; -+#endif /* defined __GLIBC__ */ - ASSERT(p != NULL); - return p; - } diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-uintmax_t-for-handling-rlim_t.patch deleted file mode 100644 index 0a1d008733..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 18eea61a7a768c6c3b57c6683c7bef7049f0f6ab Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 13 Jun 2018 23:37:09 -0700 -Subject: [PATCH] Use uintmax_t for handling rlim_t - -rlimit types are not representable with long or long long -formats, therefore use uintmax_t to typecast rlim_t types -and use %j to print it - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index 0e6351a9..a2ee1740 100644 ---- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -+++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -5294,8 +5294,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: - goto exit; - } - -- LOG(6, ("%s: File Size limits: 0x%"FMT64"x 0x%"FMT64"x\n", -- __FUNCTION__, fileSize.rlim_cur, fileSize.rlim_max)); -+ LOG(6, ("%s: File Size limits: 0x%jx 0x%jx\n", -+ __FUNCTION__, (uintmax_t)fileSize.rlim_cur, (uintmax_t)fileSize.rlim_max)); - - /* - * Check the offset is within the file size range. diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0012-Use-off64_t-instead-of-__off64_t.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0012-Use-off64_t-instead-of-__off64_t.patch deleted file mode 100644 index d69b74e23a..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0012-Use-off64_t-instead-of-__off64_t.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 123c690f12f560022305b0cf19499e7f81a690ae Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 27 Aug 2018 23:22:21 -0700 -Subject: [PATCH] Use off64_t instead of __off64_t - -Fixes -unknown type name '__off64_t' - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/file/fileIOPosix.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c -index 23108279..bcd2ddc5 100644 ---- a/open-vm-tools/lib/file/fileIOPosix.c -+++ b/open-vm-tools/lib/file/fileIOPosix.c -@@ -206,10 +206,10 @@ static AlignedPool alignedPool; - * the symbols (and anyone building XOPEN<700 gets nothing). - */ - extern ssize_t preadv64(int fd, const struct iovec *iov, int iovcnt, -- __off64_t offset) __attribute__ ((weak)); -+ off64_t offset) __attribute__ ((weak)); - - extern ssize_t pwritev64(int fd, const struct iovec *iov, int iovcnt, -- __off64_t offset) __attribute__ ((weak)); -+ off64_t offset) __attribute__ ((weak)); - #else - #error "Large file support unavailable. Aborting." - #endif diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch deleted file mode 100644 index 3e4753b2a6..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0013-misc-Do-not-print-NULL-string-into-logs.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cfc6839362bd96bf2f42954160f16a60bf1de377 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 22 Dec 2018 19:59:02 -0800 -Subject: [PATCH] misc: Do not print NULL string into logs - -string format %s is getting a NULL pointer for 'expand' -parameter always since the check for chunks[i] == NULL will ensure that -its always null when the Log() API is called - -Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/312] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - open-vm-tools/lib/misc/util_misc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/open-vm-tools/lib/misc/util_misc.c -+++ b/open-vm-tools/lib/misc/util_misc.c -@@ -719,7 +719,7 @@ Util_ExpandString(const char *fileName) - ASSERT(!freeChunk[i]); - chunks[i] = expand; - if (chunks[i] == NULL) { -- Log("%s: Cannot allocate memory to expand $ in \"%s\".\n", -+ Log("%s: Cannot allocate memory to expand in \"%s\".\n", - __FUNCTION__, fileName); - goto out; - } diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/tools.conf b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/tools.conf deleted file mode 100644 index f6cae70cc5..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/tools.conf +++ /dev/null @@ -1,2 +0,0 @@ -[guestinfo] -disable-perf-mon=1 diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.init b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.init deleted file mode 100644 index 38280464a7..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.init +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# vmtoolsd Start/stop the vmware tools daemon -# -# chkconfig: 2345 90 60 -# description: vmtoolsd is a daemon that starts up. for some reason, it -# doesn't include a sysv init startup file in the latest release. -# so i have to write this -# - -### BEGIN INIT INFO -# Provides: vmtoolsd -# Required-Start: $local_fs $syslog -# Required-Stop: $local_fs $syslog -# Default-Start: 2345 -# Default-Stop: 90 -# Short-Description: Run vmware tools daemon -### END INIT INFO - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/bin/vmtoolsd -NAME=vmtoolsd -DESC="vmware tools daemon" -VMTOOLSDARGS=" -b /var/run/vmtoolsd.pid " -RETVAL="1" - -# source function library -. /etc/init.d/functions - -test -f $DAEMON || exit 0 - - -case "$1" in - start) - echo -n "Starting vmware tools daemon: " - start-stop-daemon --start --quiet --exec $DAEMON -- $VMTOOLSDARGS - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - echo "OK" - else - echo "FAIL" - fi - ;; - stop) - echo -n "Stopping vmware tools daemon: " - start-stop-daemon --stop --quiet --pidfile /var/run/vmtoolsd.pid - RETVAL=$? - if [ $RETVAL -eq 0 ] ; then - echo "OK" - else - echo "FAIL" - fi - ;; - status) - status vmtoolsd - exit $? - ;; - restart) - $0 stop && sleep 1 && $0 start - ;; - *) - echo "Usage: /etc/init.d/vmtoolsd {start|stop|status|restart}" - exit 1 -esac - -exit $RETVAL diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.service b/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.service deleted file mode 100644 index d30e38055c..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools/vmtoolsd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Open Virtual Machine Tools (VMware Tools) -ConditionVirtualization=vmware - -[Service] -ExecStart=/usr/bin/vmtoolsd -Restart=on-failure -KillSignal=SIGKILL - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb deleted file mode 100644 index 34a81d21f0..0000000000 --- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_11.0.1.bb +++ /dev/null @@ -1,116 +0,0 @@ -# This recipe is modified from the recipe originally found in the Open-Switch -# repository: -# -# https://github.com/open-switch/ops-build -# yocto/openswitch/meta-foss-openswitch/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.0.5.bb -# Commit 9008de2d8e100f3f868c66765742bca9fa98f3f9 -# -# The recipe packaging has been relicensed under the MIT license for inclusion -# in meta-openembedded by agreement of the author (Diego Dompe). -# - -SUMMARY = "Tools to enhance VMWare guest integration and performance" -HOMEPAGE = "https://github.com/vmware/open-vm-tools" -SECTION = "vmware-tools" - -LICENSE = "LGPL-2.0 & GPL-2.0 & BSD & CDDL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=559317809c5444fb39ceaf6ac45c43ac" -LICENSE_modules/freebsd/vmblock = "BSD" -LICENSE_modules/freebsd/vmmemctl = "GPL-2.0" -LICENSE_modules/freebsd/vmxnet = "GPL-2.0" -LICENSE_modules/linux = "GPL-2.0" -LICENSE_modules/solaris = "CDDL-1.0" - -SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ - file://tools.conf \ - file://vmtoolsd.service \ - file://vmtoolsd.init \ - file://0001-configure.ac-don-t-use-dnet-config.patch;patchdir=.. \ - file://0002-add-include-sys-sysmacros.h.patch;patchdir=.. \ - file://0003-Use-configure-test-for-struct-timespec.patch;patchdir=.. \ - file://0004-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch;patchdir=.. \ - file://0005-Use-configure-to-test-for-feature-instead-of-platfor.patch;patchdir=.. \ - file://0006-Use-configure-test-for-sys-stat.h-include.patch;patchdir=.. \ - file://0007-Fix-subdir-objects-configure-error.patch;patchdir=.. \ - file://0008-include-poll.h-instead-of-sys-poll.h.patch;patchdir=.. \ - file://0009-Rename-poll.h-to-vm_poll.h.patch;patchdir=.. \ - file://0010-use-posix-strerror_r-unless-on-gnu-libc-system.patch;patchdir=.. \ - file://0011-Use-uintmax_t-for-handling-rlim_t.patch;patchdir=.. \ - file://0012-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ - file://0013-misc-Do-not-print-NULL-string-into-logs.patch;patchdir=.. \ - file://0001-GitHub-Issue-367.-Remove-references-to-deprecated-G_.patch;patchdir=.. \ - file://0001-Make-HgfsConvertFromNtTimeNsec-aware-of-64-bit-time_.patch;patchdir=.. \ - file://0002-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ - file://0001-utilBacktrace-Ignore-Warray-bounds.patch;patchdir=.. \ - file://0001-hgfsmounter-Makefile.am-support-usrmerge.patch;patchdir=.. \ -" - -SRCREV = "d3edfd142a81096f9f58aff17d84219b457f4987" - -S = "${WORKDIR}/git/open-vm-tools" - -DEPENDS = "glib-2.0 glib-2.0-native util-linux libdnet procps libtirpc" - -# open-vm-tools is supported only on x86. -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' - -inherit autotools pkgconfig systemd update-rc.d - -SYSTEMD_SERVICE_${PN} = "vmtoolsd.service" - -EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ - --disable-tests --without-gtkmm --without-xerces --without-pam \ - --disable-vgauth --disable-deploypkg \ - --without-root-privileges --without-kernel-modules --with-tirpc \ - --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" - -NO_X11_FLAGS = "--without-x --without-gtk2 --without-gtk3" -X11_DEPENDS = "libxext libxi libxrender libxrandr libxtst gtk+ gdk-pixbuf" -PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}" - -# fuse gets implicitly detected; there is no --without-fuse option. -PACKAGECONFIG[fuse] = ",,fuse" - -CFLAGS_append_toolchain-clang = " -Wno-address-of-packed-member" -FILES_${PN} += "\ - ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \ - ${libdir}/open-vm-tools/plugins/common/lib*.so \ - ${sysconfdir}/vmware-tools/tools.conf \ -" -FILES_${PN}-locale += "${datadir}/open-vm-tools/messages" -FILES_${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la" - -CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf" - -RDEPENDS_${PN} = "util-linux libdnet fuse" - -do_install_append() { - if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then - install -d ${D}/sbin - ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs - fi - install -d ${D}${sysconfdir}/vmware-tools - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system - else - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/vmtoolsd.init ${D}${sysconfdir}/init.d/vmtoolsd - fi - install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf -} - -do_configure_prepend() { - export CUSTOM_DNET_NAME=dnet - export CUSTOM_DNET_LIBS=-L${STAGING_LIBDIR}/libdnet.so -} - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "vmtoolsd" -INITSCRIPT_PARAMS_${PN} = "start 90 2 3 4 5 . stop 60 0 1 6 ." - -python() { - if 'networking-layer' not in d.getVar('BBFILE_COLLECTIONS').split() or \ - 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): - raise bb.parse.SkipRecipe('Requires meta-networking and meta-filesystems to be present.') -} diff --git a/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb index 9fd88ced95..6cacd3722c 100644 --- a/meta-oe/recipes-support/opencl/clinfo_2.2.18.04.06.bb +++ b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb @@ -7,14 +7,14 @@ HOMEPAGE = "https://github.com/Oblomov/clinfo" LICENSE = "CC0-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fd8857f774dfb0eefe1e80c8f9240a7e" -SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https" +SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master" -SRCREV = "59d0daf898e48d76ccbb788acbba258fa0a8ba7c" +SRCREV = "748c3930a9b9cb826e631d77439e2cb8f84f5bcf" S = "${WORKDIR}/git" -DEPENDS += "opencl-headers opencl-icd-loader" +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-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch b/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch new file mode 100644 index 0000000000..9bd3d18d6e --- /dev/null +++ b/meta-oe/recipes-support/openct/openct/0001-m4-Just-emit-the-first-line-of-compiler-version.patch @@ -0,0 +1,31 @@ +From 146b5116140d719e4e9ae19748c0b6dee7d82f96 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 22 May 2023 22:01:28 -0700 +Subject: [PATCH] m4: Just emit the first line of compiler version + +Avoids emitting buildpaths into comments +Fixes +WARNING: openct-0.6.20-r0 do_package_qa: QA Issue: File /usr/include/openct/types.h in package openct-dev contains reference to TMPDIR [buildpaths] + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/ac_create_stdint_h.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/ac_create_stdint_h.m4 b/m4/ac_create_stdint_h.m4 +index 66de704..4b7223a 100644 +--- a/m4/ac_create_stdint_h.m4 ++++ b/m4/ac_create_stdint_h.m4 +@@ -110,7 +110,7 @@ echo "#define" $_ac_stdint_h "1" >>$ac_stdint_h + echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint_h + echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint_h + if test "$GCC" = "yes" ; then +- echo "/* generated using a gnu compiler version" `$CC --version` "*/" \ ++ echo "/* generated using a gnu compiler version" `$CC --version|head -1` "*/" \ + >>$ac_stdint_h + else + echo "/* generated using $CC */" >>$ac_stdint_h +-- +2.40.1 + diff --git a/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch b/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch index 745f923af1..e2401bb31b 100644 --- a/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch +++ b/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch @@ -5,7 +5,7 @@ Subject: [PATCH 1/2] etc/openct.udev.in: disablePROGRAM Bug fix: https://bugzilla.redhat.com/show_bug.cgi?id=287871 -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch b/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch index d5e3fe5753..22eda729fb 100644 --- a/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch +++ b/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch @@ -5,7 +5,7 @@ Subject: [PATCH 2/2] etc/openct_usb.in: modify UDEVINFO this patch is from Fedora -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index 08b2e3c232..4a1a0f568d 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -1,4 +1,4 @@ -Summanry = "Middleware framework for smart card terminals" +SUMMARY = "Middleware framework for smart card terminals" HOMEPAGE = "https://github.com/OpenSC/openct/wiki" DESCRIPTION = " \ OpenCT implements drivers for several smart card readers. \ @@ -11,9 +11,10 @@ readers to remote machines via TCP/IP." DEPENDS += "libtool pcsc-lite libusb-compat" SRC_URI = " \ - ${DEBIAN_MIRROR}/main/o/${BPN}/${BPN}_${PV}.orig.tar.gz \ + https://downloads.sourceforge.net/project/opensc/${BPN}/${BPN}-${PV}.tar.gz \ file://etc-openct.udev.in-disablePROGRAM.patch \ file://etc-openct_usb.in-modify-UDEVINFO.patch \ + file://0001-m4-Just-emit-the-first-line-of-compiler-version.patch \ file://openct.init \ file://openct.sysconfig \ file://openct.service \ @@ -22,11 +23,11 @@ SRC_URI = " \ SRC_URI[md5sum] = "a1da3358ab798f1cb9232f1dbababc21" SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d181a68" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit systemd -SYSTEMD_SERVICE_${PN} += "openct.service " +SYSTEMD_SERVICE:${PN} += "openct.service " SYSTEMD_AUTO_ENABLE = "enable" EXTRA_OECONF=" \ @@ -35,31 +36,30 @@ EXTRA_OECONF=" \ --enable-pcsc \ --enable-doc \ --enable-api-doc \ - --with-udev=${nonarch_base_libdir}/udev \ + --with-udev=${nonarch_libdir}/udev \ --with-bundle=${libdir}/pcsc/drivers \ " inherit autotools pkgconfig -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/ctapi \ - ${nonarch_base_libdir}/udev \ + ${nonarch_libdir}/udev \ ${libdir}/openct-ifd.so \ ${libdir}/pcsc \ - /run/openct/status \ " -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/ctapi/.debug \ ${libdir}/pcsc/drivers/openct-ifd.bundle/Contents/Linux/.debug \ " -INSANE_SKIP_${PN} += "dev-deps" +INSANE_SKIP:${PN} += "dev-deps" + +do_install[cleandirs] += "${D}" do_install () { - rm -rf ${D} - install -d ${D}/etc - install -dm 755 ${D}${nonarch_base_libdir}/udev + install -d ${D}${sysconfdir} # fix up hardcoded paths sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ ${WORKDIR}/openct.service ${WORKDIR}/openct.init @@ -67,22 +67,18 @@ do_install () { oe_runmake install DESTDIR=${D} install -dm 755 ${D}${libdir}/ctapi/ mv ${D}${libdir}/libopenctapi.so ${D}${libdir}/ctapi/ - install -Dpm 644 etc/openct.udev ${D}/etc/udev/rules.d/60-openct.rules - install -pm 644 etc/openct.conf ${D}/etc/openct.conf + install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules + install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf - install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct - install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct + install -Dpm 755 ${WORKDIR}/openct.init ${D}${sysconfdir}/init.d/openct + install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct - install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/openct.service ${D}${systemd_unitdir}/system so=$(find ${D} -name \*.so | sed "s|^${D}||") sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf - install -Dpm 644 etc/reader.conf ${D}/etc/reader.conf.d/openct.conf - - install -dm 755 ${D}${localstatedir}/run/openct - touch ${D}${localstatedir}/run/openct/status - chmod 644 ${D}${localstatedir}/run/openct/status - - rm -r ${D}/${localstatedir}/run + install -Dpm 644 etc/reader.conf ${D}${sysconfdir}/reader.conf.d/openct.conf } + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch b/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch deleted file mode 100644 index f038b0aa91..0000000000 --- a/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 67ccf77d97b76e8260c9d793ab172577e2393dbc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 19 Dec 2019 21:33:46 -0800 -Subject: [PATCH] use GNUInstallDirs for detecting install paths - -This helps with multilib builds - -Upstream-Status: Submitted [https://github.com/opencv/ade/pull/19] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - sources/ade/CMakeLists.txt | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/sources/ade/CMakeLists.txt b/sources/ade/CMakeLists.txt -index 2d1dd20..46415d1 100644 ---- a/sources/ade/CMakeLists.txt -+++ b/sources/ade/CMakeLists.txt -@@ -47,12 +47,14 @@ if(BUILD_ADE_DOCUMENTATION) - VERBATIM) - endif() - -+include(GNUInstallDirs) -+ - install(TARGETS ade COMPONENT dev - EXPORT adeTargets -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib -- RUNTIME DESTINATION lib -- INCLUDES DESTINATION include) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - install(EXPORT adeTargets DESTINATION share/ade COMPONENT dev) - --- -2.24.1 - diff --git a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb b/meta-oe/recipes-support/opencv/ade_0.1.2.bb index 3861802158..93b14ad4f3 100644 --- a/meta-oe/recipes-support/opencv/ade_0.1.1f.bb +++ b/meta-oe/recipes-support/opencv/ade_0.1.2.bb @@ -4,11 +4,9 @@ and processing framework. ADE Framework is suitable for \ organizing data flow processing and execution." HOMEPAGE = "https://github.com/opencv/ade" -SRC_URI = "git://github.com/opencv/ade.git \ - file://0001-use-GNUInstallDirs-for-detecting-install-paths.patch \ - " +SRC_URI = "git://github.com/opencv/ade.git;branch=master;protocol=https" -SRCREV = "58b2595a1a95cc807be8bf6222f266a9a1f393a9" +SRCREV = "1e02d7486bdb9c87993d91b9910e7cc6c4ddbf66" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" @@ -19,4 +17,4 @@ S = "${WORKDIR}/git" EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release" -FILES_${PN}-dev += "${datadir}/${BPN}/*.cmake" +FILES:${PN}-dev += "${datadir}/${BPN}/*.cmake" diff --git a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch deleted file mode 100644 index 9e6a613713..0000000000 --- a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9b4959b97d2e95d4b49cf6ca2a3fce3cdb484f2d Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Date: Thu, 31 Mar 2016 00:20:15 +0200 -Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp - -Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> - ---- - 3rdparty/ippicv/ippicv.cmake | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake -index 257af6fcc6..f88460450f 100644 ---- a/3rdparty/ippicv/ippicv.cmake -+++ b/3rdparty/ippicv/ippicv.cmake -@@ -34,18 +34,5 @@ function(download_ippicv root_var) - endif() - - set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") -- ocv_download(FILENAME ${OPENCV_ICV_NAME} -- HASH ${OPENCV_ICV_HASH} -- URL -- "${OPENCV_IPPICV_URL}" -- "$ENV{OPENCV_IPPICV_URL}" -- "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" -- DESTINATION_DIR "${THE_ROOT}" -- ID IPPICV -- STATUS res -- UNPACK RELATIVE_URL) -- -- if(res) -- set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) -- endif() -+ set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) - endfunction() diff --git a/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch index 1e47f8b162..a3bbefaabe 100644 --- a/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch +++ b/meta-oe/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch @@ -7,6 +7,8 @@ Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function Signed-off-by: Jason Wessel <jason.wessel@windriver.com> --- +Upstream-Status: Pending + modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch index bb47ef2bab..9df419d0b8 100644 --- a/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch +++ b/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch @@ -15,6 +15,8 @@ ts module. Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> --- +Upstream-Status: Pending + modules/ts/include/opencv2/ts.hpp | 4 ++-- modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +- modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- diff --git a/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch b/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch new file mode 100644 index 0000000000..8fda857080 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0008-Do-not-embed-build-directory-in-binaries.patch @@ -0,0 +1,138 @@ +From: Victor Westerhuis <victor@westerhu.is> +Date: Sat, 19 Nov 2022 21:45:39 +0100 +Subject: Do not embed build directory in binaries + +This makes the opencv core module build reproducibly. + +https://salsa.debian.org/science-team/opencv/-/raw/master/debian/patches/0008-Do-not-embed-build-directory-in-binaries.patch +Upstream-Status: Backport +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> +--- + modules/core/CMakeLists.txt | 10 ------ + modules/core/include/opencv2/core/private.hpp | 4 +-- + modules/core/include/opencv2/core/utility.hpp | 4 +-- + modules/core/src/utils/datafile.cpp | 48 +-------------------------- + 4 files changed, 5 insertions(+), 61 deletions(-) + +diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt +index b78bb98..d96b669 100644 +--- a/modules/core/CMakeLists.txt ++++ b/modules/core/CMakeLists.txt +@@ -188,16 +188,6 @@ if(OPENCV_OTHER_INSTALL_PATH) + ") + endif() + +-set(OPENCV_DATA_CONFIG_STR "${OPENCV_DATA_CONFIG_STR} +-#define OPENCV_BUILD_DIR \"${CMAKE_BINARY_DIR}\" +-") +- +-file(RELATIVE_PATH SOURCE_DIR_RELATIVE ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}) +-set(OPENCV_DATA_CONFIG_STR "${OPENCV_DATA_CONFIG_STR} +-#define OPENCV_DATA_BUILD_DIR_SEARCH_PATHS \\ +- \"${SOURCE_DIR_RELATIVE}/\" +-") +- + if(WIN32) + file(RELATIVE_PATH INSTALL_DATA_DIR_RELATIVE "${CMAKE_INSTALL_PREFIX}/${OPENCV_BIN_INSTALL_PATH}" "${CMAKE_INSTALL_PREFIX}/${OPENCV_OTHER_INSTALL_PATH}") + else() +diff --git a/modules/core/include/opencv2/core/private.hpp b/modules/core/include/opencv2/core/private.hpp +index 146d37f..dd675bc 100644 +--- a/modules/core/include/opencv2/core/private.hpp ++++ b/modules/core/include/opencv2/core/private.hpp +@@ -818,10 +818,10 @@ Search directories: + 2. Check path specified by configuration parameter with "_HINT" suffix (name of environment variable). + 3. Check path specified by configuration parameter (name of environment variable). + If parameter value is not empty and nothing is found then stop searching. +-4. Detects build/install path based on: ++4. Detects install path based on: + a. current working directory (CWD) + b. and/or binary module location (opencv_core/opencv_world, doesn't work with static linkage) +-5. Scan `<source>/{,data}` directories if build directory is detected or the current directory is in source tree. ++5. Scan `<source>/{,data}` directories if the current directory is in source tree. + 6. Scan `<install>/share/OpenCV` directory if install directory is detected. + + @param relative_path Relative path to data file +diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp +index 108c0d9..f15d9ea 100644 +--- a/modules/core/include/opencv2/core/utility.hpp ++++ b/modules/core/include/opencv2/core/utility.hpp +@@ -1163,10 +1163,10 @@ Search directories: + 2. OPENCV_SAMPLES_DATA_PATH_HINT environment variable + 3. OPENCV_SAMPLES_DATA_PATH environment variable + If parameter value is not empty and nothing is found then stop searching. +-4. Detects build/install path based on: ++4. Detects install path based on: + a. current working directory (CWD) + b. and/or binary module location (opencv_core/opencv_world, doesn't work with static linkage) +-5. Scan `<source>/{,data,samples/data}` directories if build directory is detected or the current directory is in source tree. ++5. Scan `<source>/{,data,samples/data}` directories if the current directory is in source tree. + 6. Scan `<install>/share/OpenCV` directory if install directory is detected. + + @see cv::utils::findDataFile +diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp +index 3af83a5..6bda857 100644 +--- a/modules/core/src/utils/datafile.cpp ++++ b/modules/core/src/utils/datafile.cpp +@@ -280,32 +280,8 @@ cv::String findDataFile(const cv::String& relative_path, + + + // Steps: 4, 5, 6 +- cv::String cwd = utils::fs::getcwd(); +- cv::String build_dir(OPENCV_BUILD_DIR); +- bool has_tested_build_directory = false; +- if (isSubDirectory(build_dir, cwd) || isSubDirectory(utils::fs::canonical(build_dir), utils::fs::canonical(cwd))) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): the current directory is build sub-directory: " << cwd); +- const char* build_subdirs[] = { OPENCV_DATA_BUILD_DIR_SEARCH_PATHS }; +- for (size_t k = 0; k < sizeof(build_subdirs)/sizeof(build_subdirs[0]); k++) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): <build>/" << build_subdirs[k]); +- cv::String datapath = utils::fs::join(build_dir, build_subdirs[k]); +- if (utils::fs::isDirectory(datapath)) +- { +- for(size_t i = search_subdir.size(); i > 0; i--) +- { +- const cv::String& subdir = search_subdir[i - 1]; +- cv::String prefix = utils::fs::join(datapath, subdir); +- TRY_FILE_WITH_PREFIX(prefix); +- } +- } +- } +- has_tested_build_directory = true; +- } +- + cv::String source_dir; +- cv::String try_source_dir = cwd; ++ cv::String try_source_dir = utils::fs::getcwd(); + for (int levels = 0; levels < 3; ++levels) + { + if (utils::fs::exists(utils::fs::join(try_source_dir, "modules/core/include/opencv2/core/version.hpp"))) +@@ -341,28 +317,6 @@ cv::String findDataFile(const cv::String& relative_path, + CV_LOG_INFO(NULL, "Can't detect module binaries location"); + } + +- if (!has_tested_build_directory && +- (isSubDirectory(build_dir, module_path) || isSubDirectory(utils::fs::canonical(build_dir), utils::fs::canonical(module_path))) +- ) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): the binary module directory is build sub-directory: " << module_path); +- const char* build_subdirs[] = { OPENCV_DATA_BUILD_DIR_SEARCH_PATHS }; +- for (size_t k = 0; k < sizeof(build_subdirs)/sizeof(build_subdirs[0]); k++) +- { +- CV_LOG_DEBUG(NULL, "utils::findDataFile(): <build>/" << build_subdirs[k]); +- cv::String datapath = utils::fs::join(build_dir, build_subdirs[k]); +- if (utils::fs::isDirectory(datapath)) +- { +- for(size_t i = search_subdir.size(); i > 0; i--) +- { +- const cv::String& subdir = search_subdir[i - 1]; +- cv::String prefix = utils::fs::join(datapath, subdir); +- TRY_FILE_WITH_PREFIX(prefix); +- } +- } +- } +- } +- + #if defined OPENCV_INSTALL_DATA_DIR_RELATIVE + if (!module_path.empty()) // require module path + { diff --git a/meta-oe/recipes-support/opencv/opencv_4.4.0.bb b/meta-oe/recipes-support/opencv/opencv_4.9.0.bb index c83186de07..cf836d3ecf 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.4.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.9.0.bb @@ -2,55 +2,37 @@ SUMMARY = "Opencv : The Open Computer Vision Library" HOMEPAGE = "http://opencv.org/" SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293" -SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" -SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" +SRCREV_opencv = "dad8af6b17f8e60d7b95a1203a1b4d22f56574cf" +SRCREV_contrib = "c7602a8f74205e44389bd6a4e8d727d32e7e27b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" +SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" -def ipp_filename(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ippicv_2020_lnx_ia32_20191018_general.tgz" - else: - return "ippicv_2020_lnx_intel64_20191018_general.tgz" - -def ipp_md5sum(d): - import re - arch = d.getVar('TARGET_ARCH') - if re.match("i.86$", arch): - return "ad189a940fb60eb71f291321322fe3e8" - else: - return "7421de0095c7a39162ae13a6098782f9" - -IPP_FILENAME = "${@ipp_filename(d)}" -IPP_MD5 = "${@ipp_md5sum(d)}" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" -SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ - git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ - git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ - file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https \ + git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=4.x;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ + git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ file://download.patch \ file://0001-Make-ts-module-external.patch \ + file://0008-Do-not-embed-build-directory-in-binaries.patch \ " -SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" +SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" S = "${WORKDIR}/git" @@ -59,7 +41,6 @@ S = "${WORKDIR}/git" OPENCV_DLDIR = "${WORKDIR}/downloads" do_unpack_extra() { - tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} md5() { # Return the MD5 of $1 @@ -74,20 +55,21 @@ do_unpack_extra() { test -e $DEST || ln -s $F $DEST done } - cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i - cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i - cache data ${WORKDIR}/face/*.dat + cache xfeatures2d/boostdesc ${S}/boostdesc/*.i + cache xfeatures2d/vgg ${S}/vgg/*.i + cache data ${S}/face/*.dat + cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel + cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt } addtask unpack_extra after do_unpack before do_patch CMAKE_VERBOSE = "VERBOSE=1" -EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ +EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${S}/contrib/modules \ -DWITH_1394=OFF \ -DENABLE_PRECOMPILED_HEADERS=OFF \ -DCMAKE_SKIP_RPATH=ON \ - -DOPENCV_ICV_HASH=${IPP_MD5} \ - -DIPPROOT=${WORKDIR}/ippicv_lnx \ + -DWITH_IPP=OFF \ -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ -DOPENCV_ALLOW_DOWNLOADS=OFF \ @@ -95,16 +77,28 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ " -EXTRA_OECMAKE_append_x86 = " -DX86=ON" +LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" +LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" + +EXTRA_OECMAKE:append:x86 = " -DX86=ON" +# disable sse4.1 and sse4.2 to fix 32bit build failure +# https://github.com/opencv/opencv/issues/21597 +EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" + ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" + +# TBB does not build for powerpc so disable that package config +PACKAGECONFIG:remove:powerpc = "tbb" +# tbb now needs getcontect/setcontext which is not there for all arches on musl +PACKAGECONFIG:remove:libc-musl:riscv64 = "tbb" +PACKAGECONFIG:remove:libc-musl:riscv32 = "tbb" PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," -PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," +PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF -DCMAKE_CXX_STANDARD=17,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," @@ -116,23 +110,20 @@ PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg," PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav," PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils," PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd," +PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine" PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," -PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," -PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," +PACKAGECONFIG[python3] = "-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} -DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," +PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,," PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," -inherit pkgconfig cmake - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} +inherit pkgconfig cmake setuptools3-base python3native export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" @@ -142,76 +133,78 @@ TARGET_CC_ARCH += "-I${S}/include " PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ ${PN}-apps" -python populate_packages_prepend () { +python populate_packages:prepend () { cv_libdir = d.expand('${libdir}') - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) + do_split_packages(d, cv_libdir, r'^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) pn = d.getVar('PN') metapkg = pn + '-dev' - d.setVar('ALLOW_EMPTY_' + metapkg, "1") + d.setVar('ALLOW_EMPTY:' + metapkg, "1") blacklist = [ metapkg ] metapkg_rdepends = [ ] packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): metapkg_rdepends.append(pkg) - d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('RRECOMMENDS:' + metapkg, ' '.join(metapkg_rdepends)) metapkg = pn - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg, "libopencv-ts" ] + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + blacklist = [ metapkg ] metapkg_rdepends = [ ] for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) } PACKAGES_DYNAMIC += "^libopencv-.*" -FILES_${PN} = "" -FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" -FILES_${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" -FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" -FILES_${PN}-java = "${datadir}/OpenCV/java" -FILES_${PN}-samples = "${datadir}/opencv4/samples/" +FILES:${PN} = "" +FILES:${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" +FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" +FILES:${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" +FILES:${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" +FILES:${PN}-java = "${datadir}/OpenCV/java" +FILES:${PN}-samples = "${datadir}/opencv4/samples/" -INSANE_SKIP_${PN}-java = "libdir" -INSANE_SKIP_${PN}-dbg = "libdir" +INSANE_SKIP:${PN}-java = "libdir" +INSANE_SKIP:${PN}-dbg = "libdir" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -SUMMARY_python-opencv = "Python bindings to opencv" -FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-opencv = "python-core python-numpy" +SUMMARY:python3-opencv = "Python bindings to opencv" +FILES:python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS:python3-opencv = "python3-core python3-numpy" -SUMMARY_python3-opencv = "Python bindings to opencv" -FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python3-opencv = "python3-core python3-numpy" +RDEPENDS:${PN}-apps = "bash" -RDEPENDS_${PN}-apps = "bash" - -do_compile_prepend() { +do_compile:prepend() { # remove the build host info to improve reproducibility if [ -f ${WORKDIR}/build/modules/core/version_string.inc ]; then sed -i "s#${WORKDIR}#/workdir#g" ${WORKDIR}/build/modules/core/version_string.inc fi } -do_install_append() { +do_install:append() { # Move Python files into correct library folder (for multilib build) if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then mv ${D}/usr/lib/* ${D}/${libdir}/ rm -rf ${D}/usr/lib fi + # remove build host path to improve reproducibility + if [ -f ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake ]; then + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${libdir}/cmake/opencv4/OpenCVModules.cmake + fi + # remove setup_vars_opencv4.sh as its content is confusing and useless + if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then + rm -rf ${D}${bindir}/setup_vars_opencv4.sh + fi } - -TOOLCHAIN = "gcc" diff --git a/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch b/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch new file mode 100644 index 0000000000..9d25f2c599 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch @@ -0,0 +1,38 @@ +From 321839cbd1d57f12d3d6695254d2003473d8dd1a Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 8 Dec 2021 16:58:55 +0800 +Subject: [PATCH] build/top.mk: unset STRIP_OPTS + +Unset STRIP_OPTS to disable strip to fix QA errors: + +ERROR: openldap-2.5.9-r0 do_package: QA Issue: File +'/usr/bin/ldapcompare' from openldap was already stripped, this will +prevent future debugging! [already-stripped] + +ERROR: openldap-2.5.9-r0 do_package: QA Issue: File +'/usr/bin/ldapdelete' from openldap was already stripped, this will +prevent future debugging! [already-stripped] + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + build/top.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/top.mk b/build/top.mk +index 38ce146..6e9fe1f 100644 +--- a/build/top.mk ++++ b/build/top.mk +@@ -60,7 +60,7 @@ INSTALL_PROGRAM = $(INSTALL) + INSTALL_DATA = $(INSTALL) -m 644 + INSTALL_SCRIPT = $(INSTALL) + +-STRIP_OPTS = -s ++STRIP_OPTS = + + LINT = lint + 5LINT = 5lint +-- +2.17.1 + diff --git a/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-oe/recipes-support/openldap/openldap/install-strip.patch deleted file mode 100644 index 7c675962b6..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/install-strip.patch +++ /dev/null @@ -1,17 +0,0 @@ -# This patch ensures that the install operations which strip -# programs and libraries (LTINSTALL) work in a cross build -# environment. - -Upstream-Status: Pending - ---- openldap-2.2.24/.pc/install-strip.patch/build/top.mk 2005-01-20 09:00:55.000000000 -0800 -+++ openldap-2.2.24/build/top.mk 2005-04-16 13:48:20.536710376 -0700 -@@ -116,7 +116,7 @@ - LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \ - $(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD) - --LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -+LTINSTALL = STRIPPROG="" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c - LTFINISH = $(LIBTOOL) --mode=finish - - # Misc UNIX commands used in build environment diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch b/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch deleted file mode 100644 index 86d0767a47..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch +++ /dev/null @@ -1,17 +0,0 @@ -From http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-nds/openldap/files/ - -Upstream-status: Pending - --- - ---- openldap-2.4.28/configure.in.orig 2012-02-11 22:40:36.004360795 +0000 -+++ openldap-2.4.28/configure.in 2012-02-11 22:40:13.410986851 +0000 -@@ -1214,7 +1214,7 @@ - ol_with_tls=gnutls - ol_link_tls=yes - -- TLS_LIBS="-lgnutls" -+ TLS_LIBS="-lgnutls -lgcrypt" - - AC_DEFINE(HAVE_GNUTLS, 1, - [define if you have GNUtls]) diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch b/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch deleted file mode 100644 index ce8b47ae4e..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch +++ /dev/null @@ -1,63 +0,0 @@ -openldap CVE-2015-3276 - -the patch comes from: -https://bugzilla.redhat.com/show_bug.cgi?id=1238322 -https://bugzilla.redhat.com/attachment.cgi?id=1055640 - -The nss_parse_ciphers function in libraries/libldap/tls_m.c in -OpenLDAP does not properly parse OpenSSL-style multi-keyword mode -cipher strings, which might cause a weaker than intended cipher to -be used and allow remote attackers to have unspecified impact via -unknown vectors. - -Upstream-Status: Pending - -CVE: CVE-2015-3276 - -Signed-off-by: Li Wang <li.wang@windriver.com> ---- - libraries/libldap/tls_m.c | 27 ++++++++++++++++----------- - 1 file changed, 16 insertions(+), 11 deletions(-) - -diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c -index 9b101f9..e6f3051 100644 ---- a/libraries/libldap/tls_m.c -+++ b/libraries/libldap/tls_m.c -@@ -621,18 +621,23 @@ nss_parse_ciphers(const char *cipherstr, int cipher_list[ciphernum]) - */ - if (mask || strength || protocol) { - for (i=0; i<ciphernum; i++) { -- if (((ciphers_def[i].attr & mask) || -- (ciphers_def[i].strength & strength) || -- (ciphers_def[i].version & protocol)) && -- (cipher_list[i] != -1)) { -- /* Enable the NULL ciphers only if explicity -- * requested */ -- if (ciphers_def[i].attr & SSL_eNULL) { -- if (mask & SSL_eNULL) -- cipher_list[i] = action; -- } else -+ /* if more than one mask is provided -+ * then AND logic applies (to match openssl) -+ */ -+ if ( cipher_list[i] == -1) ) -+ continue; -+ if ( mask && ! (ciphers_def[i].attr & mask) ) -+ continue; -+ if ( strength && ! (ciphers_def[i].strength & strength) ) -+ continue; -+ if ( protocol && ! (ciphers_def[i].version & protocol) ) -+ continue; -+ /* Enable the NULL ciphers only if explicity requested */ -+ if (ciphers_def[i].attr & SSL_eNULL) { -+ if (mask & SSL_eNULL) - cipher_list[i] = action; -- } -+ } else -+ cipher_list[i] = action; - } - } else { - for (i=0; i<ciphernum; i++) { --- -1.7.9.5 - diff --git a/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch b/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch deleted file mode 100644 index 38c0a5af2f..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Pending - ---- openldap-2.3.11/build/openldap.m4.orig 2005-11-11 00:11:18.604322590 -0800 -+++ openldap-2.3.11/build/openldap.m4 2005-11-11 00:26:21.621145856 -0800 -@@ -788,7 +788,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ - ]]) - - AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], --AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES -+[AC_LANG_SOURCE([[OL_PTHREAD_TEST_INCLUDES - - int main(argc, argv) - int argc; -@@ -796,7 +796,7 @@ int main(argc, argv) - { - OL_PTHREAD_TEST_FUNCTION - } --])) -+]])]) - dnl -------------------------------------------------------------------- - AC_DEFUN([OL_PTHREAD_TRY], [# Pthread try link: $1 ($2) - if test "$ol_link_threads" = no ; then diff --git a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch index 870fc98adf..7a1b5aaad7 100644 --- a/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch +++ b/meta-oe/recipes-support/openldap/openldap/remove-user-host-pwd-from-version.patch @@ -12,8 +12,6 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> build/mkversion | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/build/mkversion b/build/mkversion -index 4e35723..9fa3bee 100755 --- a/build/mkversion +++ b/build/mkversion @@ -53,8 +53,12 @@ APPLICATION=$1 @@ -39,6 +37,3 @@ index 4e35723..9fa3bee 100755 "\t$WHOWHERE\n"; __EOF__ --- -2.7.4 - diff --git a/meta-oe/recipes-support/openldap/openldap/thread_stub.patch b/meta-oe/recipes-support/openldap/openldap/thread_stub.patch deleted file mode 100644 index 540ba4a635..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/thread_stub.patch +++ /dev/null @@ -1,20 +0,0 @@ -openldap: set pointer - -When the function ldap_pvt_thread_pool_getkey() succeeds, it -must set the value of *data since the caller may try to use it. - -Upstream-Status: pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - - ---- a/libraries/libldap_r/thr_stub.c -+++ b/libraries/libldap_r/thr_stub.c -@@ -217,6 +217,7 @@ ldap_pvt_thread_pool_unidle ( ldap_pvt_t - int ldap_pvt_thread_pool_getkey ( - void *ctx, void *key, void **data, ldap_pvt_thread_pool_keyfree_t **kfree ) - { -+ if (data) *data = NULL; /* avoid problems with uninitialized *data */ - return(0); - } - diff --git a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch deleted file mode 100644 index e7b988fafd..0000000000 --- a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch +++ /dev/null @@ -1,38 +0,0 @@ -openldap: assume /dev/urandom exists - -When we are cross-compiling, we want to assume -that /dev/urandom exists. We could change the source -code to look for it, but this is the easy way out. - -Upstream-Status: pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - - ---- a/configure.in -+++ b/configure.in -@@ -2142,8 +2142,8 @@ fi - - dnl ---------------------------------------------------------------- - dnl Check for entropy sources -+dev=no - if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then -- dev=no - if test -r /dev/urandom ; then - dev="/dev/urandom"; - elif test -r /idev/urandom ; then -@@ -2156,9 +2156,11 @@ if test $cross_compiling != yes && test - dev="/idev/random"; - fi - -- if test $dev != no ; then -- AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) -- fi -+elif test $cross_compiling == yes ; then -+ dev="/dev/urandom"; -+fi -+if test $dev != no ; then -+ AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) - fi - - dnl ---------------------------------------------------------------- diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.51.bb b/meta-oe/recipes-support/openldap/openldap_2.6.7.bb index d2c5746080..e807fdef16 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.4.51.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.6.7.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" # basically BSD. opensource.org does not record this license # at present (so it is apparently not OSI certified). LICENSE = "OpenLDAP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=5391b559d23a2237bdb21e7a62dae7c3 \ +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ " SECTION = "libs" @@ -15,27 +15,17 @@ SECTION = "libs" LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \ - file://openldap-m4-pthread.patch \ - file://openldap-2.4.28-gnutls-gcrypt.patch \ - file://use-urandom.patch \ file://initscript \ file://slapd.service \ - file://thread_stub.patch \ - file://openldap-CVE-2015-3276.patch \ file://remove-user-host-pwd-from-version.patch \ + file://0001-build-top.mk-unset-STRIP_OPTS.patch \ " -SRC_URI[md5sum] = "0d2025896cf1c17af7304ecc57ec9531" -SRC_URI[sha256sum] = "f490775ea4c6506b7210ee55a102c8f4aacfe9d1c8eaa633c7316d33a714be62" +SRC_URI[sha256sum] = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930" DEPENDS = "util-linux groff-native" -# The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when -# installing .so and executables, this fails in cross compilation -# environments -SRC_URI += "file://install-strip.patch" - -inherit autotools-brokensep update-rc.d systemd +inherit autotools-brokensep update-rc.d systemd pkgconfig # CV SETTINGS # Required to work round AC_FUNC_MEMCMP which gets the wrong answer @@ -50,12 +40,12 @@ EXTRA_OECONF += "--with-yielding-select=yes" # Shared libraries are nice... EXTRA_OECONF += "--enable-dynamic" -PACKAGECONFIG ??= "gnutls modules \ - mdb ldap meta monitor null passwd shell proxycache dnssrv \ +PACKAGECONFIG ??= "asyncmeta gnutls modules \ + mdb ldap meta null passwd proxycache dnssrv \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " #--with-tls with TLS/SSL support auto|openssl|gnutls [auto] -PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls libgcrypt" +PACKAGECONFIG[gnutls] = "--with-tls=gnutls,,gnutls" PACKAGECONFIG[openssl] = "--with-tls=openssl,,openssl" PACKAGECONFIG[sasl] = "--with-cyrus-sasl,--without-cyrus-sasl,cyrus-sasl" @@ -72,25 +62,20 @@ EXTRA_OECONF += "--enable-crypt" # The backend must be set by the configuration. This controls the # required database. # -# Backends="bdb dnssrv hdb ldap mdb meta monitor ndb null passwd perl relay shell sock sql" +# Backends="asyncmeta dnssrv ldap mdb meta null passwd perl relay sock sql wt" # # Note that multiple backends can be built. The ldbm backend requires a -# build-time choice of database API. The bdb backend forces this to be -# DB4. To use the gdbm (or other) API the Berkely database module must -# be removed from the build. +# build-time choice of database API. To use the gdbm (or other) API the +# Berkely database module must be removed from the build. md = "${libexecdir}/openldap" # -#--enable-bdb enable Berkeley DB backend no|yes|mod yes -# The Berkely DB is the standard choice. This version of OpenLDAP requires -# the version 4 implementation or better. -PACKAGECONFIG[bdb] = "--enable-bdb=yes,--enable-bdb=no,db" + +#--enable-asyncmeta enable asyncmeta backend no|yes|mod no +PACKAGECONFIG[asyncmeta] = "--enable-asyncmeta=mod,--enable-asyncmeta=no" #--enable-dnssrv enable dnssrv backend no|yes|mod no PACKAGECONFIG[dnssrv] = "--enable-dnssrv=mod,--enable-dnssrv=no" -#--enable-hdb enable Hierarchical DB backend no|yes|mod no -PACKAGECONFIG[hdb] = "--enable-hdb=yes,--enable-hdb=no,db" - #--enable-ldap enable ldap backend no|yes|mod no PACKAGECONFIG[ldap] = "--enable-ldap=mod,--enable-ldap=no," @@ -100,12 +85,6 @@ PACKAGECONFIG[mdb] = "--enable-mdb=yes,--enable-mdb=no," #--enable-meta enable metadirectory backend no|yes|mod no PACKAGECONFIG[meta] = "--enable-meta=mod,--enable-meta=no," -#--enable-monitor enable monitor backend no|yes|mod yes -PACKAGECONFIG[monitor] = "--enable-monitor=mod,--enable-monitor=no," - -#--enable-ndb enable MySQL NDB Cluster backend no|yes|mod [no] -PACKAGECONFIG[ndb] = "--enable-ndb=mod,--enable-ndb=no," - #--enable-null enable null backend no|yes|mod no PACKAGECONFIG[null] = "--enable-null=mod,--enable-null=no," @@ -121,10 +100,6 @@ PACKAGECONFIG[perl] = "--enable-perl=mod,--enable-perl=no,perl" #--enable-relay enable relay backend no|yes|mod [yes] PACKAGECONFIG[relay] = "--enable-relay=mod,--enable-relay=no," -#--enable-shell enable shell backend no|yes|mod no -# configure: WARNING: Use of --without-threads is recommended with back-shell -PACKAGECONFIG[shell] = "--enable-shell=mod --without-threads,--enable-shell=no," - #--enable-sock enable sock backend no|yes|mod [no] PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no," @@ -133,6 +108,10 @@ PACKAGECONFIG[sock] = "--enable-sock=mod,--enable-sock=no," # sqlite.h (which may be compatible but hasn't been tried.) PACKAGECONFIG[sql] = "--enable-sql=mod,--enable-sql=no,sqlite3" +#--enable-wt enable wt backend no|yes|mod no +# back-wt is marked currently as experimental +PACKAGECONFIG[wt] = "--enable-wt=mod,--enable-wt=no" + #--enable-dyngroup Dynamic Group overlay no|yes|mod no # This is a demo, Proxy Cache defines init_module which conflicts with the # same symbol in dyngroup @@ -140,22 +119,24 @@ PACKAGECONFIG[dyngroup] = "--enable-dyngroup=mod,--enable-dyngroup=no," #--enable-proxycache Proxy Cache overlay no|yes|mod no PACKAGECONFIG[proxycache] = "--enable-proxycache=mod,--enable-proxycache=no," -FILES_${PN}-overlay-proxycache = "${md}/pcache-*.so.*" +FILES:${PN}-overlay-proxycache = "${md}/pcache.so.*" PACKAGES += "${PN}-overlay-proxycache" # Append URANDOM_DEVICE='/dev/urandom' to CPPFLAGS: # This allows tls to obtain random bits from /dev/urandom, by default # it was disabled for cross-compiling. -CPPFLAGS_append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\'/dev/urandom\' -fPIC" +CPPFLAGS:append = " -D_GNU_SOURCE -DURANDOM_DEVICE=\\"/dev/urandom\\" -fPIC" -LDFLAGS_append = " -pthread" +LDFLAGS:append = " -pthread" do_configure() { - cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build rm -f ${S}/libtool aclocal libtoolize --force --copy gnu-configize + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/ltmain.sh ${S}/build + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/missing ${S}/build + cp ${STAGING_DATADIR_NATIVE}/libtool/build-aux/compile ${S}/build autoconf oe_runconf } @@ -168,16 +149,16 @@ LEAD_SONAME = "libldap-${LDAP_VER}.so.*" PACKAGES += "${PN}-slapd ${PN}-slurpd ${PN}-bin" # Package contents - shift most standard contents to -bin -FILES_${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/${BPN}/data" -FILES_${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ +FILES:${PN} = "${libdir}/lib*.so.* ${sysconfdir}/openldap/ldap.* ${localstatedir}/${BPN}/data" +FILES:${PN}-slapd = "${sysconfdir}/init.d ${libexecdir}/slapd ${sbindir} ${localstatedir}/run ${localstatedir}/volatile/run \ ${sysconfdir}/openldap/slapd.* ${sysconfdir}/openldap/schema \ ${sysconfdir}/openldap/DB_CONFIG.example ${systemd_unitdir}/system/*" -FILES_${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp" -FILES_${PN}-bin = "${bindir}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so" -FILES_${PN}-dbg += "${libexecdir}/openldap/.debug" +FILES:${PN}-slurpd = "${libexecdir}/slurpd ${localstatedir}/openldap-slurp" +FILES:${PN}-bin = "${bindir}" +FILES:${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libexecdir}/openldap/*.a ${libexecdir}/openldap/*.la ${libexecdir}/openldap/*.so ${libdir}/pkgconfig/*.pc" +FILES:${PN}-dbg += "${libexecdir}/openldap/.debug" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap chmod 755 ${D}${sysconfdir}/init.d/openldap @@ -187,7 +168,7 @@ do_install_append() { # Installing slapd under ${sbin} is more FHS and LSB compliance mv ${D}${libexecdir}/slapd ${D}/${sbindir}/slapd rmdir --ignore-fail-on-non-empty ${D}${libexecdir} - SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema" + SLAPTOOLS="slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema slapmodify" cd ${D}/${sbindir}/ rm -f ${SLAPTOOLS} for i in ${SLAPTOOLS}; do ln -sf slapd $i; done @@ -208,45 +189,41 @@ do_install_append() { -i ${D}${sysconfdir}/openldap/slapd.conf mkdir -p ${D}${localstatedir}/${BPN}/data - - } INITSCRIPT_PACKAGES = "${PN}-slapd" -INITSCRIPT_NAME_${PN}-slapd = "openldap" -INITSCRIPT_PARAMS_${PN}-slapd = "defaults" -SYSTEMD_SERVICE_${PN}-slapd = "hostapd.service" -SYSTEMD_AUTO_ENABLE_${PN}-slapd ?= "disable" - +INITSCRIPT_NAME:${PN}-slapd = "openldap" +INITSCRIPT_PARAMS:${PN}-slapd = "defaults" +SYSTEMD_PACKAGES = "${PN}-slapd" +SYSTEMD_SERVICE:${PN}-slapd = "slapd.service" +SYSTEMD_AUTO_ENABLE:${PN}-slapd ?= "disable" PACKAGES_DYNAMIC += "^${PN}-backends.* ^${PN}-backend-.*" # The modules require their .so to be dynamicaly loaded -INSANE_SKIP_${PN}-backend-dnssrv += "dev-so" -INSANE_SKIP_${PN}-backend-ldap += "dev-so" -INSANE_SKIP_${PN}-backend-meta += "dev-so" -INSANE_SKIP_${PN}-backend-mdb += "dev-so" -INSANE_SKIP_${PN}-backend-monitor += "dev-so" -INSANE_SKIP_${PN}-backend-null += "dev-so" -INSANE_SKIP_${PN}-backend-passwd += "dev-so" -INSANE_SKIP_${PN}-backend-shell += "dev-so" - - -python populate_packages_prepend () { +INSANE_SKIP:${PN}-backend-asyncmeta += "dev-so" +INSANE_SKIP:${PN}-backend-dnssrv += "dev-so" +INSANE_SKIP:${PN}-backend-ldap += "dev-so" +INSANE_SKIP:${PN}-backend-meta += "dev-so" +INSANE_SKIP:${PN}-backend-mdb += "dev-so" +INSANE_SKIP:${PN}-backend-null += "dev-so" +INSANE_SKIP:${PN}-backend-passwd += "dev-so" + +python populate_packages:prepend () { backend_dir = d.expand('${libexecdir}/openldap') - do_split_packages(d, backend_dir, 'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True) - do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) + do_split_packages(d, backend_dir, r'back_([a-z]*)\.so$', 'openldap-backend-%s', 'OpenLDAP %s backend', prepend=True, extra_depends='', allow_links=True) + do_split_packages(d, backend_dir, r'back_([a-z]*)\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True) metapkg = "${PN}-backends" - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - d.setVar('FILES_' + metapkg, "") + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + d.setVar('FILES:' + metapkg, "") metapkg_rdepends = [] packages = d.getVar('PACKAGES').split() for pkg in packages[1:]: if pkg.count("openldap-backend-") and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale"): metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) - d.setVar('DESCRIPTION_' + metapkg, 'OpenLDAP backends meta package') + d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('DESCRIPTION:' + metapkg, 'OpenLDAP backends meta package') packages.append(metapkg) d.setVar('PACKAGES', ' '.join(packages)) } diff --git a/meta-oe/recipes-support/opensc/opensc_0.20.0.bb b/meta-oe/recipes-support/opensc/opensc_0.25.1.bb index a815980c4f..19fb78092e 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.20.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.25.1.bb @@ -6,15 +6,14 @@ keys on the smart card is possible with PKCS\ such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\ eID cards have also been confirmed to work." -HOMEPAGE = "http://www.opensc-project.org/opensc/" +HOMEPAGE = "https://github.com/OpenSC/OpenSC/wiki" SECTION = "System Environment/Libraries" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" -#v0.19.0 -SRCREV = "45e29056ccde422e70ed3585084a7f150c632515" -SRC_URI = "git://github.com/OpenSC/OpenSC \ - " +#v0.21.0 +SRCREV = "0a4b772d6fdab9bfaaa3123775a48a7cb6c5e7c6" +SRC_URI = "git://github.com/OpenSC/OpenSC;branch=stable-0.25;protocol=https" DEPENDS = "virtual/libiconv openssl" S = "${WORKDIR}/git" @@ -24,6 +23,7 @@ EXTRA_OECONF = " \ --disable-static \ --disable-ctapi \ --disable-doc \ + --disable-strict \ " EXTRA_OEMAKE = "DESTDIR=${D}" @@ -32,14 +32,15 @@ PACKAGECONFIG ??= "pcsc" PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib" -RDEPENDS_${PN} = "readline" +RDEPENDS:${PN} = "readline" -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/opensc-pkcs11.so \ ${libdir}/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11-spy.so \ " -FILES_${PN}-dev += "\ +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-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb index 8c948c5655..1c5a18e863 100644 --- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb +++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb @@ -1,7 +1,7 @@ SUMMARY = "WBXML parsing and encoding library" HOMEPAGE = "http://libwbxml.opensync.org/" SECTION = "libs" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c1128ee5341ccd5927d8bafe4b6266e1" DEPENDS = "expat" @@ -19,5 +19,5 @@ EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" PACKAGES += "${PN}-tools" -FILES_${PN}-tools = "${bindir}" -FILES_${PN} = "${libdir}/*.so.*" +FILES:${PN}-tools = "${bindir}" +FILES:${PN} = "${libdir}/*.so.*" diff --git a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb index 45aa0d4ac1..c6a3079ea2 100644 --- a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb +++ b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb @@ -1,22 +1,28 @@ DESCRIPTION = "A small network printer daemon for embedded situations that passes the job directly to the printer" HOMEPAGE = "http://p910nd.sourceforge.net/" SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=3d82780e8917b360cbee7b9ec3e40734" -PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/p910nd/p910nd-${PV}.tar.bz2 \ +# v0.97 +SRCREV = "57ebc07ad8723ea4106090536c58c7f7160743e2" +SRC_URI = "git://github.com/kenyapcomau/p910nd;protocol=https;branch=master \ file://fix-var-lock.patch" -SRC_URI[md5sum] = "69461a6c54dca0b13ecad5b83864b43e" -SRC_URI[sha256sum] = "4ac980a3ae24babae6f70f0a692625ece03a4a92c357fbb10d2e368386c3c26f" +S = "${WORKDIR}/git" + +inherit update-rc.d + +INITSCRIPT_NAME = "p910nd" +INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." do_compile () { - ${CC} ${LDFLAGS} -o p910nd p910nd.c + ${CC} ${CFLAGS} ${LDFLAGS} -o p910nd p910nd.c } do_install () { install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd - install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf + install -D -m 0644 ${S}/aux/p910nd.conf ${D}${sysconfdir}/sysconfig/p910nd.conf + install -D -m 0644 ${S}/aux/p910nd.init ${D}${sysconfdir}/init.d/p910nd } diff --git a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb new file mode 100644 index 0000000000..2f37b099b4 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb @@ -0,0 +1,48 @@ +require pcp.inc +inherit python3native native +#autotools-brokensep +DEPENDS = "python3-native python3-setuptools-native flex-native bison-native" + +export PCP_DIR = "${D}" +export PCP_TMP_DIR = "${D}/tmp" +export PCP_BIN_DIR = "${D}/usr/bin" + +B = "${S}" + +do_configure:prepend() { + export SED=${TMPDIR}/hosttools/sed + export AR=${TMPDIR}/hosttools/ar +# export PYTHON=python3 + + rm -rf ${S}/include/pcp/configsz.h + rm -rf ${S}/include/pcp/platformsz.h + +} +do_compile:prepend() { + sed -i -e "s,#undef HAVE_64BIT_LONG,,g" \ + -e "s,#undef HAVE_64BIT_PTR,,g" \ + -e "s,#undef PM_SIZEOF_SUSECONDS_T,,g" \ + -e "s,#undef PM_SIZEOF_TIME_T,,g" \ + ${S}/src/include/pcp/config.h.in + + export AR=${TMPDIR}/hosttools/ar +# export PYTHON=python3 +} + +do_compile() { + oe_runmake default_pcp +} + +do_install () { + oe_runmake install \ + PCP_ETC_DIR=${D}/${sysconfdir} \ + PCP_SYSCONF_DIR=${D}/${sysconfdir} \ + PCP_VAR_DIR=${D}/${localstatedir} \ + PCP_SHARE_DIR=${D}/${datadir} \ + PCP_BIN_DIR=${D}/${bindir} \ + PCP_BINADM_DIR=${D}/${libexecdir}/pcp/bin \ + PCP_LIBADM_DIR=${D}/${libdir} \ + PCP_LIB_DIR=${D}/${libdir} \ + PCP_MAN_DIR=${D}/${mandir} \ + PCP_DOC_DIR=${D}/${docdir} +} diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc new file mode 100644 index 0000000000..4cafa7234b --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp.inc @@ -0,0 +1,40 @@ +SUMMARY = "System-level performance monitoring and performance management" +HOMEPAGE = "http://www.pcp.io" +SECTION = "Applications/System" + +LICENSE = "GPL-2.0-or-later & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \ + " +COMPATIBLE_HOST:libc-musl = "null" + +SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \ + file://0001-configure-Limit-the-header-search-to-sysroot.patch \ + file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \ + file://config.linux \ + " +SRC_URI[sha256sum] = "dacf92ba195f1f2ea8f40bf0c455d2cd2456273a1e30dcc3ee5b5bfd099a99ee" + +inherit setuptools3-base pkgconfig autotools-brokensep + +# Specify any options you want to pass to the configure script using EXTRA_OECONF: +CACHED_CONFIGUREVARS = "PACKAGE_DISTRIBUTION=arch" +EXTRA_OECONF:append = "\ + --with-dstat-symlink=yes \ + --with-infiniband=no \ + --with-python=no \ + --with-perl=no \ + --with-python3=yes \ + --with-pmdajson=no \ + --with-perfevent=no \ + --with-pmdabcc=yes \ + --with-rundir=${localstatedir}/run \ + --with-sysconfigdir=${sysconfdir} \ + --with-logdir=${localstatedir}/log \ + --with-docdir=${docdir} \ + " + +PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d" + +PACKAGECONFIG ?= "" + +PARALLEL_MAKE = "" diff --git a/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch b/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch new file mode 100644 index 0000000000..abf4aee61d --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch @@ -0,0 +1,39 @@ +From db9e6a4b7a48dee62fccb662347dd638a2d286d5 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Thu, 2 Dec 2021 14:29:06 +0900 +Subject: [PATCH] Remove unsuitble part for cross-compile. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + configure.ac | 6 ------ + src/libpcp/src/GNUmakefile | 1 - + 2 files changed, 7 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -607,12 +607,6 @@ fi + which=$WHICH + AC_SUBST(which) + +-if test -z "$AR"; then +- AC_PATH_PROGS(AR, [gcc-ar ar], /usr/bin/ar) +-fi +-if test ! -x "$AR"; then +- AC_MSG_ERROR([cannot find a valid 'ar' command.]) +-fi + ar=$AR + AC_SUBST(ar) + +--- a/src/libpcp/src/GNUmakefile ++++ b/src/libpcp/src/GNUmakefile +@@ -179,8 +179,6 @@ exports: exports.in mk.exports + # consistent in all placess. + # + check.done: $(OBJECTS) +- ./check-statics +- ./check-errorcodes + touch check.done + + ifneq ($(LIBTARGET),) diff --git a/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch b/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch new file mode 100644 index 0000000000..b03c48e581 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-configure-Limit-the-header-search-to-sysroot.patch @@ -0,0 +1,45 @@ +From 1eb68f65fd73443d862ca5f36f3b6041e2b0f13a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 10 Mar 2022 18:53:13 -0800 +Subject: [PATCH] configure: Limit the header search to sysroot + +Hardcoded paths in configure.ac means it starts to poke at host system +include paths, which is least we want in a cross build, therefore prefix +these paths with STAGING_SYSROOT + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -907,7 +907,7 @@ AC_DEFUN([PCP_CHECK_PYTHON_HEADER], + [ PY_MAJOR="$1" + PY_MINOR="$2" + PY_VERSION="python$PY_MAJOR.$PY_MINOR" +- PY_INCLUDE_DIRS="-I/usr/include/${PY_VERSION}m -I/usr/include/${PY_VERSION}" ++ PY_INCLUDE_DIRS="-I${STAGING_INCDIR}/${PY_VERSION}m -I${STAGING_INCDIR}/${PY_VERSION}" + saved_CFLAGS="$CFLAGS" + saved_CPPFLAGS="$CPPFLAGS" + CFLAGS="$CFLAGS $PY_INCLUDE_DIRS" +@@ -1603,7 +1603,7 @@ AC_SUBST(qmake) + + enable_qt3d=false + AS_IF([test "x$do_qt3d" != "xno"], [ +- if test -f /usr/include/Coin3/Inventor/Qt/SoQt.h -o -f /usr/include/Inventor/Qt/SoQt.h ++ if test -f ${STAGING_INCDIR}/Coin3/Inventor/Qt/SoQt.h -o -f ${STAGING_INCDIR}/Inventor/Qt/SoQt.h + then + enable_qt3d=$enable_qt + elif test x"$do_qt3d" = x"yes" +@@ -3699,7 +3699,7 @@ AC_SUBST(enable_decompression) + AC_SUBST(enable_lzma) + + dnl check for array sessions +-if test -f /usr/include/sn/arsess.h ++if test -f ${STAGING_INCDIR}/sn/arsess.h + then + pcp_mpi_dirs=libpcp_mpi\ libpcp_mpiread + else diff --git a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch new file mode 100644 index 0000000000..009dfe2d04 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch @@ -0,0 +1,36 @@ +From c123980d6bf1bc2bf93ee0dd0d7f8fee3d4ddc96 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 5 Jul 2023 08:45:14 -0700 +Subject: [PATCH] htop: Change dependency order of header and sourcefiles + +Fixes build race +| pcp/Platform.h:29:10: fatal error: DiskIOMeter.h: No such file or directory +| 29 | #include "DiskIOMeter.h" +| | ^~~~~~~~~~~~~~~ +| compilation terminated. +| make[3]: *** [<builtin>: pcp-htop.o] Error 1 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/pcp/htop/GNUmakefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile +index 6b7c0c5..5153c63 100644 +--- a/src/pcp/htop/GNUmakefile ++++ b/src/pcp/htop/GNUmakefile +@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS)) + CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS)) + + CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) +-TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES) +-SUBXFILES = $(SUBCFILES) $(SUBHFILES) ++TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES) ++SUBXFILES = $(SUBHFILES) $(SUBCFILES) + CFILES = $(TOPCFILES) $(SUBCFILES) + HFILES = $(TOPHFILES) $(SUBHFILES) + LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \ +-- +2.41.0 + diff --git a/meta-oe/recipes-support/pcp/pcp/config.linux b/meta-oe/recipes-support/pcp/pcp/config.linux new file mode 100644 index 0000000000..191f87acc6 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/config.linux @@ -0,0 +1,13 @@ +sizeof_int=4 +sizeof_long=4 +sizeof_pointer=8 +sizeof_suseconds_t=8 +sizeof_time_t=8 +bit_field_scheme=2100 +enable_python3='yes' +enable_python3='true' +have_python_OrderedDict="true" +have_python=python3 +printf_p_prefix=0x +printf_fmt_int64=I64d +strtoint64=strtoll diff --git a/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch new file mode 100644 index 0000000000..9cb649a594 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch @@ -0,0 +1,13 @@ +Upstream-Status: Pending + +--- a/qa/src/GNUlocaldefs ++++ b/qa/src/GNUlocaldefs +@@ -728,7 +728,7 @@ scale.o: localconfig.h + 779246.o: libpcp.h + aggrstore.o: libpcp.h + badmmv.o: libpcp.h +-chkacc1.o: libpcp.h ++chkacc1.o: libpcp.h localconfig.h + chkacc2.o: libpcp.h + chkacc3.o: libpcp.h + chkacc4.o: libpcp.h diff --git a/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch b/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch new file mode 100644 index 0000000000..6fa864cd21 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/pass-options-to-AR.patch @@ -0,0 +1,29 @@ +Do not pass cr option + +These options are already coming from builddefs + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/src/include/builddefs.in ++++ b/src/include/builddefs.in +@@ -167,7 +167,7 @@ OBJECTS = $(ASFILES:.s=.o) \ + + #NB: don't override $(MAKE); gnumake sets it well, propagating -j etc. + #MAKE = @make@ +-AR = @ar@ ++AR = @ar@ cqs + CC = @cc@ + CXX = @cxx@ + LD = @ld@ +--- a/src/include/buildrules ++++ b/src/include/buildrules +@@ -93,7 +93,7 @@ $(STATICLIBTARGET) : $(SUBDIRS) $(OBJECT + ifeq ($(TARGET_OS), darwin) + libtool -static -o $(STATICLIBTARGET) $? + else +- $(AR) cr $(STATICLIBTARGET) $? ++ $(AR) $(STATICLIBTARGET) $? + endif + endif + diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb new file mode 100644 index 0000000000..6a93b2ec90 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb @@ -0,0 +1,236 @@ +require pcp.inc +#inherit perlnative + +# NOTE: the following prog dependencies are unknown, ignoring: gtar gzip pkgmk xmlto lzma qshape md5sum pod2man publican git makedepend qmake-qt4 xconfirm true gmake xz dblatex hdiutil rpm bzip2 which mkinstallp dtrace seinfo qmake-qt5 gawk dlltool rpmbuild dpkg makepkg qmake echo +# NOTE: unable to map the following pkg-config dependencies: libmicrohttpd libsystemd-journal +# (this is based on recipes that have previously been built and packaged) +# NOTE: the following library dependencies are unknown, ignoring: nspr gen ibumad regex sasl2 pfm nss papi ibmad +# (this is based on recipes that have previously been built and packaged) +DEPENDS += "perl-native bison-native flex-native python3-native python3-setuptools python3 \ + pcp-native cairo zlib ncurses readline libx11 avahi openssl" + + +SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \ + file://pass-options-to-AR.patch \ + file://fix_parallel_make.patch \ + " + +export PCP_DIR="${RECIPE_SYSROOT_NATIVE}" +#export PCP_RUN_DIR="${RECIPE_SYSROOT_NATIVE}" +EXTRA_OEMAKE = "CC="${CC}" LD="${LD}"" +inherit useradd systemd features_check python3targetconfig + +# Needs libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SYSTEMD_AUTO_ENABLE:${PN} = "enable" +SYSTEMD_SERVICE:${PN} = "\ + pmie_farm_check.service \ + pmie_farm.service \ + pmfind.service \ + pmlogger_farm_check.service \ + pmcd.service \ + pmie.service \ + pmlogger_daily.service \ + pmlogger.service \ + pmlogger_farm.service \ + pmie_check.service \ + pmproxy.service \ + pmlogger_check.service \ + pmie_daily.service" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/pcp --no-create-home \ + --user-group pcp" + +USERADD_PACKAGES += "${PN}-testsuite" +USERADD_PARAM:${PN}-testsuite = "--system --home ${localstatedir}/lib/pcp/testsuite --no-create-home \ + --user-group pcpqa" + +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-testsuite += "${PN} bash perl" +RDEPENDS:python3-${PN} += "${PN} python3" + +do_configure:prepend () { + cp ${WORKDIR}/config.linux ${B} + rm -rf ${S}/include/pcp/configsz.h + rm -rf ${S}/include/pcp/platformsz.h + export SED=${TMPDIR}/hosttools/sed + export PYTHON=python3 +} + +do_compile:prepend() { + sed -i -e "s,#undef HAVE_64BIT_LONG,,g" \ + -e "s,#undef HAVE_64BIT_PTR,,g" \ + -e "s,#undef PM_SIZEOF_SUSECONDS_T,,g" \ + -e "s,#undef PM_SIZEOF_TIME_T,,g" \ + ${S}/src/include/pcp/config.h.in + sed -i -e "s,HAVE_PYTHON_ORDEREDDICT = false,HAVE_PYTHON_ORDEREDDICT = true,g" \ + ${S}/src/include/builddefs + sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile + export PYTHON=python3 + #export PYTHON3=${STAGING_BINDIR_NATIVE}/python3-native/python3 +} + +do_compile() { + oe_runmake default_pcp +} + +do_install () { + export NO_CHOWN=true + oe_runmake install DIST_ROOT=${D}\ + install_pcp + + rm -rf ${D}${localstatedir}/log + rm -rf ${D}${localstatedir}/lib/pcp/pmcd + rm -rf ${D}${localstatedir}/lib/pcp/tmp + rm -rf ${D}${localstatedir}/run + mv ${D}${docdir}/C* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/I* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/R* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/V* ${D}${docdir}/pcp-doc/ + sed -i "s#PCP_AWK_PROG=.*#PCP_AWK_PROG=awk#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf +} + +PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ + libpcp-gui2 libpcp-gui2-dev \ + libpcp-import1 libpcp-archive1 \ + libpcp-mmv1 libpcp-mmv1-dev \ + libpcp-pmda3 libpcp-pmda3-dev \ + libpcp-trace2 libpcp-trace2-dev \ + libpcp-web1 libpcp-web1-dev \ + libpcp3 libpcp3-dev python3-${PN}\ +" +FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \ +" +FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \ +" +FILES:libpcp-gui2-dev = " \ + ${libdir}/libpcp_gui.so \ + ${libdir}/libpcp_gui.a \ + ${includedir}/pmafm.h \ + ${includedir}/pmtime.h \ +" +FILES:libpcp-mmv1 = " \ + ${libdir}/libpcp_mmv.so.1 \ +" +FILES:libpcp-mmv1-dev = " \ + ${libdir}/libpcp_mmv.a \ + ${libdir}/libpcp_mmv.so \ + ${libdir}/libpcp_mmv.so \ + ${includedir}/mmv_stats.h \ + ${includedir}/mmv_dev.h \ + ${datadir}/man/man3/mmv_* \ + ${datadir}/man/man5/mmv.5.gz \ +" +FILES:libpcp-import1 = " \ + ${libdir}/libpcp_import.so.1 \ +" +FILES:libpcp-pmda3 = " \ + ${libdir}/libpcp_pmda.so.3 \ +" +FILES:libpcp-pmda3-dev = " \ + ${includedir}/pmda.h \ + ${includedir}/pmdaroot.h \ + ${libdir}/libpcp_pmda.a \ + ${libdir}/libpcp_pmda.so \ + ${libdir}/pkgconfig/libpcp_pmda.pc \ + ${datadir}/man/man3/PMDA.3.gz \ + ${datadir}/man/man3/pmda* \ +" +FILES:libpcp-trace2 = " \ + ${libdir}/libpcp_trace.so.2 \ +" +FILES:libpcp-trace2-dev = " \ + ${includedir}/trace.h \ + ${includedir}/trace_dev.h \ + ${libdir}/libpcp_trace.a \ + ${libdir}/libpcp_trace.so \ + ${datadir}/man/man3/pmtrace* \ +" +FILES:libpcp-web1 = " \ + ${libdir}/libpcp_web.so.1 \ +" +FILES:libpcp-web1-dev = " \ + ${includedir}/pmhttp.h \ + ${includedir}/pmjson.h \ + ${libdir}/libpcp_web.a \ + ${libdir}/libpcp_web.so \ + ${datadir}/man/man3/pmhttp* \ + ${datadir}/man/man3/pmjson* \ +" +FILES:libpcp3 = " \ + ${libdir}/libpcp.so.3 \ +" + +FILES:${PN} = " \ + ${sysconfdir}/pcp \ + ${sysconfdir}/cron.d \ + ${sysconfdir}/init.d \ + ${libexecdir} \ + ${bindir} \ + ${datadir}/bash-completion \ + ${datadir}/pcp-gui \ + ${datadir}/zsh \ + ${systemd_system_unitdir}/ \ + ${libdir}/pcp/ \ + ${libdir}/sysusers.d/pcp.conf \ + ${datadir}/pcp \ + ${libdir}/*.sh \ + ${datadir}/man \ + ${libdir}/rc-proc.sh.minimal \ + ${sysconfdir}/p* \ + ${sysconfdir}/s* \ + ${localstatedir}/lib/pcp/config \ + ${localstatedir}/lib/pcp/pmdas/ \ + ${localstatedir}/lib/pcp/pmns \ + ${libdir}/libpcp_fault.so.3 \ +" + +FILES:${PN}-export-zabbix-agent += " \ + ${libdir}/zabbix \ + ${sysconfdir}/zabbix \ + ${mandir}/man3/zbxpcp.3.gz \ + ${libdir}/zabbix \ +" +FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/ ${libdir}/sysusers.d/pcp-testsuite.conf" +FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-dev += " \ + ${includedir}/pcp \ + ${libdir}/libpcp.a \ + ${libdir}/libpcp.so \ + ${localstatedir}/lib/pcp/pmdas/*/*.so \ + ${libexecdir}/pcp/bin/install-sh \ + ${libdir}/pkgconfig/libpcp.pc \ + ${libdir}/zabbix/modules/*.so \ + ${datadir}/man/man3/LOGIMPORT.3.gz \ + ${datadir}/man/man3/P* \ + ${datadir}/man/man3/Q* \ + ${datadir}/man/man3/__pm* \ + ${datadir}/man/man3/pmA* \ + ${datadir}/man/man3/pmC* \ + ${datadir}/man/man3/pmD* \ + ${datadir}/man/man3/pmE* \ + ${datadir}/man/man3/pmF* \ + ${datadir}/man/man3/pmG* \ + ${datadir}/man/man3/pmH* \ + ${datadir}/man/man3/pmI* \ + ${datadir}/man/man3/pmL* \ + ${datadir}/man/man3/pmM* \ + ${datadir}/man/man3/pmN* \ + ${datadir}/man/man3/pmO* \ + ${datadir}/man/man3/pmP* \ + ${datadir}/man/man3/pmR* \ + ${datadir}/man/man3/pmS* \ + ${datadir}/man/man3/pmT* \ + ${datadir}/man/man3/pmU* \ + ${datadir}/man/man3/pmW* \ + ${datadir}/man/man3/pmf* \ + ${datadir}/man/man3/pmg* \ + ${datadir}/man/man3/pmi* \ + ${datadir}/man/man3/pms* \ + ${datadir}/man/man3/pmt* \ +" diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch b/meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch deleted file mode 100644 index 3e7b0adda6..0000000000 --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite/0001-pcsc-spy-use-python3-only.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 75dd98876951d86890ceb30be521de57fd31e3c7 Mon Sep 17 00:00:00 2001 -From: Andrey Zhizhikin <andrey.z@gmail.com> -Date: Mon, 27 Jan 2020 13:27:12 +0000 -Subject: [PATCH] pcsc-spy: use python3 only - -Python2 has been EOL and most distributions would not provide any -support for it anymore. Since Python3 is available in all distributions -now, switch pcsc-spy to use it exclusively. - -Upstream-Status: Pending - -Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> ---- - src/spy/pcsc-spy | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/src/spy/pcsc-spy b/src/spy/pcsc-spy -index 85222c6..965138e 100755 ---- a/src/spy/pcsc-spy -+++ b/src/spy/pcsc-spy -@@ -1,4 +1,4 @@ --#! /usr/bin/python -+#!/usr/bin/env python3 - - """ - # Display PC/SC functions arguments -@@ -22,12 +22,7 @@ from __future__ import print_function - import os - import signal - import time --try: -- # for Python3 -- from queue import Queue --except ImportError: -- # for Python2 -- from Queue import Queue -+from queue import Queue - from threading import Thread - from operator import attrgetter - --- -2.17.1 - diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb deleted file mode 100644 index 6f38d65e05..0000000000 --- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "PC/SC Lite smart card framework and applications" -HOMEPAGE = "http://pcsclite.alioth.debian.org/" -LICENSE = "BSD & GPLv3+" -LICENSE_${PN} = "BSD" -LICENSE_${PN}-lib = "BSD" -LICENSE_${PN}-doc = "BSD" -LICENSE_${PN}-dev = "BSD" -LICENSE_${PN}-dbg = "BSD & GPLv3+" -LICENSE_${PN}-spy = "GPLv3+" -LICENSE_${PN}-spy-dev = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" - -SRC_URI = "\ - https://pcsclite.apdu.fr/files/${BP}.tar.bz2 \ - file://0001-pcsc-spy-use-python3-only.patch \ -" -SRC_URI[md5sum] = "eb595f2d398ff229207a6ec09fbc4e98" -SRC_URI[sha256sum] = "0148d403137124552c5d0f10f8cdab2cbb8dfc7c6ce75e018faf667be34f2ef9" - -inherit autotools systemd pkgconfig perlnative - -EXTRA_OECONF = " \ - --disable-libusb \ - --enable-usbdropdir=${libdir}/pcsc/drivers \ -" - -S = "${WORKDIR}/pcsc-lite-${PV}" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} udev" -PACKAGECONFIG_class-native ??= "" - -PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," -PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" - -PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" - -RRECOMMENDS_${PN} = "ccid" -RRECOMMENDS_${PN}_class-native = "" - -FILES_${PN} = "${sbindir}/pcscd" -FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" -FILES_${PN}-dev = "${includedir} \ - ${libdir}/pkgconfig \ - ${libdir}/libpcsclite.la \ - ${libdir}/libpcsclite.so" - -FILES_${PN}-spy = "${bindir}/pcsc-spy \ - ${libdir}/libpcscspy*${SOLIBS}" -FILES_${PN}-spy-dev = "${libdir}/libpcscspy.la \ - ${libdir}/libpcscspy.so " - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "pcscd.socket" -RDEPENDS_${PN}-spy +="python3" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb new file mode 100644 index 0000000000..d5a560a6a0 --- /dev/null +++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb @@ -0,0 +1,58 @@ +SUMMARY = "PC/SC Lite smart card framework and applications" +HOMEPAGE = "https://pcsclite.apdu.fr/" +LICENSE = "BSD-3-Clause & GPL-3.0-or-later" +LICENSE:${PN} = "BSD-3-Clause" +LICENSE:${PN}-lib = "BSD-3-Clause" +LICENSE:${PN}-doc = "BSD-3-Clause" +LICENSE:${PN}-dev = "BSD-3-Clause" +LICENSE:${PN}-dbg = "BSD-3-Clause & GPL-3.0-or-later" +LICENSE:${PN}-spy = "GPL-3.0-or-later" +LICENSE:${PN}-spy-dev = "GPL-3.0-or-later" +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] = "f42ee9efa489e9ff5d328baefa26f9c515be65021856e78d99ad1f0ead9ec85d" + +inherit autotools systemd pkgconfig perlnative + +EXTRA_OECONF = " \ + --disable-libusb \ + --enable-usbdropdir=${libdir}/pcsc/drivers \ +" + +S = "${WORKDIR}/pcsc-lite-${PV}" + +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" + +RRECOMMENDS:${PN} = "ccid" +RRECOMMENDS:${PN}:class-native = "" +RPROVIDES:${PN}:class-native += "pcsc-lite-lib-native" + +FILES:${PN} = "${sbindir}/pcscd \ + ${datadir}/polkit-1" +FILES:${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" +FILES:${PN}-dev = "${includedir} \ + ${libdir}/pkgconfig \ + ${libdir}/libpcsclite.la \ + ${libdir}/libpcsclite.so" + +FILES:${PN}-spy = "${bindir}/pcsc-spy \ + ${libdir}/libpcscspy*${SOLIBS}" +FILES:${PN}-spy-dev = "${libdir}/libpcscspy.la \ + ${libdir}/libpcscspy.so " + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "pcscd.socket" +RDEPENDS:${PN}-spy += "python3-core" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb new file mode 100644 index 0000000000..97a94ec973 --- /dev/null +++ b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "Some tools to be used with smart cards and PC/SC" +HOMEPAGE = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" + +SRCREV = "53834cd33155ae1f0332102b1baca6ce63660fc5" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" + +DEPENDS = "pcsc-lite autoconf-archive-native" + +RDEPENDS:${PN} += " \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','pcsc-lite-systemd', 'pcsc-lite', d)} \ + perl \ + perl-module-getopt-std \ + perl-module-file-stat \ + libpcsc-perl \ +" + +FILES:${PN} += "${datadir}/pcsc/smartcard_list.txt \ + ${datadir}/pcsc/gscriptor.png" diff --git a/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch b/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch deleted file mode 100644 index 5b344b9e83..0000000000 --- a/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-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_git.bb index 3d26b9364b..cc0d88faca 100644 --- a/meta-oe/recipes-support/picocom/picocom_git.bb +++ b/meta-oe/recipes-support/picocom/picocom_git.bb @@ -1,16 +1,15 @@ SUMMARY = "Lightweight and minimal dumb-terminal emulation program" SECTION = "console/utils" -LICENSE = "GPLv2+" -HOMEPAGE = "https://github.com/npat-efault/picocom" +LICENSE = "GPL-2.0-or-later" +HOMEPAGE = "https://gitlab.com/wsakernel/picocom" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" -BASEPV = "3.1" -PV = "${BASEPV}+git${SRCPV}" +BASEPV = "2023-04" +PV = "${BASEPV}+git" -SRCREV = "90385aabe2b51f39fa130627d46b377569f82d4a" +SRCREV = "12537df0314767d5af35bddddbbca3694e6a0342" -SRC_URI = "git://github.com/npat-efault/picocom \ - 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-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb index 3a437659e7..ad6a7501c5 100644 --- a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb +++ b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb @@ -1,13 +1,13 @@ SUMMARY = "Protocol plugin for New Yahoo (2016) for Adium, Pidgin, Miranda and Telepathy IM Framework" SECTION = "webos/services" -LICENSE = "GPLv3.0" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" DEPENDS = "pidgin json-glib glib-2.0" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=git" +SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https" SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" S = "${WORKDIR}/git" @@ -20,6 +20,6 @@ do_install() { oe_runmake DESTDIR="${D}" install; } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ " diff --git a/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-oe/recipes-support/pidgin/icyque_git.bb index 0f32dc3a39..ed58c4a76f 100644 --- a/meta-oe/recipes-support/pidgin/icyque_git.bb +++ b/meta-oe/recipes-support/pidgin/icyque_git.bb @@ -1,15 +1,15 @@ SUMMARY = "WIM Protocol plugin for ICQ for Adium, Pidgin, Miranda and Telepathy IM Framework" SECTION = "webos/services" -LICENSE = "GPLv3.0" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" DEPENDS = "pidgin json-glib" -PV = "0.1+gitr${SRCPV}" +PV = "0.1+git" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/icyque" +SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https" SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5" S = "${WORKDIR}/git" @@ -22,6 +22,6 @@ do_install() { oe_runmake DESTDIR="${D}" install; } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ " diff --git a/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch b/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch new file mode 100644 index 0000000000..8bb60b5557 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libgnt/0001-meson-import-changes-from-3.0.-version.patch @@ -0,0 +1,215 @@ +From 51d66c1c257f7487497f562033ac32ac75f648cb Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Mon, 8 Feb 2021 12:27:51 +0100 +Subject: [PATCH] meson: import changes from 3.0.* version + +* we need to use the meson option to disable introspection and docs + +Upstream-Status: Backport +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + meson.build | 139 ++++++++++++++++++++++++++++------------------ + meson_options.txt | 5 ++ + 2 files changed, 90 insertions(+), 54 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index 1084c82..ed040b4 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,9 +53,9 @@ compiler = meson.get_compiler('c') + pkgconfig = import('pkgconfig') + + # ####################################################################### +-# # Check for GLib 2.16 ++# # Check for GLib 2.44 + # ####################################################################### +-glib = dependency('glib-2.0', version : '>= 2.16.0') ++glib = dependency('glib-2.0', version : '>= 2.44.0') + gobject = dependency('gobject-2.0') + gmodule = dependency('gmodule-2.0') + gnome = import('gnome') +@@ -63,74 +63,88 @@ gnome = import('gnome') + ####################################################################### + # Check for LibXML2 + ####################################################################### +-libxml = dependency('libxml-2.0', version : '>= 2.6.0', required : false) +-gnt_config.set('NO_LIBXML', not libxml.found()) ++libxml = dependency('libxml-2.0', version : '>= 2.6.0') + + ####################################################################### + # Check for ncurses and other things used by it + ####################################################################### + ncurses_available = true +-ncurses_inc = [] +-# The order of this list is important to the condition that follows. +-ncurses_libs = [ +- compiler.find_library('ncursesw', required : false), +- compiler.find_library('panelw', required : false), +- compiler.find_library('tinfow', required : false), +-] +-if not ncurses_libs[0].found() or not ncurses_libs[1].found() +- ncurses_available = false +-endif ++ncurses_widechar = true ++ncurses_header = 'ncurses.h' ++# Some distros put the headers in ncursesw/, some don't. These are ordered to ++# pick the last available as most-specific version. ++ncursesw_header_paths = ['', 'ncursesw/'] + +-if host_machine.system() == 'windows' +- # FIXME: $host ? +- ncurses_sys_prefix = '/usr/$host/sys-root/mingw' ++ncurses = [ ++ dependency('ncursesw', required : false), ++ dependency('panelw', required : false), ++] ++if ncurses[0].found() and ncurses[1].found() ++ foreach location : ncursesw_header_paths ++ f = location + 'ncurses.h' ++ if compiler.has_header_symbol(f, 'get_wch', ++ prefix : '#define _XOPEN_SOURCE_EXTENDED') ++ ncurses_header = f ++ endif ++ endforeach + else +- ncurses_sys_prefix = '/usr' +-endif +- +-ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw', +- ncurses_sys_prefix + '/include'] +- +-if ncurses_available +- # Some distros put the headers in ncursesw/, some don't +- found_ncurses_h = false +- foreach location : ncurses_sys_dirs +- f = location + '/ncurses.h' +- if not found_ncurses_h ++ ncurses_available = false ++ ncurses_inc = [] ++ ncurses_libs = [ ++ compiler.find_library('ncursesw', required : false), ++ compiler.find_library('panelw', required : false) ++ ] ++ if ncurses_libs[0].found() and ncurses_libs[1].found() ++ foreach location : ncursesw_header_paths ++ f = location + 'ncurses.h' + if compiler.has_header_symbol(f, 'get_wch', + prefix : '#define _XOPEN_SOURCE_EXTENDED') +- if location != '.' +- ncurses_inc += [include_directories(location)] +- endif +- found_ncurses_h = true ++ ncurses_available = true ++ ncurses_header = f + endif +- endif +- endforeach ++ endforeach + +- if not found_ncurses_h +- ncurses_inc = [] +- ncurses_libs = [] +- ncurses_available = false ++ if ncurses_available ++ ncurses = declare_dependency( ++ include_directories : ncurses_inc, ++ dependencies : ncurses_libs ++ ) ++ endif + endif +-else ++endif ++ ++if not ncurses_available + # ncursesw was not found. Look for plain old ncurses +- # The order of this list is important to the condition that follows. +- ncurses_libs = [ +- compiler.find_library('ncurses', required : false), +- compiler.find_library('panel', required : false), +- compiler.find_library('tinfo', required : false), ++ ncurses = [ ++ dependency('ncurses', required : false), ++ dependency('panel', required : false), + ] +- ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() +- gnt_config.set('NO_WIDECHAR', true) ++ if ncurses[0].found() and ncurses_libs[1].found() ++ ncurses_available = true ++ else ++ ncurses_libs = [ ++ compiler.find_library('ncurses', required : false), ++ compiler.find_library('panel', required : false), ++ ] ++ ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() ++ ncurses = declare_dependency(dependencies : ncurses_libs) ++ endif ++ ncurses_widechar = false + endif ++ ++if not ncurses_available and host_machine.system() == 'windows' ++ # Try pdcurses too. ++ ncurses_header = 'curses.h' ++ ncurses_libs = compiler.find_library('pdcurses', required : false) ++ ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found() ++ ncurses = declare_dependency(dependencies : ncurses_libs) ++endif ++ + if not ncurses_available + error('ncurses could not be found!') + endif +- +-ncurses = declare_dependency( +- include_directories : ncurses_inc, +- dependencies : ncurses_libs +-) ++gnt_config.set('NCURSES_HEADER', ncurses_header) ++gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar) + + libgnt_SOURCES = [ + 'gntwidget.c', +@@ -191,7 +205,10 @@ libgnt_headers = [ + ] + + # Check for Python headers +-python_dep = dependency('python2', required : false) ++python_dep = dependency('python3-embed', required: false) ++if not python_dep.found() ++ python_dep = dependency('python3', required : false) ++endif + gnt_config.set('USE_PYTHON', python_dep.found()) + + configure_file(output : 'gntconfig.h', +@@ -233,6 +250,20 @@ pkgconfig.generate( + variables : ['plugindir = ${libdir}/gnt'], + ) + ++if get_option('introspection') ++ libgnt_gir = gnome.generate_gir(libgnt, ++ sources : libgnt_headers + [gnt_h], ++ includes : 'GObject-2.0', ++ namespace : 'Gnt', ++ symbol_prefix : 'gnt', ++ identifier_prefix : 'Gnt', ++ nsversion : '@0@.@1@'.format(gnt_major_version, gnt_minor_version), ++ install : true, ++ extra_args : ['-DGNT_COMPILATION', '--quiet']) ++endif ++ + subdir('wms') + subdir('test') +-subdir('doc') ++if get_option('doc') ++ subdir('doc') ++endif +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..f2414e2 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1,5 @@ ++option('doc', type : 'boolean', value : true, yield : true, ++ description : 'build documentation with gtk-doc') ++ ++option('introspection', type : 'boolean', value : true, yield : true, ++ description : 'build introspection data') diff --git a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb new file mode 100644 index 0000000000..d17a623063 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb @@ -0,0 +1,20 @@ +SUMMARY = "GNT: The GLib Ncurses Toolkit" + +SECTION = "libs" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=c9a1abacd0166f595a9fbe6afb1f0d5e" +DEPENDS = "glib-2.0 ncurses libxml2 glib-2.0-native" + +inherit meson pkgconfig + +# SRCREV = "0a44b1d01c41" +# SRC_URI = "hg://keep.imfreedom.org/${BPN};module=${BPN} + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/pidgin/${BPN}/${PV}/${BP}.tar.xz \ + file://0001-meson-import-changes-from-3.0.-version.patch \ +" +SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8" + +EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false" + +FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" diff --git a/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch b/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch new file mode 100644 index 0000000000..5b2e14b7b9 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch @@ -0,0 +1,31 @@ +From aa2362e50d54fce8464d85766f5b230bf453c1f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 8 Apr 2022 20:15:03 -0700 +Subject: [PATCH] tests: Include missing sys/socket.h header + +Helps define +| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:21: error: use of undeclared identifier 'PF_UNIX' +| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:30: error: use of undeclared identifier 'SOCK_STREAM' +| ../../../../libotr-4.1.1/tests/regression/client/client.c:986:20: error: use of undeclared identifier 'AF_UNIX' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/regression/client/client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/regression/client/client.c b/tests/regression/client/client.c +index e72b661..e0b3453 100644 +--- a/tests/regression/client/client.c ++++ b/tests/regression/client/client.c +@@ -26,6 +26,7 @@ + #include <stdlib.h> + #include <syscall.h> + #include <sys/epoll.h> ++#include <sys/socket.h> + #include <sys/types.h> + #include <sys/un.h> + #include <unistd.h> +-- +2.35.1 + diff --git a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb index c701244219..115a6968eb 100644 --- a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb +++ b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb @@ -1,12 +1,13 @@ SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging" HOMEPAGE = "http://www.cypherpunks.ca/otr/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24" DEPENDS = "libgcrypt libgpg-error" SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ file://fix_qa-issue_include.patch \ file://sepbuild.patch \ + file://0001-tests-Include-missing-sys-socket.h-header.patch \ " SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81" diff --git a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb index 04133c1b3d..326c5bfc57 100644 --- a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb +++ b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb @@ -1,6 +1,6 @@ SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging" HOMEPAGE = "https://otr.cypherpunks.ca/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24" DEPENDS = "libgcrypt libotr pidgin gtk+ intltool-native glib-2.0 glib-2.0-native" REQUIRED_DISTRO_FEATURES = "x11" @@ -10,6 +10,6 @@ SRC_URI = "https://otr.cypherpunks.ca/${BP}.tar.gz \ SRC_URI[md5sum] = "7ef14e1334a4bc80e5d530f9a3cfc626" SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4" -FILES_${PN} = "${libdir}/pidgin/*" +FILES:${PN} = "${libdir}/pidgin/*" inherit autotools pkgconfig features_check diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch new file mode 100644 index 0000000000..ceb48d21fc --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-Migrate-to-use-g_memdup2.patch @@ -0,0 +1,192 @@ +From 51c95a23bff3a024dc19e3127ca751e1458be0f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 5 Apr 2021 11:36:50 -0700 +Subject: [PATCH] Migrate to use g_memdup2 + +g_memdup has been deprecated for long and latest glib-2.0 2.68+ has +turned it int an error to use old function. + +The fall-back to g_memdup isn't needed because pidgin provides g_memdup2 +in pidgin-sipe/1.25.0-r0/recipe-sysroot/usr/include/libpurple/glibcompat.h +based on glib-2.0 version: + /* Backport the static inline version of g_memdup2 if we don't have g_memdup2. + * see https://mail.gnome.org/archives/desktop-devel-list/2021-February/msg00000.html + * for more information. + */ + #if !GLIB_CHECK_VERSION(2, 67, 3) + static inline gpointer + g_memdup2(gconstpointer mem, gsize byte_size) { + gpointer new_mem = NULL; + + if(mem && byte_size != 0) { + new_mem = g_malloc (byte_size); + memcpy (new_mem, mem, byte_size); + } + + return new_mem; + } + #endif /* !GLIB_CHECK_VERSION(2, 67, 3) */ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/api/sipe-common.h | 3 +++ + src/core/sip-sec-gssapi.c | 4 ++-- + src/core/sip-sec-ntlm.c | 12 ++++++------ + src/core/sip-sec-tls-dsk.c | 4 ++-- + src/core/sipe-media.c | 2 +- + src/core/sipe-tls-tester.c | 2 +- + src/core/sipe-tls.c | 4 ++-- + src/telepathy/telepathy-protocol.c | 2 +- + 8 files changed, 18 insertions(+), 15 deletions(-) + +diff --git a/src/api/sipe-common.h b/src/api/sipe-common.h +index c964f15..cab81e0 100644 +--- a/src/api/sipe-common.h ++++ b/src/api/sipe-common.h +@@ -51,3 +51,6 @@ + #ifdef _MSC_VER + typedef long ssize_t; + #endif ++ ++// for g_memdup2 ++#include <libpurple/glibcompat.h> +diff --git a/src/core/sip-sec-gssapi.c b/src/core/sip-sec-gssapi.c +index 873080f..4c63868 100644 +--- a/src/core/sip-sec-gssapi.c ++++ b/src/core/sip-sec-gssapi.c +@@ -602,7 +602,7 @@ sip_sec_init_sec_context__gssapi(SipSecContext context, + + out_buff->length = output_token.length; + if (out_buff->length) +- out_buff->value = g_memdup(output_token.value, output_token.length); ++ out_buff->value = g_memdup2(output_token.value, output_token.length); + else + /* Special case: empty token */ + out_buff->value = (guint8 *) g_strdup(""); +@@ -653,7 +653,7 @@ sip_sec_make_signature__gssapi(SipSecContext context, + return FALSE; + } else { + signature->length = output_token.length; +- signature->value = g_memdup(output_token.value, ++ signature->value = g_memdup2(output_token.value, + output_token.length); + gss_release_buffer(&minor, &output_token); + return TRUE; +diff --git a/src/core/sip-sec-ntlm.c b/src/core/sip-sec-ntlm.c +index 2e2354f..1fa4daa 100644 +--- a/src/core/sip-sec-ntlm.c ++++ b/src/core/sip-sec-ntlm.c +@@ -951,7 +951,7 @@ sip_sec_ntlm_parse_challenge(SipSecBuffer in_buff, + + /* server challenge (nonce) */ + if (server_challenge) { +- *server_challenge = g_memdup(cmsg->nonce, 8); ++ *server_challenge = g_memdup2(cmsg->nonce, 8); + } + + /* flags */ +@@ -984,7 +984,7 @@ sip_sec_ntlm_parse_challenge(SipSecBuffer in_buff, + *target_info_len = len; + } + if (target_info) { +- *target_info = g_memdup(content, len); ++ *target_info = g_memdup2(content, len); + } + } + } +@@ -1117,13 +1117,13 @@ sip_sec_ntlm_gen_authenticate(guchar **client_sign_key, + Set ServerSigningKey to SIGNKEY(ExportedSessionKey, "Server") + */ + SIGNKEY(exported_session_key, TRUE, key); +- *client_sign_key = g_memdup(key, 16); ++ *client_sign_key = g_memdup2(key, 16); + SIGNKEY(exported_session_key, FALSE, key); +- *server_sign_key = g_memdup(key, 16); ++ *server_sign_key = g_memdup2(key, 16); + SEALKEY(neg_flags, exported_session_key, TRUE, key); +- *client_seal_key = g_memdup(key, 16); ++ *client_seal_key = g_memdup2(key, 16); + SEALKEY(neg_flags, exported_session_key, FALSE, key); +- *server_seal_key = g_memdup(key, 16); ++ *server_seal_key = g_memdup2(key, 16); + } + + /* @TODO: */ +diff --git a/src/core/sip-sec-tls-dsk.c b/src/core/sip-sec-tls-dsk.c +index 70433ea..2d3f2db 100644 +--- a/src/core/sip-sec-tls-dsk.c ++++ b/src/core/sip-sec-tls-dsk.c +@@ -88,9 +88,9 @@ sip_sec_init_sec_context__tls_dsk(SipSecContext context, + /* copy key pair */ + ctx->algorithm = state->algorithm; + ctx->key_length = state->key_length; +- ctx->client_key = g_memdup(state->client_key, ++ ctx->client_key = g_memdup2(state->client_key, + state->key_length); +- ctx->server_key = g_memdup(state->server_key, ++ ctx->server_key = g_memdup2(state->server_key, + state->key_length); + + /* extract certicate expiration time */ +diff --git a/src/core/sipe-media.c b/src/core/sipe-media.c +index e9c4b8a..936e31c 100644 +--- a/src/core/sipe-media.c ++++ b/src/core/sipe-media.c +@@ -578,7 +578,7 @@ media_stream_to_sdpmedia(struct sipe_media_call_private *call_private, + // Set our key if encryption is enabled. + if (stream_private->encryption_key && + encryption_policy != SIPE_ENCRYPTION_POLICY_REJECTED) { +- sdpmedia->encryption_key = g_memdup(stream_private->encryption_key, ++ sdpmedia->encryption_key = g_memdup2(stream_private->encryption_key, + SIPE_SRTP_KEY_LEN); + sdpmedia->encryption_key_id = stream_private->encryption_key_id; + } +diff --git a/src/core/sipe-tls-tester.c b/src/core/sipe-tls-tester.c +index e80d715..5fbb5f8 100644 +--- a/src/core/sipe-tls-tester.c ++++ b/src/core/sipe-tls-tester.c +@@ -155,7 +155,7 @@ static guchar *read_tls_record(int fd, + printf("received %d bytes from server\n", result); + record = g_new0(struct record, 1); + record->length = result; +- record->msg = g_memdup(buffer, result); ++ record->msg = g_memdup2(buffer, result); + length += result; + fragments = g_slist_append(fragments, record); + } +diff --git a/src/core/sipe-tls.c b/src/core/sipe-tls.c +index b0235d5..020aedb 100644 +--- a/src/core/sipe-tls.c ++++ b/src/core/sipe-tls.c +@@ -427,7 +427,7 @@ static guchar *sipe_tls_prf(SIPE_UNUSED_PARAMETER struct tls_internal_state *sta + gsize half = (secret_length + 1) / 2; + gsize newseed_length = label_length + seed_length; + /* secret: used as S1; secret2: last half of original secret (S2) */ +- guchar *secret2 = g_memdup(secret + secret_length - half, half); ++ guchar *secret2 = g_memdup2(secret + secret_length - half, half); + guchar *newseed = g_malloc(newseed_length); + guchar *md5, *dest; + guchar *sha1, *src; +@@ -1525,7 +1525,7 @@ static struct tls_compiled_message *tls_client_key_exchange(struct tls_internal_ + + /* found all the required fields */ + state->server_random.length = server_random->length; +- state->server_random.buffer = g_memdup(server_random->data, ++ state->server_random.buffer = g_memdup2(server_random->data, + server_random->length); + tls_calculate_secrets(state); + +diff --git a/src/telepathy/telepathy-protocol.c b/src/telepathy/telepathy-protocol.c +index f6e5337..1dde579 100644 +--- a/src/telepathy/telepathy-protocol.c ++++ b/src/telepathy/telepathy-protocol.c +@@ -237,7 +237,7 @@ static void get_connection_details(SIPE_UNUSED_PARAMETER TpBaseProtocol *self, + SIPE_TYPE_SEARCH_MANAGER, + G_TYPE_INVALID + }; +- *channel_managers = g_memdup(types, sizeof(types)); ++ *channel_managers = g_memdup2(types, sizeof(types)); + } + if (icon_name) + *icon_name = g_strdup("im-" SIPE_TELEPATHY_DOMAIN); diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch new file mode 100644 index 0000000000..1dc7ca3f17 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe/0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch @@ -0,0 +1,36 @@ +From fedef3c0b1772cee97d7288bee7d5d50805a5964 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 12 Dec 2020 08:56:04 -0800 +Subject: [PATCH] configure: Do not add native paths to pkgconfig search + +This does not work in cross environments, secondly in OE we already +point pkkconfig into recipe sysroot where it will find all the +dependencies therefore this setting is not needed + +Upstream-Status: Inappropriate [ OE-Specific ] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0df85b0..2481153 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -70,12 +70,6 @@ AC_CHECK_HEADERS([]) + dnl checks for library functions + AC_CHECK_FUNCS([]) + +-dnl tell pkgconfig to look in the same prefix where we're installing this to, +-dnl as that is likely where libpurple will be found if it is not in the default +-dnl pkgconfig path +-PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${libdir}/pkgconfig" +-export PKG_CONFIG_PATH +- + dnl debug mode + AC_ARG_ENABLE(debug, + [AS_HELP_STRING([--enable-debug], +-- +2.29.2 + diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index 99fcf3c6d0..0a62a043bf 100644 --- a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Protocol plugin for Office 365/Lync/OCS for Adium, Pidgin, Miranda and Telepathy IM Framework" SECTION = "webos/services" -LICENSE = "GPLv2.0" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "pidgin gmime intltool-native glib-2.0-native" @@ -10,6 +10,8 @@ inherit autotools gettext pkgconfig SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \ file://0001-sipe-consider-64bit-time_t-when-printing.patch \ file://0001-Align-structs-casts-with-time_t-elements-to-8byte-bo.patch \ + file://0001-configure-Do-not-add-native-paths-to-pkgconfig-searc.patch \ + file://0001-Migrate-to-use-g_memdup2.patch \ " SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314" @@ -23,13 +25,18 @@ PACKAGECONFIG[krb5] = "--with-krb5=yes,--with-krb5=no,krb5" PACKAGECONFIG[telepathy] = "--enable-telepathy=yes,--enable-telepathy=no,telepathy-glib" #PACKAGECONFIG[gssapi_only] = "--enable-gssapi-only=yes,--enable-gssapi-only=no,krb5" PACKAGECONFIG[debug] = "--enable-debug=yes,--enable-debug=no,valgrind" +# disable Werror by default, useful for dev mode +PACKAGECONFIG[quality] = "--enable-quality-check=yes,--enable-quality-check=no," -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/purple-2/*.la \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/purple-2/libsipe.so \ ${datadir}/appdata \ ${datadir}/metainfo \ " + +# pidgin-sipe-1.25.0/src/core/sipe-xml.c:210:9: error: initialization of 'void (*)(void *, const xmlError *)' {aka 'void (*)(void *, const struct _xmlError *)'} from incompatible pointer type 'void (*)(void *, xmlError *)' {aka 'void (*)(void *, struct _xmlError *)'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch deleted file mode 100644 index 312fc8593f..0000000000 --- a/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 855cc20bafa30597ae7a62f7672d42654b25cde0 Mon Sep 17 00:00:00 2001 -From: Herrie <github.com@herrie.org> -Date: Mon, 24 Jul 2017 21:30:16 +0200 -Subject: [PATCH] Use pkg-config instead of ${PYTHON}-config to find python - ---- - configure.ac | 21 ++++++++------------- - 1 file changed, 8 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d20a18e..c741829 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1567,20 +1567,15 @@ AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes") - dnl Check for Python headers (currently useful only for libgnt) - dnl (Thanks to XChat) - if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then -- AC_MSG_CHECKING(for Python compile flags) -- if test -f ${PYTHON}-config; then -- PY_CFLAGS=`${PYTHON}-config --includes` -- PY_LIBS=`${PYTHON}-config --libs` -- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.]) -- AC_MSG_RESULT(ok) -- else -- AC_MSG_RESULT([Cannot find ${PYTHON}-config]) -- PY_CFLAGS="" -- PY_LIBS="" -- fi -+ AC_MSG_CHECKING(for Python compile flags) -+ PKG_CHECK_MODULES(PY, python, [ -+ AC_SUBST(PY_CFLAGS) -+ AC_SUBST(PY_LIBS) -+ ], [ -+ AC_MSG_RESULT(no) -+ AC_MSG_ERROR([Can't find python]) -+ ]) - fi --AC_SUBST(PY_CFLAGS) --AC_SUBST(PY_LIBS) - - dnl ####################################################################### - dnl # Check for Mono support diff --git a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch index 0a1baa9183..1c4daa9f67 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch @@ -3,6 +3,8 @@ From: Herrie <github.com@herrie.org> Date: Mon, 24 Jul 2017 21:30:16 +0200 --- +Upstream-Status: Pending + libpurple/protocols/irc/irc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch index 84dbcdc276..cf6207423d 100644 --- a/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch +++ b/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch @@ -3,6 +3,8 @@ From: Herrie <github.com@herrie.org> Date: Mon, 24 Jul 2017 21:30:16 +0200 --- +Upstream-Status: Pending + configure.ac | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch b/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch deleted file mode 100644 index c7b4163cb5..0000000000 --- a/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1488,7 +1488,7 @@ AC_ARG_WITH([python], - - if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then - if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then -- AC_PATH_PROG([PYTHON], [python], [no]) -+ AC_PATH_PROG([PYTHON], [python3], [no]) - fi - - if test x"$PYTHON" = x"no" ; then -@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently - dnl (Thanks to XChat) - if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then - AC_MSG_CHECKING(for Python compile flags) -- PKG_CHECK_MODULES(PY, python, [ -+ PKG_CHECK_MODULES(PY, python3, [ - AC_SUBST(PY_CFLAGS) - AC_SUBST(PY_LIBS) - ], [ diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb index fdc79e81b2..43ba148c91 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb @@ -1,6 +1,7 @@ SUMMARY = "multi-protocol instant messaging client" + SECTION = "x11/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "python3 virtual/libintl intltool-native libxml2 gconf glib-2.0-native" @@ -10,12 +11,12 @@ SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch \ file://purple-OE-branding-25.patch \ - file://pidgin-cross-python-265.patch \ - file://use_py3.patch \ " -SRC_URI[md5sum] = "423403494fe1951e47cc75231f743bb0" -SRC_URI[sha256sum] = "2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f" +SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603" + +CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." +CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ @@ -34,11 +35,12 @@ PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,ncurses" +PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,libgnt" PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR} --with-gnutls-libs=${STAGING_LIBDIR},--disable-gnutls,gnutls,libpurple-plugin-ssl-gnutls" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss nspr,libpurple-plugin-ssl-nss" +PACKAGECONFIG[cyrus-sasl] = "--enable-cyrus-sasl,--disable-cyrus-sasl,cyrus-sasl" EXTRA_OECONF = " \ --disable-perl \ @@ -51,68 +53,64 @@ EXTRA_OECONF = " \ --disable-screensaver \ " -do_configure_prepend() { - touch ${S}/po/Makefile - sed -i "s#PY_VERSION=`$PYTHON -c 'import sys ; print sys.version[0:3]'`#PY_VERSION=${PYTHON_BASEVERSION}#g" ${S}/configure.ac -} - OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" OE_LT_RPATH_ALLOW[export]="1" -PACKAGES =+ "libpurple-dev libpurple libgnt libgnt-dev finch finch-dev ${PN}-data" +PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data" -RPROVIDES_${PN}-dbg += "libpurple-dbg libgnt-dbg finch-dbg" +RPROVIDES:${PN}-dbg += "libpurple-dbg finch-dbg" LEAD_SONAME = "libpurple.so.0" -FILES_libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" -FILES_libpurple-dev = "${libdir}/libpurple*.la \ +FILES:libpurple = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple* ${datadir}/purple/ca-certs" +FILES:libpurple-dev = "${libdir}/libpurple*.la \ ${libdir}/libpurple*.so \ ${libdir}/purple-2/*.la \ ${libdir}/purple-2/libjabber.so \ ${libdir}/purple-2/liboscar.so \ ${libdir}/purple-2/libymsg.so \ ${datadir}/aclocal" -FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" -FILES_libgnt-dev = "${libdir}/gnt/*.la" -FILES_finch = "${bindir}/finch" -FILES_finch-dev = "${libdir}/finch/*.la" +FILES:finch = "${bindir}/finch" +FILES:finch-dev = "${libdir}/finch/*.la" -FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ +FILES:${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ ${datadir}/applications" -RRECOMMENDS_${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" +RRECOMMENDS:${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" -FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" -FILES_${PN}-dev += "${libdir}/${PN}/*.la" +FILES:${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" +FILES:${PN}-dev += "${libdir}/${PN}/*.la" PACKAGES_DYNAMIC += "^libpurple-protocol-.* ^libpurple-plugin-.* ^pidgin-plugin-.* ^finch-plugin-.*" -python populate_packages_prepend () { +python populate_packages:prepend () { pidgroot = d.expand('${libdir}/pidgin') purple = d.expand('${libdir}/purple-2') finch = d.expand('${libdir}/finch') - do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, pidgroot, r'^([^l][^i][^b].*)\.so$', output_pattern='pidgin-plugin-%s', description='Pidgin plugin %s', prepend=True, extra_depends='') - do_split_packages(d, purple, '^lib(.*)\.so$', + do_split_packages(d, purple, r'^lib(.*)\.so$', output_pattern='libpurple-protocol-%s', description='Libpurple protocol plugin for %s', prepend=True, extra_depends='') - do_split_packages(d, purple, '^(ssl-.*)\.so$', + do_split_packages(d, purple, r'^(ssl-.*)\.so$', output_pattern='libpurple-plugin-%s', description='libpurple plugin %s', prepend=True, extra_depends='libpurple-plugin-ssl') - do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, purple, r'^([^l][^i][^b].*)\.so$', output_pattern='libpurple-plugin-%s', description='libpurple plugin %s', prepend=True, extra_depends='') - do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, finch, r'^([^l][^i][^b].*)\.so$', output_pattern='finch-plugin-%s', description='Finch plugin %s', prepend=True, extra_depends='') } + +# pidgin-2.14.2/libpurple/protocols/bonjour/parser.c:200:9: error: initialization of 'void (*)(void *, const xmlError *)' {aka 'void (*)(void *, const struct _xmlError *)'} from incompatible pointer type 'void (*)(void *, xmlError *)' {aka 'void (*)(void *, struct _xmlError *)'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb index 277d12057a..65e8e988e3 100644 --- a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb +++ b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb @@ -1,17 +1,17 @@ SUMMARY = "Skype protocol plug-in for libpurple" SECTION = "webos/services" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://skypeweb/gpl3.txt;md5=d90260d32cef39f3c8d6c0f05d3adb8e" DEPENDS = "pidgin json-glib glib-2.0 zlib" inherit pkgconfig -SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=git" +SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https" SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6" S = "${WORKDIR}/git" -PV = "1.7+git${SRCPV}" +PV = "1.7+git" do_compile() { oe_runmake -C skypeweb; @@ -21,6 +21,9 @@ do_install() { oe_runmake -C skypeweb DESTDIR="${D}" install; } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ " + +# skypeweb_contacts.c:975:17: error: 'return' with no value, in function returning non-void [-Wreturn-mismatch] +CFLAGS += "-Wno-error=return-mismatch" diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb new file mode 100644 index 0000000000..816ee967c1 --- /dev/null +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb @@ -0,0 +1,27 @@ +SUMMARY = "An OpenSSL provider that allows direct interfacing with pkcs11 drivers" +DESCRIPTION = "\ +This is an Openssl 3.x provider to access Hardware or Software Tokens using \ +the PKCS#11 Cryptographic Token Interface\ +\ +This code targets version 3.1 of the interface but should be backwards \ +compatible to previous versions as well.\ +" +HOMEPAGE = "https://github.com/latchset/pkcs11-provider" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" +DEPENDS = "\ + autoconf-archive \ + openssl \ + p11-kit \ +" + +SRCREV = "58040b4e32975cc1d7f39e424ee7b0097cd11311" + +SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch b/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch index 2d0ea0252c..12333cc1f1 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch @@ -7,6 +7,8 @@ link with shared zlib Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + Makefile.unx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch b/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch index 6d4465fbed..0fc5a8e0d2 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch @@ -6,6 +6,8 @@ Subject: [PATCH 1/2] png-fix-IDAT-windowsize: Fix format string errors in Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + gpl/png-fix-IDAT-windowsize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch b/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch index f2c86689ec..2ff6d664c0 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch +++ b/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch @@ -2,6 +2,8 @@ From: Jari Aalto <jari.aalto@cante.net> Subject: Correct fomat strings fro hardened build flags --- +Upstream-Status: Pending + gpl/pngsplit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb index 9f617ecda5..19da947d04 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb +++ b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb @@ -1,6 +1,6 @@ SUMMARY = "pngcheck verifies the integrity of PNG, JNG and MNG files" HOMEPAGE = "http://www.libpng.org/pub/png/apps/pngcheck.html" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://gpl/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "zlib libpng" diff --git a/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch b/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch deleted file mode 100644 index f4a358f47f..0000000000 --- a/meta-oe/recipes-support/poco/poco/0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fa079dfc5e1d22ea35762bf4c5b09999bdc5e731 Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof <git@jochen.sprickerhof.de> -Date: Wed, 22 Aug 2018 21:42:09 +0200 -Subject: [PATCH] Don't try to install non existing Encodings/testsuite/data - -Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/2437] ---- - Encodings/testsuite/CMakeLists.txt | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/Encodings/testsuite/CMakeLists.txt b/Encodings/testsuite/CMakeLists.txt -index 7508e5522..79495ae02 100644 ---- a/Encodings/testsuite/CMakeLists.txt -+++ b/Encodings/testsuite/CMakeLists.txt -@@ -19,12 +19,9 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE - add_executable( ${TESTUNIT} ${TEST_SRCS} ) - if(ANDROID) - add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} -- COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) -+ COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) - else() - add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -- # The test is run in the build directory. So the test data is copied there too -- add_custom_command(TARGET ${TESTUNIT} POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data ) - endif() - #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) - target_link_libraries( ${TESTUNIT} PocoEncodings PocoFoundation CppUnit ) --- -2.18.0 - diff --git a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch b/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch new file mode 100644 index 0000000000..b06135222a --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch @@ -0,0 +1,60 @@ +From 4cbb225811205b51b65371d0d8abc2d2af8233b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 14:56:36 -0800 +Subject: [PATCH] Use std::atomic<int> instead of std::atomic<bool> + +GCC on RISCV does not yet support inline subword atomics [1] +Therefore avoid them until fixed + +Upstream-Status: Pending + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104338 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Foundation/include/Poco/AsyncChannel.h | 2 +- + Foundation/src/AsyncChannel.cpp | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Foundation/include/Poco/AsyncChannel.h b/Foundation/include/Poco/AsyncChannel.h +index 190bae7dd..d73ea6c72 100644 +--- a/Foundation/include/Poco/AsyncChannel.h ++++ b/Foundation/include/Poco/AsyncChannel.h +@@ -111,7 +111,7 @@ private: + NotificationQueue _queue; + std::size_t _queueSize = 0; + std::size_t _dropCount = 0; +- std::atomic<bool> _closed; ++ std::atomic<int> _closed; + }; + + +diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp +index 37cdec477..e829b180c 100644 +--- a/Foundation/src/AsyncChannel.cpp ++++ b/Foundation/src/AsyncChannel.cpp +@@ -48,11 +48,10 @@ private: + Message _msg; + }; + +- + AsyncChannel::AsyncChannel(Channel::Ptr pChannel, Thread::Priority prio): + _pChannel(pChannel), + _thread("AsyncChannel"), +- _closed(false) ++ _closed(0) + { + _thread.setPriority(prio); + } +@@ -95,7 +94,7 @@ void AsyncChannel::open() + + void AsyncChannel::close() + { +- if (!_closed.exchange(true)) ++ if (!_closed.exchange(1)) + { + if (_thread.isRunning()) + { +-- +2.39.1 + diff --git a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch new file mode 100644 index 0000000000..f70e8bcc74 --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch @@ -0,0 +1,66 @@ +From 879ddb725823c78c9510cfd39786adb16f3726c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Sep 2023 19:52:56 -0700 +Subject: [PATCH] cppignore.lnx: Ignore PKCS12 and testLaunch test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +These tests fail on Linux + +There were 4 failures: + 1: N7CppUnit10TestCallerI11ProcessTestEE.testLaunch + "rc == 3" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 79 + 2: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectIn + "rc == 100" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 106 + 3: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectOut + "s == "Hello, world!"" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 134 + 4: N7CppUnit10TestCallerI11ProcessTestEE.testLaunchEnv + "s == "test"" + in "/usr/src/debug/poco/1.12.4-r0/Foundation/testsuite/src/ProcessTest.cpp", line 166 + + There were 4 errors:- + 1: N7CppUnit10TestCallerI7EVPTestEE.testRSAEVPKeyFromPKCS12 + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + 2: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testFullPKCS12 + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + 3: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testCertsOnlyPKCS12 + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + 4: N7CppUnit10TestCallerI19PKCS12ContainerTestEE.testPEMReadWrite + │ │ "N4Poco17NotFoundExceptionE: + Not found: POCO_BASE" + │ │ in "<unknown>", line -1 + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> +--- + cppignore.lnx | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/cppignore.lnx b/cppignore.lnx +index 2c2376526..65df4af08 100644 +--- a/cppignore.lnx ++++ b/cppignore.lnx +@@ -28,3 +28,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy + CppUnit::TestCaller<HTTPSStreamFactoryTest>.testProxy + CppUnit::TestCaller<DNSTest>.testHostByAddress + CppUnit::TestCaller<DNSTest>.testHostByName ++CppUnit::TestCaller<ProcessTest>.testLaunch ++CppUnit::TestCaller<ProcessTest>.testLaunchRedirectIn ++CppUnit::TestCaller<ProcessTest>.testLaunchRedirectOut ++CppUnit::TestCaller<ProcessTest>.testLaunchEnv ++CppUnit::TestCaller<EVPTest>.testRSAEVPKeyFromPKCS12 ++CppUnit::TestCaller<PKCS12ContainerTest>.testFullPKCS12 ++CppUnit::TestCaller<PKCS12ContainerTest>.testCertsOnlyPKCS12 ++CppUnit::TestCaller<PKCS12ContainerTest>.testPEMReadWrite ++CppUnit::TestCaller<MongoDBTest>.testArray diff --git a/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch b/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch deleted file mode 100644 index c0de32dafe..0000000000 --- a/meta-oe/recipes-support/poco/poco/0001-riscv-Enable-double-operations-when-using-double-flo.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 589a5442a841b156a1890bc2d26e7a5103e2f672 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 1 Nov 2019 17:53:50 -0700 -Subject: [PATCH] riscv: Enable double operations when using double float abi - -Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/2825] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Foundation/src/utils.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index 69cea1aca..ff7a5c9ce 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,7 +63,8 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || \ -- defined(nios2) || defined(__nios2) || defined(__nios2__) -+ defined(nios2) || defined(__nios2) || defined(__nios2__) || \ -+ (defined(__riscv) && defined(__riscv_float_abi_double)) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) --- -2.23.0 - diff --git a/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch b/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch new file mode 100644 index 0000000000..427cb9723a --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch @@ -0,0 +1,32 @@ +From e54478c936493c0ed87e875f04127bd13642de44 Mon Sep 17 00:00:00 2001 +From: tyler92 <tyler92@inbox.ru> +Date: Tue, 21 Nov 2023 05:07:24 +0300 +Subject: [PATCH] fix(build): Install cmake files with resolved ENABLE_JSON and + ENABLE_XML (#4227) + +Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/4227] +Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> + +--- + Util/cmake/PocoUtilConfig.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Util/cmake/PocoUtilConfig.cmake b/Util/cmake/PocoUtilConfig.cmake +index 90c1eab1c..8186435e1 100644 +--- a/Util/cmake/PocoUtilConfig.cmake ++++ b/Util/cmake/PocoUtilConfig.cmake +@@ -1,9 +1,9 @@ + include(CMakeFindDependencyMacro) + find_dependency(PocoFoundation) +-if(ENABLE_XML) ++if(@ENABLE_XML@) + find_dependency(PocoXML) + endif() +-if(ENABLE_JSON) ++if(@ENABLE_JSON@) + find_dependency(PocoJSON) + endif() + include("${CMAKE_CURRENT_LIST_DIR}/PocoUtilTargets.cmake") +-- +2.43.0 + diff --git a/meta-oe/recipes-support/poco/poco/run-ptest b/meta-oe/recipes-support/poco/poco/run-ptest index c479f7ac10..c8e50fc967 100644 --- a/meta-oe/recipes-support/poco/poco/run-ptest +++ b/meta-oe/recipes-support/poco/poco/run-ptest @@ -1,9 +1,21 @@ #!/bin/sh +export POCO_BASE=/usr/lib/poco/ptest +export LD_LIBRARY_PATH=${POCO_BASE}/bin:${LD_LIBRARY_PATH} +i=0 while read runner; do - pushd . >/dev/null + oldpath=`pwd` >/dev/null cd bin echo Testing $runner - ./$runner-testrunner -all - popd >/dev/null + ./$runner -ignore $oldpath/cppignore.lnx -all + export res$((i++))=$? + cd $oldpath >/dev/null +done < testrunners +i=0 +while read runner; do + eval assign=\$res$((i++)) + if [ $assign -ne 0 ]; then + echo "FAIL: $runner" + else + echo "PASS: $runner" + fi done < testrunners - diff --git a/meta-oe/recipes-support/poco/poco_1.9.4.bb b/meta-oe/recipes-support/poco/poco_1.12.5p2.bb index fcd5219759..a0bb0b5d96 100644 --- a/meta-oe/recipes-support/poco/poco_1.9.4.bb +++ b/meta-oe/recipes-support/poco/poco_1.12.5p2.bb @@ -6,15 +6,15 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" # These dependencies are required by Foundation -DEPENDS = "libpcre zlib" +DEPENDS = "libpcre2 zlib" -SRC_URI = " \ - git://github.com/pocoproject/poco.git;branch=poco-${PV} \ - file://0001-Don-t-try-to-install-non-existing-Encodings-testsuit.patch \ - file://0001-riscv-Enable-double-operations-when-using-double-flo.patch \ - file://run-ptest \ - " -SRCREV = "b95393dcc3640807838e8323b4e600e54d2e8116" +SRC_URI = "git://github.com/pocoproject/poco.git;branch=master;protocol=https \ + file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ + file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ + file://run-ptest \ + file://0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch \ + " +SRCREV = "1d6fb3e1383e559cacbada5e3f861c0dafaf5d30" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" @@ -25,21 +25,29 @@ inherit cmake ptest # By default the most commonly used poco components are built # Foundation is built anyway and doesn't need to be listed explicitly # these don't have dependencies outside oe-core -PACKAGECONFIG ??= "XML JSON MongoDB PDF Util Net NetSSL Crypto Data DataSQLite Zip Encodings Redis" - -PACKAGECONFIG[XML] = "-DENABLE_XML=ON -DEXPAT_LIBRARY:STRING=expat,-DENABLE_XML=OFF,expat" +PACKAGECONFIG ??= "XML JSON PDF Util Net NetSSL Crypto JWT Data DataSQLite Zip Encodings Redis Prometheus" +# MongoDB does not build for all architectures yet keep in sync with COMPATIBLE_HOST list in mongodb recipe +# and mongodb needs meta-python enabled as well +PACKAGECONFIG:remove:riscv32 = "MongoDB" +PACKAGECONFIG:remove:riscv64 = "MongoDB" +PACKAGECONFIG:remove:mipsarch = "MongoDB" +PACKAGECONFIG:remove:powerpc = "MongoDB" + +PACKAGECONFIG[XML] = "-DENABLE_XML=ON,-DENABLE_XML=OFF,expat" PACKAGECONFIG[JSON] = "-DENABLE_JSON=ON,-DENABLE_JSON=OFF" PACKAGECONFIG[MongoDB] = "-DENABLE_MONGODB=ON,-DENABLE_MONGODB=OFF" PACKAGECONFIG[PDF] = "-DENABLE_PDF=ON,-DENABLE_PDF=OFF,zlib" PACKAGECONFIG[Util] = "-DENABLE_UTIL=ON,-DENABLE_UTIL=OFF" PACKAGECONFIG[Net] = "-DENABLE_NET=ON,-DENABLE_NET=OFF" -PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_NETSSL=OFF,openssl" -PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON -DOPENSSL_SSL_LIBRARY:STRING=ssl -DOPENSSL_CRYPTO_LIBRARY:STRING=crypto,-DENABLE_CRYPTO=OFF,openssl" +PACKAGECONFIG[NetSSL] = "-DENABLE_NETSSL=ON,-DENABLE_NETSSL=OFF,openssl" +PACKAGECONFIG[Crypto] = "-DENABLE_CRYPTO=ON,-DENABLE_CRYPTO=OFF,openssl" +PACKAGECONFIG[JWT] = "-DENABLE_JWT=ON,-DENABLE_JWT=OFF,openssl" PACKAGECONFIG[Data] = "-DENABLE_DATA=ON,-DENABLE_DATA=OFF" PACKAGECONFIG[DataSQLite] = "-DENABLE_DATA_SQLITE=ON -DSQLITE3_LIBRARY:STRING=sqlite3,-DENABLE_DATA_SQLITE=OFF,sqlite3" PACKAGECONFIG[Zip] = "-DENABLE_ZIP=ON,-DENABLE_ZIP=OFF" PACKAGECONFIG[Encodings] = "-DENABLE_ENCODINGS=ON,-DENABLE_ENCODINGS=OFF" PACKAGECONFIG[Redis] = "-DENABLE_REDIS=ON,-DENABLE_REDIS=OFF" +PACKAGECONFIG[Prometheus] = "-DENABLE_PROMETHEUS=ON,-DENABLE_PROMETHEUS=OFF" # Additional components not build by default, # they might have dependencies not included in oe-core @@ -48,36 +56,38 @@ PACKAGECONFIG[mod_poco] = "-DENABLE_APACHECONNECTOR=ON,-DENABLE_APACHECONNECTOR= PACKAGECONFIG[CppParser] = "-DENABLE_CPPPARSER=ON,-DENABLE_CPPPARSER=OFF" PACKAGECONFIG[DataMySQL] = "-DENABLE_DATA_MYSQL=ON -DMYSQL_LIB:STRING=mysqlclient_r,-DENABLE_DATA_MYSQL=OFF,mariadb" PACKAGECONFIG[DataODBC] = "-DENABLE_DATA_ODBC=ON,-DENABLE_DATA_ODBC=OFF,libiodbc" +PACKAGECONFIG[ActiveRecord] = "-DENABLE_ACTIVERECORD=ON,-DENABLE_ACTIVERECORD=OFF" +PACKAGECONFIG[ActiveRecordCompiler] = "-DENABLE_ACTIVERECORD_COMPILER=ON,-DENABLE_ACTIVERECORD_COMPILER=OFF" PACKAGECONFIG[PageCompiler] = "-DENABLE_PAGECOMPILER=ON,-DENABLE_PAGECOMPILER=OFF" PACKAGECONFIG[PageCompilerFile2Page] = "-DENABLE_PAGECOMPILER_FILE2PAGE=ON,-DENABLE_PAGECOMPILER_FILE2PAGE=OFF" PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF" EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ - -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \ -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}" # For the native build we want to use the bundled version -EXTRA_OECMAKE_append_class-native = " -DPOCO_UNBUNDLED=OFF" +EXTRA_OECMAKE:append:class-native = " -DPOCO_UNBUNDLED=OFF" # do not use rpath -EXTRA_OECMAKE_append = " -DCMAKE_SKIP_RPATH=ON" +EXTRA_OECMAKE:append = " -DCMAKE_SKIP_RPATH=ON" + +LDFLAGS:append:riscv32 = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" +LDFLAGS:append:mips = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" +LDFLAGS:append:powerpc = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" -python populate_packages_prepend () { +python populate_packages:prepend () { poco_libdir = d.expand('${libdir}') pn = d.getVar("PN") packages = [] - testrunners = [] def hook(f, pkg, file_regex, output_pattern, modulename): packages.append(pkg) - testrunners.append(modulename) - do_split_packages(d, poco_libdir, '^libPoco(.*)\.so\..*$', + do_split_packages(d, poco_libdir, r'^libPoco(.*)\.so\..*$', 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) - d.setVar("RRECOMMENDS_%s" % pn, " ".join(packages)) - d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) + d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) } do_install_ptest () { @@ -85,19 +95,25 @@ do_install_ptest () { cp -f ${B}/lib/libCppUnit.so* ${D}${libdir} cp -rf ${B}/*/testsuite/data ${D}${PTEST_PATH}/bin/ find "${D}${PTEST_PATH}" -executable -exec chrpath -d {} \; - echo "${POCO_TESTRUNNERS}" > "${D}${PTEST_PATH}/testrunners" + rm -f ${D}${PTEST_PATH}/testrunners + for f in ${D}${PTEST_PATH}/bin/*-testrunner; do + echo `basename $f` >> ${D}${PTEST_PATH}/testrunners + done + install -Dm 0644 ${S}/cppignore.lnx ${D}${PTEST_PATH}/cppignore.lnx } PACKAGES_DYNAMIC = "poco-.*" # "poco" is a metapackage which pulls in all Poco components -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # cppunit is only built if tests are enabled PACKAGES =+ "${PN}-cppunit" -FILES_${PN}-cppunit += "${libdir}/libCppUnit.so*" -ALLOW_EMPTY_${PN}-cppunit = "1" +FILES:${PN}-cppunit += "${libdir}/libCppUnit.so*" +ALLOW_EMPTY:${PN}-cppunit = "1" -RDEPENDS_${PN}-ptest += "${PN}-cppunit" +RDEPENDS:${PN}-ptest += "${PN}-cppunit" +RDEPENDS:${PN}-ptest += "${@bb.utils.contains('PACKAGECONFIG', 'MongoDB', 'mongodb', '', d)}" +RDEPENDS:${PN}-ptest += "${@bb.utils.contains('PACKAGECONFIG', 'Redis', 'redis', '', d)}" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb index eda3f7ecdc..eed21ad54a 100644 --- a/meta-oe/recipes-support/poppler/poppler-data_0.4.9.bb +++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb @@ -2,9 +2,9 @@ SUMMARY = "Encoding files for Poppler" DESCRIPTION = "Encoding files for use with poppler that enable poppler to \ correctly render CJK and Cyrrilic." HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "BSD & GPLv2 & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4870b98343f0bbb25fa43b9d2ba59448 \ - file://COPYING.adobe;md5=63c6a8a9df204c00461fa5f163d8a663 \ +LICENSE = "BSD-3-Clause & GPL-2.0-only & GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=96287d49ec274d9c3222b5f966c132fd \ + file://COPYING.adobe;md5=a790726a74164c30b5de1ef93fd69e99 \ file://COPYING.gpl2;md5=751419260aa954499f7abaabaa882bbe \ " @@ -18,8 +18,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.gz \ ${CMAP_RESOURCES_BASE}/Identity-H;name=idh \ ${CMAP_RESOURCES_BASE}/Identity-V;name=idv" -SRC_URI[md5sum] = "35cc7beba00aa174631466f06732be40" -SRC_URI[sha256sum] = "1f9c7e7de9ecd0db6ab287349e31bf815ca108a5a175cf906a90163bdbe32012" +SRC_URI[sha256sum] = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74" SRC_URI[idh.md5sum] = "009c93cf0141ab7bd6acb7eea14306cc" SRC_URI[idh.sha256sum] = "ae702c203a82ea124e9b96590f821db6fbf8754e2c4547a9dba0e82f94739e95" SRC_URI[idv.md5sum] = "2f32a45d43d001c26eeac6b878855fbf" @@ -34,4 +33,4 @@ do_install() { install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ } -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" diff --git a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch index 05e0abede6..e07da387b2 100644 --- a/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch +++ b/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch @@ -10,43 +10,46 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - cmake/modules/PopplerMacros.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + cmake/modules/PopplerMacros.cmake | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake +index 2aed028..3c30f3f 100644 --- a/cmake/modules/PopplerMacros.cmake +++ b/cmake/modules/PopplerMacros.cmake -@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) +@@ -117,13 +117,13 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set(DEFAULT_COMPILE_WARNINGS "${_warn}") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") -+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") - set(_save_cflags "${CMAKE_C_FLAGS}") +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") ++ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") - set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") - set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") -@@ -167,7 +167,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") +@@ -161,14 +161,14 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set(DEFAULT_COMPILE_WARNINGS "${_warn}") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 -@@ -175,7 +175,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") - set(_save_cflags "${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") - set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 +-- +2.25.1 + diff --git a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch new file mode 100644 index 0000000000..adbe82263f --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch @@ -0,0 +1,192 @@ +From 04686340c4cd375a17d60d31bf6943367cc33214 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Jan 2023 03:09:08 -0800 +Subject: [PATCH] cmake: Do not use -isystem + +isystem dirs are searched before the regular system dirs +this exposes an interesting include ordering problem when using +clang + libc++, when including C++ headers like <cstdlib> + +cstdlib includes stdlib.h and in case of libc++, this should be coming +from libc++ as well, which is then eventually including system stdlib.h + +libc++ has added a check for checking this order recently, which means +if cstlib ends up including system stdlib.h before libc++ provided +stdlib.h it errors out + +/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/thrift/0.17.0-r0/recipe-sysroot/usr/include/c++/v1/cstdlib:90:5: error: <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. This usually means that your header search paths are not configured properly. The header search paths should contain the C++ Standard Library headers before any C Standard Library, and you are probably using compiler flags that make that not be the case. + ^ + +The reason is that include_directories with SYSTEM property adds the +directory via -system and some of these directories point to sysroot +e.g. OPENSSL_INCLUDE_DIR which ends up adding -isystem +<sysroot>/usr/include and causes the system stdlib.h to included before +libc++ stdlib.h + +A fix is to use -idirafter which preserved the effects of system headers +but instead of prepending, it will append to system headers and the +issue is addressed + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- +Upstream-Status: Pending + + CMakeLists.txt | 4 ++-- + glib/CMakeLists.txt | 4 ++-- + qt5/src/CMakeLists.txt | 4 ++-- + qt6/src/CMakeLists.txt | 4 ++-- + test/CMakeLists.txt | 6 +++--- + utils/CMakeLists.txt | 10 +++++----- + 6 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c6c757c..5f1c540 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS}) + if (OpenJPEG_FOUND) + # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed + # target openjp2 may lack interface include directories +- target_include_directories(poppler SYSTEM PRIVATE ${OPENJPEG_INCLUDE_DIRS}) ++ target_include_directories(poppler PRIVATE ${OPENJPEG_INCLUDE_DIRS}) + endif() + if(USE_CMS) +- target_include_directories(poppler SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") + set_target_properties(poppler PROPERTIES VERSION 127.0.0 SOVERSION 127) +diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt +index 52e8687..08ab39a 100644 +--- a/glib/CMakeLists.txt ++++ b/glib/CMakeLists.txt +@@ -4,7 +4,7 @@ include_directories( + ) + + include_directories( +- SYSTEM ++ + ${GLIB2_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ) +@@ -96,7 +96,7 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler-glib PROPERTIES SUFFIX "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif() + target_link_libraries(poppler-glib poppler PkgConfig::GLIB2 ${CAIRO_LIBRARIES} Freetype::Freetype) +-target_include_directories(poppler-glib SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS}) + install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install(FILES +diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt +index 5db3a6c..f242d29 100644 +--- a/qt5/src/CMakeLists.txt ++++ b/qt5/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt5 poppler Qt5::Core Qt5::Gui Qt5::Xml Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt5 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt5 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt5 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt5 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt +index cd91975..6c42e12 100644 +--- a/qt6/src/CMakeLists.txt ++++ b/qt6/src/CMakeLists.txt +@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) + endif() + target_link_libraries(poppler-qt6 poppler Qt6::Core Qt6::Gui Freetype::Freetype) + if (ENABLE_NSS3) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(poppler-qt6 PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if(USE_CMS) + target_link_libraries(poppler-qt6 poppler ${LCMS2_LIBRARIES}) +- target_include_directories(poppler-qt6 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(poppler-qt6 PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index afa1352..9bd3b9a 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -23,7 +23,7 @@ if (GTK_FOUND) + ) + poppler_add_test(gtk-test BUILD_GTK_TESTS ${gtk_splash_test_SRCS}) + target_link_libraries(gtk-test ${CAIRO_LIBRARIES} poppler-glib PkgConfig::GTK3) +- target_include_directories(gtk-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(gtk-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + + if (HAVE_CAIRO) + +@@ -35,7 +35,7 @@ if (GTK_FOUND) + ) + poppler_add_test(pdf-inspector BUILD_GTK_TESTS ${pdf_inspector_SRCS}) + target_link_libraries(pdf-inspector ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs} PkgConfig::GTK3 poppler) +- target_include_directories(pdf-inspector SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdf-inspector PRIVATE ${CAIRO_INCLUDE_DIRS}) + target_compile_definitions(pdf-inspector PRIVATE -DSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + endif () + +@@ -59,7 +59,7 @@ if (HAVE_CAIRO) + ) + add_executable(cairo-thread-test ${cairo_thread_test_SRCS}) + target_link_libraries(cairo-thread-test ${CAIRO_LIBRARIES} Freetype::Freetype Threads::Threads poppler) +- target_include_directories(cairo-thread-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(cairo-thread-test PRIVATE ${CAIRO_INCLUDE_DIRS}) + endif () + endif () + +diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt +index 1c3ebcb..bc1840a 100644 +--- a/utils/CMakeLists.txt ++++ b/utils/CMakeLists.txt +@@ -16,7 +16,7 @@ add_executable(pdftoppm ${pdftoppm_SOURCES}) + target_link_libraries(pdftoppm ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) +- target_include_directories(pdftoppm SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftoppm PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftoppm DESTINATION bin) + install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -37,10 +37,10 @@ if (HAVE_CAIRO) + add_definitions(${CAIRO_CFLAGS}) + add_executable(pdftocairo ${pdftocairo_SOURCES}) + target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) ++ target_include_directories(pdftocairo PRIVATE ${CAIRO_INCLUDE_DIRS}) + if(LCMS2_FOUND) + target_link_libraries(pdftocairo ${LCMS2_LIBRARIES}) +- target_include_directories(pdftocairo SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftocairo PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftocairo DESTINATION bin) + install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -99,7 +99,7 @@ if (ENABLE_NSS3) + pdfsig.cc + ) + add_executable(pdfsig ${pdfsig_SOURCES}) +- target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS}) + target_link_libraries(pdfsig ${common_libs}) + install(TARGETS pdfsig DESTINATION bin) + install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +@@ -114,7 +114,7 @@ add_executable(pdftops ${pdftops_SOURCES}) + target_link_libraries(pdftops ${common_libs}) + if(LCMS2_FOUND) + target_link_libraries(pdftops ${LCMS2_LIBRARIES}) +- target_include_directories(pdftops SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) ++ target_include_directories(pdftops PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftops DESTINATION bin) + install(FILES pdftops.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) diff --git a/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch b/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch new file mode 100644 index 0000000000..cc942fad77 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch @@ -0,0 +1,46 @@ +From 591235c8b6c65a2eee88991b9ae73490fd9afdfe Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Fri, 18 Aug 2023 11:36:06 +0000 +Subject: [PATCH] OutlineItem::open: Fix crash on malformed files + +Fixes #1399 + +CVE: CVE-2023-34872 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/poppler/poppler/-/commit/591235c8b6c65a2eee88991b9ae73490fd9afdfe] + +Signed-off-by: Yogita Urade <yogita.urade@windriver.com> +--- + poppler/Outline.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/poppler/Outline.cc b/poppler/Outline.cc +index cbb6cb4..4c68be9 100644 +--- a/poppler/Outline.cc ++++ b/poppler/Outline.cc +@@ -14,7 +14,7 @@ + // under GPL version 2 or later + // + // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com> +-// Copyright (C) 2008, 2016-2019, 2021 Albert Astals Cid <aacid@kde.org> ++// Copyright (C) 2008, 2016-2019, 2021, 2023 Albert Astals Cid <aacid@kde.org> + // Copyright (C) 2009 Nick Jones <nick.jones@network-box.com> + // Copyright (C) 2016 Jason Crain <jason@aquaticape.us> + // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> +@@ -483,8 +483,12 @@ void OutlineItem::open() + { + if (!kids) { + Object itemDict = xref->fetch(ref); +- const Object &firstRef = itemDict.dictLookupNF("First"); +- kids = readItemList(this, &firstRef, xref, doc); ++ if (itemDict.isDict()) { ++ const Object &firstRef = itemDict.dictLookupNF("First"); ++ kids = readItemList(this, &firstRef, xref, doc); ++ } else { ++ kids = new std::vector<OutlineItem *>(); ++ } + } + } + +-- +2.35.5 diff --git a/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch new file mode 100644 index 0000000000..70ba1cf123 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch @@ -0,0 +1,41 @@ +From 2986f06c7cc9d64a506ebe861b8bf38f73386e86 Mon Sep 17 00:00:00 2001 +From: Jordan Abrahams-Whitehead <ajordanr@google.com> +Date: Tue, 16 May 2023 18:52:19 +0000 +Subject: [PATCH] Add missing #include <cstdio> prior to jpeglib.h + +Fixes #1398 + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + goo/JpegWriter.cc | 2 +- + poppler/ImageEmbeddingUtils.cc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc +index ca69fd055..566ee38f8 100644 +--- a/goo/JpegWriter.cc ++++ b/goo/JpegWriter.cc +@@ -23,7 +23,7 @@ + #ifdef ENABLE_LIBJPEG + + # include "poppler/Error.h" +- ++# include <cstdio> + extern "C" { + # include <jpeglib.h> + } +diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc +index 0c13fe968..07b9dfb62 100644 +--- a/poppler/ImageEmbeddingUtils.cc ++++ b/poppler/ImageEmbeddingUtils.cc +@@ -14,6 +14,7 @@ + + #include <memory> + #ifdef ENABLE_LIBJPEG ++# include <cstdio> + extern "C" { + # include <jpeglib.h> + } +-- +GitLab diff --git a/meta-oe/recipes-support/poppler/poppler_20.10.0.bb b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb index 0f04b88f2d..f4411e1163 100644 --- a/meta-oe/recipes-support/poppler/poppler_20.10.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb @@ -1,15 +1,18 @@ SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ + file://0001-cmake-Do-not-use-isystem.patch \ + file://jpeg-stdio.patch \ + file://CVE-2023-34872.patch \ " -SRC_URI[sha256sum] = "434ecbbb539c1a75955030a1c9b24c7b58200b7f68d2e4269e29acf2f8f13336" +SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" +DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" inherit cmake pkgconfig gobject-introspection @@ -21,7 +24,7 @@ PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" -PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" +PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" # surprise - did not expect this to work :) inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} @@ -33,11 +36,13 @@ EXTRA_OECMAKE += " \ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ -DBUILD_GTK_TESTS=OFF \ -DENABLE_ZLIB=ON \ + -DRUN_GPERF_IF_PRESENT=OFF \ -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ " +EXTRA_OECMAKE:append:class-native = " -DENABLE_CPP=OFF" -do_configure_append() { +do_configure:append() { # poppler macro uses pkg-config to check for g-ir runtimes. Something # makes them point to /usr/bin. Align them to sysroot - that's where the # gir-wrappers are: @@ -45,7 +50,9 @@ do_configure_append() { } PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" +FILES:libpoppler = "${libdir}/libpoppler.so.*" +FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" -RDEPENDS_libpoppler = "poppler-data" +RDEPENDS:libpoppler = "poppler-data" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/portaudio/files/ldflags.patch b/meta-oe/recipes-support/portaudio/files/ldflags.patch deleted file mode 100644 index aca93a51f2..0000000000 --- a/meta-oe/recipes-support/portaudio/files/ldflags.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream forgot to pass LDFLAGS to everything apart from the main library. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/Makefile.in b/Makefile.in -index 5e1a764..61ecdd1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -171,20 +171,20 @@ lib/$(PALIB): lib-stamp $(LTOBJS) $(MAKEFILE) $(PAINC) - @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(PA_LDFLAGS) -o lib/$(PALIB) $(LTOBJS) $(DLL_LIBS) - - $(ALL_TESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) test/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/test/$*.c lib/$(PALIB) $(LIBS) - - $(EXAMPLES): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) examples/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/examples/$*.c lib/$(PALIB) $(LIBS) - - $(SELFTESTS): bin/%: lib/$(PALIB) $(MAKEFILE) $(PAINC) qa/%.c -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(top_srcdir)/qa/$*.c lib/$(PALIB) $(LIBS) - - bin/paloopback: lib/$(PALIB) $(MAKEFILE) $(PAINC) $(LOOPBACK_OBJS) -- @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -- @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_FALSE@ $(LIBTOOL) --mode=link $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) -+ @WITH_ASIO_TRUE@ $(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $(LOOPBACK_OBJS) lib/$(PALIB) $(LIBS) - - install: lib/$(PALIB) portaudio-2.0.pc - $(INSTALL) -d $(DESTDIR)$(libdir) -@@ -224,10 +224,10 @@ distclean: clean - $(CC) -c $(CFLAGS) $< -o $@ - - %.lo: %.c $(MAKEFILE) $(PAINC) -- $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@ -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(LDFLAGS) $< -o $@ - - %.lo: %.cpp $(MAKEFILE) $(PAINC) -- $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $< -o $@ -+ $(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $(LDFLAGS) $< -o $@ - - %.o: %.cpp $(MAKEFILE) $(PAINC) - $(CXX) -c $(CXXFLAGS) $< -o $@ diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb new file mode 100644 index 0000000000..2bf4d0a449 --- /dev/null +++ b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "A portable audio library" +SECTION = "libs/multimedia" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" + +PV .= "+git" + +SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https" +SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +PACKAGECONFIG ??= "alsa jack" +PACKAGECONFIG[alsa] = ",,alsa-lib" +PACKAGECONFIG[jack] = ",,jack" +PACKAGECONFIG[examples] = "-DPA_BUILD_EXAMPLES=ON,-DPA_BUILD_EXAMPLES=OFF" + +do_install:append() { + if [ -d ${B}/examples ]; then + install -d ${D}${bindir} + for example in ${B}/examples/pa*; do + install -m755 $example ${D}${bindir}/ + done + fi +} diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb deleted file mode 100644 index 489f8ad9e2..0000000000 --- a/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "A portable audio library" -SECTION = "libs/multimedia" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" - -PV = "v190600" - -SRC_URI = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz \ - file://ldflags.patch" -SRC_URI[md5sum] = "4df8224e047529ca9ad42f0521bf81a8" -SRC_URI[sha256sum] = "f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513" - -S = "${WORKDIR}/portaudio" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "alsa jack" -PACKAGECONFIG[alsa] = "--with-alsa, --without-alsa, alsa-lib," -PACKAGECONFIG[jack] = "--with-jack, --without-jack, jack," - -EXTRA_OECONF = "--without-oss --without-asihpi" - -do_install_append() { - mkdir --parents ${D}${bindir} - for b in ${B}/bin/pa*; do - # Bit nasty, should always work - ${B}/*-libtool --mode install install $b ${D}${bindir} - done -} - -PACKAGES += "portaudio-examples" -FILES_portaudio-examples = "${bindir}" diff --git a/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb index c8baa5d9ca..65c06c1bd5 100644 --- a/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb +++ b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb @@ -1,15 +1,15 @@ SUMMARY = "User-space tools for LinuxPPS" HOMEPAGE = "http://linuxpps.org" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "cb48b7ecf7079ceba7081c78d4e61e507b0e8d2d" -SRC_URI = "git://github.com/ago/pps-tools.git" +SRCREV = "c50cb7183e252b47308fa22f420e0a877277aa29" +SRC_URI = "git://github.com/ago/pps-tools.git;branch=master;protocol=https" S = "${WORKDIR}/git" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" do_install() { install -d ${D}${bindir} ${D}${includedir} \ diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch index 8341a8ecde..c1f9ce7eca 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/3] From debian to fix compile errors Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + src/Makefile.0 | 7 +++---- src/autoconf | 64 +++++++++++++------------------------------------------- src/comsat.c | 65 +++++++++++++++++++-------------------------------------- diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch index 7b3c643b2b..78ac6241d0 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/3] From debian to fix man file Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + man/procmail.man | 24 +++++++++++++++++------- man/procmailrc.man | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch b/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch index a94e436703..2bebccc0b2 100644 --- a/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch +++ b/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch @@ -5,6 +5,8 @@ Subject: [PATCH 3/3] From debian to modify parameters Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + Makefile | 16 ++++++++-------- config.h | 13 +++++++------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch b/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch index 46d973e060..72fa27a834 100644 --- a/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch +++ b/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch @@ -5,6 +5,8 @@ Subject: [PATCH] man file mailstat.1 from debian Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + debian/mailstat.1 | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 debian/mailstat.1 diff --git a/meta-oe/recipes-support/procmail/procmail_3.22.bb b/meta-oe/recipes-support/procmail/procmail_3.22.bb index 6160733b3d..ba268de0a5 100644 --- a/meta-oe/recipes-support/procmail/procmail_3.22.bb +++ b/meta-oe/recipes-support/procmail/procmail_3.22.bb @@ -16,7 +16,7 @@ SRC_URI = "http://www.ring.gr.jp/archives/net/mail/${BPN}/${BP}.tar.gz \ SRC_URI[md5sum] = "1678ea99b973eb77eda4ecf6acae53f1" SRC_URI[sha256sum] = "087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117" -LICENSE = "GPL-2.0 & Artistic-1.0" +LICENSE = "GPL-2.0-only & Artistic-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=a71e50e197a992c862379e576e669757 \ file://Artistic;md5=505e00d03c3428cde21b17b2a386590e" diff --git a/meta-oe/recipes-support/psutils/psutils_2.10.bb b/meta-oe/recipes-support/psutils/psutils_2.10.bb new file mode 100644 index 0000000000..1f1894a5f2 --- /dev/null +++ b/meta-oe/recipes-support/psutils/psutils_2.10.bb @@ -0,0 +1,24 @@ +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=87212b5f1ae096371049a12f80034f32" + +SRC_URI = "https://github.com/rrthomas/psutils/releases/download/v${PV}/psutils-${PV}.tar.gz" +SRC_URI[sha256sum] = "6f8339fd5322df5c782bfb355d9f89e513353220fca0700a5a28775404d7e98b" + +inherit perlnative autotools + +export PERL="/usr/bin/env perl" + +DEPENDS += "libpaper-native" + +do_install:append() { + sed -i -e 's|${STAGING_BINDIR_NATIVE}/perl-native/|/usr/bin/env |g' ${D}${bindir}/pstops + for f in psbook psresize psnup psselect; do + grep -v '${B}' ${D}${bindir}/$f > ${D}${bindir}/$f.temp + install -m 0755 ${D}${bindir}/$f.temp ${D}${bindir}/$f + rm -f ${D}${bindir}/$f.temp + done +} + +BBCLASSEXTEND += "native" +# /usr/bin/pstops contained in package psutils requires perl +RDEPENDS:${PN} += "perl" diff --git a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch new file mode 100644 index 0000000000..c51fb1cfdb --- /dev/null +++ b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch @@ -0,0 +1,40 @@ +From c5cd932fb08e7ce90cdbf9ae6c5cc7e65ac0738e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20Wei=C3=9F?= <michael.weiss@aisec.fraunhofer.de> +Date: Tue, 9 May 2023 20:00:26 +0200 +Subject: [PATCH] pv/display: handle error of tcgetpgrp() in pv_in_foreground() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Show pv progress bar even if no terminal is set, e.g., in a busybox +init script. The description of pv_in_forground() states it will +return true "if we aren't outputting to a terminal". However, this +is not the case since tcgetpgrg() will return an error and set ERRNO +to ENOTTY if the output fd is not an tty. We now handle this error +correctly and pv_in_foreground() returns also true in that case. + +Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de> +--- +Upstream-Status: Pending + + src/pv/display.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/pv/display.c b/src/pv/display.c +index aff643b..8d1f4c9 100644 +--- a/src/pv/display.c ++++ b/src/pv/display.c +@@ -48,6 +48,10 @@ bool pv_in_foreground(void) + + our_process_group = getpgrp(); + tty_process_group = tcgetpgrp(STDERR_FILENO); ++ ++ if (tty_process_group == -1 && errno == ENOTTY) ++ return true; ++ + if (our_process_group == tty_process_group) + return true; + +-- +2.30.2 + diff --git a/meta-oe/recipes-support/pv/pv/run-ptest b/meta-oe/recipes-support/pv/pv/run-ptest new file mode 100644 index 0000000000..3f5956f4c0 --- /dev/null +++ b/meta-oe/recipes-support/pv/pv/run-ptest @@ -0,0 +1,7 @@ +#!/bin/sh + +rm -rf tests.log +sh -e run-test.sh pv . > tests.log 2>&1 +sed -e 's|\(.*\):.*OK|PASS: \1|' \ + -e 's|\(.*\):.*FAILED|FAIL: \1|' \ + tests.log diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-oe/recipes-support/pv/pv_1.6.20.bb new file mode 100644 index 0000000000..6a739af927 --- /dev/null +++ b/meta-oe/recipes-support/pv/pv_1.6.20.bb @@ -0,0 +1,28 @@ +SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline" +HOMEPAGE = "http://www.ivarch.com/programs/pv.shtml" + +LICENSE = "Artistic-2.0" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02" + +SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \ + file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" + +UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" +UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar.bz2" + +inherit autotools ptest + +LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}" +export LDEMULATION + +RDEPENDS:${PN}-ptest += "coreutils ${PN}" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests + cp -r ${S}/autoconf/scripts/run-test.sh ${D}${PTEST_PATH} + # sed -i -e 's@\$SRCDIR/@./@g' ${D}${PTEST_PATH}/run-ptest +} diff --git a/meta-oe/recipes-support/pv/pv_1.6.6.bb b/meta-oe/recipes-support/pv/pv_1.6.6.bb deleted file mode 100644 index 0eef82b2c2..0000000000 --- a/meta-oe/recipes-support/pv/pv_1.6.6.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline" - -LICENSE = "Artistic-2.0" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02" - -SRC_URI = "http://www.ivarch.com/programs/sources/${BP}.tar.bz2" -SRC_URI[md5sum] = "ff3564fddcc2b9bd4a9c1d143aba4b4c" -SRC_URI[sha256sum] = "608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1" - -UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" -UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar.bz2" - -inherit autotools - -LDEMULATION_mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}" -export LDEMULATION diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch index 36983ec479..2b5b5caa6f 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch index a9c4b95cf0..c0f81725d9 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch index 06853851d0..fba2e7f513 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch index 59f21fe3c1..91ca0a7742 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch +++ b/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: pxaregs-1.14/pxaregs.c =================================================================== --- pxaregs-1.14.orig/pxaregs.c diff --git a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb index 30c41fffbe..b61fb026ca 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb +++ b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb @@ -1,7 +1,6 @@ SUMMARY = "Tool to display and modify PXA registers at runtime" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://pxaregs.c;endline=12;md5=668d061b7637acc68cb8071c9be372e6" -AUTHOR = "Holger Schurig <hs4233@mail.mn-solutions.de>" HOMEPAGE = "http://www.mn-logistik.de/unsupported/pxa250/" SRC_URI = "file://pxaregs.c \ diff --git a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch deleted file mode 100644 index 7faeb130a7..0000000000 --- a/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3f97aac5a1f43ef57b02fb9ccdcadd41a6b69fa9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 27 Oct 2015 10:21:24 +0100 -Subject: [PATCH] configure.ac: do additional checks on libxml2 also when - detected by pkg-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Applied [1] - -[1] https://github.com/dajobe/raptor/pull/33 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 10ff870..35fa08e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -601,7 +601,7 @@ have_libxml=0 - need_libxml=0 - - oCPPFLAGS="$CPPFLAGS" --if test "X$XML_CONFIG" != X; then -+if test "X$libxml_source" != X; then - CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS" - LIBS="$LIBS $LIBXML_LIBS" - AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no) --- -2.1.0 - diff --git a/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch b/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch new file mode 100644 index 0000000000..e709616797 --- /dev/null +++ b/meta-oe/recipes-support/raptor2/raptor2/0001-Remove-the-access-to-entities-checked-private-symbol.patch @@ -0,0 +1,34 @@ +From da171e12d961b41b89196627ef5e5baae1e637ce Mon Sep 17 00:00:00 2001 +From: David Anes <david.anes@suse.com> +Date: Thu, 4 May 2023 11:54:02 +0200 +Subject: [PATCH] Remove the access to entities 'checked' private symbol for + libxml2 2.11.0 + +Since version 2.11.0, some private symbols that were never intended +as public API/ABI have been removed from libxml2, therefore the field +'checked' is no longer present and raptor fails to build in this +scenario. + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Upstream-Status: Backport [https://github.com/dajobe/raptor/commit/ac914399b9013c54572833d4818e6ce008136dc9] +--- + src/raptor_libxml.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/raptor_libxml.c b/src/raptor_libxml.c +index 538c2c8..8bcee13 100644 +--- a/src/raptor_libxml.c ++++ b/src/raptor_libxml.c +@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name) + + ret->owner = 1; + +-#if LIBXML_VERSION >= 20627 ++#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100 + /* Checked field was released in 2.6.27 on 2006-10-25 + * http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6 + * ++ * and was later removed in version 2.11.0 + */ + + /* Mark this entity as having been checked - never do this again */ diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb index dd00c14f72..85012bcfb3 100644 --- a/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb +++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb @@ -1,7 +1,7 @@ SUMMARY = "Library for parsing and serializing RDF syntaxes" -LICENSE = "GPLv2 | LGPLv2.1 | Apache-2.0" +LICENSE = "GPL-2.0-only | LGPL-2.1-only | Apache-2.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.txt;md5=b840e5ae3aeb897f45b473341348cd9c \ + file://LICENSE.txt;md5=f7fed8b6ab9289b77f5c14f3f79572cc \ file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -11,12 +11,11 @@ DEPENDS = "libxml2 libxslt curl yajl" SRC_URI = " \ http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ - file://0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch \ + file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ " -SRC_URI[md5sum] = "a39f6c07ddb20d7dd2ff1f95fa21e2cd" -SRC_URI[sha256sum] = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed" +SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" -inherit autotools pkgconfig +inherit autotools pkgconfig gtk-doc EXTRA_OECONF = " \ --without-xml2-config \ diff --git a/meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb b/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb index 42f2064fd4..3a15fe6c9a 100644 --- a/meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb +++ b/meta-oe/recipes-support/rdfind/rdfind_1.6.0.bb @@ -1,15 +1,12 @@ SUMMARY = "Rdfind is a program that finds duplicate files" HOMEPAGE = "https://rdfind.pauldreik.se/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fa22e16ebbe6638b2bd253338fbded9f" DEPENDS = "nettle autoconf-archive" -SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ -" - -SRC_URI[md5sum] = "180418c863b861d1df221bc486a07ce7" -SRC_URI[sha256sum] = "30c613ec26eba48b188d2520cfbe64244f3b1a541e60909ce9ed2efb381f5e8c" +SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz" +SRC_URI[sha256sum] = "7a406e8ef1886a5869655604618dd98f672f12c6a6be4926d053be65070f3279" inherit autotools diff --git a/meta-oe/recipes-support/re2/re2/run-ptest b/meta-oe/recipes-support/re2/re2/run-ptest new file mode 100644 index 0000000000..8bd5fd1efb --- /dev/null +++ b/meta-oe/recipes-support/re2/re2/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +ctest --force-new-ctest-process | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' diff --git a/meta-oe/recipes-support/re2/re2_2024.03.01.bb b/meta-oe/recipes-support/re2/re2_2024.03.01.bb new file mode 100644 index 0000000000..192fe265f1 --- /dev/null +++ b/meta-oe/recipes-support/re2/re2_2024.03.01.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "A regular expression library" +HOMEPAGE = "https://github.com/google/re2/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" + +# tag 2024-03-01 +SRCREV = "2d866a3d0753f4f4fce93cccc6c59c4b052d7db4" + +SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ + " + +S = "${WORKDIR}/git" + +DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebenchmark', '', d)}" + +inherit cmake ptest +RDEPENDS:${PN}-ptest += "cmake sed" +RDEPENDS:${PN} += "abseil-cpp-dev" + +INSANE_SKIP:${PN} += "dev-deps" + +EXTRA_OECMAKE += " \ + -DBUILD_SHARED_LIBS=ON \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ +" + +do_install_ptest () { + cp -r ${B}/*_test ${D}${PTEST_PATH} + cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} + sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` + # ERROR: re2-2024.03.01-r0 do_package_qa: QA Issue: /usr/lib64/re2/ptest/string_generator_test contained in package re2-ptest requires libtesting.so()(64bit), but no providers found in RDEPENDS:re2-ptest? [file-rdeps] + cp -r ${B}/libtesting.so ${D}${PTEST_PATH} +} + +# ignore .so in /usr/lib64 +FILES:${PN} = "${libdir}" +INSANE_SKIP:${PN} += "dev-so" + +# Don't include so files in dev package +FILES:${PN}-dev = "${includedir} ${libdir}/cmake" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb index 1aa492c31b..28da51a21c 100644 --- a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb +++ b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb @@ -3,7 +3,6 @@ DESCRIPTION = "read-edid is a set of two tools - get-edid, which gets the raw \ EDID information from the monitor, and parse-edid, which turns \ the raw binary information into a xorg.conf-compatible monitor \ section." -AUTHOR = "Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com>" HOMEPAGE = "http://www.polypux.org/projects/read-edid/" SECTION = "console/utils" LICENSE = "read-edid" diff --git a/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb new file mode 100644 index 0000000000..c038966ba8 --- /dev/null +++ b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb @@ -0,0 +1,17 @@ +SUMMARY = "Reboot the device to a specific mode." + +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +SRC_URI = "git://gitlab.com/postmarketOS/reboot-mode.git;protocol=http;branch=master" +SRCREV = "84831b20512abd9033414ca5f5a023f333525335" + +S = "${WORKDIR}/git" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} ${S}/reboot-mode.c -o ${B}/reboot-mode +} + +do_install() { + install -D -m 0755 ${B}/reboot-mode ${D}${bindir}/reboot-mode +} diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.34.bb b/meta-oe/recipes-support/remmina/remmina_1.4.34.bb new file mode 100644 index 0000000000..921d34d9fd --- /dev/null +++ b/meta-oe/recipes-support/remmina/remmina_1.4.34.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" +HOMEPAGE = "https://remmina.org" +SECTION = "Support" +LICENSE = "GPL-2.0-only & OpenSSL" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" + +DEPENDS = " \ + glib-2.0-native \ + openssl \ + freerdp \ + gtk+3 \ + gdk-pixbuf \ + atk \ + libgcrypt \ + libsodium \ + libssh \ + vte \ + json-glib \ + libsoup-3.0 \ + libvncserver \ + libsecret \ + libxkbfile \ +" + +DEPENDS:append:libc-musl = " libexecinfo" +LDFLAGS:append:libc-musl = " -lexecinfo" + +SRCREV = "75a0bdb795d99e052690178ae0d81ebdbd2cbdd3" +SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" +S = "${WORKDIR}/git" + +inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DHAVE_LIBAPPINDICATOR=OFF -DWITH_WEBKIT2GTK=OFF" + +PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" +# Switch on gtk support in avahi recipe if you want to enable avahi support +PACKAGECONFIG[avahi] = "-DWITH_AVAHI=ON, -DWITH_AVAHI=OFF, avahi" + +do_configure:append() { + sed -i -e 's|${WORKDIR}|<WORKDIR>|g' ${B}/generated/buildflags.h +} + +RDEPENDS:${PN} = "bash" + +FILES:${PN}+= " \ + ${datadir}/metainfo \ + ${datadir}/mime \ +" diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.7.bb b/meta-oe/recipes-support/remmina/remmina_1.4.7.bb deleted file mode 100644 index 661673d6b2..0000000000 --- a/meta-oe/recipes-support/remmina/remmina_1.4.7.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" -HOMEPAGE = "https://remmina.org" -SECTION = "Support" -LICENSE = "GPLv2 & openssl" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" -DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret libxkbfile" - - -DEPENDS_append_libc-musl = " libexecinfo" -LDFLAGS_append_libc-musl = " -lexecinfo" - -SRC_URI = "https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/Remmina-v${PV}.tar.bz2 \ -" -SRC_URI[sha256sum] = "7614d447dc588403aff2ff97b253f46c5f03a6347d024618e84490b8ab4cd87b" - -S = "${WORKDIR}/Remmina-v${PV}" - -inherit cmake features_check mime-xdg -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" - -do_install_append(){ - # We dont need the extra stuff form other desktop environments - rm -rf ${D}/${datadir}/xsessions - rm -rf ${D}/${datadir}/metainfo - rm -rf ${D}/${datadir}/gnome-session -} - -PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" - -RDEPENDS_${PN} = "bash" - -FILES_${PN}_append = " ${datadir}/icons/hicolor/*" diff --git a/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb new file mode 100644 index 0000000000..57b31a78d9 --- /dev/null +++ b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "Reparent a running program to a new terminal" +DESCRIPTION = "reptyr is a utility for taking an existing running program and \ +attaching it to a new terminal. Started a long-running process over ssh, but \ +have to leave and don't want to interrupt it? Just start a screen, use reptyr \ +to grab it, and then kill the ssh session and head on home." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=25a0555028c71837623fa6dfa4cc45c0" + +SRC_URI = "git://github.com/nelhage/reptyr.git;protocol=https;branch=master" +SRCREV = "1238097fc2cd15db058d2185cc4985daa87bcd41" + +S = "${WORKDIR}/git" + +inherit bash-completion github-releases manpages pkgconfig + +GITHUB_BASE_URI = "https://github.com/nelhage/${BPN}/releases/" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[manpages] = "" + +EXTRA_OEMAKE = "'BINDIR=${bindir}' 'MANDIR=${mandir}' 'PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config'" + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake install 'DESTDIR=${D}' +} diff --git a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index 33f5dccca2..3cbd04bd5c 100644 --- a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -3,10 +3,10 @@ HOMEPAGE = "http://www.rsnapshot.org" BUGTRACKER = "https://sourceforge.net/projects/rsnapshot/" SECTION = "console/network" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" -RDEPENDS_${PN} = "rsync \ +RDEPENDS:${PN} = "rsync \ perl \ perl-module-dirhandle \ perl-module-cwd \ @@ -22,10 +22,10 @@ RDEPENDS_${PN} = "rsync \ perl-module-ipc-open3 \ " -SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" -PV = "1.4.3+git${SRCPV}" +SRCREV = "1b943dbc7695d62fac5c0f9549ec696a538be19c" +PV = "1.4.5" -SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ +SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=https \ file://configure-fix-cmd_rsync.patch \ " @@ -48,7 +48,7 @@ EXTRA_OECONF += "--without-cp \ # Create 't/include.ac' before starting the autoreconf to fix configure # error: configure.ac:302: file 't/include.ac' does not exist -do_configure_prepend(){ +do_configure:prepend(){ saved_dir=`pwd` cd ${S}; ./autogen.sh cd ${saved_dir} diff --git a/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb new file mode 100644 index 0000000000..d65f5da859 --- /dev/null +++ b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb @@ -0,0 +1,14 @@ +SUMMARY = "Useful programs to test rtc drivers" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=74274e8a218423e49eefdea80bc55038" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/${BPN}.git;protocol=https;branch=master" +SRCREV = "61839777afedcc7bdb68ea4628c5ce5ca72c2ac8" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "DESTDIR=${D}" + +do_install() { + oe_runmake install +} diff --git a/meta-oe/recipes-support/rtkit/rtkit_0.13.bb b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb new file mode 100644 index 0000000000..4f06e55e8e --- /dev/null +++ b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "REALTIMEKIT Realtime Policy and Watchdog Daemon" +LICENSE = "GPL-3.0-only & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a8e768468b658b3ed44971b53d4a6716" + +SRC_URI = "git://github.com/heftig/rtkit.git;protocol=https;branch=master" + +SRCREV = "b9169402fe5e82d20efb754509eb0b191f214599" +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check useradd + +REQUIRED_DISTRO_FEATURES = "polkit" + +DEPENDS = "dbus libcap polkit xxd-native" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = ",,systemd" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --shell /bin/nologin rtkit" + +FILES:${PN} += "${libdir} ${datadir} ${systemd_system_unitdir}" + diff --git a/meta-oe/recipes-support/sass/libsass_git.bb b/meta-oe/recipes-support/sass/libsass_git.bb index 9cba3a8901..f0824944b9 100644 --- a/meta-oe/recipes-support/sass/libsass_git.bb +++ b/meta-oe/recipes-support/sass/libsass_git.bb @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" inherit autotools -SRC_URI = "git://github.com/sass/libsass.git;branch=master" -SRCREV = "8d312a1c91bb7dd22883ebdfc829003f75a82396" -PV = "3.6.4" +SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https" +SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460" +PV = "3.6.6" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/sass/sassc_git.bb b/meta-oe/recipes-support/sass/sassc_git.bb index 3c7a55cc3d..9bb8c76e87 100644 --- a/meta-oe/recipes-support/sass/sassc_git.bb +++ b/meta-oe/recipes-support/sass/sassc_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libsass" inherit autotools pkgconfig -SRC_URI = "git://github.com/sass/sassc.git" -SRCREV = "46748216ba0b60545e814c07846ca10c9fefc5b6" +SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https" +SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0" S = "${WORKDIR}/git" -PV = "3.6.1" +PV = "3.6.2" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch b/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch index b6c32c4bd5..24efc13560 100644 --- a/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch +++ b/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch @@ -10,19 +10,17 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> lib/rpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/lib/rpm.c b/lib/rpm.c -index 920e145..58140bf 100644 --- a/lib/rpm.c +++ b/lib/rpm.c -@@ -191,7 +191,7 @@ sr_rpm_package_sort(struct sr_rpm_package *packages) - } +@@ -34,6 +34,11 @@ + #include <assert.h> + #include <string.h> - /* Sort the array. */ -- qsort(array, count, sizeof(struct sr_rpm_package*), (comparison_fn_t)cmp_nevra_qsort_wrapper); -+ qsort(array, count, sizeof(struct sr_rpm_package*), cmp_nevra_qsort_wrapper); - - /* Create a linked list from the sorted array. */ - for (size_t loop = 0; loop < count; ++loop) --- -2.8.1 - ++#if !defined(__GLIBC__) ++typedef int (*__compar_fn_t) (const void*, const void*); ++typedef __compar_fn_t comparison_fn_t; ++#endif ++ + struct sr_rpm_package * + sr_rpm_package_new() + { diff --git a/meta-oe/recipes-support/satyr/satyr_0.31.bb b/meta-oe/recipes-support/satyr/satyr_0.43.bb index e99f8ac6a1..9e6d701c7f 100644 --- a/meta-oe/recipes-support/satyr/satyr_0.31.bb +++ b/meta-oe/recipes-support/satyr/satyr_0.43.bb @@ -3,14 +3,14 @@ failure processing, analysis, and reporting supporting kernel space, user \ space, Python, and Java programs" HOMEPAGE = "https://github.com/abrt/satyr" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" -inherit autotools-brokensep python3native pkgconfig +inherit autotools-brokensep python3native python3targetconfig pkgconfig -SRC_URI = "git://github.com/abrt/satyr.git \ +SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \ file://0002-fix-compile-failure-against-musl-C-library.patch \ -" -SRCREV = "79506592fa61fa10aa2e186158eecfa10b39e905" + " +SRCREV = "5891618d6a95afc4cde6757374485adf9bf0e9a5" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" @@ -20,15 +20,16 @@ DEPENDS += " \ gperf-native \ json-c \ nettle \ + glib-2.0 \ " PACKAGES += "python3-${BPN}" -FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" +FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" PACKAGECONFIG ??= "python3 rpm" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" -do_configure_prepend() { +do_configure:prepend() { ${S}/gen-version } diff --git a/meta-oe/recipes-support/sdmon/sdmon_git.bb b/meta-oe/recipes-support/sdmon/sdmon_git.bb new file mode 100644 index 0000000000..522539a67b --- /dev/null +++ b/meta-oe/recipes-support/sdmon/sdmon_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "Get SD card health data" +HOMEPAGE = "https://github.com/Ognian/sdmon" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/Ognian/sdmon;protocol=https;branch=master" + +PV = "0.8.1+git" +SRCREV = "ef1aec457f04a50721f0259651cca9c946f11390" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake -C ${S}/src CC="${CC}" CFLAGS="${CFLAGS} -D_REENTRANT -DVERSION=\"\\\"${PV}\\\"\"" LDFLAGS="${LDFLAGS}" +} + +do_install() { + install -Dm 0755 ${S}/src/sdmon ${D}${bindir}/sdmon +} diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.11.bb b/meta-oe/recipes-support/sdparm/sdparm_1.12.bb index 7fc87db2bd..a5f98e6723 100644 --- a/meta-oe/recipes-support/sdparm/sdparm_1.11.bb +++ b/meta-oe/recipes-support/sdparm/sdparm_1.12.bb @@ -15,12 +15,12 @@ MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" UPSTREAM_CHECK_REGEX = "sdparm-(?P<pver>\d+(\.\d+)+)\.tgz" PACKAGES =+ "${PN}-scripts" -RDEPENDS_${PN}-scripts += "bash ${PN}" +RDEPENDS:${PN}-scripts += "bash ${PN}" -SRC_URI[md5sum] = "cd998d1c12a4ec11652d0af580f06b4d" -SRC_URI[sha256sum] = "432fdbfe90f0c51640291faf7602489b0ae56dfb96d0c02ed02308792adc7fb0" +SRC_URI[md5sum] = "2902fd29e6834fd62c16bb5d1ac53c7e" +SRC_URI[sha256sum] = "e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124" inherit autotools # Put the bash scripts to ${PN}-scripts -FILES_${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp" +FILES:${PN}-scripts = "${bindir}/sas_disk_blink ${bindir}/scsi_ch_swp" diff --git a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb index 7f59b3ecad..82994331ee 100644 --- a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb +++ b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb @@ -1,12 +1,11 @@ SUMMARY = "Receive a forwarded serial from serial-forward and provide a PTY" -AUTHOR = "Holger 'Zecke' Freyther" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" SECTION = "console/network" SRCREV = "00dbec2636ae0385ad028587e20e446272ff97ec" -PV = "1.1+gitr${SRCPV}" +PV = "1.1+git" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https" +SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https;branch=master" S = "${WORKDIR}/git/tools/serial_forward" inherit autotools native diff --git a/meta-oe/recipes-support/serial-utils/serial-forward/0001-correct-the-typo-in-include-file-name-string.h.patch b/meta-oe/recipes-support/serial-utils/serial-forward/0001-correct-the-typo-in-include-file-name-string.h.patch new file mode 100644 index 0000000000..f65d2c4bbf --- /dev/null +++ b/meta-oe/recipes-support/serial-utils/serial-forward/0001-correct-the-typo-in-include-file-name-string.h.patch @@ -0,0 +1,27 @@ +From 2897794c337625d1951eb0b402cd8840ae2182a8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 10:33:57 -0700 +Subject: [PATCH] correct the typo in include file name string.h + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tools/serial_forward/src/forward.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/serial_forward/src/forward.c b/tools/serial_forward/src/forward.c +index 9fad6f9b..4c0dd9df 100644 +--- a/tools/serial_forward/src/forward.c ++++ b/tools/serial_forward/src/forward.c +@@ -20,7 +20,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <termios.h> +-#include <strings.h> ++#include <string.h> + #include <getopt.h> + + #include "forward.h" +-- +2.37.3 + diff --git a/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch index 7dcc67d114..a3fb678965 100644 --- a/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch +++ b/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch @@ -7,6 +7,8 @@ This does not work with ssp turned on with hardening flags on musl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/serial_forward/src/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb index 0ef829856c..541ae84a93 100644 --- a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb +++ b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb @@ -1,13 +1,13 @@ SUMMARY = "Forward a serial using TCP/IP" -AUTHOR = "Holger 'Zecke' Freyther'" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" SECTION = "console/devel" SRCREV = "07c6fdede0870edc37a8d51d033b6e7e29aa7c91" -PV = "1.1+gitr${SRCPV}" +PV = "1.1+git" -SRC_URI = "git://github.com/freesmartphone/cornucopia.git \ +SRC_URI = "git://github.com/freesmartphone/cornucopia.git;branch=master;protocol=https \ file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \ + file://0001-correct-the-typo-in-include-file-name-string.h.patch;striplevel=3 \ " S = "${WORKDIR}/git/tools/serial_forward" diff --git a/meta-oe/recipes-support/serial/serial/Findcatkin.cmake b/meta-oe/recipes-support/serial/serial/Findcatkin.cmake new file mode 100644 index 0000000000..2f93564be3 --- /dev/null +++ b/meta-oe/recipes-support/serial/serial/Findcatkin.cmake @@ -0,0 +1,5 @@ +# Work-around for https://github.com/wjwwood/serial/issues/135 + +function(catkin_package) +endfunction() + diff --git a/meta-oe/recipes-support/serial/serial_1.2.1.bb b/meta-oe/recipes-support/serial/serial_1.2.1.bb new file mode 100644 index 0000000000..8c1fb063b3 --- /dev/null +++ b/meta-oe/recipes-support/serial/serial_1.2.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "Cross-platform library for interfacing with rs-232 serial like ports" +HOMEPAGE = "http://wjwwood.io/serial/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://README.md;beginline=53;endline=62;md5=049c68d559533f90250404746e6a1045" + +SRC_URI = " \ + git://github.com/wjwwood/${BPN}.git;protocol=https;branch=main \ + file://Findcatkin.cmake \ +" +SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f" +SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96" + +S = "${WORKDIR}/git" + +inherit cmake + +# Work-around for https://github.com/wjwwood/serial/issues/135 +EXTRA_OECMAKE = " \ + -DCMAKE_MODULE_PATH=${WORKDIR} \ + -DCATKIN_PACKAGE_LIB_DESTINATION=${libdir} \ + -DCATKIN_PACKAGE_BIN_DESTINATION=${bindir} \ + -DCATKIN_GLOBAL_INCLUDE_DESTINATION=${includedir} \ + -DCATKIN_ENABLE_TESTING=OFF \ +" + +# Do not depend on the main package since it will be empty +RDEPENDS:${PN}-dev = "" + diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb index 22995b773f..6c3d813983 100644 --- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb +++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb @@ -5,20 +5,18 @@ DESCRIPTION = "This package contains low level utilities for devices that use th HOMEPAGE = "http://sg.danny.cz/sg/sg3_utils.html" SECTION = "console/admin" -LICENSE = "GPLv2+ & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=f90da7fc52172599dbf082d7620f18ca" +LICENSE = "GPL-2.0-or-later & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=f685699d3ac82f108aa880043fa3feb7" -SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz \ -" +SRC_URI = "http://sg.danny.cz/sg/p/sg3_utils-${PV}.tgz" MIRRORS += "http://sg.danny.cz/sg/p https://fossies.org/linux/misc" UPSTREAM_CHECK_REGEX = "sg3_utils-(?P<pver>\d+(\.\d+)+)\.tgz" -SRC_URI[md5sum] = "2e71d7cd925dcc48acb24afaaaac7990" -SRC_URI[sha256sum] = "0b87c971af52af7cebebcce343eac6bd3d73febb3c72af9ce41a4552f1605a61" +SRC_URI[sha256sum] = "d62b6c3cf20390fa7357044390084166d25f1d932a1135c450b69fe5c283d773" inherit autotools-brokensep S = "${WORKDIR}/sg3_utils-${PV}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch index 7b627c16dd..583fe33ece 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch @@ -8,6 +8,8 @@ whereas it does support format attribute, we hard code it Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/shar-opts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch index 9e2ebe7564..0d9978a214 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-building-with-GCC-10.patch @@ -21,6 +21,8 @@ declarations. Signed-off-by: Petr PÃÂsaÃ…â„¢ <address@hidden> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/shar-opts.h | 2 +- src/shar-std.def | 2 +- src/unshar-opts.h | 2 +- diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-configure.ac-Check-and-define-intmax_t-type.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-configure.ac-Check-and-define-intmax_t-type.patch new file mode 100644 index 0000000000..32562a08bc --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-configure.ac-Check-and-define-intmax_t-type.patch @@ -0,0 +1,32 @@ +From ea6f7a4c22f1b6f28cf426566cccd65eb9a0e9de Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 10 Sep 2023 13:52:31 -0700 +Subject: [PATCH] configure.ac: Check and define intmax_t type + +If stdint.h or inttypes.h defines the type intmax_t, define HAVE_INTMAX_T. +Otherwise, define intmax_t to the widest signed integer type. + +intmax_t is defined in lib/system.h if system is not providing it but it +needs to be checked by configure for existence first. + +Upstream-Status: Submitted [https://savannah.gnu.org/bugs/index.php?64653] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 1242cb7..2ccaac9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -72,6 +72,7 @@ AC_HEADER_STAT + AC_HEADER_STDC + AC_STRUCT_TIMEZONE + AC_TYPE_SIZE_T ++AC_TYPE_INTMAX_T + AC_CHECK_FUNCS([fchmod isascii strchr]) + AC_FUNC_CLOSEDIR_VOID + AC_FUNC_FSEEKO +-- +2.42.0 + diff --git a/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch b/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch index d4a8d6fbae..5932ddf1c0 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/0002-Do-not-include-lib-md5.c-into-src-shar.c.patch @@ -20,6 +20,8 @@ shar.o:shar.c:(.text+0x28): first defined here Signed-off-by: Petr PÃÂsaÃ…â„¢ <address@hidden> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/shar.c | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch index 99dc4e3046..47eb9cfd64 100644 --- a/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch +++ b/meta-oe/recipes-support/sharutils/sharutils/CVE-2018-1000097.patch @@ -36,7 +36,7 @@ This was reported in <http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html>. CVE: CVE-2018-1000097 -Upstream-Status: no upstream [http://lists.gnu.org/archive/html/bug-gnu-utils/2018-02/msg00004.html] +Upstream-Status: Inappropriate [no upstream] Signed-off-by: Petr PÃsaÅ™ <ppisar@redhat.com> Signed-off-by: Sinan Kaya <okaya@kernel.org> --- diff --git a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb index 8bbc6815ed..2a16b18288 100644 --- a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb +++ b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb @@ -1,7 +1,7 @@ SUMMARY = "This is the set of GNU shar utilities." HOMEPAGE = "http://www.gnu.org/software/sharutils/" SECTION = "console/utils" -LICENSE="GPLv3+" +LICENSE="GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit gettext autotools update-alternatives @@ -12,11 +12,12 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Fix-build-with-recent-gettext.patch \ file://0001-Fix-building-with-GCC-10.patch \ file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \ + file://0001-configure.ac-Check-and-define-intmax_t-type.patch \ " SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800" SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" -do_install_append() { +do_install:append() { if [ -e ${D}${libdir}/charset.alias ] then rm -rf ${D}${libdir}/charset.alias @@ -26,6 +27,6 @@ do_install_append() { BBCLASSEXTEND = "native nativesdk" -ALTERNATIVE_${PN} = "uudecode uuencode" +ALTERNATIVE:${PN} = "uudecode uuencode" ALTERNATIVE_LINK_NAME[uudecode] = "${bindir}/uudecode" ALTERNATIVE_LINK_NAME[uuencode] = "${bindir}/uuencode" diff --git a/meta-oe/recipes-support/smarty/smarty_4.4.1.bb b/meta-oe/recipes-support/smarty/smarty_4.4.1.bb new file mode 100644 index 0000000000..1caa4cd1bb --- /dev/null +++ b/meta-oe/recipes-support/smarty/smarty_4.4.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "the compiling PHP template engine" +SECTION = "console/network" +HOMEPAGE = "https://www.smarty.net/" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3" + +DEPENDS += "php" + +SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=support/4.3" + +SRCREV = "f4152e9b814ae2369b6e4935c05e1e0c3654318d" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir}/php/smarty3/libs/ + install -m 0644 ${S}/libs/*.php ${D}${datadir}/php/smarty3/libs/ + + install -d ${D}${datadir}/php/smarty3/libs/plugins + install -m 0644 ${S}/libs/plugins/*.php ${D}${datadir}/php/smarty3/libs/plugins/ + + install -d ${D}${datadir}/php/smarty3/libs/sysplugins + install -m 0644 ${S}/libs/sysplugins/*.php ${D}${datadir}/php/smarty3/libs/sysplugins/ +} +FILES:${PN} = "${datadir}/php/smarty3/" diff --git a/meta-oe/recipes-support/span-lite/span-lite_git.bb b/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb index 96ec829b74..9dc393fd08 100644 --- a/meta-oe/recipes-support/span-lite/span-lite_git.bb +++ b/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb @@ -3,10 +3,9 @@ HOMEPAGE = "https://github.com/martinmoene/span-lite" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI += "git://github.com/martinmoene/span-lite" -SRCREV = "e03d1166ccc8481d993dc02aae703966301a5e6e" +SRC_URI += "git://github.com/martinmoene/span-lite;branch=master;protocol=https" +SRCREV = "50f55c59d1b66910837313c40d11328d03447a41" S = "${WORKDIR}/git" inherit cmake -inherit ptest diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.13.0.bb b/meta-oe/recipes-support/spdlog/spdlog_1.13.0.bb new file mode 100644 index 0000000000..c6a0881db9 --- /dev/null +++ b/meta-oe/recipes-support/spdlog/spdlog_1.13.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Very fast, header only, C++ logging library." +HOMEPAGE = "https://github.com/gabime/spdlog/wiki" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" + +SRCREV = "7c02e204c92545f869e2f04edaab1f19fe8b19fd" +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" + +DEPENDS = "fmt" + +S = "${WORKDIR}/git" + +inherit cmake + +# no need to build example & tests & benchmarks on pure yocto +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EXAMPLE=off -DSPDLOG_FMT_EXTERNAL=on" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb b/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb deleted file mode 100644 index 7d28fff5e3..0000000000 --- a/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Very fast, header only, C++ logging library." -HOMEPAGE = "https://github.com/gabime/spdlog/wiki" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRCREV = "cbe9448650176797739dbab13961ef4c07f4290f" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" - -DEPENDS += "fmt" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" -# no need to build example&text&benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" - -inherit cmake - -# Header-only library -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-oe/recipes-support/spitools/spitools_git.bb index 06fb82b859..1e3d6beaf4 100644 --- a/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-oe/recipes-support/spitools/spitools_git.bb @@ -1,16 +1,14 @@ DESCRIPTION = "This package contains some simple command line tools to help using Linux spidev devices" HOMEPAGE = "https://github.com/cpb-/spi-tools" -AUTHOR = "Christophe BLAESS" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" -BPV = "0.8.5" -PV = "${BPV}" -SRCREV = "3c93b9038a7c4d9de4302ab6f14372e9fa381f3c" +PV = "1.0.2" +SRCREV = "1748e092425a4a0ff693aa347062a57fc1ffdd00" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=git" +SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=https;branch=master" inherit autotools diff --git a/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch b/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch new file mode 100644 index 0000000000..0ed9e87771 --- /dev/null +++ b/meta-oe/recipes-support/srecord/files/0001-Disable-doxygen.patch @@ -0,0 +1,85 @@ +From d75193671c235e4b3bd02417b40516f3bfeb55b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 30 Apr 2023 14:09:21 -0700 +Subject: [PATCH] Disable doxygen + +doxygen (dot) detect does not work in cross environment here with cmake + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + etc/configure.cmake | 2 +- + srecord/CMakeLists.txt | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +--- a/etc/configure.cmake ++++ b/etc/configure.cmake +@@ -103,32 +103,3 @@ option(_TANDEM_SOURCE ON) + # Enable general extensions on Solaris. + option(__EXTENSIONS__ ON) + +-# Doxygen configuration +-find_package(Doxygen REQUIRED doxygen dot) +- +-set(DOXYGEN_DOT_GRAPH_MAX_NODES 150) +-set(DOXYGEN_ALPHABETICAL_INDEX NO) +-set(DOXYGEN_BUILTIN_STL_SUPPORT YES) +-set(DOXYGEN_CASE_SENSE_NAMES NO) +-set(DOXYGEN_CLASS_DIAGRAMS YES) +-set(DOXYGEN_DISTRIBUTE_GROUP_DOC YES) +-set(DOXYGEN_EXCLUDE bin) +-set(DOXYGEN_EXTRACT_ALL YES) +-set(DOXYGEN_EXTRACT_LOCAL_CLASSES NO) +-set(DOXYGEN_FILE_PATTERNS *.h) +-set(DOXYGEN_GENERATE_TREEVIEW YES) +-set(DOXYGEN_HIDE_FRIEND_COMPOUNDS YES) +-set(DOXYGEN_HIDE_IN_BODY_DOCS YES) +-set(DOXYGEN_HIDE_UNDOC_CLASSES YES) +-set(DOXYGEN_HIDE_UNDOC_MEMBERS YES) +-set(DOXYGEN_JAVADOC_AUTOBRIEF YES) +-set(DOXYGEN_QT_AUTOBRIEF YES) +-set(DOXYGEN_QUIET YES) +-set(DOXYGEN_RECURSIVE YES) +-set(DOXYGEN_REFERENCED_BY_RELATION YES) +-set(DOXYGEN_REFERENCES_RELATION YES) +-set(DOXYGEN_SORT_BY_SCOPE_NAME YES) +-set(DOXYGEN_SORT_MEMBER_DOCS NO) +-set(DOXYGEN_SOURCE_BROWSER YES) +-set(DOXYGEN_STRIP_CODE_COMMENTS NO) +-set(DOXYGEN_GENERATE_HTML YES) +--- a/srecord/CMakeLists.txt ++++ b/srecord/CMakeLists.txt +@@ -34,9 +34,9 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE + FILES_MATCHING PATTERN "*.h") + + # Install the Doxygen output for the website +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html +- DESTINATION ${CMAKE_INSTALL_DOCDIR}/htdocs/srecord +- COMPONENT website) ++#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html ++# DESTINATION ${CMAKE_INSTALL_DOCDIR}/htdocs/srecord ++# COMPONENT website) + + # Generate config.h to suit local environment + configure_file(config.h.in config.h @ONLY) +@@ -44,6 +44,6 @@ configure_file(patchlevel.h.in patchleve + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + # Generate doxygen content +-doxygen_add_docs(doxygen +- ${LIB_SRECORD_HDR} +- ALL) ++#doxygen_add_docs(doxygen ++# ${LIB_SRECORD_HDR} ++# ALL) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,7 @@ enable_testing() + add_subdirectory(test) + + # Documentation & Man Pages +-add_subdirectory(doc) ++# add_subdirectory(doc) + + # Package SRecord + include(CPack) diff --git a/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch b/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch new file mode 100644 index 0000000000..524dc74611 --- /dev/null +++ b/meta-oe/recipes-support/srecord/files/0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch @@ -0,0 +1,45 @@ +From 756169511ed13e4c7adc06c7c108d365ac66b9f8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 30 Apr 2023 22:58:47 -0700 +Subject: [PATCH] cmake: Do not try to compute library dependencies during + install + +Since we are cross-building the dependencies are not in final install +location but in a staging area in recipe specific sysroot and it wont be +able to resolve the libraries all the time + +Fixes +| CMake Error at srec_cat/cmake_install.cmake:66 (file): +| file Could not resolve runtime dependencies: +| +| libc++.so.1 +| libc.so +| Call Stack (most recent call first): +| cmake_install.cmake:52 (include) + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + etc/packaging.cmake | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/etc/packaging.cmake b/etc/packaging.cmake +index ee2a32c..9804fd8 100644 +--- a/etc/packaging.cmake ++++ b/etc/packaging.cmake +@@ -45,12 +45,6 @@ FUNCTION(INSTALL_SRECORD_EXECUTABLE_TARGET target) + + install(IMPORTED_RUNTIME_ARTIFACTS ${target} + RUNTIME_DEPENDENCY_SET ${PROJECT_NAME}_dlls COMPONENT ${target}) +- install(RUNTIME_DEPENDENCY_SET ${PROJECT_NAME}_dlls +- PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" +- POST_EXCLUDE_REGEXES ".*system32/.*\\.dll" +- DIRECTORIES ${DLL_SEARCH_DIRS} +- COMPONENT ${target} +- ) + ENDFUNCTION() + + # Packaging +-- +2.40.1 + diff --git a/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch b/meta-oe/recipes-support/srecord/files/0001-cmake-respect-explicit-install-prefix.patch new file mode 100644 index 0000000000..64584656fa --- /dev/null +++ b/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-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch b/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch deleted file mode 100644 index 9b2bd99795..0000000000 --- a/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch +++ /dev/null @@ -1,57 +0,0 @@ -Add option to build this utility without a documentation. - -For full documentation building are necessary utilities like -groff and ps2pdf. Full documentation can takes a lot of space. -So it can be disabled by overloading makefile variable WITHOUT_DOC. - -Upstream-Status: Inappropriate [Other] -Workaround specific to our build system. - -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - -diff --git a/Makefile.in b/Makefile.in -index 9bdd8f1..a2b5494 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -141,6 +141,14 @@ GROFF = @GROFF@ - # - SOELIM = @SOELIM@ - -+# Option to build this utility without building and installing the documentation. -+WITHOUT_DOC ?= 0 -+ifeq ($(WITHOUT_DOC),0) -+ BUILD_DOC = all-doc -+ INST_DOC = install-doc -+ CLR_DOC = clean-doc -+endif -+ - # --------------------------------------------------------- - # You should not need to change anything below this line. - -@@ -4090,7 +4098,7 @@ bin/test_url_decode: $(test_url_decode_obj) .bin srecord/libsrecord.la - $(LIBTOOL) --mode=link --tag=CXX $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ \ - $(test_url_decode_obj) srecord/libsrecord.la $(LDFLAGS) $(LIBS) - --all: all-bin all-doc -+all: all-bin $(BUILD_DOC) - - all-bin: bin/srec_cat bin/srec_cmp bin/srec_info bin/test_arglex_ambiguous \ - bin/test_crc16 bin/test_fletcher16 bin/test_gecos \ -@@ -4156,7 +4164,7 @@ test_files = t0001a t0002a t0003a t0004a t0005a t0006a t0007a t0008a t0009a \ - sure: $(test_files) - @echo Passed All Tests - --clean: clean-bin clean-doc clean-misc clean-obj -+clean: clean-bin $(CLR_DOC) clean-misc clean-obj - - clean-bin: - rm -f bin/srec_cat bin/srec_cmp bin/srec_info bin/test_arglex_ambiguous -@@ -4443,7 +4451,7 @@ distclean-directories: - rm -rf test/fletcher16/.libs test/gecos/.libs test/hyphen/.libs - rm -rf test/url_decode/.libs - --install: install-bin install-doc install-include install-libdir install-man -+install: install-bin $(INST_DOC) install-include install-libdir install-man - - install-bin: $(bindir)/srec_cat $(bindir)/srec_cmp $(bindir)/srec_info - diff --git a/meta-oe/recipes-support/srecord/srecord_1.64.bb b/meta-oe/recipes-support/srecord/srecord_1.64.bb deleted file mode 100644 index 4c34fa1bc3..0000000000 --- a/meta-oe/recipes-support/srecord/srecord_1.64.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A collection of powerful tools for manipulating EPROM load files." -SECTION = "devel" -LICENSE = "GPLv3+ & LGPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8dfcbf2f0a144b97f0931b6394debea7" - -SRC_URI = " \ - http://srecord.sourceforge.net/srecord-${PV}.tar.gz \ - file://add-option-to-remove-docs.patch \ -" - -SRC_URI[md5sum] = "4de4a7497472d7972645c2af91313769" -SRC_URI[sha256sum] = "49a4418733c508c03ad79a29e95acec9a2fbc4c7306131d2a8f5ef32012e67e2" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/srecord/files/releases" - -DEPENDS = "libtool-native boost groff-native" - -inherit autotools-brokensep - -EXTRA_OECONF = "--without-gcrypt LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" - -# Set variable WITHOUT_DOC=0 to enable documentation generation -EXTRA_OEMAKE = "WITHOUT_DOC=1" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb new file mode 100644 index 0000000000..3e8a87d07f --- /dev/null +++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "A collection of powerful tools for manipulating EPROM load files." +SECTION = "devel" +LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later" +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-respect-explicit-install-prefix.patch" +SRC_URI[sha256sum] = "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644" +S = "${WORKDIR}/${BP}-Source" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/srecord/files/releases" + +DEPENDS = "boost libgcrypt" + +inherit cmake + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch index d9190e5bdf..5842ff1f36 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Don-t-use-__GNUC_PREREQ.patch @@ -10,6 +10,8 @@ availability first Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/efi/efi.h | 4 ++-- lib/engine/pragma.h | 4 ++-- lib/log/log.h | 4 ++-- diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch index fd44571b69..b522146602 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-Include-libgen.h.patch @@ -9,6 +9,8 @@ would be upstreams choice to make Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/ssieventmonitor.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch index 8fdbf3e60e..c01c7e5ccd 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0001-log-Avoid-shadowing-functions-from-std-lib.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/4] log: Avoid shadowing functions from std lib Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/log/log.c | 2 +- lib/log/log.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch index acc718d23d..390faeb77b 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0002-Use-stangard-int-types.patch @@ -10,6 +10,8 @@ error: unknown type name '__uint8_t' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/engine/end_device.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch index 2eeab54e53..aabbc04e57 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0002-boost-Backport-clang-support.patch @@ -7,6 +7,8 @@ backport headers from boost 1.59 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/boost/config/compiler/clang.hpp | 272 +++++++++ lib/boost/config/stdlib/libcpp.hpp | 80 +++ lib/boost/cstdint.hpp | 542 ++++++++++++++++++ diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch index 261358459e..e5e257b49a 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0003-engine-Define-discover-const-String-path-in-base-cla.patch @@ -11,6 +11,8 @@ Remove ununsed orom_vmd Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/engine/storage_object.h | 3 +++ lib/engine/vmd_raid_info.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch index 848d38b223..d70be51ee6 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0003-replace-canonicalize_file_name-with-realpath.patch @@ -11,6 +11,8 @@ error: use of undeclared identifier 'canonicalize_file_name' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/engine/filesystem.cpp | 2 +- tools/ssieventmonitor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch index ca2ffc56b1..56e3c658a4 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0004-Do-not-override-flags-coming-from-build-environment.patch @@ -8,6 +8,8 @@ without this change, the build would fail Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch index d63eb50619..005a35e5a4 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0004-include-limits.h.patch @@ -8,6 +8,8 @@ error: use of undeclared identifier 'PATH_MAX' Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/ssieventmonitor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch b/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch index c516f65252..6dd7fc735e 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch +++ b/meta-oe/recipes-support/ssiapi/ssiapi/0005-enable-out-of-source-tree-builds.patch @@ -5,6 +5,8 @@ Subject: [PATCH] enable out of source tree builds Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + lib/efi/Makefile.am | 2 +- lib/engine/Makefile.am | 2 +- lib/orom/Makefile.am | 2 +- diff --git a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb index ce46cf5892..bf9de31f84 100644 --- a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb +++ b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb @@ -29,10 +29,13 @@ S ="${WORKDIR}/${BPN}.${PV}" inherit autotools -do_configure_prepend(){ +CXXFLAGS += "-std=gnu++14" + +do_configure:prepend(){ ${S}/autogen.sh } -RDEPENDS_${PN} += "mdadm" +RDEPENDS:${PN} += "mdadm" -COMPATIBLE_HOST_powerpc = 'null' +COMPATIBLE_HOST:powerpc = 'null' +COMPATIBLE_HOST:powerpc64le = 'null' diff --git a/meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb b/meta-oe/recipes-support/stm32flash/stm32flash_0.7.bb index 854df06cb7..0998aa6778 100644 --- a/meta-oe/recipes-support/stm32flash/stm32flash_0.5.bb +++ b/meta-oe/recipes-support/stm32flash/stm32flash_0.7.bb @@ -1,16 +1,13 @@ SUMMARY = "Open source flash program for STM32 using the ST serial bootloader" HOMEPAGE = "https://sourceforge.net/projects/stm32flash/" BUGTRACKER = "https://sourceforge.net/p/stm32flash/tickets/" -LICENSE = "GPL-2.0+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" -S = "${WORKDIR}/${BPN}" - SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" do_install() { oe_runmake install DESTDIR=${D} PREFIX=${prefix} } -SRC_URI[md5sum] = "40f673502949f3bb655d2bcc539d7b6a" -SRC_URI[sha256sum] = "97aa9422ef02e82f7da9039329e21a437decf972cb3919ad817f70ac9a49e306" +SRC_URI[sha256sum] = "c4c9cd8bec79da63b111d15713ef5cc2cd947deca411d35d6e3065e227dc414a" diff --git a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb new file mode 100644 index 0000000000..17f54dcf4c --- /dev/null +++ b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb @@ -0,0 +1,21 @@ +SUMMARY = "Easy to use CLI and C library for communicating with Microsemi's Switchtec management interface" +HOMEPAGE = "https://github.com/Microsemi/switchtec-user" +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6b07c89629cff2990d2e8e1f4c2382" + +DEPENDS = "ncurses openssl" + +SRCREV = "e7c351c6c722336b3c79b79cd002c7c2986eefb0" +SRC_URI = "git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master" +SRC_URI[sha256sum] = "a715e46d8498418dbb8a2519318ba0714ee148151d7e4a7fa5e27770a2f6888f" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +EXTRA_OEMAKE = "DESTDIR='${D}' PREFIX='${prefix}' LDCONFIG='true' LIBDIR='${D}${libdir}'" + +do_install () { + oe_runmake install +} diff --git a/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-oe/recipes-support/synergy/synergy_git.bb index dba89d181c..fb767942fe 100644 --- a/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-oe/recipes-support/synergy/synergy_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/symless/synergy-core;protocol=https;nobranch=1" # Version 1.10.1-stable SRCREV ?= "1b4c076127687aceac931d269e898beaac1cad9f" -PV = "1.10.1+git${SRCPV}" +PV = "1.10.1+git" S = "${WORKDIR}/git" @@ -21,4 +21,4 @@ inherit cmake features_check EXTRA_OECMAKE += "-DSYNERGY_BUILD_LEGACY_GUI=OFF" -FILES_${PN} += "${datadir}/icons/hicolor" +FILES:${PN} += "${datadir}/icons/hicolor" diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch b/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch new file mode 100644 index 0000000000..c7bb4a64d9 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-Fix-buildpaths-warning.patch @@ -0,0 +1,55 @@ +From d85a7a3ae2bb9f5267b2af43784633ae8f011f21 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 13 Mar 2023 09:50:15 +0800 +Subject: [PATCH] Fix buildpaths warning + +Fix buildpath warning: +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/include/syslog-ng/syslog-ng-config-64.h in package syslog-ng-dev contains reference to TMPDIR [buildpaths] +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/bin/syslog-ng-update-virtualenv in package syslog-ng contains reference to TMPDIR +File /usr/bin/pdbtool in package syslog-ng contains reference to TMPDIR [buildpaths] +WARNING: syslog-ng-4.0.1-r0 do_package_qa: QA Issue: File /usr/lib/syslog-ng/libdbparser.so in package syslog-ng-libs contains reference to TMPDIR [buildpaths] + +* SYSLOG_NG_PATH_TOPSRC_DIR is /yocto/build/tmp/work/core2-64-poky-linux/syslog-ng/4.0.1-r0, + which is used to get xsd dir in build SYSLOG_NG_PATH_TOPSRC_DIR/doc/xsd, + which is not suitable for target, set it to "/source" for fixing this buildpath warning + +* SYSTEM_PYTHON is /yocto/build/tmp/hosttools/python3, set to python3 + for target. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 2 +- + scripts/syslog-ng-update-virtualenv.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 79a1502..1ad6508 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1930,7 +1930,7 @@ AC_DEFINE_UNQUOTED(PYTHON_SYSCONF_MODULE_DIR, "$python_sysconf_moduledir", [Pyth + AC_DEFINE_UNQUOTED(PATH_LOGGENPLUGINDIR, "$loggenplugindir", [loggenplugin installation directory]) + AC_DEFINE_UNQUOTED(MODULE_PATH, "$module_path", [module search path]) + AC_DEFINE_UNQUOTED(JAVA_MODULE_PATH, "$java_module_path", [java module search path]) +-AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "$abs_topsrcdir", [self-defined top_srcdir path]) ++AC_DEFINE_UNQUOTED(PATH_TOPSRC_DIR, "/source", [self-defined top_srcdir path]) + AC_DEFINE_UNQUOTED(PACKAGE_NAME, "$PACKAGE_NAME", [package name]) + + +diff --git a/scripts/syslog-ng-update-virtualenv.in b/scripts/syslog-ng-update-virtualenv.in +index ed85baf..b1a9e34 100755 +--- a/scripts/syslog-ng-update-virtualenv.in ++++ b/scripts/syslog-ng-update-virtualenv.in +@@ -62,7 +62,7 @@ done + set -e + + REQUIREMENTS_FILE=${python_moduledir}/requirements.txt +-SYSTEM_PYTHON=@PYTHON@ ++SYSTEM_PYTHON=python3 + VENV_PYTHON=${python_venvdir}/bin/python + + if [ "$display_prompt" -ne 0 ]; then +-- +2.25.1 + diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch new file mode 100644 index 0000000000..f21ad5d70f --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch @@ -0,0 +1,40 @@ +From 896d77dd949b52d6ea5798e5a038ba97d6b802be Mon Sep 17 00:00:00 2001 +From: Peter Marko <peter.marko@siemens.com> +Date: Thu, 4 Apr 2024 15:44:18 +0200 +Subject: [PATCH] macros: guard ipv6 code with SYSLOG_NG_ENABLE_IPV6 + +With ipv6 disabled, there are linking errors currently. +This fixes it by not using the symbols when IPv6 is disabled. + +Solves #4810 with my config options +https://github.com/openembedded/meta-openembedded/blob/2487e65ee3842b6ae0c7a2628985be6189ed9ebf/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb + +Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/4880] + +Signed-off-by: Peter Marko <peter.marko@siemens.com> +--- + lib/template/macros.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/template/macros.c b/lib/template/macros.c +index 54142706c..fcb83637f 100644 +--- a/lib/template/macros.c ++++ b/lib/template/macros.c +@@ -277,12 +277,14 @@ _get_originating_ip_protocol(const LogMessage *msg) + return 0; + if (g_sockaddr_inet_check(msg->saddr)) + return 4; ++#if SYSLOG_NG_ENABLE_IPV6 + if (g_sockaddr_inet6_check(msg->saddr)) + { + if (g_sockaddr_inet6_is_v4_mapped(msg->saddr)) + return 4; + return 6; + } ++#endif + return 0; + } + +-- +2.30.2 + diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch b/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch new file mode 100644 index 0000000000..343e6fdade --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/0001-plugin.c-workaround-powerpc64le-segfaults-error.patch @@ -0,0 +1,46 @@ +From 616446afab61ab98b28c81605e2efd4a689f37d1 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Fri, 20 Jan 2023 14:59:14 +0800 +Subject: [PATCH] plugin.c: workaround powerpc64le segfaults error + +syslog-ng segfaults on powerpc64le, workaround this error. +See https://github.com/syslog-ng/syslog-ng/issues/4285 and +https://sourceware.org/bugzilla/show_bug.cgi?id=30062 for more details. +This patch should be dropped once the above issues are fixed. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + lib/plugin.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/lib/plugin.c b/lib/plugin.c +index fbbfb92..3a03617 100644 +--- a/lib/plugin.c ++++ b/lib/plugin.c +@@ -528,10 +528,7 @@ plugin_discover_candidate_modules(PluginContext *context) + } + } + g_free(module_name); +- if (mod) +- g_module_close(mod); +- else +- mod = NULL; ++ mod = NULL; + } + } + g_dir_close(dir); +@@ -663,8 +660,7 @@ plugin_list_modules(FILE *out, gboolean verbose) + first = FALSE; + } + g_free(module_name); +- if (mod) +- g_module_close(mod); ++ mod = NULL; + } + } + g_dir_close(dir); +-- +2.17.1 + diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch b/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch deleted file mode 100644 index b5bfcd025a..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/0001-syslog-ng-fix-segment-fault-during-service-start.patch +++ /dev/null @@ -1,74 +0,0 @@ -Subject: [PATCH] syslog-ng: fix segment fault during service start on arm64 - -service start failed since segment fault on arch arm64, -syslog-ng have a submodule ivykis, from ivykis V0.42, -it use pthread_atfork, but for arm64, this symbol is -not included by libpthread, so cause segment fault. - -refer systemd, replace pthread_atfork with __register_atfork -to fix this problem. - -I have create an issue, and this proposal to upstream. -https://github.com/buytenh/ivykis/issues/15 - -Upstream-Status: Pending - -Signed-off-by: Changqing Li <changqing.li@windriver.com> - -Update for 3.24.1. -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - lib/ivykis/src/pthr.h | 23 ++++++++++++----------- - 1 file changed, 12 insertions(+), 11 deletions(-) - -diff --git a/lib/ivykis/src/pthr.h b/lib/ivykis/src/pthr.h -index 29e4be7..5d29096 100644 ---- a/lib/ivykis/src/pthr.h -+++ b/lib/ivykis/src/pthr.h -@@ -24,6 +24,16 @@ - #include <pthread.h> - #include <signal.h> - -+#ifdef __GLIBC__ -+/* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc -+ * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against -+ * libpthread, as it is part of glibc anyway. */ -+extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle); -+extern void* __dso_handle __attribute__ ((__weak__)); -+#else -+#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child) -+#endif -+ - #ifdef HAVE_PRAGMA_WEAK - #pragma weak pthread_create - #endif -@@ -36,16 +46,7 @@ static inline int pthreads_available(void) - - #ifdef HAVE_PRAGMA_WEAK - --/* -- * On Linux, pthread_atfork() is defined in libc_nonshared.a (for -- * glibc >= 2.28) or libpthread_nonshared.a (for glibc <= 2.27), and -- * we want to avoid "#pragma weak" for that symbol because that causes -- * it to be undefined even if you link lib*_nonshared.a in explicitly. -- */ --#if !defined(HAVE_LIBC_NONSHARED) && !defined(HAVE_LIBPTHREAD_NONSHARED) --#pragma weak pthread_atfork --#endif -- -+#pragma weak __register_atfork - #pragma weak pthread_create - #pragma weak pthread_detach - #pragma weak pthread_getspecific -@@ -73,7 +74,7 @@ static inline int - pthr_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) - { - if (pthreads_available()) -- return pthread_atfork(prepare, parent, child); -+ return __register_atfork(prepare, parent, child, __dso_handle); - - return ENOSYS; - } --- -2.7.4 - diff --git a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch b/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch deleted file mode 100644 index 4f8a3d0775..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch +++ /dev/null @@ -1,47 +0,0 @@ -configure.ac: add option --enable-thread-tls to manage thread ssl support - -Add option --enable-thread-tls to manage the including of thread -local storage, so we could explicitly disable it. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - configure.ac | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -Index: syslog-ng-3.15.1/configure.ac -=================================================================== ---- syslog-ng-3.15.1.orig/configure.ac -+++ syslog-ng-3.15.1/configure.ac -@@ -190,6 +190,9 @@ AC_ARG_ENABLE(gprof, - AC_ARG_ENABLE(memtrace, - [ --enable-memtrace Enable alternative leak debugging code.]) - -+AC_ARG_ENABLE(thread-tls, -+ [ --enable-thread-tls Enable Thread Local Storage support.],,enable_thread_tls="no") -+ - AC_ARG_ENABLE(dynamic-linking, - [ --enable-dynamic-linking Link everything dynamically.],,enable_dynamic_linking="auto") - -@@ -591,12 +594,14 @@ dnl *************************************************************************** - dnl Is the __thread keyword available? - dnl *************************************************************************** - --AC_LINK_IFELSE([AC_LANG_PROGRAM( --[[#include <pthread.h> --__thread int a; --]], --[a=0;])], --[ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Thread Local Storage is supported by the system")]) -+if test "x$enable_thread_tls" != "xno"; then -+ AC_LINK_IFELSE([AC_LANG_PROGRAM( -+ [[#include <pthread.h> -+ __thread int a; -+ ]], -+ [a=0;])], -+ [ac_cv_have_tls=yes; AC_DEFINE_UNQUOTED(HAVE_THREAD_KEYWORD, 1, "Whether Thread Local Storage is supported by the system")]) -+fi - - dnl *************************************************************************** - dnl How to do static linking? diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch deleted file mode 100644 index 4ad0afa954..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch +++ /dev/null @@ -1,65 +0,0 @@ -Subject: [PATCH] add libnet enable option - -Upstream-Status: Pending - -This would avoid a implicit auto-detecting result. - -Signed-off-by: Ming Liu <ming.liu@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - -Update for 3.24.1. -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - configure.ac | 28 ++++++++++++++++------------ - 1 file changed, 16 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 00eb566..e7d5ac1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -143,6 +143,9 @@ AC_CONFIG_HEADERS(config.h) - dnl *************************************************************************** - dnl Arguments - -+AC_ARG_ENABLE(libnet, -+ [ --enable-libnet Enable libnet support.],, enable_libnet="no") -+ - AC_ARG_WITH(libnet, - [ --with-libnet=path use path to libnet-config script], - , -@@ -1047,19 +1050,20 @@ dnl *************************************************************************** - dnl libnet headers/libraries - dnl *************************************************************************** - AC_MSG_CHECKING(for LIBNET) --if test "x$with_libnet" = "x"; then -- LIBNET_CONFIG="`which libnet-config`" --else -- LIBNET_CONFIG="$with_libnet/libnet-config" --fi -+if test "x$enable_libnet" = xyes; then -+ if test "x$with_libnet" = "x"; then -+ LIBNET_CONFIG="`which libnet-config`" -+ else -+ LIBNET_CONFIG="$with_libnet/libnet-config" -+ fi - --if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -- LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -- LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -- AC_MSG_RESULT(yes) --dnl libnet-config does not provide the _DEFAULT_SOURCE define, that can cause warning during build --dnl as upstream libnet-config does uses _DEFAULT_SOURCE this is just a fix till -- LIBNET_CFLAGS="$LIBNET_CFLAGS -D_DEFAULT_SOURCE" -+ if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then -+ LIBNET_CFLAGS="`$LIBNET_CONFIG --defines`" -+ LIBNET_LIBS="`$LIBNET_CONFIG --libs`" -+ AC_MSG_RESULT(yes) -+ else -+ AC_MSG_ERROR([Could not find libnet, and libnet support was explicitly enabled.]) -+ fi - - else - LIBNET_LIBS= --- -2.7.4 - diff --git a/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch b/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch deleted file mode 100644 index 54ecce57e3..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch +++ /dev/null @@ -1,25 +0,0 @@ -syslog-ng: fix wrong ownership issue - -Upstream-Status: Pending - -The ownership of build user is preserved for some target files, fixed it by -adding --no-same-owner option to tar when extracting files. - -Signed-off-by: Ming Liu <ming.liu@windriver.com> ---- - scl/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: syslog-ng-3.8.1/scl/Makefile.am -=================================================================== ---- syslog-ng-3.8.1.orig/scl/Makefile.am -+++ syslog-ng-3.8.1/scl/Makefile.am -@@ -27,7 +27,7 @@ scl-install-data-local: - fi; \ - done - $(mkinstalldirs) $(DESTDIR)/$(scldir) -- (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf -) -+ (cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner) - chmod -R u+rwX $(DESTDIR)/$(scldir) - - scl-uninstall-local: diff --git a/meta-oe/recipes-support/syslog-ng/files/shebang.patch b/meta-oe/recipes-support/syslog-ng/files/shebang.patch deleted file mode 100644 index 35d967753e..0000000000 --- a/meta-oe/recipes-support/syslog-ng/files/shebang.patch +++ /dev/null @@ -1,18 +0,0 @@ -syslog-ng: change shebang to use python3 - -Correct shebang for python3. This is far from the only python file with an out of date shebang, -but it is the only one that winds up on a target. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - - ---- a/lib/merge-grammar.py -+++ b/lib/merge-grammar.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - ############################################################################# - # Copyright (c) 2010-2017 Balabit - # diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd index 6a86276724..851bf252b7 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd @@ -1,4 +1,4 @@ -@version: 3.24 +@version: 3.36 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit index 32b98610dc..70afd0da84 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit @@ -1,4 +1,4 @@ -@version: 3.24 +@version: 3.36 # # Syslog-ng configuration file, compatible with default Debian syslogd # installation. Originally written by anonymous (I can't find his name) diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 0e1d09492b..c80e91244f 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -1,7 +1,7 @@ Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start successfully,so modify it. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Updated-by: Andrej Valek <andrej.valek@siemens.com> @@ -38,7 +38,7 @@ index 0ccc2b9..7f08c0e 100644 -CONTROL_FILE=/var/run/syslog-ng.ctl -PID_FILE=/var/run/syslog-ng.pid +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist -+CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl ++CONTROL_FILE=@LOCALSTATEDIR@/run/syslog-ng/syslog-ng.ctl +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid OTHER_OPTIONS="--enable-core" -- diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb deleted file mode 100644 index 10bf00fdce..0000000000 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.24.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -require syslog-ng.inc - -# We only want to add stuff we need to the defaults provided in syslog-ng.inc. -# -SRC_URI += " \ - file://fix-config-libnet.patch \ - file://fix-invalid-ownership.patch \ - file://syslog-ng.service-the-syslog-ng-service.patch \ - file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \ - file://shebang.patch \ - file://syslog-ng-tmp.conf \ - " - -SRC_URI[md5sum] = "ef9de066793f7358af7312b964ac0450" -SRC_URI[sha256sum] = "d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d" diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb index 2b38f4d693..4584944150 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb @@ -9,24 +9,30 @@ ideal for firewalled environments. \ " HOMEPAGE = "http://www.balabit.com/network-security/syslog-ng/opensource-logging-system" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec" # util-linux added to get libuuid -DEPENDS = "libpcre flex glib-2.0 openssl util-linux" +DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl" -# We expect the recipe to add anything specific for that version to these defaults. -# SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ file://syslog-ng.conf.systemd \ file://syslog-ng.conf.sysvinit \ file://initscript \ file://volatiles.03_syslog-ng \ - file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \ + file://syslog-ng-tmp.conf \ + file://syslog-ng.service-the-syslog-ng-service.patch \ + file://0001-Fix-buildpaths-warning.patch \ + file://0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch \ " +SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" + +SRC_URI[sha256sum] = "b69e3360dfb96a754a4e1cbead4daef37128b1152a23572356db4ab64a475d4f" UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" +CVE_STATUS[CVE-2022-38725] = "cpe-incorrect: cve-check wrongly matches cpe:2.3:a:oneidentity:syslog-ng:*:*:*:*:premium:*:*:* < 7.0.32" + inherit autotools gettext systemd pkgconfig update-rc.d multilib_header EXTRA_OECONF = " \ @@ -42,12 +48,8 @@ EXTRA_OECONF = " \ --disable-python \ --disable-java --disable-java-modules \ --with-pidfile-dir=${localstatedir}/run/${BPN} \ - ${CONFIG_TLS} \ " -CONFIG_TLS = "--enable-thread-tls" -CONFIG_TLS_arm = "${@oe.utils.conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" - PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ " @@ -55,7 +57,7 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd," PACKAGECONFIG[linux-caps] = "--enable-linux-caps,--disable-linux-caps,libcap," PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi," -PACKAGECONFIG[libnet] = "--enable-libnet --with-libnet=${STAGING_BINDIR_CROSS},--disable-libnet,libnet," +PACKAGECONFIG[spoof-source] = "--enable-spoof-source --with-libnet=${STAGING_BINDIR_CROSS},--disable-spoof-source,libnet," PACKAGECONFIG[http] = "--enable-http,--disable-http,curl," PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp," PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c," @@ -63,7 +65,7 @@ PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wra PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," PACKAGECONFIG[native] = "--enable-native,--disable-native,," -do_configure_prepend() { +do_configure:prepend() { olddir=$(pwd) cd ${AUTOTOOLS_SCRIPT_PATH} @@ -72,7 +74,7 @@ do_configure_prepend() { cd $olddir } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/${BPN} install -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog @@ -86,6 +88,10 @@ do_install_append() { # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run + # it causes install conflict when multilib enabled + # since python support is disabled, not deliver it + rm -f ${D}${bindir}/syslog-ng-update-virtualenv + # support for systemd if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf @@ -107,10 +113,10 @@ do_install_append() { oe_multilib_header syslog-ng/syslog-ng-config.h } -FILES_${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*" -RDEPENDS_${PN} += "gawk ${@bb.utils.contains('PACKAGECONFIG','json','${PN}-jconf','',d)}" +FILES:${PN} += "${datadir}/include/scl/ ${datadir}/xsd ${datadir}/tools ${systemd_unitdir}/system/multi-user.target.wants/*" +RDEPENDS:${PN} += "gawk ${@bb.utils.contains('PACKAGECONFIG','json','${PN}-jconf','',d)}" -FILES_${PN}-jconf += " \ +FILES:${PN}-jconf += " \ ${datadir}/${BPN}/include/scl/cim \ ${datadir}/${BPN}/include/scl/elasticsearch \ ${datadir}/${BPN}/include/scl/ewmm \ @@ -121,23 +127,23 @@ ${datadir}/${BPN}/include/scl/logmatic \ # This overcomes the syslog-ng rdepends on syslog-ng-dev QA Error PACKAGES =+ "${PN}-jconf ${PN}-libs ${PN}-libs-dev" -RPROVIDES_${PN}-dbg += "${PN}-libs-dbg" -FILES_${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" -FILES_${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" -FILES_${PN}-staticdev += "${libdir}/${BPN}/libtest/*.a" -FILES_${PN} += "${systemd_unitdir}/system/*.service" -INSANE_SKIP_${PN}-libs = "dev-so" -RDEPENDS_${PN} += "${PN}-libs" - -CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" - -RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog" -RCONFLICTS_${PN}-libs = "busybox-syslog sysklogd rsyslog" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}@.service" +RPROVIDES:${PN}-dbg += "${PN}-libs-dbg" +FILES:${PN}-libs = "${libdir}/${BPN}/*.so ${libdir}/libsyslog-ng-*.so*" +FILES:${PN}-libs-dev = "${libdir}/${BPN}/lib*.la" +FILES:${PN}-staticdev += "${libdir}/${BPN}/libtest/*.a" +FILES:${PN} += "${systemd_unitdir}/system/*.service" +INSANE_SKIP:${PN}-libs = "dev-so" +RDEPENDS:${PN} += "${PN}-libs" + +CONFFILES:${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" + +RCONFLICTS:${PN} = "busybox-syslog sysklogd rsyslog" +RCONFLICTS:${PN}-libs = "busybox-syslog sysklogd rsyslog" + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "${BPN}@.service" INITSCRIPT_NAME = "syslog" INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 90 0 1 6 ." diff --git a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb b/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb index 1ce3c8e442..db4c395c56 100644 --- a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb +++ b/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "a graphical user interface that allows the user to \ change the default keyboard of the system" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://fedorahosted.org/releases/s/y/${BPN}/${BP}.tar.bz2" SRC_URI[md5sum] = "c267db0ee7a2131ba418399dc17f9e72" @@ -17,11 +17,11 @@ do_install() { oe_runmake 'DESTDIR=${D}' install } -do_install_append_class-native() { +do_install:append:class-native() { rm -rf ${D}/usr } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/python${PYTHON_BASEVERSION}/* \ ${datadir}/* \ " diff --git a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch b/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch new file mode 100644 index 0000000000..640b131703 --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch @@ -0,0 +1,33 @@ +From 7ffc1eba8596544d6e3af0fd5f4004fff6d56f84 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Wed, 29 Nov 2023 15:48:57 +0800 +Subject: [PATCH] hwloc_detection.cmake: remove cross-compiation check + +This check is preventing pkgconfig to +search for hwloc under cross-compilation. + +pkgconfig able to find hwloc pkg from sysroot. + +Upstream-Status: Inappropriate + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + cmake/hwloc_detection.cmake | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/cmake/hwloc_detection.cmake b/cmake/hwloc_detection.cmake +index 47233b17..5a7e84c3 100644 +--- a/cmake/hwloc_detection.cmake ++++ b/cmake/hwloc_detection.cmake +@@ -46,8 +46,6 @@ endforeach() + unset(HWLOC_TARGET_NAME) + + if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND +- # No hwloc auto detection for cross compilation +- NOT CMAKE_CROSSCOMPILING AND + NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH + ) + find_package(PkgConfig QUIET) +-- +2.37.3 + diff --git a/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch b/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch deleted file mode 100644 index 7e66945fa2..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6b2b136caa68912d77ffe26143cd3da768b9ef80 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 3 Jun 2017 08:39:37 -0700 -Subject: [PATCH] mallinfo() is glibc specific API mark it so - -Helps compiling with musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/tbbmalloc/proxy.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/tbbmalloc/proxy.cpp b/src/tbbmalloc/proxy.cpp -index 5ef279d..06c4872 100644 ---- a/src/tbbmalloc/proxy.cpp -+++ b/src/tbbmalloc/proxy.cpp -@@ -185,6 +185,7 @@ int mallopt(int /*param*/, int /*value*/) __THROW - return 1; - } - -+#ifdef __GLIBC__ - struct mallinfo mallinfo() __THROW - { - struct mallinfo m; -@@ -192,6 +193,7 @@ struct mallinfo mallinfo() __THROW - - return m; - } -+#endif - - #if __ANDROID__ - // Android doesn't have malloc_usable_size, provide it to be compatible --- -2.13.0 - diff --git a/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch b/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch deleted file mode 100644 index 6f28f6f3a4..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/GLIBC-PREREQ-is-not-defined-on-musl.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 27956d4c5fb615098231cebfb8eef11057639d3c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Sun, 8 Dec 2019 18:14:38 +0100 -Subject: [PATCH] src/tbbmalloc/proxy.cpp: __GLIBC_PREREQ is not defined on - musl - -Do not call __GLIBC_PREREQ if it is not defined otherwise build will -fail on musl - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> - -Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/203] - -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - src/tbbmalloc/proxy.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/tbbmalloc/proxy.cpp b/src/tbbmalloc/proxy.cpp -index d96ae7a0..709ae839 100644 ---- a/src/tbbmalloc/proxy.cpp -+++ b/src/tbbmalloc/proxy.cpp -@@ -24,7 +24,8 @@ - // of aligned_alloc as required by new C++ standard, this makes it hard to - // redefine aligned_alloc here. However, running on systems with new libc - // version, it still needs it to be redefined, thus tricking system headers --#if defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC -+#if defined(__GLIBC_PREREQ) -+#if !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC - // tell <cstdlib> that there is no aligned_alloc - #undef _GLIBCXX_HAVE_ALIGNED_ALLOC - // trick <stdlib.h> to define another symbol instead -@@ -32,7 +33,8 @@ - // Fix the state and undefine the trick - #include <cstdlib> - #undef aligned_alloc --#endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC -+#endif // defined(__GLIBC_PREREQ) -+#endif // !__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC - #endif // __linux__ && !__ANDROID__ - - #include "proxy.h" diff --git a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch b/meta-oe/recipes-support/tbb/tbb/cross-compile.patch deleted file mode 100644 index 36578543f8..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/cross-compile.patch +++ /dev/null @@ -1,35 +0,0 @@ -Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -Upstream-Status: unsuitable ---- - -diff --git a/build/linux.clang.inc b/build/linux.clang.inc -index fe9b5c98..b0dcd68b 100644 ---- a/build/linux.clang.inc -+++ b/build/linux.clang.inc -@@ -12,8 +12,8 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --CPLUS ?= clang++ --CONLY ?= clang -+CPLUS ?= $(CXX) -+CONLY ?= $(CC) - COMPILE_ONLY = -c -MMD - PREPROC_ONLY = -E -x c++ - INCLUDE_KEY = -I -diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc -index d820c15d..62c76afd 100644 ---- a/build/linux.gcc.inc -+++ b/build/linux.gcc.inc -@@ -12,8 +12,8 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --CPLUS ?= g++ --CONLY ?= gcc -+CPLUS ?= $(CXX) -+CONLY ?= $(CC) - COMPILE_ONLY = -c -MMD - PREPROC_ONLY = -E -x c++ - INCLUDE_KEY = -I diff --git a/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch b/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch deleted file mode 100644 index 91d10cb7ab..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/improve-reproducibility.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f56eeb18a07df139864a99e1967d450cc5c8c0bb Mon Sep 17 00:00:00 2001 -From: Lee Chee Yang <chee.yang.lee@intel.com> -Date: Wed, 30 Sep 2020 16:18:35 +0800 -Subject: [PATCH] improve reproducibility - -remove the WORKDIR info from BUILD_COMMAND to improve reproducibility. -also use SOURCE_DATE_EPOCH as DATETIME wherever possible. - -Upstream-Status: Inappropriate [sed WORKDIR does not applies to upstream] -Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> ---- - build/version_info_linux.sh | 4 +- - 1 file changed, 2 insertion(+), 2 deletion(-) - -diff --git a/build/version_info_linux.sh b/build/version_info_linux.sh -index 793cad11..ed6f4b2a 100644 ---- a/build/version_info_linux.sh -+++ b/build/version_info_linux.sh -@@ -25,6 +25,6 @@ echo '#N": BUILD_GCC'"\t\t"`g++ --version </dev/null 2>&1 | grep 'g++'`'" ENDL \ - echo '#N": BUILD_LIBC'"\t"`getconf GNU_LIBC_VERSION | grep glibc | sed -e 's/^glibc //'`'" ENDL \' - echo '#N": BUILD_LD'"\t\t"`ld -v 2>&1 | grep 'version'`'" ENDL \' - echo '#N": BUILD_TARGET'"\t$arch on $runtime"'" ENDL \' --echo '#N": BUILD_COMMAND'"\t"$*'" ENDL \' -+echo '#N": BUILD_COMMAND'"\t"$(echo $* | sed 's#'$WORKDIR'#/workdir#g')'" ENDL \' - echo "" --echo "#define __TBB_DATETIME \""`date -u`"\"" -+echo "#define __TBB_DATETIME \""`$(date -u -d "@$SOURCE_DATE_EPOCH" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" 2>/dev/null || date -u )`"\"" --- -2.25.1 - diff --git a/meta-oe/recipes-support/tbb/tbb/tbb.pc b/meta-oe/recipes-support/tbb/tbb/tbb.pc deleted file mode 100644 index 4f9da11409..0000000000 --- a/meta-oe/recipes-support/tbb/tbb/tbb.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: Threading Building Blocks -Description: Intel's parallelism library for C++ -URL: https://software.intel.com/en-us/tbb -Version: 2020.2 -Libs: -L${libdir} -ltbb -Cflags: -I${includedir} diff --git a/meta-oe/recipes-support/tbb/tbb_2020.3.bb b/meta-oe/recipes-support/tbb/tbb_2020.3.bb deleted file mode 100644 index 8e0094b318..0000000000 --- a/meta-oe/recipes-support/tbb/tbb_2020.3.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "Parallelism library for C++ - runtime files \ - TBB is a library that helps you leverage multi-core processor \ - performance without having to be a threading expert. It represents a \ - higher-level, task-based parallelism that abstracts platform details \ - and threading mechanism for performance and scalability." -HOMEPAGE = "https://software.intel.com/en-us/tbb" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -BRANCH = "tbb_2020" -SRCREV = "eca91f16d7490a8abfdee652dadf457ec820cc37" -SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ - file://cross-compile.patch \ - file://0001-mallinfo-is-glibc-specific-API-mark-it-so.patch \ - file://GLIBC-PREREQ-is-not-defined-on-musl.patch \ - file://tbb.pc \ - file://improve-reproducibility.patch \ -" - -S = "${WORKDIR}/git" -PE = "1" - -COMPILER ?= "gcc" -COMPILER_toolchain-clang = "clang" - -do_compile() { - oe_runmake compiler=${COMPILER} arch=${HOST_ARCH} -} - -do_install() { - install -d ${D}${includedir} ${D}${libdir} - rm ${S}/include/tbb/index.html -f - cp -R --no-dereference --preserve=mode,links -v ${S}/include/tbb ${D}${includedir} - for f in ${B}/build/linux_*_release/lib*.so* - do - install -Dm 0755 $f ${D}${libdir}/ - done - install -Dm 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig/tbb.pc -} - -# fails with thumb enabled: -# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp -# | {standard input}: Assembler messages: -# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]' -# ... -# | make[1]: *** [concurrent_queue.o] Error 1 -ARM_INSTRUCTION_SET = "arm" diff --git a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb new file mode 100644 index 0000000000..f834726bd6 --- /dev/null +++ b/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb @@ -0,0 +1,62 @@ +DESCRIPTION = "Parallelism library for C++ - runtime files \ + TBB is a library that helps you leverage multi-core processor \ + performance without having to be a threading expert. It represents a \ + higher-level, task-based parallelism that abstracts platform details \ + and threading mechanism for performance and scalability." +HOMEPAGE = "https://software.intel.com/en-us/tbb" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327" + +DEPENDS:append:libc-musl = " libucontext" +DEPENDS:append:class-target = " hwloc" + +PE = "1" + +BRANCH = "onetbb_2021" +SRCREV = "8b829acc65569019edb896c5150d427f288e8aba" +SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ + file://0001-hwloc_detection.cmake-remove-cross-compiation-check.patch \ +" +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +# test build fails, error: 'mallinfo mallinfo()' is deprecated +EXTRA_OECMAKE += " \ + -DTBB_TEST=OFF \ + -DCMAKE_BUILD_TYPE=Release \ + " + +# Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi) +# tmp-glibc/work/riscv64-oe-linux/tbb/1_2021.7.0-r0/recipe-sysroot-native/usr/bin/riscv64-oe-linux/riscv64-oe-linux-ld: /tmp/lto-llvm-264bc2.o: can't link soft-float modules with double-float modules +# tmp-glibc/work/riscv64-oe-linux/tbb/1_2021.7.0-r0/recipe-sysroot-native/usr/bin/riscv64-oe-linux/riscv64-oe-linux-ld: failed to merge target specific data of file /tmp/lto-llvm-264bc2.o +EXTRA_OECMAKE:append:riscv32:toolchain-clang = " -DTBB_ENABLE_IPO=OFF " +EXTRA_OECMAKE:append:riscv64:toolchain-clang = " -DTBB_ENABLE_IPO=OFF " + +# fails with thumb enabled: +# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp +# | {standard input}: Assembler messages: +# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]' +# ... +# | make[1]: *** [concurrent_queue.o] Error 1 +ARM_INSTRUCTION_SET = "arm" + +ASNEEDED = "" + +LDFLAGS:append:mips = " -latomic" +LDFLAGS:append:mipsel = " -latomic" +LDFLAGS:append:riscv32:toolchain-clang = " -latomic" + +LDFLAGS:append:libc-musl = " -lucontext" + +# The latest version of oneTBB does not support PPC +COMPATIBLE_MACHINE:powerpc = "(!.*ppc).*" + + +do_install:append:class-target() { + # fix for qa check buildpaths + sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/TBB/TBBTargets.cmake +} + + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch b/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch deleted file mode 100644 index 547949dd60..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch +++ /dev/null @@ -1,33 +0,0 @@ -From de869ad2cb19d81257a159770ebe27593a71593c Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 31 Jul 2018 11:29:51 +0800 -Subject: [PATCH] do not strip pdata_tools at do_install - -It caused QA Issue: --------------- -|ERROR: QA Issue: File '/usr/sbin/pdata_tools' from thin-provisioning-tools -was already stripped, this will prevent future debugging! [already-stripped] --------------- - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 02b75dd..df590b4 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -267,7 +267,6 @@ MANPAGES:=$(patsubst %,man8/%.8,$(TOOLS)) - install: bin/pdata_tools $(MANPAGES) - $(INSTALL_DIR) $(BINDIR) - $(INSTALL_PROGRAM) bin/pdata_tools $(BINDIR) -- $(STRIP) $(BINDIR)/pdata_tools - ln -s -f pdata_tools $(BINDIR)/cache_check - ln -s -f pdata_tools $(BINDIR)/cache_dump - ln -s -f pdata_tools $(BINDIR)/cache_metadata_size --- -2.7.4 - diff --git a/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch b/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch deleted file mode 100644 index de934c19a8..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/files/use-sh-on-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 38397b42e2c3450c2aee20e6fb92f362db4e35ef Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 2 Jul 2019 13:20:39 +0800 -Subject: [PATCH] thin-provisioning-tools: use sh on path when invoking txt2man - -txt2man contains a test which might try to use ksh to run the script, so we -avoid running /bin/sh. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: joe.slater <joe.slater@windriver.com> - -Rebase to 0.8.5 -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 7c867b2..5303994 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -223,7 +223,7 @@ endif - %.8: %.txt bin/txt2man - @echo " [txt2man] $<" - @mkdir -p $(dir $@) -- $(V) bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ -+ $(V) sh bin/txt2man -p -t $(basename $(notdir $<)) $< > $@ - - #---------------------------------------------------------------- - --- -2.7.4 - diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc new file mode 100644 index 0000000000..d71aa442fa --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc @@ -0,0 +1,214 @@ +# Autogenerated with 'bitbake -c update_crates thin-provisioning-tools' + +# from Cargo.lock +SRC_URI += " \ + crate://crates.io/adler/1.0.2 \ + crate://crates.io/aho-corasick/1.1.2 \ + crate://crates.io/anstyle/1.0.6 \ + crate://crates.io/anyhow/1.0.80 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/base64/0.21.7 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bitflags/2.4.2 \ + crate://crates.io/bytemuck/1.14.3 \ + crate://crates.io/byteorder/1.5.0 \ + crate://crates.io/cassowary/0.3.0 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/clap/4.5.1 \ + crate://crates.io/clap_builder/4.5.1 \ + crate://crates.io/clap_lex/0.7.0 \ + crate://crates.io/console/0.15.8 \ + crate://crates.io/crc32c/0.6.5 \ + crate://crates.io/crc32fast/1.4.0 \ + crate://crates.io/data-encoding/2.5.0 \ + crate://crates.io/downcast/0.11.0 \ + crate://crates.io/duct/0.13.7 \ + crate://crates.io/encode_unicode/0.3.6 \ + crate://crates.io/env_logger/0.8.4 \ + crate://crates.io/errno/0.3.8 \ + crate://crates.io/exitcode/1.1.2 \ + crate://crates.io/fastrand/2.0.1 \ + crate://crates.io/fixedbitset/0.4.2 \ + crate://crates.io/flate2/1.0.28 \ + crate://crates.io/fragile/2.0.0 \ + crate://crates.io/getrandom/0.2.12 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hermit-abi/0.3.6 \ + crate://crates.io/indicatif/0.17.8 \ + crate://crates.io/instant/0.1.12 \ + crate://crates.io/iovec/0.1.4 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/libc/0.2.153 \ + crate://crates.io/linux-raw-sys/0.4.13 \ + crate://crates.io/log/0.4.20 \ + crate://crates.io/memchr/2.7.1 \ + crate://crates.io/minimal-lexical/0.2.1 \ + crate://crates.io/miniz_oxide/0.7.2 \ + crate://crates.io/mockall/0.12.1 \ + crate://crates.io/mockall_derive/0.12.1 \ + crate://crates.io/nom/7.1.3 \ + crate://crates.io/num-derive/0.4.2 \ + crate://crates.io/num-traits/0.2.18 \ + crate://crates.io/num_cpus/1.16.0 \ + crate://crates.io/number_prefix/0.4.0 \ + crate://crates.io/numtoa/0.1.0 \ + crate://crates.io/once_cell/1.19.0 \ + crate://crates.io/os_pipe/1.1.5 \ + crate://crates.io/portable-atomic/1.6.0 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/predicates/3.1.0 \ + crate://crates.io/predicates-core/1.0.6 \ + crate://crates.io/predicates-tree/1.0.9 \ + crate://crates.io/proc-macro2/1.0.78 \ + crate://crates.io/quick-xml/0.31.0 \ + crate://crates.io/quickcheck/1.0.3 \ + crate://crates.io/quickcheck_macros/1.0.0 \ + crate://crates.io/quote/1.0.35 \ + crate://crates.io/rand/0.8.5 \ + crate://crates.io/rand_chacha/0.3.1 \ + crate://crates.io/rand_core/0.6.4 \ + crate://crates.io/rangemap/1.5.0 \ + crate://crates.io/redox_syscall/0.2.16 \ + crate://crates.io/redox_termios/0.1.3 \ + crate://crates.io/regex/1.10.3 \ + crate://crates.io/regex-automata/0.4.5 \ + crate://crates.io/regex-syntax/0.8.2 \ + crate://crates.io/roaring/0.10.3 \ + crate://crates.io/rustc_version/0.4.0 \ + crate://crates.io/rustix/0.38.31 \ + crate://crates.io/safemem/0.3.3 \ + crate://crates.io/semver/1.0.22 \ + crate://crates.io/shared_child/1.0.0 \ + crate://crates.io/strsim/0.11.0 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.50 \ + crate://crates.io/tempfile/3.10.0 \ + crate://crates.io/termion/1.5.6 \ + crate://crates.io/termtree/0.4.1 \ + crate://crates.io/thiserror/1.0.57 \ + crate://crates.io/thiserror-impl/1.0.57 \ + crate://crates.io/threadpool/1.8.1 \ + crate://crates.io/tui/0.19.0 \ + crate://crates.io/unicode-ident/1.0.12 \ + crate://crates.io/unicode-segmentation/1.11.0 \ + crate://crates.io/unicode-width/0.1.11 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows-sys/0.52.0 \ + crate://crates.io/windows-targets/0.52.3 \ + crate://crates.io/windows_aarch64_gnullvm/0.52.3 \ + crate://crates.io/windows_aarch64_msvc/0.52.3 \ + crate://crates.io/windows_i686_gnu/0.52.3 \ + crate://crates.io/windows_i686_msvc/0.52.3 \ + crate://crates.io/windows_x86_64_gnu/0.52.3 \ + crate://crates.io/windows_x86_64_gnullvm/0.52.3 \ + crate://crates.io/windows_x86_64_msvc/0.52.3 \ +" + +SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +SRC_URI[anstyle-1.0.6.sha256sum] = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +SRC_URI[anyhow-1.0.80.sha256sum] = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +SRC_URI[bytemuck-1.14.3.sha256sum] = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[clap-4.5.1.sha256sum] = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +SRC_URI[clap_builder-4.5.1.sha256sum] = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +SRC_URI[clap_lex-0.7.0.sha256sum] = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +SRC_URI[crc32c-0.6.5.sha256sum] = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" +SRC_URI[crc32fast-1.4.0.sha256sum] = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +SRC_URI[duct-0.13.7.sha256sum] = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" +SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" +SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[hermit-abi-0.3.6.sha256sum] = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +SRC_URI[linux-raw-sys-0.4.13.sha256sum] = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +SRC_URI[mockall-0.12.1.sha256sum] = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +SRC_URI[mockall_derive-0.12.1.sha256sum] = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +SRC_URI[num-derive-0.4.2.sha256sum] = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" +SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +SRC_URI[os_pipe-1.1.5.sha256sum] = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +SRC_URI[predicates-3.1.0.sha256sum] = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +SRC_URI[proc-macro2-1.0.78.sha256sum] = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +SRC_URI[quick-xml-0.31.0.sha256sum] = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +SRC_URI[quickcheck_macros-1.0.0.sha256sum] = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" +SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +SRC_URI[rangemap-1.5.0.sha256sum] = "795915a3930a5d6bafd9053d37602fea3e61be2e5d4d788983a8ba9654c1c6f2" +SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" +SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +SRC_URI[roaring-0.10.3.sha256sum] = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" +SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +SRC_URI[semver-1.0.22.sha256sum] = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +SRC_URI[shared_child-1.0.0.sha256sum] = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +SRC_URI[strsim-0.11.0.sha256sum] = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[syn-2.0.50.sha256sum] = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +SRC_URI[tempfile-3.10.0.sha256sum] = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +SRC_URI[thiserror-1.0.57.sha256sum] = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +SRC_URI[thiserror-impl-1.0.57.sha256sum] = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +SRC_URI[tui-0.19.0.sha256sum] = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" +SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +SRC_URI[windows-targets-0.52.3.sha256sum] = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" +SRC_URI[windows_aarch64_gnullvm-0.52.3.sha256sum] = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" +SRC_URI[windows_aarch64_msvc-0.52.3.sha256sum] = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" +SRC_URI[windows_i686_gnu-0.52.3.sha256sum] = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" +SRC_URI[windows_i686_msvc-0.52.3.sha256sum] = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" +SRC_URI[windows_x86_64_gnu-0.52.3.sha256sum] = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" +SRC_URI[windows_x86_64_gnullvm-0.52.3.sha256sum] = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" +SRC_URI[windows_x86_64_msvc-0.52.3.sha256sum] = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc new file mode 100644 index 0000000000..ceea67c364 --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc @@ -0,0 +1,6 @@ +SRC_URI += "\ + git://github.com/jthornber/rio;protocol=https;nobranch=1;name=rio;destsuffix=rio;type=git-dependency \ +" + +SRCREV_FORMAT .= "_rio" +SRCREV_rio = "2979a720f671e836302c01546f9cc9f7988610c8" diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb deleted file mode 100644 index 9f89bac22a..0000000000 --- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.8.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Tools of dm-thin device-mapper" -DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." -HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" -LICENSE = "GPLv3" -SECTION = "devel" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/jthornber/thin-provisioning-tools \ - file://0001-do-not-strip-pdata_tools-at-do_install.patch \ - file://use-sh-on-path.patch \ -" - -SRCREV = "5e5409f48b5403d2c6dffd9919b35ad77d6fb7b4" - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" - -DEPENDS += "expat libaio boost" - -inherit autotools-brokensep diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb new file mode 100644 index 0000000000..09b91f6b37 --- /dev/null +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb @@ -0,0 +1,50 @@ +SUMMARY = "Tools of dm-thin device-mapper" +DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target." +HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools" +LICENSE = "GPL-3.0-only" +SECTION = "devel" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +S = "${WORKDIR}/git" + +SRC_URI = " \ + git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ + " + +SRCREV = "b2d57dad4c3378544d7b36f3fc61e60989c5c092" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + +inherit cargo cargo-update-recipe-crates + +require ${BPN}-crates.inc +require ${BPN}-git-crates.inc + +do_install:append() { + install -d ${D}${sbindir} + mv ${D}${bindir}/pdata_tools ${D}${sbindir}/pdata_tools + rmdir --ignore-fail-on-non-empty ${D}${bindir} + + for tool in cache_check \ + cache_dump \ + cache_metadata_size \ + cache_repair \ + cache_restore \ + cache_writeback \ + thin_check \ + thin_delta \ + thin_dump \ + thin_ls \ + thin_repair \ + thin_restore \ + thin_rmap \ + thin_metadata_size \ + thin_metadata_pack \ + thin_metadata_unpack \ + thin_trim \ + era_check \ + era_dump \ + era_invalidate \ + era_restore; do + ln -sf pdata_tools ${D}${sbindir}/$tool + done +} diff --git a/meta-oe/recipes-support/tio/tio_2.7.bb b/meta-oe/recipes-support/tio/tio_2.7.bb new file mode 100644 index 0000000000..59c772b5d0 --- /dev/null +++ b/meta-oe/recipes-support/tio/tio_2.7.bb @@ -0,0 +1,19 @@ +SUMMARY = "tio - a simple serial device I/O tool" +DESCRIPTION = "tio is a simple serial device tool which features a \ + straightforward command-line and configuration file interface to easily \ + connect to serial TTY devices for basic I/O operations." + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0e1a95b7892d3015ecd6d0016f601f2c" + +SRC_URI = "git://github.com/tio/tio;protocol=https;branch=master" +SRCREV = "1c32555c2a4f26b60f94757656825fc6684d6892" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +DEPENDS += " libinih" +RDEPENDS:${PN} += " libinih" + +FILES:${PN} += " /usr/share/bash-completion/completions/tio " diff --git a/meta-oe/recipes-support/tokyocabinet/tokyocabinet/0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch b/meta-oe/recipes-support/tokyocabinet/tokyocabinet/0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch new file mode 100644 index 0000000000..001fa9dd75 --- /dev/null +++ b/meta-oe/recipes-support/tokyocabinet/tokyocabinet/0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch @@ -0,0 +1,58 @@ +From e192da006dd9b0ecbbef540a3e86b65ff88e89e2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 13:28:29 -0700 +Subject: [PATCH] configure: Fix check functions for AC_CHECK_LIB test + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.in | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/configure.in b/configure.in +index 5b24947..0542490 100644 +--- a/configure.in ++++ b/configure.in +@@ -247,30 +247,30 @@ test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS" + AC_C_BIGENDIAN(MYCPPFLAGS="$MYCPPFLAGS -D_MYBIGEND") + + # Underlying libraries +-AC_CHECK_LIB(c, main) +-AC_CHECK_LIB(m, main) ++AC_CHECK_LIB(c, printf) ++AC_CHECK_LIB(m, pow) + if test "$enable_pthread" != "no" + then +- AC_CHECK_LIB(pthread, main) +- AC_CHECK_LIB(rt, main) ++ AC_CHECK_LIB(pthread, pthread_create) ++ AC_CHECK_LIB(rt, clock_gettime) + fi + if test "$enable_zlib" != "no" + then +- AC_CHECK_LIB(z, main) ++ AC_CHECK_LIB(z, inflate) + fi + if test "$enable_bzip" != "no" + then +- AC_CHECK_LIB(bz2, main) ++ AC_CHECK_LIB(bz2, BZ2_bzCompressInit) + fi + if test "$enable_exlzma" = "yes" + then +- AC_CHECK_LIB(lzma, main) ++ AC_CHECK_LIB(lzma, lzma_easy_buffer_encode) + fi + if test "$enable_exlzo" = "yes" + then +- AC_CHECK_LIB(lzo2, main) ++ AC_CHECK_LIB(lzo2, lzo1x_1_compress) + fi +-AC_CHECK_LIB(tokyocabinet, main, AC_MSG_WARN([old version of Tokyo Cabinet was detected])) ++AC_CHECK_LIB(tokyocabinet, tcbdbopen, AC_MSG_WARN([old version of Tokyo Cabinet was detected])) + + # Necessary headers + AC_CHECK_HEADER(stdlib.h, true, AC_MSG_ERROR([stdlib.h is required])) +-- +2.37.3 + diff --git a/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb b/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb index 9f75cf047d..ae00ff4e55 100644 --- a/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb +++ b/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb @@ -12,11 +12,12 @@ Records are organized in hash table, B+ tree, or fixed-length array." HOMEPAGE = "http://fallabs.com/tokyocabinet/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" SRC_URI = "http://fallabs.com/tokyocabinet/${BP}.tar.gz \ file://remove-hard-coded-include-and-lib-paths.patch \ + file://0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch \ " SRC_URI[md5sum] = "fd03df6965f8f56dd5b8518ca43b4f5e" diff --git a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-oe/recipes-support/toscoterm/toscoterm_git.bb deleted file mode 100644 index aba485e1a4..0000000000 --- a/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A very small and simple terminal emulator" -SECTION = "x11/applications" -DEPENDS = "vte9" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://main.c;start_line=5;end_line=16;md5=9ae4bf20caf291afa94530026bd15229" - -# 0.2 version -SRCREV = "8586d617aed19fc75f5ae1e07270752c1b2f9a30" -SRC_URI = "git://github.com/OSSystems/toscoterm.git" - -S = "${WORKDIR}/git" - -inherit features_check gitpkgv pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -do_compile() { - oe_runmake \ - CC="${CC}" \ - CFLAGS="`pkg-config --cflags vte`${CFLAGS}" \ - LDFLAGS="`pkg-config --libs vte` ${LDFLAGS}" -} - -do_install() { - oe_runmake PREFIX="${prefix}" DESTDIR="${D}" install -} - -RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-ibm437" diff --git a/meta-oe/recipes-support/tree/tree_1.8.0.bb b/meta-oe/recipes-support/tree/tree_2.1.1.bb index 01b1ac384c..0b61149609 100644 --- a/meta-oe/recipes-support/tree/tree_1.8.0.bb +++ b/meta-oe/recipes-support/tree/tree_2.1.1.bb @@ -1,12 +1,11 @@ SUMMARY = "A recursive directory listing command" HOMEPAGE = "http://mama.indstate.edu/users/ice/tree/" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz" -SRC_URI[md5sum] = "715191c7f369be377fc7cc8ce0ccd835" -SRC_URI[sha256sum] = "715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2" +SRC_URI[sha256sum] = "d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5" # tree's default CFLAGS for Linux CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb index 4a595e6432..3e164cc26f 100644 --- a/meta-oe/recipes-support/uchardet/uchardet_0.0.7.bb +++ b/meta-oe/recipes-support/uchardet/uchardet_0.0.8.bb @@ -1,9 +1,8 @@ SUMMARY = "uchardet is an encoding detector library" -LICENSE = "MPLv1.1" +LICENSE = "MPL-1.1" LIC_FILES_CHKSUM = "file://COPYING;md5=6ecda54f6f525388d71d6b3cd92f7474" inherit cmake -SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.7.tar.xz" -SRC_URI[md5sum] = "623406dac5c5ad89e40eedd7f279efae" -SRC_URI[sha256sum] = "3fc79408ae1d84b406922fa9319ce005631c95ca0f34b205fad867e8b30e45b1" +SRC_URI = "https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.8.tar.xz" +SRC_URI[sha256sum] = "e97a60cfc00a1c147a674b097bb1422abd9fa78a2d9ce3f3fdcc2e78a34ac5f0" diff --git a/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch b/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch new file mode 100644 index 0000000000..727c5a32fc --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch @@ -0,0 +1,47 @@ +From b1b58f122a3e05b5689358fdd3203ba110cca567 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Sun, 24 Sep 2023 22:20:42 +0200 +Subject: [PATCH] Reproducibility fix + +This fixes: +WARNING: udisks2-2.10.1-r0 do_package_qa: QA Issue: File /usr/lib/udisks2/modules/libudisks2_btrfs.so in package udisks2 contains reference to TMPDIR +File /usr/lib/udisks2/modules/libudisks2_lvm2.so in package udisks2 contains reference to TMPDIR +File /usr/libexec/udisks2/udisksd in package udisks2 contains reference to TMPDIR [buildpaths] + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + modules/lvm2/Makefile.am | 2 +- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am +index 67b8aa6b3..e4ae462e7 100644 +--- a/modules/lvm2/Makefile.am ++++ b/modules/lvm2/Makefile.am +@@ -16,7 +16,7 @@ CPPFLAGS = \ + -DLVM_HELPER_DIR=\""$(prefix)/lib/udisks2/"\" \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -DUDISKS_COMPILATION \ +- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ ++ -DBUILD_DIR=\"/usr/src/\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ +diff --git a/src/Makefile.am b/src/Makefile.am +index 5a174d1ab..0da3a497b 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -20,7 +20,7 @@ CPPFLAGS = \ + -DUDISKS_MODULE_DIR=\"$(libdir)/udisks2/modules\" \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -DUDISKS_COMPILATION \ +- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ ++ -DBUILD_DIR=\"/usr/src/\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(GLIB_CFLAGS) \ +-- +2.42.0 + diff --git a/meta-oe/recipes-support/udisks/udisks2_git.bb b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb index 196198c52b..cb1cbe670d 100644 --- a/meta-oe/recipes-support/udisks/udisks2_git.bb +++ b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb @@ -1,5 +1,5 @@ SUMMARY = "udisks provides dbus interfaces for disks and storage devices" -LICENSE = "GPLv2+ & LGPLv2+" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" DEPENDS = " \ @@ -15,13 +15,13 @@ DEPENDS = " \ " DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -RDEPENDS_${PN} = "acl" +RDEPENDS:${PN} = "acl" SRC_URI = " \ - git://github.com/storaged-project/udisks.git;branch=master \ + git://github.com/storaged-project/udisks.git;branch=2.10.x-branch;protocol=https \ + file://0001-Makefile.am-Dont-include-buildpath.patch \ " -PV = "2.9.1" -SRCREV = "95444ab6bf2b8d8c205b540dded4029fcb15f91b" +SRCREV = "18c9faf089e306ad6f3f51f5cb887a6b9aa08350" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" @@ -32,16 +32,23 @@ REQUIRED_DISTRO_FEATURES = "polkit" EXTRA_OECONF = "--disable-man --disable-gtk-doc" -do_configure_prepend() { +do_configure:prepend() { # | configure.ac:656: error: required file 'build-aux/config.rpath' not found mkdir -p ${S}/build-aux touch ${S}/build-aux/config.rpath } -FILES_${PN} += " \ +PACKAGECONFIG ?= "" + +PACKAGECONFIG[lvm2] = "--enable-lvm2,--disable-lvm2,lvm2" +PACKAGECONFIG[btrfs] = "--enable-btrfs,--disable-btrfs,,btrfs-tools" +PACKAGECONFIG[lsm] = "--enable-lsm,--disable-lsm,libstoragemgmt" + +FILES:${PN} += " \ ${datadir}/dbus-1/ \ ${datadir}/polkit-1 \ ${datadir}/bash-completion \ + ${datadir}/zsh \ ${libdir}/polkit-1/extensions/*.so \ ${nonarch_base_libdir}/udev/* \ ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ @@ -49,8 +56,8 @@ FILES_${PN} += " \ " PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" -FILES_${PN} += "${nonarch_libdir}/tmpfiles.d" +FILES:${PN}-libs = "${libdir}/lib*${SOLIBS}" +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb b/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb index fb60446cb2..8b334dbdec 100644 --- a/meta-oe/recipes-support/uhubctl/uhubctl_2.2.0.bb +++ b/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb @@ -3,16 +3,16 @@ HOMEPAGE = "https://github.com/mvp/uhubctl" BUGTRACKER = "https://github.com/mvp/uhubctl/issues" DEPENDS = "libusb1" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "5ee8260c71647f687b5e71af11f45244814835d7" -SRC_URI = "git://github.com/mvp/${BPN}" +SRCREV = "20276ad5ced147d018e2b3fccedabd94597aa25e" +SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https" S = "${WORKDIR}/git" # uhubctl gets its program version from "git describe". As we use the source # archive do reduce download size replace the call with our hardcoded version. -do_configure_append() { +do_configure:append() { sed -i "s/^\(GIT_VERSION :=\).*$/\1 ${PV}/g" ${S}/Makefile } diff --git a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch index 0fafc8533e..0e2fb687b6 100644 --- a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch +++ b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch @@ -3,6 +3,8 @@ From: Bian Naimeng <biannm@cn.fujitsu.com> Date: Fri, 26 Jun 2015 12:57:48 +0900 --- +Upstream-Status: Pending + scm/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-oe/recipes-support/uim/uim_1.8.8.bb index 507a341445..e0d9d05dce 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.8.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A multilingual user input method library" HOMEPAGE = "http://uim.freedesktop.org/" -LICENSE = "BSD-3-Clause & LGPLv2+" +LICENSE = "BSD-3-Clause & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" SECTION = "inputmethods" @@ -8,7 +8,7 @@ SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2 file://0001-Fix-to-set-libedit-path-from-configure-option-proper.patch \ file://JMP_BUF_GC_jmp_buf.patch \ " -SRC_URI_append_class-target = "\ +SRC_URI:append:class-target = "\ file://uim-module-manager.patch \ " SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" @@ -17,16 +17,16 @@ SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit" -DEPENDS_append_class-target = " intltool-native gtk+ gtk+3 uim-native takao-fonts" +DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native" -RDEPENDS_uim = "libuim0 libedit" -RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0" -RDEPENDS_uim-anthy_append_libc-glibc = " glibc-utils glibc-gconv-euc-jp" +RDEPENDS:uim = "libuim0 libedit" +RDEPENDS:uim-anthy = "anthy libanthy0" +RDEPENDS:uim-anthy:append:libc-glibc = " glibc-utils glibc-gconv-euc-jp" LEAD_SONAME = "libuim.so.1" -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" inherit features_check autotools pkgconfig gettext qemu gtk-immodules-cache @@ -44,82 +44,85 @@ EXTRA_OECONF += "--disable-emacs \ --without-eb \ " -CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" +CONFIGUREOPTS:remove:class-target = "--disable-silent-rules" # https://github.com/uim/uim/issues/44 PARALLEL_MAKE = "" #Because m4 file's find maxdepth=2, so copy the m4 files of the deep depth. -do_configure_prepend () { +do_configure:prepend () { + rm -rf ${S}/m4.generated/lt*.m4 ${S}/m4.generated/libtool.m4 + rm -rf ${S}/sigscheme/libgcroots/m4/lt*.m4 ${S}/sigscheme/libgcroots/m4/libtool.m4 + rm -rf ${S}/sigscheme/m4/lt*.m4 ${S}/sigscheme/m4/libtool.m4 cp ${S}/sigscheme/m4/* ${S}/m4/ } -do_install_append() { +do_install:append() { rm -rf ${D}/${datadir}/applications } PACKAGES =+ "uim-xim uim-utils uim-skk uim-gtk2.0 uim-gtk3 uim-fep uim-anthy uim-common libuim0 libuim-dev" -FILES_${PN} = "${bindir}/uim-help \ +FILES:${PN} = "${bindir}/uim-help \ ${libdir}/uim/plugin/libuim-* \ ${libdir}/libuim-scm* \ ${libdir}/libgcroots* \ ${libdir}/uim/plugin/libuim-* \ " -FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ +FILES:libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \ ${libdir}/libuim-custom.so.* \ ${datadir}/locale/ja/LC_MESSAGES/uim.mo \ ${datadir}/locale/fr/LC_MESSAGES/uim.mo \ ${datadir}/locale/ko/LC_MESSAGES/uim.mo \ ${libdir}/libuim.so.* \ " -FILES_libuim-dev = "${libdir}/libuim*.a \ +FILES:libuim-dev = "${libdir}/libuim*.a \ ${libdir}/libuim*.la \ ${libdir}/libuim*.so \ ${includedir}/uim \ ${libdir}/pkgconfig/uim.pc \ " -FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ +FILES:uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \ ${datadir}/uim/anthy*.scm \ " -FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" -FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" +FILES:${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" +FILES:${PN}-dev += "${libdir}/uim/plugin/*.la" -FILES_uim-utils = "${bindir}/uim-sh \ +FILES:uim-utils = "${bindir}/uim-sh \ ${bindir}/uim-module-manager \ ${libexecdir}/uim-helper-server \ " -FILES_uim-xim = "${bindir}/uim-xim \ +FILES:uim-xim = "${bindir}/uim-xim \ ${libexecdir}/uim-candwin-*gtk \ ${libexecdir}/uim-candwin-*gtk3 \ ${datadir}/man/man1/uim-xim.1 \ ${sysconfdir}/X11/xinit/xinput.d/uim* \ " -FILES_uim-common = "${datadir}/uim/pixmaps/*.png \ +FILES:uim-common = "${datadir}/uim/pixmaps/*.png \ ${datadir}/uim \ " -FILES_uim-fep = "${bindir}/uim-fep*" +FILES:uim-fep = "${bindir}/uim-fep*" -FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \ +FILES:uim-gtk2.0 = "${libdir}/gtk-2.0 \ ${bindir}/uim-toolbar-gtk \ ${bindir}/uim-toolbar-gtk-systray \ ${bindir}/uim-*-gtk \ ${bindir}/uim-input-pad-ja \ ${libdir}/uim/uim-*-gtk \ " -FILES_uim-gtk3 = "${libdir}/gtk-3.0 \ +FILES:uim-gtk3 = "${libdir}/gtk-3.0 \ ${bindir}/uim-toolbar-gtk3 \ ${bindir}/uim-toolbar-gtk3-systray \ ${bindir}/uim-*-gtk3 \ ${libdir}/uim/uim-*-gtk3 \ " -FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ +FILES:uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ ${datadir}/uim/skk*.scm \ " PACKAGE_WRITE_DEPS += "qemu-native" -pkg_postinst_uim-anthy() { +pkg_postinst:uim-anthy() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim else @@ -127,7 +130,7 @@ pkg_postinst_uim-anthy() { fi } -pkg_prerm_uim-anthy() { +pkg_prerm:uim-anthy() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy else @@ -135,7 +138,7 @@ pkg_prerm_uim-anthy() { fi } -pkg_postinst_uim-skk() { +pkg_postinst:uim-skk() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim else @@ -143,7 +146,7 @@ pkg_postinst_uim-skk() { fi } -pkg_postrm_uim-skk() { +pkg_postrm:uim-skk() { if test -n "$D"; then ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk else diff --git a/meta-oe/recipes-support/unicode-ucd/files/license.html b/meta-oe/recipes-support/unicode-ucd/files/license.html deleted file mode 100644 index a02442ad97..0000000000 --- a/meta-oe/recipes-support/unicode-ucd/files/license.html +++ /dev/null @@ -1,98 +0,0 @@ -<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html> - - - -<head> - -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<meta http-equiv="Content-Language" content="en-us"> -<meta name="VI60_defaultClientScript" content="JavaScript"> -<meta name="GENERATOR" content="Microsoft FrontPage 12.0"> -<meta name="keywords" content="Unicode Standard, copyright"> -<meta name="ProgId" content="FrontPage.Editor.Document"> -<title>Unicode License Agreement</title> -<link rel="stylesheet" type="text/css" - -href="http://www.unicode.org/webscripts/standard_styles.css"> - -<style type="text/css"> -pre { - FONT-FAMILY: Arial, Geneva, sans-serif; -} -</style> - - -</head> - - -<body text="#330000"> - - <table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> - - <!-- BEGIN CONTENTS --> - - <td> - - -<blockquote> -<h2><a name="License">UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE</a></h2> - -<pre> -See <a href="https://www.unicode.org/copyright.html">Terms of Use</a> for definitions of Unicode Inc.'s -Data Files and Software. - -NOTICE TO USER: Carefully read the following legal agreement. -BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S -DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), -YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE -TERMS AND CONDITIONS OF THIS AGREEMENT. -IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE -THE DATA FILES OR SOFTWARE. - -COPYRIGHT AND PERMISSION NOTICE - -Copyright © 1991-2019 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in https://www.unicode.org/copyright.html. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Unicode data files and any associated documentation -(the "Data Files") or Unicode software and any associated documentation -(the "Software") to deal in the Data Files or Software -without restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, and/or sell copies of -the Data Files or Software, and to permit persons to whom the Data Files -or Software are furnished to do so, provided that either -(a) this copyright and permission notice appear with all copies -of the Data Files or Software, or -(b) this copyright and permission notice appear in associated -Documentation. - -THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT OF THIRD PARTY RIGHTS. -IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS -NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL -DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THE DATA FILES OR SOFTWARE. - -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, -use or other dealings in these Data Files or Software without prior -written authorization of the copyright holder. -</pre> - -</blockquote> - - - - </td> - - </tr> - - </table> -</body> -</html> diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb deleted file mode 100644 index b29bb784e4..0000000000 --- a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Unicode Character Database" -HOMEPAGE = "https://unicode.org/ucd/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../license.html;beginline=42;endline=85;md5=ddcaebcc17ab633995f12c383599f377" - -SRC_URI = " \ - https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd \ - file://license.html \ -" -SRC_URI[ucd.md5sum] = "430cbdac2615451571dd69a976dd08f6" -SRC_URI[ucd.sha256sum] = "25ba51a0d4c6fa41047b7a5e5733068d4a734588f055f61e85f450097834a0a6" - -inherit allarch - -do_configure[noexec] = "1" - -do_install() { - install -d ${D}${datadir}/unicode - cp -rf ${WORKDIR}/ucd ${D}${datadir}/unicode -} - -FILES_${PN} = "${datadir}/unicode/ucd" diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb new file mode 100644 index 0000000000..7970cd953f --- /dev/null +++ b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Unicode Character Database" +HOMEPAGE = "https://unicode.org/ucd/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f" + +SRC_URI = " \ + https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ + https://www.unicode.org/license.txt;name=ucd-license \ +" +SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600" +SRC_URI[ucd-license.sha256sum] = "f7830d126f59d83842565d3dddedc79db4ca978ed52aee0ebcc040ea76a85519" + +inherit allarch + +do_configure[noexec] = "1" + +do_install() { + install -d ${D}${datadir}/unicode + cp -rf ${WORKDIR}/ucd ${D}${datadir}/unicode +} + +FILES:${PN} = "${datadir}/unicode/ucd" diff --git a/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch b/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch new file mode 100644 index 0000000000..c763a9feb6 --- /dev/null +++ b/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch @@ -0,0 +1,54 @@ +From e886222c70d4b251f0785f670477b7aee938e5af Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Wed, 21 Feb 2024 13:55:41 +0800 +Subject: [PATCH] exe/Makefile.am: add CROSS_LAUNCHER to run odbc_config + +In case of cross compilation, the odbc_config cannot run, the error message +would be like below: + + /bin/bash: line 1: ../exe/odbc_config: cannot execute binary file: Exec format error + +Add CROSS_LAUNCHER to allow the possibility of running odbc_config correctly in +case of cross compilation. + +For example, here's a possible value for it (Yocto project environment, aarch64 target). + export CROSS_LAUNCHER="PSEUDO_UNLOAD=1 qemu-aarch64 -r 5.15 \ + -L /PATH/TO/unixodbc/2.3.11/recipe-sysroot \ + -E LD_LIBRARY_PATH=/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib:/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib " + +Other projects can use the launcher they like to allow correct generation of +the odbc.pc file in cross compilation environment. + +Upstream-Status: Submitted [Personal Email, nick.gorham@easysoft.com] + +As said in the official website, https://www.unixodbc.org/, the way to report bug and send +out patch is via personal email. So there's a public link above. + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + exe/Makefile.am | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/exe/Makefile.am b/exe/Makefile.am +index 03f3d5a..5f33cf2 100644 +--- a/exe/Makefile.am ++++ b/exe/Makefile.am +@@ -59,11 +59,13 @@ slencheck_SOURCES = slencheck.c + dltest_DEPENDENCIES = $(LTDLDEPS) + dltest_LDADD = $(LIBLTDL) + ++CROSS_LAUNCHER ?= "" ++ + all-am: +- @sed "s![@]ODBC_ULEN[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ ++ @sed "s![@]ODBC_ULEN[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ + $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp + @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc +- @sed "s![@]ODBC_CFLAGS[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ ++ @sed "s![@]ODBC_CFLAGS[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ + $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp + @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc + +-- +2.34.1 + diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb new file mode 100644 index 0000000000..7819387c39 --- /dev/null +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb @@ -0,0 +1,48 @@ +SUMMARY = "An Open Source ODBC sub-system" +DESCRIPTION = "unixODBC is an Open Source ODBC sub-system and an ODBC SDK \ +for Linux, Mac OSX, and UNIX." + +HOMEPAGE = "http://www.unixodbc.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d7b37bf80a3df5a65b355433ae36d206" + +DEPENDS = "libtool readline" + +SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ + file://do-not-use-libltdl-source-directory.patch \ + file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ +" +SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" + +UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" + +inherit autotools-brokensep multilib_header qemu + +S = "${WORKDIR}/unixODBC-${PV}" + +EXTRA_OEMAKE += "LIBS=-lltdl" +EXTRA_OECONF += "--enable-utf8ini" +DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" +QEMU_WRAPPER = "${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" + +do_configure:prepend() { + # old m4 files will cause libtool version don't match + rm -rf m4/* + rm -fr libltdl +} + +do_compile:prepend() { + if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then + export CROSS_LAUNCHER="${QEMU_WRAPPER} " + fi +} + +do_install:prepend() { + if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then + export CROSS_LAUNCHER="${QEMU_WRAPPER} " + fi +} + +do_install:append() { + oe_multilib_header unixodbc.h unixODBC/unixodbc_conf.h +} diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb deleted file mode 100644 index 61378fec29..0000000000 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "An Open Source ODBC sub-system" -DESCRIPTION = "unixODBC is an Open Source ODBC sub-system and an ODBC SDK \ -for Linux, Mac OSX, and UNIX." - -HOMEPAGE = "http://www.unixodbc.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7b37bf80a3df5a65b355433ae36d206" - -DEPENDS = "libtool readline" - -SRC_URI = "http://ftp.unixodbc.org/unixODBC-${PV}.tar.gz \ - file://do-not-use-libltdl-source-directory.patch \ -" -SRC_URI[md5sum] = "274a711b0c77394e052db6493840c6f9" -SRC_URI[sha256sum] = "45f169ba1f454a72b8fcbb82abd832630a3bf93baa84731cf2949f449e1e3e77" - -UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" - -inherit autotools-brokensep - -S = "${WORKDIR}/unixODBC-${PV}" - -EXTRA_OEMAKE += "LIBS=-lltdl" - -do_configure_prepend() { - # old m4 files will cause libtool version don't match - rm -rf m4/* - rm -fr libltdl -} diff --git a/meta-oe/recipes-support/upower/upower_0.99.11.bb b/meta-oe/recipes-support/upower/upower_0.99.11.bb deleted file mode 100644 index d6c89a65d0..0000000000 --- a/meta-oe/recipes-support/upower/upower_0.99.11.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics. " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" - -DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib" - -SRC_URI = " \ - http://upower.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ -" -SRC_URI[md5sum] = "abe6acb617f11f2e8dbd9846fcf86e24" -SRC_URI[sha256sum] = "64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef" - -inherit autotools pkgconfig gettext gobject-introspection systemd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" -PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-systemdsystemunitdir=${systemd_system_unitdir}, \ - --without-systemdutildir --without-systemdsystemunitdir,systemd" - -EXTRA_OECONF = " --with-backend=linux" - -SYSTEMD_SERVICE_${PN} = "upower.service" -# don't start on boot by default - dbus does that on demand -SYSTEMD_AUTO_ENABLE = "disable" - -do_configure_prepend() { - sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am - sed -i -e 's: doc : :g' ${S}/Makefile.am -} - -RDEPENDS_${PN} += "dbus" -RRECOMMENDS_${PN} += "pm-utils" -FILES_${PN} += "${datadir}/dbus-1/ \ - ${base_libdir}/udev/* \ -" diff --git a/meta-oe/recipes-support/upower/upower_0.99.17.bb b/meta-oe/recipes-support/upower/upower_0.99.17.bb new file mode 100644 index 0000000000..0572cc801b --- /dev/null +++ b/meta-oe/recipes-support/upower/upower_0.99.17.bb @@ -0,0 +1,44 @@ +SUMMARY = "UPower is an abstraction for enumerating power devices" +DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics." +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" + +DEPENDS = " \ + intltool-native \ + libusb1 \ + libgudev \ + glib-2.0 \ + dbus-glib \ +" + +SRC_URI = "git://gitlab.freedesktop.org/upower/upower.git;protocol=https;branch=master" +SRCREV = "c889154ec8e3e2239db9260d48b2e198d72ba002" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "UPOWER_(?P<pver>\d+(\_\d+)+)" + +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" +GTKDOC_MESON_OPTION = "gtk-doc" + +inherit meson pkgconfig gtk-doc gettext gobject-introspection systemd + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[idevice] = "-Didevice=enabled,-Didevice=disabled,libimobiledevice libplist" +PACKAGECONFIG[systemd] = "-Dsystemdsystemunitdir=${systemd_system_unitdir},-Dsystemdsystemunitdir=no -Dudevrulesdir=${base_libdir}/udev/rules.d,systemd" + +EXTRA_OEMESON = " \ + -Dos_backend=linux \ + -Dman=false \ +" + +SYSTEMD_SERVICE:${PN} = "upower.service" +# don't start on boot by default - dbus does that on demand +SYSTEMD_AUTO_ENABLE = "disable" + +RDEPENDS:${PN} += "dbus" +RRECOMMENDS:${PN} += "pm-utils" +FILES:${PN} += " \ + ${datadir}/dbus-1/ \ + ${base_libdir}/udev/* \ +" diff --git a/meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb b/meta-oe/recipes-support/uriparser/uriparser_0.9.7.bb index d02cf5de8e..421263e62b 100644 --- a/meta-oe/recipes-support/uriparser/uriparser_0.9.4.bb +++ b/meta-oe/recipes-support/uriparser/uriparser_0.9.7.bb @@ -5,11 +5,11 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" -SRC_URI[sha256sum] = "095e8a358a9ccbbef9d1f10d40495ca0fcb3d4490a948ba6449b213a66e08ef0" +SRC_URI[sha256sum] = "11553b2abd2b5728a6c88e35ab08e807d0a0f23c44920df937778ce8cc4d40ff" -UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" +inherit cmake github-releases -inherit cmake +UPSTREAM_CHECK_REGEX = "releases/tag/${BPN}-(?P<pver>\d+(\.\d+)+)" EXTRA_OECMAKE += "-DURIPARSER_BUILD_DOCS:BOOL=OFF -DURIPARSER_BUILD_TESTS:BOOL=OFF" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb index 938c0f9c26..351fe44d70 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb @@ -1,5 +1,5 @@ SUMMARY = "Data files for usbmodeswitch" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit allarch @@ -11,9 +11,9 @@ SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17" SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9" do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} RULESDIR=${D}/${nonarch_base_libdir}/udev/rules.d } -RDEPENDS_${PN} = "usb-modeswitch (>= 2.4.0)" -FILES_${PN} += "${base_libdir}/udev/rules.d/ \ +RDEPENDS:${PN} = "usb-modeswitch (>= 2.4.0)" +FILES:${PN} += "${nonarch_base_libdir}/udev/rules.d/ \ ${datadir}/usb_modeswitch" diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb index baad340908..cd3840feab 100644 --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb @@ -1,25 +1,29 @@ SUMMARY = "A mode switching tool for controlling 'flip flop' (multiple device) USB gear" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=091556bd6d0154cd4c2d17a1bfc7380a" DEPENDS = "libusb1" SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" -SRC_URI[md5sum] = "be73dcc84025794081a1d4d4e5a75e4c" -SRC_URI[sha256sum] = "c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3" +SRC_URI[sha256sum] = "5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34" inherit pkgconfig systemd -SYSTEMD_SERVICE_${PN} = "usb_modeswitch@.service" +SYSTEMD_SERVICE:${PN} = "usb_modeswitch@.service" EXTRA_OEMAKE = "TCL=${bindir}/tclsh" -FILES_${PN} = "${bindir} ${sysconfdir} ${nonarch_base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch" -RDEPENDS_${PN} = "tcl" -RRECOMMENDS_${PN} = "usb-modeswitch-data" +FILES:${PN} = " \ + ${bindir} \ + ${sysconfdir} \ + ${nonarch_base_libdir}/udev/usb_modeswitch \ + ${sbindir} ${localstatedir}/lib/usb_modeswitch \ +" +RDEPENDS:${PN} = "tcl" +RRECOMMENDS:${PN} = "usb-modeswitch-data" do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} UDEVDIR=${D}/${nonarch_base_libdir}/udev install if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system diff --git a/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb b/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb new file mode 100644 index 0000000000..b0dd72fb25 --- /dev/null +++ b/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb @@ -0,0 +1,18 @@ +SUMMARY = "usb device database." +HOMEPAGE = "https://github.com/usbids/usbids" + +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https" + +SRCREV = "7963233faf69eb9c80ffca8dfc1f31940f75999f" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${datadir} + install -m0644 ${S}/usb.ids ${D}${datadir} +} + +FILES:${PN} = "${datadir}" diff --git a/meta-oe/recipes-support/uthash/uthash_2.1.0.bb b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb index 09cef44a85..ef15613586 100644 --- a/meta-oe/recipes-support/uthash/uthash_2.1.0.bb +++ b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb @@ -8,11 +8,11 @@ DESCRIPTION = " uthash-dev provides a hash table implementation using C preproce HOMEPAGE = "https://troydhanson.github.io/uthash/" SECTION = "base" LICENSE = "BSD-1-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a2513f7d2291df840527b76b2a8f9718" -SRCREV = "8b214aefcb81df86a7e5e0d4fa20e59a6c18bc02" +LIC_FILES_CHKSUM = "file://LICENSE;md5=736712b5904dd42f8678df7172bc5f2b" +SRCREV = "e493aa90a2833b4655927598f169c31cfcdf7861" SRC_URI = "\ - git://github.com/troydhanson/${BPN}.git \ + git://github.com/troydhanson/${BPN}.git;branch=master;protocol=https \ file://run-ptest \ " @@ -40,7 +40,7 @@ do_install_ptest() { # The main package is empty and non-existent, so -dev # should not depend on it... -RDEPENDS_${PN}-dev = "" -RDEPENDS_${PN}-ptest_remove = "${PN}" +RDEPENDS:${PN}-dev = "" +RDEPENDS:${PN}-ptest:remove = "${PN}" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb index a5a881d1fe..bd69dbb11c 100644 --- a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb @@ -2,17 +2,17 @@ SUMMARY = "Kernel evdev device emulation" DESCRIPTION = "The evemu library and tools are used to describe devices, record data, create devices and replay data from kernel evdev devices. " HOMEPAGE = "http://bitmath.org/code/evemu/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" inherit autotools -SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http \ +SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http;branch=master \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24" -PV = "1.0.6+git${SRCPV}" +PV = "1.0.6+git" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch b/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch index f3c8eeb418..f0860fcd90 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch +++ b/meta-oe/recipes-support/utouch/utouch-frame/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch @@ -9,6 +9,8 @@ error: field has incomplete Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + tools/utouch-frame-test-mtdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb index ca74d911f8..ddd27a7e30 100644 --- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -2,20 +2,20 @@ SUMMARY = "Touch Frame Library" DESCRIPTION = "The frame library and tools are used to handle touch frames, i.e., collections of tracked contacts. Bindings for mtdev and XI2.1." HOMEPAGE = "http://bitmath.org/code/frame/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" DEPENDS += "mtdev utouch-evemu" inherit autotools pkgconfig -SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \ +SRC_URI = "git://bitmath.org/git/frame.git;protocol=http;branch=master \ file://remove-man-page-creation.patch \ file://0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ " SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" -PV = "1.1.2+git${SRCPV}" +PV = "1.1.2+git" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index 04d1f3fc7f..d964d7f263 100644 --- a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -2,18 +2,18 @@ SUMMARY = "Multitouch viewer" DESCRIPTION = "mtview is a small X application that shows a graphical view of your MT-enabled hardware. It uses mtdev." HOMEPAGE = "http://bitmath.org/code/mtview/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4c61b8950dc1aab4d2aa7c2ae6b1cfb3" inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "git://bitmath.org/git/mtview.git;protocol=http" +SRC_URI = "git://bitmath.org/git/mtview.git;protocol=http;branch=master" SRCREV = "ad437c38dc111cf3990a03abf14efe1b5d89604b" DEPENDS += "mtdev utouch-frame utouch-evemu libx11" -PV = "1.1.7+git${SRCPV}" +PV = "1.1.7+git" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils index 495601f08f..5982e2d08c 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils @@ -13,7 +13,7 @@ INCLUDES = -I. -I../vboxsf -I../vboxsf/include MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \ -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DIN_MODULE -DIN_GUEST_R0 -CFLAGS = ${INCLUDES} ${MOD_DEFS} +CFLAGS = ${INCLUDES} ${MOD_DEFS} ${EXTRA_CFLAGS} LDFLAGS = SRCS = mount.vboxsf.c \ diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb index 35dc4953bb..208b1bb6e5 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb @@ -1,7 +1,7 @@ SUMMARY = "VirtualBox Linux Guest Drivers" SECTION = "core" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e" DEPENDS = "virtual/kernel" @@ -14,21 +14,22 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ " -SRC_URI[md5sum] = "6e4313df24fd00b0dc0437c3746b940d" -SRC_URI[sha256sum] = "91fa05bcfce36316ca93e3927c9550ea66286fff4c5bec900b753fca278ce1a0" + +SRC_URI[sha256sum] = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9" S ?= "${WORKDIR}/vbox_module" -S_task-patch = "${WORKDIR}/${VBOX_NAME}" +S:task-patch = "${WORKDIR}/${VBOX_NAME}" -export BUILD_TARGET_ARCH="${ARCH}" -export BUILD_TARGET_ARCH_x86-64="amd64" +export VBOX_KBUILD_TARGET_ARCH="${ARCH}" +export VBOX_KBUILD_TARGET_ARCH:x86-64="amd64" -EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" +EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1 CC='${CC} ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}'" # otherwise 5.2.22 builds just vboxguest MAKE_TARGETS = "all" addtask export_sources after do_patch before do_configure +do_export_sources[depends] += "virtual/kernel:do_shared_workdir" do_export_sources() { mkdir -p "${S}" @@ -41,9 +42,17 @@ do_export_sources() { install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils install ${S}/../Makefile.utils ${S}/utils/Makefile + # some kernel versions have issues with stdarg.h and compatibility with + # the sysroot and libc-headers/uapi. If we include the file directly from + # the kernel source (STAGING_KERNEL_DIR) we get conflicting types on many + # structures, due to kernel .h files being found before libc .h files. + # if we grab just this one file from the source, and put it into our + # file structure, everything holds together + mkdir -p ${S}/vboxsf/include/linux + install ${STAGING_KERNEL_DIR}/include/linux/stdarg.h ${S}/vboxsf/include/linux } -do_configure_prepend() { +do_configure:prepend() { # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in <version>/build, or the variable KERN_VER must be set. Stop. mkdir -p ${WORKDIR}/${KERNEL_VERSION} @@ -53,7 +62,7 @@ do_configure_prepend() { # compile and install mount utility do_compile() { oe_runmake all - oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils + oe_runmake 'LD=${CC}' 'EXTRA_CFLAGS=-I${STAGING_KERNEL_BUILDDIR}/include/' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then echo "ERROR: One of vbox*.ko modules wasn't built" exit 1 @@ -68,15 +77,15 @@ module_do_install() { install -m 644 vboxvideo.ko $MODULE_DIR } -do_install_append() { +do_install:append() { install -d ${D}${base_sbindir} install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} } PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" -RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" +RRECOMMENDS:${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" -FILES_${PN} = "${base_sbindir}" +FILES:${PN} = "${base_sbindir}" # autoload if installed KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch new file mode 100644 index 0000000000..06030c047c --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch @@ -0,0 +1,29 @@ +From e68e87c14243b1c8707c56883a53e841310974a1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 27 Oct 2015 16:02:19 +0200 +Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained + from pkg-config with PKG_CONFIG_SYSROOT_DIR + +See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for +reasons why this is not approproiate for upstream submission. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/cmake/FindGI.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Source/cmake/FindGI.cmake b/Source/cmake/FindGI.cmake +index fdc56b21..d42eca52 100644 +--- a/Source/cmake/FindGI.cmake ++++ b/Source/cmake/FindGI.cmake +@@ -72,6 +72,9 @@ if (PKG_CONFIG_FOUND) + endif () + endif () + ++set(_GI_SCANNER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_SCANNER_EXE}") ++set(_GI_COMPILER_EXE "$ENV{PKG_CONFIG_SYSROOT_DIR}${_GI_COMPILER_EXE}") ++ + find_program(GI_SCANNER_EXE NAMES ${_GI_SCANNER_EXE} g-ir-scanner) + find_program(GI_COMPILER_EXE NAMES ${_GI_COMPILER_EXE} g-ir-compiler) + diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch new file mode 100644 index 0000000000..e6a43c2fff --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch @@ -0,0 +1,35 @@ +From fb81a5de7798eb7f68e0de1c281671553e1aa19d Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@redhat.com> +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?= + =?UTF-8?q?=E2=80=98t6=E2=80=99=20was=20not=20declared=20in=20this=20scope?= + =?UTF-8?q?=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 75cecbbd..b1020ea4 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch new file mode 100644 index 0000000000..b2e40a88c8 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch @@ -0,0 +1,65 @@ +From 1523e00a2a76e285262c8aa3721b5d99f3f2d612 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt <thomas.devoogdt@barco.com> +Date: Mon, 16 Jan 2023 17:03:30 +0100 +Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix + + !ENABLE(WEBASSEMBLY_B3JIT) + +https://bugs.webkit.org/show_bug.cgi?id=250681 + +Reviewed by NOBODY (OOPS!). + +WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT). +Also, toB3Type and simdScalarType are not defined if it is included. + +Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com> + +Upstream-Status: Inappropriate [https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2008798] +--- + Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp +index eaaa3749..1d089783 100644 +--- a/Source/JavaScriptCore/b3/B3Validate.cpp ++++ b/Source/JavaScriptCore/b3/B3Validate.cpp +@@ -47,6 +47,12 @@ + #include <wtf/StringPrintStream.h> + #include <wtf/text/CString.h> + ++#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT) ++#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type)) ++#else ++#define simdScalarTypeToB3Type(type) B3::Type() ++#endif ++ + namespace JSC { namespace B3 { + + namespace { +@@ -454,7 +460,7 @@ public: + case VectorExtractLane: + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); + VALIDATE(value->numChildren() == 1, ("At ", *value)); +- VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + VALIDATE(value->child(0)->type() == V128, ("At ", *value)); + break; + case VectorReplaceLane: +@@ -462,7 +468,7 @@ public: + VALIDATE(value->numChildren() == 2, ("At ", *value)); + VALIDATE(value->type() == V128, ("At ", *value)); + VALIDATE(value->child(0)->type() == V128, ("At ", *value)); +- VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + break; + case VectorDupElement: + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); +@@ -484,7 +490,7 @@ public: + VALIDATE(!value->kind().hasExtraBits(), ("At ", *value)); + VALIDATE(value->numChildren() == 1, ("At ", *value)); + VALIDATE(value->type() == V128, ("At ", *value)); +- VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value)); ++ VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value)); + break; + + case VectorPopcnt: diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch new file mode 100644 index 0000000000..37bc6538c3 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch @@ -0,0 +1,30 @@ +From c50f2277509f2e6f087cda2eaf323eaf569aad8d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Sep 2023 12:42:06 -0700 +Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL + +This causes clang-17 to crash see [1] +this code is new in webkit 2.42[2] thats why we do not see the crash in older webkit + +[1] https://github.com/llvm/llvm-project/issues/67767 +[2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/WTF/wtf/Compiler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h +index 449ca502..daac29d7 100644 +--- a/Source/WTF/wtf/Compiler.h ++++ b/Source/WTF/wtf/Compiler.h +@@ -321,7 +321,7 @@ + /* MUST_TAIL_CALL */ + + #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) +-#if __has_cpp_attribute(clang::musttail) ++#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) + #define MUST_TAIL_CALL [[clang::musttail]] + #endif + #endif diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch new file mode 100644 index 0000000000..0a5720c99e --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/reproducibility.patch @@ -0,0 +1,30 @@ +From 7336dfd02c20ec9b2a984e1e42d17201af55c8f5 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.purdie@linuxfoundation.org> +Date: Thu, 27 Jul 2023 22:09:06 +0200 +Subject: [PATCH] webkitgtk3: add recipe + +Injection a year based on the current date isn't reproducible. Hack this +to a specific year for now for reproducibilty and to avoid autobuilder failures. + +The correct fix would be to use SOURCE_DATE_EPOCH from the environment and +then this could be submitted upstream, sadly my ruby isn't up to that. + +Upstream-Status: Pending [could be reworked] +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +--- + Source/JavaScriptCore/generator/GeneratedFile.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/generator/GeneratedFile.rb b/Source/JavaScriptCore/generator/GeneratedFile.rb +index 6ed2b6e4..86a28286 100644 +--- a/Source/JavaScriptCore/generator/GeneratedFile.rb ++++ b/Source/JavaScriptCore/generator/GeneratedFile.rb +@@ -25,7 +25,7 @@ require 'date' + require 'digest' + + $LICENSE = <<-EOF +-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved. ++Copyright (C) 2021 Apple Inc. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.1.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.1.bb new file mode 100644 index 0000000000..fc96d5dc3b --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.1.bb @@ -0,0 +1,188 @@ +SUMMARY = "WebKit web rendering engine for the GTK+ platform" +HOMEPAGE = "https://www.webkitgtk.org/" +BUGTRACKER = "https://bugs.webkit.org/" + +LICENSE = "BSD-2-Clause & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ + file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ + file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ + file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 \ + " + +SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ + file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ + file://reproducibility.patch \ + file://no-musttail-arm.patch \ + file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ + file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ + " +SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561" + +inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen + +S = "${WORKDIR}/webkitgtk-${PV}" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" + +CVE_PRODUCT = "webkitgtk webkitgtk\+" + +DEPENDS += " \ + ruby-native \ + gperf-native \ + unifdef-native \ + cairo \ + harfbuzz \ + jpeg \ + atk \ + libwebp \ + gtk+3 \ + libxslt \ + libtasn1 \ + libnotify \ + gstreamer1.0 \ + gstreamer1.0-plugins-base \ + glib-2.0-native \ + gettext-native \ + " + +PACKAGECONFIG_SOUP ?= "soup3" +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl-or-es', '', d)} \ + enchant \ + libsecret \ + ${PACKAGECONFIG_SOUP} \ + " + +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native" +PACKAGECONFIG[angle] = "-DUSE_ANGLE_WEBGL=ON,-DUSE_ANGLE_WEBGL=OFF" +PACKAGECONFIG[x11] = "-DENABLE_X11_TARGET=ON,-DENABLE_X11_TARGET=OFF,virtual/libx11 libxcomposite libxdamage libxrender libxt" +PACKAGECONFIG[geoclue] = "-DENABLE_GEOLOCATION=ON,-DENABLE_GEOLOCATION=OFF,geoclue" +PACKAGECONFIG[enchant] = "-DENABLE_SPELLCHECK=ON,-DENABLE_SPELLCHECK=OFF,enchant2" +PACKAGECONFIG[gles2] = "-DENABLE_GLES2=ON,-DENABLE_GLES2=OFF,virtual/libgles2" +PACKAGECONFIG[jpegxl] = " -DUSE_JPEGXL=ON,-DUSE_JPEGXL=OFF,libjxl" +PACKAGECONFIG[webgl] = "-DENABLE_WEBGL=ON,-DENABLE_WEBGL=OFF,virtual/egl" +PACKAGECONFIG[opengl] = "-DENABLE_GRAPHICS_CONTEXT_GL=ON,-DENABLE_GRAPHICS_CONTEXT_GL=OFF,virtual/egl" +PACKAGECONFIG[opengl-or-es] = "-DUSE_OPENGL_OR_ES=ON,-DUSE_OPENGL_OR_ES=OFF" +PACKAGECONFIG[libsecret] = "-DUSE_LIBSECRET=ON,-DUSE_LIBSECRET=OFF,libsecret" +PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen" +PACKAGECONFIG[woff2] = "-DUSE_WOFF2=ON,-DUSE_WOFF2=OFF,woff2" +PACKAGECONFIG[openjpeg] = "-DUSE_OPENJPEG=ON,-DUSE_OPENJPEG=OFF,openjpeg" +PACKAGECONFIG[systemd] = "-DUSE_SYSTEMD=ON,-DUSE_SYSTEMD=off,systemd" +PACKAGECONFIG[reduce-size] = "-DCMAKE_BUILD_TYPE=MinSizeRel,-DCMAKE_BUILD_TYPE=Release,," +PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" +PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" +PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" +PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" +PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" +PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" +PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette" +PACKAGECONFIG[webrtc] = "-DENABLE_WEB_RTC=ON,-DENABLE_WEB_RTC=OFF" +PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON -DBWRAP_EXECUTABLE=${bindir}/bwrap -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,,bubblewrap xdg-dbus-proxy" +PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace" + +EXTRA_OECMAKE = " \ + -DPORT=GTK \ + -DUSE_GTK4=OFF \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ + ${@bb.utils.contains('GIDOCGEN_ENABLED', 'True', '-DENABLE_DOCUMENTATION=ON', '-DENABLE_DOCUMENTATION=OFF', d)} \ + -DENABLE_MINIBROWSER=ON \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \ + " +# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the +# debug symbols (4.3GB to 700M at time of writing) +DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}" + +# Javascript JIT is not supported on ARC +EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " +# By default 25-bit "medium" calls are used on ARC +# which is not enough for binaries larger than 32 MiB +CFLAGS:append:arc = " -mlong-calls" +CXXFLAGS:append:arc = " -mlong-calls" + +# Needed for non-mesa graphics stacks when x11 is disabled +CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + +# Javascript JIT is not supported on powerpc +EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF " + +# ARM JIT code does not build on ARMv4/5/6 anymore +EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " + +# And for armv7* don't enable it for softfp, because after: +# https://github.com/WebKit/WebKit/commit/a2ec4ef1997d6fafa6ffc607bffb54e76168a918 +# https://bugs.webkit.org/show_bug.cgi?id=242172 +# softfp armv7* fails because WEBASSEMBLY is left enabled by default and JIT gets +# explicitly disabled causing: +# http://errors.yoctoproject.org/Errors/Details/734587/ +# PR was sent upstream, but the end result is the same both JIT and WEBASSEMBLY disabled +# https://github.com/WebKit/WebKit/pull/17447 +EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" +EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" +EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" + +EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " +EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " + +# JIT and gold linker does not work on RISCV +EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF" + +# JIT not supported on MIPS either +EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " + +# JIT not supported on X32 +# An attempt was made to upstream JIT support for x32 in +# https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as +# unresolved due to limited X32 adoption. +EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " + +SECURITY_CFLAGS:remove:aarch64 = "-fpie" +SECURITY_CFLAGS:append:aarch64 = " -fPIE" + +FILES:${PN} += "${libdir}/webkit2gtk-4.*/injected-bundle/libwebkit2gtkinjectedbundle.so" + +RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" + +# http://errors.yoctoproject.org/Errors/Details/20370/ +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" + +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +ARM_INSTRUCTION_SET:armv7a = "thumb" +ARM_INSTRUCTION_SET:armv7r = "thumb" +ARM_INSTRUCTION_SET:armv7ve = "thumb" + +# ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 +COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" + +# introspection inside qemu-arm hangs forever on musl/arm builds +# therefore disable GI_DATA +GI_DATA_ENABLED:libc-musl:armv7a = "False" +GI_DATA_ENABLED:libc-musl:armv7ve = "False" + +do_install:append() { + mv ${D}${bindir}/WebKitWebDriver ${D}${bindir}/WebKitWebDriver3 +} + +PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" +src_package_preprocess () { + # Trim build paths from comments in generated sources to ensure reproducibility + sed -i -e "s,${WORKDIR},,g" \ + ${B}/JavaScriptCore/DerivedSources/*.h \ + ${B}/JavaScriptCore/DerivedSources/yarr/*.h \ + ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ + ${B}/WebCore/DerivedSources/*.cpp \ + ${B}/WebKitGTK/DerivedSources/webkit/*.cpp +} + diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch new file mode 100644 index 0000000000..12613f8b19 --- /dev/null +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch @@ -0,0 +1,508 @@ +From 05d1189ffce562560da90056d96fe2084d84654a Mon Sep 17 00:00:00 2001 +From: "Laszlo Boszormenyi (GCS)" <gcs@debian.org> +Date: Mon, 14 Feb 2022 14:13:13 +0100 +Subject: [PATCH] SCons 4.2.0 no longer has env_cpp11.has_key() Check env_cpp11 + as an array. + +This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003022 +--- +Upstream-Status: Pending + + examples/broadcast_server/SConscript | 2 +- + examples/debug_client/SConscript | 2 +- + examples/debug_server/SConscript | 2 +- + examples/dev/SConscript | 2 +- + examples/echo_client/SConscript | 2 +- + examples/echo_server/SConscript | 2 +- + examples/echo_server_both/SConscript | 2 +- + examples/echo_server_tls/SConscript | 2 +- + examples/external_io_service/SConscript | 2 +- + examples/iostream_server/SConscript | 2 +- + examples/print_client/SConscript | 2 +- + examples/print_client_tls/SConscript | 2 +- + examples/print_server/SConscript | 2 +- + examples/scratch_client/SConscript | 2 +- + examples/scratch_server/SConscript | 2 +- + examples/sip_client/SConscript | 2 +- + examples/subprotocol_server/SConscript | 2 +- + examples/telemetry_client/SConscript | 2 +- + examples/telemetry_server/SConscript | 2 +- + examples/testee_client/SConscript | 2 +- + examples/testee_server/SConscript | 2 +- + examples/utility_client/SConscript | 4 ++-- + test/connection/SConscript | 2 +- + test/endpoint/SConscript | 2 +- + test/extension/SConscript | 2 +- + test/http/SConscript | 2 +- + test/logger/SConscript | 2 +- + test/message_buffer/SConscript | 2 +- + test/processors/SConscript | 2 +- + test/random/SConscript | 2 +- + test/roles/SConscript | 2 +- + test/transport/SConscript | 2 +- + test/transport/asio/SConscript | 2 +- + test/transport/iostream/SConscript | 2 +- + test/utility/SConscript | 2 +- + 35 files changed, 36 insertions(+), 36 deletions(-) + +diff --git a/examples/broadcast_server/SConscript b/examples/broadcast_server/SConscript +index 5786f570d..06c55c147 100644 +--- a/examples/broadcast_server/SConscript ++++ b/examples/broadcast_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/debug_client/SConscript b/examples/debug_client/SConscript +index 781db8371..b92b14653 100644 +--- a/examples/debug_client/SConscript ++++ b/examples/debug_client/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/debug_server/SConscript b/examples/debug_server/SConscript +index 4d02261c6..7e24b07c8 100644 +--- a/examples/debug_server/SConscript ++++ b/examples/debug_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/dev/SConscript b/examples/dev/SConscript +index 34ddac2d5..31062fee9 100644 +--- a/examples/dev/SConscript ++++ b/examples/dev/SConscript +@@ -11,7 +11,7 @@ env_cpp11 = env_cpp11.Clone () + + prgs = [] + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system','timer','chrono'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('main', ["main.cpp"], LIBS = BOOST_LIBS_CPP11) + +diff --git a/examples/echo_client/SConscript b/examples/echo_client/SConscript +index 0e4110822..2adf1166d 100644 +--- a/examples/echo_client/SConscript ++++ b/examples/echo_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + prgs += env_cpp11.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/echo_server/SConscript b/examples/echo_server/SConscript +index a2978852e..a48724155 100644 +--- a/examples/echo_server/SConscript ++++ b/examples/echo_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/echo_server_both/SConscript b/examples/echo_server_both/SConscript +index d1ecf202f..32f4c8c55 100644 +--- a/examples/echo_server_both/SConscript ++++ b/examples/echo_server_both/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('echo_server_both', ["echo_server_both.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/echo_server_tls/SConscript b/examples/echo_server_tls/SConscript +index e24cc4ce8..688bf7c14 100644 +--- a/examples/echo_server_tls/SConscript ++++ b/examples/echo_server_tls/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/external_io_service/SConscript b/examples/external_io_service/SConscript +index beb7c1c42..0abf3e175 100644 +--- a/examples/external_io_service/SConscript ++++ b/examples/external_io_service/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/iostream_server/SConscript b/examples/iostream_server/SConscript +index dc90834cf..304142082 100644 +--- a/examples/iostream_server/SConscript ++++ b/examples/iostream_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/print_client/SConscript b/examples/print_client/SConscript +index 8da4ce5b2..79fdea0fd 100644 +--- a/examples/print_client/SConscript ++++ b/examples/print_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('print_client', ["print_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/print_client_tls/SConscript b/examples/print_client_tls/SConscript +index 01b011473..e57b9d691 100644 +--- a/examples/print_client_tls/SConscript ++++ b/examples/print_client_tls/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('print_client_tls', ["print_client_tls.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/print_server/SConscript b/examples/print_server/SConscript +index 4f0e492be..454dcf01b 100644 +--- a/examples/print_server/SConscript ++++ b/examples/print_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/scratch_client/SConscript b/examples/scratch_client/SConscript +index 6e7b2ef07..4be98f437 100644 +--- a/examples/scratch_client/SConscript ++++ b/examples/scratch_client/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + prgs += env_cpp11.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/scratch_server/SConscript b/examples/scratch_server/SConscript +index bf90f7433..cc495ba5c 100644 +--- a/examples/scratch_server/SConscript ++++ b/examples/scratch_server/SConscript +@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z'] + prgs += env_cpp11.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/sip_client/SConscript b/examples/sip_client/SConscript +index fafe7b4ff..e2afefe73 100644 +--- a/examples/sip_client/SConscript ++++ b/examples/sip_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/subprotocol_server/SConscript b/examples/subprotocol_server/SConscript +index e97535ca5..299af43c5 100644 +--- a/examples/subprotocol_server/SConscript ++++ b/examples/subprotocol_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/telemetry_client/SConscript b/examples/telemetry_client/SConscript +index 62396a5e3..ac0e6daba 100644 +--- a/examples/telemetry_client/SConscript ++++ b/examples/telemetry_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/telemetry_server/SConscript b/examples/telemetry_server/SConscript +index 1b8ff2295..c620f38a4 100644 +--- a/examples/telemetry_server/SConscript ++++ b/examples/telemetry_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('telemetry_server', ["telemetry_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/testee_client/SConscript b/examples/testee_client/SConscript +index 64f0ef1f3..6154bb966 100644 +--- a/examples/testee_client/SConscript ++++ b/examples/testee_client/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + prgs += env_cpp11.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/testee_server/SConscript b/examples/testee_server/SConscript +index 3c75f4ff2..ca8ffb7d7 100644 +--- a/examples/testee_server/SConscript ++++ b/examples/testee_server/SConscript +@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + prgs += env_cpp11.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS) + else: +diff --git a/examples/utility_client/SConscript b/examples/utility_client/SConscript +index 6e6cd8c9d..f6d673a43 100644 +--- a/examples/utility_client/SConscript ++++ b/examples/utility_client/SConscript +@@ -13,11 +13,11 @@ env_cpp11 = env_cpp11.Clone () + prgs = [] + + # if a C++11 environment is available build using that, otherwise use boost +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + prgs += env_cpp11.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS) + else: + ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS) + +-Return('prgs') +\ No newline at end of file ++Return('prgs') +diff --git a/test/connection/SConscript b/test/connection/SConscript +index 4ed7a4e69..b79876bf1 100644 +--- a/test/connection/SConscript ++++ b/test/connection/SConscript +@@ -16,7 +16,7 @@ objs = env.Object('connection_boost.o', ["connection.cpp"], LIBS = BOOST_LIBS) + objs = env.Object('connection_tu2_boost.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_connection_boost', ["connection_boost.o","connection_tu2_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('connection_tu2_stl.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/endpoint/SConscript b/test/endpoint/SConscript +index 5cb3ede91..74912865e 100644 +--- a/test/endpoint/SConscript ++++ b/test/endpoint/SConscript +@@ -16,7 +16,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + + objs = env.Object('endpoint_boost.o', ["endpoint.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_endpoint_boost', ["endpoint_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + objs += env_cpp11.Object('endpoint_stl.o', ["endpoint.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('test_endpoint_stl', ["endpoint_stl.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/extension/SConscript b/test/extension/SConscript +index d8b425fda..0cb813856 100644 +--- a/test/extension/SConscript ++++ b/test/extension/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('permessage_deflate_boost.o', ["permessage_deflate.cpp"], LIB + prgs = env.Program('test_extension_boost', ["extension_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_permessage_deflate_boost', ["permessage_deflate_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + objs += env_cpp11.Object('extension_stl.o', ["extension.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('permessage_deflate_stl.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/http/SConscript b/test/http/SConscript +index 0a24a8774..422998e24 100644 +--- a/test/http/SConscript ++++ b/test/http/SConscript +@@ -15,7 +15,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework'],env) + [platform_libs] + objs = env.Object('parser_boost.o', ["parser.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_http_boost', ["parser_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('parser_stl.o', ["parser.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('test_http_stl', ["parser_stl.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/logger/SConscript b/test/logger/SConscript +index 81d607601..0ccbbc5df 100644 +--- a/test/logger/SConscript ++++ b/test/logger/SConscript +@@ -15,7 +15,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + objs = env.Object('logger_basic_boost.o', ["basic.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('logger_basic_boost', ["logger_basic_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('logger_basic_stl.o', ["basic.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('logger_basic_stl', ["logger_basic_stl.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/message_buffer/SConscript b/test/message_buffer/SConscript +index 2ef6d71f3..89785cb3e 100644 +--- a/test/message_buffer/SConscript ++++ b/test/message_buffer/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('alloc_boost.o', ["alloc.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_message_boost', ["message_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_alloc_boost', ["alloc_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('message_stl.o', ["message.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('alloc_stl.o', ["alloc.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/processors/SConscript b/test/processors/SConscript +index 406a7edc9..1b40d0b1d 100644 +--- a/test/processors/SConscript ++++ b/test/processors/SConscript +@@ -26,7 +26,7 @@ prgs += env.Program('test_hybi07_boost', ["test_hybi07_boost.o"], LIBS = BOOST_L + prgs += env.Program('test_hybi00_boost', ["test_hybi00_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_extension_permessage_compress_boost', ["test_extension_permessage_compress_boost.o"], LIBS = BOOST_LIBS + ['z']) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] + # no C++11 features are used in processor so there are no C++11 versions of + # these tests. +diff --git a/test/random/SConscript b/test/random/SConscript +index 3cadc9e97..4a11b0ce5 100644 +--- a/test/random/SConscript ++++ b/test/random/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('random_device_boost.o', ["random_device.cpp"], LIBS = BOOST_ + prgs = env.Program('test_random_none_boost', ["random_none_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_random_device_boost', ["random_device_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('random_none_stl.o', ["none.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('random_device_stl.o', ["random_device.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/roles/SConscript b/test/roles/SConscript +index e86107ece..17b3be105 100644 +--- a/test/roles/SConscript ++++ b/test/roles/SConscript +@@ -17,7 +17,7 @@ objs += env.Object('server_boost.o', ["server.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_client_boost', ["client_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_server_boost', ["server_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('client_stl.o', ["client.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('server_stl.o', ["server.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/transport/SConscript b/test/transport/SConscript +index 71b31b6c5..aa9b719ec 100644 +--- a/test/transport/SConscript ++++ b/test/transport/SConscript +@@ -16,7 +16,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','random','chrono + objs = env.Object('boost_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS) + prgs = env.Program('test_boost_integration', ["boost_integration.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + objs += env_cpp11.Object('stl_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS_CPP11) + prgs += env_cpp11.Program('test_stl_integration', ["stl_integration.o"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/transport/asio/SConscript b/test/transport/asio/SConscript +index f8185e57e..518d362b1 100644 +--- a/test/transport/asio/SConscript ++++ b/test/transport/asio/SConscript +@@ -20,7 +20,7 @@ prgs = env.Program('test_base_boost', ["base_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_timers_boost', ["timers_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_security_boost', ["security_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + objs += env_cpp11.Object('base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('timers_stl.o', ["timers.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/transport/iostream/SConscript b/test/transport/iostream/SConscript +index 9e74c2f15..dcaf9f2d9 100644 +--- a/test/transport/iostream/SConscript ++++ b/test/transport/iostream/SConscript +@@ -19,7 +19,7 @@ prgs = env.Program('test_iostream_base_boost', ["iostream_base_boost.o"], LIBS = + prgs += env.Program('test_iostream_connection_boost', ["iostream_connection_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_iostream_endpoint_boost', ["iostream_endpoint_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('iostream_base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('iostream_connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11) +diff --git a/test/utility/SConscript b/test/utility/SConscript +index 80e9ef6c8..6f19aa52a 100644 +--- a/test/utility/SConscript ++++ b/test/utility/SConscript +@@ -24,7 +24,7 @@ prgs += env.Program('test_close_boost', ["close_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_sha1_boost', ["sha1_boost.o"], LIBS = BOOST_LIBS) + prgs += env.Program('test_error_boost', ["error_boost.o"], LIBS = BOOST_LIBS) + +-if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ++if 'WSPP_CPP11_ENABLED' in env_cpp11: + BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + objs += env_cpp11.Object('utilities_stl.o', ["utilities.cpp"], LIBS = BOOST_LIBS_CPP11) + objs += env_cpp11.Object('uri_stl.o', ["uri.cpp"], LIBS = BOOST_LIBS_CPP11) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch index 3245d941b0..68cb645b40 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Fix cmake find boost with version >= 1.71 For some reasons "system;thread;random;unit_test_framework" was seen as a single module, because of the quotes. --- +Upstream-Status: Pending + CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch index f221cd6999..401a614dc1 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch +++ b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch @@ -8,6 +8,8 @@ Subject: [PATCH] Update SConstruct with new Python3 syntax: - new raise This should fix FTBFS against new scons 3.1.2 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947584 --- +Upstream-Status: Pending + SConstruct | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb index 79a5ac5c4e..f437accc50 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb +++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb @@ -6,20 +6,21 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'openssl boost zlib', '', d)} " -SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ +SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https;branch=master \ file://0001-cmake-Use-GNUInstallDirs.patch \ file://855.patch \ file://857.patch \ file://0001-Correct-clang-compiler-flags.patch \ + file://1024.patch \ " EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON', '', d)} " # this is an header only library, do not depend on the main package -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" # to add this package to an SDK, since it isn't a reverse-dependency of anything, just use something like this: -# TOOLCHAIN_TARGET_TASK_append = " websocketpp-dev" +# TOOLCHAIN_TARGET_TASK:append = " websocketpp-dev" # tag 0.8.2 SRCREV= "56123c87598f8b1dd471be83ca841ceae07f95ba" @@ -30,9 +31,9 @@ inherit cmake PACKAGES =+ "${PN}-examples" -FILES_${PN}-examples = "${docdir}" +FILES:${PN}-examples = "${docdir}" -do_install_append() { +do_install:append() { install -d ${D}${docdir}/${BPN} cp -R ${S}/examples ${D}${docdir}/${BPN} } diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb index d100030f9b..6b35d71a55 100644 --- a/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb +++ b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb @@ -4,10 +4,10 @@ DESCRIPTION = "Open-source binary diff, differential compression tools, \ HOMEPAGE = "http://xdelta.org/" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl" +SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl;protocol=https" SRCREV = "4b4aed71a959fe11852e45242bb6524be85d3709" S = "${WORKDIR}/git/xdelta3" diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb new file mode 100644 index 0000000000..e10ccd04ea --- /dev/null +++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb @@ -0,0 +1,19 @@ +SUMMARY = "xdg-dbus-proxy is a filtering proxy for D-Bus connections" +HOMEPAGE = "https://github.com/flatpak/xdg-dbus-proxy" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0 \ + libxslt-native \ + docbook-xsl-stylesheets-native \ +" + +inherit meson pkgconfig + +SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" +SRCREV = "7466c8137fc06f863fde8486521984e43a26cd10" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch new file mode 100644 index 0000000000..3410a88310 --- /dev/null +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal/0001-meson.build-add-a-hack-for-crosscompile.patch @@ -0,0 +1,28 @@ +From 7abb3840ac2870fcfc174fbbd81c4209c838e1a9 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 18 Sep 2023 22:22:17 +0200 +Subject: [PATCH] meson.build: add a hack for cross-compiling + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Inappropriate [cross-compile specific] +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 760613a..d339d26 100644 +--- a/meson.build ++++ b/meson.build +@@ -168,7 +168,7 @@ pkgconfig.generate( + 'prefix': get_option('prefix'), + 'datarootdir': dataroot_dir, + 'datadir': '${prefix}/@0@'.format(get_option('datadir')), +- 'interfaces_dir': '${datadir}/dbus-1/interfaces/', ++ 'interfaces_dir': '${pc_sysrootdir}${datadir}/dbus-1/interfaces/', + }, + ) + +-- +2.41.0 + diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb new file mode 100644 index 0000000000..0aa8724281 --- /dev/null +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb @@ -0,0 +1,49 @@ +SUMMARY = "A portal frontend service for Flatpak and possibly other desktop containment frameworks." +HOMEPAGE = "https://github.com/flatpak/xdg-desktop-portal" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +REQUIRED_DISTRO_FEATURES = "polkit" + +DEPENDS = " \ + json-glib \ + glib-2.0 \ + glib-2.0-native \ + flatpak \ + libportal \ + geoclue \ + pipewire \ + fuse3 \ + xmlto-native \ +" + +PORTAL_BACKENDS ?= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gtk+3', 'xdg-desktop-portal-gtk', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gtk4', 'xdg-desktop-portal-gtk', '', d)} \ +" + +RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS}" + +inherit meson pkgconfig python3native features_check + +SRC_URI = " \ + git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=main \ + file://0001-meson.build-add-a-hack-for-crosscompile.patch \ +" + +S = "${WORKDIR}/git" +SRCREV = "37a6f7c8b8e08b9861f05e172cd4e0d07a832c4d" + +FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" + +EXTRA_OEMESON += " \ + --cross-file=${WORKDIR}/meson-${PN}.cross \ + -Ddbus-service-dir=${datadir}/dbus-1/services \ +" + +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +bwrap = '${bindir}/bwrap' +EOF +} diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.18.bb index e3ce9268cd..84fc9e2f18 100644 --- a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb +++ b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.18.bb @@ -1,16 +1,15 @@ DESCRIPTION = "xdg-user-dirs is a tool to help manage user directories like the desktop folder and the music folder" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "e0564ec6d838e6e41864d872a29b3575" -SRC_URI[sha256sum] = "2a07052823788e8614925c5a19ef5b968d8db734fdee656699ea4f97d132418c" +SRC_URI[sha256sum] = "ec6f06d7495cdba37a732039f9b5e1578bcb296576fde0da40edb2f52220df3c" inherit autotools gettext EXTRA_OECONF = "--disable-documentation" -CONFFILES_${PN} += " \ +CONFFILES:${PN} += " \ ${sysconfdir}/xdg/user-dirs.conf \ ${sysconfdir}/xdg/user-dirs.defaults \ " diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch index 53c119765a..f107f42dab 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch +++ b/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-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch index 1451ff5647..3a1531deb1 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch +++ b/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-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch new file mode 100644 index 0000000000..7b07628e5f --- /dev/null +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/ensure-search-path-non-host.patch @@ -0,0 +1,31 @@ +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. + +It will eventually arise after the configure QA as the configure script should only look at the staging sysroot dir, not at the host. + +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com> + +--- + 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 ========================================================================== +-COMMON_INCLUDE_DIR="/usr/include /usr/local/include" +-COMMON_LIB_DIR="/usr/lib /usr/lib64 /usr/local/lib" ++COMMON_INCLUDE_DIR="${STAGING_INCDIR}" ++COMMON_LIB_DIR="${STAGING_LIBDIR}" + case $host in + i*86-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/i386-linux-gnu" ;; + x86_64-*-linux-gnu) COMMON_LIB_DIR="$COMMON_LIB_DIR /usr/lib/x86_64-linux-gnu" ;; diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch index af598fe749..73c6ddb027 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/fix-ltmain.sh.patch +++ b/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-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch index d45356924b..26ebce343d 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch @@ -9,13 +9,12 @@ and it's installed as ptest. Upstream-Status: Inappropriate [ OE ptest specific ] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - --- examples/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index 89b1d61..c1cbcca 100644 +index 02480c2..cbc2661 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -8,9 +8,17 @@ PROGRAMS = \ @@ -24,12 +23,12 @@ index 89b1d61..c1cbcca 100644 +ifndef CC CC = gcc --CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS +-CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS -Wall -Wextra -LDLIBS += -g $(shell xmlsec1-config --libs) +endif + -+CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -+LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) ++CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra ++LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) + +DESTDIR = /usr/share/xmlsec1 +install-ptest: @@ -38,3 +37,6 @@ index 89b1d61..c1cbcca 100644 all: $(PROGRAMS) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest b/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest index a203c38f27..afd8c69853 100755 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/run-ptest @@ -34,8 +34,8 @@ check_return verify-single-key echo "---------------------------------------------------" echo "Verifying a signature with keys manager..." -./verify2 sign1-res.xml rsapub.pem -./verify2 sign2-res.xml rsapub.pem +./verify2 sign1-res.xml rsakey.pem +./verify2 sign2-res.xml rsakey.pem check_return verify-keys-manager echo "---------------------------------------------------" diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch index 8b2533ed9e..9e6a6a840f 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch @@ -6,25 +6,27 @@ Subject: [PATCH] examples: allow build in separate dir Upstream-Status: Inappropriate [ OE specific ] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - --- examples/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/Makefile b/examples/Makefile -index c1cbcca..3f1bd14 100644 +index cbc2661..e882b61 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -12,8 +12,10 @@ ifndef CC CC = gcc endif --CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS --LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) +-CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra +-LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) +top_srcdir = .. +top_builddir = .. -+CFLAGS += -I$(top_srcdir)/include -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS ++CFLAGS += -I$(top_srcdir)/include -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra +LDLIBS += -L$(top_builddir)/src/.libs -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --libs xmlsec1 ) DESTDIR = /usr/share/xmlsec1 install-ptest: +-- +2.25.1 + diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb index 93b0d6a67f..7639209e19 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.30.bb +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb @@ -13,16 +13,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0" SECTION = "libs" SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ - file://fix-ltmain.sh.patch \ - file://change-finding-path-of-nss.patch \ - file://makefile-ptest.patch \ - file://xmlsec1-examples-allow-build-in-separate-dir.patch \ - file://0001-nss-nspr-fix-for-multilib.patch \ - file://run-ptest \ - " + file://fix-ltmain.sh.patch \ + file://change-finding-path-of-nss.patch \ + file://makefile-ptest.patch \ + file://xmlsec1-examples-allow-build-in-separate-dir.patch \ + file://0001-nss-nspr-fix-for-multilib.patch \ + file://run-ptest \ + file://ensure-search-path-non-host.patch \ + " -SRC_URI[md5sum] = "b66ec21e0a0ac331afb4b1bc5c9ef966" -SRC_URI[sha256sum] = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8" +SRC_URI[sha256sum] = "45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75" inherit autotools-brokensep ptest pkgconfig @@ -38,14 +38,14 @@ PACKAGECONFIG[des] = ",--disable-des,," # these can be dynamically loaded with xmlSecCryptoDLLoadLibrary() FILES_SOLIBSDEV = "${libdir}/libxmlsec1.so" -FILES_${PN} += "${libdir}/libxmlsec1-*.so" -INSANE_SKIP_${PN} = "dev-so" +FILES:${PN} += "${libdir}/libxmlsec1-*.so" +INSANE_SKIP:${PN} = "dev-so" -FILES_${PN}-dev += "${libdir}/xmlsec1Conf.sh" -FILES_${PN}-dbg += "${PTEST_PATH}/.debug/*" +FILES:${PN}-dev += "${libdir}/xmlsec1Conf.sh" +FILES:${PN}-dbg += "${PTEST_PATH}/.debug/*" -RDEPENDS_${PN}-ptest += "${PN}-dev" -INSANE_SKIP_${PN}-ptest += "dev-deps" +RDEPENDS:${PN}-ptest += "${PN}-dev" +INSANE_SKIP:${PN}-ptest += "dev-deps" PTEST_EXTRA_ARGS = "top_srcdir=${S} top_builddir=${B}" @@ -53,7 +53,7 @@ do_compile_ptest () { oe_runmake -C ${S}/examples ${PTEST_EXTRA_ARGS} all } -do_install_append() { +do_install:append() { for i in ${bindir}/xmlsec1-config ${libdir}/xmlsec1Conf.sh \ ${libdir}/pkgconfig/xmlsec1-openssl.pc; do sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i @@ -63,3 +63,5 @@ do_install_append() { do_install_ptest () { oe_runmake -C ${S}/examples DESTDIR=${D}${PTEST_PATH} ${PTEST_EXTRA_ARGS} install-ptest } + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch new file mode 100644 index 0000000000..2a766dbb87 --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Fix-hash_key_put-signature.patch @@ -0,0 +1,33 @@ +From 64cb138aaaafc87c8462885d502c9323be86a003 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 18 Jan 2023 14:50:08 -0800 +Subject: [PATCH] Fix hash_key_put() signature + +Fixes + +../xmlstarlet-1.6.1/src/xml_elem.c:271:27: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(uniq, hash_key_put, &lines); + ^~~~~~~~~~~~ + +Upstream-Status: Submitted [https://sourceforge.net/p/xmlstar/code/merge-requests/6/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/xml_elem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xml_elem.c b/src/xml_elem.c +index 024e62a..a73038a 100644 +--- a/src/xml_elem.c ++++ b/src/xml_elem.c +@@ -186,7 +186,7 @@ typedef struct { + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name; +-- +2.39.1 + diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch new file mode 100644 index 0000000000..a9d98db69c --- /dev/null +++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Make-xmlError-struct-constant.patch @@ -0,0 +1,45 @@ +From f7a5ebc3a673b246a64c9a664df304c1520a3951 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Mar 2024 12:35:17 -0800 +Subject: [PATCH] Make xmlError struct constant + +In libxml2 commit v2.12.0~14 the API changed so that +xmlGetLastError() returns pointer to a constant xmlError struct. +Reflect this change in our code. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/xml.c | 2 +- + src/xmlstar.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/xml.c b/src/xml.c +index cf47cc2..e6f19c1 100644 +--- a/src/xml.c ++++ b/src/xml.c +@@ -104,7 +104,7 @@ void reportGenericError(void* ctx, const char * msg, ...) { + /* by default all errors are reported */ + static ErrorInfo errorInfo = { NULL, NULL, VERBOSE, CONTINUE }; + +-void reportError(void *ptr, xmlErrorPtr error) ++void reportError(void *ptr, const xmlError *error) + { + ErrorInfo *errorInfo = (ErrorInfo*) ptr; + assert(errorInfo); +diff --git a/src/xmlstar.h b/src/xmlstar.h +index 3e1eed3..7e41ac4 100644 +--- a/src/xmlstar.h ++++ b/src/xmlstar.h +@@ -32,7 +32,7 @@ typedef struct _errorInfo { + ErrorStop stop; + } ErrorInfo; + +-void reportError(void *ptr, xmlErrorPtr error); ++void reportError(void *ptr, const xmlError* error); + void suppressErrors(void); + + typedef struct _gOptions { +-- +2.44.0 + diff --git a/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch index e55f4f3b13..7e13110a3b 100644 --- a/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch +++ b/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + configure.ac: don't use xml-config if --with-libxml-prefix is specified to configure Same behavior for xslt-config. diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb index e28fd61a03..61eeaaa095 100644 --- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb +++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb @@ -14,8 +14,9 @@ DEPENDS = "libxml2 libxslt" SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \ file://configure.ac.patch \ - file://0001-usage2c.awk-fix-wrong-basename-regexp.patch" -SRC_URI[md5sum] = "f3c5dfa3b1a2ee06cd57c255cc8b70a0" + file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ + file://0001-Make-xmlError-struct-constant.patch \ + file://0001-Fix-hash_key_put-signature.patch" SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" inherit autotools diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb index 481e7303b3..9650d43695 100644 --- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb +++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb @@ -10,14 +10,14 @@ DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native" inherit features_check REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git" +SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git;branch=v0.9;protocol=https" -SRCREV = "c122544f184d4031bbae1ad80fbab554c34a9427" +SRCREV = "d463bad9639c910fadc2f30dac473c7688b11cfc" -PV = "0.2.5" +PV = "0.9.19" S = "${WORKDIR}/git" -FILES_${PN} += "${libdir}/xorg/modules/*" +FILES:${PN} += "${libdir}/xorg/modules/*" -INSANE_SKIP_${PN} += "xorg-driver-abi" +INSANE_SKIP:${PN} += "xorg-driver-abi" diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch index 5e7fca02a5..05803266cb 100644 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch @@ -6,6 +6,8 @@ Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf, Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + keygen/openssl.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch index 82b2790856..e8b4ffa6bf 100644 --- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch @@ -5,6 +5,8 @@ Fix the compile error: Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + xrdp/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch new file mode 100644 index 0000000000..ea3eb11f0a --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch @@ -0,0 +1,27 @@ +From 5958db649855bfb2ada7c0ed22a00f839b9a1161 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 12 Mar 2021 21:40:35 -0800 +Subject: [PATCH] arch: Define NO_NEED_ALIGN on ppc64 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common/arch.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/arch.h b/common/arch.h +index 617feb5e..6edb39db 100644 +--- a/common/arch.h ++++ b/common/arch.h +@@ -85,7 +85,7 @@ typedef int bool_t; + #define NEED_ALIGN + #elif defined(__x86__) || defined(__x86_64__) || \ + defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ +- defined(__i386__) || defined(__aarch64__) || \ ++ defined(__i386__) || defined(__aarch64__) || defined(__powerpc64__) || \ + defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \ + defined(__s390__) || defined (__s390x__) || \ + defined(__riscv) +-- +2.31.1 + diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch new file mode 100644 index 0000000000..77a394d556 --- /dev/null +++ b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch @@ -0,0 +1,31 @@ +From 492f74dbea1d9a15fbc3e870e78ab52e7fc5583b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 20:19:32 -0700 +Subject: [PATCH] mark count with unused attribute + +This may throw a warning when devel logs are disabled +Fixed +../../../xrdp-0.9.19/sesman/chansrv/chansrv.c:198:9: error: variable 'count' set but not used [-Werror,-Wunused-but-set-variable] int count; ^ 1 error generated. + +Upstream-Status: Submitted [https://github.com/neutrinolabs/xrdp/pull/2353] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sesman/chansrv/chansrv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c +index 4452d998..b818bff3 100644 +--- a/sesman/chansrv/chansrv.c ++++ b/sesman/chansrv/chansrv.c +@@ -195,7 +195,7 @@ check_timeout(void) + struct timeout_obj *tobj; + struct timeout_obj *last_tobj; + struct timeout_obj *temp_tobj; +- int count; ++ int count __attribute__((unused)); + tui32 now; + + LOG_DEVEL(LOG_LEVEL_DEBUG, "check_timeout:"); +-- +2.37.3 + diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb index deda0fd1b5..b839a68294 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb @@ -6,79 +6,73 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ inherit features_check autotools pkgconfig useradd systemd -DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" +DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native imlib2 pixman libsm" REQUIRED_DISTRO_FEATURES = "x11 pam" -SRC_URI = "git://github.com/neutrinolabs/xrdp.git \ +SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ file://xrdp.sysconfig \ file://0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch \ file://0001-Fix-the-compile-error.patch \ + file://0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch \ + file://0001-mark-count-with-unused-attribute.patch \ " -SRCREV = "1e4b03eb3c9aa7173de251a328c93c073dcc0fca" +SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0" -PV = "0.9.11" - -S = "${WORKDIR}/git" +CFLAGS += " -Wno-deprecated-declarations" PACKAGECONFIG ??= "" PACKAGECONFIG[fuse] = " --enable-fuse, --disable-fuse, fuse" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system xrdp" -USERADD_PARAM_${PN} = "--system --home /var/run/xrdp -g xrdp \ +GROUPADD_PARAM:${PN} = "--system xrdp" +USERADD_PARAM:${PN} = "--system --home /var/run/xrdp -g xrdp \ --no-create-home --shell /bin/false xrdp" -FILES_${PN} += "${datadir}/dbus-1/services/*.service \ +FILES:${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/accessibility-services/*.service " -FILES_${PN}-dev += "${libdir}/xrdp/libcommon.so \ +FILES:${PN}-dev += "${libdir}/xrdp/libcommon.so \ ${libdir}/xrdp/libxrdp.so \ ${libdir}/xrdp/libscp.so \ ${libdir}/xrdp/libxrdpapi.so " -EXTRA_OECONF = "--enable-pam-config=suse" +EXTRA_OECONF = "--enable-pam-config=suse --enable-fuse \ + --enable-pixman --enable-painter --enable-vsock \ + --enable-ipv6 --with-imlib2 --with-socketdir=${localstatedir}/run/${PN}" -do_configure_prepend() { +do_configure:prepend() { cd ${S} ./bootstrap cd - } -do_compile_prepend() { +do_compile:prepend() { sed -i 's/(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am/(MAKE) $(AM_MAKEFLAGS) install-exec-am/g' ${S}/keygen/Makefile.in + echo "" > ${B}/xrdp_configure_options.h } +do_install:append() { -do_install_append() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/xrdp - install -d ${D}${sysconfdir}/xrdp/pam.d - install -d ${D}${sysconfdir}/sysconfig/xrdp - # deal with systemd unit files install -d ${D}${systemd_unitdir}/system install -m 0644 ${S}/instfiles/xrdp.service.in ${D}${systemd_unitdir}/system/xrdp.service - install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service + install -m 0644 ${S}/instfiles/xrdp-sesman.service.in ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@sysconfdir@,${sysconfdir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service sed -i -e 's,@sbindir@,${sbindir},g' ${D}${systemd_unitdir}/system/xrdp.service ${D}${systemd_unitdir}/system/xrdp-sesman.service + install -d ${D}${sysconfdir}/sysconfig/xrdp install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/sesman.ini.in ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/sesman/startwm.sh ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp.ini.in ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/xrdp/xrdp_keyboard.ini ${D}${sysconfdir}/xrdp/ - install -m 0644 ${S}/instfiles/xrdp.sh ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ chown xrdp:xrdp ${D}${sysconfdir}/xrdp } -SYSTEMD_SERVICE_${PN} = "xrdp.service xrdp-sesman.service" +SYSTEMD_SERVICE:${PN} = "xrdp.service xrdp-sesman.service" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if test -z "$D" then if test -x ${bindir}/xrdp-keygen @@ -92,6 +86,6 @@ pkg_postinst_${PN}() { -out ${sysconfdir}/xrdp/cert.pem \ -config ${sysconfdir}/xrdp/openssl.conf >/dev/null 2>&1 chmod 400 ${sysconfdir}/xrdp/key.pem - fi + fi fi } diff --git a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb index 1d75d52d29..76aea6f41a 100644 --- a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb +++ b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb @@ -1,6 +1,6 @@ SUMMARY = "X.Org X cvt" HOMEPAGE = "https://linux.die.net/man/1/cvt" -LICENSE = "MIT-X" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" DEPENDS += "pixman-native xorgproto-native libxrandr-native" @@ -8,13 +8,13 @@ DEPENDS += "pixman-native xorgproto-native libxrandr-native" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130" -SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" +SRC_URI[md5sum] = "8cf8bd1f33e3736bc8dd279b20a32399" +SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" S = "${WORKDIR}/${XORG_PN}-${PV}" B = "${WORKDIR}/build" -inherit native pkgconfig +inherit pkgconfig native do_configure[noexec] = "1" diff --git a/meta-oe/recipes-support/xxhash/xxhash_0.8.0.bb b/meta-oe/recipes-support/xxhash/xxhash_0.8.0.bb deleted file mode 100644 index e437d4d15b..0000000000 --- a/meta-oe/recipes-support/xxhash/xxhash_0.8.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Extremely fast non-cryptographic hash algorithm" -DESCRIPTION = "xxHash is an extremely fast non-cryptographic hash algorithm, \ -working at speeds close to RAM limits." -HOMEPAGE = "http://www.xxhash.com/" -LICENSE = "BSD-2-Clause & GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b335320506abb0505437e39295e799cb" - -SRC_URI = "git://github.com/Cyan4973/xxHash.git;branch=release;protocol=git" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" - -SRCREV = "94e5f23e736f2bb67ebdf90727353e65344f9fc0" - -S = "${WORKDIR}/git" - -do_compile () { - oe_runmake all -} - -do_install () { - oe_runmake DESTDIR=${D} install -} diff --git a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb new file mode 100644 index 0000000000..44ac0687a7 --- /dev/null +++ b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "yaml-cpp parser and emitter library" +DESCRIPTION = "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec." +HOMEPAGE = "https://github.com/jbeder/yaml-cpp" +SECTION = "devel" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c" + +# yaml-cpp releases are stored as archive files in github. +# download the exact revision of release +SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https" +SRCREV = "f7320141120f720aecc4c32be25586e7da9eb978" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DYAML_CPP_BUILD_TESTS=OFF -DYAML_BUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TOOLS=OFF" diff --git a/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch b/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch deleted file mode 100644 index c93af32966..0000000000 --- a/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 224507bc4b6e58f7a6e445bfebfb59d6b8d78bd6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 2 Dec 2016 17:38:51 -0800 -Subject: [PATCH] make relies GNU extentions - -We get errors like -`%'-style pattern rules are a GNU make extension - -Disable this warning, since we use gmake with OE -anyway - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,7 @@ AC_PREREQ([2.61]) - AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net]) - AC_CONFIG_AUX_DIR(config) - AC_CONFIG_MACRO_DIR(config) --AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2]) -+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-error foreign subdir-objects std-options dist-bzip2]) - AC_CONFIG_HEADERS([include/config.h]) - AC_CONFIG_SRCDIR(zbar/scanner.c) - LT_PREREQ([2.2]) -@@ -47,7 +47,7 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION - [Library revision]) - - AM_CPPFLAGS="-I$srcdir/include" --AM_CFLAGS="-Wall -Wno-parentheses -Werror" -+AM_CFLAGS="-Wall -Wno-parentheses" - AM_CXXFLAGS="$AM_CFLAGS" - AC_SUBST([AM_CPPFLAGS]) - AC_SUBST([AM_CFLAGS]) diff --git a/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch b/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch new file mode 100644 index 0000000000..3d8c07f02b --- /dev/null +++ b/meta-oe/recipes-support/zbar/zbar/0001-qt-Create-subdir-in-Makefile.patch @@ -0,0 +1,37 @@ +From 9c67f377477a07495a712f478eabfa8d33164c45 Mon Sep 17 00:00:00 2001 +From: Daniel Gomez <dagmcr@gmail.com> +Date: Sun, 17 Jan 2021 23:32:51 +0100 +Subject: [PATCH 1/2] qt: Create subdir in Makefile + +Create builddir/qt subdir when --with-qt5 is enabled. + +Fixes the following error: + +moc -Iqt -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore +-I../git/include ../git/include/zbar/QZBar.h -o qt/moc_QZBar.cpp +moc: Cannot create qt/moc_QZBar.cpp +make: *** [Makefile:2459: qt/moc_QZBar.cpp] Error 1 + +Signed-off-by: Daniel Gomez <dagmcr@gmail.com> +--- +Upstream-Status: Pending + + qt/Makefile.am.inc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qt/Makefile.am.inc b/qt/Makefile.am.inc +index b099c2b..c98fbeb 100644 +--- a/qt/Makefile.am.inc ++++ b/qt/Makefile.am.inc +@@ -15,4 +15,5 @@ qt/moc_%.cpp: qt/%.h + $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@ + + qt/moc_%.cpp: include/zbar/%.h ++ @$(mkdir_p) qt 2>/dev/null + $(MOC) $(qt_libzbarqt_la_CPPFLAGS) $< -o $@ +-- +2.29.2 + diff --git a/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch b/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch new file mode 100644 index 0000000000..9030ed88f2 --- /dev/null +++ b/meta-oe/recipes-support/zbar/zbar/0002-zbarcam-Create-subdir-in-Makefile.patch @@ -0,0 +1,42 @@ +From fe751929ccc8fd75e350ed6db9d28d04bd31fc79 Mon Sep 17 00:00:00 2001 +From: Daniel Gomez <dagmcr@gmail.com> +Date: Sun, 17 Jan 2021 23:33:19 +0100 +Subject: [PATCH 2/2] zbarcam: Create subdir in Makefile + +Create builddir/zbarcam when --with-qt5 is enabled. + +Fixes the following error: + +moc -i -Izbarcam -DQT_WIDGETS_LIB -DQT_X11EXTRAS_LIB -DQT_GUI_LIB +-DQT_CORE_LIB +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtWidgets +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtX11Extras +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtGui +-I/var/lib/yocto/gallium/tmp_20210113/work/znver1-poky-linux/zbar/0.23.1+gitAUTOINC+89e7900d85-r0/recipe-sysroot/usr/include/QtCore +-I../git/include ../git/zbarcam/zbarcam-qt.cpp -o +zbarcam/moc_zbarcam_qt.h +moc: Cannot create zbarcam/moc_zbarcam_qt.h +make: *** [Makefile:2438: zbarcam/moc_zbarcam_qt.h] Error 1 + +Signed-off-by: Daniel Gomez <dagmcr@gmail.com> +--- +Upstream-Status: Pending + + zbarcam/Makefile.am.inc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc +index b6de82c..e90c50c 100644 +--- a/zbarcam/Makefile.am.inc ++++ b/zbarcam/Makefile.am.inc +@@ -28,6 +28,7 @@ DISTCLEANFILES += $(nodist_zbarcam_zbarcam_qt_SOURCES) zbarcam/moc_zbarcam_qt.h + + + zbarcam/moc_zbarcam_qt.h: zbarcam/zbarcam-qt.cpp ++ @$(mkdir_p) zbarcam 2>/dev/null + $(MOC) -i $(zbarcam_zbarcam_qt_CPPFLAGS) $< -o $@ + endif + +-- +2.29.2 + diff --git a/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-oe/recipes-support/zbar/zbar_git.bb index 181d7ae43c..975779cd18 100644 --- a/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-oe/recipes-support/zbar/zbar_git.bb @@ -1,31 +1,58 @@ -DESCRIPTION = "2D barcode scanner toolkit." +HOMEPAGE = "https://github.com/mchehab/zbar" +SUMMARY = "A bar code library" +DESRIPTION = "ZBar is an open source software suite for reading bar codes \ +from various sources, such as video streams, image files and raw \ +intensity sensors. It supports EAN-13/UPC-A, UPC-E, EAN-8, Code 128, \ +Code 93, Code 39, Codabar, Interleaved 2 of 5, QR Code and SQ Code" SECTION = "graphics" -LICENSE = "LGPL-2.1" -DEPENDS = "pkgconfig intltool-native libpng jpeg" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5e9ee833a2118adc7d8b5ea38e5b1cef" -LIC_FILES_CHKSUM = "file://COPYING;md5=4015840237ca7f0175cd626f78714ca8" +SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https \ + file://0001-qt-Create-subdir-in-Makefile.patch \ + file://0002-zbarcam-Create-subdir-in-Makefile.patch \ +" +SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37" + +S = "${WORKDIR}/git" +PV = "0.23.1+git" -PV = "0.10+git${SRCPV}" +DEPENDS += "xmlto-native" -# iPhoneSDK-1.3.1 tag -SRCREV = "67003d2a985b5f9627bee2d8e3e0b26d0c474b57" -SRC_URI = "git://github.com/ZBar/Zbar \ - file://0001-make-relies-GNU-extentions.patch \ +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ " -S = "${WORKDIR}/git" -inherit autotools pkgconfig +PACKAGECONFIG ??= "video" -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +inherit autotools pkgconfig gettext \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gtk3', 'gobject-introspection', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)} -PACKAGECONFIG[x11] = "--with-x,-without-x,libxcb libx11 libsm libxau libxext libxv libice libxdmcp" +PACKAGECONFIG[x11] = "--with-x, --without-x, libxv" +PACKAGECONFIG[video] = "--enable-video, --disable-video, v4l-utils libv4l" +PACKAGECONFIG[jpeg] = "--with-jpeg, --without-jpeg, jpeg" +PACKAGECONFIG[python3] = "--with-python=auto, --without-python, python3" +PACKAGECONFIG[gtk3] = "--with-gtk=gtk3, --without-gtk, gtk+3" +PACKAGECONFIG[qt5] = "--with-qt5, --without-qt5, qtbase qtbase-native qtx11extras qtsvg, qtbase" +PACKAGECONFIG[imagemagick] = "--with-imagemagick, --without-imagemagick, imagemagick" -EXTRA_OECONF = "--without-imagemagick --without-qt --without-python --disable-video --without-gtk" +FILES:${PN} += "${bindir} \ + ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ +" + +CPPFLAGS:append = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ + -I${STAGING_INCDIR}/QtX11Extras \ + -I${STAGING_INCDIR}/dbus-1.0 \ + -I${STAGING_LIBDIR}/dbus-1.0/include \ + ', '', d)} \ +" -CPPFLAGS += "-Wno-error" +TARGET_CXXFLAGS:append = " -fPIC" -do_install_append() { - #remove usr/bin if empty - rmdir ${D}${bindir} +do_configure:prepend() { + install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/ } diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb b/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb deleted file mode 100644 index e041132b1c..0000000000 --- a/meta-oe/recipes-support/zchunk/zchunk_1.1.6.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "A file format designed for highly efficient deltas while maintaining good compression" -AUTHOR = "Jonathan Dieter" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cd6e590282010ce90a94ef25dd31410f" - -SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https" - -SRCREV = "f5593aa11584faa691c81b4898f0aaded47f8bf7" -S = "${WORKDIR}/git" - -DEPENDS = "\ - curl \ - zstd \ - " - -DEPENDS_append_libc-musl = " argp-standalone" -LDFLAGS_append_libc-musl = " -largp" - -inherit meson - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb b/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb new file mode 100644 index 0000000000..0c8a9c7a5f --- /dev/null +++ b/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A file format designed for highly efficient deltas while maintaining good compression" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242" + +SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" + +SRCREV = "4dd91d31157ede4a1b092721d944ae2fdd161cd9" +S = "${WORKDIR}/git" + +DEPENDS = "zstd" +DEPENDS:append:libc-musl = " argp-standalone" + +inherit meson pkgconfig lib_package + +PACKAGECONFIG ??= "openssl zckdl" + +# zckdl gets packaged into zchunk-bin +PACKAGECONFIG[zckdl] = "-Dwith-curl=enabled,-Dwith-curl=disabled,curl" +# Use OpenSSL primitives for SHA +PACKAGECONFIG[openssl] = "-Dwith-openssl=enabled,-Dwith-openssl=disabled,openssl" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-oe/recipes-support/zile/zile_2.4.15.bb index acd491498e..e86b3f82d2 100644 --- a/meta-oe/recipes-support/zile/zile_2.4.14.bb +++ b/meta-oe/recipes-support/zile/zile_2.4.15.bb @@ -2,24 +2,24 @@ SUMMARY = "Zile is lossy Emacs" HOMEPAGE = "http://zile.sourceforge.net/" DEPENDS = "ncurses bdwgc" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "${GNU_MIRROR}/zile/${BP}.tar.gz \ file://remove-help2man.patch \ " -SRC_URI[md5sum] = "c7d7eec93231c6878f255978d9747a73" -SRC_URI[sha256sum] = "7a78742795ca32480f2bab697fd5e328618d9997d6f417cf1b14e9da9af26b74" +SRC_URI[md5sum] = "05efa90dfee1821ca018b0b2ef8f50a8" +SRC_URI[sha256sum] = "39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e" inherit autotools pkgconfig -do_install_append() { +do_install:append() { rm -rf ${D}${libdir}/charset.alias rmdir --ignore-fail-on-non-empty ${D}${libdir} || true } PACKAGECONFIG ??= "" -PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" +PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)}" PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," |