diff options
author | jmbills <jason.m.bills@intel.com> | 2021-10-04 22:42:48 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-04 22:42:48 +0300 |
commit | 0c9e31989c615598b5d042ffab385606660c93c0 (patch) | |
tree | 8019999b0ca042482e5193d6cabc06220c71d776 /meta-openembedded/meta-oe/recipes-support | |
parent | 04cd92067d2481643df5010cb39b2134b648cf4d (diff) | |
parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
download | openbmc-0c9e31989c615598b5d042ffab385606660c93c0.tar.xz |
Update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
165 files changed, 861 insertions, 1098 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb b/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb index 4ea6c8a29..15cfb6eec 100644 --- a/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https" PV = "02.07.17+git${SRCPV}" SRCREV = "812e2c56aed246931a667f16c28b096e34597016" -FILES_${PN} = "${datadir}/ace-builds" +FILES:${PN} = "${datadir}/ace-builds" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb index a83efe03c..3ca394ac3 100644 --- a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb @@ -12,34 +12,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-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb index 36aff7503..530e06196 100644 --- a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.18.1.bb @@ -13,7 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" inherit autotools -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084" diff --git a/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb b/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb index 5bde96519..c91d86610 100644 --- a/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb @@ -48,9 +48,9 @@ do_install() { 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-openembedded/meta-oe/recipes-support/augeas/augeas.inc b/meta-openembedded/meta-oe/recipes-support/augeas/augeas.inc index 1bbd181c3..d83ba493e 100644 --- a/meta-openembedded/meta-oe/recipes-support/augeas/augeas.inc +++ b/meta-openembedded/meta-oe/recipes-support/augeas/augeas.inc @@ -15,19 +15,19 @@ inherit autotools pkgconfig PACKAGES =+ "${PN}-lenses lib${BPN}" -FILES_${PN}-lenses = "${datadir}/augeas/lenses" -FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" +FILES:${PN}-lenses = "${datadir}/augeas/lenses" +FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" -RDEPENDS_lib${BPN} += "${PN}-lenses" -RRECOMMENDS_lib${BPN} += "${PN}" +RDEPENDS:lib${BPN} += "${PN}-lenses" +RRECOMMENDS:lib${BPN} += "${PN}" LEAD_SONAME = "libaugeas.so" -do_install_append() { +do_install:append() { rm -fr ${D}${datadir}/vim } -PACKAGECONFIG ??= "" -PACKAGECONFIG[libselinux] = "--with-selinux,--without-selinux,libselinux" +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-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb index 407de2138..b478b86ba 100644 --- a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.0.4.bb @@ -32,8 +32,8 @@ inherit autotools pkgconfig EXTRA_OECONF += "--enable-cpluscplus" -CFLAGS_append_libc-musl = " -D_GNU_SOURCE -DNO_GETCONTEXT -DSEARCH_FOR_DATA_START -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" +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-openembedded/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch deleted file mode 100644 index 8f15f8424..000000000 --- a/meta-openembedded/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-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch deleted file mode 100644 index c6f9c6de6..000000000 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 2cc41bee63223cb398ea932aad6ecc94ff5b61dd 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 | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 08c0247..0020d6b 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 -@@ -551,6 +554,15 @@ ENDIF() - # Record toplevel CMakeLists.txt path - set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}") - -+# 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 - # -@@ -624,7 +636,6 @@ IF (CARES_INSTALL) - INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - 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") diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb index 92eb9dae5..2109d955d 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.2.bb @@ -5,14 +5,8 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" -PV = "1.17.1" - -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 = "39c73b503d9ef70a58ad1f4a4643f15b01407c66" +SRC_URI = "git://github.com/c-ares/c-ares.git;branch=main" +SRCREV = "6654436a307a5a686b008c1d4c93b0085da6e6d8" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" @@ -22,6 +16,6 @@ inherit cmake pkgconfig PACKAGES =+ "${PN}-utils" -FILES_${PN}-utils = "${bindir}" +FILES:${PN}-utils = "${bindir}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb index 22b9d0bb9..f8282583d 100644 --- a/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb @@ -22,6 +22,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-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb index b9858d279..5f93d8df0 100644 --- a/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb +++ b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb @@ -31,8 +31,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 +45,14 @@ RDEPENDS_${PN}-bin = " \ python3-threading \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/geisview \ ${libdir}/${PYTHON_DIR}/site-packages/geis* \ ${libdir}/${PYTHON_DIR}/site-packages/_*.so \ " -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" +FILES:${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" -FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/site-packages/_*.la" +FILES:${PN}-dev += "${libdir}/${PYTHON_DIR}/site-packages/_*.la" -FILES_${PN}-staticdev += "${libdir}/${PYTHON_DIR}/site-packages/_*.a" +FILES:${PN}-staticdev += "${libdir}/${PYTHON_DIR}/site-packages/_*.a" diff --git a/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb index e1d377725..3e5af2a29 100644 --- a/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \ inherit autotools pkgconfig 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" @@ -23,5 +23,5 @@ 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-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb index 3c5889425..4b1c42173 100644 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.33.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "virtual/libusb0 pcsc-lite" -RDEPENDS_${PN} = "pcsc-lite" +RDEPENDS:${PN} = "pcsc-lite" SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ file://no-dep-on-libfl.patch \ @@ -16,5 +16,5 @@ SRC_URI[sha256sum] = "5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb6 inherit autotools pkgconfig -FILES_${PN} += "${libdir}/pcsc/" -FILES_${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" +FILES:${PN} += "${libdir}/pcsc/" +FILES:${PN}-dbg += "${libdir}/pcsc/drivers/*/*/*/.debug" diff --git a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb index 7feba4a5a..a5165166c 100644 --- a/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_2.0.0.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/git" inherit cmake -do_configure_prepend() { +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) @@ -37,6 +37,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-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb index 5f022d78a..a01f2c272 100644 --- a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_1.9.1.bb @@ -14,4 +14,4 @@ inherit cmake inherit ptest # cli11 is a header only C++ library, so the main package will be empty. -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.0.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.1.bb index c52a04064..e2db8aa76 100644 --- a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.1.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" SRC_URI = "git://github.com/commonmark/cmark.git" -SRCREV = "8800e66010214384e75f933830ca5585e1ae3060" +SRCREV = "977b128291c0cf6c5053cdcf2ac72e627f09c105" S = "${WORKDIR}/git" inherit cmake lib_package diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb index 845041cc4..65fa0f44b 100644 --- a/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord-native.bb @@ -1,6 +1,6 @@ require ${BPN}.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-native:" inherit meson native diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb index f514c0b78..66dc4a580 100644 --- a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb @@ -4,7 +4,7 @@ inherit meson gobject-introspection gsettings gettext bash-completion systemd fe # polkit and gobject-introspection are mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" +UNKNOWN_CONFIGURE_WHITELIST:append = " introspection" DEPENDS += " \ ${BPN}-native \ @@ -28,9 +28,9 @@ 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 \ @@ -42,4 +42,4 @@ FILES_${PN} += " \ " 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-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb b/meta-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb index 90bd560c4..2bd69e8d5 100644 --- a/meta-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/consolation/consolation_0.0.8.bb @@ -21,9 +21,9 @@ 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-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb index 472b72fc2..3c271ae5d 100644 --- a/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb @@ -22,5 +22,5 @@ inherit cmake pkgconfig DEPENDS = "zlib boost openssl" -EXTRA_OECMAKE_append = " -DCPP-NETLIB_BUILD_TESTS=OFF -DCPP-NETLIB_BUILD_EXAMPLES=OFF" +EXTRA_OECMAKE:append = " -DCPP-NETLIB_BUILD_TESTS=OFF -DCPP-NETLIB_BUILD_EXAMPLES=OFF" diff --git a/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb index 3a049e76d..25d5b09e7 100644 --- a/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb +++ b/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb @@ -20,4 +20,4 @@ do_install() { install -dm 755 ${D}${libdir}/ctapi } -FILES_${PN} += "${libdir}/ctapi" +FILES:${PN} += "${libdir}/ctapi" diff --git a/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index f0c5f7d7d..ed73408cd 100644 --- a/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb @@ -35,10 +35,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-openembedded/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2.bb index 9bd1eb73d..56ca7a1b3 100644 --- a/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2.bb +++ b/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}" CFLAGS += "-DFORCE_STRICT_ALIGNMENT" -python do_unpack_append() { +python do_unpack:append() { os.rename("devmem2-new.c", "devmem2.c") } diff --git a/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb index 74af54ca5..0511f4a30 100644 --- a/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.4.bb @@ -21,4 +21,4 @@ do_install() { oe_runmake 'DESTDIR=${D}' install } -RDEPENDS_${PN} += "python3-core python3-misc python3-resource python3-shell python3-unixadmin" +RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell python3-unixadmin" diff --git a/meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb index dec2e7ab4..ca1a2457f 100644 --- a/meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb @@ -20,7 +20,7 @@ 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 +28,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-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb index 01629f416..a91c465c1 100644 --- a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "https://ftp.gnu.org/pub/gnu/emacs/emacs-${PV}.tar.xz \ file://emacs-glibc-2.34.patch \ " -SRC_URI_append_class-target = " file://usemake-docfile-native.patch" +SRC_URI:append:class-target = " file://usemake-docfile-native.patch" SRC_URI[sha256sum] = "b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9" @@ -22,24 +22,24 @@ PACKAGECONFIG ??= "gnutls kerberos libgmp" EXTRA_OECONF = " --with-x=no --with-dumping=none" DEPENDS = "ncurses" -DEPENDS_append_class-target = " emacs-native" +DEPENDS:append:class-target = " emacs-native" inherit autotools mime-xdg -do_compile_class-native (){ +do_compile:class-native (){ cd ${B}/lib-src oe_runmake make-docfile oe_runmake make-fingerprint } -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}/ } -do_install_append(){ +do_install:append(){ # Delete systemd stuff, extend using DISTRO_FEATURES? rm -rf ${D}/${libdir} # Extra stuff which isnt needed @@ -59,13 +59,13 @@ 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 = " \ +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 \ @@ -185,7 +185,7 @@ FILES_${PN}-minimal = " \ # What works for "most" is relative, but this can be easily extended if needed -FILES_${PN}-base = " \ +FILES:${PN}-base = " \ ${datadir}/${BPN}/${PV}/etc/srecode \ ${datadir}/${BPN}/${PV}/etc/e \ ${datadir}/${BPN}/${PV}/etc/forms \ @@ -253,8 +253,8 @@ FILES_${PN}-base = " \ " # 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-openembedded/meta-oe/recipes-support/enca/enca_1.19.bb b/meta-openembedded/meta-oe/recipes-support/enca/enca_1.19.bb index 0adf0a29c..f81ed670c 100644 --- a/meta-openembedded/meta-oe/recipes-support/enca/enca_1.19.bb +++ b/meta-openembedded/meta-oe/recipes-support/enca/enca_1.19.bb @@ -16,12 +16,12 @@ SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362 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-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb b/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb index 78f8f85c9..8dcc9789c 100644 --- a/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb +++ b/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb @@ -19,7 +19,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 +64,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-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb b/meta-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb index c9a382ad4..08710aa1d 100644 --- a/meta-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb @@ -16,6 +16,6 @@ PV = "gitr${SRCPV}" inherit autotools pkgconfig PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${libdir}/python*/site-packages/*" -RDEPENDS_${PN}-python = "python3" +FILES:${PN}-python = "${libdir}/python*/site-packages/*" +RDEPENDS:${PN}-python = "python3" diff --git a/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.18.bb b/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.18.bb index f3e7b8bac..c65d72cd8 100644 --- a/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.18.bb @@ -25,16 +25,16 @@ GTKDOC_MESON_DISABLE_FLAG = "disabled" inherit meson gtk-doc gobject-introspection -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" +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() { +do_configure:prepend() { mkdir ${S}/m4 || true } -do_compile_append() { +do_compile:append() { for i in $(find ${B} -name "*.pc") ; do sed -i -e s:${STAGING_DIR_TARGET}::g \ -e s:/${TARGET_SYS}::g \ diff --git a/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes.bb index b76855332..034c2871a 100644 --- a/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes.bb +++ b/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes.bb @@ -18,4 +18,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-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb index e3e406ff5..969a6d23a 100644 --- a/meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb @@ -9,7 +9,7 @@ SUMMARY = "The fbset console tool" HOMEPAGE = "http://users.telenet.be/geertu/Linux/fbdev/" LICENSE = "GPLv2" 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" @@ -29,7 +29,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-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb index 9979c21b8..38bf3a19c 100644 --- a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb @@ -23,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 @@ -84,19 +84,19 @@ do_install_ptest() { } 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_${PN}-dev += "${libdir}/cmake" -RDEPENDS_${PN}-dev = "libfftw libfftwl libfftwf" -RDEPENDS_${PN}-ptest += "perl" -RDEPENDS_${PN}-ptest_remove = "fftw" +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" +RDEPENDS:${PN}-ptest += "perl" +RDEPENDS:${PN}-ptest:remove = "fftw" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb index 5d5a236be..8d3992a6e 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb @@ -18,7 +18,7 @@ EXTRA_OECMAKE += " \ # lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): undefined reference to symbol 'dlsym@@GLIBC_2.2.5' LDFLAGS += "-ldl" -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-openembedded/meta-oe/recipes-support/fltk/fltk.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb index 51b4a0bc8..3c9ee5ee3 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb @@ -5,6 +5,8 @@ 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-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch" + EXTRA_OECMAKE = " \ -DOPTION_BUILD_SHARED_LIBS=ON \ -DOPTION_USE_THREADS=ON \ @@ -22,23 +24,23 @@ PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,li 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() { +do_install:append() { sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/fltk-config } -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-openembedded/meta-oe/recipes-support/fltk/fltk.inc b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc index 403cbddbb..6e8fdc9d3 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc @@ -11,8 +11,8 @@ SRC_URI = " \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.6" -SRC_URI[sha256sum] = "20d2627c97b4485ee3eab5522303985bc22b798a878ba80239e6d43dcfed067e" +PV = "1.3.7" +SRC_URI[sha256sum] = "5ff1e90766ff4216e78e9a19a9bf527e6258f04accccd4429e9bb829b01d690d" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch new file mode 100644 index 000000000..72bb48a32 --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb index 8890f6ce9..f46834445 100644 --- a/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_2.3.0.bb @@ -48,19 +48,19 @@ PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" PACKAGES =+ "libfreerdp" LEAD_SONAME = "libfreerdp.so" -FILES_libfreerdp = "${libdir}/lib*${SOLIBS}" +FILES:libfreerdp = "${libdir}/lib*${SOLIBS}" PACKAGES_DYNAMIC += "^libfreerdp-plugin-.*" # 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$', diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb index 14b988337..8b0c78667 100644 --- a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb @@ -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-openembedded/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch b/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch new file mode 100644 index 000000000..6152a1184 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch @@ -0,0 +1,29 @@ +From 8b111b2b4a4842179be66db68d84dda91a246032 Mon Sep 17 00:00:00 2001 +From: maryam ebrahimzadeh <maryam.ebr@student.sharif.edu> +Date: Mon, 19 Jul 2021 10:07:13 +0430 +Subject: [PATCH] fix read out-of-bands in reading tga header file + +--- + src/gd_tga.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/gd_tga.c b/src/gd_tga.c +index cae9428..286febb 100644 +--- a/src/gd_tga.c ++++ b/src/gd_tga.c +@@ -191,7 +191,11 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga) + return -1; + } + +- gdGetBuf(tga->ident, tga->identsize, ctx); ++ ++ if (gdGetBuf(tga->ident, tga->identsize, ctx) != tga->identsize) { ++ gd_error("fail to read header ident"); ++ return -1; ++ } + } + + return 1; +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb index 4e95fa954..32484ce79 100644 --- a/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.3.2.bb @@ -15,6 +15,7 @@ DEPENDS = "freetype libpng jpeg zlib tiff" SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ file://0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch \ + file://0001-fix-read-out-of-bands-in-reading-tga-header-file.patch \ " SRCREV = "2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e" @@ -34,21 +35,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-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb index 6eea0c00e..6436df457 100644 --- a/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.2.bb @@ -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-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb index c4ba9f244..40199343e 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb @@ -18,16 +18,16 @@ S = "${WORKDIR}/git" inherit cmake PACKAGECONFIG ?= "shared unwind" -PACKAGECONFIG_remove_riscv64 = "unwind" -PACKAGECONFIG_remove_riscv32 = "unwind" -PACKAGECONFIG_append_libc-musl_riscv64 = " execinfo" -PACKAGECONFIG_append_libc-musl_riscv32 = " execinfo" +PACKAGECONFIG:remove:riscv64 = "unwind" +PACKAGECONFIG:remove:riscv32 = "unwind" +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,," -do_configure_append() { +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 diff --git a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb index bf8cb9017..557af0e85 100644 --- a/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.9.1.bb @@ -8,7 +8,7 @@ Included are an optimized thread-caching malloc() and cpu and heap profiling uti LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a" -DEPENDS_append_libc-musl = " libucontext" +DEPENDS:append:libc-musl = " libucontext" SRCREV = "f7c6fb6c8e99d6b1b725e5994373bcd19ffdf8fd" SRC_URI = "git://github.com/gperftools/gperftools \ @@ -19,7 +19,7 @@ SRC_URI = "git://github.com/gperftools/gperftools \ file://sgidef.patch \ " -SRC_URI_append_libc-musl = " file://ppc-musl.patch" +SRC_URI:append:libc-musl = " file://ppc-musl.patch" inherit autotools @@ -28,32 +28,32 @@ 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" +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" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:toolchain-clang:arm = "arm" -EXTRA_OECONF_append_libc-musl_powerpc64le = " --disable-cpu-profiler --disable-heap-profiler --disable-heap-checker" +EXTRA_OECONF:append:libc-musl:powerpc64le = " --disable-cpu-profiler --disable-heap-profiler --disable-heap-checker" PACKAGECONFIG ?= "libunwind static" -PACKAGECONFIG_remove_arm_libc-musl = "libunwind" -PACKAGECONFIG_remove_riscv64 = "libunwind" -PACKAGECONFIG_remove_riscv32 = "libunwind" +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}" +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} += " \ +RDEPENDS:${PN} += " \ binutils \ curl \ perl-module-carp \ @@ -63,4 +63,4 @@ RDEPENDS_${PN} += " \ perl-module-posix \ " -RDEPENDS_${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" +RDEPENDS:${PN} += "libtcmalloc-minimal (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb index 600b25df8..039c9554e 100644 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb @@ -25,15 +25,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-openembedded/meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb b/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb index 7ed46f82c..b94bdad3a 100644 --- a/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb +++ b/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1-201903191516.bb @@ -45,6 +45,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-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.106.bb b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.106.bb index 0249d09e4..15c0f6faf 100644 --- a/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.106.bb +++ b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.106.bb @@ -18,12 +18,12 @@ S = "${WORKDIR}/${BPN}-2.8" 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-openembedded/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb index d5da2b688..27d5c5fef 100644 --- a/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb +++ b/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb @@ -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-openembedded/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-openembedded/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch new file mode 100644 index 000000000..288e642fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch @@ -0,0 +1,65 @@ +From 39572baac462f16b39dc385751d5c642646718d3 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 4 Aug 2021 17:05:10 +0800 +Subject: [PATCH] cmake: remove build flags + +Remove the build flags to improve reproducibility. + +Upstream-Status: Inappropriate[oe specific] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + config/cmake/libh5cc.in | 2 +- + config/cmake/libhdf5.settings.cmake.in | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in +index f462d56..93c7137 100644 +--- a/config/cmake/libh5cc.in ++++ b/config/cmake/libh5cc.in +@@ -29,4 +29,4 @@ printf 'dir is %s\n' "$dir" + + export PKG_CONFIG_PATH=$dir/lib/pkgconfig + +-@_PKG_CONFIG_COMPILER@ `pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@ ++`pkg-config --define-variable=prefix=$dir --cflags --libs @_PKG_CONFIG_LIBNAME@-@_PKG_CONFIG_VERSION@` $@ +diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in +index c337dea..0ab9066 100644 +--- a/config/cmake/libhdf5.settings.cmake.in ++++ b/config/cmake/libhdf5.settings.cmake.in +@@ -16,8 +16,8 @@ General Information: + Compiling Options: + ------------------ + Compilation Mode: @CMAKE_BUILD_TYPE@ @CMAKE_C_COMPILER_VERSION@ +- C Compiler: @CMAKE_C_COMPILER@ +- CFLAGS: @CMAKE_C_FLAGS@ ++ C Compiler: ++ CFLAGS: + H5_CFLAGS: @H5_CFLAGS@ + AM_CFLAGS: @AM_CFLAGS@ + CPPFLAGS: @CPPFLAGS@ +@@ -29,8 +29,8 @@ Compiling Options: + LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@ + AM_LDFLAGS: @AM_LDFLAGS@ + Extra libraries: @LINK_LIBS@ +- Archiver: @CMAKE_AR@ +- Ranlib: @CMAKE_RANLIB@ ++ Archiver: ++ Ranlib: + Debugged Packages: @DEBUG_PKG@ + API Tracing: @HDF5_ENABLE_TRACE@ + +@@ -46,8 +46,8 @@ Languages: + @BUILD_FORTRAN_CONDITIONAL_TRUE@ Static Fortran Library: YES + + C++: @HDF5_BUILD_CPP_LIB@ +-@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ +-@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CMAKE_CXX_FLAGS@ ++@BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: ++@BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: + @BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@ + @BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@ + @BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @H5_ENABLE_SHARED_LIB@ +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb index 11285451a..7b886a463 100644 --- a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb +++ b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb @@ -16,11 +16,12 @@ SRC_URI = " \ file://H5Tinit-32.c \ file://0001-cross-compiling-support.patch \ file://0002-Remove-suffix-shared-from-shared-library-name.patch \ + file://0001-cmake-remove-build-flags.patch \ " SRC_URI[md5sum] = "2d2408f2a9dfb5c7b79998002e9a90e9" SRC_URI[sha256sum] = "e5b1b1dee44a64b795a91c3321ab7196d9e0871fe50d42969761794e3899f40d" -FILES_${PN} += "${libdir}/libhdf5.settings ${datadir}/*" +FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" EXTRA_OECMAKE = " \ -DTEST_LFS_WORKS_RUN=0 \ @@ -47,7 +48,7 @@ gen_hd5file() { install -m 544 ${WORKDIR}/H5Tinit-${SITEINFO_BITS}.c ${S}/H5Tinit.c } -do_install_append() { +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} diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb index 76f5dc762..e45445073 100644 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -7,6 +7,7 @@ LICENSE = "BSD-3-Clause | GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7c3949a631240cb6c31c50f3eb696077" DEPENDS = "libusb udev" +RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb index 8e9b95d91..7854c7beb 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.0.5.bb @@ -30,4 +30,6 @@ PACKAGECONFIG[setuid] = "--enable-setuid,--disable-setuid" PACKAGECONFIG[delayacct] = "--enable-delayacct,--disable-delayacct,libnl" PACKAGECONFIG[sensors] = "--with-sensors,--without-sensors,lmsensors,lmsensors-libsensors" -FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/htop.svg" +FILES:${PN} += "${datadir}/icons/hicolor/scalable/apps/htop.svg" + +RDEPENDS:${PN} += "ncurses-terminfo-base" diff --git a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb index 28c2d809a..eb1472fea 100644 --- a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb +++ b/meta-openembedded/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" +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" LIC_FILES_CHKSUM = " \ file://dictionaries/bg/license;md5=ab14e2ded1a43b84be9aba2be64b9814 \ file://dictionaries/br/license;md5=2e046c64edc0a4e47fb3ea614e6c82c4 \ @@ -131,7 +131,7 @@ LIC_FILES_CHKSUM = " \ file://dictionaries/vi/license;md5=8d9ecb4e7577ce760029786aba7ecec5 \ " -RDEPENDS_${PN} = "hunspell" +RDEPENDS:${PN} = "hunspell" PV = "0.0.0+git${SRCPV}" SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" @@ -148,4 +148,4 @@ do_install() { done } -FILES_${PN} = "${datadir}/hunspell" +FILES:${PN} = "${datadir}/hunspell" diff --git a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb index c2fb4fa05..b0aa4f719 100644 --- a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.7.0.bb @@ -13,6 +13,6 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig gettext -RDEPENDS_${PN} = "perl" +RDEPENDS:${PN} = "perl" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb index 43fb9189c..192aa5746 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.347.bb @@ -17,5 +17,5 @@ do_install() { oe_runmake install DESTDIR=${D} } -FILES_${PN} = "${libdir}/* \ +FILES:${PN} = "${libdir}/* \ ${datadir}/* " diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb index ac81fc75a..d8e63156e 100644 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb @@ -35,18 +35,18 @@ PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt" -FILES_${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \ +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" 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" @@ -62,7 +62,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-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb index 0d21a6bfe..111a8208a 100644 --- a/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/imapfilter/imapfilter_2.7.5.bb @@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "ab19f840712e6951e51c29e44c43b3b2fa42e93693f98f8969cc763a4f DEPENDS= "openssl lua libpcre2" -EXTRA_OEMAKE_append = " PREFIX=${prefix}" +EXTRA_OEMAKE:append = " PREFIX=${prefix}" do_install(){ oe_runmake DESTDIR=${D} install diff --git a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb index 5beb29281..00747f4d4 100644 --- a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb @@ -20,4 +20,4 @@ S = "${WORKDIR}/git" inherit gitpkgv cmake # We don't have libinih since we only have static libraries -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb index 8206590a8..26e7e8459 100644 --- a/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb @@ -18,4 +18,4 @@ EXTRA_OECONF = "--disable-doxygen" PACKAGES =+ "libinotifytools" -FILES_libinotifytools = "${libdir}/lib*.so.*" +FILES:libinotifytools = "${libdir}/lib*.so.*" diff --git a/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb index 0cc8b31b3..c501b1534 100755 --- a/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.14.bb @@ -8,7 +8,7 @@ LCOV supports statement, function and branch coverage measurement." LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ libjson-perl \ libperlio-gzip-perl \ perl \ @@ -44,7 +44,7 @@ RDEPENDS_${PN} += " \ perl-module-tie-hash \ " -RDEPENDS_${PN}_append_class-target = " \ +RDEPENDS:${PN}:append:class-target = " \ gcov \ gcov-symlinks \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb index 4cfb73293..127f71da4 100644 --- a/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb @@ -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-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb index 0aaf188b6..ba21ffaf0 100644 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.4.bb @@ -21,7 +21,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-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb index 1495051d7..0b85862bb 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb @@ -32,7 +32,7 @@ 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='' ) @@ -41,23 +41,23 @@ python populate_packages_prepend() { 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-openembedded/meta-oe/recipes-support/libcereal/libcereal/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch new file mode 100644 index 000000000..93114dadd --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch @@ -0,0 +1,37 @@ +From c9e60ed064aa2938f71f2cacf79f0bb337812bf8 Mon Sep 17 00:00:00 2001 +From: Anton Blanchard <anton@ozlabs.org> +Date: Tue, 17 Aug 2021 09:32:43 +1000 +Subject: [PATCH] Use GNUInstallDirs instead of hard wiring install directories + +On a multilib setup cmake files should go into lib64. + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/710] +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b97c1f59..ad574290 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,14 +70,15 @@ endif() + + option(CEREAL_INSTALL "Generate the install target" ${CEREAL_MASTER_PROJECT}) + if(CEREAL_INSTALL) ++ include(GNUInstallDirs) + include(CMakePackageConfigHelpers) + + install(TARGETS cereal EXPORT ${PROJECT_NAME}Targets) +- install(DIRECTORY include/cereal DESTINATION include) ++ install(DIRECTORY include/cereal DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + set(configFile ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake) + set(versionFile ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake) +- set(configInstallDestination lib/cmake/${PROJECT_NAME}) ++ set(configInstallDestination ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) + + configure_package_config_file( + ${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb index dc5050969..6498bb367 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb @@ -16,7 +16,9 @@ PROVIDES += "${PN}-dev" PV .= "+git${SRCPV}" SRCREV = "64f50dbd5cecdaba785217e2b0aeea3a4f1cdfab" -SRC_URI = "git://github.com/USCiLab/cereal.git" +SRC_URI = "git://github.com/USCiLab/cereal.git \ + file://0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch \ + " S = "${WORKDIR}/git" @@ -24,8 +26,8 @@ inherit cmake pkgconfig EXTRA_OECMAKE = "-DJUST_INSTALL_CEREAL=ON" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb index 6237638d3..d98fa2c2f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb @@ -17,6 +17,6 @@ inherit cmake S = "${WORKDIR}/git" -do_install_append(){ +do_install:append(){ chrpath -d ${D}${libdir}/libcppkafka.so.0.3.1 } diff --git a/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb index 74b5e21e2..98871c3cf 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb @@ -15,4 +15,4 @@ S = "${WORKDIR}/git" inherit cmake PACKAGES =+ "${PN}-utils" -FILES_${PN}-utils = "${bindir}/*" +FILES:${PN}-utils = "${bindir}/*" diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb index a54d8f8f7..8ce26ff63 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb @@ -17,10 +17,10 @@ S = "${WORKDIR}/git" inherit cmake -FILES_${PN}-dev += "${datadir}/eigen3/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})" +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb index 8479b274e..d1cc721ad 100644 --- a/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb @@ -30,4 +30,4 @@ BBCLASSEXTEND = "native nativesdk" PACKAGES += "${PN}-python" -FILES_${PN}-python = "${libdir}/${PYTHON_DIR}/site-packages/" +FILES:${PN}-python = "${libdir}/${PYTHON_DIR}/site-packages/" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb index be5be2f8d..ac4ba85d7 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb @@ -28,7 +28,7 @@ EXTRA_OECONF = "--enable-tools" DEPENDS += "autoconf-archive-native" PACKAGES =+ "${PN}-tools libgpiodcxx ${PN}-python" -FILES_${PN}-tools = " \ +FILES:${PN}-tools = " \ ${bindir}/gpiodetect \ ${bindir}/gpioinfo \ ${bindir}/gpioget \ @@ -36,7 +36,7 @@ FILES_${PN}-tools = " \ ${bindir}/gpiofind \ ${bindir}/gpiomon \ " -FILES_${PN}-ptest += " \ +FILES:${PN}-ptest += " \ ${bindir}/gpiod-test \ ${bindir}/gpio-tools-test \ ${bindir}/gpio-tools-test.bats \ @@ -44,14 +44,14 @@ FILES_${PN}-ptest += " \ ${bindir}/gpiod_py_test.py \ ${libdir}/libgpiomockup.so.* \ " -FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" +FILES:libgpiodcxx = "${libdir}/libgpiodcxx.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" +RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '', d)}" +RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-mockup" -PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)}" +PACKAGECONFIG:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)}" do_install_ptest() { install -d ${D}${PTEST_PATH}/tests @@ -63,7 +63,7 @@ do_install_ptest() { # we're not selecting libgpiod-tools. 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/ - for tool in ${FILES_${PN}-tools}; do + for tool in ${FILES:${PN}-tools}; do install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ done diff --git a/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb index 8d30c1f7b..01c94f847 100644 --- a/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libharu/libharu_2.3.0.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit cmake DEPENDS += "libpng zlib" -do_install_append() { +do_install:append() { mkdir -p ${D}/${datadir}/libharu mv ${D}/libharu ${D}/${datadir} } diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index d2d6fd475..748633d9d 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -38,17 +38,17 @@ PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" -RDEPENDS_${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" +RDEPENDS:${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" -FILES_${PN}-iiod = " \ +FILES:${PN}-iiod = " \ ${sbindir}/iiod \ ${systemd_system_unitdir}/iiod.service \ " -FILES_${PN}-tests = "${bindir}" -FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-tests = "${bindir}" +FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" SYSTEMD_PACKAGES = "${PN}-iiod" -SYSTEMD_SERVICE_${PN}-iiod = "iiod.service" +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 diff --git a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb index 7f425cdea..4dc2e8041 100644 --- a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb @@ -22,4 +22,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-openembedded/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb index 4928b6c3a..417a11f50 100644 --- a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb @@ -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-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.6.bb b/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.6.bb index 23ab348dc..78c75460e 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.6.bb @@ -12,5 +12,5 @@ SRC_URI[sha256sum] = "63653259a821ec7d90d681e52e757e2219d462828c9d74b056a5f53267 inherit meson pkgconfig gobject-introspection ptest vala -FILES_${PN}-ptest =+ "${bindir}/manette-test" -FILES_${PN}-dev =+ "${libdir}/girepository-1.0" +FILES:${PN}-ptest =+ "${bindir}/manette-test" +FILES:${PN}-dev =+ "${libdir}/girepository-1.0" diff --git a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.2.bb b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.2.bb index c0ed72d99..2e8ecbfc4 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmxml/libmxml_3.2.bb @@ -19,7 +19,7 @@ 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-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb b/meta-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb index d7adb2b94..b1e6da1bb 100644 --- a/meta-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb @@ -11,10 +11,10 @@ SRC_URI[sha256sum] = "9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a3200 inherit autotools binconfig -do_compile_prepend() { +do_compile:prepend() { install ${S}/utils/make_class.in ${B}/utils } -do_install_append() { +do_install:append() { rm -fr ${D}${bindir} } diff --git a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb index 1c5cc52bf..4c99a328b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb @@ -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-openembedded/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb b/meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb index 5314f4a48..0fa229662 100644 --- a/meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/librdkafka/librdkafka_1.6.1.bb @@ -18,6 +18,6 @@ inherit cmake S = "${WORKDIR}/git" -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" EXTRA_OECMAKE += "-DRDKAFKA_BUILD_EXAMPLES=OFF -DRDKAFKA_BUILD_TESTS=OFF"
\ No newline at end of file diff --git a/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.2.bb b/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.2.bb index f1997136a..79a1a0fb8 100644 --- a/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/librsync/librsync_2.3.2.bb @@ -13,6 +13,6 @@ DEPENDS = "popt" inherit cmake PACKAGES =+ "rdiff" -FILES_rdiff = "${bindir}/rdiff" +FILES:rdiff = "${bindir}/rdiff" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index ae76fade7..a98f32be4 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -12,21 +12,21 @@ SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \ SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11" SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3" -RDEPENDS_${PN} += "wget" +RDEPENDS:${PN} += "wget" inherit autotools EXTRA_OECONF = "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" diff --git a/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb index 8b773aefa..9abba6e04 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb @@ -26,7 +26,7 @@ PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-n PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \ '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-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:${PYTHON_PN}-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" +FILES:${PYTHON_PN}-libsoc += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.8.9.bb b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.8.9.bb index 2aff2c878..cbda8b7be 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.8.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.8.9.bb @@ -17,7 +17,7 @@ PACKAGECONFIG ??= "gcrypt" PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, " PACKAGECONFIG[gcrypt] = "-DWITH_GCRYPT=1, -DWITH_GCRYPT=0, libgcrypt, " -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" EXTRA_OECMAKE = " \ -DWITH_PCAP=1 \ @@ -26,7 +26,7 @@ EXTRA_OECMAKE = " \ -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " -do_configure_prepend () { +do_configure:prepend () { # Disable building of examples sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \ || bbfatal "Failed to disable examples" diff --git a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb index 149cfb8d2..a131de36c 100644 --- a/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb +++ b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.31.bb @@ -20,20 +20,20 @@ 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" do_install_ptest() { install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/ diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.0.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.0.bb index 9eddf2e2a..7a903e5d4 100644 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.0.bb @@ -13,15 +13,15 @@ SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ file://0001-examples-ucontext-cp.c-Do-not-use-SIGSTKSZ.patch \ file://0001-tests-fix-portability-issue-when-using-__NR_mmap-sys.patch \ " -SRC_URI_append_libc-musl_riscv64 = " file://0001-do-not-build-examples.patch " -SRC_URI_append_libc-musl_riscv32 = " file://0001-do-not-build-examples.patch " +SRC_URI:append:libc-musl:riscv64 = " file://0001-do-not-build-examples.patch " +SRC_URI:append:libc-musl:riscv32 = " file://0001-do-not-build-examples.patch " SRCREV = "b013dfd5a5f65116373d5e0f0bdfb73db9d8816e" 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() { diff --git a/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb b/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb index 21fa478b6..8c3337370 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusb/libusb-compat_0.1.7.bb @@ -33,7 +33,7 @@ inherit autotools pkgconfig binconfig-disabled lib_package EXTRA_OECONF = "--libdir=${base_libdir}" -do_install_append() { +do_install:append() { install -d ${D}${libdir} if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then mv ${D}${base_libdir}/pkgconfig ${D}${libdir} diff --git a/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb index b1c466352..94399a017 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb @@ -14,6 +14,6 @@ SRC_URI = "git://github.com/libusbg/libusbg.git \ 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-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start index 1a106b785..9e22671a9 100644..100755 --- a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start +++ b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start @@ -7,5 +7,10 @@ for i in $IMPORT_SCHEMAS; do 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-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index 48fc91143..dc0d5c08d 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -20,14 +20,14 @@ SRC_URI = " \ S = "${WORKDIR}/git" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "usbgx.service" +SYSTEMD_SERVICE:${PN} = "usbgx.service" INITSCRIPT_NAME = "usbgx" INITSCRIPT_PARAMS = "defaults" EXTRA_OECONF = "--includedir=${includedir}/usbgx" -do_install_append() { +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 @@ -37,9 +37,9 @@ do_install_append() { fi } -RDEPENDS_${PN} += "libusbgx-config" +RDEPENDS:${PN} += "libusbgx-config" ALTERNATIVE_PRIORITY = "90" -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-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb index b8a700b7b..68a8ad364 100644 --- a/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb +++ b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb @@ -37,6 +37,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-openembedded/meta-oe/recipes-support/links/links-x11_2.22.bb b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.22.bb index 563984c0e..e354bbafd 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.22.bb @@ -1,7 +1,7 @@ require links.inc DEPENDS += "virtual/libx11" -RCONFLICTS_${PN} = "links" +RCONFLICTS:${PN} = "links" inherit features_check # depends on virtual/libx11 @@ -21,7 +21,7 @@ EXTRA_OECONF = "--enable-graphics \ --without-directfb --without-pmshell --without-atheos \ --with-x --without-gpm" -do_install_append() { +do_install:append() { install -d ${D}/${datadir}/applications install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications install -d ${D}/${datadir}/pixmaps diff --git a/meta-openembedded/meta-oe/recipes-support/links/links_2.22.bb b/meta-openembedded/meta-oe/recipes-support/links/links_2.22.bb index 2bfc9ae07..f2b4a6a80 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links_2.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links_2.22.bb @@ -1,7 +1,7 @@ require links.inc DEPENDS += "gpm" -RCONFLICTS_${PN} = "links-x11" +RCONFLICTS:${PN} = "links-x11" EXTRA_OECONF = "--enable-graphics \ --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ diff --git a/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb index 4891fd187..7d7c67b65 100644 --- a/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb @@ -57,11 +57,11 @@ do_install() { PNBLACKLIST[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 \ +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-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb b/meta-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb index 5ae36bb67..3549cb215 100644 --- a/meta-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index ccb4f7ac1..43356c9cd 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -24,7 +24,7 @@ S = "${WORKDIR}/git" 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)} \ " diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb index 7f3f000e0..3988d5491 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.03.11.bb @@ -12,7 +12,7 @@ MULTILIB_SCRIPTS = "${PN}:${sysconfdir}/lvm/lvm.conf" CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" -do_install_append() { +do_install:append() { # Install machine specific configuration file install -d ${D}${sysconfdir}/lvm install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf @@ -30,33 +30,33 @@ do_install_append() { 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)} \ +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}" +EXTRA_OECONF:append:class-nativesdk = " --with-confdir=${sysconfdir}" DEPENDS += "util-linux" -LVM2_PACKAGECONFIG_append_class-target = " \ +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 = " \ +FILES:libdevmapper = " \ ${libdir}/libdevmapper.so.* \ ${sbindir}/dmsetup \ ${sbindir}/dmstats \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/device-mapper/*.so \ ${systemd_system_unitdir}/lvm2-pvscan@.service \ " -FILES_${PN}-scripts = " \ +FILES:${PN}-scripts = " \ ${sbindir}/blkdeactivate \ ${sbindir}/fsadm \ ${sbindir}/lvmconf \ @@ -64,22 +64,22 @@ FILES_${PN}-scripts = " \ " # 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" +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}) \ +RDEPENDS:${PN}-scripts = "${PN} (= ${EXTENDPKGV}) \ bash \ util-linux-lsblk \ util-linux-findmnt \ coreutils \ " -RRECOMMENDS_${PN}_class-target = "${PN}-scripts (= ${EXTENDPKGV})" +RRECOMMENDS:${PN}:class-target = "${PN}-scripts (= ${EXTENDPKGV})" -CONFFILES_${PN} += "${sysconfdir}/lvm/lvm.conf" +CONFFILES:${PN} += "${sysconfdir}/lvm/lvm.conf" -SYSROOT_PREPROCESS_FUNCS_append = " remove_libdevmapper_sysroot_preprocess" +SYSROOT_PREPROCESS_FUNCS:append = " remove_libdevmapper_sysroot_preprocess" remove_libdevmapper_sysroot_preprocess() { rm -f ${SYSROOT_DESTDIR}${libdir}/libdevmapper.so* \ ${SYSROOT_DESTDIR}${sbindir}/dmsetup \ diff --git a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.53.bb b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.53.bb index c3cd57fb6..34588380a 100644 --- a/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.53.bb +++ b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.53.bb @@ -27,5 +27,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-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb index 35fb94470..328f7c99b 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -17,15 +17,15 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git SRCREV = "7643baf6c3919b3d727e6ba6c2e545dc6a653307" PV = "20190917+git${SRCPV}" -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(){ +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-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb index ae810eff8..b77709485 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_175.bb @@ -21,7 +21,7 @@ inherit autotools-brokensep ptest COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' -do_install_append() { +do_install:append() { 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 @@ -33,4 +33,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-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb index eb7de1279..797e91eae 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/hboetes/mg \ 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-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.62.bb b/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.62.bb index 858521b65..46def2a23 100644 --- a/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.62.bb +++ b/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.62.bb @@ -1,14 +1,14 @@ SECTION = "base" SUMMARY = "MIME files 'mime.types' & 'mailcap', and support programs" LICENSE = "PD & Bellcore" -LICENSE_${PN} = "PD" +LICENSE:${PN} = "PD" # mailcap.man's license is Bellcore -LICENSE_${PN}-doc = "PD & 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}.tar.gz" SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a" @@ -16,9 +16,9 @@ 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} @@ -61,5 +61,5 @@ do_install () { } ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "mime.types" +ALTERNATIVE:${PN} = "mime.types" ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.0.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.1.bb index 069d9f81c..9833c0cec 100644 --- a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.1.bb @@ -15,7 +15,7 @@ SRC_URI = " \ file://monitrc \ " -SRC_URI[sha256sum] = "9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c" +SRC_URI[sha256sum] = "57d8885f66e58a0a4ca6a967f2bb7e8c15ed988a25b5ca6ba6733f919ef07a5c" DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" @@ -31,14 +31,14 @@ 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_install:append() { # Configuration file install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc diff --git a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb index 49899edd7..25cfafafa 100644 --- a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb @@ -13,7 +13,7 @@ DEPENDS = "gd " inherit autotools gettext -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-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 186f78b8f..d4d6c6ba9 100644 --- a/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -58,7 +58,7 @@ S = "${WORKDIR}/git" inherit systemd pkgconfig -SYSTEMD_SERVICE_${PN} = "multipathd.service" +SYSTEMD_SERVICE:${PN} = "multipathd.service" SYSTEMD_AUTO_ENABLE = "disable" TARGET_CC_ARCH += "${LDFLAGS}" @@ -68,8 +68,8 @@ 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. # @@ -100,23 +100,23 @@ do_install() { ${D}${sysconfdir}/multipath.conf.example } -FILES_${PN}-dbg += "${base_libdir}/multipath/.debug" +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" 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-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb index 8ba4ca13f..146ad55c6 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv3" 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]}" diff --git a/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index f37ccde1c..295628c77 100644 --- a/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -17,13 +17,13 @@ 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 = "(.*)" +COMPATIBLE_MACHINE:armv7ve = "(.*)" 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 = "armv7" +NE10_TARGET_ARCH:armv7ve = "armv7" 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-openembedded/meta-oe/recipes-support/neon/neon_0.30.2.bb b/meta-openembedded/meta-oe/recipes-support/neon/neon_0.30.2.bb index 2639c9229..5f120e9a7 100644 --- a/meta-openembedded/meta-oe/recipes-support/neon/neon_0.30.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/neon/neon_0.30.2.bb @@ -18,7 +18,7 @@ inherit autotools binconfig-disabled lib_package pkgconfig ptest # Enable gnutls or openssl, not both PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib" -PACKAGECONFIG_class-native = "expat gnutls webdav zlib" +PACKAGECONFIG:class-native = "expat gnutls webdav zlib" PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" @@ -31,7 +31,7 @@ PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" EXTRA_OECONF += "--enable-shared" -do_compile_append() { +do_compile:append() { oe_runmake -C test } diff --git a/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb b/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb index e77faa30a..32b60fef9 100644 --- a/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb +++ b/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb @@ -4,7 +4,7 @@ SECTION = "console/utils" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://${WORKDIR}/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 \ @@ -17,7 +17,7 @@ SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecc CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" LDFLAGS += "-ltinfo -lncursesw -lm" -ASNEEDED_pn-nmon = "" +ASNEEDED:pn-nmon = "" S = "${WORKDIR}" diff --git a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb index 6307c159e..1bf6811b7 100644 --- a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb +++ b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb @@ -15,7 +15,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz file://nspr.pc.in \ " -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ +CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" @@ -30,7 +30,7 @@ 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,15 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # preferred path upstream. EXTRA_OECONF += "--includedir=${includedir}/nspr" -do_compile_prepend() { +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 +190,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-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb index 98be21d40..c935c6a2a 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb @@ -9,7 +9,7 @@ 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 & MIT) | (MPL-2.0 & GPL-2.0+ & MIT) | (MPL-2.0 & LGPL-2.1+ & MIT)" @@ -45,30 +45,30 @@ TDS = "${S}/tentative-dist-staging" TARGET_CC_ARCH += "${LDFLAGS}" -CFLAGS_append_class-native = " -D_XOPEN_SOURCE " +CFLAGS:append:class-native = " -D_XOPEN_SOURCE " -do_configure_prepend_libc-musl () { +do_configure:prepend:libc-musl () { sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk } -do_configure_prepend_powerpc64le_toolchain-clang () { +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 () { +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() { +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}" } @@ -138,7 +138,7 @@ do_compile() { do_compile[vardepsexclude] += "SITEINFO_BITS" -do_install_prepend_class-nativesdk() { +do_install:prepend:class-nativesdk() { export LDFLAGS="" } @@ -215,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 @@ -231,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 @@ -246,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` @@ -259,24 +259,24 @@ 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" diff --git a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb index 3dae8b33c..075373563 100644 --- a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -26,7 +26,7 @@ LICENSE = "LGPLv2+" 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=" \ @@ -41,19 +41,19 @@ EXTRA_OECONF=" \ inherit autotools pkgconfig -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/ctapi \ ${nonarch_libdir}/udev \ ${libdir}/openct-ifd.so \ ${libdir}/pcsc \ " -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}" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb b/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb index 386180215..12b71226a 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/ade_0.1.1f.bb @@ -19,4 +19,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-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb index 31dcc3c29..7eefbccfe 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.5.2.bb @@ -5,8 +5,8 @@ SECTION = "libs" 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" @@ -53,7 +53,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0001-Make-ts-module-external.patch \ file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \ " -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" @@ -100,17 +100,17 @@ 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" +EXTRA_OECMAKE:append:x86 = " -DX86=ON" 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)}" # TBB does not build for powerpc so disable that package config -PACKAGECONFIG_remove_powerpc = "tbb" +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: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," @@ -158,7 +158,7 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', ' ${@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') @@ -167,58 +167,58 @@ python populate_packages_prepend () { 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") + d.setVar('ALLOW_EMPTY:' + metapkg, "1") blacklist = [ metapkg, "libopencv-ts" ] 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: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}/ diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.58.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.58.bb index c5274aa39..f9dc58a4c 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.58.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.58.bb @@ -140,15 +140,15 @@ 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() { rm -f ${S}/libtool @@ -170,16 +170,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" +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 @@ -215,40 +215,40 @@ do_install_append() { } 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_SERVICE:${PN}-slapd = "hostapd.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" +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 () { +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) 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-openembedded/meta-oe/recipes-support/opensc/opensc_0.21.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.22.0.bb index 2fbf60c14..e8bb505e4 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.21.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.22.0.bb @@ -12,7 +12,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" #v0.21.0 -SRCREV = "30180986a08cf71fe4af4b50251a8bb5b1ab95af" +SRCREV = "c902e1992195e00ada12d71beb1029287cd72037" SRC_URI = "git://github.com/OpenSC/OpenSC \ " DEPENDS = "virtual/libiconv openssl" @@ -32,14 +32,14 @@ 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}/pkcs11/opensc-pkcs11.so \ ${libdir}/pkcs11/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/pkcs11-spy.so \ diff --git a/meta-openembedded/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-openembedded/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb index 8c948c565..3d6bd2a4f 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb @@ -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-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb index c1b793960..93b18ba1d 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.9.0.bb @@ -1,13 +1,13 @@ 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+" +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 = "\ @@ -27,33 +27,33 @@ EXTRA_OECONF = " \ S = "${WORKDIR}/pcsc-lite-${PV}" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} udev" -PACKAGECONFIG_class-native ??= "" +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 = "" -RPROVIDES_${PN}_class-native += "pcsc-lite-lib-native" +RRECOMMENDS:${PN} = "ccid" +RRECOMMENDS:${PN}:class-native = "" +RPROVIDES:${PN}:class-native += "pcsc-lite-lib-native" -FILES_${PN} = "${sbindir}/pcscd" -FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" -FILES_${PN}-dev = "${includedir} \ +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 \ +FILES:${PN}-spy = "${bindir}/pcsc-spy \ ${libdir}/libpcscspy*${SOLIBS}" -FILES_${PN}-spy-dev = "${libdir}/libpcscspy.la \ +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" +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-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb index bc82e49ea..a5825d5a9 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb @@ -13,4 +13,4 @@ S = "${WORKDIR}/git" DEPENDS = "pcsc-lite" -FILES_${PN} += "${datadir}/pcsc/smartcard_list.txt" +FILES:${PN} += "${datadir}/pcsc/smartcard_list.txt" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb index 3a437659e..89d463699 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb @@ -20,6 +20,6 @@ do_install() { oe_runmake DESTDIR="${D}" install; } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ " diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb index 0f32dc3a3..02cd12bf4 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb @@ -22,6 +22,6 @@ do_install() { oe_runmake DESTDIR="${D}" install; } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ " diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb index 67d8cc87c..7c9a2cbf6 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb @@ -17,4 +17,4 @@ SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1 EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false" -FILES_${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" +FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb index 04133c1b3..80fb23e6a 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb @@ -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-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index 5a96bec90..3752c0501 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -26,11 +26,11 @@ PACKAGECONFIG[telepathy] = "--enable-telepathy=yes,--enable-telepathy=no,telepat #PACKAGECONFIG[gssapi_only] = "--enable-gssapi-only=yes,--enable-gssapi-only=no,krb5" PACKAGECONFIG[debug] = "--enable-debug=yes,--enable-debug=no,valgrind" -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/purple-2/*.la \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/purple-2/libsipe.so \ ${datadir}/appdata \ ${datadir}/metainfo \ diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb index ba0dca233..b2e6d9ac1 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb @@ -55,30 +55,30 @@ OE_LT_RPATH_ALLOW[export]="1" PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data" -RPROVIDES_${PN}-dbg += "libpurple-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_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') diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb index 277d12057..1a8249528 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb @@ -21,6 +21,6 @@ do_install() { oe_runmake -C skypeweb DESTDIR="${D}" install; } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ " diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb index 48b31dd3f..5db518cbb 100644 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.10.1.bb @@ -57,12 +57,12 @@ EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \ ${@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" -python populate_packages_prepend () { +python populate_packages:prepend () { poco_libdir = d.expand('${libdir}') pn = d.getVar("PN") packages = [] @@ -75,7 +75,7 @@ python populate_packages_prepend () { do_split_packages(d, poco_libdir, '^libPoco(.*)\.so\..*$', 'poco-%s', 'Poco %s component', extra_depends='', prepend=True, hook=hook) - d.setVar("RRECOMMENDS_%s" % pn, " ".join(packages)) + d.setVar("RRECOMMENDS:%s" % pn, " ".join(packages)) d.setVar("POCO_TESTRUNNERS", "\n".join(testrunners)) } @@ -90,13 +90,13 @@ do_install_ptest () { 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" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb index 46e33514e..7574c7b5b 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.10.bb @@ -34,4 +34,4 @@ do_install() { install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ } -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.07.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.08.0.bb index 975ab1d70..1fc3bf3f4 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.07.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.08.0.bb @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[sha256sum] = "e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4" +SRC_URI[sha256sum] = "e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" @@ -21,7 +21,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)} @@ -37,7 +37,7 @@ EXTRA_OECMAKE += " \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ " -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 +45,7 @@ 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" diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb index aec482b9b..c0b32e725 100644 --- a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -20,7 +20,7 @@ PACKAGECONFIG[alsa] = ",,alsa-lib" PACKAGECONFIG[jack] = ",,jack" PACKAGECONFIG[examples] = "-DPA_BUILD_EXAMPLES=ON,-DPA_BUILD_EXAMPLES=OFF" -do_install_append() { +do_install:append() { if [ -d ${B}/examples ]; then install -d ${D}${bindir} for example in ${B}/examples/pa*; do @@ -30,4 +30,4 @@ do_install_append() { } FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/libportaudio.so" +FILES:${PN} += "${libdir}/libportaudio.so" diff --git a/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb b/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb index c8baa5d9c..262f05f49 100644 --- a/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_1.0.2.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/ago/pps-tools.git" S = "${WORKDIR}/git" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" do_install() { install -d ${D}${bindir} ${D}${includedir} \ diff --git a/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.6.bb b/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.6.bb index 0eef82b2c..244d14001 100644 --- a/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.6.bb @@ -12,5 +12,5 @@ UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar.bz2" inherit autotools -LDEMULATION_mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}" +LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}" export LDEMULATION diff --git a/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb b/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb index 7f6fcdb01..a289d962e 100644 --- a/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb +++ b/meta-openembedded/meta-oe/recipes-support/re2/re2_2020.11.01.bb @@ -17,7 +17,7 @@ EXTRA_OECMAKE += " \ " # Don't include so files in dev package -FILES_${PN} = "${libdir}" -FILES_${PN}-dev = "${includedir} ${libdir}/cmake" +FILES:${PN} = "${libdir}" +FILES:${PN}-dev = "${includedir} ${libdir}/cmake" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb index 954da272e..f52378b4b 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb @@ -22,8 +22,8 @@ DEPENDS = " \ libxkbfile \ " -DEPENDS_append_libc-musl = " libexecinfo" -LDFLAGS_append_libc-musl = " -lexecinfo" +DEPENDS:append:libc-musl = " libexecinfo" +LDFLAGS:append:libc-musl = " -lexecinfo" SRCREV = "045862cc7d7dd986b349c68131df2f86b9b1cd9c" SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https" @@ -38,9 +38,9 @@ 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" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" -FILES_${PN}+= " \ +FILES:${PN}+= " \ ${datadir}/metainfo \ ${datadir}/mime \ " diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index a81d8d6ca..3cdf78200 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -6,7 +6,7 @@ SECTION = "console/network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" -RDEPENDS_${PN} = "rsync \ +RDEPENDS:${PN} = "rsync \ perl \ perl-module-dirhandle \ perl-module-cwd \ @@ -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-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb index d01ea42bd..4c0845a0f 100644 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb @@ -24,12 +24,12 @@ DEPENDS += " \ " 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-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.12.bb b/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.12.bb index d0a4a0467..a5f98e672 100644 --- a/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.12.bb +++ b/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.12.bb @@ -15,7 +15,7 @@ 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] = "2902fd29e6834fd62c16bb5d1ac53c7e" SRC_URI[sha256sum] = "e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124" @@ -23,4 +23,4 @@ SRC_URI[sha256sum] = "e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7c 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-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb b/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb index 22995b773..43ee19afb 100644 --- a/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb +++ b/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.45.bb @@ -21,4 +21,4 @@ inherit autotools-brokensep S = "${WORKDIR}/sg3_utils-${PV}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" diff --git a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb index 8bbc6815e..381958051 100644 --- a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb @@ -16,7 +16,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ 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 +26,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-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb index 67ec802cd..40ef4646b 100644 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb @@ -18,5 +18,5 @@ EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_SHARED=on -DSPDLOG_BUILD_EX inherit cmake # Header-only library -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb index 9a0da831b..13ed7570b 100644 --- a/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb @@ -29,11 +29,11 @@ S ="${WORKDIR}/${BPN}.${PV}" inherit autotools -do_configure_prepend(){ +do_configure:prepend(){ ${S}/autogen.sh } -RDEPENDS_${PN} += "mdadm" +RDEPENDS:${PN} += "mdadm" -COMPATIBLE_HOST_powerpc = 'null' -COMPATIBLE_HOST_powerpc64le = 'null' +COMPATIBLE_HOST:powerpc = 'null' +COMPATIBLE_HOST:powerpc64le = 'null' diff --git a/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb index dba89d181..f2e7a9161 100644 --- a/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb @@ -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-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb index ce1c41e35..ef30fd707 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.31.2.bb @@ -63,7 +63,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 +72,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 @@ -107,10 +107,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 +121,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-openembedded/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb b/meta-openembedded/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb index 1ce3c8e44..e71a8b436 100644 --- a/meta-openembedded/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb @@ -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-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb index 0b039a181..36ca8f91a 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb @@ -7,7 +7,7 @@ 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:libc-musl = " libucontext" PE = "1" @@ -43,10 +43,10 @@ ARM_INSTRUCTION_SET = "arm" ASNEEDED = "" -LDFLAGS_append_mips = " -latomic" -LDFLAGS_append_mipsel = " -latomic" +LDFLAGS:append:mips = " -latomic" +LDFLAGS:append:mipsel = " -latomic" -LDFLAGS_append_libc-musl = " -lucontext" +LDFLAGS:append:libc-musl = " -lucontext" # The latest version of oneTBB does not support PPC -COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*" +COMPATIBLE_MACHINE:powerpc = "(!.*ppc).*" diff --git a/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb index aba485e1a..3aecc6a76 100644 --- a/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb @@ -26,4 +26,4 @@ do_install() { oe_runmake PREFIX="${prefix}" DESTDIR="${D}" install } -RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-ibm437" +RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-ibm437" diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.2.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.3.bb index f9e127438..de8249e28 100644 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.9.3.bb @@ -15,10 +15,10 @@ 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" -SRCREV = "da6d9480fefeb0ffdf8a84626b5096827d8d7030" +SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch" +SRCREV = "c430dd9a27e158693cc783e9ee91bf6e5b2a8819" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" @@ -29,13 +29,13 @@ 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} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1/ \ ${datadir}/polkit-1 \ ${datadir}/bash-completion \ @@ -46,8 +46,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-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb index 7970ca3c4..9926ad4f0 100644 --- a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.3.0.bb @@ -12,7 +12,7 @@ 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-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb index 507a34144..18b455ce2 100644 --- a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb @@ -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,82 @@ 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 () { 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 +127,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 +135,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 +143,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-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb index b29bb784e..06f97940c 100644 --- a/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/unicode-ucd/unicode-ucd_12.1.0.bb @@ -19,4 +19,4 @@ do_install() { cp -rf ${WORKDIR}/ucd ${D}${datadir}/unicode } -FILES_${PN} = "${datadir}/unicode/ucd" +FILES:${PN} = "${datadir}/unicode/ucd" diff --git a/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb b/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb index 61378fec2..5e7c603f8 100644 --- a/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.7.bb @@ -22,7 +22,7 @@ S = "${WORKDIR}/unixODBC-${PV}" EXTRA_OEMAKE += "LIBS=-lltdl" -do_configure_prepend() { +do_configure:prepend() { # old m4 files will cause libtool version don't match rm -rf m4/* rm -fr libltdl diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb index d6c89a65d..ad302a0e1 100644 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb @@ -19,17 +19,17 @@ PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-system EXTRA_OECONF = " --with-backend=linux" -SYSTEMD_SERVICE_${PN} = "upower.service" +SYSTEMD_SERVICE:${PN} = "upower.service" # don't start on boot by default - dbus does that on demand SYSTEMD_AUTO_ENABLE = "disable" -do_configure_prepend() { +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/ \ +RDEPENDS:${PN} += "dbus" +RRECOMMENDS:${PN} += "pm-utils" +FILES:${PN} += "${datadir}/dbus-1/ \ ${base_libdir}/udev/* \ " diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb index ca970e59b..291fad5e6 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb @@ -14,6 +14,6 @@ do_install() { oe_runmake install DESTDIR=${D} RULESDIR=${D}/${nonarch_base_libdir}/udev/rules.d } -RDEPENDS_${PN} = "usb-modeswitch (>= 2.4.0)" -FILES_${PN} += "${nonarch_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-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb index 6a5287af4..a6282a57c 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb @@ -10,13 +10,13 @@ SRC_URI[sha256sum] = "c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b5658 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} UDEVDIR=${D}/${nonarch_base_libdir}/udev install diff --git a/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.3.0.bb index ca8a3c0bb..b512f8c67 100644 --- a/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.3.0.bb @@ -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-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch deleted file mode 100644 index e95e24049..000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch +++ /dev/null @@ -1,276 +0,0 @@ -Subject: Fix build errors with linux 5.13 -Origin: upstream, https://www.virtualbox.org/browser/vbox/trunk -Bug: https://bugs.launchpad.net/bugs/1929193 - -diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h ---- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h 2021-04-28 16:24:47.000000000 +0000 -+++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h 2021-06-23 10:08:44.431714404 +0000 -@@ -46,20 +41,20 @@ - * Evaluates to true if the linux kernel version is equal or higher to the - * one specfied. */ - #define RTLNX_VER_MIN(a_Major, a_Minor, a_Patch) \ -- (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch)) -+ (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch)) - - /** @def RTLNX_VER_MAX - * Evaluates to true if the linux kernel version is less to the one specfied - * (exclusive). */ - #define RTLNX_VER_MAX(a_Major, a_Minor, a_Patch) \ -- (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch)) -+ (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch)) - - /** @def RTLNX_VER_RANGE - * Evaluates to true if the linux kernel version is equal or higher to the given - * minimum version and less (but not equal) to the maximum version (exclusive). */ - #define RTLNX_VER_RANGE(a_MajorMin, a_MinorMin, a_PatchMin, a_MajorMax, a_MinorMax, a_PatchMax) \ -- ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \ -- && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) ) -+ ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \ -+ && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) ) - - - /** @def RTLNX_RHEL_MIN -@@ -70,7 +65,7 @@ - */ - #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) - # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) \ -- ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))) -+ ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))) - #else - # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) (0) - #endif -@@ -83,7 +78,7 @@ - */ - #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) - # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) \ -- ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor))) -+ ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor))) - #else - # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) - #endif -@@ -95,7 +90,7 @@ - */ - #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) - # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax, a_iMinorMax) \ -- (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax)) -+ (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax)) - #else - # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax, a_iMinorMax) (0) - #endif -@@ -173,7 +168,9 @@ - #include <drm/ttm/ttm_bo_api.h> - #include <drm/ttm/ttm_bo_driver.h> - #include <drm/ttm/ttm_placement.h> -+#if RTLNX_VER_MAX(5,13,0) - #include <drm/ttm/ttm_memory.h> -+#endif - #if RTLNX_VER_MAX(5,12,0) - # include <drm/ttm/ttm_module.h> - #endif -@@ -222,7 +219,7 @@ static inline void drm_gem_object_put(st - VBVA_ADAPTER_INFORMATION_SIZE) - #define GUEST_HEAP_SIZE VBVA_ADAPTER_INFORMATION_SIZE - #define GUEST_HEAP_USABLE_SIZE (VBVA_ADAPTER_INFORMATION_SIZE - \ -- sizeof(HGSMIHOSTFLAGS)) -+ sizeof(struct hgsmi_host_flags)) - #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE - - /** How frequently we refresh if the guest is not providing dirty rectangles. */ -@@ -232,7 +229,7 @@ static inline void drm_gem_object_put(st - static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size, - gfp_t flags) - { -- return devm_kzalloc(dev, n * size, flags); -+ return devm_kzalloc(dev, n * size, flags); - } - #endif - -@@ -244,7 +241,7 @@ struct vbox_private { - u8 __iomem *guest_heap; - u8 __iomem *vbva_buffers; - struct gen_pool *guest_pool; -- struct VBVABUFFERCONTEXT *vbva_info; -+ struct vbva_buf_context *vbva_info; - bool any_pitch; - u32 num_crtcs; - /** Amount of available VRAM, including space used for buffers. */ -@@ -252,7 +249,7 @@ struct vbox_private { - /** Amount of available VRAM, not including space used for buffers. */ - u32 available_vram_size; - /** Array of structures for receiving mode hints. */ -- VBVAMODEHINT *last_mode_hints; -+ struct vbva_modehint *last_mode_hints; - - struct vbox_fbdev *fbdev; - -@@ -263,7 +260,11 @@ struct vbox_private { - struct drm_global_reference mem_global_ref; - struct ttm_bo_global_ref bo_global_ref; - #endif -+#if RTLNX_VER_MIN(5,13,0) -+ struct ttm_device bdev; -+#else - struct ttm_bo_device bdev; -+#endif - bool mm_initialised; - } ttm; - -diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c ---- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-04-28 16:24:47.000000000 +0000 -+++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-06-23 10:08:07.164057918 +0000 -@@ -48,7 +43,11 @@ - #endif - - -+#if RTLNX_VER_MIN(5,13,0) -+static inline struct vbox_private *vbox_bdev(struct ttm_device *bd) -+#else - static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd) -+#endif - { - return container_of(bd, struct vbox_private, ttm.bdev); - } -@@ -188,7 +187,7 @@ static int vbox_ttm_io_mem_reserve(struc - mem->bus.size = mem->num_pages << PAGE_SHIFT; - mem->bus.base = 0; - mem->bus.is_iomem = false; -- if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) -+ if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) - return -EINVAL; - switch (mem->mem_type) { - case TTM_PL_SYSTEM: -@@ -205,8 +204,13 @@ static int vbox_ttm_io_mem_reserve(struc - return 0; - } - #else -+# if RTLNX_VER_MAX(5,13,0) - static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, - struct ttm_resource *mem) -+# else /* > 5.13.0 */ -+static int vbox_ttm_io_mem_reserve(struct ttm_device *bdev, -+ struct ttm_resource *mem) -+# endif /* > 5.13.0 */ - { - struct vbox_private *vbox = vbox_bdev(bdev); - mem->bus.addr = NULL; -@@ -241,7 +245,12 @@ static int vbox_ttm_io_mem_reserve(struc - - - --#if RTLNX_VER_MIN(5,10,0) -+#if RTLNX_VER_MIN(5,13,0) -+static void vbox_ttm_io_mem_free(struct ttm_device *bdev, -+ struct ttm_resource *mem) -+{ -+} -+#elif RTLNX_VER_MIN(5,10,0) - static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, - struct ttm_resource *mem) - { -@@ -253,7 +262,13 @@ static void vbox_ttm_io_mem_free(struct - } - #endif - --#if RTLNX_VER_MIN(5,10,0) -+#if RTLNX_VER_MIN(5,13,0) -+static void vbox_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt) -+{ -+ ttm_tt_fini(tt); -+ kfree(tt); -+} -+#elif RTLNX_VER_MIN(5,10,0) - static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt) - { - ttm_tt_fini(tt); -@@ -333,7 +348,11 @@ static int vbox_bo_move(struct ttm_buffe - } - #endif - -+#if RTLNX_VER_MIN(5,13,0) -+static struct ttm_device_funcs vbox_bo_driver = { -+#else /* < 5.13.0 */ - static struct ttm_bo_driver vbox_bo_driver = { -+#endif /* < 5.13.0 */ - .ttm_tt_create = vbox_ttm_tt_create, - #if RTLNX_VER_MIN(5,10,0) - .ttm_tt_destroy = vbox_ttm_tt_destroy, -@@ -370,14 +389,22 @@ int vbox_mm_init(struct vbox_private *vb - { - int ret; - struct drm_device *dev = vbox->dev; -+#if RTLNX_VER_MIN(5,13,0) -+ struct ttm_device *bdev = &vbox->ttm.bdev; -+#else - struct ttm_bo_device *bdev = &vbox->ttm.bdev; -+#endif - - #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) - ret = vbox_ttm_global_init(vbox); - if (ret) - return ret; - #endif -+#if RTLNX_VER_MIN(5,13,0) -+ ret = ttm_device_init(&vbox->ttm.bdev, -+#else - ret = ttm_bo_device_init(&vbox->ttm.bdev, -+#endif - #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) - vbox->ttm.bo_global_ref.ref.object, - #endif -@@ -429,7 +456,11 @@ int vbox_mm_init(struct vbox_private *vb - return 0; - - err_device_release: -+#if RTLNX_VER_MIN(5,13,0) -+ ttm_device_fini(&vbox->ttm.bdev); -+#else - ttm_bo_device_release(&vbox->ttm.bdev); -+#endif - #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) - err_ttm_global_release: - vbox_ttm_global_release(vbox); -@@ -446,7 +477,11 @@ void vbox_mm_fini(struct vbox_private *v - #else - arch_phys_wc_del(vbox->fb_mtrr); - #endif -+#if RTLNX_VER_MIN(5,13,0) -+ ttm_device_fini(&vbox->ttm.bdev); -+#else - ttm_bo_device_release(&vbox->ttm.bdev); -+#endif - #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) - vbox_ttm_global_release(vbox); - #endif -@@ -528,7 +563,9 @@ int vbox_bo_create(struct drm_device *de - { - struct vbox_private *vbox = dev->dev_private; - struct vbox_bo *vboxbo; -+#if RTLNX_VER_MAX(5,13,0) - size_t acc_size; -+#endif - int ret; - - vboxbo = kzalloc(sizeof(*vboxbo), GFP_KERNEL); -@@ -551,16 +588,20 @@ int vbox_bo_create(struct drm_device *de - - vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM); - -+#if RTLNX_VER_MAX(5,13,0) - acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size, - sizeof(struct vbox_bo)); -+#endif - - ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size, - ttm_bo_type_device, &vboxbo->placement, - #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) - align >> PAGE_SHIFT, false, NULL, acc_size, --#else -+#elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */ - align >> PAGE_SHIFT, false, acc_size, --#endif -+#else /* > 5.13.0 */ -+ align >> PAGE_SHIFT, false, -+#endif /* > 5.13.0 */ - #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2) - NULL, NULL, vbox_bo_ttm_destroy); - #else diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch deleted file mode 100644 index 8dd30a20e..000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/add__divmoddi4.patch +++ /dev/null @@ -1,36 +0,0 @@ -add __divmoddi4 builtin - -GCC 11 will generate it in code - -void foo(unsigned char *u8Second, unsigned int *u32Nanosecond, long long timeSpec) -{ - long long i64Div; - int i32Div; - int i32Rem; - i64Div = timeSpec; - i32Rem = (int)(i64Div % 1000000000); - i64Div /= 1000000000; - *u32Nanosecond = i32Rem; - i32Rem = (int)(i64Div % 60); - *u8Second = i32Rem; -} - - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/src/VBox/Runtime/common/math/gcc/divdi3.c -+++ b/src/VBox/Runtime/common/math/gcc/divdi3.c -@@ -68,3 +68,12 @@ __divdi3(a, b) - uq = - uq; - return uq; - } -+ -+quad_t -+__divmoddi4(quad_t a, quad_t b, quad_t* rem) -+{ -+ quad_t d = __divdi3(a,b); -+ *rem = a - (d*b); -+ return d; -+} -+ diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb index 19b8f8f46..689782b7f 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.26.bb @@ -13,17 +13,16 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ - file://40-linux-5.13-support.patch \ - file://add__divmoddi4.patch \ " -SRC_URI[md5sum] = "abb1a20021e5915fe38c666e8c11cf80" -SRC_URI[sha256sum] = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49" + +SRC_URI[md5sum] = "fce04bbef244b4df1a50e53d132d3e6f" +SRC_URI[sha256sum] = "0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195" S ?= "${WORKDIR}/vbox_module" S_task-patch = "${WORKDIR}/${VBOX_NAME}" export BUILD_TARGET_ARCH="${ARCH}" -export BUILD_TARGET_ARCH_x86-64="amd64" +export BUILD_TARGET_ARCH:x86-64="amd64" EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" @@ -45,7 +44,7 @@ do_export_sources() { } -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} @@ -70,15 +69,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-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb index 79a5ac5c4..423780154 100644 --- a/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb @@ -16,10 +16,10 @@ SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https \ 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 +30,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-openembedded/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb b/meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb index e3ce9268c..39ba4ec71 100644 --- a/meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb +++ b/meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb @@ -10,7 +10,7 @@ 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-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.32.bb index 3464f2f43..15da5aa6c 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.31.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.32.bb @@ -22,8 +22,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://ensure-search-path-non-host.patch \ " -SRC_URI[md5sum] = "182f5cbdfb8ddbac535c04470c170dc3" -SRC_URI[sha256sum] = "9b10bc52cc31e4f76162e3975e50db26b71ab49c571d810b311ca626be5a0b26" +SRC_URI[sha256sum] = "e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043" inherit autotools-brokensep ptest pkgconfig @@ -39,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}" @@ -54,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 diff --git a/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb index 481e7303b..fd22defb2 100644 --- a/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb @@ -18,6 +18,6 @@ PV = "0.2.5" 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-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb index d7a371b08..6d8659844 100644 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.16.bb @@ -24,32 +24,32 @@ 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" -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 } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir} install -d ${D}${sysconfdir}/xrdp install -d ${D}${sysconfdir}/xrdp/pam.d @@ -73,9 +73,9 @@ do_install_append() { 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 diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb index a33aa2c96..39d3894ff 100644 --- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb @@ -39,11 +39,11 @@ 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" -FILES_${PN} += "${bindir} \ +FILES:${PN} += "${bindir} \ ${@bb.utils.contains('DEPENDS', 'python3-native', '${libdir}', '', d)} \ " -CPPFLAGS_append = "\ +CPPFLAGS:append = "\ ${@bb.utils.contains('PACKAGECONFIG', 'qt5', '\ -I${STAGING_INCDIR}/QtX11Extras \ -I${STAGING_INCDIR}/dbus-1.0 \ @@ -51,8 +51,8 @@ CPPFLAGS_append = "\ ', '', d)} \ " -TARGET_CXXFLAGS_append = " -fPIC" +TARGET_CXXFLAGS:append = " -fPIC" -do_configure_prepend() { +do_configure:prepend() { install -m 755 ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${S}/ } diff --git a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb index ab7b71ef7..9ac205afe 100644 --- a/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/zchunk/zchunk_1.1.9.bb @@ -14,8 +14,8 @@ DEPENDS = "\ zstd \ " -DEPENDS_append_libc-musl = " argp-standalone" -LDFLAGS_append_libc-musl = " -largp" +DEPENDS:append:libc-musl = " argp-standalone" +LDFLAGS:append:libc-musl = " -largp" inherit meson diff --git a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.15.bb b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.15.bb index 41c4b76d2..f61848e7c 100644 --- a/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.15.bb +++ b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.15.bb @@ -14,12 +14,12 @@ SRC_URI[sha256sum] = "39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40 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," |