[meta-mingw] [PATCH 1/3] meta-mingw: Convert to new override syntax
Richard Purdie
This converts the two layers to the new override syntax. This was done using
<oe-core>/scripts/contrib/convert-overrides.py <this-layer> Signed-off-by: Richard Purdie <richard.purdie@...> --- classes/toolchain-scripts-mingw32.bbclass | 8 +++--- conf/machine-sdk/include/mingw32-common.inc | 26 +++++++++---------- recipes-core/dbus/dbus_%.bbappend | 6 ++--- recipes-core/dtc/dtc_%.bbappend | 8 +++--- recipes-core/expat/expat_%.bbappend | 2 +- recipes-core/gettext/gettext_%.bbappend | 14 +++++----- recipes-core/glib-2.0/glib-2.0_%.bbappend | 10 +++---- recipes-core/libxml/libxml2_%.bbappend | 2 +- recipes-core/meta/meta-environment.bbappend | 2 +- .../nativesdk-packagegroup-sdk-host.bbappend | 2 +- recipes-core/zlib/zlib_1.2.%.bbappend | 2 +- .../binutils-cross-canadian_2.%.bbappend | 8 +++--- recipes-devtools/cmake/cmake_%.bbappend | 4 +-- .../gcc/gcc-cross-canadian_%.bbappend | 12 ++++----- recipes-devtools/gcc/gcc-crosssdk_%.bbappend | 4 +-- recipes-devtools/gcc/gcc-runtime_%.bbappend | 16 ++++++------ recipes-devtools/gcc/gcc_%.bbappend | 4 +-- recipes-devtools/gcc/libgcc_%.bbappend | 8 +++--- .../gdb/gdb-cross-canadian_%.bbappend | 14 +++++----- recipes-devtools/go/go_%.bbappend | 4 +-- .../libtool/nativesdk-libtool_2.4.6.bbappend | 2 +- .../nativesdk-mingw-w64-headers_8.0.0.bb | 4 +-- .../nativesdk-mingw-w64-runtime_8.0.0.bb | 6 ++--- .../nativesdk-mingw-w64-winpthreads_8.0.0.bb | 2 +- recipes-devtools/ninja/ninja_%.bbappend | 4 +-- recipes-devtools/swig/swig_%.bbappend | 4 +-- .../diffutils/diffutils_%.bbappend | 6 ++--- .../libarchive/libarchive_%.bbappend | 2 +- recipes-extended/libidn/libidn2_%.bbappend | 2 +- recipes-extended/zstd/zstd_%.bbappend | 4 +-- recipes-graphics/libsdl2/libsdl2_%.bbappend | 4 +-- recipes-graphics/wayland/wayland_%.bbappend | 6 ++--- recipes-support/curl/curl_%.bbappend | 4 +-- .../libgcrypt/libgcrypt_%.bbappend | 6 ++--- .../libgpg-error/libgpg-error_%.bbappend | 2 +- recipes-support/libiconv/libiconv_1.15.bb | 6 ++--- recipes-support/libmpc/libmpc_%.bbappend | 2 +- recipes-support/libpcre/libpcre_%.bbappend | 8 +++--- recipes-support/mpfr/mpfr_4.1.%.bbappend | 2 +- 39 files changed, 116 insertions(+), 116 deletions(-) diff --git a/classes/toolchain-scripts-mingw32.bbclass b/classes/toolchain-scripts-mingw32.bbclass index 0afbf7d..d96cb40 100644 --- a/classes/toolchain-scripts-mingw32.bbclass +++ b/classes/toolchain-scripts-mingw32.bbclass @@ -1,5 +1,5 @@ # Based off of the oe-core meta/classes/toolchain-scripts.bbclass version -toolchain_create_sdk_env_script_sdkmingw32 () { +toolchain_create_sdk_env_script:sdkmingw32 () { # Create environment setup script sdkpathnative=${7:-${SDKPATHNATIVE}} prefix=${6:-${prefix_nativesdk}} @@ -54,7 +54,7 @@ toolchain_create_sdk_env_script_sdkmingw32 () { mv $script.new $script } -toolchain_shared_env_script_sdkmingw32 () { +toolchain_shared_env_script:sdkmingw32 () { echo 'set CC=${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=%SDKTARGETSYSROOT%' >> $script echo 'set CXX=${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=%SDKTARGETSYSROOT%' >> $script echo 'set CPP=${TARGET_PREFIX}gcc -E ${TARGET_CC_ARCH} --sysroot=%SDKTARGETSYSROOT%' >> $script @@ -94,13 +94,13 @@ toolchain_shared_env_script_sdkmingw32 () { EOF } -toolchain_create_sdk_siteconfig_append_sdkmingw32 () { +toolchain_create_sdk_siteconfig:append:sdkmingw32 () { # Make the file windows friendly... awk 'sub("$", "\r")' $siteconfig > $siteconfig.new mv $siteconfig.new $siteconfig } -toolchain_create_sdk_version_append_sdkmingw32 () { +toolchain_create_sdk_version:append:sdkmingw32 () { # Make the file windows friendly... awk 'sub("$", "\r")' $versionfile > $versionfile.new mv $versionfile.new $versionfile diff --git a/conf/machine-sdk/include/mingw32-common.inc b/conf/machine-sdk/include/mingw32-common.inc index 3997a26..6c43fc9 100644 --- a/conf/machine-sdk/include/mingw32-common.inc +++ b/conf/machine-sdk/include/mingw32-common.inc @@ -1,6 +1,6 @@ SDK_OS = "mingw32" -SDK_VENDOR_mingw32 = "-w64" -SDK_VENDOR_sdkmingw32 = "-w64" +SDK_VENDOR:mingw32 = "-w64" +SDK_VENDOR:sdkmingw32 = "-w64" NATIVESDKLIBC = "libc-mingw" @@ -10,12 +10,12 @@ PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext" PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" -USE_NLS_mingw32 = "no" +USE_NLS:mingw32 = "no" -FILES_${PN}-staticdev_append_mingw32 = " ${libdir}/*.lib" -ALLOW_EMPTY_${PN}_mingw32 = "1" +FILES:${PN}-staticdev:append:mingw32 = " ${libdir}/*.lib" +ALLOW_EMPTY:${PN}:mingw32 = "1" -DISTRO_FEATURES_FILTER_NATIVESDK_remove_mingw32 = "debuginfod" +DISTRO_FEATURES_FILTER_NATIVESDK:remove:mingw32 = "debuginfod" # Do what amounts to a NOOP SDK_PACKAGING_FUNC = "do_compile" @@ -25,8 +25,8 @@ SDK_PACKAGING_FUNC = "do_compile" SDKUSE_NLS = "no" SDKIMAGE_LINGUAS = "" -SDK_DEPENDS_remove = "nativesdk-glibc-locale" -SDK_DEPENDS_remove = "nativesdk-glibc-utils" +SDK_DEPENDS:remove = "nativesdk-glibc-locale" +SDK_DEPENDS:remove = "nativesdk-glibc-utils" SDKPKGSUFFIX = "nativesdk-mingw32" @@ -35,19 +35,19 @@ MACHINEOVERRIDES .= ":sdkmingw32" TESTSDK_CLASS_NAME = "oeqa.sdkmingw.testsdk.TestSDKMinGW" TESTSDKEXT_CLASS_NAME = "" -WINDRES_mingw32 = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}" -RC_mingw32 = "${WINDRES}" +WINDRES:mingw32 = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}" +RC:mingw32 = "${WINDRES}" export WINDRES export RC -BB_HASHBASE_WHITELIST_append = " WINDRES RC" +BB_HASHBASE_WHITELIST:append = " WINDRES RC" # Needed to override no-static-libs.inc -DISABLE_STATIC_mingw32 = "" +DISABLE_STATIC:mingw32 = "" # disable security flags -GCCPIE_mingw32 = "" +GCCPIE:mingw32 = "" # wine and wineserver are required to test MinGW SDKs HOSTTOOLS += "${@'wine wineserver' if (bb.utils.contains_any('IMAGE_CLASSES', 'testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testsdk.bbclass"])) else ''}" diff --git a/recipes-core/dbus/dbus_%.bbappend b/recipes-core/dbus/dbus_%.bbappend index d81af7d..7bb40f1 100644 --- a/recipes-core/dbus/dbus_%.bbappend +++ b/recipes-core/dbus/dbus_%.bbappend @@ -1,14 +1,14 @@ -FILES_${PN}_append_mingw32 = "\ +FILES:${PN}:append:mingw32 = "\ ${bindir}/dbus-launch.exe \ " -FILES_${PN}-tools_append_mingw32 = "\ +FILES:${PN}-tools:append:mingw32 = "\ ${bindir}/dbus-send.exe \ ${bindir}/dbus-monitor.exe \ ${bindir}/dbus-test-tool.exe \ ${bindir}/dbus-update-activation-environment.exe \ " -FILES_${PN}-lib_append_mingw32 = "\ +FILES:${PN}-lib:append:mingw32 = "\ ${bindir}/lib*.dll \ " diff --git a/recipes-core/dtc/dtc_%.bbappend b/recipes-core/dtc/dtc_%.bbappend index 1406937..2d27a0a 100644 --- a/recipes-core/dtc/dtc_%.bbappend +++ b/recipes-core/dtc/dtc_%.bbappend @@ -1,16 +1,16 @@ -do_configure_append_mingw32 () { +do_configure:append:mingw32 () { # don't try to build the other dtc components when installing libs sed -i 's/install-lib: all/install-lib: libfdt/g' ${S}/Makefile } -do_compile_mingw32 () { +do_compile:mingw32 () { oe_runmake libfdt } -do_install_mingw32 () { +do_install:mingw32 () { oe_runmake install-lib install-includes } -RDEPENDS_${PN}-misc_remove_mingw32 = "bash" +RDEPENDS:${PN}-misc:remove:mingw32 = "bash" diff --git a/recipes-core/expat/expat_%.bbappend b/recipes-core/expat/expat_%.bbappend index 626ea5b..0749fe3 100644 --- a/recipes-core/expat/expat_%.bbappend +++ b/recipes-core/expat/expat_%.bbappend @@ -1,3 +1,3 @@ -FILES_${PN}-bin_mingw32 = "${bindir}/*.exe ${sbindir}/*.exe" +FILES:${PN}-bin:mingw32 = "${bindir}/*.exe ${sbindir}/*.exe" diff --git a/recipes-core/gettext/gettext_%.bbappend b/recipes-core/gettext/gettext_%.bbappend index d518698..4e18798 100644 --- a/recipes-core/gettext/gettext_%.bbappend +++ b/recipes-core/gettext/gettext_%.bbappend @@ -1,12 +1,12 @@ -EXTRA_OECONF_append_mingw32 = " --enable-static" +EXTRA_OECONF:append:mingw32 = " --enable-static" -FILESEXTRAPATHS_prepend_mingw32 := "${THISDIR}/${BPN}:" -SRC_URI_append_mingw32 = " \ +FILESEXTRAPATHS:prepend:mingw32 := "${THISDIR}/${BPN}:" +SRC_URI:append:mingw32 = " \ " -FILES_libgettextlib_mingw32 = "${bindir}/libgettextlib-*.dll" -FILES_libgettextsrc_mingw32 = "${bindir}/libgettextsrc-*.dll" +FILES:libgettextlib:mingw32 = "${bindir}/libgettextlib-*.dll" +FILES:libgettextsrc:mingw32 = "${bindir}/libgettextsrc-*.dll" -PACKAGES_prepend_mingw32 = "libintl " -FILES_libintl_mingw32 = "${bindir}/libintl*.dll" +PACKAGES:prepend:mingw32 = "libintl " +FILES:libintl:mingw32 = "${bindir}/libintl*.dll" diff --git a/recipes-core/glib-2.0/glib-2.0_%.bbappend b/recipes-core/glib-2.0/glib-2.0_%.bbappend index d379f0b..28687eb 100644 --- a/recipes-core/glib-2.0/glib-2.0_%.bbappend +++ b/recipes-core/glib-2.0/glib-2.0_%.bbappend @@ -1,15 +1,15 @@ # glib always provides bash-completion output, package the output but prevent # the dependency chain on bash (via bash-completion) for mingw32 targets only. -RDEPENDS_${PN}-bash-completion_remove_mingw32 = "bash-completion" +RDEPENDS:${PN}-bash-completion:remove:mingw32 = "bash-completion" # libmount is not buildable for mingw/windows -PACKAGECONFIG_remove_mingw32 = "libmount" +PACKAGECONFIG:remove:mingw32 = "libmount" -FILES_${PN}_append_mingw32 = " \ +FILES:${PN}:append:mingw32 = " \ ${bindir}/lib*.dll \ ${libexecdir}/*gio-querymodules.exe \ " -FILES_${PN}-dev_append_mingw32 = " ${libdir}/*.def" -FILES_${PN}-utils_append_mingw32 = " ${bindir}/*.exe" +FILES:${PN}-dev:append:mingw32 = " ${libdir}/*.def" +FILES:${PN}-utils:append:mingw32 = " ${bindir}/*.exe" diff --git a/recipes-core/libxml/libxml2_%.bbappend b/recipes-core/libxml/libxml2_%.bbappend index 2c9f206..cc155e5 100644 --- a/recipes-core/libxml/libxml2_%.bbappend +++ b/recipes-core/libxml/libxml2_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_remove_class-nativesdk_mingw32 = "python" +PACKAGECONFIG:remove:class-nativesdk:mingw32 = "python" diff --git a/recipes-core/meta/meta-environment.bbappend b/recipes-core/meta/meta-environment.bbappend index 0846042..e981401 100644 --- a/recipes-core/meta/meta-environment.bbappend +++ b/recipes-core/meta/meta-environment.bbappend @@ -1,4 +1,4 @@ TCSCRIPTS ?= "" -TCSCRIPTS_sdkmingw32 = "toolchain-scripts-mingw32" +TCSCRIPTS:sdkmingw32 = "toolchain-scripts-mingw32" inherit ${TCSCRIPTS} diff --git a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend index b3ffb82..d6ec6d3 100644 --- a/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend +++ b/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_${PN}_mingw32 = "\ +RDEPENDS:${PN}:mingw32 = "\ nativesdk-sdk-provides-dummy \ nativesdk-pkgconfig \ nativesdk-libtool \ diff --git a/recipes-core/zlib/zlib_1.2.%.bbappend b/recipes-core/zlib/zlib_1.2.%.bbappend index 2fd034b..d03721a 100644 --- a/recipes-core/zlib/zlib_1.2.%.bbappend +++ b/recipes-core/zlib/zlib_1.2.%.bbappend @@ -1 +1 @@ -EXTRA_OEMAKE_append_mingw32 = " LDSHAREDLIBC=''" +EXTRA_OEMAKE:append:mingw32 = " LDSHAREDLIBC=''" diff --git a/recipes-devtools/binutils/binutils-cross-canadian_2.%.bbappend b/recipes-devtools/binutils/binutils-cross-canadian_2.%.bbappend index 5845fe0..2890afc 100644 --- a/recipes-devtools/binutils/binutils-cross-canadian_2.%.bbappend +++ b/recipes-devtools/binutils/binutils-cross-canadian_2.%.bbappend @@ -1,5 +1,5 @@ -EXTRA_OECONF_append_sdkmingw32 = " --disable-nls" -LDFLAGS_append_sdkmingw32 = " -Wl,-static" +EXTRA_OECONF:append:sdkmingw32 = " --disable-nls" +LDFLAGS:append:sdkmingw32 = " -Wl,-static" -DEPENDS_remove_sdkmingw32 = "nativesdk-gettext" -DEPENDS_remove_sdkmingw32 = "nativesdk-flex" +DEPENDS:remove:sdkmingw32 = "nativesdk-gettext" +DEPENDS:remove:sdkmingw32 = "nativesdk-flex" diff --git a/recipes-devtools/cmake/cmake_%.bbappend b/recipes-devtools/cmake/cmake_%.bbappend index b2e8a19..9fb4f99 100644 --- a/recipes-devtools/cmake/cmake_%.bbappend +++ b/recipes-devtools/cmake/cmake_%.bbappend @@ -1,2 +1,2 @@ -DEPENDS_remove_mingw32 = "ncurses" -RDEPENDS_${PN}-bash-completion_remove_mingw32 = "bash-completion" +DEPENDS:remove:mingw32 = "ncurses" +RDEPENDS:${PN}-bash-completion:remove:mingw32 = "bash-completion" diff --git a/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend index 9c0d828..13ea016 100644 --- a/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend +++ b/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend @@ -1,9 +1,9 @@ -INSANE_SKIP_${PN}_append_sdkmingw32 = " staticdev" -EXTRA_OECONF_append_sdkmingw32 = " --disable-nls" -LDFLAGS_append_sdkmingw32 = " -Wl,-static" -EXEEXT_sdkmingw32 = ".exe" -ELFUTILS_sdkmingw32 = "" -DEPENDS_remove_sdkmingw32 = "nativesdk-gettext" +INSANE_SKIP:${PN}:append:sdkmingw32 = " staticdev" +EXTRA_OECONF:append:sdkmingw32 = " --disable-nls" +LDFLAGS:append:sdkmingw32 = " -Wl,-static" +EXEEXT:sdkmingw32 = ".exe" +ELFUTILS:sdkmingw32 = "" +DEPENDS:remove:sdkmingw32 = "nativesdk-gettext" # With plugins enabled, it will output 'dll.a' files that are mistaken # for ELF which can trigger a failure. Simply avoid processing these diff --git a/recipes-devtools/gcc/gcc-crosssdk_%.bbappend b/recipes-devtools/gcc/gcc-crosssdk_%.bbappend index 3411946..1a4bf6c 100644 --- a/recipes-devtools/gcc/gcc-crosssdk_%.bbappend +++ b/recipes-devtools/gcc/gcc-crosssdk_%.bbappend @@ -1,3 +1,3 @@ PACKAGECONFIG_CONFARGS ?= "" -EXTRA_OECONF_remove_mingw32 = "--enable-initfini-array --with-linker-hash-style=${LINKER_HASH_STYLE}" -EXTRA_OECONF_append_mingw32 = " --disable-initfini-array" +EXTRA_OECONF:remove:mingw32 = "--enable-initfini-array --with-linker-hash-style=${LINKER_HASH_STYLE}" +EXTRA_OECONF:append:mingw32 = " --disable-initfini-array" diff --git a/recipes-devtools/gcc/gcc-runtime_%.bbappend b/recipes-devtools/gcc/gcc-runtime_%.bbappend index f14edf1..0013e88 100644 --- a/recipes-devtools/gcc/gcc-runtime_%.bbappend +++ b/recipes-devtools/gcc/gcc-runtime_%.bbappend @@ -1,14 +1,14 @@ -FILES_libstdc++_append_mingw32 = " ${bindir}/libstdc++*.dll" -FILES_libstdc++-staticdev_append_mingw32 = " ${libdir}/libstdc++.dll.a*" -FILES_libssp_append_mingw32 = " ${bindir}/libssp*.dll" -# FILES_libgomp_append_mingw32 = " ${bindir}/libgomp*.dll" +FILES:libstdc++_append_mingw32 = " ${bindir}/libstdc++*.dll" +FILES:libstdc++-staticdev_append_mingw32 = " ${libdir}/libstdc++.dll.a*" +FILES:libssp:append:mingw32 = " ${bindir}/libssp*.dll" +# FILES:libgomp:append:mingw32 = " ${bindir}/libgomp*.dll" -RUNTIMETARGET_remove_mingw32 = "libatomic libgomp" -RUNTIMETARGET_remove_mingw32 = "libitm" +RUNTIMETARGET:remove:mingw32 = "libatomic libgomp" +RUNTIMETARGET:remove:mingw32 = "libitm" # Intel Memory Protection Extension library for x86 builds are now enabled # by default. However, it does not build for mingw32, so remove it from # mingw builds -RUNTIMETARGET_remove_mingw32 = "libmpx" +RUNTIMETARGET:remove:mingw32 = "libmpx" -DEPENDS_append_mingw32 = " nativesdk-mingw-w64-winpthreads" +DEPENDS:append:mingw32 = " nativesdk-mingw-w64-winpthreads" diff --git a/recipes-devtools/gcc/gcc_%.bbappend b/recipes-devtools/gcc/gcc_%.bbappend index a779bb9..c72363e 100644 --- a/recipes-devtools/gcc/gcc_%.bbappend +++ b/recipes-devtools/gcc/gcc_%.bbappend @@ -1,6 +1,6 @@ -FILES_${PN}_append_mingw32 = "\ +FILES:${PN}:append:mingw32 = "\ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto_plugin-0.dll \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto_plugin.dll.a \ " -INSANE_SKIP_append_mingw32 = " staticdev" +INSANE_SKIP:append:mingw32 = " staticdev" diff --git a/recipes-devtools/gcc/libgcc_%.bbappend b/recipes-devtools/gcc/libgcc_%.bbappend index f542cfc..743b5b7 100644 --- a/recipes-devtools/gcc/libgcc_%.bbappend +++ b/recipes-devtools/gcc/libgcc_%.bbappend @@ -1,9 +1,9 @@ -DEPENDS_append_mingw32 = " nativesdk-mingw-w64-winpthreads" +DEPENDS:append:mingw32 = " nativesdk-mingw-w64-winpthreads" -FILES_${PN}_append_mingw32 = " ${bindir}/libgcc*.dll" -FILES_${PN}-dev_append_mingw32 = " ${base_libdir}/libgcc*.a" +FILES:${PN}:append:mingw32 = " ${bindir}/libgcc*.dll" +FILES:${PN}-dev:append:mingw32 = " ${base_libdir}/libgcc*.a" -do_install_append_mingw32 () { +do_install:append:mingw32 () { # move the .dll files into bindir install -d ${D}${bindir} mv ${D}${base_libdir}/libgcc*.dll ${D}${bindir}/ diff --git a/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend b/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend index 096fc63..9d8324f 100644 --- a/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend +++ b/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend @@ -1,7 +1,7 @@ -EXEEXT_sdkmingw32 = ".exe" -DEPENDS_remove_sdkmingw32 = "nativesdk-ncurses nativesdk-readline nativesdk-python" -RDEPENDS_${PN}_remove_sdkmingw32 = "nativesdk-python-core nativesdk-python-lang nativesdk-python-re nativesdk-python-codecs nativesdk-python-netclient" -EXTRA_OECONF_append_sdkmingw32 = " --without-curses --without-system-readline --with-python=no" -PACKAGECONFIG_remove_sdkmingw32 = "readline" -PACKAGECONFIG_remove_sdkmingw32 = "python" -PACKAGECONFIG_remove_sdkmingw32 = "debuginfod" +EXEEXT:sdkmingw32 = ".exe" +DEPENDS:remove:sdkmingw32 = "nativesdk-ncurses nativesdk-readline nativesdk-python" +RDEPENDS:${PN}:remove:sdkmingw32 = "nativesdk-python-core nativesdk-python-lang nativesdk-python-re nativesdk-python-codecs nativesdk-python-netclient" +EXTRA_OECONF:append:sdkmingw32 = " --without-curses --without-system-readline --with-python=no" +PACKAGECONFIG:remove:sdkmingw32 = "readline" +PACKAGECONFIG:remove:sdkmingw32 = "python" +PACKAGECONFIG:remove:sdkmingw32 = "debuginfod" diff --git a/recipes-devtools/go/go_%.bbappend b/recipes-devtools/go/go_%.bbappend index 9933108..846a4ff 100644 --- a/recipes-devtools/go/go_%.bbappend +++ b/recipes-devtools/go/go_%.bbappend @@ -1,4 +1,4 @@ -do_install_append_class-nativesdk_mingw32() { +do_install:append:class-nativesdk:mingw32() { install -d ${D}${SDKPATHNATIVE}/environment-setup.d cat <<EOF > ${D}${SDKPATHNATIVE}/environment-setup.d/go.bat @@ -6,4 +6,4 @@ set GOROOT=%OECORE_NATIVE_SYSROOT%\\usr\\lib\\${BPN} EOF } -FILES_${PN}_append_class-nativesdk_mingw32 = " ${SDKPATHNATIVE}/environment-setup.d" +FILES:${PN}:append:class-nativesdk:mingw32 = " ${SDKPATHNATIVE}/environment-setup.d" diff --git a/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bbappend b/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bbappend index 4252e8d..63eb066 100644 --- a/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bbappend +++ b/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bbappend @@ -1 +1 @@ -EXTRA_OECONF_append_mingw32 = " --disable-shared" \ No newline at end of file +EXTRA_OECONF:append:mingw32 = " --disable-shared" \ No newline at end of file diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_8.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_8.0.0.bb index 292d22b..68e77fa 100644 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_8.0.0.bb +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_8.0.0.bb @@ -18,9 +18,9 @@ do_compile() { : } -do_install_append() { +do_install:append() { # install correct pthread headers install -m 0644 -t ${D}${includedir} ${S}/../mingw-w64-libraries/winpthreads/include/*.h } -FILES_${PN} += "${exec_prefix}/${TARGET_SYS}" +FILES:${PN} += "${exec_prefix}/${TARGET_SYS}" diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_8.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_8.0.0.bb index 0368841..02132c1 100644 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_8.0.0.bb +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_8.0.0.bb @@ -9,7 +9,7 @@ B = "${WORKDIR}/build-${TARGET_SYS}" inherit autotools nativesdk -BUILDSDK_CPPFLAGS_append = " -isystem${STAGING_INCDIR}" +BUILDSDK_CPPFLAGS:append = " -isystem${STAGING_INCDIR}" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "nativesdk-mingw-w64-headers virtual/${TARGET_PREFIX}gcc " @@ -21,11 +21,11 @@ PROVIDES += "virtual/nativesdk-libintl" TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" -EXTRA_OECONF_x86-64 = "--disable-lib32" +EXTRA_OECONF:x86-64 = "--disable-lib32" do_configure() { oe_runconf } -FILES_${PN} += "${exec_prefix}/libsrc" +FILES:${PN} += "${exec_prefix}/libsrc" diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_8.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_8.0.0.bb index 814268d..38092dc 100644 --- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_8.0.0.bb +++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_8.0.0.bb @@ -18,7 +18,7 @@ do_configure() { TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" -do_install_append() { +do_install:append() { # headers are already installed by mingw-w64-headers rm -rf ${D}${includedir} } diff --git a/recipes-devtools/ninja/ninja_%.bbappend b/recipes-devtools/ninja/ninja_%.bbappend index e7ddb4d..8860e32 100644 --- a/recipes-devtools/ninja/ninja_%.bbappend +++ b/recipes-devtools/ninja/ninja_%.bbappend @@ -1,8 +1,8 @@ -do_compile_mingw32() { +do_compile:mingw32() { python3 ./configure.py --platform mingw ninja } -do_install_mingw32() { +do_install:mingw32() { install -D -m 0755 ${S}/ninja.exe ${D}${bindir}/ninja.exe } diff --git a/recipes-devtools/swig/swig_%.bbappend b/recipes-devtools/swig/swig_%.bbappend index de40609..e5ce7e7 100644 --- a/recipes-devtools/swig/swig_%.bbappend +++ b/recipes-devtools/swig/swig_%.bbappend @@ -1,6 +1,6 @@ # A wrapper script won't work to set SWIG_LIB for a mingw SDK. Instead, add an # environment setup batch file to set SWIG_LIB when the SDK is configured. -do_install_append_class-nativesdk_mingw32() { +do_install:append:class-nativesdk:mingw32() { install -d ${D}${SDKPATHNATIVE}/environment-setup.d cat <<HEREDOC > ${D}${SDKPATHNATIVE}/environment-setup.d/swig.bat @@ -8,5 +8,5 @@ set SWIG_LIB=%OECORE_NATIVE_SYSROOT%\\usr\\share\\${BPN}\\${PV} HEREDOC } -FILES_${PN}_append_class-nativesdk_mingw32 = " ${SDKPATHNATIVE}/environment-setup.d" +FILES:${PN}:append:class-nativesdk:mingw32 = " ${SDKPATHNATIVE}/environment-setup.d" diff --git a/recipes-extended/diffutils/diffutils_%.bbappend b/recipes-extended/diffutils/diffutils_%.bbappend index 2c54a55..8b54cb0 100644 --- a/recipes-extended/diffutils/diffutils_%.bbappend +++ b/recipes-extended/diffutils/diffutils_%.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend_mingw32 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:mingw32 := "${THISDIR}/${BPN}:" # Add some definitions for POSIX signals.. -CFLAGS_append_mingw32 = " -DSIGALRM=14 -DSIGHUP=1 -DSIGQUIT=3 -DSIGPIPE=13 -DSIGTSTP=18 -DSIGSTOP=17 " +CFLAGS:append:mingw32 = " -DSIGALRM=14 -DSIGHUP=1 -DSIGQUIT=3 -DSIGPIPE=13 -DSIGTSTP=18 -DSIGSTOP=17 " -do_configure_prepend_mingw32 () { +do_configure:prepend:mingw32 () { # Remove building of "man" and "gnulib-tests". The tests don't # cross-compile for mingw, but we aren't using them anyway sed -i \ diff --git a/recipes-extended/libarchive/libarchive_%.bbappend b/recipes-extended/libarchive/libarchive_%.bbappend index a411b40..228e85b 100644 --- a/recipes-extended/libarchive/libarchive_%.bbappend +++ b/recipes-extended/libarchive/libarchive_%.bbappend @@ -1 +1 @@ -EXTRA_OECONF_append_mingw32 = " --without-cng" +EXTRA_OECONF:append:mingw32 = " --without-cng" diff --git a/recipes-extended/libidn/libidn2_%.bbappend b/recipes-extended/libidn/libidn2_%.bbappend index 275886d..51d0459 100644 --- a/recipes-extended/libidn/libidn2_%.bbappend +++ b/recipes-extended/libidn/libidn2_%.bbappend @@ -1 +1 @@ -FILES_${PN}-dev_append_mingw32 = " ${libdir}/*.def" +FILES:${PN}-dev:append:mingw32 = " ${libdir}/*.def" diff --git a/recipes-extended/zstd/zstd_%.bbappend b/recipes-extended/zstd/zstd_%.bbappend index 3b2b991..11a2d4e 100644 --- a/recipes-extended/zstd/zstd_%.bbappend +++ b/recipes-extended/zstd/zstd_%.bbappend @@ -1,2 +1,2 @@ -EXTRA_OEMAKE_append_mingw32 = " OS=Windows" -FILES_${PN}_append_mingw32 = " ${libdir}/*.dll" +EXTRA_OEMAKE:append:mingw32 = " OS=Windows" +FILES:${PN}:append:mingw32 = " ${libdir}/*.dll" diff --git a/recipes-graphics/libsdl2/libsdl2_%.bbappend b/recipes-graphics/libsdl2/libsdl2_%.bbappend index 92fa41c..89532d6 100644 --- a/recipes-graphics/libsdl2/libsdl2_%.bbappend +++ b/recipes-graphics/libsdl2/libsdl2_%.bbappend @@ -1,7 +1,7 @@ # Need to disable X11 explictly as nativesdk-libxdmcp fails: # .libs/Fill.o:Fill.c:(.text+0x48): undefined reference to `_imp__recvfrom@24' # .libs/Flush.o:Flush.c:(.text+0x36): undefined reference to `_imp__sendto@24' -PACKAGECONFIG_remove_mingw32_class-nativesdk = "x11 opengl" +PACKAGECONFIG:remove:mingw32:class-nativesdk = "x11 opengl" # libtool doesn't think it can link windres output (COFF) with libtool objects # (COFF) , but it can. This might be because file misidentifies version.o: @@ -10,4 +10,4 @@ PACKAGECONFIG_remove_mingw32_class-nativesdk = "x11 opengl" # # Telling libtool to be dumb and just pass the input to the underlying tools # works fine. -EXTRA_OECONF_append_mingw32 = " lt_cv_deplibs_check_method=pass_all" +EXTRA_OECONF:append:mingw32 = " lt_cv_deplibs_check_method=pass_all" diff --git a/recipes-graphics/wayland/wayland_%.bbappend b/recipes-graphics/wayland/wayland_%.bbappend index bd42595..86a9061 100644 --- a/recipes-graphics/wayland/wayland_%.bbappend +++ b/recipes-graphics/wayland/wayland_%.bbappend @@ -1,7 +1,7 @@ # The assembly file that encodes the DTD string into wayland-scanner is not # compatible with i686 MinGW -PACKAGECONFIG_remove_mingw32_i686 = "dtd-validation" +PACKAGECONFIG:remove:mingw32_i686 = "dtd-validation" -EXTRA_OECONF_class-nativesdk_mingw32 = "--disable-documentation --disable-libraries" -EXTRA_OEMESON_class-nativesdk_mingw32 = "-Ddocumentation=false -Dlibraries=false" +EXTRA_OECONF:class-nativesdk:mingw32 = "--disable-documentation --disable-libraries" +EXTRA_OEMESON:class-nativesdk:mingw32 = "-Ddocumentation=false -Dlibraries=false" diff --git a/recipes-support/curl/curl_%.bbappend b/recipes-support/curl/curl_%.bbappend index 7865b46..f013ee2 100644 --- a/recipes-support/curl/curl_%.bbappend +++ b/recipes-support/curl/curl_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_remove_class-nativesdk_mingw32 = "ssl" -RRECOMMENDS_lib${BPN}_remove_mingw32 = "ca-certificates" +PACKAGECONFIG:remove:class-nativesdk:mingw32 = "ssl" +RRECOMMENDS:lib${BPN}:remove:mingw32 = "ca-certificates" diff --git a/recipes-support/libgcrypt/libgcrypt_%.bbappend b/recipes-support/libgcrypt/libgcrypt_%.bbappend index 50dca09..76c405a 100644 --- a/recipes-support/libgcrypt/libgcrypt_%.bbappend +++ b/recipes-support/libgcrypt/libgcrypt_%.bbappend @@ -1,11 +1,11 @@ # libcap does not support mingw32 -PACKAGECONFIG_remove_mingw32 = "capabilities" +PACKAGECONFIG:remove:mingw32 = "capabilities" -FILES_${PN}-dev_append_mingw32 = " \ +FILES:${PN}-dev:append:mingw32 = " \ ${libdir}/*.def \ ${bindir}/hmac256.exe \ ${bindir}/mpicalc.exe \ " -FILES_dumpsexp-dev_append_mingw32 = " ${bindir}/dumpsexp.exe" +FILES:dumpsexp-dev:append:mingw32 = " ${bindir}/dumpsexp.exe" diff --git a/recipes-support/libgpg-error/libgpg-error_%.bbappend b/recipes-support/libgpg-error/libgpg-error_%.bbappend index 8fcfa78..1e8db69 100644 --- a/recipes-support/libgpg-error/libgpg-error_%.bbappend +++ b/recipes-support/libgpg-error/libgpg-error_%.bbappend @@ -1,3 +1,3 @@ -FILES_${PN}-dev_append_mingw32 = " ${bindir}/gpg-error.exe" +FILES:${PN}-dev:append:mingw32 = " ${bindir}/gpg-error.exe" diff --git a/recipes-support/libiconv/libiconv_1.15.bb b/recipes-support/libiconv/libiconv_1.15.bb index e3eacd9..7b2252f 100644 --- a/recipes-support/libiconv/libiconv_1.15.bb +++ b/recipes-support/libiconv/libiconv_1.15.bb @@ -30,17 +30,17 @@ EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" LEAD_SONAME = "libiconv.so" -do_configure_prepend () { +do_configure:prepend () { rm -f ${S}/m4/libtool.m4 ${S}/m4/ltoptions.m4 ${S}/m4/ltsugar.m4 ${S}/m4/ltversion.m4 ${S}/m4/lt~obsolete.m4 ${S}/libcharset/m4/libtool.m4 ${S}/libcharset/m4/ltoptions.m4 ${S}/libcharset/m4/ltsugar.m4 ${S}/libcharset/m4/ltversion.m4 ${S}/libcharset/m4/lt~obsolete.m4 } -do_configure_append () { +do_configure:append () { # forcibly remove RPATH from libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' *libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=_NO_RPATH_|g' *libtool } -do_install_append () { +do_install:append () { rm -rf ${D}${libdir}/preloadable_libiconv.so rm -rf ${D}${libdir}/charset.alias } diff --git a/recipes-support/libmpc/libmpc_%.bbappend b/recipes-support/libmpc/libmpc_%.bbappend index 5a9ab9e..b04b4e5 100644 --- a/recipes-support/libmpc/libmpc_%.bbappend +++ b/recipes-support/libmpc/libmpc_%.bbappend @@ -1 +1 @@ -EXTRA_OECONF_append_mingw32 = " --enable-static --disable-shared" +EXTRA_OECONF:append:mingw32 = " --enable-static --disable-shared" diff --git a/recipes-support/libpcre/libpcre_%.bbappend b/recipes-support/libpcre/libpcre_%.bbappend index b154f8d..ea72d11 100644 --- a/recipes-support/libpcre/libpcre_%.bbappend +++ b/recipes-support/libpcre/libpcre_%.bbappend @@ -1,6 +1,6 @@ -FILES_libpcrecpp_mingw32 = "${bindir}/libpcrecpp*.dll" -FILES_libpcreposix_mingw32 = "${bindir}/libpcreposix*.dll" -FILES_pcregrep_mingw32 = "${bindir}/pcregrep.exe" -FILES_pcretest_mingw32 = "${bindir}/pcretest.exe" +FILES:libpcrecpp:mingw32 = "${bindir}/libpcrecpp*.dll" +FILES:libpcreposix:mingw32 = "${bindir}/libpcreposix*.dll" +FILES:pcregrep:mingw32 = "${bindir}/pcregrep.exe" +FILES:pcretest:mingw32 = "${bindir}/pcretest.exe" diff --git a/recipes-support/mpfr/mpfr_4.1.%.bbappend b/recipes-support/mpfr/mpfr_4.1.%.bbappend index 4252e8d..63eb066 100644 --- a/recipes-support/mpfr/mpfr_4.1.%.bbappend +++ b/recipes-support/mpfr/mpfr_4.1.%.bbappend @@ -1 +1 @@ -EXTRA_OECONF_append_mingw32 = " --disable-shared" \ No newline at end of file +EXTRA_OECONF:append:mingw32 = " --disable-shared" \ No newline at end of file -- 2.30.2 |
||
|
||
[meta-mingw] [PATCH 2/3] meta-mingw: Override syntax conversion manual fixes
Richard Purdie
Fix a coupld of mis-converted lines from the automated override
conversion script. Signed-off-by: Richard Purdie <richard.purdie@...> --- recipes-devtools/gcc/gcc-runtime_%.bbappend | 4 ++-- recipes-graphics/wayland/wayland_%.bbappend | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-devtools/gcc/gcc-runtime_%.bbappend b/recipes-devtools/gcc/gcc-runtime_%.bbappend index 0013e88..1511abb 100644 --- a/recipes-devtools/gcc/gcc-runtime_%.bbappend +++ b/recipes-devtools/gcc/gcc-runtime_%.bbappend @@ -1,5 +1,5 @@ -FILES:libstdc++_append_mingw32 = " ${bindir}/libstdc++*.dll" -FILES:libstdc++-staticdev_append_mingw32 = " ${libdir}/libstdc++.dll.a*" +FILES:libstdc++:append:mingw32 = " ${bindir}/libstdc++*.dll" +FILES:libstdc++-staticdev:append:mingw32 = " ${libdir}/libstdc++.dll.a*" FILES:libssp:append:mingw32 = " ${bindir}/libssp*.dll" # FILES:libgomp:append:mingw32 = " ${bindir}/libgomp*.dll" diff --git a/recipes-graphics/wayland/wayland_%.bbappend b/recipes-graphics/wayland/wayland_%.bbappend index 86a9061..e8ca57d 100644 --- a/recipes-graphics/wayland/wayland_%.bbappend +++ b/recipes-graphics/wayland/wayland_%.bbappend @@ -1,6 +1,6 @@ # The assembly file that encodes the DTD string into wayland-scanner is not # compatible with i686 MinGW -PACKAGECONFIG:remove:mingw32_i686 = "dtd-validation" +PACKAGECONFIG:remove:mingw32:i686 = "dtd-validation" EXTRA_OECONF:class-nativesdk:mingw32 = "--disable-documentation --disable-libraries" EXTRA_OEMESON:class-nativesdk:mingw32 = "-Ddocumentation=false -Dlibraries=false" -- 2.30.2 |
||
|
||
Minutes: Yocto Project Weekly Triage Meeting 7/29/2021
Trevor Gamblin
Wiki: https://wiki.yoctoproject.org/wiki/Bug_Triage Attendees: Diane, Joshua, MichaelO, Randy, Richard,
Stephen, Steve, Tim, Tony, TrevorG ARs: - Tim to talk with Intel
team about bug 14491 ([QA 3.4_M2.rc1] - stap.StapTest.test_stap
failure)
- Randy to discuss bug
(save which recipe fetches which source) with Robert and come to a
conclusion
Notes:
- Steve encountered
build failures such as the one in
https://errors.yoctoproject.org/Errors/Details/593109/ when
attempting to run dunfell builds with the PARALLEL_MAKE load
averaging added. WR is testing/investigating on internal
Autobuilder instance
Medium+ 3.4 Unassigned Enhancements/Bugs: 80 (Last week
73) AB-INT Bugs: 46
(Last week 49)
|
||
|
||
Yocto Autobuilder: Latency Monitor and AB-INT - Meeting notes: July 29, 2021
YP AB Intermittent failures meeting
=================================== July 29, 2021, 9 AM ET https://windriver.zoom.us/j/3696693975 Attendees: Tony, Richard, Trevor, Randy, Sakib! Summary: ======== ptest failures again are better but there's still room for improvement. The make/ninja load average limit is in but it's not clear if it's effective yet. We tried mechanically summarizing all the high latency top logs for the last week. No firm conclusions but initial thoughts below. If anyone wants to help, we could use more eyes on the logs, particularly the summary logs and understanding iostat # when the dd test times out. Plans for the week: =================== All: Wait and see if the ptest failure rate continues to be lower than previous weeks. Richard: Alex: Sakib: hook more responsive load average in to latency test. (v2) Trevor: patch to set PARALLEL_MAKE : -l 50 -> dunfell, gatesgarth, hardknott Investigate dunfell which failed with this change. Tony: Saul: on vacation Randy: Look at performance data Meeting Notes: ============== 1. job server - ninja could be patched with make's more responsive algorithm next or is this good enough? - Richard suggested that we extract make's code for measuring the load average to a separate binary and run it in the periodic io latency test. Also can we translate it to python? - Trevor is working on this and had some problems so next week. 2. AB status ptest cases are improving, we may be close to done! Let's wait a week to see how things go. (July29, we're not done...) - development week with lots of failures and a-quick builds so it's hard to say. 3. Nothing new on this item this week (July 29): Richard reported - something really flaky going on with serial ports. - particularly bad on qemuppc but also x86. - related to Saul's QMP data dump? - Juy 22/29: We didn't talk about this issue this week. 4. Sakib's improvements to the logging are merged. We think Michael needs to update the script that generates the web page. Randy/Sakib to talk with Michael. -- Done. Sakib generated a summary of all high latency 'top' logs from ~July 23->July 29 by just running his summary script on the merged raw top logs. see all_summary attached. You can see what compilation jobs are most frequently associated with high latency events by: $ grep GCC ~/Downloads/all_summary.txt | less They are: linux-yocto, llvm, qemu, gtk+, # quick top 10 list: $ grep GCC ~/Downloads/all_summary.txt | grep cc | head -10 | \ cut -d"/" -f1,4,5,8 104 ~/genericx86_64-poky-linux/linux-yocto/x86_64-poky-linux 94 ~/core2-32-poky-linux-musl/llvm/i686-poky-linux-musl 89 ~/i686-nativesdk-pokysdk-linux/nativesdk-qemu/i686-pokysdk-linux 74 ~/core2-32-poky-linux-musl/gtk+3/i686-poky-linux-musl 64 ~/build-st/reproducibleB/core2-64-poky-linux 59 ~/cortexa8hf-neon-poky-linux-gnueabi/qemu/arm-poky-linux-gnueabi 53 ~/qemux86-poky-linux/perf/i686-poky-linux 40 ~/core2-64-poky-linux/glibc/x86_64-poky-linux 39 ~/build-st/reproducibleA/core2-64-poky-linux 38 ~/ppc7400-poky-linux/ofono/powerpc-poky-linux If you look at the non-GCC activities that are not part of the base OS activities you see processes such as: make, mv, perl, tar, pseudo, rm, ninja $ grep -v GCC ~/Downloads/all_summary.txt | grep -A 33 "Userspace Process Summary:" Userspace Process Summary: 12326 bitbake-server 12145 python3 8112 /bin/sh 7213 /bin/bash 5207 make 1329 /usr/bin/python3 826 mv 758 (sd-pam) 715 perl 694 x86_64-poky-linux-gcc 620 top 587 sshd: 580 bash 566 /lib/systemd/systemd 561 -bash 476 tar 398 sh 397 arm-poky-linux-gnueabi-gcc 386 /usr/bin/dbus-daemon 382 gcc 379 /usr/sbin/irqbalance 379 /sbin/agetty 373 ~/pkgman-rpm-non-rpm/build/build/tmp/sysroots-components/x86_64/pseudo-native/usr/bin/pseudo 360 qmgr 360 dpkg-deb 358 pickup 356 rm 351 as 335 /usr/sbin/cron 333 /usr/sbin/rsyslogd 326 /usr/sbin/atd 314 /usr/sbin/sshd 296 ninja mv is likely blocked on IO (Sakib please confirm from logs) Since make is around more than ninja, we may be able to better control the load using the 'load average' limit and not have to patch ninja (with make's enhancement) to be more responsive. Attachments: a. script to gather the file: sum_sum.py b. ./summarize_to_outup.py all <directory w/ all the interval files> More analysis required.... 5. (From July 8) Richard says that we may need to redesign the data collection system that Sakib's AB INT tests are based on. Was worried the current approach does NOT cover oe-selftests but we do see it when we see the AB-INT trigger from builds. Not sure if we need the change anything yet. Everything goes through run-command in yocto-ab-helper. Still relevant parts of Previous Meeting Notes: ======================= 4. bitbake server timeout ( no change july 29) "Timeout while waiting for a reply from the bitbake server (60s)" Randy mentioned that the bitbake server timeouts seen in the Wind River build cluster have gone away after upgrading to a newer version of docker. Old: Docker Version: Docker version 18.09.4, build d14af54266 New: Docker Version: Docker version 20.10.7, build f0df350 Clearly the YP ABs aren't running in docker but what about firmware and kernel tunings. Michael, Is the BIOS/firmware kept up to date on most nodes? - July 22: This was done. For the performance builder trend see: https://autobuilder.yocto.io/pub/non-release/20210721-9/testresults/buildperf-centos7/perf-centos7.yoctoproject.org_master_20210721150057_1ad79313a5.html https://autobuilder.yocto.io/pub/non-release/20210721-14/testresults/buildperf-ubuntu1604/perf-ubuntu1604_master_20210721210034_1ad79313a5.html Summary, - CentOS-7 seems to take less time (~ 1 min), - Ubuntu-16.04 seems to take more (~ 5 min) That's a bit surprising! Randy to look at 62659 commit number in poky. 5. io stalls (no update: July 29) Richard said that it would make sense to write an ftrace utility / script to monitor io latency and we could install it with sudo Ch^W mentioned ftrace on IRC. Sakib and Randy will work on that but not for a week or two. ../Randy |
||
|
||
Re: Install SDK with yocto
Hi,
After you download e.g. the tarball, you'll find an installation guide inside. It says: OpenSUSE 13.1 / 42.3 Ubuntu ® 14.04 / 16.04 Fedora 26 / 27 Debian 8.10 / 9.3 So I am not sure why you assume that this should work out of the box/at all with the Yocto Project. If you really want it I suggest to talk to Baumer about it and I am happy to help you and them with the integration. Regards, Robert |
||
|
||
Re: #yocto -kernel startup of devices/platform/amba/ffa00000.perf-monitor
#yocto
Monsees, Steven C (US)
Nevermind I found it, long day…
From: yocto@... <yocto@...>
On Behalf Of Monsees, Steven C (US) via lists.yoctoproject.org
Sent: Wednesday, July 28, 2021 1:57 PM To: yocto@... Subject: [yocto] #yocto -kernel startup of devices/platform/amba/ffa00000.perf-monitor
I am running with zeus…, during kernel startup I see perf-monitors setup
[ 3.564635] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM [ 3.571139] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM [ 3.577571] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM [ 3.583987] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM
Are these are tied to uio0 thru uio3 ? Can someone tell me what recipe initializes and brings these in ? Is it possible to delay their initialization/startup ? (I would like to have them come into play after I setup the uio_fpga interrupt…)
root@cvpx-default ls -la /sys/class/uio total 0 drwxr-xr-x 2 root root 0 Jan 1 1970 . drwxr-xr-x 49 root root 0 Jan 1 1970 .. lrwxrwxrwx 1 root root 0 Jan 1 1970 uio0 -> ../../devices/platform/amba/ffa00000.perf-monitor/uio/uio0 lrwxrwxrwx 1 root root 0 Jan 1 1970 uio1 -> ../../devices/platform/amba/fd0b0000.perf-monitor/uio/uio1 lrwxrwxrwx 1 root root 0 Jan 1 1970 uio2 -> ../../devices/platform/amba/fd490000.perf-monitor/uio/uio2 lrwxrwxrwx 1 root root 0 Jan 1 1970 uio3 -> ../../devices/platform/amba/ffa10000.perf-monitor/uio/uio3 lrwxrwxrwx 1 root root 0 Jul 28 17:36 uio4 -> ../../devices/uio_fpga/uio/uio4 root@cvpx-default
Thanks, Steve |
||
|
||
mail2uvijay@...
Thank you Yoann. I was able to fetch.
|
||
|
||
Yoann Congal
Hello, Le jeu. 29 juil. 2021 à 08:22, <mail2uvijay@...> a écrit : SRC_URI = "git://git@...:xxx/xxx.git" The ':' in SRC_URI is not handled like in the git clone command line. You may need to change it to a '/' SRC_URI = "git://git@.../xxx/xxx.git;protocol=ssh;" This is a frequent error (I make it at least once per project) Hope this helps! Regards, Yoann Congal Smile ECS - Expert technique |
||
|
||
mail2uvijay@...
Hi,
Working on Yocto build system first time. I has written a recipe to fetch the code from private GIT HUB, using SSH keys. Able to clone the code using git clone. However when i ran bitbake getting below error. "ssh couldnot resolve host" In my bitbake recipe these two line are present SRCREV = "ed189c8f5a4df7xxxxxxxxxxx4d443c382f4578" SRC_URI = "git://git@...:xxx/xxx.git" Could someone please suggest on how to write a recipe to get the application code from private git hub using SSH keys. Regards, Vijay |
||
|
||
Re: [meta-spdxscanner][PATCH] MAINTAINERS: Updated the email address where send patches
leimaohui
Merged.
toggle quoted message
Show quoted text
-----Original Message----- |
||
|
||
Install SDK with yocto
daniel_herrmann22@...
Hi,
I am new to yocto and have some problems by installing a SDK with yocto for AArch64. The SDK you can find here: https://www.baumer.com/ch/de/produktubersicht/industriekameras-bildverarbeitung/software/baumer-gapi-sdk/linux-arm/c/14178 It comes with a debian package and a tar.gz file. The tar is like this: include/sdk-folder/header-files
lib/sdk-folder/lib-files
etc..
Question 1: What is the best way to install this with yocto ? 1. I tried to install the deb package like this with no success: DEPENDS += " dpkg-native " SRC_URI += " \ file://baumer-gapi-sdk-linux-v2.11.0-gcc-5.4-aarch64.deb.zip \ " do_install_append() { touch ${STAGING_DIR_NATIVE}/var/lib/dpkg/status ${STAGING_BINDIR_NATIVE}/dpkg --instdir=${D}/ \ --admindir=${STAGING_DIR_NATIVE}/var/lib/dpkg/ \ -i ${WORKDIR}/baumer-gapi-sdk-linux-v2.11.0-gcc-5.4-aarch64.deb } Question 2: Is this a good way with dpkg, when host and target architecture are different ? 2. I tried to install the tar.gz file like this also with no sucess: # Use local tarball SRC_URI = "file://${BP}.tar.gz" S = "${WORKDIR}" inherit bin_package #For Error: libraries are added by mutiple providers EXCLUDE_FROM_SHLIBS = "1" #For Warning: was already stripped (precompiled sources) INSANE_SKIP_${PN} = "ldflags" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_PACKAGE_STRIP = "1" do_install() { cp -r "${WORKDIR}/include ${D}/include ... } The way I thought here, is to extract and copy each file to the target inside do_install.. It would be very helpful when you could give me some hints for the best way to installing this package Thanks |
||
|
||
#yocto -kernel startup of devices/platform/amba/ffa00000.perf-monitor
#yocto
Monsees, Steven C (US)
I am running with zeus…, during kernel startup I see perf-monitors setup
[ 3.564635] xilinx-axipmon ffa00000.perf-monitor: Probed Xilinx APM [ 3.571139] xilinx-axipmon fd0b0000.perf-monitor: Probed Xilinx APM [ 3.577571] xilinx-axipmon fd490000.perf-monitor: Probed Xilinx APM [ 3.583987] xilinx-axipmon ffa10000.perf-monitor: Probed Xilinx APM
Are these are tied to uio0 thru uio3 ? Can someone tell me what recipe initializes and brings these in ? Is it possible to delay their initialization/startup ? (I would like to have them come into play after I setup the uio_fpga interrupt…) root@cvpx-default ls -la /sys/class/uio total 0 drwxr-xr-x 2 root root 0 Jan 1 1970 . drwxr-xr-x 49 root root 0 Jan 1 1970 .. lrwxrwxrwx 1 root root 0 Jan 1 1970 uio0 -> ../../devices/platform/amba/ffa00000.perf-monitor/uio/uio0 lrwxrwxrwx 1 root root 0 Jan 1 1970 uio1 -> ../../devices/platform/amba/fd0b0000.perf-monitor/uio/uio1 lrwxrwxrwx 1 root root 0 Jan 1 1970 uio2 -> ../../devices/platform/amba/fd490000.perf-monitor/uio/uio2 lrwxrwxrwx 1 root root 0 Jan 1 1970 uio3 -> ../../devices/platform/amba/ffa10000.perf-monitor/uio/uio3 lrwxrwxrwx 1 root root 0 Jul 28 17:36 uio4 -> ../../devices/uio_fpga/uio/uio4 root@cvpx-default
Thanks, Steve |
||
|
||
Re: [meta-spdxscanner][PATCH] MAINTAINERS & README.md: Updated the email address where send patches
On 28/07/21 09:12, leimaohui@... wrote:
Hi, MarcoHi Lei,+Please submit any patches against meta-spdxscanner to the Yocto ProjectThis part repeats with MAINTAINERS. Can you send patch V2 without this part? Done. See other upcoming patch. Thanks -- Marco |
||
|
||
[meta-spdxscanner][PATCH] MAINTAINERS: Updated the email address where send patches
From: Marco Cavallini <m.cavallini@...>
Signed-off-by: Marco Cavallini <koansoftware@...> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 23761bf..ec34c24 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,7 +1,7 @@ This file contains a list of maintainers for the meta-spdxscanner layer. Please submit any patches against meta-spdxscanner to the Yocto Project -mailing list (yocto@...) with'[meta-spdxscanner]' in the +mailing list (yocto@...) with'[meta-spdxscanner]' in the subject. You may also contact the maintainers directly. -- 2.17.1 |
||
|
||
Re: [meta-spdxscanner][PATCH] MAINTAINERS & README.md: Updated the email address where send patches
leimaohui
Hi, Marco
+Please submit any patches against meta-spdxscanner to the Yocto ProjectThis part repeats with MAINTAINERS. Can you send patch V2 without this part? Best regards Lei -----Original Message----- |
||
|
||
Re: QA notification for completed autobuilder build (yocto-3.3.2.rc2)
Sangeeta Jain
Hi all,
toggle quoted message
Show quoted text
Intel and WR YP QA is planning for QA execution for YP build yocto-3.3.2.rc2. We are planning to execute following tests for this cycle: OEQA-manual tests for following module: 1. OE-Core 2. BSP-hw Runtime auto test for following platforms: 1. MinnowTurbot 32-bit 2. Coffee Lake 3. NUC 7 4. NUC 6 5. Edgerouter 6. Beaglebone ETA for completion is next Monday, Aug 02. Thanks, Sangeeta -----Original Message----- |
||
|
||
QA notification for completed autobuilder build (yocto-3.1.10.rc1)
Richard Purdie
A build flagged for QA (yocto-3.1.10.rc1) was completed on the autobuilder and is available at:
https://autobuilder.yocto.io/pub/releases/yocto-3.1.10.rc1 Build hash information: bitbake: 0e0af15b84e07e6763300dcd092b980086b9b9c4 meta-agl: 68c0029602e539d005c33b6c36baa32e34bf67bf meta-arm: b79b9122e0dc66ca03542f82ff4fa8eb05174f61 meta-aws: d66de6ed82fe6b89e3b8b2626f4db6f5d7d5713d meta-gplv2: 60b251c25ba87e946a0ca4cdc8d17b1cb09292ac meta-intel: d8bf86ae6288ae520b8ddd7209a0b448b9693f48 meta-mingw: 524de686205b5d6736661d4532f5f98fee8589b7 meta-openembedded: 8fbcfb9f023e0eab7f122eb19607a1c757b0d245 oecore: 9ae339ace9274be71bfd3b5e5da64dceac9fa963 poky: 2a848e95074318f3a243df7b3f40513a13173a82 This is an automated message from the Yocto Project Autobuilder Git: git://git.yoctoproject.org/yocto-autobuilder2 Email: richard.purdie@... |
||
|
||
Re: #yocto
#yocto
toggle quoted message
Show quoted text
On 7/22/21 11:26 PM, sateesh m wrote:
Hi Guys, |
||
|
||
Re: HOW To resolve : Files/directories were installed but not shipped in any package:
On 2021-07-27 5:44 a.m., Alexander Raih wrote:
After modify recipe with using my repo I have this error after rebuild.As the log says, either don't install the file or delete them. There are many commits that you can look at as examples: http://cgit.openembedded.org/openembedded-core/log/?qt=grep&q=Files%2Fdirectories+were+installed+but+not+shipped+in+any+package%3A ../Randy log: -- # Randy MacLeod # Wind River Linux |
||
|
||
[meta-security][PATCH 2/2] clamav: fix branch name and update
They dropped the dev branch for rel. Update to tip.
Refresh patches Signed-off-by: Armin Kuster <akuster808@...> --- recipes-scanners/clamav/clamav_0.104.0.bb | 6 +++--- recipes-scanners/clamav/files/fix_systemd_socket.patch | 4 ++-- recipes-scanners/clamav/files/headers_fixup.patch | 8 ++++---- recipes-scanners/clamav/files/oe_cmake_fixup.patch | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes-scanners/clamav/clamav_0.104.0.bb b/recipes-scanners/clamav/clamav_0.104.0.bb index 4f20309..5759ddd 100644 --- a/recipes-scanners/clamav/clamav_0.104.0.bb +++ b/recipes-scanners/clamav/clamav_0.104.0.bb @@ -8,10 +8,10 @@ DEPENDS = "glibc llvm libtool db openssl zlib curl libxml2 bison pcre2 json-c li LIC_FILES_CHKSUM = "file://COPYING.txt;beginline=2;endline=3;md5=f7029fbbc5898b273d5902896f7bbe17" -# May 15th -SRCREV = "fe96de86bb90c489aa509ee9135f776b7a2a7eb4" +# July 27th +SRCREV = "c389dfa4c3af92b006ada4f7595bbc3e6df3f356" -SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=dev/0.104 \ +SRC_URI = "git://github.com/vrtadmin/clamav-devel;branch=rel/0.104 \ file://clamd.conf \ file://freshclam.conf \ file://volatiles.03_clamav \ diff --git a/recipes-scanners/clamav/files/fix_systemd_socket.patch b/recipes-scanners/clamav/files/fix_systemd_socket.patch index 3e9abe2..3347770 100644 --- a/recipes-scanners/clamav/files/fix_systemd_socket.patch +++ b/recipes-scanners/clamav/files/fix_systemd_socket.patch @@ -12,9 +12,9 @@ Index: git/clamd/CMakeLists.txt =================================================================== --- git.orig/clamd/CMakeLists.txt +++ git/clamd/CMakeLists.txt -@@ -54,4 +54,10 @@ if(SYSTEMD_FOUND) +@@ -60,4 +60,10 @@ if(SYSTEMD_FOUND) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/clamav-daemon.service + FILES ${CMAKE_CURRENT_BINARY_DIR}/clamav-daemon.socket DESTINATION ${SYSTEMD_UNIT_DIR}) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/clamav-daemon.socket.in diff --git a/recipes-scanners/clamav/files/headers_fixup.patch b/recipes-scanners/clamav/files/headers_fixup.patch index 9de0a26..369aa58 100644 --- a/recipes-scanners/clamav/files/headers_fixup.patch +++ b/recipes-scanners/clamav/files/headers_fixup.patch @@ -7,7 +7,7 @@ Index: git/CMakeLists.txt =================================================================== --- git.orig/CMakeLists.txt +++ git/CMakeLists.txt -@@ -374,8 +373,6 @@ check_include_file("stdlib.h" +@@ -443,8 +443,6 @@ check_include_file("stdlib.h" check_include_file("string.h" HAVE_STRING_H) check_include_file("strings.h" HAVE_STRINGS_H) check_include_file("sys/cdefs.h" HAVE_SYS_CDEFS_H) @@ -16,7 +16,7 @@ Index: git/CMakeLists.txt check_include_file("sys/mman.h" HAVE_SYS_MMAN_H) check_include_file("sys/param.h" HAVE_SYS_PARAM_H) check_include_file("sys/queue.h" HAVE_SYS_QUEUE_H) -@@ -410,8 +407,6 @@ endif() +@@ -479,8 +477,6 @@ endif() # int-types variants check_include_file("inttypes.h" HAVE_INTTYPES_H) @@ -25,7 +25,7 @@ Index: git/CMakeLists.txt check_include_file("stdint.h" HAVE_STDINT_H) # this hack required to silence warnings on systems with inttypes.h -@@ -539,17 +528,11 @@ check_type_size("time_t" SIZEOF_TIME_T) +@@ -608,17 +604,11 @@ check_type_size("time_t" SIZEOF_TIME_T) # Checks for library functions. include(CheckSymbolExists) check_symbol_exists(_Exit "stdlib.h" HAVE__EXIT) @@ -44,7 +44,7 @@ Index: git/CMakeLists.txt check_symbol_exists(timegm "time.h" HAVE_TIMEGM) check_symbol_exists(vsnprintf "stdio.h" HAVE_VSNPRINTF) -@@ -563,10 +546,9 @@ else() +@@ -632,10 +622,9 @@ else() check_symbol_exists(fseeko "stdio.h" HAVE_FSEEKO) check_symbol_exists(getaddrinfo "netdb.h" HAVE_GETADDRINFO) check_symbol_exists(getpagesize "unistd.h" HAVE_GETPAGESIZE) diff --git a/recipes-scanners/clamav/files/oe_cmake_fixup.patch b/recipes-scanners/clamav/files/oe_cmake_fixup.patch index b284915..c9c88b9 100644 --- a/recipes-scanners/clamav/files/oe_cmake_fixup.patch +++ b/recipes-scanners/clamav/files/oe_cmake_fixup.patch @@ -22,7 +22,7 @@ Index: git/CMakeLists.txt if(C_LINUX) if(CMAKE_COMPILER_IS_GNUCXX) # Set _GNU_SOURCE for O_LARGEFILE, O_CLOEXEC, O_DIRECTORY, O_NOFOLLOW, etc flags on older systems -@@ -512,14 +506,8 @@ include(TestInline) +@@ -581,14 +575,8 @@ include(TestInline) include(CheckFileOffsetBits) # Determine how to pack structs on this platform. include(CheckStructPacking) -- 2.25.1 |
||
|