diff options
612 files changed, 6834 insertions, 3365 deletions
diff --git a/.github/workflows/yoe.yml b/.github/workflows/yoe.yml new file mode 100644 index 0000000000..c70d1b5053 --- /dev/null +++ b/.github/workflows/yoe.yml @@ -0,0 +1,84 @@ +name: Yoe Distro CI + +on: + # Trigger the workflow on push or pull request, + # but only for the master branch + push: + branches: + - yoe/mut + pull_request: + branches: + - master +jobs: + build: + name: Yoe Build + runs-on: [self-hosted, Linux] + timeout-minutes: 720 + steps: + - name: Fetch Repo Name + id: repo-name + run: echo "value=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_OUTPUT + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: recursive + - name: checkout yoe + run: | + git clone --recurse-submodules -j8 -b master https://github.com/YoeDistro/yoe-distro.git yoe + cd yoe + git checkout master + git pull + git submodule update --recursive --init + rm -rf sources/${{ steps.repo-name.outputs.value }}/* + rsync -av --progress --exclude="yoe" --exclude=".git" `pwd`/../ sources/${{ steps.repo-name.outputs.value }}/ + - name: Setup + run: | + cd yoe + export DOCKER_REPO=none + export LANG=en_US.UTF-8 + export SSTATE_CACHE_DIR=/scratch/sstate-cache + echo export DOCKER_REPO=none > local.sh + echo export LANG=en_US.UTF-8 >> local.sh + echo export SSTATE_CACHE_DIR=/scratch/sstate-cache >> local.sh + cp conf/local.conf.sample conf/local.conf + echo SSTATE_DIR = \"$SSTATE_CACHE_DIR\" >> conf/local.conf + echo IMAGE_CLASSES += \"testimage testsdk\" >> conf/local.conf + echo INHERIT += \"report-error rm_work\" >> conf/local.conf + echo ERR_REPORT_SERVER = \"errors.yoctoproject.org\" >> conf/local.conf + echo ERR_REPORT_PORT = \"80\" >> conf/local.conf + echo ERR_REPORT_USERNAME = \"Yoe Distro CI\" >> conf/local.conf + echo ERR_REPORT_EMAIL = \"info@yoedistro.org\" >> conf/local.conf + echo TOOLCHAIN = \"clang\" >> conf/local.conf + echo BB_NUMBER_THREADS = \"16\" >> conf/local.conf + echo PARALLEL_MAKE = \"-j 32\" >> conf/local.conf + echo ZSTD_THREADS = \"8\" >> conf/local.conf + echo XZ_THREADS = \"8\" >> conf/local.conf + echo XZ_MEMLIMIT = \"20%\" >> conf/local.conf + echo CLANGSDK = \"1\" >> conf/local.conf + echo IMAGE_INSTALL:append = \" clang \" >> conf/local.conf + echo SDKMACHINE = \"aarch64\" >> conf/local.conf + /bin/bash -c "sed -i -e 's/PACKAGE_FEED_URI.*$//' conf/site.conf" + /bin/bash -c "sed -i -e 's/SDK_UPDATE_URL.*$//' conf/site.conf" + - name: Build Image + run: | + cd yoe + /bin/bash -c ". ./envsetup.sh qemuarm64 && bitbake yoe-kiosk-image yoe-sdk-image yoe-debug-image" + - name: Build SDK + run: | + cd yoe + /bin/bash -c ". ./envsetup.sh qemuarm64 && bitbake yoe-debug-image -cpopulate_sdk_ext" + - name: Test Image + run: | + cd yoe + export DISPLAY=":0" + echo TESTIMAGE_AUTO:qemuall = \"1\" >> conf/local.conf + /bin/bash -c ". ./envsetup.sh qemuarm64 && bitbake yoe-sdk-image" + - name: Prepare results + run: | + cd yoe + /bin/bash -c ". ./envsetup.sh qemuarm64 && resulttool report build/tmp/log/oeqa" + - name: Clean shared state + run: | + cd yoe + /bin/bash -c ". ./envsetup.sh qemuarm64 && ./sources/poky/scripts/sstate-cache-management.py -d --remove-orphans -y " @@ -1,3 +1,5 @@ +[](https://github.com/YoeDistro/meta-openembedded/actions/workflows/yoe.yml?query=workflow%3AYoe+branch%3Ayoe%2Fmut) + Collection of layers for the OE-core universe Main layer maintainer: Khem Raj <raj.khem@gmail.com> diff --git a/meta-filesystems/conf/layer.conf b/meta-filesystems/conf/layer.conf index 2e220bfe24..52ca5a4c0b 100644 --- a/meta-filesystems/conf/layer.conf +++ b/meta-filesystems/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_filesystems-layer = "1" LAYERDEPENDS_filesystems-layer = "core openembedded-layer networking-layer" -LAYERSERIES_COMPAT_filesystems-layer = "scarthgap styhead" +LAYERSERIES_COMPAT_filesystems-layer = "styhead" diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb index b641e4c24e..7768a734d6 100644 --- a/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb +++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p3.bb @@ -37,8 +37,8 @@ EXTRA_OECONF = " \ do_install:prepend() { install -d ${D}${sysconfdir}/default/ install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/owhttpd ${D}${sysconfdir}/init.d/owhttpd - install -m 0755 ${WORKDIR}/owserver ${D}${sysconfdir}/init.d/owserver + install -m 0755 ${UNPACKDIR}/owhttpd ${D}${sysconfdir}/init.d/owhttpd + install -m 0755 ${UNPACKDIR}/owserver ${D}${sysconfdir}/init.d/owserver } PACKAGES =+ "owftpd owhttpd owserver owshell libowcapi libow libownet owmon owtap" diff --git a/meta-filesystems/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch b/meta-filesystems/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch deleted file mode 100644 index 49a0b21c6e..0000000000 --- a/meta-filesystems/recipes-support/composefs/files/0001-musl-basename-use-portable-implementation-for-basena.patch +++ /dev/null @@ -1,75 +0,0 @@ -From b21a9d4f10a066cac76bb345d31fdd24afcf3e6f Mon Sep 17 00:00:00 2001 -From: Fathi Boudra <fathi.boudra@linaro.org> -Date: Tue, 9 Apr 2024 08:47:37 +0200 -Subject: [PATCH] musl: basename: use portable implementation for basename API - -musl has removed the non-prototype declaration of basename from string.h which -now results in build errors with newer clang compilers. - -Implement GNU basename behavior using strchr which is portable across libcs. - -Fixes: -| ../../git/tools/mountcomposefs.c:43:20: -| error: call to undeclared function 'basename'; ISO C99 and later do not -| support implicit function declarations [-Wimplicit-function-declaration] -| 43 | const char *bin = basename(argv0); -| | ^ -| ../../git/tools/mountcomposefs.c:43:14: -| error: incompatible integer to pointer conversion initializing 'const char *' -| with an expression of type 'int' [-Wint-conversion] -| 43 | const char *bin = basename(argv0); -| | ^ ~~~~~~~~~~~~~~~ - -For reference: -https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Closes: https://github.com/containers/composefs/issues/272 - -Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org> - -Upstream-Status: Submitted [https://github.com/containers/composefs/pull/273] ---- - libcomposefs/lcfs-utils.h | 6 ++++++ - tools/mkcomposefs.c | 2 +- - tools/mountcomposefs.c | 3 ++- - 3 files changed, 9 insertions(+), 2 deletions(-) - ---- a/tools/mountcomposefs.c -+++ b/tools/mountcomposefs.c -@@ -37,10 +37,11 @@ - #include <linux/fsverity.h> - - #include "libcomposefs/lcfs-mount.h" -+#include "libcomposefs/lcfs-utils.h" - - static void usage(const char *argv0) - { -- const char *bin = basename(argv0); -+ const char *bin = gnu_basename(argv0); - fprintf(stderr, - "usage: %s [-t type] [-o opt[,opts..]] IMAGE MOUNTPOINT\n" - "Example:\n" ---- a/libcomposefs/lcfs-utils.h -+++ b/libcomposefs/lcfs-utils.h -@@ -161,4 +161,10 @@ static inline void *steal_pointer(void * - /* type safety */ - #define steal_pointer(pp) (0 ? (*(pp)) : (steal_pointer)(pp)) - -+static inline const char *gnu_basename(const char *filename) -+{ -+ const char *p = strrchr(filename, '/'); -+ return p ? p+1 : filename; -+} -+ - #endif ---- a/tools/mkcomposefs.c -+++ b/tools/mkcomposefs.c -@@ -315,7 +315,7 @@ static int fill_store(struct lcfs_node_s - - static void usage(const char *argv0) - { -- const char *bin = basename(argv0); -+ const char *bin = gnu_basename(argv0); - fprintf(stderr, - "Usage: %s [OPTIONS] SOURCE IMAGE\n" - "Options:\n" diff --git a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb index cee4879eee..6f613e9cd1 100644 --- a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb +++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb @@ -68,7 +68,7 @@ do_install:append() { # Install systemd related configuration file if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/modules-load.d - install -m 0644 ${WORKDIR}/fuse.conf ${D}${sysconfdir}/modules-load.d + install -m 0644 ${UNPACKDIR}/fuse.conf ${D}${sysconfdir}/modules-load.d fi } diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index ad846af470..4d2b909809 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -33,7 +33,7 @@ do_configure:prepend() { do_configure:append () { install -d ${S}/include/linux/ - cp ${WORKDIR}/aufs_type.h ${S}/include/linux/ + cp ${UNPACKDIR}/aufs_type.h ${S}/include/linux/ sed -i -e 's;__user;;' ${S}/include/linux/aufs_type.h } diff --git a/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.2.bb b/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.3.bb index 0dd5d8f5e7..98d7cc08e5 100644 --- a/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.2.bb +++ b/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.3.bb @@ -12,7 +12,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "61d517231f8ec177eeb5955fd6edb89748d3f88ba412c48bcb32741b430e359a" +SRC_URI[sha256sum] = "fe7eb48d9a655b4fae9b08ef22c7dd20694a92fdbe9ae768e0af03c8be5c27ed" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb index c8a80523dd..8d997ef643 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb @@ -58,10 +58,16 @@ do_install() { unionmount_target_dir=${D}${prefix}/xfstests/unionmount-testsuite install -d $unionmount_target_dir/tests - install ${WORKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests - install ${WORKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir - install ${WORKDIR}/unionmount-testsuite/run -t $unionmount_target_dir - install ${WORKDIR}/unionmount-testsuite/README -t $unionmount_target_dir + install ${UNPACKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests + install ${UNPACKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir + install ${UNPACKDIR}/unionmount-testsuite/run -t $unionmount_target_dir + install ${UNPACKDIR}/unionmount-testsuite/README -t $unionmount_target_dir } FILES:${PN} += "${prefix}/xfstests" + +# This one is reproducible only on 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766963/ +# lstat64.c:65:14: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] +# bstat.c:18:19: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index 89659592ee..f831de78c4 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python" -LAYERSERIES_COMPAT_gnome-layer = "scarthgap styhead" +LAYERSERIES_COMPAT_gnome-layer = "styhead" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ faenza-icon-theme->gdk-pixbuf \ diff --git a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.1.bb b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb index 634b37971e..59ae9383db 100644 --- a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.1.bb +++ b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb @@ -4,11 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext gsettings features_check +inherit gnomebase gettext gsettings features_check useradd -REQUIRED_DISTRO_FEATURES = "opengl" +REQUIRED_DISTRO_FEATURES = "opengl polkit" -SRC_URI[archive.sha256sum] = "7c62a4281fdfa9522110affbf75d09973035f2adc7fa4577511d733186beb68f" +SRC_URI[archive.sha256sum] = "97443eaffe4b1a69626886a41d25cbeb2c148d3fed43d92115c1b7d20d5238ab" DEPENDS = " \ asciidoc-native \ @@ -36,5 +36,15 @@ PACKAGECONFIG[vnc] = "-Dvnc=true,-Dvnc=false,libvncserver" PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp3 fuse3 libxkbcommon" PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" + +do_install:append() { + if [ -d ${D}${datadir}/polkit-1/rules.d ]; then + chmod 700 ${D}${datadir}/polkit-1/rules.d + chown polkitd:root ${D}${datadir}/polkit-1/rules.d + fi +} + PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir} ${datadir} ${libdir}/sysusers.d ${libdir}/tmpfiles.d" diff --git a/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.0.bb b/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.1.bb index 44fdd2dbea..6272065de6 100644 --- a/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.0.bb +++ b/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.1.bb @@ -31,11 +31,13 @@ RDEPENDS:${PN} = "glib-2.0-dev libvirt-virsh qemu-common qemu-system-x86-64 geni inherit gnomebase gsettings pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check -SRC_URI[archive.sha256sum] = "67eeb5e989294958b25c397cfc5615ff65f44315c700010f0b9e336e6f3407cb" +SRC_URI[archive.sha256sum] = "900c177f6762640370a6634cf9e7d3cd8207e498367a8a667a6b731b04116036" GIR_MESON_OPTION = "" VALA_MESON_OPTION = "" +CFLAGS += "-Wno-int-conversion" + FILES:${PN} += "${datadir}" INSANE_SKIP:${PN} = "dev-deps" diff --git a/meta-gnome/recipes-connectivity/folks/folks_0.15.8.bb b/meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb index 4d26817107..899b8da261 100644 --- a/meta-gnome/recipes-connectivity/folks/folks_0.15.8.bb +++ b/meta-gnome/recipes-connectivity/folks/folks_0.15.9.bb @@ -25,4 +25,4 @@ PACKAGECONFIG ??= "" inherit pkgconfig gnomebase gettext gobject-introspection vala features_check -SRC_URI[archive.sha256sum] = "954a6afb3e378f01d310fd443790f235cb0eb71e2139cff4f05f09ab725e49c2" +SRC_URI[archive.sha256sum] = "2311b37355c351f33f163fdc394874a22a0a0682c319493d6d8a6e420711415f" diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb index e0e4a59d24..af1a7d8673 100644 --- a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb @@ -24,6 +24,6 @@ S = "${WORKDIR}/git" do_install:append() { install -d ${D}${datadir}/applications - install -m644 ${WORKDIR}/polkit-gnome-authentication-agent-1.desktop \ + install -m644 ${UNPACKDIR}/polkit-gnome-authentication-agent-1.desktop \ ${D}${datadir}/applications } diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch new file mode 100644 index 0000000000..13b3dda144 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-file-tiff-load-fix-mismatching-variable-type.patch @@ -0,0 +1,24 @@ +From a2458f1528e5733574bb26ff5452b1329116e6db Mon Sep 17 00:00:00 2001 +From: Simon Budig <simon@budig.de> +Date: Sat, 20 May 2023 18:40:41 +0200 +Subject: [PATCH] file-tiff-load: fix mismatching variable type + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/a2458f1528e5733574bb26ff5452b1329116e6db] +Signed-off-by: Khem Raj <raj.khem@gmai.com> +--- + plug-ins/file-tiff/file-tiff-load.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/plug-ins/file-tiff/file-tiff-load.c ++++ b/plug-ins/file-tiff/file-tiff-load.c +@@ -1301,8 +1301,8 @@ load_image (GFile *file, + + /* any resolution info in the file? */ + { +- gfloat xres = 72.0; +- gfloat yres = 72.0; ++ gdouble xres = 72.0; ++ gdouble yres = 72.0; + gushort read_unit; + GimpUnit unit = GIMP_UNIT_PIXEL; /* invalid unit */ + diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch new file mode 100644 index 0000000000..4f04ac8250 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-metadata-shut-up-a-weird-warning.patch @@ -0,0 +1,22 @@ +From 51311f913d9f417d121f59b83d560c7b4b853d1c Mon Sep 17 00:00:00 2001 +From: Simon Budig <simon@budig.de> +Date: Sat, 20 May 2023 22:25:40 +0200 +Subject: [PATCH] metadata: shut up a weird warning + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/51311f913d9f417d121f59b83d560c7b4b853d1c] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + plug-ins/metadata/metadata-editor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/plug-ins/metadata/metadata-editor.c ++++ b/plug-ins/metadata/metadata-editor.c +@@ -2140,7 +2140,7 @@ metadata_dialog_editor_set_metadata (GEx + } + else + { +- if (! g_strv_contains (values, equiv_values[evi])) ++ if (! g_strv_contains ((const gchar * const *) values, equiv_values[evi])) + { + gchar *tmpvalue; + diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.36.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb index 4526839ad6..833341f850 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.36.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb @@ -46,8 +46,11 @@ SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ file://0001-configure-Keep-first-line-of-compiler-version-string.patch \ - file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch" -SRC_URI[sha256sum] = "3d3bc3c69a4bdb3aea9ba2d5385ed98ea03953f3857aafd1d6976011ed7cdbb2" + file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch \ + file://0001-file-tiff-load-fix-mismatching-variable-type.patch \ + file://0001-metadata-shut-up-a-weird-warning.patch \ + " +SRC_URI[sha256sum] = "50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e" EXTRA_OECONF = "--disable-python \ --without-webkit \ diff --git a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb index 90c12efadf..9e641daa5a 100644 --- a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb +++ b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb @@ -29,7 +29,7 @@ do_compile() { do_install() { oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install install -d ${D}/${sysconfdir}/devilspie2 - install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 + install -m 644 ${UNPACKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 install -d ${D}/${sysconfdir}/xdg/autostart - install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart + install -m 644 ${UNPACKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart } diff --git a/meta-gnome/recipes-gnome/evince/evince_46.0.bb b/meta-gnome/recipes-gnome/evince/evince_46.3.bb index 291d325848..47c0950b61 100644 --- a/meta-gnome/recipes-gnome/evince/evince_46.0.bb +++ b/meta-gnome/recipes-gnome/evince/evince_46.3.bb @@ -33,7 +33,7 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'open def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "aff6af69392c04956bfad976dec5d1583b41d5a334e937995f7c3ca0740de221" +SRC_URI[archive.sha256sum] = "bc0d1d41b9d7ffc762e99d2abfafacbf745182f0b31d86db5eec8c67f5f3006b" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index 103bad1b68..fc19253142 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -58,7 +58,7 @@ LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" GI_DATA_ENABLED:libc-musl="False" do_configure:append () { - cp ${WORKDIR}/iconv-detect.h ${S}/src + cp ${UNPACKDIR}/iconv-detect.h ${S}/src # avoid writing perl-native path into csv2vcard shebang sed -i "s|@PERL@|${bindir}/perl|" ${S}/src/tools/addressbook-export/csv2vcard.in } diff --git a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb index 12d344bff5..5db9457122 100644 --- a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb +++ b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit allarch gtk-icon-cache -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BPN}_${PV}.zip" SRC_URI[sha256sum] = "d4486fda0413f8a81a87e0dd2329f50f2a8a7cb4147b48cf147f0160add8174a" diff --git a/meta-gnome/recipes-gnome/file-roller/file-roller_44.1.bb b/meta-gnome/recipes-gnome/file-roller/file-roller_44.3.bb index 30760387f4..a195d43f0c 100644 --- a/meta-gnome/recipes-gnome/file-roller/file-roller_44.1.bb +++ b/meta-gnome/recipes-gnome/file-roller/file-roller_44.3.bb @@ -22,7 +22,7 @@ REQUIRED_DISTRO_FEATURES = "opengl" EXTRA_OEMESON += "-Dintrospection=enabled" SRC_URI = "git://gitlab.gnome.org/GNOME/file-roller.git;protocol=https;branch=master" -SRCREV = "299e86c77d8fe600ee6658357e209b15c674397e" +SRCREV = "d4f3b970bd7dd07d8f539433628eba10551aa629" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" diff --git a/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb index 469281624c..ec1d6ad39f 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb @@ -7,6 +7,7 @@ DEPENDS = " \ audit \ dconf-native \ gtk+3 \ + json-glib \ keyutils \ libcanberra \ libgudev \ diff --git a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.0.bb b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.1.bb index 5c7e27378c..f1a93ea833 100644 --- a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.1.bb @@ -29,7 +29,7 @@ def gnome_verdir(v): REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "44694fda6b6233923f5c10a48d02d2cf5724e011a8a85789074c953101f33bf1" +SRC_URI[archive.sha256sum] = "2d36750a73890086122cf3f0c83e68517891585615165306fa1596a918668247" FILES:${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch index 7d17817bc0..c1bd34d14b 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -1,4 +1,4 @@ -From 8e542784b8ca49c655df0f251a1a1dec724a522e Mon Sep 17 00:00:00 2001 +From 9b88f816ffbe3dd35d0260974e246f6694983500 Mon Sep 17 00:00:00 2001 From: Markus Volk <f_l_k@t-online.de> Date: Mon, 18 Mar 2024 05:50:21 +0100 Subject: [PATCH] Add meson option to pass sysroot @@ -13,14 +13,14 @@ Upstream-Status: Inappropriate [OE specific] 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index f415a7e..8966632 100644 +index b2302bf..5b9baf5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings') option('documentation', type: 'boolean', value: false, description: 'build documentation') - option('location-services', type: 'feature', value: 'disabled', description: 'build with location services') + option('location-services', type: 'feature', value: 'enabled', description: 'build with location services') diff --git a/panels/background/meson.build b/panels/background/meson.build index 6ced050..df1f808 100644 --- a/panels/background/meson.build diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb index 9b54a00e64..152e803b5d 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb @@ -38,7 +38,7 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" -SRC_URI[archive.sha256sum] = "81792423019deda1d2a074c1ecf6a7e6ef3172c09cbe6f4d7995a4b5dea28312" +SRC_URI[archive.sha256sum] = "6335c6cb8164e574db521fff61cfa3dfaa55f1db66ae3bca02750a193e1c4f3d" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[cups] = ",,cups,cups system-config-printer cups-pk-helper" @@ -46,6 +46,7 @@ PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" PACKAGECONFIG[file-share] = ",,,gnome-user-share" PACKAGECONFIG[media-share] = ",,,rygel-meta tumbler" +PACKAGECONFIG[malcontent] = "-Dmalcontent=true,-Dmalcontent=false,malcontent,malcontent-ui" EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch new file mode 100644 index 0000000000..be4c002fc3 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch @@ -0,0 +1,43 @@ +From ac4a07e7ef3d9d046a4ca2a803c5b649b6f7ddf4 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Sat, 8 Jul 2023 00:01:07 -0400 +Subject: [PATCH] window: Fix function callback definition + +Without this, the build fails with clang with +CFLAGS=-Werror=incompatible-function-pointer-types + +``` +../src/font-view-window.c:864:77: error: incompatible function pointer types passing 'void (FontViewWindow *)' (aka 'void (struct _FontViewWindow *)') to parameter of type 'GtkWidgetActionActivateFunc' (aka 'void (*)(struct _GtkWidget *, const char *, struct _GVariant *)') [-Wincompatible-function-pointer-types] + gtk_widget_class_install_action (widget_class, "win.toggle-search", NULL, action_toggle_search_cb); + ^~~~~~~~~~~~~~~~~~~~~~~ +/usr/include/gtk-4.0/gtk/gtkwidget.h:956:87: note: passing argument to parameter 'activate' here + GtkWidgetActionActivateFunc activate); + ^ +``` + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/font-view-window.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/font-view-window.c b/src/font-view-window.c +index 639ac33..24461f7 100644 +--- a/src/font-view-window.c ++++ b/src/font-view-window.c +@@ -758,8 +758,11 @@ font_view_window_show_overview (FontViewWindow *self) + } + + static void +-action_toggle_search_cb (FontViewWindow *self) ++action_toggle_search_cb (GtkWidget *widget, ++ const char *action_name, ++ GVariant *parameter) + { ++ FontViewWindow *self = FONT_VIEW_WINDOW (widget); + + gtk_toggle_button_set_active (self->search_button, + !gtk_toggle_button_get_active (self->search_button)); +-- +2.45.1 + diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb index dbce71d121..ccf8262dcd 100644 --- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb @@ -15,6 +15,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11 opengl" +SRC_URI += "file://0001-window-Fix-function-callback-definition.patch" SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c" FILES:${PN} += " \ diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.1.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.2.bb index 66df8902fa..adce70770f 100644 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.1.bb +++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.2.bb @@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goabackend', DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr" -SRC_URI[archive.sha256sum] = "42ee43fd1e2942b9ff6106252ccdc834602815508bf7a3a52c0bdfffa56eaf40" +SRC_URI[archive.sha256sum] = "df16ad975d139c6bfc4ebb2ec8bb8327297a791ef2bf0b977c78076af5faa98e" PACKAGECONFIG ?= "goabackend kerberos owncloud google windows_live" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.2.bb index b79f70c60c..5c2ae05936 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.1.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.2.bb @@ -6,7 +6,7 @@ inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -SRC_URI[archive.sha256sum] = "c5ba50700da77a986f0060beedacfc017e7ec82283f2a6384842a0807bc4553f" +SRC_URI[archive.sha256sum] = "d442e9d26925125ff215a5c134290495655380741daafbb37a3a99d6f0c7d86f" EXTRA_OEMESON += " \ -Dextension_set=all \ diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb index ed86cbcb6a..0a52de7a3b 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.1.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb @@ -32,7 +32,7 @@ GIR_MESON_OPTION = "" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -SRC_URI[archive.sha256sum] = "64f999844c101e63bf294d45b138de56319ad2f326282721aad0fa860653b369" +SRC_URI[archive.sha256sum] = "6b587101c04bfb364ab09cd38b5d93ebeeb4254754c807cf712fbc8ee3fde238" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.2.bb index 40a7141fca..244941786b 100644 --- a/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.2.bb @@ -28,7 +28,7 @@ RDEPENDS:${PN} = "iso-codes" EXTRA_OEMESON += "-Dtests=false -Dsoup2=false" -SRC_URI[archive.sha256sum] = "11893002bbb54082896683707bc3991ae55a2f3040811a760e3a92c96544f86e" +SRC_URI[archive.sha256sum] = "e700cba287764f5e2255514e312e160550fdbf7a5d3fe16358bb6f7b6732b974" PACKAGECONFIG ?= "flatpak" PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree" diff --git a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.1.bb b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.3.bb index f37eb71952..1e3268238b 100644 --- a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.1.bb +++ b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.3.bb @@ -18,7 +18,7 @@ inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check REQUIRED_DISTRO_FEATURES = "opengl" -SRC_URI[archive.sha256sum] = "8ebfa0bea12e75f5efeacc721be3b8ae65027b024aa81db9ecab8c312257a2eb" +SRC_URI[archive.sha256sum] = "005b48104a909be66ae07448d2bc5706c7d113781057a24ff6da55bdf324c73d" FILES:${PN} += " \ ${datadir}/metainfo \ diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb index 4e1e434314..9d46b43c42 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb @@ -6,13 +6,14 @@ inherit allarch SRC_URI = "file://classic-light.xml" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { install -d ${D}${datadir}/gtksourceview-3.0/styles - install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-3.0/styles/ + install -m 0644 ${UNPACKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-3.0/styles/ install -d ${D}${datadir}/gtksourceview-4/styles - install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-4/styles/ + install -m 0644 ${UNPACKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-4/styles/ } FILES:${PN} = " \ diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb index e504186b82..0ab9b14692 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb @@ -15,6 +15,9 @@ inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspecti REQUIRED_DISTRO_FEATURES = "x11" +EXTRA_OECONF += "--disable-glade-catalog --disable-gtk-doc --disable-Werror" + +CFLAGS += "-Wno-error=incompatible-pointer-types" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${PV}.tar.xz" SRC_URI[md5sum] = "b748da426a7d64e1304f0c532b0f2a67" SRC_URI[sha256sum] = "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd" diff --git a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb b/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb index 9b4a8a0352..a4b4349500 100644 --- a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb +++ b/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" inherit gnomebase gobject-introspection gi-docgen features_check REQUIRED_DISTRO_FEATURES = "opengl" -SRC_URI[archive.sha256sum] = "e0e59eaa8ae3e0a48ec0a6c2fed0470856a709248e9212b6a1d037de5792ecbb" +SRC_URI[archive.sha256sum] = "12cc954f750bb137ace8500fe9355d26e6e00ef6ccaab2950e9d360e92758335" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-gnome/recipes-gnome/mutter/mutter_46.1.bb b/meta-gnome/recipes-gnome/mutter/mutter_46.2.bb index b60ffefb0a..6a121b09cf 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_46.1.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_46.2.bb @@ -24,7 +24,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gettext features_check -SRC_URI[archive.sha256sum] = "63b2660dd0fa193fa662c80ee12eb8b16f2b8c3bc3896366200c79943824d51d" +SRC_URI[archive.sha256sum] = "009baa77f8362612caa2e18c338a1b3c8aad3b5fe2964c2fef7824d321228983" # x11 is still manadatory - see meson.build REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_46.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_46.2.bb index 4092ff9dd2..30e0681ae4 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_46.1.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_46.2.bb @@ -22,7 +22,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache -SRC_URI[archive.sha256sum] = "cc1a5fdf1dd72f92e9e3f3c7ad263709a0de5391a895be9344f6a67f43887bd7" +SRC_URI[archive.sha256sum] = "6ee8c99019b9e3447f6918d68232a20deca89e5525c05805432b7d8840ca71fa" REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch index ea239c41f9..0812e88a9e 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch @@ -1,4 +1,4 @@ -From 2bbd07843e8ec34311cafab35f21b40c86e0dd7f Mon Sep 17 00:00:00 2001 +From 1b7a34b7de9eb2ae776f7cf4dc6221f49b2395ee Mon Sep 17 00:00:00 2001 From: Markus Volk <f_l_k@t-online.de> Date: Tue, 12 Sep 2023 17:00:41 +0200 Subject: [PATCH] meson: fix reproducibility @@ -20,7 +20,7 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de> 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build -index a838344..6945f63 100644 +index 37f5148..18f4bfa 100644 --- a/meson.build +++ b/meson.build @@ -393,7 +393,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version())) @@ -53,10 +53,10 @@ index a838344..6945f63 100644 if get_option('tests_tap_protocol') diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c -index 95c652e..608cee4 100644 +index 6d4510b..189d2fb 100644 --- a/src/libtracker-miners-common/tracker-landlock.c +++ b/src/libtracker-miners-common/tracker-landlock.c -@@ -276,7 +276,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) +@@ -282,7 +282,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) LANDLOCK_ACCESS_FS_READ_DIR); } } @@ -65,7 +65,7 @@ index 95c652e..608cee4 100644 current_dir = g_get_current_dir (); /* Detect running in-tree */ -@@ -296,7 +296,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) +@@ -302,7 +302,7 @@ tracker_landlock_init (const gchar * const *indexed_folders) in_tree_rules[i].flags); } } @@ -90,7 +90,7 @@ index 6e58832..04750f8 100644 ], install: true, diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build -index 16ce367..bbd494d 100644 +index 2e4f61d..b47581c 100644 --- a/src/tracker-extract/meson.build +++ b/src/tracker-extract/meson.build @@ -158,7 +158,7 @@ endif @@ -115,6 +115,3 @@ index 8c081fd..9792082 100644 libtracker_miner_test_deps = [tracker_miners_common_dep, tracker_miner_dep, tracker_sparql] --- -2.34.1 - diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.2.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb index a1fefe6a00..2b2dc7c4b6 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.2.bb +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.3.bb @@ -18,7 +18,7 @@ SRC_URI:append = " \ file://0001-fix-reproducibility.patch \ file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ " -SRC_URI[archive.sha256sum] = "eb4f2b288a0cbe9e614871cb0048274461cfe1cb8467ac817b102d3873dbcba5" +SRC_URI[archive.sha256sum] = "e74388154b5c197b4b7ee42f0dce8c5fbbddd4d361093ef88d4fb303e33da5fe" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-gnome/recipes-gnome/tracker/tracker_3.7.2.bb b/meta-gnome/recipes-gnome/tracker/tracker_3.7.3.bb index f3c482b279..885f3515da 100644 --- a/meta-gnome/recipes-gnome/tracker/tracker_3.7.2.bb +++ b/meta-gnome/recipes-gnome/tracker/tracker_3.7.3.bb @@ -22,7 +22,7 @@ DEPENDS = " \ inherit gettext gnomebase gobject-introspection vala gtk-doc bash-completion python3native SRC_URI += "file://0001-fix-reproducibility.patch" -SRC_URI[archive.sha256sum] = "debcaa291e46afadc1cf6a251f17efb02440aa48bff643d78c61123807dce00f" +SRC_URI[archive.sha256sum] = "ab3d4a50937e04c5ed7846f6dbb999e2909819402f389ca592ee6b77dd28d1f9" # text search is not an option anymore and requires sqlite3 build with # PACKAGECONFIG[fts5] set (default) diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.1.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.2.bb index 847907a5be..e1dd8afae9 100644 --- a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.1.bb +++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.2.bb @@ -21,7 +21,7 @@ inherit gnomebase pkgconfig gsettings features_check REQUIRED_DISTRO_FEATURES = "polkit" -SRC_URI[archive.sha256sum] = "7e8d9623e9d96a89c0897616827cd441dcf2832927d38f135c722552b1172aa1" +SRC_URI[archive.sha256sum] = "b5c65ea25e8483502d033a613be6dc6b71883ac07f1a3e474ad18049c47d16d6" PACKAGECONFIG ?= "screenshot screencast ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[wayland] = ",,wayland-native" diff --git a/meta-initramfs/conf/layer.conf b/meta-initramfs/conf/layer.conf index 93ae527d42..c844085b09 100644 --- a/meta-initramfs/conf/layer.conf +++ b/meta-initramfs/conf/layer.conf @@ -16,7 +16,7 @@ BBFILE_PATTERN_meta-initramfs := "^${LAYERDIR}/" BBFILE_PRIORITY_meta-initramfs = "5" LAYERDEPENDS_meta-initramfs = "core" -LAYERSERIES_COMPAT_meta-initramfs = "scarthgap styhead" +LAYERSERIES_COMPAT_meta-initramfs = "styhead" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ dracut->virtual/kernel \ diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb index 2dce19c6be..d8134b228c 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://icon.xpm" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install:prepend () { echo '# /boot/boot.cfg - KEXECBOOT configuration file. diff --git a/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb b/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb index 4c06346570..c2b3faddda 100644 --- a/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb +++ b/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb @@ -3,10 +3,11 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "file://init-debug.sh" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { - install -m 0755 ${WORKDIR}/init-debug.sh ${D}/init + install -m 0755 ${UNPACKDIR}/init-debug.sh ${D}/init } inherit allarch diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch deleted file mode 100644 index bd768d00d2..0000000000 --- a/meta-initramfs/recipes-devtools/dracut/dracut/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ff5e1a662ba93ba79e2aeaaaec48a2a8ec4b4701 Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Thu, 31 Mar 2022 22:22:44 +0800 -Subject: [PATCH] Guard against __GLIBC_PREREQ for musl libc - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/install/util.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/install/util.c b/src/install/util.c -index 5721de89..784aec48 100644 ---- a/src/install/util.c -+++ b/src/install/util.c -@@ -27,6 +27,7 @@ - - #include "util.h" - -+#if defined(__GLIBC__) - #if __GLIBC_PREREQ(2, 30) == 0 - #include <sys/syscall.h> - #ifndef SYS_gettid -@@ -35,6 +36,7 @@ - - #define gettid() ((pid_t) syscall(SYS_gettid)) - #endif /*__GLIBC_PREREQ */ -+#endif /*__GLIBC__*/ - - size_t page_size(void) - { --- -2.25.1 - diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-feat-dracut-install-split-ldd-command-arguments-for-.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-feat-dracut-install-split-ldd-command-arguments-for-.patch new file mode 100644 index 0000000000..febdbdbddd --- /dev/null +++ b/meta-initramfs/recipes-devtools/dracut/dracut/0001-feat-dracut-install-split-ldd-command-arguments-for-.patch @@ -0,0 +1,91 @@ +From 38dea7dd671fd621b563377cfbd95e4783568c6e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= + <zboszor@gmail.com> +Date: Fri, 7 Jun 2024 10:32:40 +0200 +Subject: [PATCH] feat(dracut-install): split ldd command arguments for + execvp() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This restores a not-so-subtle feature of previously executing ldd +via popen(), i.e. the ability to use a cross-compiled sysroot. + +The ldd command may be passed in via the DRACUT_LDD environment +variable, and the command may contain command line arguments. +The number of such arguments are not known in advance. + +Split the command into executable and arguments and run it +via execvp(). + +Fixes: d010fa0d7f8ef42ad31729d027d2e4be6dd6e588 +Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> +Upstream-Status: Submitted [https://github.com/dracut-ng/dracut-ng/pull/339] +--- + src/install/dracut-install.c | 47 +++++++++++++++++++++++++++++++++++- + 1 file changed, 46 insertions(+), 1 deletion(-) + +diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c +index e9708c45..724b27b5 100644 +--- a/src/install/dracut-install.c ++++ b/src/install/dracut-install.c +@@ -559,10 +559,55 @@ static int resolve_deps(const char *src) + log_debug("%s %s", ldd, fullsrcpath); + pid_t ldd_pid; + if ((ldd_pid = fork()) == 0) { ++ char **cmdline = NULL; ++ int start, pos, idx = 0; ++ /* Account for at least 2 elements plus the terminating NULL in cmdline */ ++ int args = 3; ++ ++ /* Estimate the number of space-separated elements in the "ldd" string */ ++ pos = 0; ++ while (isspace(ldd[pos])) ++ pos++; ++ for (; ldd[pos]; pos++) { ++ if (isspace(ldd[pos])) { ++ if (pos) ++ args++; ++ while (isspace(ldd[pos])) ++ pos++; ++ } ++ } ++ ++ cmdline = malloc(args * sizeof(char *)); ++ memset(cmdline, 0, args * sizeof(char *)); ++ ++ pos = 0; ++ while (isspace(ldd[pos])) ++ pos++; ++ start = pos; ++ for (; ldd[pos]; pos++) { ++ while (ldd[pos] && !isspace(ldd[pos])) ++ pos++; ++ ++ cmdline[idx] = malloc(pos - start + 1); ++ memcpy(cmdline[idx], ldd + start, pos - start); ++ cmdline[idx][pos - start] = 0; ++ idx++; ++ ++ if (!ldd[pos]) ++ break; ++ ++ while (isspace(ldd[pos])) ++ pos++; ++ start = pos; ++ } ++ ++ cmdline[idx++] = fullsrcpath; ++ cmdline[idx] = NULL; ++ + dup2(fds[1], 1); + dup2(fds[1], 2); + putenv("LC_ALL=C"); +- execlp(ldd, ldd, fullsrcpath, (char *)NULL); ++ execvp(cmdline[0], cmdline); + _exit(errno == ENOENT ? 127 : 126); + } + close(fds[1]); +-- +2.45.2 + diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-install-Do-not-undef-_FILE_OFFSET_BITS.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-install-Do-not-undef-_FILE_OFFSET_BITS.patch deleted file mode 100644 index 170df7119f..0000000000 --- a/meta-initramfs/recipes-devtools/dracut/dracut/0001-install-Do-not-undef-_FILE_OFFSET_BITS.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7f8ef553b7c433af153d48c6a16b2943780abf67 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 31 Dec 2022 14:41:52 -0800 -Subject: [PATCH] install: Do not undef _FILE_OFFSET_BITS - -_FILE_OFFSET_BITS is a feature test macro to determine largefile -support. Usually its set to 64 on systems supporting LFS. Its also -needed to be set to 64 for supporting 64bit time_t on glibc on 32bit -systems. If its undefined explicitly, then 64bit time_t can not be -enabled. - -Upstream-Status: Submitted [https://github.com/dracutdevs/dracut/pull/2157] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/install/dracut-install.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c -index dda0caca..05a67a03 100644 ---- a/src/install/dracut-install.c -+++ b/src/install/dracut-install.c -@@ -22,7 +22,6 @@ - #ifndef _GNU_SOURCE - #define _GNU_SOURCE - #endif --#undef _FILE_OFFSET_BITS - #include <ctype.h> - #include <errno.h> - #include <fcntl.h> --- -2.39.0 - diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_056.bb b/meta-initramfs/recipes-devtools/dracut/dracut_102.bb index db08fffe9a..496380a0fb 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_056.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_102.bb @@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PE = "1" -SRCREV = "631d5f72a223288aa1f48bb8e8d0313e75947400" -SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http;branch=master \ +SRCREV = "1a8ee6e00bbe017717a5ef9e9bcfefb3b88f629e" +SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \ file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ - file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \ - file://0001-install-Do-not-undef-_FILE_OFFSET_BITS.patch \ + file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ " DEPENDS += "kmod" diff --git a/meta-multimedia/conf/layer.conf b/meta-multimedia/conf/layer.conf index b7866cbe8c..0442a57a96 100644 --- a/meta-multimedia/conf/layer.conf +++ b/meta-multimedia/conf/layer.conf @@ -31,4 +31,4 @@ LAYERVERSION_multimedia-layer = "1" LAYERDEPENDS_multimedia-layer = "core openembedded-layer meta-python" -LAYERSERIES_COMPAT_multimedia-layer = "scarthgap styhead" +LAYERSERIES_COMPAT_multimedia-layer = "styhead" diff --git a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb index 8fbf9ab2c8..e20358955a 100644 --- a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb +++ b/meta-multimedia/recipes-dvb/oscam/oscam_1.20.bb @@ -6,12 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libusb1 openssl pcsc-lite" -SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ - " -SRCREV = "11718" -PV = "1.10+" +SRCREV = "190d6dee96ca70f8b614932b1498332b1504632b" +SRC_URI = "git://repo.or.cz/oscam.git;protocol=https;nobranch=1" -S = "${WORKDIR}/trunk" +S = "${UNPACKDIR}/git" inherit cmake diff --git a/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.1.bb b/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb index 08607acd85..4e8412303b 100644 --- a/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.1.bb +++ b/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669" SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;branch=master" -SRCREV = "872e470ebf3e65b0b956f3a70329e885a2df1c2a" +SRCREV = "805d9e5a8ffce3ef78cebde4bfedf3642907b2d3" S = "${WORKDIR}/git" diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb index 542ad3487b..f9115d819b 100644 --- a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb +++ b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb @@ -33,7 +33,7 @@ do_install() { chmod a+rx ${D}/${libdir}/*.so* cp -R --no-dereference --preserve=mode,links ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/ cp -R --no-dereference --preserve=mode,links ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ - cp -R --no-dereference --preserve=mode,links ${WORKDIR}/dvb-scan-table/* ${D}/usr/share/dvb + cp -R --no-dereference --preserve=mode,links ${UNPACKDIR}/dvb-scan-table/* ${D}/usr/share/dvb } PACKAGES =+ "dvb-evtest dvb-evtest-dbg \ diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-ipu3-Use-posix-basename.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-ipu3-Use-posix-basename.patch deleted file mode 100644 index 9e4adf3d8d..0000000000 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-ipu3-Use-posix-basename.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 35d2acc61b1b27c0810a80cd21de65f29dc79df7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 24 Mar 2024 11:27:21 -0700 -Subject: [PATCH] ipu3: Use posix basename - -musl does not implement GNU basename extention and with latest musl -the prototype from string.h is also removed [1] which now results in -compile errors e.g. - -../git/utils/ipu3/ipu3-pack.c:21:47: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - -These utilities are using this function in usage() which is used just -before program exit. Always use the basename APIs from libgen.h which is -posix implementation - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2024-March/041180.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/ipu3/ipu3-pack.c | 4 ++-- - utils/ipu3/ipu3-unpack.c | 3 ++- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/utils/ipu3/ipu3-pack.c b/utils/ipu3/ipu3-pack.c -index decbfc6c..23d2db8b 100644 ---- a/utils/ipu3/ipu3-pack.c -+++ b/utils/ipu3/ipu3-pack.c -@@ -8,6 +8,7 @@ - - #include <errno.h> - #include <fcntl.h> -+#include <libgen.h> - #include <stdint.h> - #include <stdio.h> - #include <string.h> -@@ -15,9 +16,8 @@ - #include <sys/types.h> - #include <unistd.h> - --static void usage(const char *argv0) -+static void usage(char *argv0) - { -- - printf("Usage: %s input-file output-file\n", basename(argv0)); - printf("Convert unpacked RAW10 Bayer data to the IPU3 packed Bayer formats\n"); - printf("If the output-file '-', output data will be written to standard output\n"); -diff --git a/utils/ipu3/ipu3-unpack.c b/utils/ipu3/ipu3-unpack.c -index 9d2c1200..1505a970 100644 ---- a/utils/ipu3/ipu3-unpack.c -+++ b/utils/ipu3/ipu3-unpack.c -@@ -8,6 +8,7 @@ - - #include <errno.h> - #include <fcntl.h> -+#include <libgen.h> - #include <stdint.h> - #include <stdio.h> - #include <string.h> -@@ -15,7 +16,7 @@ - #include <sys/types.h> - #include <unistd.h> - --static void usage(const char *argv0) -+static void usage(char *argv0) - { - printf("Usage: %s input-file output-file\n", basename(argv0)); - printf("Unpack the IPU3 raw Bayer format to 16-bit Bayer\n"); --- -2.44.0 - diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.2.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb index 45d6be31ec..93f29c1612 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.2.0.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb @@ -13,10 +13,9 @@ SRC_URI = " \ file://0001-media_device-Add-bool-return-type-to-unlock.patch \ file://0002-options-Replace-use-of-VLAs-in-C.patch \ file://0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch \ - file://0001-ipu3-Use-posix-basename.patch \ " -SRCREV = "89227a428a82e724548399d35c98ea89566f9045" +SRCREV = "aee16c06913422a0ac84ee3217f87a9795e3c2d9" PE = "1" diff --git a/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb b/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb index 5de717c281..1e5381bb2c 100644 --- a/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb +++ b/meta-multimedia/recipes-multimedia/libdvbcsa/libdvbcsa_1.1.0.bb @@ -15,5 +15,5 @@ inherit autotools lib_package pkgconfig do_install:append() { install -D -m 0644 ${S}/src/dvbcsa/dvbcsa.h ${D}${includedir}/dvbcsa/dvbcsa.h - install -D -m 0644 ${WORKDIR}/libdvbcsa.pc ${D}${libdir}/pkgconfig/libdvbcsa.pc + install -D -m 0644 ${UNPACKDIR}/libdvbcsa.pc ${D}${libdir}/pkgconfig/libdvbcsa.pc } diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index 4959a3c8d7..aabf81dce0 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -28,11 +28,11 @@ do_install:append(){ # Systemd script install -d ${D}${nonarch_base_libdir}/systemd/system - install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system + install -m 0755 ${UNPACKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system # Sysvinit script install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna + install -m 0755 ${UNPACKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna } diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb index f30fffebeb..33155da7d2 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb @@ -76,7 +76,7 @@ do_install:append() { ${D}/${localstatedir}/lib/mpd/music install -d ${D}/${sysconfdir} - install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf + install -m 644 ${UNPACKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf sed -i \ -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ diff --git a/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb b/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb index 444bc1cf39..8bedc693ba 100644 --- a/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb +++ b/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb @@ -33,17 +33,17 @@ do_install() { rm -r ${D}${libdir}/mycroft/.git # Install the dev opts so it doesn't ask us on initial setup. - install -m 644 ${WORKDIR}/dev_opts.json ${D}${libdir}/mycroft/.dev_opts.json + install -m 644 ${UNPACKDIR}/dev_opts.json ${D}${libdir}/mycroft/.dev_opts.json if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/mycroft-setup.service ${D}${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/mycroft-setup.service ${D}${systemd_unitdir}/system sed -i -e 's,@LIBDIR@,${libdir},g' ${D}${systemd_unitdir}/system/mycroft-setup.service fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/mycroft.service ${D}${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/mycroft.service ${D}${systemd_unitdir}/system sed -i -e 's,@LIBDIR@,${libdir},g' ${D}${systemd_unitdir}/system/mycroft.service fi } diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch new file mode 100644 index 0000000000..ce381a78b3 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2/0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch @@ -0,0 +1,43 @@ +From b1d911fdab4a583f276d18395037d90bfc305109 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 May 2024 18:12:23 -0700 +Subject: [PATCH] module-suspend-on-idle: Include time.h for struct timespec + decl + +This is flagged as error with gcc-14 on musl targets + +In file included from ../git/src/pipewire/loop.h:27, + from ../git/src/pipewire/core.h:44, + from ../git/src/modules/module-suspend-on-idle.c:26: +../git/spa/include/spa/support/loop.h:184:37: warning: 'struct timespec' declared inside parameter list will not be visible outside of this definition or declaration + 184 | struct timespec *value, + | ^~~~~~~~ +../git/src/modules/module-suspend-on-idle.c: In function 'node_state_changed': +../git/src/modules/module-suspend-on-idle.c:110:69: error: passing argument 2 of 'main_loop->utils->update_timer' from incompatible pointer type [-Wincompatible-pointer-types] + 110 | pw_loop_update_timer(main_loop, info->idle_timeout, &value, NULL, false); + | ^~~~~~ + | | + | struct timespec * + +Upstream-Status: Inappropriate [Fixed in latest pipewire differently] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/modules/module-suspend-on-idle.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/modules/module-suspend-on-idle.c b/src/modules/module-suspend-on-idle.c +index e5c1fcb30..4dba3be71 100644 +--- a/src/modules/module-suspend-on-idle.c ++++ b/src/modules/module-suspend-on-idle.c +@@ -20,6 +20,7 @@ + #include <string.h> + #include <stdio.h> + #include <errno.h> ++#include <time.h> + + #include "config.h" + +-- +2.45.1 + diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb index 9895e89761..7c8afd3d51 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire-0.2_git.bb @@ -10,7 +10,9 @@ DEPENDS = "alsa-lib dbus udev" SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" PV = "0.2.7" -SRC_URI = "git://github.com/PipeWire/pipewire;branch=master;protocol=https" +SRC_URI = "git://github.com/PipeWire/pipewire;branch=master;protocol=https \ + file://0001-module-suspend-on-idle-Include-time.h-for-struct-tim.patch \ + " S = "${WORKDIR}/git" diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.5.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.6.bb index c8ac04d59a..f60ede537b 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.5.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.6.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "a2287be601710eea0d073261223ec34b92384c8a" +SRCREV = "1b8b683a6d7ee9f1c5dcef3fce5f93069f1357c4" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.0;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb index cb919d79e3..5eba4da207 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb @@ -9,9 +9,12 @@ SRC_URI[sha256sum] = "69fe2cfe7154a6e752688e3a0d7d6b07b1605bbaf75b56f6470dc7b4c2 inherit allarch +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${datadir}/movies - install -m 0644 ${WORKDIR}/big_buck_bunny_1080p_surround.avi ${D}${datadir}/movies/ + install -m 0644 ${UNPACKDIR}/big_buck_bunny_1080p_surround.avi ${D}${datadir}/movies/ } FILES:${PN} += "${datadir}/movies" diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb index 40dc2aacb5..29e60cb0a8 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb @@ -9,9 +9,12 @@ SRC_URI[sha256sum] = "40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db0 inherit allarch +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${datadir}/movies - install -m 0644 ${WORKDIR}/big_buck_bunny_480p_surround-fix.avi ${D}${datadir}/movies/ + install -m 0644 ${UNPACKDIR}/big_buck_bunny_480p_surround-fix.avi ${D}${datadir}/movies/ } FILES:${PN} += "${datadir}/movies" diff --git a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb index ed1d027b40..50ea2e3c88 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb @@ -9,9 +9,12 @@ SRC_URI[sha256sum] = "b957d6e6212638441b52d3b620af157cc8d40c2a0342669294854a06ed inherit allarch +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${datadir}/movies - install -m 0644 ${WORKDIR}/big_buck_bunny_720p_surround.avi ${D}${datadir}/movies/ + install -m 0644 ${UNPACKDIR}/big_buck_bunny_720p_surround.avi ${D}${datadir}/movies/ } FILES:${PN} += "${datadir}/movies" diff --git a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb index 78f15f143f..ed3ff75ac0 100644 --- a/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb +++ b/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb @@ -8,9 +8,12 @@ SRC_URI[sha256sum] = "bd2b5bc6c16d4085034f47ef7e4b3938afe86b4eec4ac3cf2685367d3b inherit allarch +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${datadir}/movies - install -m 0644 ${WORKDIR}/ToS-4k-1920.mov ${D}${datadir}/movies/ + install -m 0644 ${UNPACKDIR}/ToS-4k-1920.mov ${D}${datadir}/movies/ } FILES:${PN} += "${datadir}/movies" diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch new file mode 100644 index 0000000000..5f9135a0ee --- /dev/null +++ b/meta-multimedia/recipes-multimedia/sox/sox/0001-tests-Include-math.h-for-fabs-definition.patch @@ -0,0 +1,33 @@ +From afe336ab63ff9b64ef759255de6b03b897dc4453 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 19 May 2024 09:09:46 -0700 +Subject: [PATCH] tests: Include math.h for fabs() definition + +Fixes build with gcc-14 + +../../sox-14.4.2/src/sox_sample_test.h:190:3: error: implicit declaration of function 'fabs' [-Wimplicit-function-declaration] + 190 | assert(fabs(d - 1) < 1e-9 && clips == 0); + | ^~~~~~ + ../../sox-14.4.2/src/sox_sample_test.h:23:1: note: include '<math.h>' or provide a declaration of 'fabs' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/sox_sample_test.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/sox_sample_test.h b/src/sox_sample_test.h +index 62b55e4..17f0069 100644 +--- a/src/sox_sample_test.h ++++ b/src/sox_sample_test.h +@@ -19,6 +19,7 @@ + #undef NDEBUG /* Must undef above assert.h or other that might include it. */ + #endif + #include <assert.h> ++#include <math.h> + #include "sox.h" + + #define TEST_UINT(bits) \ +-- +2.45.1 + diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb index 011cbc2a9d..800fcad2c9 100644 --- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb +++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb @@ -30,6 +30,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \ file://0001-remove-the-error-line-and-live-without-file-type-det.patch \ file://0001-Update-exported-symbol-list.patch \ + file://0001-tests-Include-math.h-for-fabs-definition.patch \ " SRC_URI[md5sum] = "d04fba2d9245e661f245de0577f48a33" SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c" diff --git a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb index e261611afd..b513e959d3 100644 --- a/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb +++ b/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb @@ -4,16 +4,15 @@ HOMEPAGE = "https://github.com/tinyalsa/tinyalsa" SECTION = "libs/multimedia" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://NOTICE;md5=e04cd6fa58488e016f7fb648ebea1db4" +LIC_FILES_CHKSUM = "file://NOTICE;md5=d2918795d9185efcbf430b9ad5cda46d" -SRCREV = "1c5fb68ced57d838f2b7ecd0c00bc1fefc9ab60d" -SRC_URI = "git://github.com/tinyalsa/tinyalsa;branch=master;protocol=https \ - file://0001-fixed-compilation-error-caused-by-strncpy.patch \ - " +PV .= "+git" +SRCREV = "f78ed25aced2dfea743867b8205a787bfb091340" +SRC_URI = "git://github.com/tinyalsa/tinyalsa;branch=master;protocol=https" S = "${WORKDIR}/git" -inherit cmake +inherit meson # tinyalsa is built as a static library. Enable PIC to avoid relocation # errors like these: diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch new file mode 100644 index 0000000000..3f2aa60512 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch @@ -0,0 +1,179 @@ +From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001 +From: Thomas Guillem <thomas@gllm.fr> +Date: Tue, 5 Dec 2023 09:23:35 +0100 +Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment + +Fixes #28441 +Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4645] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/input/input_internal.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/input/input_internal.h b/src/input/input_internal.h +index d29731edca1b..ea02f39f5add 100644 +--- a/src/input/input_internal.h ++++ b/src/input/input_internal.h +@@ -117,7 +117,7 @@ typedef struct input_thread_private_t + + /* Title infos FIXME multi-input (not easy) ? */ + int i_title; +- const input_title_t **title; ++ input_title_t * const *title; + + int i_title_offset; + int i_seekpoint_offset; +-- +GitLab + + +From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001 +From: Zhao Zhili <quinkblack@foxmail.com> +Date: Thu, 1 Mar 2018 14:25:59 +0800 +Subject: [PATCH 2/5] yadif: fix variable type + +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60) +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +--- + modules/video_filter/deinterlace/yadif.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h +index 4bc592ba9307..af16443d0804 100644 +--- a/modules/video_filter/deinterlace/yadif.h ++++ b/modules/video_filter/deinterlace/yadif.h +@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8 + } + + static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) { +- uint8_t *dst = (uint8_t *)dst8; +- uint8_t *prev = (uint8_t *)prev8; +- uint8_t *cur = (uint8_t *)cur8; +- uint8_t *next = (uint8_t *)next8; ++ uint16_t *dst = (uint16_t *)dst8; ++ uint16_t *prev = (uint16_t *)prev8; ++ uint16_t *cur = (uint16_t *)cur8; ++ uint16_t *next = (uint16_t *)next8; + int x; + uint16_t *prev2= parity ? prev : cur ; + uint16_t *next2= parity ? cur : next; +-- +GitLab + + +From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Sun, 3 Mar 2019 09:59:10 +0200 +Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion + +(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058) +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +--- + modules/video_chroma/swscale.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c +index 8993d11ec5dd..11897527355c 100644 +--- a/modules/video_chroma/swscale.c ++++ b/modules/video_chroma/swscale.c +@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, + { + filter_sys_t *p_sys = p_filter->p_sys; + uint8_t palette[AVPALETTE_SIZE]; +- uint8_t *src[4]; int src_stride[4]; +- uint8_t *dst[4]; int dst_stride[4]; ++ uint8_t *src[4], *dst[4]; ++ const uint8_t *csrc[4]; ++ int src_stride[4], dst_stride[4]; + + GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video, + p_src, i_plane_count, b_swap_uvi ); +@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, + GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video, + p_dst, i_plane_count, b_swap_uvo ); + ++ for (size_t i = 0; i < ARRAY_SIZE(src); i++) ++ csrc[i] = src[i]; ++ + #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) +- sws_scale( ctx, src, src_stride, 0, i_height, ++ sws_scale( ctx, csrc, src_stride, 0, i_height, + dst, dst_stride ); + #else +- sws_scale_ordered( ctx, src, src_stride, 0, i_height, ++ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height, + dst, dst_stride ); + #endif + } +-- +GitLab + + +From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Sun, 3 Mar 2019 17:20:04 +0200 +Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing + +(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35) +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +--- + modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +index a93462925e8a..a85f9aafb0b9 100644 +--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c ++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] = + void RegisterCommand( filter_t *p_filter ) + { + filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; +- size_t i_index = 0; + + p_sys->i_commands = ARRAY_SIZE(p_commands); + p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) ); + if( !p_sys->pp_commands ) return; +- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ ) ++ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ ) + { + p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) ); + if( !p_sys->pp_commands[i_index] ) return; +-- +GitLab + + +From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Mon, 26 Feb 2018 20:43:03 +0200 +Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption + +Font alpha is 8-bits, not 32-bits. + +(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0) +Signed-off-by: Thomas Guillem <thomas@gllm.fr> +--- + modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +index a85f9aafb0b9..7a71c6f2373a 100644 +--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c ++++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end, + skip_space( &psz_command ); + if( isdigit( (unsigned char)*psz_command ) ) + { +- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC ) ++ int32_t value; ++ ++ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC ) + return VLC_EGENERIC; ++ ++ p_params->fontstyle.i_font_alpha = value; + } + return VLC_SUCCESS; + } +-- +GitLab + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch new file mode 100644 index 0000000000..c9ef33358e --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch @@ -0,0 +1,377 @@ +From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Mon, 26 Feb 2018 20:36:29 +0200 +Subject: [PATCH 1/9] chromaprint: missing cast + +(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547) +Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> +Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4665] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/stream_out/chromaprint.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c +index 80ec31ba2590..c76cbda3c2bb 100644 +--- a/modules/stream_out/chromaprint.c ++++ b/modules/stream_out/chromaprint.c +@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, + if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer ) + { + if(! chromaprint_feed( p_sys->p_chromaprint_ctx, +- p_buf->p_buffer, ++ (int16_t *)p_buf->p_buffer, + p_buf->i_buffer / BYTESPERSAMPLE ) ) + msg_Warn( p_stream, "feed error" ); + id->i_samples -= i_samples; +-- +GitLab + + +From 6179d6b843f2a93af6a3d51c4244766e3eba9e77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Sun, 14 Apr 2019 09:41:38 +0300 +Subject: [PATCH 2/9] win32: wrap {g,s}etsockopt() + +char * can alias anything, and Winsock relies on that. Unfortunately, +the compiler still issues warnings. This works around that. + +(cherry picked from commit 36715d9b79f34824e126c2bc3aee2f1c1c16af46) +Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> +--- + include/vlc_network.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/include/vlc_network.h b/include/vlc_network.h +index 010454a01c09..e39ffd0bacaa 100644 +--- a/include/vlc_network.h ++++ b/include/vlc_network.h +@@ -183,6 +183,22 @@ VLC_API int vlc_close(int); + + /** @} */ + ++#ifdef _WIN32 ++static inline int vlc_getsockopt(int s, int level, int name, ++ void *val, socklen_t *len) ++{ ++ return getsockopt(s, level, name, (char *)val, len); ++} ++#define getsockopt vlc_getsockopt ++ ++static inline int vlc_setsockopt(int s, int level, int name, ++ const void *val, socklen_t len) ++{ ++ return setsockopt(s, level, name, (const char *)val, len); ++} ++#define setsockopt vlc_setsockopt ++#endif ++ + /* Portable network names/addresses resolution layer */ + + #define NI_MAXNUMERICHOST 64 +-- +GitLab + + +From 3391108f9709f0d77d9297c94371cf9cd30f2cbe Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Thu, 7 Dec 2023 15:43:04 +0100 +Subject: [PATCH 3/9] netsync: use char for temporary local buffer + +On Windows recvfrom/revc/sendto expects a char*. +--- + modules/control/netsync.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/modules/control/netsync.c b/modules/control/netsync.c +index 2a6a1a6a2bf8..8c91034d7cf2 100644 +--- a/modules/control/netsync.c ++++ b/modules/control/netsync.c +@@ -181,7 +181,7 @@ static void *Master(void *handle) + intf_sys_t *sys = intf->p_sys; + for (;;) { + struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; +- uint64_t data[2]; ++ char data[16]; + + if (poll(&ufd, 1, -1) < 0) + continue; +@@ -198,8 +198,8 @@ static void *Master(void *handle) + if (master_system < 0) + continue; + +- data[0] = hton64(mdate()); +- data[1] = hton64(master_system); ++ SetQWBE(&data[0], mdate()); ++ SetQWBE(&data[8], master_system); + + /* Reply to the sender */ + sendto(sys->fd, data, 16, 0, +@@ -224,7 +224,7 @@ static void *Slave(void *handle) + + for (;;) { + struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; +- uint64_t data[2]; ++ char data[16]; + + vlc_tick_t system = GetPcrSystem(sys->input); + if (system < 0) +@@ -233,7 +233,7 @@ static void *Slave(void *handle) + /* Send clock request to the master */ + const vlc_tick_t send_date = mdate(); + +- data[0] = hton64(system); ++ SetQWBE(&data[0], system); + send(sys->fd, data, 8, 0); + + /* Don't block */ +@@ -244,8 +244,8 @@ static void *Slave(void *handle) + if (recv(sys->fd, data, 16, 0) < 16) + goto wait; + +- const vlc_tick_t master_date = ntoh64(data[0]); +- const vlc_tick_t master_system = ntoh64(data[1]); ++ const vlc_tick_t master_date = GetQWBE(&data[0]); ++ const vlc_tick_t master_system = GetQWBE(&data[8]); + const vlc_tick_t diff_date = receive_date - + ((receive_date - send_date) / 2 + master_date); + +-- +GitLab + + +From 27e584d7b9add8dbbb82b7227228e1ec1e25a089 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Tue, 3 Jan 2023 13:23:00 +0100 +Subject: [PATCH 4/9] access/dtv: move the lfind() Windows hack in the module + +So that we don't have to include search.h each time vlc_fixups.h is used. + +The Win32 prototype of lfind() expects an unsigned* for 'nelp', not a size_t*. + +(cherry picked from commit 7c43bcba27b6fe256456d93a9d32e10648f08da8) +Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> +--- + include/vlc_fixups.h | 3 +++ + modules/access/dtv/access.c | 5 +++++ + 2 files changed, 8 insertions(+) + +diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h +index 37f788933779..861cb4cc5063 100644 +--- a/include/vlc_fixups.h ++++ b/include/vlc_fixups.h +@@ -501,8 +501,11 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void + void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) ); + void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); + void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) ); ++#ifndef _WIN32 ++/* the Win32 prototype of lfind() expects an unsigned* for 'nmemb' */ + void *lfind( const void *key, const void *base, size_t *nmemb, + size_t size, int(*cmp)(const void *, const void *) ); ++#endif + #endif /* HAVE_SEARCH_H */ + #ifndef HAVE_TDESTROY + void tdestroy( void *root, void (*free_node)(void *nodep) ); +diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c +index d9756c7b4885..c6ca5005883c 100644 +--- a/modules/access/dtv/access.c ++++ b/modules/access/dtv/access.c +@@ -32,6 +32,11 @@ + #ifdef HAVE_SEARCH_H + #include <search.h> + #endif ++#if defined(_WIN32) ++/* the Win32 prototype of lfind() expects an unsigned* for 'nelp' */ ++# define lfind(a,b,c,d,e) \ ++ lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e)) ++#endif + + #include "dtv/dtv.h" + +-- +GitLab + + +From 5a9ca37a95b6e85e6beaaefba9aa4a886a45411c Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Mon, 15 Jul 2019 12:41:29 +0200 +Subject: [PATCH 5/9] vlc_common: fix swab() calls on win32 that don't use + const on source pointer + +(cherry picked from commit a9e0b1124e19225b903a2926951781e84002c410) +Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> +--- + include/vlc_common.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/include/vlc_common.h b/include/vlc_common.h +index 8090b277150d..089878581763 100644 +--- a/include/vlc_common.h ++++ b/include/vlc_common.h +@@ -947,6 +947,11 @@ static inline void SetQWLE (void *p, uint64_t qw) + # define O_NONBLOCK 0 + # endif + ++/* the mingw32 swab() and win32 _swab() prototypes expect a char* instead of a ++ const void* */ ++# define swab(a,b,c) swab((char*) (a), (char*) (b), (c)) ++ ++ + # include <tchar.h> + #endif /* _WIN32 */ + +-- +GitLab + + +From b758e19479a80604e3feb470b197e4a13a203a85 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Wed, 10 Jul 2019 08:23:45 +0200 +Subject: [PATCH 6/9] avcodec: encoder: fix MPEG4 matrix passed as const + +lavc expects a pointer that it will free in avcodec_free_context(). + +(cherry picked from commit d86c4c87aa78130a4fd00294e25df865d0e2b327) +Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> +--- + modules/codec/avcodec/encoder.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c +index 2b1c3604713d..4919ccf0e0e4 100644 +--- a/modules/codec/avcodec/encoder.c ++++ b/modules/codec/avcodec/encoder.c +@@ -588,8 +588,14 @@ int InitVideoEnc( vlc_object_t *p_this ) + + if ( p_sys->b_mpeg4_matrix ) + { +- p_context->intra_matrix = mpeg4_default_intra_matrix; +- p_context->inter_matrix = mpeg4_default_non_intra_matrix; ++ p_context->intra_matrix = av_malloc( sizeof(mpeg4_default_intra_matrix) ); ++ if ( p_context->intra_matrix ) ++ memcpy( p_context->intra_matrix, mpeg4_default_intra_matrix, ++ sizeof(mpeg4_default_intra_matrix)); ++ p_context->inter_matrix = av_malloc( sizeof(mpeg4_default_non_intra_matrix) ); ++ if ( p_context->inter_matrix ) ++ memcpy( p_context->inter_matrix, mpeg4_default_non_intra_matrix, ++ sizeof(mpeg4_default_non_intra_matrix)); + } + + if ( p_sys->b_pre_me ) +-- +GitLab + + +From 55be3ce60795a09d13861c5637c1fe7aebc5ce8b Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Thu, 7 Dec 2023 14:18:22 +0100 +Subject: [PATCH 7/9] smb: fix potential string to wide string copy + +The type of net_resource depends on the UNICODE define. +--- + modules/access/smb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/access/smb.c b/modules/access/smb.c +index 5fe56f0c9dfe..6add2a3e6278 100644 +--- a/modules/access/smb.c ++++ b/modules/access/smb.c +@@ -524,7 +524,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, + const char *psz_pwd, const char *psz_domain ) + { + char psz_remote[MAX_PATH]; +- NETRESOURCE net_resource; ++ NETRESOURCEA net_resource; + DWORD i_result; + VLC_UNUSED( psz_domain ); + +@@ -544,7 +544,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, + + net_resource.lpRemoteName = psz_remote; + +- i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 ); ++ i_result = WNetAddConnection2A( &net_resource, psz_pwd, psz_user, 0 ); + + if( i_result != NO_ERROR ) + { +-- +GitLab + + +From 5ae924bf212dce64a6424561d92426dbcc2cf3a0 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Wed, 6 Dec 2023 14:45:46 +0100 +Subject: [PATCH 8/9] dxva2: add missing mask initializers + +--- + modules/codec/avcodec/dxva2.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c +index 18b872fe0fe3..2e6809a05410 100644 +--- a/modules/codec/avcodec/dxva2.c ++++ b/modules/codec/avcodec/dxva2.c +@@ -84,12 +84,12 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, + + /* XXX Preferred format must come first */ + static const d3d9_format_t d3d_formats[] = { +- { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12 }, +- { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12 }, +- //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12 }, +- { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010 }, ++ { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12, 0,0,0 }, ++ { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12, 0,0,0 }, ++ //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12, 0,0,0 }, ++ { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010, 0,0,0 }, + +- { NULL, 0, 0 } ++ { NULL, 0, 0, 0,0,0 } + }; + + static const d3d9_format_t *D3dFindFormat(D3DFORMAT format) +-- +GitLab + + +From 08c7a66780740679ba1b0abe9e30e73afc6bc271 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <robux4@ycbcr.xyz> +Date: Wed, 6 Dec 2023 07:48:29 +0100 +Subject: [PATCH 9/9] win32/modules: use cast with GetProcAddress function + pointers + +--- + src/text/url.c | 3 ++- + src/win32/plugin.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/text/url.c b/src/text/url.c +index b962eb31f849..2eb4b8d10817 100644 +--- a/src/text/url.c ++++ b/src/text/url.c +@@ -892,7 +892,8 @@ static int IdnToAscii(DWORD flags, LPCWSTR str, int len, LPWSTR buf, int size) + int (WINAPI *IdnToAsciiReal)(DWORD, LPCWSTR, int, LPWSTR, int); + int ret = 0; + +- IdnToAsciiReal = GetProcAddress(h, "IdnToAscii"); ++ IdnToAsciiReal = (int (WINAPI *)(DWORD, LPCWSTR, int, LPWSTR, int)) ++ GetProcAddress(h, "IdnToAscii"); + if (IdnToAsciiReal != NULL) + ret = IdnToAsciiReal(flags, str, len, buf, size); + else +diff --git a/src/win32/plugin.c b/src/win32/plugin.c +index 1a65521fca75..b5c336eb99ca 100644 +--- a/src/win32/plugin.c ++++ b/src/win32/plugin.c +@@ -45,7 +45,8 @@ static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode) + + BOOL (WINAPI *SetThreadErrorModeReal)(DWORD, DWORD *); + +- SetThreadErrorModeReal = GetProcAddress(h, "SetThreadErrorMode"); ++ SetThreadErrorModeReal = (BOOL (WINAPI *)(DWORD, DWORD *)) ++ GetProcAddress(h, "SetThreadErrorMode"); + if (SetThreadErrorModeReal != NULL) + return SetThreadErrorModeReal(mode, oldmode); + +-- +GitLab + diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb index 21bc408f6d..2a6b27add0 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb @@ -25,6 +25,8 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \ file://0006-configure-Disable-incompatible-function-pointer-type.patch \ file://taglib-2.patch \ file://0001-taglib-Fix-build-on-x86-32-bit.patch \ + file://4645.patch \ + file://4665.patch \ " SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5" diff --git a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.1.bb b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.2.bb index 9115076a24..6ab48285ca 100644 --- a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.1.bb +++ b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.2.bb @@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \ ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \ " -SRCREV = "961450b2ac700e8c9c85a0beb2426b875fa08bff" +SRCREV = "b302ebd6ab66fd538191d22db4ebe02bcef87a91" SRC_URI = " \ git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ file://90-OE-disable-session-dbus-dependent-features.lua \ @@ -54,7 +54,7 @@ WP_MODULE_SUBDIR = "wireplumber-0.5" do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'false', 'true', d)}; then - install -m 0644 ${WORKDIR}/90-OE-disable-session-dbus-dependent-features.lua ${D}${datadir}/wireplumber/main.lua.d + install -m 0644 ${UNPACKDIR}/90-OE-disable-session-dbus-dependent-features.lua ${D}${datadir}/wireplumber/main.lua.d fi } diff --git a/meta-networking/conf/include/non-repro-meta-networking.inc b/meta-networking/conf/include/non-repro-meta-networking.inc index e0f448fe31..45eed5398e 100755 --- a/meta-networking/conf/include/non-repro-meta-networking.inc +++ b/meta-networking/conf/include/non-repro-meta-networking.inc @@ -15,7 +15,6 @@ KNOWN_NON_REPRO_META_NETWORKING = " \ htpdate-doc \ keepalived \ keepalived-dbg \ - kernel-module-mdio-netlink-6.6.17-yocto-standard \ libbearssl-staticdev \ libfko3 \ libfko-client \ @@ -25,7 +24,6 @@ KNOWN_NON_REPRO_META_NETWORKING = " \ libowfat-staticdev \ libruli-staticdev \ libsamba-util0 \ - mdio-netlink-dbg \ mosquitto \ mosquitto-dbg \ ncftp \ diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index 0e09d8f2ad..a9ba4abade 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -15,7 +15,7 @@ LAYERVERSION_networking-layer = "1" LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" -LAYERSERIES_COMPAT_networking-layer = "scarthgap styhead" +LAYERSERIES_COMPAT_networking-layer = "styhead" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb index 52157cf9a8..12cc6645b5 100644 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.3.2.bb @@ -146,7 +146,7 @@ do_install:append() { # firewalld ships an init script but it contains Red Hat-isms, replace it with our own rm -rf ${D}${sysconfdir}/rc.d/ install -d ${D}${sysconfdir}/init.d - install -m0755 ${WORKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld + install -m0755 ${UNPACKDIR}/firewalld.init ${D}${sysconfdir}/init.d/firewalld fi if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'false', 'true', d)}; then diff --git a/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb index 66ad83f711..96515935a9 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb @@ -31,3 +31,7 @@ MULTILIB_SCRIPTS += "${PN}:${bindir}/daq-modules-config " DISABLE_STATIC = "" BBCLASSEXTEND = "native" + +# http://errors.yoctoproject.org/Errors/Details/766912/ +# daq-2.0.7/os-daq-modules/daq_nfq.c:394:37: error: passing argument 2 of 'nfq_get_payload' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb index e5f7e0334f..e458321e6e 100644 --- a/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb +++ b/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.3p1.bb @@ -53,16 +53,16 @@ do_configure:prepend () { } do_install:append () { - install -Dm 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + install -Dm 0644 ${UNPACKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcrelay.service sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service else install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay + install -m 0755 ${UNPACKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay fi } diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 34f8a7e3e5..cc36fbd4f0 100644 --- a/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -41,3 +41,7 @@ FILES:${PN}-client = "${sbindir}/${PN}-client" FILES:${PN}-relay = "${sbindir}/${PN}-relay" FILES:${PN}-requestor = "${sbindir}/${PN}-requestor" FILES:${PN}-server = "${sbindir}/${PN}-server" + +# http://errors.yoctoproject.org/Errors/Details/766880/ +# git/Port-linux/interface.c:118:18: error: assignment to '__caddr_t' {aka 'char *'} from incompatible pointer type 'struct ethtool_value *' [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb index 7ea63a65d3..8397380c1d 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb @@ -169,14 +169,14 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/default/volatiles - install -m 0755 ${WORKDIR}/freeradius ${D}/etc/init.d/radiusd - install -m 0644 ${WORKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd + install -m 0755 ${UNPACKDIR}/freeradius ${D}/etc/init.d/radiusd + install -m 0644 ${UNPACKDIR}/volatiles.58_radiusd ${D}${sysconfdir}/default/volatiles/58_radiusd fi # For systemd if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/radiusd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/radiusd.service ${D}${systemd_unitdir}/system sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ -e 's,@STATEDIR@,${localstatedir},g' \ @@ -184,7 +184,7 @@ do_install() { ${D}${systemd_unitdir}/system/radiusd.service install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/radiusd.conf + install -m 0644 ${UNPACKDIR}/radiusd-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/radiusd.conf fi oe_multilib_header freeradius/autoconf.h diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb index 63476d3495..0e1f50164a 100644 --- a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.1.bb +++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb @@ -13,7 +13,7 @@ SECTION = "console/network" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "swig-native python3" -SRCREV = "210cf30897631fe2006ac50483caf8fd616622a2" +SRCREV = "6f557c490f0b46ab5d7ef1b01bb3bc9fab3f442f" SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb index 468569eef1..1c2f030f83 100644 --- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb +++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb @@ -44,7 +44,7 @@ do_install() { install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ } SYSTEMD_SERVICE:${PN} = "miniupnpd.service" diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb index ea9eb4857b..4ef0654102 100644 --- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb +++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.18.bb @@ -46,7 +46,7 @@ do_install:append() { install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto + install -m 0755 ${UNPACKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto sed -i -e 's,@SBINDIR@,${sbindir},g' \ -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb index cdef11c89c..f44526ff98 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb @@ -13,7 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/Netw SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" -SRC_URI[sha256sum] = "62f0f2a8782221b923f212ac2a8ebbc1002efd6a90ee945dad4adfb56d076d21" +SRC_URI[sha256sum] = "2128de06f91b33c13d63cdaa6e178bc1ca57fc770cde3bc7c24891f4d9824501" S = "${WORKDIR}/NetworkManager-openvpn-${PV}" diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch new file mode 100644 index 0000000000..8e246efe01 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch @@ -0,0 +1,65 @@ +From 34d7a6c9919a73c2e716835000944c17438b2ca1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 7 Jun 2024 14:03:15 -0700 +Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid + function + +When building on musl systems ( with out systemd ), and using LLD linker +from LLVM project we fail to link with undefined symbols. + +This symbol is in sd_id128.c but its disabled, so let disable the functions +which need this function. + +| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific +| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202) +| >>> libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a +| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation) + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1966] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++ + .../src/libsystemd-network/sd-dhcp6-client.c | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +index e664a4a..7ba5020 100644 +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c +@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) { + return 0; + } + ++#if 0 + int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + sd_id128_t machine_id; + int r; +@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { + duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id); + return 0; + } ++#endif + + int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) { + _cleanup_free_ char *p = NULL, *x = NULL; +diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +index 7c20116..08c1e96 100644 +--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c +@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) { + return 0; + } + ++#if 0 + int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + int r; + +@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { + + return 0; + } +- ++#endif + int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) { + int r; + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.0.bb index 3c9570d927..47287951f5 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.0.bb @@ -40,10 +40,11 @@ SRC_URI = " \ file://${BPN}.initd \ file://enable-dhcpcd.conf \ file://enable-iwd.conf \ + file://0001-libnm-systemd-core-Disable-sd_dhcp6_client_set_duid_.patch \ " SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" -SRC_URI[sha256sum] = "722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068" +SRC_URI[sha256sum] = "fc80b942de38e329468e6fc1dfb40aad6a78d02ddf6b8ec31f9acc6460b8723f" S = "${WORKDIR}/NetworkManager-${PV}" @@ -301,7 +302,7 @@ RRECOMMENDS:${PN} += "\ " do_install:append() { - install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager + install -Dm 0755 ${UNPACKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager rm -rf ${D}/run ${D}${localstatedir}/run @@ -315,11 +316,11 @@ do_install:append() { # Enable iwd if compiled if ${@bb.utils.contains('PACKAGECONFIG','iwd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/enable-iwd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-iwd.conf + install -Dm 0644 ${UNPACKDIR}/enable-iwd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-iwd.conf fi # Enable dhcpd if compiled if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf + install -Dm 0644 ${UNPACKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf fi } diff --git a/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.0.bb b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.1.bb index 568593b2d4..b69a7e2355 100644 --- a/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.0.bb +++ b/meta-networking/recipes-connectivity/openfortivpn/openfortivpn_1.22.1.bb @@ -3,7 +3,7 @@ LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d575262a651a6f1a17210ce41bf907d" SRC_URI = "git://github.com/adrienverge/openfortivpn.git;protocol=https;branch=master" -SRCREV = "82e4401162fc65efad8267f4cb3287c6ab6fc088" +SRCREV = "388fa98f639ef91733461de50b06dd57f1ffb099" DEPENDS = "openssl" diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb index d7be1cd71d..0ec9db9e18 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -63,3 +63,7 @@ RCONFLICTS:${PN} = "ot-daemon" FILES:${PN} += "${systemd_unitdir}/*" FILES:${PN} += "${datadir}/*" + +# http://errors.yoctoproject.org/Errors/Details/766903/ +# git/third_party/openthread/repo/src/core/border_router/routing_manager.hpp:615:11: error: 'ot::BorderRouter::RoutingManager::DiscoveredPrefixTable' declared with greater visibility than the type of its field 'ot::BorderRouter::RoutingManager::DiscoveredPrefixTable::mEntryTimer' [-Werror=attributes] +CXXFLAGS += "-Wno-error=attributes" diff --git a/meta-networking/recipes-connectivity/samba/samba_4.19.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb index f5ef86dd4b..7bdcfd35c0 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.19.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb @@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \ file://samba-4.3.9-remove-getpwent_r.patch \ " -SRC_URI[sha256sum] = "0e2405b4cec29d0459621f4340a1a74af771ec7cffedff43250cad7f1f87605e" +SRC_URI[sha256sum] = "653b52095554dbc223c63b96af5cdf9e98c3e048549c5f56143d3b33dce1cef1" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" @@ -173,8 +173,8 @@ do_install:append() { install -d ${D}${sysconfdir}/samba echo "127.0.0.1 localhost" > ${D}${sysconfdir}/samba/lmhosts - install -m644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf - install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba + install -m644 ${UNPACKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf + install -D -m 644 ${UNPACKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/03_samba install -d ${D}${sysconfdir}/default install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba diff --git a/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb index 8b9092b418..9bc14fc56f 100644 --- a/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb +++ b/meta-networking/recipes-connectivity/snort/snort_2.9.20.bb @@ -76,18 +76,18 @@ do_install:append() { cp ${S}/preproc_rules/*.rules ${D}${sysconfdir}/snort/preproc_rules/ if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort + install -m 755 ${UNPACKDIR}/snort.init ${D}${sysconfdir}/init.d/snort fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}/${systemd_system_unitdir} - install -m 644 ${WORKDIR}/snort.service ${D}/${systemd_system_unitdir} + install -m 644 ${UNPACKDIR}/snort.service ${D}/${systemd_system_unitdir} # Install default environment file install -d ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/snort.default ${D}${sysconfdir}/default/snort + install -m 0644 ${UNPACKDIR}/snort.default ${D}${sysconfdir}/default/snort fi install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort + install -m 0644 ${UNPACKDIR}/volatiles.99_snort ${D}${sysconfdir}/default/volatiles/99_snort sed -i -e 's|-ffile-prefix-map[^ ]*||g; s|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc } diff --git a/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb b/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb index 36d35e6dee..f6b58559d4 100644 --- a/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb +++ b/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb @@ -13,9 +13,9 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "tayga.service" do_install:append() { - install -m 0644 ${WORKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf + install -m 0644 ${UNPACKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/tayga.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/tayga.service ${D}${systemd_unitdir}/system/ } inherit autotools systemd diff --git a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index fe9c038f5c..5876b58273 100644 --- a/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -38,14 +38,14 @@ inherit perlnative pkgconfig do_configure:append () { # Make sure we use our nativeperl wrapper sed -i "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/*.pl - cp ${WORKDIR}/long-help ${S} + cp ${UNPACKDIR}/long-help ${S} } do_install () { sed -i s:m600:m\ 600:g Makefile oe_runmake 'DESTDIR=${D}' 'PREFIX=/usr' install rm -f ${D}${sysconfdir}/vpnc/vpnc.conf #This file is useless - install ${WORKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf + install ${UNPACKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf } SYSROOT_PREPROCESS_FUNCS += "vpnc_sysroot_preprocess" diff --git a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb index 507621795f..41b7cf0878 100644 --- a/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb +++ b/meta-networking/recipes-daemons/atftp/atftp_0.8.0.bb @@ -29,14 +29,14 @@ EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -std=gnu89'" do_install:append() { install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/atftpd.init ${D}${sysconfdir}/init.d/atftpd + install -m 0755 ${UNPACKDIR}/atftpd.init ${D}${sysconfdir}/init.d/atftpd install -d ${D}/srv/tftp rm ${D}${sbindir}/in.tftpd install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/atftpd.service ${D}${systemd_unitdir}/system } PACKAGES =+ "${PN}d" diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 36ea289945..7947ffe457 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -65,14 +65,14 @@ do_install() { oe_runmake DESTDIR=${D} install install -D -m 0755 ${S}/debian/init.d ${D}${sysconfdir}/init.d/ippoold - install -D -m 0644 ${WORKDIR}/ippool.service ${D}${systemd_system_unitdir}/ippool.service + install -D -m 0644 ${UNPACKDIR}/ippool.service ${D}${systemd_system_unitdir}/ippool.service sed -i -e 's:@SBINDIR@:${sbindir}:g' ${D}${systemd_system_unitdir}/ippool.service # install self test install -d ${D}/opt/${BPN} install ${S}/test/all.tcl ${S}/test/ippool.test \ ${S}/test/test_procs.tcl ${D}/opt/${BPN} - install ${WORKDIR}/runtest.sh ${D}/opt/${BPN} + install ${UNPACKDIR}/runtest.sh ${D}/opt/${BPN} # fix the ../ippoolconfig in test_procs.tcl sed -i -e "s:../ippoolconfig:ippoolconfig:" \ ${D}/opt/${BPN}/test_procs.tcl diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.8.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.10.bb index 2caddbb54a..6a272775f6 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.8.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.10.bb @@ -12,7 +12,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d) LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "543ba0f15d340b97f30782308cec424a6738fec3" +SRCREV = "d0f04ae4b9bf0bc0be55fbda5f235afdfbf5dd19" SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \ file://0001-Makefile-Do-not-set-Werror.patch \ @@ -78,7 +78,7 @@ do_install () { cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi - install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid + install -p -m 755 ${UNPACKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid sed -i -e "s:= /sbin/iscsid:= ${sbindir}/iscsid:" ${D}${sysconfdir}/iscsi/iscsid.conf @@ -87,17 +87,17 @@ do_install () { echo "d /run/${BPN}/lock - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/iscsi.conf install -d ${D}/etc/default/ - install -p -m 755 ${WORKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ + install -p -m 755 ${UNPACKDIR}/iscsi-initiator ${D}${sysconfdir}/default/ install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/iscsi-initiator.service \ - ${WORKDIR}/iscsi-initiator-targets.service \ + install -m 0644 ${UNPACKDIR}/iscsi-initiator.service \ + ${UNPACKDIR}/iscsi-initiator-targets.service \ ${D}${systemd_unitdir}/system/ install -d ${D}${nonarch_libdir}/iscsi - install -m 0755 ${WORKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi + install -m 0755 ${UNPACKDIR}/set_initiatorname ${D}${nonarch_libdir}/iscsi else install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles + install -m 0644 ${UNPACKDIR}/99_iscsi-initiator-utils ${D}/etc/default/volatiles fi } diff --git a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb index 370465e141..4deab153c4 100644 --- a/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb +++ b/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb @@ -48,8 +48,8 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE:${PN} = "lldpd.service" do_install:append() { - install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd - install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd + install -Dm 0755 ${UNPACKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd + install -Dm 0644 ${UNPACKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd # Make an empty configuration file touch ${D}${sysconfdir}/lldpd.conf } diff --git a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb index 15bb00a3af..de111cac05 100644 --- a/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb +++ b/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb @@ -28,3 +28,7 @@ do_install () { 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ install } + +# http://errors.yoctoproject.org/Errors/Details/766888/ +# ncftp/3.2.7/ncftp-3.2.7/config.h:358:28: error: passing argument 2 of 'select' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index 32c4783cf7..ac13d7a196 100644 --- a/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb +++ b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb @@ -75,10 +75,10 @@ do_install:append () { install -m 0600 ${S}/openhpi.conf.example ${D}${sysconfdir}/${BPN}/openhpi.conf install -m 0644 ${S}/simulation.data.example ${D}${sysconfdir}/${BPN}/simulation.data install -m 0644 ${S}/test_agent.data.example ${D}${sysconfdir}/${BPN}/test_agent.data - install -m 0755 ${WORKDIR}/openhpi.init ${D}${sysconfdir}/init.d/openhpid + install -m 0755 ${UNPACKDIR}/openhpi.init ${D}${sysconfdir}/init.d/openhpid install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/openhpid.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/openhpid.service ${D}${systemd_unitdir}/system sed -i -e "s,@SBINDIR@,${sbindir},g" -e "s,@SYSCONFDIR@,${sysconfdir},g" \ ${D}${systemd_unitdir}/system/openhpid.service } diff --git a/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb b/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb index 3ec7f22ad3..d48e9145f8 100644 --- a/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb +++ b/meta-networking/recipes-daemons/postfix/postfix_3.8.6.bb @@ -136,21 +136,21 @@ do_install () { mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/ install -d ${D}${sysconfdir}/init.d - install -m 644 ${WORKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf + install -m 644 ${UNPACKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf - install -m 755 ${WORKDIR}/check_hostname.sh ${D}${sbindir}/ + install -m 755 ${UNPACKDIR}/check_hostname.sh ${D}${sbindir}/ - install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix - install -m 644 ${WORKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient + install -m 755 ${UNPACKDIR}/postfix ${D}${sysconfdir}/init.d/postfix + install -m 644 ${UNPACKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/postfix.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/postfix.service ${D}${systemd_unitdir}/system sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service - install -m 0755 ${WORKDIR}/aliasesdb ${D}${libexecdir}/postfix + install -m 0755 ${UNPACKDIR}/aliasesdb ${D}${libexecdir}/postfix install -m 770 -d ${D}${localstatedir}/spool/postfix chown postfix:postfix ${D}${localstatedir}/spool/postfix diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb index ecd2777247..aa8d5fabd6 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb @@ -82,14 +82,14 @@ do_install () { sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd + install -m 0755 ${UNPACKDIR}/proftpd-basic.init ${D}${sysconfdir}/init.d/proftpd sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/proftpd sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/proftpd sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/proftpd sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/proftpd install -d ${D}${sysconfdir}/default - install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/proftpd + install -m 0755 ${UNPACKDIR}/default ${D}${sysconfdir}/default/proftpd # create the pub directory mkdir -p ${D}/home/${FTPUSER}/pub/ @@ -105,7 +105,7 @@ do_install () { fi install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/proftpd.service ${D}/${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/proftpd.service ${D}/${systemd_unitdir}/system sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ diff --git a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb index d1eb6e28fc..f2c300855c 100644 --- a/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb +++ b/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb @@ -47,13 +47,13 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ptpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/ptpd.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/ptpd.service sed -i -e 's#@BINDIR@#${bindir}#g' ${D}${systemd_unitdir}/system/ptpd.service install -d ${D}${sysconfdir}/default/ - install -m 0644 ${WORKDIR}/ptpd.conf ${D}${sysconfdir}/default/ptpd + install -m 0644 ${UNPACKDIR}/ptpd.conf ${D}${sysconfdir}/default/ptpd fi } diff --git a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb b/meta-networking/recipes-daemons/radvd/radvd_2.19.bb index a9b5f79424..a8a116cbe5 100644 --- a/meta-networking/recipes-daemons/radvd/radvd_2.19.bb +++ b/meta-networking/recipes-daemons/radvd/radvd_2.19.bb @@ -34,30 +34,30 @@ do_install:append () { ${D}${sysconfdir}/default/volatiles \ ${D}${docdir}/radvd # Install init script and volatiles - install -m 0755 ${WORKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd + install -m 0755 ${UNPACKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/radvd sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/radvd sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/radvd sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/radvd - install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd + install -m 0644 ${UNPACKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/03_radvd # Install systemd service files install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/radvd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/radvd.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' \ -e 's#@SBINDIR@#${sbindir}#g' \ -e 's#@BASE_BINDIR@#${base_bindir}#g' ${D}${systemd_unitdir}/system/radvd.service # Install default environment file - install -m 0644 ${WORKDIR}/radvd.default ${D}${sysconfdir}/default/radvd + install -m 0644 ${UNPACKDIR}/radvd.default ${D}${sysconfdir}/default/radvd # Documentation for i in radvd.conf.example README; do \ install -m 0644 ${S}/$i ${D}${docdir}/radvd; \ done - install -m 0644 ${WORKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf + install -m 0644 ${UNPACKDIR}/radvd.conf ${D}${sysconfdir}/radvd.conf } USERADD_PACKAGES = "${PN}" diff --git a/meta-networking/recipes-daemons/squid/squid_6.9.bb b/meta-networking/recipes-daemons/squid/squid_6.9.bb index f0663a5e04..f670a776eb 100644 --- a/meta-networking/recipes-daemons/squid/squid_6.9.bb +++ b/meta-networking/recipes-daemons/squid/squid_6.9.bb @@ -68,6 +68,11 @@ EXTRA_OECONF += "--with-default-user=squid \ --with-logdir=${localstatedir}/log/${BPN} \ 'PERL=${USRBINPATH}/env perl'" +# Workaround a build failure when using a native compiler that need -std=c++17 +# with a cross-compiler that doesn't. +# Upstream issue closed as invalid : https://bugs.squid-cache.org/show_bug.cgi?id=5376 +BUILD_CXXFLAGS += "-std=c++17" + export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" TESTDIR = "test-suite" @@ -117,7 +122,7 @@ do_install:append() { fi install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid + install -m 0644 ${UNPACKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid rmdir "${D}${localstatedir}/run/${BPN}" rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" @@ -127,7 +132,7 @@ do_install:append() { # Install NetworkManager dispatcher reload hooks install -d ${D}${libdir}/NetworkManager/dispatcher.d - install -m 0755 ${WORKDIR}/squid.nm ${D}${libdir}/NetworkManager/dispatcher.d/20-squid + install -m 0755 ${UNPACKDIR}/squid.nm ${D}${libdir}/NetworkManager/dispatcher.d/20-squid } SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 565f493ce2..b5a2b9dae0 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -58,18 +58,18 @@ do_install() { install -m 755 -d ${D}${localstatedir}/lib/tftpboot/ install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/tftpd-hpa + install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/tftpd-hpa sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/tftpd-hpa sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/tftpd-hpa install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa + install -m 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/tftpd-hpa install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tftpd-hpa.socket ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tftpd-hpa.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/tftpd-hpa.socket ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/tftpd-hpa.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tftpd-hpa.service } diff --git a/meta-networking/recipes-daemons/vblade/vblade_25.bb b/meta-networking/recipes-daemons/vblade/vblade_25.bb index 7c37fc1676..7f20e927c6 100644 --- a/meta-networking/recipes-daemons/vblade/vblade_25.bb +++ b/meta-networking/recipes-daemons/vblade/vblade_25.bb @@ -27,22 +27,22 @@ do_install() { install -D -m 0755 ${S}/vbladed ${D}/${sbindir}/vbladed install -D -m 0644 ${S}/vblade.8 ${D}/${mandir}/man8/vblade.8 - install -D -m 0644 ${WORKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf - install -D -m 0755 ${WORKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} + install -D -m 0644 ${UNPACKDIR}/${BPN}.conf ${D}/${sysconfdir}/${BPN}.conf + install -D -m 0755 ${UNPACKDIR}/${BPN}.init ${D}/${sysconfdir}/init.d/${BPN} if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}/${sysconfdir}/default/volatiles - install -m 0755 ${WORKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade + install -m 0755 ${UNPACKDIR}/volatiles.99_vblade ${D}/${sysconfdir}/default/volatiles/99_vblade fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/${BPN}.init ${D}/${bindir}/ + install -m 0755 ${UNPACKDIR}/${BPN}.init ${D}/${bindir}/ install -d ${D}${sysconfdir}/tmpfiles.d echo "d /var/run/${BPN} 0755 root root -" > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/vblade.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/vblade.service ${D}${systemd_system_unitdir} sed -e 's,@BINDIR@,${bindir},g' -i ${D}${systemd_system_unitdir}/*.service fi diff --git a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb index 0ae52c8ddc..4a843bd800 100644 --- a/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb +++ b/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb @@ -65,14 +65,14 @@ do_install() { install -d ${D}${mandir}/man5 oe_runmake 'DESTDIR=${D}' install install -d ${D}${sysconfdir} - install -m 600 ${WORKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf + install -m 600 ${UNPACKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf install -d ${D}${sysconfdir}/init.d/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vsftpd + install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/vsftpd install -d ${D}/${sysconfdir}/default/volatiles - install -m 644 ${WORKDIR}/volatiles.99_vsftpd ${D}/${sysconfdir}/default/volatiles/99_vsftpd + install -m 644 ${UNPACKDIR}/volatiles.99_vsftpd ${D}/${sysconfdir}/default/volatiles/99_vsftpd - install -m 600 ${WORKDIR}/vsftpd.ftpusers ${D}${sysconfdir}/ - install -m 600 ${WORKDIR}/vsftpd.user_list ${D}${sysconfdir}/ + install -m 600 ${UNPACKDIR}/vsftpd.ftpusers ${D}${sysconfdir}/ + install -m 600 ${UNPACKDIR}/vsftpd.user_list ${D}${sysconfdir}/ if ! test -z "${PAMLIB}" ; then install -d ${D}${sysconfdir}/pam.d/ cp ${S}/RedHat/vsftpd.pam ${D}${sysconfdir}/pam.d/vsftpd @@ -87,7 +87,7 @@ do_install() { # Install systemd unit files install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/vsftpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/vsftpd.service ${D}${systemd_unitdir}/system sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/vsftpd.service } diff --git a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb index 98f0f02fb8..2f5d192a77 100644 --- a/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb +++ b/meta-networking/recipes-devtools/libcoap/libcoap_4.3.4.bb @@ -51,7 +51,7 @@ do_compile:prepend() { do_install_ptest () { install -d ${D}${PTEST_PATH} - install -m 0755 ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest + install -m 0755 ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest install -m 0755 ${B}/tests/testdriver ${D}${PTEST_PATH}/testdriver } diff --git a/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb b/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb index 8fca576614..cbbbbc70cd 100644 --- a/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb +++ b/meta-networking/recipes-extended/corosync/corosync_3.1.6.bb @@ -40,7 +40,7 @@ EXTRA_OEMAKE = "tmpfilesdir_DATA=" #} do_install:append() { - install -D -m 0644 ${WORKDIR}/corosync.conf ${D}${sysconfdir}/corosync/corosync.conf.example + install -D -m 0644 ${UNPACKDIR}/corosync.conf ${D}${sysconfdir}/corosync/corosync.conf.example install -d ${D}${sysconfdir}/sysconfig/ install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd diff --git a/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb b/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb index 35995f7876..e816b79e87 100644 --- a/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb +++ b/meta-networking/recipes-extended/tgt/tgt_1.0.90.bb @@ -39,12 +39,12 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/tgtd.init ${D}${sysconfdir}/init.d/tgtd + install -m 0755 ${UNPACKDIR}/tgtd.init ${D}${sysconfdir}/init.d/tgtd elif ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tgtd.service ${D}${systemd_unitdir}/system/tgtd.service + install -m 0644 ${UNPACKDIR}/tgtd.service ${D}${systemd_unitdir}/system/tgtd.service install -d ${D}${sysconfdir}/sysconfig - install -m 0644 ${WORKDIR}/tgtd ${D}${sysconfdir}/sysconfig/tgtd + install -m 0644 ${UNPACKDIR}/tgtd ${D}${sysconfdir}/sysconfig/tgtd sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tgtd.service sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/tgtd.service sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/tgtd.service diff --git a/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb b/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.2.bb index e124fd2906..940454c3ac 100644 --- a/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb +++ b/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.2.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://rocky.eld.leidenuniv.nl/joomla/index.php?option=com_content&v LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://gpl_license.txt;md5=11c7b65c4a4acb9d5175f7e9bf99c403" -SRCREV = "a96b81da4a9b619e4045805f5f13a1e982c95663" +SRCREV = "c8dfd85b9e8e453e279525f30c1e3184c092f036" SRC_URI = "git://github.com/arno-iptables-firewall/aif;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb index 07e01845d7..524718d56c 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.8.bb @@ -34,8 +34,8 @@ do_install:append() { install -d ${D}/${sysconfdir}/conntrackd install -d ${D}/${sysconfdir}/init.d install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample - install -m 0755 ${WORKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd + install -m 0755 ${UNPACKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover + install -m 0755 ${UNPACKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd # Fix hardcoded paths in scripts sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd @@ -45,7 +45,7 @@ do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}/${systemd_system_unitdir} - install -m 644 ${WORKDIR}/conntrackd.service ${D}/${systemd_system_unitdir} + install -m 644 ${UNPACKDIR}/conntrackd.service ${D}/${systemd_system_unitdir} fi } diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb index d522b514f6..8918936e14 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb @@ -29,14 +29,14 @@ do_install:append () { # Replace upstream ebtables-save perl script with Fedora bash based rewrite # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save rm -f ${D}${sbindir}/ebtables-legacy-save - install -m 0755 ${WORKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save + install -m 0755 ${UNPACKDIR}/ebtables-legacy-save ${D}${sbindir}/ebtables-legacy-save # Install systemd service files if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ebtables.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/ebtables.service ${D}${systemd_unitdir}/system sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/ebtables.service - install -m 0755 ${WORKDIR}/ebtables.common ${D}${sbindir}/ebtables.common + install -m 0755 ${UNPACKDIR}/ebtables.common ${D}${sbindir}/ebtables.common fi install -d ${D}${base_sbindir} diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb index 7718922742..17f00ffd42 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb @@ -35,9 +35,9 @@ EXTRA_OECONF = " \ SETUPTOOLS_SETUP_PATH = "${S}/py" -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} -PACKAGES =+ "${PN}-python" +PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)}" FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" diff --git a/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb index d075ec4788..635fa6a408 100644 --- a/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb +++ b/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb @@ -42,11 +42,11 @@ do_install:append () { install -m 0644 ${S}/ulogd.8 ${D}${mandir}/man8/ulogd.8 install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/ulogd.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/ulogd.service ${D}${systemd_system_unitdir} sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/ulogd.service install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/ulogd.init ${D}${sysconfdir}/init.d/ulogd + install -m 755 ${UNPACKDIR}/ulogd.init ${D}${sysconfdir}/init.d/ulogd } PACKAGES += "${PN}-plugins" diff --git a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb index b3282d273b..c7c329a5d4 100644 --- a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb +++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb @@ -78,18 +78,18 @@ do_install:append() { mv ${D}${sysconfdir}/${fd_pkgname}/freediameter.conf.sample \ ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf.sample install -d ${D}${sysconfdir}/freeDiameter - install ${WORKDIR}/freeDiameter.conf ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf + install ${UNPACKDIR}/freeDiameter.conf ${D}${sysconfdir}/${fd_pkgname}/freeDiameter.conf # install daemon init related files install -d -m 0755 ${D}${sysconfdir}/default install -d -m 0755 ${D}${sysconfdir}/init.d install -m 0644 ${S}/contrib/debian/freediameter-daemon.default \ ${D}${sysconfdir}/default/${BPN} - install -m 0755 ${WORKDIR}/freediameter.init ${D}${sysconfdir}/init.d/${BPN} + install -m 0755 ${UNPACKDIR}/freediameter.init ${D}${sysconfdir}/init.d/${BPN} # install for systemd install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/freediameter.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/freediameter.service ${D}${systemd_system_unitdir} sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/*.service cat >> ${D}${sysconfdir}/freeDiameter/freeDiameter.conf <<EOF @@ -108,14 +108,14 @@ EOF openssl req -x509 -config ${STAGING_DIR_NATIVE}/etc/ssl/openssl.cnf -newkey rsa:4096 -sha256 -nodes -out ${D}${sysconfdir}/freeDiameter/${FD_PEM} -keyout ${D}${sysconfdir}/freeDiameter/${FD_KEY} -days 3650 -subj '/CN=${FD_HOSTNAME}.${FD_REALM}' openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024 - find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${WORKDIR}##g' {} \; + find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${UNPACKDIR}##g' {} \; } do_install_ptest() { mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/ rmdir ${D}${PTEST_PATH}-tests install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/ - sed -i -e 's#${WORKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake + sed -i -e 's#${UNPACKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake } diff --git a/meta-networking/recipes-protocols/frr/frr_9.1.bb b/meta-networking/recipes-protocols/frr/frr_10.0.bb index eea6d62f5f..bdc359667a 100644 --- a/meta-networking/recipes-protocols/frr/frr_9.1.bb +++ b/meta-networking/recipes-protocols/frr/frr_10.0.bb @@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/9.1 \ +SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.0 \ file://frr.pam \ file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ " -SRCREV = "ca2d6f0f1e000951224a18973cc1827f7f5215b5" +SRCREV = "03a143cd49ed1b190cb38f48a31ef4d71fa01a02" UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" @@ -104,7 +104,7 @@ do_install:append:class-target () { if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then install -d ${D}/${sysconfdir}/pam.d - install -m 644 ${WORKDIR}/frr.pam ${D}/${sysconfdir}/pam.d/frr + install -m 644 ${UNPACKDIR}/frr.pam ${D}/${sysconfdir}/pam.d/frr fi if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch index f5d424d58f..68a395d69e 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch @@ -1,7 +1,7 @@ -From c1f3e19d3cb0aa948248616eb1684a1e80aa39b4 Mon Sep 17 00:00:00 2001 +From 1fefe289d0c907392382eb2fa2f1f0ecac02f85d Mon Sep 17 00:00:00 2001 From: Nate Karstens <nate.karstens@garmin.com> Date: Wed, 28 Jun 2017 17:30:00 -0500 -Subject: [PATCH 1/8] Create subroutine for cleaning recent interfaces +Subject: [PATCH] Create subroutine for cleaning recent interfaces Moves functionality for cleaning the list of recent interfaces into its own subroutine. @@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/mDNSPosix.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) -Index: mDNSResponder/mDNSPosix/mDNSPosix.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mDNSPosix.c -+++ mDNSResponder/mDNSPosix/mDNSPosix.c -@@ -1322,6 +1322,19 @@ mDNSlocal int SetupSocket(struct sockadd +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 3b761d04e3c4..5aa220cf694e 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1322,6 +1322,19 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, mDNSIPPort port, int interf return err; } @@ -38,7 +38,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c // Creates a PosixNetworkInterface for the interface whose IP address is // intfAddr and whose name is intfName and registers it with mDNS core. mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, -@@ -1559,16 +1572,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c +@@ -1559,16 +1572,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) // Clean up. if (intfList != NULL) freeifaddrs(intfList); diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch index 4b0227f1dc..abf82b1e02 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch @@ -1,4 +1,4 @@ -From 14cc53bb09a3d8adf301f3842c765598467e63e1 Mon Sep 17 00:00:00 2001 +From 2db1f5bc941e4b4cd1721e361a47cfe288b07a76 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Thu, 1 Feb 2024 14:07:03 +0000 Subject: [PATCH] Fix SIGSEGV during DumpStateLog() @@ -25,6 +25,3 @@ index 7a4ca19eff6d..d449dde320f6 100644 { return; } --- -2.39.0 - diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch index 7e76f07c0e..7ec5996013 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch @@ -1,4 +1,4 @@ -From 1cc54320306e07c1fc0eed98e7fbcbb07a2f3b28 Mon Sep 17 00:00:00 2001 +From c67102307f25c5f4d238c736e90519e56a76ae79 Mon Sep 17 00:00:00 2001 From: Stefan Agner <stefan@agner.ch> Date: Fri, 23 Jun 2023 10:10:00 +0200 Subject: [PATCH] Handle interface without `ifa_addr` @@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/mDNSPosix.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: mDNSResponder/mDNSPosix/mDNSPosix.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mDNSPosix.c -+++ mDNSResponder/mDNSPosix/mDNSPosix.c -@@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(i +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 0c9dd2582660..c3ead26799e6 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) continue; if ((ifa_loop4 == NULL) && @@ -26,7 +26,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c ((*ifi)->ifa_addr->sa_family == AF_INET) && ((*ifi)->ifa_flags & IFF_UP) && ((*ifi)->ifa_flags & IFF_LOOPBACK)) -@@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(i +@@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) continue; } diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch index 82825b294d..0dc36ae1d4 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch @@ -1,7 +1,7 @@ -From cea342c10731cb1c8c8b52f03d55f9d15fc3b091 Mon Sep 17 00:00:00 2001 +From a5fe20fa00088683136a09a4da3c36d9b20fe1b9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 4 Nov 2021 07:31:32 -0700 -Subject: [PATCH 1/6] dns-sd: Include missing headers +Subject: [PATCH] dns-sd: Include missing headers Fixes build on Musl @@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> mDNSPosix/nss_mdns.c | 3 +++ 1 file changed, 3 insertions(+) -Index: mDNSResponder/mDNSPosix/nss_mdns.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/nss_mdns.c -+++ mDNSResponder/mDNSPosix/nss_mdns.c +diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c +index afadb3c6c33b..84c312759463 100644 +--- a/mDNSPosix/nss_mdns.c ++++ b/mDNSPosix/nss_mdns.c @@ -89,6 +89,9 @@ #include <dns_sd.h> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch index 867db88a50..5ce7eb1015 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch @@ -1,7 +1,7 @@ -From 40ef0241afbb49f84e76afd65eb3ee17466bb582 Mon Sep 17 00:00:00 2001 +From d265ac9346d3dcbcf1187134318baafcfa75c054 Mon Sep 17 00:00:00 2001 From: Nate Karstens <nate.karstens@garmin.com> Date: Wed, 28 Jun 2017 17:30:00 -0500 -Subject: [PATCH 2/8] Create subroutine for tearing down an interface +Subject: [PATCH] Create subroutine for tearing down an interface Creates a subroutine for tearing down an interface. @@ -13,11 +13,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/mDNSPosix.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) -Index: mDNSResponder/mDNSPosix/mDNSPosix.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mDNSPosix.c -+++ mDNSResponder/mDNSPosix/mDNSPosix.c -@@ -1043,6 +1043,19 @@ mDNSlocal void FreePosixNetworkInterface +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 5aa220cf694e..a6041b04a21e 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1043,6 +1043,19 @@ mDNSlocal void FreePosixNetworkInterface(PosixNetworkInterface *intf) gRecentInterfaces = intf; } @@ -37,7 +37,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c // Grab the first interface, deregister it, free it, and repeat until done. mDNSlocal void ClearInterfaceList(mDNS *const m) { -@@ -1051,13 +1064,10 @@ mDNSlocal void ClearInterfaceList(mDNS * +@@ -1051,13 +1064,10 @@ mDNSlocal void ClearInterfaceList(mDNS *const m) while (m->HostInterfaces) { PosixNetworkInterface *intf = (PosixNetworkInterface*)(m->HostInterfaces); diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch index 03fb1bc0d7..86b659f8a1 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch @@ -1,7 +1,7 @@ -From a198bcd457abd04f2e22812ff3a37246aa564614 Mon Sep 17 00:00:00 2001 +From dfa9e2c494d1a834f5bdfe4dc24e8329dd8720eb Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Mon, 5 Dec 2022 15:14:12 +0000 -Subject: [PATCH 2/6] make: Set libdns_sd.so soname correctly +Subject: [PATCH] make: Set libdns_sd.so soname correctly Upstream-Status: Pending Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> @@ -9,11 +9,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: mDNSResponder/mDNSPosix/Makefile -=================================================================== ---- mDNSResponder.orig/mDNSPosix/Makefile -+++ mDNSResponder/mDNSPosix/Makefile -@@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$ +diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile +index 041706523139..c877c8bb19e6 100755 +--- a/mDNSPosix/Makefile ++++ b/mDNSPosix/Makefile +@@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o $(OBJDIR)/dnssd_errstring.c.so.o $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) diff --git a/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch b/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch index f1cda2b895..59871eb66a 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch @@ -1,7 +1,7 @@ -From deb3a2c51f32e0d2741be11a492e727129f770e2 Mon Sep 17 00:00:00 2001 +From 5f58e5671cd6dbd4cb49bd30fb606d430b626361 Mon Sep 17 00:00:00 2001 From: Nate Karstens <nate.karstens@garmin.com> Date: Wed, 28 Jun 2017 17:30:00 -0500 -Subject: [PATCH 3/8] Track interface socket family +Subject: [PATCH] Track interface socket family Tracks the socket family associated with the interface. @@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/mDNSPosix.h | 2 ++ 2 files changed, 3 insertions(+) -Index: mDNSResponder/mDNSPosix/mDNSPosix.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mDNSPosix.c -+++ mDNSResponder/mDNSPosix/mDNSPosix.c -@@ -1415,6 +1415,7 @@ mDNSlocal int SetupOneInterface(mDNS *co +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index a6041b04a21e..15bbecee04a4 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1415,6 +1415,7 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct // Set up the extra fields in PosixNetworkInterface. assert(intf->intfName != NULL); // intf->intfName already set up above intf->index = intfIndex; @@ -26,10 +26,10 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c intf->multicastSocket4 = -1; #if HAVE_IPV6 intf->multicastSocket6 = -1; -Index: mDNSResponder/mDNSPosix/mDNSPosix.h -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mDNSPosix.h -+++ mDNSResponder/mDNSPosix/mDNSPosix.h +diff --git a/mDNSPosix/mDNSPosix.h b/mDNSPosix/mDNSPosix.h +index 9675591b0434..dd7864cd0d5e 100644 +--- a/mDNSPosix/mDNSPosix.h ++++ b/mDNSPosix/mDNSPosix.h @@ -19,6 +19,7 @@ #define __mDNSPlatformPosix_h diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch index 6bc36456f6..bf2b85c2ab 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch @@ -1,7 +1,7 @@ -From beab76b5708862f44d9acbe7a92db45e2f99259f Mon Sep 17 00:00:00 2001 +From 935033dd40772240c9bcc6b9610d78eb3753bfaf Mon Sep 17 00:00:00 2001 From: Nate Karstens <nate.karstens@garmin.com> Date: Tue, 1 Aug 2017 17:06:01 -0500 -Subject: [PATCH 4/8] Indicate loopback interface to mDNS core +Subject: [PATCH] Indicate loopback interface to mDNS core Tells the mDNS core if an interface is a loopback interface, similar to AddInterfaceToList() in the MacOS implementation. @@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/mDNSPosix.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -Index: mDNSResponder/mDNSPosix/mDNSPosix.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mDNSPosix.c -+++ mDNSResponder/mDNSPosix/mDNSPosix.c -@@ -1348,7 +1348,7 @@ mDNSlocal void CleanRecentInterfaces(voi +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 15bbecee04a4..f4c31a07d587 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1348,7 +1348,7 @@ mDNSlocal void CleanRecentInterfaces(void) // Creates a PosixNetworkInterface for the interface whose IP address is // intfAddr and whose name is intfName and registers it with mDNS core. mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, @@ -27,7 +27,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c { int err = 0; PosixNetworkInterface *intf; -@@ -1411,6 +1411,7 @@ mDNSlocal int SetupOneInterface(mDNS *co +@@ -1411,6 +1411,7 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct intf->coreIntf.Advertise = m->AdvertiseLocalAddresses; intf->coreIntf.McastTxRx = mDNStrue; @@ -35,7 +35,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c // Set up the extra fields in PosixNetworkInterface. assert(intf->intfName != NULL); // intf->intfName already set up above -@@ -1561,7 +1562,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c +@@ -1561,7 +1562,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) } #endif if (SetupOneInterface(m, i->ifa_addr, i->ifa_netmask, @@ -44,7 +44,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c { if (i->ifa_addr->sa_family == AF_INET) foundav4 = mDNStrue; -@@ -1578,7 +1579,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c +@@ -1578,7 +1579,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) // if ((m->HostInterfaces == NULL) && (firstLoopback != NULL)) if (!foundav4 && firstLoopback) (void) SetupOneInterface(m, firstLoopback->ifa_addr, firstLoopback->ifa_netmask, diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch index 837580ac36..8d1915de8c 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch @@ -1,7 +1,7 @@ -From 22316f200803225f2d375ae5c36ffead59e2f6b8 Mon Sep 17 00:00:00 2001 +From f871ac42165c29f763785aa0199dfc76f1731f4d Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Mon, 5 Dec 2022 15:14:26 +0000 -Subject: [PATCH 4/6] make: Separate TLS targets from libraries +Subject: [PATCH] make: Separate TLS targets from libraries There are dependencies on TLSOBJS, which fails when `-lmbedtls` is listed as a dependency, so separate it out. @@ -12,10 +12,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -Index: mDNSResponder/mDNSPosix/Makefile -=================================================================== ---- mDNSResponder.orig/mDNSPosix/Makefile -+++ mDNSResponder/mDNSPosix/Makefile +diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile +index c877c8bb19e6..3a5897c4dbee 100755 +--- a/mDNSPosix/Makefile ++++ b/mDNSPosix/Makefile @@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux) ifeq ($(tls), no) CFLAGS_OS = -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -ftabstop=4 -Wno-expansion-to-defined diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch index f00116c617..ebdfe8c783 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch @@ -1,7 +1,7 @@ -From e79f81f5cd626ad77ec64de4325f6645cf253c5e Mon Sep 17 00:00:00 2001 +From 47118760466b74939cec9f5233062236a12bb3f4 Mon Sep 17 00:00:00 2001 From: Nate Karstens <nate.karstens@garmin.com> Date: Thu, 13 Jul 2017 09:00:00 -0500 -Subject: [PATCH 5/8] Use list for changed interfaces +Subject: [PATCH] Use list for changed interfaces Uses a linked list to store the index of changed network interfaces instead of a bitfield. This allows for network interfaces with an @@ -15,10 +15,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/mDNSPosix.c | 58 ++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 15 deletions(-) -Index: mDNSResponder/mDNSPosix/mDNSPosix.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mDNSPosix.c -+++ mDNSResponder/mDNSPosix/mDNSPosix.c +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index f4c31a07d587..6b2fe76d4b66 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c @@ -74,6 +74,14 @@ struct IfChangeRec }; typedef struct IfChangeRec IfChangeRec; @@ -34,7 +34,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c // Note that static data is initialized to zero in (modern) C. static PosixEventSource *gEventSources; // linked list of PosixEventSource's static sigset_t gEventSignalSet; // Signals which event loop listens for -@@ -1621,6 +1629,23 @@ mDNSlocal mStatus OpenIfNotifySocket(int +@@ -1621,6 +1629,23 @@ mDNSlocal mStatus OpenIfNotifySocket(int *pFD) return err; } @@ -58,7 +58,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c #if MDNS_DEBUGMSGS mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) { -@@ -1648,14 +1673,13 @@ mDNSlocal void PrintNetLinkMsg(cons +@@ -1648,14 +1673,13 @@ mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) } #endif @@ -74,7 +74,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c // The structure here is more complex than it really ought to be because, // unfortunately, there's no good way to size a buffer in advance large -@@ -1691,9 +1715,9 @@ mDNSlocal mDNSu32 ProcessRoutingNo +@@ -1691,9 +1715,9 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) // Process the NetLink message if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) @@ -86,7 +86,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c // Advance pNLMsg to the next message in the buffer if ((pNLMsg->nlmsg_flags & NLM_F_MULTI) != 0 && pNLMsg->nlmsg_type != NLMSG_DONE) -@@ -1704,8 +1728,6 @@ mDNSlocal mDNSu32 ProcessRoutingNo +@@ -1704,8 +1728,6 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) else break; // all done! } @@ -95,7 +95,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c } #else // USES_NETLINK -@@ -1737,14 +1759,13 @@ mDNSlocal void PrintRoutingSocketMs +@@ -1737,14 +1759,13 @@ mDNSlocal void PrintRoutingSocketMsg(const struct ifa_msghdr *pRSMsg) } #endif @@ -111,7 +111,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c readCount = read(sd, buff, sizeof buff); if (readCount < (ssize_t) sizeof(struct ifa_msghdr)) -@@ -1759,12 +1780,10 @@ mDNSlocal mDNSu32 ProcessRoutingNo +@@ -1759,12 +1780,10 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) pRSMsg->ifam_type == RTM_IFINFO) { if (pRSMsg->ifam_type == RTM_IFINFO) @@ -126,7 +126,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c } #endif // USES_NETLINK -@@ -1774,7 +1793,8 @@ mDNSlocal void InterfaceChangeCallback(i +@@ -1774,7 +1793,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) { IfChangeRec *pChgRec = (IfChangeRec*) context; fd_set readFDs; @@ -136,7 +136,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c struct timeval zeroTimeout = { 0, 0 }; (void)fd; // Unused -@@ -1782,17 +1802,25 @@ mDNSlocal void InterfaceChangeCallback(i +@@ -1782,17 +1802,25 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) FD_ZERO(&readFDs); FD_SET(pChgRec->NotifySD, &readFDs); diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch index fd2f2f1178..3c46d599c1 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch @@ -1,20 +1,19 @@ -From 764b6202402e9e5687ff873330e5ad6be6f69df7 Mon Sep 17 00:00:00 2001 +From 0b3953dfdeef8dc9b8a23820659feee9e15b5bad Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Mon, 5 Dec 2022 22:49:49 +0000 Subject: [PATCH] mDNSCore: Fix broken debug parameter Upstream-Status: Pending Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> - --- mDNSCore/mDNS.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: mDNSResponder/mDNSCore/mDNS.c -=================================================================== ---- mDNSResponder.orig/mDNSCore/mDNS.c -+++ mDNSResponder/mDNSCore/mDNS.c -@@ -10231,7 +10231,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastA +diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c +index d4519a7f62aa..3090edb2ac5d 100644 +--- a/mDNSCore/mDNS.c ++++ b/mDNSCore/mDNS.c +@@ -10253,7 +10253,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage * #else const DNSServRef dnsserv = qptr->qDNSServer; #endif diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch index 80cdbca500..be63471e64 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch @@ -1,7 +1,7 @@ -From bfa1d68bed863e22c40a6d9a19ffbcc8694bbff6 Mon Sep 17 00:00:00 2001 +From 105514b75df6d7abd052ec64d8106f5c07cc4782 Mon Sep 17 00:00:00 2001 From: Nate Karstens <nate.karstens@garmin.com> Date: Mon, 24 Jul 2017 09:38:55 -0500 -Subject: [PATCH 6/8] Handle noisy netlink sockets +Subject: [PATCH] Handle noisy netlink sockets The POSIX implementation currently clears all network interfaces when netlink indicates that there has been a change. This causes @@ -27,11 +27,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/mDNSPosix.c | 182 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 172 insertions(+), 10 deletions(-) -Index: mDNSResponder/mDNSPosix/mDNSPosix.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mDNSPosix.c -+++ mDNSResponder/mDNSPosix/mDNSPosix.c -@@ -1788,14 +1788,43 @@ mDNSlocal void ProcessRoutingNo +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 6b2fe76d4b66..ecd5741d038d 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1788,14 +1788,43 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change #endif // USES_NETLINK @@ -75,7 +75,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c (void)fd; // Unused -@@ -1810,12 +1839,149 @@ mDNSlocal void InterfaceChangeCallback(i +@@ -1810,12 +1839,149 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) } while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout)); @@ -230,7 +230,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL) { RemoveFromList(&changedInterfaces, changedInterface); -@@ -1947,15 +2113,11 @@ mDNSexport void mDNSPlatformClose(mDNS * +@@ -1947,15 +2113,11 @@ mDNSexport void mDNSPlatformClose(mDNS *const m) #endif } diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch index c12a02fcdd..ffa3fa3827 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch @@ -1,7 +1,7 @@ -From fa9ef50ab4c4225cf3ade4bafc38ddf93e6fe127 Mon Sep 17 00:00:00 2001 +From 626ccae85aab5b0902a8e3c05d9f0e3fbbe4fcd2 Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Tue, 6 Dec 2022 13:28:31 +0000 -Subject: [PATCH 6/6] make: Add top-level Makefile +Subject: [PATCH] make: Add top-level Makefile Simple top level Makefile that just delegates to mDNSPosix. @@ -12,10 +12,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> 1 file changed, 2 insertions(+) create mode 100644 Makefile -Index: mDNSResponder/Makefile -=================================================================== +diff --git a/Makefile b/Makefile +new file mode 100644 +index 000000000000..feb6ac67ef47 --- /dev/null -+++ mDNSResponder/Makefile ++++ b/Makefile @@ -0,0 +1,2 @@ +all clean: + cd mDNSPosix && $(MAKE) $@ diff --git a/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch b/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch index dae1ac7ea0..276f879df2 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch @@ -1,7 +1,7 @@ -From a8accffb95267490b50401c8b65ec18db57b5ef5 Mon Sep 17 00:00:00 2001 +From 3715b3f4a0ba2d2cb05e5ba617b523c759c88d4b Mon Sep 17 00:00:00 2001 From: Nate Karstens <nate.karstens@garmin.com> Date: Wed, 9 Aug 2017 09:16:58 -0500 -Subject: [PATCH 7/8] Mark deleted interfaces as being changed +Subject: [PATCH] Mark deleted interfaces as being changed Netlink notification handling ignores messages for deleted links, RTM_DELLINK. It does handle RTM_GETLINK. According to libnl docu- @@ -22,11 +22,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/mDNSPosix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: mDNSResponder/mDNSPosix/mDNSPosix.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mDNSPosix.c -+++ mDNSResponder/mDNSPosix/mDNSPosix.c -@@ -1714,7 +1714,7 @@ mDNSlocal void ProcessRoutingNo +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index ecd5741d038d..776531dbc8e8 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1714,7 +1714,7 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change #endif // Process the NetLink message diff --git a/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch b/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch index 1789001e14..f3c7f62d3f 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch @@ -1,7 +1,7 @@ -From ed58146d3aeecdb9920fdc017f85c18b5b10f2db Mon Sep 17 00:00:00 2001 +From 4e6621eee389e1cbb558fe268e02d5153a1d8f2d Mon Sep 17 00:00:00 2001 From: Nate Karstens <nate.karstens@garmin.com> Date: Thu, 10 Aug 2017 08:27:32 -0500 -Subject: [PATCH 8/8] Handle errors from socket calls +Subject: [PATCH] Handle errors from socket calls Adds handling for socket() or read() returning a negative value (indicating an error has occurred). @@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> mDNSPosix/mDNSPosix.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -Index: mDNSResponder/mDNSPosix/mDNSPosix.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mDNSPosix.c -+++ mDNSResponder/mDNSPosix/mDNSPosix.c -@@ -1677,7 +1677,7 @@ mDNSlocal void ProcessRoutingNo +diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c +index 776531dbc8e8..0c9dd2582660 100644 +--- a/mDNSPosix/mDNSPosix.c ++++ b/mDNSPosix/mDNSPosix.c +@@ -1677,7 +1677,7 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change // Read through the messages on sd and if any indicate that any interface records should // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. { @@ -27,7 +27,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c char buff[4096]; struct nlmsghdr *pNLMsg = (struct nlmsghdr*) buff; -@@ -1686,7 +1686,10 @@ mDNSlocal void ProcessRoutingNo +@@ -1686,7 +1686,10 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change // enough to hold all pending data and so avoid message fragmentation. // (Note that FIONREAD is not supported on AF_NETLINK.) @@ -39,7 +39,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c while (1) { // Make sure we've got an entire nlmsghdr in the buffer, and payload, too. -@@ -1702,7 +1705,9 @@ mDNSlocal void ProcessRoutingNo +@@ -1702,7 +1705,9 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change pNLMsg = (struct nlmsghdr*) buff; // read more data @@ -50,7 +50,7 @@ Index: mDNSResponder/mDNSPosix/mDNSPosix.c continue; // spin around and revalidate with new readCount } else -@@ -2017,6 +2022,7 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR +@@ -2017,6 +2022,7 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanReceiveUnicast(void) int err; int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); struct sockaddr_in s5353; diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch index d443bc97b2..818017037c 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch @@ -1,4 +1,4 @@ -From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001 +From 05cb409ce213f35798c02faf2032d4846a84b48e Mon Sep 17 00:00:00 2001 From: Beniamin Sandu <beniaminsandu@gmail.com> Date: Thu, 15 Jun 2023 17:02:58 +0000 Subject: [PATCH] remove unneeded headers @@ -14,10 +14,10 @@ Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> mDNSPosix/mbedtls.c | 2 -- 1 file changed, 2 deletions(-) -Index: mDNSResponder/mDNSPosix/mbedtls.c -=================================================================== ---- mDNSResponder.orig/mDNSPosix/mbedtls.c -+++ mDNSResponder/mDNSPosix/mbedtls.c +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c +index a73681b6d528..ab8f8c772c00 100644 +--- a/mDNSPosix/mbedtls.c ++++ b/mDNSPosix/mbedtls.c @@ -38,10 +38,8 @@ #include <mbedtls/sha256.h> #include <mbedtls/base64.h> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch b/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch deleted file mode 100644 index 511a6fdc18..0000000000 --- a/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9fc45a2cf3b78573a568abf538a6e6f4bd30b2d7 Mon Sep 17 00:00:00 2001 -From: Alex Kiernan <alex.kiernan@gmail.com> -Date: Wed, 27 Sep 2023 11:45:26 +0100 -Subject: [PATCH] Add missing limits.h - -Upstream-Status: Pending -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> ---- - mDNSShared/PlatformCommon.c | 1 + - 1 file changed, 1 insertion(+) - -Index: mDNSResponder/mDNSShared/PlatformCommon.c -=================================================================== ---- mDNSResponder.orig/mDNSShared/PlatformCommon.c -+++ mDNSResponder/mDNSShared/PlatformCommon.c -@@ -32,6 +32,7 @@ - #include <time.h> - #include <sys/time.h> // Needed for #include <sys/time.h>(). - #include <assert.h> -+#include <limits.h> - - - #include "mDNSEmbeddedAPI.h" // Defines the interface provided to the client layer above diff --git a/meta-networking/recipes-protocols/mdns/mdns_2200.100.94.0.2.bb b/meta-networking/recipes-protocols/mdns/mdns_2200.120.24.bb index 183f05ebc3..9aeda92a4b 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_2200.100.94.0.2.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_2200.120.24.bb @@ -22,11 +22,10 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https file://0008-Handle-errors-from-socket-calls.patch \ file://0009-remove-unneeded-headers.patch \ file://mdns.service \ - file://0015-Add-missing-limits.h.patch \ file://0001-Handle-interface-without-ifa_addr.patch \ file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \ " -SRCREV = "8f70f98fc1d0cf439ca3a6470be6ad8ac2bcc019" +SRCREV = "51a7148a21362285f8013648c4bfa91247ff598a" # We install a stub Makefile in the top directory so that the various checks # in base.bbclass pass their tests for a Makefile, this ensures (that amongst @@ -104,7 +103,7 @@ do_install () { install -m 0644 libnss_mdns.8 ${D}${mandir}/man8 install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/mdns.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/mdns.service ${D}${systemd_system_unitdir} install -d ${D}${INIT_D_DIR} install mdnsd.sh ${D}${INIT_D_DIR}/mdns diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb index 395b02df00..75b3d9e8c6 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb @@ -116,12 +116,12 @@ do_configure:append() { do_install:append() { install -d ${D}${sysconfdir}/snmp install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd - install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/ - install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/ + install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/snmpd + install -m 644 ${UNPACKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/ + install -m 644 ${UNPACKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/ install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/snmpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ -i ${D}${bindir}/net-snmp-create-v3-user sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g' \ diff --git a/meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch b/meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch new file mode 100644 index 0000000000..6382c2a9a6 --- /dev/null +++ b/meta-networking/recipes-protocols/openflow/openflow/0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch @@ -0,0 +1,62 @@ +From 2272df8407d86519d72504d6468b710e7eb56de8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 May 2024 00:23:43 -0700 +Subject: [PATCH] Link in libexecinfo if it has backtrace() API + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/libopenflow.m4 | 5 +++++ + tests/automake.mk | 2 +- + utilities/automake.mk | 4 ++-- + 3 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/m4/libopenflow.m4 b/m4/libopenflow.m4 +index 58014ed..c9302b8 100644 +--- a/m4/libopenflow.m4 ++++ b/m4/libopenflow.m4 +@@ -96,6 +96,11 @@ AC_DEFUN([OFP_CHECK_FAULT_LIBS], + [AC_CHECK_LIB([dl], [dladdr], [FAULT_LIBS=-ldl]) + AC_SUBST([FAULT_LIBS])]) + ++dnl Checks for libraries needed by lib/fault.c. ++AC_DEFUN([OFP_CHECK_FAULT_LIBS], ++ [AC_CHECK_LIB([execinfo], [backtrace], [FAULT_LIBS=-lexecinfo]) ++ AC_SUBST([FAULT_LIBS])]) ++ + dnl Checks for libraries needed by lib/socket-util.c. + AC_DEFUN([OFP_CHECK_SOCKET_LIBS], + [AC_CHECK_LIB([socket], [connect]) +diff --git a/tests/automake.mk b/tests/automake.mk +index a4e945a..0944275 100644 +--- a/tests/automake.mk ++++ b/tests/automake.mk +@@ -27,7 +27,7 @@ EXTRA_DIST += tests/test-stp.sh + noinst_PROGRAMS += tests/test-stp + + tests_test_stp_SOURCES = tests/test-stp.c +-tests_test_stp_LDADD = lib/libopenflow.a ++tests_test_stp_LDADD = lib/libopenflow.a $(FAULT_LIBS) + stp_files = \ + tests/test-stp-ieee802.1d-1998 \ + tests/test-stp-ieee802.1d-2004-fig17.4 \ +diff --git a/utilities/automake.mk b/utilities/automake.mk +index d6f79a8..0608655 100644 +--- a/utilities/automake.mk ++++ b/utilities/automake.mk +@@ -36,10 +36,10 @@ utilities_dpctl_SOURCES = utilities/dpctl.c + utilities_dpctl_LDADD = lib/libopenflow.a $(FAULT_LIBS) $(SSL_LIBS) + + utilities_vlogconf_SOURCES = utilities/vlogconf.c +-utilities_vlogconf_LDADD = lib/libopenflow.a ++utilities_vlogconf_LDADD = lib/libopenflow.a $(FAULT_LIBS) + + utilities_ofp_discover_SOURCES = utilities/ofp-discover.c +-utilities_ofp_discover_LDADD = lib/libopenflow.a ++utilities_ofp_discover_LDADD = lib/libopenflow.a $(FAULT_LIBS) + + utilities_ofp_kill_SOURCES = utilities/ofp-kill.c + utilities_ofp_kill_LDADD = lib/libopenflow.a +-- +2.45.1 + diff --git a/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-networking/recipes-protocols/openflow/openflow_git.bb index 41bedcd0cf..0061565f90 100644 --- a/meta-networking/recipes-protocols/openflow/openflow_git.bb +++ b/meta-networking/recipes-protocols/openflow/openflow_git.bb @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/mininet/openflow;protocol=https;branch=master \ file://0001-generate-not-static-get_dh-functions.patch \ file://0001-socket-util-Include-sys-stat.h-for-fchmod.patch \ file://0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch \ + file://0001-Link-in-libexecinfo-if-it-has-backtrace-API.patch \ " CVE_STATUS[CVE-2015-1611] = "not-applicable-config: Not referred to our implementation of openflow" CVE_STATUS[CVE-2015-1612] = "not-applicable-config: Not referred to our implementation of openflow" @@ -34,9 +35,7 @@ EXTRA_OECONF += " \ KARCH=${TARGET_ARCH} \ ${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ " - DEPENDS:append:libc-musl = " libexecinfo" -LDFLAGS:append:libc-musl = " -lexecinfo" S = "${WORKDIR}/git" @@ -68,3 +67,8 @@ do_install:append() { } FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" + +# http://errors.yoctoproject.org/Errors/Details/766898/ +# lib/flow.c:213:48: error: initialization of 'const struct arp_eth_header *' from incompatible pointer type 'struct arp_header *' [-Wincompatible-pointer-types] +# lib/backtrace.c:126:32: error: passing argument 1 of 'backtrace' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 183c0066df..f64c7340d1 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -74,7 +74,7 @@ do_install:append () { install -m 0755 ${S}/etc/sysconfig/openl2tpd ${D}${sysconfdir}/default/openl2tpd if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0644 ${WORKDIR}/openl2tpd.service ${D}${systemd_system_unitdir}/openl2tpd.service + install -D -m 0644 ${UNPACKDIR}/openl2tpd.service ${D}${systemd_system_unitdir}/openl2tpd.service sed -i -e 's,@STATEDIR@,${localstatedir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb index 0d26c338b9..cabe18ef8a 100644 --- a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb +++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb @@ -26,7 +26,7 @@ do_install() { install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8 install -m 555 pptp ${D}${sbindir} install -m 644 pptp.8 ${D}${mandir}/man8 - install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp + install -m 644 ${UNPACKDIR}/options.pptp ${D}${sysconfdir}/ppp } RDEPENDS:${PN} = "ppp" diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb index 4dfdb8fc21..c8e1767114 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.15.bb @@ -29,7 +29,7 @@ CFLAGS += "-D_GNU_SOURCE" do_install:append() { install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service install -d ${D}${datadir}/doc/${PN} @@ -41,8 +41,8 @@ do_install:append() { do_install() { # Install init script and default settings install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server - install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server + install -m 0644 ${UNPACKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server + install -m 0755 ${UNPACKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server # Install oe_runmake -C ${S} DESTDIR=${D} docdir=${docdir} install chmod 4755 ${D}${sbindir}/pppoe diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb index 61f6b79dd7..cb26699212 100644 --- a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb +++ b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb @@ -32,6 +32,6 @@ do_install () { install -d ${D}${sysconfdir}/network/if-up.d install -d ${D}${sysconfdir}/default install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf - install -c -m 755 ${WORKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf - install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf + install -c -m 755 ${UNPACKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf + install -c ${UNPACKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf } diff --git a/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-networking/recipes-support/arptables/arptables_git.bb index 949794bf30..f9dd66f605 100644 --- a/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-networking/recipes-support/arptables/arptables_git.bb @@ -25,7 +25,7 @@ do_install() { oe_runmake install DESTDIR=${D} if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/arptables.service ${D}${systemd_unitdir}/system fi } diff --git a/meta-networking/recipes-support/chrony/chrony_4.5.bb b/meta-networking/recipes-support/chrony/chrony_4.5.bb index ed26e59879..0681a34393 100644 --- a/meta-networking/recipes-support/chrony/chrony_4.5.bb +++ b/meta-networking/recipes-support/chrony/chrony_4.5.bb @@ -90,7 +90,7 @@ do_install() { # Config file install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/chrony.conf ${D}${sysconfdir} + install -m 644 ${UNPACKDIR}/chrony.conf ${D}${sysconfdir} if ${@bb.utils.contains('PACKAGECONFIG', 'privdrop', 'true', 'false', d)}; then echo "# Define user to drop to after dropping root privileges" >> ${D}${sysconfdir}/chrony.conf echo "user chronyd" >> ${D}${sysconfdir}/chrony.conf @@ -98,7 +98,7 @@ do_install() { # System V init script install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/chronyd ${D}${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/chronyd ${D}${sysconfdir}/init.d # systemd unit configuration file install -d ${D}${systemd_unitdir}/system diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb index 62daf3279d..86f6a0df5d 100644 --- a/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb +++ b/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb @@ -9,7 +9,7 @@ SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_$ " SRC_URI[md5sum] = "3d01940bc1085c6c42184c25fb61f739" SRC_URI[sha256sum] = "3174cf0f8657b19d80dc59e184778d8e553da424728cb2966fe9d5428dd84267" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" do_install() { install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV}-docs diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb index 7d51bc1c91..45eee8f1b6 100644 --- a/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb +++ b/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb @@ -9,12 +9,12 @@ SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2500/cim_schema_$ " SRC_URI[md5sum] = "ee4ad6441a2b65ca60a3abc53e3ec629" SRC_URI[sha256sum] = "a44d67881325e267ef46b72eabe0c69f90470b1033b1ce7c26d9ba99072adb50" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" do_install() { install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} - install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} + install -m 644 ${UNPACKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ chown -R root:root ${D}${datadir}/mof/cimv${PV} diff --git a/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb index 32bd8acbb9..d046622df5 100644 --- a/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb +++ b/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb @@ -9,12 +9,12 @@ SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_$ " SRC_URI[md5sum] = "a9bdf17c7374e3b5b7adeaac4842c4ad" SRC_URI[sha256sum] = "dbfa3064ea427acd71a4bebbc172ca2dc44b0b09a6d83b0945b9ffa988a9058a" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" do_install() { install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} - install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} + install -m 644 ${UNPACKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ chown -R root:root ${D}${datadir}/mof/cimv${PV}/ diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb index 38fa271dc3..be74759d5e 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb @@ -81,20 +81,20 @@ do_install () { "MANDIR=${D}${mandir}" \ install-i18n install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d - install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq + install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}${sysconfdir}/ + install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq install -d ${D}${systemd_unitdir}/system if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then - install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service + install -m 0644 ${UNPACKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service else - install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service + install -m 0644 ${UNPACKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service fi if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then install -d ${D}${sysconfdir}/systemd/resolved.conf.d/ - install -m 0644 ${WORKDIR}/dnsmasq-resolved.conf ${D}${sysconfdir}/systemd/resolved.conf.d/ + install -m 0644 ${UNPACKDIR}/dnsmasq-resolved.conf ${D}${sysconfdir}/systemd/resolved.conf.d/ fi if [ "${@bb.utils.filter('PACKAGECONFIG', 'dhcp', d)}" ]; then @@ -113,11 +113,11 @@ do_install () { if [ "${@bb.utils.filter('PACKAGECONFIG', 'resolvconf', d)}" ]; then install -d ${D}${sysconfdir}/resolvconf/update.d/ - install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq + install -m 0755 ${UNPACKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/99_dnsmasq ${D}${sysconfdir}/default/volatiles - install -m 0755 ${WORKDIR}/dnsmasq-resolvconf-helper ${D}${bindir} + install -m 0644 ${UNPACKDIR}/99_dnsmasq ${D}${sysconfdir}/default/volatiles + install -m 0755 ${UNPACKDIR}/dnsmasq-resolvconf-helper ${D}${bindir} fi } diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb index 17fbd789b6..2f887e6018 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb @@ -52,7 +52,7 @@ do_install:append () { install -d 755 ${D}/etc/dovecot touch 644 ${D}/etc/dovecot/dovecot.conf if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then - install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/dovecot.service fi diff --git a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb index 587a479497..6cde94b202 100644 --- a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb +++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb @@ -18,8 +18,11 @@ inherit autotools gettext pkgconfig python3-dir python3native EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" +INSANE_SKIP:${PN} = "already-stripped" + do_install:append() { sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf + sed -i 's,${RECIPE_SYSROOT},,g' ${D}${bindir}/fetchmail } PACKAGES =+ "fetchmail-python" diff --git a/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb index d8288f9b49..8e23b66c48 100644 --- a/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb +++ b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb @@ -30,6 +30,7 @@ do_install_ptest () { install ${S}/t/*.t* ${D}${PTEST_PATH}/t install ${S}/t/data/* ${D}${PTEST_PATH}/t/data } +RDEPENDS:${PN}-ptest += "perl-modules" FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/Geo/IP/.debug" diff --git a/meta-networking/recipes-support/geoip/geoip_1.6.12.bb b/meta-networking/recipes-support/geoip/geoip_1.6.12.bb index 429cd69d6d..b247823cd4 100644 --- a/meta-networking/recipes-support/geoip/geoip_1.6.12.bb +++ b/meta-networking/recipes-support/geoip/geoip_1.6.12.bb @@ -46,10 +46,10 @@ EXTRA_OECONF = "--disable-static \ do_install() { make DESTDIR=${D} install install -d ${D}/${datadir}/GeoIP - install ${WORKDIR}/GeoIP.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoIP.dat - install ${WORKDIR}/GeoIPv6.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoIPv6.dat - install ${WORKDIR}/GeoLiteCity.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoLiteCity.dat - install ${WORKDIR}/GeoLiteCityv6.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoLiteCityv6.dat + install ${UNPACKDIR}/GeoIP.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoIP.dat + install ${UNPACKDIR}/GeoIPv6.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoIPv6.dat + install ${UNPACKDIR}/GeoLiteCity.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoLiteCity.dat + install ${UNPACKDIR}/GeoLiteCityv6.dat.${GEOIP_DATABASE_VERSION} ${D}/${datadir}/GeoIP/GeoLiteCityv6.dat ln -s GeoLiteCity.dat ${D}${datadir}/GeoIP/GeoIPCity.dat } diff --git a/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb b/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb index 9a0292eacc..e4dc9dee47 100644 --- a/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb +++ b/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb @@ -28,6 +28,6 @@ inherit autotools do_install:append() { install -d ${D}/${sysconfdir} install -d ${D}/${sysconfdir}/cron.d - install ${WORKDIR}/GeoIP.conf ${D}/${sysconfdir}/ - install ${WORKDIR}/geoipupdate.cron ${D}/${sysconfdir}/cron.d/ + install ${UNPACKDIR}/GeoIP.conf ${D}/${sysconfdir}/ + install ${UNPACKDIR}/geoipupdate.cron ${D}/${sysconfdir}/cron.d/ } diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb b/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb index ac80f3733a..0a37d7977d 100644 --- a/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb +++ b/meta-networking/recipes-support/libtevent/libtevent_0.16.1.bb @@ -17,7 +17,7 @@ SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" -SRC_URI[sha256sum] = "1aa58f21017ed8c2f606ae84aa7e795b5439edd4dd5f68f1a388a7d6fb40f682" +SRC_URI[sha256sum] = "362971e0f32dc1905f6fe4736319c4b8348c22dc85aa6c3f690a28efe548029e" inherit pkgconfig ptest waf-samba diff --git a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 86b9112ba2..391e0e4ab6 100644 --- a/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -32,3 +32,7 @@ inherit autotools pkgconfig EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" FILES:${PN} += "${nonarch_base_libdir}/firmware" + +# http://errors.yoctoproject.org/Errors/Details/766901/ +# linux-atm-2.5.2/src/led/conn.c:414:57: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb index 3f945eeeee..0243f2a1db 100644 --- a/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb +++ b/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb @@ -27,8 +27,8 @@ BBCLASSEXTEND = "native" inherit autotools-brokensep pkgconfig binconfig ptest do_install_ptest () { - install -m 0755 ${WORKDIR}/v4test.sh ${D}${PTEST_PATH} - install -m 0755 ${WORKDIR}/v6test.sh ${D}${PTEST_PATH} + install -m 0755 ${UNPACKDIR}/v4test.sh ${D}${PTEST_PATH} + install -m 0755 ${UNPACKDIR}/v6test.sh ${D}${PTEST_PATH} for testcase in `find ${B}/src/apps/.libs ${B}/src/func_tests/.libs -maxdepth 1 -type f -executable`; do install $testcase ${D}${PTEST_PATH} done diff --git a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb index b50d33f908..3867b89052 100644 --- a/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb +++ b/meta-networking/recipes-support/mdio-tools/mdio-netlink_1.3.1.bb @@ -3,11 +3,12 @@ require mdio-tools.inc DEPENDS += "virtual/kernel libmnl" # This module requires Linux 5.6 higher -S = "${WORKDIR}/git/kernel" +S = "${WORKDIR}/git" inherit module -EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR}" +EXTRA_OEMAKE = "-C kernel/ KDIR=${STAGING_KERNEL_DIR}" +MODULES_MODULE_SYMVERS_LOCATION="kernel" MODULES_INSTALL_TARGET = "install" RPROVIDES:${PN} += "kernel-module-mdio-netlink" diff --git a/meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch b/meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch new file mode 100644 index 0000000000..15b439e255 --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd/0001-nbd-client-Fix-build-on-musl-gcc14.patch @@ -0,0 +1,43 @@ +From 909d20a2ee4afecd5ae4cc5950c8ee599f72972d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 May 2024 17:48:13 -0700 +Subject: [PATCH] nbd-client: Fix build on musl + gcc14 + +GCC-14 has promoted incompatible-pointer-types warning into error which is +now flagged especially with when building on musl + +Fixes following error + +| ../nbd-3.26.1/nbd-client.c: In function 'openunix': +| ../nbd-3.26.1/nbd-client.c:345:27: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types] +| 345 | if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { +| | ^~~~~~~~ +| | | +| | struct sockaddr_un * +| In file included from ../nbd-3.26.1/nbd-client.c:25: +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/nbd/3.26.1/recipe-sysroot/usr/include/sys/socket.h:386:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *' +| 386 | int connect (int, const struct sockaddr *, socklen_t); +| | ^~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://lists.debian.org/nbd/2024/05/msg00012.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + nbd-client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nbd-client.c b/nbd-client.c +index 8d1101b..7b25c67 100644 +--- a/nbd-client.c ++++ b/nbd-client.c +@@ -342,7 +342,7 @@ int openunix(const char *path) { + return -1; + }; + +- if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { ++ if (connect(sock, (struct sockaddr*)&un_addr, sizeof(un_addr)) == -1) { + err_nonfatal("CONNECT failed"); + close(sock); + return -1; +-- +2.45.1 + diff --git a/meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch b/meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch new file mode 100644 index 0000000000..716ded55be --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch @@ -0,0 +1,50 @@ +From f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c Mon Sep 17 00:00:00 2001 +From: Dave Jones <dave.jones@canonical.com> +Date: Thu, 14 Mar 2024 11:13:05 +0000 +Subject: [PATCH] Fix the check & no cases of enable_manpages + +Currently, running "configure --disable-manpages" while docbook2man *is* +installed results in the error "don't know what to do here" when it +should disable manpages. + +There also appears to be a missing conditional at the start of the line; +there's closing un-matched ]) at the end of the line. Still, at this +point the check can be done in pure shell; no need for AC macros. I've +also removed the confusing m4_divert_text call on the check case. Not +sure why that was there, but it appears unnecessary. + +Upstream-Status: Backport [https://github.com/NetworkBlockDevice/nbd/commit/f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -328,7 +328,7 @@ AC_MSG_CHECKING([whether man pages are r + AC_ARG_ENABLE([manpages], + AS_HELP_STRING([--disable-manpages], [Do not install man pages]), + [], +- [: m4_divert_text([DEFAULTS], [enable_manpages=check])] ++ [enable_manpages=check] + ) + AC_MSG_RESULT([$enable_manpages]) + +@@ -337,9 +337,14 @@ AS_IF([test "x$enable_manpages" != "xno" + ]) + AS_IF([test "x$enable_manpages" = "xyes" -a "x$DB2M" = "x"], [ + AC_MSG_ERROR([docbook2man not found, but is required to build manpages]) +- ], +- [test "x$DB2M" != "x"], [enable_manpages=yes], +- [AC_MSG_ERROR([don't know what to do here])]) ++ ]) ++if test "x$enable_manpages" = "xcheck"; then ++ if test "x$DB2M" = "x"; then ++ enable_manpages=no ++ else ++ enable_manpages=yes ++ fi ++fi + AC_MSG_CHECKING([whether to build manpages]) + AC_MSG_RESULT([$enable_manpages]) + diff --git a/meta-networking/recipes-support/nbd/nbd_3.24.bb b/meta-networking/recipes-support/nbd/nbd_3.24.bb deleted file mode 100644 index da9f829523..0000000000 --- a/meta-networking/recipes-support/nbd/nbd_3.24.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Network Block Device" -HOMEPAGE = "http://nbd.sourceforge.net" -SECTION = "net" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "autoconf-archive bison-native glib-2.0 libnl" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "a6d9e7bbc311a2ed07ef84a58b82b5dd" -SRC_URI[sha256sum] = "6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c" - -inherit autotools pkgconfig - -PACKAGES = "${PN}-client ${PN}-dbg ${PN}-doc ${PN}-server ${PN}-trdump ${PN}-trplay" - -FILES:${PN}-client = "${sbindir}/${BPN}-client" -FILES:${PN}-server = "${bindir}/${BPN}-server" -FILES:${PN}-trdump = "${bindir}/${BPN}-trdump" -FILES:${PN}-trplay = "${bindir}/${BPN}-trplay" diff --git a/meta-networking/recipes-support/nbd/nbd_3.26.1.bb b/meta-networking/recipes-support/nbd/nbd_3.26.1.bb new file mode 100644 index 0000000000..a69d35fa96 --- /dev/null +++ b/meta-networking/recipes-support/nbd/nbd_3.26.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Network Block Device user-space tools (TCP version)" +HOMEPAGE = "https://github.com/NetworkBlockDevice/nbd" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "autoconf-archive bison-native glib-2.0 libnl zlib bison-native" + +SRC_URI = "https://github.com/NetworkBlockDevice/${BPN}/releases/download/${BP}/${BP}.tar.xz \ + file://f0418b0d8b54c21a1e5b0c6dce3277e938d07e7c.patch \ + file://0001-nbd-client-Fix-build-on-musl-gcc14.patch \ + " +SRC_URI[sha256sum] = "f0cf509fa5b20b1a07f7904eb637e9b47d3e30b6ed6f00075af5d8b701c78fef" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--enable-syslog --enable-lfs --disable-manpages" + +PACKAGES = "${PN}-client ${PN}-dbg ${PN}-doc ${PN}-server ${PN}-trdump ${PN}-trplay" + +FILES:${PN}-client = "${sbindir}/${BPN}-client" +FILES:${PN}-server = "${bindir}/${BPN}-server" +FILES:${PN}-trdump = "${bindir}/${BPN}-trdump" +FILES:${PN}-trplay = "${bindir}/${BPN}-trplay" diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb index 6e459eeeb4..579a04b86f 100644 --- a/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-networking/recipes-support/netperf/netperf_git.bb @@ -42,14 +42,14 @@ do_configure:prepend() { } do_install() { - sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${WORKDIR}/init + sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${UNPACKDIR}/init install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d ${D}${systemd_system_unitdir} if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - sed -e 's#/usr/sbin/#${sbindir}/#g' ${WORKDIR}/netserver.service > ${D}${systemd_system_unitdir}/netserver.service + sed -e 's#/usr/sbin/#${sbindir}/#g' ${UNPACKDIR}/netserver.service > ${D}${systemd_system_unitdir}/netserver.service fi install -m 4755 src/netperf ${D}${bindir} install -m 4755 src/netserver ${D}${sbindir} - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf + install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/netperf # man install -d ${D}${mandir}/man1/ diff --git a/meta-networking/recipes-support/nis/yp-tools_2.14.bb b/meta-networking/recipes-support/nis/yp-tools_2.14.bb index 8b7ed6fa28..0e147826f0 100644 --- a/meta-networking/recipes-support/nis/yp-tools_2.14.bb +++ b/meta-networking/recipes-support/nis/yp-tools_2.14.bb @@ -30,5 +30,5 @@ CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" do_install:append() { install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/domainname.service ${D}${systemd_unitdir}/system } diff --git a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb index d2535487b4..9b2c186873 100644 --- a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb +++ b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb @@ -43,5 +43,5 @@ FILES:${PN}-staticdev += " ${libdir}/yp-nis/*.a" do_install:append() { install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/domainname.service ${D}${systemd_unitdir}/system } diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb b/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb index a95062bc8b..e29730a23f 100644 --- a/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb +++ b/meta-networking/recipes-support/nis/ypbind-mt_2.7.2.bb @@ -49,10 +49,10 @@ do_install:append () { install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/rcS.d - install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind + install -m 0755 ${UNPACKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/ypbind.service ${D}${systemd_unitdir}/system } # uses glibc internal APIs e.g. _hostalias diff --git a/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch b/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch new file mode 100644 index 0000000000..eefd4e1ab2 --- /dev/null +++ b/meta-networking/recipes-support/ntopng/files/0001-Follow-rrd-post-1.8-change.patch @@ -0,0 +1,32 @@ +From a3bd9efe78f9c381f19b99c8ceb7f52b4c2a52b8 Mon Sep 17 00:00:00 2001 +From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +Date: Wed, 5 Jun 2024 09:40:17 +0300 +Subject: [PATCH] Follow rrd post-1.8 change + +Git version of rrdtool has changed rrd_tune argument from char pointer +to const char pointer. GCC 14 is more strict regarding the pointer +constantness checks and errors out in such a case. Update rrd_tune +invokation. + +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +Upstream-Status: Pending [CLA is not signed on our side] +--- + src/LuaEngineNtop.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/LuaEngineNtop.cpp b/src/LuaEngineNtop.cpp +index bd2de79e3021..dd00f1608f78 100644 +--- a/src/LuaEngineNtop.cpp ++++ b/src/LuaEngineNtop.cpp +@@ -5427,7 +5427,7 @@ static int ntop_rrd_tune(lua_State* vm) { + filename = argv[1]; + + reset_rrd_state(); +- status = rrd_tune(argc, (char**)argv); ++ status = rrd_tune(argc, (const char**)argv); + + if(status != 0) { + char *err = rrd_get_error(); +-- +2.39.2 + diff --git a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb index 110ca36866..9bb93910f8 100644 --- a/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb +++ b/meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb @@ -19,6 +19,7 @@ SRC_URI = "git://github.com/ntop/ntopng.git;protocol=https;branch=5.2-stable \ file://0001-autogen.sh-generate-configure.ac-only.patch \ file://0001-configure.ac.in-not-check-clang-on-host.patch \ file://0001-configure.ac.in-Allow-dynamic-linking-against-ndpi-3.patch \ + file://0001-Follow-rrd-post-1.8-change.patch \ file://ntopng.service \ " @@ -34,7 +35,7 @@ inherit autotools-brokensep gettext pkgconfig systemd do_install:append() { install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/ntopng.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/ntopng.service ${D}${systemd_unitdir}/system } FILES:${PN} += "\ diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p17.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb index 4ed58cd6a4..302cf9915f 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p17.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p18.bb @@ -6,7 +6,7 @@ or satellite receiver or modem." HOMEPAGE = "http://support.ntp.org" SECTION = "net" LICENSE = "NTP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a8ffebbcad335abf2c39fec38671eec" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2311915f6d5142b06395231b0ffeaf29" DEPENDS = "libevent" @@ -24,7 +24,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -SRC_URI[sha256sum] = "103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866" +SRC_URI[sha256sum] = "cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5" CVE_STATUS[CVE-2016-9312] = "not-applicable-platform: Issue only applies on Windows" CVE_STATUS[CVE-2019-11331] = "upstream-wontfix: inherent to RFC 5905 and cannot be fixed without breaking compatibility" @@ -90,8 +90,8 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," do_install:append() { install -d ${D}${sysconfdir}/init.d - install -m 644 ${WORKDIR}/ntp.conf ${D}${sysconfdir} - install -m 755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d + install -m 644 ${UNPACKDIR}/ntp.conf ${D}${sysconfdir} + install -m 755 ${UNPACKDIR}/ntpd ${D}${sysconfdir}/init.d install -m 755 -d ${D}${NTP_USER_HOME} chown ntp:ntp ${D}${NTP_USER_HOME} @@ -109,14 +109,14 @@ do_install:append() { sed -i '/use/i use warnings;' ${D}${sbindir}/calc_tickadj install -d ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/sntp ${D}${sysconfdir}/default/ + install -m 0644 ${UNPACKDIR}/sntp ${D}${sysconfdir}/default/ install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/sntp.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/ntpd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/sntp.service ${D}${systemd_unitdir}/system/ install -d ${D}${systemd_unitdir}/ntp-units.d - install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list + install -m 0644 ${UNPACKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list # Remove the empty libexecdir and bindir. rmdir --ignore-fail-on-non-empty ${D}${libexecdir} diff --git a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb index 9ad97e7689..872d1ce4f7 100644 --- a/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb +++ b/meta-networking/recipes-support/ntpsec/ntpsec_1.2.2a.bb @@ -81,7 +81,7 @@ do_install:append() { install -m 755 ${S}/etc/rc/ntpd ${D}${sysconfdir}/init.d cp -r ${S}/etc/ntp.d ${D}${sysconfdir} - sed -e 's:@NTP_USER_HOME@:${NTP_USER_HOME}:g' ${WORKDIR}/volatiles.ntpsec >${T}/volatiles.ntpsec + sed -e 's:@NTP_USER_HOME@:${NTP_USER_HOME}:g' ${UNPACKDIR}/volatiles.ntpsec >${T}/volatiles.ntpsec if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then cp ${B}/main/etc/* ${D}${systemd_system_unitdir} awk '{print $1, $5, $4, $2, $3, "-"}' ${T}/volatiles.ntpsec >${T}/tmpfiles.ntpsec diff --git a/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb b/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb index 115b51e96c..b02f775a55 100644 --- a/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb +++ b/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb @@ -18,7 +18,8 @@ SRC_URI = "http://nuttcp.net/${BPN}/beta/${BP}.c \ SRC_URI[md5sum] = "d3c92c4d2f261221193c3726c1b9a42f" SRC_URI[sha256sum] = "8c5595bcd27c2fd66831be74c390df078cfb1870aa427f2511ac2586d236c8a1" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile () { ${CC} ${CFLAGS} ${LDFLAGS} -o nuttcp nuttcp-${PV}.c @@ -28,8 +29,8 @@ do_install () { install -d ${D}${bindir} install -d ${D}${systemd_system_unitdir} install -m 0755 nuttcp ${D}${bindir} - install -m 0644 ${WORKDIR}/nuttcp@.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/nuttcp.socket ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/nuttcp@.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/nuttcp.socket ${D}${systemd_system_unitdir} } FILES:${PN} += " \ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb index 82aab051f1..7e3fe5601f 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb @@ -97,12 +97,12 @@ do_install:append() { install -d ${D}${sysconfdir}/vmware-tools if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/*.service ${D}${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/*.service ${D}${systemd_unitdir}/system else install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/vmtoolsd.init ${D}${sysconfdir}/init.d/vmtoolsd + install -m 0755 ${UNPACKDIR}/vmtoolsd.init ${D}${sysconfdir}/init.d/vmtoolsd fi - install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf + install -m 0644 ${UNPACKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf } do_configure:prepend() { diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb index eacbe5ce96..c7c7573677 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.34.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb @@ -34,7 +34,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[sha256sum] = "93227e43c72b5c3bd5949323e0669aa5527d1a971473a3a365af03fb8284a95f" +SRC_URI[sha256sum] = "b059114f6299d73f04ff6e76a0857a0ab81aa362dee99644d256b223872437ad" inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig @@ -102,10 +102,10 @@ do_install:append () { # for systemd install -d ${D}${systemd_unitdir}/system - install -m 0664 ${WORKDIR}/ipmi.service ${D}${systemd_unitdir}/system + install -m 0664 ${UNPACKDIR}/ipmi.service ${D}${systemd_unitdir}/system sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/ipmi.service install -d ${D}${libexecdir} - install -m 0755 ${WORKDIR}/openipmi-helper ${D}${libexecdir} + install -m 0755 ${UNPACKDIR}/openipmi-helper ${D}${libexecdir} } INITSCRIPT_NAME = "ipmi" diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb b/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb index f8de78ff74..ba53d40f47 100644 --- a/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb +++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb @@ -44,7 +44,7 @@ PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" do_install:append() { install -d ${D}/${sysconfdir}/init.d - install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d + install -m 755 ${UNPACKDIR}/openvpn ${D}/${sysconfdir}/init.d install -d ${D}/${sysconfdir}/openvpn install -d ${D}/${sysconfdir}/openvpn/server diff --git a/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb index ffb879952c..ddcad46beb 100644 --- a/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb +++ b/meta-networking/recipes-support/pgpool2/pgpool2_4.5.1.bb @@ -43,8 +43,8 @@ do_configure:append() { do_install:append() { install -d ${D}${sysconfdir}/pgpool-II - install -D -m 0644 ${WORKDIR}/pgpool.sysconfig ${D}${sysconfdir}/pgpool-II/pgpool.conf + install -D -m 0644 ${UNPACKDIR}/pgpool.sysconfig ${D}${sysconfdir}/pgpool-II/pgpool.conf install -D -m 0644 ${S}/src/sample/pcp.conf.sample ${D}${sysconfdir}/pgpool-II/pcp.conf install -D -m 0644 ${S}/src/sample/pool_hba.conf.sample ${D}${sysconfdir}/pgpool-II/pool_hba.conf - install -Dm 0644 ${WORKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service + install -Dm 0644 ${UNPACKDIR}/pgpool.service ${D}${systemd_system_unitdir}/pgpool.service } diff --git a/meta-networking/recipes-support/smcroute/smcroute_2.5.6.bb b/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb index 09752825c2..950f6a2e21 100644 --- a/meta-networking/recipes-support/smcroute/smcroute_2.5.6.bb +++ b/meta-networking/recipes-support/smcroute/smcroute_2.5.7.bb @@ -5,7 +5,7 @@ SECTION = "net" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "999bdd724a1f963ac8bfd0598ffdd2a3d651646e" +SRCREV = "b315d06ddb0dad16a52fe91e5831b4030ce37010" SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb index 0531ffe640..2d63119750 100644 --- a/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb +++ b/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb @@ -15,3 +15,7 @@ CFLAGS += "-D_GNU_SOURCE " do_install() { oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install } + +# http://errors.yoctoproject.org/Errors/Details/766895/ +# ssmping.c:55:51: error: passing argument 3 of 'getsockname' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb index 999deff4de..4f52ee2ba6 100644 --- a/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb +++ b/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.1.bb @@ -36,7 +36,7 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/tinyproxy.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/tinyproxy.service ${D}${systemd_system_unitdir} fi - install -m 0644 ${WORKDIR}/tinyproxy.conf ${D}${sysconfdir}/tinyproxy.conf + install -m 0644 ${UNPACKDIR}/tinyproxy.conf ${D}${sysconfdir}/tinyproxy.conf } diff --git a/meta-networking/recipes-support/unbound/unbound_1.19.3.bb b/meta-networking/recipes-support/unbound/unbound_1.20.0.bb index ffdc78e9d6..fe0111f595 100644 --- a/meta-networking/recipes-support/unbound/unbound_1.19.3.bb +++ b/meta-networking/recipes-support/unbound/unbound_1.20.0.bb @@ -9,8 +9,8 @@ SECTION = "net" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" -SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.19.3" -SRCREV = "48b6c60a24e9a5d6d369a7a37c9fe2a767f26abd" +SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.20.0" +SRCREV = "b9525c5fd47ba481a29b90109017d2253beb105d" inherit autotools pkgconfig systemd update-rc.d diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.4.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb index 95db2efc4c..7cbe3e6324 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.2.4.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb @@ -17,7 +17,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "46bd0f4474337144b30816fb2d8f14e72a26d0391f24fe0b7b619acdcdad8c0c" +SRC_URI[sha256sum] = "55e793ab87a9a73aac44336235c92cb76c52180c469b362ed3a54f26fbb1261f" PE = "1" diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index d8f0f5339a..a254990ec5 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf @@ -44,7 +44,7 @@ LAYERVERSION_openembedded-layer = "1" LAYERDEPENDS_openembedded-layer = "core" -LAYERSERIES_COMPAT_openembedded-layer = "scarthgap styhead" +LAYERSERIES_COMPAT_openembedded-layer = "styhead" LICENSE_PATH += "${LAYERDIR}/licenses" @@ -115,3 +115,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ DEFAULT_TEST_SUITES:pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}" NON_MULTILIB_RECIPES:append = " crash pahole libbpf" + +NON_MULTILIB_RECIPES:remove:x86 = "libbpf" +NON_MULTILIB_RECIPES:remove:x86-64 = "libbpf" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb index d348ef8be9..17a1d3c947 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb @@ -70,13 +70,13 @@ do_install:append() { install -m 0755 -d ${D}${sysconfdir} install -m 0755 -d ${D}${sysconfdir}/lirc - install -m 0644 ${WORKDIR}/lircd.conf ${D}${sysconfdir}/lirc/ - install -m 0644 ${WORKDIR}/lirc_options.conf ${D}${sysconfdir}/lirc/ + install -m 0644 ${UNPACKDIR}/lircd.conf ${D}${sysconfdir}/lirc/ + install -m 0644 ${UNPACKDIR}/lirc_options.conf ${D}${sysconfdir}/lirc/ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -m 0755 -d ${D}${systemd_unitdir}/system ${D}${libdir}/tmpfiles.d - install -m 0644 ${WORKDIR}/lircd.service ${D}${systemd_unitdir}/system/ - install -m 0755 ${WORKDIR}/lircexec.init ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/lirc.tmpfiles ${D}${libdir}/tmpfiles.d/lirc.conf + install -m 0644 ${UNPACKDIR}/lircd.service ${D}${systemd_unitdir}/system/ + install -m 0755 ${UNPACKDIR}/lircexec.init ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/lirc.tmpfiles ${D}${libdir}/tmpfiles.d/lirc.conf else rm -rf ${D}/lib fi diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.6.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb index 0d0f6fea48..2c749eeba7 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.6.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "fc24bb674308f05d963a1dbed8d0b38ead77424ad7cf032a2652732af48f1336" +SRC_URI[sha256sum] = "6505d94d3173e2469950b03d5b99dac4210af7b659a3a1a3b58da35b2a984da6" inherit pypi setuptools3 @@ -55,13 +55,13 @@ do_install:append(){ install -d ${D}${sysconfdir}/thingsboard-gateway/config - for file in $(find ${WORKDIR} -maxdepth 1 -type f -name *.json); do + for file in $(find ${UNPACKDIR} -maxdepth 1 -type f -name *.json); do install -m 0644 "$file" ${D}${sysconfdir}/thingsboard-gateway/config done - install -m 0644 ${WORKDIR}/tb_gateway.yaml ${D}${sysconfdir}/thingsboard-gateway/config - install -m 0644 ${WORKDIR}/logs.conf ${D}${sysconfdir}/thingsboard-gateway/config + install -m 0644 ${UNPACKDIR}/tb_gateway.yaml ${D}${sysconfdir}/thingsboard-gateway/config + install -m 0644 ${UNPACKDIR}/logs.conf ${D}${sysconfdir}/thingsboard-gateway/config install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/thingsboard-gateway.service ${D}${systemd_system_unitdir}/thingsboard-gateway.service + install -m 0644 ${UNPACKDIR}/thingsboard-gateway.service ${D}${systemd_system_unitdir}/thingsboard-gateway.service } diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb index c083a3a37a..a7a3bf12c5 100644 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb +++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb @@ -34,9 +34,9 @@ LDFLAGS:append:libc-musl = " -largp" do_install:append() { install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon + install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system } FILES:${PN} += "${sbindir}/rasdaemon \ diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb index 1c26c7207b..86b0ce0778 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb @@ -3,6 +3,9 @@ SECTION = "console/utils" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + SRC_URI = " \ file://android-gadget-setup \ file://android-gadget-start \ @@ -14,17 +17,17 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" do_install() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} - install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir} - install -m 0755 ${WORKDIR}/android-gadget-cleanup ${D}${bindir} + install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} + install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir} + install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir} - if [ -r ${WORKDIR}/android-gadget-setup.machine ] ; then + if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${D}${sysconfdir} + install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir} fi install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d - install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d + install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d } FILES:${PN} += " \ diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb index b63ccbb080..cb2ff672e3 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb @@ -7,7 +7,7 @@ SRC_URI = "file://android-gadget-setup" do_install() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} + install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} } python () { diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-liblp-fix-building-with-GCC-14.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-liblp-fix-building-with-GCC-14.patch new file mode 100644 index 0000000000..ccd289c81b --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-liblp-fix-building-with-GCC-14.patch @@ -0,0 +1,26 @@ +From 9f4d839847666019cadf57aa34fd366801c11a44 Mon Sep 17 00:00:00 2001 +From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +Date: Fri, 24 May 2024 14:13:35 +0300 +Subject: [PATCH] liblp: fix building with GCC 14 + +Upstream-Status: Pending +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +--- + system/core/fs_mgr/liblp/utility.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/system/core/fs_mgr/liblp/utility.cpp b/system/core/fs_mgr/liblp/utility.cpp +index 48c5c8318d99..0aa8023aa87d 100644 +--- a/system/core/fs_mgr/liblp/utility.cpp ++++ b/system/core/fs_mgr/liblp/utility.cpp +@@ -24,6 +24,7 @@ + #include <sys/ioctl.h> + #endif + ++#include <algorithm> + #include <map> + #include <string> + #include <vector> +-- +2.39.2 + diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb index fbad5e1368..456c7400ef 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb @@ -52,6 +52,7 @@ SRC_URI += " \ file://0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch \ file://0004-adb-Fix-build-on-big-endian-systems.patch \ file://0005-adb-Allow-adbd-to-be-run-as-root.patch \ + file://0001-liblp-fix-building-with-GCC-14.patch \ " S = "${WORKDIR}/git" @@ -138,7 +139,7 @@ do_compile() { do_install() { install -d ${D}${base_sbindir} - install -m 0755 ${S}/../remount -D ${D}${base_sbindir}/remount + install -m 0755 ${UNPACKDIR}/remount -D ${D}${base_sbindir}/remount for tool in img2simg simg2img fastboot adbd; do if echo ${TOOLS_TO_BUILD} | grep -q "$tool" ; then @@ -153,7 +154,7 @@ do_install() { fi # Outside the if statement to avoid errors during do_package - install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ + install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \ ${D}${systemd_unitdir}/system/android-tools-adbd.service install -d ${D}${libdir}/android/ diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone-c89.patch b/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone-c89.patch new file mode 100644 index 0000000000..faf710fe12 --- /dev/null +++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone-c89.patch @@ -0,0 +1,242 @@ +dhrystone: make it speak C89 + +Update Dhrystone sources to stop using K&R C and use something close to C89. +This fixes compilation errors reported by the GCC 14. + +Upstream-Status: Pending +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> + +Index: dhrystone-2.1/dhry.h +=================================================================== +--- dhrystone-2.1.orig/dhry.h ++++ dhrystone-2.1/dhry.h +@@ -423,3 +423,13 @@ typedef struct record + #ifndef HZ + extern long HZ; + #endif ++ ++void Proc_2 (One_Fifty *Int_Par_Ref); ++void Proc_3 (Rec_Pointer *Ptr_Ref_Par); ++void Proc_4(); ++void Proc_5(); ++void Proc_6 (Enumeration Enum_Val_Par, Enumeration *Enum_Ref_Par); ++void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref); ++void Proc_8 (Arr_1_Dim Arr_1_Par_Ref, Arr_2_Dim Arr_2_Par_Ref, int Int_1_Par_Val, int Int_2_Par_Val); ++ ++Boolean Func_2 (Str_30 Str_1_Par_Ref, Str_30 Str_2_Par_Ref); +Index: dhrystone-2.1/dhry_1.c +=================================================================== +--- dhrystone-2.1.orig/dhry_1.c ++++ dhrystone-2.1/dhry_1.c +@@ -14,6 +14,8 @@ + * + **************************************************************************** + */ ++#include <stdlib.h> ++#include <string.h> + + #include "dhry.h" + +@@ -28,7 +30,6 @@ char Ch_1_Glob, + int Arr_1_Glob [50]; + int Arr_2_Glob [50] [50]; + +-extern char *malloc (); + Enumeration Func_1 (); + /* forward declaration necessary since Enumeration may not simply be int */ + +@@ -41,6 +42,8 @@ Enumeration Func_1 (); + Boolean Reg = true; + #endif + ++void Proc_1 (REG Rec_Pointer Ptr_Val_Par); ++ + /* variables for time measurement: */ + + #ifdef TIMES +@@ -70,7 +73,7 @@ float Microseconds, + /* end of variables for time measurement */ + + +-main () ++int main (void) + /*****/ + + /* main program, corresponds to procedures */ +@@ -218,7 +221,7 @@ main () + printf ("Arr_2_Glob[8][7]: %d\n", Arr_2_Glob[8][7]); + printf (" should be: Number_Of_Runs + 10\n"); + printf ("Ptr_Glob->\n"); +- printf (" Ptr_Comp: %d\n", (int) Ptr_Glob->Ptr_Comp); ++ printf (" Ptr_Comp: %lu\n", (unsigned long) Ptr_Glob->Ptr_Comp); + printf (" should be: (implementation-dependent)\n"); + printf (" Discr: %d\n", Ptr_Glob->Discr); + printf (" should be: %d\n", 0); +@@ -229,7 +232,7 @@ main () + printf (" Str_Comp: %s\n", Ptr_Glob->variant.var_1.Str_Comp); + printf (" should be: DHRYSTONE PROGRAM, SOME STRING\n"); + printf ("Next_Ptr_Glob->\n"); +- printf (" Ptr_Comp: %d\n", (int) Next_Ptr_Glob->Ptr_Comp); ++ printf (" Ptr_Comp: %lu\n", (unsigned long) Next_Ptr_Glob->Ptr_Comp); + printf (" should be: (implementation-dependent), same as above\n"); + printf (" Discr: %d\n", Next_Ptr_Glob->Discr); + printf (" should be: %d\n", 0); +@@ -280,14 +283,13 @@ main () + printf ("%6.1f \n", Dhrystones_Per_Second); + printf ("\n"); + } +- ++ return 0; + } + + +-Proc_1 (Ptr_Val_Par) ++void Proc_1 (REG Rec_Pointer Ptr_Val_Par) + /******************/ + +-REG Rec_Pointer Ptr_Val_Par; + /* executed once */ + { + REG Rec_Pointer Next_Record = Ptr_Val_Par->Ptr_Comp; +@@ -318,12 +320,10 @@ REG Rec_Pointer Ptr_Val_Par; + } /* Proc_1 */ + + +-Proc_2 (Int_Par_Ref) ++void Proc_2 (One_Fifty *Int_Par_Ref) + /******************/ + /* executed once */ + /* *Int_Par_Ref == 1, becomes 4 */ +- +-One_Fifty *Int_Par_Ref; + { + One_Fifty Int_Loc; + Enumeration Enum_Loc; +@@ -341,13 +341,10 @@ One_Fifty *Int_Par_Ref; + } /* Proc_2 */ + + +-Proc_3 (Ptr_Ref_Par) ++void Proc_3 (Rec_Pointer *Ptr_Ref_Par) + /******************/ + /* executed once */ + /* Ptr_Ref_Par becomes Ptr_Glob */ +- +-Rec_Pointer *Ptr_Ref_Par; +- + { + if (Ptr_Glob != Null) + /* then, executed */ +@@ -356,7 +353,7 @@ Rec_Pointer *Ptr_Ref_Par; + } /* Proc_3 */ + + +-Proc_4 () /* without parameters */ ++void Proc_4 () /* without parameters */ + /*******/ + /* executed once */ + { +@@ -368,7 +365,7 @@ Proc_4 () /* without parameters */ + } /* Proc_4 */ + + +-Proc_5 () /* without parameters */ ++void Proc_5 () /* without parameters */ + /*******/ + /* executed once */ + { +Index: dhrystone-2.1/dhry_2.c +=================================================================== +--- dhrystone-2.1.orig/dhry_2.c ++++ dhrystone-2.1/dhry_2.c +@@ -14,6 +14,7 @@ + * + **************************************************************************** + */ ++#include <string.h> + + #include "dhry.h" + +@@ -26,14 +27,14 @@ + extern int Int_Glob; + extern char Ch_1_Glob; + ++Boolean Func_3 (Enumeration Enum_Par_Val); + +-Proc_6 (Enum_Val_Par, Enum_Ref_Par) ++ ++void Proc_6 (Enumeration Enum_Val_Par, Enumeration *Enum_Ref_Par) + /*********************************/ + /* executed once */ + /* Enum_Val_Par == Ident_3, Enum_Ref_Par becomes Ident_2 */ + +-Enumeration Enum_Val_Par; +-Enumeration *Enum_Ref_Par; + { + *Enum_Ref_Par = Enum_Val_Par; + if (! Func_3 (Enum_Val_Par)) +@@ -61,7 +62,7 @@ Enumeration *Enum_Ref_Par; + } /* Proc_6 */ + + +-Proc_7 (Int_1_Par_Val, Int_2_Par_Val, Int_Par_Ref) ++void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref) + /**********************************************/ + /* executed three times */ + /* first call: Int_1_Par_Val == 2, Int_2_Par_Val == 3, */ +@@ -70,9 +71,6 @@ Proc_7 (Int_1_Par_Val, Int_2_Par_Val, In + /* Int_Par_Ref becomes 17 */ + /* third call: Int_1_Par_Val == 6, Int_2_Par_Val == 10, */ + /* Int_Par_Ref becomes 18 */ +-One_Fifty Int_1_Par_Val; +-One_Fifty Int_2_Par_Val; +-One_Fifty *Int_Par_Ref; + { + One_Fifty Int_Loc; + +@@ -81,15 +79,11 @@ One_Fifty *Int_Par_Ref; + } /* Proc_7 */ + + +-Proc_8 (Arr_1_Par_Ref, Arr_2_Par_Ref, Int_1_Par_Val, Int_2_Par_Val) ++void Proc_8 (Arr_1_Dim Arr_1_Par_Ref, Arr_2_Dim Arr_2_Par_Ref, int Int_1_Par_Val, int Int_2_Par_Val) + /*********************************************************************/ + /* executed once */ + /* Int_Par_Val_1 == 3 */ + /* Int_Par_Val_2 == 7 */ +-Arr_1_Dim Arr_1_Par_Ref; +-Arr_2_Dim Arr_2_Par_Ref; +-int Int_1_Par_Val; +-int Int_2_Par_Val; + { + REG One_Fifty Int_Index; + REG One_Fifty Int_Loc; +@@ -132,14 +126,11 @@ Capital_Letter Ch_2_Par_Val; + } /* Func_1 */ + + +-Boolean Func_2 (Str_1_Par_Ref, Str_2_Par_Ref) ++Boolean Func_2 (Str_30 Str_1_Par_Ref, Str_30 Str_2_Par_Ref) + /*************************************************/ + /* executed once */ + /* Str_1_Par_Ref == "DHRYSTONE PROGRAM, 1'ST STRING" */ + /* Str_2_Par_Ref == "DHRYSTONE PROGRAM, 2'ND STRING" */ +- +-Str_30 Str_1_Par_Ref; +-Str_30 Str_2_Par_Ref; + { + REG One_Thirty Int_Loc; + Capital_Letter Ch_Loc; +@@ -174,11 +165,10 @@ Str_30 Str_2_Par_Ref; + } /* Func_2 */ + + +-Boolean Func_3 (Enum_Par_Val) ++Boolean Func_3 (Enumeration Enum_Par_Val) + /***************************/ + /* executed once */ + /* Enum_Par_Val == Ident_3 */ +-Enumeration Enum_Par_Val; + { + Enumeration Enum_Loc; + diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb index d809a564e9..db4377f53e 100644 --- a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb +++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb @@ -3,7 +3,9 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851" SRC_URI = "http://www.netlib.org/benchmark/dhry-c;downloadfilename=dhry-c.shar \ - file://dhrystone.patch" + file://dhrystone.patch \ + file://dhrystone-c89.patch \ +" SRC_URI[md5sum] = "75aa5909c174eed98c134be2f56307da" SRC_URI[sha256sum] = "038a7e9169787125c3451a6c941f3aca5db2d2f3863871afcdce154ef17f4e3e" @@ -25,3 +27,27 @@ CFLAGS += "-fno-lto" CFLAGS:append:toolchain-clang = " -Wno-error=implicit-function-declaration -Wno-error=deprecated-non-prototype -Wno-error=implicit-int" LDFLAGS += "-fno-lto" + +# http://errors.yoctoproject.org/Errors/Details/766887/ +# dhry_1.c:101:3: error: implicit declaration of function 'strcpy' [-Wimplicit-function-declaration] +# dhry_1.c:149:5: error: implicit declaration of function 'Proc_5' [-Wimplicit-function-declaration] +# dhry_1.c:150:5: error: implicit declaration of function 'Proc_4' [-Wimplicit-function-declaration] +# dhry_1.c:156:19: error: implicit declaration of function 'Func_2'; did you mean 'Func_1'? [-Wimplicit-function-declaration] +# dhry_1.c:162:7: error: implicit declaration of function 'Proc_7' [-Wimplicit-function-declaration] +# dhry_1.c:167:5: error: implicit declaration of function 'Proc_8' [-Wimplicit-function-declaration] +# dhry_1.c:169:5: error: implicit declaration of function 'Proc_1' [-Wimplicit-function-declaration] +# dhry_1.c:176:9: error: implicit declaration of function 'Proc_6' [-Wimplicit-function-declaration] +# dhry_1.c:187:5: error: implicit declaration of function 'Proc_2' [-Wimplicit-function-declaration] +# dhry_1.c:287:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_1.c:303:3: error: implicit declaration of function 'Proc_3'; did you mean 'Proc_1'? [-Wimplicit-function-declaration] +# dhry_1.c:321:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_1.c:344:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_1.c:359:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_1.c:371:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_1.c:73:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_2.c:164:9: error: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration] +# dhry_2.c:30:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_2.c:39:9: error: implicit declaration of function 'Func_3' [-Wimplicit-function-declaration] +# dhry_2.c:64:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_2.c:84:1: error: return type defaults to 'int' [-Wimplicit-int] +CFLAGS += "-Wno-error=implicit-int -Wno-error=implicit-function-declaration" diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb index 5a1306b6fe..6ab1121efb 100644 --- a/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb +++ b/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb @@ -37,8 +37,8 @@ do_install() { install -m 0755 ${S}/iozone ${D}${bindir} install -m 0755 ${S}/fileop ${D}${bindir} - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/ - install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${S}/../../docs/iozone.1 ${D}${mandir}/man1/ + install -m 0644 ${UNPACKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/ install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${BPN}/examples install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples @@ -48,9 +48,9 @@ do_install() { install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${BPN}/examples install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${BPN}/examples - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/ - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/ - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${S}/../../docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${S}/../../docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${S}/../../docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/ } FILES:${PN} += "${datadir}/doc/${PN}/copyright.txt" diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.16.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.17.1.bb index 5cec4c6874..44fae0255f 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.16.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.17.1.bb @@ -10,14 +10,14 @@ SECTION = "console/network" BUGTRACKER = "https://github.com/esnet/iperf/issues" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dc6301c8256ceb8f71c9e3c2ae9096b9" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9873a72f714e240530e759e103ac7b2" SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ file://0001-configure.ac-check-for-CPP-prog.patch \ " -SRCREV = "f9481e1cd35159929458513692e4a8f9fdd1bd6f" +SRCREV = "2acfcfe94e928e74542c9f107e02aa6dd4748a79" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb b/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb index 603004ddd5..a0327ee154 100644 --- a/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb +++ b/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "LINPACK Benchmarks are a measure of a system's floating point com SUMMARY = "LINPACK is a software library for performing numerical linear algebra on digital computers" LICENSE = "PD" -LIC_FILES_CHKSUM ="file://${WORKDIR}/linpacknew.c;beginline=1;endline=23;md5=aa025e3bc44190c71e4c5e3b084fed87" +LIC_FILES_CHKSUM ="file://${UNPACKDIR}/linpacknew.c;beginline=1;endline=23;md5=aa025e3bc44190c71e4c5e3b084fed87" SRC_URI = "http://www.netlib.org/benchmark/linpackc.new;downloadfilename=linpacknew.c \ file://0001-linpack-Define-DP-only-when-SP-is-not-defined.patch \ @@ -10,7 +10,8 @@ SRC_URI = "http://www.netlib.org/benchmark/linpackc.new;downloadfilename=linpack SRC_URI[md5sum] = "1c5d0b6a31264685d2e651c920e3cdf4" SRC_URI[sha256sum] = "a63f2ec86512959f1fd926bfafb85905b2d7b7402942ffae3af374d48745e97e" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile () { ${CC} ${CFLAGS} ${LDFLAGS} -DDP -o linpack_dp linpacknew.c -lm diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 57f73eedc7..6729e81fa5 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -75,7 +75,7 @@ do_install () { DESTDIR="${D}" \ -C src install mv ${D}${bindir}/line ${D}${bindir}/lm_line - install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ + install -m 0755 ${UNPACKDIR}/lmbench-run ${D}${bindir}/ install -m 0755 ${S}/bin/${TARGET_SYS}/cache ${D}${bindir}/ sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \ -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \ diff --git a/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb b/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb index 8fad04e365..ce28fc732c 100644 --- a/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb +++ b/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb @@ -2,13 +2,14 @@ DESCRIPTION = "Whetstone benchmark is a synthetic benchmark for evaluating the p SUMMARY = "CPU benchmark to measure floating point performance" LICENSE = "PD" -LIC_FILES_CHKSUM ="file://${WORKDIR}/whetstone.c;beginline=1;endline=52;md5=c795edc15e7e1d92ca8f88ad718449f5" +LIC_FILES_CHKSUM ="file://${UNPACKDIR}/whetstone.c;beginline=1;endline=52;md5=c795edc15e7e1d92ca8f88ad718449f5" SRC_URI = "http://www.netlib.org/benchmark/whetstone.c" SRC_URI[md5sum] = "d8eb2cd7104bb5a12d614ac6d3f1f9fb" SRC_URI[sha256sum] = "333e4ceca042c146f63eec605573d16ae8b07166cbc44a17bec1ea97c6f1efbf" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile () { ${CC} ${CFLAGS} ${LDFLAGS} -Ofast -o whetstone whetstone.c -lm diff --git a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index 03076cbc60..6c80f4c81d 100644 --- a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -48,7 +48,7 @@ RDEPENDS:${PN}:append = " \ do_install:append() { install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/edac.service ${D}/${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/edac.service ${D}/${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}/${systemd_unitdir}/system/edac.service } diff --git a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb index 0a041835e1..f3760a40e6 100644 --- a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb +++ b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb @@ -29,6 +29,6 @@ do_configure:prepend() { do_install:append() { install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/firmwared.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/firmwared.service ${D}${systemd_system_unitdir} sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/firmwared.service } diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb index d20d5ed2ae..e6c276ba4e 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb @@ -104,7 +104,7 @@ PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=enabled,-Dplugin_s PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=enabled,-Dplugin_synaptics_rmi=disabled" PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=enabled,-Dplugin_tpm=disabled,tpm2-tss" # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported -PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=disabled,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi" +PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi" PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=enabled,-Dplugin_uefi_pk=disabled" PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=enabled,-Dplugin_uf2=disabled" PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=enabled,-Dplugin_upower=disabled" diff --git a/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb b/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb index fa1bb928ca..22bb30a504 100644 --- a/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb +++ b/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb @@ -60,5 +60,5 @@ do_install () { done install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} + install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} } diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb index 25ab44f75e..6fad255c89 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb @@ -12,7 +12,8 @@ SRC_URI = "file://fancontrol \ file://sensors.conf \ file://sensord \ " -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" PACKAGECONFIG ??= "sensord" PACKAGECONFIG[sensord] = ",," @@ -22,20 +23,20 @@ RDEPENDS:${PN}-dev = "" do_install() { # Install fancontrol configuration file install -d ${D}${sysconfdir}/sysconfig - install -m 0644 ${WORKDIR}/fancontrol ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/sensord ${D}${sysconfdir}/sysconfig + install -m 0644 ${UNPACKDIR}/fancontrol ${D}${sysconfdir} + install -m 0644 ${UNPACKDIR}/sensord ${D}${sysconfdir}/sysconfig # Install libsensors configuration file install -d ${D}${sysconfdir}/sensors.d - install -m 0644 ${WORKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d + install -m 0644 ${UNPACKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then # Install sensord configuration file - install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir} + install -m 0644 ${UNPACKDIR}/sensord.conf ${D}${sysconfdir} # Install sensord.cgi script and create world-writable # web-accessible sensord directory install -d ${D}/www/pages/cgi-bin - install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin + install -m 0755 ${UNPACKDIR}/sensord.cgi ${D}/www/pages/cgi-bin install -d -m a=rwxs ${D}/www/pages/sensord fi } diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch new file mode 100644 index 0000000000..0ff8b3801b --- /dev/null +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch @@ -0,0 +1,36 @@ +From fd49cbcb7f3402e1a4a99b71b901a564060039b4 Mon Sep 17 00:00:00 2001 +From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +Date: Fri, 24 May 2024 14:16:21 +0300 +Subject: [PATCH] Fix building with GCC 14 + +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +Upstream-Status: Submitted [https://github.com/lm-sensors/lm-sensors/pull/497] +--- + prog/sensord/rrd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c +index a531362bddd5..36d685fce514 100644 +--- a/prog/sensord/rrd.c ++++ b/prog/sensord/rrd.c +@@ -299,7 +299,7 @@ int rrdInit(void) + argv[argc++] = rraBuff; + argv[argc] = NULL; + +- ret = rrd_create(argc, (char**) argv); ++ ret = rrd_create(argc, (const char**) argv); + if (ret == -1) { + sensorLog(LOG_ERR, "Error creating RRD file: %s: %s", + sensord_args.rrdFile, rrd_get_error()); +@@ -455,7 +455,7 @@ int rrdUpdate(void) + const char *argv[] = { + "sensord", sensord_args.rrdFile, rrdBuff, NULL + }; +- if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) { ++ if ((ret = rrd_update(3, (const char **) /* WEAK */ argv))) { + sensorLog(LOG_ERR, "Error updating RRD file: %s: %s", + sensord_args.rrdFile, rrd_get_error()); + } +-- +2.39.2 + diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index aba5ab5878..07027225c5 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -14,6 +14,7 @@ SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=mast file://fancontrol.init \ file://sensord.init \ file://0001-Change-PIDFile-path-from-var-run-to-run.patch \ + file://0001-Fix-building-with-GCC-14.patch \ " SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" @@ -70,11 +71,11 @@ do_install() { install -d ${D}${INIT_D_DIR} # Install fancontrol init script - install -m 0755 ${WORKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol + install -m 0755 ${UNPACKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then # Install sensord init script - install -m 0755 ${WORKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord + install -m 0755 ${UNPACKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord fi # Insall sensord service script diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch new file mode 100644 index 0000000000..be1452af51 --- /dev/null +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch @@ -0,0 +1,88 @@ +From ac2ff1dbe0b44953de636c50c7d7f8c1e9f1e458 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 4 May 2024 09:13:06 +0100 +Subject: [PATCH] nvme: Use C99 types for uint32_t + +<stdint.h> provides `uint32_t`, while `u_int_32` is an unofficial/internal +typedef that glibc happens to provide. This fixes the build on musl. + +Bug: https://bugs.gentoo.org/931194 + +Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/ac2ff1dbe0b44953de636c50c7d7f8c1e9f1e458] +Signed-off-by: Sam James <sam@gentoo.org> +--- + nvme.c | 13 +++++++------ + util/base64.c | 5 +++-- + 2 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/nvme.c b/nvme.c +index 46a2399a..5409ddf2 100644 +--- a/nvme.c ++++ b/nvme.c +@@ -34,6 +34,7 @@ + #include <inttypes.h> + #include <locale.h> + #include <stdio.h> ++#include <stdint.h> + #include <stdlib.h> + #include <string.h> + #include <unistd.h> +@@ -9081,8 +9082,8 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru + + unsigned char decoded_key[128]; + unsigned int decoded_len; +- u_int32_t crc = crc32(0L, NULL, 0); +- u_int32_t key_crc; ++ uint32_t crc = crc32(0L, NULL, 0); ++ uint32_t key_crc; + int err = 0, hmac; + struct config { + char *key; +@@ -9150,10 +9151,10 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru + return -EINVAL; + } + crc = crc32(crc, decoded_key, decoded_len); +- key_crc = ((u_int32_t)decoded_key[decoded_len]) | +- ((u_int32_t)decoded_key[decoded_len + 1] << 8) | +- ((u_int32_t)decoded_key[decoded_len + 2] << 16) | +- ((u_int32_t)decoded_key[decoded_len + 3] << 24); ++ key_crc = ((uint32_t)decoded_key[decoded_len]) | ++ ((uint32_t)decoded_key[decoded_len + 1] << 8) | ++ ((uint32_t)decoded_key[decoded_len + 2] << 16) | ++ ((uint32_t)decoded_key[decoded_len + 3] << 24); + if (key_crc != crc) { + nvme_show_error("CRC mismatch (key %08x, crc %08x)", key_crc, crc); + return -EINVAL; +diff --git a/util/base64.c b/util/base64.c +index 7f47cda6..0e89f2e9 100644 +--- a/util/base64.c ++++ b/util/base64.c +@@ -20,6 +20,7 @@ + * MA 02110-1301, USA. + */ + ++#include <stdint.h> + #include <stdlib.h> + #include <string.h> + #include <errno.h> +@@ -42,7 +43,7 @@ static const char base64_table[65] = + int base64_encode(const unsigned char *src, int srclen, char *dst) + { + int i, bits = 0; +- u_int32_t ac = 0; ++ uint32_t ac = 0; + char *cp = dst; + + for (i = 0; i < srclen; i++) { +@@ -77,7 +78,7 @@ int base64_encode(const unsigned char *src, int srclen, char *dst) + */ + int base64_decode(const char *src, int srclen, unsigned char *dst) + { +- u_int32_t ac = 0; ++ uint32_t ac = 0; + int i, bits = 0; + unsigned char *bp = dst; + +-- +2.45.1 + diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch new file mode 100644 index 0000000000..1881b18aac --- /dev/null +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch @@ -0,0 +1,34 @@ +From 47d33d8da7a5b7310a2c2f4328115b439039e46c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 21 May 2024 14:09:32 -0700 +Subject: [PATCH] plugins/ssstc: Replace __uint16_t with uint16_t + +uint16_t is ISO defined and comes from stdint.h, makes it +portable across glibc and musl on linux. + +Upstream-Status: Submitted [https://github.com/linux-nvme/nvme-cli/pull/2351] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + plugins/ssstc/ssstc-nvme.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/plugins/ssstc/ssstc-nvme.c b/plugins/ssstc/ssstc-nvme.c +index 03e4fe3f..302df988 100644 +--- a/plugins/ssstc/ssstc-nvme.c ++++ b/plugins/ssstc/ssstc-nvme.c +@@ -64,9 +64,9 @@ void show_ssstc_add_smart_log_jsn(struct nvme_additional_smart_log *smart, + unsigned int nsid, const char *devname) + { + struct json_object *root, *entry_stats, *dev_stats, *multi; +- __uint16_t wear_level_min = 0; +- __uint16_t wear_level_max = 0; +- __uint16_t wear_level_avg = 0; ++ uint16_t wear_level_min = 0; ++ uint16_t wear_level_max = 0; ++ uint16_t wear_level_avg = 0; + uint64_t raw_val = 0; + + root = json_create_object(); +-- +2.45.1 + diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.9.1.bb index 81b30c283d..ad1728eed6 100644 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.bb +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.9.1.bb @@ -6,9 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c libnvme" -SRCREV = "43b716b982da3df1cf8c4658f7c31b0fe28d377b" +SRCREV = "b340fd7dcf1aef76f8d46ab28bef3c170d310887" -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https \ + file://0001-nvme-Use-C99-types-for-uint32_t.patch \ + file://0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch \ + " S = "${WORKDIR}/git" @@ -28,3 +31,8 @@ FILES:${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" RDEPENDS:${PN} = "util-linux-uuidgen" + +# This one is reproducible only on 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766964/ +# git/plugins/virtium/virtium-nvme.c:205:63: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb index 61be5b2dcc..20e870ccb2 100644 --- a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb +++ b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b5fcfc87fb615860d398b5e38685edf" SRC_URI = "file://pointercal \ file://COPYING" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { # Only install file if it has a contents diff --git a/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb b/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb index aa52f62572..e6ec9c3573 100644 --- a/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb +++ b/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb @@ -22,8 +22,8 @@ do_install:append() { rm -rf ${D}/usr/share/gammu #install default configuration files install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/gammurc ${D}${sysconfdir}/gammurc - install -m 0644 ${WORKDIR}/gammu-smsdrc ${D}${sysconfdir}/gammu-smsdrc + install -m 0644 ${UNPACKDIR}/gammurc ${D}${sysconfdir}/gammurc + install -m 0644 ${UNPACKDIR}/gammu-smsdrc ${D}${sysconfdir}/gammu-smsdrc } EXTRA_OECONF = " \ diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb index dbdc5c1bdf..44683bf735 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb @@ -2,7 +2,7 @@ SUMMARY = "User space daemon for extended IEEE 802.11 management" HOMEPAGE = "http://w1.fi/hostapd/" SECTION = "kernel/userland" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://hostapd/README;md5=c905478466c90f1cefc0df987c40e172" +LIC_FILES_CHKSUM = "file://hostapd/README;beginline=5;endline=47;md5=aa03b8bd6216d1a7ca01fd4b89863073" DEPENDS = "libnl openssl" @@ -16,9 +16,6 @@ SRC_URI = " \ SRC_URI[sha256sum] = "206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d" -S = "${WORKDIR}/hostapd-${PV}" -B = "${WORKDIR}/hostapd-${PV}/hostapd" - inherit update-rc.d systemd pkgconfig features_check CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" @@ -29,22 +26,22 @@ SYSTEMD_SERVICE:${PN} = "hostapd.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" do_configure:append() { - install -m 0644 ${WORKDIR}/defconfig ${B}/.config + install -m 0644 ${UNPACKDIR}/defconfig ${B}/hostapd/.config } do_compile() { export CFLAGS="-MMD -O2 -Wall -g" export EXTRA_CFLAGS="${CFLAGS}" - make V=1 + make -C hostapd V=1 } do_install() { install -d ${D}${sbindir} ${D}${sysconfdir}/init.d ${D}${systemd_unitdir}/system/ - install -m 0644 ${B}/hostapd.conf ${D}${sysconfdir} - install -m 0755 ${B}/hostapd ${D}${sbindir} - install -m 0755 ${B}/hostapd_cli ${D}${sbindir} - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd - install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${B}/hostapd/hostapd.conf ${D}${sysconfdir} + install -m 0755 ${B}/hostapd/hostapd ${D}${sbindir} + install -m 0755 ${B}/hostapd/hostapd_cli ${D}${sbindir} + install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/hostapd + install -m 0644 ${UNPACKDIR}/hostapd.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service } diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb index 7af33e4e7e..ed12fee94c 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb @@ -74,8 +74,8 @@ do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then mkdir -p ${D}/${sysconfdir}/init.d ${D}/${sysconfdir}/default - install -m 0755 ${WORKDIR}/etc/init.d/* ${D}/${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/etc/default/* ${D}/${sysconfdir}/default + install -m 0755 ${UNPACKDIR}/etc/init.d/* ${D}/${sysconfdir}/init.d + install -m 0644 ${UNPACKDIR}/etc/default/* ${D}/${sysconfdir}/default mkdir -p ${D}/${sysconfdir}/default/volatiles echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \ @@ -90,11 +90,11 @@ do_install:append() { > ${D}${sysconfdir}/tmpfiles.d/krb5.conf mkdir -p ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/etc/default/* ${D}/${sysconfdir}/default + install -m 0644 ${UNPACKDIR}/etc/default/* ${D}/${sysconfdir}/default install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/krb5-admin-server.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/krb5-kdc.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/krb5-admin-server.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/krb5-kdc.service ${D}${systemd_system_unitdir} fi sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ diff --git a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.2.0.bb index d37c547c98..c9e9c90d7d 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.2.0.bb @@ -8,9 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" DEPENDS = "libplist" -PV = "1.0.0+git" - -SRCREV = "114098d30e783fbb3def5c9b49427a86621cfcb1" +SRCREV = "fde8946a3988790fd5d3f01fc0a1fd43609ab1d1" SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb b/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.0.bb index 2400195975..29f67d39d8 100644 --- a/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb +++ b/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.0.bb @@ -8,9 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" DEPENDS = "libimobiledevice-glue libusb1 readline" -PV = "1.1.0" - -SRCREV = "98c9f7055ec1f2e09fac69ef1413a8757113b838" +SRCREV = "2254dab893ec439f9a73235ea07194afa77399db" SRC_URI = "git://github.com/libimobiledevice/libirecovery;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/libndp/libndp/0001-libndp-Fix-signature-of-sendto-API.patch b/meta-oe/recipes-connectivity/libndp/libndp/0001-libndp-Fix-signature-of-sendto-API.patch new file mode 100644 index 0000000000..f625416acf --- /dev/null +++ b/meta-oe/recipes-connectivity/libndp/libndp/0001-libndp-Fix-signature-of-sendto-API.patch @@ -0,0 +1,40 @@ +From 14e036b5daf6b72483a1a21054b5133acabceabe Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 17 May 2024 18:14:04 -0700 +Subject: [PATCH] libndp: Fix signature of sendto API + +This fixes build with musl/gcc-14 + +| ../../git/libndp/libndp.c: In function 'mysendto6': +| ../../git/libndp/libndp.c:212:50: error: passing argument 5 of 'sendto' from incompatible pointer type [-Wincompatible-pointer-types] +| 212 | ret = sendto(sockfd, buf, buflen, flags, &sin6, sizeof(sin6)); +| | ^~~~~ +| | | +| | struct sockaddr_in6 * +| In file included from ../../git/libndp/libndp.c:27: +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libndp/1.8/recipe-sysroot/usr/include/sys/socket.h:396:49: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_in6 *' +| 396 | ssize_t sendto (int, const void *, size_t, int, const struct sockaddr *, socklen_t); +| | ^~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [Sent to maintainer] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libndp/libndp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libndp/libndp.c b/libndp/libndp.c +index 6314717..056df0f 100644 +--- a/libndp/libndp.c ++++ b/libndp/libndp.c +@@ -209,7 +209,7 @@ static int mysendto6(int sockfd, void *buf, size_t buflen, int flags, + memcpy(&sin6.sin6_addr, addr, sizeof(sin6.sin6_addr)); + sin6.sin6_scope_id = ifindex; + resend: +- ret = sendto(sockfd, buf, buflen, flags, &sin6, sizeof(sin6)); ++ ret = sendto(sockfd, buf, buflen, flags, (struct sockaddr*)&sin6, sizeof(sin6)); + if (ret == -1) { + switch(errno) { + case EINTR: +-- +2.45.1 + diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb b/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb index 4d4d3e51cd..80946317e4 100644 --- a/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb +++ b/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb @@ -4,6 +4,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ + file://0001-libndp-Fix-signature-of-sendto-API.patch \ " # tag for v1.8 SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c" diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb index 4518e2faaa..3170d37f5b 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb @@ -42,6 +42,8 @@ do_install:append() { sed -i -e 's|${STAGING_LIBDIR}/libuv.so|uv|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake sed -i -e 's|${STAGING_INCDIR}||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake + sed -i -e 's|${STAGING_LIBDIR}/||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ + ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake } PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev ${PN}-evlib-sd" diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb index 9a5c9b5204..d1a73841a1 100644 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb @@ -46,10 +46,10 @@ do_install() { install -d ${D}/${systemd_unitdir}/system/ for service in ${LINUXPTP_SYSTEMD_SERVICES}; do sed -i -e 's,@SBINDIR@,${sbindir},g' \ - ${WORKDIR}/systemd/$service.in + ${UNPACKDIR}/systemd/$service.in sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${WORKDIR}/systemd/$service.in - install -m 644 ${WORKDIR}/systemd/$service.in \ + ${UNPACKDIR}/systemd/$service.in + install -m 644 ${UNPACKDIR}/systemd/$service.in \ ${D}/${systemd_unitdir}/system/$service done } diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch new file mode 100644 index 0000000000..f2e210fc67 --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch @@ -0,0 +1,35 @@ +From 298dec6f87061914c85049faca3d0ff3310d1794 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 May 2024 12:15:30 -0700 +Subject: [PATCH] initialize timespec variable + +Fixes build warnings with GCC14 + +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp: In constructor 'pcpp::RawPacket::RawPacket(const uint8_t*, int, timeval, bool, pcpp::LinkLayerType)': +/mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: error: 'nsec_time.timespec::<anonymous>' is used uninitialized [-Werror=uninitialized] + 23 | timespec nsec_time; + | ^~~~~~~~~ +cc1plus: all warnings being treated as errors + +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1389] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Packet++/src/RawPacket.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp +index 8ad52d52..07dbbbe2 100644 +--- a/Packet++/src/RawPacket.cpp ++++ b/Packet++/src/RawPacket.cpp +@@ -20,7 +20,7 @@ void RawPacket::init(bool deleteRawDataAtDestructor) + + RawPacket::RawPacket(const uint8_t* pRawData, int rawDataLen, timeval timestamp, bool deleteRawDataAtDestructor, LinkLayerType layerType) + { +- timespec nsec_time; ++ timespec nsec_time = {}; + TIMEVAL_TO_TIMESPEC(×tamp, &nsec_time); + init(deleteRawDataAtDestructor); + setRawData(pRawData, rawDataLen, nsec_time, layerType); +-- +2.45.0 + diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch new file mode 100644 index 0000000000..b6389e0e3f --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch @@ -0,0 +1,34 @@ +From 742f564ee80749e9f1f3363092775545e37c0f87 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 9 May 2024 17:02:09 -0700 +Subject: [PATCH] packet++: Initialize m_ExternalRawData in IDnsResource + constructor + +Fixes following warning with GCC-14 + +Packet++/src/DnsResource.cpp:29:24: error: '*this.pcpp::IDnsResource::m_ExternalRawData' may be used uninitialized [-Werror=maybe-uninitialized] + 29 | return m_ExternalRawData; + | ^~~~~~~~~~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1391] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Packet++/src/DnsResource.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp +index fec1bf05..c1f97041 100644 +--- a/Packet++/src/DnsResource.cpp ++++ b/Packet++/src/DnsResource.cpp +@@ -10,7 +10,7 @@ namespace pcpp + { + + IDnsResource::IDnsResource(DnsLayer* dnsLayer, size_t offsetInLayer) +- : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr) ++ : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr), m_ExternalRawData(nullptr) + { + char decodedName[4096]; + m_NameLength = decodeName((const char*)getRawData(), decodedName); +-- +2.45.0 + diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb index 39c6942c83..9db0222172 100644 --- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb @@ -7,7 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" DEPENDS = "libpcap" -SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master" +SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master \ + file://0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch \ + file://0001-initialize-timespec-variable.patch" + SRCREV = "4cf8ed44f9dd145f874dc1dd747dfefcfcab75be" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.2.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.2.bb index 21066b10f1..f23692816c 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.2.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.2.bb @@ -24,7 +24,7 @@ CONFFILES:${PN} += "${sysconfdir}/ser2net/ser2net.yaml" do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/ser2net.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/ser2net.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/ser2net.service fi } diff --git a/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb index 735db1441e..b9ed3d925d 100644 --- a/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb @@ -1,55 +1,40 @@ DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client" SECTION = "network" HOMEPAGE = "https://transmissionbt.com/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=73f535ddffcf2a0d3af4f381f84f9b33" +LICENSE = "MIT & GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=ba8199e739948e198310093de27175fa" DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" RDEPENDS:${PN}-web = "${PN}" SRC_URI = " \ - gitsm://github.com/transmission/transmission;branch=master;protocol=https \ + gitsm://github.com/transmission/transmission;branch=4.0.x;protocol=https \ file://transmission-daemon \ " -# Transmission release 3.00 -SRCREV = "bb6b5a062ee594dfd4b7a12a6b6e860c43849bfd" -PV = "3.00" +# Transmission release 4.0.5 +SRCREV = "a6fe2a64aa7eca089f96006cf082a12f0cde937f" S = "${WORKDIR}/git" -inherit autotools-brokensep gettext update-rc.d pkgconfig systemd mime-xdg +inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" -PACKAGECONFIG[gtk] = " --with-gtk,--without-gtk,gtk+3," -PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd," +PACKAGECONFIG[gtk] = "-DENABLE_GTK=ON,-DENABLE_GTK=OFF,gtk4 gtkmm4," +PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd," # Weak default values for transmission user and group # Change them in bbappend if needed TRANSMISSION_USER ??= "root" TRANSMISSION_GROUP ??= "root" -# Configure aborts with: -# config.status: error: po/Makefile.in.in was not created by intltoolize. -do_configure() { - sed -i /AM_GLIB_GNU_GETTEXT/d ${S}/configure.ac - cd ${S} - ./update-version-h.sh - intltoolize --copy --force --automake - aclocal - libtoolize --automake --copy --force - autoconf - automake -a - oe_runconf -} - do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - sed -i '/USERNAME=/c\USERNAME=${TRANSMISSION_USER}' ${WORKDIR}/transmission-daemon + sed -i '/USERNAME=/c\USERNAME=${TRANSMISSION_USER}' ${UNPACKDIR}/transmission-daemon install -d ${D}${sysconfdir}/init.d - install -m 0744 ${WORKDIR}/transmission-daemon ${D}${sysconfdir}/init.d/ + install -m 0744 ${UNPACKDIR}/transmission-daemon ${D}${sysconfdir}/init.d/ chown ${TRANSMISSION_USER}:${TRANSMISSION_GROUP} ${D}${sysconfdir}/init.d/transmission-daemon fi @@ -63,8 +48,8 @@ do_install:append() { PACKAGES += "${PN}-gtk ${PN}-client ${PN}-web" FILES:${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" -FILES:${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" -FILES:${PN}-web = "${datadir}/transmission/web" +FILES:${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps ${datadir}/metainfo" +FILES:${PN}-web = "${datadir}/transmission/web ${datadir}/transmission/public_html" FILES:${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon ${datadir}/appdata" SYSTEMD_SERVICE:${PN} = "transmission-daemon.service" diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb index eda01ca388..c372b03072 100644 --- a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb +++ b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb @@ -38,3 +38,8 @@ do_install () { } RDEPENDS:${PN} = "wpa-supplicant" + +# http://errors.yoctoproject.org/Errors/Details/766893/ +# wfa_cmdproc.c:467:68: error: passing argument 3 of 'strtok_r' from incompatible pointer type [-Wincompatible-pointer-types] +# wfa_cs.c:4175:57: error: initialization of 'caStaGetEventDetails_t *' {aka 'struct ca_sta_get_event_details *'} from incompatible pointer type 'caStaMngServ_t *' {aka 'struct ca_sta_manage_service *'} [-Wincompatible-pointer-types] +CC += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb index 8708852ce7..46c09a02a5 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb @@ -68,7 +68,7 @@ do_configure:prepend() { do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service fi } diff --git a/meta-oe/recipes-core/emlog/emlog_git.bb b/meta-oe/recipes-core/emlog/emlog_git.bb index 6331f618fc..3f3b5bc920 100644 --- a/meta-oe/recipes-core/emlog/emlog_git.bb +++ b/meta-oe/recipes-core/emlog/emlog_git.bb @@ -18,7 +18,7 @@ do_compile() { } do_install() { - install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/${BPN} + install -Dm 0755 ${UNPACKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/${BPN} install -Dm 0755 ${S}/nbcat ${D}${bindir}/nbcat install -Dm 0755 ${S}/mkemlog ${D}${bindir}/mkemlog } diff --git a/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb b/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb new file mode 100644 index 0000000000..ebcc2b267b --- /dev/null +++ b/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb @@ -0,0 +1,14 @@ +SUMMARY = "libglib-testing provides test harnesses and mock classes to complement GLib classes" +HOMEPAGE = "https://gitlab.gnome.org/pwithnall/libglib-testing" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://gitlab.gnome.org/pwithnall/libglib-testing.git;protocol=https;branch=main" + +PV = "0.1.1" +S = "${WORKDIR}/git" +SRCREV = "e326f73a7139c5e54fcf926896ae6e4cc899a1a7" + +inherit meson pkgconfig + +DEPENDS = "glib-2.0 gtk-doc-native libxslt-native docbook-xsl-stylesheets-native python3-pygments-native" diff --git a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.78.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb index f40a8144d7..a45d31edc2 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.78.0.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb @@ -12,7 +12,7 @@ inherit gnomebase SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI[archive.sha256sum] = "5d2e872564996f02a06d8bbac3677e7c394af8b00dd1526aebd47af842a3ef50" +SRC_URI[archive.sha256sum] = "539b0a29e15a96676c4f0594541250566c5ca44da5d4d87a3732fa2d07909e4a" S = "${WORKDIR}/${GNOMEBN}-${PV}" diff --git a/meta-oe/recipes-core/ndctl/ndctl_v78.bb b/meta-oe/recipes-core/ndctl/ndctl_v79.bb index 907c02c7c8..9a4bc49d12 100644 --- a/meta-oe/recipes-core/ndctl/ndctl_v78.bb +++ b/meta-oe/recipes-core/ndctl/ndctl_v79.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74a614eac8b2657a4b8e6607421a0883" inherit meson pkgconfig bash-completion systemd -SRCREV = "a871e6153b11fe63780b37cdcb1eb347b296095c" +SRCREV = "16f45755f991f4fb6d76fec70a42992426c84234" SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \ file://0001-include-libgen.h-for-basename.patch" diff --git a/meta-oe/recipes-core/opencl/opencl-headers_2023.12.14.bb b/meta-oe/recipes-core/opencl/opencl-headers_2024.05.08.bb index 8b1c795666..01e83c812c 100644 --- a/meta-oe/recipes-core/opencl/opencl-headers_2023.12.14.bb +++ b/meta-oe/recipes-core/opencl/opencl-headers_2024.05.08.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "base" S = "${WORKDIR}/git" -SRCREV = "2368105c0531069fe927989505de7d125ec58c55" +SRCREV = "8275634cf9ec31b6484c2e6be756237cb583999d" SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https" do_configure[noexec] = "1" diff --git a/meta-oe/recipes-core/opencl/opencl-icd-loader_2023.12.14.bb b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb index 146ec6e472..38db7a2453 100644 --- a/meta-oe/recipes-core/opencl/opencl-icd-loader_2023.12.14.bb +++ b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb @@ -13,7 +13,7 @@ RPROVIDES:${PN} = "virtual-opencl-icd" S = "${WORKDIR}/git" -SRCREV = "229410f86a8c8c9e0f86f195409e5481a2bae067" +SRCREV = "861b68b290e76d08e7241608479c16431f529945" SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https" EXTRA_OECMAKE:append = " \ diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 7544a9fbfa..19242ba545 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -511,7 +511,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ libsdl2-net \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \ libsdl \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "lv-drivers lvgl lv-lib-png", "", d)} \ + lvgl \ ttf-arphic-uming \ ttf-droid-sans ttf-droid-sans-mono ttf-droid-sans-fallback ttf-droid-sans-japanese ttf-droid-serif \ ttf-abyssinica \ @@ -688,7 +688,6 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ RDEPENDS:packagegroup-meta-oe-navigation ="\ geos \ ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "orrery", "", d)} \ geoclue \ libspatialite \ proj \ diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb index 247cc4266f..86a2331bd3 100644 --- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb +++ b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb @@ -2,7 +2,7 @@ SUMMARY = "Proxy libintl" HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" SECTION = "libs" LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://src/proxy-libintl/COPYING.LIB.txt;md5=bc400bc21422f9a92e76ec2c5167ca2e" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/src/proxy-libintl/COPYING.LIB.txt;md5=bc400bc21422f9a92e76ec2c5167ca2e" PROVIDES = "virtual/libintl" @@ -12,7 +12,6 @@ SRC_URI = " \ SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e" SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91" -S = "${WORKDIR}" PACKAGES = "${PN} ${PN}-dev" FILES:${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" INSANE_SKIP:${PN}-dev = "staticdev" @@ -21,13 +20,13 @@ CFLAGS:append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][d.getVar(' TARGET_CC_ARCH += "${LDFLAGS}" do_compile() { - cd ${WORKDIR}/src/proxy-libintl + cd ${UNPACKDIR}/src/proxy-libintl oe_runmake ../../lib/libintl.a } do_install() { install -d ${D}/${includedir} install -d ${D}/${libdir} - install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir} - install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir} + install -m 0644 ${UNPACKDIR}/include/libintl.h ${D}/${includedir} + install -m 0644 ${UNPACKDIR}/lib/libintl.a ${D}/${libdir} } diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch index 66be79077e..c23d9b7551 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch @@ -46,11 +46,9 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> src/vconsole/vconsole-setup.c | 2 +- 22 files changed, 50 insertions(+), 51 deletions(-) -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index d2be79622f..e65fecb68d 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *path) { +@@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *p if (r < 0) return r; @@ -59,7 +57,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -843,7 +843,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -843,7 +843,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (isempty(sc)) { @@ -68,7 +66,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -861,7 +861,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -861,7 +861,7 @@ int cg_install_release_agent(const char sc = strstrip(contents); if (streq(sc, "0")) { @@ -77,7 +75,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -86,7 +84,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const cha if (r < 0) return r; @@ -95,7 +93,7 @@ index d2be79622f..e65fecb68d 100644 if (r < 0) return r; -@@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *control if (r < 0) return r; @@ -104,11 +102,9 @@ index d2be79622f..e65fecb68d 100644 } int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { -diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c -index 2101f617ad..63817bae17 100644 --- a/src/basic/namespace-util.c +++ b/src/basic/namespace-util.c -@@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) { +@@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, freeze(); xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); @@ -123,11 +119,9 @@ index 2101f617ad..63817bae17 100644 if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); -diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 6cb0ddf575..247cf9e1d1 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c -@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limit) { +@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limi * decrease it, as threads-max is the much more relevant sysctl. */ if (limit > pid_max-1) { sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ @@ -143,11 +137,9 @@ index 6cb0ddf575..247cf9e1d1 100644 if (r < 0) { uint64_t threads_max; -diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c -index b66a6622ae..8d1c93008a 100644 --- a/src/basic/sysctl-util.c +++ b/src/basic/sysctl-util.c -@@ -58,7 +58,7 @@ int sysctl_write(const char *property, const char *value) { +@@ -58,7 +58,7 @@ int sysctl_write(const char *property, c log_debug("Setting '%s' to '%s'", p, value); @@ -156,8 +148,6 @@ index b66a6622ae..8d1c93008a 100644 } int sysctl_writef(const char *property, const char *format, ...) { -diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c -index d21f3f79ff..258607cc7e 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -30,7 +30,7 @@ static bool arg_unregister = false; @@ -169,7 +159,7 @@ index d21f3f79ff..258607cc7e 100644 } static int apply_rule(const char *filename, unsigned line, const char *rule) { -@@ -58,7 +58,7 @@ static int apply_rule(const char *filename, unsigned line, const char *rule) { +@@ -58,7 +58,7 @@ static int apply_rule(const char *filena if (r >= 0) log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); @@ -187,11 +177,9 @@ index d21f3f79ff..258607cc7e 100644 if (r < 0) log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); else -diff --git a/src/core/cgroup.c b/src/core/cgroup.c -index 61ac4df1a6..ea18970196 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c -@@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) { +@@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u, u->freezer_state = FREEZER_THAWING; } @@ -200,11 +188,9 @@ index 61ac4df1a6..ea18970196 100644 if (r < 0) return r; -diff --git a/src/core/main.c b/src/core/main.c -index 3f71cc0947..0e5aec3e9e 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool if (getpid_cached() != 1) return; @@ -213,11 +199,9 @@ index 3f71cc0947..0e5aec3e9e 100644 if (r < 0) log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); -diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c -index 7ea902b6f9..1aef2988d0 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -321,17 +321,17 @@ int mac_smack_setup(bool *loaded_policy) { +@@ -321,17 +321,17 @@ int mac_smack_setup(bool *loaded_policy) } #if HAVE_SMACK_RUN_LABEL @@ -239,8 +223,6 @@ index 7ea902b6f9..1aef2988d0 100644 if (r < 0) log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); #endif -diff --git a/src/home/homework.c b/src/home/homework.c -index 066483e342..5f92dd7064 100644 --- a/src/home/homework.c +++ b/src/home/homework.c @@ -278,7 +278,7 @@ static void drop_caches_now(void) { @@ -252,11 +234,9 @@ index 066483e342..5f92dd7064 100644 if (r < 0) log_warning_errno(r, "Failed to drop caches, ignoring: %m"); else -diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index 2fbc619a34..09d9591e37 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, +@@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value if (!value) return -ENOMEM; @@ -265,11 +245,9 @@ index 2fbc619a34..09d9591e37 100644 if (r < 0) { /* On failure, clear cache entry, as we do not know how it fails. */ device_remove_cached_sysattr_value(device, sysattr); -diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c -index a5002437c6..b12e6cd9c9 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c -@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { +@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified fn = strjoina(tree, cgroup, "/cgroup.procs"); sprintf(pid_string, PID_FMT, pid); @@ -278,11 +256,9 @@ index a5002437c6..b12e6cd9c9 100644 if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 6ab604d3dc..bbec6b686c 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2688,7 +2688,7 @@ static int reset_audit_loginuid(void) { +@@ -2690,7 +2690,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -291,7 +267,7 @@ index 6ab604d3dc..bbec6b686c 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -4141,7 +4141,7 @@ static int setup_uid_map( +@@ -4143,7 +4143,7 @@ static int setup_uid_map( return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); @@ -300,7 +276,7 @@ index 6ab604d3dc..bbec6b686c 100644 if (r < 0) return log_error_errno(r, "Failed to write UID map: %m"); -@@ -4151,7 +4151,7 @@ static int setup_uid_map( +@@ -4153,7 +4153,7 @@ static int setup_uid_map( return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); @@ -309,8 +285,6 @@ index 6ab604d3dc..bbec6b686c 100644 if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); -diff --git a/src/shared/binfmt-util.c b/src/shared/binfmt-util.c -index a26175474b..1413a9c72c 100644 --- a/src/shared/binfmt-util.c +++ b/src/shared/binfmt-util.c @@ -46,7 +46,7 @@ int disable_binfmt(void) { @@ -322,11 +296,9 @@ index a26175474b..1413a9c72c 100644 if (r < 0) return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); -diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c -index 934a16eaf3..c921ced861 100644 --- a/src/shared/cgroup-setup.c +++ b/src/shared/cgroup-setup.c -@@ -351,7 +351,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { +@@ -351,7 +351,7 @@ int cg_attach(const char *controller, co xsprintf(c, PID_FMT "\n", pid); @@ -344,11 +316,9 @@ index 934a16eaf3..c921ced861 100644 if (r < 0) { log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); -diff --git a/src/shared/coredump-util.c b/src/shared/coredump-util.c -index 805503f366..01a7ccb291 100644 --- a/src/shared/coredump-util.c +++ b/src/shared/coredump-util.c -@@ -163,7 +163,7 @@ int set_coredump_filter(uint64_t value) { +@@ -163,7 +163,7 @@ int set_coredump_filter(uint64_t value) xsprintf(t, "0x%"PRIx64, value); return write_string_file("/proc/self/coredump_filter", t, @@ -366,11 +336,9 @@ index 805503f366..01a7ccb291 100644 if (r < 0) log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } -diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c -index 3eb13d48f6..d09b901be1 100644 --- a/src/shared/hibernate-util.c +++ b/src/shared/hibernate-util.c -@@ -481,7 +481,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { +@@ -501,7 +501,7 @@ int write_resume_config(dev_t devno, uin /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ @@ -379,7 +347,7 @@ index 3eb13d48f6..d09b901be1 100644 if (r == -ENOENT) { if (offset != 0) return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), -@@ -497,7 +497,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { +@@ -517,7 +517,7 @@ int write_resume_config(dev_t devno, uin log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", offset_str, device); @@ -388,11 +356,9 @@ index 3eb13d48f6..d09b901be1 100644 if (r < 0) return log_error_errno(r, "Failed to write device '%s' (%s) to /sys/power/resume: %m", -diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c -index 1f88e724d0..feb18b320a 100644 --- a/src/shared/smack-util.c +++ b/src/shared/smack-util.c -@@ -113,7 +113,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { +@@ -113,7 +113,7 @@ int mac_smack_apply_pid(pid_t pid, const return 0; p = procfs_file_alloca(pid, "attr/current"); @@ -401,24 +367,20 @@ index 1f88e724d0..feb18b320a 100644 if (r < 0) return r; -diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c -index 4c1a968718..6faf6806a5 100644 --- a/src/shared/watchdog.c +++ b/src/shared/watchdog.c -@@ -93,7 +93,7 @@ static int set_pretimeout_governor(const char *governor) { +@@ -93,7 +93,7 @@ static int set_pretimeout_governor(const r = write_string_file(sys_fn, governor, - WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); + WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); if (r < 0) - return log_error_errno(r, "Failed to set pretimeout_governor to '%s': %m", governor); + return log_error_errno(r, "Failed to set watchdog pretimeout_governor to '%s': %m", governor); -diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 21af3e9e52..6d4b84b5d5 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) { +@@ -137,7 +137,7 @@ static int write_state(int fd, char * co if (k < 0) return RET_GATHER(r, k); @@ -427,7 +389,7 @@ index 21af3e9e52..6d4b84b5d5 100644 if (k >= 0) { log_debug("Using sleep state '%s'.", *state); return 0; -@@ -155,7 +155,7 @@ static int write_mode(char * const *modes) { +@@ -155,7 +155,7 @@ static int write_mode(char * const *mode STRV_FOREACH(mode, modes) { int k; @@ -436,11 +398,9 @@ index 21af3e9e52..6d4b84b5d5 100644 if (k >= 0) { log_debug("Using sleep disk mode '%s'.", *mode); return 0; -diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c -index ae63baaf79..82eeca479a 100644 --- a/src/storagetm/storagetm.c +++ b/src/storagetm/storagetm.c -@@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSubsystem *s) { +@@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSub if (!enable_fn) return log_oom(); @@ -449,7 +409,7 @@ index ae63baaf79..82eeca479a 100644 if (r < 0) log_warning_errno(r, "Failed to disable namespace '%s' of NVME subsystem '%s', ignoring: %m", e->d_name, s->name); -@@ -254,7 +254,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { +@@ -254,7 +254,7 @@ static int nvme_subsystem_write_metadata _cleanup_free_ char *truncated = strndup(w, 40); /* kernel refuses more than 40 chars (as per nvme spec) */ /* The default string stored in 'attr_model' is "Linux" btw. */ @@ -458,7 +418,7 @@ index ae63baaf79..82eeca479a 100644 if (r < 0) log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", w); } -@@ -268,7 +268,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { +@@ -268,7 +268,7 @@ static int nvme_subsystem_write_metadata return log_oom(); /* The default string stored in 'attr_firmware' is `uname -r` btw, but truncated to 8 chars. */ @@ -467,7 +427,7 @@ index ae63baaf79..82eeca479a 100644 if (r < 0) log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", truncated); } -@@ -295,7 +295,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { +@@ -295,7 +295,7 @@ static int nvme_subsystem_write_metadata if (!truncated) return log_oom(); @@ -476,7 +436,7 @@ index ae63baaf79..82eeca479a 100644 if (r < 0) log_warning_errno(r, "Failed to set serial of subsystem to '%s', ignoring: %m", truncated); } -@@ -345,7 +345,7 @@ static int nvme_namespace_write_metadata(int namespace_fd, sd_device *device, co +@@ -345,7 +345,7 @@ static int nvme_namespace_write_metadata id = id128_digest(j, l); } @@ -485,7 +445,7 @@ index ae63baaf79..82eeca479a 100644 if (r < 0) log_warning_errno(r, "Failed to set uuid of namespace to '%s', ignoring: %m", SD_ID128_TO_UUID_STRING(id)); -@@ -408,7 +408,7 @@ static int nvme_subsystem_add(const char *node, int consumed_fd, sd_device *devi +@@ -408,7 +408,7 @@ static int nvme_subsystem_add(const char if (subsystem_fd < 0) return log_error_errno(subsystem_fd, "Failed to create NVME subsystem '%s': %m", j); @@ -494,7 +454,7 @@ index ae63baaf79..82eeca479a 100644 if (r < 0) return log_error_errno(r, "Failed to set 'attr_allow_any_host' flag: %m"); -@@ -423,11 +423,11 @@ static int nvme_subsystem_add(const char *node, int consumed_fd, sd_device *devi +@@ -423,11 +423,11 @@ static int nvme_subsystem_add(const char /* We use /proc/$PID/fd/$FD rather than /proc/self/fd/$FD, because this string is visible to others * via configfs, and by including the PID it's clear to who the stuff belongs. */ @@ -532,11 +492,9 @@ index ae63baaf79..82eeca479a 100644 if (r < 0) return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr); -diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c -index febe345b4c..a90b610ba1 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c -@@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_event( +@@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_even log_event_debug(dev, token, "ATTR '%s' writing '%s'", buf, value); r = write_string_file(buf, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | @@ -544,11 +502,9 @@ index febe345b4c..a90b610ba1 100644 WRITE_STRING_FILE_AVOID_NEWLINE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); if (r < 0) -diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c -index 4d82c65f0a..3a3d861b83 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c -@@ -261,7 +261,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { +@@ -261,7 +261,7 @@ static int toggle_utf8_vc(const char *na static int toggle_utf8_sysfs(bool utf8) { int r; @@ -557,6 +513,3 @@ index 4d82c65f0a..3a3d861b83 100644 if (r < 0) return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); --- -2.34.1 - diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch index 24f3bf74a0..56755ac559 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch @@ -1,7 +1,7 @@ -From fd52f1764647e03a35e8f0ed0ef952049073ccbd Mon Sep 17 00:00:00 2001 +From 97d3ed7834bd86615ba4acdbef984c677b7e7791 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Tue, 2 Jan 2024 11:03:27 +0800 -Subject: [PATCH 22/22] avoid missing LOCK_EX declaration +Subject: [PATCH] avoid missing LOCK_EX declaration This only happens on MUSL. Include sys/file.h to avoid compilation error about missing LOCK_EX declaration. @@ -14,8 +14,6 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> src/shared/dev-setup.h | 1 + 2 files changed, 2 insertions(+) -diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c -index 70d963e269..7084811439 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -4,6 +4,7 @@ @@ -26,8 +24,6 @@ index 70d963e269..7084811439 100644 #if HAVE_PAM #include <security/pam_appl.h> -diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h -index 5339bc4e5e..0697495f23 100644 --- a/src/shared/dev-setup.h +++ b/src/shared/dev-setup.h @@ -2,6 +2,7 @@ @@ -38,6 +34,3 @@ index 5339bc4e5e..0697495f23 100644 int lock_dev_console(void); --- -2.34.1 - diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.4.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb index 3b44e02376..ceb422325c 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.4.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb @@ -10,7 +10,7 @@ inherit meson pkgconfig DEPENDS += "gperf-native gettext-native util-linux libcap util-linux python3-jinja2-native" -SRCREV = "387a14a7b67b8b76adaed4175e14bb7e39b2f738" +SRCREV = "5810c25792d4268282dd3892af1a253b690423c9" SRCBRANCH = "v255-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ file://static-libsystemd-pkgconfig.patch \ diff --git a/meta-oe/recipes-core/usleep/files/usleep.c b/meta-oe/recipes-core/usleep/files/usleep.c index a5e7d9d715..dfa52ec19a 100644 --- a/meta-oe/recipes-core/usleep/files/usleep.c +++ b/meta-oe/recipes-core/usleep/files/usleep.c @@ -34,7 +34,7 @@ int main(int argc, char **argv) { int showVersion = 0; int showOot = 0; int rc; - char * countStr = NULL; + const char * countStr = NULL; struct poptOption options[] = { { "version", 'v', POPT_ARG_NONE, &showVersion, 0, "Display the version of this program, and exit" }, @@ -44,7 +44,7 @@ int main(int argc, char **argv) { { 0, 0, 0, 0, 0 } }; - optCon = poptGetContext("usleep", argc, argv, options,0); + optCon = poptGetContext("usleep", argc, (const char **)argv, options,0); /*poptReadDefaultConfig(optCon, 1);*/ poptSetOtherOptionHelp(optCon, "[microseconds]"); diff --git a/meta-oe/recipes-core/usleep/usleep_1.2.bb b/meta-oe/recipes-core/usleep/usleep_1.2.bb index a529032aad..e8b4a7fef9 100644 --- a/meta-oe/recipes-core/usleep/usleep_1.2.bb +++ b/meta-oe/recipes-core/usleep/usleep_1.2.bb @@ -3,7 +3,8 @@ SECTION = "base" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" DEPENDS = "popt" SRC_URI = "file://usleep.c \ @@ -19,8 +20,8 @@ do_install() { install -d ${D}${base_bindir} install -d ${D}${mandir}/man1 - install -m 0755 ${WORKDIR}/usleep ${D}${base_bindir} - install -m 0644 ${WORKDIR}/usleep.1 ${D}${mandir}/man1 + install -m 0755 ${UNPACKDIR}/usleep ${D}${base_bindir} + install -m 0644 ${UNPACKDIR}/usleep.1 ${D}${mandir}/man1 } inherit update-alternatives @@ -31,3 +32,7 @@ ALTERNATIVE_LINK_NAME[usleep] = "${base_bindir}/usleep" ALTERNATIVE:${PN}-doc = "usleep.1" ALTERNATIVE_LINK_NAME[usleep.1] = "${mandir}/man1/usleep.1" + +# http://errors.yoctoproject.org/Errors/Details/766900/ +# usleep.c:47:43: error: passing argument 3 of 'poptGetContext' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-crypto/botan/botan_3.2.0.bb b/meta-oe/recipes-crypto/botan/botan_3.4.0.bb index 5eff2d383e..8cd1aa64cc 100644 --- a/meta-oe/recipes-crypto/botan/botan_3.2.0.bb +++ b/meta-oe/recipes-crypto/botan/botan_3.4.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=f5254d3abe90ec5bb82c5694ff751546" SECTION = "libs" SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" -SRC_URI[sha256sum] = "049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3" +SRC_URI[sha256sum] = "71843afcc0a2c585f8f33fa304f0b58ae4b9c5d8306f894667b3746044277557" S = "${WORKDIR}/Botan-${PV}" diff --git a/meta-oe/recipes-crypto/libsodium/libsodium/0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch b/meta-oe/recipes-crypto/libsodium/libsodium/0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch deleted file mode 100644 index 7a6fae7997..0000000000 --- a/meta-oe/recipes-crypto/libsodium/libsodium/0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d3253310f7c0fc0f1aad6864e3b57958ea1bb9c5 Mon Sep 17 00:00:00 2001 -From: tux3 <barrdetwix@gmail.com> -Date: Mon, 16 Oct 2023 16:42:04 +0200 -Subject: [PATCH] fix(aarch64): Move target #pragma after arm_neon.h include - -Fix per https://github.com/android/ndk/issues/1945 - -If the pragma is done before the header include, -in NDK 26 the attribute may apply to the functions in arm_neon.h - -Upstream-Status: Backport [https://github.com/jedisct1/libsodium/pull/1321] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - .../aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c b/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c -index 0a5a128..aa76f5c 100644 ---- a/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c -+++ b/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c -@@ -19,12 +19,6 @@ - #define __vectorcall - #endif - --#ifdef __clang__ --#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function) --#elif defined(__GNUC__) --#pragma GCC target("+simd+crypto") --#endif -- - #ifndef __ARM_FEATURE_CRYPTO - #define __ARM_FEATURE_CRYPTO 1 - #endif -@@ -34,6 +28,12 @@ - - #include <arm_neon.h> - -+#ifdef __clang__ -+#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function) -+#elif defined(__GNUC__) -+#pragma GCC target("+simd+crypto") -+#endif -+ - #define ABYTES crypto_aead_aes256gcm_ABYTES - #define NPUBBYTES crypto_aead_aes256gcm_NPUBBYTES - #define KEYBYTES crypto_aead_aes256gcm_KEYBYTES --- -2.42.1 - diff --git a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.19.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.19.bb deleted file mode 100644 index 2e678f3f0f..0000000000 --- a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.19.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "The Sodium crypto library" -HOMEPAGE = "http://libsodium.org/" -BUGTRACKER = "https://github.com/jedisct1/libsodium/issues" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=49ce3b426e6a002e23a1387248e6dbe9" - -SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz \ - file://0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch" -SRC_URI[sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea" - -inherit autotools - -S = "${WORKDIR}/libsodium-stable" -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb new file mode 100644 index 0000000000..63d21576b4 --- /dev/null +++ b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb @@ -0,0 +1,12 @@ +SUMMARY = "The Sodium crypto library" +HOMEPAGE = "http://libsodium.org/" +BUGTRACKER = "https://github.com/jedisct1/libsodium/issues" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c59be7bb29f8e431b5f2d690b6734185" + +SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19" + +inherit autotools + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb index 5301071516..9506d0e55d 100644 --- a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +++ b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb @@ -38,19 +38,20 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" do_install:prepend() { - rm ${B}/src/${GO_IMPORT}/build.py - rm ${B}/src/${GO_IMPORT}/build.sh - rm ${B}/src/${GO_IMPORT}/Dockerfile* + test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py + test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh + rm -rf ${B}/src/${GO_IMPORT}/Dockerfile* + sed -i -e "s#usr/bin/sh#bin/sh#g" ${B}/src/${GO_IMPORT}/scripts/ci/run_perftest.sh } do_install:append() { install -d ${D}${sysconfdir}/influxdb - install -m 0644 ${WORKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb + install -m 0644 ${UNPACKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb chown -R root:influxdb ${D}${sysconfdir}/influxdb install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb + install -m 0755 ${UNPACKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ] ; then install -d ${D}${sysconfdir}/logrotate.d diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 33da32fb28..695965f7d2 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -31,8 +31,6 @@ SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe25811 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" -S = "${WORKDIR}/mariadb-${PV}" - BINCONFIG_GLOB = "mysql_config" inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig @@ -80,6 +78,7 @@ BUILD_CFLAGS += "-fuse-ld=bfd" BUILD_CXXFLAGS += "-fuse-ld=bfd" LDFLAGS:x86:toolchain-clang = "-latomic" +LDFLAGS:riscv32:toolchain-clang = "-latomic" EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ -DWITH_JEMALLOC=no \ @@ -163,18 +162,18 @@ do_install() { oe_runmake 'DESTDIR=${D}' install install -d ${D}/${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/ - install -m 0755 ${WORKDIR}/install_db ${D}/${sysconfdir}/init.d/ + install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/ + install -m 0755 ${UNPACKDIR}/install_db ${D}/${sysconfdir}/init.d/ mv ${D}/${sysconfdir}/init.d/mysql ${D}/${sysconfdir}/init.d/mysqld install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/mysqld.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/install_db.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/mysqld.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/install_db.service ${D}${systemd_unitdir}/system sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service \ ${D}${systemd_unitdir}/system/install_db.service install -d ${D}${bindir} - install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir} + install -m 755 ${UNPACKDIR}/mysql-systemd-start ${D}${bindir} install -d ${D}${datadir}/doc/${PN} if [ -f ${D}${datadir}/doc/README ]; then mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ diff --git a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch index d76d1991b6..9df4d073ff 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch @@ -18,7 +18,7 @@ index 401ce30..27f382d 100644 +++ b/configure.ac @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [16.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [16.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not diff --git a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index fa46912eef..1f735f322b 100644 --- a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch +++ b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch @@ -23,7 +23,7 @@ diff --git a/configure.ac b/configure.ac index fba79ee..7170f26 100644 --- a/configure.ac +++ b/configure.ac -@@ -2261,7 +2261,7 @@ Use --without-tcl to disable building PL/Tcl.]) +@@ -2297,7 +2297,7 @@ Use --without-tcl to disable building PL/Tcl.]) fi # check for <perl.h> diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index e29a5bef77..2dd7dd6fda 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -198,24 +198,24 @@ do_install:append() { # install dirs and server init install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/${BPN}.init ${D}${sysconfdir}/init.d/${BPN}-server + install -m 0755 ${UNPACKDIR}/${BPN}.init ${D}${sysconfdir}/init.d/${BPN}-server sed -i -e "s/^PGVERSION=.*$/PGVERSION=${PV}/g" ${D}${sysconfdir}/init.d/${BPN}-server - install -m 0755 ${WORKDIR}/${BPN}-setup ${D}${bindir}/${BPN}-setup + install -m 0755 ${UNPACKDIR}/${BPN}-setup ${D}${bindir}/${BPN}-setup install -d -m 700 ${D}${localstatedir}/lib/${BPN}/data install -d -m 700 ${D}${localstatedir}/lib/${BPN}/backups - install -m 644 ${WORKDIR}/${BPN}-profile ${D}${localstatedir}/lib/${BPN}/.profile + install -m 644 ${UNPACKDIR}/${BPN}-profile ${D}${localstatedir}/lib/${BPN}/.profile chown -R postgres:postgres ${D}${localstatedir}/lib/${BPN} # multiple server config directory install -d -m 700 ${D}${sysconfdir}/default/${BPN} if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/pam.d - install -m 644 ${WORKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql + install -m 644 ${UNPACKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql fi # Install systemd unit files install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/postgresql.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/postgresql.service ${D}${systemd_unitdir}/system sed -i -e 's,@BINDIR@,${bindir},g' \ ${D}${systemd_unitdir}/system/postgresql.service # Remove the build path diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_16.2.bb b/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb index 31f83a564b..6df719cd98 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql_16.2.bb +++ b/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb @@ -11,6 +11,6 @@ SRC_URI += "\ file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \ " -SRC_URI[sha256sum] = "446e88294dbc2c9085ab4b7061a646fa604b4bec03521d5ea671c2e5ad9b2952" +SRC_URI[sha256sum] = "331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585" CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it." diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb index 3f9d49a2d2..a91229f908 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb @@ -3,6 +3,9 @@ SECTION = "console/utils" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + SRC_URI = " \ file://android-gadget-setup \ file://android-gadget-start \ @@ -14,17 +17,17 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" do_install() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} - install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir} - install -m 0755 ${WORKDIR}/android-gadget-cleanup ${D}${bindir} + install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} + install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir} + install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir} - if [ -r ${WORKDIR}/android-gadget-setup.machine ] ; then + if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${D}${sysconfdir} + install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir} fi install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d - install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d + install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d } FILES:${PN} += " \ diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb index 34b1a9bdd2..f73be8dbbf 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb @@ -9,7 +9,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" do_install() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} + install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} } python () { diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff index 177d69a97a..ddb41ea4b0 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff @@ -17,9 +17,10 @@ Upstream-Status: Pending +++ b/adb/adb_auth_host.c @@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, BIGNUM* rem = BN_new(); - BIGNUM* n = BN_new(); +- BIGNUM* n = BN_new(); ++ const BIGNUM* n; BIGNUM* n0inv = BN_new(); -+ BIGNUM* e = BN_new(); ++ const BIGNUM* e; if (RSA_size(rsa) != RSANUMBYTES) { ret = 0; @@ -32,7 +33,7 @@ Upstream-Status: Pending BN_set_bit(r, RSANUMWORDS * 32); BN_mod_sqr(rr, r, n, ctx); BN_div(NULL, rem, n, r32, ctx); -@@ -96,7 +97,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, +@@ -96,11 +97,10 @@ static int RSA_to_RSAPublicKey(RSA *rsa, BN_div(n, rem, n, r32, ctx); pkey->n[i] = BN_get_word(rem); } @@ -41,3 +42,7 @@ Upstream-Status: Pending out: BN_free(n0inv); +- BN_free(n); + BN_free(rem); + BN_free(r); + BN_free(rr); diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index 1c66ea4997..198ef281f2 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -88,7 +88,7 @@ TOOLS:class-native = "fastboot ext4_utils mkbootimg" TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg" do_compile() { - cp ${WORKDIR}/gitignore ${S}/.gitignore + cp ${UNPACKDIR}/gitignore ${S}/.gitignore # Setting both variables below causing our makefiles to not work with # implicit make rules @@ -123,7 +123,7 @@ do_compile() { for tool in ${TOOLS}; do mkdir -p ${B}/${tool} - oe_runmake -f ${B}/${tool}.mk -C ${B}/${tool} + oe_runmake -f ${UNPACKDIR}/${BPN}/${tool}.mk -C ${B}/${tool} done } @@ -151,7 +151,7 @@ do_install() { fi # Outside the if statement to avoid errors during do_package - install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ + install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \ ${D}${systemd_unitdir}/system/android-tools-adbd.service if echo ${TOOLS} | grep -q "fastboot" ; then @@ -193,3 +193,8 @@ android_tools_enable_devmode() { } ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" + +# http://errors.yoctoproject.org/Errors/Details/766881/ +# android-tools/5.1.1.r37/git/system/core/adb/adb_auth_host.c:86:23: error: passing argument 2 of 'RSA_get0_key' from incompatible pointer type [-Wincompatible-pointer-types] +# android-tools/5.1.1.r37/git/system/core/adb/adb_auth_host.c:86:27: error: passing argument 3 of 'RSA_get0_key' from incompatible pointer type [-Wincompatible-pointer-types] +CC += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.17.bb b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb index 6c8934b342..5e992845a1 100644 --- a/meta-oe/recipes-devtools/cjson/cjson_1.7.17.bb +++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \ file://run-ptest \ " -SRCREV = "87d8f0961a01bf09bef98ff89bae9fdec42181ee" +SRCREV = "acc76239bee01d8e9c858ae2cab296704e52d916" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240310.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb index d4ffbb7f03..f8add448b8 100644 --- a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240310.0.bb +++ b/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "38fd8e39b877a79666393b90e38400fd8d7d5d14" +SRCREV = "653ca9204527fe1da7ecf97c3da4308f9ab17d2c" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb index 479b98d44d..599675a345 100644 --- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb +++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb @@ -24,7 +24,7 @@ do_install:append() { do_install:append:class-target() { install -d ${D}${sysconfdir}/yum.repos.d - install -m 0644 ${WORKDIR}/oe-remote.repo.sample ${D}${sysconfdir}/yum.repos.d + install -m 0644 ${UNPACKDIR}/oe-remote.repo.sample ${D}${sysconfdir}/yum.repos.d } do_install:append:class-nativesdk() { diff --git a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.6.bb b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb index 976120b515..2c594d229e 100644 --- a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.6.bb +++ b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb @@ -2,12 +2,12 @@ SUMMARY = "EditorConfig helps maintain consistent coding styles across various e HOMEPAGE = "https://https://editorconfig.org" SECTION = "libs" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f515fff3ea0a2b9797eda60d83c0e5ca" +LIC_FILES_CHKSUM = "file://LICENSE;md5=38f617473e9f7373b5e79baf437accf8" SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master" S = "${WORKDIR}/git" -SRCREV = "b7837029494c03af5ea70ed9d265e8c2123bff53" +SRCREV = "fd8cf1e94ecf4e6e4493833f96140cf9bd17578e" inherit cmake diff --git a/meta-oe/recipes-devtools/glade/glade_3.22.2.bb b/meta-oe/recipes-devtools/glade/glade_3.22.2.bb index d11751a4b2..72c4036be2 100644 --- a/meta-oe/recipes-devtools/glade/glade_3.22.2.bb +++ b/meta-oe/recipes-devtools/glade/glade_3.22.2.bb @@ -24,3 +24,10 @@ SRC_URI[sha256sum] = "edefa6eb24b4d15bd52589121dc109bc08c286157c41288deb74dd9cc3 EXTRA_OECONF += "--disable-man-pages" FILES:${PN} += "${datadir}/glade ${datadir}/metainfo ${libdir}/glade/modules/libgladegtk.so" + +# http://errors.yoctoproject.org/Errors/Details/766882/ +# glade-3.22.2/gladeui/glade-widget.c:1822:36: error: assignment to 'GtkWidget *' {aka 'struct _GtkWidget *'} from incompatible pointer type 'GObject *' {aka 'struct _GObject *'} [-Wincompatible-pointer-types] +# glade-3.22.2/gladeui/glade-command.c:920:23: error: assignment to 'GladeProperty *' {aka 'struct _GladeProperty *'} from incompatible pointer type 'GObject *' {aka 'struct _GObject *'} [-Wincompatible-pointer-types] +# glade-3.22.2/gladeui/glade-command.c:1253:21: error: assignment to 'GladeWidget *' {aka 'struct _GladeWidget *'} from incompatible pointer type 'GObject *' {aka 'struct _GObject *'} [-Wincompatible-pointer-types] +# glade-3.22.2/gladeui/glade-command.c:1419:21: error: assignment to 'GladeWidget *' {aka 'struct _GladeWidget *'} from incompatible pointer type 'GObject *' {aka 'struct _GObject *'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb index be2c0f5394..599fd2c373 100644 --- a/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb +++ b/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb @@ -30,3 +30,33 @@ COMPATIBLE_HOST:riscv32 = "null" COMPATIBLE_HOST:riscv64 = "null" BBCLASSEXTEND = "native" + +# http://errors.yoctoproject.org/Errors/Details/766879/ +# buildResult: +# variable: "LIBUNWIND_HAS_UNW_BACKTRACE" +# cached: true +# stdout: | +# Change Dir: '/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO' +# +# Run Build Command(s): ninja -v cmTC_51d86 +# [1/2] ccache /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/aarch64-webos-linux-gcc --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -DLIBUNWIND_HAS_UNW_BACKTRACE -mcpu=cortex-a72+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0 -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot= -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot= -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native= -o CMakeFiles/cmTC_51d86.dir/src.c.o -c /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO/src.c +# FAILED: CMakeFiles/cmTC_51d86.dir/src.c.o +# ccache /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/aarch64-webos-linux-gcc --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -DLIBUNWIND_HAS_UNW_BACKTRACE -mcpu=cortex-a72+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0 -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot= -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot= -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native= -o CMakeFiles/cmTC_51d86.dir/src.c.o -c /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO/src.c +# src.c: In function 'main': +# src.c:3:43: error: passing argument 1 of 'unw_backtrace' from incompatible pointer type [-Wincompatible-pointer-types] +# 3 | int main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; } +# | ^~~~ +# | | +# | void * (*)[10] +# In file included from ../../../../recipe-sysroot/usr/include/libunwind-aarch64.h:232, +# from ../../../../recipe-sysroot/usr/include/libunwind-64.h:7, +# from ../../../../recipe-sysroot/usr/include/libunwind.h:27, +# from src.c:2: +# ../../../../recipe-sysroot/usr/include/libunwind-common.h:290:27: note: expected 'void **' but argument is of type 'void * (*)[10]' +# 290 | extern int unw_backtrace (void **, int); +# | ^~~~~~~ +# ninja: build stopped: subcommand failed. +# +# exitCode: 1 +# +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb b/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb index 0f6bbb4d54..f9e2c7873c 100644 --- a/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb +++ b/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb @@ -42,7 +42,7 @@ do_compile() { do_install() { oe_runmake DESTDIR=${D} install install -D -m 0644 -p ${S}/iptraf-ng-logrotate.conf ${D}${sysconfdir}/logrotate.d/iptraf-ng - install -Dm 0644 ${WORKDIR}/iptraf-ng-tmpfiles.conf ${D}${libdir}/tmpfiles.d/iptraf-ng-tmpfiles.conf + install -Dm 0644 ${UNPACKDIR}/iptraf-ng-tmpfiles.conf ${D}${libdir}/tmpfiles.d/iptraf-ng-tmpfiles.conf } FILES:${PN} += "${libdir}/tmpfiles.d" diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb index 7e0272f898..cc21c8beae 100644 --- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb +++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb @@ -17,6 +17,8 @@ SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=dev;protocol=https \ file://run-ptest \ " SRCREV = "630434bb0ac619f7beec927569782d924c459385" +PV_LONG := "${PV}-171-g${SRCREV}" +PV .= "+git" S = "${WORKDIR}/git" @@ -27,7 +29,7 @@ EXTRA_AUTORECONF += "--exclude=autoheader" EXTRA_OECONF:append:libc-musl = " --with-jemalloc-prefix=je_" # For some reason VERSION file populated only in tarball distribution. # Adding jemalloc version since this recipe is using source code from git tag -EXTRA_OECONF:append = " --with-version=${PV}-0-g${SRCREV} --enable-xmalloc" +EXTRA_OECONF:append = " --with-version=${PV_LONG} --enable-xmalloc" do_install:append() { sed -i -e 's@${STAGING_DIR_HOST}@@g' \ diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb b/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb index 0ed6e8235d..9e52fe0ce9 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb @@ -19,3 +19,38 @@ do_configure:prepend() { } SRC_URI[archive.sha256sum] = "1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d" + +# http://errors.yoctoproject.org/Errors/Details/766884/ +# libgee-0.20.6/gee/concurrentlist.c:1169:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:1175:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2385:194: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2438:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2460:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2469:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2481:185: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2640:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2641:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2750:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:469:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:514:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:713:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:3635:185: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:4950:201: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5378:201: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5428:226: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5480:218: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5530:238: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5532:234: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5623:246: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5625:242: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:7088:194: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:7157:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:7184:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:7198:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:7215:185: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/hashmap.c:4089:30: error: assignment to 'gboolean (*)(GeeMapIterator *)' {aka 'int (*)(struct _GeeMapIterator *)'} from incompatible pointer type 'gboolean (*)(GeeHashMapNodeIterator *)' {aka 'int (*)(struct _GeeHashMapNodeIterator *)'} [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/hazardpointer.c:430:134: error: passing argument 4 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/hazardpointer.c:430:171: error: passing argument 5 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/hazardpointer.c:434:134: error: passing argument 4 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/hazardpointer.c:434:171: error: passing argument 5 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb index 9445856730..da45cac7d7 100644 --- a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb +++ b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb @@ -16,3 +16,6 @@ EXTRA_OECONF = " --enable-mcpplib " BBCLASSEXTEND = "native nativesdk" +# http://errors.yoctoproject.org/Errors/Details/766883/ +# mcpp-2.7.2/src/expand.c:713:21: error: assignment to 'char *' from incompatible pointer type 'LOCATION *' {aka 'struct location *'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb index 2451a36be2..89e6744dca 100644 --- a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb +++ b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb @@ -10,7 +10,7 @@ RDEPENDS:${PN} = "python3 python3-modules" inherit python3native python3targetconfig SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" -SRC_URI[sha256sum] = "a5603d0d395ebf67fe5d27abbb3bd37fcc01871ecf394c793672d2c1e68be7e7" +SRC_URI[sha256sum] = "f75d6a4a75823a1b7d713a4967eca2f596f466e58fc6bc06d72642932fd7e307" S = "${WORKDIR}/mercurial-${PV}" diff --git a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb index 6e29b2459d..8ba121d5ea 100644 --- a/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb +++ b/meta-oe/recipes-devtools/microsoft-gsl/microsoft-gsl_4.0.0.bb @@ -43,3 +43,8 @@ FILES:${PN}-ptest = "${bindir}/gsl*_tests" CVE_PRODUCT = "microsoft:gsl" BBCLASSEXTEND = "native nativesdk" + +# This one is reproducible only on 32bit arm MACHINEs (didn't see it with qemux86 or qemux86-64 builds) +# http://errors.yoctoproject.org/Errors/Details/766976/ +# lib32-microsoft-gsl/4.0.0/git/tests/span_tests.cpp:1275:34: error: value computed is not used [-Werror=unused-value] +CXXFLAGS += "-Wno-error=unused-value" diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.12/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache index f596207648..eb0f143eae 100755 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.12/oe-npm-cache +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache @@ -30,7 +30,7 @@ const xlate = { time: Date.now(), url: key, reqHeaders: { - 'accept': 'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*', + 'accept': 'application/json', }, resHeaders: { "content-type": "application/json", diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb index a61dd5018f..d4b818f967 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.12.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb @@ -8,10 +8,13 @@ SRC_URI = "\ inherit native +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + B = "${WORKDIR}/build" do_configure() { - sed -e 's!@@libdir@@!${libdir}!g' < '${WORKDIR}/oe-npm-cache' > '${B}/oe-npm-cache' + sed -e 's!@@libdir@@!${libdir}!g' < '${UNPACKDIR}/oe-npm-cache' > '${B}/oe-npm-cache' } do_install() { diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.12.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb index d86c38f2fc..df68b5f77d 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.12.2.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9a7fcce64128730251dbc58aa41b4674" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cef54676c547a5bbab44aa8be3be9ef7" CVE_PRODUCT = "nodejs node.js" @@ -36,7 +36,7 @@ SRC_URI:append:toolchain-clang:x86 = " \ SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "d7cbcc5fbfb31e9001f3f0150bbeda59abe5dd7137aaa6273958cd59ce35ced7" +SRC_URI[sha256sum] = "11d229fcad7e6e10f450301223c602043f021cda51259ffafc7e55e484b37dc7" S = "${WORKDIR}/node-v${PV}" @@ -180,3 +180,7 @@ PACKAGES =+ "${PN}-systemtap" FILES:${PN}-systemtap = "${datadir}/systemtap" BBCLASSEXTEND = "native" + +# http://errors.yoctoproject.org/Errors/Details/766923/ +# TOPDIR/tmp-glibc/work/core2-64-oe-linux/nodejs/20.12.2/node-v20.12.2/out/Release/v8-qemu-wrapper.sh: line 7: 252447 Illegal instruction (core dumped) PSEUDO_UNLOAD=1 qemu-x86_64 -r 5.15 -cpu Nehalem,check=false -L TOPDIR/tmp-glibc/work/core2-64-oe-linux/nodejs/20.12.2/recipe-sysroot -E LD_LIBRARY_PATH=TOPDIR/tmp-glibc/work/core2-64-oe-linux/nodejs/20.12.2/recipe-sysroot/usr/lib:TOPDIR/tmp-glibc/work/core2-64-oe-linux/nodejs/20.12.2/recipe-sysroot/usr/lib "$@" +# TODO: Fix with gcc-14 diff --git a/meta-oe/recipes-devtools/perl/exiftool_12.72.bb b/meta-oe/recipes-devtools/perl/exiftool_12.85.bb index ba3e3fdf7e..66e9a3b719 100644 --- a/meta-oe/recipes-devtools/perl/exiftool_12.72.bb +++ b/meta-oe/recipes-devtools/perl/exiftool_12.85.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff inherit cpan -SRCREV = "fc4f6614ff0c19bb5f332a9c464dcef7267931df" +SRCREV = "405674e0c477931b60b10a78828483ef54761385" SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb index fc505fe1e8..53c197c5de 100644 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb +++ b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb @@ -20,3 +20,7 @@ SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https;branch=master S = "${WORKDIR}/git" inherit cpan + +# http://errors.yoctoproject.org/Errors/Details/766909/ +# dbdimp.c:3207:24: error: assignment to 'my_bool *' {aka 'char *'} from incompatible pointer type '_Bool *' [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch index a967d64120..c743697469 100644 --- a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch +++ b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch @@ -1,6 +1,6 @@ -From ca9b419f2c146061f73ee045cb0a069c18b40cd0 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Wed, 15 Dec 2021 14:00:08 +0800 +From 889583912ddd7abc628f2703892ec4884db6419a Mon Sep 17 00:00:00 2001 +From: Soumya Sambu <soumya.sambu@windriver.com> +Date: Tue, 7 May 2024 08:39:16 +0000 Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache We can't use AC_TRY_RUN to run programs in a cross compile @@ -20,15 +20,18 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com> update patch to version 8.1.0 Signed-off-by: Mingli Yu <mingli.yu@windriver.com> + +update patch to version 8.2.18 +Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> --- ext/opcache/config.m4 | 204 ++---------------------------------------- 1 file changed, 8 insertions(+), 196 deletions(-) diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index 2a83fa2..9471b5d 100644 +index 6bf07ad3..5d645b86 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -108,209 +108,21 @@ if test "$PHP_OPCACHE" != "no"; then +@@ -113,209 +113,21 @@ if test "$PHP_OPCACHE" != "no"; then AC_CHECK_FUNCS([mprotect]) AC_MSG_CHECKING(for sysvipc shared memory support) @@ -40,7 +43,7 @@ index 2a83fa2..9471b5d 100644 -#include <unistd.h> -#include <string.h> - --int main() { +-int main(void) { - pid_t pid; - int status; - int ipc_id; @@ -121,7 +124,7 @@ index 2a83fa2..9471b5d 100644 -# define MAP_FAILED ((void*)-1) -#endif - --int main() { +-int main(void) { - pid_t pid; - int status; - char *shm; @@ -185,7 +188,7 @@ index 2a83fa2..9471b5d 100644 -# define MAP_FAILED ((void*)-1) -#endif - --int main() { +-int main(void) { - pid_t pid; - int status; - int fd; @@ -247,5 +250,5 @@ index 2a83fa2..9471b5d 100644 PHP_NEW_EXTENSION(opcache, ZendAccelerator.c \ -- -2.17.1 +2.40.0 diff --git a/meta-oe/recipes-devtools/php/php_8.2.16.bb b/meta-oe/recipes-devtools/php/php_8.2.18.bb index 1cb378fb94..e662f6806e 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.16.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.18.bb @@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "2658c1b8935ab6b53a7f209354602761ab07066e66920bc472b8815fd1b43f71" +SRC_URI[sha256sum] = "ca0b07c254200320f518ac5b3df540a9cf14d866f3c93edc3013b52e06fac796" CVE_STATUS_GROUPS += "CVE_STATUS_PHP" CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." @@ -182,19 +182,19 @@ do_install:append:class-target() { rm -rf ${D}/.[a-z]* rm -rf ${D}/var rm -f ${D}/${sysconfdir}/php-fpm.conf.default - install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf + install -m 0644 ${UNPACKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf install -d ${D}/${sysconfdir}/apache2/conf.d - install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf + install -m 0644 ${UNPACKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf install -d ${D}${sysconfdir}/init.d sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm - install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf + install -m 0644 ${UNPACKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_system_unitdir}/php-fpm.service + install -m 0644 ${UNPACKDIR}/php-fpm.service ${D}${systemd_system_unitdir}/php-fpm.service sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_system_unitdir}/php-fpm.service sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/php-fpm.service sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/php-fpm.service @@ -203,7 +203,7 @@ do_install:append:class-target() { if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/apache2/modules.d install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} - install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d + install -m 644 ${UNPACKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf cat ${S}/php.ini-production | \ sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ diff --git a/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch b/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch deleted file mode 100644 index a41f985eb8..0000000000 --- a/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch +++ /dev/null @@ -1,45 +0,0 @@ -From cef3fc90f02ef4fc49515745194bac3d81a2265b Mon Sep 17 00:00:00 2001 -From: "Jose E. Marchesi" <jose.marchesi@oracle.com> -Date: Fri, 30 Apr 2021 13:17:05 +0200 -Subject: [PATCH] build: do not check for Tcl/Tk if --disable-gui is specified - -2021-04-30 Jose E. Marchesi <jemarch@gnu.org> - - * configure.ac: Do not check for tcl/tk if --disable-gui is - specified at configure time. - -(cherry picked from commit 280a5e154287e43c0a40d9530a9cc658a7367a9c) -[Romain: remove Changelog entry] -Signed-off-by: Romain Naour <romain.naour@gmail.com> ---- -Upstream-Status: Pending - - configure.ac | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c7205513..c2f0760a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -214,12 +214,15 @@ fi - dnl The GUI is optional, and depends on the availability of Tcl and - dnl Tk. - --POKE_TCLTK -- - AC_ARG_ENABLE([gui], - AS_HELP_STRING([--enable-gui], - [Enable the GUI (default is YES)]), -- [gui_enabled=$enableval], [gui_enabled=$has_tcltk]) -+ [gui_enabled=$enableval], [gui_enabled=yes]) -+ -+if test "x$gui_enabled" = "xyes"; then -+ POKE_TCLTK -+ gui_enabled=$has_tcltk -+fi - - AM_CONDITIONAL([GUI], [test "x$gui_enabled" = "xyes"]) - --- -2.30.2 - diff --git a/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch b/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch deleted file mode 100644 index 660b19f514..0000000000 --- a/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c37419e459bd5863534719fa50755174d0912e6d Mon Sep 17 00:00:00 2001 -From: Romain Naour <romain.naour@gmail.com> -Date: Fri, 30 Apr 2021 14:32:21 +0200 -Subject: [PATCH] jitter: jitter-config.in: avoit host poisoning while - cross-compiling - -When jitter is bundled into another project (poke), jitter-config --cppflags -return an unsafe path "-I /usr/include". - -In the context of Buildroot, such configuration script woulf be "fixed" -after installation. But jitter-config is not installed by poke since it's -build as static library and liked to poke. - -For now, patch jitter-config.in instead of jitter-config.in.m4sh since -there is an issue while converting the M4sh m4sh script ( .in.m4sh ) -into a portable shell script ( .in ) ready to be processed by aclocal -for @-substitutions. - -[1] https://git.buildroot.net/buildroot/tree/package/pkg-generic.mk?h=2021.02.1#n291 - -Signed-off-by: Romain Naour <romain.naour@gmail.com> ---- -Upstream-Status: Pending - - jitter/bin/jitter-config.in | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/jitter/bin/jitter-config.in b/jitter/bin/jitter-config.in -index 5e124f0..af0ac9d 100644 ---- a/jitter/bin/jitter-config.in -+++ b/jitter/bin/jitter-config.in -@@ -998,11 +998,7 @@ while test "$#" != "0"; do - append_to_output cflags;; - --cppflags) - no_option_argument -- append_to_output cppflags -- # Append a -I argument. This is defined separately from the rest, -- # as the installation prefix can be decided very late, at Jitter -- # installation time. -- output="$output -I $includedir";; -+ append_to_output cppflags;; - --ldadd) - no_option_argument - append_to_output ldadd;; --- -2.30.2 - diff --git a/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index ad2bf764d3..67384b73d4 100644 --- a/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -11,18 +11,16 @@ Avoid: ./../poke/poke -o ./poke.1 ../run: line 51: exec: :: not found +Upstream-Status: Pending Signed-off-by: Romain Naour <romain.naour@gmail.com> --- -Upstream-Status: Pending configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index c2f0760a..93769ef9 100644 --- a/configure.ac +++ b/configure.ac -@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) +@@ -148,7 +148,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) if test $cross_compiling = no; then AM_MISSING_PROG(HELP2MAN, help2man) else @@ -30,7 +28,4 @@ index c2f0760a..93769ef9 100644 + HELP2MAN=true fi - dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to --- -2.30.2 - + dnl The following Automake conditional is used in some Makefile.am files diff --git a/meta-oe/recipes-devtools/poke/poke_1.2.bb b/meta-oe/recipes-devtools/poke/poke_4.1.bb index af85d21705..2963680704 100644 --- a/meta-oe/recipes-devtools/poke/poke_1.2.bb +++ b/meta-oe/recipes-devtools/poke/poke_4.1.bb @@ -6,14 +6,12 @@ LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \ - file://0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch \ - file://0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch \ file://0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch \ " DEPENDS = "flex-native bison-native bdwgc readline" -SRC_URI[sha256sum] = "f61cf8da5b64c01a1359373725aad1ca257f35c1c9269e4d50dd0664183ddf62" +SRC_URI[sha256sum] = "08ecaea41f7374acd4238e12bbf97e8cd5e572d5917e956b73b9d43026e9d740" # poke does not support using out-of-tree builds inherit autotools-brokensep gettext pkgconfig @@ -29,4 +27,7 @@ EXTRA_OECONF = "--disable-gui \ PACKAGECONFIG[mi] = "--enable-mi,--disable-mi,json-c" -FILES:${PN} += "${datadir}/emacs/site-lisp" +PACKAGES =+ "${PN}-emacs ${PN}-vim" + +FILES:${PN}-emacs += "${datadir}/emacs/site-lisp" +FILES:${PN}-vim += "${datadir}/vim/vimfiles" diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb index 3241345963..4f8515471f 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb @@ -116,3 +116,4 @@ LDFLAGS:append:arm = " -latomic" LDFLAGS:append:mips = " -latomic" LDFLAGS:append:powerpc = " -latomic" LDFLAGS:append:mipsel = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" diff --git a/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb new file mode 100644 index 0000000000..1b064faf16 --- /dev/null +++ b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb @@ -0,0 +1,12 @@ +SUMMARY = "sexpect is another implementation of Expect which is specifically designed for Shell scripts" +HOMEPAGE = "https://github.com/clarkwang/sexpect" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + +BRANCH = "master" +SRC_URI = "git://github.com/clarkwang/sexpect;branch=${BRANCH};protocol=https" +SRCREV = "532a52d36aae442b7fe1ce20a59effd1dbc6e6fe" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb index f7160f508b..3360ccf357 100644 --- a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb +++ b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb @@ -7,9 +7,10 @@ inherit nativesdk SRC_URI = "file://systemctl" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/systemctl ${D}${bindir} + install -m 0755 ${UNPACKDIR}/systemctl ${D}${bindir} } diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-newer-tls.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-newer-tls.patch new file mode 100644 index 0000000000..958abc90f8 --- /dev/null +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-newer-tls.patch @@ -0,0 +1,29 @@ +Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> +Upstream-Status: Pending + +--- imap-2007f/src/osdep/unix/ssl_unix.c.old 2024-05-08 09:41:06.183450584 +0200 ++++ imap-2007f/src/osdep/unix/ssl_unix.c 2024-05-08 09:43:38.512931933 +0200 +@@ -220,7 +220,11 @@ + if (ssl_last_error) fs_give ((void **) &ssl_last_error); + ssl_last_host = host; + if (!(stream->context = SSL_CTX_new ((flags & NET_TLSCLIENT) ? ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++ TLS_client_method () : ++#else + TLSv1_client_method () : ++#endif + SSLv23_client_method ()))) + return "SSL context failed"; + SSL_CTX_set_options (stream->context,0); +@@ -703,7 +707,11 @@ + } + /* create context */ + if (!(stream->context = SSL_CTX_new (start_tls ? ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++ TLS_server_method () : ++#else + TLSv1_server_method () : ++#endif + SSLv23_server_method ()))) + syslog (LOG_ALERT,"Unable to create SSL context, host=%.80s", + tcp_clienthost ()); diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index dcb59f4ea0..4287ee973a 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb @@ -15,6 +15,7 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \ file://0001-Do-not-build-mtest.patch \ file://0002-tmail-Include-ctype.h-for-isdigit.patch \ file://0001-Fix-Wincompatible-function-pointer-types.patch \ + file://uw-imap-newer-tls.patch \ " SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369" @@ -51,3 +52,10 @@ ALLOW_EMPTY:${PN} = "1" PARALLEL_MAKE = "" +# http://errors.yoctoproject.org/Errors/Details/766915/ +# unix.c:235:21: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] +# unix.c:1002:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] +# unix.c:1163:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] +# unix.c:1428:40: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] +# unix.c:2254:33: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb index 5cd20c5b1c..178a5eb0b5 100644 --- a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb +++ b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb @@ -27,6 +27,6 @@ inherit autotools ptest do_install_ptest() { install -d ${D}${PTEST_PATH} - install -m 0644 ${WORKDIR}/ptest.out.expected ${D}${PTEST_PATH}/ptest.out.expected + install -m 0644 ${UNPACKDIR}/ptest.out.expected ${D}${PTEST_PATH}/ptest.out.expected } diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb index 781dc83da9..db602a2523 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb @@ -32,3 +32,7 @@ FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/* FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so" BBCLASSEXTEND = "native" + +# http://errors.yoctoproject.org/Errors/Details/766910/ +# cmpi-bindings/1.0.4/git/swig/python/../../src/target_python.c:168:21: error: passing argument 1 of 'Py_SetProgramName' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index 02f1fcb420..df36b64695 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -63,7 +63,7 @@ EXTRA_OECONF = " \ do_install:append() { install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd + install -m 0755 ${UNPACKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/collectd sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/collectd sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/collectd @@ -77,7 +77,7 @@ do_install:append() { # Install systemd unit files install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/collectd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/collectd.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' \ ${D}${systemd_unitdir}/system/collectd.service } diff --git a/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb b/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb index 22b6c782a6..ef016b8683 100644 --- a/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb +++ b/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb @@ -30,11 +30,11 @@ do_install () { } do_install_ptest() { - install -m 0755 "${WORKDIR}/duktape-2.7.0/hello" "${D}${PTEST_PATH}" - install -m 0755 "${WORKDIR}/duktape-2.7.0/eval" "${D}${PTEST_PATH}" - install -m 0755 "${WORKDIR}/duktape-2.7.0/evloop" "${D}${PTEST_PATH}" - install -m 0755 "${WORKDIR}/duktape-2.7.0/examples/eventloop/timer-test.js" "${D}${PTEST_PATH}" - install -m 0755 "${WORKDIR}/duktape-2.7.0/examples/eventloop/ecma_eventloop.js" "${D}${PTEST_PATH}" + install -m 0755 "${S}/hello" "${D}${PTEST_PATH}" + install -m 0755 "${S}/eval" "${D}${PTEST_PATH}" + install -m 0755 "${S}/evloop" "${D}${PTEST_PATH}" + install -m 0755 "${S}/examples/eventloop/timer-test.js" "${D}${PTEST_PATH}" + install -m 0755 "${S}/examples/eventloop/ecma_eventloop.js" "${D}${PTEST_PATH}" } RDEPENDS:${PN}-ptest += "make" diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch deleted file mode 100644 index ce12d4270a..0000000000 --- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch +++ /dev/null @@ -1,68 +0,0 @@ -From cb79329010d73e36ce64830914005f1c17f8f53c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com> -Date: Sat, 23 Sep 2023 11:32:18 +0200 -Subject: [PATCH] cmake: fix when cross compiling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In order to generate protobuf files CMake need to use the protoc -and grpc-cpp-plugin compiled for the host architecture. - -Unfortunately, the protoc and grpc-cpp-plugin in the gRPC CMake -configuration file are the one for the target architecture. - -Fix this by properly finding the correct executable when -CMake is cross compiling. - -Signed-off-by: Clément Péron <peron.clem@gmail.com> ---- -Upstream-Status: Pending - - CMakeLists.txt | 28 ++++++++++++++++++++++++++-- - 1 file changed, 26 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5aa1310..80ebad2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -120,10 +120,34 @@ if(Protobuf_PROTOC_EXECUTABLE) - endif() - endif() - -+# When cross compiling we look for the native protoc compiler -+# overwrite protobuf::protoc with the proper protoc -+if(CMAKE_CROSSCOMPILING) -+ find_program(Protobuf_PROTOC_EXECUTABLE REQUIRED NAMES protoc) -+ if(NOT TARGET protobuf::protoc) -+ add_executable(protobuf::protoc IMPORTED) -+ endif() -+ set_target_properties(protobuf::protoc PROPERTIES -+ IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}") -+endif() -+ - find_package(gRPC QUIET) --if(gRPC_FOUND AND TARGET gRPC::grpc AND TARGET gRPC::grpc_cpp_plugin) -+if(gRPC_FOUND AND TARGET gRPC::grpc) -+ # When cross compiling we look for the native grpc_cpp_plugin -+ if(CMAKE_CROSSCOMPILING) -+ find_program(GRPC_CPP_PLUGIN REQUIRED NAMES grpc_cpp_plugin) -+ if(NOT TARGET gRPC::grpc_cpp_plugin) -+ add_executable(gRPC::grpc_cpp_plugin IMPORTED) -+ endif() -+ set_target_properties(gRPC::grpc_cpp_plugin PROPERTIES -+ IMPORTED_LOCATION "${GRPC_CPP_PLUGIN}") -+ elseif(TARGET gRPC::grpc_cpp_plugin) -+ get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) -+ else() -+ message(FATAL_ERROR "Found gRPC but no gRPC CPP plugin defined") -+ endif() -+ - set(GRPC_LIBRARIES gRPC::gpr gRPC::grpc gRPC::grpc++) -- get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) - get_target_property(GRPC_INCLUDE_DIR gRPC::grpc INTERFACE_INCLUDE_DIRECTORIES) - else() - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGRPC.cmake) --- -2.39.3 (Apple Git-145) - diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch new file mode 100644 index 0000000000..373e146b98 --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch @@ -0,0 +1,27 @@ +From 44f4254fe96c43437400f94a8a2800175ddf3279 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 May 2024 21:00:48 -0700 +Subject: [PATCH] include stdint.h for int64_t types + +This is exposed when compiling for musl platforms where this +header is not included indirectly. + +Upstream-Status: Submitted [https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/pull/270] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Value.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Value.cpp b/src/Value.cpp +index cbda697..d6f2c9c 100644 +--- a/src/Value.cpp ++++ b/src/Value.cpp +@@ -1,4 +1,5 @@ + #include <iomanip> ++#include <cstdint> + + #include "etcd/Value.hpp" + #include "etcd/v3/KeyValue.hpp" +-- +2.45.1 + diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb index 401d53c79c..88a8ba3469 100644 --- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" SRC_URI = " \ git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ - file://0001-cmake-fix-when-cross-compiling.patch \ + file://0001-include-stdint.h-for-int64_t-types.patch \ " -SRCREV = "e31ac4d4caa55fa662e207150ba40f8151b7ad96" +SRCREV = "ba6216385fc332b23d95683966824c2b86c2474e" inherit cmake diff --git a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb index 0794158a52..24e111dea0 100644 --- a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb +++ b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb @@ -2,12 +2,12 @@ DESCRIPTION = "etcd is a distributed key-value store for distributed systems" HOMEPAGE = "https://etcd.io/" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +LIC_FILES_CHKSUM = "file://${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = " \ - git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https \ - file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=src/${GO_IMPORT} \ - file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=src/${GO_IMPORT} \ + git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ + file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=${GO_INSTALL} \ + file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=${GO_INSTALL} \ file://etcd.service \ file://etcd-existing.conf \ file://etcd-new.service \ @@ -62,11 +62,11 @@ do_install:append() { install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir} install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir} install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir} - install -m 0644 ${WORKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d + install -m 0644 ${UNPACKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/etcd.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${WORKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/ - install -m 0644 ${WORKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/etcd.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/ + install -m 0644 ${UNPACKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/ } FILES:${PN}:append = " ${sysconfdir}/etcd.d/etcd-existing.conf" diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch deleted file mode 100644 index b076a3fffd..0000000000 --- a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ced2e933cf647874da4baff002e0987b9bfe5fac Mon Sep 17 00:00:00 2001 -From: Markus Volk <f_l_k@t-online.de> -Date: Sat, 18 Nov 2023 15:07:49 +0100 -Subject: [PATCH] meson.build: require for native wayland-scanner - -Signed-off-by: Markus Volk <f_l_k@t-online.de> - -Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5596] ---- - meson.build | 4 ++-- - 1 file changed, 1 insertions(+), 1 deletions(-) - -diff --git a/meson.build b/meson.build -index f4e5b3a3..5d2f9eba 100644 ---- a/meson.build -+++ b/meson.build -@@ -207,7 +207,7 @@ gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc')) - build_gtk_doc = gtkdoc_dep.found() - - wayland_client = dependency('wayland-client', required : get_option('wayland_security_context')) --wayland_scanner = dependency('wayland-scanner', version : '>= 1.15', required : get_option('wayland_security_context')) -+wayland_scanner = dependency('wayland-scanner', version : '>= 1.15', required : get_option('wayland_security_context'), native : true) - wayland_protocols = dependency('wayland-protocols', version : '>= 1.32', required : get_option('wayland_security_context')) - build_wayland_security_context = wayland_client.found() and wayland_scanner.found() and wayland_protocols.found() - --- -2.42.0 - diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch deleted file mode 100644 index 77b60ec98c..0000000000 --- a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 49737b1e4a74c77a8cd7ae727974d68503da087f Mon Sep 17 00:00:00 2001 -From: Markus Volk <f_l_k@t-online.de> -Date: Fri, 12 Jan 2024 13:52:08 +0100 -Subject: [PATCH] meson.build: require native gtkdoc - -this fixes: -| Run-time dependency gtk-doc found: NO (tried pkgconfig) -| -| ../git/meson.build:206:13: ERROR: Dependency "gtk-doc" not found, tried pkgconfig - -Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5650/commits/e5de3e46b917f830d7f81e9db6ed2a9b7d7db942] - -Signed-off-by: Markus Volk <f_l_k@t-online.de> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index f7f9372d..dccc3eb4 100644 ---- a/meson.build -+++ b/meson.build -@@ -203,7 +203,7 @@ appstream_dep = dependency('appstream', version : '>=0.12.0') - gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') - libseccomp_dep = dependency('libseccomp', required : get_option('seccomp')) - gir_dep = dependency('gobject-introspection-1.0', version : '>=1.40.0', required : get_option('gir')) --gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc')) -+gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc'), native : true) - build_gtk_doc = gtkdoc_dep.found() - - wayland_client = dependency('wayland-client', required : get_option('wayland_security_context')) --- -2.43.0 - diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb index 97e57c13d5..8351e7d655 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb @@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = " \ gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \ file://0001-flatpak-pc-add-pc_sysrootdir.patch \ - file://0001-meson.build-require-for-native-wayland-scanner.patch \ - file://0001-meson.build-require-native-gtkdoc.patch \ " -SRCREV = "27b11b93c2a80a91c9461bc6c7f5e9a201406041" +SRCREV = "925c80f913d69e7ca424428823e1431c4ffb0deb" S = "${WORKDIR}/git" @@ -40,6 +38,7 @@ RDEPENDS:${PN} = " \ ca-certificates \ dconf \ flatpak-xdg-utils \ + fuse3-utils \ " GIR_MESON_OPTION = "gir" @@ -56,6 +55,7 @@ PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4" PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" +PACKAGECONFIG[malcontent] = "-Dmalcontent=enabled,-Dmalcontent=disabled,malcontent" PACKAGECONFIG[selinux] = "-Dselinux_module=enabled,-Dselinux_module=disabled,libselinux" PACKAGECONFIG[wayland-security-context] = "-Dwayland_security_context=enabled,-Dwayland_security_context=disabled,wayland wayland-native wayland-protocols" @@ -66,6 +66,8 @@ PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \ " +EXTRA_OEMESON = "-Dsystem_fusermount=${bindir}/fusermount3" + FILES:${PN} += "${libdir} ${datadir}" USERADD_PACKAGES = "${PN}" diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch index f5a1716c07..0cabed9633 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch @@ -15,8 +15,6 @@ Upstream-Status: Pending [https://github.com/fluent/fluent-bit/issues/5492] lib/cmetrics/CMakeLists.txt | 7 +------ 3 files changed, 3 insertions(+), 17 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3dba5a8..d94b988 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,11 +46,7 @@ else() @@ -32,8 +30,6 @@ index 3dba5a8..d94b988 100644 if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l") set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic") -diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt -index bbe1f39..809ea93 100644 --- a/lib/chunkio/CMakeLists.txt +++ b/lib/chunkio/CMakeLists.txt @@ -14,12 +14,7 @@ else() @@ -50,21 +46,19 @@ index bbe1f39..809ea93 100644 include(cmake/macros.cmake) -diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt -index 60e8774..e3d6149 100644 --- a/lib/cmetrics/CMakeLists.txt +++ b/lib/cmetrics/CMakeLists.txt @@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR 3) - set(CMT_VERSION_PATCH 5) + set(CMT_VERSION_PATCH 7) set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}") --# Define __FILENAME__ consistently across Operating Systems +-# Define __CMT_FILENAME__ consistently across Operating Systems -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") -else() -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__") -endif() -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__") # Configuration options - option(CMT_DEV "Enable development mode" No) + option(CMT_DEV "Enable development mode" No) diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb index fc06095475..ef04111131 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb @@ -29,7 +29,7 @@ SRC_URI:append:libc-musl = "\ file://0001-Use-posix-strerror_r-with-musl.patch \ file://0002-chunkio-Link-with-fts-library-with-musl.patch \ " -SRC_URI[sha256sum] = "8ca2ac081d7eee717483c06608adcb5e3d5373e182ad87dba21a23f8278c6540" +SRC_URI[sha256sum] = "3f6cd4bd1894cda16b465aef6ffec7e920d54c4209b3e2320fcffe7ae345700e" S = "${WORKDIR}/fluent-bit-${PV}" DEPENDS = "zlib bison-native flex-native openssl" @@ -84,6 +84,9 @@ EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2" +# Fixes build with GCC-14 +CFLAGS += "-Wno-error=incompatible-pointer-types" + inherit cmake systemd pkgconfig SYSTEMD_SERVICE:${PN} = "td-agent-bit.service" diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb index fe5e5c067d..a293048a21 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb @@ -50,14 +50,14 @@ EXTRA_OECONF = " \ " do_compile:prepend() { - install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ + install -m 0644 ${UNPACKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ } do_install:append:class-target() { install -d ${D}${datadir}/applications/ - install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/ + install -m 0644 ${UNPACKDIR}/gnuplot.desktop ${D}${datadir}/applications/ install -d ${D}${datadir}/pixmaps/ - install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ + install -m 0644 ${UNPACKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ } PACKAGES =+ "${PN}-x11" diff --git a/meta-oe/recipes-extended/highway/highway_1.1.0.bb b/meta-oe/recipes-extended/highway/highway_1.2.0.bb index 11d9e7cddf..5d74941245 100644 --- a/meta-oe/recipes-extended/highway/highway_1.1.0.bb +++ b/meta-oe/recipes-extended/highway/highway_1.2.0.bb @@ -8,7 +8,7 @@ inherit cmake SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master" -SRCREV = "58b52a717469e62b2d9b8eaa2f5dddb44d4a4cbf" +SRCREV = "457c891775a7397bdb0376bb1031e6e027af1c48" S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release" diff --git a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb index 84ed3b052b..fb1aefad61 100644 --- a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb +++ b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb @@ -8,5 +8,5 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { - install -Dm 0644 ${WORKDIR}/inputattach.conf ${D}${sysconfdir}/inputattach.conf + install -Dm 0644 ${UNPACKDIR}/inputattach.conf ${D}${sysconfdir}/inputattach.conf } diff --git a/meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch b/meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch new file mode 100644 index 0000000000..e87972af27 --- /dev/null +++ b/meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch @@ -0,0 +1,57 @@ +From 684ebc7f8eb44558219d4b5be52add1250b3c0ca Mon Sep 17 00:00:00 2001 +From: Eric Biggers <ebiggers@google.com> +Date: Tue, 30 Apr 2024 11:27:55 -0700 +Subject: [PATCH] lib/arm: don't use explicit armv8.2-a on gcc 13.2 and later + +Resolves https://github.com/ebiggers/libdeflate/issues/369 +--- +Upstream-Status: Backport [https://github.com/ebiggers/libdeflate/pull/370] + + lib/arm/adler32_impl.h | 10 ++++++---- + lib/arm/crc32_impl.h | 10 ++++++---- + 2 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/lib/arm/adler32_impl.h b/lib/arm/adler32_impl.h +index 6453b8e..6144afb 100644 +--- a/lib/arm/adler32_impl.h ++++ b/lib/arm/adler32_impl.h +@@ -214,11 +214,13 @@ adler32_arm_neon(u32 adler, const u8 *p, size_t len) + # ifdef __clang__ + # define ATTRIBUTES _target_attribute("dotprod") + /* +- * With gcc, arch=armv8.2-a is needed for dotprod intrinsics, unless the +- * default target is armv8.3-a or later in which case it must be omitted. +- * armv8.3-a or later can be detected by checking for __ARM_FEATURE_JCVT. ++ * With gcc 13.1 and earlier (before gcc commit 73d3bc348190 or 9aac37ab8a7b, ++ * "aarch64: Remove architecture dependencies from intrinsics"), ++ * arch=armv8.2-a is needed for the dotprod intrinsics, unless the default ++ * target is armv8.3-a or later in which case it must be omitted. armv8.3-a ++ * or later can be detected by checking for __ARM_FEATURE_JCVT. + */ +-# elif defined(__ARM_FEATURE_JCVT) ++# elif GCC_PREREQ(13, 2) || defined(__ARM_FEATURE_JCVT) + # define ATTRIBUTES _target_attribute("+dotprod") + # else + # define ATTRIBUTES _target_attribute("arch=armv8.2-a+dotprod") +diff --git a/lib/arm/crc32_impl.h b/lib/arm/crc32_impl.h +index 3c4bec7..5363041 100644 +--- a/lib/arm/crc32_impl.h ++++ b/lib/arm/crc32_impl.h +@@ -551,11 +551,13 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) + # ifdef __clang__ + # define ATTRIBUTES _target_attribute("aes,crc,sha3") + /* +- * With gcc, arch=armv8.2-a is needed for the sha3 intrinsics, unless the +- * default target is armv8.3-a or later in which case it must be omitted. +- * armv8.3-a or later can be detected by checking for __ARM_FEATURE_JCVT. ++ * With gcc 13.1 and earlier (before gcc commit 73d3bc348190 or 9aac37ab8a7b, ++ * "aarch64: Remove architecture dependencies from intrinsics"), ++ * arch=armv8.2-a is needed for the sha3 intrinsics, unless the default ++ * target is armv8.3-a or later in which case it must be omitted. armv8.3-a ++ * or later can be detected by checking for __ARM_FEATURE_JCVT. + */ +-# elif defined(__ARM_FEATURE_JCVT) ++# elif GCC_PREREQ(13, 2) || defined(__ARM_FEATURE_JCVT) + # define ATTRIBUTES _target_attribute("+crypto,+crc,+sha3") + # else + # define ATTRIBUTES _target_attribute("arch=armv8.2-a+crypto+crc+sha3") diff --git a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb index f0a966f2b4..e3de8aca62 100644 --- a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb +++ b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb @@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7b6977026437092191e9da699ed9f780" DEPENDS += "gzip zlib" -SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master" +SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master \ + file://0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch \ +" S = "${WORKDIR}/git" SRCREV = "275aa5141db6eda3587214e0f1d3a134768f557d" inherit cmake pkgconfig - diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb index 5716817e95..a2a420ced8 100644 --- a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb +++ b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb @@ -50,11 +50,11 @@ do_compile() { do_install() { oe_runmake install - install -Dm 0644 ${WORKDIR}/51-these-are-not-joysticks-rm.rules ${D}${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules - install -Dm 0644 ${WORKDIR}/60-joystick.rules ${D}${nonarch_base_libdir}/udev/rules.d/60-joystick.rules + install -Dm 0644 ${UNPACKDIR}/51-these-are-not-joysticks-rm.rules ${D}${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules + install -Dm 0644 ${UNPACKDIR}/60-joystick.rules ${D}${nonarch_base_libdir}/udev/rules.d/60-joystick.rules - install -Dm 0644 ${WORKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service - install -Dm 0755 ${WORKDIR}/inputattachctl ${D}${bindir}/inputattachctl + install -Dm 0644 ${UNPACKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service + install -Dm 0755 ${UNPACKDIR}/inputattachctl ${D}${bindir}/inputattachctl } PACKAGES += "inputattach joystick-jscal joystick" diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch new file mode 100644 index 0000000000..a09a17bf2c --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch @@ -0,0 +1,37 @@ +From cd2b5362fe2e63dff3666ce72da27979fe06a519 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 28 May 2024 22:24:52 -0700 +Subject: [PATCH] libminifi: Rename mutex_ to mtx_ member of ConcurrentQueue + +Fixes +libminifi/include/utils/MinifiConcurrentQueue.h:48:75: error: no member named 'mutex_' in 'ConcurrentQueue<T>'; did you mean 'mtx_'? +| 48 | : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mutex_)) {} +| | ^~~~~~ +| | mtx_ +| libminifi/include/utils/MinifiConcurrentQueue.h:140:22: note: 'mtx_' declared here +| 140 | mutable std::mutex mtx_; +| | ^ +| 1 error generated. + +Upstream-Status: Submitted [https://github.com/apache/nifi-minifi-cpp/pull/1803] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libminifi/include/utils/MinifiConcurrentQueue.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libminifi/include/utils/MinifiConcurrentQueue.h b/libminifi/include/utils/MinifiConcurrentQueue.h +index 8abc0ec93..1db58080b 100644 +--- a/libminifi/include/utils/MinifiConcurrentQueue.h ++++ b/libminifi/include/utils/MinifiConcurrentQueue.h +@@ -45,7 +45,7 @@ class ConcurrentQueue { + ConcurrentQueue(const ConcurrentQueue& other) = delete; + ConcurrentQueue& operator=(const ConcurrentQueue& other) = delete; + ConcurrentQueue(ConcurrentQueue&& other) +- : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mutex_)) {} ++ : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mtx_)) {} + + ConcurrentQueue& operator=(ConcurrentQueue&& other) { + if (this != &other) { +-- +2.45.1 + diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb index beb247c254..fca8d9e754 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=mai file://0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch \ file://0007-CMakeLists.txt-do-not-use-ccache.patch \ file://0008-libsodium-aarch64_crypto.patch \ + file://0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ " @@ -47,7 +48,7 @@ SRCREV_FORMAT .= "_expected-lite_range-v3_magic-enum_cxxopts_gsl-lite_date_asio_ SRC_URI[ossp-uuid.sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" SRC_URI[libsodium.sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea" -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/git" inherit pkgconfig cmake systemd @@ -55,6 +56,8 @@ DEPENDS = "virtual/crypt bison-native flex-native flex openssl curl zlib xz bzip OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" +LDFLAGS:append:riscv32 = " -latomic" + EXTRA_OECMAKE = " \ -DCMAKE_BUILD_TYPE=Release \ -DHOST_SYS=${HOST_SYS} -DBUILD_SYS=${BUILD_SYS} \ @@ -162,7 +165,7 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -m 755 -d ${D}${sysconfdir}/tmpfiles.d - install -m 644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/minifi.conf + install -m 644 ${UNPACKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/minifi.conf sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/tmpfiles.d/minifi.conf install -m 755 -d ${D}${systemd_system_unitdir} @@ -174,7 +177,7 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi + install -m 0644 ${UNPACKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/default/volatiles/99_minifi fi diff --git a/meta-oe/recipes-extended/nana/nana_git.bb b/meta-oe/recipes-extended/nana/nana_git.bb index 7c748bc49b..d292bb8827 100644 --- a/meta-oe/recipes-extended/nana/nana_git.bb +++ b/meta-oe/recipes-extended/nana/nana_git.bb @@ -42,3 +42,9 @@ do_configure:prepend:class-nativesdk() { } BBCLASSEXTEND = "native nativesdk" + +do_install:append() { + sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana-c++lg + sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana-clg + sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana +} diff --git a/meta-oe/recipes-extended/networking/mstpd_git.bb b/meta-oe/recipes-extended/networking/mstpd_git.bb index b2043ef062..e6e1f9a3b2 100644 --- a/meta-oe/recipes-extended/networking/mstpd_git.bb +++ b/meta-oe/recipes-extended/networking/mstpd_git.bb @@ -26,8 +26,8 @@ do_install:append() { rmdir ${D}${libdir} || true install -d -m 0755 ${D}${sbindir} - install -m 0755 ${WORKDIR}/bridge-stp ${D}${sbindir} + install -m 0755 ${UNPACKDIR}/bridge-stp ${D}${sbindir} install -d -m 0755 ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/mstpd.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/mstpd.service ${D}${systemd_system_unitdir} } diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb index 1c68b5f432..5437ea13e8 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb @@ -57,7 +57,7 @@ do_install:append() { chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/openwsmand.service sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/openwsmand.service diff --git a/meta-oe/recipes-extended/ostree/ostree_2024.5.bb b/meta-oe/recipes-extended/ostree/ostree_2024.6.bb index 2ea92f190c..7f30dbfc5a 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2024.5.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2024.6.bb @@ -22,13 +22,13 @@ GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ file://run-ptest \ " -SRC_URI[sha256sum] = "bc12d8493db64152093ee5be77cf62a29cc67a4a9e430dc987103e78aada4a6f" +SRC_URI[sha256sum] = "8b61c856697aa412f2f1724322ada40bdd7b1bf9e7783e2c594faa7a594f868f" S = "${WORKDIR}/libostree-${PV}" inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd -UNKNOWN_CONFIGURE_OPT_IGNORE = "--disable-introspection --enable-introspection" +UNKNOWN_CONFIGURE_OPT_IGNORE += "--disable-introspection --enable-introspection" # Workaround compile failure: # |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] @@ -69,6 +69,7 @@ PACKAGECONFIG:class-nativesdk ??= " \ PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" +PACKAGECONFIG[composefs] = "--with-composefs, --without-composefs, composefs" PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" PACKAGECONFIG[ed25519-libsodium] = "--with-ed25519-libsodium, --without-ed25519-libsodium, libsodium" diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index b5bcc63339..e9508b6d4b 100644 --- a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -53,3 +53,16 @@ do_compile () { # FILES:${PN} += "${base_libdir}/security/pam*" FILES:${PN}-dbg += "${base_libdir}/security/.debug" + +# This one is reproducible only on 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766965/ +# ssh-rsa.c:59:24: error: passing argument 1 of 'EVP_DigestInit' from incompatible pointer type [-Wincompatible-pointer-types] +# ssh-rsa.c:60:26: error: passing argument 1 of 'EVP_DigestUpdate' from incompatible pointer type [-Wincompatible-pointer-types] +# ssh-rsa.c:61:25: error: passing argument 1 of 'EVP_DigestFinal' from incompatible pointer type [-Wincompatible-pointer-types] +# ssh-ecdsa.c:76:18: error: passing argument 1 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] +# ssh-ecdsa.c:76:23: error: passing argument 2 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] +# ssh-ecdsa.c:76:27: error: passing argument 3 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] +# ssh-ecdsa.c:148:18: error: passing argument 1 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] +# ssh-ecdsa.c:148:23: error: passing argument 2 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] +# ssh-ecdsa.c:148:27: error: passing argument 3 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-extended/pmdk/pmdk_2.0.0.bb b/meta-oe/recipes-extended/pmdk/pmdk_2.1.0.bb index aeda236901..100ff4200c 100644 --- a/meta-oe/recipes-extended/pmdk/pmdk_2.0.0.bb +++ b/meta-oe/recipes-extended/pmdk/pmdk_2.1.0.bb @@ -12,7 +12,7 @@ DEPENDS:append:libc-musl = " fts" S = "${WORKDIR}/git" SRC_URI = "git://github.com/pmem/pmdk.git;branch=master;protocol=https" -SRCREV = "ba92d6b469d52d16f26279bebaf317bbdbb3822c" +SRCREV = "5705fdffa755d00b4dbb4d6c30eb49671436f961" inherit autotools-brokensep pkgconfig diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb index 8a14018a82..2159482ebb 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb @@ -7,7 +7,7 @@ require polkit-group-rule.inc SRC_URI = "file://50-org.freedesktop.timedate1.rules" do_install() { - install -m 0755 ${WORKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d + install -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d } USERADD_PACKAGES = "${PN}" diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb index 8266fa6396..bfd3361dfe 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb @@ -7,7 +7,7 @@ require polkit-group-rule.inc SRC_URI = "file://50-org.freedesktop.NetworkManager.rules" do_install() { - install -m 0755 ${WORKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d + install -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d } USERADD_PACKAGES = "${PN}" diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb index db2ed015b4..8dc8c5e255 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb @@ -10,7 +10,7 @@ SRC_URI = "file://50-org.freedesktop.udiskie.rules" RDEPENDS:${PN} += "udisks2" do_install() { - install -m 0755 ${WORKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d + install -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d } USERADD_PACKAGES = "${PN}" diff --git a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb index 7359c12544..2934312456 100644 --- a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb +++ b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb @@ -36,10 +36,10 @@ do_install() { install -m 755 rarpd.init ${D}${sysconfdir}/init.d/rarpd install -m 755 rarpd ${D}${sbindir}/rarpd install -m 644 rarpd.8 ${D}${mandir}/man8/rarpd.8 - install -m 644 ${WORKDIR}/ethers.sample ${D}${sysconfdir}/ethers + install -m 644 ${UNPACKDIR}/ethers.sample ${D}${sysconfdir}/ethers install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/rarpd.service ${D}${systemd_unitdir}/system/ } inherit systemd diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch index 01e53e3f21..01e53e3f21 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch index 93c3595261..93c3595261 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch index 6e07c25c6a..6e07c25c6a 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch index 7785acca5c..7785acca5c 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server b/meta-oe/recipes-extended/redis/redis-7.2.5/init-redis-server index c5f335f57d..c5f335f57d 100755 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/init-redis-server diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch index 20708eda1e..20708eda1e 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch index 7b601e02a9..7b601e02a9 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf b/meta-oe/recipes-extended/redis/redis-7.2.5/redis.conf index 75037d6dc8..75037d6dc8 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/redis.conf diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.service b/meta-oe/recipes-extended/redis/redis-7.2.5/redis.service index b7791d0df4..b7791d0df4 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.service +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/redis.service diff --git a/meta-oe/recipes-extended/redis/redis_6.2.14.bb b/meta-oe/recipes-extended/redis/redis_6.2.14.bb index fa430ce402..2433abba55 100644 --- a/meta-oe/recipes-extended/redis/redis_6.2.14.bb +++ b/meta-oe/recipes-extended/redis/redis_6.2.14.bb @@ -43,14 +43,14 @@ do_install() { export PREFIX=${D}/${prefix} oe_runmake install install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -m 0644 ${UNPACKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -m 0755 ${UNPACKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server install -d ${D}/var/lib/redis/ chown redis.redis ${D}/var/lib/redis/ install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/redis.service ${D}${systemd_system_unitdir} sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service if [ "${REDIS_ON_SYSTEMD}" = true ]; then diff --git a/meta-oe/recipes-extended/redis/redis_7.2.4.bb b/meta-oe/recipes-extended/redis/redis_7.2.5.bb index 5d64e9ba78..bfb46240a7 100644 --- a/meta-oe/recipes-extended/redis/redis_7.2.4.bb +++ b/meta-oe/recipes-extended/redis/redis_7.2.5.bb @@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE-7.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59" +SRC_URI[sha256sum] = "5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d" inherit autotools-brokensep pkgconfig update-rc.d systemd useradd @@ -46,14 +46,14 @@ do_install() { export PREFIX=${D}/${prefix} oe_runmake install install -d ${D}/${sysconfdir}/redis - install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf + install -m 0644 ${UNPACKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server + install -m 0755 ${UNPACKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server install -d ${D}/var/lib/redis/ chown redis.redis ${D}/var/lib/redis/ install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/redis.service ${D}${systemd_system_unitdir} sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch new file mode 100644 index 0000000000..7f54a3723d --- /dev/null +++ b/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch @@ -0,0 +1,1583 @@ +From b76e3c578f1e9f582e9c28f50d82b1f569602075 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20Such=C3=A1nek?= <hramrach@gmail.com> +Date: Fri, 5 Jan 2024 15:31:48 +0100 +Subject: [PATCH] Constify argv, fix warnings. (#1242) + +* Fix perl warnings + + - cast POPs to void to avoid unused value warning + - declare functions that don't set RETVAL as returning void + +Signed-off-by: Michal Suchanek <msuchanek@suse.de> + +* Constify argv + +rrd has no business modifying the string pointed to by passed agrv, and +as far as gcc can see it does indeed not modify them because it compiles +with const argv. + +This fixes warnings when passing const strings into rrd, and avoids the +need to duplicate all strings in the tcl bindings. + +This fixes warnings like these: +[ 3s] prog/sensord/rrd.c: In function 'rrdInit': +[ 3s] prog/sensord/rrd.c:302:40: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual] +[ 3s] 302 | ret = rrd_create(argc, (char**) argv); +[ 3s] | ^ +[ 3s] prog/sensord/rrd.c: In function 'rrdUpdate': +[ 3s] prog/sensord/rrd.c:458:42: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual] +[ 3s] 458 | if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) { +[ 3s] | ^ + +Signed-off-by: Michal Suchanek <msuchanek@suse.de> + +* tcl: Do not duplicate const strings + +--------- + +Signed-off-by: Michal Suchanek <msuchanek@suse.de> +Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/b76e3c578f1e9f582e9c28f50d82b1f569602075] +--- + CHANGES | 3 ++ + bindings/lua/rrdlua.c | 25 +++++----- + bindings/perl-shared/RRDs.xs | 36 +++++++------- + bindings/python/rrdtoolmodule.c | 38 +++++++-------- + bindings/ruby/main.c | 10 ++-- + bindings/tcl/tclrrd.c | 84 ++++++++------------------------- + src/optparse.c | 14 +++--- + src/optparse.h | 6 +-- + src/rrd.h | 38 +++++++-------- + src/rrd_cgi.c | 24 +++++----- + src/rrd_create.c | 2 +- + src/rrd_daemon.c | 12 ++--- + src/rrd_dump.c | 4 +- + src/rrd_fetch.c | 2 +- + src/rrd_first.c | 2 +- + src/rrd_flushcached.c | 2 +- + src/rrd_graph.c | 6 +-- + src/rrd_graph.h | 4 +- + src/rrd_graph_helper.c | 2 +- + src/rrd_info.c | 2 +- + src/rrd_last.c | 2 +- + src/rrd_lastupdate.c | 2 +- + src/rrd_list.c | 6 +-- + src/rrd_modify.c | 2 +- + src/rrd_modify.h | 2 +- + src/rrd_resize.c | 4 +- + src/rrd_restore.c | 2 +- + src/rrd_tool.c | 26 +++++----- + src/rrd_tune.c | 2 +- + src/rrd_update.c | 4 +- + src/rrd_xport.c | 2 +- + src/rrdupdate.c | 7 +-- + 32 files changed, 168 insertions(+), 209 deletions(-) + +diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c +index d1a700641..2095c3b5b 100644 +--- a/bindings/lua/rrdlua.c ++++ b/bindings/lua/rrdlua.c +@@ -37,8 +37,8 @@ + extern void rrd_freemem(void *mem); + + extern int luaopen_rrd (lua_State * L); +-typedef int (*RRD_FUNCTION)(int, char **); +-typedef rrd_info_t *(RRD_FUNCTION_V)(int, char **); ++typedef int (*RRD_FUNCTION)(int, const char **); ++typedef rrd_info_t *(RRD_FUNCTION_V)(int, const char **); + + /**********************************************************/ + +@@ -49,9 +49,9 @@ static void reset_rrd_state(void) + rrd_clear_error(); + } + +-static char **make_argv(const char *cmd, lua_State * L) ++static const char **make_argv(const char *cmd, lua_State * L) + { +- char **argv; ++ const char **argv; + int i; + int argc = lua_gettop(L) + 1; + +@@ -60,13 +60,12 @@ static char **make_argv(const char *cmd, lua_State * L) + luaL_error(L, "Can't allocate memory for arguments array", cmd); + + /* fprintf(stderr, "Args:\n"); */ +- argv[0] = (char *) cmd; /* Dummy arg. Cast to (char *) because rrd */ +- /* functions don't expect (const * char) */ ++ argv[0] = cmd; + /* fprintf(stderr, "%s\n", argv[0]); */ + for (i=1; i<argc; i++) { + /* accepts string or number */ + if (lua_isstring(L, i) || lua_isnumber(L, i)) { +- if (!(argv[i] = (char *) lua_tostring (L, i))) { ++ if (!(argv[i] = lua_tostring (L, i))) { + /* raise an error and never return */ + luaL_error(L, "%s - error duplicating string area for arg #%d", + cmd, i); +@@ -84,7 +83,7 @@ static char **make_argv(const char *cmd, lua_State * L) + static int + rrd_common_call (lua_State *L, const char *cmd, RRD_FUNCTION rrd_function) + { +- char **argv; ++ const char **argv; + int argc = lua_gettop(L) + 1; + + argv = make_argv(cmd, L); +@@ -99,7 +98,7 @@ rrd_common_call (lua_State *L, const char *cmd, RRD_FUNCTION rrd_function) + static int + lua_rrd_infocall(lua_State *L, const char *cmd, RRD_FUNCTION_V rrd_function) + { +- char **argv; ++ const char **argv; + rrd_info_t *p, *data; + int argc = lua_gettop(L) + 1; + +@@ -197,7 +196,7 @@ static int + lua_rrd_fetch (lua_State * L) + { + int argc = lua_gettop(L) + 1; +- char **argv = make_argv("fetch", L); ++ const char **argv = make_argv("fetch", L); + unsigned long i, j, step, ds_cnt; + rrd_value_t *data, *p; + char **names; +@@ -246,7 +245,7 @@ lua_rrd_first (lua_State * L) + { + time_t first; + int argc = lua_gettop(L) + 1; +- char **argv = make_argv("first", L); ++ const char **argv = make_argv("first", L); + reset_rrd_state(); + first = rrd_first(argc, argv); + free(argv); +@@ -260,7 +259,7 @@ lua_rrd_last (lua_State * L) + { + time_t last; + int argc = lua_gettop(L) + 1; +- char **argv = make_argv("last", L); ++ const char **argv = make_argv("last", L); + reset_rrd_state(); + last = rrd_last(argc, argv); + free(argv); +@@ -275,7 +274,7 @@ static int + lua_rrd_graph (lua_State * L) + { + int argc = lua_gettop(L) + 1; +- char **argv = make_argv("last", L); ++ const char **argv = make_argv("last", L); + char **calcpr; + int i, xsize, ysize; + double ymin, ymax; +diff --git a/bindings/perl-shared/RRDs.xs b/bindings/perl-shared/RRDs.xs +index e233b5835..edce76ec4 100644 +--- a/bindings/perl-shared/RRDs.xs ++++ b/bindings/perl-shared/RRDs.xs +@@ -44,11 +44,11 @@ extern "C" { + strcpy(argv[i+1],handle); \ + } \ + rrd_clear_error();\ +- RETVAL=name(items+1,argv); \ ++ RETVAL = name(items + 1, (const char **)argv); \ + for (i=0; i < items; i++) {\ +- free(argv[i+1]);\ ++ free((void *)argv[i+1]);\ + } \ +- free(argv);\ ++ free((void *)argv);\ + \ + if (rrd_test_error()) XSRETURN_UNDEF; + +@@ -67,11 +67,11 @@ extern "C" { + strcpy(argv[i+1],handle); \ + } \ + rrd_clear_error(); \ +- data=name(items+1, argv); \ ++ data = name(items + 1, (const char **)argv); \ + for (i=0; i < items; i++) { \ +- free(argv[i+1]); \ ++ free((void *)argv[i+1]); \ + } \ +- free(argv); \ ++ free((void *)argv); \ + if (rrd_test_error()) XSRETURN_UNDEF; \ + hash = newHV(); \ + save=data; \ +@@ -175,7 +175,7 @@ static int rrd_fetch_cb_wrapper( + /* Check the eval first */ + if (SvTRUE(ERRSV)) { + rrd_set_error("perl callback failed: %s",SvPV_nolen(ERRSV)); +- POPs; /* there is undef on top of the stack when there is an error ++ (void)POPs; /* there is undef on top of the stack when there is an error + and call_sv was initiated with G_EVAL|G_SCALER */ + goto error_out; + } +@@ -383,7 +383,7 @@ rrd_tune(...) + + #ifdef HAVE_RRD_GRAPH + +-SV * ++void + rrd_graph(...) + PROTOTYPE: @ + PREINIT: +@@ -404,7 +404,7 @@ rrd_graph(...) + strcpy(argv[i+1],handle); + } + rrd_clear_error(); +- rrd_graph(items+1,argv,&calcpr,&xsize,&ysize,NULL,&ymin,&ymax); ++ rrd_graph(items+1,(const char **)argv,&calcpr,&xsize,&ysize,NULL,&ymin,&ymax); + for (i=0; i < items; i++) { + free(argv[i+1]); + } +@@ -433,7 +433,7 @@ rrd_graph(...) + + #endif /* HAVE_RRD_GRAPH */ + +-SV * ++void + rrd_fetch(...) + PROTOTYPE: @ + PREINIT: +@@ -455,7 +455,7 @@ rrd_fetch(...) + strcpy(argv[i+1],handle); + } + rrd_clear_error(); +- rrd_fetch(items+1,argv,&start,&end,&step,&ds_cnt,&ds_namv,&data); ++ rrd_fetch(items+1,(const char **)argv,&start,&end,&step,&ds_cnt,&ds_namv,&data); + for (i=0; i < items; i++) { + free(argv[i+1]); + } +@@ -486,7 +486,7 @@ rrd_fetch(...) + PUSHs(sv_2mortal(newRV_noinc((SV*)names))); + PUSHs(sv_2mortal(newRV_noinc((SV*)retar))); + +-SV * ++void + rrd_fetch_cb_register(cb) + SV * cb + CODE: +@@ -496,7 +496,7 @@ rrd_fetch_cb_register(cb) + SvSetSV(rrd_fetch_cb_svptr,cb); + rrd_fetch_cb_register(rrd_fetch_cb_wrapper); + +-SV * ++void + rrd_times(start, end) + char *start + char *end +@@ -521,7 +521,7 @@ rrd_times(start, end) + PUSHs(sv_2mortal(newSVuv(start_tmp))); + PUSHs(sv_2mortal(newSVuv(end_tmp))); + +-int ++void + rrd_xport(...) + PROTOTYPE: @ + PREINIT: +@@ -543,7 +543,7 @@ rrd_xport(...) + strcpy(argv[i+1],handle); + } + rrd_clear_error(); +- rrd_xport(items+1,argv,&xsize,&start,&end,&step,&col_cnt,&legend_v,&data); ++ rrd_xport(items+1,(const char **)argv,&xsize,&start,&end,&step,&col_cnt,&legend_v,&data); + for (i=0; i < items; i++) { + free(argv[i+1]); + } +@@ -657,7 +657,7 @@ rrd_flushcached(...) + OUTPUT: + RETVAL + +-SV* ++void + rrd_list(...) + PROTOTYPE: @ + PREINIT: +@@ -667,7 +667,7 @@ rrd_list(...) + char **argv; + AV *list; + PPCODE: +- argv = (char **) malloc((items+1)*sizeof(char *)); ++ argv = malloc((items+1)*sizeof(char *)); + argv[0] = "dummy"; + + for (i = 0; i < items; i++) { +@@ -681,7 +681,7 @@ rrd_list(...) + + rrd_clear_error(); + +- data = rrd_list(items+1, argv); ++ data = rrd_list(items+1, (const char **)argv); + + for (i=0; i < items; i++) { + free(argv[i+1]); +diff --git a/bindings/python/rrdtoolmodule.c b/bindings/python/rrdtoolmodule.c +index 1ab463584..f255e65bc 100644 +--- a/bindings/python/rrdtoolmodule.c ++++ b/bindings/python/rrdtoolmodule.c +@@ -123,7 +123,7 @@ PyRRD_String_FromCF(enum cf_en cf) + * @return Zero if the function succeeds, otherwise -1 + */ + static int +-convert_args(char *command, PyObject *args, char ***rrdtool_argv, int *rrdtool_argc) ++convert_args(char *command, PyObject *args, const char ***rrdtool_argv, int *rrdtool_argc) + { + PyObject *o, *lo; + int i, j, args_count, argv_count, element_count; +@@ -145,7 +145,7 @@ convert_args(char *command, PyObject *args, char ***rrdtool_argv, int *rrdtool_a + } + } + +- *rrdtool_argv = PyMem_New(char *, element_count + 1); ++ *rrdtool_argv = PyMem_New(const char *, element_count + 1); + + if (*rrdtool_argv == NULL) + return -1; +@@ -186,7 +186,7 @@ convert_args(char *command, PyObject *args, char ***rrdtool_argv, int *rrdtool_a + * Destroy argument vector. + */ + static void +-destroy_args(char ***rrdtool_argv) ++destroy_args(const char ***rrdtool_argv) + { + PyMem_Del(*rrdtool_argv); + *rrdtool_argv = NULL; +@@ -267,7 +267,7 @@ static char _rrdtool_create__doc__[] = "Create a new Round Robin Database.\n\n\ + static PyObject * + _rrdtool_create(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + int status; +@@ -306,7 +306,7 @@ static char _rrdtool_dump__doc__[] = "Dump an RRD to XML.\n\n\ + static PyObject * + _rrdtool_dump(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + int status; +@@ -345,7 +345,7 @@ static char _rrdtool_update__doc__[] = "Store a new set of values into\ + static PyObject * + _rrdtool_update(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + int status; +@@ -378,7 +378,7 @@ static char _rrdtool_updatev__doc__[] = "Store a new set of values into "\ + static PyObject * + _rrdtool_updatev(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + rrd_info_t *data; +@@ -419,7 +419,7 @@ static char _rrdtool_fetch__doc__[] = "Fetch data from an RRD.\n\n\ + static PyObject * + _rrdtool_fetch(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret, *range_tup, *dsnam_tup, *data_list, *t; + rrd_value_t *data, *datai, dv; +@@ -497,7 +497,7 @@ static char _rrdtool_flushcached__doc__[] = "Flush RRD files from memory.\n\n\ + static PyObject * + _rrdtool_flushcached(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + int status; +@@ -592,7 +592,7 @@ static char _rrdtool_graph__doc__[] = "Create a graph based on one or more " \ + static PyObject * + _rrdtool_graph(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + int xsize, ysize, i, status; +@@ -650,7 +650,7 @@ static char _rrdtool_graphv__doc__[] = "Create a graph based on one or more " \ + static PyObject * + _rrdtool_graphv(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + rrd_info_t *data; +@@ -695,7 +695,7 @@ static char _rrdtool_xport__doc__[] = "Dictionary representation of data " \ + static PyObject * + _rrdtool_xport(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + int xsize, status; +@@ -793,7 +793,7 @@ static char _rrdtool_list__doc__[] = "List RRDs in storage.\n\n" \ + static PyObject * + _rrdtool_list(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret, *str; + char *data, *ptr, *end; +@@ -855,7 +855,7 @@ static char _rrdtool_tune__doc__[] = "Modify some basic properties of a " \ + static PyObject * + _rrdtool_tune(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + int status; +@@ -893,7 +893,7 @@ static char _rrdtool_first__doc__[] = "Get the first UNIX timestamp of the "\ + static PyObject * + _rrdtool_first(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + int ts; +@@ -928,7 +928,7 @@ static char _rrdtool_last__doc__[] = "Get the UNIX timestamp of the most "\ + static PyObject * + _rrdtool_last(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + int ts; +@@ -965,7 +965,7 @@ static char _rrdtool_resize__doc__[] = "Modify the number of rows in a "\ + static PyObject * + _rrdtool_resize(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + int status; +@@ -1003,7 +1003,7 @@ static char _rrdtool_info__doc__[] = "Extract header information from an "\ + static PyObject * + _rrdtool_info(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret; + rrd_info_t *data; +@@ -1040,7 +1040,7 @@ static char _rrdtool_lastupdate__doc__[] = "Returns datetime and value stored "\ + static PyObject * + _rrdtool_lastupdate(PyObject *Py_UNUSED(self), PyObject *args) + { +- char **rrdtool_argv = NULL; ++ const char **rrdtool_argv = NULL; + int rrdtool_argc = 0; + PyObject *ret, *ds_dict, *lastupd; + int status; +diff --git a/bindings/ruby/main.c b/bindings/ruby/main.c +index e4cc6443d..a036b7fb8 100644 +--- a/bindings/ruby/main.c ++++ b/bindings/ruby/main.c +@@ -9,7 +9,7 @@ + + typedef struct string_arr_t { + int len; +- char **strings; ++ const char **strings; + } string_arr; + + VALUE mRRD; +@@ -18,12 +18,12 @@ VALUE rb_eRRDError; + typedef int ( + *RRDFUNC) ( + int argc, +- char **argv); ++ const char **argv); + + typedef rrd_info_t *( + *RRDINFOFUNC) ( + int argc, +- char **argv); ++ const char **argv); + + #define RRD_CHECK_ERROR \ + if (rrd_test_error()) \ +@@ -72,10 +72,10 @@ void string_arr_delete( + + /* skip dummy first entry */ + for (i = 1; i < a.len; i++) { +- free(a.strings[i]); ++ free((void *)a.strings[i]); + } + +- free(a.strings); ++ free((void *)a.strings); + } + + void reset_rrd_state( +diff --git a/bindings/tcl/tclrrd.c b/bindings/tcl/tclrrd.c +index 2927d9251..58a4cef68 100644 +--- a/bindings/tcl/tclrrd.c ++++ b/bindings/tcl/tclrrd.c +@@ -22,6 +22,7 @@ + #include <stdlib.h> + #include "../../src/rrd_tool.h" + #include "../../src/rrd_format.h" ++#include "../../src/unused.h" + + /* support pre-8.4 tcl */ + +@@ -41,47 +42,39 @@ extern int Tclrrd_SafeInit( + * Hence, we need to do some preparation before + * calling the rrd library functions. + */ +-static char **getopt_init( ++static const char **getopt_init( + int argc, + CONST84 char *argv[]) + { +- char **argv2; ++ const char **argv2; + int i; + + argv2 = calloc(argc, sizeof(char *)); + for (i = 0; i < argc; i++) { +- argv2[i] = strdup(argv[i]); ++ argv2[i] = argv[i]; + } + return argv2; + } + + static void getopt_cleanup( +- int argc, +- char **argv2) ++ int UNUSED(argc), ++ const char **argv2) + { +- int i; +- +- for (i = 0; i < argc; i++) { +- if (argv2[i] != NULL) { +- free(argv2[i]); +- } +- } +- free(argv2); ++ free((void *)argv2); + } + + static void getopt_free_element( +- char *argv2[], ++ const char *argv2[], + int argn) + { + if (argv2[argn] != NULL) { +- free(argv2[argn]); + argv2[argn] = NULL; + } + } + + static void getopt_squieeze( + int *argc, +- char *argv2[]) ++ const char *argv2[]) + { + int i, null_i = 0, argc_tmp = *argc; + +@@ -104,7 +97,7 @@ static int Rrd_Create( + CONST84 char *argv[]) + { + int argv_i; +- char **argv2; ++ const char **argv2; + char *parsetime_error = NULL; + time_t last_up = time(NULL) - 10; + long int long_tmp; +@@ -295,7 +288,7 @@ static int Rrd_Flushcached( + return TCL_ERROR; + } + +- rrd_flushcached(argc, (char**)argv); ++ rrd_flushcached(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -380,7 +373,7 @@ static int Rrd_Update( + CONST84 char *argv[]) + { + int argv_i; +- char **argv2, *template = NULL; ++ const char **argv2, *template = NULL; + + argv2 = getopt_init(argc, argv); + +@@ -391,16 +384,10 @@ static int Rrd_Update( + Tcl_AppendResult(interp, "RRD Error: option '", + argv2[argv_i - 1], "' needs an argument", + (char *) NULL); +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + return TCL_ERROR; + } +- if (template != NULL) { +- free(template); +- } +- template = strdup(argv2[argv_i]); ++ template = argv2[argv_i]; + getopt_free_element(argv2, argv_i - 1); + getopt_free_element(argv2, argv_i); + } else if (!strcmp(argv2[argv_i], "--")) { +@@ -409,9 +396,6 @@ static int Rrd_Update( + } else if (argv2[argv_i][0] == '-') { + Tcl_AppendResult(interp, "RRD Error: unknown option '", + argv2[argv_i], "'", (char *) NULL); +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + return TCL_ERROR; + } +@@ -422,18 +406,12 @@ static int Rrd_Update( + if (argc < 2) { + Tcl_AppendResult(interp, "RRD Error: needs rrd filename", + (char *) NULL); +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + return TCL_ERROR; + } + + rrd_update_r(argv2[1], template, argc - 2, (const char **)argv2 + 2); + +- if (template != NULL) { +- free(template); +- } + getopt_cleanup(argc, argv2); + + if (rrd_test_error()) { +@@ -454,7 +432,6 @@ static int Rrd_Info( + { + int status = TCL_OK; + rrd_info_t *data; +- char **argv2; + + /* TODO: support for rrdcached */ + if (argc != 2) { +@@ -463,9 +440,7 @@ static int Rrd_Info( + return TCL_ERROR; + } + +- argv2 = getopt_init(argc, argv); +- +- data = rrd_info_r(argv2[1]); ++ data = rrd_info_r(argv[1]); + + if (data) { + Tcl_SetObjResult(interp, convert_info(data)); +@@ -477,7 +452,6 @@ static int Rrd_Info( + status = TCL_ERROR; + } + +- getopt_cleanup(argc, argv2); + return status; + } + +@@ -488,7 +462,6 @@ static int Rrd_Lastupdate( + CONST84 char *argv[]) + { + time_t last_update; +- char **argv2; + char **ds_namv; + char **last_ds; + char s[30]; +@@ -502,8 +475,7 @@ static int Rrd_Lastupdate( + return TCL_ERROR; + } + +- argv2 = getopt_init(argc, argv); +- if (rrd_lastupdate_r(argv2[1], &last_update, ++ if (rrd_lastupdate_r(argv[1], &last_update, + &ds_cnt, &ds_namv, &last_ds) == 0) { + listPtr = Tcl_GetObjResult(interp); + for (i = 0; i < ds_cnt; i++) { +@@ -527,7 +499,6 @@ static int Rrd_Lastupdate( + free(ds_namv); + } + } +- getopt_cleanup(argc, argv2); + return TCL_OK; + } + +@@ -543,10 +514,8 @@ static int Rrd_Fetch( + char **ds_namv; + Tcl_Obj *listPtr; + char s[30]; +- char **argv2; + +- argv2 = getopt_init(argc, argv); +- if (rrd_fetch(argc, argv2, &start, &end, &step, ++ if (rrd_fetch(argc, argv, &start, &end, &step, + &ds_cnt, &ds_namv, &data) != -1) { + datai = data; + listPtr = Tcl_GetObjResult(interp); +@@ -562,7 +531,6 @@ static int Rrd_Fetch( + free(ds_namv); + free(data); + } +- getopt_cleanup(argc, argv2); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -590,7 +558,7 @@ static int Rrd_Graph( + int rc, xsize, ysize; + double ymin, ymax; + char dimensions[50]; +- char **argv2; ++ const char **argv2; + CONST84 char *save; + + /* +@@ -692,11 +660,7 @@ static int Rrd_Tune( + int argc, + CONST84 char *argv[]) + { +- char **argv2; +- +- argv2 = getopt_init(argc, argv); +- rrd_tune(argc, argv2); +- getopt_cleanup(argc, argv2); ++ rrd_tune(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -716,11 +680,7 @@ static int Rrd_Resize( + int argc, + CONST84 char *argv[]) + { +- char **argv2; +- +- argv2 = getopt_init(argc, argv); +- rrd_resize(argc, argv2); +- getopt_cleanup(argc, argv2); ++ rrd_resize(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +@@ -740,11 +700,7 @@ static int Rrd_Restore( + int argc, + CONST84 char *argv[]) + { +- char **argv2; +- +- argv2 = getopt_init(argc, argv); +- rrd_restore(argc, argv2); +- getopt_cleanup(argc, argv2); ++ rrd_restore(argc, argv); + + if (rrd_test_error()) { + Tcl_AppendResult(interp, "RRD Error: ", +diff --git a/src/optparse.c b/src/optparse.c +index 9040ba8b2..79a3efe11 100644 +--- a/src/optparse.c ++++ b/src/optparse.c +@@ -10,7 +10,7 @@ + #define options_argv(i) \ + ((i) < options->argc ? options->argv[i] : NULL) + +-void optparse_init(struct optparse *options, int argc, char **argv) ++void optparse_init(struct optparse *options, int argc, const char **argv) + { + options->argv = argv; + options->argc = argc; +@@ -42,7 +42,7 @@ is_longopt(const char *arg) + static void + permute(struct optparse *options, int index) + { +- char *nonoption = options->argv[index]; ++ const char *nonoption = options->argv[index]; + for (int i = index; i < options->optind - 1; i++) + options->argv[i] = options->argv[i + 1]; + options->argv[options->optind - 1] = nonoption; +@@ -67,7 +67,7 @@ int optparse(struct optparse *options, const char *optstring) + options->errmsg[0] = '\0'; + options->optopt = 0; + options->optarg = NULL; +- char *option = options_argv(options->optind); ++ const char *option = options_argv(options->optind); + if (option == NULL) { + return -1; + } else if (is_dashdash(option)) { +@@ -88,7 +88,7 @@ int optparse(struct optparse *options, const char *optstring) + option += options->subopt + 1; + options->optopt = option[0]; + int type = argtype(optstring, option[0]); +- char *next = options_argv(options->optind + 1); ++ const char *next = options_argv(options->optind + 1); + switch (type) { + case -1: + opterror(options, "invalid option -- '%c'", option[0]); +@@ -128,10 +128,10 @@ int optparse(struct optparse *options, const char *optstring) + return 0; + } + +-char *optparse_arg(struct optparse *options) ++const char *optparse_arg(struct optparse *options) + { + options->subopt = 0; +- char *option = options->argv[options->optind]; ++ const char *option = options->argv[options->optind]; + if (option != NULL) + options->optind++; + return option; +@@ -222,7 +222,7 @@ optparse_long(struct optparse *options, + int *longindex) + { + // printf("%i < %i\n",options->optind,options->argc); +- char *option = options_argv(options->optind); ++ const char *option = options_argv(options->optind); + if (option == NULL) { + return -1; + } else if (is_dashdash(option)) { +diff --git a/src/optparse.h b/src/optparse.h +index c4b0ec19c..7a0bb3885 100644 +--- a/src/optparse.h ++++ b/src/optparse.h +@@ -44,7 +44,7 @@ + */ + + struct optparse { +- char **argv; ++ const char **argv; + int argc; + int permute; + int optind; +@@ -65,7 +65,7 @@ struct optparse_long { + /** + * Initializes the parser state. + */ +-void optparse_init(struct optparse *options, int argc, char **argv); ++void optparse_init(struct optparse *options, int argc, const char **argv); + + /** + * Read the next option in the argv array. +@@ -98,6 +98,6 @@ optparse_long(struct optparse *options, + * subcommand returned by optparse_arg(). This function allows you to + * ignore the value of optind. + */ +-char *optparse_arg(struct optparse *options); ++const char *optparse_arg(struct optparse *options); + + #endif +diff --git a/src/rrd.h b/src/rrd.h +index 184887ccc..b40f9a449 100644 +--- a/src/rrd.h ++++ b/src/rrd.h +@@ -155,10 +155,10 @@ extern "C" { + /* main function blocks */ + int rrd_create( + int, +- char **); ++ const char **); + rrd_info_t *rrd_info( + int, +- char **); ++ const char **); + rrd_info_t *rrd_info_push( + rrd_info_t *, + char *, +@@ -170,19 +170,19 @@ extern "C" { + rrd_info_t *); + char *rrd_list( + int, +- char **); ++ const char **); + char *rrd_list_r( + int, +- char *dirname); ++ const char *dirname); + int rrd_update( + int, +- char **); ++ const char **); + rrd_info_t *rrd_update_v( + int, +- char **); ++ const char **); + int rrd_graph( + int, +- char **, ++ const char **, + char ***, + int *, + int *, +@@ -191,11 +191,11 @@ extern "C" { + double *); + rrd_info_t *rrd_graph_v( + int, +- char **); ++ const char **); + + int rrd_fetch( + int, +- char **, ++ const char **, + time_t *, + time_t *, + unsigned long *, +@@ -204,32 +204,32 @@ extern "C" { + rrd_value_t **); + int rrd_restore( + int, +- char **); ++ const char **); + int rrd_dump( + int, +- char **); ++ const char **); + int rrd_tune( + int, +- char **); ++ const char **); + time_t rrd_last( + int, +- char **); ++ const char **); + int rrd_lastupdate( + int argc, +- char **argv); ++ const char **argv); + time_t rrd_first( + int, +- char **); ++ const char **); + int rrd_resize( + int, +- char **); ++ const char **); + char *rrd_strversion( + void); + double rrd_version( + void); + int rrd_xport( + int, +- char **, ++ const char **, + int *, + time_t *, + time_t *, +@@ -239,7 +239,7 @@ extern "C" { + rrd_value_t **); + int rrd_flushcached( + int argc, +- char **argv); ++ const char **argv); + + void rrd_freemem( + void *mem); +@@ -323,7 +323,7 @@ extern "C" { + const char **argv); + int rrd_dump_opt_r( + const char *filename, +- char *outname, ++ const char *outname, + int opt_noheader); + int rrd_dump_r( + const char *filename, +diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c +index b82c310db..14a4f511a 100644 +--- a/src/rrd_cgi.c ++++ b/src/rrd_cgi.c +@@ -102,7 +102,7 @@ static char *rrdstrip( + static char *scanargs( + char *line, + int *argc, +- char ***args); ++ const char ***args); + + /* format at-time specified times using strftime */ + static char *printstrftime( +@@ -317,7 +317,7 @@ static const char *putvar( + } + + /* expand those RRD:* directives that can be used recursively */ +-static char *rrd_expand_vars( ++static const char *rrd_expand_vars( + char *buffer) + { + int i; +@@ -434,7 +434,7 @@ static int readfile( + + int main( + int argc, +- char *argv[]) ++ const char *argv[]) + { + char *buffer; + long i; +@@ -926,7 +926,7 @@ static char *drawgraph( + } + calfree(); + if (rrd_graph +- (argc + 1, (char **) args - 1, &calcpr, &xsize, &ysize, NULL, &ymin, ++ (argc + 1, args - 1, &calcpr, &xsize, &ysize, NULL, &ymin, + &ymax) != -1) { + return stralloc(calcpr[0]); + } else { +@@ -973,7 +973,7 @@ static char *printtimelast( + /* not raising argc in step with args - 1 since the last argument + will be used below for strftime */ + +- last = rrd_last(argc, (char **) args - 1); ++ last = rrd_last(argc, args - 1); + if (rrd_test_error()) { + char err[4096]; + +@@ -1027,7 +1027,7 @@ static char *printtimenow( + static char *scanargs( + char *line, + int *argument_count, +- char ***arguments) ++ const char ***arguments) + { + char *getP; /* read cursor */ + char *putP; /* write cursor */ +@@ -1039,8 +1039,8 @@ static char *scanargs( + + /* local array of arguments while parsing */ + int argc = 1; +- char **argv; +- char **argv_tmp; /* temp variable for realloc() */ ++ const char **argv; ++ const char **argv_tmp; /* temp variable for realloc() */ + + #ifdef DEBUG_PARSER + printf("<-- scanargs(%s) -->\n", line); +@@ -1051,7 +1051,7 @@ static char *scanargs( + + /* create initial argument array of char pointers */ + argsz = 32; +- argv = (char **) malloc(argsz * sizeof(char *)); ++ argv = malloc(argsz * sizeof(char *)); + if (!argv) { + return NULL; + } +@@ -1146,7 +1146,7 @@ static char *scanargs( + if (argc == argsz - 2) { + /* resize argument array */ + argsz *= 2; +- argv_tmp = (char **) rrd_realloc(argv, argsz * sizeof(char *)); ++ argv_tmp = rrd_realloc(argv, argsz * sizeof(char *)); + if (*argv_tmp == NULL) { + return NULL; + } +@@ -1213,7 +1213,7 @@ static int parse( + /* the name of the vairable ... */ + char *val; + long valln; +- char **args; ++ const char **args; + char *end; + long end_offset; + int argc; +@@ -1264,7 +1264,7 @@ static int parse( + /* make sure we do not shrink the mallocd block */ + size_t newbufsize = i + strlen(end) + valln + 1; + +- *buf = (char *) rrd_realloc(*buf, newbufsize); ++ *buf = rrd_realloc(*buf, newbufsize); + + if (*buf == NULL) { + perror("Realoc buf:"); +diff --git a/src/rrd_create.c b/src/rrd_create.c +index f9bad0866..919b4195a 100644 +--- a/src/rrd_create.c ++++ b/src/rrd_create.c +@@ -76,7 +76,7 @@ static void parseGENERIC_DS( + + int rrd_create( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"start", 'b', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c +index 751798aa1..21c38a11d 100644 +--- a/src/rrd_daemon.c ++++ b/src/rrd_daemon.c +@@ -1877,7 +1877,7 @@ static int handle_request_tune( + HANDLER_PROTO) + { /* {{{ */ + int status; +- char** argv = NULL; ++ const char** argv = NULL; + int argc, argc_tmp; + char* i; + int rc; +@@ -1916,7 +1916,7 @@ static int handle_request_tune( + goto done; + } + +- if ((argv = (char **) malloc(argc * sizeof(char*))) == NULL) { ++ if ((argv = malloc(argc * sizeof(char*))) == NULL) { + rc = send_response(sock, RESP_ERR, "%s\n", rrd_strerror(ENOMEM)); + goto done; + } +@@ -1927,7 +1927,7 @@ static int handle_request_tune( + argc_tmp += 1; + } + +- status = rrd_tune_r(file, argc, (const char **)argv); ++ status = rrd_tune_r(file, argc, argv); + if (status != 0) { + rc = send_response(sock, RESP_ERR, "Got error %s\n", rrd_get_error()); + goto done; +@@ -1935,7 +1935,7 @@ static int handle_request_tune( + rc = send_response(sock, RESP_OK, "Success\n"); + done: + free(file); +- free(argv); ++ free((void *)argv); + return rc; + } + +@@ -4505,7 +4505,7 @@ static int cleanup( + + static int read_options( + int argc, +- char **argv) ++ const char **argv) + { /* {{{ */ + struct optparse_long longopts[] = { + {NULL, 'a', OPTPARSE_REQUIRED}, +@@ -5050,7 +5050,7 @@ static int read_options( + + int main( + int argc, +- char **argv) ++ const char **argv) + { + int status; + +diff --git a/src/rrd_dump.c b/src/rrd_dump.c +index a4490d594..c58e0ee4a 100644 +--- a/src/rrd_dump.c ++++ b/src/rrd_dump.c +@@ -497,7 +497,7 @@ static size_t rrd_dump_opt_cb_fileout( + + int rrd_dump_opt_r( + const char *filename, +- char *outname, ++ const char *outname, + int opt_noheader) + { + FILE *out_file; +@@ -543,7 +543,7 @@ int rrd_dump_r( + + int rrd_dump( + int argc, +- char **argv) ++ const char **argv) + { + int opt; + struct optparse_long longopts[] = { +diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c +index c739bfc45..54780f19b 100644 +--- a/src/rrd_fetch.c ++++ b/src/rrd_fetch.c +@@ -61,7 +61,7 @@ + + int rrd_fetch( + int argc, +- char **argv, ++ const char **argv, + time_t *start, + time_t *end, /* which time frame do you want ? + * will be changed to represent reality */ +diff --git a/src/rrd_first.c b/src/rrd_first.c +index a696c5c38..f3dde5404 100644 +--- a/src/rrd_first.c ++++ b/src/rrd_first.c +@@ -13,7 +13,7 @@ + + time_t rrd_first( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"rraindex", 129, OPTPARSE_REQUIRED}, +diff --git a/src/rrd_flushcached.c b/src/rrd_flushcached.c +index 090bca749..3bf6cd29d 100644 +--- a/src/rrd_flushcached.c ++++ b/src/rrd_flushcached.c +@@ -22,7 +22,7 @@ + #include "rrd_tool.h" + #include "rrd_client.h" + +-int rrd_flushcached (int argc, char **argv) ++int rrd_flushcached (int argc, const char **argv) + { + struct optparse_long longopts[] = { + {"daemon", 'd', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_graph.c b/src/rrd_graph.c +index b32d45085..46511e9a3 100644 +--- a/src/rrd_graph.c ++++ b/src/rrd_graph.c +@@ -4607,7 +4607,7 @@ int scan_for_col( + /* Now just a wrapper around rrd_graph_v */ + int rrd_graph( + int argc, +- char **argv, ++ const char **argv, + char ***prdata, + int *xsize, + int *ysize, +@@ -4690,7 +4690,7 @@ int rrd_graph( + + rrd_info_t *rrd_graph_v( + int argc, +- char **argv) ++ const char **argv) + { + image_desc_t im; + rrd_info_t *grinfo; +@@ -4953,7 +4953,7 @@ void rrd_graph_init( + + void rrd_graph_options( + int argc, +- char *argv[], ++ const char **argv, + struct optparse *poptions, + image_desc_t *im) + { +diff --git a/src/rrd_graph.h b/src/rrd_graph.h +index 4df32ec66..083cf3800 100644 +--- a/src/rrd_graph.h ++++ b/src/rrd_graph.h +@@ -473,12 +473,12 @@ void time_clean( + + void rrd_graph_options( + int, +- char **, ++ const char **, + struct optparse *, + image_desc_t *); + void rrd_graph_script( + int, +- char **, ++ const char **, + image_desc_t *const, + int); + int rrd_graph_color( +diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c +index 99cdefa65..ba90e1a6c 100644 +--- a/src/rrd_graph_helper.c ++++ b/src/rrd_graph_helper.c +@@ -1952,7 +1952,7 @@ static int parse_xport( + + void rrd_graph_script( + int argc, +- char *argv[], ++ const char **argv, + image_desc_t *const im, + int optno) + { +diff --git a/src/rrd_info.c b/src/rrd_info.c +index c0c6f68c7..eb0d4e4de 100644 +--- a/src/rrd_info.c ++++ b/src/rrd_info.c +@@ -82,7 +82,7 @@ rrd_info_t + + rrd_info_t *rrd_info( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"daemon", 'd', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_last.c b/src/rrd_last.c +index 026a1e828..1aae72512 100644 +--- a/src/rrd_last.c ++++ b/src/rrd_last.c +@@ -11,7 +11,7 @@ + + time_t rrd_last( + int argc, +- char **argv) ++ const char **argv) + { + char *opt_daemon = NULL; + time_t lastupdate; +diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c +index ab30dcf67..4f7f4770e 100644 +--- a/src/rrd_lastupdate.c ++++ b/src/rrd_lastupdate.c +@@ -14,7 +14,7 @@ + #include "rrd_client.h" + #include <stdarg.h> + +-int rrd_lastupdate (int argc, char **argv) ++int rrd_lastupdate (int argc, const char **argv) + { + struct optparse_long longopts[] = { + {"daemon", 'd', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_list.c b/src/rrd_list.c +index e743b9b7d..6e96220ea 100644 +--- a/src/rrd_list.c ++++ b/src/rrd_list.c +@@ -37,7 +37,7 @@ static char *move_past_prefix(const char *prefix, const char *string) + return (char *)&(string[index]); + } + +-static char *rrd_list_rec(int recursive, char *root, char *dirname) ++static char *rrd_list_rec(int recursive, const char *root, const char *dirname) + { + #define SANE_ASPRINTF2(_dest_str, _format, ...) \ + if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) { \ +@@ -138,7 +138,7 @@ static char *rrd_list_rec(int recursive, char *root, char *dirname) + return out; + } + +-char *rrd_list_r(int recursive, char *dirname) ++char *rrd_list_r(int recursive, const char *dirname) + { + #define SANE_ASPRINTF(_dest_str, _format, ...) \ + if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) { \ +@@ -240,7 +240,7 @@ char *rrd_list_r(int recursive, char *dirname) + return rrd_list_rec(recursive, dirname, dirname); + } + +-char *rrd_list(int argc, char **argv) ++char *rrd_list(int argc, const char **argv) + { + char *opt_daemon = NULL; + int status; +diff --git a/src/rrd_modify.c b/src/rrd_modify.c +index a2b07f640..70ac9e77f 100644 +--- a/src/rrd_modify.c ++++ b/src/rrd_modify.c +@@ -1297,7 +1297,7 @@ static int add_rras(const rrd_t *in, rrd_t *out, const int *ds_map, + } + + int handle_modify(const rrd_t *in, const char *outfilename, +- int argc, char **argv, int optidx, ++ int argc, const char **argv, int optidx, + int newstep) { + // parse add/remove options + int rc = -1; +diff --git a/src/rrd_modify.h b/src/rrd_modify.h +index 52d8789be..64a39926e 100644 +--- a/src/rrd_modify.h ++++ b/src/rrd_modify.h +@@ -28,7 +28,7 @@ typedef struct { + } rra_mod_op_t; + + int handle_modify(const rrd_t *in, const char *outfilename, +- int argc, char **argv, int optind, ++ int argc, const char **argv, int optind, + int newstep); + + typedef union { +diff --git a/src/rrd_resize.c b/src/rrd_resize.c +index fb75d81ff..742e6d141 100644 +--- a/src/rrd_resize.c ++++ b/src/rrd_resize.c +@@ -12,9 +12,9 @@ + + int rrd_resize( + int argc, +- char **argv) ++ const char **argv) + { +- char *infilename, outfilename[11] = "resize.rrd"; ++ const char *infilename, outfilename[11] = "resize.rrd"; + rrd_t rrdold, rrdnew; + rrd_value_t buffer; + int version; +diff --git a/src/rrd_restore.c b/src/rrd_restore.c +index 85d481e0c..ebef5efe8 100644 +--- a/src/rrd_restore.c ++++ b/src/rrd_restore.c +@@ -1378,7 +1378,7 @@ int write_file( + + int rrd_restore( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"range-check", 'r', OPTPARSE_NONE}, +diff --git a/src/rrd_tool.c b/src/rrd_tool.c +index cc6119d9a..56321ee1a 100644 +--- a/src/rrd_tool.c ++++ b/src/rrd_tool.c +@@ -22,16 +22,16 @@ + + + static void PrintUsage( +- char *cmd); ++ const char *cmd); + static int CountArgs( + char *aLine); + static int CreateArgs( ++ const char *, + char *, +- char *, +- char **); ++ const char **); + static int HandleInputLine( + int, +- char **, ++ const char **, + FILE *); + int RemoteMode = 0; + int ChangeRoot = 0; +@@ -42,7 +42,7 @@ int ChangeRoot = 0; + + + static void PrintUsage( +- char *cmd) ++ const char *cmd) + { + + const char *help_main = +@@ -443,11 +443,11 @@ static char *fgetslong( + + int main( + int argc, +- char *argv[]) ++ const char *argv[]) + { +- char **myargv; ++ const char **myargv; + char *aLine; +- char *firstdir = ""; ++ const char *firstdir = ""; + + #ifdef MUST_DISABLE_SIGFPE + signal(SIGFPE, SIG_IGN); +@@ -526,7 +526,7 @@ int main( + printf("ERROR: not enough arguments\n"); + continue; + } +- if ((myargv = (char **) malloc((argc + 1) * ++ if ((myargv = malloc((argc + 1) * + sizeof(char *))) == NULL) { + perror("malloc"); + exit(1); +@@ -572,7 +572,7 @@ int main( + resolving them portably is not really simple. */ + static int HandleInputLine( + int argc, +- char **argv, ++ const char **argv, + FILE * out) + { + #if defined(HAVE_OPENDIR) && defined (HAVE_READDIR) +@@ -887,12 +887,12 @@ static int CountArgs( + * CreateArgs - take a string (aLine) and tokenize + */ + static int CreateArgs( +- char *pName, ++ const char *pName, + char *aLine, +- char **argv) ++ const char **argv) + { + char *getP, *putP; +- char **pargv = argv; ++ const char **pargv = argv; + char Quote = 0; + int inArg = 0; + int len; +diff --git a/src/rrd_tune.c b/src/rrd_tune.c +index 198817f37..dd3f3f7cb 100644 +--- a/src/rrd_tune.c ++++ b/src/rrd_tune.c +@@ -71,7 +71,7 @@ static int set_hwsmootharg( + + int rrd_tune( + int argc, +- char **argv) ++ const char **argv) + { + char *opt_daemon = NULL; + const char *in_filename = NULL; +diff --git a/src/rrd_update.c b/src/rrd_update.c +index fbbe2820a..bb9a0602c 100644 +--- a/src/rrd_update.c ++++ b/src/rrd_update.c +@@ -299,7 +299,7 @@ static void initialize_time( + + rrd_info_t *rrd_update_v( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"template", 't', OPTPARSE_REQUIRED}, +@@ -674,7 +674,7 @@ static int rrd_template_update(const char *filename, /* {{{ */ + + int rrd_update( + int argc, +- char **argv) ++ const char **argv) + { + struct optparse_long longopts[] = { + {"template", 't', OPTPARSE_REQUIRED}, +diff --git a/src/rrd_xport.c b/src/rrd_xport.c +index d15d33dd9..93c02f926 100644 +--- a/src/rrd_xport.c ++++ b/src/rrd_xport.c +@@ -73,7 +73,7 @@ static int rrd_xport_format_addprints( + + int rrd_xport( + int argc, +- char **argv, ++ const char **argv, + int UNUSED(*xsize), + time_t *start, + time_t *end, /* which time frame do you want ? +diff --git a/src/rrdupdate.c b/src/rrdupdate.c +index cbbf48cc1..e368516c8 100644 +--- a/src/rrdupdate.c ++++ b/src/rrdupdate.c +@@ -20,19 +20,20 @@ int main( + int argc, + char **argv) + { ++ const char **cargv = (const char **)argv; + char *name=basename(argv[0]); + rrd_info_t *info; + + if (!strcmp(name, "rrdcreate")) { +- rrd_create(argc, argv); ++ rrd_create(argc, cargv); + } + else if (!strcmp(name, "rrdinfo")) { +- info=rrd_info(argc, argv); ++ info=rrd_info(argc, cargv); + rrd_info_print(info); + rrd_info_free(info); + } + else { +- rrd_update(argc, argv); ++ rrd_update(argc, cargv); + } + + if (rrd_test_error()) { diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb index cbe1af2854..bd5a52a230 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb @@ -11,6 +11,7 @@ PV = "1.8.0" SRC_URI = "\ git://github.com/oetiker/rrdtool-1.x.git;protocol=https;branch=master \ + file://b76e3c578f1e9f582e9c28f50d82b1f569602075.patch \ " S = "${WORKDIR}/git" @@ -103,6 +104,11 @@ do_configure() { ${B}/examples/*.pl } +do_install:append:class-native() { + # Replace the shebang line in cgi-demo.cgi + sed -i '1s|^.*$|#!/usr/bin/env rrdcgi|' ${D}${datadir}/rrdtool/examples/cgi-demo.cgi +} + PACKAGES =+ "${PN}-perl ${PN}-python" PACKAGES =+ "rrdcached" @@ -129,3 +135,7 @@ RDEPENDS:${PN}-python = "python3" FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug" + +# http://errors.yoctoproject.org/Errors/Details/766911/ +# rrd_tune.c:239:35: error: passing argument 3 of 'optparse_init' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch new file mode 100644 index 0000000000..cf4f4080a6 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch @@ -0,0 +1,37 @@ +From baf992f82aa987c608731866876adb856847ea45 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 May 2024 18:03:40 -0700 +Subject: [PATCH] relp: fix build against upcoming `gcc-14` + (`-Werror=calloc-transposed-args`) + +`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It + detected minor infelicity in `calloc()` API usage + +Fixes +../../git/src/relp.c: In function 'addToEpollSet': +../../git/src/relp.c:101:39: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] + 101 | CHKmalloc(epd = calloc(sizeof(epolld_t), 1)); + | ^~~~~~~~ + +Upstream-Status: Submitted [https://github.com/rsyslog/librelp/pull/264] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/relp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/relp.c b/src/relp.c +index eadda36..6268f1d 100644 +--- a/src/relp.c ++++ b/src/relp.c +@@ -98,7 +98,7 @@ addToEpollSet(relpEngine_t *const pThis, epolld_type_t typ, void *ptr, int sock, + epolld_t *epd = NULL; + ENTER_RELPFUNC; + +- CHKmalloc(epd = calloc(sizeof(epolld_t), 1)); ++ CHKmalloc(epd = calloc(1, sizeof(epolld_t))); + epd->typ = typ; + epd->ptr = ptr; + epd->sock = sock; +-- +2.45.0 + diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb index 9d949c6303..49847047ac 100644 --- a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb +++ b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb @@ -11,6 +11,7 @@ SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https;branch=stable \ file://0001-tests-Fix-callback-prototype.patch \ file://0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch \ file://0001-tests-Include-missing-sys-time.h.patch \ + file://0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch \ file://run-ptest \ " diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch new file mode 100644 index 0000000000..5df29e7d90 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch @@ -0,0 +1,35 @@ +From 1e0a77d8a5ae7cd0223afadf46cdbb540119774d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 May 2024 23:31:46 -0700 +Subject: [PATCH] tests/tcpflood.c: Pass correct parameter type to sendto() + +Fixes build with GCC-14 and musl + +../../rsyslog-8.2404.0/tests/tcpflood.c:811:70: error: passing argument 5 of 'sendto' from incompatible pointer type [-Wincompatible-pointer-types] + 811 | lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr)); + | ^~~~~~~~ + | | + | struct sockaddr_in * + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/tcpflood.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/tcpflood.c b/tests/tcpflood.c +index bd8edaf..0feda23 100644 +--- a/tests/tcpflood.c ++++ b/tests/tcpflood.c +@@ -808,7 +808,7 @@ int sendMessages(struct instdata *inst) + } + lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number); + } else if(transport == TP_UDP) { +- lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr)); ++ lenSend = sendto(udpsockout, buf, lenBuf, 0, (const struct sockaddr *)&udpRcvr, sizeof(udpRcvr)); + error_number = errno; + } else if(transport == TP_TLS) { + if(sockArray[socknum] == -1) { +-- +2.45.0 + diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2402.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb index af46cc14d7..ac1645f671 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2402.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb @@ -25,14 +25,14 @@ SRC_URI = "https://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \ file://use-pkgconfig-to-check-libgcrypt.patch \ file://run-ptest \ file://0001-tests-disable-the-check-for-inotify.patch \ + file://0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch \ " SRC_URI:append:libc-musl = " \ file://0001-Include-sys-time-h.patch \ file://disable-omfile-outchannel.patch \ " - -SRC_URI[sha256sum] = "acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba" +SRC_URI[sha256sum] = "30528d140ec1b1f079224081fa37df6e06587ff42b02e3e61f2daa0526c54d33" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" @@ -137,9 +137,9 @@ do_install_ptest() { do_install:append() { install -d "${D}${sysconfdir}/init.d" install -d "${D}${sysconfdir}/logrotate.d" - install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog - install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf - install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog + install -m 755 ${UNPACKDIR}/initscript ${D}${sysconfdir}/init.d/syslog + install -m 644 ${UNPACKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf + install -m 644 ${UNPACKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then @@ -152,7 +152,7 @@ do_install:append() { fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_system_unitdir} - install -m 644 ${WORKDIR}/rsyslog.service ${D}${systemd_system_unitdir} + install -m 644 ${UNPACKDIR}/rsyslog.service ${D}${systemd_system_unitdir} sed -i -e "s,@sbindir@,${sbindir},g" ${D}${systemd_system_unitdir}/rsyslog.service fi } diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 2a7cf2285e..6126a3a38c 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -64,7 +64,7 @@ do_install() { oe_runmake DESTDIR=${D} install install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service + install -m 0644 ${UNPACKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service install -d ${D}${sysconfdir}/init.d mv ${D}${sysconfdir}/init.d/sfcb ${D}${sysconfdir}/init.d/sblim-sfcb @@ -86,3 +86,8 @@ FILES:${PN} += "${libdir}/sfcb ${datadir}/sfcb" FILES:${PN}-dbg += "${libdir}/sfcb/.debug" RDEPENDS:${PN} = "perl bash" + +# This one is reproducible only on 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766970/ +# sblim-sfcb-1.4.9/trace.c:214:18: error: passing argument 1 of 'gmtime_r' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb index c9d3ddd6b2..cd565ec295 100644 --- a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb +++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb @@ -16,3 +16,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" DEPENDS = "curl" inherit autotools + +# http://errors.yoctoproject.org/Errors/Details/766897/ +# sblim-sfcc-2.2.8/TEST/v2test_ec.c:86:31: error: passing argument 1 of 'showClass' from incompatible pointer type [-Wincompatible-pointer-types] +# sblim-sfcc-2.2.8/TEST/v2test_ein.c:96:36: error: passing argument 1 of 'showObjectPath' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index 4fefd5169b..c9a5bd1f9a 100644 --- a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb @@ -24,7 +24,7 @@ EXTRA_OEMAKE += "CC='${CC}' CFLAGS='${CFLAGS} -D_LARGEFILE64_SOURCE=1' sbindir=$ do_configure:append() { oe_runmake -C mdadm.d mdadm-1.3.0 - patch -p0 < ${WORKDIR}/mdadm.patch + patch -p0 < ${UNPACKDIR}/mdadm.patch } INITSCRIPT_PACKAGES = "${PN}-diskmon ${PN}-raidmon" INITSCRIPT_NAME:${PN}-diskmon = "sgdisk" @@ -44,3 +44,18 @@ FILES:${PN}-raidmon = "${sbindir}/sgraidmon ${sysconfdir}/init.d/sgraid" RDEPENDS:${PN} += "bash" RDEPENDS:${PN}-diskmon += "${PN} bash" RDEPENDS:${PN}-raidmon += "${PN} bash" + +# This one is reproducible only on 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766967/ +# scsirastools-1.6.6/src/sgdiag.c:238:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +# scsirastools-1.6.6/src/sgdiag.c:697:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] +# scsirastools-1.6.6/src/sgdiag.c:699:30: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +# scsirastools-1.6.6/src/sgdiag.c:733:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] +# scsirastools-1.6.6/src/sgdefects.c:214:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +# scsirastools-1.6.6/src/sgmode.c:290:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +# scsirastools-1.6.6/src/sgdiskmon.c:1278:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +# scsirastools-1.6.6/src/sgdskfl.c:318:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +# scsirastools-1.6.6/src/sgdskfl.c:829:37: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +# scsirastools-1.6.6/src/sgraidmon.c:1641:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +# scsirastools-1.6.6/src/sgsafte.c:1298:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb index f387147412..bd92b16299 100644 --- a/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb @@ -33,13 +33,13 @@ SYSTEMD_AUTO_ENABLE = "disable" do_install:append () { #install the init.d/smartd install -d ${D}${sysconfdir}/init.d - install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd + install -p -m 0755 ${UNPACKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd install -d ${D}${sysconfdir}/default - install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools + install -p -m 0644 ${UNPACKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools #install systemd service file install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/smartd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/smartd.service ${D}${systemd_unitdir}/system sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ diff --git a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb index 455bda1d76..1a75922277 100644 --- a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb +++ b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb @@ -50,7 +50,7 @@ do_configure () { do_install:append () { if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ]; then install -d -m 0755 ${D}/${sysconfdir}/pam.d - install -m 0644 ${WORKDIR}/vlock_pam ${D}${sysconfdir}/pam.d/vlock + install -m 0644 ${UNPACKDIR}/vlock_pam ${D}${sysconfdir}/pam.d/vlock fi } diff --git a/meta-oe/recipes-extended/zram/zram_0.2.bb b/meta-oe/recipes-extended/zram/zram_0.2.bb index b4b3a27b2b..800dd6b7c4 100644 --- a/meta-oe/recipes-extended/zram/zram_0.2.bb +++ b/meta-oe/recipes-extended/zram/zram_0.2.bb @@ -21,17 +21,17 @@ do_install () { # Install systemd related configuration file if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram + install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/zram fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${libexecdir} - install -m 0755 ${WORKDIR}/zram-swap-init ${D}${libexecdir} - install -m 0755 ${WORKDIR}/zram-swap-deinit ${D}${libexecdir} + install -m 0755 ${UNPACKDIR}/zram-swap-init ${D}${libexecdir} + install -m 0755 ${UNPACKDIR}/zram-swap-deinit ${D}${libexecdir} install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/zram-swap.service ${D}${systemd_unitdir}/system/zram-swap.service + install -m 0644 ${UNPACKDIR}/zram-swap.service ${D}${systemd_unitdir}/system/zram-swap.service sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/zram-swap.service - install -m 0644 ${WORKDIR}/dev-zram0.swap ${D}${systemd_unitdir}/system/dev-zram0.swap + install -m 0644 ${UNPACKDIR}/dev-zram0.swap ${D}${systemd_unitdir}/system/dev-zram0.swap fi } diff --git a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb index 1bc4010f8a..c7acdba6b2 100644 --- a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb +++ b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb @@ -18,3 +18,9 @@ S = "${WORKDIR}/git" AUTOTOOLS_SCRIPT_PATH = "${S}/src" BBCLASSEXTEND = "native nativesdk" + +# http://errors.yoctoproject.org/Errors/Details/766891/ +# git/src/libzsync/zsync.c:445:18: error: returning 'char **' from a function with incompatible return type 'const char * const*' [-Wincompatible-pointer-types] +# git/src/libzsync/zsync.c:450:18: error: returning 'char **' from a function with incompatible return type 'const char * const*' [-Wincompatible-pointer-types] +# git/src/libzsync/zsync.c:932:43: error: passing argument 4 of 'zsync_configure_zstream_for_zdata' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.2.bb b/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb index fa47cbd48d..62ca015309 100644 --- a/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.2.bb +++ b/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb @@ -13,7 +13,7 @@ inherit gnomebase features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.sha256sum] = "6f62dd99f746985e573605937577ccfc944368f606a71ca46342d70e1cdae079" +SRC_URI[archive.sha256sum] = "6ec264eaa0c4de0adb7202c600170bde9a7fbe4d466bfbe940eaf7faaa6c5974" S = "${WORKDIR}/${GNOMEBN}-${PV}" diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb index f51451d971..54b37912b2 100644 --- a/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb +++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb @@ -19,5 +19,5 @@ export ac_cv_have_iconv_detect_h="yes" export ac_cv_sys_file_offset_bits="64" do_configure:append () { - cp ${WORKDIR}/iconv-detect.h ${S} + cp ${UNPACKDIR}/iconv-detect.h ${S} } diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb index db55f22398..1cfd9c1cba 100644 --- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb +++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb @@ -11,7 +11,7 @@ PROVIDES = "gnome-doc-utils" do_install:append() { install -d ${D}${datadir}/aclocal/ - install ${WORKDIR}/gnome-doc-utils.m4 ${D}${datadir}/aclocal/ + install ${UNPACKDIR}/gnome-doc-utils.m4 ${D}${datadir}/aclocal/ } FILES:${PN} += "${datadir}" diff --git a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb index 5eac641cf3..74b0531414 100644 --- a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb +++ b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb @@ -32,3 +32,5 @@ python populate_packages:prepend () { if (d.getVar('DEBIAN_NAMES')): d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-2.0') } + +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb b/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb new file mode 100644 index 0000000000..ca3bf081d6 --- /dev/null +++ b/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb @@ -0,0 +1,48 @@ +SUMMARY = "User-Interface for malcontent." +HOMEPAGE = "https://gitlab.freedesktop.org/pwithnall/malcontent" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +require malcontent.inc + +DEPENDS = " \ + malcontent \ + accountsservice \ + glib-2.0 \ + glib-testing \ + dbus \ + desktop-file-utils-native \ + itstool-native \ + libpam \ + polkit \ + appstream \ + flatpak \ + libadwaita \ + gtk4 \ +" + +GIR_MESON_OPTION = "" + +GTKIC_VERSION = "4" +inherit meson pkgconfig gtk-icon-cache gobject-introspection gettext features_check + +REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" + +EXTRA_OEMESON = "-Dui=enabled" + +do_install() { + install -d ${D}${datadir}/gir-1.0 ${D}${libdir}/girepository-1.0 ${D}${bindir} + install -d ${D}${datadir}/polkit-1/actions ${D}${datadir}/metainfo ${D}${datadir}/applications + install -m 0644 ${B}/libmalcontent-ui/MalcontentUi-1.gir ${D}${datadir}/gir-1.0 + install -m 0644 ${B}/libmalcontent-ui/MalcontentUi-1.typelib ${D}${libdir}/girepository-1.0 + install -m 0644 ${B}/libmalcontent-ui/libmalcontent-ui-1.so.${PV} ${D}${libdir} + ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so + ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so.1 + install -m 0755 ${B}/malcontent-control/malcontent-control ${D}${bindir} + install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.policy ${D}${datadir}/polkit-1/actions + install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.appdata.xml ${D}${datadir}/metainfo + install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.desktop ${D}${datadir}/applications +} + +FILES:${PN} += "${bindir} ${libdir} ${datadir}" + diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.bb b/meta-oe/recipes-gnome/malcontent/malcontent.bb new file mode 100644 index 0000000000..c4bc50fa8e --- /dev/null +++ b/meta-oe/recipes-gnome/malcontent/malcontent.bb @@ -0,0 +1,44 @@ +SUMMARY = "malcontent implements support for restricting the type of content." +HOMEPAGE = "https://gitlab.freedesktop.org/pwithnall/malcontent" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +require malcontent.inc + +DEPENDS = " \ + accountsservice \ + glib-2.0 \ + glib-testing \ + dbus \ + itstool-native \ + libpam \ + polkit \ +" + +GIR_MESON_OPTION = "" + +inherit meson pkgconfig gobject-introspection gettext features_check useradd + +REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" + +PACKAGECONFIG ?= "ui" +PACKAGECONFIG[ui] = ",,,malcontent-ui" + +EXTRA_OEMESON = "-Dui=disabled" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" + +do_install:append() { + # Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d +} + +FILES:${PN} += " \ + ${libdir}/security/pam_malcontent.so \ + ${datadir}/accountsservice \ + ${datadir}/help \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ +" diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.inc b/meta-oe/recipes-gnome/malcontent/malcontent.inc new file mode 100644 index 0000000000..d48be08bbc --- /dev/null +++ b/meta-oe/recipes-gnome/malcontent/malcontent.inc @@ -0,0 +1,4 @@ +SRC_URI = "git://gitlab.freedesktop.org/pwithnall/malcontent.git;protocol=https;branch=main" +S = "${WORKDIR}/git" +SRCREV = "3ba80995bb25b7aeda7e21d547f9e39ff9a81736" +PV = "0.12.0" diff --git a/meta-oe/recipes-graphics/cglm/cglm_0.9.2.bb b/meta-oe/recipes-graphics/cglm/cglm_0.9.4.bb index b503c6ed9c..6fcc07d92b 100644 --- a/meta-oe/recipes-graphics/cglm/cglm_0.9.2.bb +++ b/meta-oe/recipes-graphics/cglm/cglm_0.9.4.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8dc95c4110ba741c43832734b51b7de7" SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https" # Tag v0.9.1 -SRCREV = "c8781615183ce3cb4f5d72caf70f2c01d7d4d2af" +SRCREV = "1796cc5ce298235b615dc7a4750b8c3ba56a05dd" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index 4d38632e25..54aeb06aa9 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc @@ -24,6 +24,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \ file://0001-include-libgen.h-for-basename.patch \ + file://0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch \ " S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch new file mode 100644 index 0000000000..574bba0bc7 --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch @@ -0,0 +1,36 @@ +From 18f4eca291cabf93d87e7c9051268d9c385b8f37 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 May 2024 18:23:06 -0700 +Subject: [PATCH] inputdrivers: Correct the signature of bind() call on musl + systems + +Its flagged with GCC14 + +../../../DirectFB-1.7.7/inputdrivers/linux_input/linux_input.c:1551:27: error: passing argument 2 of 'bind' from incompatible pointer type [-Wincompatible-pointer-types] + 1551 | rt = bind(socket_fd, &sock_addr, + | ^~~~~~~~~~ + | | + | struct sockaddr_un * + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + inputdrivers/linux_input/linux_input.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inputdrivers/linux_input/linux_input.c b/inputdrivers/linux_input/linux_input.c +index 03deebc..207f5a5 100644 +--- a/inputdrivers/linux_input/linux_input.c ++++ b/inputdrivers/linux_input/linux_input.c +@@ -1548,7 +1548,7 @@ udev_hotplug_EventThread(DirectThread *thread, void * hotplug_data) + "/org/kernel/udev/monitor", + sizeof(sock_addr.sun_path) - 1); + +- rt = bind(socket_fd, &sock_addr, ++ rt = bind(socket_fd, (struct sockaddr *)&sock_addr, + sizeof(sock_addr.sun_family)+1+strlen(&sock_addr.sun_path[1])); + if (rt < 0) { + D_PERROR( "DirectFB/linux_input: bind() failed: %s\n", +-- +2.45.1 + diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0001-configure-Do-not-require-support-for-implicit-ints.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0001-configure-Do-not-require-support-for-implicit-ints.patch new file mode 100644 index 0000000000..356bd73f88 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0001-configure-Do-not-require-support-for-implicit-ints.patch @@ -0,0 +1,45 @@ +From cbba378a23410241176d62f3bb43965c044615e3 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Thu, 24 Nov 2022 13:06:50 +0100 +Subject: [PATCH 1/3] configure: Do not require support for implicit ints + +Implicit ints have not been part of C since 1999, and future +compilers will disable support for them by default. Fortunatenly, +only one configure check needs adjusting. + +Upstream-Status: Submitted [https://github.com/fvwmorg/fvwm/pull/100] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + acinclude.m4 | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 8b74ff1e..b66042f9 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -30,7 +30,7 @@ if test "$ac_cv_func_select" = yes; then + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif], +-[extern select ($ac_cv_type_fd_set_size_t, ++[extern int select ($ac_cv_type_fd_set_size_t, + $ac_cv_type_fd_set *, $ac_cv_type_fd_set *, $ac_cv_type_fd_set *, + $ac_type_timeval *);], + [ac_found=yes ; break 3],ac_found=no) +diff --git a/configure.ac b/configure.ac +index 97ab9e7a..c9fcede6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -220,7 +220,7 @@ AC_MINIX + + # catch -Werror and similar options when running configure + AC_TRY_COMPILE([#include <stdio.h>], +-[int i; static j; int *p; char *c; ++[int i; int *p; char *c; + switch (*p = p = *c) { case 0: printf("%Q", c, p); } + *c = &i; c = p; + while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1)); +-- +2.45.0 + diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch new file mode 100644 index 0000000000..50ecb20c72 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch @@ -0,0 +1,32 @@ +From 51287fb60263530f61b14df5519e10dabe67d2ad Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Thu, 24 Nov 2022 13:07:56 +0100 +Subject: [PATCH 2/3] acinclude.m4: Add missing <unistd.h> to + AM_SAFETY_CHECK_MKSTEMP + +Otherwise, the check fails on a compiler which does not support +implicit function declarations (a language feature removed in 1999). + +Upstream-Status: Submitted [https://github.com/fvwmorg/fvwm/pull/100] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + acinclude.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/acinclude.m4 b/acinclude.m4 +index b66042f9..4dee2abe 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1154,6 +1154,9 @@ AC_DEFUN([AM_SAFETY_CHECK_MKSTEMP],[ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#ifdef HAVE_UNISTD_H ++#include <unistd.h> ++#endif + int main(void) + { + char template[128]; +-- +2.45.0 + diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0003-configure-Further-defang-the-Werror-check.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0003-configure-Further-defang-the-Werror-check.patch new file mode 100644 index 0000000000..e9d780ddc6 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0003-configure-Further-defang-the-Werror-check.patch @@ -0,0 +1,35 @@ +From 542c6f25327587d5a6bffb8a45b457ec85dcf8e1 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Tue, 19 Dec 2023 13:24:50 +0100 +Subject: [PATCH 3/3] configure: Further defang the -Werror check + +Incompatible pointer types are actually errors (in the sense +that they are invalid C). Compilers have merely tolerated them as +warnings for backwards compatibility. This is changing with Clang 16 +and GCC 14, so relax the check a little. + +Upstream-Status: Submitted [https://github.com/fvwmorg/fvwm/pull/100] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c9fcede6..2e9615b2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -220,9 +220,8 @@ AC_MINIX + + # catch -Werror and similar options when running configure + AC_TRY_COMPILE([#include <stdio.h>], +-[int i; int *p; char *c; +- switch (*p = p = *c) { case 0: printf("%Q", c, p); } +- *c = &i; c = p; ++[int unused; int *p; char *c; ++ printf("%Q", c, p); + while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1)); + ], , AC_MSG_ERROR(" + configure is not able to compile programs with warnings. Please +-- +2.45.0 + diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb index 8daf38a0ba..df349494aa 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb +++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb @@ -34,6 +34,9 @@ DEPENDS = " \ SRC_URI = " \ git://github.com/fvwmorg/fvwm.git;protocol=https;branch=master \ file://0001-Fix-compilation-for-disabled-gnome.patch \ + file://0001-configure-Do-not-require-support-for-implicit-ints.patch \ + file://0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch \ + file://0003-configure-Further-defang-the-Werror-check.patch \ " SRCREV = "7baf540e56fb1a3e91752acba872a88543529d46" diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb index dd520b245e..e313d7a192 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -29,10 +29,10 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir} cp -R --no-dereference --preserve=mode,links ${S}/doc ${D}${docdir}/glm rm ${D}${includedir}/glm/CMakeLists.txt - sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake - sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake - sed "s/@VERSION@/${PV}/" ${WORKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc - install -Dm644 ${WORKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake + sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake + sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake + sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc + install -Dm644 ${UNPACKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake } diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch new file mode 100644 index 0000000000..0c2a8d4bd0 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch @@ -0,0 +1,36 @@ +From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <marcus@jet.franken.de> +Date: Mon, 4 Dec 2023 13:26:08 +0100 +Subject: [PATCH] align outlen length with jpeg jeaders. fixes + https://github.com/gphoto/libgphoto2/issues/941 + +--- +Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/721f7f8c3ec8058d504607873e4c317aac0c99c5] + + camlibs/ptp2/chdk.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c +index e1d898f378..e775ea1d4b 100644 +--- a/camlibs/ptp2/chdk.c ++++ b/camlibs/ptp2/chdk.c +@@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, + struct jpeg_error_mgr jerr; + JSAMPROW row_ptr[1]; + uint8_t *outbuf = NULL, *tmprowbuf = NULL; +- uint64_t outlen = 0; ++ unsigned long outlen = 0; + unsigned int row_inc; + int sshift, dshift, xshift, skip; + +@@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, + sshift = 6; + dshift = (width/height > 2) ? 6 : 12; + xshift = 4; +- /* Digic 6 cameras: 8 bit per element UYVY, +- * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ ++ /* Digic 6 cameras: 8 bit per element UYVY, ++ * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ + } else { + row_inc = buf_width*2; + sshift = 4; diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb index cc42b6a9c6..57c9d199eb 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb @@ -13,6 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 file://40-libgphoto2.rules \ file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ file://0001-configure-Filter-out-buildpaths-from-CC.patch \ + file://fix-build-with-gcc-14.patch \ " SRC_URI[libgphoto2.sha256sum] = "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b" @@ -38,7 +39,7 @@ do_configure:append() { do_install:append() { install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${UNPACKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ } PACKAGES =+ "libgphotoport libgphoto2-camlibs" diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb index 2700142e5d..38d738310e 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb @@ -67,7 +67,7 @@ do_configure:prepend() { do_install:append:class-nativesdk() { # graphviz-setup.sh must be executed at SDK installation install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d - install -m 0755 ${WORKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d + install -m 0755 ${UNPACKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d } FILES:${PN}:class-nativesdk += "${SDKPATHNATIVE}" diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb index a70d31fed0..30964a1b9a 100644 --- a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb @@ -24,7 +24,7 @@ REQUIRED_DISTRO_FEATURES = "x11" do_configure:prepend () { rm -f ${S}/m4/init.m4 - cp -f ${WORKDIR}/Makevars ${S}/po/ + cp -f ${UNPACKDIR}/Makevars ${S}/po/ } do_install:append () { diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch new file mode 100644 index 0000000000..2007766f74 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch @@ -0,0 +1,52 @@ +From 6c35fc94ca30a4d0662479f7ef8a704d97aa7352 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 May 2024 18:13:30 -0700 +Subject: [PATCH] stdlib: Make iconv use portable across glibc/musl + +This is a backport from libsdl2 + +Upstream-Status: Backport [https://github.com/libsdl-org/SDL/blob/main/src/stdlib/SDL_iconv.c#L49C1-L51C1] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/stdlib/SDL_iconv.c | 19 ++++--------------- + 1 file changed, 4 insertions(+), 15 deletions(-) + +diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c +index fa56a99..087b6ec 100644 +--- a/src/stdlib/SDL_iconv.c ++++ b/src/stdlib/SDL_iconv.c +@@ -28,27 +28,16 @@ + + #ifdef HAVE_ICONV + +-/* Depending on which standard the iconv() was implemented with, +- iconv() may or may not use const char ** for the inbuf param. +- If we get this wrong, it's just a warning, so no big deal. +-*/ +-#if defined(_XGP6) || \ +- defined(__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) +-#define ICONV_INBUF_NONCONST +-#endif +- + #include <errno.h> + + size_t SDL_iconv(SDL_iconv_t cd, + const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft) + { +- size_t retCode; +-#ifdef ICONV_INBUF_NONCONST +- retCode = iconv(cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft); +-#else +- retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft); +-#endif ++ /* iconv's second parameter may or may not be `const char const *` depending on the ++ C runtime's whims. Casting to void * seems to make everyone happy, though. */ ++ ++ const size_t retCode = iconv((iconv_t)((uintptr_t)cd), (void *)inbuf, inbytesleft, outbuf, outbytesleft); + if ( retCode == (size_t)-1 ) { + switch(errno) { + case E2BIG: +-- +2.45.1 + diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.2.bb index 57f0f99794..267311853a 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.2.bb @@ -2,13 +2,12 @@ SUMMARY = "Simple DirectMedia Layer image library v2" SECTION = "libs" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=822edb694b20ff16ceef85b27f61c11f" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2f6d9e01c97958aa851954ed5acf82ee" DEPENDS = "tiff zlib libpng jpeg libsdl2 libwebp" SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz" -SRC_URI[md5sum] = "f26f3a153360a8f09ed5220ef7b07aea" -SRC_URI[sha256sum] = "bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0" +SRC_URI[sha256sum] = "8f486bbfbcf8464dd58c9e5d93394ab0255ce68b51c5a966a918244820a76ddc" S = "${WORKDIR}/SDL2_image-${PV}" diff --git a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb index 4fc4679f7f..1f436c6d7f 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -15,6 +15,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://libsdl-1.2.15-xdata32.patch \ file://pkgconfig.patch \ file://0001-build-Pass-tag-CC-explictly-when-using-libtool.patch \ + file://0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch \ file://CVE-2019-7577.patch \ file://CVE-2019-7574.patch \ file://CVE-2019-7572.patch \ diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index adf9cb597c..ae45258297 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb @@ -61,12 +61,12 @@ do_compile:append() { do_install:append() { install -d ${D}${localstatedir}/lib/lxdm - install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm + install -m 644 ${UNPACKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then # ArchLinux version of pam config has the following advantages: # * simple setup of passwordless login # * in XFCE powerdown/restart enabled in logoff dialog - install -m 644 ${WORKDIR}/${@bb.utils.contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm + install -m 644 ${UNPACKDIR}/${@bb.utils.contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm fi } diff --git a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.50.1.bb b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.52.0.bb index 86787a6b7f..3b0fbd3e76 100644 --- a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.50.1.bb +++ b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.52.0.bb @@ -9,7 +9,7 @@ DEPENDS = "mm-common cairomm-1.16 glibmm-2.68 pango" GNOMEBN = "pangomm" inherit gnomebase features_check -SRC_URI[archive.sha256sum] = "ccc9923413e408c2bff637df663248327d72822f11e394b423e1c5652b7d9214" +SRC_URI[archive.sha256sum] = "34a134126a6484ff12f774358c36ecc44d0e9df094e1b83796d9774bb7d24947" REQUIRED_DISTRO_FEATURES = "x11" S = "${WORKDIR}/${GNOMEBN}-${PV}" diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb index 5cde7c9fb4..668ca79ddd 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb @@ -27,7 +27,7 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch;protocol=ht XORG_PN ?= "xorg-server" XORG_PV ?= "1.20.6" SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg" -XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}" +XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}" SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b" SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" diff --git a/meta-oe/recipes-graphics/tslib/tslib_1.22.bb b/meta-oe/recipes-graphics/tslib/tslib_1.22.bb index 01da03a473..cc7e44eff2 100644 --- a/meta-oe/recipes-graphics/tslib/tslib_1.22.bb +++ b/meta-oe/recipes-graphics/tslib/tslib_1.22.bb @@ -53,12 +53,12 @@ PACKAGECONFIG[one-wire-ts-input] = "--enable-one-wire-ts-input,--disable-one-wir PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" do_install:prepend() { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf + install -m 0644 ${UNPACKDIR}/ts.conf ${S}/etc/ts.conf } do_install:append() { install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ + install -m 0755 ${UNPACKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ } RPROVIDES:tslib-conf = "libts-0.0-conf" diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb b/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb index 3402d0d46a..e7ec004059 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/source-code-pro-2.030R-ro-1.050R-it" do_install() { install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/44-source-code-pro-fonts-fontconfig.conf ${D}${sysconfdir}/fonts/conf.d/ + install -m 0644 ${UNPACKDIR}/44-source-code-pro-fonts-fontconfig.conf ${D}${sysconfdir}/fonts/conf.d/ install -d ${D}${datadir}/fonts/truetype/ find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn-fonts.conf index 6855791b43..6855791b43 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn-fonts.conf diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb index b4a598527e..c46952cce0 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb @@ -1,34 +1,6 @@ -require ttf.inc +require source-han-sans-fonts.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Simplified Chinese" -HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" - -inherit allarch fontcache - -# Download tends to break - so - or not? -#EXCLUDE_FROM_WORLD = "1" - -SRC_URI = " \ - svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/CN;protocol=http;rev=82 \ - file://44-source-han-sans-cn.conf \ -" -SRC_URI[md5sum] = "d16abc21f6575bb08894efedbed484a2" -SRC_URI[sha256sum] = "0a0e1d8e52833bc352d454d8242da03b82c0efc41323fb66f7435e5b39734a4f" - -S = "${WORKDIR}/SourceHanSansCN" - -do_install() { - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/44-source-han-sans-cn.conf ${D}${sysconfdir}/fonts/conf.d/ - - install -d ${D}${datadir}/fonts/truetype/ - find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; -} - -FILES:${PN} = " \ - ${sysconfdir}/fonts \ - ${datadir}/fonts \ -" +ZIPNAME = "SourceHanSansCN" +SRC_URI[sha256sum] = "6841fc13f1c0d255cfeb33d2a2c68d24bbebd94ae2c070347a2b2b200a1db4d6" diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc new file mode 100644 index 0000000000..03ca4c0902 --- /dev/null +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc @@ -0,0 +1,26 @@ +require ttf.inc + +HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" + +inherit allarch fontcache + +SRC_URI = " \ + https://github.com/adobe-fonts/source-han-sans/releases/download/${PV}R/${ZIPNAME}.zip;subdir=${BP};downloadfilename=${BP}.zip \ + file://44-${BPN}.conf \ +" + +do_install() { + install -d ${D}${sysconfdir}/fonts/conf.d/ + install -m 0644 ${UNPACKDIR}/44-${BPN}.conf ${D}${sysconfdir}/fonts/conf.d/ + + install -d ${D}${datadir}/fonts/truetype/ + find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; +} + +FILES:${PN} = " \ + ${sysconfdir}/fonts \ + ${datadir}/fonts \ +" + diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp-fonts.conf index a7a93feeae..a7a93feeae 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp-fonts.conf diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb index 6a4509048f..40128f97d3 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb @@ -1,34 +1,6 @@ -require ttf.inc +require source-han-sans-fonts.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Japanese" -HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" - -inherit allarch fontcache - -# Download tends to break - so - or not? -#EXCLUDE_FROM_WORLD = "1" - -SRC_URI = " \ - svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/JP;protocol=http;rev=82 \ - file://44-source-han-sans-jp.conf \ -" -SRC_URI[md5sum] = "908fbf97f3df04a6838708c093f1e900" -SRC_URI[sha256sum] = "dc6dbae3fba35f220bac88ba7130b826c7efe1282f472788fae3628b79be3f54" - -S = "${WORKDIR}/SourceHanSansJP" - -do_install() { - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/44-source-han-sans-jp.conf ${D}${sysconfdir}/fonts/conf.d/ - - install -d ${D}${datadir}/fonts/truetype/ - find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; -} - -FILES:${PN} = " \ - ${sysconfdir}/fonts \ - ${datadir}/fonts \ -" +ZIPNAME = "SourceHanSansJP" +SRC_URI[sha256sum] = "1ae9f62ad620d686c4a049ce25cf54e3afd8fefc954a678c644cf9802750c17e" diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr-fonts.conf index dee73ae77f..dee73ae77f 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr-fonts.conf diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb index 5ab5057d86..8b32ab82d2 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb @@ -1,34 +1,6 @@ -require ttf.inc +require source-han-sans-fonts.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Korean" -HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" - -inherit allarch fontcache - -# Download tends to break - so - or not? -#EXCLUDE_FROM_WORLD = "1" - -SRC_URI = " \ - svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82 \ - file://44-source-han-sans-kr.conf \ -" -SRC_URI[md5sum] = "f8d1bd6c87d8575afdb25e2f46bd81d4" -SRC_URI[sha256sum] = "38fd15c80f9980492faaa1af39ff873d8a38e45027023fb17d5b10d4b4b0e6af" - -S = "${WORKDIR}/SourceHanSansKR" - -do_install() { - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/44-source-han-sans-kr.conf ${D}${sysconfdir}/fonts/conf.d/ - - install -d ${D}${datadir}/fonts/truetype/ - find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; -} - -FILES:${PN} = " \ - ${sysconfdir}/fonts \ - ${datadir}/fonts \ -" +ZIPNAME = "SourceHanSansKR" +SRC_URI[sha256sum] = "02fe28a48c6381c49d61c27a1b173c77f0e6f2b9f2b68e79f076f10a6a8f4bfe" diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw-fonts.conf index ae289401bb..ae289401bb 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw-fonts.conf diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb index a2b3fff079..b841660efd 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb @@ -1,34 +1,6 @@ -require ttf.inc +require source-han-sans-fonts.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Traditional Chinese" -HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" - -inherit allarch fontcache - -# Download tends to break - so - or not? -#EXCLUDE_FROM_WORLD = "1" - -SRC_URI = " \ - svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82 \ - file://44-source-han-sans-tw.conf \ -" -SRC_URI[md5sum] = "6533b71b31c19e548768f0fc963202f3" -SRC_URI[sha256sum] = "92ba161921c5cdec5a8f8d5711676f0865b50cee071c25eb4bd4125b5af59fd0" - -S = "${WORKDIR}/SourceHanSansTW" - -do_install() { - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/44-source-han-sans-tw.conf ${D}${sysconfdir}/fonts/conf.d/ - - install -d ${D}${datadir}/fonts/truetype/ - find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; -} - -FILES:${PN} = " \ - ${sysconfdir}/fonts \ - ${datadir}/fonts \ -" +ZIPNAME = "SourceHanSansTW" +SRC_URI[sha256sum] = "11d78c8fbc1a4bb04a453cdd65c99db8d41ec5cd6ba6d68c8638e6ba170de806" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb index 43a387b818..54aeb318a4 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb @@ -23,7 +23,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/dejavu/files/dejavu/" do_install:append () { install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ + install -m 0644 ${UNPACKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ } PACKAGES = "\ diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb index d618607496..c142f1dd02 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb @@ -23,7 +23,8 @@ SRC_URI = "git://github.com/google/fonts.git;protocol=https;branch=main;subpath= git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasanscondensed;name=firasanscondensed \ git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasansextracondensed;name=firasansextracondensed" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install:append() { install -d ${D}${datadir}/fonts/truetype/ diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb index 2ae1d619c0..5a8fe4c320 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb @@ -3,23 +3,23 @@ require ttf.inc SUMMARY = "Inconsolata font - TTF Version" HOMEPAGE = "http://www.levien.com/type/myfonts/inconsolata.html" LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://../OFL.txt;md5=969851e3a70122069a4d9ee61dd5a2ed" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/OFL.txt;md5=969851e3a70122069a4d9ee61dd5a2ed" SRC_URI = "http://levien.com/type/myfonts/Inconsolata.otf \ file://OFL.txt" -S = "${WORKDIR}/ttf-inconsolata-${PV}" +S = "${UNPACKDIR}/ttf-inconsolata-${PV}" FILES:${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ ${datadir}/doc/ttf-inconsolata/*" do_configure() { - cp -fr ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf + cp -fr ${UNPACKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf } do_install:append() { install -d ${D}${datadir}/doc/ttf-inconsolata/ - install -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ + install -m 0644 ${UNPACKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ } SRC_URI[md5sum] = "0fbe014c1f0fb5e3c71140ff0dc63edf" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb index f386d6ec58..a0fb7b6a79 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb @@ -22,7 +22,7 @@ do_install:append () { install -d ${D}${datadir}/fonts/TTF/ install -d ${D}${sysconfdir}/fonts/conf.d/ install -m 0644 LiberationSansNarrow*.ttf ${D}${datadir}/fonts/TTF/ - install -D -m 0644 ${WORKDIR}/30-0-liberation-sans-narrow.conf ${D}${sysconfdir}/conf.avail/30-${PN}-sans.conf + install -D -m 0644 ${UNPACKDIR}/30-0-liberation-sans-narrow.conf ${D}${sysconfdir}/conf.avail/30-${PN}-sans.conf install -D -m 0644 ${S}/License.txt ${D}${datadir}/licenses/${PN}/LICENSE # normal liberation fonts come from ttf-liberation recipe so delete here rm -rf ${D}${datadir}/fonts/truetype diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb index 3951647337..65d0f0bb35 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb @@ -10,7 +10,8 @@ SRC_URI[sha256sum] = "de5750f7048973f851961050f76b8b58e9bda400d5007c3078d9317fbe DEPENDS = "fontforge-native" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" FONT_PACKAGES = "${PN}" FILES:${PN} = "${datadir}" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb index e9aa5721f7..fce76418f9 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.paratype.com/public/" SECTION = "x11/fonts" LICENSE = "ParaTypeFFL-1.3" -LIC_FILES_CHKSUM = "file://../PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d" inherit allarch fontcache @@ -16,9 +16,10 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/paratype-pt-sans-fonts/PTSans SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7" SRC_URI[sha256sum] = "0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e" +S = "${UNPACKDIR}" + do_install () { install -d ${D}${datadir}/fonts/X11/TTF/ - cd .. for i in *.ttf; do install -m 0644 $i ${D}${prefix}/share/fonts/X11/TTF/${i} done diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb index 1870c78f99..3752ec39bc 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb @@ -9,6 +9,7 @@ SRC_URI = "https://github.com/google/roboto/releases/download/v${PV}/roboto-andr SRC_URI[md5sum] = "3b43a5cb33196ec25e44d5fcb40219e1" SRC_URI[sha256sum] = "c825453253f590cfe62557733e7173f9a421fff103b00f57d33c4ad28ae53baf" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" FILES:${PN} = "${datadir}/fonts/truetype/*.ttf" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb index 461e3def78..0131a62eef 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb @@ -3,7 +3,7 @@ require ttf.inc SUMMARY = "Thai Linux Working Group Fonts" HOMEPAGE = "http://linux.thai.net/projects/fonts-tlwg" LICENSE = "GPL-2.0-only & TLWG" -LIC_FILES_CHKSUM = "file://../fonts-tlwg-${PV}/COPYING;md5=3d20cd7eadf4afd5460c0adb32e387fd" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/fonts-tlwg-${PV}/COPYING;md5=3d20cd7eadf4afd5460c0adb32e387fd" SRC_URI = "http://linux.thai.net/pub/ThaiLinux/software/fonts-tlwg/fonts-tlwg-${PV}.tar.xz;name=source \ http://linux.thai.net/pub/ThaiLinux/software/ttf-tlwg/ttf-tlwg-${PV}.tar.xz;name=ttf" diff --git a/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.5.bb b/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb index f078ad60eb..0274608d05 100644 --- a/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.5.bb +++ b/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb @@ -9,9 +9,9 @@ It includes: \ xkbvleds - display the state of LEDs on an XKB keyboard in a window \ xkbwatch - reports changes in the XKB keyboard state \ " -LIC_FILES_CHKSUM = "file://COPYING;md5=64322fab5239f5c8d97cf6e0e14f1c62" +LIC_FILES_CHKSUM = "file://COPYING;md5=6767a97a97e21260134637b657b922ae" DEPENDS += "libxaw libxkbfile" SRC_URI_EXT = "xz" -SRC_URI[sha256sum] = "f6a4a8e9c54582beb3787b1faa8168caab125c1fee0ca9cfa5b6c9c1df25eea4" +SRC_URI[sha256sum] = "31a2bbee1e09ccba01de92897b8f540b545de812f318d31de07bd3a5a75ee25e" diff --git a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.7.bb b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb index e5cd0ce6fb..4ddb1b9887 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.7.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb @@ -7,4 +7,4 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" SRC_URI_EXT = "xz" -SRC_URI[sha256sum] = "7b726945a967b44c35cddee5edd74802907a239ce2e2e515730b8a32c8e50465" +SRC_URI[sha256sum] = "807f909eace684b866fc63b3e962729c120822a6c96e051ff51cf350b3ffb6cd" diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch deleted file mode 100644 index a6cf16e4e9..0000000000 --- a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch +++ /dev/null @@ -1,75 +0,0 @@ -From b23d38f1216c4d70738edaa367cf9ecd2dd4b660 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 13 Dec 2019 12:59:26 -0800 -Subject: [PATCH] Add configure time check for setsid - -Do not assume glibc == linux - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - configure | 1 + - configure.in | 1 + - main.c | 4 ++-- - xtermcfg.hin | 1 + - 4 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 72342c7..c2ec2ac 100755 ---- a/configure -+++ b/configure -@@ -5803,6 +5803,7 @@ for ac_func in \ - unsetenv \ - sched_yield \ - setpgid \ -+ setsid \ - strftime \ - tcgetattr \ - waitpid \ -diff --git a/configure.in b/configure.in -index 56dbc25..0608c80 100644 ---- a/configure.in -+++ b/configure.in -@@ -99,6 +99,7 @@ AC_CHECK_FUNCS( \ - unsetenv \ - sched_yield \ - setpgid \ -+ setsid \ - strftime \ - tcgetattr \ - waitpid \ -diff --git a/main.c b/main.c -index 24da0eb..332174c 100644 ---- a/main.c -+++ b/main.c -@@ -2956,7 +2956,7 @@ main(int argc, char *argv[]ENVP_ARG) - } - } - --#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -+#if defined(__osf__) || (defined(__linux__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) - #define USE_OPENPTY 1 - static int opened_tty = -1; - #endif -@@ -4205,7 +4205,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed) - /* - * now in child process - */ --#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) -+#if HAVE_SETSID - int pgrp = setsid(); /* variable may not be used... */ - #else - int pgrp = getpid(); -diff --git a/xtermcfg.hin b/xtermcfg.hin -index 19048cd..e54d2cd 100644 ---- a/xtermcfg.hin -+++ b/xtermcfg.hin -@@ -98,6 +98,7 @@ - #undef HAVE_SCHED_YIELD /* AC_CHECK_FUNCS(sched_yield) */ - #undef HAVE_SETITIMER /* CF_SETITIMER */ - #undef HAVE_SETPGID /* AC_CHECK_FUNCS(setpgid) */ -+#undef HAVE_SETSID /* AC_CHECK_FUNCS(setsid) */ - #undef HAVE_STDINT_H /* AC_PROG_CC_STDC */ - #undef HAVE_STDLIB_H /* AC_CHECK_HEADERS(stdlib.h) */ - #undef HAVE_STDNORETURN_H /* CF_C11_NORETURN */ diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch new file mode 100644 index 0000000000..0c9d64c82c --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch @@ -0,0 +1,30 @@ +From e30ab2d73a21bc55511cbedbb9ae603246dbfcd1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 16 May 2024 23:10:00 -0700 +Subject: [PATCH] include missing pty.h header for openpty() + +On musl this problem is unearthed + +Fix +./main.c: In function 'get_pty': +./main.c:3123:14: error: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration] + 3123 | result = openpty(pty, &opened_tty, ttydev, NULL, NULL); + | ^~~~~~~ + | openat + +Upstream-Status: Submitted [sent to dickey@invisible-island.net] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + main.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/main.c ++++ b/main.c +@@ -89,6 +89,7 @@ + + #define RES_OFFSET(field) XtOffsetOf(XTERM_RESOURCE, field) + ++#include <pty.h> + #include <xterm.h> + #include <version.h> + #include <graphics.h> diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_388.bb b/meta-oe/recipes-graphics/xorg-app/xterm_392.bb index 8578f0cc97..677f5c9994 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_388.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_392.bb @@ -2,13 +2,12 @@ require recipes-graphics/xorg-app/xorg-app-common.inc SUMMARY = "xterm is the standard terminal emulator for the X Window System" DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=9c96124b492c0c02356850c243aaeca2" +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=1a3032aa728f8fda9d686948940ca58d" SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://0001-Add-configure-time-check-for-setsid.patch \ + file://0001-include-missing-pty.h-header-for-openpty.patch \ " - -SRC_URI[sha256sum] = "ac429345e6f937a5945a89d425a265fee6c215fc669dbdc6a0326e21f4c5f674" +SRC_URI[sha256sum] = "4d57372ef08eafa9fb7682db8d07be0fe0513e58e8478c2ec8e9b62486e7fe5e" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb index 9f445ff265..8c26bf798c 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "b596168c4ed2f1023212dc828ce49cbe82a0bbd1aac3c5e2958154d788 do_install:append() { install -d ${D}${nonarch_base_libdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-xf86-input-tslib.rules ${D}${nonarch_base_libdir}/udev/rules.d/ + install -m 0644 ${UNPACKDIR}/99-xf86-input-tslib.rules ${D}${nonarch_base_libdir}/udev/rules.d/ } FILES:${PN} += "${nonarch_base_libdir}/udev" diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb index dc909ed78c..d698efa5e6 100644 --- a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb +++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb @@ -34,11 +34,11 @@ PACKAGECONFIG = "png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', PACKAGECONFIG[systemd] = "--with-systemd=yes,--with-systemd=no,systemd" PACKAGECONFIG[png] = "--with-png=yes,--with-png=no,libpng" -CONFIGUREOPTS:remove = "--disable-silent-rules --disable-dependency-tracking ${@append_libtool_sysroot(d)}" +CONFIGUREOPTS:remove = "--disable-silent-rules --disable-dependency-tracking" EXTRA_OECONF:remove = "--disable-static" do_install:append() { - install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service + install -D ${UNPACKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service for f in xscreensaver-getimage-file xscreensaver-getimage-video webcollage xscreensaver-text vidwhacker do sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" ${D}/${libexecdir}/${PN}/$f diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb index 0f1c8846b4..dcd3edaf34 100644 --- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb @@ -37,8 +37,8 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig do_install:append() { - if [ -e ${WORKDIR}/iana-enterprise-numbers ]; then - install -Dm 0755 ${WORKDIR}/iana-enterprise-numbers ${D}${datadir}/misc/enterprise-numbers + if [ -e ${UNPACKDIR}/iana-enterprise-numbers ]; then + install -Dm 0755 ${UNPACKDIR}/iana-enterprise-numbers ${D}${datadir}/misc/enterprise-numbers fi } @@ -57,3 +57,6 @@ EXTRA_OECONF = "--disable-dependency-tracking --enable-file-security --disable-i --disable-registry-download \ " +# http://errors.yoctoproject.org/Errors/Details/766896/ +# git/lib/ipmi_fru.c:1556:41: error: initialization of 'struct fru_multirec_mgmt *' from incompatible pointer type 'struct fru_multirect_mgmt *' [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 01f185adba..3f57ef3bfd 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -2,7 +2,7 @@ SUMMARY = "Kernel selftest for Linux" DESCRIPTION = "Kernel selftest for Linux" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://../COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS = "rsync-native llvm-native" @@ -120,7 +120,7 @@ do_install() { } do_configure() { - install -D -m 0644 ${WORKDIR}/COPYING ${S}/COPYING + install -D -m 0644 ${UNPACKDIR}/COPYING ${S}/COPYING } do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_unrelated" diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.0.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb index f2ec48f390..928482ba36 100644 --- a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.0.bb +++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238 DEPENDS = "zlib elfutils" -SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master" -SRCREV = "20ea95b4505c477af3b6ff6ce9d19cee868ddc5d" +SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.2" +SRCREV = "1b357586a7a62db7fe27af4ebe4bdefe6986cfd6" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux" diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch index 7ae0856f85..7eaf29e4c4 100644 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch +++ b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch @@ -1,4 +1,4 @@ -From 6650d0e79eea330b53635574885208a138fef97e Mon Sep 17 00:00:00 2001 +From ab6f78bfd6811c648ee71663cfc4dc8be151a519 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 21 Dec 2022 22:50:56 -0800 Subject: [PATCH] makefile: Do not preserve ownership in cp command @@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 27d425c..3aea142 100644 +index 7f4f5c3..1ba7b9d 100644 --- a/Makefile +++ b/Makefile -@@ -273,7 +273,7 @@ endif # DESTDIR = "" +@@ -296,7 +296,7 @@ endif # DESTDIR = "" install_libs: libs install_pkgconfig $(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)); \ @@ -26,6 +26,3 @@ index 27d425c..3aea142 100644 $(Q)$(call do_install,$(src)/include/tracefs.h,$(includedir_SQ),644) $(Q)$(call install_ld_config) --- -2.39.0 - diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch deleted file mode 100644 index a24dd1315b..0000000000 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f539d96ef4a34ad23d33c552d1770ab429b0220e Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 14 Jun 2023 00:24:36 -0700 -Subject: [PATCH] tracefs-perf: Add missing headers for syscall() and SYS_* - defines - -These headers are needed to provide prototype definitions for functions -e.g. close(), syscall(), getpagesize(), getpid() - -The issue is observed with clang-16+ compiler on musl systems - -Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20230614072759.316154-1-raj.khem@gmail.com/T/#u] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/tracefs-perf.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/tracefs-perf.c b/src/tracefs-perf.c -index 96d12cd..62c1508 100644 ---- a/src/tracefs-perf.c -+++ b/src/tracefs-perf.c -@@ -1,4 +1,5 @@ --#include <asm/unistd.h> -+#include <unistd.h> -+#include <sys/syscall.h> - #include <sys/mman.h> - #include <signal.h> - #include <linux/perf_event.h> --- -2.41.0 - diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.7.0.bb b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb index 9a408ba13c..c90ac19fa7 100644 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.7.0.bb +++ b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb @@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 SECTION = "libs" DEPENDS = "libtraceevent bison-native flex-native" -SRCREV = "aebab37379d0fbadc702d64aca0fe5cf18676404" +SRCREV = "67f3b2ab9f836e6c9c70c94db7aac3251119a263" SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \ file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \ - file://0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-kernel/linux/linux.inc b/meta-oe/recipes-kernel/linux/linux.inc index b4b0661225..79a916d46a 100644 --- a/meta-oe/recipes-kernel/linux/linux.inc +++ b/meta-oe/recipes-kernel/linux/linux.inc @@ -41,8 +41,8 @@ do_configure:prepend() { # # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used # - if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then - install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm + if [ -e ${UNPACKDIR}/logo_linux_clut224.ppm ]; then + install -m 0644 ${UNPACKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm kernel_conf_variable LOGO y kernel_conf_variable LOGO_LINUX_CLUT224 y fi diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb index 726aa60ce7..90e847c137 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb @@ -36,9 +36,9 @@ do_install:append() { cp -rf ${S}/etc/* ${D}/${sysconfdir}/ install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/minicoredumper.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/minicoredumper.service ${D}${systemd_system_unitdir} install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/minicoredumper.init ${D}${sysconfdir}/init.d/minicoredumper + install -m 0755 ${UNPACKDIR}/minicoredumper.init ${D}${sysconfdir}/init.d/minicoredumper # correct path of minicoredumper sed -i -e s:/usr/bin/minicoredumper:${sbindir}/minicoredumper:g ${D}${sysconfdir}/init.d/minicoredumper diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0011-replace-__FILE__-with-__FILE_NAME__.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0011-replace-__FILE__-with-__FILE_NAME__.patch new file mode 100644 index 0000000000..902032969e --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0011-replace-__FILE__-with-__FILE_NAME__.patch @@ -0,0 +1,47 @@ +From 640b116618b89eeddd61a91b793bb3c879adfe57 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 7 May 2024 19:56:59 -0700 +Subject: [PATCH] replace __FILE__ with __FILE_NAME__ + +This helps build paths not beeing assumed during runtime +since in cross-builds its possible that absolute paths during +build will not match runtime paths + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libutil++/tests/file_manip_tests.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libutil++/tests/file_manip_tests.cpp b/libutil++/tests/file_manip_tests.cpp +index dfe161b..3d960bc 100644 +--- a/libutil++/tests/file_manip_tests.cpp ++++ b/libutil++/tests/file_manip_tests.cpp +@@ -138,9 +138,9 @@ static void is_directory_tests() + static input_output<pair<string, string>, bool> + expect_is_files_identical[] = { + #define MAKE_PAIR(a, b) make_pair(string(a), string(b)) +- { MAKE_PAIR(__FILE__, __FILE__), true }, +- { MAKE_PAIR(__FILE__, "not_existing"), false }, +- { MAKE_PAIR("not_exisiting", __FILE__), false }, ++ { MAKE_PAIR(__FILE_NAME__, __FILE_NAME__), true }, ++ { MAKE_PAIR(__FILE_NAME__, "not_existing"), false }, ++ { MAKE_PAIR("not_exisiting", __FILE_NAME__), false }, + { MAKE_PAIR("not_exisiting", "not_existing"), false }, + { MAKE_PAIR("", ""), false } + #undef MAKE_PAIR +@@ -163,8 +163,8 @@ void is_files_identical_tests(char const * prog_name) + + static input_output<char const *, bool> expect_op_file_readable[] = + { +- { __FILE__, true }, +- { "./" __FILE__, true }, ++ { __FILE_NAME__, true }, ++ { "./" __FILE_NAME__, true }, + { ".", false }, + { "/.", false }, + { "./", false }, +-- +2.45.0 + diff --git a/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb b/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb index 092d22746a..45f70aa381 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb +++ b/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb @@ -30,6 +30,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0008-include-linux-limits.h-for-MAX_INPUT.patch \ file://0009-Prevent-running-check-tests-on-host-if-cross-compili.patch \ file://0010-oprofile-Determine-the-root-home-directory-dynamical.patch \ + file://0011-replace-__FILE__-with-__FILE_NAME__.patch \ file://0001-configure-Include-unistd.h-for-getpid-API.patch \ file://0001-Replace-std-bind2nd-with-generic-lambda.patch \ " @@ -42,7 +43,7 @@ inherit autotools pkgconfig ptest EXTRA_OECONF = "--with-kernel=${STAGING_DIR_HOST}${prefix} --without-x ac_cv_prog_XSLTPROC=" do_configure () { - cp ${WORKDIR}/acinclude.m4 ${S}/ + cp ${UNPACKDIR}/acinclude.m4 ${S}/ autotools_do_configure } diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index bdc37c0382..02a6952188 100644 --- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb @@ -12,7 +12,7 @@ processor frequency and idle power saving state residency on supported \ processors." LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://../COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' COMPATIBLE_HOST:libc-musl = "null" @@ -50,7 +50,7 @@ do_configure:prepend() { cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} fi cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} - cp -r ${WORKDIR}/COPYING ${S} + cp -r ${UNPACKDIR}/COPYING ${S} } diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 9fd91114d7..225bc8ecb9 100644 --- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -13,6 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0001-genisoimage-Add-missing-extern-definition.patch \ file://0001-add-new-option-eltorito-platform.patch \ file://0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch \ + file://fix-incompatible-pointer-type-error.patch \ " SRC_URI:append:class-nativesdk = " \ file://0001-install-netscsid-to-bin-for-nativesdk.patch \ @@ -62,3 +63,8 @@ do_install:append() { } BBCLASSEXTEND = "native nativesdk" + +# http://errors.yoctoproject.org/Errors/Details/766905/ +# cdrkit/1.1.11/cdrkit-1.1.11/genisoimage/eltorito.c:399:41: error: passing argument 1 of 'set_721' from incompatible pointer type [-Wincompatible-pointer-types] +# cdrkit/1.1.11/cdrkit-1.1.11/genisoimage/eltorito.c:422:25: error: passing argument 1 of 'set_721' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-multimedia/cdrkit/files/fix-incompatible-pointer-type-error.patch b/meta-oe/recipes-multimedia/cdrkit/files/fix-incompatible-pointer-type-error.patch new file mode 100644 index 0000000000..887a54f7f2 --- /dev/null +++ b/meta-oe/recipes-multimedia/cdrkit/files/fix-incompatible-pointer-type-error.patch @@ -0,0 +1,44 @@ +Fix incompatible pointer type error when gcc option '-Wincompatible-pointer-types' set: + +cdrkit-1.1.11/genisoimage/eltorito.c:399:41: error: passing argument 1 of 'set_721' from incompatible pointer type [-Wincompatible-pointer-types] + 399 | set_721(&last_section_header->entry_count, nentries); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | | + | char (*)[2] +In file included from cdrkit/1.1.11/cdrkit-1.1.11/genisoimage/eltorito.c:39: +cdrkit-1.1.11/genisoimage/genisoimage.h:507:21: note: expected 'char *' but argument is of type 'char (*)[2]' + 507 | extern void set_721(char *, unsigned int); + | ^~~~~~ + +Upstream-Status: Inactive-Upstream [lastrelease: 2010] + +[1]: https://en.wikipedia.org/wiki/Cdrkit + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +--- + genisoimage/eltorito.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/genisoimage/eltorito.c b/genisoimage/eltorito.c +index a804988..e48d58c 100644 +--- a/genisoimage/eltorito.c ++++ b/genisoimage/eltorito.c +@@ -396,7 +396,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) + (arch != newarch) || + (current_boot_entry->type & ELTORITO_SECTION_HEADER)) { + if (last_section_header) +- set_721(&last_section_header->entry_count, nentries); ++ set_721((char *)(&last_section_header->entry_count), nentries); + nentries = 1; + last_section_header = (struct eltorito_sectionheader_entry *) + (de2->table + offset); +@@ -419,7 +419,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) + } + + if (last_section_header) { +- set_721(&last_section_header->entry_count, nentries); ++ set_721((char *)(&last_section_header->entry_count), nentries); + last_section_header->header_id[0] = EL_TORITO_SHDR_ID_LAST_SHDR; + } + diff --git a/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb b/meta-oe/recipes-multimedia/libass/libass_0.17.2.bb index 800ad1b15e..e239d028eb 100644 --- a/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb +++ b/meta-oe/recipes-multimedia/libass/libass_0.17.2.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75" DEPENDS = "fontconfig freetype fribidi harfbuzz" -SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=0.17.1-branch" -SRCREV = "e8ad72accd3a84268275a9385beb701c9284e5b3" +SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=master" +SRCREV = "cbb48cc4f2f076300004b8b06a86bec55281d0c2" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-oe/recipes-multimedia/live555/live555_20210824.bb b/meta-oe/recipes-multimedia/live555/live555_20210824.bb index a899049b77..80c770c3e3 100644 --- a/meta-oe/recipes-multimedia/live555/live555_20210824.bb +++ b/meta-oe/recipes-multimedia/live555/live555_20210824.bb @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ TARGET_CC_ARCH += "${LDFLAGS}" do_configure() { - cp ${WORKDIR}/config.linux-cross . + cp ${UNPACKDIR}/config.linux-cross . echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross ./genMakefiles linux-cross } diff --git a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch index 463651aa4a..bd3d697885 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch +++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch @@ -1,4 +1,4 @@ -From 2829e6998b7595dd2108c1497fdd02485ef99e2c Mon Sep 17 00:00:00 2001 +From 1bbbf27a23c91dcc271b773a97153063461b986d Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Tue, 16 Aug 2011 16:04:35 +0200 Subject: [PATCH] Upstream: not yet @@ -11,10 +11,10 @@ Upstream-Status: Pending 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/build/make/configure.sh b/build/make/configure.sh -index b645a666f..0b99a8b38 100644 +index 93643f3de..e84198200 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -658,6 +658,8 @@ process_common_cmdline() { +@@ -692,6 +692,8 @@ process_common_cmdline() { ;; --prefix=*) prefix="${optval}" @@ -23,7 +23,7 @@ index b645a666f..0b99a8b38 100644 ;; --libdir=*) libdir="${optval}" -@@ -687,13 +689,23 @@ process_cmdline() { +@@ -721,13 +723,23 @@ process_cmdline() { } post_process_common_cmdline() { diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.14.1.bb index b4d49842ea..f32c7842c3 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.14.1.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRCREV = "602e2e8979d111b02c959470da5322797dd96a19" +SRCREV = "12f3a2ac603e8f10742105519e0cd03c3b8f71dd" SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ file://libvpx-configure-support-blank-prefix.patch \ " diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb index a755e39ed4..ddea8ad2e3 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb @@ -68,7 +68,7 @@ do_install() { do_install:append() { install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gpsd.init ${D}${sysconfdir}/init.d/gpsd + install -m 0755 ${UNPACKDIR}/gpsd.init ${D}${sysconfdir}/init.d/gpsd install -d ${D}${sysconfdir}/default install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}${sysconfdir}/default/gpsd.default diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch deleted file mode 100644 index 829ace09b5..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e13f15205425c67e1101031a33107fa9cd2d65f9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 26 May 2023 10:32:53 -0700 -Subject: [PATCH] Append cflags instead of overriding in Makefile.am - -Fixes -WARNING: orrery-2.7-r0 do_package_qa: QA Issue: File /usr/bin/.debug/orrery in package orrery-dbg contains reference to TMPDIR [buildpaths] - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index b64449f..23637b3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --CFLAGS = -g -O3 -Wall -+CFLAGS += -g -O3 -Wall - - bin_PROGRAMS = orrery - orrery_SOURCES = planetInfo.c orrery.c orrery.h phaseConstants.h --- -2.40.1 - diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch deleted file mode 100644 index 3d5828011a..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e600d3c09d2f97a197f86e6987d44d142e7b7cdf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 21:12:17 -0700 -Subject: [PATCH] orrery: Fix sprintf format - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - orrery.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/orrery.c b/orrery.c -index e3a1f6d..1b31a9f 100644 ---- a/orrery.c -+++ b/orrery.c -@@ -3767,7 +3767,7 @@ static void drawOptsScreens(void) - displayWidth/2 - gdk_string_width(smallFont, scratchString)/2, - 12, scratchString); - for (day = 0; day < 7; day++) { -- sprintf(scratchString, dayName[day]); -+ sprintf(scratchString, "%s", dayName[day]); - gdk_draw_string(pixmap, smallFont, blueGC, - CAL_DAY_WIDTH/2 + day*CAL_DAY_WIDTH + CAL_LEFT_OFFSET - - gdk_string_width(smallFont, scratchString)/2, --- -2.13.2 - diff --git a/meta-oe/recipes-navigation/orrery/orrery/orrery.png b/meta-oe/recipes-navigation/orrery/orrery/orrery.png Binary files differdeleted file mode 100644 index d9865b70ce..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/orrery.png +++ /dev/null diff --git a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch deleted file mode 100644 index 2abb320d83..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch +++ /dev/null @@ -1,61 +0,0 @@ -Upstream-Status: Pending - -From: Benjamin Deering -Subject: orrery crashing X -Date: Thursday, September 2, 2010 - 5:25 pm -Link: http://kerneltrap.org/mailarchive/openmoko-community/2010/9/3/13218 - -diff -uNr orrery.orig//orrery.c orrery/orrery.c ---- orrery.orig//orrery.c 2009-11-30 06:59:44.000000000 +0100 -+++ orrery/orrery.c 2010-11-15 22:33:17.000000000 +0100 -@@ -1238,12 +1238,44 @@ - } - currentEntry = currentEntry->forwardPointer; - } -- if (nDarkGreyPoints > 0) -- gdk_draw_points(pixmap, darkGreyGC, darkGreyPoints, nDarkGreyPoints); -- if (nGreyPoints > 0) -- gdk_draw_points(pixmap, greyGC, greyPoints, nGreyPoints); -- if (nWhitePoints > 0) -- gdk_draw_points(pixmap, whiteGC, whitePoints, nWhitePoints); -+ GdkPixbuf* starDrawingBuf = gdk_pixbuf_get_from_drawable( NULL, -+ pixmap, -+ gdk_colormap_get_system() -+ , 0, 0, 0, 0, displayWidth, displayHeight); -+ g_assert (gdk_pixbuf_get_bits_per_sample (starDrawingBuf) == 8); -+ guchar* p; -+ int rowstride = gdk_pixbuf_get_rowstride (starDrawingBuf); -+ guchar* pixels = gdk_pixbuf_get_pixels (starDrawingBuf); -+ int n_channels = gdk_pixbuf_get_n_channels (starDrawingBuf); -+ GdkGCValues starGCval; -+ GdkColor starColor; -+ int pointNum; -+ gdk_gc_get_values(darkGreyGC, &starGCval); -+ gdk_colormap_query_color( gdk_gc_get_colormap(darkGreyGC),starGCval.foreground.pixel, &starColor ); -+ for( pointNum = 0; pointNum < nDarkGreyPoints; pointNum++) { -+ p = pixels + darkGreyPoints[pointNum].y * rowstride + darkGreyPoints[pointNum].x * n_channels; -+ p[0] = starColor.red & 0xff; -+ p[1] = starColor.green & 0xff; -+ p[2] = starColor.blue & 0xff; -+ } -+ gdk_gc_get_values(greyGC, &starGCval); -+ gdk_colormap_query_color( gdk_gc_get_colormap(greyGC), starGCval.foreground.pixel, &starColor ); -+ for( pointNum = 0; pointNum < nGreyPoints; pointNum++) { -+ p = pixels + greyPoints[pointNum].y * rowstride + greyPoints[pointNum].x * n_channels; -+ p[0] = starColor.red & 0xff; -+ p[1] = starColor.green & 0xff; -+ p[2] = starColor.blue & 0xff; -+ } -+ gdk_gc_get_values(whiteGC, &starGCval); -+ gdk_colormap_query_color( gdk_gc_get_colormap(whiteGC), starGCval.foreground.pixel, &starColor ); -+ for( pointNum = 0; pointNum < nWhitePoints; pointNum++) { -+ p = pixels + whitePoints[pointNum].y * rowstride + whitePoints[pointNum].x * n_channels; -+ p[0] = starColor.red & 0xff; -+ p[1] = starColor.green & 0xff; -+ p[2] = starColor.blue & 0xff; -+ } -+ gdk_draw_pixbuf ( pixmap , NULL , starDrawingBuf, -+ 0, 0, 0, 0, displayWidth, displayHeight, GDK_RGB_DITHER_NORMAL, 0, 0 ) ; - } - - void makeTimeString(char *string) diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb deleted file mode 100644 index 96a7018de2..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Astronomical application which displays the night sky" -HOMEPAGE = "http://projects.openmoko.org/projects/orrery/" -SECTION = "x11/scientific" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe" -DEPENDS = "gtk+" - -inherit features_check autotools-brokensep pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \ - file://orrery.png \ - file://use.GdkPixbuf.patch \ - file://0001-orrery-Fix-sprintf-format.patch \ - file://0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch \ - " - -SRC_URI[md5sum] = "bd62a33e7554ee1030313dfcdefcda8b" -SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6" - -S = "${WORKDIR}/${BPN}" - -do_configure:prepend() { - # fix DSO issue with binutils-2.22 - sed -i 's/ -lrt$/ -lrt -lm/g' ${S}/Makefile.am -} -do_install:append() { - install -d ${D}${datadir}/orrery - cp -R --no-dereference --preserve=mode,links -v ${S}/data/* ${D}${datadir}/orrery - chown -R root:root ${D}${datadir}/orrery - install -d ${D}${datadir}/icons - install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons - rm -rf ${D}${datadir}/orrery/Makefile* -} - -FILES:${PN} += "${datadir}/icons/orrery.png" diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb index d85ef20577..a6703ecf8d 100644 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb @@ -58,7 +58,7 @@ do_compile:prepend () { do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/saslauthd.service ${D}${systemd_unitdir}/system sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/saslauthd.service sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/saslauthd.service @@ -68,7 +68,7 @@ do_install:append() { echo "d /run/saslauthd/ - - - -" > ${D}${sysconfdir}/tmpfiles.d/saslauthd.conf install -d ${D}${sysconfdir}/default/ - install -m 0644 ${WORKDIR}/saslauthd.conf ${D}${sysconfdir}/default/saslauthd + install -m 0644 ${UNPACKDIR}/saslauthd.conf ${D}${sysconfdir}/default/saslauthd sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/default/saslauthd fi } diff --git a/meta-oe/recipes-security/audit/audit_4.0.1.bb b/meta-oe/recipes-security/audit/audit_4.0.1.bb index a37ae3bb84..c189cfea55 100644 --- a/meta-oe/recipes-security/audit/audit_4.0.1.bb +++ b/meta-oe/recipes-security/audit/audit_4.0.1.bb @@ -90,11 +90,11 @@ do_install:append() { install -m 0640 ${D}/etc/audit/rules.d/audit.rules ${D}/etc/audit/audit.rules if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0644 ${WORKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/audit.conf + install -D -m 0644 ${UNPACKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/audit.conf fi if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -D -m 0755 ${WORKDIR}/auditd ${D}/etc/init.d/auditd + install -D -m 0755 ${UNPACKDIR}/auditd ${D}/etc/init.d/auditd rm -rf ${D}${libdir}/systemd fi diff --git a/meta-oe/recipes-security/bubblewrap/bubblewrap_0.8.0.bb b/meta-oe/recipes-security/bubblewrap/bubblewrap_0.9.0.bb index 06c42addbf..c60c1dfd63 100644 --- a/meta-oe/recipes-security/bubblewrap/bubblewrap_0.8.0.bb +++ b/meta-oe/recipes-security/bubblewrap/bubblewrap_0.9.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" DEPENDS = "libcap" SRC_URI = "https://github.com/containers/${BPN}/releases/download/v${PV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "957ad1149db9033db88e988b12bcebe349a445e1efc8a9b59ad2939a113d333a" +SRC_URI[sha256sum] = "c6347eaced49ac0141996f46bba3b089e5e6ea4408bc1c43bab9f2d05dd094e1" inherit autotools bash-completion github-releases manpages pkgconfig diff --git a/meta-oe/recipes-support/atop/atop_2.4.0.bb b/meta-oe/recipes-support/atop/atop_2.4.0.bb index bb1f53624a..4b0e74227b 100644 --- a/meta-oe/recipes-support/atop/atop_2.4.0.bb +++ b/meta-oe/recipes-support/atop/atop_2.4.0.bb @@ -35,12 +35,12 @@ do_install() { make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \ PMPATHD=${systemd_unitdir}/system-sleep systemdinstall install -d ${D}${sysconfdir}/tmpfiles.d - install -m 644 ${WORKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf + install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf rm -f ${D}${systemd_system_unitdir}/atopacct.service else make DESTDIR=${D} VERS=${PV} sysvinstall install -d ${D}${sysconfdir}/default/volatiles - install -m 644 ${WORKDIR}/volatiles.99_atop ${D}${sysconfdir}/default/volatiles/99_atop + install -m 644 ${UNPACKDIR}/volatiles.99_atop ${D}${sysconfdir}/default/volatiles/99_atop rm -f ${D}${sysconfdir}/init.d/atopacct fi diff --git a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb index 6ec25bdd2b..0ac1decccf 100644 --- a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb +++ b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb @@ -20,3 +20,8 @@ S = "${WORKDIR}/git/lang/c++" inherit cmake pkgconfig BBCLASSEXTEND = "native nativesdk" + +# http://errors.yoctoproject.org/Errors/Details/766913/ +# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:304:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference] +# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:370:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference] +CXXFLAGS += "-Wno-error=dangling-reference" diff --git a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb index bb7f53e459..bf84242e29 100644 --- a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb +++ b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb @@ -15,3 +15,9 @@ SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ S = "${WORKDIR}/git/lang/c" inherit cmake pkgconfig + +# http://errors.yoctoproject.org/Errors/Details/766902/ +# avro-c/1.11.3/git/lang/c/examples/quickstop.c:123:61: error: passing argument 3 of 'first_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] +# avro-c/1.11.3/git/lang/c/examples/quickstop.c:127:60: error: passing argument 3 of 'last_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] +# avro-c/1.11.3/git/lang/c/examples/quickstop.c:131:61: error: passing argument 3 of 'phone_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb index 2d91ac1731..d0f5b30eb7 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb @@ -20,7 +20,7 @@ EXTRA_OECMAKE = "-DCARES_STATIC=${@ 'ON' if d.getVar('DISABLE_STATIC') == '' els do_install_ptest () { install -d ${D}${PTEST_PATH} install -m 0755 ${B}/bin/arestest ${D}${PTEST_PATH} - install -m 0755 ${WORKDIR}/run-ptest ${D}${PTEST_PATH} + install -m 0755 ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH} } PACKAGE_BEFORE_PN = "${PN}-utils" diff --git a/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-oe/recipes-support/ckermit/ckermit_302.bb index 53f2b9d2c5..72a2e16e45 100644 --- a/meta-oe/recipes-support/ckermit/ckermit_302.bb +++ b/meta-oe/recipes-support/ckermit/ckermit_302.bb @@ -45,7 +45,7 @@ do_compile () { -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ - -DNOARROWKEYS" + -DNOARROWKEYS -DMAINTYPE=int" } do_install () { @@ -55,3 +55,11 @@ do_install () { rm ${D}${BINDIR}/kermit-sshsub (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb) } + +# This one is reproducible only on 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766966/ +# ckutio.c:12057:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] +# ckutio.c:12058:20: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] +# ckufio.c:5043:32: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] +# ckufio.c:5263:32: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch index aae2be8c1e..a120b73114 100644 --- a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch +++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch @@ -1,4 +1,4 @@ -From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001 +From d16aed3118bee1e0a7d0bc9e0f34c427a405a6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Sun, 12 May 2019 21:58:02 +0200 Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev @@ -89,10 +89,10 @@ index a5e2328..dec509a 100644 +} + diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c -index 8beec43..398ff7a 100644 +index 3937d8a..daf6f4d 100644 --- a/lib/colord/cd-icc.c +++ b/lib/colord/cd-icc.c -@@ -3114,68 +3114,6 @@ cd_icc_create_default (CdIcc *icc, GError **error) +@@ -3117,68 +3117,6 @@ cd_icc_create_default (CdIcc *icc, GError **error) return cd_icc_create_default_full (icc, CD_ICC_LOAD_FLAGS_NONE, error); } @@ -161,6 +161,3 @@ index 8beec43..398ff7a 100644 /** * cd_icc_create_from_edid: * @icc: A valid #CdIcc --- -2.20.1 - diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc index 0ae1a30fe6..cafbaaa696 100644 --- a/meta-oe/recipes-support/colord/colord.inc +++ b/meta-oe/recipes-support/colord/colord.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ " -PV = "1.4.6" +PV = "1.4.7" SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "7407631a27bfe5d1b672e7ae42777001c105d860b7b7392283c8c6300de88e6f" +SRC_URI[sha256sum] = "de02d9910634ae159547585cec414e450f711c27235453b4f9b38a9f2361a653" diff --git a/meta-filesystems/recipes-support/composefs/composefs_1.0.3.bb b/meta-oe/recipes-support/composefs/composefs_1.0.4.bb index 7607b0a12c..aaf33b40ec 100644 --- a/meta-filesystems/recipes-support/composefs/composefs_1.0.3.bb +++ b/meta-oe/recipes-support/composefs/composefs_1.0.4.bb @@ -1,4 +1,7 @@ SUMMARY = "Tools to handle creating and mounting composefs images" +DESCRIPTION = "The composefs project combines several underlying Linux \ +features to provide a very flexible mechanism to support read-only mountable \ +filesystem trees, stacking on top of an underlying "lower" Linux filesystem." HOMEPAGE = "https://github.com/containers/composefs" LICENSE = "GPL-3.0-or-later & LGPL-2.0-or-later & Apache-2.0" LIC_FILES_CHKSUM = "\ @@ -9,15 +12,22 @@ LIC_FILES_CHKSUM = "\ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -DEPENDS = "fuse3 openssl" -SRCREV = "2d5cdcb9176cfe4ccf1761ef6d78e1c48de35649" -PV = "1.0.3" -SRC_URI = "\ - git://github.com/containers/composefs.git;protocol=https;branch=main \ - file://0001-musl-basename-use-portable-implementation-for-basena.patch \ -" +PV .= "+git${SRCPV}" +SRCREV = "7623e4dc89f62ada5724d4e41d0a16d2671312f5" +SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" S = "${WORKDIR}/git" inherit autotools pkgconfig + +DEPENDS = "openssl" + +EXTRA_OECONF += " \ + --disable-man \ + --without-fuse \ +" + +LDFLAGS:append:class-native = " -pthread" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb index d53e1a276b..4247263b5a 100644 --- a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb +++ b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb @@ -3,7 +3,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116" GO_IMPORT = "github.com/usbarmory/crucible" -SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master" +SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX}" GO_INSTALL = "\ ${GO_IMPORT}/cmd/crucible \ diff --git a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb index 0e994d8b09..90db08544d 100644 --- a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb +++ b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb @@ -2,15 +2,15 @@ SUMMARY = "Common files and packaging infrastructure for CT-API modules" HOMEPAGE = "http://fedoraproject.org/" SECTION = "System Environment/Libraries" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://../ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91" do_compile() { - install -pm 644 ${WORKDIR}/ctapi-common.LICENSE LICENSE - install -pm 644 ${WORKDIR}/ctapi-common.README README + install -pm 644 ${UNPACKDIR}/ctapi-common.LICENSE LICENSE + install -pm 644 ${UNPACKDIR}/ctapi-common.README README echo ${libdir}/ctapi > ctapi.conf } diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index a35b54e3bc..73d995c87c 100644 --- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb @@ -46,3 +46,10 @@ do_install:append:class-target() { inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE:${PN} = "svc svok" + +# http://errors.yoctoproject.org/Errors/Details/766886/ +# pathexec_run.c:19:17: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +# pathexec_run.c:19:22: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +# pathexec_run.c:36:18: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +# pathexec_run.c:36:23: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +CC += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/dool/dool_1.3.1.bb b/meta-oe/recipes-support/dool/dool_1.3.2.bb index b20f8b4015..f7e403018c 100644 --- a/meta-oe/recipes-support/dool/dool_1.3.1.bb +++ b/meta-oe/recipes-support/dool/dool_1.3.2.bb @@ -12,7 +12,7 @@ RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell pyth SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \ " -SRCREV = "30847c748483bc088549486292232d805b086b1f" +SRCREV = "b2862905be841232c9e36ce1e059d3fe34ef0cdf" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-oe/recipes-support/fbset/fbset-modes.bb index aa5f631c38..fcaf31795b 100644 --- a/meta-oe/recipes-support/fbset/fbset-modes.bb +++ b/meta-oe/recipes-support/fbset/fbset-modes.bb @@ -6,11 +6,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 PV = "0.1.0" SRC_URI = "file://fb.modes" -S = "${WORKDIR}" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir} + install -m 0644 ${UNPACKDIR}/fb.modes ${D}${sysconfdir} } # fb.modes file is MACHINE_ARCH, base.bbclass correctly changes it to MACHINE_ARCH, but too late for allarch.bbclass diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch new file mode 100644 index 0000000000..62600cddab --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch @@ -0,0 +1,72 @@ +From 130094de3244d5039e463e1142e1ec487c1104ef Mon Sep 17 00:00:00 2001 +From: Armin Novak <armin.novak@thincast.com> +Date: Tue, 22 Feb 2022 12:05:08 +0100 +Subject: [PATCH] Fixed compilation warnings in ainput channel + +Upstream-Status: Backport [130094de3 Fixed compilation warnings in ainput channel] +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- + channels/ainput/server/ainput_main.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c +index bc1737ee1..17d2ec681 100644 +--- a/channels/ainput/server/ainput_main.c ++++ b/channels/ainput/server/ainput_main.c +@@ -192,7 +192,7 @@ static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s) + + static HANDLE ainput_server_get_channel_handle(ainput_server* ainput) + { +- BYTE* buffer = NULL; ++ void* buffer = NULL; + DWORD BytesReturned = 0; + HANDLE ChannelEvent = NULL; + +@@ -389,7 +389,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm) + goto fail; + return &ainput->context; + fail: +- ainput_server_context_free(ainput); ++ ainput_server_context_free(&ainput->context); + return NULL; + } + +@@ -496,17 +496,23 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) + break; + case AINPUT_OPENED: + { +- BYTE* buffer = NULL; ++ union ++ { ++ BYTE* pb; ++ void* pv; ++ } buffer; + DWORD BytesReturned = 0; + +- if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer, ++ buffer.pv = NULL; ++ ++ if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer.pv, + &BytesReturned) != TRUE) + { + WLog_ERR(TAG, "WTSVirtualChannelReady failed,"); + } + else + { +- if (*buffer != 0) ++ if (*buffer.pb != 0) + { + error = ainput_server_send_version(ainput); + if (error) +@@ -518,7 +524,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) + else + error = CHANNEL_RC_OK; + } +- WTSFreeMemory(buffer); ++ WTSFreeMemory(buffer.pv); + } + break; + case AINPUT_VERSION_SENT: +-- +2.43.0 + diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch new file mode 100644 index 0000000000..7fae2703f8 --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch @@ -0,0 +1,27 @@ +From 75fa1fa5bd5ef2350390564245fd0984209ac092 Mon Sep 17 00:00:00 2001 +From: akallabeth <akallabeth@posteo.net> +Date: Mon, 4 Jul 2022 14:34:46 +0200 +Subject: [PATCH] Fixed compilation warnings + +Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/2da280b8a1748052b70b3f5a1ef0d8e932c33adc] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + client/X11/xf_graphics.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c +index 5aa1fd48b..fe81e0ed9 100644 +--- a/client/X11/xf_graphics.c ++++ b/client/X11/xf_graphics.c +@@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) + + #endif + fail: +- WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1); ++ WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL); + return rc; + } + +-- +2.45.0 + diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb index 537d19263d..b6974af739 100644 --- a/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb @@ -7,7 +7,7 @@ DEPENDS = "openssl libusb1 uriparser cairo icu pkcs11-helper zlib jpeg" inherit pkgconfig cmake -SRCREV = "708f3764897e06297469a7b0507b3c9ecc041ad7" +SRCREV = "eda5c99686e15327f2f37b9cadf307e852b96adf" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb index 8de0e39ad7..ee4d4530d6 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb @@ -13,11 +13,13 @@ inherit pkgconfig cmake gitpkgv PE = "1" PKGV = "${GITPKGVTAG}" -SRCREV = "a38c1be9eee39a9bc22b511fffe96e63fdf8ebe7" +SRCREV = "efa899d3deb8595a29fabb2a2251722f9d7e0d7f" SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ file://winpr-makecert-Build-with-install-RPATH.patch \ + file://0001-Fixed-compilation-warnings.patch \ file://0001-Fix-const-qualifier-error.patch \ file://0002-Do-not-install-tools-a-CMake-targets.patch \ + file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/fuse/fuse3/fuse3.conf b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf new file mode 100644 index 0000000000..a517c488f3 --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf @@ -0,0 +1 @@ +fuse diff --git a/meta-filesystems/recipes-support/fuse/fuse3/run-ptest b/meta-oe/recipes-support/fuse/fuse3/run-ptest index b63c4de0d9..b63c4de0d9 100644 --- a/meta-filesystems/recipes-support/fuse/fuse3/run-ptest +++ b/meta-oe/recipes-support/fuse/fuse3/run-ptest diff --git a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb index 2b0797a6f5..47b070557d 100644 --- a/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb +++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb @@ -13,8 +13,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66 \ " -SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz \ -" +SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz" SRC_URI[sha256sum] = "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87" S = "${WORKDIR}/fuse-${PV}" @@ -28,6 +27,7 @@ inherit meson pkgconfig ptest SRC_URI += " \ file://run-ptest \ + file://fuse3.conf \ " RDEPENDS:${PN}-ptest += " \ @@ -79,6 +79,20 @@ FILES:fuse3-utils = "${bindir} ${base_sbindir}" DEBIAN_NOAUTONAME:fuse3-utils = "1" DEBIAN_NOAUTONAME:${PN}-dbg = "1" +SYSTEMD_SERVICE:${PN} = "" + do_install:append() { rm -rf ${D}${base_prefix}/dev + + # systemd class remove the sysv_initddir only if systemd_system_unitdir + # contains anything, but it's not needed if sysvinit is not in DISTRO_FEATURES + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then + rm -rf ${D}${sysconfdir}/init.d/ + fi + + # Install systemd related configuration file + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/modules-load.d + install -m 0644 ${UNPACKDIR}/fuse3.conf ${D}${sysconfdir}/modules-load.d + fi } diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch new file mode 100644 index 0000000000..3017314abe --- /dev/null +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch @@ -0,0 +1,33 @@ +From 7f0e99af540a333108b92d792923ec7fc9e9fad9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 28 May 2024 20:14:54 -0700 +Subject: [PATCH] cycleclock: Fix type conversion to match function return type + (#1794) + +fixes build with clang19 + +src/cycleclock.h:208:52: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long long') to 'int64_t' (aka 'long long') [-Werror,-Wsign-conversion] + 208 | return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo; + | ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~ +1 error generated. + +Upstream-Status: Backport [https://github.com/google/benchmark/commit/7f0e99af540a333108b92d792923ec7fc9e9fad9] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/cycleclock.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/cycleclock.h b/src/cycleclock.h +index a25843760..c657414e5 100644 +--- a/src/cycleclock.h ++++ b/src/cycleclock.h +@@ -205,7 +205,8 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { + "sub %0, zero, %0\n" + "and %1, %1, %0\n" + : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1)); +- return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo; ++ return static_cast<int64_t>((static_cast<uint64_t>(cycles_hi1) << 32) | ++ cycles_lo); + #else + uint64_t cycles; + asm volatile("rdtime %0" : "=r"(cycles)); diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.3.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb index f945a30f36..34732b42d9 100644 --- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.3.bb +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb @@ -4,8 +4,9 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main" -SRCREV = "344117638c8ff7e239044fd0fa7085839fc03021" +SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main \ + file://0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch" +SRCREV = "a4cf155615c63e019ae549e31703bf367df5b471" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/gosu/gosu_1.17.bb b/meta-oe/recipes-support/gosu/gosu_1.17.bb index a29d6bce45..6a4441fc24 100644 --- a/meta-oe/recipes-support/gosu/gosu_1.17.bb +++ b/meta-oe/recipes-support/gosu/gosu_1.17.bb @@ -5,9 +5,9 @@ LICENSE = "Apache-2.0 " LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" GO_IMPORT = "github.com/tianon/gosu" -SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \ - git://github.com/moby/sys;name=user;destsuffix=${S}/src/github.com/moby/sys;branch=main;protocol=https \ - git://github.com/golang/sys;name=sys;destsuffix=${S}/src/golang.org/x/sys;branch=master;protocol=https \ +SRC_URI = "git://${GO_IMPORT}.git;destsuffix=src/${GO_IMPORT};branch=master;protocol=https \ + git://github.com/moby/sys;name=user;destsuffix=src/github.com/moby/sys;branch=main;protocol=https \ + git://github.com/golang/sys;name=sys;destsuffix=src/golang.org/x/sys;branch=master;protocol=https \ " SRCREV = "0d1847490b448a17eb347e5e357f2c0478df87ad" #v0.1.0 @@ -17,6 +17,7 @@ SRCREV_sys = "95e765b1cc43ac521bd4fd501e00774e34401449" SRCREV_FORMAT .= "_user_sys" +S = "${UNPACKDIR}" inherit go CGO_ENABLED = "1" diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb index 31503e9c62..25e5414a35 100644 --- a/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-oe/recipes-support/gpm/gpm_git.bb @@ -30,8 +30,8 @@ do_configure:prepend() { 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 + sed 's:@bindir@:${sbindir}:' < ${UNPACKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service + install -D -m 0755 ${UNPACKDIR}/init ${D}${INIT_D_DIR}/gpm ln -s libgpm.so.2 ${D}${libdir}/libgpm.so } diff --git a/meta-oe/recipes-support/gsl/gsl_2.7.1.bb b/meta-oe/recipes-support/gsl/gsl_2.7.1.bb deleted file mode 100644 index a4dc1437e2..0000000000 --- a/meta-oe/recipes-support/gsl/gsl_2.7.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -include gsl.inc - -SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" -SRC_URI[sha256sum] = "dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b" diff --git a/meta-oe/recipes-support/gsl/gsl_2.8.bb b/meta-oe/recipes-support/gsl/gsl_2.8.bb new file mode 100644 index 0000000000..45c776112b --- /dev/null +++ b/meta-oe/recipes-support/gsl/gsl_2.8.bb @@ -0,0 +1,4 @@ +include gsl.inc + +SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" +SRC_URI[sha256sum] = "6a99eeed15632c6354895b1dd542ed5a855c0f15d9ad1326c6fe2b2c9e423190" diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch new file mode 100644 index 0000000000..df27a59ee7 --- /dev/null +++ b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch @@ -0,0 +1,85 @@ +From 2b7a51556185539a0f9baef0f109e0814933d6b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 19 May 2024 17:11:20 -0700 +Subject: [PATCH] Provide strtod_l signature on non-glibc linux ( musl ) + systems + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gsoap/stdsoap2.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/gsoap/stdsoap2.cpp ++++ b/gsoap/stdsoap2.cpp +@@ -74,6 +74,11 @@ A commercial use license is available fr + + #include "stdsoap2.h" + ++#if defined(__linux__) && !defined(__GLIBC__) ++struct __locale_struct; ++double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); ++#endif ++ + #if GSOAP_VERSION != GSOAP_LIB_VERSION + # error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE" + #endif +@@ -5457,7 +5462,7 @@ tcp_gethostbyname(struct soap *soap, con + { + #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) + struct hostent_data ht_data; +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + int r; + char *tmpbuf = soap->tmpbuf; + size_t tmplen = sizeof(soap->tmpbuf); +@@ -5490,7 +5495,7 @@ tcp_gethostbyname(struct soap *soap, con + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -23192,7 +23197,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); +--- a/gsoap/stdsoap2.c ++++ b/gsoap/stdsoap2.c +@@ -74,6 +74,11 @@ A commercial use license is available fr + + #include "stdsoap2.h" + ++#if defined(__linux__) && !defined(__GLIBC__) ++struct __locale_struct; ++double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); ++#endif ++ + #if GSOAP_VERSION != GSOAP_LIB_VERSION + # error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE" + #endif +@@ -5490,7 +5495,7 @@ tcp_gethostbyname(struct soap *soap, con + hostent = NULL; + soap->errnum = h_errno; + } +-#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) ++#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) + while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) + { + if (tmpbuf != soap->tmpbuf) +@@ -23192,7 +23197,7 @@ soap_strerror(struct soap *soap) + { + #ifndef WIN32 + # ifdef HAVE_STRERROR_R +-# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) ++# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) + err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ + if (err != 0) + soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch deleted file mode 100644 index 6ae02deb24..0000000000 --- a/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch +++ /dev/null @@ -1,96 +0,0 @@ -From fa923a50790c907725c822b2fc7d63b2da62b4ad Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 12 Mar 2023 13:34:55 -0700 -Subject: [PATCH] Simplify check for gethostbyname_r() - -This helps build fix with musl. - -Imported from Alpine: https://git.alpinelinux.org/aports/tree/community/gsoap/musl-fixes.patch - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - gsoap/stdsoap2.c | 6 ++---- - gsoap/stdsoap2.cpp | 10 ++-------- - 2 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c -index 654a1e1..fa31d02 100644 ---- a/gsoap/stdsoap2.c -+++ b/gsoap/stdsoap2.c -@@ -5463,7 +5463,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, - hostent = NULL; - soap->errnum = h_errno; - } --#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && defined(HAVE_GETHOSTBYNAME_R) -+#elif defined(HAVE_GETHOSTBYNAME_R) - while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) - { - if (tmpbuf != soap->tmpbuf) -@@ -5478,8 +5478,6 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, - if (!tmpbuf) - break; - } --#elif defined(HAVE_GETHOSTBYNAME_R) -- hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); - #elif defined(VXWORKS) - /* vxWorks compatible */ - /* If the DNS resolver library resolvLib has been configured in the vxWorks -@@ -23112,7 +23110,7 @@ soap_strerror(struct soap *soap) - { - #ifndef WIN32 - # ifdef HAVE_STRERROR_R --# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) -+# if 1 - err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ - if (err != 0) - soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); -diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp -index 654a1e1..5fd5fd6 100644 ---- a/gsoap/stdsoap2.cpp -+++ b/gsoap/stdsoap2.cpp -@@ -5430,7 +5430,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, - { - #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) - struct hostent_data ht_data; --#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && defined(HAVE_GETHOSTBYNAME_R) -+#elif defined(HAVE_GETHOSTBYNAME_R) - int r; - char *tmpbuf = soap->tmpbuf; - size_t tmplen = sizeof(soap->tmpbuf); -@@ -5463,7 +5463,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, - hostent = NULL; - soap->errnum = h_errno; - } --#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && defined(HAVE_GETHOSTBYNAME_R) -+#elif defined(HAVE_GETHOSTBYNAME_R) - while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) - { - if (tmpbuf != soap->tmpbuf) -@@ -5478,8 +5478,6 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, - if (!tmpbuf) - break; - } --#elif defined(HAVE_GETHOSTBYNAME_R) -- hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); - #elif defined(VXWORKS) - /* vxWorks compatible */ - /* If the DNS resolver library resolvLib has been configured in the vxWorks -@@ -23112,13 +23110,9 @@ soap_strerror(struct soap *soap) - { - #ifndef WIN32 - # ifdef HAVE_STRERROR_R --# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) - err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ - if (err != 0) - soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); --# else -- return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ --# endif - # else - return strerror(err); - # endif --- -2.39.2 - diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb index 6d8b53d308..5528e87e6c 100644 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb @@ -5,9 +5,9 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" -SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip" -SRC_URI:append:libc-musl = " file://0001-Simplify-check-for-gethostbyname_r.patch" -SRC_URI[sha256sum] = "b65190ebf8c2517d6fafbdc2000bc7bc650d921a02f4aa53eb1e3df267592c4a" +SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip \ + file://0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch" +SRC_URI[sha256sum] = "63478e555c0ccde0164f055ff605b02805db0abc6712a04bcb14cb617b047218" inherit autotools diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch b/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch new file mode 100644 index 0000000000..38f5c88997 --- /dev/null +++ b/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch @@ -0,0 +1,46 @@ +From 04149f9ec9b37b5bb4c2b6c38d4560b2c122c483 Mon Sep 17 00:00:00 2001 +From: Yoann Congal <yoann.congal@smile.fr> +Date: Thu, 23 May 2024 23:28:42 +0200 +Subject: [PATCH] po: force Language: header for "fr" and "de" locals + +Language: header is "new" and used to be derived from Language-Team +header. But, for fr.po and de.po, Language can't be derived. + +Force "Language" header to avoid having a default Language header. + +Upstream-Status: Inactive-Upstream [lastrelease: 26-Apr-2006] +See: http://download.savannah.nongnu.org/releases/hddtemp/?C=M&O=D + +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> +--- + po/de.po | 1 + + po/fr.po | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/po/de.po b/po/de.po +index 3b79e08..d04976b 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -13,6 +13,7 @@ msgstr "" + "PO-Revision-Date: 2011-08-30 16:40+0200\n" + "Last-Translator: Vinzenz Vietzke <vinz@v1nz.org>\n" + "Language-Team: <debian-l10n-german@lists.debian.org>\n" ++"Language: de\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit" +diff --git a/po/fr.po b/po/fr.po +index 2fd97c5..0b3bf19 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -12,6 +12,7 @@ msgstr "" + "PO-Revision-Date: 2011-08-30 16:38+0200\n" + "Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n" + "Language-Team: FRANCAIS <fr@li.org>\n" ++"Language: fr\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=ISO-8859-1\n" + "Content-Transfer-Encoding: 8bit\n" +-- +2.39.2 + diff --git a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb index b204ea4dd6..75feccb87c 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb +++ b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb @@ -10,6 +10,7 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/hddtemp/hddtemp-0.3-beta15.tar.bz2 \ file://0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch \ file://0001-configure.ac-Rename-to-configure.ac-and-use-external.patch \ file://0001-sata.c-Declare-ata_get_powermode-prototype.patch \ + file://0001-po-force-Language-header-for-fr-and-de-locals.patch \ file://hddtemp.db \ file://init \ " @@ -25,9 +26,9 @@ FILES:${PN} += "/usr/share/misc/hddtemp.db" do_install:append() { install -d ${D}/usr/share/misc/ - install -m 0644 ${WORKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db + install -m 0644 ${UNPACKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db install -d ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hddtemp + install -m 0644 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/hddtemp } INITSCRIPT_NAME = "hddtemp" diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.381.bb b/meta-oe/recipes-support/hwdata/hwdata_0.383.bb index 291b273724..cfa6ae0e45 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_0.381.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_0.383.bb @@ -5,7 +5,7 @@ SECTION = "System/Base" LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -SRCREV = "4463530857af32d9dbfcfa9939c2304b51e5e58d" +SRCREV = "229069b51b488bc776602d82315188cd1fbf4887" SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch b/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch deleted file mode 100644 index 4824344f05..0000000000 --- a/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 1761298b73c759c07e4652ada307f68512a75ff1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 25 Mar 2022 20:44:41 -0700 -Subject: [PATCH] iniparser.pc: Make libpath a variable - -Will set according to baselib that yocto exports. - -Upstream-Status: Inappropriate [OE-specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - iniparser.pc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/iniparser.pc -+++ b/iniparser.pc -@@ -1,6 +1,6 @@ - prefix=/usr - exec_prefix=/usr --libdir=${exec_prefix}/lib -+libdir=${exec_prefix}/@baselib@ - includedir=${prefix}/include - datarootdir=${prefix}/share - datadir=${datarootdir} diff --git a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch b/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch deleted file mode 100644 index 46c1b0f7ac..0000000000 --- a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch +++ /dev/null @@ -1,65 +0,0 @@ -Origin: Debian packaging -From: Klee Dienes <klee@mit.edu> -Date: Thu, 13 Feb 2014 07:03:26 -0500 -Subject: Add CMake support. - ---- -Upstream-Status: Pending - - CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) - create mode 100644 CMakeLists.txt - ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,50 @@ -+cmake_minimum_required (VERSION 2.8.8) -+ -+project (iniparser) -+include (GNUInstallDirs) -+ -+include_directories (src) -+ -+set(INIPARSER_SRCS src/dictionary.c src/iniparser.c) -+set(INIPARSER_HDRS src/dictionary.h src/iniparser.h) -+ -+add_library(iniparser-shared SHARED ${INIPARSER_SRCS} ${INIPARSER_HDRS}) -+add_library(iniparser-static STATIC ${INIPARSER_SRCS} ${INIPARSER_HDRS}) -+ -+set_target_properties(iniparser-shared PROPERTIES SOVERSION 1) -+set_target_properties(iniparser-shared PROPERTIES OUTPUT_NAME iniparser) -+set_target_properties(iniparser-static PROPERTIES OUTPUT_NAME iniparser) -+ -+install (TARGETS iniparser-shared -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ -+install (TARGETS iniparser-static -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ -+find_package(Doxygen) -+if (NOT DOXYGEN_FOUND) -+message(FATAL_ERROR "Doxygen is needed to build the documentation. Please install it correctly") -+endif() -+ -+file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/iniparser.dox -+ "@INCLUDE = ${CMAKE_CURRENT_SOURCE_DIR}/doc/iniparser.dox\n" -+ "OUTPUT_DIRECTORY = ${CMAKE_CURRENT_BINARY_DIR}\n" -+ ) -+ -+add_custom_target (doc ALL -+ COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/iniparser.dox -+ SOURCES doc/iniparser.dox) -+ -+enable_testing() -+ -+add_test(NAME testsuite -+ COMMAND make -+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test) -+ -+install (FILES ${INIPARSER_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iniparser) -+ -+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_DOCDIR}) diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb b/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb new file mode 100644 index 0000000000..8c6c60a79a --- /dev/null +++ b/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb @@ -0,0 +1,18 @@ +SUMMARY = "The iniParser library is a simple C library offering INI file parsing services (both reading and writing)." +SECTION = "libs" +HOMEPAGE = "https://gitlab.com/iniparser/iniparser" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" +SRCBRANCH = "main" +SRCREV = "762715ca6cdba9dcf31a5af9297b444f3b5b8c00" + +SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}" +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = " \ + -DBUILD_DOCS=OFF \ + " + +FILES_${PN}-staticdev += "${libdir}/cmake/iniparser/iniparser-staticTargets*.cmake" diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.bb b/meta-oe/recipes-support/iniparser/iniparser_4.2.bb deleted file mode 100644 index d44772590a..0000000000 --- a/meta-oe/recipes-support/iniparser/iniparser_4.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "The iniParser library is a simple C library offering INI file parsing services (both reading and writing)." -SECTION = "libs" -HOMEPAGE = "https://github.com/ndevilla/iniparser" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" - -DEPENDS = "doxygen-native" - -PV .= "+git" - -SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https;branch=master \ - file://0001-iniparser.pc-Make-libpath-a-variable.patch \ - file://Add-CMake-support.patch \ -" - -SRCREV = "9f5a6da1c245b44f49a46212ec0d81ffb1f821aa" - -S = "${WORKDIR}/git" - -inherit cmake - -do_install:append() { - install -Dm 0644 ${S}/iniparser.pc ${D}${libdir}/pkgconfig/iniparser.pc - sed -i -e 's,@baselib@,${baselib},g' ${D}${libdir}/pkgconfig/iniparser.pc -} - -BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc index 16fe557f76..592109b951 100644 --- a/meta-oe/recipes-support/libee/libee.inc +++ b/meta-oe/recipes-support/libee/libee.inc @@ -35,5 +35,5 @@ do_install_ptest() { install -d ${D}${PTEST_PATH} install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} - install -m 0755 ${WORKDIR}/ezapi1.sh ${D}${PTEST_PATH} + install -m 0755 ${UNPACKDIR}/ezapi1.sh ${D}${PTEST_PATH} } diff --git a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb b/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb index 08d3f4e84d..d453d0ab97 100644 --- a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb +++ b/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb @@ -21,5 +21,3 @@ EXTRA_OECMAKE = "-DUDEV_RULES_DIR=${nonarch_base_libdir}/udev/rules.d -DBUILD_EX PACKAGE_BEFORE_PN = "${PN}-tools" FILES:${PN}-tools = "${bindir}/fido2-*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch new file mode 100644 index 0000000000..ac1eff510b --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch @@ -0,0 +1,530 @@ +From 0d3e1b3923a1fac80e9d75d8b5e33cd36f4fe659 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 31 May 2024 09:03:22 -0700 +Subject: [PATCH] bindings: cxx: Migrate C++ tests to use Catch2 v3 + +Catch2 v3.x has API changes which needs to be addressed +in the tests themselves, hence this changeset is to fix +those. + +Upstream-Status: Submitted [https://lore.kernel.org/linux-gpio/20240531184223.3949069-1-raj.khem@gmail.com/T/#u] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> +--- + bindings/cxx/tests/Makefile.am | 2 +- + bindings/cxx/tests/gpiod-cxx-test-main.cpp | 3 +-- + bindings/cxx/tests/helpers.hpp | 8 +++--- + bindings/cxx/tests/tests-chip-info.cpp | 30 ++++++++++----------- + bindings/cxx/tests/tests-chip.cpp | 14 +++++----- + bindings/cxx/tests/tests-edge-event.cpp | 2 +- + bindings/cxx/tests/tests-info-event.cpp | 2 +- + bindings/cxx/tests/tests-line-config.cpp | 2 +- + bindings/cxx/tests/tests-line-info.cpp | 22 +++++++-------- + bindings/cxx/tests/tests-line-request.cpp | 16 +++++------ + bindings/cxx/tests/tests-line-settings.cpp | 2 +- + bindings/cxx/tests/tests-line.cpp | 2 +- + bindings/cxx/tests/tests-misc.cpp | 2 +- + bindings/cxx/tests/tests-request-config.cpp | 10 +++---- + configure.ac | 4 +-- + 15 files changed, 60 insertions(+), 61 deletions(-) + +diff --git a/bindings/cxx/tests/Makefile.am b/bindings/cxx/tests/Makefile.am +index fbf80a1..d9284da 100644 +--- a/bindings/cxx/tests/Makefile.am ++++ b/bindings/cxx/tests/Makefile.am +@@ -4,7 +4,7 @@ + AM_CXXFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include + AM_CXXFLAGS += -I$(top_srcdir)/tests/gpiosim/ + AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17 $(CATCH2_CFLAGS) +-AM_LDFLAGS = -pthread ++AM_LDFLAGS = -pthread $(CATCH2_LIBS) + LDADD = $(top_builddir)/bindings/cxx/libgpiodcxx.la + LDADD += $(top_builddir)/tests/gpiosim/libgpiosim.la + +diff --git a/bindings/cxx/tests/gpiod-cxx-test-main.cpp b/bindings/cxx/tests/gpiod-cxx-test-main.cpp +index 11bf8e5..ec48286 100644 +--- a/bindings/cxx/tests/gpiod-cxx-test-main.cpp ++++ b/bindings/cxx/tests/gpiod-cxx-test-main.cpp +@@ -1,5 +1,4 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2017-2021 Bartosz Golaszewski <bartekgola@gmail.com> + +-#define CATCH_CONFIG_MAIN +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> +diff --git a/bindings/cxx/tests/helpers.hpp b/bindings/cxx/tests/helpers.hpp +index 62d9827..62bbdf5 100644 +--- a/bindings/cxx/tests/helpers.hpp ++++ b/bindings/cxx/tests/helpers.hpp +@@ -4,13 +4,13 @@ + #ifndef __GPIOD_CXX_TEST_HELPERS_HPP__ + #define __GPIOD_CXX_TEST_HELPERS_HPP__ + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <regex> + #include <string> + #include <sstream> + #include <system_error> + +-class system_error_matcher : public Catch::MatcherBase<::std::system_error> ++class system_error_matcher : public Catch::Matchers::MatcherBase<::std::system_error> + { + public: + explicit system_error_matcher(int expected_errno); +@@ -21,7 +21,7 @@ private: + ::std::error_condition _m_cond; + }; + +-class regex_matcher : public Catch::MatcherBase<::std::string> ++class regex_matcher : public Catch::Matchers::MatcherBase<::std::string> + { + public: + explicit regex_matcher(const ::std::string& pattern); +@@ -33,7 +33,7 @@ private: + ::std::string _m_repr; + }; + +-template<class T> class stringify_matcher : public Catch::MatcherBase<T> ++template<class T> class stringify_matcher : public Catch::Matchers::MatcherBase<T> + { + public: + explicit stringify_matcher(const ::std::string& expected) : _m_expected(expected) +diff --git a/bindings/cxx/tests/tests-chip-info.cpp b/bindings/cxx/tests/tests-chip-info.cpp +index 717c387..2c54f53 100644 +--- a/bindings/cxx/tests/tests-chip-info.cpp ++++ b/bindings/cxx/tests/tests-chip-info.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + #include <sstream> + +@@ -24,12 +24,12 @@ TEST_CASE("chip_info properties can be read", "[chip-info][chip]") + + SECTION("get chip name") + { +- REQUIRE_THAT(info.name(), Catch::Equals(sim.name())); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name())); + } + + SECTION("get chip label") + { +- REQUIRE_THAT(info.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar")); + } + + SECTION("get num_lines") +@@ -52,12 +52,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") + { + auto copy(info); + +- REQUIRE_THAT(copy.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(copy.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(copy.num_lines() == 4); + +- REQUIRE_THAT(info.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(info.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(info.num_lines() == 4); + } + +@@ -67,12 +67,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") + + copy = info; + +- REQUIRE_THAT(copy.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(copy.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(copy.num_lines() == 4); + +- REQUIRE_THAT(info.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(info.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(info.num_lines() == 4); + } + +@@ -80,8 +80,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") + { + auto moved(std::move(info)); + +- REQUIRE_THAT(moved.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(moved.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(moved.num_lines() == 4); + } + +@@ -91,8 +91,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") + + moved = ::std::move(info); + +- REQUIRE_THAT(moved.name(), Catch::Equals(sim.name())); +- REQUIRE_THAT(moved.label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name())); ++ REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar")); + REQUIRE(moved.num_lines() == 4); + } + } +diff --git a/bindings/cxx/tests/tests-chip.cpp b/bindings/cxx/tests/tests-chip.cpp +index c5ec19b..1ab7add 100644 +--- a/bindings/cxx/tests/tests-chip.cpp ++++ b/bindings/cxx/tests/tests-chip.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + #include <sstream> + #include <system_error> +@@ -48,9 +48,9 @@ TEST_CASE("chip constructor works", "[chip]") + .build(); + + ::gpiod::chip first(sim.dev_path()); +- REQUIRE_THAT(first.get_info().label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(first.get_info().label(), Catch::Matchers::Equals("foobar")); + ::gpiod::chip second(::std::move(first)); +- REQUIRE_THAT(second.get_info().label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(second.get_info().label(), Catch::Matchers::Equals("foobar")); + } + } + +@@ -70,9 +70,9 @@ TEST_CASE("chip operators work", "[chip]") + + ::gpiod::chip moved_chip(moved_sim.dev_path()); + +- REQUIRE_THAT(chip.get_info().label(), Catch::Equals("foobar")); ++ REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("foobar")); + chip = ::std::move(moved_chip); +- REQUIRE_THAT(chip.get_info().label(), Catch::Equals("moved")); ++ REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("moved")); + } + + SECTION("boolean operator") +@@ -94,7 +94,7 @@ TEST_CASE("chip properties can be read", "[chip]") + + SECTION("get device path") + { +- REQUIRE_THAT(chip.path(), Catch::Equals(sim.dev_path())); ++ REQUIRE_THAT(chip.path(), Catch::Matchers::Equals(sim.dev_path())); + } + + SECTION("get file descriptor") +@@ -169,7 +169,7 @@ TEST_CASE("stream insertion operator works for chip", "[chip]") + "\", label=\"foobar\", num_lines=4))"; + + buf << chip; +- REQUIRE_THAT(buf.str(), Catch::Equals(expected.str())); ++ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str())); + } + + SECTION("closed chip") +diff --git a/bindings/cxx/tests/tests-edge-event.cpp b/bindings/cxx/tests/tests-edge-event.cpp +index 19a6ab3..db387be 100644 +--- a/bindings/cxx/tests/tests-edge-event.cpp ++++ b/bindings/cxx/tests/tests-edge-event.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <chrono> + #include <gpiod.hpp> + #include <sstream> +diff --git a/bindings/cxx/tests/tests-info-event.cpp b/bindings/cxx/tests/tests-info-event.cpp +index 21c0ef0..f7ae309 100644 +--- a/bindings/cxx/tests/tests-info-event.cpp ++++ b/bindings/cxx/tests/tests-info-event.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <chrono> + #include <filesystem> + #include <gpiod.hpp> +diff --git a/bindings/cxx/tests/tests-line-config.cpp b/bindings/cxx/tests/tests-line-config.cpp +index 5e439a1..2f510fb 100644 +--- a/bindings/cxx/tests/tests-line-config.cpp ++++ b/bindings/cxx/tests/tests-line-config.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + + #include "gpiosim.hpp" +diff --git a/bindings/cxx/tests/tests-line-info.cpp b/bindings/cxx/tests/tests-line-info.cpp +index 21211f2..8589da3 100644 +--- a/bindings/cxx/tests/tests-line-info.cpp ++++ b/bindings/cxx/tests/tests-line-info.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + #include <string> + +@@ -35,9 +35,9 @@ TEST_CASE("get_line_info() works", "[chip][line-info]") + auto info = chip.get_line_info(0); + + REQUIRE(info.offset() == 0); +- REQUIRE_THAT(info.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar")); + REQUIRE(info.used()); +- REQUIRE_THAT(info.consumer(), Catch::Equals("hog")); ++ REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("hog")); + REQUIRE(info.direction() == ::gpiod::line::direction::OUTPUT); + REQUIRE_FALSE(info.active_low()); + REQUIRE(info.bias() == ::gpiod::line::bias::UNKNOWN); +@@ -74,9 +74,9 @@ TEST_CASE("line properties can be retrieved", "[line-info]") + auto info6 = chip.get_line_info(6); + + REQUIRE(info4.offset() == 4); +- REQUIRE_THAT(info4.name(), Catch::Equals("baz")); ++ REQUIRE_THAT(info4.name(), Catch::Matchers::Equals("baz")); + REQUIRE(info4.used()); +- REQUIRE_THAT(info4.consumer(), Catch::Equals("hog4")); ++ REQUIRE_THAT(info4.consumer(), Catch::Matchers::Equals("hog4")); + REQUIRE(info4.direction() == direction::OUTPUT); + REQUIRE(info4.edge_detection() == edge::NONE); + REQUIRE_FALSE(info4.active_low()); +@@ -102,10 +102,10 @@ TEST_CASE("line_info can be copied and moved") + { + auto copy(info); + REQUIRE(copy.offset() == 2); +- REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); + /* info can still be used */ + REQUIRE(info.offset() == 2); +- REQUIRE_THAT(info.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar")); + } + + SECTION("assignment operator works") +@@ -113,17 +113,17 @@ TEST_CASE("line_info can be copied and moved") + auto copy = chip.get_line_info(0); + copy = info; + REQUIRE(copy.offset() == 2); +- REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); + /* info can still be used */ + REQUIRE(info.offset() == 2); +- REQUIRE_THAT(info.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar")); + } + + SECTION("move constructor works") + { + auto copy(::std::move(info)); + REQUIRE(copy.offset() == 2); +- REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); + } + + SECTION("move assignment operator works") +@@ -131,7 +131,7 @@ TEST_CASE("line_info can be copied and moved") + auto copy = chip.get_line_info(0); + copy = ::std::move(info); + REQUIRE(copy.offset() == 2); +- REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); ++ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); + } + } + +diff --git a/bindings/cxx/tests/tests-line-request.cpp b/bindings/cxx/tests/tests-line-request.cpp +index 9632ae0..af8b979 100644 +--- a/bindings/cxx/tests/tests-line-request.cpp ++++ b/bindings/cxx/tests/tests-line-request.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + #include <sstream> + #include <stdexcept> +@@ -20,7 +20,7 @@ using pull = ::gpiosim::chip::pull; + + namespace { + +-class value_matcher : public Catch::MatcherBase<value> ++class value_matcher : public Catch::Matchers::MatcherBase<value> + { + public: + value_matcher(pull pull, bool active_low = false) +@@ -117,7 +117,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]") + auto info = chip.get_line_info(2); + + REQUIRE(info.used()); +- REQUIRE_THAT(info.consumer(), Catch::Equals("foobar")); ++ REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("foobar")); + } + + SECTION("empty consumer") +@@ -130,7 +130,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]") + auto info = chip.get_line_info(2); + + REQUIRE(info.used()); +- REQUIRE_THAT(info.consumer(), Catch::Equals("?")); ++ REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("?")); + } + } + +@@ -380,7 +380,7 @@ TEST_CASE("line_request can be moved", "[line-request]") + auto moved(::std::move(request)); + + REQUIRE(moved.fd() == fd); +- REQUIRE_THAT(moved.offsets(), Catch::Equals(offs)); ++ REQUIRE_THAT(moved.offsets(), Catch::Matchers::Equals(offs)); + } + + SECTION("move assignment operator works") +@@ -388,7 +388,7 @@ TEST_CASE("line_request can be moved", "[line-request]") + another = ::std::move(request); + + REQUIRE(another.fd() == fd); +- REQUIRE_THAT(another.offsets(), Catch::Equals(offs)); ++ REQUIRE_THAT(another.offsets(), Catch::Matchers::Equals(offs)); + } + } + +@@ -484,7 +484,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]") + { + buf << request; + +- REQUIRE_THAT(buf.str(), Catch::Equals(expected.str())); ++ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str())); + } + + SECTION("request released") +@@ -493,7 +493,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]") + + buf << request; + +- REQUIRE_THAT(buf.str(), Catch::Equals("gpiod::line_request(released)")); ++ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals("gpiod::line_request(released)")); + } + } + +diff --git a/bindings/cxx/tests/tests-line-settings.cpp b/bindings/cxx/tests/tests-line-settings.cpp +index dc821bb..2690331 100644 +--- a/bindings/cxx/tests/tests-line-settings.cpp ++++ b/bindings/cxx/tests/tests-line-settings.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + + #include "helpers.hpp" +diff --git a/bindings/cxx/tests/tests-line.cpp b/bindings/cxx/tests/tests-line.cpp +index 319012a..abd0e08 100644 +--- a/bindings/cxx/tests/tests-line.cpp ++++ b/bindings/cxx/tests/tests-line.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <gpiod.hpp> + + #include "helpers.hpp" +diff --git a/bindings/cxx/tests/tests-misc.cpp b/bindings/cxx/tests/tests-misc.cpp +index f06dc39..33fc3fa 100644 +--- a/bindings/cxx/tests/tests-misc.cpp ++++ b/bindings/cxx/tests/tests-misc.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <filesystem> + #include <gpiod.hpp> + #include <string> +diff --git a/bindings/cxx/tests/tests-request-config.cpp b/bindings/cxx/tests/tests-request-config.cpp +index 66eb748..d71e91b 100644 +--- a/bindings/cxx/tests/tests-request-config.cpp ++++ b/bindings/cxx/tests/tests-request-config.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0-or-later + // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> + +-#include <catch2/catch.hpp> ++#include <catch2/catch_all.hpp> + #include <cstddef> + #include <gpiod.hpp> + #include <string> +@@ -33,7 +33,7 @@ TEST_CASE("request_config can be moved", "[request-config]") + SECTION("move constructor works") + { + auto moved(::std::move(cfg)); +- REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar")); ++ REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar")); + REQUIRE(moved.event_buffer_size() == 64); + } + +@@ -43,7 +43,7 @@ TEST_CASE("request_config can be moved", "[request-config]") + + moved = ::std::move(cfg); + +- REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar")); ++ REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar")); + REQUIRE(moved.event_buffer_size() == 64); + } + } +@@ -55,7 +55,7 @@ TEST_CASE("request_config mutators work", "[request-config]") + SECTION("set consumer") + { + cfg.set_consumer("foobar"); +- REQUIRE_THAT(cfg.consumer(), Catch::Equals("foobar")); ++ REQUIRE_THAT(cfg.consumer(), Catch::Matchers::Equals("foobar")); + } + + SECTION("set event_buffer_size") +@@ -77,7 +77,7 @@ TEST_CASE("request_config stream insertion operator works", "[request-config]") + + ::std::string expected("gpiod::request_config(consumer='foobar', event_buffer_size=32)"); + +- REQUIRE_THAT(buf.str(), Catch::Equals(expected)); ++ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected)); + } + + } /* namespace */ +diff --git a/configure.ac b/configure.ac +index a2370c5..216007e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -206,9 +206,9 @@ then + + if test "x$with_tests" = xtrue + then +- PKG_CHECK_MODULES([CATCH2], [catch2],, [ ++ PKG_CHECK_MODULES([CATCH2], [catch2-with-main],, [ + AC_LANG_PUSH([C++]) +- AC_CHECK_HEADERS([catch2/catch.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch.hpp])]) ++ AC_CHECK_HEADERS([catch2/catch_all.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch_all.hpp])]) + AC_LANG_POP([C++]) + ]) + fi diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.1.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb index 4c13d67eba..8eb41753c8 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.1.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb @@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = " \ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" -SRC_URI[sha256sum] = "b21913f469d3135680d5516f00fdf9f81d5e564e19ffb690927ea7f1d7e312cb" +SRC_URI += "file://0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch" +SRC_URI[sha256sum] = "7a148a5a7d1c97a1abb40474b9a392b6edd7a42fe077dfd7ff42cfba24308548" # Enable all project features for ptest PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb index 31c3534b88..63dfc6fa78 100644 --- a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb +++ b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb @@ -3,7 +3,7 @@ SECTION = "console/network" HOMEPAGE = "http://fronteed.com/iCheck" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://icheck.js;start_line=1;end_line=8;md5=404078d7de9f05ed64d364274f790055" +LIC_FILES_CHKSUM = "file://icheck.js;beginline=6;endline=7;md5=ea25eee37fc3b14403e215bfe13564bc" SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV}" diff --git a/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb index 9130b110a8..4f0d8e5548 100644 --- a/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb +++ b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb @@ -10,7 +10,8 @@ SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a5 JQUERYDIR = "${datadir}/javascript/jquery" JQUERYDOCDIR = "${docdir}/libjs-jquery" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { install -d -m 0755 ${D}${JQUERYDIR} diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.8.bb b/meta-oe/recipes-support/libnvme/libnvme_1.9.bb index 3894facecb..1e03b4e7ad 100644 --- a/meta-oe/recipes-support/libnvme/libnvme_1.8.bb +++ b/meta-oe/recipes-support/libnvme/libnvme_1.9.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c" -SRCREV = "bff7dda7e2a0f883d0b89e23fed725c916de3e61" +SRCREV = "80c5cf2aa45f4afc7571dc48850fae3fd62828af" SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 822b7ffc2b..73aeb55393 100644 --- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -26,7 +26,7 @@ EXTRA_OECONF:class-target = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wge do_install:append () { install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/smi.conf ${D}${sysconfdir}/smi.conf + install -m 0644 ${UNPACKDIR}/smi.conf ${D}${sysconfdir}/smi.conf } PACKAGES += "${PN}-mibs ${PN}-pibs ${PN}-yang" diff --git a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch deleted file mode 100644 index f0bd53ee8e..0000000000 --- a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0ab69dc18a2057ff5bf41abcdf2b983b72d5a903 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Jul 2017 15:34:49 -0700 -Subject: [PATCH 1/2] include sys/select.h for fd_set definition - -Fixes -teamnl.c:160:2: error: unknown type name 'fd_set'; did you mean 'fpos_t'? - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - utils/teamnl.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/teamnl.c b/utils/teamnl.c -index e8de7e2..25129e8 100644 ---- a/utils/teamnl.c -+++ b/utils/teamnl.c -@@ -24,6 +24,7 @@ - #include <getopt.h> - #include <errno.h> - #include <sys/signalfd.h> -+#include <sys/select.h> - #include <signal.h> - #include <unistd.h> - #include <team.h> --- -2.13.2 - diff --git a/meta-oe/recipes-support/libteam/libteam/0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch deleted file mode 100644 index 5f8e56177e..0000000000 --- a/meta-oe/recipes-support/libteam/libteam/0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 49693cac37ee35ff673240c8060201efe0d999c2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 24 Aug 2022 22:27:03 -0700 -Subject: [PATCH] teamd: Include missing headers for strrchr and memcmp - -Compiler does not see the prototype for these functions otherwise and -build fails e.g. - -| ../../git/teamd/teamd_phys_port_check.c:52:10: error: call to undeclared library function 'strrchr' with type 'char *(const char *, int)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] -| start = strrchr(link, '/'); -| ^ - -Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/68] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - teamd/teamd_phys_port_check.c | 1 + - teamd/teamd_runner_loadbalance.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/teamd/teamd_phys_port_check.c b/teamd/teamd_phys_port_check.c -index 1eec129..c2454ab 100644 ---- a/teamd/teamd_phys_port_check.c -+++ b/teamd/teamd_phys_port_check.c -@@ -19,6 +19,7 @@ - - #include <stdio.h> - #include <errno.h> -+#include <string.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> -diff --git a/teamd/teamd_runner_loadbalance.c b/teamd/teamd_runner_loadbalance.c -index a581472..421a7c6 100644 ---- a/teamd/teamd_runner_loadbalance.c -+++ b/teamd/teamd_runner_loadbalance.c -@@ -17,6 +17,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include <string.h> - #include <sys/socket.h> - #include <linux/netdevice.h> - #include <team.h> --- -2.37.2 - diff --git a/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch new file mode 100644 index 0000000000..0740601190 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch @@ -0,0 +1,39 @@ +From e6ba4c16da808e47891241452a927b7f558a6420 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 11 May 2024 23:11:22 -0700 +Subject: [patch libteam] teamd: Pass correct parameter type to accept API + +accept() expects sockaddr as second parameter + +int accept (int, struct sockaddr *__restrict, socklen_t *__restrict); + +Fixes build with gcc-16 on musl systems +| ../../git/teamd/teamd_usock.c: In function 'callback_usock': +| ../../git/teamd/teamd_usock.c:280:40: error: passing argument 2 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] +| 280 | sock = accept(ctx->usock.sock, &addr, &alen); +| | ^~~~~ +| | | +| | struct sockaddr_un * + +Upstream-Status: Submitted [https://lists.fedorahosted.org/archives/list/libteam@lists.fedorahosted.org/2024/5/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + teamd/teamd_usock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/teamd/teamd_usock.c b/teamd/teamd_usock.c +index 1adfdf8..5895124 100644 +--- a/teamd/teamd_usock.c ++++ b/teamd/teamd_usock.c +@@ -277,7 +277,7 @@ static int callback_usock(struct teamd_context *ctx, int events, void *priv) + int err; + + alen = sizeof(addr); +- sock = accept(ctx->usock.sock, &addr, &alen); ++ sock = accept(ctx->usock.sock, (struct sockaddr *)&addr, &alen); + if (sock == -1) { + teamd_log_err("usock: Failed to accept connection."); + return -errno; +-- +2.45.0 + diff --git a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch index ed877a721e..030140ad46 100644 --- a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch +++ b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch @@ -17,19 +17,15 @@ Upstream-Status: Pending teamd/teamd_runner_lacp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c -index 9c77fae..8800854 100644 --- a/teamd/teamd_runner_lacp.c +++ b/teamd/teamd_runner_lacp.c -@@ -23,6 +23,7 @@ +@@ -23,12 +23,12 @@ #include <unistd.h> #include <limits.h> #include <sys/ioctl.h> +#include <net/ethernet.h> - #include <linux/if_ether.h> #include <sys/socket.h> - #include <linux/netdevice.h> -@@ -30,7 +31,6 @@ + #include <netinet/in.h> #include <errno.h> #include <team.h> #include <private/misc.h> @@ -37,6 +33,3 @@ index 9c77fae..8800854 100644 #include "teamd.h" #include "teamd_config.h" --- -2.13.2 - diff --git a/meta-oe/recipes-support/libteam/libteam_1.31.bb b/meta-oe/recipes-support/libteam/libteam_1.32.bb index 6fe10abe01..508cbb13bb 100644 --- a/meta-oe/recipes-support/libteam/libteam_1.31.bb +++ b/meta-oe/recipes-support/libteam/libteam_1.32.bb @@ -8,15 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libnl libdaemon jansson" SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \ - file://0001-include-sys-select.h-for-fd_set-definition.patch \ file://0002-teamd-Re-adjust-include-header-order.patch \ file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ file://0001-team_basic_test.py-switch-to-python3.patch \ file://0001-team_basic_test.py-check-the-return-value.patch \ - file://0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch \ + file://0001-teamd-Pass-correct-parameter-type-to-accept-API.patch \ file://run-ptest \ " -SRCREV = "3ee12c6d569977cf1cd30d0da77807a07aa77158" +SRCREV = "8b843e93cee1dab61fb79b01791201cdad45e1d1" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-support/liburing/liburing_2.5.bb b/meta-oe/recipes-support/liburing/liburing_2.6.bb index 440259ffbd..fc3fe1cac1 100644 --- a/meta-oe/recipes-support/liburing/liburing_2.5.bb +++ b/meta-oe/recipes-support/liburing/liburing_2.6.bb @@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1-only | MIT" LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" -SRCREV = "f4e42a515cd78c8c9cac2be14222834be5f8df2b" +SRCREV = "f7dcc1ea60819475dffd3a45059e16f04381bee7" S = "${WORKDIR}/git" @@ -18,9 +18,14 @@ DEPENDS:append:libc-musl = " libucontext" XCFLAGS = "-pthread" XCFLAGS:append:libc-musl = " -lucontext" +USELIBC = "" +# clang-18 on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro +# this does not happen for gcc or older clang, so link with libc since we need memset API +# -fno-builtin-memset does not help +USELIBC:riscv64:toolchain-clang = "--use-libc" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" do_configure() { - ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} + ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC} } do_install () { oe_runmake install DESTDIR=${D} diff --git a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb index b269e33c44..4e9e6bcdfd 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb @@ -8,5 +8,5 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { - install -Dm 0644 ${WORKDIR}/usbgx.default ${D}${sysconfdir}/default/usbgx + install -Dm 0644 ${UNPACKDIR}/usbgx.default ${D}${sysconfdir}/default/usbgx } diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index a20ff4eeab..bc40f029cd 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -38,17 +38,17 @@ INITSCRIPT_PARAMS = "defaults" INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '1', '0', d)}" do_install:append() { - install -Dm 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-start + install -Dm 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-start sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start - install -m 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-stop + install -m 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-stop sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service + install -Dm 0644 ${UNPACKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service fi if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -Dm 0755 ${WORKDIR}/usbgx.initd ${D}${sysconfdir}/init.d/usbgx + install -Dm 0755 ${UNPACKDIR}/usbgx.initd ${D}${sysconfdir}/init.d/usbgx fi } diff --git a/meta-oe/recipes-support/links/links-x11_2.26.bb b/meta-oe/recipes-support/links/links-x11_2.26.bb index 4c8d935ccf..713919bca1 100644 --- a/meta-oe/recipes-support/links/links-x11_2.26.bb +++ b/meta-oe/recipes-support/links/links-x11_2.26.bb @@ -23,7 +23,7 @@ EXTRA_OECONF = "--enable-graphics \ do_install:append() { install -d ${D}/${datadir}/applications - install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications + install -m 0644 ${UNPACKDIR}/links2.desktop ${D}/${datadir}/applications install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps + install -m 0644 ${UNPACKDIR}/links2.png ${D}/${datadir}/pixmaps } diff --git a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch index 3c4a3a151d..fb58793a17 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch @@ -1,7 +1,7 @@ -From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001 +From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Date: Mon, 26 Nov 2018 14:53:09 +0800 -Subject: [PATCH 1/3] Avoid bashisms in init scripts +Subject: [PATCH] Avoid bashisms in init scripts Upstream-Status: Inappropriate @@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in -index 347c395..b2e9cf9 100644 +index 347c39574..b2e9cf932 100644 --- a/scripts/blk_availability_init_red_hat.in +++ b/scripts/blk_availability_init_red_hat.in @@ -1,4 +1,4 @@ @@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644 ;; esac diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in -index c82f8f5..a3a321d 100755 +index c82f8f547..a3a321d9c 100755 --- a/scripts/cmirrord_init_red_hat.in +++ b/scripts/cmirrord_init_red_hat.in @@ -1,4 +1,4 @@ @@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755 esac diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in -index 176ff5d..825f6ad 100644 +index 176ff5dcb..825f6ad84 100644 --- a/scripts/lvm2_lvmpolld_init_red_hat.in +++ b/scripts/lvm2_lvmpolld_init_red_hat.in @@ -1,4 +1,4 @@ @@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644 esac diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in -index 95e4125..dff89cd 100644 +index 95e4125a0..dff89cd38 100644 --- a/scripts/lvm2_monitoring_init_red_hat.in +++ b/scripts/lvm2_monitoring_init_red_hat.in @@ -1,4 +1,4 @@ @@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644 esac diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 -index 8eb06c5..2e8d0f7 100644 +index 8eb06c509..2e8d0f71e 100644 --- a/scripts/lvm2_monitoring_init_rhel4 +++ b/scripts/lvm2_monitoring_init_rhel4 @@ -1,4 +1,4 @@ @@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644 ;; esac --- -2.7.4 - diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch index 474c2f8ac7..f4b0f913d8 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch @@ -1,4 +1,7 @@ -configure.ac: check egrep +From f261b2f1bc16c32a55a22e28bf1b2f15ac6c7a88 Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 6 Dec 2023 10:24:46 +0800 +Subject: [PATCH] configure.ac: check egrep The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed from configure.ac, then it fails to substitute '@EGREP@': @@ -17,10 +20,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac -index 2e52498f9..d9462e22c 100644 +index c2dbf3c9f..d9e7964c3 100644 --- a/configure.ac +++ b/configure.ac -@@ -78,6 +78,7 @@ AC_PROG_LN_S +@@ -88,6 +88,7 @@ AC_PROG_EGREP AC_PROG_MAKE_SET AC_PROG_MKDIR_P AC_PROG_RANLIB @@ -28,6 +31,3 @@ index 2e52498f9..d9462e22c 100644 AC_CHECK_TOOL([READELF], [readelf]) AC_CHECK_TOOL(AR, ar) AC_PATH_TOOL(CFLOW_CMD, cflow) --- -2.34.1 - diff --git a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch index f46d7f7014..e11ac5ac08 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch @@ -1,4 +1,4 @@ -From e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001 +From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001 From: Dengke Du <dengke.du@windriver.com> Date: Tue, 25 Oct 2016 11:49:40 +0000 Subject: [PATCH] implement libc specific reopen_stream @@ -14,18 +14,17 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- Upstream-Status: Pending - +--- lib/log/log.c | 6 ++++++ tools/lvmcmdline.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) -Index: LVM2.2.02.177/lib/log/log.c -=================================================================== ---- LVM2.2.02.177.orig/lib/log/log.c -+++ LVM2.2.02.177/lib/log/log.c -@@ -161,6 +161,7 @@ static void _check_and_replace_standard_ +diff --git a/lib/log/log.c b/lib/log/log.c +index 7b88252f0..e1720098a 100644 +--- a/lib/log/log.c ++++ b/lib/log/log.c +@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ * Close and reopen standard stream on file descriptor fd. */ int reopen_standard_stream(FILE **stream, const char *mode) @@ -33,7 +32,7 @@ Index: LVM2.2.02.177/lib/log/log.c { int fd, fd_copy, new_fd; const char *name; -@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream +@@ -211,6 +212,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) *stream = new_stream; return 1; } @@ -45,11 +44,11 @@ Index: LVM2.2.02.177/lib/log/log.c void init_log_fn(lvm2_log_fn_t log_fn) { -Index: LVM2.2.02.177/tools/lvmcmdline.c -=================================================================== ---- LVM2.2.02.177.orig/tools/lvmcmdline.c -+++ LVM2.2.02.177/tools/lvmcmdline.c -@@ -3095,7 +3095,7 @@ static int _check_standard_fds(void) +diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c +index 3fd23a521..c2ee39905 100644 +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c +@@ -3380,7 +3380,7 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -58,7 +57,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c if (err) perror("stdin stream open"); else -@@ -3105,7 +3105,7 @@ static int _check_standard_fds(void) +@@ -3390,7 +3390,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -67,7 +66,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c if (err) perror("stdout stream open"); /* else no stdout */ -@@ -3113,7 +3113,7 @@ static int _check_standard_fds(void) +@@ -3398,7 +3398,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && diff --git a/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch index 7add3a7bb1..83a7f936b1 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch @@ -1,4 +1,4 @@ -From 1b9677f40ac547ba19d1cdbfd700901eab0a0d0b Mon Sep 17 00:00:00 2001 +From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 25 Mar 2024 13:07:28 -0700 Subject: [PATCH] include libgen.h for basename @@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+) diff --git a/lib/device/device_id.c b/lib/device/device_id.c -index 1422f5d05..8215811bd 100644 +index 2b183810a..53467cbbb 100644 --- a/lib/device/device_id.c +++ b/lib/device/device_id.c -@@ -25,6 +25,7 @@ +@@ -26,6 +26,7 @@ #include "lib/datastruct/str_list.h" #include "lib/metadata/metadata-exported.h" @@ -27,6 +27,3 @@ index 1422f5d05..8215811bd 100644 #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> --- -2.44.0 - diff --git a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch index ed9972a5f9..6435c3fd92 100644 --- a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch +++ b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch @@ -1,7 +1,7 @@ -From 3bba45890985b877b823836e78a1c8ac3c878856 Mon Sep 17 00:00:00 2001 +From b30f842d5d200a8217a47465d6cdd99d3805ba76 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 31 Jul 2018 15:04:29 +0800 -Subject: [PATCH 4/4] tweak MODPROBE_CMD for cross compile +Subject: [PATCH] tweak MODPROBE_CMD for cross compile Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe is incorrect. @@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac -index b43d8b9be..efe3062c1 100644 +index c8d81e16c..7c1c04627 100644 --- a/configure.ac +++ b/configure.ac -@@ -1646,8 +1646,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ +@@ -1689,8 +1689,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ ]) ################################################################################ @@ -33,6 +33,3 @@ index b43d8b9be..efe3062c1 100644 AS_IF([test -n "$MODPROBE_CMD"], [ AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) ]) --- -2.7.4 - diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch index 7979efbefb..e7aaad4d0e 100644 --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch @@ -1,7 +1,7 @@ -From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001 +From e0e06b77e067da6a01dd9b0d5582a0a1709c655d Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Mon, 26 Nov 2018 14:59:55 +0800 -Subject: [PATCH 2/3] do not build manual +Subject: [PATCH] do not build manual On some host (ubuntu 1404), build manual failed. ... @@ -26,7 +26,7 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 3b7e0ec..37f14eb 100644 +index 06c4b1823..90df7b09c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ @@ -47,7 +47,7 @@ index 3b7e0ec..37f14eb 100644 libdaemon lib tools daemons libdm \ udev po tools.distclean: test.distclean -@@ -59,7 +59,7 @@ unit-test run-unit-test: test +@@ -59,7 +59,7 @@ unit-test run-unit-test: test libdm daemons.device-mapper: libdm.device-mapper tools.device-mapper: libdm.device-mapper @@ -57,10 +57,10 @@ index 3b7e0ec..37f14eb 100644 ifeq ("@INTL@", "yes") diff --git a/configure.ac b/configure.ac -index 6def519..18a5c97 100644 +index 7c1c04627..5364dd68e 100644 --- a/configure.ac +++ b/configure.ac -@@ -2018,7 +2018,6 @@ libdaemon/server/Makefile +@@ -2022,7 +2022,6 @@ libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc @@ -68,6 +68,3 @@ index 6def519..18a5c97 100644 po/Makefile scripts/lvm2-pvscan.service scripts/blkdeactivate.sh --- -2.25.1 - diff --git a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch index 5b9b2d5748..2d49820057 100644 --- a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch +++ b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch @@ -1,4 +1,4 @@ -From e213ed33a28704f6f538df41a91b7ce95594a4f8 Mon Sep 17 00:00:00 2001 +From 20a110ade91c73f4cb3883a3a9676708a93ca786 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 15 Oct 2019 18:12:54 +0800 Subject: [PATCH] start lvm2-monitor.service after tmp.mount @@ -19,7 +19,7 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in -index c0c96e3..2a99a37 100644 +index c0c96e316..2a99a379d 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -2,7 +2,7 @@ @@ -31,6 +31,3 @@ index c0c96e3..2a99a37 100644 Before=local-fs-pre.target shutdown.target DefaultDependencies=no Conflicts=shutdown.target --- -2.25.1 - diff --git a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch index 3f53db9e5c..ca632d213f 100644 --- a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch +++ b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch @@ -1,14 +1,21 @@ -configure.ac: override CONFIGURE_LINE +From f5c6fabbdf2e7bfa105658b9dfe45d2ab86f34bb Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Fri, 17 Jul 2020 13:59:56 -0700 +Subject: [PATCH] configure.ac: override CONFIGURE_LINE For reproducible binaries, we need to report a constant CONFIGURE_LINE. Upstream-Status: Pending Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) - ---- git.orig/configure.ac -+++ git/configure.ac +diff --git a/configure.ac b/configure.ac +index 5364dd68e..c2dbf3c9f 100644 +--- a/configure.ac ++++ b/configure.ac @@ -15,7 +15,15 @@ AC_PREREQ(2.69) ################################################################################ dnl -- Process this file with autoconf to produce a configure script. diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.22.bb b/meta-oe/recipes-support/lvm2/libdevmapper.bb index be558ce1d2..be558ce1d2 100644 --- a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.22.bb +++ b/meta-oe/recipes-support/lvm2/libdevmapper.bb diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb b/meta-oe/recipes-support/lvm2/lvm2.bb index c675d3ded8..868f5a249e 100644 --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb +++ b/meta-oe/recipes-support/lvm2/lvm2.bb @@ -3,7 +3,6 @@ require lvm2.inc SRC_URI += " \ file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ file://tweak-for-lvmdbusd.patch \ - file://0001-lvmdbusd-create-dirs-for-lock-file.patch \ " DEPENDS += "autoconf-archive-native" @@ -17,7 +16,7 @@ CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" do_install:append() { # Install machine specific configuration file install -d ${D}${sysconfdir}/lvm - install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf + install -m 0644 ${UNPACKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf # We don't want init scripts/systemd units for native SDK utilities if [ "${PN}" != "nativesdk-lvm2" ]; then diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index d95366f97e..29cc7425ba 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc @@ -19,8 +19,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ file://0001-include-libgen.h-for-basename.patch \ " -SRCREV = "016e469caf856f1eb8dde39df0d1aa2e74225aed" +SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f" S = "${WORKDIR}/git" +PV = "2.03.24" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch index c0cf836ce8..96a3d64fdf 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch @@ -1,4 +1,4 @@ -From ddf36613f3408ce42f15b03b4e9c6ad8478b97f8 Mon Sep 17 00:00:00 2001 +From 2ff2a867db8d3e1c660d191a1805f9e355169c80 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 2 Mar 2021 01:33:05 -0800 Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 991a0cf85..e59c82472 100644 +index d9e7964c3..9dfdcfe01 100644 --- a/configure.ac +++ b/configure.ac -@@ -1660,6 +1660,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [ +@@ -1704,6 +1704,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [ SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" @@ -27,7 +27,7 @@ index 991a0cf85..e59c82472 100644 SBINDIR="$(eval echo $(eval echo $sbindir))" LVM_PATH="$SBINDIR/lvm" AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) -@@ -1886,6 +1888,7 @@ AC_SUBST(PYTHON2DIR) +@@ -1944,6 +1946,7 @@ AC_SUBST(PYTHON2DIR) AC_SUBST(PYTHON3) AC_SUBST(PYTHON3DIR) AC_SUBST(RT_LIBS) @@ -68,6 +68,3 @@ index 7c517b87b..7ef1bb766 100644 # Do not show tool errors by default (only done/skipping summary # message provided by this script) and no verbose mode by default. --- -2.29.2 - diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch deleted file mode 100644 index f6b293553d..0000000000 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch +++ /dev/null @@ -1,29 +0,0 @@ -lvmdbusd: create dirs for lock file - -Create leading dirs for lvmdbusd lock file, otherwise it fails to start: - -| systemd[1]: Starting LVM2 D-Bus service... -| lvmdbusd[1602]: [1602]: Error during creation of lock file(/var/lock/lvm/lvmdbusd): errno(2), exiting! - -Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/7] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - daemons/lvmdbusd/utils.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py -index d479175f6..830648659 100644 ---- a/daemons/lvmdbusd/utils.py -+++ b/daemons/lvmdbusd/utils.py -@@ -778,6 +778,7 @@ class LockFile(object): - - def __enter__(self): - try: -+ os.makedirs(os.path.dirname(self.lock_file)) - self.fd = os.open(self.lock_file, os.O_CREAT | os.O_RDWR, stat.S_IRUSR | stat.S_IWUSR) - - # Get and set the close on exec and lock the file --- -2.34.1 - diff --git a/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch index 3b85a17b61..200f2f044a 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch @@ -1,3 +1,8 @@ +From 34f5a21afae759d48fa11e77b622ca35a4feabaa Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Wed, 6 Dec 2023 10:24:46 +0800 +Subject: [PATCH] lvm2: 2.03.16 -> 2.03.22 + Not check python modules pyudev and dbus during configure that they are runtime dependencies. Deal with them in the package config setting in the recipe. @@ -13,10 +18,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index ee088b3f5..b94ef4e56 100644 +index 9dfdcfe01..fcf5c8b78 100644 --- a/configure.ac +++ b/configure.ac -@@ -1262,8 +1262,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [ +@@ -1282,8 +1282,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [ AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"]) # To get this macro, install autoconf-archive package then run autoreconf @@ -28,7 +33,7 @@ index ee088b3f5..b94ef4e56 100644 ################################################################################ diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in -index 9c2629279..a79daabf7 100644 +index 08b061fb2..e2b1c3209 100644 --- a/daemons/lvmdbusd/Makefile.in +++ b/daemons/lvmdbusd/Makefile.in @@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ @@ -41,7 +46,7 @@ index 9c2629279..a79daabf7 100644 LVMDBUS_SRCDIR_FILES = \ automatedproperties.py \ @@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD) - @echo " [INSTALL] $<" + $(SHOW) " [INSTALL] $<" $(Q) $(INSTALL_DIR) $(sbindir) $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) - $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__ diff --git a/meta-oe/recipes-support/mcelog/mcelog_198.bb b/meta-oe/recipes-support/mcelog/mcelog_199.bb index e302f4175d..0a48fc48ce 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_198.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_199.bb @@ -5,13 +5,12 @@ and should run on all Linux systems that need error handling." HOMEPAGE = "https://mcelog.org/" SECTION = "System Environment/Base" -SRC_URI = "\ - git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ - file://0001-client-Include-string.h-form-mem-function-prototypes.patch \ - file://run-ptest \ -" +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ + file://0001-client-Include-string.h-form-mem-function-prototypes.patch \ + file://run-ptest \ + " -SRCREV = "ab58f07b9b1a4456fca0f5f41639d5cbecc80e36" +SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-oe/recipes-support/monit/monit_5.33.0.bb b/meta-oe/recipes-support/monit/monit_5.34.0.bb index 66d4079a94..7c3869789c 100644 --- a/meta-oe/recipes-support/monit/monit_5.33.0.bb +++ b/meta-oe/recipes-support/monit/monit_5.34.0.bb @@ -15,7 +15,7 @@ SRC_URI = " \ file://monitrc \ " -SRC_URI[sha256sum] = "1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5" +SRC_URI[sha256sum] = "37f514cd8973bbce104cb8517ff3fc504052a083703eee0d0e873db26b919820" DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" @@ -45,12 +45,12 @@ do_configure:prepend() { do_install:append() { # Configuration file - install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc + install -Dm 0600 ${UNPACKDIR}/monitrc ${D}${sysconfdir}/monitrc # SystemD install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service # SysV - install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit + install -Dm 0755 ${UNPACKDIR}/monit ${D}${sysconfdir}/init.d/monit } diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb index e9f01bd1fe..374cda3b4e 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb @@ -91,14 +91,14 @@ do_install() { # if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)};then install -d ${D}${sysconfdir}/init.d - cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd + cp ${UNPACKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd fi sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \ ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/multipath.conf.example \ + install -m 0644 ${UNPACKDIR}/multipath.conf.example \ ${D}${sysconfdir}/multipath.conf.example } diff --git a/meta-oe/recipes-support/nano/nano_7.2.bb b/meta-oe/recipes-support/nano/nano_8.0.bb index 0642287c98..56aa47f641 100644 --- a/meta-oe/recipes-support/nano/nano_7.2.bb +++ b/meta-oe/recipes-support/nano/nano_8.0.bb @@ -13,7 +13,7 @@ RDEPENDS:${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526" +SRC_URI[sha256sum] = "c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-oe/recipes-support/nmon/nmon_16m.bb b/meta-oe/recipes-support/nmon/nmon_16m.bb index d4a357cea0..1779dd2273 100644 --- a/meta-oe/recipes-support/nmon/nmon_16m.bb +++ b/meta-oe/recipes-support/nmon/nmon_16m.bb @@ -18,7 +18,8 @@ CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" LDFLAGS += "-ltinfo -lncursesw -lm" ASNEEDED:pn-nmon = "" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon diff --git a/meta-oe/recipes-support/nspr/nspr_4.35.bb b/meta-oe/recipes-support/nspr/nspr_4.35.bb index f8d329398b..abd750b138 100644 --- a/meta-oe/recipes-support/nspr/nspr_4.35.bb +++ b/meta-oe/recipes-support/nspr/nspr_4.35.bb @@ -171,7 +171,7 @@ do_compile:append() { } do_install:append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc + install -D ${UNPACKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc sed -i \ -e 's:NSPRVERSION:${PV}:g' \ -e 's:OEPREFIX:${prefix}:g' \ diff --git a/meta-oe/recipes-support/nss/nss_3.98.bb b/meta-oe/recipes-support/nss/nss_3.98.bb index 01501362e2..0ceefb5e3e 100644 --- a/meta-oe/recipes-support/nss/nss_3.98.bb +++ b/meta-oe/recipes-support/nss/nss_3.98.bb @@ -224,7 +224,7 @@ do_install:append() { done install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc + sed 's/%NSS_VERSION%/${PV}/' ${UNPACKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc @@ -239,9 +239,9 @@ do_install:append:class-target() { # databases by: # certutil -N -d sql:/database/path/ --empty-password install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt + install -m 0644 ${UNPACKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db + install -m 0644 ${UNPACKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db + install -m 0644 ${UNPACKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt } PACKAGE_WRITE_DEPS += "nss-native" diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index 4a1a0f568d..2077335670 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -62,7 +62,7 @@ do_install () { install -d ${D}${sysconfdir} # fix up hardcoded paths sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ - ${WORKDIR}/openct.service ${WORKDIR}/openct.init + ${UNPACKDIR}/openct.service ${UNPACKDIR}/openct.init oe_runmake install DESTDIR=${D} install -dm 755 ${D}${libdir}/ctapi/ @@ -70,11 +70,11 @@ do_install () { install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf - install -Dpm 755 ${WORKDIR}/openct.init ${D}${sysconfdir}/init.d/openct - install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct + install -Dpm 755 ${UNPACKDIR}/openct.init ${D}${sysconfdir}/init.d/openct + install -Dpm 644 ${UNPACKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/openct.service ${D}${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/openct.service ${D}${systemd_unitdir}/system so=$(find ${D} -name \*.so | sed "s|^${D}||") sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf @@ -82,3 +82,8 @@ do_install () { } BBCLASSEXTEND = "native" + +# http://errors.yoctoproject.org/Errors/Details/766890/ +# openct-0.6.20/src/ifd/ifdhandler.c:239:52: error: passing argument 2 of 'ifd_get_eventfd' from incompatible pointer type [-Wincompatible-pointer-types] +# openct-0.6.20/src/ifd/process.c:461:61: error: passing argument 4 of 'ct_tlv_get_opaque' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb b/meta-oe/recipes-support/openldap/openldap_2.6.7.bb index e807fdef16..e619b059b1 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.6.7.bb @@ -160,7 +160,7 @@ FILES:${PN}-dbg += "${libexecdir}/openldap/.debug" do_install:append() { install -d ${D}${sysconfdir}/init.d - cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap + cat ${UNPACKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap chmod 755 ${D}${sysconfdir}/init.d/openldap # This is duplicated in /etc/openldap and is for slapd rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example @@ -177,7 +177,7 @@ do_install:append() { rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/slapd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/slapd.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service # Uses mdm as the database @@ -229,3 +229,8 @@ python populate_packages:prepend () { } BBCLASSEXTEND = "native" + +# This one is reproducible only on 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766968/ +# tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb new file mode 100644 index 0000000000..88033e58cc --- /dev/null +++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Open Telemetry Library" +DESCRIPTION = "An Observability framework to create and manage telemetry data \ +such as traces, metrics, and logs." +HOMEPAGE = "https://github.com/open-telemetry/opentelemetry-cpp" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +DEPENDS = "nlohmann-json" + +SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;" +SRCREV = "054b0dc207c1f58e290d78cdaac5f314bc328b31" + +S = "${WORKDIR}/git" +inherit cmake pkgconfig lib_package + +PACKAGECONFIG ?= "opentelemety_install otlp_api" + +PACKAGECONFIG[opentelemety_install]="-DOPENTELEMETRY_INSTALL=ON,-DOPENTELEMETRY_INSTALL=OFF" +PACKAGECONFIG[build_package]="-DBUILD_PACKAGE=ON,-DBUILD_PACKAGE=OFF" +PACKAGECONFIG[otlp_api]="-DWITH_OTLP_API=ON,-DWITH_OTLP_API=OFF" +PACKAGECONFIG[otlp_grpc]="-DWITH_OTLP_GRPC=ON,-DWITH_OTLP_GRPC=OFF" +PACKAGECONFIG[otlp_http]="-DWITH_OTLP_HTTP=ON,-DWITH_OTLP_HTTP=OFF" +PACKAGECONFIG[otlp_prometheus]="-DWITH_PROMETHEUS=ON,-DWITH_PROMETHEUS=OFF" +PACKAGECONFIG[benchmark]="-DWITH_BENCHMARK=ON,-DWITH_BENCHMARK=OFF" +PACKAGECONFIG[testing]="-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF" diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb index 6a93b2ec90..10545b65ea 100644 --- a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb +++ b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb @@ -52,7 +52,7 @@ RDEPENDS:${PN}-testsuite += "${PN} bash perl" RDEPENDS:python3-${PN} += "${PN} python3" do_configure:prepend () { - cp ${WORKDIR}/config.linux ${B} + cp ${UNPACKDIR}/config.linux ${B} rm -rf ${S}/include/pcp/configsz.h rm -rf ${S}/include/pcp/platformsz.h export SED=${TMPDIR}/hosttools/sed diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index 6ce42ec187..e96e118611 100644 --- a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -37,3 +37,7 @@ FILES:${PN} += " \ ${datadir}/appdata \ ${datadir}/metainfo \ " + +# http://errors.yoctoproject.org/Errors/Details/766947/ +# pidgin-sipe-1.25.0/src/core/sipe-xml.c:210:9: error: initialization of 'void (*)(void *, const xmlError *)' {aka 'void (*)(void *, const struct _xmlError *)'} from incompatible pointer type 'void (*)(void *, xmlError *)' {aka 'void (*)(void *, struct _xmlError *)'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb index ae251b5a08..1691824ce8 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb @@ -111,3 +111,7 @@ python populate_packages:prepend () { description='Finch plugin %s', prepend=True, extra_depends='') } + +# http://errors.yoctoproject.org/Errors/Details/766946/ +# pidgin-2.14.2/libpurple/protocols/bonjour/parser.c:200:9: error: initialization of 'void (*)(void *, const xmlError *)' {aka 'void (*)(void *, const struct _xmlError *)'} from incompatible pointer type 'void (*)(void *, xmlError *)' {aka 'void (*)(void *, struct _xmlError *)'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch index f70e8bcc74..d172c8dbf2 100644 --- a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch +++ b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch @@ -1,4 +1,4 @@ -From 879ddb725823c78c9510cfd39786adb16f3726c8 Mon Sep 17 00:00:00 2001 +From 6b1123b313e439d8bfae3570a3e541b3aa26f3ad Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 16 Sep 2023 19:52:56 -0700 Subject: [PATCH] cppignore.lnx: Ignore PKCS12 and testLaunch test @@ -48,10 +48,10 @@ Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> 1 file changed, 9 insertions(+) diff --git a/cppignore.lnx b/cppignore.lnx -index 2c2376526..65df4af08 100644 +index b3288d474..9aad48ca5 100644 --- a/cppignore.lnx +++ b/cppignore.lnx -@@ -28,3 +28,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy +@@ -30,3 +30,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy CppUnit::TestCaller<HTTPSStreamFactoryTest>.testProxy CppUnit::TestCaller<DNSTest>.testHostByAddress CppUnit::TestCaller<DNSTest>.testHostByName diff --git a/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch b/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch deleted file mode 100644 index 427cb9723a..0000000000 --- a/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e54478c936493c0ed87e875f04127bd13642de44 Mon Sep 17 00:00:00 2001 -From: tyler92 <tyler92@inbox.ru> -Date: Tue, 21 Nov 2023 05:07:24 +0300 -Subject: [PATCH] fix(build): Install cmake files with resolved ENABLE_JSON and - ENABLE_XML (#4227) - -Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/4227] -Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> - ---- - Util/cmake/PocoUtilConfig.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Util/cmake/PocoUtilConfig.cmake b/Util/cmake/PocoUtilConfig.cmake -index 90c1eab1c..8186435e1 100644 ---- a/Util/cmake/PocoUtilConfig.cmake -+++ b/Util/cmake/PocoUtilConfig.cmake -@@ -1,9 +1,9 @@ - include(CMakeFindDependencyMacro) - find_dependency(PocoFoundation) --if(ENABLE_XML) -+if(@ENABLE_XML@) - find_dependency(PocoXML) - endif() --if(ENABLE_JSON) -+if(@ENABLE_JSON@) - find_dependency(PocoJSON) - endif() - include("${CMAKE_CURRENT_LIST_DIR}/PocoUtilTargets.cmake") --- -2.43.0 - diff --git a/meta-oe/recipes-support/poco/poco_1.12.5p2.bb b/meta-oe/recipes-support/poco/poco_1.13.3.bb index a0bb0b5d96..6ad577b37b 100644 --- a/meta-oe/recipes-support/poco/poco_1.12.5p2.bb +++ b/meta-oe/recipes-support/poco/poco_1.13.3.bb @@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" # These dependencies are required by Foundation DEPENDS = "libpcre2 zlib" -SRC_URI = "git://github.com/pocoproject/poco.git;branch=master;protocol=https \ +SRC_URI = "git://github.com/pocoproject/poco.git;branch=master-unused;protocol=https \ file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ file://run-ptest \ - file://0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch \ " -SRCREV = "1d6fb3e1383e559cacbada5e3f861c0dafaf5d30" +SRCREV = "d6bd48a94c5f03e3c69cac1b024fdad5120e3a7b" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb index eed21ad54a..5433659af4 100644 --- a/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb +++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb @@ -30,7 +30,7 @@ do_compile() { do_install() { oe_runmake install DESTDIR=${D} prefix=${prefix} datadir=${datadir} install -d ${D}${datadir}/poppler/cMap - install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ + install -m644 ${UNPACKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ } FILES:${PN} += "${datadir}" diff --git a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb index b61fb026ca..09534c44fd 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb +++ b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb @@ -9,7 +9,8 @@ SRC_URI = "file://pxaregs.c \ file://serial.patch \ file://usb.patch " -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile() { ${CC} pxaregs.c -o pxaregs ${CFLAGS} ${LDFLAGS} diff --git a/meta-filesystems/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb b/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb index 323ddb4157..323ddb4157 100644 --- a/meta-filesystems/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb +++ b/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb diff --git a/meta-oe/recipes-support/re2/re2_2024.03.01.bb b/meta-oe/recipes-support/re2/re2_2024.03.01.bb index 192fe265f1..6e5b32a945 100644 --- a/meta-oe/recipes-support/re2/re2_2024.03.01.bb +++ b/meta-oe/recipes-support/re2/re2_2024.03.01.bb @@ -16,9 +16,6 @@ DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebe inherit cmake ptest RDEPENDS:${PN}-ptest += "cmake sed" -RDEPENDS:${PN} += "abseil-cpp-dev" - -INSANE_SKIP:${PN} += "dev-deps" EXTRA_OECMAKE += " \ -DBUILD_SHARED_LIBS=ON \ @@ -39,6 +36,6 @@ FILES:${PN} = "${libdir}" INSANE_SKIP:${PN} += "dev-so" # Don't include so files in dev package -FILES:${PN}-dev = "${includedir} ${libdir}/cmake" +FILES:${PN}-dev = "${includedir} ${libdir}/cmake ${libdir}/pkgconfig" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/serial/serial_1.2.1.bb b/meta-oe/recipes-support/serial/serial_1.2.1.bb index f42d0f3516..c3f13d1af5 100644 --- a/meta-oe/recipes-support/serial/serial_1.2.1.bb +++ b/meta-oe/recipes-support/serial/serial_1.2.1.bb @@ -17,7 +17,7 @@ inherit cmake # Work-around for https://github.com/wjwwood/serial/issues/135 EXTRA_OECMAKE = " \ - -DCMAKE_MODULE_PATH=${WORKDIR} \ + -DCMAKE_MODULE_PATH=${UNPACKDIR} \ -DCATKIN_PACKAGE_LIB_DESTINATION=${libdir} \ -DCATKIN_PACKAGE_BIN_DESTINATION=${bindir} \ -DCATKIN_GLOBAL_INCLUDE_DESTINATION=${includedir} \ diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.14.0.bb b/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb index aa55171f31..19bac0be89 100644 --- a/meta-oe/recipes-support/spdlog/spdlog_1.14.0.bb +++ b/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" -SRCREV = "238c9ffa5d1a14226eeabe10c9b63ffff3ed8b8e" +SRCREV = "27cb4c76708608465c413f6d0e6b8d99a4d84302" SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" DEPENDS = "fmt" diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb index 4584944150..ab4a8d1825 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb @@ -77,12 +77,12 @@ do_configure:prepend() { do_install:append() { install -d ${D}${sysconfdir}/${BPN} install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog + install -m 755 ${UNPACKDIR}/initscript ${D}${sysconfdir}/init.d/syslog install -d ${D}${sysconfdir}/default/volatiles/ - install -m 644 ${WORKDIR}/volatiles.03_syslog-ng ${D}${sysconfdir}/default/volatiles/03_syslog-ng + install -m 644 ${UNPACKDIR}/volatiles.03_syslog-ng ${D}${sysconfdir}/default/volatiles/03_syslog-ng install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 644 ${WORKDIR}/syslog-ng-tmp.conf ${D}${sysconfdir}/tmpfiles.d/syslog-ng.conf + install -m 644 ${UNPACKDIR}/syslog-ng-tmp.conf ${D}${sysconfdir}/tmpfiles.d/syslog-ng.conf install -d ${D}${localstatedir}/lib/${BPN} # Remove /var/run as it is created on startup @@ -94,7 +94,7 @@ do_install:append() { # support for systemd if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf + install -m 644 ${UNPACKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf install -d ${D}${systemd_unitdir}/system/ install -m 644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service @@ -107,7 +107,7 @@ do_install:append() { install -d ${D}${systemd_unitdir}/system/multi-user.target.wants ln -sf ../${BPN}@.service ${D}${systemd_unitdir}/system/multi-user.target.wants/${BPN}@default.service else - install -m 644 ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf + install -m 644 ${UNPACKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf fi oe_multilib_header syslog-ng/syslog-ng-config.h @@ -147,3 +147,11 @@ SYSTEMD_SERVICE:${PN} = "${BPN}@.service" INITSCRIPT_NAME = "syslog" INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 90 0 1 6 ." + +# Fails only with 32bit MACHINEs +# http://errors.yoctoproject.org/Errors/Details/766956/ +# syslog-ng-4.6.0/modules/secure-logging/slog.c:937:63: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] +# syslog-ng-4.6.0/modules/secure-logging/slog.c:955:99: error: passing argument 5 of 'cmac' from incompatible pointer type [-Wincompatible-pointer-types] +# syslog-ng-4.6.0/modules/secure-logging/slog.c:959:74: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] +# syslog-ng-4.6.0/modules/secure-logging/slog.c:975:107: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch b/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch deleted file mode 100644 index 34a1ea0fa2..0000000000 --- a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f828a89cc1e956d56498422ec158d284fc97de3f Mon Sep 17 00:00:00 2001 -From: OBATA Akio <obache@outlook.com> -Date: Fri, 10 Aug 2018 18:38:18 +0900 -Subject: [PATCH] Fix to set libedit path from configure option properly - -Upstream-Status: Backport [https://github.com/uim/uim/pull/134] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 00d1b02..9c0a5ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1311,8 +1311,8 @@ if test "x$with_libedit" != xno; then - if test "x$with_libedit" = xyes; then - libedit_path=/usr - else -- with_libedit=yes - libedit_path="$with_libedit" -+ with_libedit=yes - fi - - saved_CPPFLAGS=$CPPFLAGS --- -2.23.0 - diff --git a/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch b/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch deleted file mode 100644 index adb9c4b06b..0000000000 --- a/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix error pointed out by gcc10 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/sigscheme/libgcroots/include/private/gc_priv.h -+++ b/sigscheme/libgcroots/include/private/gc_priv.h -@@ -2026,7 +2026,7 @@ void GC_err_puts(const char *s); - - # if defined(NEED_FIND_LIMIT) || \ - defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS) --JMP_BUF GC_jmp_buf; -+extern JMP_BUF GC_jmp_buf; - - /* Set up a handler for address faults which will longjmp to */ - /* GC_jmp_buf; */ diff --git a/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-oe/recipes-support/uim/uim_1.8.9.bb index e0d9d05dce..f78c82f18a 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.9.bb @@ -4,15 +4,11 @@ LICENSE = "BSD-3-Clause & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" SECTION = "inputmethods" -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 = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2" SRC_URI:append:class-target = "\ file://uim-module-manager.patch \ " -SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" -SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc" +SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb index 7970cd953f..026d4ffe02 100644 --- a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb +++ b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Unicode Character Database" HOMEPAGE = "https://unicode.org/ucd/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${WORKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f" SRC_URI = " \ https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ @@ -12,11 +12,14 @@ SRC_URI[ucd-license.sha256sum] = "f7830d126f59d83842565d3dddedc79db4ca978ed52aee inherit allarch +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_install() { install -d ${D}${datadir}/unicode - cp -rf ${WORKDIR}/ucd ${D}${datadir}/unicode + cp -rf ${UNPACKDIR}/ucd ${D}${datadir}/unicode } FILES:${PN} = "${datadir}/unicode/ucd" diff --git a/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch b/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch new file mode 100644 index 0000000000..6884465452 --- /dev/null +++ b/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch @@ -0,0 +1,53 @@ +From 76beb0938ef14276123996bfd99df23b0c7f0982 Mon Sep 17 00:00:00 2001 +From: Soumya Sambu <soumya.sambu@windriver.com> +Date: Fri, 7 Jun 2024 11:10:46 +0000 +Subject: [PATCH] PostgreSQL driver: Fix incompatible pointer-to-integer types + +These result in out-of-bounds stack writes on 64-bit architectures +(caller has 4 bytes, callee writes 8 bytes), and seem to have gone +unnoticed on little-endian architectures (although big-endian +architectures must be broken). + +This change is required to avoid a build failure with GCC 14. + +CVE: CVE-2024-1013 + +Upstream-Status: Backport [https://github.com/lurcher/unixODBC/commit/45f501e1be2db6b017cc242c79bfb9de32b332a1] + +Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> +--- + Drivers/Postgre7.1/info.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Drivers/Postgre7.1/info.c b/Drivers/Postgre7.1/info.c +index 63ac91f..2216ecd 100644 +--- a/Drivers/Postgre7.1/info.c ++++ b/Drivers/Postgre7.1/info.c +@@ -1779,14 +1779,14 @@ char *table_name; + char index_name[MAX_INFO_STRING]; + short fields_vector[8]; + char isunique[10], isclustered[10]; +-SDWORD index_name_len, fields_vector_len; ++SQLLEN index_name_len, fields_vector_len; + TupleNode *row; + int i; + HSTMT hcol_stmt; + StatementClass *col_stmt, *indx_stmt; + char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING]; + char **column_names = 0; +-Int4 column_name_len; ++SQLLEN column_name_len; + int total_columns = 0; + char error = TRUE; + ConnInfo *ci; +@@ -2136,7 +2136,7 @@ HSTMT htbl_stmt; + StatementClass *tbl_stmt; + char tables_query[STD_STATEMENT_LEN]; + char attname[MAX_INFO_STRING]; +-SDWORD attname_len; ++SQLLEN attname_len; + char pktab[MAX_TABLE_LEN + 1]; + Int2 result_cols; + +-- +2.40.0 diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb index 7819387c39..dfad833e0a 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb @@ -11,6 +11,7 @@ DEPENDS = "libtool readline" SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ file://do-not-use-libltdl-source-directory.patch \ file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ + file://CVE-2024-1013.patch \ " SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" diff --git a/meta-oe/recipes-support/uriparser/uriparser_0.9.7.bb b/meta-oe/recipes-support/uriparser/uriparser_0.9.8.bb index 421263e62b..3d76190d39 100644 --- a/meta-oe/recipes-support/uriparser/uriparser_0.9.7.bb +++ b/meta-oe/recipes-support/uriparser/uriparser_0.9.8.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" -SRC_URI[sha256sum] = "11553b2abd2b5728a6c88e35ab08e807d0a0f23c44920df937778ce8cc4d40ff" +SRC_URI[sha256sum] = "4cd0e4f93b477272fabceeb0202f269169fe6ec3044e10fac6acbcdf354bb080" inherit cmake github-releases diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb index 208b1bb6e5..47f616e990 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb @@ -1,7 +1,7 @@ SUMMARY = "VirtualBox Linux Guest Drivers" SECTION = "core" LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e" DEPENDS = "virtual/kernel" @@ -15,7 +15,7 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 file://Makefile.utils \ " -SRC_URI[sha256sum] = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9" +SRC_URI[sha256sum] = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5" S ?= "${WORKDIR}/vbox_module" S:task-patch = "${WORKDIR}/${VBOX_NAME}" @@ -33,14 +33,14 @@ do_export_sources[depends] += "virtual/kernel:do_shared_workdir" do_export_sources() { mkdir -p "${S}" - ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz + ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz # add a mount utility to use shared folder from VBox Addition Source Code mkdir -p "${S}/utils" - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils - install ${S}/../Makefile.utils ${S}/utils/Makefile + install ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils + install ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils + install ${UNPACKDIR}/Makefile.utils ${S}/utils/Makefile # some kernel versions have issues with stdarg.h and compatibility with # the sysroot and libc-headers/uapi. If we include the file directly from diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.1.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb index fc96d5dc3b..31480b8d8e 100644 --- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.1.bb +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb @@ -16,7 +16,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ " -SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561" +SRC_URI[sha256sum] = "523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb index 0aa8724281..87e8f1f5e9 100644 --- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb @@ -22,17 +22,17 @@ PORTAL_BACKENDS ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'gtk4', 'xdg-desktop-portal-gtk', '', d)} \ " -RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS}" +RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS} fuse3-utils" inherit meson pkgconfig python3native features_check SRC_URI = " \ - git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=main \ + git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=xdg-desktop-portal-1.18 \ file://0001-meson.build-add-a-hack-for-crosscompile.patch \ " S = "${WORKDIR}/git" -SRCREV = "37a6f7c8b8e08b9861f05e172cd4e0d07a832c4d" +SRCREV = "11c8a96b147aeae70e3f770313f93b367d53fedd" FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb index b839a68294..c1b75e6138 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb @@ -66,7 +66,7 @@ do_install:append() { install -d ${D}${sysconfdir}/sysconfig/xrdp install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ - install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ + install -m 0644 ${UNPACKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ chown xrdp:xrdp ${D}${sysconfdir}/xrdp } diff --git a/meta-oe/recipes-test/catch2/catch2_2.13.10.bb b/meta-oe/recipes-test/catch2/catch2_3.6.0.bb index 8512a0f30a..c4541c4d52 100644 --- a/meta-oe/recipes-test/catch2/catch2_2.13.10.bb +++ b/meta-oe/recipes-test/catch2/catch2_3.6.0.bb @@ -4,8 +4,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x;protocol=https" -SRCREV = "182c910b4b63ff587a3440e08f84f70497e49a81" +SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https" +SRCREV = "4e8d92bf02f7d1c8006a0e7a5ecabd8e62d98502" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb b/meta-oe/recipes-test/cukinia/cukinia_0.7.0.bb index 1bcfb0a9bf..e3424d019e 100644 --- a/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb +++ b/meta-oe/recipes-test/cukinia/cukinia_0.7.0.bb @@ -2,14 +2,13 @@ SUMMARY = "Linux firmware validation framework" DESCRIPTION = "Cukinia is designed to help Linux-based embedded firmware \ developers run simple system-level validation tests on their firmware." HOMEPAGE = "https://github.com/savoirfairelinux/cukinia" -LICENSE = "GPL-3.0-only | Apache-2.0" +LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/savoirfairelinux/cukinia.git;protocol=https;branch=master" -SRCREV = "a290f2dbb813ce12ba407962655a5d8b57322221" +SRCREV = "be56f653743cc0e68bef81ef35df7c50ff8919c4" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch b/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch new file mode 100644 index 0000000000..8bb19fb72b --- /dev/null +++ b/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch @@ -0,0 +1,29 @@ +From 648868595cf290e77aab1f271db2a57e1f791301 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 May 2024 20:37:07 -0700 +Subject: [PATCH] executor: Remove including <error.h> in test_linux.h + +it seems to be redundant and moreover it lets us compile on musl which +does not provide this system header + +Upstream-Status: Submitted [https://github.com/google/syzkaller/pull/4822] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + executor/test_linux.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/executor/test_linux.h b/executor/test_linux.h +index 7cf459569..8c9493539 100644 +--- a/executor/test_linux.h ++++ b/executor/test_linux.h +@@ -1,7 +1,6 @@ + // Copyright 2017 syzkaller project authors. All rights reserved. + // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. + +-#include <error.h> + #include <stdint.h> + #include <sys/utsname.h> + +-- +2.45.1 + diff --git a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb index b43207f2a7..639f55de2f 100644 --- a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb +++ b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb @@ -9,6 +9,7 @@ GO_IMPORT = "github.com/google/syzkaller" SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IMPORT};branch=master \ file://0001-sys-targets-targets.go-allow-users-to-override-hardc.patch;patchdir=src/${GO_IMPORT} \ file://0001-executor-Include-missing-linux-falloc.h.patch;patchdir=src/${GO_IMPORT} \ + file://0001-executor-Remove-including-error.h-in-test_linux.h.patch;patchdir=src/${GO_IMPORT} \ " SRCREV = "25905f5d0a2a7883bd33491997556193582c6059" diff --git a/meta-oe/recipes-test/testfloat/testfloat_3e.bb b/meta-oe/recipes-test/testfloat/testfloat_3e.bb index 48f50d8274..071be2a200 100644 --- a/meta-oe/recipes-test/testfloat/testfloat_3e.bb +++ b/meta-oe/recipes-test/testfloat/testfloat_3e.bb @@ -19,7 +19,8 @@ SRC_URI[TestFloat.sha256sum] = "6d4bdf0096b48a653aa59fc203a9e5fe18b5a58d7a1b7151 SRC_URI[SoftFloat.md5sum] = "7dac954ea4aed0697cbfee800ba4f492" SRC_URI[SoftFloat.sha256sum] = "21130ce885d35c1fe73fc1e1bf2244178167e05c6747cad5f450cc991714c746" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile(){ oe_runmake -C SoftFloat-${PV}/build/Linux-Cross-Compile/ diff --git a/meta-perl/conf/layer.conf b/meta-perl/conf/layer.conf index e20c8471e0..fb1fe88453 100644 --- a/meta-perl/conf/layer.conf +++ b/meta-perl/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_perl-layer = "1" LAYERDEPENDS_perl-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_perl-layer = "scarthgap styhead" +LAYERSERIES_COMPAT_perl-layer = "styhead" diff --git a/meta-perl/recipes-extended/logcheck/logcheck_1.4.3.bb b/meta-perl/recipes-extended/logcheck/logcheck_1.4.3.bb index c13bd940ea..037852392f 100644 --- a/meta-perl/recipes-extended/logcheck/logcheck_1.4.3.bb +++ b/meta-perl/recipes-extended/logcheck/logcheck_1.4.3.bb @@ -49,7 +49,7 @@ do_install() { # Don't install /var/lock when populating rootfs. Do it through volatile if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/99_logcheck ${D}${sysconfdir}/default/volatiles + install -m 0644 ${UNPACKDIR}/99_logcheck ${D}${sysconfdir}/default/volatiles fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d diff --git a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.60.bb b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.64.bb index 7e330c3704..7b67cd8625 100644 --- a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.60.bb +++ b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.64.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=415fc49abed2728f9480cd32c8d67beb" SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" -SRC_URI[sha256sum] = "c2f6330bcc7cacda0c905f57ca0d31da1b19a2e4e5babede648c49b13803ee11" +SRC_URI[sha256sum] = "39bd8e40ce00cdab39e0a2bc71abd2bbe451d1d97bc7e54e41a2e199eb6226e7" S = "${WORKDIR}/CGI-${PV}" diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.206.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.212.bb index 2bd98e73b4..7120730416 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.206.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.212.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://metacpan.org/release/Compress-Raw-Bzip2" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=85ab0f65a47c4c0f72dd6d033ff74ece" +LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=cd551ef796cc7fa34351ced771a3a7f9" SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-${PV}.tar.gz" -SRC_URI[sha256sum] = "212b81db1c0ae822d19928619a603bd108cb5d5c4700fc67dc7cb169e0cc6525" +SRC_URI[sha256sum] = "6caeee843c428f45fa9646ea98dc675470db63dbac0ee3e2d8e9ee4eb58a856d" DEPENDS += "bzip2" diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.206.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.212.bb index cdabdb1390..c4cba470bd 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.206.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.212.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://metacpan.org/release/Compress-Raw-Lzma" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=b95311d4a7dbf3d0d3663edc094aced6" +LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=2a0fd6d30eaf88289587b776f74c2886" SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Lzma-${PV}.tar.gz" -SRC_URI[sha256sum] = "e01a7040b84bdc67592d13eec0c788590e1f696d1d4f07c7097bd72a4f886eb4" +SRC_URI[sha256sum] = "4ba7ab803bdba2d7be7d55d4a2668369d794eb8d8d6bb0db6b74fd9b4ce18cac" DEPENDS += "xz" diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.206.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.212.bb index 47fe8e0035..d79a710a77 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.206.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.212.bb @@ -6,11 +6,11 @@ HOMEPAGE = "https://metacpan.org/release/Compress-Raw-Zlib" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=8;endline=17;md5=45bba5fa4937353fd4f505fa2108a6bf" +LIC_FILES_CHKSUM = "file://README;beginline=8;endline=17;md5=1bb3479faca6bb2086c05a33a934f62a" SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Zlib-${PV}.tar.gz" -SRC_URI[sha256sum] = "46785a6a383a1c843895b7f9f25d5d759e7c305159f9d1e04a3604eb74c77374" +SRC_URI[sha256sum] = "6d9de0c11921fd520dfd99a3f6b0ca9f1fd9850274f8bec10bbaa4f6803cc049" DEPENDS += "zlib" diff --git a/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.74.bb b/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.74.bb index 7e38da8836..e5483e8c26 100644 --- a/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.74.bb +++ b/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.74.bb @@ -33,7 +33,7 @@ RDEPENDS:${PN} += "libdbi-perl \ do_install:append() { if [ ${PERL_DBM_TEST} = "1" ]; then - install -m 755 -D ${WORKDIR}/sqlite-perl-test.pl ${D}/${bindir}/sqlite-perl-test.pl + install -m 755 -D ${UNPACKDIR}/sqlite-perl-test.pl ${D}/${bindir}/sqlite-perl-test.pl fi } diff --git a/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.206.bb b/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.212.bb index 1959df5e04..cf5a9db666 100644 --- a/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.206.bb +++ b/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.212.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://metacpan.org/release/IO-Compress-Lzma" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=b95311d4a7dbf3d0d3663edc094aced6" +LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=2a0fd6d30eaf88289587b776f74c2886" SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-Lzma-${PV}.tar.gz" -SRC_URI[sha256sum] = "6c600f9bbb1a2d834b1decd0bd5863dcea52e0ac17de101b5085e0e3cb27285c" +SRC_URI[sha256sum] = "51ef81f931cfd2c13fb2340c665204a9587843087dec1a57e9e9f4666d6dad40" S = "${WORKDIR}/IO-Compress-Lzma-${PV}" diff --git a/meta-perl/recipes-perl/libio/libio-compress-perl_2.206.bb b/meta-perl/recipes-perl/libio/libio-compress-perl_2.212.bb index c58e3fa30c..bb4013ae5a 100644 --- a/meta-perl/recipes-perl/libio/libio-compress-perl_2.206.bb +++ b/meta-perl/recipes-perl/libio/libio-compress-perl_2.212.bb @@ -14,11 +14,11 @@ HOMEPAGE = "https://metacpan.org/release/IO-Compress" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=8e78b88f9c8ac08ae03e8ea81195ca45" +LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=254a3b5756814db98ee483c8974736c6" SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-${PV}.tar.gz" -SRC_URI[sha256sum] = "7d3062b9a494f757e8d0614f220d83f22731bbda1aeb5f7cff0e72a83f433d35" +SRC_URI[sha256sum] = "687490dbf9c4be42c22a945c4601812be5f4d38a9836018148915ba9e0ea65b1" S = "${WORKDIR}/IO-Compress-${PV}" diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.40.bb b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.45.bb index e30125ab7b..21f5b7f576 100644 --- a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.40.bb +++ b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.45.bb @@ -9,7 +9,7 @@ DEPENDS += "perl" SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" -SRC_URI[sha256sum] = "209bbd40de8d48c1bd7aade48da237fe0a499f89d279baa2e1a99bd5ec922ddc" +SRC_URI[sha256sum] = "39f4b82ffe822f4d28691f6c4260f6f1fe6b5a09b546b56dd2410c21b38c1380" UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc index e07aaf3c0c..bdcd658d98 100644 --- a/meta-python/conf/include/ptest-packagelists-meta-python.inc +++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc @@ -17,8 +17,10 @@ PTESTS_FAST_META_PYTHON = "\ python3-cachetools \ python3-cbor2 \ python3-click \ + python3-dasbus \ python3-dominate \ python3-execnet \ + python3-flask \ python3-flexcache \ python3-flexparser \ python3-freezegun \ diff --git a/meta-python/conf/layer.conf b/meta-python/conf/layer.conf index 998f492a49..aaf620a433 100644 --- a/meta-python/conf/layer.conf +++ b/meta-python/conf/layer.conf @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1" LAYERDEPENDS_meta-python = "core (>= 12) openembedded-layer" -LAYERSERIES_COMPAT_meta-python = "scarthgap styhead" +LAYERSERIES_COMPAT_meta-python = "styhead" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-python/recipes-devtools/python/python3-annotated-types_0.6.0.bb b/meta-python/recipes-devtools/python/python3-annotated-types_0.7.0.bb index 79cbb66bc0..53552d0b7b 100644 --- a/meta-python/recipes-devtools/python/python3-annotated-types_0.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-annotated-types_0.7.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c6afb13fdc220497ee5cded1e717ed67" -SRC_URI[sha256sum] = "563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d" +SRC_URI[sha256sum] = "aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89" S = "${WORKDIR}/annotated_types-${PV}" PYPI_PACKAGE = "annotated_types" diff --git a/meta-python/recipes-devtools/python/python3-astroid_3.1.0.bb b/meta-python/recipes-devtools/python/python3-astroid_3.2.2.bb index 3c68f1e583..d7e7f56981 100644 --- a/meta-python/recipes-devtools/python/python3-astroid_3.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-astroid_3.2.2.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "ac248253bfa4bd924a0de213707e7ebeeb3138abeb48d798784ead1e56d419d4" +SRC_URI[sha256sum] = "8ead48e31b92b2e217b6c9733a21afafe479d52d6e164dd25fb1a770c7c3cf94" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.6.bb b/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.9.bb index 34f7187d46..0946dd2a33 100644 --- a/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.6.bb +++ b/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.9.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=f75d2927d3c1ed2414ef72048f5ad640" -SRC_URI[sha256sum] = "c03fdb1a7dbb6bed8ede763e4e0ac224a2a3157bdc51e4ba3832588a3c29904d" +SRC_URI[sha256sum] = "d0fc2c9af487b6ac2a3bd7db7b5139de54afcc3660720f80d7324b122a27c1c7" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-bitstring_4.2.1.bb b/meta-python/recipes-devtools/python/python3-bitstring_4.2.3.bb index 8485e2e8f3..4d86ce7df8 100644 --- a/meta-python/recipes-devtools/python/python3-bitstring_4.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-bitstring_4.2.3.bb @@ -1,9 +1,9 @@ SUMMARY = "Simple construction, analysis and modification of binary data." HOMEPAGE = "https://github.com/scott-griffiths/bitstring" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f7f2fd3f1cd52b5ccd39d76fb3568d3f" +LIC_FILES_CHKSUM = "file://LICENSE;md5=661f450e2c0aef39b4b15597333444a7" -SRC_URI[sha256sum] = "8abb5a661588c764bacf1a23d64c7bb57517d2841e3e6f54fb8c057119e0540d" +SRC_URI[sha256sum] = "e0c447af3fda0d114f77b88c2d199f02f97ee7e957e6d719f40f41cf15fbb897" PYPI_PACKAGE = "bitstring" diff --git a/meta-python/recipes-devtools/python/python3-cloudpickle_3.0.0.bb b/meta-python/recipes-devtools/python/python3-cloudpickle_3.0.0.bb index 25c379590f..fce5a5b408 100644 --- a/meta-python/recipes-devtools/python/python3-cloudpickle_3.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-cloudpickle_3.0.0.bb @@ -8,7 +8,7 @@ data." HOMEPAGE = "https://github.com/cloudpipe/cloudpickle" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE.cloudpickle;md5=b4d59aa5e2cc777722aac17841237931" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE.cloudpickle;md5=b4d59aa5e2cc777722aac17841237931" inherit pypi python_flit_core diff --git a/meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb b/meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb index 6b31d0b4f5..a6c3e139b8 100644 --- a/meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb +++ b/meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb @@ -22,7 +22,7 @@ addtask do_patchbuild after do_patch before do_configure do_patchbuild () { rm -f ${S}/CMakeLists.txt - cp ${WORKDIR}/CMakeLists.txt ${S}/ + cp ${UNPACKDIR}/CMakeLists.txt ${S}/ } do_install:append () { diff --git a/meta-python/recipes-devtools/python/python3-dasbus/run-ptest b/meta-python/recipes-devtools/python/python3-dasbus/run-ptest new file mode 100755 index 0000000000..8d2017d39c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-dasbus/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --automake diff --git a/meta-python/recipes-devtools/python/python3-dasbus_1.7.bb b/meta-python/recipes-devtools/python/python3-dasbus_1.7.bb new file mode 100644 index 0000000000..d1d294a284 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-dasbus_1.7.bb @@ -0,0 +1,32 @@ +SUMMARY = "Dasbus is a DBus library written in Python 3, based on GLib and inspired by pydbus." +HOMEPAGE = "https://dasbus.readthedocs.io" +SECTION = "devel" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" + +SRC_URI = "git://github.com/dasbus-project/dasbus.git;protocol=https;branch=master \ + file://run-ptest \ +" +SRCREV = "413cf9a0b7c231468f1d28d9a29dd8dd8bda15c5" + +S = "${WORKDIR}/git" + +inherit setuptools3 ptest + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ + + # Remove the problematic cases + # https://github.com/dasbus-project/dasbus/issues/128 + rm -rf ${D}${PTEST_PATH}/tests/lib_dbus.py + rm -rf ${D}${PTEST_PATH}/tests/test_dbus.py + rm -rf ${D}${PTEST_PATH}/tests/test_unix.py +} + +RDEPENDS:${PN} = "python3-pygobject" + +RDEPENDS:${PN}-ptest += " \ + python3-pytest \ + python3-unittest-automake-output \ +" diff --git a/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.1.bb b/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.3.bb index 9e2566175d..a4087d6473 100644 --- a/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.1.bb +++ b/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/bluetooth-devices/dbus-fast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=729e372b5ea0168438e4fd4a00a04947" -SRC_URI[sha256sum] = "87b852d2005f1d59399ca51c5f3538f28a4742d739d7abe82b7ae8d01d8a5d02" +SRC_URI[sha256sum] = "8d0f0f61d007c1316ce79cde35ed52c0ce8ce229fd0f0bf8c9af2013ab4516a7" PYPI_PACKAGE = "dbus_fast" diff --git a/meta-python/recipes-devtools/python/python3-django_5.0.4.bb b/meta-python/recipes-devtools/python/python3-django_5.0.6.bb index 3139ed4682..69b25742dc 100644 --- a/meta-python/recipes-devtools/python/python3-django_5.0.4.bb +++ b/meta-python/recipes-devtools/python/python3-django_5.0.6.bb @@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "4bd01a8c830bb77a8a3b0e7d8b25b887e536ad17a81ba2dce5476135c73312bd" +SRC_URI[sha256sum] = "ff1b61005004e476e0aeea47c7f79b85864c70124030e95146315396f1e7951f" RDEPENDS:${PN} += "\ python3-sqlparse \ diff --git a/meta-python/recipes-devtools/python/python3-filelock_3.13.4.bb b/meta-python/recipes-devtools/python/python3-filelock_3.14.0.bb index 4d6d19551a..d94ad4bf3b 100644 --- a/meta-python/recipes-devtools/python/python3-filelock_3.13.4.bb +++ b/meta-python/recipes-devtools/python/python3-filelock_3.14.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://py-filelock.readthedocs.io/" LICENSE = "Unlicense" LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" -SRC_URI[sha256sum] = "d13f466618bfde72bd2c18255e269f72542c6e70e7bac83a0232d6b1cc5c8cf4" +SRC_URI[sha256sum] = "6ea72da3be9b8c82afd3edcf99f2fffbb5076335a5ae4d03248bb5b6c3eae78a" BBCLASSEXTEND = "native nativesdk" inherit pypi python_hatchling diff --git a/meta-python/recipes-devtools/python/python3-flask/run-ptest b/meta-python/recipes-devtools/python/python3-flask/run-ptest new file mode 100644 index 0000000000..8d2017d39c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-flask/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --automake diff --git a/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb b/meta-python/recipes-devtools/python/python3-flask_3.0.3.bb index 300ca99ddc..98e773008c 100644 --- a/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-flask_3.0.3.bb @@ -4,14 +4,18 @@ Flask is a microframework for Python based on Werkzeug, Jinja 2 and good \ intentions. And before you ask: It’s BSD licensed!" HOMEPAGE = "https://github.com/mitsuhiko/flask/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "822c03f4b799204250a7ee84b1eddc40665395333973dfb9deebfe425fefcb7d" +SRC_URI[sha256sum] = "ceb27b0af3823ea2737928a4d99d125a06175b8512c445cbd9a9ce200ef76842" + +SRC_URI += " \ + file://run-ptest \ +" UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Flask" UPSTREAM_CHECK_REGEX = "/Flask/(?P<pver>(\d+[\.\-_]*)+)" -inherit pypi python_setuptools_build_meta +inherit pypi python_setuptools_build_meta ptest CLEANBROKEN = "1" @@ -23,3 +27,8 @@ RDEPENDS:${PN} = " \ python3-profile \ python3-werkzeug \ " + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} diff --git a/meta-python/recipes-devtools/python/python3-freezegun_1.5.0.bb b/meta-python/recipes-devtools/python/python3-freezegun_1.5.1.bb index b9cbedbf72..8b5750df43 100644 --- a/meta-python/recipes-devtools/python/python3-freezegun_1.5.0.bb +++ b/meta-python/recipes-devtools/python/python3-freezegun_1.5.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/spulec/freezegun" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=acf1d209bb6eddae4cbe6ffd6a0144fe" -SRC_URI[sha256sum] = "200a64359b363aa3653d8aac289584078386c7c3da77339d257e46a01fb5c77c" +SRC_URI[sha256sum] = "b29dedfcda6d5e8e083ce71b2b542753ad48cfec44037b3fc79702e2980a89e9" inherit pypi python_setuptools_build_meta ptest diff --git a/meta-python/recipes-devtools/python/python3-gevent/not-final.patch b/meta-python/recipes-devtools/python/python3-gevent/not-final.patch new file mode 100644 index 0000000000..444a195da4 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-gevent/not-final.patch @@ -0,0 +1,16 @@ +gevent fails to build with Cython 3.0.10. As per +https://github.com/gevent/gevent/issues/2031, removing the +cython.final decorator works around this. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +--- a/src/gevent/_gevent_cqueue.pxd ++++ b/src/gevent/_gevent_cqueue.pxd +@@ -75,7 +75,6 @@ cdef class ItemWaiter(Waiter): + cdef readonly Queue queue + + +-@cython.final + cdef class UnboundQueue(Queue): + pass diff --git a/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb b/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb index fbdbf8ccc7..806e093910 100644 --- a/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb @@ -13,7 +13,8 @@ RDEPENDS:${PN} = "python3-greenlet \ python3-zopeinterface \ " -SRC_URI += "file://0001-_setuputils.py-Do-not-add-sys_inc_dir.patch" +SRC_URI += "file://0001-_setuputils.py-Do-not-add-sys_inc_dir.patch \ + file://not-final.patch" SRC_URI[sha256sum] = "432fc76f680acf7cf188c2ee0f5d3ab73b63c1f03114c7cd8a34cebbe5aa2056" @@ -35,3 +36,8 @@ do_configure:append() { do_compile:append() { sed -i -e 's#${WORKDIR}##g' ${S}/src/gevent/*.c ${S}/src/gevent/libev/*.c ${S}/src/gevent/resolver/*.c } + +# http://errors.yoctoproject.org/Errors/Details/766918/ +# src/gevent/queue.c:11894:83: error: passing argument 1 of '__pyx_vtabptr_6gevent_14_gevent_cqueue_UnboundQueue->__pyx_base.put' from incompatible pointer type [-Wincompatible-pointer-types] +# src/gevent/queue.c:11894:114: error: passing argument 4 of '__pyx_vtabptr_6gevent_14_gevent_cqueue_UnboundQueue->__pyx_base.put' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-python/recipes-devtools/python/python3-gmqtt_0.6.14.bb b/meta-python/recipes-devtools/python/python3-gmqtt_0.6.16.bb index 5d8a3ba51c..20cdee80ff 100644 --- a/meta-python/recipes-devtools/python/python3-gmqtt_0.6.14.bb +++ b/meta-python/recipes-devtools/python/python3-gmqtt_0.6.16.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/wialon/gmqtt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=903f1792621a3b35ee546da75d139177" -SRC_URI[sha256sum] = "45b0f7794247455b9163155eeedf41c86e303c72b79056bf65d33038b17443a3" +SRC_URI[sha256sum] = "ddd1fdc1c6ae604e74377cf70e99f067e579c03c1c71a6acd494e199e93b7fa4" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-google-api-core_2.18.0.bb b/meta-python/recipes-devtools/python/python3-google-api-core_2.19.0.bb index b4cbafa85d..d177fcde5f 100644 --- a/meta-python/recipes-devtools/python/python3-google-api-core_2.18.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-api-core_2.19.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pypi setuptools3 -SRC_URI[sha256sum] = "62d97417bfc674d6cef251e5c4d639a9655e00c45528c4364fbfebb478ce72a9" +SRC_URI[sha256sum] = "cf1b7c2694047886d2af1128a03ae99e391108a08804f87cfd35970e49c9cd10" RDEPENDS:${PN} += "\ python3-asyncio \ diff --git a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.127.0.bb b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.130.0.bb index 4c9bbc6cf0..9ba73ebd2e 100644 --- a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.127.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.130.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "bbb51b0fbccdf40e536c26341e372d7800f09afebb53103bbcc94e08f14b523b" +SRC_URI[sha256sum] = "2bba3122b82a649c677b8a694b8e2bbf2a5fbf3420265caf3343bb88e2e9f0ae" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch new file mode 100644 index 0000000000..d830d92284 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch @@ -0,0 +1,74 @@ +From 3359a87a71307336100b84e66b69bad385cd3cfc Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Mon, 6 May 2024 01:36:39 +0200 +Subject: [PATCH] crypto: use _Generic only if !defined(__cplusplus) + +* fixes build with gcc-14 which has __builtin_addc and __builtin_subc + with gcc-13 it was already using the #else branch because of missing builtins + +* fixes + https://github.com/grpc/grpc/issues/35945 + +* _Generic was introduced in boringssl with: + https://boringssl.googlesource.com/boringssl/+/70ca6bc24be103dabd68e448cd3af29b929b771d%5E%21/#F4 + +* but e.g. third_party/boringssl-with-bazel/src/ssl/d1_both.cc includes + this internal.h and from the .cc extension gcc will process it as C++ + where _Generic isn't available, causing: + +In file included from third_party/boringssl-with-bazel/src/ssl/d1_both.cc:125: +third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h: In function 'uint32_t CRYPTO_addc_u32(uint32_t, uint32_t, uint32_t, uint32_t*)': +third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1159:7: error: expected primary-expression before 'unsigned' + 1159 | unsigned: __builtin_addc, \ + | ^~~~~~~~ +third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC' + 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry); + | ^~~~~~~~~~~~~~~~~~~ +third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1160:7: error: expected primary-expression before 'unsigned' + 1160 | unsigned long: __builtin_addcl, \ + | ^~~~~~~~ +third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC' + 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry); + | ^~~~~~~~~~~~~~~~~~~ +third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1161:7: error: expected primary-expression before 'unsigned' + 1161 | unsigned long long: __builtin_addcll))((x), (y), (carry), (out_carry)) + | ^~~~~~~~ +third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC' + 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry); + | ^~~~~~~~~~~~~~~~~~~ +third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1158:4: error: '_Generic' was not declared in this scope + 1158 | (_Generic((x), \ + | ^~~~~~~~ +third_party/boringssl-with-bazel/src/ssl/../crypto/internal.h:1166:10: note: in expansion of macro 'CRYPTO_GENERIC_ADDC' + 1166 | return CRYPTO_GENERIC_ADDC(x, y, carry, out_carry); + | ^~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Submitted [https://boringssl-review.googlesource.com/c/boringssl/+/68227 crypto: use _Generic only if !defined(__cplusplus)] + + crypto/internal.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crypto/internal.h b/crypto/internal.h +index a77102d76..30d6826dd 100644 +--- a/crypto/internal.h ++++ b/crypto/internal.h +@@ -1176,7 +1176,7 @@ static inline uint64_t CRYPTO_rotr_u64(uint64_t value, int shift) { + + // CRYPTO_addc_* returns |x + y + carry|, and sets |*out_carry| to the carry + // bit. |carry| must be zero or one. +-#if OPENSSL_HAS_BUILTIN(__builtin_addc) ++#if OPENSSL_HAS_BUILTIN(__builtin_addc) && !defined(__cplusplus) + + #define CRYPTO_GENERIC_ADDC(x, y, carry, out_carry) \ + (_Generic((x), \ +@@ -1228,7 +1228,7 @@ static inline uint64_t CRYPTO_addc_u64(uint64_t x, uint64_t y, uint64_t carry, + + // CRYPTO_subc_* returns |x - y - borrow|, and sets |*out_borrow| to the borrow + // bit. |borrow| must be zero or one. +-#if OPENSSL_HAS_BUILTIN(__builtin_subc) ++#if OPENSSL_HAS_BUILTIN(__builtin_subc) && !defined(__cplusplus) + + #define CRYPTO_GENERIC_SUBC(x, y, borrow, out_borrow) \ + (_Generic((x), \ diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch new file mode 100644 index 0000000000..0b512b1d00 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-target.h-define-proper-macro-for-ppc-ppc64.patch @@ -0,0 +1,37 @@ +From b3bca013007a4a66703573d243e433f22e1e6684 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Wed, 15 May 2024 16:55:09 +0800 +Subject: [PATCH] target.h: define proper macro for ppc/ppc64 + +Fix error: +third_party/boringssl-with-bazel/src/include/openssl/target.h:74:2: error: #error "Unknown target CPU" +third_party/boringssl-with-bazel/src/include/openssl/bn.h:172:2: error: #error "Must define either OPENSSL_32_BIT or OPENSSL_64_BIT" +third_party/boringssl-with-bazel/src/include/openssl/bn.h:230:44: error: 'BN_ULONG' has not been declared + +BN_ULONG will be defined after set proper OPENSSL_32_BIT or OPENSSL_64_BIT + +Upstream-Status: Pending + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + third_party/boringssl-with-bazel/src/include/openssl/target.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/third_party/boringssl-with-bazel/src/include/openssl/target.h b/third_party/boringssl-with-bazel/src/include/openssl/target.h +index 29b1dc6..d779813 100644 +--- a/third_party/boringssl-with-bazel/src/include/openssl/target.h ++++ b/third_party/boringssl-with-bazel/src/include/openssl/target.h +@@ -54,6 +54,10 @@ + #define OPENSSL_32_BIT + #elif defined(__myriad2__) + #define OPENSSL_32_BIT ++#elif defined(__PPC64__) ++#define OPENSSL_64_BIT ++#elif defined(__PPC__) ++#define OPENSSL_32_BIT + #else + // The list above enumerates the platforms that BoringSSL supports. For these + // platforms we keep a reasonable bar of not breaking them: automated test +-- +2.25.1 + diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.62.2.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.62.2.bb index 3148f63761..47f3b2ea25 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.62.2.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.62.2.bb @@ -9,6 +9,8 @@ DEPENDS += "python3-protobuf" SRC_URI += "file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch \ file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \ + file://0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch;patchdir=third_party/boringssl-with-bazel/src/ \ + file://0001-target.h-define-proper-macro-for-ppc-ppc64.patch \ " SRC_URI[sha256sum] = "c77618071d96b7a8be2c10701a98537823b9c65ba256c0b9067e0594cdbd954d" diff --git a/meta-python/recipes-devtools/python/python3-h5py/0001-Fix-Cython-3-compatibility.patch b/meta-python/recipes-devtools/python/python3-h5py/0001-Fix-Cython-3-compatibility.patch deleted file mode 100644 index aba62ddf14..0000000000 --- a/meta-python/recipes-devtools/python/python3-h5py/0001-Fix-Cython-3-compatibility.patch +++ /dev/null @@ -1,796 +0,0 @@ -From 1e02dbe5533d679b9ef064078a303607a7d0542a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Fri, 29 Dec 2023 14:33:38 +0100 -Subject: [PATCH] Fix Cython 3 compatibility - -Upstream-Status: Backport [https://github.com/h5py/h5py/pull/2345/commits] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - benchmarks/benchmark_slicing.py | 12 ++++---- - docs/conf.py | 2 +- - docs/high/dataset.rst | 4 +-- - docs/high/file.rst | 6 ++-- - docs/requirements-rtd.txt | 5 ++-- - docs/vds.rst | 2 +- - docs/whatsnew/3.0.rst | 2 +- - docs/whatsnew/3.7.rst | 4 +-- - h5py/_errors.pxd | 10 +++---- - h5py/_errors.pyx | 4 +-- - h5py/_hl/base.py | 4 +-- - h5py/_hl/dataset.py | 8 ++--- - h5py/_hl/dims.py | 3 +- - h5py/_hl/files.py | 2 +- - h5py/_locks.pxi | 6 ++-- - h5py/_proxy.pyx | 4 +-- - h5py/_selector.pyx | 2 +- - h5py/api_compat.h | 13 ++++---- - h5py/api_types_hdf5.pxd | 48 +++++++++++++++--------------- - h5py/h5fd.pyx | 38 ++++++++++++++++------- - h5py/h5p.pyx | 4 +-- - h5py/h5t.pyx | 2 +- - h5py/tests/test_attrs_data.py | 2 +- - h5py/tests/test_big_endian_file.py | 4 +-- - h5py/tests/test_dataset.py | 4 +-- - h5py/tests/test_file.py | 6 ++-- - h5py/tests/test_file_alignment.py | 4 +-- - h5py/tests/test_group.py | 4 +-- - h5py/tests/test_selections.py | 2 +- - pylintrc | 2 +- - pyproject.toml | 2 +- - setup_configure.py | 2 +- - tox.ini | 2 +- - 33 files changed, 116 insertions(+), 103 deletions(-) - -diff --git a/benchmarks/benchmark_slicing.py b/benchmarks/benchmark_slicing.py -index e9a34dad..b833f012 100644 ---- a/benchmarks/benchmark_slicing.py -+++ b/benchmarks/benchmark_slicing.py -@@ -7,7 +7,7 @@ import logging - logger = logging.getLogger(__name__) - import h5py - --#Needed for mutithreading: -+#Needed for multithreading: - from queue import Queue - from threading import Thread, Event - import multiprocessing -@@ -173,8 +173,8 @@ class SlicingBenchmark: - - if __name__ == "__main__": - logging.basicConfig(level=logging.INFO) -- benckmark = SlicingBenchmark() -- benckmark.setup() -- benckmark.time_sequential_reads() -- benckmark.time_threaded_reads() -- benckmark.teardown() -+ benchmark = SlicingBenchmark() -+ benchmark.setup() -+ benchmark.time_sequential_reads() -+ benchmark.time_threaded_reads() -+ benchmark.teardown() -diff --git a/docs/conf.py b/docs/conf.py -index 93b23939..a0f6c1ac 100644 ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -109,7 +109,7 @@ pygments_style = 'sphinx' - - # The theme to use for HTML and HTML Help pages. See the documentation for - # a list of builtin themes. --html_theme = 'default' -+html_theme = 'sphinx_rtd_theme' - - # Theme options are theme-specific and customize the look and feel of a theme - # further. For a list of options available for each theme, see the -diff --git a/docs/high/dataset.rst b/docs/high/dataset.rst -index 0f27284f..cb75fffe 100644 ---- a/docs/high/dataset.rst -+++ b/docs/high/dataset.rst -@@ -58,7 +58,7 @@ the requested ``dtype``. - Reading & writing data - ---------------------- - --HDF5 datasets re-use the NumPy slicing syntax to read and write to the file. -+HDF5 datasets reuse the NumPy slicing syntax to read and write to the file. - Slice specifications are translated directly to HDF5 "hyperslab" - selections, and are a fast and efficient way to access data in the file. The - following slicing arguments are recognized: -@@ -464,7 +464,7 @@ Reference - >>> dset = f["MyDS"] - >>> f.close() - >>> if dset: -- ... print("datset accessible") -+ ... print("dataset accessible") - ... else: - ... print("dataset inaccessible") - dataset inaccessible -diff --git a/docs/high/file.rst b/docs/high/file.rst -index 484498ce..e757fe1a 100644 ---- a/docs/high/file.rst -+++ b/docs/high/file.rst -@@ -392,7 +392,7 @@ Data alignment - When creating datasets within files, it may be advantageous to align the offset - within the file itself. This can help optimize read and write times if the data - become aligned with the underlying hardware, or may help with parallelism with --MPI. Unfortunately, aligning small variables to large blocks can leave alot of -+MPI. Unfortunately, aligning small variables to large blocks can leave a lot of - empty space in a file. To this effect, application developers are left with two - options to tune the alignment of data within their file. The two variables - ``alignment_threshold`` and ``alignment_interval`` in the :class:`File` -@@ -415,7 +415,7 @@ number of regions. Setting a small value can reduce the overall file size, - especially in combination with the ``libver`` option. This controls how the - overall data and metadata are laid out within the file. - --For more information, see the offical HDF5 documentation `H5P_SET_META_BLOCK_SIZE -+For more information, see the official HDF5 documentation `H5P_SET_META_BLOCK_SIZE - <https://portal.hdfgroup.org/display/HDF5/H5P_SET_META_BLOCK_SIZE>`_. - - Reference -@@ -497,7 +497,7 @@ Reference - Only available with HDF5 >= 1.12.1 or 1.10.x >= 1.10.7. - :param alignment_threshold: Together with ``alignment_interval``, this - property ensures that any file object greater than or equal -- in size to the alignement threshold (in bytes) will be -+ in size to the alignment threshold (in bytes) will be - aligned on an address which is a multiple of alignment interval. - :param alignment_interval: This property should be used in conjunction with - ``alignment_threshold``. See the description above. For more -diff --git a/docs/requirements-rtd.txt b/docs/requirements-rtd.txt -index e67a3eee..52096927 100644 ---- a/docs/requirements-rtd.txt -+++ b/docs/requirements-rtd.txt -@@ -1,3 +1,2 @@ --sphinx==4.3.0 --sphinx_rtd_theme==1.0.0 --readthedocs-sphinx-search==0.1.1 -+sphinx==7.2.6 -+sphinx_rtd_theme==1.3.0 -diff --git a/docs/vds.rst b/docs/vds.rst -index a9a7c7f6..bd47ad1c 100644 ---- a/docs/vds.rst -+++ b/docs/vds.rst -@@ -124,7 +124,7 @@ Reference - slice it to indicate which regions should be used in the virtual dataset. - - When `creating a virtual dataset <creating_vds_>`_, paths to sources present -- in the same file are changed to a ".", refering to the current file (see -+ in the same file are changed to a ".", referring to the current file (see - `H5Pset_virtual <https://portal.hdfgroup.org/display/HDF5/H5P_SET_VIRTUAL>`_). - This will keep such sources valid in case the file is renamed. - -diff --git a/docs/whatsnew/3.0.rst b/docs/whatsnew/3.0.rst -index db30ad66..ff3c2bef 100644 ---- a/docs/whatsnew/3.0.rst -+++ b/docs/whatsnew/3.0.rst -@@ -44,7 +44,7 @@ New features - See also the deprecation related to the ``external`` argument. - * Support for setting file space strategy at file creation. Includes option to - persist empty space tracking between sessions. See :class:`.File` for details. --* More efficient writing when assiging a scalar to a chunked dataset, when the -+* More efficient writing when assigning a scalar to a chunked dataset, when the - number of elements to write is no more than the size of one chunk. - * Introduced support for the split :ref:`file driver <file_driver>` - (:pr:`1468`). -diff --git a/docs/whatsnew/3.7.rst b/docs/whatsnew/3.7.rst -index 27790254..2e822d68 100644 ---- a/docs/whatsnew/3.7.rst -+++ b/docs/whatsnew/3.7.rst -@@ -19,7 +19,7 @@ New features - include it. Alternatively, you can :ref:`build h5py from source <source_install>` - against an HDF5 build with the direct driver enabled. - * The :class:`.File` constructor contains two new parameters ``alignment_threshold``, -- and ``alignment_interval`` controling the data alignment within the HDF5 -+ and ``alignment_interval`` controlling the data alignment within the HDF5 - file (:pr:`2040`). - * :meth:`~.Group.create_dataset` and :meth:`~.Group.require_dataset` now accept - parameters ``efile_prefix`` and ``virtual_prefix`` to set a filesystem path -@@ -40,7 +40,7 @@ Bug fixes - attributes with ``track_order=True``. - * Fix for building with mpi4py on Python 3.10 (:pr:`2101`). - * Fixed fancy indexing with a boolean array for a single dimension (:pr:`2079`). --* Avoid returning unitialised memory when reading from a chunked dataset with -+* Avoid returning uninitialised memory when reading from a chunked dataset with - missing chunks and no fill value (:pr:`2076`). - * Enable setting of fillvalue for datasets with variable length string dtype - (:pr:`2044`). -diff --git a/h5py/_errors.pxd b/h5py/_errors.pxd -index df9c1bbe..3cba6307 100644 ---- a/h5py/_errors.pxd -+++ b/h5py/_errors.pxd -@@ -23,7 +23,7 @@ cdef extern from "hdf5.h": - H5E_ARGS, # invalid arguments to routine - H5E_RESOURCE, # resource unavailable - H5E_INTERNAL, # Internal error (too specific to document) -- H5E_FILE, # file Accessability -+ H5E_FILE, # file Accessibility - H5E_IO, # Low-level I/O - H5E_FUNC, # function Entry/Exit - H5E_ATOM, # object Atom -@@ -121,7 +121,7 @@ cdef extern from "hdf5.h": - # No error - H5E_NONE_MINOR # No error - -- # File accessability errors -+ # File accessibility errors - H5E_FILEEXISTS # File already exists - H5E_FILEOPEN # File already open - H5E_CANTCREATE # Unable to create file -@@ -207,7 +207,7 @@ cdef extern from "hdf5.h": - H5E_ARGS, # invalid arguments to routine - H5E_RESOURCE, # resource unavailable - H5E_INTERNAL, # Internal error (too specific to document) -- H5E_FILE, # file Accessability -+ H5E_FILE, # file Accessibility - H5E_IO, # Low-level I/O - H5E_FUNC, # function Entry/Exit - H5E_ID, # object ID -@@ -305,7 +305,7 @@ cdef extern from "hdf5.h": - # No error - H5E_NONE_MINOR # No error - -- # File accessability errors -+ # File accessibility errors - H5E_FILEEXISTS # File already exists - H5E_FILEOPEN # File already open - H5E_CANTCREATE # Unable to create file -@@ -425,4 +425,4 @@ ctypedef struct err_cookie: - cdef err_cookie set_error_handler(err_cookie handler) - - # Set the default error handler set by silence_errors/unsilence_errors --cdef void set_default_error_handler() nogil -+cdef void set_default_error_handler() noexcept nogil -diff --git a/h5py/_errors.pyx b/h5py/_errors.pyx -index c3bd184e..2a7524b2 100644 ---- a/h5py/_errors.pyx -+++ b/h5py/_errors.pyx -@@ -94,7 +94,7 @@ cdef struct err_data_t: - H5E_error_t err - int n - --cdef herr_t walk_cb(unsigned int n, const H5E_error_t *desc, void *e) nogil noexcept: -+cdef herr_t walk_cb(unsigned int n, const H5E_error_t *desc, void *e) noexcept nogil: - - cdef err_data_t *ee = <err_data_t*>e - -@@ -168,7 +168,7 @@ cdef err_cookie _error_handler # Store error handler used by h5py - _error_handler.func = NULL - _error_handler.data = NULL - --cdef void set_default_error_handler() nogil: -+cdef void set_default_error_handler() noexcept nogil: - """Set h5py's current default error handler""" - H5Eset_auto(<hid_t>H5E_DEFAULT, _error_handler.func, _error_handler.data) - -diff --git a/h5py/_hl/base.py b/h5py/_hl/base.py -index cad37053..9d261c90 100644 ---- a/h5py/_hl/base.py -+++ b/h5py/_hl/base.py -@@ -20,7 +20,7 @@ import posixpath - import numpy as np - - # The high-level interface is serialized; every public API function & method --# is wrapped in a lock. We re-use the low-level lock because (1) it's fast, -+# is wrapped in a lock. We reuse the low-level lock because (1) it's fast, - # and (2) it eliminates the possibility of deadlocks due to out-of-order - # lock acquisition. - from .._objects import phil, with_phil -@@ -524,7 +524,7 @@ def product(nums): - # Daniel Greenfeld, BSD license), where it is attributed to bottle (Copyright - # (c) 2009-2022, Marcel Hellkamp, MIT license). - --class cached_property(object): -+class cached_property: - def __init__(self, func): - self.__doc__ = getattr(func, "__doc__") - self.func = func -diff --git a/h5py/_hl/dataset.py b/h5py/_hl/dataset.py -index b69aba48..77b202d2 100644 ---- a/h5py/_hl/dataset.py -+++ b/h5py/_hl/dataset.py -@@ -334,10 +334,10 @@ class ChunkIterator: - self._layout = dset.chunks - if source_sel is None: - # select over entire dataset -- slices = [] -- for dim in range(rank): -- slices.append(slice(0, self._shape[dim])) -- self._sel = tuple(slices) -+ self._sel = tuple( -+ slice(0, self._shape[dim]) -+ for dim in range(rank) -+ ) - else: - if isinstance(source_sel, slice): - self._sel = (source_sel,) -diff --git a/h5py/_hl/dims.py b/h5py/_hl/dims.py -index d3c9206b..0cf4c9f3 100644 ---- a/h5py/_hl/dims.py -+++ b/h5py/_hl/dims.py -@@ -53,8 +53,7 @@ class DimensionProxy(base.CommonStateObject): - - @with_phil - def __iter__(self): -- for k in self.keys(): -- yield k -+ yield from self.keys() - - @with_phil - def __len__(self): -diff --git a/h5py/_hl/files.py b/h5py/_hl/files.py -index aa4fb78d..bfcf3098 100644 ---- a/h5py/_hl/files.py -+++ b/h5py/_hl/files.py -@@ -480,7 +480,7 @@ class File(Group): - - alignment_threshold - Together with ``alignment_interval``, this property ensures that -- any file object greater than or equal in size to the alignement -+ any file object greater than or equal in size to the alignment - threshold (in bytes) will be aligned on an address which is a - multiple of alignment interval. - -diff --git a/h5py/_locks.pxi b/h5py/_locks.pxi -index bc8b2dd9..1ec4e2fc 100644 ---- a/h5py/_locks.pxi -+++ b/h5py/_locks.pxi -@@ -63,7 +63,7 @@ cdef class FastRLock: - return self._owner == pythread.PyThread_get_thread_ident() - - --cdef inline bint lock_lock(FastRLock lock, long current_thread, bint blocking) nogil: -+cdef inline bint lock_lock(FastRLock lock, long current_thread, bint blocking) noexcept nogil: - # Note that this function *must* hold the GIL when being called. - # We just use 'nogil' in the signature to make sure that no Python - # code execution slips in that might free the GIL -@@ -83,7 +83,7 @@ cdef inline bint lock_lock(FastRLock lock, long current_thread, bint blocking) n - lock, current_thread, - pythread.WAIT_LOCK if blocking else pythread.NOWAIT_LOCK) - --cdef bint _acquire_lock(FastRLock lock, long current_thread, int wait) nogil: -+cdef bint _acquire_lock(FastRLock lock, long current_thread, int wait) noexcept nogil: - # Note that this function *must* hold the GIL when being called. - # We just use 'nogil' in the signature to make sure that no Python - # code execution slips in that might free the GIL -@@ -111,7 +111,7 @@ cdef bint _acquire_lock(FastRLock lock, long current_thread, int wait) nogil: - lock._count = 1 - return 1 - --cdef inline void unlock_lock(FastRLock lock) nogil: -+cdef inline void unlock_lock(FastRLock lock) noexcept nogil: - # Note that this function *must* hold the GIL when being called. - # We just use 'nogil' in the signature to make sure that no Python - # code execution slips in that might free the GIL -diff --git a/h5py/_proxy.pyx b/h5py/_proxy.pyx -index 46b4fe0d..e40504f5 100644 ---- a/h5py/_proxy.pyx -+++ b/h5py/_proxy.pyx -@@ -241,7 +241,7 @@ ctypedef struct h5py_scatter_t: - void* buf - - cdef herr_t h5py_scatter_cb(void* elem, hid_t type_id, unsigned ndim, -- const hsize_t *point, void *operator_data) nogil except -1: -+ const hsize_t *point, void *operator_data) except -1 nogil: - cdef h5py_scatter_t* info = <h5py_scatter_t*>operator_data - - memcpy(elem, (<char*>info[0].buf)+((info[0].i)*(info[0].elsize)), -@@ -252,7 +252,7 @@ cdef herr_t h5py_scatter_cb(void* elem, hid_t type_id, unsigned ndim, - return 0 - - cdef herr_t h5py_gather_cb(void* elem, hid_t type_id, unsigned ndim, -- const hsize_t *point, void *operator_data) nogil except -1: -+ const hsize_t *point, void *operator_data) except -1 nogil: - cdef h5py_scatter_t* info = <h5py_scatter_t*>operator_data - - memcpy((<char*>info[0].buf)+((info[0].i)*(info[0].elsize)), elem, -diff --git a/h5py/_selector.pyx b/h5py/_selector.pyx -index 8b858c82..69970176 100644 ---- a/h5py/_selector.pyx -+++ b/h5py/_selector.pyx -@@ -341,7 +341,7 @@ cdef class Reader: - - arr = PyArray_ZEROS(arr_rank, arr_shape, self.np_typenum, 0) - if not self.native_byteorder: -- arr = arr.newbyteorder() -+ arr = arr.view(arr.dtype.newbyteorder()) - finally: - efree(arr_shape) - -diff --git a/h5py/api_compat.h b/h5py/api_compat.h -index 52917f4d..a359e827 100644 ---- a/h5py/api_compat.h -+++ b/h5py/api_compat.h -@@ -24,7 +24,6 @@ typedef void *PyMPI_MPI_Message; - #include <stddef.h> - #include "Python.h" - #include "numpy/arrayobject.h" --#include "hdf5.h" - - /* The HOFFSET macro can't be used from Cython. */ - -@@ -35,14 +34,14 @@ typedef void *PyMPI_MPI_Message; - #define h5py_size_n256 (sizeof(npy_complex256)) - #endif - --#define h5py_offset_n64_real (HOFFSET(npy_complex64, real)) --#define h5py_offset_n64_imag (HOFFSET(npy_complex64, imag)) --#define h5py_offset_n128_real (HOFFSET(npy_complex128, real)) --#define h5py_offset_n128_imag (HOFFSET(npy_complex128, imag)) -+#define h5py_offset_n64_real (0) -+#define h5py_offset_n64_imag (sizeof(float)) -+#define h5py_offset_n128_real (0) -+#define h5py_offset_n128_imag (sizeof(double)) - - #ifdef NPY_COMPLEX256 --#define h5py_offset_n256_real (HOFFSET(npy_complex256, real)) --#define h5py_offset_n256_imag (HOFFSET(npy_complex256, imag)) -+#define h5py_offset_n256_real (0) -+#define h5py_offset_n256_imag (sizeof(long double)) - #endif - - #endif -diff --git a/h5py/api_types_hdf5.pxd b/h5py/api_types_hdf5.pxd -index a198f105..099e0f58 100644 ---- a/h5py/api_types_hdf5.pxd -+++ b/h5py/api_types_hdf5.pxd -@@ -257,27 +257,27 @@ cdef extern from "hdf5.h": - herr_t (*sb_encode)(H5FD_t *file, char *name, unsigned char *p) - herr_t (*sb_decode)(H5FD_t *f, const char *name, const unsigned char *p) - size_t fapl_size -- void * (*fapl_get)(H5FD_t *file) -- void * (*fapl_copy)(const void *fapl) -- herr_t (*fapl_free)(void *fapl) -+ void * (*fapl_get)(H5FD_t *file) except * -+ void * (*fapl_copy)(const void *fapl) except * -+ herr_t (*fapl_free)(void *fapl) except -1 - size_t dxpl_size - void * (*dxpl_copy)(const void *dxpl) - herr_t (*dxpl_free)(void *dxpl) -- H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr) -- herr_t (*close)(H5FD_t *file) -+ H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr) except * -+ herr_t (*close)(H5FD_t *file) except -1 - int (*cmp)(const H5FD_t *f1, const H5FD_t *f2) - herr_t (*query)(const H5FD_t *f1, unsigned long *flags) - herr_t (*get_type_map)(const H5FD_t *file, H5FD_mem_t *type_map) - haddr_t (*alloc)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) - herr_t (*free)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size) -- haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type) -- herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr) -- haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) -+ haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type) noexcept -+ herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr) noexcept -+ haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) except -1 - herr_t (*get_handle)(H5FD_t *file, hid_t fapl, void**file_handle) -- herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer) -- herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer) -- herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) -- herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) -+ herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer) except * -+ herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer) except * -+ herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) except -1 -+ herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) except -1 - herr_t (*lock)(H5FD_t *file, hbool_t rw) - herr_t (*unlock)(H5FD_t *file) - H5FD_mem_t fl_map[<int>H5FD_MEM_NTYPES] -@@ -295,27 +295,27 @@ cdef extern from "hdf5.h": - herr_t (*sb_encode)(H5FD_t *file, char *name, unsigned char *p) - herr_t (*sb_decode)(H5FD_t *f, const char *name, const unsigned char *p) - size_t fapl_size -- void * (*fapl_get)(H5FD_t *file) -- void * (*fapl_copy)(const void *fapl) -- herr_t (*fapl_free)(void *fapl) -+ void * (*fapl_get)(H5FD_t *file) except * -+ void * (*fapl_copy)(const void *fapl) except * -+ herr_t (*fapl_free)(void *fapl) except -1 - size_t dxpl_size - void * (*dxpl_copy)(const void *dxpl) - herr_t (*dxpl_free)(void *dxpl) -- H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr) -- herr_t (*close)(H5FD_t *file) -+ H5FD_t *(*open)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr) except * -+ herr_t (*close)(H5FD_t *file) except -1 - int (*cmp)(const H5FD_t *f1, const H5FD_t *f2) - herr_t (*query)(const H5FD_t *f1, unsigned long *flags) - herr_t (*get_type_map)(const H5FD_t *file, H5FD_mem_t *type_map) - haddr_t (*alloc)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) - herr_t (*free)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t size) -- haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type) -- herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr) -- haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) -+ haddr_t (*get_eoa)(const H5FD_t *file, H5FD_mem_t type) noexcept -+ herr_t (*set_eoa)(H5FD_t *file, H5FD_mem_t type, haddr_t addr) noexcept -+ haddr_t (*get_eof)(const H5FD_t *file, H5FD_mem_t type) except -1 - herr_t (*get_handle)(H5FD_t *file, hid_t fapl, void**file_handle) -- herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer) -- herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer) -- herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) -- herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) -+ herr_t (*read)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, void *buffer) except * -+ herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer) except * -+ herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) except -1 -+ herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing) except -1 - herr_t (*lock)(H5FD_t *file, hbool_t rw) - herr_t (*unlock)(H5FD_t *file) - H5FD_mem_t fl_map[<int>H5FD_MEM_NTYPES] -diff --git a/h5py/h5fd.pyx b/h5py/h5fd.pyx -index e9746057..d39cf68f 100644 ---- a/h5py/h5fd.pyx -+++ b/h5py/h5fd.pyx -@@ -144,10 +144,10 @@ cdef herr_t H5FD_fileobj_close(H5FD_fileobj_t *f) except -1 with gil: - stdlib_free(f) - return 0 - --cdef haddr_t H5FD_fileobj_get_eoa(const H5FD_fileobj_t *f, H5FD_mem_t type): -+cdef haddr_t H5FD_fileobj_get_eoa(const H5FD_fileobj_t *f, H5FD_mem_t type) noexcept nogil: - return f.eoa - --cdef herr_t H5FD_fileobj_set_eoa(H5FD_fileobj_t *f, H5FD_mem_t type, haddr_t addr): -+cdef herr_t H5FD_fileobj_set_eoa(H5FD_fileobj_t *f, H5FD_mem_t type, haddr_t addr) noexcept nogil: - f.eoa = addr - return 0 - -@@ -191,22 +191,38 @@ cdef herr_t H5FD_fileobj_flush(H5FD_fileobj_t *f, hid_t dxpl, hbool_t closing) e - cdef H5FD_class_t info - memset(&info, 0, sizeof(info)) - -+# Cython doesn't support "except X" in casting definition currently -+ctypedef herr_t (*file_free_func_ptr)(void *) except -1 -+ -+ctypedef herr_t (*file_close_func_ptr)(H5FD_t *) except -1 -+ctypedef haddr_t (*file_get_eoa_func_ptr)(const H5FD_t *, H5FD_mem_t) noexcept -+ctypedef herr_t (*file_set_eof_func_ptr)(H5FD_t *, H5FD_mem_t, haddr_t) noexcept -+ctypedef haddr_t (*file_get_eof_func_ptr)(const H5FD_t *, H5FD_mem_t) except -1 -+ctypedef herr_t (*file_read_func_ptr)(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, void*) except -1 -+ctypedef herr_t (*file_write_func_ptr)(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, const void*) except -1 -+ctypedef herr_t (*file_truncate_func_ptr)(H5FD_t *, hid_t, hbool_t) except -1 -+ctypedef herr_t (*file_flush_func_ptr)(H5FD_t *, hid_t, hbool_t) except -1 -+ -+ - info.name = 'fileobj' - info.maxaddr = libc.stdint.SIZE_MAX - 1 - info.fc_degree = H5F_CLOSE_WEAK - info.fapl_size = sizeof(PyObject *) - info.fapl_get = <void *(*)(H5FD_t *)>H5FD_fileobj_fapl_get - info.fapl_copy = <void *(*)(const void *)>H5FD_fileobj_fapl_copy --info.fapl_free = <herr_t (*)(void *)>H5FD_fileobj_fapl_free -+ -+info.fapl_free = <file_free_func_ptr>H5FD_fileobj_fapl_free -+ - info.open = <H5FD_t *(*)(const char *name, unsigned flags, hid_t fapl, haddr_t maxaddr)>H5FD_fileobj_open --info.close = <herr_t (*)(H5FD_t *)>H5FD_fileobj_close --info.get_eoa = <haddr_t (*)(const H5FD_t *, H5FD_mem_t)>H5FD_fileobj_get_eoa --info.set_eoa = <herr_t (*)(H5FD_t *, H5FD_mem_t, haddr_t)>H5FD_fileobj_set_eoa --info.get_eof = <haddr_t (*)(const H5FD_t *, H5FD_mem_t)>H5FD_fileobj_get_eof --info.read = <herr_t (*)(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, void *)>H5FD_fileobj_read --info.write = <herr_t (*)(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, const void *)>H5FD_fileobj_write --info.truncate = <herr_t (*)(H5FD_t *, hid_t, hbool_t)>H5FD_fileobj_truncate --info.flush = <herr_t (*)(H5FD_t *, hid_t, hbool_t)>H5FD_fileobj_flush -+ -+info.close = <file_close_func_ptr>H5FD_fileobj_close -+info.get_eoa = <file_get_eoa_func_ptr>H5FD_fileobj_get_eoa -+info.set_eoa = <file_set_eof_func_ptr>H5FD_fileobj_set_eoa -+info.get_eof = <file_get_eof_func_ptr>H5FD_fileobj_get_eof -+info.read = <file_read_func_ptr>H5FD_fileobj_read -+info.write = <file_write_func_ptr>H5FD_fileobj_write -+info.truncate = <file_truncate_func_ptr>H5FD_fileobj_truncate -+info.flush = <file_flush_func_ptr>H5FD_fileobj_flush - # H5FD_FLMAP_DICHOTOMY - info.fl_map = [H5FD_MEM_SUPER, # default - H5FD_MEM_SUPER, # super -diff --git a/h5py/h5p.pyx b/h5py/h5p.pyx -index 779ea1b5..dc8bf65a 100644 ---- a/h5py/h5p.pyx -+++ b/h5py/h5p.pyx -@@ -1177,7 +1177,7 @@ cdef class PropFAID(PropInstanceID): - size_t block_size IN: File system block size - size_t cbuf_size IN: Copy buffer size - -- Properites with value of 0 indicate that the HDF5 library should -+ Properties with value of 0 indicate that the HDF5 library should - choose the value. - """ - H5Pset_fapl_direct(self.id, alignment, block_size, cbuf_size) -@@ -1761,7 +1761,7 @@ cdef class PropOCID(PropCreateID): - - max_compact -- maximum number of attributes to be stored in compact storage(default:8) - must be greater than or equal to min_dense -- min_dense -- minmum number of attributes to be stored in dense storage(default:6) -+ min_dense -- minimum number of attributes to be stored in dense storage(default:6) - - """ - H5Pset_attr_phase_change(self.id, max_compact, min_dense) -diff --git a/h5py/h5t.pyx b/h5py/h5t.pyx -index e7aae14f..b9d7e74d 100644 ---- a/h5py/h5t.pyx -+++ b/h5py/h5t.pyx -@@ -1938,7 +1938,7 @@ def check_dtype(**kwds): - - vlen = dtype - If the dtype represents an HDF5 vlen, returns the Python base class. -- Currently only builting string vlens (str) are supported. Returns -+ Currently only built-in string vlens (str) are supported. Returns - None if the dtype does not represent an HDF5 vlen. - - enum = dtype -diff --git a/h5py/tests/test_attrs_data.py b/h5py/tests/test_attrs_data.py -index 56481ca0..5083a1aa 100644 ---- a/h5py/tests/test_attrs_data.py -+++ b/h5py/tests/test_attrs_data.py -@@ -262,7 +262,7 @@ class TestEmpty(BaseAttrs): - self.assertTrue(is_empty_dataspace(h5a.open(self.f.id, b'y'))) - - def test_modify(self): -- with self.assertRaises(IOError): -+ with self.assertRaises(OSError): - self.f.attrs.modify('x', 1) - - def test_values(self): -diff --git a/h5py/tests/test_big_endian_file.py b/h5py/tests/test_big_endian_file.py -index 4d81de01..170b5bcc 100644 ---- a/h5py/tests/test_big_endian_file.py -+++ b/h5py/tests/test_big_endian_file.py -@@ -24,14 +24,14 @@ def test_vlen_big_endian(): - assert dset[4] == 1.2 - assert dset.dtype == "<f8" - -- # Same float values with big endianess -+ # Same float values with big endianness - assert f["DSBEfloat"][0] == 3.14 - assert f["DSBEfloat"].dtype == ">f8" - - assert f["DSLEint"][0] == 1 - assert f["DSLEint"].dtype == "<u8" - -- # Same int values with big endianess -+ # Same int values with big endianness - assert f["DSBEint"][0] == 1 - assert f["DSBEint"].dtype == ">i8" - -diff --git a/h5py/tests/test_dataset.py b/h5py/tests/test_dataset.py -index e104dd53..0ffa5c80 100644 ---- a/h5py/tests/test_dataset.py -+++ b/h5py/tests/test_dataset.py -@@ -1939,9 +1939,9 @@ class TestCommutative(BaseDataset): - dset = self.f.create_dataset("test", shape, dtype=float, - data=np.random.rand(*shape)) - -- # grab a value from the elements, ie dset[0] -+ # grab a value from the elements, ie dset[0, 0] - # check that mask arrays are commutative wrt ==, != -- val = np.float64(dset[0]) -+ val = np.float64(dset[0, 0]) - - assert np.all((val == dset) == (dset == val)) - assert np.all((val != dset) == (dset != val)) -diff --git a/h5py/tests/test_file.py b/h5py/tests/test_file.py -index b47d408e..1aa38731 100644 ---- a/h5py/tests/test_file.py -+++ b/h5py/tests/test_file.py -@@ -326,7 +326,7 @@ class TestDrivers(TestCase): - # could be an integer multiple of 512 - # - # To allow HDF5 to do the heavy lifting for different platform, -- # We didn't provide any argumnets to the first call -+ # We didn't provide any arguments to the first call - # and obtained HDF5's default values there. - - # Testing creation with a few different property lists -@@ -639,9 +639,9 @@ class TestUnicode(TestCase): - Modes 'r' and 'r+' do not create files even when given unicode names - """ - fname = self.mktemp(prefix=chr(0x201a)) -- with self.assertRaises(IOError): -+ with self.assertRaises(OSError): - File(fname, 'r') -- with self.assertRaises(IOError): -+ with self.assertRaises(OSError): - File(fname, 'r+') - - -diff --git a/h5py/tests/test_file_alignment.py b/h5py/tests/test_file_alignment.py -index c280bb76..da13ee04 100644 ---- a/h5py/tests/test_file_alignment.py -+++ b/h5py/tests/test_file_alignment.py -@@ -50,7 +50,7 @@ class TestFileAlignment(TestCase): - alignment_interval = 4096 - - for shape in [ -- (1033,), # A prime number above the thresold -+ (1033,), # A prime number above the threshold - (1000,), # Exactly equal to the threshold - (1001,), # one above the threshold - ]: -@@ -75,7 +75,7 @@ class TestFileAlignment(TestCase): - alignment_interval = 1024 - - for shape in [ -- (881,), # A prime number below the thresold -+ (881,), # A prime number below the threshold - (999,), # Exactly one below the threshold - ]: - fname = self.mktemp() -diff --git a/h5py/tests/test_group.py b/h5py/tests/test_group.py -index 328c352a..4af1fb1f 100644 ---- a/h5py/tests/test_group.py -+++ b/h5py/tests/test_group.py -@@ -771,7 +771,7 @@ class TestExternalLinks(TestCase): - with self.assertRaises(KeyError): - self.f['ext'] - -- # I would prefer IOError but there's no way to fix this as the exception -+ # I would prefer OSError but there's no way to fix this as the exception - # class is determined by HDF5. - def test_exc_missingfile(self): - """ KeyError raised when attempting to open missing file """ -@@ -844,7 +844,7 @@ class TestExtLinkBugs(TestCase): - try: - if x: - x.close() -- except IOError: -+ except OSError: - pass - return w - orig_name = self.mktemp() -diff --git a/h5py/tests/test_selections.py b/h5py/tests/test_selections.py -index 0b1722d7..01f6dcb7 100644 ---- a/h5py/tests/test_selections.py -+++ b/h5py/tests/test_selections.py -@@ -65,7 +65,7 @@ class TestTypeGeneration(BaseSelection): - self.assertEqual(out, np.dtype('i')) - self.assertEqual(format, np.dtype( [('a','i')] )) - -- # Field does not apear in named typed -+ # Field does not appear in named typed - with self.assertRaises(ValueError): - out, format = sel2.read_dtypes(dt, ('j', 'k')) - -diff --git a/pylintrc b/pylintrc -index 045df2f7..2401d3b0 100644 ---- a/pylintrc -+++ b/pylintrc -@@ -44,7 +44,7 @@ confidence= - # can either give multiple identifiers separated by comma (,) or put this - # option multiple times (only on the command line, not in the configuration - # file where it should appear only once).You can also use "--disable=all" to --# disable everything first and then reenable specific checks. For example, if -+# disable everything first and then re-enable specific checks. For example, if - # you want to run only the similarities checker, you can use "--disable=all - # --enable=similarities". If you want to run only the classes checker, but have - # no Warning level messages displayed, use"--disable=all --enable=classes -diff --git a/pyproject.toml b/pyproject.toml -index ee573d2f..717200ef 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,6 +1,6 @@ - [build-system] - requires = [ -- "Cython >=0.29.31,<1", -+ "Cython >=0.29.31,<4", - "oldest-supported-numpy", - "pkgconfig", - "setuptools >=61", -diff --git a/setup_configure.py b/setup_configure.py -index 0fba53ba..c3b86a64 100644 ---- a/setup_configure.py -+++ b/setup_configure.py -@@ -165,7 +165,7 @@ class BuildConfig: - try: - if pkgconfig.exists(pc_name): - pc = pkgconfig.parse(pc_name) -- except EnvironmentError: -+ except OSError: - if os.name != 'nt': - print( - "Building h5py requires pkg-config unless the HDF5 path " -diff --git a/tox.ini b/tox.ini -index 0efb88a6..86a176dd 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -65,7 +65,7 @@ skip_install=True - package_env = DUMMY NON-EXISTENT ENV NAME - changedir=docs - deps= -- sphinx -+ -r docs/requirements-rtd.txt - commands= - sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html - diff --git a/meta-python/recipes-devtools/python/python3-h5py_3.10.0.bb b/meta-python/recipes-devtools/python/python3-h5py_3.11.0.bb index 8a9158525e..e0ceafca1e 100644 --- a/meta-python/recipes-devtools/python/python3-h5py_3.10.0.bb +++ b/meta-python/recipes-devtools/python/python3-h5py_3.11.0.bb @@ -4,10 +4,9 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c" -SRC_URI[sha256sum] = "d93adc48ceeb33347eb24a634fb787efc7ae4644e6ea4ba733d099605045c049" +SRC_URI[sha256sum] = "7b7e8f78072a2edec87c9836f25f34203fd492a4475709a18b417a33cfb21fa9" -SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch \ - file://0001-Fix-Cython-3-compatibility.patch" +SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch" inherit pkgconfig pypi setuptools3 @@ -38,3 +37,8 @@ RDEPENDS:${PN} = "python3-numpy \ " export HDF5_VERSION="1.14.0" + +# http://errors.yoctoproject.org/Errors/Details/766919/ +# h5py/h5l.c:8163:107: error: passing argument 4 of '__pyx_f_4h5py_4defs_H5Lunpack_elink_val' from incompatible pointer type [-Wincompatible-pointer-types] +# h5py/h5l.c:8163:133: error: passing argument 5 of '__pyx_f_4h5py_4defs_H5Lunpack_elink_val' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-python/recipes-devtools/python/python3-icu_2.12.bb b/meta-python/recipes-devtools/python/python3-icu_2.13.1.bb index 6394db4e9e..6a590de5fd 100644 --- a/meta-python/recipes-devtools/python/python3-icu_2.12.bb +++ b/meta-python/recipes-devtools/python/python3-icu_2.13.1.bb @@ -8,8 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0724597863f1581ab01429e0423e779f" DEPENDS += "icu" PYPI_PACKAGE = "PyICU" -SRC_URI[sha256sum] = "bd7ab5efa93ad692e6daa29cd249364e521218329221726a113ca3cb281c8611" + +SRC_URI[sha256sum] = "d4919085eaa07da12bade8ee721e7bbf7ade0151ca0f82946a26c8f4b98cdceb" SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch" inherit pkgconfig pypi python_setuptools_build_meta + +# it's lowercase pyicu instead of ${PYPI_PACKAGE} in this version +S = "${WORKDIR}/pyicu-${PV}" diff --git a/meta-python/recipes-devtools/python/python3-imgtool_2.0.0.bb b/meta-python/recipes-devtools/python/python3-imgtool_2.1.0.bb index a25e6a61a8..aafcf38272 100644 --- a/meta-python/recipes-devtools/python/python3-imgtool_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-imgtool_2.1.0.bb @@ -3,7 +3,7 @@ SUMMARY = "MCUboot's image signing and key management tool" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://imgtool/main.py;beginline=3;endline=18;md5=0645fb61e2f961a110302fbfdb227446" -SRC_URI[sha256sum] = "7a541255e69eec1f12aa38dce1f1d4fe20d8212677c68a9b6ec634ca91a06612" +SRC_URI[sha256sum] = "4f7fbcdf53c44eaaa6226504510ccb52f7ef00c997503cf94934b330c9607b60" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-joblib_1.4.0.bb b/meta-python/recipes-devtools/python/python3-joblib_1.4.2.bb index 868e3f2114..13d2a448db 100644 --- a/meta-python/recipes-devtools/python/python3-joblib_1.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-joblib_1.4.2.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2e481820abf0a70a18011a30153df066" inherit setuptools3 pypi -SRC_URI[sha256sum] = "1eb0dc091919cd384490de890cb5dfd538410a6d4b3b54eef09fb8c50b409b1c" +SRC_URI[sha256sum] = "2382c5816b2636fbd20a09e0f4e9dad4736765fdfb7dca582943b9c1366b3f0e" RDEPENDS:${PN} += " \ python3-asyncio \ diff --git a/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb b/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb index 237713bf12..ff9d7dd552 100644 --- a/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-jstyleson_0.0.2.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/linjackson78/jstyleson" SRC_URI += " file://LICENSE " LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=d97b96c7337934ee448ffd4392f32079" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=d97b96c7337934ee448ffd4392f32079" PYPI_PACKAGE_EXT = "tar.gz" diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb b/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb index 991aa0f7d8..6bd7ce8ba3 100644 --- a/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb @@ -70,3 +70,8 @@ RDEPENDS:${PN} = " \ python3-pillow \ python3-pygments \ " + +# http://errors.yoctoproject.org/Errors/Details/766917/ +# python3-kivy/2.3.0/git/kivy/graphics/cgl_backend/cgl_gl.c:4568:52: error: assignment to 'void (*)(GLuint, GLsizei, const GLchar **, const GLint *)' {aka 'void (*)(unsigned int, int, const char **, const int *)'} from incompatible pointer type 'void (*)(GLuint, GLsizei, const GLchar * const*, const GLint *)' {aka 'void (*)(unsigned int, int, const char * const*, const int *)'} [-Wincompatible-pointer-types] +# python3-kivy/2.3.0/git/kivy/core/window/_window_sdl2.c:8781:23: error: passing argument 1 of 'SDL_SetEventFilter' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-python/recipes-devtools/python/python3-langtable_0.0.65.bb b/meta-python/recipes-devtools/python/python3-langtable_0.0.66.bb index fa9edc67d4..26a4f19215 100644 --- a/meta-python/recipes-devtools/python/python3-langtable_0.0.65.bb +++ b/meta-python/recipes-devtools/python/python3-langtable_0.0.66.bb @@ -6,7 +6,7 @@ SECTION = "devel/python" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI[sha256sum] = "791ec5403859704e1dee4d2a056a30ec21d1e7bc040658ce62c40e0427ba4333" +SRC_URI[sha256sum] = "0679e9014aa25916a8184c7bb5082fe983a661ab958d37f5fb75461abf5fb342" inherit pypi setuptools3 python3native diff --git a/meta-python/recipes-devtools/python/python3-marshmallow_3.21.1.bb b/meta-python/recipes-devtools/python/python3-marshmallow_3.21.2.bb index bf1d8dd290..11351230c2 100644 --- a/meta-python/recipes-devtools/python/python3-marshmallow_3.21.1.bb +++ b/meta-python/recipes-devtools/python/python3-marshmallow_3.21.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "\ file://LICENSE;md5=27586b20700d7544c06933afe56f7df4 \ file://docs/license.rst;md5=13da439ad060419fb7cf364523017cfb" -SRC_URI[sha256sum] = "4e65e9e0d80fc9e609574b9983cf32579f305c718afb30d7233ab818571768c3" +SRC_URI[sha256sum] = "82408deadd8b33d56338d2182d455db632c6313aa2af61916672146bb32edc56" inherit python_flit_core pypi ptest diff --git a/meta-python/recipes-devtools/python/python3-moteus/0001-lib-python-remove-self-import-from-setup.py.patch b/meta-python/recipes-devtools/python/python3-moteus/0001-lib-python-remove-self-import-from-setup.py.patch deleted file mode 100644 index 10acd7b8c1..0000000000 --- a/meta-python/recipes-devtools/python/python3-moteus/0001-lib-python-remove-self-import-from-setup.py.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7490ac4629c7fe0dc329647e6e000d4bc13c610d Mon Sep 17 00:00:00 2001 -From: Richard Leitner <dev@g0hl1n.net> -Date: Wed, 24 Jan 2024 00:49:45 +0100 -Subject: [PATCH] lib: python: remove self-import from setup.py - -Importing moteus itself within the setup.py creates some kind of a -chicken-and-egg problem. Furthermore it isn't used anywhere within -setup.py. Therefore remove the corresponding import. - -Signed-off-by: Richard Leitner <dev@g0hl1n.net> - -Upstream-Status: Backport [https://github.com/mjbots/moteus/commit/7490ac4629c7fe0dc329647e6e000d4bc13c610d] ---- - setup.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 2731685..6c6064d 100644 ---- a/setup.py -+++ b/setup.py -@@ -17,8 +17,6 @@ - import setuptools - import pathlib - --import moteus -- - here = pathlib.Path(__file__).parent.resolve() - - # Get the long description from the README file --- -2.40.1 - diff --git a/meta-python/recipes-devtools/python/python3-moteus_0.3.67.bb b/meta-python/recipes-devtools/python/python3-moteus_0.3.70.bb index 3c93ee44ff..7e77d8f7ae 100644 --- a/meta-python/recipes-devtools/python/python3-moteus_0.3.67.bb +++ b/meta-python/recipes-devtools/python/python3-moteus_0.3.70.bb @@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=9;md5=24025d3c660abfc62a inherit pypi setuptools3 -SRC_URI += "file://0001-lib-python-remove-self-import-from-setup.py.patch" - -SRC_URI[sha256sum] = "a2122f20f59b8962057cf8d3fb583e0aa19006eaf2cde49e30027a4d1b8bf925" +SRC_URI[sha256sum] = "39e6e2689511c601dff62e502ca6c6ab91100f34b2ebbf52fcee241bf8bfed31" S = "${WORKDIR}/moteus-${PV}" diff --git a/meta-python/recipes-devtools/python/python3-nocasedict_2.0.1.bb b/meta-python/recipes-devtools/python/python3-nocasedict_2.0.3.bb index 5a29858177..105c20b5a8 100644 --- a/meta-python/recipes-devtools/python/python3-nocasedict_2.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-nocasedict_2.0.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pywbem/nocasedict" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" -SRC_URI[sha256sum] = "960cb699f1209da80ac39e3ab50aa7342fe8ca9f70606c23447a510550435e50" +SRC_URI[sha256sum] = "1c9226c7f5a8a97ad51dcb0ae3157a720e3f7cb9c4568d22ea3a05e3f85658a9" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-nocaselist_2.0.0.bb b/meta-python/recipes-devtools/python/python3-nocaselist_2.0.2.bb index 2ad42247d9..913b8ac5ed 100644 --- a/meta-python/recipes-devtools/python/python3-nocaselist_2.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-nocaselist_2.0.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "456aa000c6777c5d21b029c52e532f94328d4fb4f15ad2a4dd3dd62db30b3892" +SRC_URI[sha256sum] = "32708b700a1a53133e6bb5cc53332c9775b0c7c959a5f9725793171fd2f4c8a5" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-pdm_2.15.1.bb b/meta-python/recipes-devtools/python/python3-pdm_2.15.3.bb index 270850061b..7551de866a 100644 --- a/meta-python/recipes-devtools/python/python3-pdm_2.15.1.bb +++ b/meta-python/recipes-devtools/python/python3-pdm_2.15.3.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=2eb31a2cc1a758c34b499f287dd04ef2" -SRC_URI[sha256sum] = "1c9cd049c1016633a23ef92ec1fc782da8ae0743142ef33faf7d48872f874b39" +SRC_URI[sha256sum] = "c227d81f6bf109626a5643a7bb531c5f5b777a850c4eac8d08b472c1146beee5" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-platformdirs_4.2.1.bb b/meta-python/recipes-devtools/python/python3-platformdirs_4.2.2.bb index 5f0aafc936..5821aedd4f 100644 --- a/meta-python/recipes-devtools/python/python3-platformdirs_4.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-platformdirs_4.2.2.bb @@ -7,7 +7,7 @@ SRC_URI += " \ file://run-ptest \ " -SRC_URI[sha256sum] = "031cd18d4ec63ec53e82dceaac0417d218a6863f7745dfcc9efe7793b7039bdf" +SRC_URI[sha256sum] = "38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3" inherit pypi python_hatchling ptest diff --git a/meta-python/recipes-devtools/python/python3-pycurl_7.45.2.bb b/meta-python/recipes-devtools/python/python3-pycurl_7.45.3.bb index a6863e21ff..774c1343c2 100644 --- a/meta-python/recipes-devtools/python/python3-pycurl_7.45.2.bb +++ b/meta-python/recipes-devtools/python/python3-pycurl_7.45.3.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING-LGPL;md5=4fbd65380cdd255951079008b364516c \ file://COPYING-MIT;md5=be42e1b1e58c8d59c2901fd747bfc55d \ " -SRC_URI[sha256sum] = "5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d23224ca" +SRC_URI[sha256sum] = "8c2471af9079ad798e1645ec0b0d3d4223db687379d17dd36a70637449f81d6b" DEPENDS = "curl" diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb b/meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb index faa291ea6d..f510645222 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb +++ b/meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb @@ -35,17 +35,6 @@ RDEPENDS:${PN}-ptest += "\ python3-unittest-automake-output \ " -do_install:append() { - for f in ${D}/${PYTHON_SITEPACKAGES_DIR}/pydantic_core/_pydantic_core.*.so - do - fname=`basename $f` - lname=`echo $fname | sed 's/musl/gnu/'` - if [ "$fname" != "$lname" ]; then - mv $f ${D}/${PYTHON_SITEPACKAGES_DIR}/pydantic_core/$lname - fi - done -} - do_install_ptest() { cp -rf ${S}/tests/ ${D}${PTEST_PATH}/ sed -i -e "/--automake/ s/$/ -k 'not test_model_class_root_validator_wrap and not test_model_class_root_validator_before and not test_model_class_root_validator_after'/" ${D}${PTEST_PATH}/run-ptest diff --git a/meta-python/recipes-devtools/python/python3-pydantic_2.7.1.bb b/meta-python/recipes-devtools/python/python3-pydantic_2.7.3.bb index 3c11144472..423fe76733 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic_2.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-pydantic_2.7.3.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=09280955509d1c4ca14bae02f21d49a6" inherit pypi python_hatchling -SRC_URI[sha256sum] = "e9dbb5eada8abe4d9ae5f46b9939aead650cd2b68f249bb3a8139dbe125803cc" +SRC_URI[sha256sum] = "c46c76a40bb1296728d7a8b99aa73dd70a48c3510111ff290034f860c99c419e" DEPENDS += "python3-hatch-fancy-pypi-readme-native" diff --git a/meta-python/recipes-devtools/python/python3-pylint_3.1.0.bb b/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb index 12f4f908af..0de1576af4 100644 --- a/meta-python/recipes-devtools/python/python3-pylint_3.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb @@ -3,11 +3,11 @@ HOMEPAGE= "http://www.pylint.org/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=c107cf754550e65755c42985a5d4e9c9" -SRC_URI += "git://github.com/pylint-dev/pylint;branch=maintenance/3.1.x;protocol=https \ +SRC_URI += "git://github.com/pylint-dev/pylint;branch=main;protocol=https \ file://0001-Adjust-test-expectations-for-ptest.patch \ file://run-ptest \ " -SRCREV = "053c2c3a25f97f043e10cdd41d2609e495a68f57" +SRCREV = "769ffd20bbf321a6cf23f5e7221a0b8221f51482" inherit python_setuptools_build_meta ptest diff --git a/meta-python/recipes-devtools/python/python3-pyperf_2.6.3.bb b/meta-python/recipes-devtools/python/python3-pyperf_2.7.0.bb index 6b37e1864a..f3ebfe2d9b 100644 --- a/meta-python/recipes-devtools/python/python3-pyperf_2.6.3.bb +++ b/meta-python/recipes-devtools/python/python3-pyperf_2.7.0.bb @@ -13,7 +13,7 @@ Features: \ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8" -SRC_URI[sha256sum] = "9752fe749c21e460a564bb3f52fc319b892c62ee61c5138b4a9bbf94ad2755e6" +SRC_URI[sha256sum] = "4201c6601032f374e9c900c6d2544a2f5891abedc1a96eec0e7b2338a6247589" DEPENDS += "python3-six-native" diff --git a/meta-python/recipes-devtools/python/python3-pyruvate_1.2.1.bb b/meta-python/recipes-devtools/python/python3-pyruvate_1.2.1.bb index 2807c054d9..297eecad0e 100644 --- a/meta-python/recipes-devtools/python/python3-pyruvate_1.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyruvate_1.2.1.bb @@ -9,16 +9,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI += "\ git://gitlab.com/tschorr/pyruvate.git;protocol=https;branch=main \ - file://0001-linux.rs-Define-consts-for-rv32-architecture.patch;patchdir=../cargo_home/bitbake/nix-0.23.2/ \ - file://0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch;patchdir=../cargo_home/bitbake/libc-0.2.138/ \ - file://0001-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch;patchdir=../cargo_home/bitbake/libc-0.2.138/ \ - file://0001-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch;patchdir=../cargo_home/bitbake/libc-0.2.138/ \ - file://0001-musl-Define-O_LARGEFILE-for-riscv32.patch;patchdir=../cargo_home/bitbake/libc-0.2.138/ \ - file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=../cargo_home/bitbake/libc-0.2.138/ \ + file://0001-linux.rs-Define-consts-for-rv32-architecture.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/nix-0.23.2/ \ + file://0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/libc-0.2.138/ \ + file://0001-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/libc-0.2.138/ \ + file://0001-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/libc-0.2.138/ \ + file://0001-musl-Define-O_LARGEFILE-for-riscv32.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/libc-0.2.138/ \ + file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/libc-0.2.138/ \ " SRCREV = "57db64c9f65ced05c71b8d786c1cedfaa2991597" -SRC_URI:append:mips = " file://0001-check-for-mips-targets-for-stat.st_dev-definitions.patch;patchdir=../cargo_home/bitbake/libsystemd-0.5.0/" +SRC_URI:append:mips = " file://0001-check-for-mips-targets-for-stat.st_dev-definitions.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/libsystemd-0.5.0/" S = "${WORKDIR}/git" diff --git a/meta-python/recipes-devtools/python/python3-pytest-freezer_0.4.8.bb b/meta-python/recipes-devtools/python/python3-pytest-freezer_0.4.8.bb new file mode 100644 index 0000000000..6ff69a3964 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-freezer_0.4.8.bb @@ -0,0 +1,15 @@ +SUMMARY = "Pytest plugin providing a fixture interface for spulec/freezegun" +HOMEPAGE = "https://github.com/pytest-dev/pytest-freezer" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1661a0f2b9b83ed73b8e05b5683b10d0" + +SRC_URI[sha256sum] = "8ee2f724b3ff3540523fa355958a22e6f4c1c819928b78a7a183ae4248ce6ee6" + +inherit pypi python_flit_core + +RDEPENDS:${PN} = "\ + python3-freezegun (>=1.0) \ + python3-pytest (>=3.6) \ +" + +PYPI_PACKAGE = "pytest_freezer" diff --git a/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb b/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb index 37478ee0ae..154ec255cb 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb @@ -15,7 +15,9 @@ DEPENDS += "\ " RDEPENDS:${PN} += " \ + python3-jinja2 \ python3-pytest \ + python3-pytest-metadata \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pytest-socket_0.7.0.bb b/meta-python/recipes-devtools/python/python3-pytest-socket_0.7.0.bb new file mode 100644 index 0000000000..86b03724a0 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-socket_0.7.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Pytest Plugin to disable socket calls during tests" +HOMEPAGE = "https://github.com/miketheman/pytest-socket" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1752f63a3a8a02fed42e580e9b94a081" + +SRC_URI[sha256sum] = "71ab048cbbcb085c15a4423b73b619a8b35d6a307f46f78ea46be51b1b7e11b3" + +inherit pypi python_poetry_core + +RDEPENDS:${PN} = "python3-pytest" + +BBCLASSEXTEND = "native nativesdk" + +PYPI_PACKAGE = "pytest_socket" diff --git a/meta-python/recipes-devtools/python/python3-pytest-unordered_0.6.0.bb b/meta-python/recipes-devtools/python/python3-pytest-unordered_0.6.0.bb new file mode 100644 index 0000000000..bf1420cf93 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-unordered_0.6.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "Test equality of unordered collections in pytest" +HOMEPAGE = "https://github.com/utapyngo/pytest-unordered" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fcd3af2d38a4d4dfd5138c6f163dbe2e" + +SRC_URI[sha256sum] = "f61b4f6e06a60a92db50968954efac93e2f584290a49f53ad135e3f32f57e02a" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-pytest" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb b/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb index ed5175fcf7..0911b63ed9 100644 --- a/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb @@ -3,7 +3,7 @@ SUMMARY = "A libudev binding" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI[sha256sum] = "75e54d37218f5ac45b0da1f0fd9cc5e526a3cac3ef1cfad410cf7ab338b01471" +SRC_URI[sha256sum] = "2e945427a21674893bb97632401db62139d91cea1ee96137cc7b07ad22198fc7" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-pyzstd_0.15.10.bb b/meta-python/recipes-devtools/python/python3-pyzstd_0.16.0.bb index c094a8d6f0..77459c1c57 100644 --- a/meta-python/recipes-devtools/python/python3-pyzstd_0.15.10.bb +++ b/meta-python/recipes-devtools/python/python3-pyzstd_0.16.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aedb5a2679cd1552fb61c181ef974b9e" PYPI_PACKAGE = "pyzstd" -SRC_URI[sha256sum] = "83603a97fdbcf2139f475c940789f09e32703f931f29f4a8ddf3551e6700108b" +SRC_URI[sha256sum] = "fd43a0ae38ae15223fb1057729001829c3336e90f4acf04cf12ebdec33346658" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-rapidjson_1.14.bb b/meta-python/recipes-devtools/python/python3-rapidjson_1.17.bb index 22868d8df0..d7a56b0519 100644 --- a/meta-python/recipes-devtools/python/python3-rapidjson_1.14.bb +++ b/meta-python/recipes-devtools/python/python3-rapidjson_1.17.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/python-rapidjson/python-rapidjson" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4daf3929156304df67003c33274a98bd" -SRC_URI[sha256sum] = "26806f0a658c34b48d2951d8d3f846ca9deb93a34e664ef436db632a188b6779" +SRC_URI[sha256sum] = "95a111da29d996af8549f8b32ec701dab3af2ab7c6cd9c79540391ecb05f20c8" # Inheriting ptest provides functionality for packaging and installing runtime tests for this recipe inherit setuptools3 pypi ptest diff --git a/meta-python/recipes-devtools/python/python3-regex_2024.4.28.bb b/meta-python/recipes-devtools/python/python3-regex_2024.5.15.bb index 62c850dcdb..9d356553b9 100644 --- a/meta-python/recipes-devtools/python/python3-regex_2024.4.28.bb +++ b/meta-python/recipes-devtools/python/python3-regex_2024.5.15.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" inherit pypi setuptools3 -SRC_URI[sha256sum] = "83ab366777ea45d58f72593adf35d36ca911ea8bd838483c1823b883a121b0e4" +SRC_URI[sha256sum] = "d3ee02d9e5f482cc8309134a91eeaacbdd2261ba111b0fef3748eeb4913e6a2c" RDEPENDS:${PN} += " \ python3-stringold \ diff --git a/meta-python/recipes-devtools/python/python3-requests-mock_1.12.1.bb b/meta-python/recipes-devtools/python/python3-requests-mock_1.12.1.bb new file mode 100644 index 0000000000..248526b00b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-requests-mock_1.12.1.bb @@ -0,0 +1,9 @@ +SUMMARY = "Mocked responses for the requests library" +HOMEPAGE = "https://github.com/jamielennox/requests-mock" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b2eea41aec0f2973a45e1e45f28aa32" + +DEPENDS = "python3-setuptools-scm-native" +SRC_URI[sha256sum] = "e9e12e333b525156e82a3c852f22016b9158220d2f47454de9cae8a77d371401" + +inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.29.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.30.bb index e646bd0d9c..1a42aa1b45 100644 --- a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.29.bb +++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.30.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c78b979ae6c20775a28a287d32092cbb" -SRC_URI[sha256sum] = "bd9566b8e58cabd700bc367b60e90d9349cd16f0984973f98a9a09f9c64e86f0" +SRC_URI[sha256sum] = "2b1708916730f4830bc69d6f49d37f7698b5bd7530aca7f04f785f8849e95255" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb b/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb index e119a0f11a..a952722619 100644 --- a/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" SRC_URI += " file://LICENSE " LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=497c556f42b1355b64190da2f3d88f93" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=497c556f42b1355b64190da2f3d88f93" SRC_URI[sha256sum] = "f7f39c583fd92027bd9d06127b259aee7a5b7945c1f1fa56263811e1e766996d" @@ -14,4 +14,4 @@ RDEPENDS:${PN} += "\ python3-setuptools \ " -BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-supervisor_4.2.5.bb b/meta-python/recipes-devtools/python/python3-supervisor_4.2.5.bb index 06b08e78a3..e104e1c0ce 100644 --- a/meta-python/recipes-devtools/python/python3-supervisor_4.2.5.bb +++ b/meta-python/recipes-devtools/python/python3-supervisor_4.2.5.bb @@ -28,6 +28,6 @@ do_install:append() { install -d ${D}${sysconfdir}/supervisor install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/supervisord.conf ${D}${sysconfdir}/supervisor - install -m 0644 ${WORKDIR}/supervisor.service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/supervisord.conf ${D}${sysconfdir}/supervisor + install -m 0644 ${UNPACKDIR}/supervisor.service ${D}${systemd_system_unitdir} } diff --git a/meta-python/recipes-devtools/python/python3-tqdm_4.66.2.bb b/meta-python/recipes-devtools/python/python3-tqdm_4.66.4.bb index 77d26f54b2..485d24f523 100644 --- a/meta-python/recipes-devtools/python/python3-tqdm_4.66.2.bb +++ b/meta-python/recipes-devtools/python/python3-tqdm_4.66.4.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=42dfa9e8c616dbc295df3f58d756b2a1" -SRC_URI[sha256sum] = "6cd52cdf0fef0e0f543299cfc96fec90d7b8a7e88745f411ec33eb44d5ed3531" +SRC_URI[sha256sum] = "e4d936c9de8727928f3be6079590e97d9abfe8d39a590be678eb5919ffc186bb" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-transitions_0.9.0.bb b/meta-python/recipes-devtools/python/python3-transitions_0.9.1.bb index 980351bf14..5f1e3d9e26 100644 --- a/meta-python/recipes-devtools/python/python3-transitions_0.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-transitions_0.9.1.bb @@ -4,6 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=de0a0876a688a4483bfafa764773ab39" inherit pypi setuptools3 -SRC_URI[sha256sum] = "2f54d11bdb225779d7e729011e93a9fb717668ce3dc65f8d4f5a5d7ba2f48e10" +SRC_URI[sha256sum] = "3542c37108e93e2ae5f215208ec5732c94a772937854a102cd7345b967fee61b" RDEPENDS:${PN} += "python3-six python3-logging" diff --git a/meta-python/recipes-devtools/python/python3-twine_5.0.0.bb b/meta-python/recipes-devtools/python/python3-twine_5.1.0.bb index cb45074811..6a79d45d43 100644 --- a/meta-python/recipes-devtools/python/python3-twine_5.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-twine_5.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://twine.readthedocs.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" -SRC_URI[sha256sum] = "89b0cc7d370a4b66421cc6102f269aa910fe0f1861c124f573cf2ddedbc10cf4" +SRC_URI[sha256sum] = "4d74770c88c4fcaf8134d2a6a9d863e40f08255ff7d8e2acb3cbbd57d25f6e9d" inherit pypi python_setuptools_build_meta diff --git a/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb index ba5bb04db0..336c173893 100644 --- a/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb @@ -15,7 +15,7 @@ do_install:append() { find ${D} \( -name "*.bat" -o -name "*.c" -o -name "*.h" \) -exec rm -f {} \; } -PACKAGES += "\ +PACKAGES =+ "\ ${PN}-zsh \ ${PN}-test \ ${PN}-protocols \ diff --git a/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240423.bb b/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240516.bb index 876f93a0f7..d0684ba933 100644 --- a/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240423.bb +++ b/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240516.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1 inherit pypi setuptools3 -SRC_URI[sha256sum] = "1b976cf86308316c5ac22cec688015b04273c84f8e691c3dfb0c12318f32a6f3" +SRC_URI[sha256sum] = "bb296f59fc56458891d0feb1994717e548a1bcf89936a2877df8792b822b4696" BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-types-setuptools_69.0.0.20240125.bb b/meta-python/recipes-devtools/python/python3-types-setuptools_70.0.0.20240524.bb index 7e15dcb13a..781d3b5bbc 100644 --- a/meta-python/recipes-devtools/python/python3-types-setuptools_69.0.0.20240125.bb +++ b/meta-python/recipes-devtools/python/python3-types-setuptools_70.0.0.20240524.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1 inherit pypi setuptools3 -SRC_URI[sha256sum] = "22ad498cb585b22ce8c97ada1fccdf294a2e0dd7dc984a28535a84ea82f45b3f" +SRC_URI[sha256sum] = "e31fee7b9d15ef53980526579ac6089b3ae51a005a281acf97178e90ac71aff6" BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-devtools/python/python3-ujson_5.9.0.bb b/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb index b5f6be9f27..c64c800626 100644 --- a/meta-python/recipes-devtools/python/python3-ujson_5.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb @@ -4,7 +4,7 @@ DESCRIPTION = "UltraJSON is an ultra fast JSON encoder and decoder written in pu LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e0039a83d8a99726b5418f0b03302d0a" -SRC_URI[sha256sum] = "89cc92e73d5501b8a7f48575eeb14ad27156ad092c2e9fc7e3cf949f07e75532" +SRC_URI[sha256sum] = "b3cd8f3c5d8c7738257f1018880444f7b7d9b66232c64649f562d7ba86ad4bc1" inherit pypi ptest setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-uswid_0.4.7.bb b/meta-python/recipes-devtools/python/python3-uswid_0.5.0.bb index 4499edb216..1381d7e880 100644 --- a/meta-python/recipes-devtools/python/python3-uswid_0.4.7.bb +++ b/meta-python/recipes-devtools/python/python3-uswid_0.5.0.bb @@ -1,10 +1,10 @@ SUMMARY = "A pure-python library for embedding CoSWID data" HOMEPAGE = "https://github.com/hughsie/python-uswid" SECTION = "devel/python" -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=40d2542b8c43a3ec2b7f5da31a697b88" +LICENSE = "BSD-2-Clause-Patent" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f3636dfe71e94cc72918423cec0d1971" -SRC_URI[sha256sum] = "de15c2421bedaa5f54606558700c1f628f07d73da49ec69d1888214ac52c49e6" +SRC_URI[sha256sum] = "bdcd7ee5afac1da60ee688c357aa12f5f8d74bc28012446b10e2b4a9cf52fc6d" inherit setuptools3 python3native pypi diff --git a/meta-python/recipes-devtools/python/python3-validators_0.28.1.bb b/meta-python/recipes-devtools/python/python3-validators_0.28.3.bb index 7666ae7d46..a132d74ebd 100644 --- a/meta-python/recipes-devtools/python/python3-validators_0.28.1.bb +++ b/meta-python/recipes-devtools/python/python3-validators_0.28.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://python-validators.github.io/validators" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3fb4b9e6db86c69a33d5e3ee013ab59" -SRC_URI[sha256sum] = "5ac88e7916c3405f0ce38ac2ac82a477fcf4d90dbbeddd04c8193171fc17f7dc" +SRC_URI[sha256sum] = "c6c79840bcde9ba77b19f6218f7738188115e27830cbaff43264bc4ed24c429d" inherit pypi python_setuptools_build_meta ptest diff --git a/meta-python/recipes-devtools/python/python3-virtualenv_20.26.0.bb b/meta-python/recipes-devtools/python/python3-virtualenv_20.26.2.bb index 55f7f46112..c7c7d48980 100644 --- a/meta-python/recipes-devtools/python/python3-virtualenv_20.26.0.bb +++ b/meta-python/recipes-devtools/python/python3-virtualenv_20.26.2.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/pypa/virtualenv" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538" -SRC_URI[sha256sum] = "ec25a9671a5102c8d2657f62792a27b48f016664c6873f6beed3800008577210" +SRC_URI[sha256sum] = "82bf0f4eebbb78d36ddaee0283d43fe5736b53880b8a8cdcd37390a07ac3741c" BBCLASSEXTEND = "native nativesdk" inherit pypi python_hatchling diff --git a/meta-python/recipes-devtools/python/python3-watchdog_4.0.0.bb b/meta-python/recipes-devtools/python/python3-watchdog_4.0.1.bb index 9e36264d62..4d0a626c47 100644 --- a/meta-python/recipes-devtools/python/python3-watchdog_4.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-watchdog_4.0.1.bb @@ -4,7 +4,7 @@ DEPENDS = "python3-argh" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "e3e7065cbdabe6183ab82199d7a4f6b3ba0a438c5a512a68559846ccb76a78ec" +SRC_URI[sha256sum] = "eebaacf674fa25511e8867028d281e602ee6500045b57f43b08778082f7f8b44" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-web3_6.17.2.bb b/meta-python/recipes-devtools/python/python3-web3_6.19.0.bb index e695bc27a0..7f06ca5006 100644 --- a/meta-python/recipes-devtools/python/python3-web3_6.17.2.bb +++ b/meta-python/recipes-devtools/python/python3-web3_6.19.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=373fede350846fdffd23648fba504635" -SRC_URI[sha256sum] = "8ed8b7184eba5b00d0849efb95c8ec6f3220aa8886e740182bb1e4f1247cca3e" +SRC_URI[sha256sum] = "d27fbd4ac5aa70d0e0c516bd3e3b802fbe74bc159b407c34052d9301b400f757" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb b/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb index f8d2769b41..448abe1897 100644 --- a/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb @@ -20,4 +20,5 @@ RDEPENDS:${PN} += " \ python3-profile \ python3-compression \ python3-json \ + python3-difflib \ " diff --git a/meta-python/recipes-devtools/python/python3-zeroconf_0.132.0.bb b/meta-python/recipes-devtools/python/python3-zeroconf_0.132.2.bb index ea8ef1cb92..421bd3b6c8 100644 --- a/meta-python/recipes-devtools/python/python3-zeroconf_0.132.0.bb +++ b/meta-python/recipes-devtools/python/python3-zeroconf_0.132.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=6517bdc8f2416f27ab725d4702f7aac3" -SRC_URI[sha256sum] = "e2dddb9b8e6a9de3c43f943d8547300e6bd49b2043fd719ae830cfe0f2908a5c" +SRC_URI[sha256sum] = "9ad8bc6e3f168fe8c164634c762d3265c775643defff10e26273623a12d73ae1" DEPENDS += "python3-cython-native" diff --git a/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.1.0.bb b/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.1.2.bb index 482155856a..0aae1d0c96 100644 --- a/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.1.0.bb +++ b/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.1.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/burnash/gspread" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9488e21983675fa56dc05af558b83e2f" -SRC_URI[sha256sum] = "576b72b628b251d2ee41e02b982d3c714d511d2a5aa3a88e587ed9efc4d6e752" +SRC_URI[sha256sum] = "b147688b8c7a18c9835d5f998997ec17c97c0470babcab17f65ac2b3a32402b7" RDEPENDS:${PN} = " \ python3-google-auth \ diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch new file mode 100644 index 0000000000..4782e74ef3 --- /dev/null +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch @@ -0,0 +1,31 @@ +From 5234a454a1b9f11f83e59909fb2972176497e02c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 9 May 2024 17:35:11 -0700 +Subject: [PATCH] sip: Fix build with gcc-14 + +Fixes -Wincompatible-pointer-types +sip/siplib/siplib.c:3900:20: error: assignment to 'sipSimpleWrapper *' {aka 'struct _sipSimpleWrapper *'} from incompatible pointer type 'PyObject *' {aka 'struct _object *'} [-Wincompatible-pointer-types] +| 3900 | *selfp = va_arg(va, PyObject *); + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sip/siplib/siplib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sip/siplib/siplib.c b/sip/siplib/siplib.c +index 95563e5c..ae3fac60 100644 +--- a/sip/siplib/siplib.c ++++ b/sip/siplib/siplib.c +@@ -3897,7 +3897,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, + { + case '#': + /* A ctor has an argument with the /Transfer/ annotation. */ +- *selfp = va_arg(va, PyObject *); ++ *selfp = (sipSimpleWrapper *)va_arg(va, PyObject *); + break; + + case 'B': +-- +2.45.0 + diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb index fb011cb71b..cc6b6cef67 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb @@ -14,6 +14,7 @@ SRC_URI += "file://add-back-option-build-base.patch \ file://wxgtk-fixup-build-scripts.patch \ file://not-overwrite-cflags-cxxflags.patch \ file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \ + file://0001-sip-Fix-build-with-gcc-14.patch \ " SRC_URI[sha256sum] = "e48de211a6606bf072ec3fa778771d6b746c00b7f4b970eb58728ddf56d13d5c" diff --git a/meta-webserver/conf/layer.conf b/meta-webserver/conf/layer.conf index 717bfda471..08e9df505b 100644 --- a/meta-webserver/conf/layer.conf +++ b/meta-webserver/conf/layer.conf @@ -17,7 +17,7 @@ LAYERVERSION_webserver = "1" LAYERDEPENDS_webserver = "core openembedded-layer" -LAYERSERIES_COMPAT_webserver = "scarthgap styhead" +LAYERSERIES_COMPAT_webserver = "styhead" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb index b96e8b4e17..1632c6ccb1 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e S = "${WORKDIR}/httpd-${PV}" -inherit autotools update-rc.d pkgconfig systemd update-alternatives +inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header DEPENDS = "openssl expat pcre apr apr-util apache2-native " @@ -80,13 +80,15 @@ EXTRA_OECONF:class-native = "\ " do_configure:prepend() { - sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout + sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' \ + -e 's#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#' \ + ${S}/config.layout } do_install:append:class-target() { install -d ${D}/${sysconfdir}/init.d - cat ${WORKDIR}/init | \ + cat ${UNPACKDIR}/init | \ sed -e 's,/usr/sbin/,${sbindir}/,g' \ -e 's,/usr/bin/,${bindir}/,g' \ -e 's,/usr/lib/,${libdir}/,g' \ @@ -119,30 +121,33 @@ do_install:append:class-target() { -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk + -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${libexecdir}/${PN}/build/config_vars.mk sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice + -e 's,${WORKDIR}/recipe-sysroot/,,g' \ + -e 's,".*/configure","configure",g' ${D}${libexecdir}/${PN}/build/config.nice if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ + install -m 0644 ${UNPACKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/apache2.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/apache2.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/apache2.service sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' ${D}${systemd_unitdir}/system/apache2.service elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 + install -m 0644 ${UNPACKDIR}/volatiles.04_apache2 ${D}${sysconfdir}/default/volatiles/04_apache2 fi rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* chown -R root:root ${D} + + oe_multilib_header apache2/ap_config_layout.h } do_install:append:class-native() { @@ -152,20 +157,22 @@ do_install:append:class-native() { SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess" +SYSROOT_DIRS += "${libexecdir}/${PN}/build" + apache_sysroot_preprocess() { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts} install -d ${SYSROOT_DESTDIR}${sbindir} install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} - sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs - - sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk - sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk + sed -i 's!\(my $installbuilddir = \)"\(.*\)"!\1"${STAGING_DIR_HOST}\2"!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs + + sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${libexecdir}/${PN}/build/config_vars.mk + sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${libexecdir}/${PN}/build/config_vars.mk + sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${libexecdir}/${PN}/build/config_vars.mk + sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${libexecdir}/${PN}/build/config_vars.mk + sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${libexecdir}/${PN}/build/config_vars.mk + sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${libexecdir}/${PN}/build/config_vars.mk + sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${libexecdir}/${PN}/build/config_vars.mk } # Implications - used by update-rc.d scripts @@ -178,6 +185,8 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" ALTERNATIVE:${PN}-doc = "htpasswd.1" ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apxs" + PACKAGES = "${PN}-utils ${PN}-scripts ${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" CONFFILES:${PN} = "${sysconfdir}/${BPN}/httpd.conf \ @@ -200,7 +209,7 @@ FILES:${PN}-utils = "${bindir}/ab \ # We override here rather than append so that .so links are # included in the runtime package rather than here (-dev) # and to get build, icons, error into the -dev package -FILES:${PN}-dev = "${datadir}/${BPN}/build \ +FILES:${PN}-dev = "${libexecdir}/${PN}/build \ ${datadir}/${BPN}/icons \ ${datadir}/${BPN}/error \ ${includedir}/${BPN} \ diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb index 7763a31881..53d6a85ae7 100644 --- a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb @@ -36,13 +36,13 @@ EXTRA_OECONF = "--disable-static \ do_install:append () { install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee + install -m 755 ${UNPACKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee # clean up .la files for plugins rm -f ${D}${libdir}/cherokee/*.la install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/cherokee.service ${D}${systemd_unitdir}/system rmdir "${D}${localstatedir}/run" rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" } diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb index 2e848eaf56..1111ef6f56 100644 --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.12.bb @@ -37,9 +37,9 @@ EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ do_install:append() { # Copy over init script and sed in the correct sbin path - sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init + sed -i 's,sed_sbin_path,${sbindir},' ${UNPACKDIR}/hiawatha-init mkdir -p ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha + install -m 0755 ${UNPACKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha # configure php-fcgi to have a working configuration # by default if php is installed @@ -47,7 +47,7 @@ do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system - install -m 644 ${WORKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system + install -m 644 ${UNPACKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system fi # /var/log/hiawatha and /var/lib/hiawatha needs to be created in runtime. diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index ee5dc16198..5bf6373a81 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -46,7 +46,7 @@ do_configure:append() { do_install:append() { rmdir ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/run ${D}${localstatedir}/log rmdir --ignore-fail-on-non-empty ${D}${localstatedir} - install -Dm 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey + install -Dm 0755 ${UNPACKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey # Create /var/log/monkey in runtime. if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then install -d ${D}${nonarch_libdir}/tmpfiles.d @@ -57,7 +57,7 @@ do_install:append() { echo "d ${BPN} ${BPN} 0755 ${localstatedir}/log/${BPN} none" > ${D}${sysconfdir}/default/volatiles/99_${BPN} fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -Dm 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service + install -Dm 644 ${UNPACKDIR}/monkey.service ${D}/${systemd_unitdir}/system/monkey.service fi } diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 83ae90c40c..2714c3d22f 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -108,24 +108,24 @@ do_install () { chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx + install -m 0755 ${UNPACKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx install -d ${D}${sysconfdir}/nginx - install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf + install -m 0644 ${UNPACKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/nginx/nginx.conf sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf sed -i 's/^user.*/user ${NGINX_USER};/g' ${D}${sysconfdir}/nginx/nginx.conf - install -Dm 0644 ${WORKDIR}/default_server.site ${D}${sysconfdir}/nginx/sites-available/default_server + install -Dm 0644 ${UNPACKDIR}/default_server.site ${D}${sysconfdir}/nginx/sites-available/default_server sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/sites-available/default_server install -d ${D}${sysconfdir}/nginx/sites-enabled ln -s ../sites-available/default_server ${D}${sysconfdir}/nginx/sites-enabled/ - install -m 0644 ${WORKDIR}/proxy_params ${D}${sysconfdir}/nginx/proxy_params + install -m 0644 ${UNPACKDIR}/proxy_params ${D}${sysconfdir}/nginx/proxy_params install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx + install -m 0644 ${UNPACKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx sed -i 's,@NGINX_USER@,${NGINX_USER},g' ${D}${sysconfdir}/default/volatiles/99_nginx @@ -140,7 +140,7 @@ do_install () { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${UNPACKDIR}/nginx.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb index 601ec7bcd1..ec188cc482 100644 --- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb +++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb @@ -37,14 +37,14 @@ do_configure:prepend () { do_install:append () { install -d ${D}${sysconfdir}/init.d - install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/thttpd - install -c -m 755 ${WORKDIR}/thttpd.conf ${D}${sysconfdir} + install -c -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/thttpd + install -c -m 755 ${UNPACKDIR}/thttpd.conf ${D}${sysconfdir} sed -i -e 's,@@CONFFILE,${sysconfdir}/thttpd.conf,g' ${D}${sysconfdir}/init.d/thttpd sed -i -e 's,@@SRVDIR,${SRV_DIR},g' ${D}${sysconfdir}/thttpd.conf sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/thttpd install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/thttpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/thttpd.service ${D}${systemd_unitdir}/system sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_unitdir}/system/thttpd.service sed -i 's!/var/!${localstatedir}/!g' ${D}${systemd_unitdir}/system/thttpd.service sed -i -e 's,@@CONFFILE,${sysconfdir}/thttpd.conf,g' ${D}${systemd_unitdir}/system/thttpd.service diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.1.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.1.bb index 34b710e885..7c3810154f 100644 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.1.bb +++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_5.2.1.bb @@ -28,7 +28,7 @@ do_install() { rm -rf ${D}${datadir}/${BPN}/patches install -d ${D}${sysconfdir}/apache2/conf.d - install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf + install -m 0644 ${UNPACKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf # Remove a few scripts that explicitly require bash (!) rm -f ${D}${datadir}/phpmyadmin/libraries/transformations/*.sh diff --git a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb b/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb index df7f47a118..6a5eb4e66e 100644 --- a/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb +++ b/meta-webserver/recipes-webadmin/cockpit/cockpit_304.bb @@ -193,7 +193,7 @@ do_install:append() { chmod 4750 ${D}${libexecdir}/cockpit-session install -d "${D}${sysconfdir}/pam.d" - install -p -m 0644 ${WORKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit + install -p -m 0644 ${UNPACKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit # provided by firewalld rm -rf ${D}${libdir}/firewalld diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb index 700c6b2346..b06a5df314 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb @@ -55,13 +55,13 @@ do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then # Install systemd unit files install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/netdata.service ${D}${systemd_unitdir}/system sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service fi # Install default netdata.conf install -d ${D}${sysconfdir}/netdata - install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ + install -m 0644 ${UNPACKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb index 35ec09daea..bbc59443c7 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb @@ -82,7 +82,7 @@ do_install() { install -m 0755 webmin-init ${D}${sysconfdir}/init.d/webmin install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/webmin.service ${D}${systemd_unitdir}/system + install -m 0644 ${UNPACKDIR}/webmin.service ${D}${systemd_unitdir}/system sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ ${D}${systemd_unitdir}/system/webmin.service @@ -117,7 +117,7 @@ do_install() { export atboot=1 export no_pam=1 mkdir -p $tempdir - ${S}/../setup.sh + ${UNPACKDIR}/setup.sh # Ensure correct PERLLIB path sed -i -e 's#${D}##g' ${D}${sysconfdir}/webmin/start diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf index 0c7990e8e0..f131eb2704 100644 --- a/meta-xfce/conf/layer.conf +++ b/meta-xfce/conf/layer.conf @@ -19,7 +19,7 @@ LAYERDEPENDS_xfce-layer += "multimedia-layer" LAYERDEPENDS_xfce-layer += "meta-python" LAYERDEPENDS_xfce-layer += "networking-layer" -LAYERSERIES_COMPAT_xfce-layer = "scarthgap styhead" +LAYERSERIES_COMPAT_xfce-layer = "styhead" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ openzone->gdk-pixbuf \ diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.3.2.bb b/meta-xfce/recipes-apps/menulibre/menulibre_2.4.0.bb index 7491b509cc..71d3ab4d29 100644 --- a/meta-xfce/recipes-apps/menulibre/menulibre_2.3.2.bb +++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.4.0.bb @@ -12,9 +12,8 @@ DEPENDS = " \ inherit setuptools3_legacy gtk-icon-cache features_check REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data" -SRC_URI = "git://github.com/bluesabre/menulibre.git;protocol=https;branch=master" -SRCREV = "94bef4060714fa65c7246c25b87410b52a149f94" -S = "${WORKDIR}/git" +SRC_URI = "https://github.com/bluesabre/${BPN}/releases/download/${BP}/${BP}.tar.gz" +SRC_URI[sha256sum] = "d906acf9cc13b0e15b8e342ae9aab8b0680db336a382d0c42f5d5f465f593c9f" do_compile[noexec] = "1" diff --git a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb index 1e02bbe54f..73eafeebcf 100644 --- a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb +++ b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.3.1.bb @@ -13,3 +13,6 @@ RRECOMMENDS:${PN} = "mpd" inherit xfce-app SRC_URI[sha256sum] = "4867d5dd100fa42ab39ebde6c784ec21ee31717f1adb3f4da070dafb3848d96d" + +# Fixes build with GCC-14 which enables incompatible-pointer-types as error +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.10.0.bb b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.11.0.bb index 8c9768b1e3..0262620e6c 100644 --- a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.10.0.bb +++ b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.11.0.bb @@ -7,4 +7,8 @@ inherit xfce-panel-plugin DEPENDS += "gtk+3 libxfce4ui xfce4-panel xfconf" -SRC_URI[sha256sum] = "2ee4406042edd352a91e166c83b60d13220ef04dce3fa6b9e0eb13636d636929" +CFLAGS += "-Wno-error=incompatible-pointer-types" +SRC_URI[sha256sum] = "eb38246deb0fc89535fa9ff9b953c762cece232b5585d8210fab9abbf282aae3" + +# Add /usr/share/xfce4/notes/gtk-3.0/gtk.css +FILES:${PN} += "${datadir}/xfce4/notes" |
