diff options
963 files changed, 12592 insertions, 9530 deletions
diff --git a/meta-filesystems/conf/include/non-repro-meta-filesystems.inc b/meta-filesystems/conf/include/non-repro-meta-filesystems.inc index 497559327..509907d88 100644 --- a/meta-filesystems/conf/include/non-repro-meta-filesystems.inc +++ b/meta-filesystems/conf/include/non-repro-meta-filesystems.inc | |||
@@ -3,7 +3,4 @@ | |||
3 | KNOWN_NON_REPRO_META_FILESYSTEMS = " \ | 3 | KNOWN_NON_REPRO_META_FILESYSTEMS = " \ |
4 | e2tools-ptest \ | 4 | e2tools-ptest \ |
5 | xfsprogs-doc \ | 5 | xfsprogs-doc \ |
6 | zfs \ | ||
7 | zfs-dbg \ | ||
8 | zfs-dev \ | ||
9 | " | 6 | " |
diff --git a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb index d3ea6797e..504fe2892 100644 --- a/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb +++ b/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "CDDL-1.0" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" |
5 | HOMEPAGE ="https://github.com/openzfs/zfs" | 5 | HOMEPAGE ="https://github.com/openzfs/zfs" |
6 | 6 | ||
7 | SRCREV = "494aaaed89cb9fe9f2da3b6c6f465a4bc9f6a7e1" | 7 | SRCREV = "33174af15112ed5c53299da2d28e763b0163f428" |
8 | SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \ | 8 | SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \ |
9 | file://0001-Define-strndupa-if-it-does-not-exist.patch \ | 9 | file://0001-Define-strndupa-if-it-does-not-exist.patch \ |
10 | file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \ | 10 | file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \ |
@@ -35,7 +35,7 @@ EXTRA_OECONF:append = " \ | |||
35 | --with-systemdgeneratordir=${nonarch_base_libdir}/systemd/system-generators \ | 35 | --with-systemdgeneratordir=${nonarch_base_libdir}/systemd/system-generators \ |
36 | --with-systemdpresetdir=${nonarch_base_libdir}/systemd/system-preset \ | 36 | --with-systemdpresetdir=${nonarch_base_libdir}/systemd/system-preset \ |
37 | --with-systemdmodulesloaddir=${sysconfdir}/module-load.d \ | 37 | --with-systemdmodulesloaddir=${sysconfdir}/module-load.d \ |
38 | --without-dracutdir \ | 38 | --without-dracutdir --enable-linux-builtin \ |
39 | " | 39 | " |
40 | 40 | ||
41 | EXTRA_OEMAKE:append = " \ | 41 | EXTRA_OEMAKE:append = " \ |
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 6f613e9cd..fca7d42b3 100644 --- a/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb +++ b/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb | |||
@@ -23,7 +23,7 @@ SRC_URI[sha256sum] = "d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7 | |||
23 | UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" | 23 | UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" |
24 | UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>2(\.\d+)+).tar.gz" | 24 | UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>2(\.\d+)+).tar.gz" |
25 | 25 | ||
26 | CVE_PRODUCT = "fuse_project:fuse" | 26 | CVE_PRODUCT = "fuse_project:fuse fuse:fuse" |
27 | 27 | ||
28 | inherit autotools pkgconfig update-rc.d systemd | 28 | inherit autotools pkgconfig update-rc.d systemd |
29 | 29 | ||
diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb index 1fa5e0187..459c7058e 100644 --- a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb +++ b/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb | |||
@@ -15,6 +15,7 @@ PV = "0.1.0+git" | |||
15 | 15 | ||
16 | SRC_URI = " \ | 16 | SRC_URI = " \ |
17 | git://github.com/e2tools/e2tools;protocol=https;branch=master \ | 17 | git://github.com/e2tools/e2tools;protocol=https;branch=master \ |
18 | file://0001-Disable-portability-warning-as-error.patch \ | ||
18 | file://run-ptest \ | 19 | file://run-ptest \ |
19 | " | 20 | " |
20 | 21 | ||
@@ -24,41 +25,14 @@ S = "${WORKDIR}/git" | |||
24 | 25 | ||
25 | inherit autotools pkgconfig ptest | 26 | inherit autotools pkgconfig ptest |
26 | 27 | ||
27 | do_configure:prepend() { | 28 | # Otherwise these tools will be detected from build host and |
28 | git -C "${WORKDIR}/git" reset --hard HEAD | 29 | # assumptions will go wrong, Fun of cross compiling |
29 | 30 | EXTRA_OECONF += "\ | |
30 | # To install ptest for this package, special configuration needs to be | 31 | ac_cv_path_MKE2FS=${base_sbindir}/mke2fs \ |
31 | # done before do_configure(). So, do_configure_ptest() which is scheduled | 32 | ac_cv_path_CHMOD=${base_bindir}/chmod \ |
32 | # after do_configure() cannot be used. | 33 | ac_cv_path_DD=${base_bindir}/dd \ |
33 | 34 | ac_cv_path_GREP=${base_bindir}/grep \ | |
34 | # We only do special configuration if we are installing ptest for this | 35 | " |
35 | # package. | ||
36 | if [ "${@d.getVar('PTEST_ENABLED')}" -eq "1" ]; then | ||
37 | # Since we guarantee run-time dependency when installing the ptest for | ||
38 | # this package, we do not need the check macros under section "checks | ||
39 | # for programs" in "configure.ac". Plus, these check macros set the | ||
40 | # ouput variables to incorrect values as these checks are performed on | ||
41 | # the host environment. Still, we need these variables outputted from | ||
42 | # these check macros. So, we insert the following lines to manually | ||
43 | # set these output variables to the correct value in "configure.ac". | ||
44 | |||
45 | # Note that HAVE_DD_COMMAND and HAVE_MKE2FS_COMMAND are only ever used | ||
46 | # in tests/Makefile-files which determines whether to include the test | ||
47 | # cases. As for output variables CHMOD, DD, and MKE2FS, they only | ||
48 | # point to the programs which test cases need to run. Since these | ||
49 | # commands are guaranteed to be present due to RDEPENDS and are | ||
50 | # guaranteed to be accessible under PATH environment variable on the | ||
51 | # target, we only need to specify the name of these programs. | ||
52 | |||
53 | perl -i -0777 -pe 's/(^dnl\s*=+\s*^dnl\s*Checks for compiler flags\s*^dnl\s*=+)/ | ||
54 | AC_SUBST([CHMOD], 'chmod') | ||
55 | AC_SUBST([DD], 'dd') | ||
56 | AC_SUBST([MKE2FS], 'mke2fs') | ||
57 | AM_CONDITIONAL([HAVE_DD_COMMAND], [true]) | ||
58 | AM_CONDITIONAL([HAVE_MKE2FS_COMMAND], [true]) | ||
59 | \1/ms' "${WORKDIR}/git/configure.ac" | ||
60 | fi | ||
61 | } | ||
62 | 36 | ||
63 | do_install_ptest() { | 37 | do_install_ptest() { |
64 | rm -rf "${D}${PTEST_PATH}/*" | 38 | rm -rf "${D}${PTEST_PATH}/*" |
@@ -67,7 +41,7 @@ do_install_ptest() { | |||
67 | cp -r "${S}" "${D}${PTEST_PATH}" | 41 | cp -r "${S}" "${D}${PTEST_PATH}" |
68 | rm -rf ${D}${PTEST_PATH}/build/config.log ${D}${PTEST_PATH}/build/autom4te.cache \ | 42 | rm -rf ${D}${PTEST_PATH}/build/config.log ${D}${PTEST_PATH}/build/autom4te.cache \ |
69 | ${D}${PTEST_PATH}/git/.git ${D}${PTEST_PATH}/git/autom4te.cache | 43 | ${D}${PTEST_PATH}/git/.git ${D}${PTEST_PATH}/git/autom4te.cache |
70 | sed -i -e 's;${RECIPE_SYSROOT};;g' ${D}${PTEST_PATH}/build/config.status | 44 | sed -i -e 's;${TMPDIR};;g' ${D}${PTEST_PATH}/build/config.status |
71 | } | 45 | } |
72 | 46 | ||
73 | RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl" | 47 | RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl" |
diff --git a/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch b/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch new file mode 100644 index 000000000..dec793f37 --- /dev/null +++ b/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From e0aaedea30483bf5b9bb085e12fff79144fa1174 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 29 Aug 2024 11:12:57 -0700 | ||
4 | Subject: [PATCH] Disable portability warning as error | ||
5 | |||
6 | With latest automake 1.17 its warning about escape hash | ||
7 | mark [1] and since configure.ac uses -werror to call automake | ||
8 | this becomes an error and reconfigure fails. | ||
9 | |||
10 | escape hash mark is non-portable as discussed here [2] | ||
11 | |||
12 | Fow now let it be a warning, it should be fixed in a portable way | ||
13 | |||
14 | [1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=7610 | ||
15 | [2] https://lists.gnu.org/archive/html/automake/2011-08/msg00023.html | ||
16 | |||
17 | Upstream-Status: Submitted [https://github.com/e2tools/e2tools/pull/31] | ||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | --- | ||
20 | configure.ac | 1 + | ||
21 | 1 file changed, 1 insertion(+) | ||
22 | |||
23 | diff --git a/configure.ac b/configure.ac | ||
24 | index dd32c4d..9f37591 100644 | ||
25 | --- a/configure.ac | ||
26 | +++ b/configure.ac | ||
27 | @@ -14,6 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) | ||
28 | AM_INIT_AUTOMAKE([ | ||
29 | -Wall | ||
30 | -Werror | ||
31 | +-Wno-portability | ||
32 | 1.9.6 | ||
33 | foreign | ||
34 | subdir-objects | ||
diff --git a/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.4.bb b/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.5.bb index aa6a19978..c3ae8b838 100644 --- a/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.4.bb +++ b/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.5.bb | |||
@@ -12,7 +12,7 @@ LICENSE = "GPL-2.0-only" | |||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
13 | 13 | ||
14 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" | 14 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" |
15 | SRC_URI[sha256sum] = "ad38126dfd9f74f8c6ecb35ddfd34d2582601d6c3ff26756610b8418360c8ee2" | 15 | SRC_URI[sha256sum] = "f27160dcc1ddd17c96cd41a6ceef7037adc2796ab5c5633d3d85cf532c3ee2f0" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 17 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
18 | UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" | 18 | UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch new file mode 100644 index 000000000..78802e39a --- /dev/null +++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 2fa94fc7adf05fae46204f4665216c8b019010f3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 5 Jul 2024 23:16:38 -0700 | ||
4 | Subject: [PATCH 1/2] always use glibc basename() | ||
5 | |||
6 | There is a use of basename() which expects it to be GNU version of | ||
7 | basename, which is not available in other libcs e.g. musl on Linux | ||
8 | therefore provide a version for such cases | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/kmxz/overlayfs-tools/pull/26] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | main.c | 12 ++++++++++++ | ||
14 | 1 file changed, 12 insertions(+) | ||
15 | |||
16 | diff --git a/main.c b/main.c | ||
17 | index 7b669eb..ea0f5a5 100644 | ||
18 | --- a/main.c | ||
19 | +++ b/main.c | ||
20 | @@ -30,6 +30,18 @@ bool brief; | ||
21 | bool ignore; | ||
22 | extern char *program_name; | ||
23 | |||
24 | +#ifndef __GLIBC__ | ||
25 | +/* | ||
26 | + * GNU basename implementation | ||
27 | + */ | ||
28 | +static const char *__basename(const char *filename) { | ||
29 | + char *p = strrchr(filename, '/'); | ||
30 | + return p ? p + 1 : filename; | ||
31 | +} | ||
32 | + | ||
33 | +#define basename(x) __basename(x) | ||
34 | +#endif | ||
35 | + | ||
36 | void print_help(const char *program) { | ||
37 | printf("Usage: %s command options\n", program); | ||
38 | puts(""); | ||
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch new file mode 100644 index 000000000..845306292 --- /dev/null +++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From be694ba90aa2e0fed3a4e9b53ad7a61efd0430c5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 5 Jul 2024 23:18:07 -0700 | ||
4 | Subject: [PATCH 2/2] Change program_name to have const attribute | ||
5 | |||
6 | This is how it is used in all places and it also avoids a const to | ||
7 | non-const conversion warning | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/kmxz/overlayfs-tools/pull/26] | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | common.c | 2 +- | ||
14 | fsck.c | 2 +- | ||
15 | main.c | 2 +- | ||
16 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/common.c b/common.c | ||
19 | index eaf24a8..a15b66f 100644 | ||
20 | --- a/common.c | ||
21 | +++ b/common.c | ||
22 | @@ -29,7 +29,7 @@ | ||
23 | #include "common.h" | ||
24 | #include "config.h" | ||
25 | |||
26 | -char *program_name; | ||
27 | +const char *program_name; | ||
28 | |||
29 | /* #define DEBUG 1 */ | ||
30 | #ifdef DEBUG | ||
31 | diff --git a/fsck.c b/fsck.c | ||
32 | index 4e513f5..285b9f1 100644 | ||
33 | --- a/fsck.c | ||
34 | +++ b/fsck.c | ||
35 | @@ -46,7 +46,7 @@ | ||
36 | #include "mount.h" | ||
37 | #include "overlayfs.h" | ||
38 | |||
39 | -extern char *program_name; | ||
40 | +extern const char *program_name; | ||
41 | |||
42 | struct ovl_fs ofs = {}; | ||
43 | int flags = 0; /* user input option flags */ | ||
44 | diff --git a/main.c b/main.c | ||
45 | index ea0f5a5..1a8b239 100644 | ||
46 | --- a/main.c | ||
47 | +++ b/main.c | ||
48 | @@ -28,7 +28,7 @@ | ||
49 | bool verbose; | ||
50 | bool brief; | ||
51 | bool ignore; | ||
52 | -extern char *program_name; | ||
53 | +extern const char *program_name; | ||
54 | |||
55 | #ifndef __GLIBC__ | ||
56 | /* | ||
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb deleted file mode 100644 index 47613207a..000000000 --- a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | DESCRIPTION = "Maintenance tools for OverlayFS" | ||
2 | HOMEPAGE = "https://github.com/kmxz/overlayfs-tools" | ||
3 | LICENSE = "WTFPL" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69" | ||
5 | |||
6 | SRC_URI = "\ | ||
7 | git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \ | ||
8 | " | ||
9 | |||
10 | PV = "1.0+git" | ||
11 | SRCREV = "b5e5a829895ac98ccfe4629fbfbd8b819262bd00" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | B = "${S}" | ||
15 | |||
16 | # Required to have the fts.h header for musl | ||
17 | DEPENDS:append:libc-musl = " fts" | ||
18 | |||
19 | EXTRA_OEMAKE += "'CC=${CC} -O2'" | ||
20 | # Fix the missing fts libs when using musl | ||
21 | EXTRA_OEMAKE:append:libc-musl = " LDLIBS=-lfts" | ||
22 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
23 | |||
24 | do_install () { | ||
25 | install -d ${D}${bindir} | ||
26 | install -m 0755 ${B}/overlay ${D}${bindir} | ||
27 | install -m 0755 ${B}/fsck.overlay ${D}${bindir} | ||
28 | } | ||
diff --git a/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb new file mode 100644 index 000000000..d11ee0c47 --- /dev/null +++ b/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | DESCRIPTION = "Maintenance tools for OverlayFS" | ||
2 | HOMEPAGE = "https://github.com/kmxz/overlayfs-tools" | ||
3 | LICENSE = "WTFPL" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69" | ||
5 | |||
6 | SRC_URI = "\ | ||
7 | git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \ | ||
8 | file://0001-always-use-glibc-basename.patch \ | ||
9 | file://0002-Change-program_name-to-have-const-attribute.patch \ | ||
10 | " | ||
11 | |||
12 | SRCREV = "7a4a0c4f2c6c86aa46a40e3468e394fd4a237491" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit meson pkgconfig | ||
17 | |||
18 | DEPENDS:append:libc-musl = " fts" | ||
diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.12.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.2.0.bb index 9c0394918..c65344f53 100644 --- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.12.bb +++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.2.0.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ | |||
15 | file://0001-include-libgen.h-for-basename-API-prototype.patch \ | 15 | file://0001-include-libgen.h-for-basename-API-prototype.patch \ |
16 | ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \ | 16 | ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "f39c4c1b306b2dd7ec979c0e94d60fe69083d2ecf9af051cac5ef3bed772c74a" | 18 | SRC_URI[sha256sum] = "2914dbbe1ebc88c7d93ad88e220aa57dabc43d216e11f06221c01edf3cc10732" |
19 | 19 | ||
20 | inherit autotools-brokensep | 20 | inherit autotools-brokensep |
21 | 21 | ||
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 9e82b0f74..8d997ef64 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2024.03.03.bb | |||
@@ -65,3 +65,9 @@ do_install() { | |||
65 | } | 65 | } |
66 | 66 | ||
67 | FILES:${PN} += "${prefix}/xfstests" | 67 | FILES:${PN} += "${prefix}/xfstests" |
68 | |||
69 | # This one is reproducible only on 32bit MACHINEs | ||
70 | # http://errors.yoctoproject.org/Errors/Details/766963/ | ||
71 | # lstat64.c:65:14: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] | ||
72 | # bstat.c:18:19: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
73 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb index 59ae9383d..a16a02aa7 100644 --- a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb +++ b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb | |||
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
4 | 4 | ||
5 | GNOMEBASEBUILDCLASS = "meson" | 5 | GNOMEBASEBUILDCLASS = "meson" |
6 | 6 | ||
7 | inherit gnomebase gettext gsettings features_check useradd | 7 | inherit gnomebase gettext gsettings features_check |
8 | 8 | ||
9 | REQUIRED_DISTRO_FEATURES = "opengl polkit" | 9 | REQUIRED_DISTRO_FEATURES = "opengl polkit" |
10 | 10 | ||
@@ -36,15 +36,5 @@ PACKAGECONFIG[vnc] = "-Dvnc=true,-Dvnc=false,libvncserver" | |||
36 | PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp3 fuse3 libxkbcommon" | 36 | PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp3 fuse3 libxkbcommon" |
37 | PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" | 37 | PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" |
38 | 38 | ||
39 | USERADD_PACKAGES = "${PN}" | ||
40 | USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" | ||
41 | |||
42 | do_install:append() { | ||
43 | if [ -d ${D}${datadir}/polkit-1/rules.d ]; then | ||
44 | chmod 700 ${D}${datadir}/polkit-1/rules.d | ||
45 | chown polkitd:root ${D}${datadir}/polkit-1/rules.d | ||
46 | fi | ||
47 | } | ||
48 | |||
49 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" | 39 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" |
50 | FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir} ${datadir} ${libdir}/sysusers.d ${libdir}/tmpfiles.d" | 40 | FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir} ${datadir} ${libdir}/sysusers.d ${libdir}/tmpfiles.d" |
diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch new file mode 100644 index 000000000..8162e50d9 --- /dev/null +++ b/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 98243ca43e40116c22f7b867e32ad27ffd314505 Mon Sep 17 00:00:00 2001 | ||
2 | From: Markus Volk <f_l_k@t-online.de> | ||
3 | Date: Tue, 16 Jul 2024 07:30:09 +0200 | ||
4 | Subject: [PATCH] application-client.vala: hardcode some paths | ||
5 | |||
6 | Otherwise the build values will be stored in the binary and used if geary was not installed | ||
7 | https://gitlab.gnome.org/GNOME/geary/-/blob/main/src/client/application/application-client.vala?ref_type=heads#L798 | ||
8 | https://gitlab.gnome.org/GNOME/geary/-/blob/main/src/client/application/application-client.vala?ref_type=heads#L365 | ||
9 | |||
10 | This breaks reproducibility | ||
11 | WARNING: geary-46.0-r0 do_package_qa: QA Issue: File /usr/lib/geary/libgeary-client-46.0.so in package geary contains reference to TMPDIR [buildpaths] | ||
12 | WARNING: geary-46.0-r0 do_package_qa: QA Issue: File /usr/lib/geary/.debug/libgeary-client-46.0.so in package geary-dbg contains reference to TMPDIR [buildpaths] | ||
13 | |||
14 | Upstream-Status: Inappropriate [oe-specific] | ||
15 | |||
16 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
17 | --- | ||
18 | src/client/application/application-client.vala | 4 ++-- | ||
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala | ||
22 | index 51d0f632e..acc53a65f 100644 | ||
23 | --- a/src/client/application/application-client.vala | ||
24 | +++ b/src/client/application/application-client.vala | ||
25 | @@ -39,9 +39,9 @@ public class Application.Client : Gtk.Application { | ||
26 | |||
27 | public const string VERSION = _VERSION; | ||
28 | public const string INSTALL_PREFIX = _INSTALL_PREFIX; | ||
29 | - public const string GSETTINGS_DIR = _GSETTINGS_DIR; | ||
30 | - public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR; | ||
31 | - public const string BUILD_ROOT_DIR = _BUILD_ROOT_DIR; | ||
32 | + public const string GSETTINGS_DIR = "/usr/share/applications"; | ||
33 | + public const string SOURCE_ROOT_DIR = "/usr/src"; | ||
34 | + public const string BUILD_ROOT_DIR = "/usr/src"; | ||
35 | |||
36 | // keep these in sync with meson_options.txt | ||
37 | public const string PROFILE_RELEASE = "release"; | ||
38 | -- | ||
39 | 2.45.2 | ||
40 | |||
diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch deleted file mode 100644 index 1e0640a66..000000000 --- a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From a300be5877f35379bb569313eec901bda9c8d762 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 30 Apr 2023 22:08:39 -0700 | ||
4 | Subject: [PATCH] meson: Use PKG_CONFIG_SYSROOT_DIR when using pkg-config | ||
5 | |||
6 | OE cross-builds and absolute paths found by pkg-config points to | ||
7 | non-sysroot'ed locations which are not correct as they point into native | ||
8 | sysroot from build machine which is incorrect. | ||
9 | |||
10 | Upstream-Status: Inappropriate [OE-specific] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | meson.build | 8 +++++--- | ||
14 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/meson.build b/meson.build | ||
17 | index d563dd08..9b72aeb4 100644 | ||
18 | --- a/meson.build | ||
19 | +++ b/meson.build | ||
20 | @@ -38,6 +38,9 @@ metadata_dir = meson.project_source_root() / 'bindings'/ 'metadata' | ||
21 | po_dir = meson.project_source_root() / 'po' | ||
22 | vapi_dir = meson.project_source_root() / 'bindings' / 'vapi' | ||
23 | |||
24 | +# pkg-config sysroot location | ||
25 | +pkgconf_sysroot = run_command('python3', '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() | ||
26 | + | ||
27 | # Compiler configuration | ||
28 | add_project_arguments([ | ||
29 | # Make sure Meson can find custom VAPIs | ||
30 | @@ -120,7 +123,7 @@ icu_uc = declare_dependency( | ||
31 | if libunwind_dep.found() | ||
32 | # We need to add native lib to the search path for these so Flatpak | ||
33 | # builds can find it. | ||
34 | - unwind_lib = libunwind_dep.get_variable(pkgconfig: 'libdir') | ||
35 | + unwind_lib = pkgconf_sysroot + libunwind_dep.get_variable(pkgconfig: 'libdir') | ||
36 | libunwind = declare_dependency( | ||
37 | dependencies: [ | ||
38 | valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]), | ||
39 | @@ -207,8 +210,7 @@ vala_unit_proj = subproject( | ||
40 | vala_unit_dep = vala_unit_proj.get_variable('vala_unit_dep') | ||
41 | |||
42 | # Language detection | ||
43 | - | ||
44 | -iso_codes_dir = iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes' | ||
45 | +iso_codes_dir = pkgconf_sysroot + iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes' | ||
46 | |||
47 | iso_639_xml = get_option('iso_639_xml') | ||
48 | if iso_639_xml == '' | ||
49 | -- | ||
50 | 2.40.1 | ||
51 | |||
diff --git a/meta-gnome/recipes-connectivity/geary/geary_44.1.bb b/meta-gnome/recipes-connectivity/geary/geary_46.0.bb index decae6b2c..d8d48ef51 100644 --- a/meta-gnome/recipes-connectivity/geary/geary_44.1.bb +++ b/meta-gnome/recipes-connectivity/geary/geary_46.0.bb | |||
@@ -23,6 +23,7 @@ DEPENDS = " \ | |||
23 | libical \ | 23 | libical \ |
24 | libpeas \ | 24 | libpeas \ |
25 | libsecret \ | 25 | libsecret \ |
26 | libsoup \ | ||
26 | libstemmer \ | 27 | libstemmer \ |
27 | libxml2 \ | 28 | libxml2 \ |
28 | sqlite3 \ | 29 | sqlite3 \ |
@@ -31,15 +32,15 @@ DEPENDS = " \ | |||
31 | 32 | ||
32 | RDEPENDS:${PN} = "gnome-keyring" | 33 | RDEPENDS:${PN} = "gnome-keyring" |
33 | 34 | ||
34 | inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check | 35 | inherit meson pkgconfig mime-xdg gsettings gtk-icon-cache gobject-introspection vala features_check |
35 | 36 | ||
36 | SRC_URI = " \ | 37 | SRC_URI = " \ |
37 | git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ | 38 | git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ |
38 | file://0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch \ | 39 | file://0001-application-client.vala-hardcode-some-paths.patch \ |
39 | " | 40 | " |
40 | 41 | ||
41 | S = "${WORKDIR}/git" | 42 | S = "${WORKDIR}/git" |
42 | SRCREV = "37c378a563d5b1c269d57c34671edc940d1cd180" | 43 | SRCREV = "46e93c0c0dafc381e8a308b1befb07e908121722" |
43 | 44 | ||
44 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 45 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
45 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" | 46 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" |
@@ -52,10 +53,6 @@ PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" | |||
52 | PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" | 53 | PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" |
53 | 54 | ||
54 | PACKAGECONFIG ??= "" | 55 | PACKAGECONFIG ??= "" |
55 | # rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion] | ||
56 | #| return NULL; | ||
57 | #| ^~~~ | ||
58 | CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" | ||
59 | 56 | ||
60 | FILES:${PN} += "${datadir}" | 57 | FILES:${PN} += "${datadir}" |
61 | 58 | ||
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb index 833341f85..a17e03b10 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb | |||
@@ -73,3 +73,8 @@ do_compile:prepend() { | |||
73 | FILES:${PN} += "${datadir}/metainfo" | 73 | FILES:${PN} += "${datadir}/metainfo" |
74 | 74 | ||
75 | RDEPENDS:${PN} += "mypaint-brushes-1.0" | 75 | RDEPENDS:${PN} += "mypaint-brushes-1.0" |
76 | |||
77 | CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux" | ||
78 | CVE_STATUS[CVE-2009-0581] = "cpe-incorrect: The current version (2.10.38) is not affected." | ||
79 | CVE_STATUS[CVE-2009-0723] = "cpe-incorrect: The current version (2.10.38) is not affected." | ||
80 | CVE_STATUS[CVE-2009-0733] = "cpe-incorrect: The current version (2.10.38) is not affected." | ||
diff --git a/meta-gnome/recipes-gnome/eog/eog_45.3.bb b/meta-gnome/recipes-gnome/eog/eog_47.0.bb index 00fe26669..8e0583cf9 100644 --- a/meta-gnome/recipes-gnome/eog/eog_45.3.bb +++ b/meta-gnome/recipes-gnome/eog/eog_47.0.bb | |||
@@ -21,7 +21,7 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea | |||
21 | # FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used. | 21 | # FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used. |
22 | REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data" | 22 | REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data" |
23 | 23 | ||
24 | SRC_URI[archive.sha256sum] = "8650f662d4921d83a7904f6bb9ca245baf735f717b47fac5b37f0d90e5e891a8" | 24 | SRC_URI[archive.sha256sum] = "db5edbf5224d75126a7b7d8ee4e9272a2f30a953331d5baf6d3f3c0ce0cbde66" |
25 | 25 | ||
26 | GTKDOC_MESON_OPTION = "gtk_doc" | 26 | GTKDOC_MESON_OPTION = "gtk_doc" |
27 | 27 | ||
diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.3.bb index 8fd658310..83bc9c6ad 100644 --- a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb +++ b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.3.bb | |||
@@ -8,7 +8,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" | |||
8 | 8 | ||
9 | inherit gnomebase gobject-introspection gtk-doc python3native vala | 9 | inherit gnomebase gobject-introspection gtk-doc python3native vala |
10 | 10 | ||
11 | SRC_URI[archive.sha256sum] = "2a0c9cf48fbe8b3435008866ffd40b8eddb0667d2212b42396fdf688e93ce0be" | 11 | SRC_URI[archive.sha256sum] = "21e64d2c56e9b333d44fef3f2a4b25653d922c419acd972fa96fab695217e2c8" |
12 | 12 | ||
13 | EXTRA_OEMESON = " \ | 13 | EXTRA_OEMESON = " \ |
14 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} \ | 14 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} \ |
diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.4.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.5.bb index 8d602eee4..d7325888d 100644 --- a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.4.bb +++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.5.bb | |||
@@ -13,7 +13,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" | |||
13 | 13 | ||
14 | inherit gnomebase gobject-introspection gtk-doc vala | 14 | inherit gnomebase gobject-introspection gtk-doc vala |
15 | 15 | ||
16 | SRC_URI[archive.sha256sum] = "c0afbe333bcf3cb1441a1f574cc8ec7b1b8197779145d4edeee2896fdacfc3c2" | 16 | SRC_URI[archive.sha256sum] = "838c5306fc38bfaa2f23abe24262f4bf15771e3303fb5dcb74f5b9c7a615dabe" |
17 | 17 | ||
18 | do_compile:prepend() { | 18 | do_compile:prepend() { |
19 | export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" | 19 | export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" |
diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_47.0.bb index d938ae94c..8774750e9 100644 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_47.0.bb | |||
@@ -6,7 +6,7 @@ SECTION = "x11/gnome" | |||
6 | 6 | ||
7 | inherit gnomebase gettext allarch | 7 | inherit gnomebase gettext allarch |
8 | 8 | ||
9 | SRC_URI[archive.sha256sum] = "4ddd3ac439a4a067876805921bb75f4d3c8b85a218d47c276dddde8928443c2e" | 9 | SRC_URI[archive.sha256sum] = "874a4a39c4261736f6a854722833400b612441c4681aa5982d90b15abc9c91fd" |
10 | 10 | ||
11 | FILES:${PN} += " \ | 11 | FILES:${PN} += " \ |
12 | ${datadir}/backgrounds \ | 12 | ${datadir}/backgrounds \ |
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.1.bb index 1b29e52c7..980ff3678 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.1.bb | |||
@@ -25,7 +25,7 @@ inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection | |||
25 | 25 | ||
26 | REQUIRED_DISTRO_FEATURES = "x11 opengl" | 26 | REQUIRED_DISTRO_FEATURES = "x11 opengl" |
27 | 27 | ||
28 | SRC_URI[archive.sha256sum] = "13fe1e75f317acdbdf5e80c9029d2e0632d60a9ccf72a43ae36eb7545021fbef" | 28 | SRC_URI[archive.sha256sum] = "56c44a17034598e9607458afae1be75f3de5efdf0e62355f09ba58fc7bc312ac" |
29 | 29 | ||
30 | BT_PULSE_PACKS = " \ | 30 | BT_PULSE_PACKS = " \ |
31 | pulseaudio-lib-bluez5-util \ | 31 | pulseaudio-lib-bluez5-util \ |
diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_47.0.bb index bb53b58df..e3365f618 100644 --- a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_47.0.bb | |||
@@ -22,13 +22,13 @@ DEPENDS = " \ | |||
22 | 22 | ||
23 | RRECOMMENDS:${PN} = "gnuchess" | 23 | RRECOMMENDS:${PN} = "gnuchess" |
24 | 24 | ||
25 | SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=master" | 25 | SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=main" |
26 | 26 | ||
27 | inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check mime-xdg gsettings | 27 | inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check mime-xdg gsettings |
28 | 28 | ||
29 | GIR_MESON_OPTION = "" | 29 | GIR_MESON_OPTION = "" |
30 | 30 | ||
31 | S = "${WORKDIR}/git" | 31 | S = "${WORKDIR}/git" |
32 | SRCREV = "c3625ee59ab3acfd7566ef04300b15ddbadaaac3" | 32 | SRCREV = "91476257c2404945bfa30238c38391343bf4737b" |
33 | 33 | ||
34 | FILES:${PN} += "${datadir}" | 34 | FILES:${PN} += "${datadir}" |
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb index 152e803b5..ae96caf94 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb | |||
@@ -33,7 +33,7 @@ DEPENDS = " \ | |||
33 | upower \ | 33 | upower \ |
34 | " | 34 | " |
35 | 35 | ||
36 | inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check useradd | 36 | inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check |
37 | 37 | ||
38 | REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" | 38 | REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" |
39 | 39 | ||
@@ -52,16 +52,6 @@ EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" | |||
52 | 52 | ||
53 | export XDG_DATA_DIRS = "${STAGING_DATADIR}" | 53 | export XDG_DATA_DIRS = "${STAGING_DATADIR}" |
54 | 54 | ||
55 | USERADD_PACKAGES = "${PN}" | ||
56 | USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" | ||
57 | |||
58 | do_install:append() { | ||
59 | if [ -d ${D}${datadir}/polkit-1/rules.d ]; then | ||
60 | chmod 700 ${D}${datadir}/polkit-1/rules.d | ||
61 | chown polkitd:root ${D}${datadir}/polkit-1/rules.d | ||
62 | fi | ||
63 | } | ||
64 | |||
65 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" | 55 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" |
66 | 56 | ||
67 | FILES:${PN} += " \ | 57 | FILES:${PN} += " \ |
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.1.bb index 19bae74ce..63847fe3e 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.1.bb | |||
@@ -15,7 +15,7 @@ GIR_MESON_OPTION = "" | |||
15 | 15 | ||
16 | SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ | 16 | SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ |
17 | file://0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch" | 17 | file://0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch" |
18 | SRC_URI[archive.sha256sum] = "42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42" | 18 | SRC_URI[archive.sha256sum] = "ae7ca55dc9e08914999741523a17d29ce223915626bd2462a120bf96f47a79ab" |
19 | 19 | ||
20 | DEPENDS += " \ | 20 | DEPENDS += " \ |
21 | fontconfig \ | 21 | fontconfig \ |
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.1.bb index e4998f627..6f910c4c1 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.1.bb | |||
@@ -29,7 +29,7 @@ PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" | |||
29 | PACKAGECONFIG[x11] = ",,libcanberra" | 29 | PACKAGECONFIG[x11] = ",,libcanberra" |
30 | 30 | ||
31 | SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-gnome-disk-utility-remove-libcanberra-dependency.patch', '', d)}" | 31 | SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-gnome-disk-utility-remove-libcanberra-dependency.patch', '', d)}" |
32 | SRC_URI[archive.sha256sum] = "464649148c6d6771f1ac2ebfe43a4e519205b11c2d914a09f2a001821d06957d" | 32 | SRC_URI[archive.sha256sum] = "c24e9439a04d70bcfae349ca134c7005435fe2b6f452114df878bff0b89bbffe" |
33 | 33 | ||
34 | EXTRA_OEMESON = "-Dman=false" | 34 | EXTRA_OEMESON = "-Dman=false" |
35 | 35 | ||
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 deleted file mode 100644 index be4c002fc..000000000 --- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From ac4a07e7ef3d9d046a4ca2a803c5b649b6f7ddf4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matt Turner <mattst88@gmail.com> | ||
3 | Date: Sat, 8 Jul 2023 00:01:07 -0400 | ||
4 | Subject: [PATCH] window: Fix function callback definition | ||
5 | |||
6 | Without this, the build fails with clang with | ||
7 | CFLAGS=-Werror=incompatible-function-pointer-types | ||
8 | |||
9 | ``` | ||
10 | ../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] | ||
11 | gtk_widget_class_install_action (widget_class, "win.toggle-search", NULL, action_toggle_search_cb); | ||
12 | ^~~~~~~~~~~~~~~~~~~~~~~ | ||
13 | /usr/include/gtk-4.0/gtk/gtkwidget.h:956:87: note: passing argument to parameter 'activate' here | ||
14 | GtkWidgetActionActivateFunc activate); | ||
15 | ^ | ||
16 | ``` | ||
17 | |||
18 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54] | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | --- | ||
21 | src/font-view-window.c | 5 ++++- | ||
22 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/src/font-view-window.c b/src/font-view-window.c | ||
25 | index 639ac33..24461f7 100644 | ||
26 | --- a/src/font-view-window.c | ||
27 | +++ b/src/font-view-window.c | ||
28 | @@ -758,8 +758,11 @@ font_view_window_show_overview (FontViewWindow *self) | ||
29 | } | ||
30 | |||
31 | static void | ||
32 | -action_toggle_search_cb (FontViewWindow *self) | ||
33 | +action_toggle_search_cb (GtkWidget *widget, | ||
34 | + const char *action_name, | ||
35 | + GVariant *parameter) | ||
36 | { | ||
37 | + FontViewWindow *self = FONT_VIEW_WINDOW (widget); | ||
38 | |||
39 | gtk_toggle_button_set_active (self->search_button, | ||
40 | !gtk_toggle_button_get_active (self->search_button)); | ||
41 | -- | ||
42 | 2.45.1 | ||
43 | |||
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_47.0.bb index ccf8262dc..4763d1717 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_47.0.bb | |||
@@ -15,8 +15,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg | |||
15 | 15 | ||
16 | REQUIRED_DISTRO_FEATURES = "x11 opengl" | 16 | REQUIRED_DISTRO_FEATURES = "x11 opengl" |
17 | 17 | ||
18 | SRC_URI += "file://0001-window-Fix-function-callback-definition.patch" | 18 | SRC_URI[archive.sha256sum] = "b8e5a042e0b241b0c7cae43f74da0d5f88e6423017a91feb86e7617edb4080ed" |
19 | SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c" | ||
20 | 19 | ||
21 | FILES:${PN} += " \ | 20 | FILES:${PN} += " \ |
22 | ${datadir}/dbus-1 \ | 21 | ${datadir}/dbus-1 \ |
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.2.bb index 8df3710e6..e17319908 100644 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb +++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.2.bb | |||
@@ -22,7 +22,7 @@ inherit gnomebase gsettings features_check gettext | |||
22 | 22 | ||
23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
24 | 24 | ||
25 | SRC_URI[archive.sha256sum] = "b1d3ae9132ff2f8b3f25a190790892968e3d0acf952a487e40f644a8550ce3f6" | 25 | SRC_URI[archive.sha256sum] = "bf26c966b8a8b7f3285ecc8bb3e467b9c20f9535b94dc451c9c559ddcff61925" |
26 | SRC_URI += " \ | 26 | SRC_URI += " \ |
27 | file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \ | 27 | file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \ |
28 | file://musl.patch \ | 28 | file://musl.patch \ |
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb index 0a52de7a3..e166db0a6 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb | |||
@@ -13,6 +13,7 @@ DEPENDS = " \ | |||
13 | gjs \ | 13 | gjs \ |
14 | gnome-autoar \ | 14 | gnome-autoar \ |
15 | gnome-desktop \ | 15 | gnome-desktop \ |
16 | gnome-control-center \ | ||
16 | polkit \ | 17 | polkit \ |
17 | pipewire \ | 18 | pipewire \ |
18 | libsoup-3.0 \ | 19 | libsoup-3.0 \ |
diff --git a/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb index 14e1ca9fe..b6ac75dd8 100644 --- a/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb +++ b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb | |||
@@ -26,5 +26,14 @@ PACKAGECONFIG[test-ui] = "-Denable-test-ui=true, -Denable-test-ui=false, gtk+3 l | |||
26 | EXTRA_OEMESON = "-Denable-grl-pls=false" | 26 | EXTRA_OEMESON = "-Denable-grl-pls=false" |
27 | 27 | ||
28 | do_compile:append() { | 28 | do_compile:append() { |
29 | sed -i -e 's,${B}/../,,' ${B}/src/grl-type-builtins.h | 29 | # grl-type-builtins.* are generated by glib-mkenums which leave full paths |
30 | # in comment and #include directives. Rewrite those before *-src packaging. | ||
31 | |||
32 | # Path can be relative to B or WORKDIR in devtool modify | ||
33 | for base in ${B} ${WORKDIR} ; do | ||
34 | relpath="$(realpath --relative-to="$base" "${S}")" | ||
35 | sed -i -e "s,$base/$relpath/src/,," \ | ||
36 | ${B}/src/grl-type-builtins.h \ | ||
37 | ${B}/src/grl-type-builtins.c | ||
38 | done | ||
30 | } | 39 | } |
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb index 01cdb4eef..6549b1900 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb | |||
@@ -2,7 +2,7 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem" | |||
2 | LICENSE = "LGPL-2.0-only" | 2 | LICENSE = "LGPL-2.0-only" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" |
4 | 4 | ||
5 | inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd | 5 | inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check |
6 | 6 | ||
7 | DEPENDS += "\ | 7 | DEPENDS += "\ |
8 | dbus \ | 8 | dbus \ |
@@ -77,16 +77,7 @@ PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse3" | |||
77 | # libcdio-paranoia recipe doesn't exist yet | 77 | # libcdio-paranoia recipe doesn't exist yet |
78 | PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" | 78 | PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" |
79 | 79 | ||
80 | USERADD_PACKAGES = "${PN}" | ||
81 | USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" | ||
82 | |||
83 | do_install:append() { | 80 | do_install:append() { |
84 | if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then | ||
85 | # Fix up permissions on polkit rules.d to work with rpm4 constraints | ||
86 | chmod 700 ${D}${datadir}/polkit-1/rules.d | ||
87 | chown polkitd:root ${D}${datadir}/polkit-1/rules.d | ||
88 | fi | ||
89 | |||
90 | # After rebuilds (not from scracth) it can happen that the executables in | 81 | # After rebuilds (not from scracth) it can happen that the executables in |
91 | # libexec ar missing executable permission flag. Not sure but it came up | 82 | # libexec ar missing executable permission flag. Not sure but it came up |
92 | # during transition to meson. Looked into build files and logs but could | 83 | # during transition to meson. Looked into build files and logs but could |
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch b/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch new file mode 100644 index 000000000..08ff51205 --- /dev/null +++ b/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch | |||
@@ -0,0 +1,105 @@ | |||
1 | From 4a84e9857d83f684bf53d616942a393ce558a328 Mon Sep 17 00:00:00 2001 | ||
2 | From: Morten Welinder <terra@gnome.org> | ||
3 | Date: Wed, 3 Jul 2024 19:18:15 -0400 | ||
4 | Subject: [PATCH] Compilation: attempt fixes for libxml 2.13 | ||
5 | |||
6 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libgsf/-/commit/5d4bb55095d3d6ef793c1908a88504183e28644c] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | configure.ac | 1 + | ||
10 | gsf/gsf-input-http.c | 19 +++++++++++++++++++ | ||
11 | 2 files changed, 20 insertions(+) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index fceb776..7c2f946 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -238,6 +238,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gstdio.h>]], [[(void)g_chown("/ | ||
18 | AC_MSG_RESULT(yes)], | ||
19 | [AC_MSG_RESULT(no)]) | ||
20 | AC_CHECK_FUNCS(g_date_time_new_from_iso8601 g_date_time_format_iso8601) | ||
21 | +AC_CHECK_FUNCS(xmlNanoHTTPOpen xmlNanoHTTPClose) | ||
22 | CFLAGS=$SAVE_CFLAGS | ||
23 | LIBS=$SAVE_LIBS | ||
24 | |||
25 | diff --git a/gsf/gsf-input-http.c b/gsf/gsf-input-http.c | ||
26 | index bdde3c8..03f4045 100644 | ||
27 | --- a/gsf/gsf-input-http.c | ||
28 | +++ b/gsf/gsf-input-http.c | ||
29 | @@ -23,7 +23,10 @@ | ||
30 | #include <gsf/gsf-input-http.h> | ||
31 | #include <gsf/gsf.h> | ||
32 | |||
33 | +#ifdef HAVE_XMLNANOHTTPOPEN | ||
34 | +// It's going away, so make it conditional | ||
35 | #include <libxml/nanohttp.h> | ||
36 | +#endif | ||
37 | |||
38 | struct _GsfInputHTTP { | ||
39 | GsfInput input; | ||
40 | @@ -74,7 +77,9 @@ gsf_input_http_finalize (GObject *obj_input) | ||
41 | input->content_type = NULL; | ||
42 | |||
43 | if (input->ctx) { | ||
44 | +#ifdef HAVE_XMLNANOHTTPCLOSE | ||
45 | xmlNanoHTTPClose ((gpointer) input->ctx); | ||
46 | +#endif | ||
47 | input->ctx = NULL; | ||
48 | } | ||
49 | |||
50 | @@ -215,6 +220,7 @@ gsf_input_http_get_content_type (GsfInputHTTP *input) | ||
51 | return content_type; | ||
52 | } | ||
53 | |||
54 | +#ifdef HAVE_XMLNANOHTTPOPEN | ||
55 | static GsfInput * | ||
56 | make_local_copy (gpointer *ctx) | ||
57 | { | ||
58 | @@ -254,6 +260,7 @@ make_local_copy (gpointer *ctx) | ||
59 | |||
60 | return copy; | ||
61 | } | ||
62 | +#endif | ||
63 | |||
64 | /** | ||
65 | * gsf_input_http_new: | ||
66 | @@ -265,6 +272,7 @@ make_local_copy (gpointer *ctx) | ||
67 | GsfInput * | ||
68 | gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED) | ||
69 | { | ||
70 | +#ifdef HAVE_XMLNANOHTTPOPEN | ||
71 | GObject *obj; | ||
72 | GsfInput *input; | ||
73 | gpointer ctx; | ||
74 | @@ -293,6 +301,10 @@ gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED) | ||
75 | GSF_INPUT_HTTP (obj)->ctx = ctx; | ||
76 | |||
77 | return GSF_INPUT (obj); | ||
78 | +#else | ||
79 | + g_return_val_if_fail(url != NULL, NULL); | ||
80 | + return NULL; | ||
81 | +#endif | ||
82 | } | ||
83 | |||
84 | static GsfInput * | ||
85 | @@ -304,6 +316,7 @@ gsf_input_http_dup (GsfInput *src, GError **err) | ||
86 | static guint8 const * | ||
87 | gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer) | ||
88 | { | ||
89 | +#ifdef HAVE_XMLNANOHTTPOPEN | ||
90 | int nread; | ||
91 | size_t total_read; | ||
92 | gpointer ctx = GSF_INPUT_HTTP (input)->ctx; | ||
93 | @@ -324,6 +337,12 @@ gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer) | ||
94 | return NULL; | ||
95 | } | ||
96 | return buffer; | ||
97 | +#else | ||
98 | + (void)input; | ||
99 | + (void)num_bytes; | ||
100 | + (void)buffer; | ||
101 | + return NULL; | ||
102 | +#endif | ||
103 | } | ||
104 | |||
105 | static gboolean | ||
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb index 7e1842b1a..97cbbe450 100644 --- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb +++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb | |||
@@ -10,7 +10,8 @@ GNOMEBASEBUILDCLASS = "autotools" | |||
10 | inherit gnomebase gobject-introspection gettext gtk-doc | 10 | inherit gnomebase gobject-introspection gettext gtk-doc |
11 | 11 | ||
12 | SRC_URI[archive.sha256sum] = "9181c914b9fac0e05d6bcaa34c7b552fe5fc0961d3c9f8c01ccc381fb084bcf0" | 12 | SRC_URI[archive.sha256sum] = "9181c914b9fac0e05d6bcaa34c7b552fe5fc0961d3c9f8c01ccc381fb084bcf0" |
13 | SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" | 13 | SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch \ |
14 | file://0001-Compilation-attempt-fixes-for-libxml-2.13.patch" | ||
14 | 15 | ||
15 | PACKAGECONFIG ??= "" | 16 | PACKAGECONFIG ??= "" |
16 | PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" | 17 | PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" |
diff --git a/meta-gnome/recipes-gnome/libspelling/libspelling_0.2.1.bb b/meta-gnome/recipes-gnome/libspelling/libspelling_0.2.1.bb new file mode 100644 index 000000000..f5f8a3321 --- /dev/null +++ b/meta-gnome/recipes-gnome/libspelling/libspelling_0.2.1.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | SUMMARY = "A spellcheck library for GTK 4" | ||
2 | HOMEPAGE = "https://gitlab.gnome.org/GNOME/libspelling" | ||
3 | LICENSE = "LGPL-2.1-or-later" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
5 | |||
6 | DEPENDS = "enchant2 gtk4 gtksourceview5 icu" | ||
7 | |||
8 | inherit gnomebase pkgconfig gettext gi-docgen vala gobject-introspection | ||
9 | |||
10 | GIR_MESON_OPTION = '' | ||
11 | GIDOCGEN_MESON_OPTION = 'docs' | ||
12 | |||
13 | SRC_URI[archive.sha256sum] = "7a787b467bd493f6baffb44138dbc4bef78aaab60efb76a7db88b243bf0f6343" | ||
diff --git a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb b/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.3.bb index a4b434950..f3f66c3dc 100644 --- a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb +++ b/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.3.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" | |||
5 | inherit gnomebase gobject-introspection gi-docgen features_check | 5 | inherit gnomebase gobject-introspection gi-docgen features_check |
6 | REQUIRED_DISTRO_FEATURES = "opengl" | 6 | REQUIRED_DISTRO_FEATURES = "opengl" |
7 | 7 | ||
8 | SRC_URI[archive.sha256sum] = "12cc954f750bb137ace8500fe9355d26e6e00ef6ccaab2950e9d360e92758335" | 8 | SRC_URI[archive.sha256sum] = "ed42e800cb7f0a07477cd9e3e744cdc1a240a6ad7ab96b8a875806267a9fddb0" |
9 | 9 | ||
10 | GTKDOC_MESON_OPTION = "gtk_doc" | 10 | GTKDOC_MESON_OPTION = "gtk_doc" |
11 | 11 | ||
diff --git a/meta-gnome/recipes-gnome/mutter/mutter_46.2.bb b/meta-gnome/recipes-gnome/mutter/mutter_46.4.bb index 6a121b09c..c91744cf6 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_46.2.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_46.4.bb | |||
@@ -24,7 +24,7 @@ DEPENDS = " \ | |||
24 | 24 | ||
25 | inherit gnomebase gsettings gobject-introspection gettext features_check | 25 | inherit gnomebase gsettings gobject-introspection gettext features_check |
26 | 26 | ||
27 | SRC_URI[archive.sha256sum] = "009baa77f8362612caa2e18c338a1b3c8aad3b5fe2964c2fef7824d321228983" | 27 | SRC_URI[archive.sha256sum] = "611bd9cf982adb56597ce2b34224272fda619bb3bb912a684d75c6f2c37502e4" |
28 | 28 | ||
29 | # x11 is still manadatory - see meson.build | 29 | # x11 is still manadatory - see meson.build |
30 | REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" | 30 | REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" |
diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-libsysprof-Check-for-unw_set_caching_policy-before-u.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-libsysprof-Check-for-unw_set_caching_policy-before-u.patch new file mode 100644 index 000000000..2dca95dac --- /dev/null +++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-libsysprof-Check-for-unw_set_caching_policy-before-u.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From a3316e607db2a64e030df8551455c5700b5ddfcf Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 25 Jul 2024 20:18:17 -0700 | ||
4 | Subject: [PATCH] libsysprof: Check for unw_set_caching_policy before using | ||
5 | |||
6 | llvm libunwind does not implement unw_cache_* functions yet | ||
7 | |||
8 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/-/merge_requests/95] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | src/libsysprof/preload/backtrace-helper.h | 2 ++ | ||
12 | 1 file changed, 2 insertions(+) | ||
13 | |||
14 | diff --git a/src/libsysprof/preload/backtrace-helper.h b/src/libsysprof/preload/backtrace-helper.h | ||
15 | index 88dc194..5c23ad3 100644 | ||
16 | --- a/src/libsysprof/preload/backtrace-helper.h | ||
17 | +++ b/src/libsysprof/preload/backtrace-helper.h | ||
18 | @@ -32,7 +32,9 @@ static void | ||
19 | backtrace_init (void) | ||
20 | { | ||
21 | #ifdef ENABLE_LIBUNWIND | ||
22 | +# ifdef UNW_CACHE_PER_THREAD | ||
23 | unw_set_caching_policy (unw_local_addr_space, UNW_CACHE_PER_THREAD); | ||
24 | +# endif | ||
25 | # ifdef HAVE_UNW_SET_CACHE_SIZE | ||
26 | unw_set_cache_size (unw_local_addr_space, 1024, 0); | ||
27 | #endif | ||
diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch index dc702a0e3..ea9bdb2eb 100644 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch +++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch | |||
@@ -6,22 +6,22 @@ Subject: [PATCH] meson: Check for libunwind instead of libunwind-generic | |||
6 | This helps it to use llvm unwinder since libunwind-generic is specific | 6 | This helps it to use llvm unwinder since libunwind-generic is specific |
7 | to nongnu libunwind. | 7 | to nongnu libunwind. |
8 | 8 | ||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/-/merge_requests/95] |
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | --- | 11 | --- |
12 | meson.build | 2 +- | 12 | meson.build | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/meson.build b/meson.build | 15 | diff --git a/meson.build b/meson.build |
16 | index 2835782..0fdb39a 100644 | 16 | index 3d3d8b5..4a1963d 100644 |
17 | --- a/meson.build | 17 | --- a/meson.build |
18 | +++ b/meson.build | 18 | +++ b/meson.build |
19 | @@ -81,7 +81,7 @@ config_h.set10('HAVE_POLKIT_AGENT', polkit_agent_dep.found()) | 19 | @@ -96,7 +96,7 @@ config_h.set10('HAVE_POLKIT', polkit_dep.found()) |
20 | config_h.set10('HAVE_POLKIT', polkit_dep.found()) | ||
21 | |||
22 | if get_option('libunwind') | 20 | if get_option('libunwind') |
23 | - libunwind_dep = dependency('libunwind-generic') | 21 | # Force libunwind usage if it's specified to avoid back compiles |
24 | + libunwind_dep = dependency('libunwind') | 22 | # and backtrace() showing up in builds |
23 | - libunwind_dep = dependency('libunwind-generic', required: true) | ||
24 | + libunwind_dep = dependency('libunwind', required: true) | ||
25 | config_h.set('ENABLE_LIBUNWIND', libunwind_dep.found()) | 25 | config_h.set('ENABLE_LIBUNWIND', libunwind_dep.found()) |
26 | config_h.set('HAVE_UNW_SET_CACHE_SIZE', libunwind_dep.found() and cc.has_header_symbol('libunwind.h', 'unw_set_cache_size', dependencies: [libunwind_dep])) | 26 | config_h.set('HAVE_UNW_SET_CACHE_SIZE', libunwind_dep.found() and cc.has_header_symbol('libunwind.h', 'unw_set_cache_size', dependencies: [libunwind_dep])) |
27 | endif | 27 | endif |
diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch new file mode 100644 index 000000000..998c20c65 --- /dev/null +++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 9ad120283f4b61b97da67f18a95bb3b4f1e8a3b9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Carlos Alberto Lopez Perez <clopez@igalia.com> | ||
3 | Date: Wed, 24 Jul 2024 15:51:05 +0100 | ||
4 | Subject: [PATCH] meson: Do not invoke the commands to update the icon caches | ||
5 | when cross-building | ||
6 | |||
7 | This does not have any useful efect when cross-building and it requires | ||
8 | the cross-builder environment to have gtk4-native built in order to invoke | ||
9 | gtk-update-icon-cache program. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com> | ||
13 | --- | ||
14 | meson.build | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/meson.build b/meson.build | ||
18 | index 3d3d8b5..da622f1 100644 | ||
19 | --- a/meson.build | ||
20 | +++ b/meson.build | ||
21 | @@ -250,7 +250,7 @@ configure_file( | ||
22 | configuration: config_h | ||
23 | ) | ||
24 | |||
25 | -if get_option('gtk') and gnome.found() | ||
26 | +if get_option('gtk') and gnome.found() and not meson.is_cross_build() | ||
27 | gnome.post_install( | ||
28 | gtk_update_icon_cache: true, | ||
29 | update_desktop_database: true | ||
30 | -- | ||
31 | 2.39.2 | ||
32 | |||
diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb b/meta-gnome/recipes-gnome/sysprof/sysprof_3.48.0.bb index 3523bad3e..fccca1d8f 100644 --- a/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb +++ b/meta-gnome/recipes-gnome/sysprof/sysprof_3.48.0.bb | |||
@@ -14,19 +14,26 @@ DEPENDS += " \ | |||
14 | json-glib \ | 14 | json-glib \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch" | 17 | SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch \ |
18 | SRC_URI[archive.sha256sum] = "ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b" | 18 | file://0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch \ |
19 | file://0001-libsysprof-Check-for-unw_set_caching_policy-before-u.patch \ | ||
20 | " | ||
21 | SRC_URI[archive.sha256sum] = "07d9081a66cf2fb52753f48ff2b85ada75c60ff1bc1af1bd14d8aeb627972168" | ||
19 | 22 | ||
20 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd libsysprof', '', d)} \ | 23 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd', '', d)} \ |
21 | ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \ | 24 | ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \ |
22 | libunwind" | 25 | agent \ |
26 | libsysprof \ | ||
27 | libunwind \ | ||
28 | " | ||
23 | # nongnu libunwind needs porting to RV32 | 29 | # nongnu libunwind needs porting to RV32 |
24 | PACKAGECONFIG:remove:riscv32 = "libunwind" | 30 | PACKAGECONFIG:remove:riscv32 = "libunwind" |
25 | 31 | ||
26 | PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" | 32 | PACKAGECONFIG[gtk] = "-Dgtk=true,-Dgtk=false,gtk4 libadwaita" |
27 | PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" | 33 | PACKAGECONFIG[sysprofd] = "-Dsysprofd=bundled,-Dsysprofd=none,polkit" |
28 | PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" | 34 | PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,json-glib" |
29 | PACKAGECONFIG[libunwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" | 35 | PACKAGECONFIG[libunwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" |
36 | PACKAGECONFIG[agent] = "-Dagent=true,-Dagent=false," | ||
30 | 37 | ||
31 | EXTRA_OEMESON += "-Dsystemdunitdir=${systemd_unitdir}/system" | 38 | EXTRA_OEMESON += "-Dsystemdunitdir=${systemd_unitdir}/system" |
32 | 39 | ||
diff --git a/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb b/meta-gnome/recipes-gnome/tecla/tecla_47.0.bb index 62b3aa3e3..e430b167d 100644 --- a/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb +++ b/meta-gnome/recipes-gnome/tecla/tecla_47.0.bb | |||
@@ -13,4 +13,4 @@ REQUIRED_DISTRO_FEATURES = "wayland" | |||
13 | 13 | ||
14 | inherit gnomebase pkgconfig features_check | 14 | inherit gnomebase pkgconfig features_check |
15 | 15 | ||
16 | SRC_URI[archive.sha256sum] = "4a081eab867a5a8b09758991cad7645920f323aabca954408290fb6f44591b0f" | 16 | SRC_URI[archive.sha256sum] = "0790b99ec29137a54b546c510661a99aa6f039c8d75f10c08e928682c0804fe5" |
diff --git a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb index 1b3ded021..14986f265 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb | |||
@@ -39,3 +39,5 @@ FILES:${PN} += " \ | |||
39 | " | 39 | " |
40 | 40 | ||
41 | RDEPENDS:${PN} += "yelp-xsl" | 41 | RDEPENDS:${PN} += "yelp-xsl" |
42 | |||
43 | CVE_STATUS[CVE-2008-3533] = "cpe-incorrect: The current version (42.2) is not affected. Fixed in 2.24." | ||
diff --git a/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_4.0.2.bb index 88b4b5c86..801eaae8e 100644 --- a/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb +++ b/meta-gnome/recipes-gnome/zenity/zenity_4.0.2.bb | |||
@@ -18,7 +18,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | |||
18 | REQUIRED_DISTRO_FEATURES = "opengl" | 18 | REQUIRED_DISTRO_FEATURES = "opengl" |
19 | GTKIC_VERSION = "4" | 19 | GTKIC_VERSION = "4" |
20 | 20 | ||
21 | SRC_URI[archive.sha256sum] = "0c2f537813b10f728470d9d05d6c95713db2512f9c95096e1e85b1a6739605e6" | 21 | SRC_URI[archive.sha256sum] = "c16dcae46e29e22c2fa0b95e80e06c96b2aec93840161369c95c85ed9f093153" |
22 | 22 | ||
23 | PACKAGECONFIG ?= "webkitgtk" | 23 | PACKAGECONFIG ?= "webkitgtk" |
24 | PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk" | 24 | PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk" |
diff --git a/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.1.bb index 0e86d781c..1c6d34e46 100644 --- a/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb +++ b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.1.bb | |||
@@ -10,7 +10,7 @@ DEPENDS = " \ | |||
10 | " | 10 | " |
11 | 11 | ||
12 | SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" | 12 | SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" |
13 | SRC_URI[sha256sum] = "b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0" | 13 | SRC_URI[sha256sum] = "c176b889b75630a17f4e3d7ef24c09a3e12368e633496087459c8b53ac3a122d" |
14 | 14 | ||
15 | PACKAGECONFIG ??= "gtk3 gtk4" | 15 | PACKAGECONFIG ??= "gtk3 gtk4" |
16 | PACKAGECONFIG[gtk3] = "-Dgtk3=true, -Dgtk3=false, gtk+3" | 16 | PACKAGECONFIG[gtk3] = "-Dgtk3=true, -Dgtk3=false, gtk+3" |
diff --git a/meta-initramfs/classes/klibc.bbclass b/meta-initramfs/classes/klibc.bbclass index 202d132d9..ca50a3d43 100644 --- a/meta-initramfs/classes/klibc.bbclass +++ b/meta-initramfs/classes/klibc.bbclass | |||
@@ -9,7 +9,7 @@ CC:append:armv7ve = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE | |||
9 | CC:append:armv7a = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}" | 9 | CC:append:armv7a = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}" |
10 | 10 | ||
11 | # klcc uses own optimizations by default. See klcc(1) man file. | 11 | # klcc uses own optimizations by default. See klcc(1) man file. |
12 | export CFLAGS="${TUNE_CCARGS}" | 12 | export CFLAGS="${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}" |
13 | export CPPFLAGS="${TUNE_CCARGS}" | 13 | export CPPFLAGS="${TUNE_CCARGS}" |
14 | export LDFLAGS="${TUNE_CCARGS}" | 14 | export LDFLAGS="${TUNE_CCARGS}" |
15 | 15 | ||
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_102.bb b/meta-initramfs/recipes-devtools/dracut/dracut_103.bb index 39ff265a3..3ee348dbf 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_102.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_103.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
7 | 7 | ||
8 | PE = "1" | 8 | PE = "1" |
9 | 9 | ||
10 | SRCREV = "1a8ee6e00bbe017717a5ef9e9bcfefb3b88f629e" | 10 | SRCREV = "3fce598fb45aa5618cdf885eb48cf327104ffcb8" |
11 | SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \ | 11 | SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \ |
12 | file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ | 12 | file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ |
13 | " | 13 | " |
diff --git a/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb b/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.0.bb index e79bd77a5..8a506af44 100644 --- a/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb +++ b/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.0.bb | |||
@@ -20,7 +20,7 @@ inherit gnomebase features_check vala gobject-introspection gettext systemd | |||
20 | # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured | 20 | # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured |
21 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" | 21 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" |
22 | 22 | ||
23 | SRC_URI[archive.sha256sum] = "1133602d2e6710aade6b22aa98d93384c8d56396f344763413e96e0110b7d89f" | 23 | SRC_URI[archive.sha256sum] = "5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72" |
24 | 24 | ||
25 | GIR_MESON_ENABLE_FLAG = 'enabled' | 25 | GIR_MESON_ENABLE_FLAG = 'enabled' |
26 | GIR_MESON_DISABLE_FLAG = 'disabled' | 26 | GIR_MESON_DISABLE_FLAG = 'disabled' |
diff --git a/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch b/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch new file mode 100644 index 000000000..fbd145e6b --- /dev/null +++ b/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch | |||
@@ -0,0 +1,88 @@ | |||
1 | From 070ed35ac5cef8138ed4760582bb72e8d3e136e2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com> | ||
3 | Date: Sun, 25 Aug 2024 08:42:39 +0200 | ||
4 | Subject: [PATCH] Fix compilation on strict POSIX platforms | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | Upstream-Status: Submitted [https://github.com/arkq/bluez-alsa/commit/070ed35ac5cef8138ed4760582bb72e8d3e136e2] | ||
8 | --- | ||
9 | src/main.c | 2 +- | ||
10 | test/mock/mock.c | 2 +- | ||
11 | utils/aplay/aplay.c | 1 + | ||
12 | utils/cli/cli.c | 1 + | ||
13 | utils/rfcomm/rfcomm.c | 1 + | ||
14 | 5 files changed, 5 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/src/main.c b/src/main.c | ||
17 | index 96a66aee..eeb80165 100644 | ||
18 | --- a/src/main.c | ||
19 | +++ b/src/main.c | ||
20 | @@ -13,13 +13,13 @@ | ||
21 | #endif | ||
22 | |||
23 | #include <getopt.h> | ||
24 | +#include <libgen.h> | ||
25 | #include <sched.h> | ||
26 | #include <signal.h> | ||
27 | #include <stdbool.h> | ||
28 | #include <stdint.h> | ||
29 | #include <stdio.h> | ||
30 | #include <stdlib.h> | ||
31 | -#include <string.h> | ||
32 | #include <strings.h> | ||
33 | #include <syslog.h> | ||
34 | #include <time.h> | ||
35 | diff --git a/test/mock/mock.c b/test/mock/mock.c | ||
36 | index 947211a3..0a2f6091 100644 | ||
37 | --- a/test/mock/mock.c | ||
38 | +++ b/test/mock/mock.c | ||
39 | @@ -20,12 +20,12 @@ | ||
40 | #include <assert.h> | ||
41 | #include <errno.h> | ||
42 | #include <getopt.h> | ||
43 | +#include <libgen.h> | ||
44 | #include <signal.h> | ||
45 | #include <stdbool.h> | ||
46 | #include <stdint.h> | ||
47 | #include <stdio.h> | ||
48 | #include <stdlib.h> | ||
49 | -#include <string.h> | ||
50 | #include <strings.h> | ||
51 | #include <sys/stat.h> | ||
52 | #include <unistd.h> | ||
53 | diff --git a/utils/aplay/aplay.c b/utils/aplay/aplay.c | ||
54 | index 3de77902..36843e95 100644 | ||
55 | --- a/utils/aplay/aplay.c | ||
56 | +++ b/utils/aplay/aplay.c | ||
57 | @@ -15,6 +15,7 @@ | ||
58 | #include <assert.h> | ||
59 | #include <errno.h> | ||
60 | #include <getopt.h> | ||
61 | +#include <libgen.h> | ||
62 | #include <math.h> | ||
63 | #include <poll.h> | ||
64 | #include <pthread.h> | ||
65 | diff --git a/utils/cli/cli.c b/utils/cli/cli.c | ||
66 | index aeeabe58..0338b9e2 100644 | ||
67 | --- a/utils/cli/cli.c | ||
68 | +++ b/utils/cli/cli.c | ||
69 | @@ -13,6 +13,7 @@ | ||
70 | #endif | ||
71 | |||
72 | #include <getopt.h> | ||
73 | +#include <libgen.h> | ||
74 | #include <stdarg.h> | ||
75 | #include <stdbool.h> | ||
76 | #include <stdint.h> | ||
77 | diff --git a/utils/rfcomm/rfcomm.c b/utils/rfcomm/rfcomm.c | ||
78 | index d01f0810..3dacfd67 100644 | ||
79 | --- a/utils/rfcomm/rfcomm.c | ||
80 | +++ b/utils/rfcomm/rfcomm.c | ||
81 | @@ -15,6 +15,7 @@ | ||
82 | #include <ctype.h> | ||
83 | #include <errno.h> | ||
84 | #include <getopt.h> | ||
85 | +#include <libgen.h> | ||
86 | #include <poll.h> | ||
87 | #include <stdbool.h> | ||
88 | #include <stdint.h> | ||
diff --git a/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb b/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb index 5007c88ff..f089e036e 100644 --- a/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb +++ b/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb | |||
@@ -1,22 +1,31 @@ | |||
1 | SUMMARY = "Bluetooth Audio ALSA Backend" | 1 | SUMMARY = "Bluetooth Audio ALSA Backend" |
2 | DESCRIPTION = "\ | ||
3 | BlueALSA is a replacement for BlueZ >= 5, with which one can achieve the \ | ||
4 | same Bluetooth audio profile support as with PulseAudio, but with fewer \ | ||
5 | dependencies and at a lower level in the software stack. It is designed \ | ||
6 | specifically for use on small, low-powered, dedicated audio or audio/visual \ | ||
7 | systems where the high-level audio management features of PulseAudio or \ | ||
8 | PipeWire are not required. \ | ||
9 | " | ||
2 | HOMEPAGE = "https://github.com/Arkq/bluez-alsa" | 10 | HOMEPAGE = "https://github.com/Arkq/bluez-alsa" |
11 | BUGTRACKER = "https://github.com/arkq/bluez-alsa/issues" | ||
3 | SECTION = "libs" | 12 | SECTION = "libs" |
4 | 13 | ||
5 | LICENSE = "MIT" | 14 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8449a4f133a93f6254b496d4fb476e83" | 15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=143bc4e73f39cc5e89d6e096ac0315ba" |
7 | 16 | ||
8 | SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master" | 17 | DEPENDS += "alsa-lib bluez5 dbus glib-2.0-native python3-packaging-native sbc" |
9 | 18 | ||
10 | SRCREV = "dd05a1baa261b94da9ba977b5e3392c8b4dc7a5e" | 19 | SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master \ |
11 | PV = "4.0.0+git" | 20 | file://0001-Use-basename-implementation-from-glib-2.0.patch" |
12 | 21 | ||
13 | S = "${WORKDIR}/git" | 22 | SRCREV = "959573c2cccef5cf074f5b2fa7941abbd699c5f4" |
14 | 23 | ||
15 | DEPENDS += "alsa-lib bluez5 dbus glib-2.0 sbc" | 24 | S = "${WORKDIR}/git" |
16 | 25 | ||
17 | PACKAGECONFIG ??= "aplay cli hcitop ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 26 | PACKAGECONFIG ??= "aplay cli hcitop ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
18 | PACKAGECONFIG[a2dpconf] = "--enable-a2dpconf,--disable-a2dpconf" | 27 | PACKAGECONFIG[a2dpconf] = "--enable-a2dpconf,--disable-a2dpconf" |
19 | PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,fdk-aac" | 28 | PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,fdk-aac" |
20 | PACKAGECONFIG[aplay] = "--enable-aplay,--disable-aplay" | 29 | PACKAGECONFIG[aplay] = "--enable-aplay,--disable-aplay" |
21 | PACKAGECONFIG[cli] = "--enable-cli,--disable-cli" | 30 | PACKAGECONFIG[cli] = "--enable-cli,--disable-cli" |
22 | PACKAGECONFIG[coverage] = "--with-coverage,--without-coverage,lcov-native" | 31 | PACKAGECONFIG[coverage] = "--with-coverage,--without-coverage,lcov-native" |
@@ -25,8 +34,10 @@ PACKAGECONFIG[debug-time] = "--enable-debug-time,--disable-debug-time" | |||
25 | PACKAGECONFIG[faststream] = "--enable-faststream,--disable-faststream" | 34 | PACKAGECONFIG[faststream] = "--enable-faststream,--disable-faststream" |
26 | PACKAGECONFIG[hcitop] = "--enable-hcitop,--disable-hcitop,libbsd ncurses" | 35 | PACKAGECONFIG[hcitop] = "--enable-hcitop,--disable-hcitop,libbsd ncurses" |
27 | PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" | 36 | PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" |
37 | PACKAGECONFIG[midi] = "--enable-midi,--disable-midi" | ||
28 | PACKAGECONFIG[mp3lame] = "--enable-mp3lame,--disable-mp3lame,lame" | 38 | PACKAGECONFIG[mp3lame] = "--enable-mp3lame,--disable-mp3lame,lame" |
29 | PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123,mpg123" | 39 | PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123,mpg123" |
40 | PACKAGECONFIG[msbc] = "--enable-msbc,--disable-msbc,spandsp" | ||
30 | PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono,ofono" | 41 | PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono,ofono" |
31 | PACKAGECONFIG[payloadcheck] = "--enable-payloadcheck,--disable-payloadcheck" | 42 | PACKAGECONFIG[payloadcheck] = "--enable-payloadcheck,--disable-payloadcheck" |
32 | PACKAGECONFIG[rfcomm] = "--enable-rfcomm,--disable-rfcomm" | 43 | PACKAGECONFIG[rfcomm] = "--enable-rfcomm,--disable-rfcomm" |
@@ -35,9 +46,10 @@ PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd | |||
35 | PACKAGECONFIG[test] = "--enable-test,--disable-test,libcheck libsndfile1" | 46 | PACKAGECONFIG[test] = "--enable-test,--disable-test,libcheck libsndfile1" |
36 | PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,,upower" | 47 | PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,,upower" |
37 | 48 | ||
38 | inherit autotools pkgconfig systemd | 49 | inherit autotools pkgconfig python3native systemd |
39 | 50 | ||
40 | EXTRA_OECONF = " \ | 51 | # These proprietary codecs are not available in Yocto |
52 | EXTRA_OECONF = "\ | ||
41 | --disable-aptx \ | 53 | --disable-aptx \ |
42 | --disable-lc3plus \ | 54 | --disable-lc3plus \ |
43 | --disable-ldac \ | 55 | --disable-ldac \ |
@@ -45,10 +57,11 @@ EXTRA_OECONF = " \ | |||
45 | " | 57 | " |
46 | 58 | ||
47 | PACKAGE_BEFORE_PN = "${PN}-aplay" | 59 | PACKAGE_BEFORE_PN = "${PN}-aplay" |
48 | RRECOMMENDS:${PN} = "${PN}-aplay" | ||
49 | 60 | ||
50 | FILES:${PN}-aplay = "${bindir}/bluealsa-aplay" | 61 | FILES:${PN}-aplay += "${bindir}/bluealsa-aplay" |
51 | FILES:${PN} += "${libdir}/alsa-lib/*" | 62 | FILES:${PN} += "${libdir}/alsa-lib/* ${datadir}/dbus-1/system.d" |
63 | |||
64 | RRECOMMENDS:${PN} = "${PN}-aplay" | ||
52 | 65 | ||
53 | SYSTEMD_PACKAGES += "${PN}-aplay" | 66 | SYSTEMD_PACKAGES += "${PN}-aplay" |
54 | SYSTEMD_SERVICE:${PN} = "bluealsa.service" | 67 | SYSTEMD_SERVICE:${PN} = "bluealsa.service" |
diff --git a/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb b/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.3.bb index 4e8412303..6b7f3090a 100644 --- a/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb +++ b/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.3.bb | |||
@@ -6,8 +6,8 @@ LICENSE = "BSD-2-Clause" | |||
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669" |
8 | 8 | ||
9 | SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;branch=master" | 9 | SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;nobranch=1" |
10 | SRCREV = "805d9e5a8ffce3ef78cebde4bfedf3642907b2d3" | 10 | SRCREV = "e9986de7f4264940af6fa1df1498fd2754077de4" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
@@ -15,3 +15,6 @@ DEPENDS:append:x86 = " nasm-native" | |||
15 | DEPENDS:append:x86-64 = " nasm-native" | 15 | DEPENDS:append:x86-64 = " nasm-native" |
16 | 16 | ||
17 | inherit meson pkgconfig | 17 | inherit meson pkgconfig |
18 | |||
19 | # RVV assembler routines are not yet available for RISCV32 | ||
20 | EXTRA_OEMESON:append:riscv32 = " -Denable_asm=false" | ||
diff --git a/meta-multimedia/recipes-multimedia/flite/flite/0001-Remove-defining-const-as-nothing.patch b/meta-multimedia/recipes-multimedia/flite/flite/0001-Remove-defining-const-as-nothing.patch new file mode 100644 index 000000000..899ef2663 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/flite/flite/0001-Remove-defining-const-as-nothing.patch | |||
@@ -0,0 +1,79 @@ | |||
1 | From c71d844f5639ea447b9f795a4db5b5d43f0de814 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 2 Jul 2024 21:41:24 -0700 | ||
4 | Subject: [PATCH] Remove defining 'const' as nothing | ||
5 | |||
6 | This is a hack to override constness of struct members | ||
7 | however, with modern compiler like clang with fortified | ||
8 | glibc ( 2.40+ ) headers this runs into compiler errors | ||
9 | |||
10 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:38:54: error: pass_object_size attribute only applies to constant pointer arguments | ||
11 | | 38 | __fortify_clang_overload_arg (char *, __restrict, __resolved))) | ||
12 | | | ^ | ||
13 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:73:43: error: pass_object_size attribute only applies to constant pointer arguments | ||
14 | | 73 | __fortify_clang_overload_arg (char *, ,__buf), | ||
15 | | | ^ | ||
16 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:91:55: error: pass_object_size attribute only applies to constant pointer arguments | ||
17 | | 91 | __NTH (wctomb (__fortify_clang_overload_arg (char *, ,__s), wchar_t __wchar)) | ||
18 | | | ^ | ||
19 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:129:71: error: pass_object_size attribute only applies to constant pointer arguments | ||
20 | | 129 | __NTH (mbstowcs (__fortify_clang_overload_arg (wchar_t *, __restrict, __dst), | ||
21 | | | ^ | ||
22 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:159:68: error: pass_object_size attribute only applies to constant pointer arguments | ||
23 | | 159 | __NTH (wcstombs (__fortify_clang_overload_arg (char *, __restrict, __dst), | ||
24 | | | ^ | ||
25 | | 5 errors generated. | ||
26 | | | ||
27 | |||
28 | Therefore take this out, instead cast away the 'const' qualifier where needed ( equilly dangerous ) | ||
29 | however limited to just this file instead of apply to all headers including system headers | ||
30 | |||
31 | Upstream-Status: Submitted [https://github.com/festvox/flite/pull/112] | ||
32 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
33 | --- | ||
34 | tools/find_sts_main.c | 11 ++++------- | ||
35 | 1 file changed, 4 insertions(+), 7 deletions(-) | ||
36 | |||
37 | diff --git a/tools/find_sts_main.c b/tools/find_sts_main.c | ||
38 | index 3c94449..a5bf8ef 100644 | ||
39 | --- a/tools/find_sts_main.c | ||
40 | +++ b/tools/find_sts_main.c | ||
41 | @@ -41,9 +41,6 @@ | ||
42 | #include <math.h> | ||
43 | #include <string.h> | ||
44 | |||
45 | -/* To allow some normally const fields to manipulated during building */ | ||
46 | -#define const | ||
47 | - | ||
48 | #include "cst_args.h" | ||
49 | #include "cst_wave.h" | ||
50 | #include "cst_track.h" | ||
51 | @@ -132,16 +129,16 @@ cst_sts *find_sts(cst_wave *sig, cst_track *lpc) | ||
52 | lpc->frames[i],lpc->num_channels, | ||
53 | resd, | ||
54 | size); | ||
55 | - sts[i].size = size; | ||
56 | + *(int *)(&sts[i].size) = size; | ||
57 | sts[i].frame = cst_alloc(unsigned short,lpc->num_channels-1); | ||
58 | for (j=1; j < lpc->num_channels; j++) | ||
59 | - sts[i].frame[j-1] = (unsigned short) | ||
60 | + *(unsigned short *)(&sts[i].frame[j-1]) = (unsigned short) | ||
61 | (((lpc->frames[i][j]-lpc_min)/lpc_range)*65535); | ||
62 | if (cst_streq(residual_codec,"ulaw")) | ||
63 | { | ||
64 | sts[i].residual = cst_alloc(unsigned char,size); | ||
65 | for (j=0; j < size; j++) | ||
66 | - sts[i].residual[j] = cst_short_to_ulaw((short)resd[j]); | ||
67 | + *(unsigned char *)(&sts[i].residual[j]) = cst_short_to_ulaw((short)resd[j]); | ||
68 | } | ||
69 | else if (cst_streq(residual_codec,"g721")) | ||
70 | { | ||
71 | @@ -189,7 +186,7 @@ cst_sts *find_sts(cst_wave *sig, cst_track *lpc) | ||
72 | { | ||
73 | sts[i].residual = cst_alloc(unsigned char,size); | ||
74 | for (j=0; j < size; j++) | ||
75 | - sts[i].residual[j] = cst_short_to_ulaw((short)resd[j]); | ||
76 | + *(unsigned char *)(&sts[i].residual[j]) = cst_short_to_ulaw((short)resd[j]); | ||
77 | } | ||
78 | else /* Unvoiced frame */ | ||
79 | { | ||
diff --git a/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb b/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb index 0a7680a8c..bb9edfd5b 100644 --- a/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb +++ b/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb | |||
@@ -9,6 +9,7 @@ inherit autotools-brokensep | |||
9 | DEPENDS += "alsa-lib chrpath-replacement-native" | 9 | DEPENDS += "alsa-lib chrpath-replacement-native" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/festvox/flite.git;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/festvox/flite.git;protocol=https;branch=master" |
12 | SRC_URI += "file://0001-Remove-defining-const-as-nothing.patch" | ||
12 | 13 | ||
13 | SRCREV = "e9e2e37c329dbe98bfeb27a1828ef9a71fa84f88" | 14 | SRCREV = "e9e2e37c329dbe98bfeb27a1828ef9a71fa84f88" |
14 | 15 | ||
@@ -25,3 +26,5 @@ do_install:append() { | |||
25 | } | 26 | } |
26 | # | make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop. | 27 | # | make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop. |
27 | PARALLEL_MAKE = "" | 28 | PARALLEL_MAKE = "" |
29 | |||
30 | CLEANBROKEN = "1" | ||
diff --git a/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.0.0.bb b/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.2.0.bb index fea14fd84..da2953ef2 100644 --- a/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.0.0.bb +++ b/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.2.0.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" |
5 | 5 | ||
6 | SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master" | 6 | SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master" |
7 | SRCREV = "2f26e656b16fb86132f27d1f8d47c6055041430d" | 7 | SRCREV = "821d364d611dc30b3ef8a5e9beb0bf3e71b25199" |
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | 10 | ||
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch index c336e9254..0ca2082c0 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 11cc6dbd45f0880beea64cdc514f57484b90bc39 Mon Sep 17 00:00:00 2001 | 1 | From a3e25b6aa9775c43336e30d3b350f54c085a32c8 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 20 Feb 2024 18:44:23 -0800 | 3 | Date: Tue, 20 Feb 2024 18:44:23 -0800 |
4 | Subject: [PATCH] rpi: Use malloc instead of variable length arrays | 4 | Subject: [PATCH] rpi: Use malloc instead of variable length arrays |
@@ -8,16 +8,14 @@ Clang-18+ diagnoses this as error | |||
8 | | ../git/src/ipa/rpi/controller/rpi/alsc.cpp:499:10: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension] | 499 | int xLo[X], xHi[X]; | 8 | | ../git/src/ipa/rpi/controller/rpi/alsc.cpp:499:10: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension] | 499 | int xLo[X], xHi[X]; |
9 | | | ^ | 9 | | | ^ |
10 | 10 | ||
11 | Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040529.html] | 11 | Upstream-Status: Denied [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040536.html] |
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
14 | s | ||
15 | --- | 13 | --- |
16 | src/ipa/rpi/controller/rpi/alsc.cpp | 7 +++++-- | 14 | src/ipa/rpi/controller/rpi/alsc.cpp | 7 +++++-- |
17 | 1 file changed, 5 insertions(+), 2 deletions(-) | 15 | 1 file changed, 5 insertions(+), 2 deletions(-) |
18 | 16 | ||
19 | diff --git a/src/ipa/rpi/controller/rpi/alsc.cpp b/src/ipa/rpi/controller/rpi/alsc.cpp | 17 | diff --git a/src/ipa/rpi/controller/rpi/alsc.cpp b/src/ipa/rpi/controller/rpi/alsc.cpp |
20 | index 8a205c60..a7d42614 100644 | 18 | index 67029fc3..6eca9fb7 100644 |
21 | --- a/src/ipa/rpi/controller/rpi/alsc.cpp | 19 | --- a/src/ipa/rpi/controller/rpi/alsc.cpp |
22 | +++ b/src/ipa/rpi/controller/rpi/alsc.cpp | 20 | +++ b/src/ipa/rpi/controller/rpi/alsc.cpp |
23 | @@ -496,8 +496,8 @@ void resampleCalTable(const Array2D<double> &calTableIn, | 21 | @@ -496,8 +496,8 @@ void resampleCalTable(const Array2D<double> &calTableIn, |
@@ -26,8 +24,8 @@ index 8a205c60..a7d42614 100644 | |||
26 | */ | 24 | */ |
27 | - int xLo[X], xHi[X]; | 25 | - int xLo[X], xHi[X]; |
28 | - double xf[X]; | 26 | - double xf[X]; |
29 | + int *xLo = (int*)malloc(X), *xHi = (int*)malloc(X); | 27 | + int *xLo = (int *)malloc(X * sizeof(int)), *xHi = (int *)malloc(X * sizeof(int)); |
30 | + double *xf = (double*)malloc(X); | 28 | + double *xf = (double *)malloc(X * sizeof(double)); |
31 | double scaleX = cameraMode.sensorWidth / | 29 | double scaleX = cameraMode.sensorWidth / |
32 | (cameraMode.width * cameraMode.scaleX); | 30 | (cameraMode.width * cameraMode.scaleX); |
33 | double xOff = cameraMode.cropX / (double)cameraMode.sensorWidth; | 31 | double xOff = cameraMode.cropX / (double)cameraMode.sensorWidth; |
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb index 93f29c161..857f565fb 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = " \ | |||
12 | git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ | 12 | git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ |
13 | file://0001-media_device-Add-bool-return-type-to-unlock.patch \ | 13 | file://0001-media_device-Add-bool-return-type-to-unlock.patch \ |
14 | file://0002-options-Replace-use-of-VLAs-in-C.patch \ | 14 | file://0002-options-Replace-use-of-VLAs-in-C.patch \ |
15 | file://0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch \ | 15 | file://0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRCREV = "aee16c06913422a0ac84ee3217f87a9795e3c2d9" | 18 | SRCREV = "aee16c06913422a0ac84ee3217f87a9795e3c2d9" |
@@ -24,10 +24,11 @@ S = "${WORKDIR}/git" | |||
24 | DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml" | 24 | DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml" |
25 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}" | 25 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}" |
26 | 26 | ||
27 | PACKAGES =+ "${PN}-gst" | 27 | PACKAGES =+ "${PN}-gst ${PN}-pycamera" |
28 | 28 | ||
29 | PACKAGECONFIG ??= "" | 29 | PACKAGECONFIG ??= "" |
30 | PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base" | 30 | PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base" |
31 | PACKAGECONFIG[pycamera] = "-Dpycamera=enabled,-Dpycamera=disabled,python3 python3-pybind11" | ||
31 | 32 | ||
32 | LIBCAMERA_PIPELINES ??= "auto" | 33 | LIBCAMERA_PIPELINES ??= "auto" |
33 | 34 | ||
@@ -71,6 +72,7 @@ do_package_recalculate_ipa_signatures() { | |||
71 | 72 | ||
72 | FILES:${PN} += " ${libexecdir}/libcamera/v4l2-compat.so" | 73 | FILES:${PN} += " ${libexecdir}/libcamera/v4l2-compat.so" |
73 | FILES:${PN}-gst = "${libdir}/gstreamer-1.0" | 74 | FILES:${PN}-gst = "${libdir}/gstreamer-1.0" |
75 | FILES:${PN}-pycamera = "${PYTHON_SITEPACKAGES_DIR}/libcamera" | ||
74 | 76 | ||
75 | # libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to | 77 | # libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to |
76 | # both 32 and 64 bit file APIs. | 78 | # both 32 and 64 bit file APIs. |
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index aabf81dce..8c9ead148 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc | |||
@@ -11,9 +11,8 @@ inherit gettext autotools-brokensep update-rc.d systemd | |||
11 | SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ | 11 | SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ |
12 | file://minidlna-daemon.init.d \ | 12 | file://minidlna-daemon.init.d \ |
13 | file://minidlna.service \ | 13 | file://minidlna.service \ |
14 | file://0001-Update-Gettext-version.patch \ | ||
15 | file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \ | 14 | file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \ |
16 | file://0001-configure.ac-drop-non-standard-checks.patch \ | 15 | file://0001-Add-compatibility-with-FFMPEG-7.0.patch \ |
17 | " | 16 | " |
18 | 17 | ||
19 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch new file mode 100644 index 000000000..f9d9c694b --- /dev/null +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 92f8b94c697c225fb31062586f817c4fc3df8c2a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 29 Aug 2024 13:22:33 -0700 | ||
4 | Subject: [PATCH] Add compatibility with FFMPEG 7.0 | ||
5 | |||
6 | channel_layout has been replaced with ch_layout | ||
7 | |||
8 | Upstream-Status: Submitted [https://sourceforge.net/p/minidlna/git/merge-requests/59/] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | libav.h | 9 +++++++++ | ||
12 | 1 file changed, 9 insertions(+) | ||
13 | |||
14 | diff --git a/libav.h b/libav.h | ||
15 | index b69752c..a3153bd 100644 | ||
16 | --- a/libav.h | ||
17 | +++ b/libav.h | ||
18 | @@ -58,6 +58,7 @@ | ||
19 | #endif | ||
20 | |||
21 | #define USE_CODECPAR LIBAVFORMAT_VERSION_INT >= ((57<<16)+(50<<8)+100) | ||
22 | +#define USE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) | ||
23 | |||
24 | #ifndef FF_PROFILE_H264_BASELINE | ||
25 | #define FF_PROFILE_H264_BASELINE 66 | ||
26 | @@ -174,7 +175,11 @@ lav_get_interlaced(AVStream *s) | ||
27 | #define lav_codec_tag(s) s->codecpar->codec_tag | ||
28 | #define lav_sample_rate(s) s->codecpar->sample_rate | ||
29 | #define lav_bit_rate(s) s->codecpar->bit_rate | ||
30 | +#if USE_CH_LAYOUT | ||
31 | +#define lav_channels(s) s->codecpar->ch_layout.nb_channels | ||
32 | +#else | ||
33 | #define lav_channels(s) s->codecpar->channels | ||
34 | +#endif | ||
35 | #define lav_width(s) s->codecpar->width | ||
36 | #define lav_height(s) s->codecpar->height | ||
37 | #define lav_profile(s) s->codecpar->profile | ||
38 | @@ -186,7 +191,11 @@ lav_get_interlaced(AVStream *s) | ||
39 | #define lav_codec_tag(s) s->codec->codec_tag | ||
40 | #define lav_sample_rate(s) s->codec->sample_rate | ||
41 | #define lav_bit_rate(s) s->codec->bit_rate | ||
42 | +#if USE_CH_LAYOUT | ||
43 | +#define lav_channels(s) s->codec->ch_layout.nb_channels | ||
44 | +#else | ||
45 | #define lav_channels(s) s->codec->channels | ||
46 | +#endif | ||
47 | #define lav_width(s) s->codec->width | ||
48 | #define lav_height(s) s->codec->height | ||
49 | #define lav_profile(s) s->codec->profile | ||
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch deleted file mode 100644 index 6100da358..000000000 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001 | ||
2 | From: Baptiste Durand <baptiste.durand@gmail.com> | ||
3 | Date: Sun, 9 Sep 2018 20:50:41 +0200 | ||
4 | Subject: [PATCH] Update Gettext version | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-core specific] | ||
7 | |||
8 | Signed-off-by: Baptiste Durand <baptiste.durand@gmail.com> | ||
9 | --- | ||
10 | configure.ac | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | --- a/configure.ac | ||
14 | +++ b/configure.ac | ||
15 | @@ -14,7 +14,7 @@ | ||
16 | # License along with MiniDLNA; if not, write to the Free Software | ||
17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | ||
18 | # USA. | ||
19 | -AC_INIT(MiniDLNA,1.1.3,,minidlna) | ||
20 | +AC_INIT(MiniDLNA,1.2.1,,minidlna) | ||
21 | #LT_INIT | ||
22 | |||
23 | AC_CANONICAL_TARGET | ||
24 | @@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC | ||
25 | |||
26 | AM_ICONV | ||
27 | AM_GNU_GETTEXT([external]) | ||
28 | -AM_GNU_GETTEXT_VERSION(0.18) | ||
29 | +AM_GNU_GETTEXT_VERSION(0.20) | ||
30 | |||
31 | # Checks for programs. | ||
32 | AC_PROG_AWK | ||
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch b/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch deleted file mode 100644 index 93334b7da..000000000 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 83425344b2d7339e8f5b0ad230c51278d330d613 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Sat, 22 Jan 2022 11:41:50 +0100 | ||
4 | Subject: [PATCH] configure.ac: drop non-standard checks | ||
5 | |||
6 | Not sure what upstream is trying to do here but it does not work | ||
7 | with the latest autoconf. | ||
8 | |||
9 | Upstream-Status: Inactive-Upstream | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | --- | ||
12 | configure.ac | 5 ----- | ||
13 | 1 file changed, 5 deletions(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index aa7dd1c..858db52 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -418,7 +418,6 @@ for dir in "" /usr/local $SEARCH_DIR; do | ||
20 | AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue]) | ||
21 | break | ||
22 | done | ||
23 | -test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag]) | ||
24 | AC_SUBST(LIBID3TAG_LIBS) | ||
25 | |||
26 | LDFLAGS_SAVE="$LDFLAGS" | ||
27 | @@ -444,10 +443,6 @@ for dir in "" /usr/local $SEARCH_DIR; do | ||
28 | [unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_avformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])]) | ||
29 | break | ||
30 | done | ||
31 | -if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" && | ||
32 | - test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then | ||
33 | - AC_MSG_ERROR([Could not find libavformat - part of ffmpeg]) | ||
34 | -fi | ||
35 | AC_SUBST(LIBAVFORMAT_LIBS) | ||
36 | |||
37 | AC_CHECK_LIB(pthread, pthread_create) | ||
diff --git a/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb b/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb index 4238918c9..da0d90a99 100644 --- a/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb +++ b/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require ${BPN}.inc | 1 | require ${BPN}.inc |
2 | 2 | ||
3 | SRCREV = "109d63cb11ac207c18a784556834eb054b34b00b" | 3 | SRCREV = "1a9b32ee7a1c89e54e9f148199b73f9b33ad45ba" |
4 | LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" | 4 | LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" |
diff --git a/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb b/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.22.bb index 2746c6bb8..2746c6bb8 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.22.bb | |||
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb b/meta-multimedia/recipes-multimedia/musicpd/mpc_0.35.bb index 93df25ee2..93df25ee2 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpc_0.35.bb | |||
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch b/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch deleted file mode 100644 index b2dea331e..000000000 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From e62fd0eefe8b475e70d87a673a7216aac3bb622f Mon Sep 17 00:00:00 2001 | ||
2 | From: Markus Volk <f_l_k@t-online.de> | ||
3 | Date: Mon, 20 Nov 2023 17:49:59 +0100 | ||
4 | Subject: [PATCH] patch src_decoder_plugins_FfmpegIo.cxx | ||
5 | |||
6 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
7 | Upstream-Status: Pending [https://github.com/MusicPlayerDaemon/MPD/issues/1898] | ||
8 | --- | ||
9 | src/decoder/plugins/FfmpegIo.cxx | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx | ||
13 | index 572f1a86a..3e2347fec 100644 | ||
14 | --- a/src/decoder/plugins/FfmpegIo.cxx | ||
15 | +++ b/src/decoder/plugins/FfmpegIo.cxx | ||
16 | @@ -25,6 +25,7 @@ | ||
17 | #include "input/InputStream.hxx" | ||
18 | |||
19 | extern "C" { | ||
20 | +#include <libavutil/error.h> | ||
21 | #include <libavutil/mem.h> | ||
22 | } | ||
23 | |||
24 | -- | ||
25 | 2.42.0 | ||
26 | |||
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb index 33155da7d..f066c405f 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb | |||
@@ -18,14 +18,19 @@ DEPENDS += " \ | |||
18 | fmt \ | 18 | fmt \ |
19 | " | 19 | " |
20 | 20 | ||
21 | PV .= "+git" | ||
21 | SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ | 22 | SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ |
22 | file://0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch \ | ||
23 | file://mpd.conf.in \ | 23 | file://mpd.conf.in \ |
24 | " | 24 | " |
25 | SRCREV = "feac1a3f56591ccfb00870aba66c9ac3abac4773" | 25 | SRCREV = "965c466e9bda262790e76edd5272e9e74b407ff3" |
26 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
27 | 27 | ||
28 | EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" | 28 | EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)} \ |
29 | -Dadplug=disabled \ | ||
30 | -Dsndio=disabled \ | ||
31 | -Dshine=disabled \ | ||
32 | -Dtremor=disabled \ | ||
33 | " | ||
29 | 34 | ||
30 | PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \ | 35 | PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \ |
31 | alsa ao bzip2 daemon \ | 36 | alsa ao bzip2 daemon \ |
diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 672c8abc9..618eaa68d 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb | |||
@@ -51,7 +51,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\ | |||
51 | openal-soft \ | 51 | openal-soft \ |
52 | opusfile \ | 52 | opusfile \ |
53 | opus-tools \ | 53 | opus-tools \ |
54 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \ | ||
55 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \ | 54 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \ |
56 | tinyalsa \ | 55 | tinyalsa \ |
57 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ | 56 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ |
diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.7.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.3.bb index 0c68cc4d2..0a2088a3c 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.7.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.3.bb | |||
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS = "dbus ncurses" | 13 | DEPENDS = "dbus ncurses" |
14 | 14 | ||
15 | SRCREV = "59fe89d41a67f6daad086f8f3fe522935be77a3f" | 15 | SRCREV = "e2a76824e2b112b15ae4a1a3d444696d5526f8d8" |
16 | SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.0;protocol=https" | 16 | SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.2;protocol=https" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
@@ -72,6 +72,9 @@ EXTRA_OEMESON += " \ | |||
72 | # mode but it looks like clang still does | 72 | # mode but it looks like clang still does |
73 | CFLAGS:append = " -Wno-typedef-redefinition" | 73 | CFLAGS:append = " -Wno-typedef-redefinition" |
74 | 74 | ||
75 | # Specify linking with -latomic on architectures missing 64bit atomics. | ||
76 | LDFLAGS += "${@bb.utils.contains_any('TUNE_FEATURES', 'riscv32 armv5 mips ppc32 m32', '-latomic', '', d)}" | ||
77 | |||
75 | # According to wireplumber documentation only one session manager should be installed at a time | 78 | # According to wireplumber documentation only one session manager should be installed at a time |
76 | # Possible options are media-session, which has fewer dependencies but is very simple, | 79 | # Possible options are media-session, which has fewer dependencies but is very simple, |
77 | # or wireplumber, which is more powerful. | 80 | # or wireplumber, which is more powerful. |
@@ -292,6 +295,7 @@ FILES:${PN}-tools = " \ | |||
292 | ${bindir}/pw-cat \ | 295 | ${bindir}/pw-cat \ |
293 | ${bindir}/pw-cli \ | 296 | ${bindir}/pw-cli \ |
294 | ${bindir}/pw-config \ | 297 | ${bindir}/pw-config \ |
298 | ${bindir}/pw-container \ | ||
295 | ${bindir}/pw-dot \ | 299 | ${bindir}/pw-dot \ |
296 | ${bindir}/pw-dsdplay \ | 300 | ${bindir}/pw-dsdplay \ |
297 | ${bindir}/pw-dump \ | 301 | ${bindir}/pw-dump \ |
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch deleted file mode 100644 index 3f2aa6051..000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch +++ /dev/null | |||
@@ -1,179 +0,0 @@ | |||
1 | From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Guillem <thomas@gllm.fr> | ||
3 | Date: Tue, 5 Dec 2023 09:23:35 +0100 | ||
4 | Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment | ||
5 | |||
6 | Fixes #28441 | ||
7 | Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4645] | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | src/input/input_internal.h | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/src/input/input_internal.h b/src/input/input_internal.h | ||
14 | index d29731edca1b..ea02f39f5add 100644 | ||
15 | --- a/src/input/input_internal.h | ||
16 | +++ b/src/input/input_internal.h | ||
17 | @@ -117,7 +117,7 @@ typedef struct input_thread_private_t | ||
18 | |||
19 | /* Title infos FIXME multi-input (not easy) ? */ | ||
20 | int i_title; | ||
21 | - const input_title_t **title; | ||
22 | + input_title_t * const *title; | ||
23 | |||
24 | int i_title_offset; | ||
25 | int i_seekpoint_offset; | ||
26 | -- | ||
27 | GitLab | ||
28 | |||
29 | |||
30 | From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001 | ||
31 | From: Zhao Zhili <quinkblack@foxmail.com> | ||
32 | Date: Thu, 1 Mar 2018 14:25:59 +0800 | ||
33 | Subject: [PATCH 2/5] yadif: fix variable type | ||
34 | |||
35 | Signed-off-by: Thomas Guillem <thomas@gllm.fr> | ||
36 | (cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60) | ||
37 | Signed-off-by: Thomas Guillem <thomas@gllm.fr> | ||
38 | --- | ||
39 | modules/video_filter/deinterlace/yadif.h | 8 ++++---- | ||
40 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
41 | |||
42 | diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h | ||
43 | index 4bc592ba9307..af16443d0804 100644 | ||
44 | --- a/modules/video_filter/deinterlace/yadif.h | ||
45 | +++ b/modules/video_filter/deinterlace/yadif.h | ||
46 | @@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8 | ||
47 | } | ||
48 | |||
49 | 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) { | ||
50 | - uint8_t *dst = (uint8_t *)dst8; | ||
51 | - uint8_t *prev = (uint8_t *)prev8; | ||
52 | - uint8_t *cur = (uint8_t *)cur8; | ||
53 | - uint8_t *next = (uint8_t *)next8; | ||
54 | + uint16_t *dst = (uint16_t *)dst8; | ||
55 | + uint16_t *prev = (uint16_t *)prev8; | ||
56 | + uint16_t *cur = (uint16_t *)cur8; | ||
57 | + uint16_t *next = (uint16_t *)next8; | ||
58 | int x; | ||
59 | uint16_t *prev2= parity ? prev : cur ; | ||
60 | uint16_t *next2= parity ? cur : next; | ||
61 | -- | ||
62 | GitLab | ||
63 | |||
64 | |||
65 | From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001 | ||
66 | From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> | ||
67 | Date: Sun, 3 Mar 2019 09:59:10 +0200 | ||
68 | Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion | ||
69 | |||
70 | (cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058) | ||
71 | Signed-off-by: Thomas Guillem <thomas@gllm.fr> | ||
72 | --- | ||
73 | modules/video_chroma/swscale.c | 12 ++++++++---- | ||
74 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
75 | |||
76 | diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c | ||
77 | index 8993d11ec5dd..11897527355c 100644 | ||
78 | --- a/modules/video_chroma/swscale.c | ||
79 | +++ b/modules/video_chroma/swscale.c | ||
80 | @@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, | ||
81 | { | ||
82 | filter_sys_t *p_sys = p_filter->p_sys; | ||
83 | uint8_t palette[AVPALETTE_SIZE]; | ||
84 | - uint8_t *src[4]; int src_stride[4]; | ||
85 | - uint8_t *dst[4]; int dst_stride[4]; | ||
86 | + uint8_t *src[4], *dst[4]; | ||
87 | + const uint8_t *csrc[4]; | ||
88 | + int src_stride[4], dst_stride[4]; | ||
89 | |||
90 | GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video, | ||
91 | p_src, i_plane_count, b_swap_uvi ); | ||
92 | @@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, | ||
93 | GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video, | ||
94 | p_dst, i_plane_count, b_swap_uvo ); | ||
95 | |||
96 | + for (size_t i = 0; i < ARRAY_SIZE(src); i++) | ||
97 | + csrc[i] = src[i]; | ||
98 | + | ||
99 | #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) | ||
100 | - sws_scale( ctx, src, src_stride, 0, i_height, | ||
101 | + sws_scale( ctx, csrc, src_stride, 0, i_height, | ||
102 | dst, dst_stride ); | ||
103 | #else | ||
104 | - sws_scale_ordered( ctx, src, src_stride, 0, i_height, | ||
105 | + sws_scale_ordered( ctx, csrc, src_stride, 0, i_height, | ||
106 | dst, dst_stride ); | ||
107 | #endif | ||
108 | } | ||
109 | -- | ||
110 | GitLab | ||
111 | |||
112 | |||
113 | From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001 | ||
114 | From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> | ||
115 | Date: Sun, 3 Mar 2019 17:20:04 +0200 | ||
116 | Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing | ||
117 | |||
118 | (cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35) | ||
119 | Signed-off-by: Thomas Guillem <thomas@gllm.fr> | ||
120 | --- | ||
121 | modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +-- | ||
122 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
123 | |||
124 | diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c | ||
125 | index a93462925e8a..a85f9aafb0b9 100644 | ||
126 | --- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c | ||
127 | +++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c | ||
128 | @@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] = | ||
129 | void RegisterCommand( filter_t *p_filter ) | ||
130 | { | ||
131 | filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; | ||
132 | - size_t i_index = 0; | ||
133 | |||
134 | p_sys->i_commands = ARRAY_SIZE(p_commands); | ||
135 | p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) ); | ||
136 | if( !p_sys->pp_commands ) return; | ||
137 | - for( i_index = 0; i_index < p_sys->i_commands; i_index ++ ) | ||
138 | + for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ ) | ||
139 | { | ||
140 | p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) ); | ||
141 | if( !p_sys->pp_commands[i_index] ) return; | ||
142 | -- | ||
143 | GitLab | ||
144 | |||
145 | |||
146 | From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001 | ||
147 | From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> | ||
148 | Date: Mon, 26 Feb 2018 20:43:03 +0200 | ||
149 | Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption | ||
150 | |||
151 | Font alpha is 8-bits, not 32-bits. | ||
152 | |||
153 | (cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0) | ||
154 | Signed-off-by: Thomas Guillem <thomas@gllm.fr> | ||
155 | --- | ||
156 | modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++- | ||
157 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
158 | |||
159 | diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c | ||
160 | index a85f9aafb0b9..7a71c6f2373a 100644 | ||
161 | --- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c | ||
162 | +++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c | ||
163 | @@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end, | ||
164 | skip_space( &psz_command ); | ||
165 | if( isdigit( (unsigned char)*psz_command ) ) | ||
166 | { | ||
167 | - if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC ) | ||
168 | + int32_t value; | ||
169 | + | ||
170 | + if( parse_digit( &psz_command, &value ) == VLC_EGENERIC ) | ||
171 | return VLC_EGENERIC; | ||
172 | + | ||
173 | + p_params->fontstyle.i_font_alpha = value; | ||
174 | } | ||
175 | return VLC_SUCCESS; | ||
176 | } | ||
177 | -- | ||
178 | GitLab | ||
179 | |||
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch deleted file mode 100644 index c9ef33358..000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch +++ /dev/null | |||
@@ -1,377 +0,0 @@ | |||
1 | From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> | ||
3 | Date: Mon, 26 Feb 2018 20:36:29 +0200 | ||
4 | Subject: [PATCH 1/9] chromaprint: missing cast | ||
5 | |||
6 | (cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547) | ||
7 | Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> | ||
8 | Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4665] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | modules/stream_out/chromaprint.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c | ||
15 | index 80ec31ba2590..c76cbda3c2bb 100644 | ||
16 | --- a/modules/stream_out/chromaprint.c | ||
17 | +++ b/modules/stream_out/chromaprint.c | ||
18 | @@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, | ||
19 | if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer ) | ||
20 | { | ||
21 | if(! chromaprint_feed( p_sys->p_chromaprint_ctx, | ||
22 | - p_buf->p_buffer, | ||
23 | + (int16_t *)p_buf->p_buffer, | ||
24 | p_buf->i_buffer / BYTESPERSAMPLE ) ) | ||
25 | msg_Warn( p_stream, "feed error" ); | ||
26 | id->i_samples -= i_samples; | ||
27 | -- | ||
28 | GitLab | ||
29 | |||
30 | |||
31 | From 6179d6b843f2a93af6a3d51c4244766e3eba9e77 Mon Sep 17 00:00:00 2001 | ||
32 | From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> | ||
33 | Date: Sun, 14 Apr 2019 09:41:38 +0300 | ||
34 | Subject: [PATCH 2/9] win32: wrap {g,s}etsockopt() | ||
35 | |||
36 | char * can alias anything, and Winsock relies on that. Unfortunately, | ||
37 | the compiler still issues warnings. This works around that. | ||
38 | |||
39 | (cherry picked from commit 36715d9b79f34824e126c2bc3aee2f1c1c16af46) | ||
40 | Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> | ||
41 | --- | ||
42 | include/vlc_network.h | 16 ++++++++++++++++ | ||
43 | 1 file changed, 16 insertions(+) | ||
44 | |||
45 | diff --git a/include/vlc_network.h b/include/vlc_network.h | ||
46 | index 010454a01c09..e39ffd0bacaa 100644 | ||
47 | --- a/include/vlc_network.h | ||
48 | +++ b/include/vlc_network.h | ||
49 | @@ -183,6 +183,22 @@ VLC_API int vlc_close(int); | ||
50 | |||
51 | /** @} */ | ||
52 | |||
53 | +#ifdef _WIN32 | ||
54 | +static inline int vlc_getsockopt(int s, int level, int name, | ||
55 | + void *val, socklen_t *len) | ||
56 | +{ | ||
57 | + return getsockopt(s, level, name, (char *)val, len); | ||
58 | +} | ||
59 | +#define getsockopt vlc_getsockopt | ||
60 | + | ||
61 | +static inline int vlc_setsockopt(int s, int level, int name, | ||
62 | + const void *val, socklen_t len) | ||
63 | +{ | ||
64 | + return setsockopt(s, level, name, (const char *)val, len); | ||
65 | +} | ||
66 | +#define setsockopt vlc_setsockopt | ||
67 | +#endif | ||
68 | + | ||
69 | /* Portable network names/addresses resolution layer */ | ||
70 | |||
71 | #define NI_MAXNUMERICHOST 64 | ||
72 | -- | ||
73 | GitLab | ||
74 | |||
75 | |||
76 | From 3391108f9709f0d77d9297c94371cf9cd30f2cbe Mon Sep 17 00:00:00 2001 | ||
77 | From: Steve Lhomme <robux4@ycbcr.xyz> | ||
78 | Date: Thu, 7 Dec 2023 15:43:04 +0100 | ||
79 | Subject: [PATCH 3/9] netsync: use char for temporary local buffer | ||
80 | |||
81 | On Windows recvfrom/revc/sendto expects a char*. | ||
82 | --- | ||
83 | modules/control/netsync.c | 14 +++++++------- | ||
84 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
85 | |||
86 | diff --git a/modules/control/netsync.c b/modules/control/netsync.c | ||
87 | index 2a6a1a6a2bf8..8c91034d7cf2 100644 | ||
88 | --- a/modules/control/netsync.c | ||
89 | +++ b/modules/control/netsync.c | ||
90 | @@ -181,7 +181,7 @@ static void *Master(void *handle) | ||
91 | intf_sys_t *sys = intf->p_sys; | ||
92 | for (;;) { | ||
93 | struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; | ||
94 | - uint64_t data[2]; | ||
95 | + char data[16]; | ||
96 | |||
97 | if (poll(&ufd, 1, -1) < 0) | ||
98 | continue; | ||
99 | @@ -198,8 +198,8 @@ static void *Master(void *handle) | ||
100 | if (master_system < 0) | ||
101 | continue; | ||
102 | |||
103 | - data[0] = hton64(mdate()); | ||
104 | - data[1] = hton64(master_system); | ||
105 | + SetQWBE(&data[0], mdate()); | ||
106 | + SetQWBE(&data[8], master_system); | ||
107 | |||
108 | /* Reply to the sender */ | ||
109 | sendto(sys->fd, data, 16, 0, | ||
110 | @@ -224,7 +224,7 @@ static void *Slave(void *handle) | ||
111 | |||
112 | for (;;) { | ||
113 | struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; | ||
114 | - uint64_t data[2]; | ||
115 | + char data[16]; | ||
116 | |||
117 | vlc_tick_t system = GetPcrSystem(sys->input); | ||
118 | if (system < 0) | ||
119 | @@ -233,7 +233,7 @@ static void *Slave(void *handle) | ||
120 | /* Send clock request to the master */ | ||
121 | const vlc_tick_t send_date = mdate(); | ||
122 | |||
123 | - data[0] = hton64(system); | ||
124 | + SetQWBE(&data[0], system); | ||
125 | send(sys->fd, data, 8, 0); | ||
126 | |||
127 | /* Don't block */ | ||
128 | @@ -244,8 +244,8 @@ static void *Slave(void *handle) | ||
129 | if (recv(sys->fd, data, 16, 0) < 16) | ||
130 | goto wait; | ||
131 | |||
132 | - const vlc_tick_t master_date = ntoh64(data[0]); | ||
133 | - const vlc_tick_t master_system = ntoh64(data[1]); | ||
134 | + const vlc_tick_t master_date = GetQWBE(&data[0]); | ||
135 | + const vlc_tick_t master_system = GetQWBE(&data[8]); | ||
136 | const vlc_tick_t diff_date = receive_date - | ||
137 | ((receive_date - send_date) / 2 + master_date); | ||
138 | |||
139 | -- | ||
140 | GitLab | ||
141 | |||
142 | |||
143 | From 27e584d7b9add8dbbb82b7227228e1ec1e25a089 Mon Sep 17 00:00:00 2001 | ||
144 | From: Steve Lhomme <robux4@ycbcr.xyz> | ||
145 | Date: Tue, 3 Jan 2023 13:23:00 +0100 | ||
146 | Subject: [PATCH 4/9] access/dtv: move the lfind() Windows hack in the module | ||
147 | |||
148 | So that we don't have to include search.h each time vlc_fixups.h is used. | ||
149 | |||
150 | The Win32 prototype of lfind() expects an unsigned* for 'nelp', not a size_t*. | ||
151 | |||
152 | (cherry picked from commit 7c43bcba27b6fe256456d93a9d32e10648f08da8) | ||
153 | Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> | ||
154 | --- | ||
155 | include/vlc_fixups.h | 3 +++ | ||
156 | modules/access/dtv/access.c | 5 +++++ | ||
157 | 2 files changed, 8 insertions(+) | ||
158 | |||
159 | diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h | ||
160 | index 37f788933779..861cb4cc5063 100644 | ||
161 | --- a/include/vlc_fixups.h | ||
162 | +++ b/include/vlc_fixups.h | ||
163 | @@ -501,8 +501,11 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void | ||
164 | void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) ); | ||
165 | void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); | ||
166 | void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) ); | ||
167 | +#ifndef _WIN32 | ||
168 | +/* the Win32 prototype of lfind() expects an unsigned* for 'nmemb' */ | ||
169 | void *lfind( const void *key, const void *base, size_t *nmemb, | ||
170 | size_t size, int(*cmp)(const void *, const void *) ); | ||
171 | +#endif | ||
172 | #endif /* HAVE_SEARCH_H */ | ||
173 | #ifndef HAVE_TDESTROY | ||
174 | void tdestroy( void *root, void (*free_node)(void *nodep) ); | ||
175 | diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c | ||
176 | index d9756c7b4885..c6ca5005883c 100644 | ||
177 | --- a/modules/access/dtv/access.c | ||
178 | +++ b/modules/access/dtv/access.c | ||
179 | @@ -32,6 +32,11 @@ | ||
180 | #ifdef HAVE_SEARCH_H | ||
181 | #include <search.h> | ||
182 | #endif | ||
183 | +#if defined(_WIN32) | ||
184 | +/* the Win32 prototype of lfind() expects an unsigned* for 'nelp' */ | ||
185 | +# define lfind(a,b,c,d,e) \ | ||
186 | + lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e)) | ||
187 | +#endif | ||
188 | |||
189 | #include "dtv/dtv.h" | ||
190 | |||
191 | -- | ||
192 | GitLab | ||
193 | |||
194 | |||
195 | From 5a9ca37a95b6e85e6beaaefba9aa4a886a45411c Mon Sep 17 00:00:00 2001 | ||
196 | From: Steve Lhomme <robux4@ycbcr.xyz> | ||
197 | Date: Mon, 15 Jul 2019 12:41:29 +0200 | ||
198 | Subject: [PATCH 5/9] vlc_common: fix swab() calls on win32 that don't use | ||
199 | const on source pointer | ||
200 | |||
201 | (cherry picked from commit a9e0b1124e19225b903a2926951781e84002c410) | ||
202 | Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> | ||
203 | --- | ||
204 | include/vlc_common.h | 5 +++++ | ||
205 | 1 file changed, 5 insertions(+) | ||
206 | |||
207 | diff --git a/include/vlc_common.h b/include/vlc_common.h | ||
208 | index 8090b277150d..089878581763 100644 | ||
209 | --- a/include/vlc_common.h | ||
210 | +++ b/include/vlc_common.h | ||
211 | @@ -947,6 +947,11 @@ static inline void SetQWLE (void *p, uint64_t qw) | ||
212 | # define O_NONBLOCK 0 | ||
213 | # endif | ||
214 | |||
215 | +/* the mingw32 swab() and win32 _swab() prototypes expect a char* instead of a | ||
216 | + const void* */ | ||
217 | +# define swab(a,b,c) swab((char*) (a), (char*) (b), (c)) | ||
218 | + | ||
219 | + | ||
220 | # include <tchar.h> | ||
221 | #endif /* _WIN32 */ | ||
222 | |||
223 | -- | ||
224 | GitLab | ||
225 | |||
226 | |||
227 | From b758e19479a80604e3feb470b197e4a13a203a85 Mon Sep 17 00:00:00 2001 | ||
228 | From: Steve Lhomme <robux4@ycbcr.xyz> | ||
229 | Date: Wed, 10 Jul 2019 08:23:45 +0200 | ||
230 | Subject: [PATCH 6/9] avcodec: encoder: fix MPEG4 matrix passed as const | ||
231 | |||
232 | lavc expects a pointer that it will free in avcodec_free_context(). | ||
233 | |||
234 | (cherry picked from commit d86c4c87aa78130a4fd00294e25df865d0e2b327) | ||
235 | Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> | ||
236 | --- | ||
237 | modules/codec/avcodec/encoder.c | 10 ++++++++-- | ||
238 | 1 file changed, 8 insertions(+), 2 deletions(-) | ||
239 | |||
240 | diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c | ||
241 | index 2b1c3604713d..4919ccf0e0e4 100644 | ||
242 | --- a/modules/codec/avcodec/encoder.c | ||
243 | +++ b/modules/codec/avcodec/encoder.c | ||
244 | @@ -588,8 +588,14 @@ int InitVideoEnc( vlc_object_t *p_this ) | ||
245 | |||
246 | if ( p_sys->b_mpeg4_matrix ) | ||
247 | { | ||
248 | - p_context->intra_matrix = mpeg4_default_intra_matrix; | ||
249 | - p_context->inter_matrix = mpeg4_default_non_intra_matrix; | ||
250 | + p_context->intra_matrix = av_malloc( sizeof(mpeg4_default_intra_matrix) ); | ||
251 | + if ( p_context->intra_matrix ) | ||
252 | + memcpy( p_context->intra_matrix, mpeg4_default_intra_matrix, | ||
253 | + sizeof(mpeg4_default_intra_matrix)); | ||
254 | + p_context->inter_matrix = av_malloc( sizeof(mpeg4_default_non_intra_matrix) ); | ||
255 | + if ( p_context->inter_matrix ) | ||
256 | + memcpy( p_context->inter_matrix, mpeg4_default_non_intra_matrix, | ||
257 | + sizeof(mpeg4_default_non_intra_matrix)); | ||
258 | } | ||
259 | |||
260 | if ( p_sys->b_pre_me ) | ||
261 | -- | ||
262 | GitLab | ||
263 | |||
264 | |||
265 | From 55be3ce60795a09d13861c5637c1fe7aebc5ce8b Mon Sep 17 00:00:00 2001 | ||
266 | From: Steve Lhomme <robux4@ycbcr.xyz> | ||
267 | Date: Thu, 7 Dec 2023 14:18:22 +0100 | ||
268 | Subject: [PATCH 7/9] smb: fix potential string to wide string copy | ||
269 | |||
270 | The type of net_resource depends on the UNICODE define. | ||
271 | --- | ||
272 | modules/access/smb.c | 4 ++-- | ||
273 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
274 | |||
275 | diff --git a/modules/access/smb.c b/modules/access/smb.c | ||
276 | index 5fe56f0c9dfe..6add2a3e6278 100644 | ||
277 | --- a/modules/access/smb.c | ||
278 | +++ b/modules/access/smb.c | ||
279 | @@ -524,7 +524,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, | ||
280 | const char *psz_pwd, const char *psz_domain ) | ||
281 | { | ||
282 | char psz_remote[MAX_PATH]; | ||
283 | - NETRESOURCE net_resource; | ||
284 | + NETRESOURCEA net_resource; | ||
285 | DWORD i_result; | ||
286 | VLC_UNUSED( psz_domain ); | ||
287 | |||
288 | @@ -544,7 +544,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, | ||
289 | |||
290 | net_resource.lpRemoteName = psz_remote; | ||
291 | |||
292 | - i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 ); | ||
293 | + i_result = WNetAddConnection2A( &net_resource, psz_pwd, psz_user, 0 ); | ||
294 | |||
295 | if( i_result != NO_ERROR ) | ||
296 | { | ||
297 | -- | ||
298 | GitLab | ||
299 | |||
300 | |||
301 | From 5ae924bf212dce64a6424561d92426dbcc2cf3a0 Mon Sep 17 00:00:00 2001 | ||
302 | From: Steve Lhomme <robux4@ycbcr.xyz> | ||
303 | Date: Wed, 6 Dec 2023 14:45:46 +0100 | ||
304 | Subject: [PATCH 8/9] dxva2: add missing mask initializers | ||
305 | |||
306 | --- | ||
307 | modules/codec/avcodec/dxva2.c | 10 +++++----- | ||
308 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
309 | |||
310 | diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c | ||
311 | index 18b872fe0fe3..2e6809a05410 100644 | ||
312 | --- a/modules/codec/avcodec/dxva2.c | ||
313 | +++ b/modules/codec/avcodec/dxva2.c | ||
314 | @@ -84,12 +84,12 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, | ||
315 | |||
316 | /* XXX Preferred format must come first */ | ||
317 | static const d3d9_format_t d3d_formats[] = { | ||
318 | - { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12 }, | ||
319 | - { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12 }, | ||
320 | - //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12 }, | ||
321 | - { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010 }, | ||
322 | + { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12, 0,0,0 }, | ||
323 | + { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12, 0,0,0 }, | ||
324 | + //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12, 0,0,0 }, | ||
325 | + { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010, 0,0,0 }, | ||
326 | |||
327 | - { NULL, 0, 0 } | ||
328 | + { NULL, 0, 0, 0,0,0 } | ||
329 | }; | ||
330 | |||
331 | static const d3d9_format_t *D3dFindFormat(D3DFORMAT format) | ||
332 | -- | ||
333 | GitLab | ||
334 | |||
335 | |||
336 | From 08c7a66780740679ba1b0abe9e30e73afc6bc271 Mon Sep 17 00:00:00 2001 | ||
337 | From: Steve Lhomme <robux4@ycbcr.xyz> | ||
338 | Date: Wed, 6 Dec 2023 07:48:29 +0100 | ||
339 | Subject: [PATCH 9/9] win32/modules: use cast with GetProcAddress function | ||
340 | pointers | ||
341 | |||
342 | --- | ||
343 | src/text/url.c | 3 ++- | ||
344 | src/win32/plugin.c | 3 ++- | ||
345 | 2 files changed, 4 insertions(+), 2 deletions(-) | ||
346 | |||
347 | diff --git a/src/text/url.c b/src/text/url.c | ||
348 | index b962eb31f849..2eb4b8d10817 100644 | ||
349 | --- a/src/text/url.c | ||
350 | +++ b/src/text/url.c | ||
351 | @@ -892,7 +892,8 @@ static int IdnToAscii(DWORD flags, LPCWSTR str, int len, LPWSTR buf, int size) | ||
352 | int (WINAPI *IdnToAsciiReal)(DWORD, LPCWSTR, int, LPWSTR, int); | ||
353 | int ret = 0; | ||
354 | |||
355 | - IdnToAsciiReal = GetProcAddress(h, "IdnToAscii"); | ||
356 | + IdnToAsciiReal = (int (WINAPI *)(DWORD, LPCWSTR, int, LPWSTR, int)) | ||
357 | + GetProcAddress(h, "IdnToAscii"); | ||
358 | if (IdnToAsciiReal != NULL) | ||
359 | ret = IdnToAsciiReal(flags, str, len, buf, size); | ||
360 | else | ||
361 | diff --git a/src/win32/plugin.c b/src/win32/plugin.c | ||
362 | index 1a65521fca75..b5c336eb99ca 100644 | ||
363 | --- a/src/win32/plugin.c | ||
364 | +++ b/src/win32/plugin.c | ||
365 | @@ -45,7 +45,8 @@ static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode) | ||
366 | |||
367 | BOOL (WINAPI *SetThreadErrorModeReal)(DWORD, DWORD *); | ||
368 | |||
369 | - SetThreadErrorModeReal = GetProcAddress(h, "SetThreadErrorMode"); | ||
370 | + SetThreadErrorModeReal = (BOOL (WINAPI *)(DWORD, DWORD *)) | ||
371 | + GetProcAddress(h, "SetThreadErrorMode"); | ||
372 | if (SetThreadErrorModeReal != NULL) | ||
373 | return SetThreadErrorModeReal(mode, oldmode); | ||
374 | |||
375 | -- | ||
376 | GitLab | ||
377 | |||
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb index 2a6b27add..2d2ecc63b 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb | |||
@@ -25,11 +25,8 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \ | |||
25 | file://0006-configure-Disable-incompatible-function-pointer-type.patch \ | 25 | file://0006-configure-Disable-incompatible-function-pointer-type.patch \ |
26 | file://taglib-2.patch \ | 26 | file://taglib-2.patch \ |
27 | file://0001-taglib-Fix-build-on-x86-32-bit.patch \ | 27 | file://0001-taglib-Fix-build-on-x86-32-bit.patch \ |
28 | file://4645.patch \ | ||
29 | file://4665.patch \ | ||
30 | " | 28 | " |
31 | SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5" | 29 | SRC_URI[sha256sum] = "24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0" |
32 | |||
33 | inherit autotools-brokensep features_check gettext pkgconfig mime-xdg | 30 | inherit autotools-brokensep features_check gettext pkgconfig mime-xdg |
34 | 31 | ||
35 | REQUIRED_DISTRO_FEATURES = "x11" | 32 | REQUIRED_DISTRO_FEATURES = "x11" |
@@ -135,3 +132,5 @@ FILES:${PN}-staticdev += "\ | |||
135 | INSANE_SKIP:${PN} = "dev-so" | 132 | INSANE_SKIP:${PN} = "dev-so" |
136 | 133 | ||
137 | EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" | 134 | EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" |
135 | |||
136 | SKIP_RECIPE[vlc] = "requires porting to ffmpeg >= 7 as of ffmpeg >= 5 it requires extensive changes disabling VAAPI (only supported with vlc >= 4)" | ||
diff --git a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.3.bb b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.6.bb index c52f22aad..7c308bd48 100644 --- a/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.3.bb +++ b/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.6.bb | |||
@@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \ | |||
10 | ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \ | 10 | ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRCREV = "65e4ae83b994616401fc5859e00d5051b72518ba" | 13 | SRCREV = "141b2d5d3f793e20f94421c554d8d9c51143ce0d" |
14 | SRC_URI = " \ | 14 | SRC_URI = " \ |
15 | git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ | 15 | git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ |
16 | file://90-OE-disable-session-dbus-dependent-features.lua \ | 16 | file://90-OE-disable-session-dbus-dependent-features.lua \ |
diff --git a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb index 8ffe652b2..0b90bc0db 100644 --- a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb +++ b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb | |||
@@ -20,7 +20,8 @@ SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;b | |||
20 | file://0001-screencast-Fix-build-with-older-mesa.patch" | 20 | file://0001-screencast-Fix-build-with-older-mesa.patch" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | SRCREV = "776113a4f014639c29d8de8fcb513493ef7b491f" | 23 | PV .= "+git" |
24 | SRCREV = "d9ada849aeca6137915de2df69beaef4e272cc1d" | ||
24 | 25 | ||
25 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'basu', d)}" | 26 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'basu', d)}" |
26 | 27 | ||
diff --git a/meta-networking/conf/include/non-repro-meta-networking.inc b/meta-networking/conf/include/non-repro-meta-networking.inc index 45eed5398..c5313416a 100755 --- a/meta-networking/conf/include/non-repro-meta-networking.inc +++ b/meta-networking/conf/include/non-repro-meta-networking.inc | |||
@@ -1,34 +1,19 @@ | |||
1 | # List of known non-reproducible package of the meta-networking layer | 1 | # List of known non-reproducible package of the meta-networking layer |
2 | # Please keep this list sorted | 2 | # Please keep this list sorted |
3 | KNOWN_NON_REPRO_META_NETWORKING = " \ | 3 | KNOWN_NON_REPRO_META_NETWORKING = " \ |
4 | blueman \ | 4 | babeld \ |
5 | blueman-dbg \ | 5 | babeld-dbg \ |
6 | blueman-src \ | ||
7 | civetweb-dev \ | ||
8 | dhcp-relay-staticdev \ | 6 | dhcp-relay-staticdev \ |
9 | ettercap-src \ | 7 | ettercap-src \ |
10 | fetchmail \ | ||
11 | fetchmail-dbg \ | ||
12 | freediameter \ | 8 | freediameter \ |
13 | freediameter-src \ | ||
14 | freeradius \ | 9 | freeradius \ |
15 | htpdate-doc \ | 10 | htpdate-doc \ |
16 | keepalived \ | ||
17 | keepalived-dbg \ | ||
18 | libbearssl-staticdev \ | 11 | libbearssl-staticdev \ |
19 | libfko3 \ | ||
20 | libfko-client \ | ||
21 | libfko-daemon \ | ||
22 | libfko-dbg \ | ||
23 | libmosquitto1 \ | 12 | libmosquitto1 \ |
24 | libowfat-staticdev \ | 13 | libowfat-staticdev \ |
25 | libruli-staticdev \ | 14 | libruli-staticdev \ |
26 | libsamba-util0 \ | ||
27 | mosquitto \ | 15 | mosquitto \ |
28 | mosquitto-dbg \ | ||
29 | ncftp \ | 16 | ncftp \ |
30 | ncftp-dbg \ | ||
31 | ncftp-src \ | ||
32 | ndisc6-dbg \ | 17 | ndisc6-dbg \ |
33 | ndisc6-misc \ | 18 | ndisc6-misc \ |
34 | ndisc6-ndisc6 \ | 19 | ndisc6-ndisc6 \ |
@@ -38,20 +23,9 @@ KNOWN_NON_REPRO_META_NETWORKING = " \ | |||
38 | netsniff-ng-doc \ | 23 | netsniff-ng-doc \ |
39 | ntpsec-src \ | 24 | ntpsec-src \ |
40 | openl2tp \ | 25 | openl2tp \ |
41 | openl2tp-dbg \ | ||
42 | ot-br-posix \ | ||
43 | ot-br-posix-dbg \ | ||
44 | postfix-cfg \ | 26 | postfix-cfg \ |
45 | proftpd \ | 27 | rp-pppoe \ |
46 | proftpd-dbg \ | 28 | udpcast-doc \ |
47 | proftpd-dev \ | 29 | unbound-doc \ |
48 | rdist \ | ||
49 | rdist-dbg \ | ||
50 | samba-dbg \ | ||
51 | tayga \ | ||
52 | tayga-dbg \ | ||
53 | wolfssl \ | ||
54 | wolfssl-dbg \ | ||
55 | znc \ | 30 | znc \ |
56 | znc-doc \ | ||
57 | " | 31 | " |
diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch deleted file mode 100644 index 913566dce..000000000 --- a/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Subject: [PATCH] Search for cython3 | ||
2 | MIME-Version: 1.0 | ||
3 | Content-Type: text/plain; charset=UTF-8 | ||
4 | Content-Transfer-Encoding: 8bit | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | |||
8 | Signed-off-by: Markus Volk <f_l_k@gmx.net> | ||
9 | --- | ||
10 | meson.build | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | --- a/module/meson.build 2022-02-10 08:49:35.000000000 +0100 | ||
14 | +++ b/module/meson.build 2022-03-29 12:58:03.456193737 +0200 | ||
15 | @@ -1,4 +1,4 @@ | ||
16 | -cython = find_program('cython', required: true) | ||
17 | +cython = find_program('cython3', required: true) | ||
18 | |||
19 | blueman_c = custom_target( | ||
20 | 'blueman_c', | ||
21 | |||
22 | -- | ||
23 | 2.14.3 | ||
24 | |||
diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch new file mode 100644 index 000000000..6e48b7024 --- /dev/null +++ b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 4947abc5ede2dc356f011b7c45f6760c9c2ce9f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 14 Aug 2024 21:26:24 -0700 | ||
4 | Subject: [PATCH] meson: Do not emit absolute path when S != B | ||
5 | |||
6 | build systems like OE build outside sourcetree in such cases it works | ||
7 | ok but cython resolves the input file to absolute path and that gets | ||
8 | emitted into genetate _blueman.c as module name, renders the build | ||
9 | non-reproducible, wish cython had a better way to handle this but there | ||
10 | is not, therefore tweak the meson build rule to account for specifying | ||
11 | workdir to cython which will search the inputs correctly, and use | ||
12 | meson's build_root to emit the output into build dir. This ensures that | ||
13 | it becomes independent of source or build directories and cython does | ||
14 | not generate the absolute paths into generate C code. | ||
15 | |||
16 | See cython discussion on [1] | ||
17 | |||
18 | [1] https://github.com/cython/cython/issues/5949 | ||
19 | |||
20 | Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/2461] | ||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | --- | ||
23 | module/meson.build | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/module/meson.build b/module/meson.build | ||
27 | index 096ad7c8..fddef547 100644 | ||
28 | --- a/module/meson.build | ||
29 | +++ b/module/meson.build | ||
30 | @@ -4,7 +4,7 @@ blueman_c = custom_target( | ||
31 | 'blueman_c', | ||
32 | output: '_blueman.c', | ||
33 | input: '_blueman.pyx', | ||
34 | - command: [cython, '--output-file', '@OUTPUT@', '@INPUT@']) | ||
35 | + command: [cython, '-w', meson.source_root(), '--output-file', join_paths(meson.build_root(), '@OUTPUT@'), join_paths(meson.build_root(), '@INPUT@')]) | ||
36 | |||
37 | sources = [ | ||
38 | blueman_c, | ||
diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch deleted file mode 100644 index cc448b4ff..000000000 --- a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 37f24a9bd62f0a8f3e37eaddd33f2f0c9d3aaa0a Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Fri, 1 Apr 2022 23:12:17 -0700 | ||
4 | Subject: [PATCH] meson: add pythoninstalldir option | ||
5 | |||
6 | In case of cross build, using host python to determine the python | ||
7 | site-packages directory for target is not feasible, add a new option | ||
8 | pythoninstalldir to fix the issue. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/1699] | ||
11 | |||
12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
13 | --- | ||
14 | meson.build | 7 ++++++- | ||
15 | meson_options.txt | 1 + | ||
16 | 2 files changed, 7 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/meson.build b/meson.build | ||
19 | index e12d0ce6..e84457a5 100644 | ||
20 | --- a/meson.build | ||
21 | +++ b/meson.build | ||
22 | @@ -26,7 +26,12 @@ pkgdatadir = join_paths([prefix, get_option('datadir'), package_name]) | ||
23 | bindir = join_paths([prefix, get_option('bindir')]) | ||
24 | libexecdir = join_paths([prefix, get_option('libexecdir')]) | ||
25 | schemadir = join_paths(['share', 'glib-2.0', 'schemas']) | ||
26 | -pythondir = pyinstall.get_install_dir() | ||
27 | +pythoninstalldir = get_option('pythoninstalldir') | ||
28 | +if pythoninstalldir != '' | ||
29 | + pythondir = join_paths([prefix, pythoninstalldir]) | ||
30 | +else | ||
31 | + pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) | ||
32 | +endif | ||
33 | |||
34 | if get_option('policykit') | ||
35 | have_polkit = 'True' | ||
36 | diff --git a/meson_options.txt b/meson_options.txt | ||
37 | index 177d9ab8..3e397d8e 100644 | ||
38 | --- a/meson_options.txt | ||
39 | +++ b/meson_options.txt | ||
40 | @@ -2,6 +2,7 @@ option('runtime_deps_check', type: 'boolean', value: true, description: 'Disable | ||
41 | option('dhcp-config-path', type: 'string', value: '/etc/dhcp3/dhcpd.conf', description: 'Set dhcp3 server configuration path') | ||
42 | option('policykit', type: 'boolean', value: true, description: 'Enable policykit support') | ||
43 | option('pulseaudio', type: 'boolean', value: true, description: 'Enable PulseAudio support') | ||
44 | +option('pythoninstalldir', type: 'string', description: 'Path to python site-packages dir relative to ${prefix}') | ||
45 | option('systemdsystemunitdir', type: 'string', description: 'Path to systemd system unit dir relative to ${prefix}') | ||
46 | option('systemduserunitdir', type: 'string', description: 'Path to systemd user unit dir relative to ${prefix}') | ||
47 | option('sendto-plugins', type: 'array', choices: ['Caja', 'Nemo', 'Nautilus'], value: ['Caja', 'Nemo', 'Nautilus'], description: 'Install sendto plugins for various filemanagers') | ||
48 | -- | ||
49 | 2.34.1 | ||
50 | |||
diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch b/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch deleted file mode 100644 index 282d82137..000000000 --- a/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | Fix fail to enable bluetooth issue | ||
2 | |||
3 | When launch blueman-manager while bluetooth is disable, it may fails | ||
4 | with error: | ||
5 | |||
6 | Failed to enable bluetooth | ||
7 | |||
8 | Because when get bluetooth status right after change its status, the | ||
9 | status may not be updated that plugin applet/KillSwitch.py sets the | ||
10 | bluetooth status via method of another dbus service which doesn't return | ||
11 | immediately. | ||
12 | |||
13 | Provides a new dbus method for PowerManager which checks whether dbus | ||
14 | method SetBluetoothStatus() has finished. Then it makes sure to get | ||
15 | right bluetooth status. | ||
16 | |||
17 | Upstream-Status: Inappropriate | ||
18 | Send to upstream but not accepted: | ||
19 | https://github.com/blueman-project/blueman/pull/1121 | ||
20 | |||
21 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
22 | --- | ||
23 | blueman/Functions.py | 10 ++++++++++ | ||
24 | blueman/plugins/applet/PowerManager.py | 4 ++++ | ||
25 | 2 files changed, 14 insertions(+) | ||
26 | |||
27 | diff --git a/blueman/Functions.py b/blueman/Functions.py | ||
28 | index 3917f42..b4d5eae 100644 | ||
29 | --- a/blueman/Functions.py | ||
30 | +++ b/blueman/Functions.py | ||
31 | @@ -80,6 +80,16 @@ def check_bluetooth_status(message: str, exitfunc: Callable[[], Any]) -> None: | ||
32 | return | ||
33 | |||
34 | applet.SetBluetoothStatus('(b)', True) | ||
35 | + | ||
36 | + timeout = time.time() + 10 | ||
37 | + while applet.GetRequestStatus(): | ||
38 | + time.sleep(0.1) | ||
39 | + if time.time() > timeout: | ||
40 | + # timeout 5s has been set in applet/PowerManager.py | ||
41 | + # so it should NOT reach timeout here | ||
42 | + logging.warning('Should NOT reach timeout.') | ||
43 | + break | ||
44 | + | ||
45 | if not applet.GetBluetoothStatus(): | ||
46 | print('Failed to enable bluetooth') | ||
47 | exitfunc() | ||
48 | diff --git a/blueman/plugins/applet/PowerManager.py b/blueman/plugins/applet/PowerManager.py | ||
49 | index c2f7bc3..bf6c99f 100644 | ||
50 | --- a/blueman/plugins/applet/PowerManager.py | ||
51 | +++ b/blueman/plugins/applet/PowerManager.py | ||
52 | @@ -63,6 +63,7 @@ class PowerManager(AppletPlugin, StatusIconProvider): | ||
53 | self._add_dbus_signal("BluetoothStatusChanged", "b") | ||
54 | self._add_dbus_method("SetBluetoothStatus", ("b",), "", self.request_power_state) | ||
55 | self._add_dbus_method("GetBluetoothStatus", (), "b", self.get_bluetooth_status) | ||
56 | + self._add_dbus_method("GetRequestStatus", (), "b", self.get_request_status) | ||
57 | |||
58 | def on_unload(self) -> None: | ||
59 | self.parent.Plugins.Menu.unregister(self) | ||
60 | @@ -196,6 +197,9 @@ class PowerManager(AppletPlugin, StatusIconProvider): | ||
61 | def get_bluetooth_status(self) -> bool: | ||
62 | return self.current_state | ||
63 | |||
64 | + def get_request_status(self): | ||
65 | + return self.request_in_progress | ||
66 | + | ||
67 | def on_adapter_property_changed(self, _path: str, key: str, value: Any) -> None: | ||
68 | if key == "Powered": | ||
69 | if value and not self.current_state: | ||
70 | -- | ||
71 | 2.31.1 | ||
72 | |||
diff --git a/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb b/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb index 0374d23f0..e7f0987e0 100644 --- a/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb +++ b/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb | |||
@@ -4,20 +4,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
4 | 4 | ||
5 | DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native" | 5 | DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native" |
6 | 6 | ||
7 | inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache useradd features_check | 7 | inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache features_check python3targetconfig |
8 | 8 | ||
9 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" | 9 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" |
10 | 10 | ||
11 | SRC_URI = " \ | 11 | SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable \ |
12 | git://github.com/blueman-project/blueman.git;protocol=https;branch=2-3-stable \ | 12 | file://0001-meson-DO-not-emit-absolute-path-when-S-B.patch" |
13 | file://0001-Search-for-cython3.patch \ | ||
14 | file://0002-fix-fail-to-enable-bluetooth.patch \ | ||
15 | file://0001-meson-add-pythoninstalldir-option.patch \ | ||
16 | " | ||
17 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
18 | SRCREV = "c85e7afb8d6547d4c35b7b639124de8e999c3650" | 14 | SRCREV = "7bcf919ad6ac0ee9a8c66b18b0ca98af877d4c8f" |
19 | 15 | ||
20 | EXTRA_OEMESON = "-Druntime_deps_check=false -Dpythoninstalldir=${@noprefix('PYTHON_SITEPACKAGES_DIR', d)}" | 16 | EXTRA_OEMESON = "-Druntime_deps_check=false \ |
17 | -Dsystemdsystemunitdir=${systemd_system_unitdir} \ | ||
18 | -Dsystemduserunitdir=${systemd_user_unitdir} \ | ||
19 | " | ||
21 | 20 | ||
22 | SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" | 21 | SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" |
23 | SYSTEMD_AUTO_ENABLE:${PN} = "disable" | 22 | SYSTEMD_AUTO_ENABLE:${PN} = "disable" |
@@ -44,6 +43,7 @@ PACKAGECONFIG[polkit] = "-Dpolicykit=true,-Dpolicykit=false" | |||
44 | FILES:${PN} += " \ | 43 | FILES:${PN} += " \ |
45 | ${datadir} \ | 44 | ${datadir} \ |
46 | ${systemd_user_unitdir} \ | 45 | ${systemd_user_unitdir} \ |
46 | ${systemd_system_unitdir} \ | ||
47 | ${PYTHON_SITEPACKAGES_DIR} \ | 47 | ${PYTHON_SITEPACKAGES_DIR} \ |
48 | " | 48 | " |
49 | 49 | ||
@@ -60,29 +60,3 @@ do_install:append() { | |||
60 | ${D}${bindir}/blueman-services \ | 60 | ${D}${bindir}/blueman-services \ |
61 | ${D}${bindir}/blueman-tray | 61 | ${D}${bindir}/blueman-tray |
62 | } | 62 | } |
63 | |||
64 | do_install:append() { | ||
65 | install -d ${D}${datadir}/polkit-1/rules.d | ||
66 | cat >${D}${datadir}/polkit-1/rules.d/51-blueman.rules <<EOF | ||
67 | /* Allow users in wheel group to use blueman feature requiring root without authentication */ | ||
68 | polkit.addRule(function(action, subject) { | ||
69 | if ((action.id == "org.blueman.network.setup" || | ||
70 | action.id == "org.blueman.dhcp.client" || | ||
71 | action.id == "org.blueman.rfkill.setstate" || | ||
72 | action.id == "org.blueman.pppd.pppconnect") && | ||
73 | subject.isInGroup("wheel")) { | ||
74 | |||
75 | return polkit.Result.YES; | ||
76 | } | ||
77 | }); | ||
78 | EOF | ||
79 | } | ||
80 | |||
81 | USERADD_PACKAGES = "${PN}" | ||
82 | USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" | ||
83 | |||
84 | do_install:append() { | ||
85 | # Fix up permissions on polkit rules.d to work with rpm4 constraints | ||
86 | chmod 700 ${D}/${datadir}/polkit-1/rules.d | ||
87 | chown polkitd:root ${D}/${datadir}/polkit-1/rules.d | ||
88 | } | ||
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 8cb4c04fa..a686ef584 100644 --- a/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +++ b/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb | |||
@@ -8,12 +8,12 @@ PARALLEL_MAKE = "" | |||
8 | 8 | ||
9 | DEPENDS = "libpcap libpcre libdnet bison-native libnetfilter-queue" | 9 | DEPENDS = "libpcap libpcre libdnet bison-native libnetfilter-queue" |
10 | 10 | ||
11 | SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ | 11 | SRC_URI = "https://www.snort.org/downloads/snort/${BPN}-${PV}.tar.gz;downloadfilename=${BPN}-${PV}_snort_org.tar.gz \ |
12 | file://disable-run-test-program-while-cross-compiling.patch \ | 12 | file://disable-run-test-program-while-cross-compiling.patch \ |
13 | file://0001-correct-the-location-of-unistd.h.patch \ | 13 | file://0001-correct-the-location-of-unistd.h.patch \ |
14 | file://daq-fix-incompatible-pointer-type-error.patch \ | 14 | file://daq-fix-incompatible-pointer-type-error.patch \ |
15 | " | 15 | " |
16 | SRC_URI[sha256sum] = "bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e" | 16 | SRC_URI[sha256sum] = "d1f6709bc5dbddee3fdf170cdc1e49fb926e2031d4869ecf367a8c47efc87279" |
17 | # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking | 17 | # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking |
18 | # this error from test-dependencies script: | 18 | # this error from test-dependencies script: |
19 | # daq/daq/latest lost dependency on libdnet libmnl libnetfilter-queue libnfnetlink | 19 | # daq/daq/latest lost dependency on libdnet libmnl libnetfilter-queue libnfnetlink |
diff --git a/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb b/meta-networking/recipes-connectivity/daq/libdaq_3.0.16.bb index 74964e074..7834d7555 100644 --- a/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb +++ b/meta-networking/recipes-connectivity/daq/libdaq_3.0.16.bb | |||
@@ -11,7 +11,8 @@ inherit autotools pkgconfig | |||
11 | 11 | ||
12 | SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master \ | 12 | SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master \ |
13 | file://0001-example-Use-lm-for-the-fst-module.patch" | 13 | file://0001-example-Use-lm-for-the-fst-module.patch" |
14 | SRCREV = "4e68d7ba6940df9a1503599d7b177029112d6b6a" | 14 | |
15 | SRCREV = "2ffe084d4d4ccf4ebc5c23ef119aa1ae223ce2ae" | ||
15 | 16 | ||
16 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
17 | 18 | ||
diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 34f8a7e3e..cc36fbd4f 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" | |||
41 | FILES:${PN}-relay = "${sbindir}/${PN}-relay" | 41 | FILES:${PN}-relay = "${sbindir}/${PN}-relay" |
42 | FILES:${PN}-requestor = "${sbindir}/${PN}-requestor" | 42 | FILES:${PN}-requestor = "${sbindir}/${PN}-requestor" |
43 | FILES:${PN}-server = "${sbindir}/${PN}-server" | 43 | FILES:${PN}-server = "${sbindir}/${PN}-server" |
44 | |||
45 | # http://errors.yoctoproject.org/Errors/Details/766880/ | ||
46 | # git/Port-linux/interface.c:118:18: error: assignment to '__caddr_t' {aka 'char *'} from incompatible pointer type 'struct ethtool_value *' [-Wincompatible-pointer-types] | ||
47 | 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.5.bb index 8397380c1..ec68c1d92 100644 --- a/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb +++ b/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.5.bb | |||
@@ -39,7 +39,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0 | |||
39 | 39 | ||
40 | raddbdir = "${sysconfdir}/${MLPREFIX}raddb" | 40 | raddbdir = "${sysconfdir}/${MLPREFIX}raddb" |
41 | 41 | ||
42 | SRCREV = "db3d1924d9a2e8d37c43872932621f69cfdbb099" | 42 | SRCREV = "a7acce80f5ba2271d9aeb737a4a91a5bf8317f31" |
43 | 43 | ||
44 | UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" | 44 | UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" |
45 | 45 | ||
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.9.bb index db79241f2..abb5ad244 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.9.bb | |||
@@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" | |||
23 | SECTION = "libs" | 23 | SECTION = "libs" |
24 | 24 | ||
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
26 | SRCREV = "5a764e5555c64337ed17444410269ff21cb617b1" | 26 | SRCREV = "5e146adef63b326b04282252639bebc2730939c6" |
27 | SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-2.28 \ | 27 | SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-2.28 \ |
28 | file://run-ptest \ | 28 | file://run-ptest \ |
29 | " | 29 | " |
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb index 7011d54f3..62c3add2a 100644 --- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb +++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb | |||
@@ -23,12 +23,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" | |||
23 | SECTION = "libs" | 23 | SECTION = "libs" |
24 | 24 | ||
25 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
26 | SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=master \ | 26 | SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-3.6 \ |
27 | git://github.com/Mbed-TLS/mbedtls-framework.git;protocol=https;branch=main;destsuffix=git/framework;name=framework \ | 27 | git://github.com/Mbed-TLS/mbedtls-framework.git;protocol=https;branch=main;destsuffix=git/framework;name=framework \ |
28 | file://run-ptest" | 28 | file://run-ptest" |
29 | 29 | ||
30 | SRCREV = "2ca6c285a0dd3f33982dd57299012dacab1ff206" | 30 | SRCREV = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3" |
31 | SRCREV_framework = "750634d3a51eb9d61b59fd5d801546927c946588" | 31 | SRCREV_framework = "94599c0e3b5036e086446a51a3f79640f70f22f6" |
32 | SRCREV_FORMAT .= "_framework" | 32 | SRCREV_FORMAT .= "_framework" |
33 | 33 | ||
34 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 34 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
@@ -74,7 +74,8 @@ sysroot_stage_all:append() { | |||
74 | 74 | ||
75 | do_install_ptest () { | 75 | do_install_ptest () { |
76 | install -d ${D}${PTEST_PATH}/tests | 76 | install -d ${D}${PTEST_PATH}/tests |
77 | install -d ${D}${PTEST_PATH}/framework | ||
77 | cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/ | 78 | cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/ |
78 | find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete | 79 | find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete |
79 | cp -fR ${S}/tests/data_files ${D}${PTEST_PATH}/tests/ | 80 | cp -fR ${S}/framework/data_files ${D}${PTEST_PATH}/framework/ |
80 | } | 81 | } |
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.12.0.bb index f44526ff9..2d2055ba6 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.12.0.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/Netw | |||
13 | 13 | ||
14 | 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)}" | 14 | 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)}" |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "2128de06f91b33c13d63cdaa6e178bc1ca57fc770cde3bc7c24891f4d9824501" | 16 | SRC_URI[sha256sum] = "903fd4c0aebd2aa7ac70c9d8c2bed8df922655d22d764514403566ae89b7e886" |
17 | 17 | ||
18 | S = "${WORKDIR}/NetworkManager-openvpn-${PV}" | 18 | S = "${WORKDIR}/NetworkManager-openvpn-${PV}" |
19 | 19 | ||
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb index 47287951f..a9b9233b7 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb | |||
@@ -44,7 +44,7 @@ SRC_URI = " \ | |||
44 | " | 44 | " |
45 | 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)}" | 45 | 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)}" |
46 | 46 | ||
47 | SRC_URI[sha256sum] = "fc80b942de38e329468e6fc1dfb40aad6a78d02ddf6b8ec31f9acc6460b8723f" | 47 | SRC_URI[sha256sum] = "5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613" |
48 | 48 | ||
49 | S = "${WORKDIR}/NetworkManager-${PV}" | 49 | S = "${WORKDIR}/NetworkManager-${PV}" |
50 | 50 | ||
@@ -102,7 +102,7 @@ PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" | |||
102 | PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5" | 102 | PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5" |
103 | # consolekit is not picked by shlibs, so add it to RDEPENDS too | 103 | # consolekit is not picked by shlibs, so add it to RDEPENDS too |
104 | PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" | 104 | PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" |
105 | PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info,modemmanager mobile-broadband-provider-info" | 105 | PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info" |
106 | PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=${sbindir}/pppd,-Dppp=false,ppp" | 106 | PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=${sbindir}/pppd,-Dppp=false,ppp" |
107 | PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" | 107 | PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" |
108 | PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" | 108 | PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" |
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 d7be1cd71..ec930de27 100644 --- a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb | |||
@@ -29,11 +29,15 @@ inherit pkgconfig cmake systemd | |||
29 | # for (uint8_t i = 0;; i++) | 29 | # for (uint8_t i = 0;; i++) |
30 | CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare -Wno-error=unused-but-set-variable" | 30 | CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare -Wno-error=unused-but-set-variable" |
31 | 31 | ||
32 | LDFLAGS:append:riscv32 = " -latomic" | ||
33 | |||
32 | EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ | 34 | EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ |
33 | -DOTBR_DBUS=ON \ | 35 | -DOTBR_DBUS=ON \ |
34 | -DOTBR_REST=ON \ | 36 | -DOTBR_REST=ON \ |
35 | -DOTBR_WEB=OFF \ | 37 | -DOTBR_WEB=OFF \ |
36 | -DCMAKE_LIBRARY_PATH=${libdir} \ | 38 | -DCMAKE_LIBRARY_PATH=${libdir} \ |
39 | -DOT_POSIX_PRODUCT_CONFIG=${sysconfdir}/openthread.conf.example \ | ||
40 | -DOT_POSIX_FACTORY_CONFIG=${sysconfdir}/openthread.conf.example \ | ||
37 | -DOTBR_MDNS=avahi \ | 41 | -DOTBR_MDNS=avahi \ |
38 | -DOTBR_BACKBONE_ROUTER=ON \ | 42 | -DOTBR_BACKBONE_ROUTER=ON \ |
39 | -DOTBR_BORDER_ROUTING=ON \ | 43 | -DOTBR_BORDER_ROUTING=ON \ |
@@ -63,3 +67,7 @@ RCONFLICTS:${PN} = "ot-daemon" | |||
63 | 67 | ||
64 | FILES:${PN} += "${systemd_unitdir}/*" | 68 | FILES:${PN} += "${systemd_unitdir}/*" |
65 | FILES:${PN} += "${datadir}/*" | 69 | FILES:${PN} += "${datadir}/*" |
70 | |||
71 | # http://errors.yoctoproject.org/Errors/Details/766903/ | ||
72 | # 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] | ||
73 | CXXFLAGS += "-Wno-error=attributes" | ||
diff --git a/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb b/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb index d81cc9a3d..e6d99431b 100644 --- a/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb +++ b/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb | |||
@@ -38,7 +38,7 @@ DEPENDS = "bison-native" | |||
38 | 38 | ||
39 | inherit autotools-brokensep | 39 | inherit autotools-brokensep |
40 | 40 | ||
41 | EXTRA_OEMAKE = "BIN_GROUP=root MAN_GROUP=root RDIST_MODE=755 RDISTD_MODE=755 MAN_MODE=644" | 41 | EXTRA_OEMAKE = "CPPFLAGS='${CFLAGS}' BIN_GROUP=root MAN_GROUP=root RDIST_MODE=755 RDISTD_MODE=755 MAN_MODE=644" |
42 | 42 | ||
43 | # http://errors.yoctoproject.org/Errors/Details/186972/ | 43 | # http://errors.yoctoproject.org/Errors/Details/186972/ |
44 | COMPATIBLE_HOST:libc-musl = 'null' | 44 | COMPATIBLE_HOST:libc-musl = 'null' |
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.19.7.bb b/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb index 796f1697f..09d5608df 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.19.7.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb | |||
@@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \ | |||
31 | file://samba-4.3.9-remove-getpwent_r.patch \ | 31 | file://samba-4.3.9-remove-getpwent_r.patch \ |
32 | " | 32 | " |
33 | 33 | ||
34 | SRC_URI[sha256sum] = "2bbb800af2d6bc7b9c23e708cd58d008da3bfa6ef7e621d9ec8b53387efee445" | 34 | SRC_URI[sha256sum] = "1aeff76c207f383477ce4badebd154691c408d2e15b01b333c85eb775468ddf6" |
35 | 35 | ||
36 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" | 36 | UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" |
37 | 37 | ||
diff --git a/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch index ec7b90cfb..626f41273 100644 --- a/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch +++ b/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch | |||
@@ -8,6 +8,7 @@ could be absolute build paths, since these files end up in dbg packages | |||
8 | this can be flagged as a build/packaging warning. | 8 | this can be flagged as a build/packaging warning. |
9 | 9 | ||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | --- | 13 | --- |
13 | cmake/configure_options.cmake | 2 +- | 14 | cmake/configure_options.cmake | 2 +- |
diff --git a/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb b/meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb index ee84aa17e..0f3d0e986 100644 --- a/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb +++ b/meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb | |||
@@ -10,7 +10,8 @@ DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind l | |||
10 | SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ | 10 | SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ |
11 | file://0001-cmake-Check-for-HP-libunwind.patch \ | 11 | file://0001-cmake-Check-for-HP-libunwind.patch \ |
12 | file://0001-cmake-Pass-noline-flag-to-flex.patch" | 12 | file://0001-cmake-Pass-noline-flag-to-flex.patch" |
13 | SRCREV = "e7312efd840d66a52a2019abe1db7cc89ca0f39a" | 13 | |
14 | SRCREV = "5598e8dd87829cb1bbb478a7b6d4f6fb8b5dabfe" | ||
14 | 15 | ||
15 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
16 | 17 | ||
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 f6b58559d..f36435c8e 100644 --- a/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb +++ b/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb | |||
@@ -12,6 +12,8 @@ SRC_URI[sha256sum] = "2b1f7927a9d2dcff9095aff3c271924b052ccfd2faca9588b277431a44 | |||
12 | SYSTEMD_PACKAGES = "${PN}" | 12 | SYSTEMD_PACKAGES = "${PN}" |
13 | SYSTEMD_SERVICE:${PN} = "tayga.service" | 13 | SYSTEMD_SERVICE:${PN} = "tayga.service" |
14 | 14 | ||
15 | EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" | ||
16 | |||
15 | do_install:append() { | 17 | do_install:append() { |
16 | install -m 0644 ${UNPACKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf | 18 | install -m 0644 ${UNPACKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf |
17 | install -d ${D}${systemd_unitdir}/system/ | 19 | install -d ${D}${systemd_unitdir}/system/ |
@@ -19,3 +21,4 @@ do_install:append() { | |||
19 | } | 21 | } |
20 | 22 | ||
21 | inherit autotools systemd | 23 | inherit autotools systemd |
24 | |||
diff --git a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.0.bb b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb index 47c14dd1a..009434d96 100644 --- a/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.0.bb +++ b/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb | |||
@@ -13,10 +13,13 @@ PROVIDES += "cyassl" | |||
13 | RPROVIDES:${PN} = "cyassl" | 13 | RPROVIDES:${PN} = "cyassl" |
14 | 14 | ||
15 | SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master" | 15 | SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master" |
16 | SRCREV = "8970ff4c34034dbb3594943d11f8c9d4c5512bd5" | 16 | SRCREV = "00e42151ca061463ba6a95adb2290f678cbca472" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | inherit autotools | 20 | inherit autotools |
21 | 21 | ||
22 | PACKAGECONFIG ?= "reproducible-build" | ||
23 | |||
24 | PACKAGECONFIG[reproducible-build] = "--enable-reproducible-build,--disable-reproducible-build," | ||
22 | BBCLASSEXTEND += "native nativesdk" | 25 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch deleted file mode 100644 index 2a583466e..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From d0d5ac317dab11610a5fc91ca3e7f5ad72ce2236 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | ||
3 | Date: Tue, 29 Oct 2019 13:19:37 +0800 | ||
4 | Subject: [PATCH] Bug fix for pid_t not found on musl. | ||
5 | |||
6 | When compiling version 5.1.6 on musl, the following error occurs: | ||
7 | log.h:49:8: error: unknown type name 'pid_t' | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | ||
12 | --- | ||
13 | lib/defaults.c | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
16 | diff --git a/lib/defaults.c b/lib/defaults.c | ||
17 | index a6ea116..b3ecfa5 100644 | ||
18 | --- a/lib/defaults.c | ||
19 | +++ b/lib/defaults.c | ||
20 | @@ -21,6 +21,7 @@ | ||
21 | #include <string.h> | ||
22 | #include <sys/utsname.h> | ||
23 | #include <sys/stat.h> | ||
24 | +#include <sys/types.h> | ||
25 | #include <stdarg.h> | ||
26 | |||
27 | #include "config.h" | ||
28 | -- | ||
29 | 2.20.1 | ||
30 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch deleted file mode 100644 index 6128f3d0e..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 987c8f4a718cdd6b764592ba7510090a59623959 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 31 Mar 2017 19:10:57 -0700 | ||
4 | Subject: [PATCH] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF | ||
5 | |||
6 | if they are not defined as is in musl then define | ||
7 | them here | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | --- | ||
12 | Upstream-Status: Pending | ||
13 | |||
14 | include/automount.h | 8 ++++++++ | ||
15 | include/nsswitch.h | 3 +++ | ||
16 | 2 files changed, 11 insertions(+) | ||
17 | |||
18 | diff --git a/include/automount.h b/include/automount.h | ||
19 | index cc336ad..8bdcf12 100644 | ||
20 | --- a/include/automount.h | ||
21 | +++ b/include/automount.h | ||
22 | @@ -42,6 +42,14 @@ | ||
23 | |||
24 | #define ENABLE_CORES 1 | ||
25 | |||
26 | +#ifndef __SWORD_TYPE | ||
27 | +# if __WORDSIZE == 32 /* System word size */ | ||
28 | +# define __SWORD_TYPE int | ||
29 | +# else /* __WORDSIZE == 64 */ | ||
30 | +# define __SWORD_TYPE long int | ||
31 | +# endif | ||
32 | +#endif | ||
33 | + | ||
34 | /* We MUST have the paths to mount(8) and umount(8) */ | ||
35 | #ifndef HAVE_MOUNT | ||
36 | #error Failed to locate mount(8)! | ||
37 | diff --git a/include/nsswitch.h b/include/nsswitch.h | ||
38 | index d3e4027..7a0c38f 100644 | ||
39 | --- a/include/nsswitch.h | ||
40 | +++ b/include/nsswitch.h | ||
41 | @@ -24,6 +24,9 @@ | ||
42 | #include <netdb.h> | ||
43 | #include "list.h" | ||
44 | |||
45 | +#ifndef _PATH_NSSWITCH_CONF | ||
46 | +#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf" | ||
47 | +#endif | ||
48 | #define NSSWITCH_FILE _PATH_NSSWITCH_CONF | ||
49 | |||
50 | enum nsswitch_status { | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch deleted file mode 100644 index f16ae5277..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch +++ /dev/null | |||
@@ -1,115 +0,0 @@ | |||
1 | From 9fe90ab1e333b2e2bed370ff13ba552eb54c3aaf Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 17 Jul 2021 09:56:28 -0700 | ||
4 | Subject: [PATCH] Define __SWORD_TYPE if undefined | ||
5 | |||
6 | These fixes are inspired when building autofs on musl | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | daemon/automount.c | 20 ++++++++++++++------ | ||
12 | include/hash.h | 5 +++++ | ||
13 | lib/log.c | 6 +++++- | ||
14 | 3 files changed, 24 insertions(+), 7 deletions(-) | ||
15 | |||
16 | --- a/daemon/automount.c | ||
17 | +++ b/daemon/automount.c | ||
18 | @@ -1,7 +1,7 @@ | ||
19 | /* ----------------------------------------------------------------------- * | ||
20 | * | ||
21 | * automount.c - Linux automounter daemon | ||
22 | - * | ||
23 | + * | ||
24 | * Copyright 1997 Transmeta Corporation - All Rights Reserved | ||
25 | * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org> | ||
26 | * Copyright 2001-2005 Ian Kent <raven@themaw.net> | ||
27 | @@ -11,7 +11,7 @@ | ||
28 | * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, | ||
29 | * USA; either version 2 of the License, or (at your option) any later | ||
30 | * version. | ||
31 | - * | ||
32 | + * | ||
33 | * This program is distributed in the hope that it will be useful, | ||
34 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
35 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
36 | @@ -40,6 +40,14 @@ | ||
37 | #include <systemd/sd-daemon.h> | ||
38 | #endif | ||
39 | |||
40 | +#ifndef __SWORD_TYPE | ||
41 | +# if __WORDSIZE == 32 /* System word size */ | ||
42 | +# define __SWORD_TYPE int | ||
43 | +# else /* __WORDSIZE == 64 */ | ||
44 | +# define __SWORD_TYPE long int | ||
45 | +# endif | ||
46 | +#endif | ||
47 | + | ||
48 | #include "automount.h" | ||
49 | #if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND) | ||
50 | #include <dlfcn.h> | ||
51 | @@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap, | ||
52 | dev, buf, st.st_dev); | ||
53 | return -1; | ||
54 | } | ||
55 | - | ||
56 | + | ||
57 | /* | ||
58 | * Last element of path may be a symbolic link; all others | ||
59 | * are directories (and the last directory element is | ||
60 | @@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap | ||
61 | |||
62 | counter.count = 0; | ||
63 | counter.dev = dev; | ||
64 | - | ||
65 | + | ||
66 | if (walk_tree(path, counter_fn, 1, ap, &counter) == -1) | ||
67 | return -1; | ||
68 | |||
69 | @@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsi | ||
70 | /* | ||
71 | * An automount path can be made up of subdirectories. So, to | ||
72 | * create the fifo name, we will just replace instances of '/' with | ||
73 | - * '-'. | ||
74 | + * '-'. | ||
75 | */ | ||
76 | p = fifo_name + strlen(fifodir); | ||
77 | while (*p != '\0') { | ||
78 | @@ -1640,7 +1648,7 @@ static void return_start_status(void *ar | ||
79 | sc->done = 1; | ||
80 | |||
81 | /* | ||
82 | - * Startup condition mutex must be locked during | ||
83 | + * Startup condition mutex must be locked during | ||
84 | * the startup process. | ||
85 | */ | ||
86 | status = pthread_cond_signal(&sc->cond); | ||
87 | --- a/include/hash.h | ||
88 | +++ b/include/hash.h | ||
89 | @@ -5,6 +5,11 @@ | ||
90 | |||
91 | #include <sys/types.h> | ||
92 | #include <stdint.h> | ||
93 | +#include <linux/stddef.h> | ||
94 | + | ||
95 | +#ifndef __GLIBC__ | ||
96 | +#include <sys/reg.h> | ||
97 | +#endif | ||
98 | |||
99 | /* | ||
100 | * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and | ||
101 | --- a/lib/log.c | ||
102 | +++ b/lib/log.c | ||
103 | @@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons | ||
104 | char buffer[ATTEMPT_ID_SIZE + 1]; | ||
105 | char *prefixed_msg = NULL; | ||
106 | |||
107 | - attempt_id = pthread_getspecific(key_thread_attempt_id); | ||
108 | + if (key_thread_attempt_id) { | ||
109 | + attempt_id = pthread_getspecific(key_thread_attempt_id); | ||
110 | + } else { | ||
111 | + attempt_id = 0; | ||
112 | + } | ||
113 | if (attempt_id) { | ||
114 | int len = sizeof(buffer) + 1 + strlen(msg) + 1; | ||
115 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch deleted file mode 100644 index f18f237d9..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From d7a34bb388e33d16260b67275cdb58f9c877d324 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Tue, 27 Nov 2018 15:27:47 +0800 | ||
4 | Subject: [PATCH] From 6d24365f0828185fd1bb4d199209ca07eb95c41d Mon Sep 17 | ||
5 | 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 24 Aug 2018 | ||
6 | 06:24:36 +0000 Subject: [PATCH] Do not hardcode path for pkg.m4 | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | |||
12 | update patch to version 5.1.6 | ||
13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
14 | |||
15 | --- | ||
16 | configure.in | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/configure.in b/configure.in | ||
20 | index 07c2051..e85d718 100644 | ||
21 | --- a/configure.in | ||
22 | +++ b/configure.in | ||
23 | @@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl | ||
24 | AC_INIT(.autofs-5.1.8) | ||
25 | |||
26 | # for pkg-config macros | ||
27 | -m4_include([/usr/share/aclocal/pkg.m4]) | ||
28 | +m4_include([pkg.m4]) | ||
29 | |||
30 | # | ||
31 | # autofs installs by default in /usr | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch deleted file mode 100644 index caf010511..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 88f991b0ebb6fb8fcaad3d0eb8fb51a7439d053e Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabian Groffen <grobian@gentoo.org> | ||
3 | Date: Wed, 2 Feb 2022 09:27:13 +0800 | ||
4 | Subject: [PATCH 1/2] autofs-5.1.8 - add autofs_strerror_r() helper for musl | ||
5 | |||
6 | If using musl libc the XSI-compliant variant strerror_r() which returns | ||
7 | an integer instead of a pointer so add a helper function to handle this | ||
8 | case. | ||
9 | |||
10 | Signed-off-by: Fabian Groffen <grobian@gentoo.org> | ||
11 | Signed-off-by: Ian Kent <raven@themaw.net> | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | Upstream-Status: Pending | ||
15 | |||
16 | include/automount.h | 5 +++++ | ||
17 | lib/log.c | 10 ++++++++++ | ||
18 | 2 files changed, 15 insertions(+) | ||
19 | |||
20 | diff --git a/include/automount.h b/include/automount.h | ||
21 | index 8cd8b3a..f759e59 100644 | ||
22 | --- a/include/automount.h | ||
23 | +++ b/include/automount.h | ||
24 | @@ -51,6 +51,11 @@ | ||
25 | # endif | ||
26 | #endif | ||
27 | |||
28 | +#ifndef __GLIBC__ | ||
29 | +# define strerror_r(N,B,S) autofs_strerror_r(N,B,S) | ||
30 | +char *autofs_strerror_r(int errnum, char *buf, size_t buflen); /* GNU */ | ||
31 | +#endif | ||
32 | + | ||
33 | /* We MUST have the paths to mount(8) and umount(8) */ | ||
34 | #ifndef HAVE_MOUNT | ||
35 | #error Failed to locate mount(8)! | ||
36 | diff --git a/lib/log.c b/lib/log.c | ||
37 | index 39b1e3b..b99fa39 100644 | ||
38 | --- a/lib/log.c | ||
39 | +++ b/lib/log.c | ||
40 | @@ -368,3 +368,13 @@ pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label) { | ||
41 | |||
42 | return ppid; | ||
43 | } | ||
44 | + | ||
45 | +#ifndef __GLIBC__ | ||
46 | +# undef strerror_r | ||
47 | +char *autofs_strerror_r(int errnum, char *buf, size_t buflen) { | ||
48 | + int s = strerror_r(errnum, buf, buflen); | ||
49 | + if (s) | ||
50 | + return NULL; | ||
51 | + return buf; | ||
52 | +} | ||
53 | +#endif | ||
54 | -- | ||
55 | 2.37.3 | ||
56 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch deleted file mode 100644 index 8eec3014a..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 745e355ac8b595a27e1fcca75bf01d3e244f4a5f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 7 Sep 2017 22:22:31 -0700 | ||
4 | Subject: [PATCH] modules/lookup_multi.c: Replace __S_IEXEC with S_IEXEC | ||
5 | |||
6 | __S_IEXEC is internal to libc and may not be available on | ||
7 | all libc e.g. musl | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | --- | ||
12 | Upstream-Status: Pending | ||
13 | |||
14 | modules/lookup_multi.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c | ||
18 | index 3ecda6d..cf109de 100644 | ||
19 | --- a/modules/lookup_multi.c | ||
20 | +++ b/modules/lookup_multi.c | ||
21 | @@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt, | ||
22 | continue; | ||
23 | } | ||
24 | |||
25 | - if (st.st_mode & __S_IEXEC) | ||
26 | + if (st.st_mode & S_IEXEC) | ||
27 | type = src_prog; | ||
28 | else | ||
29 | type = src_file; | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch b/meta-networking/recipes-daemons/autofs/autofs/0001-no-bash.patch index f91c307d3..cd9b14358 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0001-no-bash.patch | |||
@@ -1,16 +1,18 @@ | |||
1 | From a3007d7ea930823926611081bb873ddd771325cb Mon Sep 17 00:00:00 2001 | 1 | From f53458e0b4cca0b0eedcd00b0e90b39d91228085 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 5 Jan 2013 19:53:10 -0800 | 3 | Date: Sat, 5 Jan 2013 19:53:10 -0800 |
4 | Subject: [PATCH] no bash | ||
4 | 5 | ||
5 | --- | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
8 | samples/auto.net | 2 +- | 10 | samples/auto.net | 2 +- |
9 | samples/auto.smb | 2 +- | 11 | samples/auto.smb | 2 +- |
10 | 2 files changed, 2 insertions(+), 2 deletions(-) | 12 | 2 files changed, 2 insertions(+), 2 deletions(-) |
11 | 13 | ||
12 | diff --git a/samples/auto.net b/samples/auto.net | 14 | diff --git a/samples/auto.net b/samples/auto.net |
13 | index 0384f61..61215f6 100755 | 15 | index c5b145d..a09d56d 100755 |
14 | --- a/samples/auto.net | 16 | --- a/samples/auto.net |
15 | +++ b/samples/auto.net | 17 | +++ b/samples/auto.net |
16 | @@ -1,4 +1,4 @@ | 18 | @@ -1,4 +1,4 @@ |
@@ -20,7 +22,7 @@ index 0384f61..61215f6 100755 | |||
20 | # This file must be executable to work! chmod 755! | 22 | # This file must be executable to work! chmod 755! |
21 | 23 | ||
22 | diff --git a/samples/auto.smb b/samples/auto.smb | 24 | diff --git a/samples/auto.smb b/samples/auto.smb |
23 | index 6af5d85..d296b81 100755 | 25 | index f6d41d3..0d945ee 100755 |
24 | --- a/samples/auto.smb | 26 | --- a/samples/auto.smb |
25 | +++ b/samples/auto.smb | 27 | +++ b/samples/auto.smb |
26 | @@ -1,4 +1,4 @@ | 28 | @@ -1,4 +1,4 @@ |
@@ -29,3 +31,6 @@ index 6af5d85..d296b81 100755 | |||
29 | 31 | ||
30 | # This file must be executable to work! chmod 755! | 32 | # This file must be executable to work! chmod 755! |
31 | 33 | ||
34 | -- | ||
35 | 2.25.1 | ||
36 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch deleted file mode 100644 index d67f6300c..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | From 096e33743158e0e8c04d60d01cc66e2945d79777 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Tue, 27 Nov 2018 16:52:35 +0800 | ||
4 | Subject: [PATCH] From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 | ||
5 | 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 | ||
6 | 19:12:10 -0700 Subject: [PATCH] Replace __S_IEXEC with S_IEXEC | ||
7 | |||
8 | S_IEXEC is portable | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | |||
12 | update patch to version 5.1.5 | ||
13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
14 | --- | ||
15 | Upstream-Status: Pending | ||
16 | |||
17 | daemon/lookup.c | 6 +++--- | ||
18 | modules/lookup_multi.c | 2 +- | ||
19 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
20 | |||
21 | --- a/daemon/lookup.c | ||
22 | +++ b/daemon/lookup.c | ||
23 | @@ -397,7 +397,7 @@ static int read_file_source_instance(str | ||
24 | return NSS_STATUS_NOTFOUND; | ||
25 | } | ||
26 | |||
27 | - if (st.st_mode & __S_IEXEC) | ||
28 | + if (st.st_mode & S_IEXEC) | ||
29 | type = src_prog; | ||
30 | else | ||
31 | type = src_file; | ||
32 | @@ -930,7 +930,7 @@ static int lookup_name_file_source_insta | ||
33 | return NSS_STATUS_NOTFOUND; | ||
34 | } | ||
35 | |||
36 | - if (st.st_mode & __S_IEXEC) | ||
37 | + if (st.st_mode & S_IEXEC) | ||
38 | type = src_prog; | ||
39 | else | ||
40 | type = src_file; | ||
41 | @@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map | ||
42 | if (!S_ISREG(st.st_mode)) | ||
43 | return NULL; | ||
44 | |||
45 | - if (st.st_mode & __S_IEXEC) | ||
46 | + if (st.st_mode & S_IEXEC) | ||
47 | type = "program"; | ||
48 | else | ||
49 | type = "file"; | ||
50 | --- a/modules/lookup_multi.c | ||
51 | +++ b/modules/lookup_multi.c | ||
52 | @@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_looku | ||
53 | continue; | ||
54 | } | ||
55 | |||
56 | - if (st.st_mode & __S_IEXEC) | ||
57 | + if (st.st_mode & S_IEXEC) | ||
58 | type = src_prog; | ||
59 | else | ||
60 | type = src_file; | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch deleted file mode 100644 index 9d0caae31..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch +++ /dev/null | |||
@@ -1,106 +0,0 @@ | |||
1 | From 1c0b0b70a276280f431d72319109a0bbc0267970 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabian Groffen <grobian@gentoo.org> | ||
3 | Date: Wed, 2 Feb 2022 10:15:22 +0800 | ||
4 | Subject: [PATCH 2/2] autofs-5.1.8 - handle innetgr() not present in musl | ||
5 | |||
6 | The function innetgr(3) may not be present in musl libc, add a check | ||
7 | for this. | ||
8 | |||
9 | Originally contributed by Fabian, modified by me. | ||
10 | |||
11 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=f60e40af3c038b8955325a11b7294ad38c15c9e8] | ||
12 | Signed-off-by: Fabian Groffen <grobian@gentoo.org> | ||
13 | Signed-off-by: Ian Kent <raven@themaw.net> | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | configure | 6 ++++++ | ||
17 | configure.in | 2 +- | ||
18 | include/config.h.in | 3 +++ | ||
19 | modules/parse_amd.c | 7 +++++++ | ||
20 | 4 files changed, 17 insertions(+), 1 deletion(-) | ||
21 | |||
22 | --- a/configure.in | ||
23 | +++ b/configure.in | ||
24 | @@ -169,7 +169,7 @@ AF_CHECK_SSS_LIB(SSS_AUTOFS, libsss_auto | ||
25 | AC_SUBST(HAVE_SSS_AUTOFS) | ||
26 | AC_SUBST(sssldir) | ||
27 | |||
28 | -AC_CHECK_FUNCS(pipe2) | ||
29 | +AC_CHECK_FUNCS(pipe2 innetgr) | ||
30 | |||
31 | # | ||
32 | # Newer mounts have the -s (sloppy) option to ignore unknown options, | ||
33 | --- a/include/config.h.in | ||
34 | +++ b/include/config.h.in | ||
35 | @@ -30,6 +30,9 @@ | ||
36 | /* Define to 1 if you have the `getservbyname' function. */ | ||
37 | #undef HAVE_GETSERVBYNAME | ||
38 | |||
39 | +/* Define to 1 if you have the `innetgr' function. */ | ||
40 | +#undef HAVE_INNETGR | ||
41 | + | ||
42 | /* Define to 1 if you have the <inttypes.h> header file. */ | ||
43 | #undef HAVE_INTTYPES_H | ||
44 | |||
45 | @@ -45,9 +48,6 @@ | ||
46 | /* Define if you have the Linux /proc filesystem. */ | ||
47 | #undef HAVE_LINUX_PROCFS | ||
48 | |||
49 | -/* Define to 1 if you have the <memory.h> header file. */ | ||
50 | -#undef HAVE_MEMORY_H | ||
51 | - | ||
52 | /* define if you have MOUNT */ | ||
53 | #undef HAVE_MOUNT | ||
54 | |||
55 | @@ -69,6 +69,9 @@ | ||
56 | /* Define to 1 if you have the <stdint.h> header file. */ | ||
57 | #undef HAVE_STDINT_H | ||
58 | |||
59 | +/* Define to 1 if you have the <stdio.h> header file. */ | ||
60 | +#undef HAVE_STDIO_H | ||
61 | + | ||
62 | /* Define to 1 if you have the <stdlib.h> header file. */ | ||
63 | #undef HAVE_STDLIB_H | ||
64 | |||
65 | @@ -141,7 +144,9 @@ | ||
66 | /* define if you have YACC */ | ||
67 | #undef PATH_YACC | ||
68 | |||
69 | -/* Define to 1 if you have the ANSI C header files. */ | ||
70 | +/* Define to 1 if all of the C90 standard headers exist (not just the ones | ||
71 | + required in a freestanding environment). This macro is provided for | ||
72 | + backward compatibility; new code need not use it. */ | ||
73 | #undef STDC_HEADERS | ||
74 | |||
75 | /* Define to 1 to use the libtirpc tsd usage workaround */ | ||
76 | --- a/modules/parse_amd.c | ||
77 | +++ b/modules/parse_amd.c | ||
78 | @@ -424,6 +424,7 @@ static int sel_in_network(struct autofs_ | ||
79 | return ret; | ||
80 | } | ||
81 | |||
82 | +#ifdef HAVE_INNETGR | ||
83 | static int sel_netgrp(struct autofs_point *ap, | ||
84 | struct selector *s, struct substvar *sv) | ||
85 | { | ||
86 | @@ -488,6 +489,7 @@ out: | ||
87 | |||
88 | return ret; | ||
89 | } | ||
90 | +#endif | ||
91 | |||
92 | static int eval_selector(struct autofs_point *ap, | ||
93 | struct amd_entry *this, struct substvar *sv) | ||
94 | @@ -627,7 +629,12 @@ static int eval_selector(struct autofs_p | ||
95 | switch (s->sel->selector) { | ||
96 | case SEL_NETGRP: | ||
97 | case SEL_NETGRPD: | ||
98 | +#ifndef HAVE_INNETGR | ||
99 | + error(logopt, MODPREFIX | ||
100 | + "netgroups not available, function innetgr(3) not available"); | ||
101 | +#else | ||
102 | ret = sel_netgrp(ap, s, sv); | ||
103 | +#endif | ||
104 | break; | ||
105 | |||
106 | default: | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-using-pkg-config-to-detect-krb5.patch index 41de373fd..1bf95b8a4 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-using-pkg-config-to-detect-krb5.patch | |||
@@ -1,10 +1,7 @@ | |||
1 | From dd90a690f95569b999b8ac9ab57e834b3421dcbb Mon Sep 17 00:00:00 2001 | 1 | From 796f1b5cfca595ba4e11ca9dab5c2c46c0710d95 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Roy Li <rongqing.li@windriver.com> |
3 | Date: Tue, 27 Nov 2018 15:19:07 +0800 | 3 | Date: Tue, 19 Aug 2014 11:31:35 +0800 |
4 | Subject: [PATCH] From dabcbdae38038a8e4ad2c4286112381c407c5ce7 Mon Sep 17 | 4 | Subject: [PATCH] using pkg-config to detect krb5 |
5 | 00:00:00 2001 From: Roy Li <rongqing.li@windriver.com> Date: Tue, 19 Aug 2014 | ||
6 | 11:31:35 +0800 Subject: [PATCH] using pkg-config to detect libxml-2.0 and | ||
7 | krb5 | ||
8 | 5 | ||
9 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
10 | 7 | ||
@@ -13,15 +10,17 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> | |||
13 | update patch to 5.1.5 | 10 | update patch to 5.1.5 |
14 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
15 | --- | 12 | --- |
16 | configure.in | 16 ++++++++++++++-- | 13 | configure.ac | 9 ++++++++- |
17 | 1 file changed, 14 insertions(+), 2 deletions(-) | 14 | 1 file changed, 8 insertions(+), 1 deletion(-) |
18 | 15 | ||
19 | --- a/configure.in | 16 | diff --git a/configure.ac b/configure.ac |
20 | +++ b/configure.in | 17 | index 76a38f4..1bb1a52 100644 |
21 | @@ -215,7 +215,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [ | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | ||
20 | @@ -214,7 +214,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [ | ||
22 | AC_DEFINE(LIBXML2_WORKAROUND, 1, [Use libxml2 tsd usage workaround]) | 21 | AC_DEFINE(LIBXML2_WORKAROUND, 1, [Use libxml2 tsd usage workaround]) |
23 | ], [HAVE_LIBXML=0]) | 22 | ], [HAVE_LIBXML=0]) |
24 | 23 | ||
25 | -AF_CHECK_KRB5() | 24 | -AF_CHECK_KRB5() |
26 | +PKG_CHECK_MODULES(KRB5, [krb5], [ | 25 | +PKG_CHECK_MODULES(KRB5, [krb5], [ |
27 | + HAVE_KRB5=1 | 26 | + HAVE_KRB5=1 |
@@ -31,6 +30,9 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
31 | + LIBS="$LIBS $KRB5_LIBS" | 30 | + LIBS="$LIBS $KRB5_LIBS" |
32 | + AC_CHECK_FUNCS([krb5_principal_get_realm]) | 31 | + AC_CHECK_FUNCS([krb5_principal_get_realm]) |
33 | +], [HAVE_KRB5=0]) | 32 | +], [HAVE_KRB5=0]) |
34 | 33 | ||
35 | AC_SEARCH_LIBS([versionsort],[]) | 34 | AC_SEARCH_LIBS([versionsort],[]) |
36 | if test "$ac_cv_search_versionsort" = "no"; then | 35 | if test "$ac_cv_search_versionsort" = "no"; then |
36 | -- | ||
37 | 2.25.1 | ||
38 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch b/meta-networking/recipes-daemons/autofs/autofs/0003-force-STRIP-to-emtpy.patch index 1fc500319..942f38d8b 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0003-force-STRIP-to-emtpy.patch | |||
@@ -1,23 +1,22 @@ | |||
1 | From 3cbee00fe5725b87abdae80cfa2ee735e4513ca6 Mon Sep 17 00:00:00 2001 | 1 | From efacbbe29b7212735046a7d0f2cd61148546ce9e Mon Sep 17 00:00:00 2001 |
2 | From: Roy Li <rongqing.li@windriver.com> | 2 | From: Roy Li <rongqing.li@windriver.com> |
3 | Date: Tue, 19 Aug 2014 11:31:35 +0800 | 3 | Date: Tue, 19 Aug 2014 11:31:35 +0800 |
4 | Subject: [PATCH] [PATCH] force STRIP to emtpy | 4 | Subject: [PATCH] force STRIP to emtpy |
5 | 5 | ||
6 | otherwise the generate file will be stripped | 6 | otherwise the generate file will be stripped |
7 | 7 | ||
8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
9 | |||
10 | --- | ||
11 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
12 | 9 | ||
10 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
11 | --- | ||
13 | Makefile.rules | 2 +- | 12 | Makefile.rules | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 14 | ||
16 | diff --git a/Makefile.rules b/Makefile.rules | 15 | diff --git a/Makefile.rules b/Makefile.rules |
17 | index 709dd04..b1f7e50 100644 | 16 | index 6ce39e5..a6dcd7b 100644 |
18 | --- a/Makefile.rules | 17 | --- a/Makefile.rules |
19 | +++ b/Makefile.rules | 18 | +++ b/Makefile.rules |
20 | @@ -31,7 +31,7 @@ LDFLAGS ?= -s | 19 | @@ -36,7 +36,7 @@ LDFLAGS ?= -s |
21 | endif | 20 | endif |
22 | 21 | ||
23 | ifdef DONTSTRIP | 22 | ifdef DONTSTRIP |
@@ -26,3 +25,6 @@ index 709dd04..b1f7e50 100644 | |||
26 | else | 25 | else |
27 | STRIP ?= strip --strip-debug | 26 | STRIP ?= strip --strip-debug |
28 | endif | 27 | endif |
28 | -- | ||
29 | 2.25.1 | ||
30 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch b/meta-networking/recipes-daemons/autofs/autofs/0004-autofs.init.in-remove-bashism.patch index 4183069bb..6065bc71b 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0004-autofs.init.in-remove-bashism.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cfacbb917f87b903b50132a5025f86b0cc522e9c Mon Sep 17 00:00:00 2001 | 1 | From b5f4a3c2f02244209ac613aeb8ea406bdc39af27 Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Robert Yang <liezhi.yang@windriver.com> |
3 | Date: Sat, 13 Sep 2014 20:19:28 -0700 | 3 | Date: Sat, 13 Sep 2014 20:19:28 -0700 |
4 | Subject: [PATCH] autofs.init.in: remove bashism | 4 | Subject: [PATCH] autofs.init.in: remove bashism |
@@ -9,7 +9,6 @@ Upstream-Status: Pending | |||
9 | 9 | ||
10 | Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> | 10 | Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> |
11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
12 | |||
13 | --- | 12 | --- |
14 | redhat/autofs.init.in | 12 ++++++------ | 13 | redhat/autofs.init.in | 12 ++++++------ |
15 | samples/rc.autofs.in | 10 +++++----- | 14 | samples/rc.autofs.in | 10 +++++----- |
@@ -116,3 +115,6 @@ index 487669f..e96cde1 100644 | |||
116 | pid=`pidof $prog` | 115 | pid=`pidof $prog` |
117 | if [ -z $pid ]; then | 116 | if [ -z $pid ]; then |
118 | echo $"$prog not running" | 117 | echo $"$prog not running" |
118 | -- | ||
119 | 2.25.1 | ||
120 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch b/meta-networking/recipes-daemons/autofs/autofs/0005-fix-the-YACC-rule-to-fix-a-building-failure.patch index fd736296a..462644b01 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0005-fix-the-YACC-rule-to-fix-a-building-failure.patch | |||
@@ -1,9 +1,7 @@ | |||
1 | From 971d48a00ef82880c34e89778bf430a01360ebd5 Mon Sep 17 00:00:00 2001 | 1 | From 40318f4f6109d9810b7cb31518a7879ae7632f58 Mon Sep 17 00:00:00 2001 |
2 | From: Roy Li <rongqing.li@windriver.com> | 2 | From: Roy Li <rongqing.li@windriver.com> |
3 | Date: Mon, 18 May 2015 16:28:36 +0800 | 3 | Date: Mon, 18 May 2015 16:28:36 +0800 |
4 | Subject: [PATCH] [PATCH] fix the YACC rule to fix a building failure | 4 | Subject: [PATCH] fix the YACC rule to fix a building failure |
5 | |||
6 | Upstream-Statu: Pending | ||
7 | 5 | ||
8 | The original rule will create the header file twice, one is that the header | 6 | The original rule will create the header file twice, one is that the header |
9 | file as the object file is created, other time is when create the C source file. | 7 | file as the object file is created, other time is when create the C source file. |
@@ -16,18 +14,35 @@ This lead to a race when compile amd_tok.o, the header file maybe rewritten. | |||
16 | | ^ | 14 | | ^ |
17 | |../Makefile.rules:64: recipe for target 'amd_tok.o' failed | 15 | |../Makefile.rules:64: recipe for target 'amd_tok.o' failed |
18 | |---------------------- | 16 | |---------------------- |
19 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
20 | 17 | ||
21 | --- | ||
22 | Upstream-Status: Pending | 18 | Upstream-Status: Pending |
23 | 19 | ||
24 | lib/Makefile | 6 ++++-- | 20 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
21 | --- | ||
22 | daemon/Makefile | 3 ++- | ||
23 | lib/Makefile | 3 ++- | ||
25 | modules/Makefile | 3 ++- | 24 | modules/Makefile | 3 ++- |
26 | 2 files changed, 6 insertions(+), 3 deletions(-) | 25 | 3 files changed, 6 insertions(+), 3 deletions(-) |
27 | 26 | ||
27 | diff --git a/daemon/Makefile b/daemon/Makefile | ||
28 | index 3af38e6..2a7ffe9 100644 | ||
29 | --- a/daemon/Makefile | ||
30 | +++ b/daemon/Makefile | ||
31 | @@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB) | ||
32 | master_tok.c: master_tok.l | ||
33 | $(LEX) -o$@ -Pmaster_ $? | ||
34 | |||
35 | -master_parse.tab.c master_parse.tab.h: master_parse.y | ||
36 | +master_parse.tab.h: master_parse.tab.c | ||
37 | +master_parse.tab.c: master_parse.y | ||
38 | $(YACC) -v -d -p master_ -b master_parse $? | ||
39 | |||
40 | master_tok.o: master_tok.c master_parse.tab.h | ||
41 | diff --git a/lib/Makefile b/lib/Makefile | ||
42 | index d18c67b..51445fd 100644 | ||
28 | --- a/lib/Makefile | 43 | --- a/lib/Makefile |
29 | +++ b/lib/Makefile | 44 | +++ b/lib/Makefile |
30 | @@ -53,7 +53,8 @@ mount_xdr.o: mount_xdr.c | 45 | @@ -35,7 +35,8 @@ libautofs.so: $(OBJS) |
31 | nss_tok.c: nss_tok.l | 46 | nss_tok.c: nss_tok.l |
32 | $(LEX) -o$@ -Pnss_ $? | 47 | $(LEX) -o$@ -Pnss_ $? |
33 | 48 | ||
@@ -37,9 +52,11 @@ Upstream-Status: Pending | |||
37 | $(YACC) -v -d -p nss_ -b nss_parse $? | 52 | $(YACC) -v -d -p nss_ -b nss_parse $? |
38 | 53 | ||
39 | nss_tok.o: nss_tok.c nss_parse.tab.h | 54 | nss_tok.o: nss_tok.c nss_parse.tab.h |
55 | diff --git a/modules/Makefile b/modules/Makefile | ||
56 | index 6908da0..00dd7ce 100644 | ||
40 | --- a/modules/Makefile | 57 | --- a/modules/Makefile |
41 | +++ b/modules/Makefile | 58 | +++ b/modules/Makefile |
42 | @@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l | 59 | @@ -105,7 +105,8 @@ amd_tok.c: amd_tok.l |
43 | 60 | ||
44 | amd_tok.o: amd_tok.c amd_parse.tab.h | 61 | amd_tok.o: amd_tok.c amd_parse.tab.h |
45 | 62 | ||
@@ -49,30 +66,6 @@ Upstream-Status: Pending | |||
49 | $(YACC) -v -d -p amd_ -b amd_parse $? | 66 | $(YACC) -v -d -p amd_ -b amd_parse $? |
50 | 67 | ||
51 | amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h | 68 | amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h |
52 | --- a/daemon/Makefile | 69 | -- |
53 | +++ b/daemon/Makefile | 70 | 2.25.1 |
54 | @@ -16,7 +16,7 @@ YACCSRC = master_tok.c master_parse.tab. | 71 | |
55 | version := $(shell cat ../.version) | ||
56 | |||
57 | CFLAGS += -rdynamic $(DAEMON_CFLAGS) -D_GNU_SOURCE -I../include | ||
58 | -CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" | ||
59 | +CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" | ||
60 | CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\" | ||
61 | CFLAGS += -DAUTOFS_CONF_DIR=\"$(autofsconfdir)\" | ||
62 | CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfifodir)\" | ||
63 | @@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB) | ||
64 | master_tok.c: master_tok.l | ||
65 | $(LEX) -o$@ -Pmaster_ $? | ||
66 | |||
67 | -master_parse.tab.c master_parse.tab.h: master_parse.y | ||
68 | +master_parse.tab.h: master_parse.tab.c | ||
69 | +master_parse.tab.c: master_parse.y | ||
70 | $(YACC) -v -d -p master_ -b master_parse $? | ||
71 | |||
72 | master_tok.o: master_tok.c master_parse.tab.h | ||
73 | @@ -57,5 +58,3 @@ clean: | ||
74 | install: all | ||
75 | install -d -m 755 $(INSTALLROOT)$(sbindir) | ||
76 | install -c automount -m 755 $(INSTALLROOT)$(sbindir) | ||
77 | - | ||
78 | - | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch b/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch new file mode 100644 index 000000000..ab99a98cf --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 349cc55c4cb7c7b2f5e7de937e11f3c581028b23 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 24 Aug 2018 06:24:36 +0000 | ||
4 | Subject: [PATCH] Do not hardcode path for pkg.m4 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | |||
10 | update patch to version 5.1.6 | ||
11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
12 | --- | ||
13 | configure.ac | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 1bb1a52..4cebbd2 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl | ||
21 | AC_INIT(.autofs-5.1.9) | ||
22 | |||
23 | # for pkg-config macros | ||
24 | -m4_include([/usr/share/aclocal/pkg.m4]) | ||
25 | +m4_include([pkg.m4]) | ||
26 | |||
27 | # | ||
28 | # autofs installs by default in /usr | ||
29 | -- | ||
30 | 2.25.1 | ||
31 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch b/meta-networking/recipes-daemons/autofs/autofs/0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch index e2a94bf82..14faa0c75 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Avoid conflicts between sys/mount.h and linux/mount.h | 1 | From 96e0e3ed49a0e00573fa5907ae80e6d262cb7644 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 9 Sep 2024 23:01:06 +0800 | ||
4 | Subject: [PATCH] Avoid conflicts between sys/mount.h and linux/mount.h | ||
2 | 5 | ||
3 | linux/fs.h includes linux/mount.h and this include file is unused so | 6 | linux/fs.h includes linux/mount.h and this include file is unused so |
4 | do not include it and avoid conflict too with glibc 2.36+ see [1] | 7 | do not include it and avoid conflict too with glibc 2.36+ see [1] |
@@ -8,6 +11,13 @@ do not include it and avoid conflict too with glibc 2.36+ see [1] | |||
8 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
9 | 12 | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | --- | ||
15 | modules/parse_amd.c | 1 - | ||
16 | modules/parse_sun.c | 1 - | ||
17 | 2 files changed, 2 deletions(-) | ||
18 | |||
19 | diff --git a/modules/parse_amd.c b/modules/parse_amd.c | ||
20 | index fb6b1b7..d86adf1 100644 | ||
11 | --- a/modules/parse_amd.c | 21 | --- a/modules/parse_amd.c |
12 | +++ b/modules/parse_amd.c | 22 | +++ b/modules/parse_amd.c |
13 | @@ -27,7 +27,6 @@ | 23 | @@ -27,7 +27,6 @@ |
@@ -18,6 +28,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
18 | 28 | ||
19 | #define MODULE_PARSE | 29 | #define MODULE_PARSE |
20 | #include "automount.h" | 30 | #include "automount.h" |
31 | diff --git a/modules/parse_sun.c b/modules/parse_sun.c | ||
32 | index a5351fd..8509781 100644 | ||
21 | --- a/modules/parse_sun.c | 33 | --- a/modules/parse_sun.c |
22 | +++ b/modules/parse_sun.c | 34 | +++ b/modules/parse_sun.c |
23 | @@ -30,7 +30,6 @@ | 35 | @@ -30,7 +30,6 @@ |
@@ -28,3 +40,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
28 | 40 | ||
29 | #define MODULE_PARSE | 41 | #define MODULE_PARSE |
30 | #include "automount.h" | 42 | #include "automount.h" |
43 | -- | ||
44 | 2.25.1 | ||
45 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch b/meta-networking/recipes-daemons/autofs/autofs/0008-include-libgen.h-for-basename.patch index 4c8b4ef77..13254f2c4 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0008-include-libgen.h-for-basename.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 1651e7a35be8b3e2fa90ca57b073f6944664fa62 Mon Sep 17 00:00:00 2001 | 1 | From c754222ce955c893e8e3ad75d8c73835950d1931 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 25 Mar 2024 12:04:03 -0700 | 3 | Date: Mon, 25 Mar 2024 12:04:03 -0700 |
4 | Subject: [PATCH] include libgen.h for basename | 4 | Subject: [PATCH] include libgen.h for basename |
@@ -10,6 +10,7 @@ include libgen.h for providing it. | |||
10 | [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 | 10 | [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 |
11 | 11 | ||
12 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
13 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | --- | 15 | --- |
15 | daemon/automount.c | 1 + | 16 | daemon/automount.c | 1 + |
@@ -18,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
18 | 3 files changed, 3 insertions(+) | 19 | 3 files changed, 3 insertions(+) |
19 | 20 | ||
20 | diff --git a/daemon/automount.c b/daemon/automount.c | 21 | diff --git a/daemon/automount.c b/daemon/automount.c |
21 | index 3d9461d..61b3478 100644 | 22 | index 6cb3b1b..efc2680 100644 |
22 | --- a/daemon/automount.c | 23 | --- a/daemon/automount.c |
23 | +++ b/daemon/automount.c | 24 | +++ b/daemon/automount.c |
24 | @@ -21,6 +21,7 @@ | 25 | @@ -21,6 +21,7 @@ |
@@ -30,7 +31,7 @@ index 3d9461d..61b3478 100644 | |||
30 | #include <stdio.h> | 31 | #include <stdio.h> |
31 | #include <stdlib.h> | 32 | #include <stdlib.h> |
32 | diff --git a/daemon/master.c b/daemon/master.c | 33 | diff --git a/daemon/master.c b/daemon/master.c |
33 | index f99359c..3f56499 100644 | 34 | index f2c11e9..1455e40 100644 |
34 | --- a/daemon/master.c | 35 | --- a/daemon/master.c |
35 | +++ b/daemon/master.c | 36 | +++ b/daemon/master.c |
36 | @@ -21,6 +21,7 @@ | 37 | @@ -21,6 +21,7 @@ |
@@ -42,7 +43,7 @@ index f99359c..3f56499 100644 | |||
42 | #include <sys/types.h> | 43 | #include <sys/types.h> |
43 | #include <sys/stat.h> | 44 | #include <sys/stat.h> |
44 | diff --git a/modules/lookup_file.c b/modules/lookup_file.c | 45 | diff --git a/modules/lookup_file.c b/modules/lookup_file.c |
45 | index 6afc558..82b1f28 100644 | 46 | index 99f2e21..4914395 100644 |
46 | --- a/modules/lookup_file.c | 47 | --- a/modules/lookup_file.c |
47 | +++ b/modules/lookup_file.c | 48 | +++ b/modules/lookup_file.c |
48 | @@ -15,6 +15,7 @@ | 49 | @@ -15,6 +15,7 @@ |
@@ -54,5 +55,5 @@ index 6afc558..82b1f28 100644 | |||
54 | #include <string.h> | 55 | #include <string.h> |
55 | #include <time.h> | 56 | #include <time.h> |
56 | -- | 57 | -- |
57 | 2.44.0 | 58 | 2.25.1 |
58 | 59 | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch b/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch new file mode 100644 index 000000000..442a3138c --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 1a08bbed376c0dfa0ce2d12a93b34fb2d5620c05 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Tue, 10 Sep 2024 21:08:09 +0800 | ||
4 | Subject: [PATCH] hash.h: include <sys/reg.h> instead of <bits/reg.h> | ||
5 | |||
6 | Fix build on musl: | ||
7 | In file included from ../include/automount.h:25, | ||
8 | from parse_subs.c:29: | ||
9 | ../include/hash.h:27:2: error: #error Wordsize not 32 or 64 | ||
10 | 27 | #error Wordsize not 32 or 64 | ||
11 | | ^~~~~ | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
16 | --- | ||
17 | include/hash.h | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/include/hash.h b/include/hash.h | ||
21 | index 0f1d7b5..f465ab8 100644 | ||
22 | --- a/include/hash.h | ||
23 | +++ b/include/hash.h | ||
24 | @@ -6,7 +6,7 @@ | ||
25 | #ifdef __GLIBC__ | ||
26 | #include <bits/wordsize.h> | ||
27 | #else | ||
28 | -#include <bits/reg.h> | ||
29 | +#include <sys/reg.h> | ||
30 | #endif | ||
31 | #include <linux/stddef.h> | ||
32 | #include <sys/types.h> | ||
33 | -- | ||
34 | 2.25.1 | ||
35 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch b/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch new file mode 100644 index 000000000..0e1558734 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From a6a79230110e998f780796cb1d4c5d3f59f20d1d Mon Sep 17 00:00:00 2001 | ||
2 | From: Florian Weimer <fweimer@redhat.com> | ||
3 | Date: Mon, 18 Dec 2023 13:48:18 +0100 | ||
4 | Subject: [PATCH] autofs-5.1.9 - Fix incompatible function pointer types in | ||
5 | cyrus-sasl module | ||
6 | |||
7 | Add casts to SASL callbacks to avoid incompatible-pointer-types | ||
8 | errors. Avoids a build failure with stricter compilers. | ||
9 | |||
10 | Signed-off-by: Florian Weimer <fweimer@redhat.com> | ||
11 | Signed-off-by: Ian Kent <raven@themaw.net> | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | [https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=b7ff971bb8aa3fc609bb531ddc4c2ce56226383f] | ||
15 | |||
16 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
17 | --- | ||
18 | CHANGELOG | 2 ++ | ||
19 | modules/cyrus-sasl.c | 14 +++++++------- | ||
20 | 2 files changed, 9 insertions(+), 7 deletions(-) | ||
21 | |||
22 | diff --git a/CHANGELOG b/CHANGELOG | ||
23 | index 3e47daa..fd9d861 100644 | ||
24 | --- a/CHANGELOG | ||
25 | +++ b/CHANGELOG | ||
26 | @@ -1,4 +1,6 @@ | ||
27 | |||
28 | +- Fix incompatible function pointer types in cyrus-sasl module. | ||
29 | + | ||
30 | 02/11/2023 autofs-5.1.9 | ||
31 | - fix kernel mount status notification. | ||
32 | - fix fedfs build flags. | ||
33 | diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c | ||
34 | index e742eaf..78b7794 100644 | ||
35 | --- a/modules/cyrus-sasl.c | ||
36 | +++ b/modules/cyrus-sasl.c | ||
37 | @@ -109,17 +109,17 @@ static int getpass_func(sasl_conn_t *, void *, int, sasl_secret_t **); | ||
38 | static int getuser_func(void *, int, const char **, unsigned *); | ||
39 | |||
40 | static sasl_callback_t callbacks[] = { | ||
41 | - { SASL_CB_USER, &getuser_func, NULL }, | ||
42 | - { SASL_CB_AUTHNAME, &getuser_func, NULL }, | ||
43 | - { SASL_CB_PASS, &getpass_func, NULL }, | ||
44 | + { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL }, | ||
45 | + { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL }, | ||
46 | + { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL }, | ||
47 | { SASL_CB_LIST_END, NULL, NULL }, | ||
48 | }; | ||
49 | |||
50 | static sasl_callback_t debug_callbacks[] = { | ||
51 | - { SASL_CB_LOG, &sasl_log_func, NULL }, | ||
52 | - { SASL_CB_USER, &getuser_func, NULL }, | ||
53 | - { SASL_CB_AUTHNAME, &getuser_func, NULL }, | ||
54 | - { SASL_CB_PASS, &getpass_func, NULL }, | ||
55 | + { SASL_CB_LOG, (int(*)(void)) &sasl_log_func, NULL }, | ||
56 | + { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL }, | ||
57 | + { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL }, | ||
58 | + { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL }, | ||
59 | { SASL_CB_LIST_END, NULL, NULL }, | ||
60 | }; | ||
61 | |||
62 | -- | ||
63 | 2.25.1 | ||
64 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch b/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch deleted file mode 100644 index 4cfd8edf9..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From df5d45b2d7ad7e7b5f0542a816d08b0409a529a1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Roy Li <rongqing.li@windriver.com> | ||
3 | Date: Tue, 19 Aug 2014 11:31:35 +0800 | ||
4 | Subject: [PATCH] [PATCH] add the needed stdarg.h | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
9 | |||
10 | --- | ||
11 | lib/defaults.c | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/lib/defaults.c b/lib/defaults.c | ||
15 | index 0e48a78..667f35d 100644 | ||
16 | --- a/lib/defaults.c | ||
17 | +++ b/lib/defaults.c | ||
18 | @@ -16,6 +16,7 @@ | ||
19 | |||
20 | #include <stdlib.h> | ||
21 | #include <stdio.h> | ||
22 | +#include <stdarg.h> | ||
23 | #include <ctype.h> | ||
24 | #include <string.h> | ||
25 | #include <sys/utsname.h> | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch b/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch deleted file mode 100644 index 8e06db6e4..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 080626108c9ab70e2489752ef2a14006d0564b0c Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe MacDonald <joe.macdonald@windriver.com> | ||
3 | Date: Tue, 18 Jun 2013 10:05:21 -0400 | ||
4 | Subject: [PATCH] Fix the dependency issue | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | autofs's lib sources have a dependency on a number of files that are | ||
9 | generated by rpcgen during buildtime | ||
10 | |||
11 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
12 | Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> | ||
13 | |||
14 | --- | ||
15 | lib/Makefile | 1 + | ||
16 | 1 file changed, 1 insertion(+) | ||
17 | |||
18 | diff --git a/lib/Makefile b/lib/Makefile | ||
19 | index 518b483..4798a4b 100644 | ||
20 | --- a/lib/Makefile | ||
21 | +++ b/lib/Makefile | ||
22 | @@ -81,3 +81,4 @@ install: all | ||
23 | clean: | ||
24 | rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~ | ||
25 | |||
26 | +$(OBJS): $(RPCS) | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/cross.patch b/meta-networking/recipes-daemons/autofs/autofs/cross.patch deleted file mode 100644 index 2a4f4fd0d..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/cross.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From b9b44cd82caceeb638cc6a862b5bb90b93ad6c6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 5 Jan 2013 19:53:10 -0800 | ||
4 | |||
5 | --- | ||
6 | Upstream-Status: Pending | ||
7 | |||
8 | aclocal.m4 | 2 ++ | ||
9 | configure.in | 8 ++++++-- | ||
10 | 2 files changed, 8 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/aclocal.m4 b/aclocal.m4 | ||
13 | index 2115204..2a9a802 100644 | ||
14 | --- a/aclocal.m4 | ||
15 | +++ b/aclocal.m4 | ||
16 | @@ -7,6 +7,8 @@ dnl -------------------------------------------------------------------------- | ||
17 | AC_DEFUN(AF_PATH_INCLUDE, | ||
18 | [AC_PATH_PROGS($1,$2,$3,$4) | ||
19 | if test -n "$$1"; then | ||
20 | + AH_TEMPLATE([HAVE_$1], [Have $2]) | ||
21 | + AH_TEMPLATE([PATH_$1], [Have $2]) | ||
22 | AC_DEFINE(HAVE_$1,1,[define if you have $1]) | ||
23 | AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1]) | ||
24 | HAVE_$1=1 | ||
25 | diff --git a/configure.in b/configure.in | ||
26 | index 25d7c4e..44a1c8b 100644 | ||
27 | --- a/configure.in | ||
28 | +++ b/configure.in | ||
29 | @@ -324,13 +324,15 @@ AC_PROG_CC | ||
30 | cat > pietest.c <<EOF | ||
31 | int main(void) { return 0; } | ||
32 | EOF | ||
33 | +AF_tmp_ldflags="$LDFLAGS" | ||
34 | +AF_tmp_cflags="$CFLAGS" | ||
35 | CFLAGS=-fPIE | ||
36 | LDFLAGS=-pie | ||
37 | DAEMON_CFLAGS= | ||
38 | DAEMON_LDFLAGS= | ||
39 | AC_MSG_CHECKING([whether gcc -fPIE works]) | ||
40 | -AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], | ||
41 | - [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no]) | ||
42 | +AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], | ||
43 | + [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no]) | ||
44 | AC_MSG_RESULT([$gcc_supports_pie]) | ||
45 | if test $gcc_supports_pie = yes ; then | ||
46 | DAEMON_CFLAGS="-fPIE" | ||
47 | @@ -339,6 +341,8 @@ fi | ||
48 | rm -f pietest.c | ||
49 | AC_SUBST(DAEMON_CFLAGS) | ||
50 | AC_SUBST(DAEMON_LDFLAGS) | ||
51 | +CFLAGS="${AF_tmp_cflags}" | ||
52 | +LDFLAGS="${AF_tmp_ldflags}" | ||
53 | |||
54 | # | ||
55 | # Enable ability to access value in external env variable | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch b/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch deleted file mode 100644 index 414325974..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From c500d9906f163bf716c872d37403b9de02ef0a86 Mon Sep 17 00:00:00 2001 | ||
2 | From: Amy Fong <amy.fong@windriver.com> | ||
3 | Date: Fri, 18 Jan 2013 12:13:32 -0500 | ||
4 | Subject: [PATCH] autofs: fails to compile with openldap disabled | ||
5 | |||
6 | As of 5.0.6, it appears that changes were introduced so that | ||
7 | if you compile with openldap disabled and openldap headers are not | ||
8 | available, then autofs fails to build. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Amy Fong <amy.fong@windriver.com> | ||
13 | -- | ||
14 | lookup_ldap.h | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | --- | ||
18 | include/lookup_ldap.h | 4 ++++ | ||
19 | 1 file changed, 4 insertions(+) | ||
20 | |||
21 | diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h | ||
22 | index 3a7aba7..bfdb0b3 100644 | ||
23 | --- a/include/lookup_ldap.h | ||
24 | +++ b/include/lookup_ldap.h | ||
25 | @@ -1,7 +1,9 @@ | ||
26 | #ifndef LOOKUP_LDAP_H | ||
27 | #define LOOKUP_LDAP_H | ||
28 | |||
29 | +#ifdef WITH_LDAP | ||
30 | #include <ldap.h> | ||
31 | +#endif | ||
32 | |||
33 | #ifdef WITH_SASL | ||
34 | #include <openssl/ssl.h> | ||
35 | @@ -117,10 +119,12 @@ struct lookup_context { | ||
36 | |||
37 | #define LDAP_AUTH_USESIMPLE 0x0008 | ||
38 | |||
39 | +#ifdef WITH_LDAP | ||
40 | /* lookup_ldap.c */ | ||
41 | LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt); | ||
42 | int unbind_ldap_connection(unsigned logopt, struct ldap_conn *conn, struct lookup_context *ctxt); | ||
43 | int authtype_requires_creds(const char *authtype); | ||
44 | +#endif | ||
45 | |||
46 | #ifdef WITH_SASL | ||
47 | /* cyrus-sasl.c */ | ||
diff --git a/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch b/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch deleted file mode 100644 index be750ab89..000000000 --- a/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 602f9ca83c2bdbf511bcb178fcb4b9fc54da955f Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Tue, 27 Nov 2018 15:20:46 +0800 | ||
4 | Subject: [PATCH] From e3ae56cf0bb4063c31295f45d04e3c504f4b6cc7 Mon Sep 17 | ||
5 | 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 24 Apr 2017 | ||
6 | 20:41:25 -0700 Subject: [PATCH] autofs: Upgrade to 5.1.2 release | ||
7 | |||
8 | Use pkg-config first to look for external libnsl which is now | ||
9 | split out from glibc, if it does not exist then see if its provided | ||
10 | by glibc itself. | ||
11 | |||
12 | -Khem | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | update patch to version 5.1.5 | ||
17 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
18 | --- | ||
19 | configure.in | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/configure.in b/configure.in | ||
23 | index 76ecb40..493b9f1 100644 | ||
24 | --- a/configure.in | ||
25 | +++ b/configure.in | ||
26 | @@ -238,7 +238,7 @@ AC_SUBST(LIBCLOCK_GETTIME) | ||
27 | |||
28 | PKG_CHECK_MODULES([NSL],[libnsl],, | ||
29 | [ | ||
30 | -AC_CHECK_LIB(nsl, yp_match, NSL_LIBS="-lnsl") | ||
31 | +PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[LIBNSL="-lnsl"],[LIBNSL=""])]) | ||
32 | AC_SUBST(NSL_LIBS) | ||
33 | NSL_CFLAGS="" | ||
34 | ]) | ||
35 | -- | ||
36 | 2.7.4 | ||
37 | |||
diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb b/meta-networking/recipes-daemons/autofs/autofs_5.1.9.bb index e3f977738..bc52f40d1 100644 --- a/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb +++ b/meta-networking/recipes-daemons/autofs/autofs_5.1.9.bb | |||
@@ -3,55 +3,44 @@ SECTION = "utils" | |||
3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=ee9324a6f564bb2376b63878ac396798" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=ee9324a6f564bb2376b63878ac396798" |
5 | 5 | ||
6 | DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl libxml2 util-linux cyrus-sasl libnsl2" | 6 | DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl util-linux libnsl2" |
7 | 7 | ||
8 | CFLAGS += "-I${STAGING_INCDIR}/tirpc" | 8 | CFLAGS += "-I${STAGING_INCDIR}/tirpc" |
9 | 9 | ||
10 | inherit autotools-brokensep systemd update-rc.d pkgconfig | 10 | inherit autotools-brokensep systemd update-rc.d pkgconfig |
11 | 11 | ||
12 | SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ | 12 | SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ |
13 | file://no-bash.patch \ | 13 | file://0001-no-bash.patch \ |
14 | file://cross.patch \ | 14 | file://0002-using-pkg-config-to-detect-krb5.patch \ |
15 | file://fix_disable_ldap.patch \ | 15 | file://0003-force-STRIP-to-emtpy.patch \ |
16 | file://autofs-5.0.7-fix-lib-deps.patch \ | 16 | file://0004-autofs.init.in-remove-bashism.patch \ |
17 | file://add-the-needed-stdarg.h.patch \ | 17 | file://0005-fix-the-YACC-rule-to-fix-a-building-failure.patch \ |
18 | file://using-pkg-config-to-detect-libxml-2.0-and-krb5.patch \ | 18 | file://0006-Do-not-hardcode-path-for-pkg.m4.patch \ |
19 | file://force-STRIP-to-emtpy.patch \ | 19 | file://0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch \ |
20 | file://remove-bashism.patch \ | 20 | file://0008-include-libgen.h-for-basename.patch \ |
21 | file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ | 21 | file://0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch \ |
22 | file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ | 22 | file://0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch \ |
23 | file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \ | ||
24 | file://pkgconfig-libnsl.patch \ | ||
25 | file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \ | ||
26 | file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ | ||
27 | file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ | ||
28 | file://0001-Define-__SWORD_TYPE-if-undefined.patch \ | ||
29 | file://mount_conflict.patch \ | ||
30 | file://0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch \ | ||
31 | file://0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch \ | ||
32 | file://0001-include-libgen.h-for-basename.patch \ | ||
33 | " | 23 | " |
34 | SRC_URI[sha256sum] = "0bd401c56f0eb1ca6251344c3a3d70bface3eccf9c67117cd184422c4cace30c" | 24 | SRC_URI[sha256sum] = "46c30b763ef896f4c4a6df6d62aaaef7afc410e0b7f50d52dbfc6cf728cacd4f" |
35 | 25 | ||
36 | UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/" | 26 | UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/" |
37 | 27 | ||
38 | INITSCRIPT_NAME = "autofs" | 28 | INITSCRIPT_NAME = "autofs" |
39 | INITSCRIPT_PARAMS = "defaults" | 29 | INITSCRIPT_PARAMS = "defaults" |
40 | 30 | ||
41 | # FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS | ||
42 | #CFLAGS += "${LDFLAGS}" | ||
43 | |||
44 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" | 31 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" |
32 | PACKAGECONFIG[openldap] = "--with-openldap=yes,--with-openldap=no,libxml2 openldap" | ||
33 | PACKAGECONFIG[sasl] = "--with-sasl=yes,--with-sasl=no,cyrus-sasl krb5" | ||
45 | 34 | ||
46 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 35 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
47 | 36 | ||
48 | EXTRA_OEMAKE = "DONTSTRIP=1" | 37 | EXTRA_OEMAKE = "DONTSTRIP=1" |
49 | EXTRA_OECONF += "--disable-mount-locking \ | 38 | EXTRA_OECONF += "--disable-mount-locking \ |
50 | --enable-ignore-busy --with-openldap=no \ | 39 | --enable-ignore-busy \ |
51 | --with-confdir=${sysconfdir}/default \ | 40 | --with-confdir=${sysconfdir}/default \ |
52 | --with-fifodir=/run \ | 41 | --with-fifodir=/run \ |
53 | --with-flagdir=/run \ | 42 | --with-flagdir=/run \ |
54 | --with-sasl=no --with-libtirpc \ | 43 | --with-libtirpc \ |
55 | --with-mapdir=${sysconfdir} \ | 44 | --with-mapdir=${sysconfdir} \ |
56 | --with-path=${STAGING_BINDIR_NATIVE} \ | 45 | --with-path=${STAGING_BINDIR_NATIVE} \ |
57 | --with-fifodir=${localstatedir}/run \ | 46 | --with-fifodir=${localstatedir}/run \ |
diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 7947ffe45..90e7814a0 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb | |||
@@ -42,7 +42,7 @@ inherit systemd | |||
42 | DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" | 42 | DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" |
43 | RDEPENDS:${PN} = "rpcbind" | 43 | RDEPENDS:${PN} = "rpcbind" |
44 | 44 | ||
45 | EXTRA_OEMAKE = "CC='${CC}' AS='${AS}' LD='${LD}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" | 45 | EXTRA_OEMAKE = "CC='${CC} ${CFLAGS}' AS='${AS}' LD='${LD} ${LDFLAGS}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" |
46 | EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" | 46 | EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" |
47 | # enable self tests | 47 | # enable self tests |
48 | EXTRA_OEMAKE += "IPPOOL_TEST=y" | 48 | EXTRA_OEMAKE += "IPPOOL_TEST=y" |
@@ -52,12 +52,7 @@ CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc" | |||
52 | SYSTEMD_SERVICE:${PN} = "ippool.service" | 52 | SYSTEMD_SERVICE:${PN} = "ippool.service" |
53 | 53 | ||
54 | do_compile:prepend() { | 54 | do_compile:prepend() { |
55 | # fix the CFLAGS= and CPPFLAGS= in main Makefile, to have the extra CFLAGS in env | ||
56 | sed -i -e "s/^CFLAGS=/CFLAGS+=/" ${S}/Makefile | ||
57 | sed -i -e "s/^CPPFLAGS=/CPPFLAGS+=/" ${S}/Makefile | ||
58 | |||
59 | sed -i -e "s:-I/usr/include/pppd:-I=/usr/include/pppd:" ${S}/pppd/Makefile | 55 | sed -i -e "s:-I/usr/include/pppd:-I=/usr/include/pppd:" ${S}/pppd/Makefile |
60 | |||
61 | } | 56 | } |
62 | 57 | ||
63 | 58 | ||
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch new file mode 100644 index 000000000..1f9f8b30b --- /dev/null +++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 5b1b04356f3efc08ae279cafc6ee86df11f10c9a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 15 Aug 2024 23:13:02 -0700 | ||
4 | Subject: [PATCH] configure.ac: Do not emit compiler flags into object files | ||
5 | |||
6 | They contain options which have absolute paths in them e.g. --sysroot | ||
7 | therefore do not record them and make build reproducible | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE-Specific] | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | configure.ac | 3 +-- | ||
14 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index fae16f1..677b94a 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -904,8 +904,7 @@ if test "$enable_hardening" != no; then | ||
21 | "-Wp,-D_FORTIFY_SOURCE=2" \ | ||
22 | "-fexceptions" \ | ||
23 | "-fstack-protector-strong" \ | ||
24 | - "--param=ssp-buffer-size=4" \ | ||
25 | - "-grecord-gcc-switches" | ||
26 | + "--param=ssp-buffer-size=4" | ||
27 | do | ||
28 | AC_MSG_CHECKING([for $FLAG support]) | ||
29 | CFLAGS="$CFLAGS $FLAG" | ||
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb index 85f4a6aa5..c4d59d3ca 100644 --- a/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb +++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb | |||
@@ -11,6 +11,7 @@ LICENSE = "GPL-2.0-only" | |||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
12 | 12 | ||
13 | SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ | 13 | SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ |
14 | file://0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch \ | ||
14 | " | 15 | " |
15 | SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6" | 16 | SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6" |
16 | UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" | 17 | UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" |
@@ -30,6 +31,10 @@ EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d" | |||
30 | 31 | ||
31 | export EXTRA_CFLAGS = "${CFLAGS}" | 32 | export EXTRA_CFLAGS = "${CFLAGS}" |
32 | 33 | ||
34 | do_configure:append() { | ||
35 | sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/lib/config.h | ||
36 | } | ||
37 | |||
33 | do_install:append() { | 38 | do_install:append() { |
34 | if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then | 39 | if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then |
35 | chmod 0755 ${D}${sysconfdir}/init.d/${BPN} | 40 | chmod 0755 ${D}${sysconfdir}/init.d/${BPN} |
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 15bb00a3a..de111cac0 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 () { | |||
28 | 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ | 28 | 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ |
29 | install | 29 | install |
30 | } | 30 | } |
31 | |||
32 | # http://errors.yoctoproject.org/Errors/Details/766888/ | ||
33 | # 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] | ||
34 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb index aa8d5fabd..33480bff2 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb | |||
@@ -4,8 +4,8 @@ HOMEPAGE = "http://www.proftpd.org" | |||
4 | LICENSE = "GPL-2.0-or-later" | 4 | LICENSE = "GPL-2.0-or-later" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" |
6 | 6 | ||
7 | SRCREV = "75aa739805a6e05eeb31189934a3d324e7862962" | 7 | SRCREV = "0a7ea9b0ba9fcdf368374a226370d08f10397d99" |
8 | BRANCH = "1.3.7" | 8 | BRANCH = "1.3.8" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \ | 10 | SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \ |
11 | file://basic.conf.patch \ | 11 | file://basic.conf.patch \ |
@@ -21,7 +21,7 @@ S = "${WORKDIR}/git" | |||
21 | 21 | ||
22 | inherit autotools-brokensep useradd update-rc.d systemd multilib_script | 22 | inherit autotools-brokensep useradd update-rc.d systemd multilib_script |
23 | 23 | ||
24 | EXTRA_OECONF += "--enable-largefile" | 24 | EXTRA_OECONF += "--enable-largefile INSTALL=install" |
25 | 25 | ||
26 | PACKAGECONFIG ??= "shadow \ | 26 | PACKAGECONFIG ??= "shadow \ |
27 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ | 27 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ |
@@ -70,6 +70,12 @@ do_configure () { | |||
70 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} | 70 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} |
71 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} | 71 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} |
72 | oe_runconf | 72 | oe_runconf |
73 | sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ | ||
74 | -e 's|${STAGING_DIR_NATIVE}||g' \ | ||
75 | -e 's|-ffile-prefix-map=[^ ]*||g' \ | ||
76 | -e 's|-fdebug-prefix-map=[^ ]*||g' \ | ||
77 | -e 's|-fmacro-prefix-map=[^ ]*||g' \ | ||
78 | -i ${B}/config.h | ||
73 | } | 79 | } |
74 | 80 | ||
75 | FTPUSER = "ftp" | 81 | FTPUSER = "ftp" |
@@ -116,7 +122,7 @@ do_install () { | |||
116 | -e 's|-ffile-prefix-map=[^ ]*||g' \ | 122 | -e 's|-ffile-prefix-map=[^ ]*||g' \ |
117 | -e 's|-fdebug-prefix-map=[^ ]*||g' \ | 123 | -e 's|-fdebug-prefix-map=[^ ]*||g' \ |
118 | -e 's|-fmacro-prefix-map=[^ ]*||g' \ | 124 | -e 's|-fmacro-prefix-map=[^ ]*||g' \ |
119 | -i ${D}/${bindir}/prxs | 125 | -i ${D}/${bindir}/prxs ${D}${includedir}/proftpd/Make.rules ${D}${includedir}/proftpd/config.h |
120 | 126 | ||
121 | # ftpmail perl script, which reads the proftpd log file and sends | 127 | # ftpmail perl script, which reads the proftpd log file and sends |
122 | # automatic email notifications once an upload finishs, | 128 | # automatic email notifications once an upload finishs, |
diff --git a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch index e0d002c68..489850e3b 100644 --- a/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch +++ b/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch | |||
@@ -37,7 +37,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
37 | ]) | 37 | ]) |
38 | --- a/acinclude/lib-checks.m4 | 38 | --- a/acinclude/lib-checks.m4 |
39 | +++ b/acinclude/lib-checks.m4 | 39 | +++ b/acinclude/lib-checks.m4 |
40 | @@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_ | 40 | @@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[ |
41 | [ | 41 | [ |
42 | AC_MSG_RESULT([no]) | 42 | AC_MSG_RESULT([no]) |
43 | ], | 43 | ], |
diff --git a/meta-networking/recipes-daemons/squid/squid_6.9.bb b/meta-networking/recipes-daemons/squid/squid_6.10.bb index f670a776e..984209ad2 100644 --- a/meta-networking/recipes-daemons/squid/squid_6.9.bb +++ b/meta-networking/recipes-daemons/squid/squid_6.10.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \ | |||
22 | file://squid.nm \ | 22 | file://squid.nm \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882" | 25 | SRC_URI[sha256sum] = "0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7" |
26 | 26 | ||
27 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 27 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
28 | file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ | 28 | file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ |
diff --git a/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb b/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb index ee006efe2..93d293493 100644 --- a/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb +++ b/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb | |||
@@ -37,6 +37,7 @@ SYSTEMD_AUTO_ENABLE = "enable" | |||
37 | export EXTRA_OEMAKE = "" | 37 | export EXTRA_OEMAKE = "" |
38 | 38 | ||
39 | CFPROTECTION ?= "-fcf-protection=full" | 39 | CFPROTECTION ?= "-fcf-protection=full" |
40 | CFPROTECTION:riscv32 = "" | ||
40 | CFPROTECTION:riscv64 = "" | 41 | CFPROTECTION:riscv64 = "" |
41 | CFPROTECTION:arm = "" | 42 | CFPROTECTION:arm = "" |
42 | CFPROTECTION:aarch64 = "" | 43 | CFPROTECTION:aarch64 = "" |
diff --git a/meta-networking/recipes-filter/ipset/ipset_7.21.bb b/meta-networking/recipes-filter/ipset/ipset_7.22.bb index c7ebdc1c6..5eaf14241 100644 --- a/meta-networking/recipes-filter/ipset/ipset_7.21.bb +++ b/meta-networking/recipes-filter/ipset/ipset_7.22.bb | |||
@@ -11,7 +11,7 @@ DEPENDS = "libtool libmnl" | |||
11 | 11 | ||
12 | SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2 \ | 12 | SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2 \ |
13 | file://0001-ipset-Define-portable-basename-function.patch" | 13 | file://0001-ipset-Define-portable-basename-function.patch" |
14 | SRC_URI[sha256sum] = "e2c6ce4fcf3acb3893ca5d35c86935f80ad76fc5ccae601185842df760e0bc69" | 14 | SRC_URI[sha256sum] = "f6ac5a47c3ef9f4c67fcbdf55e791cbfe38eb0a4aa1baacd12646a140abacdd9" |
15 | 15 | ||
16 | inherit autotools pkgconfig module-base | 16 | inherit autotools pkgconfig module-base |
17 | 17 | ||
diff --git a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.bb b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.7.bb index 841a7267b..b46520938 100644 --- a/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.bb +++ b/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.7.bb | |||
@@ -7,7 +7,7 @@ SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \ | |||
7 | file://0001-configure.ac-Add-serial-tests.patch \ | 7 | file://0001-configure.ac-Add-serial-tests.patch \ |
8 | file://run-ptest \ | 8 | file://run-ptest \ |
9 | " | 9 | " |
10 | SRCREV = "83dd4dc316b4189d16ead54cd30bfc89e5160cfd" | 10 | SRCREV = "116e95aa7b6358c917de8c69f6f173874030b46b" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
diff --git a/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch b/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch deleted file mode 100644 index 164182bb1..000000000 --- a/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From 7a6089a400a573b9a4fd92f29c00a6be7b8ef269 Mon Sep 17 00:00:00 2001 | ||
2 | From: Phil Sutter <phil@nwl.cc> | ||
3 | Date: Thu, 2 Nov 2023 16:02:14 +0100 | ||
4 | Subject: [PATCH] tests: shell: Fix sets/reset_command_0 for current kernels | ||
5 | |||
6 | Since kernel commit 4c90bba60c26 ("netfilter: nf_tables: do not refresh | ||
7 | timeout when resetting element"), element reset won't touch expiry | ||
8 | anymore. Invert the one check to make sure it remains unaltered, drop | ||
9 | the other testing behaviour for per-element timeouts. | ||
10 | |||
11 | Signed-off-by: Phil Sutter <phil@nwl.cc> | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | [https://git.netfilter.org/nftables/commit/?id=7a6089a400a573b9a4fd92f29c00a6be7b8ef269] | ||
15 | |||
16 | Signed-off-by: William Lyu <William.Lyu@windriver.com> | ||
17 | --- | ||
18 | tests/shell/testcases/sets/reset_command_0 | 10 ++-------- | ||
19 | 1 file changed, 2 insertions(+), 8 deletions(-) | ||
20 | |||
21 | diff --git a/tests/shell/testcases/sets/reset_command_0 b/tests/shell/testcases/sets/reset_command_0 | ||
22 | index e663dac8..d38ddb3f 100755 | ||
23 | --- a/tests/shell/testcases/sets/reset_command_0 | ||
24 | +++ b/tests/shell/testcases/sets/reset_command_0 | ||
25 | @@ -44,10 +44,10 @@ elem='element t s { 1.0.0.1 . udp . 53 }' | ||
26 | grep 'elements = ' | drop_seconds | uniq | wc -l) == 1 ]] | ||
27 | echo OK | ||
28 | |||
29 | -echo -n "counters and expiry are reset: " | ||
30 | +echo -n "counters are reset, expiry left alone: " | ||
31 | NEW=$($NFT "get $elem") | ||
32 | grep -q 'counter packets 0 bytes 0' <<< "$NEW" | ||
33 | -[[ $(expires_minutes <<< "$NEW") -gt 20 ]] | ||
34 | +[[ $(expires_minutes <<< "$NEW") -lt 20 ]] | ||
35 | echo OK | ||
36 | |||
37 | echo -n "get map elem matches reset map elem: " | ||
38 | @@ -80,12 +80,6 @@ OUT=$($NFT reset map t m) | ||
39 | $DIFF -u <(echo "$EXP") <(echo "$OUT") | ||
40 | echo OK | ||
41 | |||
42 | -echo -n "reset command respects per-element timeout: " | ||
43 | -VAL=$($NFT get element t s '{ 2.0.0.2 . tcp . 22 }' | expires_minutes) | ||
44 | -[[ $VAL -lt 15 ]] # custom timeout applies | ||
45 | -[[ $VAL -gt 10 ]] # expires was reset | ||
46 | -echo OK | ||
47 | - | ||
48 | echo -n "remaining elements are reset: " | ||
49 | OUT=$($NFT list ruleset) | ||
50 | grep -q '2.0.0.2 . tcp . 22 counter packets 0 bytes 0' <<< "$OUT" | ||
51 | -- | ||
52 | 2.43.0 | ||
53 | |||
diff --git a/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch b/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch deleted file mode 100644 index 2a966ab44..000000000 --- a/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From fff913c1eefbc84eb2d9c52038ef29fe881e9ee9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pablo Neira Ayuso <pablo@netfilter.org> | ||
3 | Date: Tue, 21 Nov 2023 21:16:38 +0100 | ||
4 | Subject: [PATCH] tests: shell: skip secmark tests if kernel does not support | ||
5 | it | ||
6 | |||
7 | Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | [https://git.netfilter.org/nftables/commit/?id=fff913c1eefbc84eb2d9c52038ef29fe881e9ee9] | ||
11 | |||
12 | Signed-off-by: William Lyu <William.Lyu@windriver.com> | ||
13 | --- | ||
14 | tests/shell/features/secmark.nft | 7 +++++++ | ||
15 | tests/shell/testcases/json/0005secmark_objref_0 | 1 + | ||
16 | 2 files changed, 8 insertions(+) | ||
17 | create mode 100644 tests/shell/features/secmark.nft | ||
18 | |||
19 | diff --git a/tests/shell/features/secmark.nft b/tests/shell/features/secmark.nft | ||
20 | new file mode 100644 | ||
21 | index 00000000..ccbb572f | ||
22 | --- /dev/null | ||
23 | +++ b/tests/shell/features/secmark.nft | ||
24 | @@ -0,0 +1,7 @@ | ||
25 | +# fb961945457f ("netfilter: nf_tables: add SECMARK support") | ||
26 | +# v4.20-rc1~14^2~125^2~5 | ||
27 | +table inet x { | ||
28 | + secmark ssh_server { | ||
29 | + "system_u:object_r:ssh_server_packet_t:s0" | ||
30 | + } | ||
31 | +} | ||
32 | diff --git a/tests/shell/testcases/json/0005secmark_objref_0 b/tests/shell/testcases/json/0005secmark_objref_0 | ||
33 | index 992d1b00..5c44f093 100755 | ||
34 | --- a/tests/shell/testcases/json/0005secmark_objref_0 | ||
35 | +++ b/tests/shell/testcases/json/0005secmark_objref_0 | ||
36 | @@ -1,6 +1,7 @@ | ||
37 | #!/bin/bash | ||
38 | |||
39 | # NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) | ||
40 | +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_secmark) | ||
41 | |||
42 | set -e | ||
43 | |||
44 | -- | ||
45 | 2.43.0 | ||
46 | |||
diff --git a/meta-networking/recipes-filter/nftables/nftables/run-ptest b/meta-networking/recipes-filter/nftables/nftables/run-ptest index 32ddf9f45..55e801f67 100644 --- a/meta-networking/recipes-filter/nftables/nftables/run-ptest +++ b/meta-networking/recipes-filter/nftables/nftables/run-ptest | |||
@@ -5,14 +5,18 @@ cd ${NFTABLESLIB}/ptest || exit 1 | |||
5 | 5 | ||
6 | LOG="${NFTABLESLIB}/ptest/nftables_ptest_$(date +%Y%m%d-%H%M%S).log" | 6 | LOG="${NFTABLESLIB}/ptest/nftables_ptest_$(date +%Y%m%d-%H%M%S).log" |
7 | NFT=nft | 7 | NFT=nft |
8 | tests/shell/run-tests.sh -v | sed -E '/I: \[OK\]/ s/^/PASS: / ; /W: \[(CHK DUMP|VALGRIND|TAINTED|DUMP FAIL|FAILED)\]/ s/^/FAIL: /' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tee -a "${LOG}" | 8 | tests/shell/run-tests.sh -v | sed -E '/I: \[OK\]/ s/^/PASS: / ; /W: \[(CHK DUMP|VALGRIND|TAINTED|DUMP FAIL|FAILED)\]/ s/^/FAIL: / ; /I: \[SKIPPED\]/ s/^/SKIP: /' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tee -a "${LOG}" |
9 | 9 | ||
10 | passed=$(grep -c PASS: "${LOG}") | 10 | passed=$(grep -c PASS: "${LOG}") |
11 | failed=$(grep -c FAIL: "${LOG}") | 11 | failed=$(grep -c FAIL: "${LOG}") |
12 | all=$((passed + failed)) | 12 | skiped=$(grep -c SKIP: "${LOG}") |
13 | |||
14 | all=$((passed + failed + skiped)) | ||
13 | 15 | ||
14 | ( echo "=== Test Summary ===" | 16 | ( echo "=== Test Summary ===" |
15 | echo "TOTAL: ${all}" | 17 | echo "TOTAL: ${all}" |
16 | echo "PASSED: ${passed}" | 18 | echo "PASSED: ${passed}" |
17 | echo "FAILED: ${failed}" | 19 | echo "FAILED: ${failed}" |
20 | echo "SKIPED: ${skiped}" | ||
21 | echo "====================" | ||
18 | ) | tee -a "${LOG}" | 22 | ) | tee -a "${LOG}" |
diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb b/meta-networking/recipes-filter/nftables/nftables_1.1.0.bb index 17f00ffd4..98e7a85a4 100644 --- a/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb +++ b/meta-networking/recipes-filter/nftables/nftables_1.1.0.bb | |||
@@ -12,11 +12,9 @@ DEPENDS = "libmnl libnftnl bison-native \ | |||
12 | ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" | 12 | ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" |
13 | 13 | ||
14 | SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ | 14 | SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ |
15 | file://0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch \ | ||
16 | file://0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch \ | ||
17 | file://run-ptest \ | 15 | file://run-ptest \ |
18 | " | 16 | " |
19 | SRC_URI[sha256sum] = "a3c304cd9ba061239ee0474f9afb938a9bb99d89b960246f66f0c3a0a85e14cd" | 17 | SRC_URI[sha256sum] = "ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24" |
20 | 18 | ||
21 | inherit autotools manpages pkgconfig ptest | 19 | inherit autotools manpages pkgconfig ptest |
22 | 20 | ||
@@ -26,16 +24,16 @@ PACKAGECONFIG[json] = "--with-json, --without-json, jansson" | |||
26 | PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" | 24 | PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" |
27 | PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" | 25 | PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" |
28 | PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" | 26 | PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" |
29 | PACKAGECONFIG[python] = ",, python3-setuptools-native" | 27 | PACKAGECONFIG[python] = "" |
30 | PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" | 28 | PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" |
31 | PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" | 29 | PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" |
32 | 30 | ||
33 | EXTRA_OECONF = " \ | 31 | EXTRA_OECONF = " \ |
34 | ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" | 32 | ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" |
35 | 33 | ||
36 | SETUPTOOLS_SETUP_PATH = "${S}/py" | 34 | PEP517_SOURCE_PATH = "${S}/py" |
37 | 35 | ||
38 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} | 36 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python_setuptools_build_meta', '', d)} |
39 | 37 | ||
40 | PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)}" | 38 | PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)}" |
41 | FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" | 39 | FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" |
@@ -46,21 +44,21 @@ RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" | |||
46 | do_configure() { | 44 | do_configure() { |
47 | autotools_do_configure | 45 | autotools_do_configure |
48 | if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then | 46 | if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then |
49 | setuptools3_do_configure | 47 | python_pep517_do_configure |
50 | fi | 48 | fi |
51 | } | 49 | } |
52 | 50 | ||
53 | do_compile() { | 51 | do_compile() { |
54 | autotools_do_compile | 52 | autotools_do_compile |
55 | if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then | 53 | if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then |
56 | setuptools3_do_compile | 54 | python_pep517_do_compile |
57 | fi | 55 | fi |
58 | } | 56 | } |
59 | 57 | ||
60 | do_install() { | 58 | do_install() { |
61 | autotools_do_install | 59 | autotools_do_install |
62 | if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then | 60 | if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then |
63 | setuptools3_do_install | 61 | python_pep517_do_install |
64 | fi | 62 | fi |
65 | } | 63 | } |
66 | 64 | ||
diff --git a/meta-networking/recipes-irc/znc/znc_1.8.2.bb b/meta-networking/recipes-irc/znc/znc_1.8.2.bb index 1517384ec..68dd0702f 100644 --- a/meta-networking/recipes-irc/znc/znc_1.8.2.bb +++ b/meta-networking/recipes-irc/znc/znc_1.8.2.bb | |||
@@ -29,4 +29,5 @@ do_configure:prepend() { | |||
29 | 29 | ||
30 | do_install:append() { | 30 | do_install:append() { |
31 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc | 31 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc |
32 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${bindir}/znc-buildmod | ||
32 | } | 33 | } |
diff --git a/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch b/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch new file mode 100644 index 000000000..98ba4d528 --- /dev/null +++ b/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From fa6227d92725af5ae17b8435c0d50d92ff7a575c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 14 Aug 2024 19:32:25 -0700 | ||
4 | Subject: [PATCH] bison/flex: Add flags for carrying user specified parameters | ||
5 | |||
6 | This helps in passing cmdline to flex and bison e.g. to remove lines | ||
7 | from generated output to avoid absolute paths | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | cmake/Modules/CMakeUserUseBison.cmake | 1 + | ||
13 | cmake/Modules/CMakeUserUseFlex.cmake | 1 + | ||
14 | 2 files changed, 2 insertions(+) | ||
15 | |||
16 | diff --git a/cmake/Modules/CMakeUserUseBison.cmake b/cmake/Modules/CMakeUserUseBison.cmake | ||
17 | index 9257545..b61bd0e 100644 | ||
18 | --- a/cmake/Modules/CMakeUserUseBison.cmake | ||
19 | +++ b/cmake/Modules/CMakeUserUseBison.cmake | ||
20 | @@ -52,6 +52,7 @@ IF(BISON_EXECUTABLE) | ||
21 | OUTPUT "${OUTFILE}" "${HEADER}" | ||
22 | COMMAND "${BISON_EXECUTABLE}" | ||
23 | ARGS "--name-prefix=${PREFIX}" | ||
24 | + "${BISON_TARGET_ARG_COMPILE_FLAGS}" | ||
25 | "--defines" | ||
26 | "--output-file=${OUTFILE}" | ||
27 | "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}" | ||
28 | diff --git a/cmake/Modules/CMakeUserUseFlex.cmake b/cmake/Modules/CMakeUserUseFlex.cmake | ||
29 | index 7d0394f..1221dca 100644 | ||
30 | --- a/cmake/Modules/CMakeUserUseFlex.cmake | ||
31 | +++ b/cmake/Modules/CMakeUserUseFlex.cmake | ||
32 | @@ -39,6 +39,7 @@ IF(FLEX_EXECUTABLE) | ||
33 | OUTPUT "${OUTFILE}" | ||
34 | COMMAND "${FLEX_EXECUTABLE}" | ||
35 | ARGS "-P${PREFIX}" | ||
36 | + "${FLEX_TARGET_ARG_COMPILE_FLAGS}" | ||
37 | "-o${OUTFILE}" | ||
38 | "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}" | ||
39 | DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}") | ||
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 c7c329a5d..cf50a92af 100644 --- a/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb +++ b/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb | |||
@@ -7,7 +7,7 @@ Accounting needs." | |||
7 | 7 | ||
8 | HOMEPAGE = "http://www.freediameter.net" | 8 | HOMEPAGE = "http://www.freediameter.net" |
9 | 9 | ||
10 | DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native" | 10 | DEPENDS = "flex-native bison-native cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native" |
11 | 11 | ||
12 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 12 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
13 | 13 | ||
@@ -23,6 +23,7 @@ SRC_URI = "git://github.com/freeDiameter/freeDiameter;protocol=https;branch=mast | |||
23 | file://freeDiameter.conf \ | 23 | file://freeDiameter.conf \ |
24 | file://install_test.patch \ | 24 | file://install_test.patch \ |
25 | file://0001-tests-use-EXTENSIONS_DIR.patch \ | 25 | file://0001-tests-use-EXTENSIONS_DIR.patch \ |
26 | file://0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch \ | ||
26 | " | 27 | " |
27 | 28 | ||
28 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |
@@ -49,6 +50,8 @@ EXTRA_OECMAKE = " \ | |||
49 | -DEXTENSIONS_DIR:PATH=${libdir}/${fd_pkgname} \ | 50 | -DEXTENSIONS_DIR:PATH=${libdir}/${fd_pkgname} \ |
50 | -DINSTALL_TEST_SUFFIX:PATH=${PTEST_PATH}-tests \ | 51 | -DINSTALL_TEST_SUFFIX:PATH=${PTEST_PATH}-tests \ |
51 | -DCMAKE_SKIP_RPATH:BOOL=ON \ | 52 | -DCMAKE_SKIP_RPATH:BOOL=ON \ |
53 | -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ | ||
54 | -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ | ||
52 | " | 55 | " |
53 | # INSTALL_LIBRARY_SUFFIX is relative to CMAKE_INSTALL_PREFIX | 56 | # INSTALL_LIBRARY_SUFFIX is relative to CMAKE_INSTALL_PREFIX |
54 | # specify it on cmd line will fix the SET bug in CMakeList.txt | 57 | # specify it on cmd line will fix the SET bug in CMakeList.txt |
@@ -107,15 +110,13 @@ EOF | |||
107 | # create self cert | 110 | # create self cert |
108 | 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}' | 111 | 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}' |
109 | openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024 | 112 | openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024 |
110 | |||
111 | find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${UNPACKDIR}##g' {} \; | ||
112 | } | 113 | } |
113 | 114 | ||
114 | do_install_ptest() { | 115 | do_install_ptest() { |
115 | mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/ | 116 | mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/ |
116 | rmdir ${D}${PTEST_PATH}-tests | 117 | rmdir ${D}${PTEST_PATH}-tests |
117 | install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/ | 118 | install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/ |
118 | sed -i -e 's#${UNPACKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake | 119 | sed -i -e 's#${WORKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake |
119 | sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake | 120 | sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake |
120 | } | 121 | } |
121 | 122 | ||
diff --git a/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch b/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch deleted file mode 100644 index 8c83d5c8e..000000000 --- a/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 49aeccbec4bf620bb594999bbd4a9de669a3984c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 15 Mar 2024 14:34:06 -0700 | ||
4 | Subject: [PATCH] zebra: Mimic GNU basename() API for non-glibc library e.g. | ||
5 | musl musl only provides POSIX version of basename and it has also removed | ||
6 | providing it via string.h header [1] which now results in compile errors with | ||
7 | newer compilers e.g. clang-18 | ||
8 | |||
9 | [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/15561/] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | zebra/zebra_netns_notify.c | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c | ||
18 | index 1bb1292e34..d55df2f62d 100644 | ||
19 | --- a/zebra/zebra_netns_notify.c | ||
20 | +++ b/zebra/zebra_netns_notify.c | ||
21 | @@ -41,6 +41,10 @@ | ||
22 | #define ZEBRA_NS_POLLING_INTERVAL_MSEC 1000 | ||
23 | #define ZEBRA_NS_POLLING_MAX_RETRIES 200 | ||
24 | |||
25 | +#if !defined(__GLIBC__) | ||
26 | +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) | ||
27 | +#endif | ||
28 | + | ||
29 | DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo"); | ||
30 | static struct event *zebra_netns_notify_current; | ||
31 | |||
32 | -- | ||
33 | 2.44.0 | ||
34 | |||
diff --git a/meta-networking/recipes-protocols/frr/frr_10.0.bb b/meta-networking/recipes-protocols/frr/frr_10.1.1.bb index afd2c95a0..237b52592 100644 --- a/meta-networking/recipes-protocols/frr/frr_10.0.bb +++ b/meta-networking/recipes-protocols/frr/frr_10.1.1.bb | |||
@@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a | |||
10 | file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" | 10 | file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" |
11 | 11 | ||
12 | 12 | ||
13 | SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.0 \ | 13 | SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.1 \ |
14 | file://frr.pam \ | 14 | file://frr.pam \ |
15 | file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ | ||
16 | " | 15 | " |
17 | 16 | ||
18 | SRCREV = "03a143cd49ed1b190cb38f48a31ef4d71fa01a02" | 17 | SRCREV = "dbf8dac1cea2b1235746e2d966a8ded9cffd5dc3" |
19 | 18 | ||
20 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" | 19 | UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" |
21 | 20 | ||
diff --git a/meta-networking/recipes-protocols/mdns/mdns_2200.120.24.bb b/meta-networking/recipes-protocols/mdns/mdns_2200.140.11.bb index 9aeda92a4..e6ea70719 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_2200.120.24.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_2200.140.11.bb | |||
@@ -25,7 +25,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https | |||
25 | file://0001-Handle-interface-without-ifa_addr.patch \ | 25 | file://0001-Handle-interface-without-ifa_addr.patch \ |
26 | file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \ | 26 | file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \ |
27 | " | 27 | " |
28 | SRCREV = "51a7148a21362285f8013648c4bfa91247ff598a" | 28 | SRCREV = "12e84b9089e577e0c0a9f48c4b922d7349fcc5a4" |
29 | 29 | ||
30 | # We install a stub Makefile in the top directory so that the various checks | 30 | # We install a stub Makefile in the top directory so that the various checks |
31 | # in base.bbclass pass their tests for a Makefile, this ensures (that amongst | 31 | # in base.bbclass pass their tests for a Makefile, this ensures (that amongst |
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 75b3d9e8c..989ec5413 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 | |||
@@ -73,6 +73,7 @@ CACHED_CONFIGUREVARS = " \ | |||
73 | lt_cv_shlibpath_overrides_runpath=yes \ | 73 | lt_cv_shlibpath_overrides_runpath=yes \ |
74 | ac_cv_path_UNAMEPROG=${base_bindir}/uname \ | 74 | ac_cv_path_UNAMEPROG=${base_bindir}/uname \ |
75 | ac_cv_path_PSPROG=${base_bindir}/ps \ | 75 | ac_cv_path_PSPROG=${base_bindir}/ps \ |
76 | ac_cv_ps_flags="-e" \ | ||
76 | ac_cv_file__etc_printcap=no \ | 77 | ac_cv_file__etc_printcap=no \ |
77 | NETSNMP_CONFIGURE_OPTIONS= \ | 78 | NETSNMP_CONFIGURE_OPTIONS= \ |
78 | " | 79 | " |
diff --git a/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-networking/recipes-protocols/openflow/openflow_git.bb index aad044a04..0061565f9 100644 --- a/meta-networking/recipes-protocols/openflow/openflow_git.bb +++ b/meta-networking/recipes-protocols/openflow/openflow_git.bb | |||
@@ -67,3 +67,8 @@ do_install:append() { | |||
67 | } | 67 | } |
68 | 68 | ||
69 | FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" | 69 | FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" |
70 | |||
71 | # http://errors.yoctoproject.org/Errors/Details/766898/ | ||
72 | # lib/flow.c:213:48: error: initialization of 'const struct arp_eth_header *' from incompatible pointer type 'struct arp_header *' [-Wincompatible-pointer-types] | ||
73 | # lib/backtrace.c:126:32: error: passing argument 1 of 'backtrace' from incompatible pointer type [-Wincompatible-pointer-types] | ||
74 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb b/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb index 4c18c6aff..3769d5cab 100644 --- a/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb +++ b/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb | |||
@@ -25,3 +25,4 @@ PACKAGECONFIG[inet6] = "--enable-inet6,--disable-inet6," | |||
25 | EXTRA_OECONF += "--disable-debug" | 25 | EXTRA_OECONF += "--disable-debug" |
26 | 26 | ||
27 | CVE_VERSION = "0.9.5.0" | 27 | CVE_VERSION = "0.9.5.0" |
28 | CVE_STATUS[CVE-2019-20503] = "cpe-incorrect: The current version (0.9.5.0) is not affected by the CVE which affects versions at least earlier than 0.9.4.0" | ||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch new file mode 100644 index 000000000..c69a395f1 --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch | |||
@@ -0,0 +1,969 @@ | |||
1 | From 7acb528db20c08d90f72fa317b8e1ccf4d270cdc Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthew Russell <matthew.g.russell@gmail.com> | ||
3 | Date: Wed, 10 Apr 2024 06:23:27 -0400 | ||
4 | Subject: [PATCH 1/2] Update to C++17 (#560) | ||
5 | |||
6 | * Upgrading to C++17 | ||
7 | |||
8 | * Code Quality: Address compiler warnings | ||
9 | |||
10 | - Fixing narrowing issues | ||
11 | - Removing useless copies | ||
12 | - Removing unused lines | ||
13 | - unused-lambda-capture | ||
14 | - Removes unused variables | ||
15 | - Fix some casts (modernize c-style, or simply remove useless casts) | ||
16 | - Explicitly deleting unused endpoint_impl copy and move constructors | ||
17 | - Removing redundant std::bind | ||
18 | - Improving const correctness | ||
19 | - Moving thread init to constructor body | ||
20 | - Moved check_routing_credentials_ inside vsomeip security section where it's used | ||
21 | - Using =default destructor instead of empty destructor | ||
22 | |||
23 | Thread init: | ||
24 | Moving the initialization of these threads into the constructor body to | ||
25 | ensure that they do not start with an incomplete "this". As they | ||
26 | capture this, it is possible that if the new thread begins before the | ||
27 | object is fully constructed, the new thread might operate on | ||
28 | uninitialized members of "this". | ||
29 | |||
30 | * Attempting to fix syntax error on MSVC | ||
31 | |||
32 | * Adjusting PR to conform to Covesa style | ||
33 | |||
34 | * Using curly brace initialization | ||
35 | |||
36 | * Using static_cast to narrow its_device.size() to a socklen_t | ||
37 | |||
38 | * Avoided double integer promotion | ||
39 | |||
40 | Upstream-Status: Backport [https://github.com/COVESA/vsomeip/pull/560] | ||
41 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
42 | --- | ||
43 | Android.bp | 2 +- | ||
44 | CMakeLists.txt | 11 ++- | ||
45 | examples/hello_world/hello_world_service.hpp | 12 +-- | ||
46 | .../configuration/include/internal.hpp.in | 6 +- | ||
47 | .../include/internal_android.hpp | 10 +-- | ||
48 | .../configuration/src/configuration_impl.cpp | 13 ++-- | ||
49 | .../endpoints/include/endpoint_impl.hpp | 3 + | ||
50 | .../local_server_endpoint_impl_receive_op.hpp | 4 +- | ||
51 | .../local_uds_client_endpoint_impl.hpp | 2 +- | ||
52 | .../local_uds_server_endpoint_impl.hpp | 2 +- | ||
53 | .../udp_server_endpoint_impl_receive_op.hpp | 2 +- | ||
54 | .../endpoints/src/endpoint_manager_base.cpp | 2 +- | ||
55 | .../src/local_uds_client_endpoint_impl.cpp | 5 -- | ||
56 | .../src/local_uds_server_endpoint_impl.cpp | 6 -- | ||
57 | .../src/tcp_client_endpoint_impl.cpp | 2 +- | ||
58 | .../src/tcp_server_endpoint_impl.cpp | 14 ++-- | ||
59 | .../src/udp_client_endpoint_impl.cpp | 2 +- | ||
60 | .../src/udp_server_endpoint_impl.cpp | 4 +- | ||
61 | .../message/include/message_base_impl.hpp | 2 - | ||
62 | implementation/message/src/deserializer.cpp | 4 +- | ||
63 | .../plugin/src/plugin_manager_impl.cpp | 2 +- | ||
64 | .../routing/src/routing_manager_base.cpp | 10 +-- | ||
65 | .../runtime/include/application_impl.hpp | 4 +- | ||
66 | .../runtime/src/application_impl.cpp | 7 +- | ||
67 | implementation/security/src/policy.cpp | 4 +- | ||
68 | implementation/security/src/security.cpp | 1 + | ||
69 | .../src/service_discovery_impl.cpp | 34 +++++---- | ||
70 | interface/vsomeip/constants.hpp | 74 +++++++++---------- | ||
71 | .../application_tests/application_test.cpp | 1 + | ||
72 | tools/vsomeip_ctrl.cpp | 9 ++- | ||
73 | 30 files changed, 129 insertions(+), 125 deletions(-) | ||
74 | |||
75 | diff --git a/Android.bp b/Android.bp | ||
76 | index c6caa4de..f314f22b 100644 | ||
77 | --- a/Android.bp | ||
78 | +++ b/Android.bp | ||
79 | @@ -30,9 +30,9 @@ libvsomeip_sd_srcs = [ | ||
80 | |||
81 | cc_defaults { | ||
82 | name: "vsomeip_defaults", | ||
83 | + cpp_std: "c++17", | ||
84 | |||
85 | cppflags: [ | ||
86 | - "-std=c++14", | ||
87 | "-fexceptions", | ||
88 | "-Wno-non-virtual-dtor", | ||
89 | "-Wno-unused-const-variable", | ||
90 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
91 | index ab399a69..3d947055 100644 | ||
92 | --- a/CMakeLists.txt | ||
93 | +++ b/CMakeLists.txt | ||
94 | @@ -64,6 +64,8 @@ if(NOT CMAKE_BUILD_TYPE) | ||
95 | set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") | ||
96 | endif() | ||
97 | |||
98 | +set(CMAKE_CXX_STANDARD 17) | ||
99 | + | ||
100 | # OS | ||
101 | if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") | ||
102 | set(DL_LIBRARY "dl") | ||
103 | @@ -248,13 +250,13 @@ if (MSVC) | ||
104 | # add_definitions(-DVSOMEIP_DLL_COMPILATION) now it is controlled per target | ||
105 | SET(BOOST_WINDOWS_VERSION "0x600" CACHE STRING "Set the same Version as the Version with which Boost was built, otherwise there will be errors. (normaly 0x600 is for Windows 7 and 0x501 is for Windows XP)") | ||
106 | # Disable warning C4250 since it warns that the compiler is correctly following the C++ Standard. It's a "We-Are-Doing-Things-By-The-Book" notice, not a real warning. | ||
107 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_ASIO_DISABLE_IOCP /EHsc /std:c++14 /wd4250") | ||
108 | + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_ASIO_DISABLE_IOCP /EHsc /wd4250") | ||
109 | set(USE_RT "") | ||
110 | link_directories(${Boost_LIBRARY_DIR_DEBUG}) | ||
111 | elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX") | ||
112 | set(USE_RT "") | ||
113 | else() | ||
114 | - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OS_CXX_FLAGS} -g ${OPTIMIZE} -std=c++14 ${NO_DEPRECATED} ${EXPORTSYMBOLS}") | ||
115 | + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OS_CXX_FLAGS} -g ${OPTIMIZE} ${NO_DEPRECATED} ${EXPORTSYMBOLS}") | ||
116 | set(USE_RT "rt") | ||
117 | endif() | ||
118 | |||
119 | @@ -268,6 +270,7 @@ list(SORT ${VSOMEIP_NAME}-cfg_SRC) | ||
120 | if (VSOMEIP_ENABLE_MULTIPLE_ROUTING_MANAGERS EQUAL 0) | ||
121 | add_library(${VSOMEIP_NAME}-cfg SHARED ${${VSOMEIP_NAME}-cfg_SRC}) | ||
122 | set_target_properties (${VSOMEIP_NAME}-cfg PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) | ||
123 | + target_compile_features(${VSOMEIP_NAME}-cfg PRIVATE cxx_std_17) | ||
124 | if (MSVC) | ||
125 | set_target_properties(${VSOMEIP_NAME}-cfg PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") | ||
126 | endif() | ||
127 | @@ -302,6 +305,7 @@ list(SORT ${VSOMEIP_NAME}_SRC) | ||
128 | |||
129 | add_library(${VSOMEIP_NAME} SHARED ${${VSOMEIP_NAME}_SRC}) | ||
130 | set_target_properties (${VSOMEIP_NAME} PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) | ||
131 | +target_compile_features(${VSOMEIP_NAME} PRIVATE cxx_std_17) | ||
132 | if (MSVC) | ||
133 | set_target_properties(${VSOMEIP_NAME} PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION") | ||
134 | else () | ||
135 | @@ -331,6 +335,7 @@ file(GLOB ${VSOMEIP_NAME}-sd_SRC | ||
136 | list(SORT ${VSOMEIP_NAME}-sd_SRC) | ||
137 | |||
138 | add_library(${VSOMEIP_NAME}-sd SHARED ${${VSOMEIP_NAME}-sd_SRC}) | ||
139 | +target_compile_features(${VSOMEIP_NAME}-sd PRIVATE cxx_std_17) | ||
140 | set_target_properties (${VSOMEIP_NAME}-sd PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) | ||
141 | if (MSVC) | ||
142 | set_target_properties(${VSOMEIP_NAME}-sd PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") | ||
143 | @@ -348,6 +353,7 @@ file(GLOB_RECURSE ${VSOMEIP_NAME}-e2e_SRC | ||
144 | list(SORT ${VSOMEIP_NAME}-e2e_SRC) | ||
145 | |||
146 | add_library(${VSOMEIP_NAME}-e2e SHARED ${${VSOMEIP_NAME}-e2e_SRC}) | ||
147 | +target_compile_features(${VSOMEIP_NAME}-e2e PRIVATE cxx_std_17) | ||
148 | set_target_properties (${VSOMEIP_NAME}-e2e PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) | ||
149 | if (MSVC) | ||
150 | set_target_properties(${VSOMEIP_NAME}-e2e PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") | ||
151 | @@ -375,6 +381,7 @@ file(GLOB_RECURSE ${VSOMEIP_COMPAT_NAME}_SRC | ||
152 | list(SORT ${VSOMEIP_COMPAT_NAME}_SRC) | ||
153 | |||
154 | add_library(${VSOMEIP_COMPAT_NAME} SHARED ${${VSOMEIP_COMPAT_NAME}_SRC}) | ||
155 | +target_compile_features(${VSOMEIP_COMPAT_NAME} PRIVATE cxx_std_17) | ||
156 | set_target_properties (${VSOMEIP_COMPAT_NAME} PROPERTIES VERSION ${VSOMEIP_COMPAT_VERSION} SOVERSION ${VSOMEIP_COMPAT_MAJOR_VERSION}) | ||
157 | if (MSVC) | ||
158 | set_target_properties(${VSOMEIP_COMPAT_NAME} PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") | ||
159 | diff --git a/examples/hello_world/hello_world_service.hpp b/examples/hello_world/hello_world_service.hpp | ||
160 | index 7ac3b1e7..b04cacea 100644 | ||
161 | --- a/examples/hello_world/hello_world_service.hpp | ||
162 | +++ b/examples/hello_world/hello_world_service.hpp | ||
163 | @@ -11,12 +11,12 @@ | ||
164 | #if defined ANDROID || defined __ANDROID__ | ||
165 | #include "android/log.h" | ||
166 | #define LOG_TAG "hello_world_service" | ||
167 | -#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n"), (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__) | ||
168 | -#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n"), (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__) | ||
169 | +#define LOG_INF(...) std::fprintf(stdout, __VA_ARGS__), std::fprintf(stdout, "\n"), (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__) | ||
170 | +#define LOG_ERR(...) std::fprintf(stderr, __VA_ARGS__), std::fprintf(stderr, "\n"), (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__) | ||
171 | #else | ||
172 | #include <cstdio> | ||
173 | -#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n") | ||
174 | -#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n") | ||
175 | +#define LOG_INF(...) std::fprintf(stdout, __VA_ARGS__), std::fprintf(stdout, "\n") | ||
176 | +#define LOG_ERR(...) std::fprintf(stderr, __VA_ARGS__), std::fprintf(stderr, "\n") | ||
177 | #endif | ||
178 | |||
179 | static vsomeip::service_t service_id = 0x1111; | ||
180 | @@ -32,9 +32,9 @@ public: | ||
181 | hello_world_service() : | ||
182 | rtm_(vsomeip::runtime::get()), | ||
183 | app_(rtm_->create_application()), | ||
184 | - stop_(false), | ||
185 | - stop_thread_(std::bind(&hello_world_service::stop, this)) | ||
186 | + stop_(false) | ||
187 | { | ||
188 | + stop_thread_ = std::thread{&hello_world_service::stop, this}; | ||
189 | } | ||
190 | |||
191 | ~hello_world_service() | ||
192 | diff --git a/implementation/configuration/include/internal.hpp.in b/implementation/configuration/include/internal.hpp.in | ||
193 | index 72c8d503..eff4efad 100644 | ||
194 | --- a/implementation/configuration/include/internal.hpp.in | ||
195 | +++ b/implementation/configuration/include/internal.hpp.in | ||
196 | @@ -141,14 +141,14 @@ typedef enum { | ||
197 | IS_SUBSCRIBING | ||
198 | } subscription_state_e; | ||
199 | |||
200 | -const std::uint32_t MESSAGE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); | ||
201 | +inline constexpr std::uint32_t MESSAGE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); | ||
202 | |||
203 | -const std::uint32_t QUEUE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); | ||
204 | +inline constexpr std::uint32_t QUEUE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); | ||
205 | |||
206 | #define VSOMEIP_DEFAULT_NPDU_DEBOUNCING_NANO 2 * 1000 * 1000 | ||
207 | #define VSOMEIP_DEFAULT_NPDU_MAXIMUM_RETENTION_NANO 5 * 1000 * 1000 | ||
208 | |||
209 | -const std::uint32_t MAX_RECONNECTS_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); | ||
210 | +inline constexpr std::uint32_t MAX_RECONNECTS_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); | ||
211 | |||
212 | const std::uint32_t ANY_UID = 0xFFFFFFFF; | ||
213 | const std::uint32_t ANY_GID = 0xFFFFFFFF; | ||
214 | diff --git a/implementation/configuration/include/internal_android.hpp b/implementation/configuration/include/internal_android.hpp | ||
215 | index f5425722..8757a85a 100644 | ||
216 | --- a/implementation/configuration/include/internal_android.hpp | ||
217 | +++ b/implementation/configuration/include/internal_android.hpp | ||
218 | @@ -128,17 +128,17 @@ typedef enum { | ||
219 | IS_SUBSCRIBING | ||
220 | } subscription_state_e; | ||
221 | |||
222 | -const std::uint32_t MESSAGE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); | ||
223 | +inline constexpr std::uint32_t MESSAGE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); | ||
224 | |||
225 | -const std::uint32_t QUEUE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); | ||
226 | +inline constexpr std::uint32_t QUEUE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); | ||
227 | |||
228 | #define VSOMEIP_DEFAULT_NPDU_DEBOUNCING_NANO 2 * 1000 * 1000 | ||
229 | #define VSOMEIP_DEFAULT_NPDU_MAXIMUM_RETENTION_NANO 5 * 1000 * 1000 | ||
230 | |||
231 | -const std::uint32_t MAX_RECONNECTS_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); | ||
232 | +inline constexpr std::uint32_t MAX_RECONNECTS_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); | ||
233 | |||
234 | -const std::uint32_t ANY_UID = 0xFFFFFFFF; | ||
235 | -const std::uint32_t ANY_GID = 0xFFFFFFFF; | ||
236 | +inline constexpr std::uint32_t ANY_UID = 0xFFFFFFFF; | ||
237 | +inline constexpr std::uint32_t ANY_GID = 0xFFFFFFFF; | ||
238 | |||
239 | enum class port_type_e { | ||
240 | PT_OPTIONAL, | ||
241 | diff --git a/implementation/configuration/src/configuration_impl.cpp b/implementation/configuration/src/configuration_impl.cpp | ||
242 | index ca1bd1dc..380b2906 100644 | ||
243 | --- a/implementation/configuration/src/configuration_impl.cpp | ||
244 | +++ b/implementation/configuration/src/configuration_impl.cpp | ||
245 | @@ -333,7 +333,7 @@ bool configuration_impl::load(const std::string &_name) { | ||
246 | |||
247 | // Tell, if reading of configuration file(s) failed. | ||
248 | // (This may file if the logger configuration is incomplete/missing). | ||
249 | - for (auto f : its_failed) | ||
250 | + for (const auto& f : its_failed) | ||
251 | VSOMEIP_WARNING << "Reading of configuration file \"" | ||
252 | << f << "\" failed. Configuration may be incomplete."; | ||
253 | |||
254 | @@ -342,7 +342,7 @@ bool configuration_impl::load(const std::string &_name) { | ||
255 | |||
256 | std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now(); | ||
257 | |||
258 | - for (auto i : its_input) { | ||
259 | + for (const auto& i : its_input) { | ||
260 | if (utility::is_file(i)) | ||
261 | VSOMEIP_INFO << "Using configuration file: \"" << i << "\"."; | ||
262 | |||
263 | @@ -561,7 +561,7 @@ bool configuration_impl::load_data(const std::vector<configuration_element> &_el | ||
264 | |||
265 | if (is_logging_loaded_) { | ||
266 | logger::logger_impl::init(shared_from_this()); | ||
267 | - for (auto w : its_warnings) | ||
268 | + for (const auto& w : its_warnings) | ||
269 | VSOMEIP_WARNING << w; | ||
270 | } | ||
271 | } | ||
272 | @@ -3255,7 +3255,7 @@ void configuration_impl::trim(std::string &_s) { | ||
273 | std::find_if( | ||
274 | _s.begin(), | ||
275 | _s.end(), | ||
276 | - [](unsigned char ch) { return !std::isspace(ch); } | ||
277 | + [](const auto ch) { return !std::isspace(ch); } | ||
278 | ) | ||
279 | ); | ||
280 | |||
281 | @@ -3263,8 +3263,9 @@ void configuration_impl::trim(std::string &_s) { | ||
282 | std::find_if( | ||
283 | _s.rbegin(), | ||
284 | _s.rend(), | ||
285 | - [](unsigned char ch) { return !std::isspace(ch); }).base(), | ||
286 | - _s.end() | ||
287 | + [](const auto ch) { return !std::isspace(ch); } | ||
288 | + ).base(), | ||
289 | + _s.end() | ||
290 | ); | ||
291 | } | ||
292 | |||
293 | diff --git a/implementation/endpoints/include/endpoint_impl.hpp b/implementation/endpoints/include/endpoint_impl.hpp | ||
294 | index 9d2b303c..685eba4e 100644 | ||
295 | --- a/implementation/endpoints/include/endpoint_impl.hpp | ||
296 | +++ b/implementation/endpoints/include/endpoint_impl.hpp | ||
297 | @@ -34,6 +34,9 @@ public: | ||
298 | std::uint32_t _max_message_size, | ||
299 | configuration::endpoint_queue_limit_t _queue_limit, | ||
300 | const std::shared_ptr<configuration>& _configuration); | ||
301 | + endpoint_impl(endpoint_impl<Protocol> const&) = delete; | ||
302 | + endpoint_impl(endpoint_impl<Protocol> const&&) = delete; | ||
303 | + | ||
304 | virtual ~endpoint_impl(); | ||
305 | |||
306 | void enable_magic_cookies(); | ||
307 | diff --git a/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp b/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp | ||
308 | index 53f4769a..b1d8991d 100644 | ||
309 | --- a/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp | ||
310 | +++ b/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp | ||
311 | @@ -25,8 +25,8 @@ struct storage : | ||
312 | { | ||
313 | socket_type_t &socket_; | ||
314 | receive_handler_t handler_; | ||
315 | - byte_t *buffer_; | ||
316 | - std::size_t length_; | ||
317 | + byte_t *buffer_ = nullptr; | ||
318 | + size_t length_; | ||
319 | uid_t uid_; | ||
320 | gid_t gid_; | ||
321 | size_t bytes_; | ||
322 | diff --git a/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp b/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp | ||
323 | index d7eede3f..e1e1aaa2 100644 | ||
324 | --- a/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp | ||
325 | +++ b/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp | ||
326 | @@ -25,7 +25,7 @@ public: | ||
327 | const endpoint_type& _remote, | ||
328 | boost::asio::io_context &_io, | ||
329 | const std::shared_ptr<configuration>& _configuration); | ||
330 | - virtual ~local_uds_client_endpoint_impl(); | ||
331 | + virtual ~local_uds_client_endpoint_impl() = default; | ||
332 | |||
333 | void start(); | ||
334 | void stop(); | ||
335 | diff --git a/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp b/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp | ||
336 | index 1e78822d..a4ed2eb5 100644 | ||
337 | --- a/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp | ||
338 | +++ b/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp | ||
339 | @@ -50,7 +50,7 @@ public: | ||
340 | const std::shared_ptr<configuration>& _configuration, | ||
341 | bool _is_routing_endpoint); | ||
342 | |||
343 | - virtual ~local_uds_server_endpoint_impl(); | ||
344 | + virtual ~local_uds_server_endpoint_impl() = default; | ||
345 | |||
346 | void start(); | ||
347 | void stop(); | ||
348 | diff --git a/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp b/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp | ||
349 | index 1e4f0fe0..35638cd7 100644 | ||
350 | --- a/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp | ||
351 | +++ b/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp | ||
352 | @@ -35,7 +35,7 @@ struct storage : | ||
353 | socket_type_t &socket_; | ||
354 | endpoint_type_t &sender_; | ||
355 | receive_handler_t handler_; | ||
356 | - byte_t *buffer_; | ||
357 | + byte_t *buffer_ = nullptr; | ||
358 | size_t length_; | ||
359 | std::uint8_t multicast_id_; | ||
360 | bool is_v4_; | ||
361 | diff --git a/implementation/endpoints/src/endpoint_manager_base.cpp b/implementation/endpoints/src/endpoint_manager_base.cpp | ||
362 | index 9dff9785..4e484454 100644 | ||
363 | --- a/implementation/endpoints/src/endpoint_manager_base.cpp | ||
364 | +++ b/implementation/endpoints/src/endpoint_manager_base.cpp | ||
365 | @@ -38,7 +38,7 @@ std::shared_ptr<endpoint> endpoint_manager_base::create_local(client_t _client) | ||
366 | return create_local_unlocked(_client); | ||
367 | } | ||
368 | |||
369 | -void endpoint_manager_base::remove_local(client_t _client) { | ||
370 | +void endpoint_manager_base::remove_local(const client_t _client) { | ||
371 | std::shared_ptr<endpoint> its_endpoint(find_local(_client)); | ||
372 | if (its_endpoint) { | ||
373 | its_endpoint->register_error_handler(nullptr); | ||
374 | diff --git a/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp b/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp | ||
375 | index 0b7e261c..56c621db 100644 | ||
376 | --- a/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp | ||
377 | +++ b/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp | ||
378 | @@ -40,12 +40,7 @@ local_uds_client_endpoint_impl::local_uds_client_endpoint_impl( | ||
379 | is_supporting_magic_cookies_ = false; | ||
380 | } | ||
381 | |||
382 | -local_uds_client_endpoint_impl::~local_uds_client_endpoint_impl() { | ||
383 | - | ||
384 | -} | ||
385 | - | ||
386 | bool local_uds_client_endpoint_impl::is_local() const { | ||
387 | - | ||
388 | return true; | ||
389 | } | ||
390 | |||
391 | diff --git a/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp b/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp | ||
392 | index 948fe925..33876c56 100644 | ||
393 | --- a/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp | ||
394 | +++ b/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp | ||
395 | @@ -104,17 +104,11 @@ local_uds_server_endpoint_impl::local_uds_server_endpoint_impl( | ||
396 | #endif | ||
397 | } | ||
398 | |||
399 | -local_uds_server_endpoint_impl::~local_uds_server_endpoint_impl() { | ||
400 | - | ||
401 | -} | ||
402 | - | ||
403 | bool local_uds_server_endpoint_impl::is_local() const { | ||
404 | - | ||
405 | return true; | ||
406 | } | ||
407 | |||
408 | void local_uds_server_endpoint_impl::start() { | ||
409 | - | ||
410 | std::lock_guard<std::mutex> its_lock(acceptor_mutex_); | ||
411 | if (acceptor_.is_open()) { | ||
412 | connection::ptr new_connection = connection::create( | ||
413 | diff --git a/implementation/endpoints/src/tcp_client_endpoint_impl.cpp b/implementation/endpoints/src/tcp_client_endpoint_impl.cpp | ||
414 | index f42d93d4..e6755157 100644 | ||
415 | --- a/implementation/endpoints/src/tcp_client_endpoint_impl.cpp | ||
416 | +++ b/implementation/endpoints/src/tcp_client_endpoint_impl.cpp | ||
417 | @@ -178,7 +178,7 @@ void tcp_client_endpoint_impl::connect() { | ||
418 | std::string its_device(configuration_->get_device()); | ||
419 | if (its_device != "") { | ||
420 | if (setsockopt(socket_->native_handle(), | ||
421 | - SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) { | ||
422 | + SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) { | ||
423 | VSOMEIP_WARNING << "TCP Client: Could not bind to device \"" << its_device << "\""; | ||
424 | } | ||
425 | } | ||
426 | diff --git a/implementation/endpoints/src/tcp_server_endpoint_impl.cpp b/implementation/endpoints/src/tcp_server_endpoint_impl.cpp | ||
427 | index f83252ae..5aef72be 100644 | ||
428 | --- a/implementation/endpoints/src/tcp_server_endpoint_impl.cpp | ||
429 | +++ b/implementation/endpoints/src/tcp_server_endpoint_impl.cpp | ||
430 | @@ -55,7 +55,7 @@ tcp_server_endpoint_impl::tcp_server_endpoint_impl( | ||
431 | std::string its_device(configuration_->get_device()); | ||
432 | if (its_device != "") { | ||
433 | if (setsockopt(acceptor_.native_handle(), | ||
434 | - SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) { | ||
435 | + SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) { | ||
436 | VSOMEIP_WARNING << "TCP Server: Could not bind to device \"" << its_device << "\""; | ||
437 | } | ||
438 | } | ||
439 | @@ -295,8 +295,8 @@ void tcp_server_endpoint_impl::accept_cbk(const connection::ptr& _connection, | ||
440 | auto its_ep = std::dynamic_pointer_cast<tcp_server_endpoint_impl>( | ||
441 | shared_from_this()); | ||
442 | its_timer->async_wait([its_timer, its_ep] | ||
443 | - (const boost::system::error_code& _error) { | ||
444 | - if (!_error) { | ||
445 | + (const boost::system::error_code& _error_inner) { | ||
446 | + if (!_error_inner) { | ||
447 | its_ep->start(); | ||
448 | } | ||
449 | }); | ||
450 | @@ -853,12 +853,12 @@ void tcp_server_endpoint_impl::connection::handle_recv_buffer_exception( | ||
451 | << std::setfill('0') << std::hex; | ||
452 | |||
453 | for (std::size_t i = 0; i < recv_buffer_size_ && i < 16; i++) { | ||
454 | - its_message << std::setw(2) << (int) (recv_buffer_[i]) << " "; | ||
455 | + its_message << std::setw(2) << static_cast<int>(recv_buffer_[i]) << " "; | ||
456 | } | ||
457 | |||
458 | its_message << " Last 16 Bytes captured: "; | ||
459 | for (int i = 15; recv_buffer_size_ > 15 && i >= 0; i--) { | ||
460 | - its_message << std::setw(2) << (int) (recv_buffer_[static_cast<size_t>(i)]) << " "; | ||
461 | + its_message << std::setw(2) << static_cast<int>(recv_buffer_[static_cast<size_t>(i)]) << " "; | ||
462 | } | ||
463 | VSOMEIP_ERROR << its_message.str(); | ||
464 | recv_buffer_.clear(); | ||
465 | @@ -954,7 +954,7 @@ void tcp_server_endpoint_impl::print_status() { | ||
466 | std::lock_guard<std::mutex> its_lock(mutex_); | ||
467 | connections_t its_connections; | ||
468 | { | ||
469 | - std::lock_guard<std::mutex> its_lock(connections_mutex_); | ||
470 | + std::lock_guard<std::mutex> its_lock_inner(connections_mutex_); | ||
471 | its_connections = connections_; | ||
472 | } | ||
473 | |||
474 | @@ -1027,7 +1027,7 @@ void tcp_server_endpoint_impl::connection::wait_until_sent(const boost::system:: | ||
475 | } | ||
476 | } | ||
477 | { | ||
478 | - std::lock_guard<std::mutex> its_lock(its_server->connections_mutex_); | ||
479 | + std::lock_guard<std::mutex> its_lock_inner(its_server->connections_mutex_); | ||
480 | stop(); | ||
481 | } | ||
482 | its_server->remove_connection(this); | ||
483 | diff --git a/implementation/endpoints/src/udp_client_endpoint_impl.cpp b/implementation/endpoints/src/udp_client_endpoint_impl.cpp | ||
484 | index d6952228..f52b2354 100644 | ||
485 | --- a/implementation/endpoints/src/udp_client_endpoint_impl.cpp | ||
486 | +++ b/implementation/endpoints/src/udp_client_endpoint_impl.cpp | ||
487 | @@ -67,7 +67,7 @@ void udp_client_endpoint_impl::connect() { | ||
488 | << get_address_port_remote(); | ||
489 | } | ||
490 | socket_->set_option(boost::asio::socket_base::receive_buffer_size( | ||
491 | - udp_receive_buffer_size_), its_error); | ||
492 | + static_cast<int>(udp_receive_buffer_size_)), its_error); | ||
493 | if (its_error) { | ||
494 | VSOMEIP_WARNING << "udp_client_endpoint_impl::connect: couldn't set " | ||
495 | << "SO_RCVBUF: " << its_error.message() | ||
496 | diff --git a/implementation/endpoints/src/udp_server_endpoint_impl.cpp b/implementation/endpoints/src/udp_server_endpoint_impl.cpp | ||
497 | index 48e35c5d..587fb94c 100644 | ||
498 | --- a/implementation/endpoints/src/udp_server_endpoint_impl.cpp | ||
499 | +++ b/implementation/endpoints/src/udp_server_endpoint_impl.cpp | ||
500 | @@ -72,7 +72,7 @@ udp_server_endpoint_impl::udp_server_endpoint_impl( | ||
501 | std::string its_device(configuration_->get_device()); | ||
502 | if (its_device != "") { | ||
503 | if (setsockopt(unicast_socket_.native_handle(), | ||
504 | - SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) { | ||
505 | + SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) { | ||
506 | VSOMEIP_WARNING << "UDP Server: Could not bind to device \"" << its_device << "\""; | ||
507 | } | ||
508 | } | ||
509 | @@ -108,7 +108,7 @@ udp_server_endpoint_impl::udp_server_endpoint_impl( | ||
510 | const int its_udp_recv_buffer_size = | ||
511 | configuration_->get_udp_receive_buffer_size(); | ||
512 | unicast_socket_.set_option(boost::asio::socket_base::receive_buffer_size( | ||
513 | - its_udp_recv_buffer_size), ec); | ||
514 | + static_cast<int>(its_udp_recv_buffer_size)), ec); | ||
515 | |||
516 | if (ec) { | ||
517 | VSOMEIP_WARNING << "udp_server_endpoint_impl: couldn't set " | ||
518 | diff --git a/implementation/message/include/message_base_impl.hpp b/implementation/message/include/message_base_impl.hpp | ||
519 | index acad2e89..2c953e98 100644 | ||
520 | --- a/implementation/message/include/message_base_impl.hpp | ||
521 | +++ b/implementation/message/include/message_base_impl.hpp | ||
522 | @@ -6,8 +6,6 @@ | ||
523 | #ifndef VSOMEIP_V3_MESSAGE_BASE_IMPL_HPP | ||
524 | #define VSOMEIP_V3_MESSAGE_BASE_IMPL_HPP | ||
525 | |||
526 | -#include <boost/thread.hpp> | ||
527 | - | ||
528 | #include <vsomeip/export.hpp> | ||
529 | #include <vsomeip/message.hpp> | ||
530 | |||
531 | diff --git a/implementation/message/src/deserializer.cpp b/implementation/message/src/deserializer.cpp | ||
532 | index 3c4eddfa..bfa723d3 100644 | ||
533 | --- a/implementation/message/src/deserializer.cpp | ||
534 | +++ b/implementation/message/src/deserializer.cpp | ||
535 | @@ -115,8 +115,8 @@ bool deserializer::deserialize(std::string &_target, std::size_t _length) { | ||
536 | if (_length > remaining_ || _length > _target.capacity()) { | ||
537 | return false; | ||
538 | } | ||
539 | - _target.assign(position_, position_ + long(_length)); | ||
540 | - position_ += long(_length); | ||
541 | + _target.assign(position_, position_ + static_cast<std::vector<byte_t>::difference_type>(_length)); | ||
542 | + position_ += static_cast<std::vector<byte_t>::difference_type>(_length); | ||
543 | remaining_ -= _length; | ||
544 | |||
545 | return true; | ||
546 | diff --git a/implementation/plugin/src/plugin_manager_impl.cpp b/implementation/plugin/src/plugin_manager_impl.cpp | ||
547 | index bea96d01..23b7b892 100644 | ||
548 | --- a/implementation/plugin/src/plugin_manager_impl.cpp | ||
549 | +++ b/implementation/plugin/src/plugin_manager_impl.cpp | ||
550 | @@ -164,7 +164,7 @@ bool plugin_manager_impl::unload_plugin(plugin_type_e _type) { | ||
551 | } | ||
552 | } else { | ||
553 | VSOMEIP_ERROR << "plugin_manager_impl::unload_plugin didn't find plugin" | ||
554 | - << " type:" << (int)_type; | ||
555 | + << " type:" << static_cast<int>(_type); | ||
556 | return false; | ||
557 | } | ||
558 | return plugins_.erase(_type); | ||
559 | diff --git a/implementation/routing/src/routing_manager_base.cpp b/implementation/routing/src/routing_manager_base.cpp | ||
560 | index dde6b260..047e6566 100644 | ||
561 | --- a/implementation/routing/src/routing_manager_base.cpp | ||
562 | +++ b/implementation/routing/src/routing_manager_base.cpp | ||
563 | @@ -1184,8 +1184,8 @@ void routing_manager_base::remove_local(client_t _client, | ||
564 | std::lock_guard<std::mutex> its_lock(local_services_mutex_); | ||
565 | // Finally remove all services that are implemented by the client. | ||
566 | std::set<std::pair<service_t, instance_t>> its_services; | ||
567 | - for (auto& s : local_services_) { | ||
568 | - for (auto& i : s.second) { | ||
569 | + for (const auto& s : local_services_) { | ||
570 | + for (const auto& i : s.second) { | ||
571 | if (std::get<2>(i.second) == _client) { | ||
572 | its_services.insert({ s.first, i.first }); | ||
573 | host_->on_availability(s.first, i.first, availability_state_e::AS_UNAVAILABLE, | ||
574 | @@ -1202,9 +1202,9 @@ void routing_manager_base::remove_local(client_t _client, | ||
575 | |||
576 | // remove disconnected client from offer service history | ||
577 | std::set<std::tuple<service_t, instance_t, client_t>> its_clients; | ||
578 | - for (auto& s : local_services_history_) { | ||
579 | - for (auto& i : s.second) { | ||
580 | - for (auto& c : i.second) { | ||
581 | + for (const auto& s : local_services_history_) { | ||
582 | + for (const auto& i : s.second) { | ||
583 | + for (const auto& c : i.second) { | ||
584 | if (c == _client) { | ||
585 | its_clients.insert(std::make_tuple(s.first, i.first, c)); | ||
586 | } | ||
587 | diff --git a/implementation/runtime/include/application_impl.hpp b/implementation/runtime/include/application_impl.hpp | ||
588 | index 67187a87..c647b531 100644 | ||
589 | --- a/implementation/runtime/include/application_impl.hpp | ||
590 | +++ b/implementation/runtime/include/application_impl.hpp | ||
591 | @@ -309,7 +309,7 @@ private: | ||
592 | std::shared_ptr<sync_handler> get_next_handler(); | ||
593 | void reschedule_availability_handler(const std::shared_ptr<sync_handler> &_handler); | ||
594 | bool has_active_dispatcher(); | ||
595 | - bool is_active_dispatcher(const std::thread::id &_id); | ||
596 | + bool is_active_dispatcher(const std::thread::id &_id) const; | ||
597 | void remove_elapsed_dispatchers(); | ||
598 | |||
599 | void shutdown(); | ||
600 | @@ -436,7 +436,7 @@ private: | ||
601 | // Dispatcher threads that are running | ||
602 | std::set<std::thread::id> running_dispatchers_; | ||
603 | // Mutex to protect access to dispatchers_ & elapsed_dispatchers_ | ||
604 | - std::mutex dispatcher_mutex_; | ||
605 | + mutable std::mutex dispatcher_mutex_; | ||
606 | |||
607 | // Condition to wakeup the dispatcher thread | ||
608 | mutable std::condition_variable dispatcher_condition_; | ||
609 | diff --git a/implementation/runtime/src/application_impl.cpp b/implementation/runtime/src/application_impl.cpp | ||
610 | index aba906b7..db880b42 100644 | ||
611 | --- a/implementation/runtime/src/application_impl.cpp | ||
612 | +++ b/implementation/runtime/src/application_impl.cpp | ||
613 | @@ -426,7 +426,8 @@ void application_impl::start() { | ||
614 | std::lock_guard<std::mutex> its_lock(dispatcher_mutex_); | ||
615 | is_dispatching_ = true; | ||
616 | auto its_main_dispatcher = std::make_shared<std::thread>( | ||
617 | - std::bind(&application_impl::main_dispatch, shared_from_this())); | ||
618 | + &application_impl::main_dispatch, shared_from_this() | ||
619 | + ); | ||
620 | dispatchers_[its_main_dispatcher->get_id()] = its_main_dispatcher; | ||
621 | } | ||
622 | |||
623 | @@ -1792,7 +1793,7 @@ void application_impl::main_dispatch() { | ||
624 | } | ||
625 | } else { | ||
626 | std::shared_ptr<sync_handler> its_handler; | ||
627 | - while (is_dispatching_ && is_active_dispatcher(its_id) | ||
628 | + while (is_dispatching_ && is_active_dispatcher(its_id) | ||
629 | && (its_handler = get_next_handler())) { | ||
630 | its_lock.unlock(); | ||
631 | invoke_handler(its_handler); | ||
632 | @@ -2048,7 +2049,7 @@ bool application_impl::has_active_dispatcher() { | ||
633 | return false; | ||
634 | } | ||
635 | |||
636 | -bool application_impl::is_active_dispatcher(const std::thread::id &_id) { | ||
637 | +bool application_impl::is_active_dispatcher(const std::thread::id &_id) const { | ||
638 | while (is_dispatching_) { | ||
639 | if (dispatcher_mutex_.try_lock()) { | ||
640 | for (const auto &d : dispatchers_) { | ||
641 | diff --git a/implementation/security/src/policy.cpp b/implementation/security/src/policy.cpp | ||
642 | index 36341223..da0bbd86 100644 | ||
643 | --- a/implementation/security/src/policy.cpp | ||
644 | +++ b/implementation/security/src/policy.cpp | ||
645 | @@ -175,7 +175,7 @@ policy::deserialize_ids(const byte_t * &_data, uint32_t &_size, | ||
646 | if (its_result == false) | ||
647 | return false; | ||
648 | |||
649 | - for (const auto i : its_instances) | ||
650 | + for (const auto& i : its_instances) | ||
651 | its_ids += std::make_pair(i, its_methods); | ||
652 | |||
653 | its_array_length -= (its_current_size - _size); | ||
654 | @@ -379,7 +379,7 @@ policy::serialize_interval_set( | ||
655 | uint32_t its_interval_set_size(0); | ||
656 | serialize_u32(its_interval_set_size, _data); | ||
657 | |||
658 | - for (const auto i : _intervals) | ||
659 | + for (const auto& i : _intervals) | ||
660 | serialize_interval(i, _data); | ||
661 | |||
662 | its_interval_set_size = static_cast<uint32_t>(_data.size() | ||
663 | diff --git a/implementation/security/src/security.cpp b/implementation/security/src/security.cpp | ||
664 | index a3b6ab3f..19ff73da 100644 | ||
665 | --- a/implementation/security/src/security.cpp | ||
666 | +++ b/implementation/security/src/security.cpp | ||
667 | @@ -14,6 +14,7 @@ | ||
668 | #include "../../plugin/include/plugin_manager.hpp" | ||
669 | |||
670 | #include <array> | ||
671 | +#include <iomanip> | ||
672 | #include <tuple> | ||
673 | |||
674 | #ifndef _WIN32 | ||
675 | diff --git a/implementation/service_discovery/src/service_discovery_impl.cpp b/implementation/service_discovery/src/service_discovery_impl.cpp | ||
676 | index de6e8467..c3880457 100644 | ||
677 | --- a/implementation/service_discovery/src/service_discovery_impl.cpp | ||
678 | +++ b/implementation/service_discovery/src/service_discovery_impl.cpp | ||
679 | @@ -5,8 +5,10 @@ | ||
680 | |||
681 | #include <vsomeip/constants.hpp> | ||
682 | |||
683 | -#include <random> | ||
684 | +#include <chrono> | ||
685 | +#include <iomanip> | ||
686 | #include <forward_list> | ||
687 | +#include <random> | ||
688 | #include <thread> | ||
689 | |||
690 | #include <vsomeip/internal/logger.hpp> | ||
691 | @@ -869,7 +871,7 @@ service_discovery_impl::create_eventgroup_entry( | ||
692 | << std::setw(4) << _service << "." | ||
693 | << std::setw(4) << _instance << "." | ||
694 | << std::setw(4) << _eventgroup << "] " | ||
695 | - << (uint16_t) _reliability_type; | ||
696 | + << static_cast<uint16_t>(_reliability_type); | ||
697 | return its_data; | ||
698 | } | ||
699 | std::shared_ptr<eventgroupentry_impl> its_entry, its_other; | ||
700 | @@ -1074,7 +1076,7 @@ service_discovery_impl::insert_subscription_ack( | ||
701 | // Selective | ||
702 | if (_clients.size() > 1 || (*(_clients.begin())) != 0) { | ||
703 | auto its_selective_option = std::make_shared<selective_option_impl>(); | ||
704 | - (void)its_selective_option->set_clients(_clients); | ||
705 | + static_cast<void>(its_selective_option->set_clients(_clients)); | ||
706 | |||
707 | its_data.options_.push_back(its_selective_option); | ||
708 | } | ||
709 | @@ -1136,7 +1138,7 @@ service_discovery_impl::on_message( | ||
710 | static bool must_start_last_msg_received_timer(true); | ||
711 | boost::system::error_code ec; | ||
712 | |||
713 | - std::lock_guard<std::mutex> its_lock(last_msg_received_timer_mutex_); | ||
714 | + std::lock_guard<std::mutex> its_lock_inner(last_msg_received_timer_mutex_); | ||
715 | if (0 < last_msg_received_timer_.cancel(ec) || must_start_last_msg_received_timer) { | ||
716 | must_start_last_msg_received_timer = false; | ||
717 | last_msg_received_timer_.expires_from_now( | ||
718 | @@ -1272,7 +1274,7 @@ service_discovery_impl::on_message( | ||
719 | } | ||
720 | |||
721 | { | ||
722 | - std::unique_lock<std::recursive_mutex> its_lock(its_acknowledgement->get_lock()); | ||
723 | + std::unique_lock<std::recursive_mutex> its_lock_inner(its_acknowledgement->get_lock()); | ||
724 | its_acknowledgement->complete(); | ||
725 | // TODO: Check the following logic... | ||
726 | if (its_acknowledgement->has_subscription()) { | ||
727 | @@ -1543,7 +1545,7 @@ service_discovery_impl::process_offerservice_serviceentry( | ||
728 | << std::setw(4) << _instance << "." | ||
729 | << std::setw(4) << eg << "]" | ||
730 | << " using reliability type: " | ||
731 | - << std::setw(4) << (uint16_t) offer_type; | ||
732 | + << std::setw(4) << static_cast<uint16_t>(offer_type); | ||
733 | its_info->set_reliability(offer_type); | ||
734 | } | ||
735 | } | ||
736 | @@ -1947,7 +1949,7 @@ service_discovery_impl::process_eventgroupentry( | ||
737 | << ": SOME/IP length field in SubscribeEventGroup message header: [" | ||
738 | << std::dec << _entry->get_owning_message()->get_someip_length() | ||
739 | << "] bytes, is shorter than length of deserialized message: [" | ||
740 | - << (uint32_t) _entry->get_owning_message()->get_length() << "] bytes. " | ||
741 | + << static_cast<uint32_t>(_entry->get_owning_message()->get_length()) << "] bytes. " | ||
742 | << its_sender.to_string(ec) << " session: " | ||
743 | << std::hex << std::setw(4) << std::setfill('0') << its_session; | ||
744 | return; | ||
745 | @@ -2238,7 +2240,7 @@ service_discovery_impl::process_eventgroupentry( | ||
746 | boost::system::error_code ec; | ||
747 | VSOMEIP_WARNING << __func__ | ||
748 | << ": Unsupported eventgroup option [" | ||
749 | - << std::hex << (int)its_option->get_type() << "] " | ||
750 | + << std::hex << static_cast<int>(its_option->get_type()) << "] " | ||
751 | << its_sender.to_string(ec) << " session: " | ||
752 | << std::hex << std::setw(4) << std::setfill('0') << its_session; | ||
753 | if (its_ttl > 0) { | ||
754 | @@ -2332,7 +2334,7 @@ service_discovery_impl::handle_eventgroup_subscription( | ||
755 | << std::setw(4) << _instance << "." | ||
756 | << std::setw(4) << _eventgroup << "]" | ||
757 | << " not valid: Event configuration (" | ||
758 | - << (std::uint32_t)_info->get_reliability() | ||
759 | + << static_cast<std::uint32_t>(_info->get_reliability()) | ||
760 | << ") does not match the provided endpoint options: " | ||
761 | << _first_address.to_string(ec) << ":" << std::dec << _first_port << " " | ||
762 | << _second_address.to_string(ec) << ":" << _second_port; | ||
763 | @@ -2355,14 +2357,14 @@ service_discovery_impl::handle_eventgroup_subscription( | ||
764 | boost::system::error_code ec; | ||
765 | // TODO: Add session id | ||
766 | VSOMEIP_ERROR << __func__ | ||
767 | - << ": Requested major version:[" << (uint32_t) _major | ||
768 | + << ": Requested major version:[" << static_cast<uint32_t>(_major) | ||
769 | << "] in subscription to service: [" | ||
770 | << std::hex << std::setfill('0') | ||
771 | << std::setw(4) << _service << "." | ||
772 | << std::setw(4) << _instance << "." | ||
773 | << std::setw(4) << _eventgroup << "]" | ||
774 | << " does not match with services major version:[" | ||
775 | - << (uint32_t) _info->get_major() << "] subscriber: " | ||
776 | + << static_cast<uint32_t>(_info->get_major()) << "] subscriber: " | ||
777 | << _first_address.to_string(ec) << ":" << std::dec << _first_port; | ||
778 | if (_ttl > 0) { | ||
779 | insert_subscription_ack(_acknowledgement, its_info, 0, nullptr, _clients); | ||
780 | @@ -3107,8 +3109,8 @@ service_discovery_impl::move_offers_into_main_phase( | ||
781 | const auto its_timer = repetition_phase_timers_.find(_timer); | ||
782 | if (its_timer != repetition_phase_timers_.end()) { | ||
783 | for (const auto& its_service : its_timer->second) { | ||
784 | - for (const auto& instance : its_service.second) { | ||
785 | - instance.second->set_is_in_mainphase(true); | ||
786 | + for (const auto& its_instance : its_service.second) { | ||
787 | + its_instance.second->set_is_in_mainphase(true); | ||
788 | } | ||
789 | } | ||
790 | repetition_phase_timers_.erase(_timer); | ||
791 | @@ -3125,7 +3127,7 @@ service_discovery_impl::stop_offer_service( | ||
792 | bool stop_offer_required(false); | ||
793 | // Delete from initial phase offers | ||
794 | { | ||
795 | - std::lock_guard<std::mutex> its_lock(collected_offers_mutex_); | ||
796 | + std::lock_guard<std::mutex> its_lock_inner(collected_offers_mutex_); | ||
797 | if (collected_offers_.size()) { | ||
798 | auto its_service_it = collected_offers_.find(its_service); | ||
799 | if (its_service_it != collected_offers_.end()) { | ||
800 | @@ -3147,7 +3149,7 @@ service_discovery_impl::stop_offer_service( | ||
801 | |||
802 | // Delete from repetition phase offers | ||
803 | { | ||
804 | - std::lock_guard<std::mutex> its_lock(repetition_phase_timers_mutex_); | ||
805 | + std::lock_guard<std::mutex> its_lock_inner(repetition_phase_timers_mutex_); | ||
806 | for (auto rpt = repetition_phase_timers_.begin(); | ||
807 | rpt != repetition_phase_timers_.end();) { | ||
808 | auto its_service_it = rpt->second.find(its_service); | ||
809 | @@ -3866,7 +3868,7 @@ reliability_type_e service_discovery_impl::get_eventgroup_reliability( | ||
810 | << std::setw(4) << _instance << "." | ||
811 | << std::setw(4) << _eventgroup << "]" | ||
812 | << " using reliability type: " | ||
813 | - << std::setw(4) << (uint16_t) its_reliability; | ||
814 | + << std::setw(4) << static_cast<uint16_t>(its_reliability); | ||
815 | its_info->set_reliability(its_reliability); | ||
816 | } | ||
817 | } else { | ||
818 | diff --git a/interface/vsomeip/constants.hpp b/interface/vsomeip/constants.hpp | ||
819 | index 2b040c5e..2519b57f 100644 | ||
820 | --- a/interface/vsomeip/constants.hpp | ||
821 | +++ b/interface/vsomeip/constants.hpp | ||
822 | @@ -13,54 +13,54 @@ | ||
823 | |||
824 | namespace vsomeip_v3 { | ||
825 | |||
826 | -const major_version_t DEFAULT_MAJOR = 0x00; | ||
827 | -const minor_version_t DEFAULT_MINOR = 0x00000000; | ||
828 | -const ttl_t DEFAULT_TTL = 0xFFFFFF; // "until next reboot" | ||
829 | +inline constexpr major_version_t DEFAULT_MAJOR = 0x00; | ||
830 | +inline constexpr minor_version_t DEFAULT_MINOR = 0x00000000; | ||
831 | +inline constexpr ttl_t DEFAULT_TTL = 0xFFFFFF; // "until next reboot" | ||
832 | |||
833 | const std::string DEFAULT_MULTICAST = "224.0.0.0"; | ||
834 | -const uint16_t DEFAULT_PORT = 30500; | ||
835 | -const uint16_t ILLEGAL_PORT = 0xFFFF; | ||
836 | -const uint16_t ANY_PORT = 0; | ||
837 | - | ||
838 | -const uint16_t NO_TRACE_FILTER_EXPRESSION = 0x0000; | ||
839 | - | ||
840 | -const service_t ANY_SERVICE = 0xFFFF; | ||
841 | -const instance_t ANY_INSTANCE = 0xFFFF; | ||
842 | -const eventgroup_t ANY_EVENTGROUP = 0xFFFF; | ||
843 | -const method_t ANY_METHOD = 0xFFFF; | ||
844 | -const major_version_t ANY_MAJOR = 0xFF; | ||
845 | -const minor_version_t ANY_MINOR = 0xFFFFFFFF; | ||
846 | - | ||
847 | -const eventgroup_t DEFAULT_EVENTGROUP = 0x0001; | ||
848 | - | ||
849 | -const client_t ILLEGAL_CLIENT = 0x0000; | ||
850 | -const method_t INVALID_METHOD = 0x0000; | ||
851 | - | ||
852 | -const byte_t MAGIC_COOKIE_CLIENT_MESSAGE = 0x00; | ||
853 | -const byte_t MAGIC_COOKIE_SERVICE_MESSAGE = 0x80; | ||
854 | -const length_t MAGIC_COOKIE_SIZE = 0x00000008; | ||
855 | -const request_t MAGIC_COOKIE_REQUEST = 0xDEADBEEF; | ||
856 | -const client_t MAGIC_COOKIE_CLIENT = 0xDEAD; | ||
857 | -const protocol_version_t MAGIC_COOKIE_PROTOCOL_VERSION = 0x01; | ||
858 | -const interface_version_t MAGIC_COOKIE_INTERFACE_VERSION = 0x01; | ||
859 | -const message_type_e MAGIC_COOKIE_CLIENT_MESSAGE_TYPE = | ||
860 | +inline constexpr uint16_t DEFAULT_PORT = 30500; | ||
861 | +inline constexpr uint16_t ILLEGAL_PORT = 0xFFFF; | ||
862 | +inline constexpr uint16_t ANY_PORT = 0; | ||
863 | + | ||
864 | +inline constexpr uint16_t NO_TRACE_FILTER_EXPRESSION = 0x0000; | ||
865 | + | ||
866 | +inline constexpr service_t ANY_SERVICE = 0xFFFF; | ||
867 | +inline constexpr instance_t ANY_INSTANCE = 0xFFFF; | ||
868 | +inline constexpr eventgroup_t ANY_EVENTGROUP = 0xFFFF; | ||
869 | +inline constexpr method_t ANY_METHOD = 0xFFFF; | ||
870 | +inline constexpr major_version_t ANY_MAJOR = 0xFF; | ||
871 | +inline constexpr minor_version_t ANY_MINOR = 0xFFFFFFFF; | ||
872 | + | ||
873 | +inline constexpr eventgroup_t DEFAULT_EVENTGROUP = 0x0001; | ||
874 | + | ||
875 | +inline constexpr client_t ILLEGAL_CLIENT = 0x0000; | ||
876 | +inline constexpr method_t INVALID_METHOD = 0x0000; | ||
877 | + | ||
878 | +inline constexpr byte_t MAGIC_COOKIE_CLIENT_MESSAGE = 0x00; | ||
879 | +inline constexpr byte_t MAGIC_COOKIE_SERVICE_MESSAGE = 0x80; | ||
880 | +inline constexpr length_t MAGIC_COOKIE_SIZE = 0x00000008; | ||
881 | +inline constexpr request_t MAGIC_COOKIE_REQUEST = 0xDEADBEEF; | ||
882 | +inline constexpr client_t MAGIC_COOKIE_CLIENT = 0xDEAD; | ||
883 | +inline constexpr protocol_version_t MAGIC_COOKIE_PROTOCOL_VERSION = 0x01; | ||
884 | +inline constexpr interface_version_t MAGIC_COOKIE_INTERFACE_VERSION = 0x01; | ||
885 | +inline constexpr message_type_e MAGIC_COOKIE_CLIENT_MESSAGE_TYPE = | ||
886 | message_type_e::MT_REQUEST_NO_RETURN; | ||
887 | -const message_type_e MAGIC_COOKIE_SERVICE_MESSAGE_TYPE = | ||
888 | +inline constexpr message_type_e MAGIC_COOKIE_SERVICE_MESSAGE_TYPE = | ||
889 | message_type_e::MT_NOTIFICATION; | ||
890 | -const return_code_e MAGIC_COOKIE_RETURN_CODE = return_code_e::E_OK; | ||
891 | +inline constexpr return_code_e MAGIC_COOKIE_RETURN_CODE = return_code_e::E_OK; | ||
892 | |||
893 | -const byte_t CLIENT_COOKIE[] = { 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, | ||
894 | +inline constexpr byte_t CLIENT_COOKIE[] = { 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, | ||
895 | 0xDE, 0xAD, 0xBE, 0xEF, 0x01, 0x01, 0x01, 0x00 }; | ||
896 | |||
897 | -const byte_t SERVICE_COOKIE[] = { 0xFF, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, | ||
898 | +inline constexpr byte_t SERVICE_COOKIE[] = { 0xFF, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, | ||
899 | 0x08, 0xDE, 0xAD, 0xBE, 0xEF, 0x01, 0x01, 0x02, 0x00 }; | ||
900 | |||
901 | -const event_t ANY_EVENT = 0xFFFF; | ||
902 | -const client_t ANY_CLIENT = 0xFFFF; | ||
903 | +inline constexpr event_t ANY_EVENT = 0xFFFF; | ||
904 | +inline constexpr client_t ANY_CLIENT = 0xFFFF; | ||
905 | |||
906 | -const int VSOMEIP_ALL = -1; | ||
907 | +inline constexpr int VSOMEIP_ALL = -1; | ||
908 | |||
909 | -const pending_security_update_id_t DEFAULT_SECURITY_UPDATE_ID = 0x0; | ||
910 | +inline constexpr pending_security_update_id_t DEFAULT_SECURITY_UPDATE_ID = 0x0; | ||
911 | |||
912 | } // namespace vsomeip_v3 | ||
913 | |||
914 | diff --git a/test/network_tests/application_tests/application_test.cpp b/test/network_tests/application_tests/application_test.cpp | ||
915 | index a4a1923d..c70b6cd5 100644 | ||
916 | --- a/test/network_tests/application_tests/application_test.cpp | ||
917 | +++ b/test/network_tests/application_tests/application_test.cpp | ||
918 | @@ -3,6 +3,7 @@ | ||
919 | // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
920 | // file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
921 | |||
922 | +#include <atomic> | ||
923 | #include <thread> | ||
924 | #include <mutex> | ||
925 | #include <condition_variable> | ||
926 | diff --git a/tools/vsomeip_ctrl.cpp b/tools/vsomeip_ctrl.cpp | ||
927 | index 74510427..3e74a832 100644 | ||
928 | --- a/tools/vsomeip_ctrl.cpp | ||
929 | +++ b/tools/vsomeip_ctrl.cpp | ||
930 | @@ -29,7 +29,6 @@ public: | ||
931 | instance_(_instance), | ||
932 | app_(vsomeip::runtime::get()->create_application("vsomeip_ctrl")), | ||
933 | wait_service_available_(true), | ||
934 | - send_thread_(std::bind(&vsomeip_sender::send, this)), | ||
935 | service_id_(0x0), | ||
936 | method_id_(0x0), | ||
937 | length_(0), | ||
938 | @@ -39,6 +38,8 @@ public: | ||
939 | return_code_(vsomeip::return_code_e::E_UNKNOWN), | ||
940 | wait_for_answer_(true) | ||
941 | { | ||
942 | + send_thread_ = std::thread{&vsomeip_sender::send, this}; | ||
943 | + | ||
944 | if (user_message_.size() < VSOMEIP_PAYLOAD_POS) { | ||
945 | VSOMEIP_ERROR << "Provided message is to short, min. length " | ||
946 | "is 16 Bytes, exiting."; | ||
947 | @@ -117,11 +118,11 @@ public: | ||
948 | << std::setw(4) << _response->get_instance() << "]:"; | ||
949 | VSOMEIP_INFO << "########## begin message"; | ||
950 | VSOMEIP_INFO << std::hex << std::setw(4) << std::setfill('0') | ||
951 | - << _response->get_service() | ||
952 | + << _response->get_service() | ||
953 | << std::hex << std::setw(4) << std::setfill('0') | ||
954 | << _response->get_method() | ||
955 | << " # service id / instance id"; | ||
956 | - VSOMEIP_INFO << std::hex << std::setw(8) << std::setfill('0') | ||
957 | + VSOMEIP_INFO << std::hex << std::setw(8) << std::setfill('0') | ||
958 | << _response->get_length() << " # length"; | ||
959 | VSOMEIP_INFO << std::hex << std::setw(4) << std::setfill('0') | ||
960 | << _response->get_client() | ||
961 | @@ -243,7 +244,7 @@ private: | ||
962 | } | ||
963 | |||
964 | if (use_tcp_ && user_message_.size() > VSOMEIP_MAX_TCP_MESSAGE_SIZE) { | ||
965 | - VSOMEIP_WARNING << "Max allowed message size for TCP is " | ||
966 | + VSOMEIP_WARNING << "Max allowed message size for TCP is " | ||
967 | << std::dec << VSOMEIP_MAX_TCP_MESSAGE_SIZE | ||
968 | << ". Provided message size is: " << user_message_.size(); | ||
969 | } | ||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch new file mode 100644 index 000000000..b15c8029e --- /dev/null +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch | |||
@@ -0,0 +1,324 @@ | |||
1 | From 9b806483d804ab335f7161fdd6248ae3e7ae3bde Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 9 Aug 2024 13:50:05 -0700 | ||
4 | Subject: [PATCH 2/2] network_tests: Include iomanip system header | ||
5 | |||
6 | Latest gcc-14/clang-18 needs this header for setfill and setw | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/751] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | .../network_tests/big_payload_tests/big_payload_test_service.hpp | 1 + | ||
12 | test/network_tests/cpu_load_tests/cpu_load_test_service.cpp | 1 + | ||
13 | test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp | 1 + | ||
14 | test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp | 1 + | ||
15 | test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp | 1 + | ||
16 | test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp | 1 + | ||
17 | test/network_tests/e2e_tests/e2e_test_client.hpp | 1 + | ||
18 | test/network_tests/e2e_tests/e2e_test_service.hpp | 1 + | ||
19 | test/network_tests/event_tests/event_test_service.cpp | 1 + | ||
20 | .../header_factory_tests/header_factory_test_client.hpp | 1 + | ||
21 | .../header_factory_tests/header_factory_test_service.hpp | 1 + | ||
22 | test/network_tests/npdu_tests/npdu_test_client.hpp | 1 + | ||
23 | test/network_tests/npdu_tests/npdu_test_service.hpp | 1 + | ||
24 | test/network_tests/payload_tests/payload_test_client.hpp | 1 + | ||
25 | test/network_tests/payload_tests/payload_test_service.hpp | 1 + | ||
26 | .../restart_routing_tests/restart_routing_test_client.hpp | 1 + | ||
27 | .../restart_routing_tests/restart_routing_test_service.hpp | 1 + | ||
28 | .../routing_tests/external_local_routing_test_service.hpp | 1 + | ||
29 | test/network_tests/routing_tests/local_routing_test_client.hpp | 1 + | ||
30 | test/network_tests/routing_tests/local_routing_test_service.hpp | 1 + | ||
31 | .../second_address_tests/second_address_test_service.cpp | 1 + | ||
32 | test/network_tests/security_tests/security_test_client.hpp | 1 + | ||
33 | test/network_tests/security_tests/security_test_service.hpp | 1 + | ||
34 | .../suspend_resume_tests/suspend_resume_test_service.cpp | 1 + | ||
35 | 24 files changed, 24 insertions(+) | ||
36 | |||
37 | diff --git a/test/network_tests/big_payload_tests/big_payload_test_service.hpp b/test/network_tests/big_payload_tests/big_payload_test_service.hpp | ||
38 | index 44af28a9..101b6758 100644 | ||
39 | --- a/test/network_tests/big_payload_tests/big_payload_test_service.hpp | ||
40 | +++ b/test/network_tests/big_payload_tests/big_payload_test_service.hpp | ||
41 | @@ -14,6 +14,7 @@ | ||
42 | #include <condition_variable> | ||
43 | #include <functional> | ||
44 | #include <queue> | ||
45 | +#include <iomanip> | ||
46 | |||
47 | #include "big_payload_test_globals.hpp" | ||
48 | #include <vsomeip/internal/logger.hpp> | ||
49 | diff --git a/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp b/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp | ||
50 | index 3d935e39..a98f3edf 100644 | ||
51 | --- a/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp | ||
52 | +++ b/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp | ||
53 | @@ -13,6 +13,7 @@ | ||
54 | #include <functional> | ||
55 | #include <numeric> | ||
56 | #include <cmath> // for isfinite | ||
57 | +#include <iomanip> | ||
58 | |||
59 | #include "cpu_load_test_globals.hpp" | ||
60 | #include <vsomeip/internal/logger.hpp> | ||
61 | diff --git a/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp b/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp | ||
62 | index ad002913..82d5e7e2 100644 | ||
63 | --- a/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp | ||
64 | +++ b/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp | ||
65 | @@ -14,6 +14,7 @@ | ||
66 | #include <mutex> | ||
67 | #include <condition_variable> | ||
68 | #include <atomic> | ||
69 | +#include <iomanip> | ||
70 | |||
71 | class e2e_profile_04_test_client { | ||
72 | public: | ||
73 | diff --git a/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp b/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp | ||
74 | index 25617917..17852b85 100644 | ||
75 | --- a/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp | ||
76 | +++ b/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp | ||
77 | @@ -17,6 +17,7 @@ | ||
78 | #include <condition_variable> | ||
79 | #include <mutex> | ||
80 | #include <thread> | ||
81 | +#include <iomanip> | ||
82 | |||
83 | class e2e_profile_04_test_service { | ||
84 | public: | ||
85 | diff --git a/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp b/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp | ||
86 | index 9b10a589..30d889b5 100644 | ||
87 | --- a/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp | ||
88 | +++ b/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp | ||
89 | @@ -14,6 +14,7 @@ | ||
90 | #include <mutex> | ||
91 | #include <condition_variable> | ||
92 | #include <atomic> | ||
93 | +#include <iomanip> | ||
94 | |||
95 | class e2e_profile_07_test_client { | ||
96 | public: | ||
97 | diff --git a/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp b/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp | ||
98 | index ad6488a5..ea1cc05c 100644 | ||
99 | --- a/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp | ||
100 | +++ b/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp | ||
101 | @@ -17,6 +17,7 @@ | ||
102 | #include <condition_variable> | ||
103 | #include <mutex> | ||
104 | #include <thread> | ||
105 | +#include <iomanip> | ||
106 | |||
107 | class e2e_profile_07_test_service { | ||
108 | public: | ||
109 | diff --git a/test/network_tests/e2e_tests/e2e_test_client.hpp b/test/network_tests/e2e_tests/e2e_test_client.hpp | ||
110 | index 10f49784..c253f101 100644 | ||
111 | --- a/test/network_tests/e2e_tests/e2e_test_client.hpp | ||
112 | +++ b/test/network_tests/e2e_tests/e2e_test_client.hpp | ||
113 | @@ -18,6 +18,7 @@ | ||
114 | #include <mutex> | ||
115 | #include <condition_variable> | ||
116 | #include <atomic> | ||
117 | +#include <iomanip> | ||
118 | |||
119 | class e2e_test_client { | ||
120 | public: | ||
121 | diff --git a/test/network_tests/e2e_tests/e2e_test_service.hpp b/test/network_tests/e2e_tests/e2e_test_service.hpp | ||
122 | index 7fd1c5a9..e839aacb 100644 | ||
123 | --- a/test/network_tests/e2e_tests/e2e_test_service.hpp | ||
124 | +++ b/test/network_tests/e2e_tests/e2e_test_service.hpp | ||
125 | @@ -16,6 +16,7 @@ | ||
126 | #include <thread> | ||
127 | #include <mutex> | ||
128 | #include <condition_variable> | ||
129 | +#include <iomanip> | ||
130 | |||
131 | class e2e_test_service { | ||
132 | public: | ||
133 | diff --git a/test/network_tests/event_tests/event_test_service.cpp b/test/network_tests/event_tests/event_test_service.cpp | ||
134 | index 3728a827..d1f117e2 100644 | ||
135 | --- a/test/network_tests/event_tests/event_test_service.cpp | ||
136 | +++ b/test/network_tests/event_tests/event_test_service.cpp | ||
137 | @@ -10,6 +10,7 @@ | ||
138 | #include <thread> | ||
139 | #include <map> | ||
140 | #include <atomic> | ||
141 | +#include <iomanip> | ||
142 | |||
143 | #include <gtest/gtest.h> | ||
144 | |||
145 | diff --git a/test/network_tests/header_factory_tests/header_factory_test_client.hpp b/test/network_tests/header_factory_tests/header_factory_test_client.hpp | ||
146 | index 79461b69..b72bbdca 100644 | ||
147 | --- a/test/network_tests/header_factory_tests/header_factory_test_client.hpp | ||
148 | +++ b/test/network_tests/header_factory_tests/header_factory_test_client.hpp | ||
149 | @@ -14,6 +14,7 @@ | ||
150 | #include <mutex> | ||
151 | #include <condition_variable> | ||
152 | #include <functional> | ||
153 | +#include <iomanip> | ||
154 | |||
155 | #include "../someip_test_globals.hpp" | ||
156 | #include <common/vsomeip_app_utilities.hpp> | ||
157 | diff --git a/test/network_tests/header_factory_tests/header_factory_test_service.hpp b/test/network_tests/header_factory_tests/header_factory_test_service.hpp | ||
158 | index 7879946a..a553adde 100644 | ||
159 | --- a/test/network_tests/header_factory_tests/header_factory_test_service.hpp | ||
160 | +++ b/test/network_tests/header_factory_tests/header_factory_test_service.hpp | ||
161 | @@ -13,6 +13,7 @@ | ||
162 | #include <mutex> | ||
163 | #include <condition_variable> | ||
164 | #include <functional> | ||
165 | +#include <iomanip> | ||
166 | |||
167 | #include "../someip_test_globals.hpp" | ||
168 | #include <common/vsomeip_app_utilities.hpp> | ||
169 | diff --git a/test/network_tests/npdu_tests/npdu_test_client.hpp b/test/network_tests/npdu_tests/npdu_test_client.hpp | ||
170 | index 2f469d40..7f615f14 100644 | ||
171 | --- a/test/network_tests/npdu_tests/npdu_test_client.hpp | ||
172 | +++ b/test/network_tests/npdu_tests/npdu_test_client.hpp | ||
173 | @@ -15,6 +15,7 @@ | ||
174 | #include <condition_variable> | ||
175 | #include <functional> | ||
176 | #include <map> | ||
177 | +#include <iomanip> | ||
178 | |||
179 | #include "../npdu_tests/npdu_test_globals.hpp" | ||
180 | #include "../someip_test_globals.hpp" | ||
181 | diff --git a/test/network_tests/npdu_tests/npdu_test_service.hpp b/test/network_tests/npdu_tests/npdu_test_service.hpp | ||
182 | index bef06806..1caae785 100644 | ||
183 | --- a/test/network_tests/npdu_tests/npdu_test_service.hpp | ||
184 | +++ b/test/network_tests/npdu_tests/npdu_test_service.hpp | ||
185 | @@ -15,6 +15,7 @@ | ||
186 | #include <functional> | ||
187 | #include <chrono> | ||
188 | #include <deque> | ||
189 | +#include <iomanip> | ||
190 | |||
191 | class npdu_test_service | ||
192 | { | ||
193 | diff --git a/test/network_tests/payload_tests/payload_test_client.hpp b/test/network_tests/payload_tests/payload_test_client.hpp | ||
194 | index 1bab6ba6..1754320c 100644 | ||
195 | --- a/test/network_tests/payload_tests/payload_test_client.hpp | ||
196 | +++ b/test/network_tests/payload_tests/payload_test_client.hpp | ||
197 | @@ -15,6 +15,7 @@ | ||
198 | #include <mutex> | ||
199 | #include <condition_variable> | ||
200 | #include <functional> | ||
201 | +#include <iomanip> | ||
202 | |||
203 | #include "../someip_test_globals.hpp" | ||
204 | #include <common/vsomeip_app_utilities.hpp> | ||
205 | diff --git a/test/network_tests/payload_tests/payload_test_service.hpp b/test/network_tests/payload_tests/payload_test_service.hpp | ||
206 | index 7d3c01d5..06dbb684 100644 | ||
207 | --- a/test/network_tests/payload_tests/payload_test_service.hpp | ||
208 | +++ b/test/network_tests/payload_tests/payload_test_service.hpp | ||
209 | @@ -13,6 +13,7 @@ | ||
210 | #include <mutex> | ||
211 | #include <condition_variable> | ||
212 | #include <functional> | ||
213 | +#include <iomanip> | ||
214 | |||
215 | #include "../someip_test_globals.hpp" | ||
216 | #include <common/vsomeip_app_utilities.hpp> | ||
217 | diff --git a/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp b/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp | ||
218 | index 8a7c9e70..6a758318 100644 | ||
219 | --- a/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp | ||
220 | +++ b/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp | ||
221 | @@ -19,6 +19,7 @@ | ||
222 | #include <condition_variable> | ||
223 | #include <atomic> | ||
224 | #include <future> | ||
225 | +#include <iomanip> | ||
226 | |||
227 | class routing_restart_test_client { | ||
228 | public: | ||
229 | diff --git a/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp b/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp | ||
230 | index 7660b8fc..1fe4d86c 100644 | ||
231 | --- a/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp | ||
232 | +++ b/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp | ||
233 | @@ -16,6 +16,7 @@ | ||
234 | #include <thread> | ||
235 | #include <mutex> | ||
236 | #include <condition_variable> | ||
237 | +#include <iomanip> | ||
238 | |||
239 | class routing_restart_test_service { | ||
240 | public: | ||
241 | diff --git a/test/network_tests/routing_tests/external_local_routing_test_service.hpp b/test/network_tests/routing_tests/external_local_routing_test_service.hpp | ||
242 | index 2499bc84..b1e2dfd8 100644 | ||
243 | --- a/test/network_tests/routing_tests/external_local_routing_test_service.hpp | ||
244 | +++ b/test/network_tests/routing_tests/external_local_routing_test_service.hpp | ||
245 | @@ -13,6 +13,7 @@ | ||
246 | #include <mutex> | ||
247 | #include <condition_variable> | ||
248 | #include <functional> | ||
249 | +#include <iomanip> | ||
250 | |||
251 | #include "../someip_test_globals.hpp" | ||
252 | #include <common/vsomeip_app_utilities.hpp> | ||
253 | diff --git a/test/network_tests/routing_tests/local_routing_test_client.hpp b/test/network_tests/routing_tests/local_routing_test_client.hpp | ||
254 | index 09af0bf0..69ee6bfc 100644 | ||
255 | --- a/test/network_tests/routing_tests/local_routing_test_client.hpp | ||
256 | +++ b/test/network_tests/routing_tests/local_routing_test_client.hpp | ||
257 | @@ -14,6 +14,7 @@ | ||
258 | #include <mutex> | ||
259 | #include <condition_variable> | ||
260 | #include <functional> | ||
261 | +#include <iomanip> | ||
262 | |||
263 | #include "../someip_test_globals.hpp" | ||
264 | #include <common/vsomeip_app_utilities.hpp> | ||
265 | diff --git a/test/network_tests/routing_tests/local_routing_test_service.hpp b/test/network_tests/routing_tests/local_routing_test_service.hpp | ||
266 | index 109dade4..932423d8 100644 | ||
267 | --- a/test/network_tests/routing_tests/local_routing_test_service.hpp | ||
268 | +++ b/test/network_tests/routing_tests/local_routing_test_service.hpp | ||
269 | @@ -13,6 +13,7 @@ | ||
270 | #include <mutex> | ||
271 | #include <condition_variable> | ||
272 | #include <functional> | ||
273 | +#include <iomanip> | ||
274 | |||
275 | #include "../someip_test_globals.hpp" | ||
276 | #include <common/vsomeip_app_utilities.hpp> | ||
277 | diff --git a/test/network_tests/second_address_tests/second_address_test_service.cpp b/test/network_tests/second_address_tests/second_address_test_service.cpp | ||
278 | index fc9d0a28..3ffa493f 100644 | ||
279 | --- a/test/network_tests/second_address_tests/second_address_test_service.cpp | ||
280 | +++ b/test/network_tests/second_address_tests/second_address_test_service.cpp | ||
281 | @@ -9,6 +9,7 @@ | ||
282 | #include <sstream> | ||
283 | #include <thread> | ||
284 | #include <map> | ||
285 | +#include <iomanip> | ||
286 | |||
287 | #include <gtest/gtest.h> | ||
288 | #include <vsomeip/vsomeip.hpp> | ||
289 | diff --git a/test/network_tests/security_tests/security_test_client.hpp b/test/network_tests/security_tests/security_test_client.hpp | ||
290 | index ab3d98b8..bd331138 100644 | ||
291 | --- a/test/network_tests/security_tests/security_test_client.hpp | ||
292 | +++ b/test/network_tests/security_tests/security_test_client.hpp | ||
293 | @@ -18,6 +18,7 @@ | ||
294 | #include <mutex> | ||
295 | #include <condition_variable> | ||
296 | #include <atomic> | ||
297 | +#include <iomanip> | ||
298 | |||
299 | class security_test_client { | ||
300 | public: | ||
301 | diff --git a/test/network_tests/security_tests/security_test_service.hpp b/test/network_tests/security_tests/security_test_service.hpp | ||
302 | index 87fb94fd..1f227072 100644 | ||
303 | --- a/test/network_tests/security_tests/security_test_service.hpp | ||
304 | +++ b/test/network_tests/security_tests/security_test_service.hpp | ||
305 | @@ -16,6 +16,7 @@ | ||
306 | #include <thread> | ||
307 | #include <mutex> | ||
308 | #include <condition_variable> | ||
309 | +#include <iomanip> | ||
310 | |||
311 | class security_test_service { | ||
312 | public: | ||
313 | diff --git a/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp b/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp | ||
314 | index 6f099ce7..dc9df239 100644 | ||
315 | --- a/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp | ||
316 | +++ b/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp | ||
317 | @@ -7,6 +7,7 @@ | ||
318 | #include <mutex> | ||
319 | #include <thread> | ||
320 | #include <atomic> | ||
321 | +#include <iomanip> | ||
322 | |||
323 | #include <gtest/gtest.h> | ||
324 | |||
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb index 4c3897020..36fa196a5 100644 --- a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb +++ b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb | |||
@@ -13,6 +13,8 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name= | |||
13 | file://0003-Do-not-build-external-gtest.patch \ | 13 | file://0003-Do-not-build-external-gtest.patch \ |
14 | file://0004-Do-not-specify-PIE-flag-explicitly.patch \ | 14 | file://0004-Do-not-specify-PIE-flag-explicitly.patch \ |
15 | file://0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch \ | 15 | file://0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch \ |
16 | file://0001-Update-to-C-17-560.patch \ | ||
17 | file://0002-network_tests-Include-iomanip-system-header.patch \ | ||
16 | " | 18 | " |
17 | 19 | ||
18 | SRCREV = "02c199dff8aba814beebe3ca417fd991058fe90c" | 20 | SRCREV = "02c199dff8aba814beebe3ca417fd991058fe90c" |
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb index be74759d5..ba783d03f 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb | |||
@@ -12,7 +12,6 @@ DEPENDS += "gettext-native" | |||
12 | #at least versions 2.69 and prior are moved to the archive folder on the server | 12 | #at least versions 2.69 and prior are moved to the archive folder on the server |
13 | SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz \ | 13 | SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz \ |
14 | file://init \ | 14 | file://init \ |
15 | file://dnsmasq.conf \ | ||
16 | file://dnsmasq-resolvconf.service \ | 15 | file://dnsmasq-resolvconf.service \ |
17 | file://dnsmasq-noresolvconf.service \ | 16 | file://dnsmasq-noresolvconf.service \ |
18 | file://dnsmasq-resolved.conf \ | 17 | file://dnsmasq-resolved.conf \ |
@@ -25,8 +24,13 @@ INITSCRIPT_NAME = "dnsmasq" | |||
25 | INITSCRIPT_PARAMS = "defaults" | 24 | INITSCRIPT_PARAMS = "defaults" |
26 | 25 | ||
27 | # dnsmasq defaults | 26 | # dnsmasq defaults |
28 | PACKAGECONFIG ?= "auth dhcp dhcp6 dumpfile inotify ipset loop script tftp" | 27 | PACKAGECONFIG ?= "\ |
28 | auth dhcp dumpfile inotify ipset loop script tftp \ | ||
29 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'dhcp6', '', d)} \ | ||
30 | ${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '', 'broken-rtc', d)} \ | ||
31 | " | ||
29 | 32 | ||
33 | # see src/config.h | ||
30 | PACKAGECONFIG[auth] = "-DHAVE_AUTH,-DNO_AUTH" | 34 | PACKAGECONFIG[auth] = "-DHAVE_AUTH,-DNO_AUTH" |
31 | PACKAGECONFIG[broken-rtc] = "-DHAVE_BROKEN_RTC," | 35 | PACKAGECONFIG[broken-rtc] = "-DHAVE_BROKEN_RTC," |
32 | PACKAGECONFIG[conntrack] = "-DHAVE_CONNTRACK,,libnetfilter-conntrack" | 36 | PACKAGECONFIG[conntrack] = "-DHAVE_CONNTRACK,,libnetfilter-conntrack" |
@@ -81,7 +85,7 @@ do_install () { | |||
81 | "MANDIR=${D}${mandir}" \ | 85 | "MANDIR=${D}${mandir}" \ |
82 | install-i18n | 86 | install-i18n |
83 | install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d | 87 | install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d |
84 | install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}${sysconfdir}/ | 88 | install -m 644 ${S}/dnsmasq.conf.example ${D}${sysconfdir}/dnsmasq.conf |
85 | install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq | 89 | install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq |
86 | 90 | ||
87 | install -d ${D}${systemd_unitdir}/system | 91 | install -d ${D}${systemd_unitdir}/system |
diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf b/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf deleted file mode 100755 index 2897b9030..000000000 --- a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf +++ /dev/null | |||
@@ -1,298 +0,0 @@ | |||
1 | # Configuration file for dnsmasq. | ||
2 | # | ||
3 | # Format is one option per line, legal options are the same | ||
4 | # as the long options legal on the command line. See | ||
5 | # "/usr/bin/dnsmasq --help" or "man 8 dnsmasq" for details. | ||
6 | |||
7 | # Listen on this specific port instead of the standard DNS port | ||
8 | # (53). Setting this to zero completely disables DNS function, | ||
9 | # leaving only DHCP and/or TFTP. | ||
10 | #port=5353 | ||
11 | |||
12 | # Change these lines if you want dnsmasq to serve MX records. | ||
13 | # Only one of mx-host and mx-target need be set, the other defaults | ||
14 | # to the name of the host running dnsmasq. | ||
15 | #mx-host= | ||
16 | #mx-target= | ||
17 | #selfmx | ||
18 | #localmx | ||
19 | |||
20 | # The following two options make you a better netizen, since they | ||
21 | # tell dnsmasq to filter out queries which the public DNS cannot | ||
22 | # answer, and which load the servers (especially the root servers) | ||
23 | # uneccessarily. If you have a dial-on-demand link they also stop | ||
24 | # these requests from bringing up the link uneccessarily. | ||
25 | |||
26 | # Never forward plain names (with a dot or domain part) | ||
27 | domain-needed | ||
28 | # Never forward addresses in the non-routed address spaces. | ||
29 | bogus-priv | ||
30 | |||
31 | |||
32 | # Uncomment this to filter useless windows-originated DNS requests | ||
33 | # which can trigger dial-on-demand links needlessly. | ||
34 | # Note that (amongst other things) this blocks all SRV requests, | ||
35 | # so don't use it if you use eg Kerberos. | ||
36 | #filterwin2k | ||
37 | |||
38 | # Change this line if you want dns to get its upstream servers from | ||
39 | # somewhere other that /etc/resolv.conf | ||
40 | #resolv-file= | ||
41 | |||
42 | # By default, dnsmasq will send queries to any of the upstream | ||
43 | # servers it knows about and tries to favour servers to are known | ||
44 | # to be up. Uncommenting this forces dnsmasq to try each query | ||
45 | # with each server strictly in the order they appear in | ||
46 | # /etc/resolv.conf | ||
47 | #strict-order | ||
48 | |||
49 | # If you don't want dnsmasq to read /etc/resolv.conf or any other | ||
50 | # file, getting its servers for this file instead (see below), then | ||
51 | # uncomment this | ||
52 | #no-resolv | ||
53 | |||
54 | # If you don't want dnsmasq to poll /etc/resolv.conf or other resolv | ||
55 | # files for changes and re-read them then uncomment this. | ||
56 | #no-poll | ||
57 | |||
58 | # Add other name servers here, with domain specs if they are for | ||
59 | # non-public domains. | ||
60 | #server=/localnet/192.168.0.1 | ||
61 | |||
62 | # Add local-only domains here, queries in these domains are answered | ||
63 | # from /etc/hosts or DHCP only. | ||
64 | #local=/localnet/ | ||
65 | |||
66 | # Add domains which you want to force to an IP address here. | ||
67 | # The example below send any host in doubleclick.net to a local | ||
68 | # webserver. | ||
69 | #address=/doubleclick.net/127.0.0.1 | ||
70 | |||
71 | # You no longer (as of version 1.7) need to set these to enable | ||
72 | # dnsmasq to read /etc/ppp/resolv.conf since dnsmasq now uses the | ||
73 | # "dip" group to achieve this. | ||
74 | #user= | ||
75 | #group= | ||
76 | |||
77 | # If you want dnsmasq to listen for requests only on specified interfaces | ||
78 | # (and the loopback) give the name of the interface (eg eth0) here. | ||
79 | # Repeat the line for more than one interface. | ||
80 | #interface= | ||
81 | # Or you can specify which interface _not_ to listen on | ||
82 | #except-interface= | ||
83 | # Or which to listen on by address (remember to include 127.0.0.1 if | ||
84 | # you use this.) | ||
85 | #listen-address=127.0.0.1 | ||
86 | |||
87 | # On systems which support it, dnsmasq binds the wildcard address, | ||
88 | # even when it is listening on only some interfaces. It then discards | ||
89 | # requests that it shouldn't reply to. This has the advantage of | ||
90 | # working even when interfaces come and go and change address. If you | ||
91 | # want dnsmasq to really bind only the interfaces it is listening on, | ||
92 | # uncomment this option. About the only time you may need this is when | ||
93 | # running another nameserver on the same machine. | ||
94 | #bind-interfaces | ||
95 | |||
96 | # If you don't want dnsmasq to read /etc/hosts, uncomment the | ||
97 | # following line. | ||
98 | #no-hosts | ||
99 | # or if you want it to read another file, as well as /etc/hosts, use | ||
100 | # this. | ||
101 | #addn-hosts=/etc/banner_add_hosts | ||
102 | |||
103 | # Set this (and domain: see below) if you want to have a domain | ||
104 | # automatically added to simple names in a hosts-file. | ||
105 | #expand-hosts | ||
106 | |||
107 | # Set the domain for dnsmasq. this is optional, but if it is set, it | ||
108 | # does the following things. | ||
109 | # 1) Allows DHCP hosts to have fully qualified domain names, as long | ||
110 | # as the domain part matches this setting. | ||
111 | # 2) Sets the "domain" DHCP option thereby potentially setting the | ||
112 | # domain of all systems configured by DHCP | ||
113 | # 3) Provides the domain part for "expand-hosts" | ||
114 | #domain=thekelleys.org.uk | ||
115 | |||
116 | # Uncomment this to enable the integrated DHCP server, you need | ||
117 | # to supply the range of addresses available for lease and optionally | ||
118 | # a lease time. If you have more than one network, you will need to | ||
119 | # repeat this for each network on which you want to supply DHCP | ||
120 | # service. | ||
121 | #dhcp-range=192.168.0.50,192.168.0.150,12h | ||
122 | #dhcp-range=10.0.0.10,10.0.0.200,2h | ||
123 | |||
124 | # This is an example of a DHCP range where the netmask is given. This | ||
125 | # is needed for networks we reach the dnsmasq DHCP server via a relay | ||
126 | # agent. If you don't know what a DHCP relay agent is, you probably | ||
127 | # don't need to worry about this. | ||
128 | #dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h | ||
129 | |||
130 | # This is an example of a DHCP range with a network-id, so that | ||
131 | # some DHCP options may be set only for this network. | ||
132 | #dhcp-range=red,192.168.0.50,192.168.0.150 | ||
133 | |||
134 | # Supply parameters for specified hosts using DHCP. There are lots | ||
135 | # of valid alternatives, so we will give examples of each. Note that | ||
136 | # IP addresses DO NOT have to be in the range given above, they just | ||
137 | # need to be on the same network. The order of the parameters in these | ||
138 | # do not matter, it's permissble to give name,adddress and MAC in any order | ||
139 | |||
140 | # Always allocate the host with ethernet address 11:22:33:44:55:66 | ||
141 | # The IP address 192.168.0.60 | ||
142 | #dhcp-host=11:22:33:44:55:66,192.168.0.60 | ||
143 | |||
144 | # Always set the name of the host with hardware address | ||
145 | # 11:22:33:44:55:66 to be "fred" | ||
146 | #dhcp-host=11:22:33:44:55:66,fred | ||
147 | |||
148 | # Always give the host with ethernet address 11:22:33:44:55:66 | ||
149 | # the name fred and IP address 192.168.0.60 and lease time 45 minutes | ||
150 | #dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m | ||
151 | |||
152 | # Give the machine which says it's name is "bert" IP address | ||
153 | # 192.168.0.70 and an infinite lease | ||
154 | #dhcp-host=bert,192.168.0.70,infinite | ||
155 | |||
156 | # Always give the host with client identifier 01:02:02:04 | ||
157 | # the IP address 192.168.0.60 | ||
158 | #dhcp-host=id:01:02:02:04,192.168.0.60 | ||
159 | |||
160 | # Always give the host with client identifier "marjorie" | ||
161 | # the IP address 192.168.0.60 | ||
162 | #dhcp-host=id:marjorie,192.168.0.60 | ||
163 | |||
164 | # Enable the address given for "judge" in /etc/hosts | ||
165 | # to be given to a machine presenting the name "judge" when | ||
166 | # it asks for a DHCP lease. | ||
167 | #dhcp-host=judge | ||
168 | |||
169 | # Never offer DHCP service to a machine whose ethernet | ||
170 | # address is 11:22:33:44:55:66 | ||
171 | #dhcp-host=11:22:33:44:55:66,ignore | ||
172 | |||
173 | # Ignore any client-id presented by the machine with ethernet | ||
174 | # address 11:22:33:44:55:66. This is useful to prevent a machine | ||
175 | # being treated differently when running under different OS's or | ||
176 | # between PXE boot and OS boot. | ||
177 | #dhcp-host=11:22:33:44:55:66,id:* | ||
178 | |||
179 | # Send extra options which are tagged as "red" to | ||
180 | # the machine with ethernet address 11:22:33:44:55:66 | ||
181 | #dhcp-host=11:22:33:44:55:66,net:red | ||
182 | |||
183 | # Send extra options which are tagged as "red" to any machine whose | ||
184 | # DHCP vendorclass string includes the substring "Linux" | ||
185 | #dhcp-vendorclass=red,Linux | ||
186 | |||
187 | # Send extra options which are tagged as "red" to any machine one | ||
188 | # of whose DHCP userclass strings includes the substring "accounts" | ||
189 | #dhcp-userclass=red,accounts | ||
190 | |||
191 | # If this line is uncommented, dnsmasq will read /etc/ethers and act | ||
192 | # on the ethernet-address/IP pairs found there just as if they had | ||
193 | # been given as --dhcp-host options. Useful if you keep | ||
194 | # MAC-address/host mappings there for other purposes. | ||
195 | #read-ethers | ||
196 | |||
197 | # Send options to hosts which ask for a DHCP lease. | ||
198 | # See RFC 2132 for details of available options. | ||
199 | # Note that all the common settings, such as netmask and | ||
200 | # broadcast address, DNS server and default route, are given | ||
201 | # sane defaults by dnsmasq. You very likely will not need any | ||
202 | # any dhcp-options. If you use Windows clients and Samba, there | ||
203 | # are some options which are recommended, they are detailed at the | ||
204 | # end of this section. | ||
205 | # For reference, the common options are: | ||
206 | # subnet mask - 1 | ||
207 | # default router - 3 | ||
208 | # DNS server - 6 | ||
209 | # broadcast address - 28 | ||
210 | |||
211 | # Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5 | ||
212 | #dhcp-option=42,192.168.0.4,10.10.0.5 | ||
213 | |||
214 | # Set the NTP time server address to be the same machine as | ||
215 | # is running dnsmasq | ||
216 | #dhcp-option=42,0.0.0.0 | ||
217 | |||
218 | # Set the NIS domain name to "welly" | ||
219 | #dhcp-option=40,welly | ||
220 | |||
221 | # Set the default time-to-live to 50 | ||
222 | #dhcp-option=23,50 | ||
223 | |||
224 | # Set the "all subnets are local" flag | ||
225 | #dhcp-option=27,1 | ||
226 | |||
227 | # Send the etherboot magic flag and then etherboot options (a string). | ||
228 | #dhcp-option=128,e4:45:74:68:00:00 | ||
229 | #dhcp-option=129,NIC=eepro100 | ||
230 | |||
231 | # Specify an option which will only be sent to the "red" network | ||
232 | # (see dhcp-range for the declaration of the "red" network) | ||
233 | #dhcp-option=red,42,192.168.1.1 | ||
234 | |||
235 | # The following DHCP options set up dnsmasq in the same way as is specified | ||
236 | # for the ISC dhcpcd in | ||
237 | # http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt | ||
238 | # adapted for a typical dnsmasq installation where the host running | ||
239 | # dnsmasq is also the host running samba. | ||
240 | # you may want to uncomment them if you use Windows clients and Samba. | ||
241 | #dhcp-option=19,0 # option ip-forwarding off | ||
242 | #dhcp-option=44,0.0.0.0 # set netbios-over-TCP/IP nameserver(s) aka WINS server(s) | ||
243 | #dhcp-option=45,0.0.0.0 # netbios datagram distribution server | ||
244 | #dhcp-option=46,8 # netbios node type | ||
245 | #dhcp-option=47 # empty netbios scope. | ||
246 | |||
247 | |||
248 | # Set the boot filename and tftpd server name and address | ||
249 | # for BOOTP. You will only need this is you want to | ||
250 | # boot machines over the network. | ||
251 | #dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3 | ||
252 | |||
253 | # Set the limit on DHCP leases, the default is 150 | ||
254 | #dhcp-lease-max=150 | ||
255 | |||
256 | # The DHCP server needs somewhere on disk to keep its lease database. | ||
257 | # This defaults to a sane location, but if you want to change it, use | ||
258 | # the line below. | ||
259 | #dhcp-leasefile=/var/lib/misc/dnsmasq.leases | ||
260 | |||
261 | # Set the cachesize here. | ||
262 | #cache-size=150 | ||
263 | |||
264 | # If you want to disable negative caching, uncomment this. | ||
265 | #no-negcache | ||
266 | |||
267 | # Normally responses which come form /etc/hosts and the DHCP lease | ||
268 | # file have Time-To-Live set as zero, which conventionally means | ||
269 | # do not cache further. If you are happy to trade lower load on the | ||
270 | # server for potentially stale date, you can set a time-to-live (in | ||
271 | # seconds) here. | ||
272 | #local-ttl= | ||
273 | |||
274 | # If you want dnsmasq to detect attempts by Verisign to send queries | ||
275 | # to unregistered .com and .net hosts to its sitefinder service and | ||
276 | # have dnsmasq instead return the correct NXDOMAIN response, uncomment | ||
277 | # this line. You can add similar lines to do the same for other | ||
278 | # registries which have implemented wildcard A records. | ||
279 | #bogus-nxdomain=64.94.110.11 | ||
280 | |||
281 | # If you want to fix up DNS results from upstream servers, use the | ||
282 | # alias option. This only works for IPv4. | ||
283 | # This alias makes a result of 1.2.3.4 appear as 5.6.7.8 | ||
284 | #alias=1.2.3.4,5.6.7.8 | ||
285 | # and this maps 1.2.3.x to 5.6.7.x | ||
286 | #alias=1.2.3.0,5.6.7.0,255.255.255.0 | ||
287 | |||
288 | # For debugging purposes, log each DNS query as it passes through | ||
289 | # dnsmasq. | ||
290 | #log-queries | ||
291 | |||
292 | # Include a another lot of configuration options. | ||
293 | #conf-file=/etc/dnsmasq.more.conf | ||
294 | |||
295 | |||
296 | |||
297 | |||
298 | |||
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 2f887e601..4e76d2452 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb | |||
@@ -50,7 +50,8 @@ SYSTEMD_AUTO_ENABLE = "disable" | |||
50 | do_install:append () { | 50 | do_install:append () { |
51 | rm -rf ${D}${libdir}/dovecot/dovecot-config | 51 | rm -rf ${D}${libdir}/dovecot/dovecot-config |
52 | install -d 755 ${D}/etc/dovecot | 52 | install -d 755 ${D}/etc/dovecot |
53 | touch 644 ${D}/etc/dovecot/dovecot.conf | 53 | touch ${D}/etc/dovecot/dovecot.conf |
54 | chmod 644 ${D}/etc/dovecot/dovecot.conf | ||
54 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then | 55 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then |
55 | install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system | 56 | install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system |
56 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service | 57 | sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service |
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch deleted file mode 100644 index b98e1e70c..000000000 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From 61991db099f66348dddbc3408e7ee8c05bda85cb Mon Sep 17 00:00:00 2001 | ||
2 | From: Yoann Congal <yoann.congal@smile.fr> | ||
3 | Date: Sat, 2 Mar 2024 16:23:07 +0100 | ||
4 | Subject: [PATCH] configure.ac: Add an option to disable host udev version | ||
5 | checks | ||
6 | |||
7 | In cross-compilation environment, the build host might have an outdated | ||
8 | udev or no udev at all. But the user may still want to build with the | ||
9 | enabled udev rule (for its udev-enabled target). | ||
10 | |||
11 | This patch adds a "--disable-udevchecks" option the disable build host | ||
12 | udev version check at configure-time and unconditionally install the | ||
13 | enabled udev rule. Without this new option, the behavior stays the same | ||
14 | (checks enabled). | ||
15 | |||
16 | Signed-off-by: Yoann Congal <yoann.congal@smile.fr> | ||
17 | Upstream-Status: Backport [https://github.com/LINBIT/drbd-utils/commit/f2b5a7335ae52109dfb95a9d99ae20519c43d59a] | ||
18 | --- | ||
19 | configure.ac | 9 +++++++-- | ||
20 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index f1d69ea3..4c56d33b 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -71,6 +71,11 @@ AC_ARG_WITH([udev], | ||
27 | [AS_HELP_STRING([--with-udev], | ||
28 | [Enable udev integration])], | ||
29 | [WITH_UDEV=$withval]) | ||
30 | +AC_ARG_ENABLE([udevchecks], | ||
31 | + [AS_HELP_STRING([--disable-udevchecks], | ||
32 | + [Disable host udev version checks])], | ||
33 | + [], | ||
34 | + [enable_udevchecks=yes]) | ||
35 | AC_ARG_WITH([xen], | ||
36 | [AS_HELP_STRING([--with-xen], | ||
37 | [Enable Xen integration])], | ||
38 | @@ -315,7 +320,7 @@ if test -z $GIT; then | ||
39 | AC_MSG_WARN(Cannot update buildtag without git. You may safely ignore this warning when building from a tarball.) | ||
40 | fi | ||
41 | |||
42 | -if test $UDEVADM = false && test $UDEVINFO = false; then | ||
43 | +if test "x$enable_udevchecks" != "xno" && test $UDEVADM = false && test $UDEVINFO = false; then | ||
44 | if test "$WITH_UDEV" = "yes"; then | ||
45 | AC_MSG_WARN([udev support enabled, but neither udevadm nor udevinfo found on this system.]) | ||
46 | fi | ||
47 | @@ -423,7 +428,7 @@ else | ||
48 | test -z $INITDIR && INITDIR="$sysconfdir/init.d" | ||
49 | |||
50 | dnl Our udev rules file is known to work only with udev >= 85 | ||
51 | - if test "$WITH_UDEV" = "yes"; then | ||
52 | + if test "x$enable_udevchecks" != "xno" && test "$WITH_UDEV" = "yes"; then | ||
53 | udev_version=$( set -- $($UDEVADM version); echo $1 ) | ||
54 | if test -z "$udev_version"; then | ||
55 | udev_version=$( set -- $($UDEVINFO -V); echo $3 ) | ||
diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index 27f0a9b54..ef0229d5b 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001 | 1 | From 9109f15f5b8ae142823194b9ef50c392615fe38d Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Thu, 21 Apr 2022 17:22:35 +0800 | 3 | Date: Thu, 21 Apr 2022 17:22:35 +0800 |
4 | Subject: [PATCH] drbd-utils: support usermerge | 4 | Subject: [PATCH] drbd-utils: support usermerge |
@@ -16,15 +16,14 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | |||
16 | scripts/drbd.service | 6 +++--- | 16 | scripts/drbd.service | 6 +++--- |
17 | scripts/drbd@.service | 6 +++--- | 17 | scripts/drbd@.service | 6 +++--- |
18 | scripts/ocf.ra@.service | 4 ++-- | 18 | scripts/ocf.ra@.service | 4 ++-- |
19 | user/v83/Makefile.in | 14 +++++++------- | ||
20 | user/v84/Makefile.in | 14 +++++++------- | 19 | user/v84/Makefile.in | 14 +++++++------- |
21 | 10 files changed, 32 insertions(+), 32 deletions(-) | 20 | 9 files changed, 25 insertions(+), 25 deletions(-) |
22 | 21 | ||
23 | diff --git a/configure.ac b/configure.ac | 22 | diff --git a/configure.ac b/configure.ac |
24 | index f1d69ea3..3289ac7d 100644 | 23 | index d3ec5ff1..910232b1 100644 |
25 | --- a/configure.ac | 24 | --- a/configure.ac |
26 | +++ b/configure.ac | 25 | +++ b/configure.ac |
27 | @@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir, | 26 | @@ -178,7 +178,7 @@ AC_ARG_WITH(tmpfilesdir, |
28 | AC_SUBST(tmpfilesdir) | 27 | AC_SUBST(tmpfilesdir) |
29 | 28 | ||
30 | # set default early | 29 | # set default early |
@@ -34,10 +33,10 @@ index f1d69ea3..3289ac7d 100644 | |||
34 | test x"$with_udev" = xyes ; then | 33 | test x"$with_udev" = xyes ; then |
35 | if test x"$PKG_CONFIG" != x; then | 34 | if test x"$PKG_CONFIG" != x; then |
36 | diff --git a/scripts/Makefile.in b/scripts/Makefile.in | 35 | diff --git a/scripts/Makefile.in b/scripts/Makefile.in |
37 | index aca15a22..a1cd2ffe 100644 | 36 | index 15a26f37..ff028310 100644 |
38 | --- a/scripts/Makefile.in | 37 | --- a/scripts/Makefile.in |
39 | +++ b/scripts/Makefile.in | 38 | +++ b/scripts/Makefile.in |
40 | @@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) | 39 | @@ -90,11 +90,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) |
41 | install -d $(DESTDIR)$(systemdunitdir) | 40 | install -d $(DESTDIR)$(systemdunitdir) |
42 | install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ | 41 | install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ |
43 | install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ | 42 | install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ |
@@ -137,37 +136,6 @@ index 9c2268a6..1666c482 100644 | |||
137 | -ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n | 136 | -ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n |
138 | +ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n | 137 | +ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n |
139 | +ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n | 138 | +ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n |
140 | diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in | ||
141 | index 08cfe574..4c4971b6 100644 | ||
142 | --- a/user/v83/Makefile.in | ||
143 | +++ b/user/v83/Makefile.in | ||
144 | @@ -96,19 +96,19 @@ install: | ||
145 | ifeq ($(WITH_83_SUPPORT),yes) | ||
146 | install -d $(DESTDIR)$(localstatedir)/lib/drbd | ||
147 | install -d $(DESTDIR)$(localstatedir)/lock | ||
148 | - install -d $(DESTDIR)/lib/drbd/ | ||
149 | + install -d $(DESTDIR)/${nonarch_libdir}/drbd/ | ||
150 | if getent group haclient > /dev/null 2> /dev/null ; then \ | ||
151 | - install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ | ||
152 | - install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ | ||
153 | + install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ | ||
154 | + install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ | ||
155 | else \ | ||
156 | - install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ | ||
157 | - install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ | ||
158 | + install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ | ||
159 | + install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ | ||
160 | fi | ||
161 | endif | ||
162 | |||
163 | uninstall: | ||
164 | - rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 | ||
165 | - rm -f $(DESTDIR)/lib/drbd/drbdadm-83 | ||
166 | + rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 | ||
167 | + rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 | ||
168 | |||
169 | .PHONY: install uninstall clean distclean | ||
170 | ../../configure: | ||
171 | diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in | 139 | diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in |
172 | index 0fcefc5f..81f7d5ec 100644 | 140 | index 0fcefc5f..81f7d5ec 100644 |
173 | --- a/user/v84/Makefile.in | 141 | --- a/user/v84/Makefile.in |
@@ -199,3 +167,6 @@ index 0fcefc5f..81f7d5ec 100644 | |||
199 | 167 | ||
200 | spell: | 168 | spell: |
201 | for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ | 169 | for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ |
170 | -- | ||
171 | 2.25.1 | ||
172 | |||
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb index 63f0fd18c..af0afc2a9 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb | |||
@@ -11,9 +11,8 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot | |||
11 | git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ | 11 | git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ |
12 | file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ | 12 | file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ |
13 | ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ | 13 | ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ |
14 | file://0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch \ | ||
15 | " | 14 | " |
16 | SRCREV_drbd-utils = "fdd9a4d603a9dc99d110d8bd0e288d7c0b6f586e" | 15 | SRCREV_drbd-utils = "ba2ce9037989b6141222c7901d1219cf852949f1" |
17 | SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a" | 16 | SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a" |
18 | 17 | ||
19 | SRCREV_FORMAT = "drbd-utils_drbd-headers" | 18 | SRCREV_FORMAT = "drbd-utils_drbd-headers" |
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 6cde94b20..cc23d5a34 100644 --- a/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb +++ b/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb | |||
@@ -16,13 +16,10 @@ SRC_URI[sha256sum] = "a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905b | |||
16 | 16 | ||
17 | inherit autotools gettext pkgconfig python3-dir python3native | 17 | inherit autotools gettext pkgconfig python3-dir python3native |
18 | 18 | ||
19 | EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" | 19 | EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix} --disable-rpath " |
20 | |||
21 | INSANE_SKIP:${PN} = "already-stripped" | ||
22 | 20 | ||
23 | do_install:append() { | 21 | do_install:append() { |
24 | sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf | 22 | sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf |
25 | sed -i 's,${RECIPE_SYSROOT},,g' ${D}${bindir}/fetchmail | ||
26 | } | 23 | } |
27 | 24 | ||
28 | PACKAGES =+ "fetchmail-python" | 25 | PACKAGES =+ "fetchmail-python" |
diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch b/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch deleted file mode 100644 index e696ac4ea..000000000 --- a/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 5aea816f27a71e6c88ad50e7326fa6584eeb7ad9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Francois Marier <francois@debian.org> | ||
3 | Date: Fri, 24 Jul 2020 21:22:47 -0700 | ||
4 | Subject: [PATCH] Fix compilation with GCC's -fno-common flag (fixes #305) | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/mrash/fwknop/pull/319] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | client/log_msg.h | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/client/log_msg.h b/client/log_msg.h | ||
13 | index cc17716..3dda161 100644 | ||
14 | --- a/client/log_msg.h | ||
15 | +++ b/client/log_msg.h | ||
16 | @@ -38,7 +38,7 @@ enum | ||
17 | LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */ | ||
18 | LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */ | ||
19 | LOG_LAST_VERBOSITY | ||
20 | -} log_level_t; | ||
21 | +}; | ||
22 | |||
23 | #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */ | ||
24 | |||
25 | -- | ||
26 | 2.28.0 | ||
27 | |||
diff --git a/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch b/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch deleted file mode 100644 index f3e170740..000000000 --- a/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From fee4cb0ae2d1fcd012cb7f501c3db0d8ec910798 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 2 Apr 2023 10:01:51 -0700 | ||
4 | Subject: [PATCH] configure.ac: Fix missing comma in AS_IF | ||
5 | |||
6 | this is flagged with autconf 2.72 | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | configure.ac | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 47a069e..9cdfd3f 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -744,7 +744,7 @@ dnl | ||
19 | IPFW_EXE="" | ||
20 | IPTABLES_EXE="" | ||
21 | FIREWALLD_EXE="" | ||
22 | - ] | ||
23 | + ], | ||
24 | ] | ||
25 | ] | ||
26 | ] | ||
27 | -- | ||
28 | 2.40.0 | ||
29 | |||
diff --git a/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb index a1f56cdf1..7cc044d99 100644 --- a/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +++ b/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb | |||
@@ -1,20 +1,20 @@ | |||
1 | SUMMARY = "fwknop - Single Packet Authorization" | 1 | SUMMARY = "fwknop - Single Packet Authorization" |
2 | HOMEPAGE = "http://www.cipherdyne.org/fwknop/" | 2 | HOMEPAGE = "http://www.cipherdyne.org/fwknop/" |
3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" |
5 | " | 5 | |
6 | inherit autotools-brokensep pkgconfig | 6 | inherit autotools-brokensep pkgconfig |
7 | 7 | ||
8 | SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ | 8 | SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ |
9 | file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \ | ||
10 | file://0001-Use-pkg-config-to-find-gpgme.patch \ | 9 | file://0001-Use-pkg-config-to-find-gpgme.patch \ |
11 | file://0001-configure.ac-Fix-missing-comma-in-AS_IF.patch \ | ||
12 | " | 10 | " |
13 | SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" | 11 | SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6774c64" |
14 | 12 | ||
15 | DEPENDS = "libpcap gpgme" | 13 | DEPENDS = "libpcap gpgme" |
16 | 14 | ||
17 | EXTRA_OECONF = " --with-iptables=${sbindir}/iptables" | 15 | EXTRA_OECONF = "--with-iptables=${sbindir}/iptables \ |
16 | --with-gpg=${bindir}/gpg \ | ||
17 | --with-wget=${base_bindir}/wget" | ||
18 | 18 | ||
19 | do_configure:prepend () { | 19 | do_configure:prepend () { |
20 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config | 20 | install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config |
diff --git a/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb deleted file mode 100644 index b8d0536eb..000000000 --- a/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | DESCRIPTION = "libConfuse is a configuration file parser library" | ||
2 | LICENSE = "ISC" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a" | ||
4 | |||
5 | SRCREV = "a42aebf13db33afd575da6e63f55163d371f776d" | ||
6 | SRC_URI = "git://github.com/libconfuse/libconfuse.git;branch=master;protocol=https" | ||
7 | |||
8 | inherit autotools-brokensep pkgconfig gettext | ||
9 | |||
10 | S = "${WORKDIR}/git" | ||
11 | |||
12 | do_configure:prepend(){ | ||
13 | (cd ${S} && ${S}/autogen.sh) | ||
14 | } | ||
diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb index bd3f9f63a..a96527a3e 100644 --- a/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ | |||
15 | file://run-ptest \ | 15 | file://run-ptest \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRC_URI[sha256sum] = "02338e33c16c21c9e29571cef523e76b2b708636254f6f30c6cf195d48c62daf" | 18 | SRC_URI[sha256sum] = "6ce4b27498812d09237ece65a0d6dfac0941610e709848ecb822aa241084cd7a" |
19 | 19 | ||
20 | PACKAGECONFIG ??= "\ | 20 | PACKAGECONFIG ??= "\ |
21 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ | 21 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ |
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 86b9112ba..391e0e4ab 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 | |||
32 | EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" | 32 | EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" |
33 | 33 | ||
34 | FILES:${PN} += "${nonarch_base_libdir}/firmware" | 34 | FILES:${PN} += "${nonarch_base_libdir}/firmware" |
35 | |||
36 | # http://errors.yoctoproject.org/Errors/Details/766901/ | ||
37 | # linux-atm-2.5.2/src/led/conn.c:414:57: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] | ||
38 | 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.20.bb index 0243f2a1d..a5f9c5543 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.20.bb | |||
@@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
8 | file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ | 8 | file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225" | 11 | SRCREV = "311fcdeb5cb41612d4be66b16f0f2ad6675a6af8" |
12 | |||
13 | PV .= "+git" | ||
14 | LK_REL = "1.0.19" | ||
15 | 12 | ||
16 | SRC_URI = " \ | 13 | SRC_URI = " \ |
17 | git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \ | 14 | git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \ |
@@ -34,19 +31,14 @@ do_install_ptest () { | |||
34 | done | 31 | done |
35 | } | 32 | } |
36 | 33 | ||
37 | SOLIBVERSION="${LK_REL}" | ||
38 | SOLIBMAJORVERSION="1" | ||
39 | |||
40 | PACKAGES =+ "${PN}-withsctp ${PN}-utils" | 34 | PACKAGES =+ "${PN}-withsctp ${PN}-utils" |
41 | 35 | ||
42 | FILES:${PN} = " \ | 36 | FILES:${PN} = " \ |
43 | ${libdir}/libsctp.so.${SOLIBVERSION} \ | 37 | ${libdir}/libsctp.so.* \ |
44 | ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \ | ||
45 | " | 38 | " |
46 | 39 | ||
47 | FILES:${PN}-withsctp = " \ | 40 | FILES:${PN}-withsctp = " \ |
48 | ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \ | 41 | ${libdir}/lksctp-tools/libwithsctp.so.* \ |
49 | ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \ | ||
50 | " | 42 | " |
51 | 43 | ||
52 | FILES:${PN}-dev += " \ | 44 | FILES:${PN}-dev += " \ |
diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb index a827e7f42..fb00b8351 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb | |||
@@ -27,6 +27,10 @@ do_configure:prepend() { | |||
27 | ${S}/autogen.sh | 27 | ${S}/autogen.sh |
28 | } | 28 | } |
29 | 29 | ||
30 | do_configure:append() { | ||
31 | sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/config.h | ||
32 | } | ||
33 | |||
30 | do_install:append () { | 34 | do_install:append () { |
31 | rm -rf ${D}${localstatedir} | 35 | rm -rf ${D}${localstatedir} |
32 | # Enable SUID bit for applications that need it | 36 | # Enable SUID bit for applications that need it |
diff --git a/meta-networking/recipes-support/ntp/ntp/ntpd b/meta-networking/recipes-support/ntp/ntp/ntpd index d1b9c4907..a0c43ed5e 100755 --- a/meta-networking/recipes-support/ntp/ntp/ntpd +++ b/meta-networking/recipes-support/ntp/ntp/ntpd | |||
@@ -72,7 +72,7 @@ case "$1" in | |||
72 | startdaemon | 72 | startdaemon |
73 | ;; | 73 | ;; |
74 | status) | 74 | status) |
75 | status /usr/sbin/ntpd; | 75 | status ntpd; |
76 | exit $? | 76 | exit $? |
77 | ;; | 77 | ;; |
78 | *) | 78 | *) |
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.4.5.bb index 7e3fe5601..217829193 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.4.5.bb | |||
@@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" | |||
25 | LICENSE:modules/linux = "GPL-2.0-only" | 25 | LICENSE:modules/linux = "GPL-2.0-only" |
26 | LICENSE:modules/solaris = "CDDL-1.0" | 26 | LICENSE:modules/solaris = "CDDL-1.0" |
27 | 27 | ||
28 | SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.3.x \ | 28 | SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.4.x \ |
29 | file://tools.conf \ | 29 | file://tools.conf \ |
30 | file://vmtoolsd.service \ | 30 | file://vmtoolsd.service \ |
31 | file://vmtoolsd.init \ | 31 | file://vmtoolsd.init \ |
@@ -50,7 +50,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" | |||
50 | SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ | 50 | SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ |
51 | " | 51 | " |
52 | 52 | ||
53 | SRCREV = "1b362b9eb449fb5de3809aaea4a636ece30ee5b7" | 53 | SRCREV = "9b94132f54fbed0b86dce04ff4402d1d8fd059c3" |
54 | 54 | ||
55 | S = "${WORKDIR}/git/open-vm-tools" | 55 | S = "${WORKDIR}/git/open-vm-tools" |
56 | 56 | ||
@@ -64,7 +64,7 @@ inherit autotools pkgconfig systemd update-rc.d | |||
64 | SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" | 64 | SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" |
65 | 65 | ||
66 | EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ | 66 | EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ |
67 | --disable-tests --without-gtkmm --without-xerces --without-pam \ | 67 | --disable-tests --without-gtkmm --without-pam \ |
68 | --disable-vgauth --disable-deploypkg --disable-containerinfo \ | 68 | --disable-vgauth --disable-deploypkg --disable-containerinfo \ |
69 | --without-root-privileges --without-kernel-modules --with-tirpc \ | 69 | --without-root-privileges --without-kernel-modules --with-tirpc \ |
70 | --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" | 70 | --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" |
diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb index c7c757367..74c5ef220 100644 --- a/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb +++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb | |||
@@ -34,7 +34,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ | |||
34 | 34 | ||
35 | S = "${WORKDIR}/OpenIPMI-${PV}" | 35 | S = "${WORKDIR}/OpenIPMI-${PV}" |
36 | 36 | ||
37 | SRC_URI[sha256sum] = "b059114f6299d73f04ff6e76a0857a0ab81aa362dee99644d256b223872437ad" | 37 | SRC_URI[sha256sum] = "a0403148fa5f7bed930c958a4d1c558047e273763a408b3a0368edc137cc55d9" |
38 | 38 | ||
39 | inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig | 39 | inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig |
40 | 40 | ||
diff --git a/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch b/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch index 03b454d62..e1253db1e 100644 --- a/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch +++ b/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ea179d83b0aa62719d90748cd1fb260f40055f15 Mon Sep 17 00:00:00 2001 | 1 | From 9cc13bdcb71cd16d2873637c491e07c01de9a3ea Mon Sep 17 00:00:00 2001 |
2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
3 | Date: Mon, 13 Jun 2022 22:44:28 +0800 | 3 | Date: Mon, 13 Jun 2022 22:44:28 +0800 |
4 | Subject: [PATCH] configure.ac: eliminate build path from openvpn --version | 4 | Subject: [PATCH] configure.ac: eliminate build path from openvpn --version |
@@ -31,10 +31,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
31 | 1 file changed, 1 insertion(+), 1 deletion(-) | 31 | 1 file changed, 1 insertion(+), 1 deletion(-) |
32 | 32 | ||
33 | diff --git a/configure.ac b/configure.ac | 33 | diff --git a/configure.ac b/configure.ac |
34 | index 2f5f6bc..eddcbc5 100644 | 34 | index df16c43..623ca65 100644 |
35 | --- a/configure.ac | 35 | --- a/configure.ac |
36 | +++ b/configure.ac | 36 | +++ b/configure.ac |
37 | @@ -1377,7 +1377,7 @@ if test "${enable_async_push}" = "yes"; then | 37 | @@ -1463,7 +1463,7 @@ if test "${enable_async_push}" = "yes"; then |
38 | esac | 38 | esac |
39 | fi | 39 | fi |
40 | 40 | ||
@@ -43,6 +43,3 @@ index 2f5f6bc..eddcbc5 100644 | |||
43 | AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) | 43 | AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) |
44 | 44 | ||
45 | TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID" | 45 | TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID" |
46 | -- | ||
47 | 2.25.1 | ||
48 | |||
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb b/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb index ba53d40f4..d81b8ce44 100644 --- a/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb +++ b/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb | |||
@@ -14,7 +14,7 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ | |||
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" | 15 | UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" |
16 | 16 | ||
17 | SRC_URI[sha256sum] = "1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b" | 17 | SRC_URI[sha256sum] = "1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929" |
18 | 18 | ||
19 | CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" | 19 | CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" |
20 | 20 | ||
diff --git a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch index 9cd240189..092f4431b 100644 --- a/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch +++ b/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch | |||
@@ -20,18 +20,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
20 | librdmacm/preload.c | 7 +++++-- | 20 | librdmacm/preload.c | 7 +++++-- |
21 | 1 file changed, 5 insertions(+), 2 deletions(-) | 21 | 1 file changed, 5 insertions(+), 2 deletions(-) |
22 | 22 | ||
23 | diff --git a/librdmacm/preload.c b/librdmacm/preload.c | ||
24 | index d46beb1bb..e09b2aa85 100644 | ||
25 | --- a/librdmacm/preload.c | 23 | --- a/librdmacm/preload.c |
26 | +++ b/librdmacm/preload.c | 24 | +++ b/librdmacm/preload.c |
27 | @@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size_t len, int flags) | 25 | @@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size |
28 | return (fd_fork_get(socket, &fd) == fd_rsocket) ? | 26 | return (fd_fork_get(socket, &fd) == fd_rsocket) ? |
29 | rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags); | 27 | rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags); |
30 | } | 28 | } |
31 | - | 29 | - |
32 | -ssize_t recvfrom(int socket, void *buf, size_t len, int flags, | 30 | -ssize_t recvfrom(int socket, void *buf, size_t len, int flags, |
33 | +ssize_t | 31 | +ssize_t |
34 | +#ifdef __clang__ | 32 | +#if defined(__clang__) && defined(__GLIBC__) |
35 | +__attribute__((overloadable)) | 33 | +__attribute__((overloadable)) |
36 | +#endif | 34 | +#endif |
37 | +recvfrom(int socket, void *buf, size_t len, int flags, | 35 | +recvfrom(int socket, void *buf, size_t len, int flags, |
diff --git a/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb b/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb index 50248078a..518ca9e27 100644 --- a/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb +++ b/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb | |||
@@ -16,7 +16,7 @@ DEPENDS = "\ | |||
16 | " | 16 | " |
17 | 17 | ||
18 | SRC_URI = "git://github.com/irontec/sngrep.git;protocol=https;branch=master" | 18 | SRC_URI = "git://github.com/irontec/sngrep.git;protocol=https;branch=master" |
19 | SRCREV = "373abb90804ba71f980c7120e62f90d3a5c81213" | 19 | SRCREV = "dad1033640f249fa4994f976cf6ee96826c15702" |
20 | 20 | ||
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
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 0531ffe64..2d6311975 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 " | |||
15 | do_install() { | 15 | do_install() { |
16 | oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install | 16 | oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install |
17 | } | 17 | } |
18 | |||
19 | # http://errors.yoctoproject.org/Errors/Details/766895/ | ||
20 | # ssmping.c:55:51: error: passing argument 3 of 'getsockname' from incompatible pointer type [-Wincompatible-pointer-types] | ||
21 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch index 82d355101..8c4ca55fb 100644 --- a/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch +++ b/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce Mon Sep 17 00:00:00 2001 | 1 | From c815368a3e41dd3f639eb8fd82d21bc0bab55d1e Mon Sep 17 00:00:00 2001 |
2 | From: Kai Kang <kai.kang@windriver.com> | 2 | From: Kai Kang <kai.kang@windriver.com> |
3 | Date: Wed, 1 Nov 2017 09:23:41 -0400 | 3 | Date: Wed, 1 Nov 2017 09:23:41 -0400 |
4 | Subject: [PATCH] stunnel: fix compile error when openssl disable des support | 4 | Subject: [PATCH] stunnel: fix compile error when openssl disable des support |
@@ -17,10 +17,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
17 | 2 files changed, 5 insertions(+), 3 deletions(-) | 17 | 2 files changed, 5 insertions(+), 3 deletions(-) |
18 | 18 | ||
19 | diff --git a/src/common.h b/src/common.h | 19 | diff --git a/src/common.h b/src/common.h |
20 | index 2b4869f..180d31a 100644 | 20 | index f112cf9..8d4be01 100644 |
21 | --- a/src/common.h | 21 | --- a/src/common.h |
22 | +++ b/src/common.h | 22 | +++ b/src/common.h |
23 | @@ -492,7 +492,9 @@ extern char *sys_errlist[]; | 23 | @@ -496,7 +496,9 @@ extern char *sys_errlist[]; |
24 | #ifndef OPENSSL_NO_MD4 | 24 | #ifndef OPENSSL_NO_MD4 |
25 | #include <openssl/md4.h> | 25 | #include <openssl/md4.h> |
26 | #endif /* !defined(OPENSSL_NO_MD4) */ | 26 | #endif /* !defined(OPENSSL_NO_MD4) */ |
@@ -31,19 +31,19 @@ index 2b4869f..180d31a 100644 | |||
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
32 | #if OPENSSL_VERSION_NUMBER<0x10100000L | 32 | #if OPENSSL_VERSION_NUMBER<0x10100000L |
33 | diff --git a/src/protocol.c b/src/protocol.c | 33 | diff --git a/src/protocol.c b/src/protocol.c |
34 | index cfe6d3b..3936aea 100644 | 34 | index c8c65ea..b071b06 100644 |
35 | --- a/src/protocol.c | 35 | --- a/src/protocol.c |
36 | +++ b/src/protocol.c | 36 | +++ b/src/protocol.c |
37 | @@ -81,7 +81,7 @@ NOEXPORT void ldap_client_middle(CLI *); | 37 | @@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *); |
38 | |||
39 | NOEXPORT void connect_server_early(CLI *); | 38 | NOEXPORT void connect_server_early(CLI *); |
39 | NOEXPORT const char *connect_client_init(SERVICE_OPTIONS *); | ||
40 | NOEXPORT void connect_client_middle(CLI *); | 40 | NOEXPORT void connect_client_middle(CLI *); |
41 | -#ifndef OPENSSL_NO_MD4 | 41 | -#ifndef OPENSSL_NO_MD4 |
42 | +#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) | 42 | +#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) |
43 | NOEXPORT void ntlm(CLI *); | 43 | NOEXPORT void ntlm(CLI *); |
44 | NOEXPORT char *ntlm1(void); | 44 | NOEXPORT char *ntlm1(void); |
45 | NOEXPORT char *ntlm3(char *, char *, char *, char *); | 45 | NOEXPORT char *ntlm3(char *, char *, char *, char *); |
46 | @@ -1331,7 +1331,7 @@ NOEXPORT void connect_client_middle(CLI *c) { | 46 | @@ -1334,7 +1334,7 @@ NOEXPORT void connect_client_middle(CLI *c) { |
47 | fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); | 47 | fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); |
48 | if(c->opt->protocol_username && c->opt->protocol_password) { | 48 | if(c->opt->protocol_username && c->opt->protocol_password) { |
49 | if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { | 49 | if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { |
@@ -52,7 +52,7 @@ index cfe6d3b..3936aea 100644 | |||
52 | ntlm(c); | 52 | ntlm(c); |
53 | #else | 53 | #else |
54 | s_log(LOG_ERR, "NTLM authentication is not available"); | 54 | s_log(LOG_ERR, "NTLM authentication is not available"); |
55 | @@ -1374,7 +1374,7 @@ NOEXPORT void connect_client_middle(CLI *c) { | 55 | @@ -1377,7 +1377,7 @@ NOEXPORT void connect_client_middle(CLI *c) { |
56 | str_free(line); | 56 | str_free(line); |
57 | } | 57 | } |
58 | 58 | ||
@@ -61,6 +61,3 @@ index cfe6d3b..3936aea 100644 | |||
61 | 61 | ||
62 | /* | 62 | /* |
63 | * NTLM code is based on the following documentation: | 63 | * NTLM code is based on the following documentation: |
64 | -- | ||
65 | 2.34.1 | ||
66 | |||
diff --git a/meta-networking/recipes-support/stunnel/stunnel_5.72.bb b/meta-networking/recipes-support/stunnel/stunnel_5.73.bb index 6d21027a1..e13b7871c 100644 --- a/meta-networking/recipes-support/stunnel/stunnel_5.72.bb +++ b/meta-networking/recipes-support/stunnel/stunnel_5.73.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ | |||
11 | file://fix-openssl-no-des.patch \ | 11 | file://fix-openssl-no-des.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "3d532941281ae353319735144e4adb9ae489a10b7e309c58a48157f08f42e949" | 14 | SRC_URI[sha256sum] = "bc917c3bcd943a4d632360c067977a31e85e385f5f4845f69749bce88183cb38" |
15 | 15 | ||
16 | inherit autotools bash-completion pkgconfig | 16 | inherit autotools bash-completion pkgconfig |
17 | 17 | ||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest index 2bfb2267d..2bfb2267d 100755..100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest +++ b/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb index 803a9bb5f..32b869f24 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb | |||
@@ -21,12 +21,12 @@ RDEPENDS:${PN}-ptest += " make perl \ | |||
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI = " \ | 23 | SRC_URI = " \ |
24 | http://www.tcpdump.org/release/${BP}.tar.gz \ | 24 | http://www.tcpdump.org/release/${BP}.tar.xz \ |
25 | file://add-ptest.patch \ | 25 | file://add-ptest.patch \ |
26 | file://run-ptest \ | 26 | file://run-ptest \ |
27 | " | 27 | " |
28 | 28 | ||
29 | SRC_URI[sha256sum] = "0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea" | 29 | SRC_URI[sha256sum] = "d76395ab82d659d526291b013eee200201380930793531515abfc6e77b4f2ee5" |
30 | 30 | ||
31 | UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" | 31 | UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" |
32 | 32 | ||
diff --git a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb b/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb index 93197dc3b..3d61160bb 100644 --- a/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb +++ b/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa6 | |||
8 | 8 | ||
9 | SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ | 9 | SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ |
10 | " | 10 | " |
11 | SRC_URI[sha256sum] = "e513f0710c4ab45ec627e5df6f7b80d12e488146e1bd500c92247e20ca608903" | 11 | SRC_URI[sha256sum] = "082967d6bf793499d3d655cea2149e07c0da97287f1877a6eab88d17cb703d0d" |
12 | 12 | ||
13 | UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar" | 13 | UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar" |
14 | 14 | ||
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch deleted file mode 100644 index 08cb3b88f..000000000 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 42f7bbc1ce4913fe2c0bc76293c5445d31690f5d Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Thu, 7 Mar 2024 21:02:07 -0800 | ||
4 | Subject: [PATCH] configure.ac: do not run conftest in case of cross | ||
5 | compilation | ||
6 | |||
7 | It'll give us nothing but error like below: | ||
8 | |||
9 | ./conftest: cannot execute binary file: Exec format error | ||
10 | ... | ||
11 | ./configure: line 23950: test: -eq: unary operator expected | ||
12 | |||
13 | The version check only has effect on Apple systems. We'd better | ||
14 | avoid error like above when cross compilation. | ||
15 | |||
16 | Also, in case of cross compilation, instead of having the above | ||
17 | Exec format error and resulting in unaligned_cv_fail to yes, set | ||
18 | it directly to yes. | ||
19 | |||
20 | Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/849] | ||
21 | |||
22 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
23 | --- | ||
24 | configure.ac | 4 ++-- | ||
25 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/configure.ac b/configure.ac | ||
28 | index 387219de..15201601 100644 | ||
29 | --- a/configure.ac | ||
30 | +++ b/configure.ac | ||
31 | @@ -928,7 +928,7 @@ cat >conftest.c <<EOF | ||
32 | EOF | ||
33 | ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LPCAPLIB \ | ||
34 | conftest.c $LIBS >/dev/null 2>&1 | ||
35 | -if test -x conftest ; then | ||
36 | +if test -x conftest -a "$cross_compiling" != "yes"; then | ||
37 | full_libpcap_version=$(LD_LIBRARY_PATH="$LPCAP_LD_LIBRARY_PATH" ./conftest) | ||
38 | libpcap_version=$(echo "$full_libpcap_version" | ${CUT} -d' ' -f3) | ||
39 | pcap_version_ok=yes | ||
40 | @@ -1709,7 +1709,7 @@ case "$host_os" in | ||
41 | EOF | ||
42 | ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \ | ||
43 | conftest.c $LIBS >/dev/null 2>&1 | ||
44 | - if test ! -x conftest ; then | ||
45 | + if test ! -x conftest -o "$cross_compiling" = "yes" ; then | ||
46 | dnl failed to compile for some reason | ||
47 | unaligned_cv_fail=yes | ||
48 | else | ||
49 | -- | ||
50 | 2.42.0 | ||
51 | |||
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch b/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch deleted file mode 100644 index 709d2cccb..000000000 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | From 5f8c78362b3b1e06f5adff2d4b140509c4799894 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sun, 3 Sep 2023 12:31:59 +0200 | ||
4 | Subject: [PATCH] configure.ac: unify search dirs for pcap and add lib32 | ||
5 | |||
6 | * add lib32 because when building lib32-tcpreplay it's | ||
7 | impossible to set --with-libpcap so that it would find | ||
8 | both include files as well as the library in lib32 directory | ||
9 | |||
10 | * maybe it would be beneficial to split --with-libpcap | ||
11 | into --with-libpcap-includedir --with-libpcap-libdir as this | ||
12 | already searches in the --with-libpcap value with and | ||
13 | without any "lib" prefix, but include files always expect | ||
14 | "include" dir there | ||
15 | |||
16 | * most of this code was added in: | ||
17 | https://github.com/appneta/tcpreplay/commit/202b8e82f9fd3c84ce5804577caeb36a33baabe7#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R570 | ||
18 | |||
19 | * then search for | ||
20 | ${host_cpu} lib/${host_cpu} (without -${host_os} suffix) | ||
21 | and ${build_arch}-${host_os} lib/${build_arch}-${host_os} | ||
22 | was added, but only for search of dynamic library in: | ||
23 | https://github.com/appneta/tcpreplay/commit/c3d5236563985a99f8bb02c3f1bd6950e3929047 | ||
24 | |||
25 | * ${build_arch}-${host_os} lib/${build_arch}-${host_os} | ||
26 | was later replaced with: | ||
27 | lib/${MULTIARCH} ${MULTIARCH} | ||
28 | and it was added to static library search as well | ||
29 | |||
30 | but for dynamic library it was searching in reversed order: | ||
31 | ${MULTIARCH} lib/${MULTIARCH} | ||
32 | https://github.com/appneta/tcpreplay/commit/ed9e3a818bde04813144014561e62f018c9eb85f | ||
33 | |||
34 | I don't think this reversed order was intentional, just unify all 4 cases | ||
35 | to use the same directories in the same order | ||
36 | |||
37 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
38 | Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/819] | ||
39 | --- | ||
40 | configure.ac | 8 ++++---- | ||
41 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
42 | |||
43 | diff --git a/configure.ac b/configure.ac | ||
44 | index 387219de..26ba31a5 100644 | ||
45 | --- a/configure.ac | ||
46 | +++ b/configure.ac | ||
47 | @@ -671,7 +671,7 @@ AC_ARG_WITH(libpcap, | ||
48 | LPCAPINCDIR=${testdir} | ||
49 | if test $dynamic_link = yes; then | ||
50 | for ext in .dylib .so .tbd ; do | ||
51 | - for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do | ||
52 | + for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do | ||
53 | sharefile=$(ls ${testdir}/$dir/libpcap${ext}* 2> /dev/null | sort | head -n1) | ||
54 | if test -n "${sharefile}"; then | ||
55 | LPCAP_LD_LIBRARY_PATH="$(dirname ${sharefile})" | ||
56 | @@ -690,7 +690,7 @@ AC_ARG_WITH(libpcap, | ||
57 | dnl If dynamic library not found, try static | ||
58 | dnl | ||
59 | for ext in ${libext} .a .A.tbd ; do | ||
60 | - for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do | ||
61 | + for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do | ||
62 | staticfile=$(ls ${testdir}/$dir/libpcap${ext} 2> /dev/null | sort | head -n1) | ||
63 | if test -n "${staticfile}"; then | ||
64 | LPCAPLIB="${staticfile}" | ||
65 | @@ -771,7 +771,7 @@ AC_ARG_WITH(libpcap, | ||
66 | LPCAPINCDIR="${testdir}/include" | ||
67 | if test $dynamic_link = yes; then | ||
68 | for ext in .dylib .so .tbd; do | ||
69 | - for dir in . lib lib64 ${host_cpu} lib/${host_cpu} ${host_cpu}-${host_os} lib/${host_cpu}-${host_os} ${MULTIARCH} lib/${MULTIARCH}; do | ||
70 | + for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do | ||
71 | sharefile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) | ||
72 | if test -n "${sharefile}"; then | ||
73 | LPCAPLIB="-L$(dirname ${sharefile}) -lpcap" | ||
74 | @@ -790,7 +790,7 @@ AC_ARG_WITH(libpcap, | ||
75 | dnl If dynamic library not found, try static | ||
76 | dnl | ||
77 | for ext in ${libext} .a .A.tbd ; do | ||
78 | - for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do | ||
79 | + for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do | ||
80 | staticfile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) | ||
81 | if test -n "${staticfile}"; then | ||
82 | LPCAPLIB="${staticfile}" | ||
diff --git a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb index 26de40a65..f01bbb95a 100644 --- a/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb +++ b/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb | |||
@@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" | |||
9 | 9 | ||
10 | SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ | 10 | SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ |
11 | file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ | 11 | file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ |
12 | file://0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch \ | ||
13 | file://0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch \ | ||
14 | " | 12 | " |
15 | 13 | ||
16 | SRC_URI[sha256sum] = "44f18fb6d3470ecaf77a51b901a119dae16da5be4d4140ffbb2785e37ad6d4bf" | 14 | SRC_URI[sha256sum] = "2de79bfd67ec92ca9ae2ffb50456dd1d53ff40f3fa71b422c65e8062013c9e85" |
17 | 15 | ||
18 | UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" | 16 | UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" |
19 | 17 | ||
diff --git a/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb b/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb index 862cba91e..b72c37540 100644 --- a/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb +++ b/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb | |||
@@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/tracerou | |||
17 | 17 | ||
18 | SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ | 18 | SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ |
19 | " | 19 | " |
20 | SRC_URI[sha256sum] = "9c6c260d96eaab51e3ce461b0a84fe87123ebc6dd6c9a59fab803f95b35a859e" | 20 | SRC_URI[sha256sum] = "9ccef9cdb9d7a98ff7fbf93f79ebd0e48881664b525c4b232a0fcec7dcb9db5e" |
21 | 21 | ||
22 | EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" | 22 | EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" |
23 | LTOEXTRA += "-flto-partition=none" | 23 | LTOEXTRA += "-flto-partition=none" |
diff --git a/meta-networking/recipes-support/unbound/unbound/run-ptest b/meta-networking/recipes-support/unbound/unbound/run-ptest new file mode 100644 index 000000000..433a687c6 --- /dev/null +++ b/meta-networking/recipes-support/unbound/unbound/run-ptest | |||
@@ -0,0 +1,17 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd tests || exit 1 | ||
4 | retVal=0 | ||
5 | ./unittest | ||
6 | ./testbound -s | ||
7 | for x in ./testdata/*.rpl; do | ||
8 | output="$(./testbound -p $x -o -vvvvv 2>&1)" | ||
9 | if test $? -eq 0; then | ||
10 | echo "$x :Pass" | ||
11 | else | ||
12 | echo "$output" | ||
13 | echo "$x :Fail" | ||
14 | retVal=1 | ||
15 | fi | ||
16 | done | ||
17 | exit $retVal | ||
diff --git a/meta-networking/recipes-support/unbound/unbound_1.20.0.bb b/meta-networking/recipes-support/unbound/unbound_1.21.0.bb index fe0111f59..8c042dc5f 100644 --- a/meta-networking/recipes-support/unbound/unbound_1.20.0.bb +++ b/meta-networking/recipes-support/unbound/unbound_1.21.0.bb | |||
@@ -9,10 +9,12 @@ SECTION = "net" | |||
9 | LICENSE = "BSD-3-Clause" | 9 | LICENSE = "BSD-3-Clause" |
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.20.0" | 12 | SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \ |
13 | SRCREV = "b9525c5fd47ba481a29b90109017d2253beb105d" | 13 | file://run-ptest \ |
14 | " | ||
15 | SRCREV = "79e4c578518886a32475cfbb0de383ff3a905033" | ||
14 | 16 | ||
15 | inherit autotools pkgconfig systemd update-rc.d | 17 | inherit autotools pkgconfig systemd update-rc.d ptest |
16 | 18 | ||
17 | DEPENDS = "openssl libtool-native bison-native expat" | 19 | DEPENDS = "openssl libtool-native bison-native expat" |
18 | RDEPENDS:${PN} = "bash openssl-bin daemonize" | 20 | RDEPENDS:${PN} = "bash openssl-bin daemonize" |
@@ -32,6 +34,10 @@ do_configure:append() { | |||
32 | sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h | 34 | sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h |
33 | } | 35 | } |
34 | 36 | ||
37 | do_compile:append() { | ||
38 | oe_runmake tests | ||
39 | } | ||
40 | |||
35 | do_install:append() { | 41 | do_install:append() { |
36 | install -d ${D}${systemd_unitdir}/system | 42 | install -d ${D}${systemd_unitdir}/system |
37 | install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system | 43 | install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system |
@@ -40,6 +46,19 @@ do_install:append() { | |||
40 | install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound | 46 | install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound |
41 | } | 47 | } |
42 | 48 | ||
49 | do_install_ptest() { | ||
50 | install -d ${D}${PTEST_PATH}/tests | ||
51 | install -d ${D}${PTEST_PATH}/tests/testdata | ||
52 | |||
53 | install -m 0544 ${B}/unittest ${D}${PTEST_PATH}/tests/ | ||
54 | install -m 0544 ${B}/testbound ${D}${PTEST_PATH}/tests/ | ||
55 | install -m 0664 ${S}/testdata/test_signatures* ${D}${PTEST_PATH}/tests/ | ||
56 | install -m 0664 ${S}/testdata/test_sigs* ${D}${PTEST_PATH}/tests/ | ||
57 | install -m 0664 ${S}/testdata/test_ds* ${D}${PTEST_PATH}/tests/ | ||
58 | install -m 0664 ${S}/testdata/test_nsec3_hash* ${D}${PTEST_PATH}/tests/ | ||
59 | install -m 0644 ${S}/testdata/*.rpl ${D}/${PTEST_PATH}/tests/testdata/ | ||
60 | } | ||
61 | |||
43 | SYSTEMD_SERVICE:${PN} = "${BPN}.service" | 62 | SYSTEMD_SERVICE:${PN} = "${BPN}.service" |
44 | 63 | ||
45 | INITSCRIPT_NAME = "unbound" | 64 | INITSCRIPT_NAME = "unbound" |
diff --git a/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb b/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb index 9da43cf9f..c3de38a6f 100644 --- a/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb +++ b/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb | |||
@@ -14,7 +14,7 @@ PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" | |||
14 | DEPENDS = "libnl ncurses" | 14 | DEPENDS = "libnl ncurses" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https" | 16 | SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https" |
17 | SRCREV = "a7c2f190e010db508ead31fa952478e2a1c13d64" | 17 | SRCREV = "8ba6604027c0aa5131070e3fafdcda323d58a7ad" |
18 | 18 | ||
19 | # Needs some help to find libnl3 headers. | 19 | # Needs some help to find libnl3 headers. |
20 | # Reorder -pthread flag on the command line. | 20 | # Reorder -pthread flag on the command line. |
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb index 7cbe3e632..b80710683 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ | |||
17 | 17 | ||
18 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" | 18 | UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" |
19 | 19 | ||
20 | SRC_URI[sha256sum] = "55e793ab87a9a73aac44336235c92cb76c52180c469b362ed3a54f26fbb1261f" | 20 | SRC_URI[sha256sum] = "2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86" |
21 | 21 | ||
22 | PE = "1" | 22 | PE = "1" |
23 | 23 | ||
diff --git a/meta-oe/README.md b/meta-oe/README.md index 676a2c892..c7c14a450 100644 --- a/meta-oe/README.md +++ b/meta-oe/README.md | |||
@@ -24,6 +24,11 @@ When sending single patches, please use something like: | |||
24 | You are encouraged to fork the mirror on GitHub https://github.com/openembedded/meta-openembedded | 24 | You are encouraged to fork the mirror on GitHub https://github.com/openembedded/meta-openembedded |
25 | to share your patches, this is preferred for patch sets consisting of more than one patch. | 25 | to share your patches, this is preferred for patch sets consisting of more than one patch. |
26 | 26 | ||
27 | Note, it is discouraged to send patches via GitHub pull request system. Such | ||
28 | patches get less attention from developers and can be mishandled or not | ||
29 | reviewed properly. Please use emails instead. For exemple, you can use | ||
30 | 'git request-pull' to generate an email referencing your git repository. | ||
31 | |||
27 | Other services like GitLab, repo.or.cz or self-hosted setups are of course accepted as well, | 32 | Other services like GitLab, repo.or.cz or self-hosted setups are of course accepted as well, |
28 | 'git fetch <remote>' works the same on all of them. We recommend GitHub because it is free, easy | 33 | 'git fetch <remote>' works the same on all of them. We recommend GitHub because it is free, easy |
29 | to use, has been proven to be reliable and has a really good web GUI. | 34 | to use, has been proven to be reliable and has a really good web GUI. |
diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index eaa86c411..0ea43f597 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc | |||
@@ -17,7 +17,6 @@ PTESTS_FAST_META_OE = "\ | |||
17 | jq \ | 17 | jq \ |
18 | leveldb \ | 18 | leveldb \ |
19 | libcereal \ | 19 | libcereal \ |
20 | libee \ | ||
21 | libgpiod \ | 20 | libgpiod \ |
22 | libio-pty-perl \ | 21 | libio-pty-perl \ |
23 | libmanette \ | 22 | libmanette \ |
@@ -34,6 +33,7 @@ PTESTS_FAST_META_OE = "\ | |||
34 | nodejs \ | 33 | nodejs \ |
35 | onig \ | 34 | onig \ |
36 | oprofile \ | 35 | oprofile \ |
36 | pegtl \ | ||
37 | protobuf \ | 37 | protobuf \ |
38 | pv \ | 38 | pv \ |
39 | python3-pefile \ | 39 | python3-pefile \ |
diff --git a/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb b/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb index ac197a631..98184b223 100644 --- a/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb +++ b/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb | |||
@@ -16,6 +16,7 @@ SRC_URI = " \ | |||
16 | file://fix-menu-generation.patch \ | 16 | file://fix-menu-generation.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "824e099928aab2fb628f0fa4870ef7bba10b95581e47c2d8fa216709a0f399b3" | 18 | SRC_URI[sha256sum] = "824e099928aab2fb628f0fa4870ef7bba10b95581e47c2d8fa216709a0f399b3" |
19 | UPSTREAM_CHECK_URI="https://launchpad.net/openbox-xdgmenu/" | ||
19 | 20 | ||
20 | inherit pkgconfig features_check | 21 | inherit pkgconfig features_check |
21 | # depends on openbox, which is X11-only | 22 | # depends on openbox, which is X11-only |
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0002-meson.build-do-not-use-Werror.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch index 663a80ecd..663a80ecd 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0002-meson.build-do-not-use-Werror.patch +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch deleted file mode 100644 index 4f385e917..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From d3aa30f5cd7ba375e006a755752acbcfcd619452 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Wed, 6 Mar 2024 19:27:15 +0800 | ||
4 | Subject: [PATCH] meson.build: drop unnecessary build dependencies | ||
5 | |||
6 | The pytest and pycoverage are required by meson test but not for | ||
7 | building. Mark them as 'required: false' to get rid of unnecessary | ||
8 | build dependencies. | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe specific] | ||
11 | |||
12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
13 | --- | ||
14 | meson.build | 8 ++++++-- | ||
15 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/meson.build b/meson.build | ||
18 | index 9556836a..30f33fe2 100644 | ||
19 | --- a/meson.build | ||
20 | +++ b/meson.build | ||
21 | @@ -25,8 +25,8 @@ bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', def | ||
22 | # Order: Fedora/Mageia/openSUSE || Debian/Ubuntu | ||
23 | pyflakes = find_program('pyflakes-3', 'pyflakes3', required: false) | ||
24 | pycodestyle = find_program('pycodestyle-3', 'pycodestyle', 'pep8', required: false) | ||
25 | -pytest = find_program('pytest-3', 'pytest3') # also requires the pytest-cov plugin | ||
26 | -pycoverage = find_program('coverage-3', 'python3-coverage') | ||
27 | +pytest = find_program('pytest-3', 'pytest3', required: false) # also requires the pytest-cov plugin | ||
28 | +pycoverage = find_program('coverage-3', 'python3-coverage', required: false) | ||
29 | pandoc = find_program('pandoc', required: false) | ||
30 | find = find_program('find') | ||
31 | |||
32 | @@ -75,6 +75,7 @@ if get_option('unit_testing') | ||
33 | endif | ||
34 | |||
35 | #FIXME: exclude doc/env/ | ||
36 | +if pyflakes.found() and pycodestyle.found() | ||
37 | test('linting', | ||
38 | pyflakes, | ||
39 | timeout: 100, | ||
40 | @@ -91,7 +92,9 @@ test('legacy-tests', | ||
41 | find_program('tests/cli_legacy.py'), | ||
42 | timeout: 600, | ||
43 | env: test_env) | ||
44 | +endif | ||
45 | #TODO: split out dbus tests into own test() instance, to run in parallel | ||
46 | +if pycoverage.found() | ||
47 | test('unit-tests', | ||
48 | pycoverage, | ||
49 | args: ['run', '-a', '-m', 'pytest', '-s', '-v', '--cov-append', meson.current_source_dir()], | ||
50 | @@ -143,4 +146,5 @@ if get_option('b_coverage') | ||
51 | priority: -99, # run last | ||
52 | is_parallel: false) | ||
53 | endif | ||
54 | +endif | ||
55 | |||
56 | -- | ||
57 | 2.25.1 | ||
58 | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch deleted file mode 100644 index 9f01108a2..000000000 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 6e3dd61bf90a7ca8c36c5b95943cbff7c1ad3c2d Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Wed, 6 Mar 2024 16:12:31 +0800 | ||
4 | Subject: [PATCH] networkd.c: define scope specific to case statement | ||
5 | |||
6 | Per [1], define a scope specific to case statement to fix build with | ||
7 | clang. | ||
8 | |||
9 | Fixes: | ||
10 | ../git/src/networkd.c:544:13: error: expected expression | ||
11 | 544 | gchar* first = g_strcmp0(def->id, def->veth_peer_link->id) < 0 ? def->id : def->veth_peer_link->id; | ||
12 | | ^ | ||
13 | ../git/src/networkd.c:545:17: error: use of undeclared identifier 'first' | ||
14 | 545 | if (first != def->id) { | ||
15 | | ^ | ||
16 | |||
17 | [1] https://stackoverflow.com/questions/92396/why-cant-variables-be-declared-in-a-switch-statement | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
22 | --- | ||
23 | src/networkd.c | 2 ++ | ||
24 | 1 file changed, 2 insertions(+) | ||
25 | |||
26 | diff --git a/src/networkd.c b/src/networkd.c | ||
27 | index 25121c48..5eb9c0fe 100644 | ||
28 | --- a/src/networkd.c | ||
29 | +++ b/src/networkd.c | ||
30 | @@ -541,12 +541,14 @@ write_netdev_file(const NetplanNetDefinition* def, const char* rootdir, const ch | ||
31 | * and, if the selected name is the name of the netdef being written, we generate | ||
32 | * the .netdev file. Otherwise we skip the netdef. | ||
33 | */ | ||
34 | + { | ||
35 | gchar* first = g_strcmp0(def->id, def->veth_peer_link->id) < 0 ? def->id : def->veth_peer_link->id; | ||
36 | if (first != def->id) { | ||
37 | g_string_free(s, TRUE); | ||
38 | return; | ||
39 | } | ||
40 | g_string_append_printf(s, "Kind=veth\n\n[Peer]\nName=%s\n", def->veth_peer_link->id); | ||
41 | + } | ||
42 | break; | ||
43 | |||
44 | case NETPLAN_DEF_TYPE_TUNNEL: | ||
45 | -- | ||
46 | 2.25.1 | ||
47 | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb index 229414718..40d72caa0 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb | |||
@@ -15,14 +15,12 @@ inherit meson pkgconfig systemd python3targetconfig features_check | |||
15 | REQUIRED_DISTRO_FEATURES = "systemd" | 15 | REQUIRED_DISTRO_FEATURES = "systemd" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ | 17 | SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ |
18 | file://0001-meson.build-drop-unnecessary-build-dependencies.patch \ | 18 | file://0001-meson.build-do-not-use-Werror.patch \ |
19 | file://0002-meson.build-do-not-use-Werror.patch \ | ||
20 | " | 19 | " |
21 | 20 | ||
22 | SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" | 21 | SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" |
23 | SRC_URI:append:toolchain-clang = " file://0001-networkd.c-define-scope-specific-to-case-statement.patch" | ||
24 | 22 | ||
25 | SRCREV = "45f7cd1569896d9e316c130bf5c60b7ccfc8211d" | 23 | SRCREV = "d27f32305f7f06de449b32239a89969e6ff2be31" |
26 | 24 | ||
27 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
28 | 26 | ||
@@ -30,10 +28,11 @@ DEPENDS = "glib-2.0 libyaml util-linux-libuuid \ | |||
30 | systemd python3-cffi-native \ | 28 | systemd python3-cffi-native \ |
31 | " | 29 | " |
32 | 30 | ||
33 | EXTRA_OEMESON = "-Dunit_testing=false" | 31 | EXTRA_OEMESON = "-Dtesting=false -Dunit_testing=false" |
34 | 32 | ||
35 | RDEPENDS:${PN} = "python3-core python3-netifaces python3-pyyaml \ | 33 | RDEPENDS:${PN} = "python3-core python3-netifaces python3-pyyaml \ |
36 | python3-dbus python3-rich python3-cffi \ | 34 | python3-dbus python3-rich python3-cffi \ |
35 | python3-json python3-fcntl \ | ||
37 | util-linux-libuuid libnetplan \ | 36 | util-linux-libuuid libnetplan \ |
38 | " | 37 | " |
39 | 38 | ||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.1.bb index 2c749eeba..7f2859186 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.1.bb | |||
@@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" | |||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" | 8 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "6505d94d3173e2469950b03d5b99dac4210af7b659a3a1a3b58da35b2a984da6" | 10 | SRC_URI[sha256sum] = "3d4ae3026b76be94aef67eba7d7e3a64e436ba9556d74ad142ba8988e4e4b253" |
11 | 11 | ||
12 | inherit pypi setuptools3 | 12 | inherit pypi setuptools3 |
13 | 13 | ||
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service index ddf8d7f74..b6661f2e3 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service | |||
@@ -1,6 +1,6 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Description=Android Debug Bridge | 2 | Description=Android Debug Bridge |
3 | ConditionPathExists=/var/usb-debugging-enabled | 3 | ConditionPathExists=/etc/usb-debugging-enabled |
4 | Before=android-system.service | 4 | Before=android-system.service |
5 | 5 | ||
6 | [Service] | 6 | [Service] |
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 456c7400e..d2680b457 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 | |||
@@ -68,6 +68,7 @@ COMPATIBLE_HOST:powerpc64le = "(null)" | |||
68 | 68 | ||
69 | inherit systemd | 69 | inherit systemd |
70 | 70 | ||
71 | SYSTEMD_PACKAGES = "${PN}-adbd" | ||
71 | SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service" | 72 | SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service" |
72 | 73 | ||
73 | # Find libbsd headers during native builds | 74 | # Find libbsd headers during native builds |
@@ -189,7 +190,7 @@ FILES:${PN} += "${libdir}/android ${libdir}/android/*" | |||
189 | BBCLASSEXTEND = "native" | 190 | BBCLASSEXTEND = "native" |
190 | 191 | ||
191 | android_tools_enable_devmode() { | 192 | android_tools_enable_devmode() { |
192 | touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled | 193 | touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled |
193 | } | 194 | } |
194 | 195 | ||
195 | ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" | 196 | ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" |
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb index 5d27acbdc..db4377f53 100644 --- a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb +++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb | |||
@@ -27,3 +27,27 @@ CFLAGS += "-fno-lto" | |||
27 | CFLAGS:append:toolchain-clang = " -Wno-error=implicit-function-declaration -Wno-error=deprecated-non-prototype -Wno-error=implicit-int" | 27 | CFLAGS:append:toolchain-clang = " -Wno-error=implicit-function-declaration -Wno-error=deprecated-non-prototype -Wno-error=implicit-int" |
28 | 28 | ||
29 | LDFLAGS += "-fno-lto" | 29 | LDFLAGS += "-fno-lto" |
30 | |||
31 | # http://errors.yoctoproject.org/Errors/Details/766887/ | ||
32 | # dhry_1.c:101:3: error: implicit declaration of function 'strcpy' [-Wimplicit-function-declaration] | ||
33 | # dhry_1.c:149:5: error: implicit declaration of function 'Proc_5' [-Wimplicit-function-declaration] | ||
34 | # dhry_1.c:150:5: error: implicit declaration of function 'Proc_4' [-Wimplicit-function-declaration] | ||
35 | # dhry_1.c:156:19: error: implicit declaration of function 'Func_2'; did you mean 'Func_1'? [-Wimplicit-function-declaration] | ||
36 | # dhry_1.c:162:7: error: implicit declaration of function 'Proc_7' [-Wimplicit-function-declaration] | ||
37 | # dhry_1.c:167:5: error: implicit declaration of function 'Proc_8' [-Wimplicit-function-declaration] | ||
38 | # dhry_1.c:169:5: error: implicit declaration of function 'Proc_1' [-Wimplicit-function-declaration] | ||
39 | # dhry_1.c:176:9: error: implicit declaration of function 'Proc_6' [-Wimplicit-function-declaration] | ||
40 | # dhry_1.c:187:5: error: implicit declaration of function 'Proc_2' [-Wimplicit-function-declaration] | ||
41 | # dhry_1.c:287:1: error: return type defaults to 'int' [-Wimplicit-int] | ||
42 | # dhry_1.c:303:3: error: implicit declaration of function 'Proc_3'; did you mean 'Proc_1'? [-Wimplicit-function-declaration] | ||
43 | # dhry_1.c:321:1: error: return type defaults to 'int' [-Wimplicit-int] | ||
44 | # dhry_1.c:344:1: error: return type defaults to 'int' [-Wimplicit-int] | ||
45 | # dhry_1.c:359:1: error: return type defaults to 'int' [-Wimplicit-int] | ||
46 | # dhry_1.c:371:1: error: return type defaults to 'int' [-Wimplicit-int] | ||
47 | # dhry_1.c:73:1: error: return type defaults to 'int' [-Wimplicit-int] | ||
48 | # dhry_2.c:164:9: error: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration] | ||
49 | # dhry_2.c:30:1: error: return type defaults to 'int' [-Wimplicit-int] | ||
50 | # dhry_2.c:39:9: error: implicit declaration of function 'Func_3' [-Wimplicit-function-declaration] | ||
51 | # dhry_2.c:64:1: error: return type defaults to 'int' [-Wimplicit-int] | ||
52 | # dhry_2.c:84:1: error: return type defaults to 'int' [-Wimplicit-int] | ||
53 | CFLAGS += "-Wno-error=implicit-int -Wno-error=implicit-function-declaration" | ||
diff --git a/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb b/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb index 4ace4515a..df76067a4 100644 --- a/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb +++ b/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = "git://git.musl-libc.org/libc-bench;branch=master \ | |||
13 | file://0001-build-Do-not-override-ldflags-from-environment.patch \ | 13 | file://0001-build-Do-not-override-ldflags-from-environment.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | # Upstream repo does not tag | ||
17 | UPSTREAM_CHECK_COMMITS = "1" | ||
18 | |||
16 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
17 | 20 | ||
18 | do_install () { | 21 | do_install () { |
diff --git a/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb b/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb index 629b12304..2cfeb7241 100644 --- a/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb +++ b/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb | |||
@@ -6,6 +6,10 @@ SRCREV = "f97f1ae321d1fb8111a2c638075702ed2512ff07" | |||
6 | PV = "3.6" | 6 | PV = "3.6" |
7 | SRC_URI = "git://github.com/Algodev-github/S.git;protocol=https;branch=master" | 7 | SRC_URI = "git://github.com/Algodev-github/S.git;protocol=https;branch=master" |
8 | 8 | ||
9 | # Current PV is not a git tag but a Readme content, track commits to detect | ||
10 | # upstream updates | ||
11 | UPSTREAM_CHECK_COMMITS = "1" | ||
12 | |||
9 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
10 | 14 | ||
11 | # installing in /opt/S-suite since the package has | 15 | # installing in /opt/S-suite since the package has |
diff --git a/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb b/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb index b392581ec..db862c896 100644 --- a/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb +++ b/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb | |||
@@ -11,3 +11,5 @@ inherit autotools | |||
11 | 11 | ||
12 | SRC_URI[md5sum] = "9e4ec55201be0be71ffbc56d38b42b57" | 12 | SRC_URI[md5sum] = "9e4ec55201be0be71ffbc56d38b42b57" |
13 | SRC_URI[sha256sum] = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f" | 13 | SRC_URI[sha256sum] = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f" |
14 | |||
15 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/acpitool/files/acpitool/" | ||
diff --git a/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb b/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb index 4688ae860..c278a0982 100644 --- a/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb +++ b/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb | |||
@@ -18,5 +18,5 @@ inherit cmake pkgconfig meson features_check | |||
18 | 18 | ||
19 | FILES:${PN} += "${datadir}/dbus-1/* \ | 19 | FILES:${PN} += "${datadir}/dbus-1/* \ |
20 | ${datadir}/polkit-1/* \ | 20 | ${datadir}/polkit-1/* \ |
21 | ${libdir}/systemd/* \ | 21 | ${systemd_system_unitdir} \ |
22 | " | 22 | " |
diff --git a/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb b/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb index 302a61e8a..b623d0525 100644 --- a/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb +++ b/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = "git://gitlab.com/pibox/con2fbmap.git;protocol=https;branch=master \ | |||
13 | file://0001-con2fbmap-Add-missing-include-on-string.h.patch \ | 13 | file://0001-con2fbmap-Add-missing-include-on-string.h.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | # Upstream repo does not tag | ||
17 | UPSTREAM_CHECK_COMMITS = "1" | ||
18 | |||
16 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
17 | 20 | ||
18 | inherit autotools | 21 | inherit autotools |
diff --git a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb index cb62ee46a..fbe948374 100644 --- a/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb +++ b/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb | |||
@@ -14,6 +14,9 @@ SRC_URI = "git://github.com/emagii/cpufrequtils.git;branch=master;protocol=https | |||
14 | file://0001-dont-unset-cflags.patch \ | 14 | file://0001-dont-unset-cflags.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | # Upstream repo does not tag | ||
18 | UPSTREAM_CHECK_COMMITS = "1" | ||
19 | |||
17 | EXTRA_OEMAKE:append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} " | 20 | EXTRA_OEMAKE:append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} " |
18 | 21 | ||
19 | 22 | ||
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch new file mode 100644 index 000000000..fbc0f5a18 --- /dev/null +++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Author: Maciej Pijanowski <maciej.pijanowski@3mdeb.com> | ||
2 | Date: Fri Jul 5 16:39:13 2024 +0200 | ||
3 | Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/86] | ||
4 | |||
5 | Makefile: allow overriding CC | ||
6 | |||
7 | Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com> | ||
8 | |||
9 | diff --git a/Makefile b/Makefile | ||
10 | index 139e5c0c3c3c..226303a6921e 100644 | ||
11 | --- a/Makefile | ||
12 | +++ b/Makefile | ||
13 | @@ -12,7 +12,7 @@ endif | ||
14 | endif | ||
15 | |||
16 | PROGRAM = dpcmd | ||
17 | -CC = gcc | ||
18 | +CC ?= gcc | ||
19 | PREFIX ?= /usr/local | ||
20 | |||
21 | PKG_CONFIG ?= pkg-config | ||
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch new file mode 100644 index 000000000..0fc8ac5bd --- /dev/null +++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From dac9d0ea5c419049c9ab0a5ba90d15d77a3271b0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com> | ||
3 | Date: Mon, 22 Jul 2024 13:02:59 +0000 | ||
4 | Subject: [PATCH] Makefile: add conditional stripping | ||
5 | Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/88] | ||
6 | |||
7 | This patch introduces a `NOSTRIP` conditional flag to the `install` | ||
8 | target in the Makefile. The purpose of this flag is to allow the | ||
9 | disabling of binary stripping during installation. This is | ||
10 | particularly useful in development environments, such as BitBake, | ||
11 | which handle stripping internally. | ||
12 | |||
13 | When `NOSTRIP` is set to `1`, the `strip` command will be skipped | ||
14 | during the installation process, preventing potential conflicts or | ||
15 | redundant operations. | ||
16 | |||
17 | Signed-off-by: Tymoteusz Burak <tymoteusz.burak@3mdeb.com> | ||
18 | |||
19 | --- | ||
20 | Makefile | 2 ++ | ||
21 | 1 file changed, 2 insertions(+) | ||
22 | |||
23 | diff --git a/Makefile b/Makefile | ||
24 | index 139e5c0..8b33320 100644 | ||
25 | --- a/Makefile | ||
26 | +++ b/Makefile | ||
27 | @@ -58,7 +58,9 @@ install: $(PROGRAM) | ||
28 | [ $(shell id -u) -eq 0 ] || (echo "Error: install needs root privileges" && false) | ||
29 | install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/DediProg | ||
30 | echo -n "install: " && install -v -o 0 -g 0 -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) | ||
31 | +ifneq ($(NOSTRIP),1) | ||
32 | strip $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) | ||
33 | +endif | ||
34 | install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/share/DediProg | ||
35 | echo -n "install: " && install -v -o 0 -g 0 -m 0644 ChipInfoDb.dedicfg $(DESTDIR)$(PREFIX)/share/DediProg/ChipInfoDb.dedicfg | ||
36 | install -v -o 0 -g 0 -m 755 -d $(DESTDIR)/etc/udev/rules.d | ||
37 | -- | ||
38 | 2.30.2 | ||
39 | |||
diff --git a/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb new file mode 100644 index 000000000..83a88ab75 --- /dev/null +++ b/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | DESCRIPTION = "Linux software for Dediprog SF100 and SF600 SPI flash programmers" | ||
2 | SECTION = "devel" | ||
3 | LICENSE = "GPL-2.0-or-later" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb" | ||
5 | |||
6 | DEPENDS = "libusb" | ||
7 | |||
8 | SRCREV = "e691f2d432144e3dbc82e9e0eea1ebaed4f3becf" | ||
9 | SRC_URI = " \ | ||
10 | git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master \ | ||
11 | file://0001-add-support-for-cross-compilation.patch \ | ||
12 | file://0002-Makefile-add-conditional-stripping.patch \ | ||
13 | " | ||
14 | |||
15 | EXTRA_OEMAKE = "NOSTRIP=1" | ||
16 | |||
17 | PV = "1.0+${SRCPV}" | ||
18 | |||
19 | S = "${WORKDIR}/git" | ||
20 | |||
21 | do_install () { | ||
22 | oe_runmake DESTDIR=${D} PREFIX=/usr install | ||
23 | } | ||
24 | |||
25 | FILES:${PN} += " \ | ||
26 | ${datadir}/DediProg \ | ||
27 | " | ||
28 | |||
29 | inherit pkgconfig | ||
diff --git a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb index f3760a40e..2b7ed256e 100644 --- a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb +++ b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = "git://github.com/teg/firmwared.git;branch=master;protocol=https \ | |||
13 | PV = "0+git" | 13 | PV = "0+git" |
14 | SRCREV = "2e6b5db43d63a5c0283a4cae9a6a20b7ad107a04" | 14 | SRCREV = "2e6b5db43d63a5c0283a4cae9a6a20b7ad107a04" |
15 | 15 | ||
16 | # Upstream repo does not tag | ||
17 | UPSTREAM_CHECK_COMMITS = "1" | ||
18 | |||
16 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
17 | 20 | ||
18 | DEPENDS = "glib-2.0 systemd" | 21 | DEPENDS = "glib-2.0 systemd" |
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.24.bb index e6c276ba4..15cde9f10 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.24.bb | |||
@@ -6,14 +6,15 @@ DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native python3-jinja2-na | |||
6 | 6 | ||
7 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ | 7 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ |
8 | file://run-ptest" | 8 | file://run-ptest" |
9 | SRC_URI[sha256sum] = "4e554f77a8a73383a41d5637b62e6c8a8936e66cd1d18585baf29d7fe47fc4d7" | 9 | SRC_URI[sha256sum] = "12f560b35dbed981fde8cf774c6d1f2e658a157d3a63d6c439bf418dbcc44b4c" |
10 | 10 | ||
11 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 11 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
12 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
12 | 13 | ||
13 | # Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins | 14 | # Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins |
14 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 15 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
15 | 16 | ||
16 | inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages useradd | 17 | inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages |
17 | 18 | ||
18 | GIDOCGEN_MESON_OPTION = 'docs' | 19 | GIDOCGEN_MESON_OPTION = 'docs' |
19 | GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' | 20 | GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' |
@@ -115,17 +116,6 @@ DISABLE_NON_X86:x86 = "" | |||
115 | DISABLE_NON_X86:x86-64 = "" | 116 | DISABLE_NON_X86:x86-64 = "" |
116 | PACKAGECONFIG:remove = "${DISABLE_NON_X86}" | 117 | PACKAGECONFIG:remove = "${DISABLE_NON_X86}" |
117 | 118 | ||
118 | USERADD_PACKAGES = "${PN}" | ||
119 | USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" | ||
120 | |||
121 | do_install:append() { | ||
122 | if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then | ||
123 | #Fix up permissions on polkit rules.d to work with rpm4 constraints | ||
124 | chmod 700 ${D}/${datadir}/polkit-1/rules.d | ||
125 | chown polkitd:root ${D}/${datadir}/polkit-1/rules.d | ||
126 | fi | ||
127 | } | ||
128 | |||
129 | FILES:${PN} += "${libdir}/fwupd-plugins-* \ | 119 | FILES:${PN} += "${libdir}/fwupd-plugins-* \ |
130 | ${libdir}/fwupd-${PV} \ | 120 | ${libdir}/fwupd-${PV} \ |
131 | ${systemd_unitdir} \ | 121 | ${systemd_unitdir} \ |
@@ -140,3 +130,5 @@ FILES:${PN} += "${libdir}/fwupd-plugins-* \ | |||
140 | FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ | 130 | FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ |
141 | ${datadir}/installed-tests/" | 131 | ${datadir}/installed-tests/" |
142 | RDEPENDS:${PN}-ptest += "gnome-desktop-testing" | 132 | RDEPENDS:${PN}-ptest += "gnome-desktop-testing" |
133 | |||
134 | INSANE_SKIP:${PN}-ptest += "buildpaths" | ||
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 deleted file mode 100644 index be1452af5..000000000 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch +++ /dev/null | |||
@@ -1,88 +0,0 @@ | |||
1 | From ac2ff1dbe0b44953de636c50c7d7f8c1e9f1e458 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sam James <sam@gentoo.org> | ||
3 | Date: Sat, 4 May 2024 09:13:06 +0100 | ||
4 | Subject: [PATCH] nvme: Use C99 types for uint32_t | ||
5 | |||
6 | <stdint.h> provides `uint32_t`, while `u_int_32` is an unofficial/internal | ||
7 | typedef that glibc happens to provide. This fixes the build on musl. | ||
8 | |||
9 | Bug: https://bugs.gentoo.org/931194 | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/ac2ff1dbe0b44953de636c50c7d7f8c1e9f1e458] | ||
12 | Signed-off-by: Sam James <sam@gentoo.org> | ||
13 | --- | ||
14 | nvme.c | 13 +++++++------ | ||
15 | util/base64.c | 5 +++-- | ||
16 | 2 files changed, 10 insertions(+), 8 deletions(-) | ||
17 | |||
18 | diff --git a/nvme.c b/nvme.c | ||
19 | index 46a2399a..5409ddf2 100644 | ||
20 | --- a/nvme.c | ||
21 | +++ b/nvme.c | ||
22 | @@ -34,6 +34,7 @@ | ||
23 | #include <inttypes.h> | ||
24 | #include <locale.h> | ||
25 | #include <stdio.h> | ||
26 | +#include <stdint.h> | ||
27 | #include <stdlib.h> | ||
28 | #include <string.h> | ||
29 | #include <unistd.h> | ||
30 | @@ -9081,8 +9082,8 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru | ||
31 | |||
32 | unsigned char decoded_key[128]; | ||
33 | unsigned int decoded_len; | ||
34 | - u_int32_t crc = crc32(0L, NULL, 0); | ||
35 | - u_int32_t key_crc; | ||
36 | + uint32_t crc = crc32(0L, NULL, 0); | ||
37 | + uint32_t key_crc; | ||
38 | int err = 0, hmac; | ||
39 | struct config { | ||
40 | char *key; | ||
41 | @@ -9150,10 +9151,10 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru | ||
42 | return -EINVAL; | ||
43 | } | ||
44 | crc = crc32(crc, decoded_key, decoded_len); | ||
45 | - key_crc = ((u_int32_t)decoded_key[decoded_len]) | | ||
46 | - ((u_int32_t)decoded_key[decoded_len + 1] << 8) | | ||
47 | - ((u_int32_t)decoded_key[decoded_len + 2] << 16) | | ||
48 | - ((u_int32_t)decoded_key[decoded_len + 3] << 24); | ||
49 | + key_crc = ((uint32_t)decoded_key[decoded_len]) | | ||
50 | + ((uint32_t)decoded_key[decoded_len + 1] << 8) | | ||
51 | + ((uint32_t)decoded_key[decoded_len + 2] << 16) | | ||
52 | + ((uint32_t)decoded_key[decoded_len + 3] << 24); | ||
53 | if (key_crc != crc) { | ||
54 | nvme_show_error("CRC mismatch (key %08x, crc %08x)", key_crc, crc); | ||
55 | return -EINVAL; | ||
56 | diff --git a/util/base64.c b/util/base64.c | ||
57 | index 7f47cda6..0e89f2e9 100644 | ||
58 | --- a/util/base64.c | ||
59 | +++ b/util/base64.c | ||
60 | @@ -20,6 +20,7 @@ | ||
61 | * MA 02110-1301, USA. | ||
62 | */ | ||
63 | |||
64 | +#include <stdint.h> | ||
65 | #include <stdlib.h> | ||
66 | #include <string.h> | ||
67 | #include <errno.h> | ||
68 | @@ -42,7 +43,7 @@ static const char base64_table[65] = | ||
69 | int base64_encode(const unsigned char *src, int srclen, char *dst) | ||
70 | { | ||
71 | int i, bits = 0; | ||
72 | - u_int32_t ac = 0; | ||
73 | + uint32_t ac = 0; | ||
74 | char *cp = dst; | ||
75 | |||
76 | for (i = 0; i < srclen; i++) { | ||
77 | @@ -77,7 +78,7 @@ int base64_encode(const unsigned char *src, int srclen, char *dst) | ||
78 | */ | ||
79 | int base64_decode(const char *src, int srclen, unsigned char *dst) | ||
80 | { | ||
81 | - u_int32_t ac = 0; | ||
82 | + uint32_t ac = 0; | ||
83 | int i, bits = 0; | ||
84 | unsigned char *bp = dst; | ||
85 | |||
86 | -- | ||
87 | 2.45.1 | ||
88 | |||
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 deleted file mode 100644 index 1881b18aa..000000000 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 47d33d8da7a5b7310a2c2f4328115b439039e46c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 21 May 2024 14:09:32 -0700 | ||
4 | Subject: [PATCH] plugins/ssstc: Replace __uint16_t with uint16_t | ||
5 | |||
6 | uint16_t is ISO defined and comes from stdint.h, makes it | ||
7 | portable across glibc and musl on linux. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/linux-nvme/nvme-cli/pull/2351] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | plugins/ssstc/ssstc-nvme.c | 6 +++--- | ||
13 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/plugins/ssstc/ssstc-nvme.c b/plugins/ssstc/ssstc-nvme.c | ||
16 | index 03e4fe3f..302df988 100644 | ||
17 | --- a/plugins/ssstc/ssstc-nvme.c | ||
18 | +++ b/plugins/ssstc/ssstc-nvme.c | ||
19 | @@ -64,9 +64,9 @@ void show_ssstc_add_smart_log_jsn(struct nvme_additional_smart_log *smart, | ||
20 | unsigned int nsid, const char *devname) | ||
21 | { | ||
22 | struct json_object *root, *entry_stats, *dev_stats, *multi; | ||
23 | - __uint16_t wear_level_min = 0; | ||
24 | - __uint16_t wear_level_max = 0; | ||
25 | - __uint16_t wear_level_avg = 0; | ||
26 | + uint16_t wear_level_min = 0; | ||
27 | + uint16_t wear_level_max = 0; | ||
28 | + uint16_t wear_level_avg = 0; | ||
29 | uint64_t raw_val = 0; | ||
30 | |||
31 | root = json_create_object(); | ||
32 | -- | ||
33 | 2.45.1 | ||
34 | |||
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.9.1.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.10.2.bb index 9b4288ff8..2005a198a 100644 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.9.1.bb +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.10.2.bb | |||
@@ -6,12 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ | |||
6 | file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ | 6 | file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ |
7 | file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" | 7 | file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" |
8 | DEPENDS = "json-c libnvme" | 8 | DEPENDS = "json-c libnvme" |
9 | SRCREV = "b340fd7dcf1aef76f8d46ab28bef3c170d310887" | 9 | SRCREV = "eeaa08c9a0e9184f3889df0bff3d2a23db6d6294" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https \ | 11 | SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" |
12 | file://0001-nvme-Use-C99-types-for-uint32_t.patch \ | ||
13 | file://0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch \ | ||
14 | " | ||
15 | 12 | ||
16 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
17 | 14 | ||
@@ -32,3 +29,8 @@ FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" | |||
32 | ALLOW_EMPTY:${PN}-user = "1" | 29 | ALLOW_EMPTY:${PN}-user = "1" |
33 | 30 | ||
34 | RDEPENDS:${PN}-user = "util-linux-uuidgen" | 31 | RDEPENDS:${PN}-user = "util-linux-uuidgen" |
32 | |||
33 | # This one is reproducible only on 32bit MACHINEs | ||
34 | # http://errors.yoctoproject.org/Errors/Details/766964/ | ||
35 | # git/plugins/virtium/virtium-nvme.c:205:63: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
36 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb b/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb index af4f2c54b..a9bdbc916 100644 --- a/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb +++ b/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_1 | |||
13 | " | 13 | " |
14 | SRC_URI[sha256sum] = "739be290a38229aaa5b5150e6ea55ce427e80970f0ace4c5040ac46644526f41" | 14 | SRC_URI[sha256sum] = "739be290a38229aaa5b5150e6ea55ce427e80970f0ace4c5040ac46644526f41" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases" | ||
17 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
18 | |||
16 | COMPATIBLE_HOST:libc-musl = "null" | 19 | COMPATIBLE_HOST:libc-musl = "null" |
17 | 20 | ||
18 | S = "${WORKDIR}/ACE_wrappers" | 21 | S = "${WORKDIR}/ACE_wrappers" |
@@ -37,5 +40,3 @@ do_install() { | |||
37 | 40 | ||
38 | rm -r ${D}/usr/share | 41 | rm -r ${D}/usr/share |
39 | } | 42 | } |
40 | |||
41 | UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases" | ||
diff --git a/meta-oe/recipes-connectivity/gensio/gensio_2.8.4.bb b/meta-oe/recipes-connectivity/gensio/gensio_2.8.7.bb index 1f85c46e2..f4d0c0930 100644 --- a/meta-oe/recipes-connectivity/gensio/gensio_2.8.4.bb +++ b/meta-oe/recipes-connectivity/gensio/gensio_2.8.7.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ | |||
5 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 5 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
6 | " | 6 | " |
7 | 7 | ||
8 | SRCREV = "300644fc02b7099ca27ca5bac88c47e159ba8a6b" | 8 | SRCREV = "e4dbb9687bd5e887fa98a4cdcec012ea85da1ef2" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" | 10 | SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" |
11 | 11 | ||
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.11.bb index 44683bf73..693afe6c5 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.11.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "User space daemon for extended IEEE 802.11 management" | |||
2 | HOMEPAGE = "http://w1.fi/hostapd/" | 2 | HOMEPAGE = "http://w1.fi/hostapd/" |
3 | SECTION = "kernel/userland" | 3 | SECTION = "kernel/userland" |
4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
5 | LIC_FILES_CHKSUM = "file://hostapd/README;beginline=5;endline=47;md5=aa03b8bd6216d1a7ca01fd4b89863073" | 5 | LIC_FILES_CHKSUM = "file://hostapd/README;beginline=5;endline=47;md5=8e2c69e491b28390f9de0df1f64ebd6d" |
6 | 6 | ||
7 | DEPENDS = "libnl openssl" | 7 | DEPENDS = "libnl openssl" |
8 | 8 | ||
@@ -14,7 +14,7 @@ SRC_URI = " \ | |||
14 | " | 14 | " |
15 | 15 | ||
16 | 16 | ||
17 | SRC_URI[sha256sum] = "206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d" | 17 | SRC_URI[sha256sum] = "2b3facb632fd4f65e32f4bf82a76b4b72c501f995a4f62e330219fe7aed1747a" |
18 | 18 | ||
19 | inherit update-rc.d systemd pkgconfig features_check | 19 | inherit update-rc.d systemd pkgconfig features_check |
20 | 20 | ||
diff --git a/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb index 5b5af3060..95dba3a40 100644 --- a/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb +++ b/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb | |||
@@ -9,6 +9,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz | |||
9 | SRC_URI[sha256sum] = "72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062" | 9 | SRC_URI[sha256sum] = "72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062" |
10 | 10 | ||
11 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 11 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
12 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
12 | 13 | ||
13 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
14 | 15 | ||
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_2.18.bb b/meta-oe/recipes-connectivity/iwd/iwd_2.20.bb index 4d993031d..16d900ddc 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_2.18.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_2.20.bb | |||
@@ -3,12 +3,12 @@ HOMEPAGE = "https://iwd.wiki.kernel.org/" | |||
3 | LICENSE = "LGPL-2.1-only" | 3 | LICENSE = "LGPL-2.1-only" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" |
5 | 5 | ||
6 | DEPENDS = "ell" | 6 | DEPENDS = "dbus" |
7 | 7 | ||
8 | SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ | 8 | SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ |
9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ | 9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ |
10 | " | 10 | " |
11 | SRC_URI[sha256sum] = "100d029171d161411f6cd8e1f95708e3a4351fb19e6847ba04819377b5fed13e" | 11 | SRC_URI[sha256sum] = "86827b97cb5b19ddecce36568c59378da2fae8cf37a0e2b9eacd1269f24c6f8e" |
12 | 12 | ||
13 | inherit autotools manpages pkgconfig python3native systemd | 13 | inherit autotools manpages pkgconfig python3native systemd |
14 | 14 | ||
@@ -24,8 +24,6 @@ PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" | |||
24 | PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" | 24 | PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" |
25 | PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" | 25 | PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" |
26 | 26 | ||
27 | EXTRA_OECONF = "--enable-external-ell" | ||
28 | |||
29 | SYSTEMD_SERVICE:${PN} = " \ | 27 | SYSTEMD_SERVICE:${PN} = " \ |
30 | iwd.service \ | 28 | iwd.service \ |
31 | ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ | 29 | ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ |
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch b/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch new file mode 100644 index 000000000..46eb6aa96 --- /dev/null +++ b/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch | |||
@@ -0,0 +1,207 @@ | |||
1 | From c5f9c816107f70139de11b38aa02db2f1774ee0d Mon Sep 17 00:00:00 2001 | ||
2 | From: Greg Hudson <ghudson@mit.edu> | ||
3 | Date: Tue, 5 Mar 2024 19:53:07 -0500 | ||
4 | Subject: [PATCH] Fix two unlikely memory leaks | ||
5 | |||
6 | In gss_krb5int_make_seal_token_v3(), one of the bounds checks (which | ||
7 | could probably never be triggered) leaks plain.data. Fix this leak | ||
8 | and use current practices for cleanup throughout the function. | ||
9 | |||
10 | In xmt_rmtcallres() (unused within the tree and likely elsewhere), | ||
11 | store port_ptr into crp->port_ptr as soon as it is allocated; | ||
12 | otherwise it could leak if the subsequent xdr_u_int32() operation | ||
13 | fails. | ||
14 | |||
15 | CVE: CVE-2024-26458 CVE-2024-26461 | ||
16 | Upstream-Status: Backport [https://github.com/krb5/krb5/commit/c5f9c816107f70139de11b38aa02db2f1774ee0d] | ||
17 | |||
18 | Signed-off-by: Yogita Urade <yogita.urade@windriver.com> | ||
19 | --- | ||
20 | src/lib/gssapi/krb5/k5sealv3.c | 56 +++++++++++++++------------------- | ||
21 | src/lib/rpc/pmap_rmt.c | 9 +++--- | ||
22 | 2 files changed, 29 insertions(+), 36 deletions(-) | ||
23 | |||
24 | diff --git a/src/lib/gssapi/krb5/k5sealv3.c b/src/lib/gssapi/krb5/k5sealv3.c | ||
25 | index 1fcbdfb..d3210c1 100644 | ||
26 | --- a/src/lib/gssapi/krb5/k5sealv3.c | ||
27 | +++ b/src/lib/gssapi/krb5/k5sealv3.c | ||
28 | @@ -65,7 +65,7 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
29 | int conf_req_flag, int toktype) | ||
30 | { | ||
31 | size_t bufsize = 16; | ||
32 | - unsigned char *outbuf = 0; | ||
33 | + unsigned char *outbuf = NULL; | ||
34 | krb5_error_code err; | ||
35 | int key_usage; | ||
36 | unsigned char acceptor_flag; | ||
37 | @@ -75,9 +75,13 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
38 | #endif | ||
39 | size_t ec; | ||
40 | unsigned short tok_id; | ||
41 | - krb5_checksum sum; | ||
42 | + krb5_checksum sum = { 0 }; | ||
43 | krb5_key key; | ||
44 | krb5_cksumtype cksumtype; | ||
45 | + krb5_data plain = empty_data(); | ||
46 | + | ||
47 | + token->value = NULL; | ||
48 | + token->length = 0; | ||
49 | |||
50 | acceptor_flag = ctx->initiate ? 0 : FLAG_SENDER_IS_ACCEPTOR; | ||
51 | key_usage = (toktype == KG_TOK_WRAP_MSG | ||
52 | @@ -107,14 +111,15 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
53 | #endif | ||
54 | |||
55 | if (toktype == KG_TOK_WRAP_MSG && conf_req_flag) { | ||
56 | - krb5_data plain; | ||
57 | krb5_enc_data cipher; | ||
58 | size_t ec_max; | ||
59 | size_t encrypt_size; | ||
60 | |||
61 | /* 300: Adds some slop. */ | ||
62 | - if (SIZE_MAX - 300 < message->length) | ||
63 | - return ENOMEM; | ||
64 | + if (SIZE_MAX - 300 < message->length) { | ||
65 | + err = ENOMEM; | ||
66 | + goto cleanup; | ||
67 | + } | ||
68 | ec_max = SIZE_MAX - message->length - 300; | ||
69 | if (ec_max > 0xffff) | ||
70 | ec_max = 0xffff; | ||
71 | @@ -126,20 +131,20 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
72 | #endif | ||
73 | err = alloc_data(&plain, message->length + 16 + ec); | ||
74 | if (err) | ||
75 | - return err; | ||
76 | + goto cleanup; | ||
77 | |||
78 | /* Get size of ciphertext. */ | ||
79 | encrypt_size = krb5_encrypt_size(plain.length, key->keyblock.enctype); | ||
80 | if (encrypt_size > SIZE_MAX / 2) { | ||
81 | err = ENOMEM; | ||
82 | - goto error; | ||
83 | + goto cleanup; | ||
84 | } | ||
85 | bufsize = 16 + encrypt_size; | ||
86 | /* Allocate space for header plus encrypted data. */ | ||
87 | outbuf = gssalloc_malloc(bufsize); | ||
88 | if (outbuf == NULL) { | ||
89 | - free(plain.data); | ||
90 | - return ENOMEM; | ||
91 | + err = ENOMEM; | ||
92 | + goto cleanup; | ||
93 | } | ||
94 | |||
95 | /* TOK_ID */ | ||
96 | @@ -164,11 +169,8 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
97 | cipher.ciphertext.length = bufsize - 16; | ||
98 | cipher.enctype = key->keyblock.enctype; | ||
99 | err = krb5_k_encrypt(context, key, key_usage, 0, &plain, &cipher); | ||
100 | - zap(plain.data, plain.length); | ||
101 | - free(plain.data); | ||
102 | - plain.data = 0; | ||
103 | if (err) | ||
104 | - goto error; | ||
105 | + goto cleanup; | ||
106 | |||
107 | /* Now that we know we're returning a valid token.... */ | ||
108 | ctx->seq_send++; | ||
109 | @@ -181,7 +183,6 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
110 | /* If the rotate fails, don't worry about it. */ | ||
111 | #endif | ||
112 | } else if (toktype == KG_TOK_WRAP_MSG && !conf_req_flag) { | ||
113 | - krb5_data plain; | ||
114 | size_t cksumsize; | ||
115 | |||
116 | /* Here, message is the application-supplied data; message2 is | ||
117 | @@ -193,21 +194,19 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
118 | wrap_with_checksum: | ||
119 | err = alloc_data(&plain, message->length + 16); | ||
120 | if (err) | ||
121 | - return err; | ||
122 | + goto cleanup; | ||
123 | |||
124 | err = krb5_c_checksum_length(context, cksumtype, &cksumsize); | ||
125 | if (err) | ||
126 | - goto error; | ||
127 | + goto cleanup; | ||
128 | |||
129 | assert(cksumsize <= 0xffff); | ||
130 | |||
131 | bufsize = 16 + message2->length + cksumsize; | ||
132 | outbuf = gssalloc_malloc(bufsize); | ||
133 | if (outbuf == NULL) { | ||
134 | - free(plain.data); | ||
135 | - plain.data = 0; | ||
136 | err = ENOMEM; | ||
137 | - goto error; | ||
138 | + goto cleanup; | ||
139 | } | ||
140 | |||
141 | /* TOK_ID */ | ||
142 | @@ -239,23 +238,15 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
143 | if (message2->length) | ||
144 | memcpy(outbuf + 16, message2->value, message2->length); | ||
145 | |||
146 | - sum.contents = outbuf + 16 + message2->length; | ||
147 | - sum.length = cksumsize; | ||
148 | - | ||
149 | err = krb5_k_make_checksum(context, cksumtype, key, | ||
150 | key_usage, &plain, &sum); | ||
151 | - zap(plain.data, plain.length); | ||
152 | - free(plain.data); | ||
153 | - plain.data = 0; | ||
154 | if (err) { | ||
155 | zap(outbuf,bufsize); | ||
156 | - goto error; | ||
157 | + goto cleanup; | ||
158 | } | ||
159 | if (sum.length != cksumsize) | ||
160 | abort(); | ||
161 | memcpy(outbuf + 16 + message2->length, sum.contents, cksumsize); | ||
162 | - krb5_free_checksum_contents(context, &sum); | ||
163 | - sum.contents = 0; | ||
164 | /* Now that we know we're actually generating the token... */ | ||
165 | ctx->seq_send++; | ||
166 | |||
167 | @@ -285,12 +276,13 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, | ||
168 | |||
169 | token->value = outbuf; | ||
170 | token->length = bufsize; | ||
171 | - return 0; | ||
172 | + outbuf = NULL; | ||
173 | + err = 0; | ||
174 | |||
175 | -error: | ||
176 | +cleanup: | ||
177 | + krb5_free_checksum_contents(context, &sum); | ||
178 | + zapfree(plain.data, plain.length); | ||
179 | gssalloc_free(outbuf); | ||
180 | - token->value = NULL; | ||
181 | - token->length = 0; | ||
182 | return err; | ||
183 | } | ||
184 | |||
185 | diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c | ||
186 | index 8c7e30c..522cb20 100644 | ||
187 | --- a/src/lib/rpc/pmap_rmt.c | ||
188 | +++ b/src/lib/rpc/pmap_rmt.c | ||
189 | @@ -160,11 +160,12 @@ xdr_rmtcallres( | ||
190 | caddr_t port_ptr; | ||
191 | |||
192 | port_ptr = (caddr_t)(void *)crp->port_ptr; | ||
193 | - if (xdr_reference(xdrs, &port_ptr, sizeof (uint32_t), | ||
194 | - xdr_u_int32) && xdr_u_int32(xdrs, &crp->resultslen)) { | ||
195 | - crp->port_ptr = (uint32_t *)(void *)port_ptr; | ||
196 | + if (!xdr_reference(xdrs, &port_ptr, sizeof (uint32_t), | ||
197 | + (xdrproc_t)xdr_u_int32)) | ||
198 | + return (FALSE); | ||
199 | + crp->port_ptr = (uint32_t *)(void *)port_ptr; | ||
200 | + if (xdr_u_int32(xdrs, &crp->resultslen)) | ||
201 | return ((*(crp->xdr_results))(xdrs, crp->results_ptr)); | ||
202 | - } | ||
203 | return (FALSE); | ||
204 | } | ||
205 | |||
206 | -- | ||
207 | 2.40.0 | ||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.21.3.bb index ed12fee94..748918132 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.21.3.bb | |||
@@ -14,7 +14,7 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n | |||
14 | HOMEPAGE = "http://web.mit.edu/Kerberos/" | 14 | HOMEPAGE = "http://web.mit.edu/Kerberos/" |
15 | SECTION = "console/network" | 15 | SECTION = "console/network" |
16 | LICENSE = "MIT" | 16 | LICENSE = "MIT" |
17 | LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=32cb3a99207053d9f5c1ef177c4d6e34" | 17 | LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=71c06694263581762668e88b7b77a1a5" |
18 | 18 | ||
19 | inherit autotools-brokensep binconfig perlnative systemd update-rc.d pkgconfig | 19 | inherit autotools-brokensep binconfig perlnative systemd update-rc.d pkgconfig |
20 | 20 | ||
@@ -28,9 +28,10 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ | |||
28 | file://etc/default/krb5-admin-server \ | 28 | file://etc/default/krb5-admin-server \ |
29 | file://krb5-kdc.service \ | 29 | file://krb5-kdc.service \ |
30 | file://krb5-admin-server.service \ | 30 | file://krb5-admin-server.service \ |
31 | file://CVE-2024-26458_CVE-2024-26461.patch;striplevel=2 \ | ||
31 | " | 32 | " |
32 | 33 | ||
33 | SRC_URI[sha256sum] = "9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491" | 34 | SRC_URI[sha256sum] = "b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35" |
34 | 35 | ||
35 | CVE_PRODUCT = "kerberos" | 36 | CVE_PRODUCT = "kerberos" |
36 | CVE_VERSION = "5-${PV}" | 37 | CVE_VERSION = "5-${PV}" |
diff --git a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.2.0.bb b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.3.0.bb index c9e9c90d7..8bd555d96 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.2.0.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.3.0.bb | |||
@@ -8,7 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" | |||
8 | 8 | ||
9 | DEPENDS = "libplist" | 9 | DEPENDS = "libplist" |
10 | 10 | ||
11 | SRCREV = "fde8946a3988790fd5d3f01fc0a1fd43609ab1d1" | 11 | SRCREV = "362f7848ac89b74d9dd113b38b51ecb601f76094" |
12 | SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" | 12 | SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb index 94cbef8fc..16f82c6ba 100644 --- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb +++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb | |||
@@ -21,6 +21,9 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.g | |||
21 | SRC_URI:append:class-target = " file://0001-Use-native-mtp-hotplug.patch" | 21 | SRC_URI:append:class-target = " file://0001-Use-native-mtp-hotplug.patch" |
22 | SRC_URI[sha256sum] = "f4c1ceb3df020a6cb851110f620c14fe399518c494ed252039cbfb4e34335135" | 22 | SRC_URI[sha256sum] = "f4c1ceb3df020a6cb851110f620c14fe399518c494ed252039cbfb4e34335135" |
23 | 23 | ||
24 | UPSTREAM_CHECK_URI = "https://github.com/libmtp/libmtp/releases" | ||
25 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
26 | |||
24 | inherit autotools pkgconfig lib_package | 27 | inherit autotools pkgconfig lib_package |
25 | 28 | ||
26 | EXTRA_OECONF += " \ | 29 | EXTRA_OECONF += " \ |
diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb b/meta-oe/recipes-connectivity/libndp/libndp_1.9.bb index 80946317e..69eecdd9f 100644 --- a/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb +++ b/meta-oe/recipes-connectivity/libndp/libndp_1.9.bb | |||
@@ -7,7 +7,7 @@ SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ | |||
7 | file://0001-libndp-Fix-signature-of-sendto-API.patch \ | 7 | file://0001-libndp-Fix-signature-of-sendto-API.patch \ |
8 | " | 8 | " |
9 | # tag for v1.8 | 9 | # tag for v1.8 |
10 | SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c" | 10 | SRCREV = "2730638bf88984b09531813974f9bd14e1a50165" |
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | inherit autotools | 13 | inherit autotools |
diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb index 693ec12d3..bea22b18e 100644 --- a/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb +++ b/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb | |||
@@ -48,3 +48,4 @@ RDEPENDS:${PN}-server += "openssh-sshd" | |||
48 | ARM_INSTRUCTION_SET = "arm" | 48 | ARM_INSTRUCTION_SET = "arm" |
49 | 49 | ||
50 | CXXFLAGS:append = " -std=c++17" | 50 | CXXFLAGS:append = " -std=c++17" |
51 | LDFLAGS:append:riscv32 = " -latomic" | ||
diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb index 734827494..7d373a65c 100644 --- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb | |||
@@ -15,6 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}-Source.tar.gz \ | |||
15 | SRC_URI[md5sum] = "f6e0b6cb7dcfd731460a7e9a91429a3a" | 15 | SRC_URI[md5sum] = "f6e0b6cb7dcfd731460a7e9a91429a3a" |
16 | SRC_URI[sha256sum] = "158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc" | 16 | SRC_URI[sha256sum] = "158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc" |
17 | 17 | ||
18 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/openobex/files/openobex/" | ||
19 | UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" | ||
20 | |||
18 | S = "${WORKDIR}/${BP}-Source" | 21 | S = "${WORKDIR}/${BP}-Source" |
19 | 22 | ||
20 | inherit cmake pkgconfig | 23 | inherit cmake pkgconfig |
diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb index f7a98fb61..018365907 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb +++ b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb | |||
@@ -14,6 +14,9 @@ SRC_URI = "http://downloads.sourceforge.net/openobex/${BP}-Source.tar.gz \ | |||
14 | SRC_URI[md5sum] = "157a9d1b2ed220203f7084db906de73c" | 14 | SRC_URI[md5sum] = "157a9d1b2ed220203f7084db906de73c" |
15 | SRC_URI[sha256sum] = "d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1c989a3" | 15 | SRC_URI[sha256sum] = "d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1c989a3" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/openobex/files/obexftp/" | ||
18 | UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" | ||
19 | |||
17 | inherit cmake pkgconfig | 20 | inherit cmake pkgconfig |
18 | 21 | ||
19 | OECMAKE_GENERATOR = "Unix Makefiles" | 22 | OECMAKE_GENERATOR = "Unix Makefiles" |
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch index fba9a8767..a881c8349 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch | |||
@@ -13,47 +13,41 @@ Upstream-Status: Pending | |||
13 | src/samples/CMakeLists.txt | 4 ++-- | 13 | src/samples/CMakeLists.txt | 4 ++-- |
14 | 2 files changed, 4 insertions(+), 4 deletions(-) | 14 | 2 files changed, 4 insertions(+), 4 deletions(-) |
15 | 15 | ||
16 | diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt | ||
17 | index a9f8908..7eadc60 100644 | ||
18 | --- a/cmake/CMakeLists.txt | 16 | --- a/cmake/CMakeLists.txt |
19 | +++ b/cmake/CMakeLists.txt | 17 | +++ b/cmake/CMakeLists.txt |
20 | @@ -11,7 +11,7 @@ export(EXPORT ${package_name} | 18 | @@ -34,7 +34,7 @@ export(EXPORT ${package_name} |
21 | FILE "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Targets.cmake" | 19 | ) |
22 | NAMESPACE ${package_name}::) | ||
23 | |||
24 | -install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name} | ||
25 | +install(EXPORT ${package_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} | ||
26 | FILE ${package_name}Targets.cmake | ||
27 | NAMESPACE ${package_name}::) | ||
28 | 20 | ||
29 | @@ -19,4 +19,4 @@ install(FILES | 21 | install(EXPORT ${package_name} |
30 | "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" | 22 | - DESTINATION lib/cmake/${package_name} |
31 | FindPahoMqttC.cmake | 23 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} |
32 | "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" | 24 | FILE ${package_name}Targets.cmake |
33 | - DESTINATION lib/cmake/${package_name}) | 25 | NAMESPACE ${package_name}:: |
34 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}) | 26 | ) |
35 | diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt | 27 | @@ -42,5 +42,5 @@ install(EXPORT ${package_name} |
36 | index 3ca0a75..c915cd5 100644 | 28 | install(FILES |
37 | --- a/src/samples/CMakeLists.txt | 29 | "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" |
38 | +++ b/src/samples/CMakeLists.txt | 30 | "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" |
39 | @@ -71,7 +71,7 @@ endforeach() | 31 | - DESTINATION lib/cmake/${package_name} |
32 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} | ||
33 | ) | ||
34 | --- a/examples/CMakeLists.txt | ||
35 | +++ b/examples/CMakeLists.txt | ||
36 | @@ -65,7 +65,7 @@ endforeach() | ||
40 | 37 | ||
41 | ## install binaries | 38 | ## install binaries |
42 | install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples | 39 | install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples |
43 | - RUNTIME DESTINATION bin | 40 | - RUNTIME DESTINATION bin |
44 | + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | 41 | + RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR} |
45 | ) | 42 | ) |
46 | 43 | ||
47 | ## Build the SSL/TLS samples, if selected | 44 | ## Build the SSL/TLS samples, if selected |
48 | @@ -89,7 +89,7 @@ if(PAHO_WITH_SSL) | 45 | @@ -80,7 +80,7 @@ if(PAHO_WITH_SSL) |
49 | endforeach() | 46 | endforeach() |
50 | 47 | ||
51 | install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples | 48 | install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples |
52 | - RUNTIME DESTINATION bin | 49 | - RUNTIME DESTINATION bin |
53 | + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | 50 | + RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR} |
54 | ) | 51 | ) |
55 | endif() | 52 | endif() |
56 | 53 | ||
57 | -- | ||
58 | 2.34.1 | ||
59 | |||
diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb index 1b2e51c3a..6f2efcda5 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb | |||
@@ -5,15 +5,16 @@ SECTION = "console/network" | |||
5 | LICENSE = "EPL-2.0 | EDL-1.0" | 5 | LICENSE = "EPL-2.0 | EDL-1.0" |
6 | 6 | ||
7 | LIC_FILES_CHKSUM = " \ | 7 | LIC_FILES_CHKSUM = " \ |
8 | file://src/mqtt/message.h;beginline=9;endline=18;md5=c5ceecf5ab99d44dcfaaabdce289071b \ | 8 | file://LICENSE;md5=c0fa3a632eea67f4079c54df781d1441 \ |
9 | file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ | 9 | file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ |
10 | file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ | 10 | file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.3.x \ | 13 | SRC_URI = "gitsm://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.4.x \ |
14 | file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ | 14 | file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ |
15 | " | 15 | " |
16 | SRCREV = "5e0d1bf37b4826d680ec066ec42afd133851a681" | 16 | SRCREV = "ac1b023eab789e829656144f12b248602c40e37b" |
17 | PV .= "+git" | ||
17 | 18 | ||
18 | DEPENDS = "openssl paho-mqtt-c" | 19 | DEPENDS = "openssl paho-mqtt-c" |
19 | 20 | ||
@@ -21,4 +22,4 @@ S = "${WORKDIR}/git" | |||
21 | 22 | ||
22 | inherit cmake | 23 | inherit cmake |
23 | 24 | ||
24 | EXTRA_OECMAKE += "-DPAHO_WITH_SSL=ON" | 25 | EXTRA_OECMAKE += "-DPAHO_WITH_SSL=ON -DPAHO_BUILD_EXAMPLES=OFF" |
diff --git a/meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb b/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb index b9ed3d925..199a7c6d6 100644 --- a/meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb +++ b/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://transmissionbt.com/" | |||
4 | LICENSE = "MIT & GPL-2.0-only" | 4 | LICENSE = "MIT & GPL-2.0-only" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=ba8199e739948e198310093de27175fa" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=ba8199e739948e198310093de27175fa" |
6 | 6 | ||
7 | DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" | 7 | DEPENDS = "curl libevent libpsl gnutls openssl libtool intltool-native glib-2.0-native" |
8 | RDEPENDS:${PN}-web = "${PN}" | 8 | RDEPENDS:${PN}-web = "${PN}" |
9 | 9 | ||
10 | SRC_URI = " \ | 10 | SRC_URI = " \ |
@@ -12,13 +12,15 @@ SRC_URI = " \ | |||
12 | file://transmission-daemon \ | 12 | file://transmission-daemon \ |
13 | " | 13 | " |
14 | 14 | ||
15 | # Transmission release 4.0.5 | 15 | # Transmission release 4.0.6 |
16 | SRCREV = "a6fe2a64aa7eca089f96006cf082a12f0cde937f" | 16 | SRCREV = "38c164933e9f77c110b48fe745861c3b98e3d83e" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg | 20 | inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg |
21 | 21 | ||
22 | LDFLAGS:append:riscv32 = " -latomic" | ||
23 | |||
22 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ | 24 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ |
23 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" | 25 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" |
24 | 26 | ||
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 eda01ca38..c372b0307 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 () { | |||
38 | } | 38 | } |
39 | 39 | ||
40 | RDEPENDS:${PN} = "wpa-supplicant" | 40 | RDEPENDS:${PN} = "wpa-supplicant" |
41 | |||
42 | # http://errors.yoctoproject.org/Errors/Details/766893/ | ||
43 | # wfa_cmdproc.c:467:68: error: passing argument 3 of 'strtok_r' from incompatible pointer type [-Wincompatible-pointer-types] | ||
44 | # 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] | ||
45 | CC += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb index 99e3ccaca..c1da15a1b 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +++ b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb | |||
@@ -16,6 +16,10 @@ SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code. | |||
16 | SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de" | 16 | SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de" |
17 | SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82" | 17 | SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82" |
18 | 18 | ||
19 | # code.google.com/archive page is generated by javascript from JSON and does not | ||
20 | # allow devtool to find the latest version | ||
21 | UPSTREAM_VERSION_UNKNOWN = "1" | ||
22 | |||
19 | COMPATIBLE_HOST:libc-musl = "null" | 23 | COMPATIBLE_HOST:libc-musl = "null" |
20 | EXTRA_OEMAKE = "" | 24 | EXTRA_OEMAKE = "" |
21 | export WVLINK="${LD}" | 25 | export WVLINK="${LD}" |
diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index 3453f3e96..3b72e4412 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb | |||
@@ -28,6 +28,10 @@ SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code. | |||
28 | SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" | 28 | SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" |
29 | SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633" | 29 | SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633" |
30 | 30 | ||
31 | # The code.google.com/archive page is generated using Javascript from a JSON file and does not | ||
32 | # allow devtool to find the latest version | ||
33 | UPSTREAM_VERSION_UNKNOWN = "1" | ||
34 | |||
31 | COMPATIBLE_HOST:libc-musl = "null" | 35 | COMPATIBLE_HOST:libc-musl = "null" |
32 | 36 | ||
33 | inherit autotools-brokensep pkgconfig | 37 | inherit autotools-brokensep pkgconfig |
diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb index 5ae72df86..f90b2cab1 100644 --- a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb +++ b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb | |||
@@ -10,6 +10,7 @@ SRC_URI[md5sum] = "471e9ec120fc66a2fe2aae14359e3cfa" | |||
10 | SRC_URI[sha256sum] = "5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377daa6ac39" | 10 | SRC_URI[sha256sum] = "5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377daa6ac39" |
11 | 11 | ||
12 | UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" | 12 | UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" |
13 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
13 | 14 | ||
14 | inherit cmake pkgconfig | 15 | inherit cmake pkgconfig |
15 | 16 | ||
diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb index 555458217..7569d3200 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV} | |||
13 | SRC_URI[sha256sum] = "6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43" | 13 | SRC_URI[sha256sum] = "6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" | 15 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" |
16 | UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+\.\d+\.\d+)" | ||
16 | 17 | ||
17 | inherit cmake ptest pkgconfig | 18 | inherit cmake ptest pkgconfig |
18 | 19 | ||
diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb deleted file mode 100644 index e89d1327e..000000000 --- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | SUMMARY = "D-Bus wrapper in C++ for dbus" | ||
2 | HOMEPAGE = "https://dbus-cxx.github.io/" | ||
3 | BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues" | ||
4 | SECTION = "base" | ||
5 | LICENSE = "LGPL-3.0-or-later | BSD-3-Clause" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" | ||
7 | |||
8 | SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https" | ||
9 | SRCREV = "732a5becb4349e02ffce407a3fd4d75cc3d82421" | ||
10 | |||
11 | DEPENDS = "\ | ||
12 | dbus \ | ||
13 | libsigc++-3 \ | ||
14 | " | ||
15 | |||
16 | RDEPENDS:${PN} = "\ | ||
17 | dbus \ | ||
18 | libsigc++-3 \ | ||
19 | " | ||
20 | |||
21 | S = "${WORKDIR}/git" | ||
22 | |||
23 | inherit pkgconfig cmake | ||
24 | |||
25 | OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" | ||
diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb new file mode 100644 index 000000000..fbe1e3475 --- /dev/null +++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb | |||
@@ -0,0 +1,49 @@ | |||
1 | SUMMARY = "D-Bus implementation in C++" | ||
2 | HOMEPAGE = "https://dbus-cxx.github.io/" | ||
3 | BUGTRACKER = "https://github.com/dbus-cxx/dbus-cxx/issues" | ||
4 | SECTION = "base" | ||
5 | LICENSE = "LGPL-3.0-or-later | BSD-3-Clause" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" | ||
7 | |||
8 | SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https" | ||
9 | SRCREV = "f2637e726207ecfbdaaf02744e1b36e54f929c9d" | ||
10 | |||
11 | DEPENDS = "\ | ||
12 | dbus \ | ||
13 | libsigc++-3 \ | ||
14 | " | ||
15 | |||
16 | RDEPENDS:${PN} = "\ | ||
17 | dbus \ | ||
18 | libsigc++-3 \ | ||
19 | " | ||
20 | |||
21 | S = "${WORKDIR}/git" | ||
22 | |||
23 | inherit pkgconfig cmake | ||
24 | |||
25 | OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" | ||
26 | EXTRA_OECMAKE = "-DBUILD_TESTING=OFF -DTOOLS_BUNDLED_CPPGENERATE=OFF" | ||
27 | |||
28 | PACKAGECONFIG ??= "" | ||
29 | PACKAGECONFIG:class-native ?= "tools" | ||
30 | PACKAGECONFIG:class-nativesdk ?= "tools" | ||
31 | |||
32 | PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOS=OFF,popt cppgenerate" | ||
33 | PACKAGECONFIG[glib] = "-DENABLE_GLIB_SUPPORT=ON,-DENABLE_GLIB_SUPPORT=OFF,glib-2.0" | ||
34 | PACKAGECONFIG[uv] = "-DENABLE_UV_SUPPORT=ON,-DENABLE_UV_SUPPORT=OFF,libuv" | ||
35 | |||
36 | PACKAGES =+ " ${PN}-tools ${PN}-glib ${PN}-uv ${PN}-glib-dev ${PN}-uv-dev " | ||
37 | FILES:${PN}-tools = "${bindir}/dbus-cxx-xml2cpp ${bindir}/dbus-cxx-introspect" | ||
38 | FILES:${PN}-glib = "${libdir}/libdbus-cxx-glib.so.* " | ||
39 | FILES:${PN}-glib-dev = "${includedir}/dbus-cxx-glib-2.0/* \ | ||
40 | ${libdir}/pkgconfig/dbus-cxx-glib-2.0.pc \ | ||
41 | ${libdir}/libdbus-cxx-glib.so \ | ||
42 | " | ||
43 | FILES:${PN}-uv = "${libdir}/libdbus-cxx-uv.so.* " | ||
44 | FILES:${PN}-uv-dev = "${includedir}/dbus-cxx-uv-2.0/* \ | ||
45 | ${libdir}/pkgconfig/dbus-cxx-uv-2.0.pc\ | ||
46 | ${libdir}/libdbus-cxx-uv.so \ | ||
47 | " | ||
48 | |||
49 | BBCLASSEXTEND="native nativesdk" | ||
diff --git a/meta-oe/recipes-core/dbus/dbus-broker_32.bb b/meta-oe/recipes-core/dbus/dbus-broker_36.bb index 900b5e3ac..46cff86db 100644 --- a/meta-oe/recipes-core/dbus/dbus-broker_32.bb +++ b/meta-oe/recipes-core/dbus/dbus-broker_36.bb | |||
@@ -7,9 +7,10 @@ LICENSE = "Apache-2.0" | |||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" |
8 | 8 | ||
9 | SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" | 9 | SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" |
10 | SRC_URI[sha256sum] = "bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de" | 10 | SRC_URI[sha256sum] = "d333d99bd2688135b6d6961e7ad1360099d186078781c87102230910ea4e162b" |
11 | 11 | ||
12 | UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" | 12 | UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" |
13 | UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+)" | ||
13 | 14 | ||
14 | inherit meson pkgconfig systemd features_check | 15 | inherit meson pkgconfig systemd features_check |
15 | 16 | ||
diff --git a/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb index cbe82d42e..086a37ca1 100644 --- a/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb +++ b/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb | |||
@@ -8,6 +8,10 @@ PV = "0.0.0+git" | |||
8 | SRC_URI = "git://github.com/alban/dbus-daemon-proxy;branch=master;protocol=https \ | 8 | SRC_URI = "git://github.com/alban/dbus-daemon-proxy;branch=master;protocol=https \ |
9 | file://0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch \ | 9 | file://0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch \ |
10 | " | 10 | " |
11 | |||
12 | # Upstream repo does not tag | ||
13 | UPSTREAM_CHECK_COMMITS = "1" | ||
14 | |||
11 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
12 | 16 | ||
13 | inherit pkgconfig | 17 | inherit pkgconfig |
diff --git a/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb b/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb index 8e8f544e8..8940e19f8 100644 --- a/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb +++ b/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb | |||
@@ -18,6 +18,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/dbus-cplusplus/dbus-c++/${PV}/${BP}.tar | |||
18 | SRC_URI[md5sum] = "e752116f523fa88ef041e63d3dee4de2" | 18 | SRC_URI[md5sum] = "e752116f523fa88ef041e63d3dee4de2" |
19 | SRC_URI[sha256sum] = "bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61" | 19 | SRC_URI[sha256sum] = "bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61" |
20 | 20 | ||
21 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/dbus-cplusplus/files" | ||
22 | UPSTREAM_CHECK_REGEX = "libdbus-c---(?P<pver>\d+(\.\d+)+)" | ||
23 | |||
21 | inherit autotools pkgconfig | 24 | inherit autotools pkgconfig |
22 | 25 | ||
23 | EXTRA_OECONF = "--disable-ecore --disable-examples --disable-tests" | 26 | EXTRA_OECONF = "--disable-ecore --disable-examples --disable-tests" |
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb index c78dd55ca..465193849 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb | |||
@@ -12,7 +12,7 @@ inherit gnomebase | |||
12 | 12 | ||
13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
14 | 14 | ||
15 | SRC_URI[archive.sha256sum] = "b2a4cd7b9ae987794cbb5a1becc10cecb65182b9bb841868625d6bbb123edb1d" | 15 | SRC_URI[archive.sha256sum] = "fe02c1e5f5825940d82b56b6ec31a12c06c05c1583cfe62f934d0763e1e542b3" |
16 | 16 | ||
17 | FILES:${PN} = "${libdir}/lib*.so.*" | 17 | FILES:${PN} = "${libdir}/lib*.so.*" |
18 | FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" | 18 | FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" |
diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb index b2eb5dd09..ede57bc3e 100644 --- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb +++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb | |||
@@ -8,6 +8,9 @@ DEPENDS = "mm-common" | |||
8 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.12/libsigc++-${PV}.tar.xz" | 8 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.12/libsigc++-${PV}.tar.xz" |
9 | SRC_URI[sha256sum] = "a9dbee323351d109b7aee074a9cb89ca3e7bcf8ad8edef1851f4cf359bd50843" | 9 | SRC_URI[sha256sum] = "a9dbee323351d109b7aee074a9cb89ca3e7bcf8ad8edef1851f4cf359bd50843" |
10 | 10 | ||
11 | UPSTREAM_CHECK_URI = "https://download.gnome.org/sources/libsigc++/2.12/" | ||
12 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
13 | |||
11 | S = "${WORKDIR}/libsigc++-${PV}" | 14 | S = "${WORKDIR}/libsigc++-${PV}" |
12 | 15 | ||
13 | inherit meson | 16 | inherit meson |
diff --git a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb index 0753457c9..b3875e843 100644 --- a/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb +++ b/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb | |||
@@ -8,6 +8,9 @@ DEPENDS = "mm-common" | |||
8 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.6/libsigc++-${PV}.tar.xz" | 8 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.6/libsigc++-${PV}.tar.xz" |
9 | SRC_URI[sha256sum] = "c3d23b37dfd6e39f2e09f091b77b1541fbfa17c4f0b6bf5c89baef7229080e17" | 9 | SRC_URI[sha256sum] = "c3d23b37dfd6e39f2e09f091b77b1541fbfa17c4f0b6bf5c89baef7229080e17" |
10 | 10 | ||
11 | UPSTREAM_CHECK_URI = "https://download.gnome.org/sources/libsigc++/3.6/" | ||
12 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
13 | |||
11 | S = "${WORKDIR}/libsigc++-${PV}" | 14 | S = "${WORKDIR}/libsigc++-${PV}" |
12 | 15 | ||
13 | inherit setuptools3 meson | 16 | inherit setuptools3 meson |
@@ -15,5 +18,5 @@ inherit setuptools3 meson | |||
15 | FILES:${PN}-dev += "${libdir}/sigc++-*/" | 18 | FILES:${PN}-dev += "${libdir}/sigc++-*/" |
16 | FILES:${PN}-doc += "${datadir}/devhelp" | 19 | FILES:${PN}-doc += "${datadir}/devhelp" |
17 | 20 | ||
18 | BBCLASSEXTEND = "native" | 21 | BBCLASSEXTEND = "native nativesdk" |
19 | SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" | 22 | SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" |
diff --git a/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb b/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb index ada019947..027160255 100644 --- a/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb +++ b/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb | |||
@@ -15,5 +15,7 @@ S = "${WORKDIR}/libxml++-${PV}" | |||
15 | 15 | ||
16 | SRC_URI[archive.sha256sum] = "15c38307a964fa6199f4da6683a599eb7e63cc89198545b36349b87cf9aa0098" | 16 | SRC_URI[archive.sha256sum] = "15c38307a964fa6199f4da6683a599eb7e63cc89198545b36349b87cf9aa0098" |
17 | 17 | ||
18 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
19 | |||
18 | FILES:${PN}-doc += "${datadir}/devhelp" | 20 | FILES:${PN}-doc += "${datadir}/devhelp" |
19 | FILES:${PN}-dev += "${libdir}/libxml++-${@gnome_verdir("${PV}")}/include/libxml++config.h" | 21 | FILES:${PN}-dev += "${libdir}/libxml++-${@gnome_verdir("${PV}")}/include/libxml++config.h" |
diff --git a/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch deleted file mode 100644 index 4866a5fbe..000000000 --- a/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Mon, 4 Nov 2019 19:19:47 +0100 | ||
4 | Subject: [PATCH] meson.build: do not ask for python installation / version | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Even by adding python3-setuptools-native the following error is not fixed so | ||
10 | just ask for python3 executable. | ||
11 | |||
12 | | meson.build:9:0: ERROR: <ExternalProgram 'python3' -> ['<...>/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools | ||
13 | |||
14 | Upstream-Status: Inappropriate [OE specific] | ||
15 | |||
16 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
17 | |||
18 | rebase for 1.0.4 | ||
19 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
20 | |||
21 | --- | ||
22 | meson.build | 7 +------ | ||
23 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
24 | |||
25 | diff --git a/meson.build b/meson.build | ||
26 | index 8a18c36..34fd546 100644 | ||
27 | --- a/meson.build | ||
28 | +++ b/meson.build | ||
29 | @@ -7,12 +7,7 @@ project('mm-common', | ||
30 | # and meson.add_install_script(python3, ...) | ||
31 | ) | ||
32 | |||
33 | -python3 = import('python').find_installation() | ||
34 | -python_version = python3.language_version() | ||
35 | -python_version_req = '>= 3.5' | ||
36 | -if not python_version.version_compare(python_version_req) | ||
37 | - error('Requires Python @0@, found @1@.'.format(python_version_req, python_version)) | ||
38 | -endif | ||
39 | +python3 = import('python3').find_python() | ||
40 | |||
41 | # Use these instead of meson.source_root() and meson.build_root(). | ||
42 | # source_root() and build_root() are not useful, if this is a subproject. | ||
43 | -- | ||
44 | 2.25.1 | ||
45 | |||
diff --git a/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb b/meta-oe/recipes-core/mm-common/mm-common_1.0.6.bb index 56f7b5af6..a252a6b48 100644 --- a/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb +++ b/meta-oe/recipes-core/mm-common/mm-common_1.0.6.bb | |||
@@ -8,10 +8,9 @@ inherit gnomebase | |||
8 | # All the recipe does is stage python and shell script, some autotools files; nothing is compiled. | 8 | # All the recipe does is stage python and shell script, some autotools files; nothing is compiled. |
9 | inherit allarch | 9 | inherit allarch |
10 | 10 | ||
11 | SRC_URI[archive.sha256sum] = "e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8" | 11 | SRC_URI[archive.sha256sum] = "b55c46037dbcdabc5cee3b389ea11cc3910adb68ebe883e9477847aa660862e7" |
12 | SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" | ||
13 | 12 | ||
14 | BBCLASSEXTEND = "native" | 13 | BBCLASSEXTEND = "native nativesdk" |
15 | 14 | ||
16 | # These files aren't very usefull on target image, package them all in nnPN-dev | 15 | # These files aren't very usefull on target image, package them all in nnPN-dev |
17 | FILES:${PN} = "" | 16 | FILES:${PN} = "" |
diff --git a/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb b/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb index 0bb45b8ea..fe3cf73e4 100644 --- a/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb +++ b/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb | |||
@@ -7,6 +7,9 @@ SRC_URI = "gitsm://github.com/pullmoll/musl-rpmatch.git;protocol=https;branch=ma | |||
7 | PV = "1.0+git" | 7 | PV = "1.0+git" |
8 | SRCREV = "46267b154987d3e1f25d3a75423faa62bb5ee342" | 8 | SRCREV = "46267b154987d3e1f25d3a75423faa62bb5ee342" |
9 | 9 | ||
10 | # Upstream repo has not made releases/tags after 1.0 | ||
11 | UPSTREAM_CHECK_COMMITS = "1" | ||
12 | |||
10 | inherit autotools | 13 | inherit autotools |
11 | 14 | ||
12 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb index 7ae0362d3..23007d7cc 100644 --- a/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +++ b/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb | |||
@@ -21,3 +21,5 @@ EXTRA_OECMAKE = " \ | |||
21 | 21 | ||
22 | # Headers only so PN is empty | 22 | # Headers only so PN is empty |
23 | RDEPENDS:${PN}-dev = "" | 23 | RDEPENDS:${PN}-dev = "" |
24 | |||
25 | BBCLASSEXTEND += "native nativesdk" | ||
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index bc40f56b9..6f31283fb 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
@@ -353,7 +353,6 @@ RDEPENDS:packagegroup-meta-oe-extended ="\ | |||
353 | figlet \ | 353 | figlet \ |
354 | libcec \ | 354 | libcec \ |
355 | libdivecomputer \ | 355 | libdivecomputer \ |
356 | fluentbit \ | ||
357 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \ | 356 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \ |
358 | liblognorm \ | 357 | liblognorm \ |
359 | libmodbus \ | 358 | libmodbus \ |
@@ -607,12 +606,13 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ | |||
607 | ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \ | 606 | ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \ |
608 | tslib \ | 607 | tslib \ |
609 | unclutter-xfixes \ | 608 | unclutter-xfixes \ |
610 | libvdpau \ | 609 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libvdpau vdpauinfo", "", d)} \ |
611 | xcursorgen \ | 610 | xcursorgen \ |
612 | ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \ | 611 | ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \ |
613 | yad \ | 612 | yad \ |
614 | ydotool \ | 613 | ydotool \ |
615 | parallel-deqp-runner \ | 614 | parallel-deqp-runner \ |
615 | deqp-runner \ | ||
616 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \ | 616 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \ |
617 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl vulkan", "vulkan-cts", "", d)} \ | 617 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl vulkan", "vulkan-cts", "", d)} \ |
618 | " | 618 | " |
@@ -811,13 +811,11 @@ RDEPENDS:packagegroup-meta-oe-support ="\ | |||
811 | libcanberra \ | 811 | libcanberra \ |
812 | libssh \ | 812 | libssh \ |
813 | libssh2 \ | 813 | libssh2 \ |
814 | libee \ | ||
815 | libusbgx-config \ | 814 | libusbgx-config \ |
816 | libusbgx \ | 815 | libusbgx \ |
817 | lockdev \ | 816 | lockdev \ |
818 | logwarn \ | 817 | logwarn \ |
819 | libjs-sizzle \ | 818 | libjs-sizzle \ |
820 | liblinebreak \ | ||
821 | mailcap \ | 819 | mailcap \ |
822 | liboauth \ | 820 | liboauth \ |
823 | mg \ | 821 | mg \ |
@@ -972,7 +970,6 @@ RDEPENDS:packagegroup-meta-oe-ptest-packages = "\ | |||
972 | oprofile-ptest \ | 970 | oprofile-ptest \ |
973 | libteam-ptest \ | 971 | libteam-ptest \ |
974 | uthash-ptest \ | 972 | uthash-ptest \ |
975 | libee-ptest \ | ||
976 | poco-ptest \ | 973 | poco-ptest \ |
977 | cmocka-ptest \ | 974 | cmocka-ptest \ |
978 | minicoredumper-ptest \ | 975 | minicoredumper-ptest \ |
diff --git a/meta-oe/recipes-core/pim435/pim435_git.bb b/meta-oe/recipes-core/pim435/pim435_git.bb index 80e3cc629..8fc8749a1 100644 --- a/meta-oe/recipes-core/pim435/pim435_git.bb +++ b/meta-oe/recipes-core/pim435/pim435_git.bb | |||
@@ -11,6 +11,10 @@ LIC_FILES_CHKSUM = "file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 | |||
11 | 11 | ||
12 | SRC_URI = "git://gitlab.eclipse.org/eclipse/oniro-blueprints/core/pim435;protocol=https;branch=main" | 12 | SRC_URI = "git://gitlab.eclipse.org/eclipse/oniro-blueprints/core/pim435;protocol=https;branch=main" |
13 | SRCREV = "445ed623ec8d3ecbb1d566900b4ef3fb3031d689" | 13 | SRCREV = "445ed623ec8d3ecbb1d566900b4ef3fb3031d689" |
14 | |||
15 | # Upstream repo does not tag | ||
16 | UPSTREAM_CHECK_COMMITS = "1" | ||
17 | |||
14 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
15 | 19 | ||
16 | DEPENDS = "i2c-tools" | 20 | DEPENDS = "i2c-tools" |
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 86a2331bd..28213f387 100644 --- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb +++ b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb | |||
@@ -12,6 +12,8 @@ SRC_URI = " \ | |||
12 | SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e" | 12 | SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e" |
13 | SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91" | 13 | SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91" |
14 | 14 | ||
15 | UPSTREAM_CHECK_REGEX = "${BPN}-dev_(?P<pver>\d+)_win32\.zip" | ||
16 | |||
15 | PACKAGES = "${PN} ${PN}-dev" | 17 | PACKAGES = "${PN} ${PN}-dev" |
16 | FILES:${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" | 18 | FILES:${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" |
17 | INSANE_SKIP:${PN}-dev = "staticdev" | 19 | INSANE_SKIP:${PN}-dev = "staticdev" |
diff --git a/meta-oe/recipes-core/usleep/usleep_1.2.bb b/meta-oe/recipes-core/usleep/usleep_1.2.bb index 882ac2c2f..e8b4a7fef 100644 --- a/meta-oe/recipes-core/usleep/usleep_1.2.bb +++ b/meta-oe/recipes-core/usleep/usleep_1.2.bb | |||
@@ -32,3 +32,7 @@ ALTERNATIVE_LINK_NAME[usleep] = "${base_bindir}/usleep" | |||
32 | 32 | ||
33 | ALTERNATIVE:${PN}-doc = "usleep.1" | 33 | ALTERNATIVE:${PN}-doc = "usleep.1" |
34 | ALTERNATIVE_LINK_NAME[usleep.1] = "${mandir}/man1/usleep.1" | 34 | ALTERNATIVE_LINK_NAME[usleep.1] = "${mandir}/man1/usleep.1" |
35 | |||
36 | # http://errors.yoctoproject.org/Errors/Details/766900/ | ||
37 | # usleep.c:47:43: error: passing argument 3 of 'poptGetContext' from incompatible pointer type [-Wincompatible-pointer-types] | ||
38 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc index 3a5bee7ce..e5bde3d04 100644 --- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc +++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc | |||
@@ -3,10 +3,12 @@ | |||
3 | # from Cargo.lock | 3 | # from Cargo.lock |
4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
5 | crate://crates.io/adler/1.0.2 \ | 5 | crate://crates.io/adler/1.0.2 \ |
6 | crate://crates.io/ahash/0.7.8 \ | 6 | crate://crates.io/ahash/0.8.11 \ |
7 | crate://crates.io/aho-corasick/1.0.4 \ | 7 | crate://crates.io/aho-corasick/1.0.4 \ |
8 | crate://crates.io/allocator-api2/0.2.18 \ | ||
8 | crate://crates.io/android-tzdata/0.1.1 \ | 9 | crate://crates.io/android-tzdata/0.1.1 \ |
9 | crate://crates.io/android_system_properties/0.1.5 \ | 10 | crate://crates.io/android_system_properties/0.1.5 \ |
11 | crate://crates.io/ansi-width/0.1.0 \ | ||
10 | crate://crates.io/anstream/0.5.0 \ | 12 | crate://crates.io/anstream/0.5.0 \ |
11 | crate://crates.io/anstyle/1.0.0 \ | 13 | crate://crates.io/anstyle/1.0.0 \ |
12 | crate://crates.io/anstyle-parse/0.2.0 \ | 14 | crate://crates.io/anstyle-parse/0.2.0 \ |
@@ -16,11 +18,12 @@ SRC_URI += " \ | |||
16 | crate://crates.io/arrayref/0.3.6 \ | 18 | crate://crates.io/arrayref/0.3.6 \ |
17 | crate://crates.io/arrayvec/0.7.4 \ | 19 | crate://crates.io/arrayvec/0.7.4 \ |
18 | crate://crates.io/autocfg/1.1.0 \ | 20 | crate://crates.io/autocfg/1.1.0 \ |
19 | crate://crates.io/bigdecimal/0.4.0 \ | 21 | crate://crates.io/bigdecimal/0.4.5 \ |
20 | crate://crates.io/binary-heap-plus/0.5.0 \ | 22 | crate://crates.io/binary-heap-plus/0.5.0 \ |
21 | crate://crates.io/bindgen/0.63.0 \ | 23 | crate://crates.io/bincode/1.3.3 \ |
24 | crate://crates.io/bindgen/0.69.4 \ | ||
22 | crate://crates.io/bitflags/1.3.2 \ | 25 | crate://crates.io/bitflags/1.3.2 \ |
23 | crate://crates.io/bitflags/2.4.2 \ | 26 | crate://crates.io/bitflags/2.5.0 \ |
24 | crate://crates.io/bitvec/1.0.1 \ | 27 | crate://crates.io/bitvec/1.0.1 \ |
25 | crate://crates.io/blake2b_simd/1.0.2 \ | 28 | crate://crates.io/blake2b_simd/1.0.2 \ |
26 | crate://crates.io/blake3/1.5.1 \ | 29 | crate://crates.io/blake3/1.5.1 \ |
@@ -63,18 +66,21 @@ SRC_URI += " \ | |||
63 | crate://crates.io/crunchy/0.2.2 \ | 66 | crate://crates.io/crunchy/0.2.2 \ |
64 | crate://crates.io/crypto-common/0.1.6 \ | 67 | crate://crates.io/crypto-common/0.1.6 \ |
65 | crate://crates.io/ctrlc/3.4.4 \ | 68 | crate://crates.io/ctrlc/3.4.4 \ |
66 | crate://crates.io/data-encoding/2.5.0 \ | 69 | crate://crates.io/data-encoding/2.6.0 \ |
67 | crate://crates.io/data-encoding-macro/0.1.14 \ | 70 | crate://crates.io/data-encoding-macro/0.1.15 \ |
68 | crate://crates.io/data-encoding-macro-internal/0.1.12 \ | 71 | crate://crates.io/data-encoding-macro-internal/0.1.13 \ |
72 | crate://crates.io/deranged/0.3.11 \ | ||
69 | crate://crates.io/derive_arbitrary/1.3.2 \ | 73 | crate://crates.io/derive_arbitrary/1.3.2 \ |
70 | crate://crates.io/diff/0.1.13 \ | 74 | crate://crates.io/diff/0.1.13 \ |
71 | crate://crates.io/digest/0.10.7 \ | 75 | crate://crates.io/digest/0.10.7 \ |
76 | crate://crates.io/displaydoc/0.2.4 \ | ||
72 | crate://crates.io/dlv-list/0.5.0 \ | 77 | crate://crates.io/dlv-list/0.5.0 \ |
73 | crate://crates.io/dns-lookup/2.0.4 \ | 78 | crate://crates.io/dns-lookup/2.0.4 \ |
74 | crate://crates.io/dunce/1.0.4 \ | 79 | crate://crates.io/dunce/1.0.4 \ |
75 | crate://crates.io/either/1.8.0 \ | 80 | crate://crates.io/either/1.8.0 \ |
76 | crate://crates.io/encode_unicode/0.3.6 \ | 81 | crate://crates.io/encode_unicode/0.3.6 \ |
77 | crate://crates.io/env_logger/0.8.4 \ | 82 | crate://crates.io/env_logger/0.8.4 \ |
83 | crate://crates.io/equivalent/1.0.1 \ | ||
78 | crate://crates.io/errno/0.3.8 \ | 84 | crate://crates.io/errno/0.3.8 \ |
79 | crate://crates.io/exacl/0.12.0 \ | 85 | crate://crates.io/exacl/0.12.0 \ |
80 | crate://crates.io/fastrand/2.0.1 \ | 86 | crate://crates.io/fastrand/2.0.1 \ |
@@ -85,7 +91,7 @@ SRC_URI += " \ | |||
85 | crate://crates.io/fnv/1.0.7 \ | 91 | crate://crates.io/fnv/1.0.7 \ |
86 | crate://crates.io/fs_extra/1.3.0 \ | 92 | crate://crates.io/fs_extra/1.3.0 \ |
87 | crate://crates.io/fsevent-sys/4.1.0 \ | 93 | crate://crates.io/fsevent-sys/4.1.0 \ |
88 | crate://crates.io/fts-sys/0.2.4 \ | 94 | crate://crates.io/fts-sys/0.2.9 \ |
89 | crate://crates.io/fundu/2.0.0 \ | 95 | crate://crates.io/fundu/2.0.0 \ |
90 | crate://crates.io/fundu-core/0.3.0 \ | 96 | crate://crates.io/fundu-core/0.3.0 \ |
91 | crate://crates.io/funty/2.0.0 \ | 97 | crate://crates.io/funty/2.0.0 \ |
@@ -103,8 +109,7 @@ SRC_URI += " \ | |||
103 | crate://crates.io/generic-array/0.14.6 \ | 109 | crate://crates.io/generic-array/0.14.6 \ |
104 | crate://crates.io/getrandom/0.2.9 \ | 110 | crate://crates.io/getrandom/0.2.9 \ |
105 | crate://crates.io/glob/0.3.1 \ | 111 | crate://crates.io/glob/0.3.1 \ |
106 | crate://crates.io/half/2.4.0 \ | 112 | crate://crates.io/half/2.4.1 \ |
107 | crate://crates.io/hashbrown/0.12.3 \ | ||
108 | crate://crates.io/hashbrown/0.14.3 \ | 113 | crate://crates.io/hashbrown/0.14.3 \ |
109 | crate://crates.io/hermit-abi/0.3.2 \ | 114 | crate://crates.io/hermit-abi/0.3.2 \ |
110 | crate://crates.io/hex/0.4.3 \ | 115 | crate://crates.io/hex/0.4.3 \ |
@@ -112,11 +117,14 @@ SRC_URI += " \ | |||
112 | crate://crates.io/hostname/0.4.0 \ | 117 | crate://crates.io/hostname/0.4.0 \ |
113 | crate://crates.io/iana-time-zone/0.1.53 \ | 118 | crate://crates.io/iana-time-zone/0.1.53 \ |
114 | crate://crates.io/iana-time-zone-haiku/0.1.2 \ | 119 | crate://crates.io/iana-time-zone-haiku/0.1.2 \ |
115 | crate://crates.io/indicatif/0.17.3 \ | 120 | crate://crates.io/indexmap/2.2.6 \ |
121 | crate://crates.io/indicatif/0.17.8 \ | ||
116 | crate://crates.io/inotify/0.9.6 \ | 122 | crate://crates.io/inotify/0.9.6 \ |
117 | crate://crates.io/inotify-sys/0.1.5 \ | 123 | crate://crates.io/inotify-sys/0.1.5 \ |
124 | crate://crates.io/instant/0.1.12 \ | ||
118 | crate://crates.io/io-lifetimes/1.0.11 \ | 125 | crate://crates.io/io-lifetimes/1.0.11 \ |
119 | crate://crates.io/itertools/0.12.1 \ | 126 | crate://crates.io/itertools/0.12.1 \ |
127 | crate://crates.io/itertools/0.13.0 \ | ||
120 | crate://crates.io/itoa/1.0.4 \ | 128 | crate://crates.io/itoa/1.0.4 \ |
121 | crate://crates.io/js-sys/0.3.64 \ | 129 | crate://crates.io/js-sys/0.3.64 \ |
122 | crate://crates.io/keccak/0.1.4 \ | 130 | crate://crates.io/keccak/0.1.4 \ |
@@ -124,18 +132,18 @@ SRC_URI += " \ | |||
124 | crate://crates.io/kqueue-sys/1.0.3 \ | 132 | crate://crates.io/kqueue-sys/1.0.3 \ |
125 | crate://crates.io/lazy_static/1.4.0 \ | 133 | crate://crates.io/lazy_static/1.4.0 \ |
126 | crate://crates.io/lazycell/1.3.0 \ | 134 | crate://crates.io/lazycell/1.3.0 \ |
127 | crate://crates.io/libc/0.2.153 \ | 135 | crate://crates.io/libc/0.2.155 \ |
128 | crate://crates.io/libloading/0.7.4 \ | 136 | crate://crates.io/libloading/0.7.4 \ |
129 | crate://crates.io/libm/0.2.7 \ | 137 | crate://crates.io/libm/0.2.7 \ |
130 | crate://crates.io/linux-raw-sys/0.3.8 \ | 138 | crate://crates.io/linux-raw-sys/0.3.8 \ |
131 | crate://crates.io/linux-raw-sys/0.4.12 \ | 139 | crate://crates.io/linux-raw-sys/0.4.12 \ |
132 | crate://crates.io/lock_api/0.4.9 \ | 140 | crate://crates.io/lock_api/0.4.9 \ |
133 | crate://crates.io/log/0.4.20 \ | 141 | crate://crates.io/log/0.4.20 \ |
134 | crate://crates.io/lru/0.7.8 \ | 142 | crate://crates.io/lru/0.12.3 \ |
135 | crate://crates.io/lscolors/0.16.0 \ | 143 | crate://crates.io/lscolors/0.16.0 \ |
136 | crate://crates.io/md-5/0.10.6 \ | 144 | crate://crates.io/md-5/0.10.6 \ |
137 | crate://crates.io/memchr/2.7.1 \ | 145 | crate://crates.io/memchr/2.7.4 \ |
138 | crate://crates.io/memmap2/0.9.0 \ | 146 | crate://crates.io/memmap2/0.9.4 \ |
139 | crate://crates.io/minimal-lexical/0.2.1 \ | 147 | crate://crates.io/minimal-lexical/0.2.1 \ |
140 | crate://crates.io/miniz_oxide/0.7.2 \ | 148 | crate://crates.io/miniz_oxide/0.7.2 \ |
141 | crate://crates.io/mio/0.8.11 \ | 149 | crate://crates.io/mio/0.8.11 \ |
@@ -143,11 +151,12 @@ SRC_URI += " \ | |||
143 | crate://crates.io/nom/7.1.3 \ | 151 | crate://crates.io/nom/7.1.3 \ |
144 | crate://crates.io/notify/6.0.1 \ | 152 | crate://crates.io/notify/6.0.1 \ |
145 | crate://crates.io/nu-ansi-term/0.49.0 \ | 153 | crate://crates.io/nu-ansi-term/0.49.0 \ |
146 | crate://crates.io/num-bigint/0.4.4 \ | 154 | crate://crates.io/num-bigint/0.4.5 \ |
147 | crate://crates.io/num-integer/0.1.45 \ | 155 | crate://crates.io/num-conv/0.1.0 \ |
156 | crate://crates.io/num-integer/0.1.46 \ | ||
148 | crate://crates.io/num-modular/0.5.1 \ | 157 | crate://crates.io/num-modular/0.5.1 \ |
149 | crate://crates.io/num-prime/0.4.3 \ | 158 | crate://crates.io/num-prime/0.4.4 \ |
150 | crate://crates.io/num-traits/0.2.18 \ | 159 | crate://crates.io/num-traits/0.2.19 \ |
151 | crate://crates.io/num_threads/0.1.6 \ | 160 | crate://crates.io/num_threads/0.1.6 \ |
152 | crate://crates.io/number_prefix/0.4.0 \ | 161 | crate://crates.io/number_prefix/0.4.0 \ |
153 | crate://crates.io/once_cell/1.19.0 \ | 162 | crate://crates.io/once_cell/1.19.0 \ |
@@ -157,8 +166,7 @@ SRC_URI += " \ | |||
157 | crate://crates.io/os_display/0.1.3 \ | 166 | crate://crates.io/os_display/0.1.3 \ |
158 | crate://crates.io/parking_lot/0.12.1 \ | 167 | crate://crates.io/parking_lot/0.12.1 \ |
159 | crate://crates.io/parking_lot_core/0.9.9 \ | 168 | crate://crates.io/parking_lot_core/0.9.9 \ |
160 | crate://crates.io/parse_datetime/0.5.0 \ | 169 | crate://crates.io/parse_datetime/0.6.0 \ |
161 | crate://crates.io/peeking_take_while/0.1.2 \ | ||
162 | crate://crates.io/phf/0.11.2 \ | 170 | crate://crates.io/phf/0.11.2 \ |
163 | crate://crates.io/phf_codegen/0.11.2 \ | 171 | crate://crates.io/phf_codegen/0.11.2 \ |
164 | crate://crates.io/phf_generator/0.11.1 \ | 172 | crate://crates.io/phf_generator/0.11.1 \ |
@@ -167,15 +175,18 @@ SRC_URI += " \ | |||
167 | crate://crates.io/pin-utils/0.1.0 \ | 175 | crate://crates.io/pin-utils/0.1.0 \ |
168 | crate://crates.io/pkg-config/0.3.26 \ | 176 | crate://crates.io/pkg-config/0.3.26 \ |
169 | crate://crates.io/platform-info/2.0.3 \ | 177 | crate://crates.io/platform-info/2.0.3 \ |
170 | crate://crates.io/portable-atomic/0.3.15 \ | 178 | crate://crates.io/portable-atomic/1.6.0 \ |
179 | crate://crates.io/powerfmt/0.2.0 \ | ||
171 | crate://crates.io/ppv-lite86/0.2.17 \ | 180 | crate://crates.io/ppv-lite86/0.2.17 \ |
172 | crate://crates.io/pretty_assertions/1.4.0 \ | 181 | crate://crates.io/pretty_assertions/1.4.0 \ |
173 | crate://crates.io/proc-macro2/1.0.63 \ | 182 | crate://crates.io/prettyplease/0.2.19 \ |
183 | crate://crates.io/proc-macro-crate/3.1.0 \ | ||
184 | crate://crates.io/proc-macro2/1.0.86 \ | ||
174 | crate://crates.io/procfs/0.16.0 \ | 185 | crate://crates.io/procfs/0.16.0 \ |
175 | crate://crates.io/procfs-core/0.16.0 \ | 186 | crate://crates.io/procfs-core/0.16.0 \ |
176 | crate://crates.io/quick-error/2.0.1 \ | 187 | crate://crates.io/quick-error/2.0.1 \ |
177 | crate://crates.io/quickcheck/1.0.3 \ | 188 | crate://crates.io/quickcheck/1.0.3 \ |
178 | crate://crates.io/quote/1.0.29 \ | 189 | crate://crates.io/quote/1.0.36 \ |
179 | crate://crates.io/radium/0.7.0 \ | 190 | crate://crates.io/radium/0.7.0 \ |
180 | crate://crates.io/rand/0.8.5 \ | 191 | crate://crates.io/rand/0.8.5 \ |
181 | crate://crates.io/rand_chacha/0.3.1 \ | 192 | crate://crates.io/rand_chacha/0.3.1 \ |
@@ -184,16 +195,16 @@ SRC_URI += " \ | |||
184 | crate://crates.io/rayon/1.10.0 \ | 195 | crate://crates.io/rayon/1.10.0 \ |
185 | crate://crates.io/rayon-core/1.12.1 \ | 196 | crate://crates.io/rayon-core/1.12.1 \ |
186 | crate://crates.io/redox_syscall/0.4.1 \ | 197 | crate://crates.io/redox_syscall/0.4.1 \ |
187 | crate://crates.io/redox_syscall/0.5.0 \ | 198 | crate://crates.io/redox_syscall/0.5.2 \ |
188 | crate://crates.io/reference-counted-singleton/0.1.2 \ | 199 | crate://crates.io/reference-counted-singleton/0.1.2 \ |
189 | crate://crates.io/regex/1.10.4 \ | 200 | crate://crates.io/regex/1.10.5 \ |
190 | crate://crates.io/regex-automata/0.4.4 \ | 201 | crate://crates.io/regex-automata/0.4.4 \ |
191 | crate://crates.io/regex-syntax/0.8.2 \ | 202 | crate://crates.io/regex-syntax/0.8.2 \ |
192 | crate://crates.io/relative-path/1.8.0 \ | 203 | crate://crates.io/relative-path/1.8.0 \ |
193 | crate://crates.io/rlimit/0.10.1 \ | 204 | crate://crates.io/rlimit/0.10.1 \ |
194 | crate://crates.io/roff/0.2.1 \ | 205 | crate://crates.io/roff/0.2.1 \ |
195 | crate://crates.io/rstest/0.19.0 \ | 206 | crate://crates.io/rstest/0.21.0 \ |
196 | crate://crates.io/rstest_macros/0.19.0 \ | 207 | crate://crates.io/rstest_macros/0.21.0 \ |
197 | crate://crates.io/rust-ini/0.21.0 \ | 208 | crate://crates.io/rust-ini/0.21.0 \ |
198 | crate://crates.io/rustc-hash/1.1.0 \ | 209 | crate://crates.io/rustc-hash/1.1.0 \ |
199 | crate://crates.io/rustc_version/0.4.0 \ | 210 | crate://crates.io/rustc_version/0.4.0 \ |
@@ -201,12 +212,13 @@ SRC_URI += " \ | |||
201 | crate://crates.io/rustix/0.38.31 \ | 212 | crate://crates.io/rustix/0.38.31 \ |
202 | crate://crates.io/same-file/1.0.6 \ | 213 | crate://crates.io/same-file/1.0.6 \ |
203 | crate://crates.io/scopeguard/1.2.0 \ | 214 | crate://crates.io/scopeguard/1.2.0 \ |
204 | crate://crates.io/self_cell/1.0.3 \ | 215 | crate://crates.io/self_cell/1.0.4 \ |
205 | crate://crates.io/selinux/0.4.0 \ | 216 | crate://crates.io/selinux/0.4.4 \ |
206 | crate://crates.io/selinux-sys/0.6.2 \ | 217 | crate://crates.io/selinux-sys/0.6.9 \ |
207 | crate://crates.io/semver/1.0.14 \ | 218 | crate://crates.io/semver/1.0.14 \ |
208 | crate://crates.io/serde/1.0.193 \ | 219 | crate://crates.io/serde/1.0.203 \ |
209 | crate://crates.io/serde_derive/1.0.193 \ | 220 | crate://crates.io/serde-big-array/0.5.1 \ |
221 | crate://crates.io/serde_derive/1.0.203 \ | ||
210 | crate://crates.io/sha1/0.10.6 \ | 222 | crate://crates.io/sha1/0.10.6 \ |
211 | crate://crates.io/sha2/0.10.8 \ | 223 | crate://crates.io/sha2/0.10.8 \ |
212 | crate://crates.io/sha3/0.10.8 \ | 224 | crate://crates.io/sha3/0.10.8 \ |
@@ -217,34 +229,36 @@ SRC_URI += " \ | |||
217 | crate://crates.io/siphasher/0.3.10 \ | 229 | crate://crates.io/siphasher/0.3.10 \ |
218 | crate://crates.io/slab/0.4.7 \ | 230 | crate://crates.io/slab/0.4.7 \ |
219 | crate://crates.io/sm3/0.4.2 \ | 231 | crate://crates.io/sm3/0.4.2 \ |
220 | crate://crates.io/smallvec/1.13.1 \ | 232 | crate://crates.io/smallvec/1.13.2 \ |
221 | crate://crates.io/smawk/0.3.1 \ | 233 | crate://crates.io/smawk/0.3.1 \ |
222 | crate://crates.io/socket2/0.5.3 \ | 234 | crate://crates.io/socket2/0.5.3 \ |
223 | crate://crates.io/strsim/0.10.0 \ | 235 | crate://crates.io/strsim/0.10.0 \ |
224 | crate://crates.io/syn/1.0.109 \ | 236 | crate://crates.io/syn/1.0.109 \ |
225 | crate://crates.io/syn/2.0.32 \ | 237 | crate://crates.io/syn/2.0.60 \ |
226 | crate://crates.io/tap/1.0.1 \ | 238 | crate://crates.io/tap/1.0.1 \ |
227 | crate://crates.io/tempfile/3.10.1 \ | 239 | crate://crates.io/tempfile/3.10.1 \ |
228 | crate://crates.io/terminal_size/0.2.6 \ | 240 | crate://crates.io/terminal_size/0.2.6 \ |
229 | crate://crates.io/terminal_size/0.3.0 \ | 241 | crate://crates.io/terminal_size/0.3.0 \ |
230 | crate://crates.io/textwrap/0.16.1 \ | 242 | crate://crates.io/textwrap/0.16.1 \ |
231 | crate://crates.io/thiserror/1.0.37 \ | 243 | crate://crates.io/thiserror/1.0.61 \ |
232 | crate://crates.io/thiserror-impl/1.0.37 \ | 244 | crate://crates.io/thiserror-impl/1.0.61 \ |
233 | crate://crates.io/time/0.3.20 \ | 245 | crate://crates.io/time/0.3.36 \ |
234 | crate://crates.io/time-core/0.1.0 \ | 246 | crate://crates.io/time-core/0.1.2 \ |
235 | crate://crates.io/time-macros/0.2.8 \ | 247 | crate://crates.io/time-macros/0.2.18 \ |
236 | crate://crates.io/tiny-keccak/2.0.2 \ | 248 | crate://crates.io/tiny-keccak/2.0.2 \ |
249 | crate://crates.io/toml_datetime/0.6.6 \ | ||
250 | crate://crates.io/toml_edit/0.21.1 \ | ||
237 | crate://crates.io/trim-in-place/0.1.7 \ | 251 | crate://crates.io/trim-in-place/0.1.7 \ |
238 | crate://crates.io/typenum/1.15.0 \ | 252 | crate://crates.io/typenum/1.15.0 \ |
239 | crate://crates.io/unicode-ident/1.0.5 \ | 253 | crate://crates.io/unicode-ident/1.0.5 \ |
240 | crate://crates.io/unicode-linebreak/0.1.5 \ | 254 | crate://crates.io/unicode-linebreak/0.1.5 \ |
241 | crate://crates.io/unicode-segmentation/1.11.0 \ | 255 | crate://crates.io/unicode-segmentation/1.11.0 \ |
242 | crate://crates.io/unicode-width/0.1.11 \ | 256 | crate://crates.io/unicode-width/0.1.12 \ |
243 | crate://crates.io/unicode-xid/0.2.4 \ | 257 | crate://crates.io/unicode-xid/0.2.4 \ |
244 | crate://crates.io/unindent/0.2.1 \ | 258 | crate://crates.io/unindent/0.2.3 \ |
245 | crate://crates.io/utf8parse/0.2.1 \ | 259 | crate://crates.io/utf8parse/0.2.1 \ |
246 | crate://crates.io/uuid/1.7.0 \ | 260 | crate://crates.io/uuid/1.7.0 \ |
247 | crate://crates.io/uutils_term_grid/0.3.0 \ | 261 | crate://crates.io/uutils_term_grid/0.6.0 \ |
248 | crate://crates.io/version_check/0.9.4 \ | 262 | crate://crates.io/version_check/0.9.4 \ |
249 | crate://crates.io/walkdir/2.5.0 \ | 263 | crate://crates.io/walkdir/2.5.0 \ |
250 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ | 264 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ |
@@ -288,18 +302,23 @@ SRC_URI += " \ | |||
288 | crate://crates.io/windows_x86_64_msvc/0.42.2 \ | 302 | crate://crates.io/windows_x86_64_msvc/0.42.2 \ |
289 | crate://crates.io/windows_x86_64_msvc/0.48.0 \ | 303 | crate://crates.io/windows_x86_64_msvc/0.48.0 \ |
290 | crate://crates.io/windows_x86_64_msvc/0.52.0 \ | 304 | crate://crates.io/windows_x86_64_msvc/0.52.0 \ |
305 | crate://crates.io/winnow/0.5.40 \ | ||
291 | crate://crates.io/wyz/0.5.1 \ | 306 | crate://crates.io/wyz/0.5.1 \ |
292 | crate://crates.io/xattr/1.3.1 \ | 307 | crate://crates.io/xattr/1.3.1 \ |
293 | crate://crates.io/yansi/0.5.1 \ | 308 | crate://crates.io/yansi/0.5.1 \ |
294 | crate://crates.io/z85/3.0.5 \ | 309 | crate://crates.io/z85/3.0.5 \ |
295 | crate://crates.io/zip/1.1.1 \ | 310 | crate://crates.io/zerocopy/0.7.33 \ |
311 | crate://crates.io/zerocopy-derive/0.7.33 \ | ||
312 | crate://crates.io/zip/1.3.0 \ | ||
296 | " | 313 | " |
297 | 314 | ||
298 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" | 315 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" |
299 | SRC_URI[ahash-0.7.8.sha256sum] = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" | 316 | SRC_URI[ahash-0.8.11.sha256sum] = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" |
300 | SRC_URI[aho-corasick-1.0.4.sha256sum] = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" | 317 | SRC_URI[aho-corasick-1.0.4.sha256sum] = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" |
318 | SRC_URI[allocator-api2-0.2.18.sha256sum] = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" | ||
301 | SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" | 319 | SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" |
302 | SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" | 320 | SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" |
321 | SRC_URI[ansi-width-0.1.0.sha256sum] = "219e3ce6f2611d83b51ec2098a12702112c29e57203a6b0a0929b2cddb486608" | ||
303 | SRC_URI[anstream-0.5.0.sha256sum] = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" | 322 | SRC_URI[anstream-0.5.0.sha256sum] = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" |
304 | SRC_URI[anstyle-1.0.0.sha256sum] = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" | 323 | SRC_URI[anstyle-1.0.0.sha256sum] = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" |
305 | SRC_URI[anstyle-parse-0.2.0.sha256sum] = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" | 324 | SRC_URI[anstyle-parse-0.2.0.sha256sum] = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" |
@@ -309,11 +328,12 @@ SRC_URI[arbitrary-1.3.2.sha256sum] = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b | |||
309 | SRC_URI[arrayref-0.3.6.sha256sum] = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" | 328 | SRC_URI[arrayref-0.3.6.sha256sum] = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" |
310 | SRC_URI[arrayvec-0.7.4.sha256sum] = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" | 329 | SRC_URI[arrayvec-0.7.4.sha256sum] = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" |
311 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" | 330 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" |
312 | SRC_URI[bigdecimal-0.4.0.sha256sum] = "5274a6b6e0ee020148397245b973e30163b7bffbc6d473613f850cb99888581e" | 331 | SRC_URI[bigdecimal-0.4.5.sha256sum] = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" |
313 | SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296" | 332 | SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296" |
314 | SRC_URI[bindgen-0.63.0.sha256sum] = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" | 333 | SRC_URI[bincode-1.3.3.sha256sum] = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" |
334 | SRC_URI[bindgen-0.69.4.sha256sum] = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" | ||
315 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | 335 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" |
316 | SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" | 336 | SRC_URI[bitflags-2.5.0.sha256sum] = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" |
317 | SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" | 337 | SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" |
318 | SRC_URI[blake2b_simd-1.0.2.sha256sum] = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" | 338 | SRC_URI[blake2b_simd-1.0.2.sha256sum] = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" |
319 | SRC_URI[blake3-1.5.1.sha256sum] = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" | 339 | SRC_URI[blake3-1.5.1.sha256sum] = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" |
@@ -356,18 +376,21 @@ SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23e | |||
356 | SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" | 376 | SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" |
357 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" | 377 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" |
358 | SRC_URI[ctrlc-3.4.4.sha256sum] = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" | 378 | SRC_URI[ctrlc-3.4.4.sha256sum] = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" |
359 | SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" | 379 | SRC_URI[data-encoding-2.6.0.sha256sum] = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" |
360 | SRC_URI[data-encoding-macro-0.1.14.sha256sum] = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" | 380 | SRC_URI[data-encoding-macro-0.1.15.sha256sum] = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" |
361 | SRC_URI[data-encoding-macro-internal-0.1.12.sha256sum] = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" | 381 | SRC_URI[data-encoding-macro-internal-0.1.13.sha256sum] = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" |
382 | SRC_URI[deranged-0.3.11.sha256sum] = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" | ||
362 | SRC_URI[derive_arbitrary-1.3.2.sha256sum] = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" | 383 | SRC_URI[derive_arbitrary-1.3.2.sha256sum] = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" |
363 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" | 384 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" |
364 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" | 385 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" |
386 | SRC_URI[displaydoc-0.2.4.sha256sum] = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" | ||
365 | SRC_URI[dlv-list-0.5.0.sha256sum] = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" | 387 | SRC_URI[dlv-list-0.5.0.sha256sum] = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" |
366 | SRC_URI[dns-lookup-2.0.4.sha256sum] = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc" | 388 | SRC_URI[dns-lookup-2.0.4.sha256sum] = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc" |
367 | SRC_URI[dunce-1.0.4.sha256sum] = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" | 389 | SRC_URI[dunce-1.0.4.sha256sum] = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" |
368 | SRC_URI[either-1.8.0.sha256sum] = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" | 390 | SRC_URI[either-1.8.0.sha256sum] = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" |
369 | SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" | 391 | SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" |
370 | SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" | 392 | SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" |
393 | SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" | ||
371 | SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" | 394 | SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" |
372 | SRC_URI[exacl-0.12.0.sha256sum] = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" | 395 | SRC_URI[exacl-0.12.0.sha256sum] = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" |
373 | SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" | 396 | SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" |
@@ -378,7 +401,7 @@ SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fad | |||
378 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" | 401 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" |
379 | SRC_URI[fs_extra-1.3.0.sha256sum] = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" | 402 | SRC_URI[fs_extra-1.3.0.sha256sum] = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" |
380 | SRC_URI[fsevent-sys-4.1.0.sha256sum] = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" | 403 | SRC_URI[fsevent-sys-4.1.0.sha256sum] = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" |
381 | SRC_URI[fts-sys-0.2.4.sha256sum] = "9a66c0a21e344f20c87b4ca12643cf4f40a7018f132c98d344e989b959f49dd1" | 404 | SRC_URI[fts-sys-0.2.9.sha256sum] = "4e184d5f593d19793f26afb6f9a58d25f0bc755c4e48890ffcba6db416153ebb" |
382 | SRC_URI[fundu-2.0.0.sha256sum] = "6c04cb831a8dccadfe3774b07cba4574a1ec24974d761510e65d8a543c2d7cb4" | 405 | SRC_URI[fundu-2.0.0.sha256sum] = "6c04cb831a8dccadfe3774b07cba4574a1ec24974d761510e65d8a543c2d7cb4" |
383 | SRC_URI[fundu-core-0.3.0.sha256sum] = "76a889e633afd839fb5b04fe53adfd588cefe518e71ec8d3c929698c6daf2acd" | 406 | SRC_URI[fundu-core-0.3.0.sha256sum] = "76a889e633afd839fb5b04fe53adfd588cefe518e71ec8d3c929698c6daf2acd" |
384 | SRC_URI[funty-2.0.0.sha256sum] = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" | 407 | SRC_URI[funty-2.0.0.sha256sum] = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" |
@@ -396,8 +419,7 @@ SRC_URI[gcd-2.3.0.sha256sum] = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d5 | |||
396 | SRC_URI[generic-array-0.14.6.sha256sum] = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" | 419 | SRC_URI[generic-array-0.14.6.sha256sum] = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" |
397 | SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" | 420 | SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" |
398 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" | 421 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" |
399 | SRC_URI[half-2.4.0.sha256sum] = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" | 422 | SRC_URI[half-2.4.1.sha256sum] = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" |
400 | SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" | ||
401 | SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" | 423 | SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" |
402 | SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" | 424 | SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" |
403 | SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" | 425 | SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" |
@@ -405,11 +427,14 @@ SRC_URI[hex-literal-0.4.1.sha256sum] = "6fe2267d4ed49bc07b63801559be28c718ea06c4 | |||
405 | SRC_URI[hostname-0.4.0.sha256sum] = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" | 427 | SRC_URI[hostname-0.4.0.sha256sum] = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" |
406 | SRC_URI[iana-time-zone-0.1.53.sha256sum] = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" | 428 | SRC_URI[iana-time-zone-0.1.53.sha256sum] = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" |
407 | SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" | 429 | SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" |
408 | SRC_URI[indicatif-0.17.3.sha256sum] = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" | 430 | SRC_URI[indexmap-2.2.6.sha256sum] = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" |
431 | SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" | ||
409 | SRC_URI[inotify-0.9.6.sha256sum] = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" | 432 | SRC_URI[inotify-0.9.6.sha256sum] = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" |
410 | SRC_URI[inotify-sys-0.1.5.sha256sum] = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" | 433 | SRC_URI[inotify-sys-0.1.5.sha256sum] = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" |
434 | SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" | ||
411 | SRC_URI[io-lifetimes-1.0.11.sha256sum] = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" | 435 | SRC_URI[io-lifetimes-1.0.11.sha256sum] = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" |
412 | SRC_URI[itertools-0.12.1.sha256sum] = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" | 436 | SRC_URI[itertools-0.12.1.sha256sum] = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" |
437 | SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" | ||
413 | SRC_URI[itoa-1.0.4.sha256sum] = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" | 438 | SRC_URI[itoa-1.0.4.sha256sum] = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" |
414 | SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" | 439 | SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" |
415 | SRC_URI[keccak-0.1.4.sha256sum] = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" | 440 | SRC_URI[keccak-0.1.4.sha256sum] = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" |
@@ -417,18 +442,18 @@ SRC_URI[kqueue-1.0.7.sha256sum] = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78 | |||
417 | SRC_URI[kqueue-sys-1.0.3.sha256sum] = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" | 442 | SRC_URI[kqueue-sys-1.0.3.sha256sum] = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" |
418 | SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" | 443 | SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" |
419 | SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" | 444 | SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" |
420 | SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" | 445 | SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" |
421 | SRC_URI[libloading-0.7.4.sha256sum] = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" | 446 | SRC_URI[libloading-0.7.4.sha256sum] = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" |
422 | SRC_URI[libm-0.2.7.sha256sum] = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" | 447 | SRC_URI[libm-0.2.7.sha256sum] = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" |
423 | SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" | 448 | SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" |
424 | SRC_URI[linux-raw-sys-0.4.12.sha256sum] = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" | 449 | SRC_URI[linux-raw-sys-0.4.12.sha256sum] = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" |
425 | SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" | 450 | SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" |
426 | SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" | 451 | SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" |
427 | SRC_URI[lru-0.7.8.sha256sum] = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" | 452 | SRC_URI[lru-0.12.3.sha256sum] = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" |
428 | SRC_URI[lscolors-0.16.0.sha256sum] = "ab0b209ec3976527806024406fe765474b9a1750a0ed4b8f0372364741f50e7b" | 453 | SRC_URI[lscolors-0.16.0.sha256sum] = "ab0b209ec3976527806024406fe765474b9a1750a0ed4b8f0372364741f50e7b" |
429 | SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" | 454 | SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" |
430 | SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" | 455 | SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" |
431 | SRC_URI[memmap2-0.9.0.sha256sum] = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" | 456 | SRC_URI[memmap2-0.9.4.sha256sum] = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" |
432 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" | 457 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" |
433 | SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" | 458 | SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" |
434 | SRC_URI[mio-0.8.11.sha256sum] = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" | 459 | SRC_URI[mio-0.8.11.sha256sum] = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" |
@@ -436,11 +461,12 @@ SRC_URI[nix-0.28.0.sha256sum] = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a97 | |||
436 | SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" | 461 | SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" |
437 | SRC_URI[notify-6.0.1.sha256sum] = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" | 462 | SRC_URI[notify-6.0.1.sha256sum] = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" |
438 | SRC_URI[nu-ansi-term-0.49.0.sha256sum] = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" | 463 | SRC_URI[nu-ansi-term-0.49.0.sha256sum] = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" |
439 | SRC_URI[num-bigint-0.4.4.sha256sum] = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" | 464 | SRC_URI[num-bigint-0.4.5.sha256sum] = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" |
440 | SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" | 465 | SRC_URI[num-conv-0.1.0.sha256sum] = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" |
466 | SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" | ||
441 | SRC_URI[num-modular-0.5.1.sha256sum] = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" | 467 | SRC_URI[num-modular-0.5.1.sha256sum] = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" |
442 | SRC_URI[num-prime-0.4.3.sha256sum] = "5f4e3bc495f6e95bc15a6c0c55ac00421504a5a43d09e3cc455d1fea7015581d" | 468 | SRC_URI[num-prime-0.4.4.sha256sum] = "e238432a7881ec7164503ccc516c014bf009be7984cde1ba56837862543bdec3" |
443 | SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" | 469 | SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" |
444 | SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" | 470 | SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" |
445 | SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" | 471 | SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" |
446 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" | 472 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" |
@@ -450,8 +476,7 @@ SRC_URI[ordered-multimap-0.7.3.sha256sum] = "49203cdcae0030493bad186b28da2fa2564 | |||
450 | SRC_URI[os_display-0.1.3.sha256sum] = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75" | 476 | SRC_URI[os_display-0.1.3.sha256sum] = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75" |
451 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" | 477 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" |
452 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" | 478 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" |
453 | SRC_URI[parse_datetime-0.5.0.sha256sum] = "3bbf4e25b13841080e018a1e666358adfe5e39b6d353f986ca5091c210b586a1" | 479 | SRC_URI[parse_datetime-0.6.0.sha256sum] = "a8720474e3dd4af20cea8716703498b9f3b690f318fa9d9d9e2e38eaf44b96d0" |
454 | SRC_URI[peeking_take_while-0.1.2.sha256sum] = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" | ||
455 | SRC_URI[phf-0.11.2.sha256sum] = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" | 480 | SRC_URI[phf-0.11.2.sha256sum] = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" |
456 | SRC_URI[phf_codegen-0.11.2.sha256sum] = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" | 481 | SRC_URI[phf_codegen-0.11.2.sha256sum] = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" |
457 | SRC_URI[phf_generator-0.11.1.sha256sum] = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" | 482 | SRC_URI[phf_generator-0.11.1.sha256sum] = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" |
@@ -460,15 +485,18 @@ SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94 | |||
460 | SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" | 485 | SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" |
461 | SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" | 486 | SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" |
462 | SRC_URI[platform-info-2.0.3.sha256sum] = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217" | 487 | SRC_URI[platform-info-2.0.3.sha256sum] = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217" |
463 | SRC_URI[portable-atomic-0.3.15.sha256sum] = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" | 488 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" |
489 | SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" | ||
464 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" | 490 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" |
465 | SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" | 491 | SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" |
466 | SRC_URI[proc-macro2-1.0.63.sha256sum] = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" | 492 | SRC_URI[prettyplease-0.2.19.sha256sum] = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" |
493 | SRC_URI[proc-macro-crate-3.1.0.sha256sum] = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" | ||
494 | SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" | ||
467 | SRC_URI[procfs-0.16.0.sha256sum] = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" | 495 | SRC_URI[procfs-0.16.0.sha256sum] = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" |
468 | SRC_URI[procfs-core-0.16.0.sha256sum] = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" | 496 | SRC_URI[procfs-core-0.16.0.sha256sum] = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" |
469 | SRC_URI[quick-error-2.0.1.sha256sum] = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" | 497 | SRC_URI[quick-error-2.0.1.sha256sum] = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" |
470 | SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" | 498 | SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" |
471 | SRC_URI[quote-1.0.29.sha256sum] = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" | 499 | SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" |
472 | SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" | 500 | SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" |
473 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" | 501 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" |
474 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" | 502 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" |
@@ -477,16 +505,16 @@ SRC_URI[rand_pcg-0.3.1.sha256sum] = "59cad018caf63deb318e5a4586d99a24424a364f40f | |||
477 | SRC_URI[rayon-1.10.0.sha256sum] = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" | 505 | SRC_URI[rayon-1.10.0.sha256sum] = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" |
478 | SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" | 506 | SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" |
479 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" | 507 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" |
480 | SRC_URI[redox_syscall-0.5.0.sha256sum] = "13c178f952cc7eac391f3124bd9851d1ac0bdbc4c9de2d892ccd5f0d8b160e96" | 508 | SRC_URI[redox_syscall-0.5.2.sha256sum] = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" |
481 | SRC_URI[reference-counted-singleton-0.1.2.sha256sum] = "f1bfbf25d7eb88ddcbb1ec3d755d0634da8f7657b2cb8b74089121409ab8228f" | 509 | SRC_URI[reference-counted-singleton-0.1.2.sha256sum] = "f1bfbf25d7eb88ddcbb1ec3d755d0634da8f7657b2cb8b74089121409ab8228f" |
482 | SRC_URI[regex-1.10.4.sha256sum] = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" | 510 | SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" |
483 | SRC_URI[regex-automata-0.4.4.sha256sum] = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" | 511 | SRC_URI[regex-automata-0.4.4.sha256sum] = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" |
484 | SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" | 512 | SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" |
485 | SRC_URI[relative-path-1.8.0.sha256sum] = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" | 513 | SRC_URI[relative-path-1.8.0.sha256sum] = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" |
486 | SRC_URI[rlimit-0.10.1.sha256sum] = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" | 514 | SRC_URI[rlimit-0.10.1.sha256sum] = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" |
487 | SRC_URI[roff-0.2.1.sha256sum] = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" | 515 | SRC_URI[roff-0.2.1.sha256sum] = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" |
488 | SRC_URI[rstest-0.19.0.sha256sum] = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" | 516 | SRC_URI[rstest-0.21.0.sha256sum] = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" |
489 | SRC_URI[rstest_macros-0.19.0.sha256sum] = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25" | 517 | SRC_URI[rstest_macros-0.21.0.sha256sum] = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" |
490 | SRC_URI[rust-ini-0.21.0.sha256sum] = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" | 518 | SRC_URI[rust-ini-0.21.0.sha256sum] = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" |
491 | SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" | 519 | SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" |
492 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" | 520 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" |
@@ -494,12 +522,13 @@ SRC_URI[rustix-0.37.26.sha256sum] = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1 | |||
494 | SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" | 522 | SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" |
495 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" | 523 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" |
496 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" | 524 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" |
497 | SRC_URI[self_cell-1.0.3.sha256sum] = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" | 525 | SRC_URI[self_cell-1.0.4.sha256sum] = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" |
498 | SRC_URI[selinux-0.4.0.sha256sum] = "a00576725d21b588213fbd4af84cd7e4cc4304e8e9bd6c0f5a1498a3e2ca6a51" | 526 | SRC_URI[selinux-0.4.4.sha256sum] = "53371b1e9bbbfffd65e5ac3c895c786ec35b7695bdc4a67a8b08c29c8d057e0b" |
499 | SRC_URI[selinux-sys-0.6.2.sha256sum] = "806d381649bb85347189d2350728817418138d11d738e2482cb644ec7f3c755d" | 527 | SRC_URI[selinux-sys-0.6.9.sha256sum] = "89d45498373dc17ec8ebb72e1fd320c015647b0157fc81dddf678e2e00205fec" |
500 | SRC_URI[semver-1.0.14.sha256sum] = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" | 528 | SRC_URI[semver-1.0.14.sha256sum] = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" |
501 | SRC_URI[serde-1.0.193.sha256sum] = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" | 529 | SRC_URI[serde-1.0.203.sha256sum] = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" |
502 | SRC_URI[serde_derive-1.0.193.sha256sum] = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" | 530 | SRC_URI[serde-big-array-0.5.1.sha256sum] = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" |
531 | SRC_URI[serde_derive-1.0.203.sha256sum] = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" | ||
503 | SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" | 532 | SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" |
504 | SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" | 533 | SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" |
505 | SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" | 534 | SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" |
@@ -510,34 +539,36 @@ SRC_URI[signal-hook-registry-1.4.1.sha256sum] = "d8229b473baa5980ac72ef434c4415e | |||
510 | SRC_URI[siphasher-0.3.10.sha256sum] = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" | 539 | SRC_URI[siphasher-0.3.10.sha256sum] = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" |
511 | SRC_URI[slab-0.4.7.sha256sum] = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" | 540 | SRC_URI[slab-0.4.7.sha256sum] = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" |
512 | SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" | 541 | SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" |
513 | SRC_URI[smallvec-1.13.1.sha256sum] = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" | 542 | SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" |
514 | SRC_URI[smawk-0.3.1.sha256sum] = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" | 543 | SRC_URI[smawk-0.3.1.sha256sum] = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" |
515 | SRC_URI[socket2-0.5.3.sha256sum] = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" | 544 | SRC_URI[socket2-0.5.3.sha256sum] = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" |
516 | SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" | 545 | SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" |
517 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" | 546 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" |
518 | SRC_URI[syn-2.0.32.sha256sum] = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" | 547 | SRC_URI[syn-2.0.60.sha256sum] = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" |
519 | SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" | 548 | SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" |
520 | SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" | 549 | SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" |
521 | SRC_URI[terminal_size-0.2.6.sha256sum] = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" | 550 | SRC_URI[terminal_size-0.2.6.sha256sum] = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" |
522 | SRC_URI[terminal_size-0.3.0.sha256sum] = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" | 551 | SRC_URI[terminal_size-0.3.0.sha256sum] = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" |
523 | SRC_URI[textwrap-0.16.1.sha256sum] = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" | 552 | SRC_URI[textwrap-0.16.1.sha256sum] = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" |
524 | SRC_URI[thiserror-1.0.37.sha256sum] = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" | 553 | SRC_URI[thiserror-1.0.61.sha256sum] = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" |
525 | SRC_URI[thiserror-impl-1.0.37.sha256sum] = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" | 554 | SRC_URI[thiserror-impl-1.0.61.sha256sum] = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" |
526 | SRC_URI[time-0.3.20.sha256sum] = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" | 555 | SRC_URI[time-0.3.36.sha256sum] = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" |
527 | SRC_URI[time-core-0.1.0.sha256sum] = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" | 556 | SRC_URI[time-core-0.1.2.sha256sum] = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" |
528 | SRC_URI[time-macros-0.2.8.sha256sum] = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" | 557 | SRC_URI[time-macros-0.2.18.sha256sum] = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" |
529 | SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" | 558 | SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" |
559 | SRC_URI[toml_datetime-0.6.6.sha256sum] = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" | ||
560 | SRC_URI[toml_edit-0.21.1.sha256sum] = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" | ||
530 | SRC_URI[trim-in-place-0.1.7.sha256sum] = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" | 561 | SRC_URI[trim-in-place-0.1.7.sha256sum] = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" |
531 | SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" | 562 | SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" |
532 | SRC_URI[unicode-ident-1.0.5.sha256sum] = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" | 563 | SRC_URI[unicode-ident-1.0.5.sha256sum] = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" |
533 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" | 564 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" |
534 | SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" | 565 | SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" |
535 | SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" | 566 | SRC_URI[unicode-width-0.1.12.sha256sum] = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" |
536 | SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" | 567 | SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" |
537 | SRC_URI[unindent-0.2.1.sha256sum] = "5aa30f5ea51ff7edfc797c6d3f9ec8cbd8cfedef5371766b7181d33977f4814f" | 568 | SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" |
538 | SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" | 569 | SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" |
539 | SRC_URI[uuid-1.7.0.sha256sum] = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" | 570 | SRC_URI[uuid-1.7.0.sha256sum] = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" |
540 | SRC_URI[uutils_term_grid-0.3.0.sha256sum] = "b389452a568698688dda38802068378a16c15c4af9b153cdd99b65391292bbc7" | 571 | SRC_URI[uutils_term_grid-0.6.0.sha256sum] = "f89defb4adb4ba5703a57abc879f96ddd6263a444cacc446db90bf2617f141fb" |
541 | SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" | 572 | SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" |
542 | SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" | 573 | SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" |
543 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" | 574 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" |
@@ -581,8 +612,11 @@ SRC_URI[windows_x86_64_gnullvm-0.52.0.sha256sum] = "1a657e1e9d3f514745a572a6846d | |||
581 | SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" | 612 | SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" |
582 | SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" | 613 | SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" |
583 | SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" | 614 | SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" |
615 | SRC_URI[winnow-0.5.40.sha256sum] = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" | ||
584 | SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" | 616 | SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" |
585 | SRC_URI[xattr-1.3.1.sha256sum] = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" | 617 | SRC_URI[xattr-1.3.1.sha256sum] = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" |
586 | SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" | 618 | SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" |
587 | SRC_URI[z85-3.0.5.sha256sum] = "2a599daf1b507819c1121f0bf87fa37eb19daac6aff3aefefd4e6e2e0f2020fc" | 619 | SRC_URI[z85-3.0.5.sha256sum] = "2a599daf1b507819c1121f0bf87fa37eb19daac6aff3aefefd4e6e2e0f2020fc" |
588 | SRC_URI[zip-1.1.1.sha256sum] = "f2655979068a1f8fa91cb9e8e5b9d3ee54d18e0ddc358f2f4a395afc0929a84b" | 620 | SRC_URI[zerocopy-0.7.33.sha256sum] = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" |
621 | SRC_URI[zerocopy-derive-0.7.33.sha256sum] = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" | ||
622 | SRC_URI[zip-1.3.0.sha256sum] = "f1f4a27345eb6f7aa7bd015ba7eb4175fa4e1b462a29874b779e0bbcf96c6ac7" | ||
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.26.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.27.bb index 5668aaac5..320739bee 100644 --- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.26.bb +++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.27.bb | |||
@@ -13,7 +13,7 @@ SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main" | |||
13 | # so src/uucore/src/lib/features.rs disables utmpx when targetting musl. | 13 | # so src/uucore/src/lib/features.rs disables utmpx when targetting musl. |
14 | COMPATIBLE_HOST:libc-musl = "null" | 14 | COMPATIBLE_HOST:libc-musl = "null" |
15 | 15 | ||
16 | SRCREV = "f95f363096610d7e5e1556d6d0a32b5018065c4c" | 16 | SRCREV = "9b11753e7cb06b0f76f4221fc237019c0a86f8f5" |
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
19 | require ${BPN}-crates.inc | 19 | require ${BPN}-crates.inc |
@@ -71,3 +71,6 @@ python __anonymous() { | |||
71 | for prog in d.getVar('sbindir_progs').split(): | 71 | for prog in d.getVar('sbindir_progs').split(): |
72 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) | 72 | d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) |
73 | } | 73 | } |
74 | |||
75 | ERROR_QA:remove = "buildpaths" | ||
76 | WARN_QA:append = " buildpaths" | ||
diff --git a/meta-oe/recipes-crypto/botan/botan_3.4.0.bb b/meta-oe/recipes-crypto/botan/botan_3.5.0.bb index 8cd1aa64c..3a40680a4 100644 --- a/meta-oe/recipes-crypto/botan/botan_3.4.0.bb +++ b/meta-oe/recipes-crypto/botan/botan_3.5.0.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | SUMMARY = "Crypto and TLS for C++11" | 1 | SUMMARY = "Crypto and TLS for C++11" |
2 | HOMEPAGE = "https://botan.randombit.net" | 2 | HOMEPAGE = "https://botan.randombit.net" |
3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-2-Clause" |
4 | LIC_FILES_CHKSUM = "file://license.txt;md5=f5254d3abe90ec5bb82c5694ff751546" | 4 | LIC_FILES_CHKSUM = "file://license.txt;md5=573e74513ae3057b04757df65b537de0" |
5 | SECTION = "libs" | 5 | SECTION = "libs" |
6 | 6 | ||
7 | SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" | 7 | SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" |
8 | SRC_URI[sha256sum] = "71843afcc0a2c585f8f33fa304f0b58ae4b9c5d8306f894667b3746044277557" | 8 | SRC_URI[sha256sum] = "67e8dae1ca2468d90de4e601c87d5f31ff492b38e8ab8bcbd02ddf7104ed8a9f" |
9 | 9 | ||
10 | S = "${WORKDIR}/Botan-${PV}" | 10 | S = "${WORKDIR}/Botan-${PV}" |
11 | 11 | ||
@@ -18,8 +18,8 @@ CPU:armv7ve = "armv7" | |||
18 | 18 | ||
19 | do_configure() { | 19 | do_configure() { |
20 | python3 ${S}/configure.py \ | 20 | python3 ${S}/configure.py \ |
21 | --prefix="${D}${exec_prefix}" \ | 21 | --prefix="${exec_prefix}" \ |
22 | --libdir="${D}${libdir}" \ | 22 | --libdir="${libdir}" \ |
23 | --cpu="${CPU}" \ | 23 | --cpu="${CPU}" \ |
24 | --cc-bin="${CXX}" \ | 24 | --cc-bin="${CXX}" \ |
25 | --cxxflags="${CXXFLAGS}" \ | 25 | --cxxflags="${CXXFLAGS}" \ |
@@ -39,8 +39,8 @@ do_compile() { | |||
39 | oe_runmake | 39 | oe_runmake |
40 | } | 40 | } |
41 | do_install() { | 41 | do_install() { |
42 | oe_runmake install | 42 | oe_runmake DESTDIR=${D} install |
43 | sed -i -e "s|${D}||g" ${D}${libdir}/pkgconfig/botan-3.pc | 43 | sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${D}${includedir}/botan-3/botan/build.h |
44 | } | 44 | } |
45 | 45 | ||
46 | PACKAGES += "${PN}-python3" | 46 | PACKAGES += "${PN}-python3" |
diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.2.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb index 504c718b9..54b47ea3f 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.2.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb | |||
@@ -20,7 +20,7 @@ DEPENDS:append:libc-musl = " argp-standalone" | |||
20 | LDFLAGS:append:libc-musl = " -largp" | 20 | LDFLAGS:append:libc-musl = " -largp" |
21 | 21 | ||
22 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" | 22 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" |
23 | SRC_URI[sha256sum] = "219ebf74e8eddf96624a0376477e5a6f8f350a67aaf36e7dadb114d94b3afef4" | 23 | SRC_URI[sha256sum] = "d2be4395b8f503b0ebf4b2d81db90c35a97050a358ee21fe62a0dfb66e5d5522" |
24 | 24 | ||
25 | inherit autotools gettext pkgconfig | 25 | inherit autotools gettext pkgconfig |
26 | 26 | ||
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 9506d0e55..cc8161cc3 100644 --- a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +++ b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb | |||
@@ -38,7 +38,7 @@ USERADD_PACKAGES = "${PN}" | |||
38 | USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" | 38 | USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" |
39 | 39 | ||
40 | do_install:prepend() { | 40 | do_install:prepend() { |
41 | test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py | 41 | test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py |
42 | test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh | 42 | test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh |
43 | rm -rf ${B}/src/${GO_IMPORT}/Dockerfile* | 43 | rm -rf ${B}/src/${GO_IMPORT}/Dockerfile* |
44 | 44 | ||
@@ -75,3 +75,5 @@ INITSCRIPT_NAME = "influxdb" | |||
75 | INITSCRIPT_PARAMS = "defaults" | 75 | INITSCRIPT_PARAMS = "defaults" |
76 | 76 | ||
77 | SYSTEMD_SERVICE:${PN} = "influxdb.service" | 77 | SYSTEMD_SERVICE:${PN} = "influxdb.service" |
78 | |||
79 | CVE_STATUS[CVE-2019-10329] = "cpe-incorrect: Version does not match and only the Jenkins plugin is affected." | ||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb index 578357b48..578357b48 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb | |||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 4bfa1c9ca..ae6581ec7 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc | |||
@@ -23,20 +23,20 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ | |||
23 | file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ | 23 | file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ |
24 | file://lfs64.patch \ | 24 | file://lfs64.patch \ |
25 | file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ | 25 | file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ |
26 | file://0001-Remove-the-compile_time_assert-lines.patch \ | ||
27 | file://0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch \ | ||
28 | " | 26 | " |
29 | SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" | 27 | SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" |
30 | SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157" | 28 | SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20" |
31 | 29 | ||
32 | UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" | 30 | UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags" |
33 | 31 | ||
34 | BINCONFIG_GLOB = "mysql_config" | 32 | BINCONFIG_GLOB = "mysql_config" |
35 | 33 | ||
36 | inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig | 34 | inherit cmake gettext binconfig update-rc.d systemd multilib_script multilib_header pkgconfig |
37 | 35 | ||
38 | MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ | 36 | MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ |
39 | ${PN}-setupdb:${bindir}/mariadb-install-db" | 37 | ${PN}-setupdb:${bindir}/mariadb-install-db \ |
38 | libmysqlclient-dev:${bindir}/mysql_config \ | ||
39 | " | ||
40 | 40 | ||
41 | INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" | 41 | INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" |
42 | INITSCRIPT_NAME:${PN}-server = "mysqld" | 42 | INITSCRIPT_NAME:${PN}-server = "mysqld" |
@@ -160,6 +160,7 @@ mariadb_sysroot_preprocess () { | |||
160 | 160 | ||
161 | do_install() { | 161 | do_install() { |
162 | oe_runmake 'DESTDIR=${D}' install | 162 | oe_runmake 'DESTDIR=${D}' install |
163 | oe_multilib_header mysql/mariadb_version.h mysql/server/my_config.h mysql/server/private/config.h | ||
163 | 164 | ||
164 | install -d ${D}/${sysconfdir}/init.d | 165 | install -d ${D}/${sysconfdir}/init.d |
165 | install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/ | 166 | install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/ |
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch deleted file mode 100644 index 3e42535da..000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch +++ /dev/null | |||
@@ -1,170 +0,0 @@ | |||
1 | From dae52f5916ef59434c93f0b716270f59dd0c3a94 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jan Tojnar <jtojnar@gmail.com> | ||
3 | Date: Sun, 7 Jan 2024 10:19:54 +0100 | ||
4 | Subject: [PATCH] MDEV-33439 Fix build with libxml2 2.12 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | libxml2 2.12.0 made `xmlGetLastError()` return `const` pointer: | ||
10 | |||
11 | https://gitlab.gnome.org/GNOME/libxml2/-/commit/61034116d0a3c8b295c6137956adc3ae55720711 | ||
12 | |||
13 | Clang 16 does not like this: | ||
14 | |||
15 | error: assigning to 'xmlErrorPtr' (aka '_xmlError *') from 'const xmlError *' (aka 'const _xmlError *') discards qualifiers | ||
16 | error: cannot initialize a variable of type 'xmlErrorPtr' (aka '_xmlError *') with an rvalue of type 'const xmlError *' (aka 'const _xmlError *') | ||
17 | |||
18 | Let’s update the variables to `const`. | ||
19 | For older versions, it will be automatically converted. | ||
20 | |||
21 | But then `xmlResetError(xmlError*)` will not like the `const` pointer: | ||
22 | |||
23 | error: no matching function for call to 'xmlResetError' | ||
24 | note: candidate function not viable: 1st argument ('const xmlError *' (aka 'const _xmlError *')) would lose const qualifier | ||
25 | |||
26 | Let’s replace it with `xmlResetLastError()`. | ||
27 | |||
28 | ALso remove `LIBXMLDOC::Xerr` protected member property. | ||
29 | It was introduced in 65b0e5455b547a3d574fa77b34cce23ae3bea0a0 | ||
30 | along with the `xmlResetError` calls. | ||
31 | It does not appear to be used for anything. | ||
32 | |||
33 | Upstream-Status: Backport [https://github.com/MariaDB/server/pull/2983] | ||
34 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
35 | --- | ||
36 | storage/connect/libdoc.cpp | 39 +++++++++++++++++++------------------- | ||
37 | 1 file changed, 19 insertions(+), 20 deletions(-) | ||
38 | |||
39 | diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp | ||
40 | index 67f22ce2..ab588dd4 100644 | ||
41 | --- a/storage/connect/libdoc.cpp | ||
42 | +++ b/storage/connect/libdoc.cpp | ||
43 | @@ -93,7 +93,6 @@ class LIBXMLDOC : public XMLDOCUMENT { | ||
44 | xmlXPathContextPtr Ctxp; | ||
45 | xmlXPathObjectPtr Xop; | ||
46 | xmlXPathObjectPtr NlXop; | ||
47 | - xmlErrorPtr Xerr; | ||
48 | char *Buf; // Temporary | ||
49 | bool Nofreelist; | ||
50 | }; // end of class LIBXMLDOC | ||
51 | @@ -327,7 +326,6 @@ LIBXMLDOC::LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp) | ||
52 | Ctxp = NULL; | ||
53 | Xop = NULL; | ||
54 | NlXop = NULL; | ||
55 | - Xerr = NULL; | ||
56 | Buf = NULL; | ||
57 | Nofreelist = false; | ||
58 | } // end of LIBXMLDOC constructor | ||
59 | @@ -365,8 +363,8 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn) | ||
60 | Encoding = (char*)Docp->encoding; | ||
61 | |||
62 | return false; | ||
63 | - } else if ((Xerr = xmlGetLastError())) | ||
64 | - xmlResetError(Xerr); | ||
65 | + } else if (xmlGetLastError()) | ||
66 | + xmlResetLastError(); | ||
67 | |||
68 | return true; | ||
69 | } // end of ParseFile | ||
70 | @@ -505,9 +503,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn) | ||
71 | #if 1 | ||
72 | // This function does not crash ( | ||
73 | if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) { | ||
74 | - xmlErrorPtr err = xmlGetLastError(); | ||
75 | + const xmlError *err = xmlGetLastError(); | ||
76 | strcpy(g->Message, (err) ? err->message : "Error saving XML doc"); | ||
77 | - xmlResetError(Xerr); | ||
78 | + xmlResetLastError(); | ||
79 | rc = -1; | ||
80 | } // endif Save | ||
81 | // rc = xmlDocDump(of, Docp); | ||
82 | @@ -546,8 +544,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) | ||
83 | if (Nlist) { | ||
84 | xmlXPathFreeNodeSet(Nlist); | ||
85 | |||
86 | - if ((Xerr = xmlGetLastError())) | ||
87 | - xmlResetError(Xerr); | ||
88 | + if (xmlGetLastError()) | ||
89 | + xmlResetLastError(); | ||
90 | |||
91 | Nlist = NULL; | ||
92 | } // endif Nlist | ||
93 | @@ -555,8 +553,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) | ||
94 | if (Xop) { | ||
95 | xmlXPathFreeObject(Xop); | ||
96 | |||
97 | - if ((Xerr = xmlGetLastError())) | ||
98 | - xmlResetError(Xerr); | ||
99 | + if (xmlGetLastError()) | ||
100 | + xmlResetLastError(); | ||
101 | |||
102 | Xop = NULL; | ||
103 | } // endif Xop | ||
104 | @@ -564,8 +562,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) | ||
105 | if (NlXop) { | ||
106 | xmlXPathFreeObject(NlXop); | ||
107 | |||
108 | - if ((Xerr = xmlGetLastError())) | ||
109 | - xmlResetError(Xerr); | ||
110 | + if (xmlGetLastError()) | ||
111 | + xmlResetLastError(); | ||
112 | |||
113 | NlXop = NULL; | ||
114 | } // endif NlXop | ||
115 | @@ -573,8 +571,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) | ||
116 | if (Ctxp) { | ||
117 | xmlXPathFreeContext(Ctxp); | ||
118 | |||
119 | - if ((Xerr = xmlGetLastError())) | ||
120 | - xmlResetError(Xerr); | ||
121 | + if (xmlGetLastError()) | ||
122 | + xmlResetLastError(); | ||
123 | |||
124 | Ctxp = NULL; | ||
125 | } // endif Ctxp | ||
126 | @@ -590,6 +588,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) | ||
127 | /******************************************************************/ | ||
128 | xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) | ||
129 | { | ||
130 | + const xmlError *xerr; | ||
131 | xmlNodeSetPtr nl; | ||
132 | |||
133 | if (trace(1)) | ||
134 | @@ -649,11 +648,11 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) | ||
135 | } else | ||
136 | xmlXPathFreeObject(Xop); // Caused node not found | ||
137 | |||
138 | - if ((Xerr = xmlGetLastError())) { | ||
139 | - strcpy(g->Message, Xerr->message); | ||
140 | - xmlResetError(Xerr); | ||
141 | + if ((xerr = xmlGetLastError())) { | ||
142 | + strcpy(g->Message, xerr->message); | ||
143 | + xmlResetLastError(); | ||
144 | return NULL; | ||
145 | - } // endif Xerr | ||
146 | + } // endif xerr | ||
147 | |||
148 | } // endif Xop | ||
149 | |||
150 | @@ -1079,7 +1078,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp) | ||
151 | /******************************************************************/ | ||
152 | void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) | ||
153 | { | ||
154 | - xmlErrorPtr xerr; | ||
155 | + const xmlError *xerr; | ||
156 | |||
157 | if (trace(1)) | ||
158 | htrc("DeleteChild: node=%p\n", dnp); | ||
159 | @@ -1122,7 +1121,7 @@ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) | ||
160 | if (trace(1)) | ||
161 | htrc("DeleteChild: errmsg=%-.256s\n", xerr->message); | ||
162 | |||
163 | - xmlResetError(xerr); | ||
164 | + xmlResetLastError(); | ||
165 | } // end of DeleteChild | ||
166 | |||
167 | /* -------------------- class XML2NODELIST ---------------------- */ | ||
168 | -- | ||
169 | 2.44.0 | ||
170 | |||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch deleted file mode 100644 index 9a6e28297..000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From cc5f1d0759b367265a1a000287e2ec15c31eb518 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Mon, 26 Feb 2024 14:56:02 +0800 | ||
4 | Subject: [PATCH] Remove the compile_time_assert lines | ||
5 | |||
6 | Remove the problematic compile_time_assert lines to fix the below build | ||
7 | failure on 32-bit arm. | ||
8 | In file included from TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_test.c:38: | ||
9 | TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_fw.c:1438:3: error: 'compile_time_assert' declared as an array with a negative size | ||
10 | 1438 | compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); | ||
11 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
12 | |||
13 | Upstream-Status: Inappropriate [Upstream will bring the asset back | ||
14 | in a new way [1]] | ||
15 | [1] https://jira.mariadb.org/browse/MDEV-33429 | ||
16 | |||
17 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
18 | --- | ||
19 | tests/mysql_client_fw.c | 8 -------- | ||
20 | 1 file changed, 8 deletions(-) | ||
21 | |||
22 | diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c | ||
23 | index c9e64678..5c0c7ce2 100644 | ||
24 | --- a/tests/mysql_client_fw.c | ||
25 | +++ b/tests/mysql_client_fw.c | ||
26 | @@ -1430,14 +1430,6 @@ int main(int argc, char **argv) | ||
27 | tests_to_run[i]= NULL; | ||
28 | } | ||
29 | |||
30 | -#ifdef _WIN32 | ||
31 | - /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */ | ||
32 | - compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728); | ||
33 | -#else | ||
34 | - /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */ | ||
35 | - compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); | ||
36 | -#endif | ||
37 | - | ||
38 | if (mysql_server_init(embedded_server_arg_count, | ||
39 | embedded_server_args, | ||
40 | (char**) embedded_server_groups)) | ||
41 | -- | ||
42 | 2.25.1 | ||
43 | |||
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb index b1d1355e2..b1d1355e2 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb | |||
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 9df4d073f..342aeba85 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 | |||
@@ -13,12 +13,12 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | |||
13 | 1 file changed, 4 deletions(-) | 13 | 1 file changed, 4 deletions(-) |
14 | 14 | ||
15 | diff --git a/configure.ac b/configure.ac | 15 | diff --git a/configure.ac b/configure.ac |
16 | index 401ce30..27f382d 100644 | 16 | index 65715a4..4ad6340 100644 |
17 | --- a/configure.ac | 17 | --- a/configure.ac |
18 | +++ b/configure.ac | 18 | +++ b/configure.ac |
19 | @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros | 19 | @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros |
20 | 20 | ||
21 | AC_INIT([PostgreSQL], [16.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) | 21 | AC_INIT([PostgreSQL], [16.4], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) |
22 | 22 | ||
23 | -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. | 23 | -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. |
24 | -Untested combinations of 'autoconf' and PostgreSQL versions are not | 24 | -Untested combinations of 'autoconf' and PostgreSQL versions are not |
@@ -28,5 +28,5 @@ index 401ce30..27f382d 100644 | |||
28 | AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) | 28 | AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) |
29 | AC_CONFIG_AUX_DIR(config) | 29 | AC_CONFIG_AUX_DIR(config) |
30 | -- | 30 | -- |
31 | 2.25.1 | 31 | 2.34.1 |
32 | 32 | ||
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index 2dd7dd6fd..4fc2e47b3 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc | |||
@@ -19,7 +19,7 @@ DESCRIPTION = "\ | |||
19 | " | 19 | " |
20 | HOMEPAGE = "http://www.postgresql.com" | 20 | HOMEPAGE = "http://www.postgresql.com" |
21 | LICENSE = "0BSD" | 21 | LICENSE = "0BSD" |
22 | DEPENDS = "libnsl2 readline tzcode-native" | 22 | DEPENDS = "libnsl2 tzcode-native perl" |
23 | 23 | ||
24 | ARM_INSTRUCTION_SET = "arm" | 24 | ARM_INSTRUCTION_SET = "arm" |
25 | 25 | ||
@@ -37,7 +37,7 @@ LEAD_SONAME = "libpq.so" | |||
37 | export LDFLAGS_SL = "${LDFLAGS}" | 37 | export LDFLAGS_SL = "${LDFLAGS}" |
38 | export LDFLAGS_EX_BE = "-Wl,--export-dynamic" | 38 | export LDFLAGS_EX_BE = "-Wl,--export-dynamic" |
39 | 39 | ||
40 | inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base multilib_header | 40 | inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext perl-version multilib_header |
41 | 41 | ||
42 | CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" | 42 | CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" |
43 | 43 | ||
@@ -55,7 +55,7 @@ pkg_postinst:${PN} () { | |||
55 | 55 | ||
56 | PACKAGECONFIG ??= " \ | 56 | PACKAGECONFIG ??= " \ |
57 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \ | 57 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \ |
58 | openssl python uuid libxml tcl perl zlib icu \ | 58 | openssl python uuid libxml tcl perl zlib icu readline \ |
59 | " | 59 | " |
60 | PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native," | 60 | PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native," |
61 | PACKAGECONFIG[perl] = "--with-perl,--without-perl,perl,perl" | 61 | PACKAGECONFIG[perl] = "--with-perl,--without-perl,perl,perl" |
@@ -71,6 +71,7 @@ PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" | |||
71 | PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4" | 71 | PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4" |
72 | PACKAGECONFIG[openssl] = "--with-ssl=openssl,ac_cv_file__dev_urandom=yes,openssl" | 72 | PACKAGECONFIG[openssl] = "--with-ssl=openssl,ac_cv_file__dev_urandom=yes,openssl" |
73 | PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu,icu" | 73 | PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu,icu" |
74 | PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" | ||
74 | 75 | ||
75 | EXTRA_OECONF += "--enable-thread-safety --disable-rpath \ | 76 | EXTRA_OECONF += "--enable-thread-safety --disable-rpath \ |
76 | --datadir=${datadir}/${BPN} \ | 77 | --datadir=${datadir}/${BPN} \ |
@@ -122,6 +123,12 @@ python populate_packages:prepend() { | |||
122 | 123 | ||
123 | } | 124 | } |
124 | 125 | ||
126 | # Same as the function in cpan-base.bbclass (but without the perl RDEPENDS) | ||
127 | def is_target(d): | ||
128 | if not bb.data.inherits_class('native', d): | ||
129 | return "yes" | ||
130 | return "no" | ||
131 | |||
125 | # This will make native perl use target settings (for include dirs etc.) | 132 | # This will make native perl use target settings (for include dirs etc.) |
126 | export PERLCONFIGTARGET = "${@is_target(d)}" | 133 | export PERLCONFIGTARGET = "${@is_target(d)}" |
127 | export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}" | 134 | export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}" |
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb b/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb index 6df719cd9..1a47369e4 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb +++ b/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb | |||
@@ -11,6 +11,6 @@ SRC_URI += "\ | |||
11 | file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \ | 11 | file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585" | 14 | SRC_URI[sha256sum] = "971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f" |
15 | 15 | ||
16 | CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it." | 16 | 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-dbs/rocksdb/files/static_library_as_option.patch b/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch new file mode 100644 index 000000000..9a85e8db4 --- /dev/null +++ b/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch | |||
@@ -0,0 +1,71 @@ | |||
1 | From 285d306494bde3e9c24c8cd6fea1eb380a304d03 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bindu-Bhabu <bindudaniel1996@gmail.com> | ||
3 | Date: Fri, 26 Jul 2024 15:14:45 +0530 | ||
4 | Subject: Add option to CMake for building static libraries | ||
5 | |||
6 | ROCKSDB creates a STATIC library target reference by default. | ||
7 | Modify the cmake so that the STATIC library is also an option | ||
8 | just like creating a SHARED library and set default to ON. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/12890] | ||
11 | |||
12 | Signed-off-by: Nisha Parrakat <nisha.m.parrakat@bmw.de> | ||
13 | Signed-off-by: Bindu Bhabu <bhabu.bindu@kpit.com> | ||
14 | --- | ||
15 | CMakeLists.txt | 29 +++++++++++++++++------------ | ||
16 | 1 file changed, 17 insertions(+), 12 deletions(-) | ||
17 | |||
18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
19 | index 93b884dd9c1..2ca925d505c 100644 | ||
20 | --- a/CMakeLists.txt | ||
21 | +++ b/CMakeLists.txt | ||
22 | @@ -98,6 +98,7 @@ if (WITH_WINDOWS_UTF8_FILENAMES) | ||
23 | add_definitions(-DROCKSDB_WINDOWS_UTF8_FILENAMES) | ||
24 | endif() | ||
25 | option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON) | ||
26 | +option(ROCKSDB_BUILD_STATIC "Build static versions of the RocksDB libraries" ON) | ||
27 | |||
28 | if( NOT DEFINED CMAKE_CXX_STANDARD ) | ||
29 | set(CMAKE_CXX_STANDARD 17) | ||
30 | @@ -1139,11 +1140,13 @@ string(REGEX REPLACE "[^0-9: /-]+" "" GIT_DATE "${GIT_DATE}") | ||
31 | set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc) | ||
32 | configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY) | ||
33 | |||
34 | -add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC}) | ||
35 | -target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC | ||
36 | - $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>) | ||
37 | -target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE | ||
38 | - ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) | ||
39 | +if(ROCKSDB_BUILD_STATIC) | ||
40 | + add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC}) | ||
41 | + target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC | ||
42 | + $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>) | ||
43 | + target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE | ||
44 | + ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) | ||
45 | +endif() | ||
46 | |||
47 | if(ROCKSDB_BUILD_SHARED) | ||
48 | add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES} ${BUILD_VERSION_CC}) | ||
49 | @@ -1238,13 +1241,15 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) | ||
50 | |||
51 | install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) | ||
52 | |||
53 | - install( | ||
54 | - TARGETS ${ROCKSDB_STATIC_LIB} | ||
55 | - EXPORT RocksDBTargets | ||
56 | - COMPONENT devel | ||
57 | - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
58 | - INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" | ||
59 | - ) | ||
60 | + if(ROCKSDB_BUILD_STATIC) | ||
61 | + install( | ||
62 | + TARGETS ${ROCKSDB_STATIC_LIB} | ||
63 | + EXPORT RocksDBTargets | ||
64 | + COMPONENT devel | ||
65 | + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
66 | + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" | ||
67 | + ) | ||
68 | + endif() | ||
69 | |||
70 | if(ROCKSDB_BUILD_SHARED) | ||
71 | install( | ||
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb index 444351dbb..fae54fdba 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt | |||
17 | file://0005-Implement-timer-implementation-for-mips-platform.patch \ | 17 | file://0005-Implement-timer-implementation-for-mips-platform.patch \ |
18 | file://0006-Implement-timer-for-arm-v6.patch \ | 18 | file://0006-Implement-timer-for-arm-v6.patch \ |
19 | file://0007-Fix-declaration-scope-of-LE_LOAD32-in-crc32c.patch \ | 19 | file://0007-Fix-declaration-scope-of-LE_LOAD32-in-crc32c.patch \ |
20 | file://static_library_as_option.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" | 23 | SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" |
@@ -43,6 +44,7 @@ EXTRA_OECMAKE = "\ | |||
43 | -DWITH_BENCHMARK_TOOLS=OFF \ | 44 | -DWITH_BENCHMARK_TOOLS=OFF \ |
44 | -DWITH_TOOLS=OFF \ | 45 | -DWITH_TOOLS=OFF \ |
45 | -DFAIL_ON_WARNINGS=OFF \ | 46 | -DFAIL_ON_WARNINGS=OFF \ |
47 | -DROCKSDB_BUILD_STATIC=OFF \ | ||
46 | " | 48 | " |
47 | 49 | ||
48 | CXXFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}" | 50 | CXXFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}" |
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch index 5242b29e0..6fecf2560 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 738549dea7a4e6c462a79962c414eaa450c2cffd Mon Sep 17 00:00:00 2001 | 1 | From 11faa06436fdeb0c9948080a11f9a99d3b5ba16c Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 9 Apr 2020 13:06:27 -0700 | 3 | Date: Thu, 9 Apr 2020 13:06:27 -0700 |
4 | Subject: [PATCH 1/3] absl: always use <asm/sgidefs.h> | 4 | Subject: [PATCH] absl: always use <asm/sgidefs.h> |
5 | 5 | ||
6 | Fixes mips/musl build, since sgidefs.h is not present on all C libraries | 6 | Fixes mips/musl build, since sgidefs.h is not present on all C libraries |
7 | but on linux asm/sgidefs.h is there and contains same definitions, using | 7 | but on linux asm/sgidefs.h is there and contains same definitions, using |
@@ -10,13 +10,12 @@ that makes it portable. | |||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | 11 | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
14 | --- | 13 | --- |
15 | absl/base/internal/direct_mmap.h | 6 +----- | 14 | absl/base/internal/direct_mmap.h | 6 +----- |
16 | 1 file changed, 1 insertion(+), 5 deletions(-) | 15 | 1 file changed, 1 insertion(+), 5 deletions(-) |
17 | 16 | ||
18 | diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h | 17 | diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h |
19 | index e492bb0..c8a4fba 100644 | 18 | index 1beb2ee4..140b0697 100644 |
20 | --- a/absl/base/internal/direct_mmap.h | 19 | --- a/absl/base/internal/direct_mmap.h |
21 | +++ b/absl/base/internal/direct_mmap.h | 20 | +++ b/absl/base/internal/direct_mmap.h |
22 | @@ -41,13 +41,9 @@ | 21 | @@ -41,13 +41,9 @@ |
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch index b92a48752..d49e860f2 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch | |||
@@ -1,20 +1,19 @@ | |||
1 | From d25cf3b9aa873595a19e197cc29ab46c0093bff1 Mon Sep 17 00:00:00 2001 | 1 | From a573ccd57e713486e7d8e782d6b3b34fde01ff9e Mon Sep 17 00:00:00 2001 |
2 | From: Sinan Kaya <sinan.kaya@microsoft.com> | 2 | From: Sinan Kaya <sinan.kaya@microsoft.com> |
3 | Date: Mon, 3 Feb 2020 03:25:57 +0000 | 3 | Date: Mon, 3 Feb 2020 03:25:57 +0000 |
4 | Subject: [PATCH 2/3] Remove maes option from cross-compilation | 4 | Subject: [PATCH] Remove maes option from cross-compilation |
5 | 5 | ||
6 | --- | ||
7 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
8 | 7 | --- | |
9 | absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- | 8 | absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- |
10 | absl/copts/GENERATED_copts.bzl | 4 ---- | 9 | absl/copts/GENERATED_copts.bzl | 4 ---- |
11 | 2 files changed, 8 deletions(-) | 10 | 2 files changed, 8 deletions(-) |
12 | 11 | ||
13 | diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake | 12 | diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake |
14 | index a4ab1aa2041e..23b9253c1f00 100644 | 13 | index da2282fe..5e0e8dfd 100644 |
15 | --- a/absl/copts/GENERATED_AbseilCopts.cmake | 14 | --- a/absl/copts/GENERATED_AbseilCopts.cmake |
16 | +++ b/absl/copts/GENERATED_AbseilCopts.cmake | 15 | +++ b/absl/copts/GENERATED_AbseilCopts.cmake |
17 | @@ -158,7 +158,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS | 16 | @@ -229,7 +229,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS |
18 | list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS | 17 | list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS |
19 | ) | 18 | ) |
20 | 19 | ||
@@ -23,10 +22,10 @@ index a4ab1aa2041e..23b9253c1f00 100644 | |||
23 | - "-msse4.1" | 22 | - "-msse4.1" |
24 | -) | 23 | -) |
25 | diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl | 24 | diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl |
26 | index a6efc98e11d4..1e847f769501 100644 | 25 | index b9e0071e..0072008c 100644 |
27 | --- a/absl/copts/GENERATED_copts.bzl | 26 | --- a/absl/copts/GENERATED_copts.bzl |
28 | +++ b/absl/copts/GENERATED_copts.bzl | 27 | +++ b/absl/copts/GENERATED_copts.bzl |
29 | @@ -159,7 +159,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [ | 28 | @@ -230,7 +230,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [ |
30 | ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [ | 29 | ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [ |
31 | ] | 30 | ] |
32 | 31 | ||
@@ -35,5 +34,5 @@ index a6efc98e11d4..1e847f769501 100644 | |||
35 | - "-msse4.1", | 34 | - "-msse4.1", |
36 | -] | 35 | -] |
37 | -- | 36 | -- |
38 | 2.36.1 | 37 | 2.25.1 |
39 | 38 | ||
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch index 1a80a428b..c82b9e1b5 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch | |||
@@ -1,24 +1,24 @@ | |||
1 | From fb24c3e3539b5743d398a429a302a3886186f261 Mon Sep 17 00:00:00 2001 | 1 | From 632632508daf8bb3a5800dac937ffc33c6d85973 Mon Sep 17 00:00:00 2001 |
2 | From: Jonas Gorski <jonas.gorski@bisdn.de> | 2 | From: Jonas Gorski <jonas.gorski@bisdn.de> |
3 | Date: Thu, 16 Jun 2022 11:46:31 +0000 | 3 | Date: Thu, 16 Jun 2022 11:46:31 +0000 |
4 | Subject: [PATCH 3/3] Remove neon option from cross compilation | 4 | Subject: [PATCH] Remove neon option from cross compilation |
5 | 5 | ||
6 | Not every arm platform supports neon instructions, so do not enforce | 6 | Not every arm platform supports neon instructions, so do not enforce |
7 | them. | 7 | them. |
8 | 8 | ||
9 | Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de> | ||
10 | --- | ||
11 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
12 | 10 | ||
11 | Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de> | ||
12 | --- | ||
13 | absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- | 13 | absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- |
14 | absl/copts/GENERATED_copts.bzl | 4 ---- | 14 | absl/copts/GENERATED_copts.bzl | 4 ---- |
15 | 2 files changed, 8 deletions(-) | 15 | 2 files changed, 8 deletions(-) |
16 | 16 | ||
17 | diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake | 17 | diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake |
18 | index 23b9253c1f00..5d112a97f3e4 100644 | 18 | index 5e0e8dfd..57cfc4d3 100644 |
19 | --- a/absl/copts/GENERATED_AbseilCopts.cmake | 19 | --- a/absl/copts/GENERATED_AbseilCopts.cmake |
20 | +++ b/absl/copts/GENERATED_AbseilCopts.cmake | 20 | +++ b/absl/copts/GENERATED_AbseilCopts.cmake |
21 | @@ -147,10 +147,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS | 21 | @@ -218,10 +218,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS |
22 | "/DNOMINMAX" | 22 | "/DNOMINMAX" |
23 | ) | 23 | ) |
24 | 24 | ||
@@ -30,10 +30,10 @@ index 23b9253c1f00..5d112a97f3e4 100644 | |||
30 | "-march=armv8-a+crypto" | 30 | "-march=armv8-a+crypto" |
31 | ) | 31 | ) |
32 | diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl | 32 | diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl |
33 | index 1e847f769501..3e10db204faf 100644 | 33 | index 0072008c..72840fda 100644 |
34 | --- a/absl/copts/GENERATED_copts.bzl | 34 | --- a/absl/copts/GENERATED_copts.bzl |
35 | +++ b/absl/copts/GENERATED_copts.bzl | 35 | +++ b/absl/copts/GENERATED_copts.bzl |
36 | @@ -148,10 +148,6 @@ ABSL_MSVC_TEST_FLAGS = [ | 36 | @@ -219,10 +219,6 @@ ABSL_MSVC_TEST_FLAGS = [ |
37 | "/DNOMINMAX", | 37 | "/DNOMINMAX", |
38 | ] | 38 | ] |
39 | 39 | ||
@@ -45,5 +45,5 @@ index 1e847f769501..3e10db204faf 100644 | |||
45 | "-march=armv8-a+crypto", | 45 | "-march=armv8-a+crypto", |
46 | ] | 46 | ] |
47 | -- | 47 | -- |
48 | 2.36.1 | 48 | 2.25.1 |
49 | 49 | ||
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch deleted file mode 100644 index 461df7a60..000000000 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: aurel32 <aurelien@aurel32.net> | ||
3 | Date: Fri, 22 Mar 2024 14:21:13 -0700 | ||
4 | Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support | ||
5 | |||
6 | Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644 | ||
7 | |||
8 | Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear. | ||
9 | |||
10 | The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2]. | ||
11 | |||
12 | Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units. | ||
13 | |||
14 | This fixes the testsuite on riscv64, tested on a VisionFive 2 board. | ||
15 | |||
16 | [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 | ||
17 | [2] https://github.com/abseil/abseil-cpp/pull/1631 | ||
18 | Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1 | ||
19 | |||
20 | Merging this change closes #1644 | ||
21 | |||
22 | COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71 | ||
23 | PiperOrigin-RevId: 618286262 | ||
24 | Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652 | ||
25 | |||
26 | Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/7335a36d] | ||
27 | [Adapted to apply on top of meta-oe's patch stack] | ||
28 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
29 | --- | ||
30 | absl/base/internal/unscaledcycleclock.cc | 12 ------------ | ||
31 | absl/base/internal/unscaledcycleclock_config.h | 5 ++--- | ||
32 | 2 files changed, 2 insertions(+), 15 deletions(-) | ||
33 | |||
34 | diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc | ||
35 | index f11fecb3..103b4f6a 100644 | ||
36 | --- a/absl/base/internal/unscaledcycleclock.cc | ||
37 | +++ b/absl/base/internal/unscaledcycleclock.cc | ||
38 | @@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() { | ||
39 | return aarch64_timer_frequency; | ||
40 | } | ||
41 | |||
42 | -#elif defined(__riscv) | ||
43 | - | ||
44 | -int64_t UnscaledCycleClock::Now() { | ||
45 | - int64_t virtual_timer_value; | ||
46 | - asm volatile("rdcycle %0" : "=r"(virtual_timer_value)); | ||
47 | - return virtual_timer_value; | ||
48 | -} | ||
49 | - | ||
50 | -double UnscaledCycleClock::Frequency() { | ||
51 | - return base_internal::NominalCPUFrequency(); | ||
52 | -} | ||
53 | - | ||
54 | #elif defined(_M_IX86) || defined(_M_X64) | ||
55 | |||
56 | #pragma intrinsic(__rdtsc) | ||
57 | diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h | ||
58 | index 5e232c1a..83552fc5 100644 | ||
59 | --- a/absl/base/internal/unscaledcycleclock_config.h | ||
60 | +++ b/absl/base/internal/unscaledcycleclock_config.h | ||
61 | @@ -22,7 +22,6 @@ | ||
62 | // The following platforms have an implementation of a hardware counter. | ||
63 | #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ | ||
64 | ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ | ||
65 | - defined(__riscv) || \ | ||
66 | defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) | ||
67 | #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 | ||
68 | #else | ||
69 | @@ -54,8 +53,8 @@ | ||
70 | #if ABSL_USE_UNSCALED_CYCLECLOCK | ||
71 | // This macro can be used to test if UnscaledCycleClock::Frequency() | ||
72 | // is NominalCPUFrequency() on a particular platform. | ||
73 | -#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \ | ||
74 | - defined(_M_IX86) || defined(_M_X64)) | ||
75 | +#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \ | ||
76 | + defined(_M_X64)) | ||
77 | #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY | ||
78 | #endif | ||
79 | #endif | ||
80 | -- | ||
81 | 2.44.0 | ||
82 | |||
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-abseil-ppc-fixes.patch index f2ebd9f08..ba0cd6692 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-abseil-ppc-fixes.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Upstream-Status: Pending | 1 | From f9607924225ca59fb6c60222e6424b84e6f70029 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 21 Sep 2024 20:53:06 +0800 | ||
4 | Subject: [PATCH] abseil: ppc fixes | ||
2 | 5 | ||
3 | An all-in-one patch that fixes several issues: | 6 | An all-in-one patch that fixes several issues: |
4 | 7 | ||
@@ -9,14 +12,24 @@ An all-in-one patch that fixes several issues: | |||
9 | 12 | ||
10 | Sourced from void linux | 13 | Sourced from void linux |
11 | 14 | ||
15 | Upstream-Status: Pending | ||
16 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
18 | --- | ||
19 | absl/base/internal/unscaledcycleclock.cc | 4 ++-- | ||
20 | absl/base/internal/unscaledcycleclock_config.h | 3 ++- | ||
21 | absl/debugging/internal/examine_stack.cc | 8 +++++++- | ||
22 | absl/debugging/internal/stacktrace_config.h | 2 +- | ||
23 | 4 files changed, 12 insertions(+), 5 deletions(-) | ||
13 | 24 | ||
25 | diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc | ||
26 | index a0bf3a65..103b4f6a 100644 | ||
14 | --- a/absl/base/internal/unscaledcycleclock.cc | 27 | --- a/absl/base/internal/unscaledcycleclock.cc |
15 | +++ b/absl/base/internal/unscaledcycleclock.cc | 28 | +++ b/absl/base/internal/unscaledcycleclock.cc |
16 | @@ -20,7 +20,7 @@ | 29 | @@ -20,7 +20,7 @@ |
17 | #include <intrin.h> | 30 | #include <intrin.h> |
18 | #endif | 31 | #endif |
19 | 32 | ||
20 | -#if defined(__powerpc__) || defined(__ppc__) | 33 | -#if defined(__powerpc__) || defined(__ppc__) |
21 | +#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) | 34 | +#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) |
22 | #ifdef __GLIBC__ | 35 | #ifdef __GLIBC__ |
@@ -25,30 +38,34 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
25 | @@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() { | 38 | @@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() { |
26 | return base_internal::NominalCPUFrequency(); | 39 | return base_internal::NominalCPUFrequency(); |
27 | } | 40 | } |
28 | 41 | ||
29 | -#elif defined(__powerpc__) || defined(__ppc__) | 42 | -#elif defined(__powerpc__) || defined(__ppc__) |
30 | +#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) | 43 | +#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) |
31 | 44 | ||
32 | int64_t UnscaledCycleClock::Now() { | 45 | int64_t UnscaledCycleClock::Now() { |
33 | #ifdef __GLIBC__ | 46 | #ifdef __GLIBC__ |
47 | diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h | ||
48 | index 43a3dabe..196a8535 100644 | ||
34 | --- a/absl/base/internal/unscaledcycleclock_config.h | 49 | --- a/absl/base/internal/unscaledcycleclock_config.h |
35 | +++ b/absl/base/internal/unscaledcycleclock_config.h | 50 | +++ b/absl/base/internal/unscaledcycleclock_config.h |
36 | @@ -21,7 +21,8 @@ | 51 | @@ -21,7 +21,8 @@ |
37 | 52 | ||
38 | // The following platforms have an implementation of a hardware counter. | 53 | // The following platforms have an implementation of a hardware counter. |
39 | #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ | 54 | #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ |
40 | - defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ | 55 | - defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) || \ |
41 | + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ | 56 | + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ |
42 | + defined(__riscv) || \ | 57 | + defined(_M_IX86) || \ |
43 | defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) | 58 | (defined(_M_X64) && !defined(_M_ARM64EC)) |
44 | #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 | 59 | #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 |
45 | #else | 60 | #else |
61 | diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc | ||
62 | index 3dd6ba1a..f923b055 100644 | ||
46 | --- a/absl/debugging/internal/examine_stack.cc | 63 | --- a/absl/debugging/internal/examine_stack.cc |
47 | +++ b/absl/debugging/internal/examine_stack.cc | 64 | +++ b/absl/debugging/internal/examine_stack.cc |
48 | @@ -33,6 +33,10 @@ | 65 | @@ -36,6 +36,10 @@ |
49 | #include <csignal> | 66 | #include <csignal> |
50 | #include <cstdio> | 67 | #include <cstdio> |
51 | 68 | ||
52 | +#if defined(__powerpc__) | 69 | +#if defined(__powerpc__) |
53 | +#include <asm/ptrace.h> | 70 | +#include <asm/ptrace.h> |
54 | +#endif | 71 | +#endif |
@@ -56,7 +73,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
56 | #include "absl/base/attributes.h" | 73 | #include "absl/base/attributes.h" |
57 | #include "absl/base/internal/raw_logging.h" | 74 | #include "absl/base/internal/raw_logging.h" |
58 | #include "absl/base/macros.h" | 75 | #include "absl/base/macros.h" |
59 | @@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) { | 76 | @@ -177,8 +181,10 @@ void* GetProgramCounter(void* const vuc) { |
60 | return reinterpret_cast<void*>(context->uc_mcontext.pc); | 77 | return reinterpret_cast<void*>(context->uc_mcontext.pc); |
61 | #elif defined(__powerpc64__) | 78 | #elif defined(__powerpc64__) |
62 | return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); | 79 | return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); |
@@ -68,6 +85,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
68 | #elif defined(__riscv) | 85 | #elif defined(__riscv) |
69 | return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]); | 86 | return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]); |
70 | #elif defined(__s390__) && !defined(__s390x__) | 87 | #elif defined(__s390__) && !defined(__s390x__) |
88 | diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h | ||
89 | index 3929b1b7..23d5e504 100644 | ||
71 | --- a/absl/debugging/internal/stacktrace_config.h | 90 | --- a/absl/debugging/internal/stacktrace_config.h |
72 | +++ b/absl/debugging/internal/stacktrace_config.h | 91 | +++ b/absl/debugging/internal/stacktrace_config.h |
73 | @@ -60,7 +60,7 @@ | 92 | @@ -60,7 +60,7 @@ |
@@ -79,3 +98,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
79 | #define ABSL_STACKTRACE_INL_HEADER \ | 98 | #define ABSL_STACKTRACE_INL_HEADER \ |
80 | "absl/debugging/internal/stacktrace_powerpc-inl.inc" | 99 | "absl/debugging/internal/stacktrace_powerpc-inl.inc" |
81 | #elif defined(__aarch64__) | 100 | #elif defined(__aarch64__) |
101 | -- | ||
102 | 2.25.1 | ||
103 | |||
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb index 87ab23931..f44a5d908 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb | |||
@@ -7,14 +7,13 @@ SECTION = "libs" | |||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" |
9 | 9 | ||
10 | SRCREV = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a" | 10 | SRCREV = "4447c7562e3bc702ade25105912dce503f0c4010" |
11 | BRANCH = "lts_2024_01_16" | 11 | BRANCH = "lts_2024_07_22" |
12 | SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ | 12 | SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ |
13 | file://0001-absl-always-use-asm-sgidefs.h.patch \ | 13 | file://0001-absl-always-use-asm-sgidefs.h.patch \ |
14 | file://0002-Remove-maes-option-from-cross-compilation.patch \ | 14 | file://0002-Remove-maes-option-from-cross-compilation.patch \ |
15 | file://abseil-ppc-fixes.patch \ | ||
16 | file://0003-Remove-neon-option-from-cross-compilation.patch \ | 15 | file://0003-Remove-neon-option-from-cross-compilation.patch \ |
17 | file://0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \ | 16 | file://0004-abseil-ppc-fixes.patch \ |
18 | " | 17 | " |
19 | 18 | ||
20 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service index ddf8d7f74..b6661f2e3 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service +++ b/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service | |||
@@ -1,6 +1,6 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Description=Android Debug Bridge | 2 | Description=Android Debug Bridge |
3 | ConditionPathExists=/var/usb-debugging-enabled | 3 | ConditionPathExists=/etc/usb-debugging-enabled |
4 | Before=android-system.service | 4 | Before=android-system.service |
5 | 5 | ||
6 | [Service] | 6 | [Service] |
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 6343256d3..a291fc39a 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 | |||
@@ -189,7 +189,12 @@ FILES:${PN}-fstools = "\ | |||
189 | BBCLASSEXTEND = "native" | 189 | BBCLASSEXTEND = "native" |
190 | 190 | ||
191 | android_tools_enable_devmode() { | 191 | android_tools_enable_devmode() { |
192 | touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled | 192 | touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled |
193 | } | 193 | } |
194 | 194 | ||
195 | ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" | 195 | ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" |
196 | |||
197 | # http://errors.yoctoproject.org/Errors/Details/766881/ | ||
198 | # 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] | ||
199 | # 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] | ||
200 | CC += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb b/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb index cb4aef522..daeeb975f 100644 --- a/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb +++ b/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb | |||
@@ -12,6 +12,8 @@ S = "${WORKDIR}/git/c++" | |||
12 | 12 | ||
13 | inherit cmake | 13 | inherit cmake |
14 | 14 | ||
15 | CVE_PRODUCT = "capnproto capnp" | ||
16 | |||
15 | CXXFLAGS:append:mips = " -latomic" | 17 | CXXFLAGS:append:mips = " -latomic" |
16 | CXXFLAGS:append:powerpc = " -latomic" | 18 | CXXFLAGS:append:powerpc = " -latomic" |
17 | CXXFLAGS:append:riscv32 = " -latomic" | 19 | CXXFLAGS:append:riscv32 = " -latomic" |
diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb index 5e992845a..bdeab3055 100644 --- a/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb +++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb | |||
@@ -24,6 +24,11 @@ do_install_ptest() { | |||
24 | sed s#${B}#${PTEST_PATH}# ${B}/CTestTestfile.cmake > ${D}${PTEST_PATH}/CTestTestfile.cmake | 24 | sed s#${B}#${PTEST_PATH}# ${B}/CTestTestfile.cmake > ${D}${PTEST_PATH}/CTestTestfile.cmake |
25 | sed s#${B}#${PTEST_PATH}# ${B}/tests/CTestTestfile.cmake > ${D}${PTEST_PATH}/tests/CTestTestfile.cmake | 25 | sed s#${B}#${PTEST_PATH}# ${B}/tests/CTestTestfile.cmake > ${D}${PTEST_PATH}/tests/CTestTestfile.cmake |
26 | sed s#${B}#${PTEST_PATH}# ${B}/fuzzing/CTestTestfile.cmake > ${D}${PTEST_PATH}/fuzzing/CTestTestfile.cmake | 26 | sed s#${B}#${PTEST_PATH}# ${B}/fuzzing/CTestTestfile.cmake > ${D}${PTEST_PATH}/fuzzing/CTestTestfile.cmake |
27 | # The cmake files also contain full paths to original CMakeLists.txt file in _BACKTRACE_TRIPLES property; | ||
28 | # these are not needed for successful ptests as we don't install the CMakeLists.txt files anyway. | ||
29 | sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/CTestTestfile.cmake | ||
30 | sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/tests/CTestTestfile.cmake | ||
31 | sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/fuzzing/CTestTestfile.cmake | ||
27 | # install test artifacts | 32 | # install test artifacts |
28 | install ${B}/cJSON_test ${D}${PTEST_PATH} | 33 | install ${B}/cJSON_test ${D}${PTEST_PATH} |
29 | install ${B}/tests/cjson_add ${B}/tests/*_tests ${B}/tests/parse_* ${B}/tests/print_* ${B}/tests/readme_examples ${D}${PTEST_PATH}/tests/ | 34 | install ${B}/tests/cjson_add ${B}/tests/*_tests ${B}/tests/parse_* ${B}/tests/print_* ${B}/tests/readme_examples ${D}${PTEST_PATH}/tests/ |
diff --git a/meta-oe/recipes-devtools/cloc/cloc_1.98.bb b/meta-oe/recipes-devtools/cloc/cloc_1.98.bb index ea5f00669..acf882cc7 100644 --- a/meta-oe/recipes-devtools/cloc/cloc_1.98.bb +++ b/meta-oe/recipes-devtools/cloc/cloc_1.98.bb | |||
@@ -8,6 +8,7 @@ SRC_URI = "https://github.com/AlDanial/cloc/releases/download/v${PV}/${BP}.tar.g | |||
8 | SRC_URI[sha256sum] = "5fe0b159eb75718df7308a4f61470eaddf82170733929999e37a3fbb4651cf8a" | 8 | SRC_URI[sha256sum] = "5fe0b159eb75718df7308a4f61470eaddf82170733929999e37a3fbb4651cf8a" |
9 | 9 | ||
10 | UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases" | 10 | UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases" |
11 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
11 | 12 | ||
12 | do_configure[noexec] = "1" | 13 | do_configure[noexec] = "1" |
13 | do_compile[noexec] = "1" | 14 | do_compile[noexec] = "1" |
diff --git a/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb b/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb new file mode 100644 index 000000000..0d7bdc83d --- /dev/null +++ b/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "C++ Code Generator library" | ||
2 | BUGTRACKER = "https://github.com/rm5248/libcppgenerate/issues" | ||
3 | SECTION = "libs" | ||
4 | LICENSE = "Apache-2.0" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" | ||
6 | |||
7 | SRC_URI = "git://github.com/rm5248/libcppgenerate.git;branch=master;protocol=https" | ||
8 | SRCREV = "930c5503f76c877b72b9ff8546353d6f422bd010" | ||
9 | |||
10 | S = "${WORKDIR}/git" | ||
11 | |||
12 | inherit cmake | ||
13 | |||
14 | BBCLASSEXTEND="native nativesdk" | ||
diff --git a/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb b/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb new file mode 100644 index 000000000..b404d4131 --- /dev/null +++ b/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | SUMMARY = "Cpuset manipulation tool" | ||
2 | HOMEPAGE = "https://github.com/SUSE/cpuset" | ||
3 | LICENSE = "GPL-2.0-only" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
5 | |||
6 | SRC_URI = "git://github.com/SUSE/cpuset.git;protocol=https;branch=master" | ||
7 | |||
8 | SRCREV = "4f80263208935f0df4f616cf9d8cb7285599a670" | ||
9 | S = "${WORKDIR}/git" | ||
10 | |||
11 | inherit setuptools3 | ||
12 | |||
13 | RDEPENDS:${PN} += "python3-core python3-logging python3-pydoc" | ||
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.1.20240915.0.bb index f8add448b..247e1a844 100644 --- a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb +++ b/meta-oe/recipes-devtools/ctags/ctags_6.1.20240915.0.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | |||
14 | 14 | ||
15 | inherit autotools-brokensep pkgconfig manpages | 15 | inherit autotools-brokensep pkgconfig manpages |
16 | 16 | ||
17 | SRCREV = "653ca9204527fe1da7ecf97c3da4308f9ab17d2c" | 17 | SRCREV = "40b58618f9f0dc4123a205cbd50b73c6ab2e6f5c" |
18 | SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" | 18 | SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" |
19 | 19 | ||
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch index 12dd23810..faa66e026 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch | |||
@@ -1,20 +1,20 @@ | |||
1 | From 87d0174e8d56e7458dc94f05f82ab7a67a5cf7d0 Mon Sep 17 00:00:00 2001 | 1 | From 6c8b0a3f9c09a7a135d95ff18038bcba22e87b86 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Thu, 8 Apr 2021 14:06:05 +0800 | 3 | Date: Thu, 8 Apr 2021 14:06:05 +0800 |
4 | Subject: [PATCH 1/2] support to override /usr/sbin and /usr/share | 4 | Subject: [PATCH] support to override /usr/sbin and /usr/share |
5 | 5 | ||
6 | Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] | 6 | Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] |
7 | 7 | ||
8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
9 | --- | 9 | --- |
10 | Makefile | 12 +++++++----- | 10 | Makefile | 10 ++++++---- |
11 | 1 file changed, 7 insertions(+), 5 deletions(-) | 11 | 1 file changed, 6 insertions(+), 4 deletions(-) |
12 | 12 | ||
13 | diff --git a/Makefile b/Makefile | 13 | diff --git a/Makefile b/Makefile |
14 | index 8516803..a2d8c00 100644 | 14 | index 21a9a39..649f465 100644 |
15 | --- a/Makefile | 15 | --- a/Makefile |
16 | +++ b/Makefile | 16 | +++ b/Makefile |
17 | @@ -5,14 +5,16 @@ all: | 17 | @@ -5,13 +5,15 @@ all: |
18 | 18 | ||
19 | clean: | 19 | clean: |
20 | 20 | ||
@@ -28,14 +28,12 @@ index 8516803..a2d8c00 100644 | |||
28 | + mkdir -p $(DESTDIR)$(sbindir) | 28 | + mkdir -p $(DESTDIR)$(sbindir) |
29 | 29 | ||
30 | cp -a scripts/* $(DSDIR)/scripts/ | 30 | cp -a scripts/* $(DSDIR)/scripts/ |
31 | install -o root -g root -m 0644 functions $(DSDIR)/ | 31 | install -m 0644 functions $(DSDIR)/ |
32 | 32 | ||
33 | - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap | 33 | - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap |
34 | - chown root:root $(DESTDIR)/usr/sbin/debootstrap | ||
35 | - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap | 34 | - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap |
36 | + sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap | 35 | + sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap |
37 | + chown root:root $(DESTDIR)$(sbindir)/debootstrap | ||
38 | + chmod 0755 $(DESTDIR)$(sbindir)/debootstrap | 36 | + chmod 0755 $(DESTDIR)$(sbindir)/debootstrap |
39 | -- | 37 | -- |
40 | 2.17.1 | 38 | 2.25.1 |
41 | 39 | ||
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch index 69329df4e..5de65779d 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f0420b201f2fb5286ccf5657faa6b38cd2680e10 Mon Sep 17 00:00:00 2001 | 1 | From 3fee46c7e50f432fbd5c97c60b918d71c91f1adc Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Thu, 8 Apr 2021 14:08:06 +0800 | 3 | Date: Thu, 8 Apr 2021 14:08:06 +0800 |
4 | Subject: [PATCH 2/2] support to override /usr/bin/arch-test | 4 | Subject: [PATCH] support to override /usr/bin/arch-test |
5 | 5 | ||
6 | Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] | 6 | Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] |
7 | 7 | ||
@@ -11,12 +11,12 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
11 | 1 file changed, 8 insertions(+), 4 deletions(-) | 11 | 1 file changed, 8 insertions(+), 4 deletions(-) |
12 | 12 | ||
13 | diff --git a/debootstrap b/debootstrap | 13 | diff --git a/debootstrap b/debootstrap |
14 | index 9b9e58d..a3cf3af 100755 | 14 | index 552c8d6..11a9465 100755 |
15 | --- a/debootstrap | 15 | --- a/debootstrap |
16 | +++ b/debootstrap | 16 | +++ b/debootstrap |
17 | @@ -51,6 +51,10 @@ INRELEASE_PATH="" | 17 | @@ -51,6 +51,10 @@ INRELEASE_PATH="" |
18 | |||
18 | DEF_MIRROR="http://deb.debian.org/debian" | 19 | DEF_MIRROR="http://deb.debian.org/debian" |
19 | DEF_HTTPS_MIRROR="https://deb.debian.org/debian" | ||
20 | 20 | ||
21 | +if [ -z "$ARCH_TEST" ]; then | 21 | +if [ -z "$ARCH_TEST" ]; then |
22 | + ARCH_TEST="/usr/bin/arch-test" | 22 | + ARCH_TEST="/usr/bin/arch-test" |
@@ -25,7 +25,7 @@ index 9b9e58d..a3cf3af 100755 | |||
25 | # set $CONTAINER | 25 | # set $CONTAINER |
26 | detect_container | 26 | detect_container |
27 | 27 | ||
28 | @@ -645,12 +649,12 @@ fi | 28 | @@ -661,12 +665,12 @@ fi |
29 | 29 | ||
30 | ########################################################################### | 30 | ########################################################################### |
31 | 31 | ||
@@ -43,5 +43,5 @@ index 9b9e58d..a3cf3af 100755 | |||
43 | ret=3 | 43 | ret=3 |
44 | fi | 44 | fi |
45 | -- | 45 | -- |
46 | 2.17.1 | 46 | 2.25.1 |
47 | 47 | ||
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch index 2a5f23316..5cd1ce88a 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e735fb23f46f0c3c7a1144ba6b4050bfc0015a05 Mon Sep 17 00:00:00 2001 | 1 | From e92554e57b4aae242cb0416025883ccc2c539d2a Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Wed, 2 Jun 2021 13:34:35 +0800 | 3 | Date: Wed, 2 Jun 2021 13:34:35 +0800 |
4 | Subject: [PATCH] do not hardcode the full path of dpkg | 4 | Subject: [PATCH] do not hardcode the full path of dpkg |
@@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/debootstrap b/debootstrap | 18 | diff --git a/debootstrap b/debootstrap |
19 | index a3cf3af..5e96c3e 100755 | 19 | index 11a9465..17ab05a 100755 |
20 | --- a/debootstrap | 20 | --- a/debootstrap |
21 | +++ b/debootstrap | 21 | +++ b/debootstrap |
22 | @@ -538,7 +538,7 @@ fi | 22 | @@ -551,7 +551,7 @@ fi |
23 | 23 | ||
24 | if in_path dpkg && \ | 24 | if in_path dpkg && \ |
25 | dpkg --print-architecture >/dev/null 2>&1; then | 25 | dpkg --print-architecture >/dev/null 2>&1; then |
@@ -29,5 +29,5 @@ index a3cf3af..5e96c3e 100755 | |||
29 | udpkg --print-architecture >/dev/null 2>&1; then | 29 | udpkg --print-architecture >/dev/null 2>&1; then |
30 | HOST_ARCH=$(/usr/bin/udpkg --print-architecture) | 30 | HOST_ARCH=$(/usr/bin/udpkg --print-architecture) |
31 | -- | 31 | -- |
32 | 2.27.0 | 32 | 2.25.1 |
33 | 33 | ||
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.bb index c28a51749..d4783b354 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.bb | |||
@@ -2,16 +2,16 @@ SUMMARY = "Install a Debian system into a subdirectory" | |||
2 | HOMEPAGE = "https://wiki.debian.org/Debootstrap" | 2 | HOMEPAGE = "https://wiki.debian.org/Debootstrap" |
3 | SECTION = "devel" | 3 | SECTION = "devel" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608" | 5 | LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7b45429ef05610abf91ac199fdb3a6e" |
6 | 6 | ||
7 | SRC_URI = "\ | 7 | SRC_URI = "\ |
8 | ${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz \ | 8 | ${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz \ |
9 | file://0001-support-to-override-usr-sbin-and-usr-share.patch \ | 9 | file://0001-support-to-override-usr-sbin-and-usr-share.patch \ |
10 | file://0002-support-to-override-usr-bin-arch-test.patch \ | 10 | file://0002-support-to-override-usr-bin-arch-test.patch \ |
11 | file://0001-do-not-hardcode-the-full-path-of-dpkg.patch \ | 11 | file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "d963a465314ac0e8fd5392573def042e6663e8edf3d08ace4bbd0d27ee8431f7" | 14 | SRC_URI[sha256sum] = "666927457ee4b0b3e68e55a0efbf3fb69189610b7abbd534017d7032cb3ae833" |
15 | 15 | ||
16 | S = "${WORKDIR}/debootstrap" | 16 | S = "${WORKDIR}/debootstrap" |
17 | 17 | ||
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb index 8bd0992bd..16a4250b2 100644 --- a/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb +++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb | |||
@@ -12,6 +12,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ | |||
12 | SRC_URI:append:class-native = " file://doxygen-native-only-check-python3.patch" | 12 | SRC_URI:append:class-native = " file://doxygen-native-only-check-python3.patch" |
13 | SRC_URI[sha256sum] = "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0" | 13 | SRC_URI[sha256sum] = "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://github.com/doxygen/doxygen/releases" | ||
16 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
17 | |||
15 | inherit cmake python3native | 18 | inherit cmake python3native |
16 | 19 | ||
17 | EXTRA_OECMAKE += "\ | 20 | EXTRA_OECMAKE += "\ |
diff --git a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb index 2c594d229..b567f11f5 100644 --- a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb +++ b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=38f617473e9f7373b5e79baf437accf8" | |||
7 | SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master" | 7 | SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master" |
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | SRCREV = "fd8cf1e94ecf4e6e4493833f96140cf9bd17578e" | 10 | SRCREV = "e082c947e7f7b14240195d55c060a6e1eda1b0a1" |
11 | 11 | ||
12 | inherit cmake | 12 | inherit cmake |
13 | 13 | ||
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb index 183554e2c..3103fd009 100644 --- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb +++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb | |||
@@ -23,6 +23,11 @@ EXTRA_OECMAKE:append:class-target = " -DFLATBUFFERS_FLATC_EXECUTABLE=${STAGING_B | |||
23 | 23 | ||
24 | inherit cmake python3native | 24 | inherit cmake python3native |
25 | 25 | ||
26 | rm_flatc_cmaketarget_for_target() { | ||
27 | rm -f "${SYSROOT_DESTDIR}/${libdir}/cmake/flatbuffers/FlatcTargets.cmake" | ||
28 | } | ||
29 | SYSROOT_PREPROCESS_FUNCS:class-target += "rm_flatc_cmaketarget_for_target" | ||
30 | |||
26 | FILES:${PN}-compiler = "${bindir}" | 31 | FILES:${PN}-compiler = "${bindir}" |
27 | 32 | ||
28 | BBCLASSEXTEND = "native nativesdk" | 33 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb index 5d3c73fd9..1fab01358 100644 --- a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb +++ b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb | |||
@@ -12,4 +12,4 @@ RDEPENDS:${PN} = "flatbuffers" | |||
12 | 12 | ||
13 | inherit setuptools3 | 13 | inherit setuptools3 |
14 | 14 | ||
15 | BBCLASSEXTEND = "native" | 15 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch b/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch deleted file mode 100644 index a01b28ac6..000000000 --- a/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | Subject: Modify binary name "convert" to "convert.im7" | ||
2 | |||
3 | The change is needed to resolve the below compilation error | ||
4 | after giflib version upgrade. Log data follows: | ||
5 | | DEBUG: Executing shell function do_compile | ||
6 | | NOTE: make -j 8 | ||
7 | | make -C doc | ||
8 | | make[1]: Entering directory '../giflib/5.2.2/giflib-5.2.2/doc' | ||
9 | | convert ../pic/gifgrid.gif -resize 50x50 giflib-logo.gif | ||
10 | | make[1]: convert: No such file or directory | ||
11 | | make[1]: *** [Makefile:46: giflib-logo.gif] Error 127 | ||
12 | | make[1]: Leaving directory '../giflib/5.2.2/giflib-5.2.2/doc' | ||
13 | | make: *** [Makefile:93: all] Error 2 | ||
14 | | ERROR: oe_runmake failed | ||
15 | |||
16 | Added dependency on ImageMagick which includes "convert" utility, | ||
17 | to ensure availability of required tool during compilation process. | ||
18 | |||
19 | This patch updates the binary name used in Makefile from | ||
20 | "convert" to "convert.im7" for resizing the logo image used in HTML | ||
21 | documentation as Imagemagick installs binary in this format. | ||
22 | |||
23 | Below commits justify the cause of adding the suffix to binaries | ||
24 | provided by ImageMagic package: | ||
25 | https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/imagemagick?id=dcbb49f707e7ad9bf755dd3275ffc442154b8144 | ||
26 | https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/imagemagick?id=6e0c24e9b3f9d430dec57f61f8c12c74bca5375d | ||
27 | |||
28 | Signed-off-by: Bhabu Bindu <bhabubindu@kpit.com> | ||
29 | Upstream-Status: Inappropriate [OE specific] | ||
30 | |||
31 | =================================================================== | ||
32 | --- a/doc/Makefile | ||
33 | +++ b/doc/Makefile | ||
34 | @@ -43,7 +43,7 @@ | ||
35 | |||
36 | # Logo image file for HTML docs | ||
37 | giflib-logo.gif: ../pic/gifgrid.gif | ||
38 | - convert $^ -resize 50x50 $@ | ||
39 | + convert.im7 $^ -resize 50x50 $@ | ||
40 | |||
41 | # Philosophical choice: the website gets the internal manual pages | ||
42 | allhtml: $(XMLALL:.xml=.html) giflib-logo.gif | ||
diff --git a/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch b/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch new file mode 100644 index 000000000..dc87ed60b --- /dev/null +++ b/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 7f0cd4b6b56183b0afbefd01425e5ebd2b8733b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <martin.jansa@gmail.com> | ||
3 | Date: Mon, 8 Jul 2024 13:18:11 +0200 | ||
4 | Subject: [PATCH] Makefile: fix typo in soname argument | ||
5 | |||
6 | * introduced in: | ||
7 | https://sourceforge.net/p/giflib/code/ci/b65c7ac2905c0842e7977a7b51d83af4486ca7b8/ | ||
8 | there is no LIBUTILMAJOR variable only LIBUTILSOMAJOR leading to: | ||
9 | |||
10 | ld: fatal error: -soname: must take a non-empty argument | ||
11 | collect2: error: ld returned 1 exit status | ||
12 | |||
13 | with some linkers like GOLD | ||
14 | |||
15 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
16 | --- | ||
17 | Upstream-Status: Submitted [https://sourceforge.net/p/giflib/code/merge-requests/17/] | ||
18 | |||
19 | Makefile | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/Makefile b/Makefile | ||
23 | index 87966a9..41b149e 100644 | ||
24 | --- a/Makefile | ||
25 | +++ b/Makefile | ||
26 | @@ -109,7 +109,7 @@ $(LIBUTILSO): $(UOBJECTS) $(UHEADERS) | ||
27 | ifeq ($(UNAME), Darwin) | ||
28 | $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO) | ||
29 | else | ||
30 | - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS) | ||
31 | + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILSOMAJOR) -o $(LIBUTILSO) $(UOBJECTS) | ||
32 | endif | ||
33 | |||
34 | libutil.a: $(UOBJECTS) $(UHEADERS) | ||
diff --git a/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb b/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb index 7d8a175fe..aa47f9309 100644 --- a/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb +++ b/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb | |||
@@ -5,14 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" | |||
5 | 5 | ||
6 | CVE_PRODUCT = "giflib_project:giflib" | 6 | CVE_PRODUCT = "giflib_project:giflib" |
7 | 7 | ||
8 | DEPENDS = "xmlto-native imagemagick-native" | 8 | DEPENDS = "xmlto-native" |
9 | 9 | ||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz \ | 10 | SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz \ |
11 | file://add_suffix_to_convert_binary_used_in_Makefile.patch" | 11 | https://sourceforge.net/p/giflib/code/ci/d54b45b0240d455bbaedee4be5203d2703e59967/tree/doc/giflib-logo.gif?format=raw;subdir=${BP}/doc;name=logo;downloadfilename=giflib-logo.gif \ |
12 | file://0001-Makefile-fix-typo-in-soname-argument.patch \ | ||
13 | " | ||
12 | 14 | ||
15 | SRC_URI[logo.sha256sum] = "1a54383986adad1521d00e003b4c482c27e8bc60690be944a1f3319c75abc2c9" | ||
13 | SRC_URI[sha256sum] = "be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb" | 16 | SRC_URI[sha256sum] = "be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb" |
14 | 17 | ||
15 | |||
16 | do_install() { | 18 | do_install() { |
17 | # using autotools's default will end up in /usr/local | 19 | # using autotools's default will end up in /usr/local |
18 | oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install | 20 | oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install |
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 d11751a4b..72c4036be 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 | |||
24 | EXTRA_OECONF += "--disable-man-pages" | 24 | EXTRA_OECONF += "--disable-man-pages" |
25 | 25 | ||
26 | FILES:${PN} += "${datadir}/glade ${datadir}/metainfo ${libdir}/glade/modules/libgladegtk.so" | 26 | FILES:${PN} += "${datadir}/glade ${datadir}/metainfo ${libdir}/glade/modules/libgladegtk.so" |
27 | |||
28 | # http://errors.yoctoproject.org/Errors/Details/766882/ | ||
29 | # 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] | ||
30 | # 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] | ||
31 | # 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] | ||
32 | # 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] | ||
33 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-devtools/grpc/grpc_1.60.1.bb b/meta-oe/recipes-devtools/grpc/grpc_1.66.1.bb index 63c696a62..7968d63a8 100644 --- a/meta-oe/recipes-devtools/grpc/grpc_1.60.1.bb +++ b/meta-oe/recipes-devtools/grpc/grpc_1.66.1.bb | |||
@@ -20,8 +20,8 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" | |||
20 | # RDEPENDS:${PN}-dev += "${PN}-compiler" | 20 | # RDEPENDS:${PN}-dev += "${PN}-compiler" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | SRCREV_grpc = "e5ae3b6b44bf3b64d24bfb4b4f82556239b986db" | 23 | SRCREV_grpc = "e821cdc231bda9ee93139a6daab6311dd8953832" |
24 | BRANCH = "v1.60.x" | 24 | BRANCH = "v1.66.x" |
25 | SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ | 25 | SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ |
26 | file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ | 26 | file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ |
27 | " | 27 | " |
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 be2c0f539..599fd2c37 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" | |||
30 | COMPATIBLE_HOST:riscv64 = "null" | 30 | COMPATIBLE_HOST:riscv64 = "null" |
31 | 31 | ||
32 | BBCLASSEXTEND = "native" | 32 | BBCLASSEXTEND = "native" |
33 | |||
34 | # http://errors.yoctoproject.org/Errors/Details/766879/ | ||
35 | # buildResult: | ||
36 | # variable: "LIBUNWIND_HAS_UNW_BACKTRACE" | ||
37 | # cached: true | ||
38 | # stdout: | | ||
39 | # Change Dir: '/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO' | ||
40 | # | ||
41 | # Run Build Command(s): ninja -v cmTC_51d86 | ||
42 | # [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 | ||
43 | # FAILED: CMakeFiles/cmTC_51d86.dir/src.c.o | ||
44 | # 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 | ||
45 | # src.c: In function 'main': | ||
46 | # src.c:3:43: error: passing argument 1 of 'unw_backtrace' from incompatible pointer type [-Wincompatible-pointer-types] | ||
47 | # 3 | int main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; } | ||
48 | # | ^~~~ | ||
49 | # | | | ||
50 | # | void * (*)[10] | ||
51 | # In file included from ../../../../recipe-sysroot/usr/include/libunwind-aarch64.h:232, | ||
52 | # from ../../../../recipe-sysroot/usr/include/libunwind-64.h:7, | ||
53 | # from ../../../../recipe-sysroot/usr/include/libunwind.h:27, | ||
54 | # from src.c:2: | ||
55 | # ../../../../recipe-sysroot/usr/include/libunwind-common.h:290:27: note: expected 'void **' but argument is of type 'void * (*)[10]' | ||
56 | # 290 | extern int unw_backtrace (void **, int); | ||
57 | # | ^~~~~~~ | ||
58 | # ninja: build stopped: subcommand failed. | ||
59 | # | ||
60 | # exitCode: 1 | ||
61 | # | ||
62 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb index c54dc9466..ade9f35d1 100644 --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb | |||
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926" | |||
13 | 13 | ||
14 | PE = "1" | 14 | PE = "1" |
15 | 15 | ||
16 | SRCREV = "5defb4ed1a4293b8e2bf641e16b156fb9de498cc" | 16 | SRCREV = "89e2973c754a9c02a49974d839779b151e95afd6" |
17 | SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https" | 17 | SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb index 544922f05..f0c60e5a8 100644 --- a/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb +++ b/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb | |||
@@ -25,4 +25,8 @@ EXTRA_OECMAKE += "-DCOMPILE_TESTS=NO -DCOMPILE_STUBGEN=NO -DCOMPILE_EXAMPLES=NO | |||
25 | -DCMAKE_LIBRARY_PATH=${libdir} \ | 25 | -DCMAKE_LIBRARY_PATH=${libdir} \ |
26 | " | 26 | " |
27 | 27 | ||
28 | do_install:append() { | ||
29 | sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${libdir}/libjson-rpc-cpp/cmake/libjson-rpc-cppTargets.cmake | ||
30 | } | ||
31 | |||
28 | FILES:${PN}-dev += "${libdir}/libjson-rpc-cpp/cmake" | 32 | FILES:${PN}-dev += "${libdir}/libjson-rpc-cpp/cmake" |
diff --git a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb index b894f0ba0..efa8c936b 100644 --- a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb +++ b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb | |||
@@ -20,6 +20,9 @@ SRC_URI = "git://gitlab.com/ymorin/kconfig-frontends.git;protocol=https;branch=4 | |||
20 | 20 | ||
21 | SRCREV = "f22fce3a308be1c7790ebefc6bbedb33c5f7c86a" | 21 | SRCREV = "f22fce3a308be1c7790ebefc6bbedb33c5f7c86a" |
22 | 22 | ||
23 | # Upstream repo does not tag | ||
24 | UPSTREAM_CHECK_COMMITS = "1" | ||
25 | |||
23 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
24 | 27 | ||
25 | inherit autotools pkgconfig | 28 | inherit autotools pkgconfig |
diff --git a/meta-oe/recipes-devtools/ldns/ldns_1.8.3.bb b/meta-oe/recipes-devtools/ldns/ldns_1.8.4.bb index 16816e62d..f071f579d 100644 --- a/meta-oe/recipes-devtools/ldns/ldns_1.8.3.bb +++ b/meta-oe/recipes-devtools/ldns/ldns_1.8.4.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34330f15b2b4abbbaaa7623f79a6a019" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34330f15b2b4abbbaaa7623f79a6a019" |
5 | 5 | ||
6 | SRC_URI = "https://www.nlnetlabs.nl/downloads/ldns/ldns-${PV}.tar.gz" | 6 | SRC_URI = "https://www.nlnetlabs.nl/downloads/ldns/ldns-${PV}.tar.gz" |
7 | SRC_URI[sha256sum] = "c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860" | 7 | SRC_URI[sha256sum] = "838b907594baaff1cd767e95466a7745998ae64bc74be038dccc62e2de2e4247" |
8 | 8 | ||
9 | DEPENDS = "openssl" | 9 | DEPENDS = "openssl" |
10 | 10 | ||
@@ -19,5 +19,6 @@ do_install:append() { | |||
19 | sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ | 19 | sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ |
20 | -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ | 20 | -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ |
21 | -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ | 21 | -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ |
22 | -i ${D}${libdir}/pkgconfig/*.pc | 22 | -e 's@${RECIPE_SYSROOT}@@g' \ |
23 | -i ${D}${libdir}/pkgconfig/*.pc ${D}${bindir}/ldns-config | ||
23 | } | 24 | } |
diff --git a/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch b/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch new file mode 100644 index 000000000..7c500e0b5 --- /dev/null +++ b/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch | |||
@@ -0,0 +1,91 @@ | |||
1 | From 0db4af09f1bf4456527b5f6ec60fc1305e770c4c Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Tue, 9 Jul 2024 15:19:35 +0100 | ||
4 | Subject: [PATCH] configure.ac: improve fts checks | ||
5 | |||
6 | The current code checks explicitly for musl and if so uses pkg-config to | ||
7 | find fts-standalone. This is suboptimal because musl may not be the only | ||
8 | libc to need a standalone fts implementation, and fts-standalone is an | ||
9 | old gentoo-specific name[1] so libabigail won't build on any other system | ||
10 | against musl. | ||
11 | |||
12 | Instead, use AC_SEARCH_LIBS to look for fts_open in libc then libfts. Do | ||
13 | this before the check for behaviour just in case someone has a standalone | ||
14 | and broken implementation. I assume that the standalone fts is installed | ||
15 | on the standard search path, which should be a fair assumption. | ||
16 | |||
17 | As we're not using pkg-config anymore the required link flags are now in | ||
18 | LIBS, so remove all instances of FTS_CFLAGS and FTS_LIBS. | ||
19 | |||
20 | [1] https://gitweb.gentoo.org/repo/gentoo.git/commit/sys-libs/fts-standalone?id=a403fe6c61d1aaeecd58d521f3def2f6d3513449 | ||
21 | |||
22 | Upstream-Status: Submitted [https://sourceware.org/pipermail/libabigail/2024q3/005973.html] | ||
23 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
24 | --- | ||
25 | configure.ac | 9 ++++----- | ||
26 | src/Makefile.am | 4 ++-- | ||
27 | tools/Makefile.am | 2 -- | ||
28 | 3 files changed, 6 insertions(+), 9 deletions(-) | ||
29 | |||
30 | diff --git a/configure.ac b/configure.ac | ||
31 | index e118a9c0..0aff2ec2 100644 | ||
32 | --- a/configure.ac | ||
33 | +++ b/configure.ac | ||
34 | @@ -281,6 +281,10 @@ fi | ||
35 | |||
36 | AC_SUBST(VISIBILITY_FLAGS) | ||
37 | |||
38 | +# glibc and BSD include fts into their libc, but musl does not so check if we | ||
39 | +# need to explicitly link to the standalone musl-fts. | ||
40 | +AC_SEARCH_LIBS([fts_open], [fts]) | ||
41 | + | ||
42 | dnl Older glibc had a broken fts that didn't work with Large File Systems. | ||
43 | dnl We want the version that can handler LFS, but include workaround if we | ||
44 | dnl get a bad one. Add define to CFLAGS (not AC_DEFINE it) since we need to | ||
45 | @@ -295,11 +299,6 @@ AS_IF([test "x$ac_cv_bad_fts" = "xyes"], | ||
46 | [CFLAGS="$CFLAGS -DBAD_FTS=1", | ||
47 | CXXFLAGS="$CXXFLAGS -DBAD_FTS=1"]) | ||
48 | |||
49 | -dnl On musl, we need to find fts-standalone | ||
50 | -AS_CASE( | ||
51 | - [${host_os}], [*-musl*], [ | ||
52 | - PKG_CHECK_MODULES([FTS], [fts-standalone]) | ||
53 | -]) | ||
54 | |||
55 | dnl Check for dependency: libelf, libdw, libebl (elfutils) | ||
56 | dnl Note that we need to use at least elfutils 0.159 but | ||
57 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
58 | index 3044c136..1c98bf84 100644 | ||
59 | --- a/src/Makefile.am | ||
60 | +++ b/src/Makefile.am | ||
61 | @@ -52,12 +52,12 @@ if BTF_READER | ||
62 | libabigail_la_SOURCES += abg-btf-reader.cc | ||
63 | endif | ||
64 | |||
65 | -libabigail_la_LIBADD = $(DEPS_LIBS) $(FTS_LIBS) | ||
66 | +libabigail_la_LIBADD = $(DEPS_LIBS) | ||
67 | libabigail_la_LDFLAGS = -lpthread -Wl,--as-needed -no-undefined -version-info $(LIBABIGAIL_SO_CURRENT):$(LIBABIGAIL_SO_REVISION):$(LIBABIGAIL_SO_AGE) | ||
68 | |||
69 | CUSTOM_MACROS = -DABIGAIL_ROOT_SYSTEM_LIBDIR=\"${libdir}\" | ||
70 | |||
71 | AM_CPPFLAGS=\ | ||
72 | -$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) $(FTS_CFLAGS) \ | ||
73 | +$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) \ | ||
74 | -Wall -I$(abs_top_srcdir) -I$(abs_top_srcdir)/include \ | ||
75 | -I$(abs_top_builddir)/include -I$(abs_top_builddir) | ||
76 | diff --git a/tools/Makefile.am b/tools/Makefile.am | ||
77 | index cbb5ce10..ea2d300c 100644 | ||
78 | --- a/tools/Makefile.am | ||
79 | +++ b/tools/Makefile.am | ||
80 | @@ -41,8 +41,6 @@ abicompatdir = $(bindir) | ||
81 | |||
82 | abipkgdiff_SOURCES = abipkgdiff.cc | ||
83 | abipkgdiffdir = $(bindir) | ||
84 | -abipkgdiff_CPPFLAGS = $(FTS_CFLAGS) | ||
85 | -abipkgdiff_LDADD = $(FTS_LIBS) | ||
86 | abipkgdiff_LDFLAGS = $(abs_top_builddir)/src/libabigail.la -pthread | ||
87 | |||
88 | kmidiff_SOURCES = kmidiff.cc | ||
89 | -- | ||
90 | 2.34.1 | ||
91 | |||
diff --git a/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb b/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb new file mode 100644 index 000000000..5c262d288 --- /dev/null +++ b/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "The ABI Generic Analysis and Instrumentation Library" | ||
2 | HOMEPAGE = "https://sourceware.org/libabigail/" | ||
3 | |||
4 | LICENSE = "Apache-2.0-with-LLVM-exception" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab" | ||
6 | |||
7 | SRC_URI = "http://mirrors.kernel.org/sourceware/${BPN}/${BP}.tar.xz \ | ||
8 | file://0001-Check-for-correct-fts-module.patch \ | ||
9 | " | ||
10 | SRC_URI[sha256sum] = "7cfc4e9b00ae38d87fb0c63beabb32b9cbf9ce410e52ceeb5ad5b3c5beb111f3" | ||
11 | |||
12 | DEPENDS = "elfutils libxml2" | ||
13 | DEPENDS:append:libc-musl = " fts" | ||
14 | |||
15 | inherit autotools pkgconfig lib_package | ||
16 | |||
17 | BBCLASSEXTEND = "native nativesdk" | ||
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 4f9099ff0..7e2781bcb 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb | |||
@@ -21,3 +21,38 @@ do_configure:prepend() { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | SRC_URI[archive.sha256sum] = "1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d" | 23 | SRC_URI[archive.sha256sum] = "1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d" |
24 | |||
25 | # http://errors.yoctoproject.org/Errors/Details/766884/ | ||
26 | # 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] | ||
27 | # 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] | ||
28 | # 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] | ||
29 | # 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] | ||
30 | # 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] | ||
31 | # 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] | ||
32 | # 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] | ||
33 | # 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] | ||
34 | # 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] | ||
35 | # 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] | ||
36 | # 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] | ||
37 | # 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] | ||
38 | # 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] | ||
39 | # 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] | ||
40 | # 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] | ||
41 | # 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] | ||
42 | # 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] | ||
43 | # 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] | ||
44 | # 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] | ||
45 | # 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] | ||
46 | # 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] | ||
47 | # 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] | ||
48 | # 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] | ||
49 | # 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] | ||
50 | # 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] | ||
51 | # 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] | ||
52 | # 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] | ||
53 | # 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] | ||
54 | # 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] | ||
55 | # 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] | ||
56 | # 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] | ||
57 | # 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] | ||
58 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-oe/recipes-devtools/libubox/libubox_git.bb index 39e18cdaf..131929b30 100644 --- a/meta-oe/recipes-devtools/libubox/libubox_git.bb +++ b/meta-oe/recipes-devtools/libubox/libubox_git.bb | |||
@@ -22,6 +22,9 @@ SRC_URI = "\ | |||
22 | SRCREV = "07413cce72e19520af55dfcbc765484f5ab41dd9" | 22 | SRCREV = "07413cce72e19520af55dfcbc765484f5ab41dd9" |
23 | PV = "1.0.1+git" | 23 | PV = "1.0.1+git" |
24 | 24 | ||
25 | # Upstream repo does not tag | ||
26 | UPSTREAM_CHECK_COMMITS = "1" | ||
27 | |||
25 | S = "${WORKDIR}/git" | 28 | S = "${WORKDIR}/git" |
26 | 29 | ||
27 | inherit cmake pkgconfig | 30 | inherit cmake pkgconfig |
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch deleted file mode 100644 index c896e3ebb..000000000 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 95ff340a74af16cca89fd5c5ca99890821053209 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 22 Apr 2017 00:47:16 -0700 | ||
4 | Subject: [PATCH] ARM code has unreachable code after switch statement move | ||
5 | initialization | ||
6 | |||
7 | Fixed | ||
8 | sysdeps/linux-gnu/arm/trace.c:173:33: error: statement will never be executed [-Werror=switch-unreachable] | ||
9 | uint32_t operand1, operand2, result = 0; | ||
10 | ^~~~~~ | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | Upstream-Status: Pending | ||
15 | |||
16 | sysdeps/linux-gnu/arm/trace.c | 3 ++- | ||
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c | ||
20 | index 5e51e91..f974d1f 100644 | ||
21 | --- a/sysdeps/linux-gnu/arm/trace.c | ||
22 | +++ b/sysdeps/linux-gnu/arm/trace.c | ||
23 | @@ -155,6 +155,8 @@ arm_get_next_pcs(struct process *proc, | ||
24 | const unsigned cond = BITS(this_instr, 28, 31); | ||
25 | const unsigned opcode = BITS(this_instr, 24, 27); | ||
26 | |||
27 | + uint32_t operand1, operand2, result = 0; | ||
28 | + | ||
29 | if (cond == COND_NV) | ||
30 | switch (opcode) { | ||
31 | arch_addr_t addr; | ||
32 | @@ -170,7 +172,6 @@ arm_get_next_pcs(struct process *proc, | ||
33 | } | ||
34 | else | ||
35 | switch (opcode) { | ||
36 | - uint32_t operand1, operand2, result = 0; | ||
37 | case 0x0: | ||
38 | case 0x1: /* data processing */ | ||
39 | case 0x2: | ||
40 | -- | ||
41 | 2.12.2 | ||
42 | |||
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch deleted file mode 100644 index a599d0e19..000000000 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch +++ /dev/null | |||
@@ -1,261 +0,0 @@ | |||
1 | From 0af8ced6376f2256b9daac301c851e1c99c3b035 Mon Sep 17 00:00:00 2001 | ||
2 | From: Adam Trhon <adam.trhon@tbs-biometrics.com> | ||
3 | Date: Fri, 12 May 2017 13:39:11 +0200 | ||
4 | Subject: [PATCH] Fix tautological compare warning | ||
5 | |||
6 | By default, gcc ignores warning from code generated by macros | ||
7 | (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80369). When | ||
8 | ltrace is compiled under icecream the warning *is generated* | ||
9 | (https://github.com/icecc/icecream/issues/202) | ||
10 | and the compilation fails (because of -Werror). | ||
11 | |||
12 | Upstream-Status: Submitted [ltrace-devel@lists.alioth.debian.org] | ||
13 | |||
14 | Signed-off-by: Adam Trhon <adam.trhon@tbs-biometrics.com> | ||
15 | --- | ||
16 | filter.c | 4 ++-- | ||
17 | sysdeps/linux-gnu/arm/fetch.c | 2 +- | ||
18 | sysdeps/linux-gnu/arm/trace.c | 2 +- | ||
19 | sysdeps/linux-gnu/ia64/fetch.c | 2 +- | ||
20 | sysdeps/linux-gnu/metag/trace.c | 2 +- | ||
21 | sysdeps/linux-gnu/mips/plt.c | 2 +- | ||
22 | sysdeps/linux-gnu/ppc/fetch.c | 2 +- | ||
23 | sysdeps/linux-gnu/ppc/plt.c | 2 +- | ||
24 | sysdeps/linux-gnu/ppc/trace.c | 4 ++-- | ||
25 | sysdeps/linux-gnu/s390/fetch.c | 2 +- | ||
26 | sysdeps/linux-gnu/s390/trace.c | 4 ++-- | ||
27 | sysdeps/linux-gnu/x86/fetch.c | 2 +- | ||
28 | sysdeps/linux-gnu/x86/trace.c | 4 ++-- | ||
29 | value.c | 4 ++-- | ||
30 | 14 files changed, 19 insertions(+), 19 deletions(-) | ||
31 | |||
32 | diff --git a/filter.c b/filter.c | ||
33 | index ba50c40..a65856d 100644 | ||
34 | --- a/filter.c | ||
35 | +++ b/filter.c | ||
36 | @@ -79,7 +79,7 @@ filter_lib_matcher_name_init(struct filter_lib_matcher *matcher, | ||
37 | { | ||
38 | switch (type) { | ||
39 | case FLM_MAIN: | ||
40 | - assert(type != type); | ||
41 | + assert(!"Unexpected value of type"); | ||
42 | abort(); | ||
43 | |||
44 | case FLM_SONAME: | ||
45 | @@ -137,7 +137,7 @@ matcher_matches_library(struct filter_lib_matcher *matcher, struct library *lib) | ||
46 | case FLM_MAIN: | ||
47 | return lib->type == LT_LIBTYPE_MAIN; | ||
48 | } | ||
49 | - assert(matcher->type != matcher->type); | ||
50 | + assert(!"Unexpected value of matcher->type"); | ||
51 | abort(); | ||
52 | } | ||
53 | |||
54 | diff --git a/sysdeps/linux-gnu/arm/fetch.c b/sysdeps/linux-gnu/arm/fetch.c | ||
55 | index b500448..8f75fcf 100644 | ||
56 | --- a/sysdeps/linux-gnu/arm/fetch.c | ||
57 | +++ b/sysdeps/linux-gnu/arm/fetch.c | ||
58 | @@ -317,7 +317,7 @@ arch_fetch_retval(struct fetch_context *ctx, enum tof type, | ||
59 | memmove(data, ctx->regs.uregs, sz); | ||
60 | return 0; | ||
61 | } | ||
62 | - assert(info->type != info->type); | ||
63 | + assert(!"Unexpected value of info->type"); | ||
64 | abort(); | ||
65 | } | ||
66 | |||
67 | diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c | ||
68 | index 5e51e91..e76bf63 100644 | ||
69 | --- a/sysdeps/linux-gnu/arm/trace.c | ||
70 | +++ b/sysdeps/linux-gnu/arm/trace.c | ||
71 | @@ -701,7 +701,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info) | ||
72 | return (size_t)-2; | ||
73 | |||
74 | default: | ||
75 | - assert(info->type != info->type); | ||
76 | + assert(!"Unexpected value of info->type"); | ||
77 | abort(); | ||
78 | } | ||
79 | } | ||
80 | diff --git a/sysdeps/linux-gnu/ia64/fetch.c b/sysdeps/linux-gnu/ia64/fetch.c | ||
81 | index 171c7a2..ee2fbc7 100644 | ||
82 | --- a/sysdeps/linux-gnu/ia64/fetch.c | ||
83 | +++ b/sysdeps/linux-gnu/ia64/fetch.c | ||
84 | @@ -409,7 +409,7 @@ arch_fetch_arg_next(struct fetch_context *ctx, enum tof type, | ||
85 | case ARGTYPE_ARRAY: | ||
86 | /* Arrays decay into pointers. XXX Fortran? */ | ||
87 | default: | ||
88 | - assert(info->type != info->type); | ||
89 | + assert(!"Unexpected value of info->type"); | ||
90 | abort(); | ||
91 | } | ||
92 | } | ||
93 | diff --git a/sysdeps/linux-gnu/metag/trace.c b/sysdeps/linux-gnu/metag/trace.c | ||
94 | index ad5fffe..7a843d6 100644 | ||
95 | --- a/sysdeps/linux-gnu/metag/trace.c | ||
96 | +++ b/sysdeps/linux-gnu/metag/trace.c | ||
97 | @@ -142,7 +142,7 @@ get_regval_from_unit(enum metag_unitnum unit, unsigned int reg, | ||
98 | return regs->ax[reg][0]; | ||
99 | /* We really shouldn't be here. */ | ||
100 | default: | ||
101 | - assert(unit != unit); | ||
102 | + assert(!"Unexpected value of unit"); | ||
103 | abort(); | ||
104 | } | ||
105 | return 0; | ||
106 | diff --git a/sysdeps/linux-gnu/mips/plt.c b/sysdeps/linux-gnu/mips/plt.c | ||
107 | index c7c10ac..ca2307d 100644 | ||
108 | --- a/sysdeps/linux-gnu/mips/plt.c | ||
109 | +++ b/sysdeps/linux-gnu/mips/plt.c | ||
110 | @@ -651,7 +651,7 @@ mips_stub_bp_continue(struct breakpoint *bp, struct process *proc) | ||
111 | break; | ||
112 | } | ||
113 | |||
114 | - assert(bp->libsym->arch.type != bp->libsym->arch.type); | ||
115 | + assert(!"Unexpected value of bp->libsym->arch.type"); | ||
116 | abort(); | ||
117 | } | ||
118 | |||
119 | diff --git a/sysdeps/linux-gnu/ppc/fetch.c b/sysdeps/linux-gnu/ppc/fetch.c | ||
120 | index c6cbd71..5db5675 100644 | ||
121 | --- a/sysdeps/linux-gnu/ppc/fetch.c | ||
122 | +++ b/sysdeps/linux-gnu/ppc/fetch.c | ||
123 | @@ -502,7 +502,7 @@ allocate_argument(struct fetch_context *ctx, struct process *proc, | ||
124 | case ARGTYPE_ARRAY: | ||
125 | /* Arrays decay into pointers. XXX Fortran? */ | ||
126 | default: | ||
127 | - assert(info->type != info->type); | ||
128 | + assert(!"Unexpected value of info->type"); | ||
129 | abort(); | ||
130 | } | ||
131 | |||
132 | diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c | ||
133 | index 5f81889..781da03 100644 | ||
134 | --- a/sysdeps/linux-gnu/ppc/plt.c | ||
135 | +++ b/sysdeps/linux-gnu/ppc/plt.c | ||
136 | @@ -1085,7 +1085,7 @@ ppc_plt_bp_continue(struct breakpoint *bp, struct process *proc) | ||
137 | break; | ||
138 | } | ||
139 | |||
140 | - assert(bp->libsym->arch.type != bp->libsym->arch.type); | ||
141 | + assert(!"Unexpected value of bp->libsym->arch.type"); | ||
142 | abort(); | ||
143 | } | ||
144 | |||
145 | diff --git a/sysdeps/linux-gnu/ppc/trace.c b/sysdeps/linux-gnu/ppc/trace.c | ||
146 | index 5aab538..caa6035 100644 | ||
147 | --- a/sysdeps/linux-gnu/ppc/trace.c | ||
148 | +++ b/sysdeps/linux-gnu/ppc/trace.c | ||
149 | @@ -217,7 +217,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info) | ||
150 | return (size_t)-2; | ||
151 | |||
152 | default: | ||
153 | - assert(info->type != info->type); | ||
154 | + assert(!"Unexpected value of info->type"); | ||
155 | abort(); | ||
156 | break; | ||
157 | } | ||
158 | @@ -231,7 +231,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info) | ||
159 | |||
160 | switch (info->type) { | ||
161 | default: | ||
162 | - assert(info->type != info->type); | ||
163 | + assert(!"Unexpected value of info->type"); | ||
164 | abort(); | ||
165 | break; | ||
166 | |||
167 | diff --git a/sysdeps/linux-gnu/s390/fetch.c b/sysdeps/linux-gnu/s390/fetch.c | ||
168 | index 4ad5951..4721c30 100644 | ||
169 | --- a/sysdeps/linux-gnu/s390/fetch.c | ||
170 | +++ b/sysdeps/linux-gnu/s390/fetch.c | ||
171 | @@ -266,7 +266,7 @@ arch_fetch_arg_next(struct fetch_context *ctx, enum tof type, | ||
172 | return allocate_gpr(ctx, proc, info, valuep, sz); | ||
173 | |||
174 | default: | ||
175 | - assert(info->type != info->type); | ||
176 | + assert(!"Unexpected value of info->type"); | ||
177 | abort(); | ||
178 | } | ||
179 | return -1; | ||
180 | diff --git a/sysdeps/linux-gnu/s390/trace.c b/sysdeps/linux-gnu/s390/trace.c | ||
181 | index 78b04c3..24f7801 100644 | ||
182 | --- a/sysdeps/linux-gnu/s390/trace.c | ||
183 | +++ b/sysdeps/linux-gnu/s390/trace.c | ||
184 | @@ -213,7 +213,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info) | ||
185 | return (size_t)-2; | ||
186 | |||
187 | default: | ||
188 | - assert(info->type != info->type); | ||
189 | + assert(!"Unexpected value of info->type"); | ||
190 | abort(); | ||
191 | } | ||
192 | } | ||
193 | @@ -226,7 +226,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info) | ||
194 | |||
195 | switch (info->type) { | ||
196 | default: | ||
197 | - assert(info->type != info->type); | ||
198 | + assert(!"Unexpected value of info->type"); | ||
199 | break; | ||
200 | |||
201 | case ARGTYPE_CHAR: | ||
202 | diff --git a/sysdeps/linux-gnu/x86/fetch.c b/sysdeps/linux-gnu/x86/fetch.c | ||
203 | index 6868101..ae2ed79 100644 | ||
204 | --- a/sysdeps/linux-gnu/x86/fetch.c | ||
205 | +++ b/sysdeps/linux-gnu/x86/fetch.c | ||
206 | @@ -523,7 +523,7 @@ classify(struct process *proc, struct fetch_context *context, | ||
207 | |||
208 | default: | ||
209 | /* Unsupported type. */ | ||
210 | - assert(info->type != info->type); | ||
211 | + assert(!"Unexpected value of info->type"); | ||
212 | abort(); | ||
213 | } | ||
214 | abort(); | ||
215 | diff --git a/sysdeps/linux-gnu/x86/trace.c b/sysdeps/linux-gnu/x86/trace.c | ||
216 | index 6a1a6a5..d8d2115 100644 | ||
217 | --- a/sysdeps/linux-gnu/x86/trace.c | ||
218 | +++ b/sysdeps/linux-gnu/x86/trace.c | ||
219 | @@ -145,7 +145,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info) | ||
220 | return (size_t)-2; | ||
221 | |||
222 | default: | ||
223 | - assert(info->type != info->type); | ||
224 | + assert(!"Unexpected value of info->type"); | ||
225 | abort(); | ||
226 | } | ||
227 | } | ||
228 | @@ -158,7 +158,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info) | ||
229 | |||
230 | switch (info->type) { | ||
231 | default: | ||
232 | - assert(info->type != info->type); | ||
233 | + assert(!"Unexpected value of info->type"); | ||
234 | abort(); | ||
235 | break; | ||
236 | |||
237 | diff --git a/value.c b/value.c | ||
238 | index 2125ba9..30edb4e 100644 | ||
239 | --- a/value.c | ||
240 | +++ b/value.c | ||
241 | @@ -363,7 +363,7 @@ value_set_word(struct value *value, long word) | ||
242 | u.u64 = word; | ||
243 | break; | ||
244 | default: | ||
245 | - assert(sz != sz); | ||
246 | + assert(!"Unexpected value of sz"); | ||
247 | abort(); | ||
248 | } | ||
249 | |||
250 | @@ -414,7 +414,7 @@ value_extract_word(struct value *value, long *retp, | ||
251 | *retp = (long)u.u64; | ||
252 | return 0; | ||
253 | default: | ||
254 | - assert(sz != sz); | ||
255 | + assert(!"Unexpected value of sz"); | ||
256 | abort(); | ||
257 | } | ||
258 | } | ||
259 | -- | ||
260 | 2.12.0 | ||
261 | |||
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch deleted file mode 100644 index 9def41ca6..000000000 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 67a8fa478a4484bc4dbfb3ac74e11be1dd5af594 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 23 Dec 2019 19:35:48 -0800 | ||
4 | Subject: [PATCH] ensure the struct pointers are null initilized | ||
5 | |||
6 | Do not delete if pointer is already null | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | expr.c | 10 +++++----- | ||
13 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
14 | |||
15 | diff --git a/expr.c b/expr.c | ||
16 | index 4059a32..5ffd0ad 100644 | ||
17 | --- a/expr.c | ||
18 | +++ b/expr.c | ||
19 | @@ -189,10 +189,8 @@ int | ||
20 | expr_clone(struct expr_node *retp, const struct expr_node *node) | ||
21 | { | ||
22 | *retp = *node; | ||
23 | - | ||
24 | + struct expr_node *nlhs = 0, *nrhs = 0; | ||
25 | switch (node->kind) { | ||
26 | - struct expr_node *nlhs; | ||
27 | - struct expr_node *nrhs; | ||
28 | |||
29 | case EXPR_OP_ARGNO: | ||
30 | case EXPR_OP_SELF: | ||
31 | @@ -236,8 +234,10 @@ expr_clone(struct expr_node *retp, const struct expr_node *node) | ||
32 | if (expr_alloc_and_clone(&nlhs, node->lhs, node->own_lhs) < 0) { | ||
33 | if (node->kind == EXPR_OP_CALL2 | ||
34 | && node->u.call.own_rhs) { | ||
35 | - expr_destroy(nrhs); | ||
36 | - free(nrhs); | ||
37 | + if (nrhs) { | ||
38 | + expr_destroy(nrhs); | ||
39 | + free(nrhs); | ||
40 | + } | ||
41 | return -1; | ||
42 | } | ||
43 | } | ||
44 | -- | ||
45 | 2.24.1 | ||
46 | |||
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch deleted file mode 100644 index 4793e561c..000000000 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From f47672bed5905ae382e80b09dafca9a8da45aa67 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 19 Apr 2022 18:44:36 -0700 | ||
4 | Subject: [PATCH] ppc/plt: do not free symbol libsym | ||
5 | |||
6 | delete_symbol_chain() will call free as well if sybol is non-null | ||
7 | it also fixes use-after-free warnings that compiler emits | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.com/cespedes/ltrace/-/merge_requests/2] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | sysdeps/linux-gnu/ppc/plt.c | 1 - | ||
13 | 1 file changed, 1 deletion(-) | ||
14 | |||
15 | diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c | ||
16 | index 5f81889..7c1c025 100644 | ||
17 | --- a/sysdeps/linux-gnu/ppc/plt.c | ||
18 | +++ b/sysdeps/linux-gnu/ppc/plt.c | ||
19 | @@ -687,7 +687,6 @@ arch_elf_add_func_entry(struct process *proc, struct ltelf *lte, | ||
20 | if (libsym == NULL | ||
21 | || library_symbol_init(libsym, addr, full_name, 1, | ||
22 | LS_TOPLT_NONE) < 0) { | ||
23 | - free(libsym); | ||
24 | delete_symbol_chain(libsym); | ||
25 | libsym = NULL; | ||
26 | fprintf(stderr, "Couldn't add symbol %s" | ||
27 | -- | ||
28 | 2.36.0 | ||
29 | |||
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch new file mode 100644 index 000000000..3e166f0de --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From f2f6082cb112cf3b8a6a5bfc989e4a4f6a1bff27 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 3 Sep 2024 20:41:20 +0000 | ||
4 | Subject: [PATCH] proc: Make PROC_PID_FILE not use variable length array | ||
5 | |||
6 | This helps in compiling with clang which is not happy about VLA | ||
7 | |||
8 | | ../../../git/sysdeps/linux-gnu/proc.c:70:3: error: variable length array folded to constant array as an extension [-Werror,-Wgnu-folding-constant] | ||
9 | | 70 | PROC_PID_FILE(proc_exe, "/proc/%d/exe", pid); | ||
10 | | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
11 | | ../../../git/sysdeps/linux-gnu/proc.c:59:11: note: expanded from macro 'PROC_PID_FILE' | ||
12 | | 59 | char VAR[strlen(FORMAT) + 6]; \ | ||
13 | | | ^~~~~~~~~~~~~~~~~~ | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | sysdeps/linux-gnu/proc.c | 3 ++- | ||
19 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c | ||
22 | index b954997..f37e4e8 100644 | ||
23 | --- a/sysdeps/linux-gnu/proc.c | ||
24 | +++ b/sysdeps/linux-gnu/proc.c | ||
25 | @@ -56,7 +56,8 @@ | ||
26 | #define MAX_DELAY 100000 /* 100000 microseconds = 0.1 seconds */ | ||
27 | |||
28 | #define PROC_PID_FILE(VAR, FORMAT, PID) \ | ||
29 | - char VAR[strlen(FORMAT) + 6]; \ | ||
30 | + enum { buflen_ ## VAR = strlen(FORMAT)}; \ | ||
31 | + char VAR[buflen_ ## VAR + 6]; \ | ||
32 | sprintf(VAR, FORMAT, PID) | ||
33 | |||
34 | /* | ||
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch deleted file mode 100644 index 65c7d535e..000000000 --- a/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 64f98f84fd88797e219f9dde1ca387fee4b509f0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 24 Apr 2016 16:58:17 -0700 | ||
4 | Subject: [PATCH] replace readdir_r with readdir | ||
5 | |||
6 | glibc 2.24 has deprecated readdir_r | ||
7 | |||
8 | https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | Upstream-Status: Submitted | ||
13 | |||
14 | sysdeps/linux-gnu/proc.c | 5 +++-- | ||
15 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c | ||
18 | index 953fd86..edb716d 100644 | ||
19 | --- a/sysdeps/linux-gnu/proc.c | ||
20 | +++ b/sysdeps/linux-gnu/proc.c | ||
21 | @@ -242,9 +242,10 @@ process_tasks(pid_t pid, pid_t **ret_tasks, size_t *ret_n) | ||
22 | size_t alloc = 0; | ||
23 | |||
24 | while (1) { | ||
25 | - struct dirent entry; | ||
26 | struct dirent *result; | ||
27 | - if (readdir_r(d, &entry, &result) != 0) { | ||
28 | + errno = 0; | ||
29 | + result = readdir(d); | ||
30 | + if (errno != 0) { | ||
31 | fail: | ||
32 | free(tasks); | ||
33 | closedir(d); | ||
34 | -- | ||
35 | 2.8.0 | ||
36 | |||
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 63971970c..a3ddf2a76 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb | |||
@@ -11,27 +11,23 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" | |||
11 | 11 | ||
12 | PE = "1" | 12 | PE = "1" |
13 | PV = "7.91+git" | 13 | PV = "7.91+git" |
14 | SRCREV = "c22d359433b333937ee3d803450dc41998115685" | 14 | SRCREV = "8eabf684ba6b11ae7a1a843aca3c0657c6329d73" |
15 | 15 | ||
16 | DEPENDS = "elfutils" | 16 | DEPENDS = "elfutils" |
17 | SRC_URI = "git://github.com/sparkleholic/ltrace.git;protocol=https;branch=master \ | 17 | SRC_URI = "git://gitlab.com/cespedes/ltrace.git;protocol=https;branch=main \ |
18 | file://configure-allow-to-disable-selinux-support.patch \ | 18 | file://configure-allow-to-disable-selinux-support.patch \ |
19 | file://0001-replace-readdir_r-with-readdir.patch \ | ||
20 | file://0001-Use-correct-enum-type.patch \ | 19 | file://0001-Use-correct-enum-type.patch \ |
21 | file://0002-Fix-const-qualifier-error.patch \ | 20 | file://0002-Fix-const-qualifier-error.patch \ |
22 | file://0001-ARM-code-has-unreachable-code-after-switch-statement.patch \ | ||
23 | file://0001-Fix-tautological-compare-warning.patch \ | ||
24 | file://0001-Add-support-for-mips64-n32-n64.patch \ | 21 | file://0001-Add-support-for-mips64-n32-n64.patch \ |
25 | file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \ | 22 | file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \ |
26 | file://0001-mips-plt.c-Delete-include-error.h.patch \ | 23 | file://0001-mips-plt.c-Delete-include-error.h.patch \ |
27 | file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ | 24 | file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ |
28 | file://0001-hook-Do-not-append-int-to-std-string.patch \ | 25 | file://0001-hook-Do-not-append-int-to-std-string.patch \ |
29 | file://0001-Bug-fix-for-data-type-length-judgment.patch \ | 26 | file://0001-Bug-fix-for-data-type-length-judgment.patch \ |
30 | file://0001-ensure-the-struct-pointers-are-null-initilized.patch \ | ||
31 | file://0001-ppc-Remove-unused-host_powerpc64-function.patch \ | 27 | file://0001-ppc-Remove-unused-host_powerpc64-function.patch \ |
32 | file://0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch \ | 28 | file://0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch \ |
33 | file://0001-ppc-plt-do-not-free-symbol-libsym.patch \ | ||
34 | file://0001-Fix-type-of-single-bit-bitfields.patch \ | 29 | file://0001-Fix-type-of-single-bit-bitfields.patch \ |
30 | file://0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch \ | ||
35 | " | 31 | " |
36 | SRC_URI:append:libc-musl = " file://add_ppc64le.patch" | 32 | SRC_URI:append:libc-musl = " file://add_ppc64le.patch" |
37 | 33 | ||
diff --git a/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb index 240271d41..418921754 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_git.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb | |||
@@ -21,7 +21,7 @@ BBCLASSEXTEND = "native" | |||
21 | # Host luajit needs to be compiled with the same pointer size | 21 | # Host luajit needs to be compiled with the same pointer size |
22 | # If you want to cross-compile to any 32 bit target on an x64 OS, | 22 | # If you want to cross-compile to any 32 bit target on an x64 OS, |
23 | # you need to install the multilib development package (e.g. | 23 | # you need to install the multilib development package (e.g. |
24 | # libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part | 24 | # libc6-dev:i386 on Debian/Ubuntu) and build a 32 bit host part |
25 | # (HOST_CC="gcc -m32"). | 25 | # (HOST_CC="gcc -m32"). |
26 | BUILD_CC_ARCH:append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}" | 26 | BUILD_CC_ARCH:append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}" |
27 | 27 | ||
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 944585673..b44c6d666 100644 --- a/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb +++ b/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb | |||
@@ -10,9 +10,15 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ | |||
10 | SRC_URI[md5sum] = "512de48c87ab023a69250edc7a0c7b05" | 10 | SRC_URI[md5sum] = "512de48c87ab023a69250edc7a0c7b05" |
11 | SRC_URI[sha256sum] = "3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864" | 11 | SRC_URI[sha256sum] = "3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864" |
12 | 12 | ||
13 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcpp/files/mcpp/" | ||
14 | UPSTREAM_CHECK_REGEX = "${BPN}/V\.(?P<pver>\d+(\.\d+)+)" | ||
15 | |||
13 | inherit autotools | 16 | inherit autotools |
14 | 17 | ||
15 | EXTRA_OECONF = " --enable-mcpplib " | 18 | EXTRA_OECONF = " --enable-mcpplib " |
16 | 19 | ||
17 | BBCLASSEXTEND = "native nativesdk" | 20 | BBCLASSEXTEND = "native nativesdk" |
18 | 21 | ||
22 | # http://errors.yoctoproject.org/Errors/Details/766883/ | ||
23 | # mcpp-2.7.2/src/expand.c:713:21: error: assignment to 'char *' from incompatible pointer type 'LOCATION *' {aka 'struct location *'} [-Wincompatible-pointer-types] | ||
24 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-devtools/memtool/memtool/run-ptest b/meta-oe/recipes-devtools/memtool/memtool/run-ptest new file mode 100644 index 000000000..865da9f69 --- /dev/null +++ b/meta-oe/recipes-devtools/memtool/memtool/run-ptest | |||
@@ -0,0 +1,27 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH | ||
4 | # | ||
5 | # SPDX-License-Identifier: MIT | ||
6 | |||
7 | fail_count=0 | ||
8 | all_count=0 | ||
9 | |||
10 | for test_suite in tests/test_* | ||
11 | do | ||
12 | if "./$test_suite" | ||
13 | then | ||
14 | echo "PASS: $test_suite" | ||
15 | else | ||
16 | echo "FAIL: $test_suite" | ||
17 | fail_count=$((fail_count + 1)) | ||
18 | fi | ||
19 | all_count=$((all_count + 1)) | ||
20 | done | ||
21 | |||
22 | if [ $fail_count -eq 0 ] | ||
23 | then | ||
24 | echo "PASS: All $all_count tests passed" | ||
25 | else | ||
26 | echo "FAIL: $fail_count of $all_count tests failed" | ||
27 | fi | ||
diff --git a/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh b/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh new file mode 100644 index 000000000..a74975d39 --- /dev/null +++ b/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh | |||
@@ -0,0 +1,69 @@ | |||
1 | #!/bin/bash | ||
2 | |||
3 | # SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH | ||
4 | # | ||
5 | # SPDX-License-Identifier: MIT | ||
6 | |||
7 | # This script verifies the behavior of memtool against plain files. | ||
8 | |||
9 | readonly PLAIN_FILE=$(mktemp) | ||
10 | FAIL_COUNT=0 | ||
11 | |||
12 | setup() { | ||
13 | echo "Hello World!" >"$PLAIN_FILE" | ||
14 | } | ||
15 | |||
16 | teardown() { | ||
17 | rm "$PLAIN_FILE" | ||
18 | } | ||
19 | |||
20 | verify() { | ||
21 | ACTUAL=$1 | ||
22 | EXPECTED=$2 | ||
23 | TEST_NAME=$3 | ||
24 | |||
25 | if [ "$ACTUAL" = "$EXPECTED" ]; then | ||
26 | echo "pass: $TEST_NAME" | ||
27 | else | ||
28 | echo "FAIL: $TEST_NAME" | ||
29 | echo " Expected: $EXPECTED" | ||
30 | echo " Actual: $ACTUAL" | ||
31 | FAIL_COUNT=$((FAIL_COUNT + 1)) | ||
32 | fi | ||
33 | } | ||
34 | |||
35 | # Test Case: Verifies that the expected string of bytes is read from a plain file starting from | ||
36 | # the offset 6 and reading 6 bytes. | ||
37 | test_memtool_read() { | ||
38 | EXPECTED="00000006: 57 6f 72 6c 64 21 World!" | ||
39 | ACTUAL=$(memtool md -s "$PLAIN_FILE" -b 0x6+6) | ||
40 | verify "$ACTUAL" "$EXPECTED" "memtool read from plain file" | ||
41 | } | ||
42 | |||
43 | # Test Case 2: Verifies that the expected string of bytes is written to a plain file starting from | ||
44 | # and then read the result. | ||
45 | test_memtool_write() { | ||
46 | # Usage of 'od' ensures correct endianess. | ||
47 | readonly replace_str_bytes=$(echo "Yocto!" | od -t d4 -A n) | ||
48 | |||
49 | # shellcheck disable=SC2086 # We want to pass the bytes as separate arguments. | ||
50 | memtool mw -d "$PLAIN_FILE" 0x6+6 $replace_str_bytes | ||
51 | |||
52 | EXPECTED="00000006: 59 6f 63 74 6f 21 Yocto!" | ||
53 | ACTUAL=$(memtool md -s "$PLAIN_FILE" -b 0x6+6) | ||
54 | verify "$ACTUAL" "$EXPECTED" "memtool write to plain file" | ||
55 | } | ||
56 | |||
57 | for test_case in $(declare -F | grep test_memtool_ | cut -f 3 -d ' '); do | ||
58 | setup | ||
59 | $test_case | ||
60 | teardown | ||
61 | done | ||
62 | |||
63 | if [ $FAIL_COUNT -eq 0 ]; then | ||
64 | echo "Test Passed: memtool plain file read/write functionality is correct." | ||
65 | exit 0 | ||
66 | else | ||
67 | echo "Test FAILED: memtool plain file read/write functionality is incorrect. Check the logs." | ||
68 | exit 1 | ||
69 | fi | ||
diff --git a/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb b/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb new file mode 100644 index 000000000..1e2e93bcd --- /dev/null +++ b/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb | |||
@@ -0,0 +1,31 @@ | |||
1 | # SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH | ||
2 | # | ||
3 | # SPDX-License-Identifier: MIT | ||
4 | |||
5 | SUMMARY = "A tool to manipulate and read memory mapped registers" | ||
6 | DESCRIPTION = "memtool is a program that allows to access memory mapped registers. This is useful \ | ||
7 | to inspect and modify registers from the command line. memtool can also operate on plain files, \ | ||
8 | and access PHY registers." | ||
9 | HOMEPAGE = "https://github.com/pengutronix/memtool" | ||
10 | BUGTRACKER = "https://github.com/pengutronix/memtool/issues" | ||
11 | SECTION = "devtool" | ||
12 | |||
13 | LICENSE = "GPL-2.0-only" | ||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
15 | |||
16 | SRC_URI = " \ | ||
17 | http://www.pengutronix.de/software/memtool/downloads/memtool-${PV}.tar.xz \ | ||
18 | file://run-ptest \ | ||
19 | file://test_read_write_plainfiles.sh \ | ||
20 | " | ||
21 | |||
22 | SRC_URI[sha256sum] = "87cb7175266ff3a00a9c1f541c4c6c93693ffbe8dcc0d97a60d13c45ff860900" | ||
23 | |||
24 | inherit autotools ptest | ||
25 | |||
26 | do_install_ptest () { | ||
27 | install -d ${D}${PTEST_PATH}/tests | ||
28 | install -m 0755 ${UNPACKDIR}/test_* ${D}${PTEST_PATH}/tests | ||
29 | } | ||
30 | |||
31 | RDEPENDS:${PN}-ptest += "bash coreutils" | ||
diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb index 89e6744dc..395a33079 100644 --- a/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb +++ b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb | |||
@@ -34,3 +34,4 @@ PACKAGES =+ "${PN}-python" | |||
34 | FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}" | 34 | FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}" |
35 | FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" | 35 | FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" |
36 | 36 | ||
37 | CVE_STATUS[CVE-2022-43410] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different mercurial package compared to the one which has the CVE issue." | ||
diff --git a/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb b/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb index 4bb3e62d9..73d434cba 100644 --- a/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb +++ b/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb | |||
@@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c9f7c009791eaa4b9ca90dc4c9538d24" | |||
6 | SRC_URI = "https://github.com/pengutronix/microcom/releases/download/v${PV}/microcom-${PV}.tar.xz" | 6 | SRC_URI = "https://github.com/pengutronix/microcom/releases/download/v${PV}/microcom-${PV}.tar.xz" |
7 | SRC_URI[sha256sum] = "ef42184bb35c9762b3e9c70748696f7478efacad8412a88aaf2d9a6a500231a1" | 7 | SRC_URI[sha256sum] = "ef42184bb35c9762b3e9c70748696f7478efacad8412a88aaf2d9a6a500231a1" |
8 | 8 | ||
9 | UPSTREAM_CHECK_URI = "${HOMEPAGE}/releases" | ||
10 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
11 | |||
9 | DEPENDS = "readline" | 12 | DEPENDS = "readline" |
10 | 13 | ||
11 | inherit autotools update-alternatives | 14 | inherit autotools update-alternatives |
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 6e29b2459..8ba121d5e 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" | |||
43 | CVE_PRODUCT = "microsoft:gsl" | 43 | CVE_PRODUCT = "microsoft:gsl" |
44 | 44 | ||
45 | BBCLASSEXTEND = "native nativesdk" | 45 | BBCLASSEXTEND = "native nativesdk" |
46 | |||
47 | # This one is reproducible only on 32bit arm MACHINEs (didn't see it with qemux86 or qemux86-64 builds) | ||
48 | # http://errors.yoctoproject.org/Errors/Details/766976/ | ||
49 | # lib32-microsoft-gsl/4.0.0/git/tests/span_tests.cpp:1275:34: error: value computed is not used [-Werror=unused-value] | ||
50 | CXXFLAGS += "-Wno-error=unused-value" | ||
diff --git a/meta-oe/recipes-devtools/mpich/mpich_4.2.1.bb b/meta-oe/recipes-devtools/mpich/mpich_4.2.2.bb index 9fd8c3bb7..f9ff07740 100644 --- a/meta-oe/recipes-devtools/mpich/mpich_4.2.1.bb +++ b/meta-oe/recipes-devtools/mpich/mpich_4.2.2.bb | |||
@@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause" | |||
6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7a88f0d96d0d7396a7c66bf353235b62" | 6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7a88f0d96d0d7396a7c66bf353235b62" |
7 | 7 | ||
8 | SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" | 8 | SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" |
9 | SRC_URI[sha256sum] = "23331b2299f287c3419727edc2df8922d7e7abbb9fd0ac74e03b9966f9ad42d7" | 9 | SRC_URI[sha256sum] = "883f5bb3aeabf627cb8492ca02a03b191d09836bbe0f599d8508351179781d41" |
10 | 10 | ||
11 | RDEPENDS:${PN} += "bash perl libxml2" | 11 | RDEPENDS:${PN} += "bash perl libxml2" |
12 | 12 | ||
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.0.bb b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb index 5f5507bc7..ccbaf9cea 100644 --- a/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.0.bb +++ b/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb | |||
@@ -8,7 +8,10 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ | |||
8 | " | 8 | " |
9 | 9 | ||
10 | SRC_URI = "https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/msgpack-cxx-${PV}.tar.gz" | 10 | SRC_URI = "https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/msgpack-cxx-${PV}.tar.gz" |
11 | SRC_URI[sha256sum] = "23ede7e93c8efee343ad8c6514c28f3708207e5106af3b3e4969b3a9ed7039e7" | 11 | SRC_URI[sha256sum] = "5fd555742e37bbd58d166199e669f01f743c7b3c6177191dd7b31fb0c37fa191" |
12 | |||
13 | UPSTREAM_CHECK_URI = "https://github.com/msgpack/msgpack-c/releases" | ||
14 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
12 | 15 | ||
13 | S = "${WORKDIR}/msgpack-cxx-${PV}" | 16 | S = "${WORKDIR}/msgpack-cxx-${PV}" |
14 | 17 | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.17/oe-npm-cache index eb0f143ea..eb0f143ea 100755 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.17/oe-npm-cache | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.17.bb index d4b818f96..d4b818f96 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.17.bb | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch b/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch new file mode 100644 index 000000000..689512cb6 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch | |||
@@ -0,0 +1,182 @@ | |||
1 | From 182d9c05e78b1ddb1cb8242cd3628a7855a0336f Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrey Kosyakov <caseq@chromium.org> | ||
3 | Date: Thu, 17 Aug 2023 13:50:11 -0700 | ||
4 | Subject: [PATCH] Define UChar as char16_t | ||
5 | |||
6 | We used to have UChar defined as uint16_t which does not go along | ||
7 | with STL these days if you try to have an std::basic_string<> of it, | ||
8 | as there are no standard std::char_traits<> specialization for uint16_t. | ||
9 | |||
10 | This switches UChar to char16_t where practical, introducing a few | ||
11 | compatibility shims to keep CL size small, as (1) this would likely | ||
12 | have to be back-ported and (2) crdtp extensively uses uint16_t for | ||
13 | wide chars. | ||
14 | |||
15 | Bug: b:296390693 | ||
16 | Change-Id: I66a32d8f0050915225b187de56896c26dd76163d | ||
17 | Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4789966 | ||
18 | Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> | ||
19 | Commit-Queue: Jaroslav Sevcik <jarin@chromium.org> | ||
20 | Auto-Submit: Andrey Kosyakov <caseq@chromium.org> | ||
21 | Cr-Commit-Position: refs/heads/main@{#89559} | ||
22 | |||
23 | Upstream-Status: Backport [https://chromium-review.googlesource.com/c/v8/v8/+/4789966] | ||
24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
25 | --- | ||
26 | src/inspector/string-16.cc | 8 +++++++- | ||
27 | src/inspector/string-16.h | 10 ++++++++-- | ||
28 | src/inspector/v8-string-conversions.cc | 6 +++--- | ||
29 | src/inspector/v8-string-conversions.h | 6 ++++-- | ||
30 | .../inspector_protocol/crdtp/test_platform_v8.cc | 9 ++++++--- | ||
31 | 5 files changed, 28 insertions(+), 11 deletions(-) | ||
32 | |||
33 | --- a/deps/v8/src/inspector/string-16.cc | ||
34 | +++ b/deps/v8/src/inspector/string-16.cc | ||
35 | @@ -27,7 +27,7 @@ bool isSpaceOrNewLine(UChar c) { | ||
36 | return isASCII(c) && c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)); | ||
37 | } | ||
38 | |||
39 | -int64_t charactersToInteger(const UChar* characters, size_t length, | ||
40 | +int64_t charactersToInteger(const uint16_t* characters, size_t length, | ||
41 | bool* ok = nullptr) { | ||
42 | std::vector<char> buffer; | ||
43 | buffer.reserve(length + 1); | ||
44 | @@ -50,6 +50,8 @@ int64_t charactersToInteger(const UChar* | ||
45 | |||
46 | String16::String16(const UChar* characters, size_t size) | ||
47 | : m_impl(characters, size) {} | ||
48 | +String16::String16(const uint16_t* characters, size_t size) | ||
49 | + : m_impl(reinterpret_cast<const UChar*>(characters), size) {} | ||
50 | |||
51 | String16::String16(const UChar* characters) : m_impl(characters) {} | ||
52 | |||
53 | @@ -241,6 +243,10 @@ String16 String16::fromUTF16LE(const UCh | ||
54 | #endif // V8_TARGET_BIG_ENDIAN | ||
55 | } | ||
56 | |||
57 | +String16 String16::fromUTF16LE(const uint16_t* stringStart, size_t length) { | ||
58 | + return fromUTF16LE(reinterpret_cast<const UChar*>(stringStart), length); | ||
59 | +} | ||
60 | + | ||
61 | std::string String16::utf8() const { | ||
62 | return UTF16ToUTF8(m_impl.data(), m_impl.size()); | ||
63 | } | ||
64 | --- a/deps/v8/src/inspector/string-16.h | ||
65 | +++ b/deps/v8/src/inspector/string-16.h | ||
66 | @@ -6,6 +6,7 @@ | ||
67 | #define V8_INSPECTOR_STRING_16_H_ | ||
68 | |||
69 | #include <stdint.h> | ||
70 | +#include <uchar.h> | ||
71 | |||
72 | #include <cctype> | ||
73 | #include <climits> | ||
74 | @@ -17,7 +18,7 @@ | ||
75 | |||
76 | namespace v8_inspector { | ||
77 | |||
78 | -using UChar = uint16_t; | ||
79 | +using UChar = char16_t; | ||
80 | |||
81 | class String16 { | ||
82 | public: | ||
83 | @@ -27,6 +28,7 @@ class String16 { | ||
84 | String16(const String16&) V8_NOEXCEPT = default; | ||
85 | String16(String16&&) V8_NOEXCEPT = default; | ||
86 | String16(const UChar* characters, size_t size); | ||
87 | + String16(const uint16_t* characters, size_t size); | ||
88 | V8_EXPORT String16(const UChar* characters); | ||
89 | V8_EXPORT String16(const char* characters); | ||
90 | String16(const char* characters, size_t size); | ||
91 | @@ -48,7 +50,9 @@ class String16 { | ||
92 | int toInteger(bool* ok = nullptr) const; | ||
93 | std::pair<size_t, size_t> getTrimmedOffsetAndLength() const; | ||
94 | String16 stripWhiteSpace() const; | ||
95 | - const UChar* characters16() const { return m_impl.c_str(); } | ||
96 | + const uint16_t* characters16() const { | ||
97 | + return reinterpret_cast<const uint16_t*>(m_impl.c_str()); | ||
98 | + } | ||
99 | size_t length() const { return m_impl.length(); } | ||
100 | bool isEmpty() const { return !m_impl.length(); } | ||
101 | UChar operator[](size_t index) const { return m_impl[index]; } | ||
102 | @@ -78,6 +82,8 @@ class String16 { | ||
103 | // On Big endian architectures, byte order needs to be flipped. | ||
104 | V8_EXPORT static String16 fromUTF16LE(const UChar* stringStart, | ||
105 | size_t length); | ||
106 | + V8_EXPORT static String16 fromUTF16LE(const uint16_t* stringStart, | ||
107 | + size_t length); | ||
108 | |||
109 | std::size_t hash() const { | ||
110 | if (!hash_code) { | ||
111 | --- a/deps/v8/src/inspector/v8-string-conversions.cc | ||
112 | +++ b/deps/v8/src/inspector/v8-string-conversions.cc | ||
113 | @@ -12,7 +12,7 @@ | ||
114 | |||
115 | namespace v8_inspector { | ||
116 | namespace { | ||
117 | -using UChar = uint16_t; | ||
118 | +using UChar = char16_t; | ||
119 | using UChar32 = uint32_t; | ||
120 | |||
121 | bool isASCII(UChar c) { return !(c & ~0x7F); } | ||
122 | @@ -386,7 +386,7 @@ std::string UTF16ToUTF8(const UChar* str | ||
123 | |||
124 | std::basic_string<UChar> UTF8ToUTF16(const char* stringStart, size_t length) { | ||
125 | if (!stringStart || !length) return std::basic_string<UChar>(); | ||
126 | - std::vector<uint16_t> buffer(length); | ||
127 | + std::vector<UChar> buffer(length); | ||
128 | UChar* bufferStart = buffer.data(); | ||
129 | |||
130 | UChar* bufferCurrent = bufferStart; | ||
131 | @@ -395,7 +395,7 @@ std::basic_string<UChar> UTF8ToUTF16(con | ||
132 | reinterpret_cast<const char*>(stringStart + length), | ||
133 | &bufferCurrent, bufferCurrent + buffer.size(), nullptr, | ||
134 | true) != conversionOK) | ||
135 | - return std::basic_string<uint16_t>(); | ||
136 | + return std::basic_string<UChar>(); | ||
137 | size_t utf16Length = bufferCurrent - bufferStart; | ||
138 | return std::basic_string<UChar>(bufferStart, bufferStart + utf16Length); | ||
139 | } | ||
140 | --- a/deps/v8/src/inspector/v8-string-conversions.h | ||
141 | +++ b/deps/v8/src/inspector/v8-string-conversions.h | ||
142 | @@ -5,14 +5,16 @@ | ||
143 | #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ | ||
144 | #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ | ||
145 | |||
146 | +#include <uchar.h> | ||
147 | + | ||
148 | #include <cstdint> | ||
149 | #include <string> | ||
150 | |||
151 | // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may | ||
152 | // want to use string-16.h directly rather than these. | ||
153 | namespace v8_inspector { | ||
154 | -std::basic_string<uint16_t> UTF8ToUTF16(const char* stringStart, size_t length); | ||
155 | -std::string UTF16ToUTF8(const uint16_t* stringStart, size_t length); | ||
156 | +std::basic_string<char16_t> UTF8ToUTF16(const char* stringStart, size_t length); | ||
157 | +std::string UTF16ToUTF8(const char16_t* stringStart, size_t length); | ||
158 | } // namespace v8_inspector | ||
159 | |||
160 | #endif // V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ | ||
161 | --- a/deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc | ||
162 | +++ b/deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc | ||
163 | @@ -11,13 +11,16 @@ | ||
164 | namespace v8_crdtp { | ||
165 | |||
166 | std::string UTF16ToUTF8(span<uint16_t> in) { | ||
167 | - return v8_inspector::UTF16ToUTF8(in.data(), in.size()); | ||
168 | + return v8_inspector::UTF16ToUTF8(reinterpret_cast<const char16_t*>(in.data()), | ||
169 | + in.size()); | ||
170 | } | ||
171 | |||
172 | std::vector<uint16_t> UTF8ToUTF16(span<uint8_t> in) { | ||
173 | - std::basic_string<uint16_t> utf16 = v8_inspector::UTF8ToUTF16( | ||
174 | + std::basic_string<char16_t> utf16 = v8_inspector::UTF8ToUTF16( | ||
175 | reinterpret_cast<const char*>(in.data()), in.size()); | ||
176 | - return std::vector<uint16_t>(utf16.begin(), utf16.end()); | ||
177 | + return std::vector<uint16_t>( | ||
178 | + reinterpret_cast<const uint16_t*>(utf16.data()), | ||
179 | + reinterpret_cast<const uint16_t*>(utf16.data()) + utf16.size()); | ||
180 | } | ||
181 | |||
182 | } // namespace v8_crdtp | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch index cb0237309..bc51f99d8 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch +++ b/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch | |||
@@ -1,21 +1,77 @@ | |||
1 | Link mksnapshot with libatomic on x86 | 1 | From 15e751e4b79475fb34e4b32a3ca54119b20c564a Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Sat, 17 Aug 2024 21:33:18 +0800 | ||
4 | Subject: [PATCH] link libatomic for clang conditionally | ||
2 | 5 | ||
3 | Clang-12 on x86 emits atomic builtins | 6 | Clang emits atomic builtin, explicitly link libatomic conditionally: |
7 | - For target build, always link -latomic for clang as usual | ||
8 | - For host build, if host and target have same bit width, cross compiling | ||
9 | is enabled, and host toolchain is gcc which does not link -latomic; | ||
10 | if host and target have different bit width, no cross compiling, | ||
11 | host build is the same with target build that requires to link | ||
12 | -latomic; | ||
4 | 13 | ||
5 | Fixes | 14 | Fix: |
6 | | module-compiler.cc:(.text._ZN2v88internal4wasm12_GLOBAL__N_123ExecuteCompilationUnitsERKSt10shared_ptrINS2_22BackgroundCompileTokenEEPNS0_8CountersEiNS2_19CompileBaselineOnlyE+0x558): un | 15 | |tmp-glibc/work/core2-64-wrs-linux/nodejs/20.13.0/node-v20.13.0/out/Release/node_js2c: error while loading shared libraries: libatomic.so.1: cannot open shared object file: No such file or directory |
7 | defined reference to `__atomic_load' | ||
8 | 16 | ||
9 | Upstream-Status: Pending | 17 | Upstream-Status: Inappropriate [OE specific] |
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | 18 | ||
19 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
20 | --- | ||
21 | node.gyp | 13 ++++++++++++- | ||
22 | tools/v8_gypfiles/v8.gyp | 15 ++++++++++++--- | ||
23 | 2 files changed, 24 insertions(+), 4 deletions(-) | ||
24 | |||
25 | diff --git a/node.gyp b/node.gyp | ||
26 | index b425f443..f296f35c 100644 | ||
27 | --- a/node.gyp | ||
28 | +++ b/node.gyp | ||
29 | @@ -487,7 +487,18 @@ | ||
30 | ], | ||
31 | }], | ||
32 | ['OS == "linux" and llvm_version != "0.0"', { | ||
33 | - 'libraries': ['-latomic'], | ||
34 | + 'target_conditions': [ | ||
35 | + ['_toolset=="host"', { | ||
36 | + 'conditions': [ | ||
37 | + ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', { | ||
38 | + 'libraries': ['-latomic'], | ||
39 | + }], | ||
40 | + ], | ||
41 | + }], | ||
42 | + ['_toolset=="target"', { | ||
43 | + 'libraries': ['-latomic'], | ||
44 | + }], | ||
45 | + ], | ||
46 | }], | ||
47 | ], | ||
48 | }, | ||
49 | diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp | ||
50 | index b23263cf..dcabf4ca 100644 | ||
12 | --- a/tools/v8_gypfiles/v8.gyp | 51 | --- a/tools/v8_gypfiles/v8.gyp |
13 | +++ b/tools/v8_gypfiles/v8.gyp | 52 | +++ b/tools/v8_gypfiles/v8.gyp |
14 | @@ -1436,6 +1436,7 @@ | 53 | @@ -1100,9 +1100,18 @@ |
15 | { | 54 | # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library |
16 | 'target_name': 'mksnapshot', | 55 | # to implement atomic memory access |
17 | 'type': 'executable', | 56 | ['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', { |
18 | + 'libraries': [ '-latomic' ], | 57 | - 'link_settings': { |
19 | 'dependencies': [ | 58 | - 'libraries': ['-latomic', ], |
20 | 'v8_base_without_compiler', | 59 | - }, |
21 | 'v8_compiler_for_mksnapshot', | 60 | + 'target_conditions': [ |
61 | + ['_toolset=="host"', { | ||
62 | + 'conditions': [ | ||
63 | + ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', { | ||
64 | + 'libraries': ['-latomic'], | ||
65 | + }], | ||
66 | + ], | ||
67 | + }], | ||
68 | + ['_toolset=="target"', { | ||
69 | + 'libraries': ['-latomic', ], | ||
70 | + }], | ||
71 | + ], | ||
72 | }], | ||
73 | ], | ||
74 | }, # v8_base_without_compiler | ||
75 | -- | ||
76 | 2.35.5 | ||
77 | |||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb index 25b59495e..38e5ca9ff 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.17.0.bb | |||
@@ -1,15 +1,15 @@ | |||
1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" | 1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" |
2 | HOMEPAGE = "http://nodejs.org" | 2 | HOMEPAGE = "http://nodejs.org" |
3 | LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" | 3 | LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cef54676c547a5bbab44aa8be3be9ef7" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2ab85b3bae451276a10919163bcc5b74" |
5 | 5 | ||
6 | CVE_PRODUCT = "nodejs node.js" | 6 | CVE_PRODUCT = "nodejs node.js" |
7 | 7 | ||
8 | DEPENDS = "openssl file-replacement-native python3-packaging-native" | 8 | DEPENDS = "openssl openssl-native file-replacement-native python3-packaging-native" |
9 | DEPENDS:append:class-target = " qemu-native" | 9 | DEPENDS:append:class-target = " qemu-native" |
10 | DEPENDS:append:class-native = " c-ares-native" | 10 | DEPENDS:append:class-native = " c-ares-native" |
11 | 11 | ||
12 | inherit pkgconfig python3native qemu ptest | 12 | inherit pkgconfig python3native qemu ptest siteinfo |
13 | 13 | ||
14 | COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" | 14 | COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" |
15 | COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*" | 15 | COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*" |
@@ -24,19 +24,17 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ | |||
24 | file://0004-v8-don-t-override-ARM-CFLAGS.patch \ | 24 | file://0004-v8-don-t-override-ARM-CFLAGS.patch \ |
25 | file://system-c-ares.patch \ | 25 | file://system-c-ares.patch \ |
26 | file://0001-liftoff-Correct-function-signatures.patch \ | 26 | file://0001-liftoff-Correct-function-signatures.patch \ |
27 | file://libatomic.patch \ | ||
28 | file://182d9c05e78.patch \ | ||
27 | file://run-ptest \ | 29 | file://run-ptest \ |
28 | " | 30 | " |
29 | |||
30 | SRC_URI:append:class-target = " \ | 31 | SRC_URI:append:class-target = " \ |
31 | file://0001-Using-native-binaries.patch \ | 32 | file://0001-Using-native-binaries.patch \ |
32 | " | 33 | " |
33 | SRC_URI:append:toolchain-clang:x86 = " \ | ||
34 | file://libatomic.patch \ | ||
35 | " | ||
36 | SRC_URI:append:toolchain-clang:powerpc64le = " \ | 34 | SRC_URI:append:toolchain-clang:powerpc64le = " \ |
37 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ | 35 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ |
38 | " | 36 | " |
39 | SRC_URI[sha256sum] = "11d229fcad7e6e10f450301223c602043f021cda51259ffafc7e55e484b37dc7" | 37 | SRC_URI[sha256sum] = "9abf03ac23362c60387ebb633a516303637145cb3c177be3348b16880fd8b28c" |
40 | 38 | ||
41 | S = "${WORKDIR}/node-v${PV}" | 39 | S = "${WORKDIR}/node-v${PV}" |
42 | 40 | ||
@@ -66,28 +64,14 @@ ARCHFLAGS ?= "" | |||
66 | 64 | ||
67 | PACKAGECONFIG ??= "ares brotli icu zlib" | 65 | PACKAGECONFIG ??= "ares brotli icu zlib" |
68 | 66 | ||
69 | PACKAGECONFIG[ares] = "--shared-cares,,c-ares" | 67 | PACKAGECONFIG[ares] = "--shared-cares,,c-ares c-ares-native" |
70 | PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" | 68 | PACKAGECONFIG[brotli] = "--shared-brotli,,brotli brotli-native" |
71 | PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" | 69 | PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu icu-native" |
72 | PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" | 70 | PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" |
73 | PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" | 71 | PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" |
74 | PACKAGECONFIG[shared] = "--shared" | 72 | PACKAGECONFIG[shared] = "--shared" |
75 | PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" | 73 | PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" |
76 | 74 | ||
77 | # We don't want to cross-compile during target compile, | ||
78 | # and we need to use the right flags during host compile, | ||
79 | # too. | ||
80 | EXTRA_OEMAKE = "\ | ||
81 | CC.host='${CC} -pie -fPIE' \ | ||
82 | CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ | ||
83 | CXX.host='${CXX} -pie -fPIE' \ | ||
84 | CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ | ||
85 | LDFLAGS.host='${LDFLAGS}' \ | ||
86 | AR.host='${AR}' \ | ||
87 | \ | ||
88 | builddir_name=./ \ | ||
89 | " | ||
90 | |||
91 | EXTRANATIVEPATH += "file-native" | 75 | EXTRANATIVEPATH += "file-native" |
92 | 76 | ||
93 | python prune_sources() { | 77 | python prune_sources() { |
@@ -110,9 +94,11 @@ do_unpack[postfuncs] += "prune_sources" | |||
110 | # V8's JIT infrastructure requires binaries such as mksnapshot and | 94 | # V8's JIT infrastructure requires binaries such as mksnapshot and |
111 | # mkpeephole to be run in the host during the build. However, these | 95 | # mkpeephole to be run in the host during the build. However, these |
112 | # binaries must have the same bit-width as the target (e.g. a x86_64 | 96 | # binaries must have the same bit-width as the target (e.g. a x86_64 |
113 | # host targeting ARMv6 needs to produce a 32-bit binary). Instead of | 97 | # host targeting ARMv6 needs to produce a 32-bit binary). |
114 | # depending on a third Yocto toolchain, we just build those binaries | 98 | # 1. If host and target have the different bit width, run those |
115 | # for the target and run them on the host with QEMU. | 99 | # binaries for the target and run them on the host with QEMU. |
100 | # 2. If host and target have the same bit width, enable upstream | ||
101 | # cross crompile support and no QEMU | ||
116 | python do_create_v8_qemu_wrapper () { | 102 | python do_create_v8_qemu_wrapper () { |
117 | """Creates a small wrapper that invokes QEMU to run some target V8 binaries | 103 | """Creates a small wrapper that invokes QEMU to run some target V8 binaries |
118 | on the host.""" | 104 | on the host.""" |
@@ -120,6 +106,10 @@ python do_create_v8_qemu_wrapper () { | |||
120 | d.expand('${STAGING_DIR_HOST}${base_libdir}')] | 106 | d.expand('${STAGING_DIR_HOST}${base_libdir}')] |
121 | qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), | 107 | qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), |
122 | qemu_libdirs) | 108 | qemu_libdirs) |
109 | |||
110 | if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1": | ||
111 | qemu_cmd = "" | ||
112 | |||
123 | wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh') | 113 | wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh') |
124 | with open(wrapper_path, 'w') as wrapper_file: | 114 | with open(wrapper_path, 'w') as wrapper_file: |
125 | wrapper_file.write("""#!/bin/sh | 115 | wrapper_file.write("""#!/bin/sh |
@@ -138,6 +128,14 @@ addtask create_v8_qemu_wrapper after do_configure before do_compile | |||
138 | 128 | ||
139 | LDFLAGS:append:x86 = " -latomic" | 129 | LDFLAGS:append:x86 = " -latomic" |
140 | 130 | ||
131 | export CC_host | ||
132 | export CFLAGS_host | ||
133 | export CXX_host | ||
134 | export CXXFLAGS_host | ||
135 | export LDFLAGS_host | ||
136 | export AR_host | ||
137 | export HOST_AND_TARGET_SAME_WIDTH | ||
138 | |||
141 | CROSS_FLAGS = "--cross-compiling" | 139 | CROSS_FLAGS = "--cross-compiling" |
142 | CROSS_FLAGS:class-native = "--no-cross-compiling" | 140 | CROSS_FLAGS:class-native = "--no-cross-compiling" |
143 | 141 | ||
@@ -179,4 +177,36 @@ RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \ | |||
179 | PACKAGES =+ "${PN}-systemtap" | 177 | PACKAGES =+ "${PN}-systemtap" |
180 | FILES:${PN}-systemtap = "${datadir}/systemtap" | 178 | FILES:${PN}-systemtap = "${datadir}/systemtap" |
181 | 179 | ||
180 | do_configure[prefuncs] += "set_gyp_variables" | ||
181 | do_compile[prefuncs] += "set_gyp_variables" | ||
182 | do_install[prefuncs] += "set_gyp_variables" | ||
183 | python set_gyp_variables () { | ||
184 | if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "0": | ||
185 | # We don't want to cross-compile during target compile, | ||
186 | # and we need to use the right flags during host compile, | ||
187 | # too. | ||
188 | d.setVar("CC_host", d.getVar("CC") + " -pie -fPIE") | ||
189 | d.setVar("CFLAGS_host", d.getVar("CFLAGS")) | ||
190 | d.setVar("CXX_host", d.getVar("CXX") + " -pie -fPIE") | ||
191 | d.setVar("CXXFLAGS_host", d.getVar("CXXFLAGS")) | ||
192 | d.setVar("LDFLAGS_host", d.getVar("LDFLAGS")) | ||
193 | d.setVar("AR_host", d.getVar("AR")) | ||
194 | elif d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1": | ||
195 | # Enable upstream cross crompile support | ||
196 | d.setVar("CC_host", d.getVar("BUILD_CC")) | ||
197 | d.setVar("CFLAGS_host", d.getVar("BUILD_CFLAGS")) | ||
198 | d.setVar("CXX_host", d.getVar("BUILD_CXX")) | ||
199 | d.setVar("CXXFLAGS_host", d.getVar("BUILD_CXXFLAGS")) | ||
200 | d.setVar("LDFLAGS_host", d.getVar("BUILD_LDFLAGS")) | ||
201 | d.setVar("AR_host", d.getVar("BUILD_AR")) | ||
202 | } | ||
203 | |||
204 | python __anonymous () { | ||
205 | # 32 bit target and 64 bit host (x86-64 or aarch64) have different bit width | ||
206 | if d.getVar("SITEINFO_BITS") == "32" and "64" in d.getVar("BUILD_ARCH"): | ||
207 | d.setVar("HOST_AND_TARGET_SAME_WIDTH", "0") | ||
208 | else: | ||
209 | d.setVar("HOST_AND_TARGET_SAME_WIDTH", "1") | ||
210 | } | ||
211 | |||
182 | BBCLASSEXTEND = "native" | 212 | BBCLASSEXTEND = "native" |
diff --git a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb index 85c4fa95a..52af9b99b 100644 --- a/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb +++ b/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb | |||
@@ -10,6 +10,9 @@ COMPATIBLE_HOST = "(x86_64|aarch64|arm|riscv64)" | |||
10 | SRCREV = "09724edb1783a98da2b7ae53c5aaa87493aabc9b" | 10 | SRCREV = "09724edb1783a98da2b7ae53c5aaa87493aabc9b" |
11 | SRC_URI = "git://github.com/billfarrow/pcimem.git;branch=master;protocol=https" | 11 | SRC_URI = "git://github.com/billfarrow/pcimem.git;branch=master;protocol=https" |
12 | 12 | ||
13 | # Upstream repo does not tag | ||
14 | UPSTREAM_CHECK_COMMITS = "1" | ||
15 | |||
13 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
14 | 17 | ||
15 | do_install() { | 18 | do_install() { |
diff --git a/meta-oe/recipes-devtools/perfetto/common/0001-fix-musl-build.patch b/meta-oe/recipes-devtools/perfetto/common/0001-fix-musl-build.patch new file mode 100644 index 000000000..3b7ca951a --- /dev/null +++ b/meta-oe/recipes-devtools/perfetto/common/0001-fix-musl-build.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 485c21940eb0100a33b7efea40a83e7f79e765f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Etienne Cordonnier <ecordonnier@snap.com> | ||
3 | Date: Sun, 22 Sep 2024 20:17:52 +0200 | ||
4 | Subject: [PATCH] fix musl build | ||
5 | |||
6 | Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> | ||
7 | --- | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | sdk/perfetto.cc | 1 - | ||
11 | src/base/utils.cc | 1 - | ||
12 | 2 files changed, 2 deletions(-) | ||
13 | |||
14 | diff --git a/sdk/perfetto.cc b/sdk/perfetto.cc | ||
15 | index b10dd5aa92..2eb90f0d15 100644 | ||
16 | --- a/sdk/perfetto.cc | ||
17 | +++ b/sdk/perfetto.cc | ||
18 | @@ -6558,7 +6558,6 @@ std::optional<int32_t> GetTimezoneOffsetMins() { | ||
19 | |||
20 | #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ | ||
21 | PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) | ||
22 | -#include <linux/prctl.h> | ||
23 | #include <sys/prctl.h> | ||
24 | |||
25 | #ifndef PR_GET_TAGGED_ADDR_CTRL | ||
26 | diff --git a/src/base/utils.cc b/src/base/utils.cc | ||
27 | index 0d9318c136..419c7dbc1a 100644 | ||
28 | --- a/src/base/utils.cc | ||
29 | +++ b/src/base/utils.cc | ||
30 | @@ -40,7 +40,6 @@ | ||
31 | |||
32 | #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ | ||
33 | PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) | ||
34 | -#include <linux/prctl.h> | ||
35 | #include <sys/prctl.h> | ||
36 | |||
37 | #ifndef PR_GET_TAGGED_ADDR_CTRL | ||
38 | -- | ||
39 | 2.43.0 | ||
40 | |||
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch b/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch deleted file mode 100644 index d08721ae6..000000000 --- a/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | From e63949205682bbd2a0e33e256119472d704a2549 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 29 Jan 2023 22:03:01 -0800 | ||
4 | Subject: [PATCH] Add missing header <cstdint> for uintXX_t types | ||
5 | |||
6 | This is detected by gcc-13 | ||
7 | gcc 13 moved some includes around and as a result <cstdint> is no | ||
8 | longer transitively included [1]. Explicitly include it for uintXX_t. | ||
9 | |||
10 | [1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes | ||
11 | |||
12 | Upstream-Status: Submitted [https://android-review.googlesource.com/c/platform/external/perfetto/+/2399128] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | include/perfetto/ext/base/http/sha1.h | 1 + | ||
16 | include/perfetto/ext/base/uuid.h | 1 + | ||
17 | src/traced/probes/common/cpu_freq_info.h | 1 + | ||
18 | 3 files changed, 3 insertions(+) | ||
19 | |||
20 | diff --git a/include/perfetto/ext/base/http/sha1.h b/include/perfetto/ext/base/http/sha1.h | ||
21 | index c583d69d4..7e3a48c83 100644 | ||
22 | --- a/include/perfetto/ext/base/http/sha1.h | ||
23 | +++ b/include/perfetto/ext/base/http/sha1.h | ||
24 | @@ -20,6 +20,7 @@ | ||
25 | #include <stddef.h> | ||
26 | |||
27 | #include <array> | ||
28 | +#include <cstdint> | ||
29 | #include <string> | ||
30 | |||
31 | namespace perfetto { | ||
32 | diff --git a/include/perfetto/ext/base/uuid.h b/include/perfetto/ext/base/uuid.h | ||
33 | index 1b4c53815..472042fab 100644 | ||
34 | --- a/include/perfetto/ext/base/uuid.h | ||
35 | +++ b/include/perfetto/ext/base/uuid.h | ||
36 | @@ -18,6 +18,7 @@ | ||
37 | #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ | ||
38 | |||
39 | #include <array> | ||
40 | +#include <cstdint> | ||
41 | #include <string> | ||
42 | |||
43 | #include "perfetto/ext/base/optional.h" | ||
44 | diff --git a/src/traced/probes/common/cpu_freq_info.h b/src/traced/probes/common/cpu_freq_info.h | ||
45 | index 36f7f9c09..8232cbf64 100644 | ||
46 | --- a/src/traced/probes/common/cpu_freq_info.h | ||
47 | +++ b/src/traced/probes/common/cpu_freq_info.h | ||
48 | @@ -17,6 +17,7 @@ | ||
49 | #ifndef SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_ | ||
50 | #define SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_ | ||
51 | |||
52 | +#include <cstdint> | ||
53 | #include <map> | ||
54 | #include <string> | ||
55 | #include <vector> | ||
56 | -- | ||
57 | 2.39.1 | ||
58 | |||
diff --git a/meta-oe/recipes-devtools/perfetto/libperfetto.bb b/meta-oe/recipes-devtools/perfetto/libperfetto.bb index c8f56fd52..8383db3cc 100644 --- a/meta-oe/recipes-devtools/perfetto/libperfetto.bb +++ b/meta-oe/recipes-devtools/perfetto/libperfetto.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | LICENSE = "Apache-2.0" | 1 | LICENSE = "Apache-2.0" |
2 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f87516e0b698007e9e75a1fe1012b390" | 2 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d" |
3 | 3 | ||
4 | require perfetto.inc | 4 | require perfetto.inc |
5 | 5 | ||
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch b/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch index ae644747c..719663a80 100644 --- a/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch +++ b/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch | |||
@@ -3,21 +3,22 @@ From: Markus Volk <f_l_k@t-online.de> | |||
3 | Date: Mon, 17 Oct 2022 19:20:53 +0200 | 3 | Date: Mon, 17 Oct 2022 19:20:53 +0200 |
4 | Subject: [PATCH] meson: add PC file for lib_perfetto | 4 | Subject: [PATCH] meson: add PC file for lib_perfetto |
5 | 5 | ||
6 | Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> | ||
6 | --- | 7 | --- |
7 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
8 | 9 | ||
9 | meson.build | 12 ++++++++++-- | 10 | meson.build | 10 +++++++++- |
10 | 1 file changed, 10 insertions(+), 2 deletions(-) | 11 | 1 file changed, 9 insertions(+), 1 deletion(-) |
11 | 12 | ||
13 | diff --git a/meson.build b/meson.build | ||
14 | index 8fb1e26275..3ef3ebf27d 100644 | ||
12 | --- a/meson.build | 15 | --- a/meson.build |
13 | +++ b/meson.build | 16 | +++ b/meson.build |
14 | @@ -19,9 +19,12 @@ | 17 | @@ -19,8 +19,11 @@ |
15 | project( | 18 | project( |
16 | 'perfetto', | 19 | 'perfetto', |
17 | ['cpp'], | 20 | ['cpp'], |
18 | - default_options: ['cpp_std=c++17'] | 21 | + version: '47.0' |
19 | + default_options: ['cpp_std=c++17'], | ||
20 | + version: '31.0' | ||
21 | ) | 22 | ) |
22 | 23 | ||
23 | +soversion = meson.project_version() | 24 | +soversion = meson.project_version() |
@@ -25,7 +26,7 @@ Upstream-Status: Pending | |||
25 | fs = import('fs') | 26 | fs = import('fs') |
26 | 27 | ||
27 | if not fs.is_dir('sdk') | 28 | if not fs.is_dir('sdk') |
28 | @@ -36,8 +39,9 @@ if host_machine.system() == 'android' | 29 | @@ -35,8 +38,9 @@ if host_machine.system() == 'android' |
29 | deps_perfetto += cpp.find_library('log') | 30 | deps_perfetto += cpp.find_library('log') |
30 | endif | 31 | endif |
31 | 32 | ||
@@ -36,7 +37,7 @@ Upstream-Status: Pending | |||
36 | sources: 'sdk/perfetto.cc', | 37 | sources: 'sdk/perfetto.cc', |
37 | dependencies: deps_perfetto, | 38 | dependencies: deps_perfetto, |
38 | install: true, | 39 | install: true, |
39 | @@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.cu | 40 | @@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.current_source_dir(), |
40 | 41 | ||
41 | install_data(dir_perfetto_trace / 'perfetto_trace.proto') | 42 | install_data(dir_perfetto_trace / 'perfetto_trace.proto') |
42 | 43 | ||
@@ -47,3 +48,6 @@ Upstream-Status: Pending | |||
47 | dep_perfetto = declare_dependency( | 48 | dep_perfetto = declare_dependency( |
48 | link_with: lib_perfetto, | 49 | link_with: lib_perfetto, |
49 | include_directories: inc_perfetto, | 50 | include_directories: inc_perfetto, |
51 | -- | ||
52 | 2.43.0 | ||
53 | |||
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-oe/recipes-devtools/perfetto/perfetto.bb index 7e9408b0b..d2a6fbe65 100644 --- a/meta-oe/recipes-devtools/perfetto/perfetto.bb +++ b/meta-oe/recipes-devtools/perfetto/perfetto.bb | |||
@@ -1,16 +1,17 @@ | |||
1 | LICENSE = "Apache-2.0 & BSD-3-Clause & MIT & Zlib" | 1 | LICENSE = "Apache-2.0 & BSD-3-Clause & MIT & Zlib" |
2 | 2 | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f87516e0b698007e9e75a1fe1012b390 \ | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d \ |
4 | file://buildtools/libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \ | 4 | file://buildtools/libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \ |
5 | file://buildtools/libcxxabi/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \ | 5 | file://buildtools/libcxxabi/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \ |
6 | file://buildtools/libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \ | 6 | file://buildtools/libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \ |
7 | file://buildtools/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \ | 7 | file://buildtools/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \ |
8 | file://buildtools/zlib/LICENSE;md5=f09575dbfb09420642318b413159496f \ | 8 | file://buildtools/zlib/LICENSE;md5=8c75f2b4df47a77f9445315a9500cd1c \ |
9 | file://debian/copyright;md5=4e08364c82141f181de69d0a2b89d612 \ | 9 | file://debian/copyright;md5=4e08364c82141f181de69d0a2b89d612 \ |
10 | file://python/LICENSE;md5=c602a632c34ade9c78a976734077bce7" | 10 | file://python/LICENSE;md5=c602a632c34ade9c78a976734077bce7" |
11 | 11 | ||
12 | # Dependencies from perfetto/tools/install-build-deps | ||
12 | SRC_URI:append = " \ | 13 | SRC_URI:append = " \ |
13 | git://github.com/protocolbuffers/protobuf.git;branch=3.9.x;protocol=https;destsuffix=git/buildtools/protobuf;name=protobuf \ | 14 | git://github.com/protocolbuffers/protobuf.git;branch=main;protocol=https;destsuffix=git/buildtools/protobuf;name=protobuf \ |
14 | git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git;protocol=https;destsuffix=git/buildtools/libcxx;branch=main;name=libcxx \ | 15 | git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git;protocol=https;destsuffix=git/buildtools/libcxx;branch=main;name=libcxx \ |
15 | git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git;protocol=https;destsuffix=git/buildtools/libcxxabi;branch=main;name=libcxxabi \ | 16 | git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git;protocol=https;destsuffix=git/buildtools/libcxxabi;branch=main;name=libcxxabi \ |
16 | git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=git/buildtools/libunwind;branch=main;name=libunwind \ | 17 | git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=git/buildtools/libunwind;branch=main;name=libunwind \ |
@@ -22,25 +23,28 @@ SRC_URI:append = " \ | |||
22 | git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=git/buildtools/bionic;name=bionic \ | 23 | git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=git/buildtools/bionic;name=bionic \ |
23 | git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=git/buildtools/zlib;name=zlib \ | 24 | git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=git/buildtools/zlib;name=zlib \ |
24 | git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=git/buildtools/lzma;name=lzma \ | 25 | git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=git/buildtools/lzma;name=lzma \ |
26 | git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=git/buildtools/zstd;name=zstd \ | ||
25 | https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=git/buildtools/;name=gn \ | 27 | https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=git/buildtools/;name=gn \ |
26 | \ | 28 | \ |
27 | file://0001-Remove-check_build_deps-build-steps.patch \ | 29 | file://0001-Remove-check_build_deps-build-steps.patch \ |
28 | file://0001-Add-missing-header-cstdint-for-uintXX_t-types.patch" | 30 | file://0002-traced-fix-missing-include.patch \ |
31 | " | ||
29 | 32 | ||
30 | SRCREV_bionic = "4b0e16bc72a82a63c699977376a7d6eadca1b206" | 33 | SRCREV_bionic = "a0d0355105cb9d4a4b5384897448676133d7b8e2" |
31 | SRCREV_core = "9e6cef7f07d8c11b3ea820938aeb7ff2e9dbaa52" | 34 | SRCREV_core = "9e6cef7f07d8c11b3ea820938aeb7ff2e9dbaa52" |
32 | SRCREV_lzma = "7851dce6f4ca17f5caa1c93a4e0a45686b1d56c3" | 35 | SRCREV_lzma = "7851dce6f4ca17f5caa1c93a4e0a45686b1d56c3" |
33 | SRCREV_libprocinfo = "fd214c13ededecae97a3b15b5fccc8925a749a84" | 36 | SRCREV_libprocinfo = "fd214c13ededecae97a3b15b5fccc8925a749a84" |
34 | SRCREV_logging = "7b36b566c9113fc703d68f76e8f40c0c2432481c" | 37 | SRCREV_logging = "7b36b566c9113fc703d68f76e8f40c0c2432481c" |
35 | SRCREV_unwinding = "d66882575ebe3700d6a6b10185f3aee28acc1051" | 38 | SRCREV_unwinding = "4b59ea8471e89d01300481a92de3230b79b6d7c7" |
36 | SRCREV_protobuf = "6a59a2ad1f61d9696092f79b6d74368b4d7970a3" | 39 | SRCREV_protobuf = "f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c" |
37 | SRCREV_libbase = "78f1c2f83e625bdf66d55b48bdb3a301c20d2fb3" | 40 | SRCREV_libbase = "78f1c2f83e625bdf66d55b48bdb3a301c20d2fb3" |
38 | SRCREV_libcxx = "f8571eaba606bde2eb8cd34b30104ca33e7c207e" | 41 | SRCREV_libcxx = "852bc6746f45add53fec19f3a29280e69e358d44" |
39 | SRCREV_libcxxabi = "8dd405113a4f3694e910b79785dd7fb7535a888a" | 42 | SRCREV_libcxxabi = "a37a3aa431f132b02a58656f13984d51098330a2" |
40 | SRCREV_libunwind = "aabcd8753678f1536e15eb6385a948470debdae4" | 43 | SRCREV_libunwind = "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad" |
41 | SRCREV_zlib = "5c85a2da4c13eda07f69d81a1579a5afddd35f59" | 44 | SRCREV_zlib = "6d3f6aa0f87c9791ca7724c279ef61384f331dfd" |
45 | SRCREV_zstd = "77211fcc5e08c781734a386402ada93d0d18d093" | ||
42 | 46 | ||
43 | SRCREV_FORMAT .="_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib" | 47 | SRCREV_FORMAT .="_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib_zstd" |
44 | 48 | ||
45 | SRC_URI[gn.sha256sum] = "f706aaa0676e3e22f5fc9ca482295d7caee8535d1869f99efa2358177b64f5cd" | 49 | SRC_URI[gn.sha256sum] = "f706aaa0676e3e22f5fc9ca482295d7caee8535d1869f99efa2358177b64f5cd" |
46 | 50 | ||
@@ -96,8 +100,8 @@ do_configure () { | |||
96 | 100 | ||
97 | ARGS=$ARGS" target_os=\"linux\"" | 101 | ARGS=$ARGS" target_os=\"linux\"" |
98 | ARGS=$ARGS" target_cpu=\"$arch\"" | 102 | ARGS=$ARGS" target_cpu=\"$arch\"" |
99 | ARGS=$ARGS" target_cc=\"$CC_BIN ${TUNE_CCARGS}\"" | 103 | ARGS=$ARGS" target_cc=\"$CC_BIN ${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}\"" |
100 | ARGS=$ARGS" target_cxx=\"$CXX_BIN -std=c++11 ${TUNE_CCARGS}\"" | 104 | ARGS=$ARGS" target_cxx=\"$CXX_BIN ${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}\"" |
101 | ARGS=$ARGS" target_strip=\"$STRIP_BIN\"" # | 105 | ARGS=$ARGS" target_strip=\"$STRIP_BIN\"" # |
102 | ARGS=$ARGS" target_sysroot=\"${RECIPE_SYSROOT}\"" | 106 | ARGS=$ARGS" target_sysroot=\"${RECIPE_SYSROOT}\"" |
103 | ARGS=$ARGS" target_linker=\"$CC_BIN ${TUNE_CCARGS} ${LDFLAGS}\"" | 107 | ARGS=$ARGS" target_linker=\"$CC_BIN ${TUNE_CCARGS} ${LDFLAGS}\"" |
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto.inc b/meta-oe/recipes-devtools/perfetto/perfetto.inc index 4b06c5bf0..e0e4f04a2 100644 --- a/meta-oe/recipes-devtools/perfetto/perfetto.inc +++ b/meta-oe/recipes-devtools/perfetto/perfetto.inc | |||
@@ -1,10 +1,15 @@ | |||
1 | SUMMARY = "Perfetto - System profiling, app tracing and trace analysis." | 1 | SUMMARY = "Perfetto - System profiling, app tracing and trace analysis." |
2 | HOMEPAGE = "https://github.com/google/perfetto" | 2 | HOMEPAGE = "https://github.com/google/perfetto" |
3 | 3 | ||
4 | SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1" | 4 | FILESEXTRAPATHS:prepend := "${THISDIR}/common:" |
5 | 5 | ||
6 | SRCREV_perfetto = "b8da07095979310818f0efde2ef3c69ea70d62c5" | 6 | # Add only patches here which are used by both perfetto and libperfetto |
7 | SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1 \ | ||
8 | file://0001-fix-musl-build.patch \ | ||
9 | " | ||
10 | |||
11 | SRCREV_perfetto = "c74251226a8caa0b43377902ee06d2570faa0c15" | ||
7 | SRCREV_FORMAT = "perfetto" | 12 | SRCREV_FORMAT = "perfetto" |
8 | PV = "31.0" | 13 | PV = "47.0" |
9 | 14 | ||
10 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch index c10400aef..118c3aed4 100644 --- a/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch +++ b/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3b7091243ec03054ca8800b51b85a1c09e7e3075 Mon Sep 17 00:00:00 2001 | 1 | From 07ddc4b9b7a6fec73cdc295baba353944857212e Mon Sep 17 00:00:00 2001 |
2 | From: Sui Chen <suichen6@gmail.com> | 2 | From: Sui Chen <suichen6@gmail.com> |
3 | Date: Mon, 13 Jun 2022 17:46:49 +0000 | 3 | Date: Mon, 13 Jun 2022 17:46:49 +0000 |
4 | Subject: [PATCH] Remove "check_build_deps" build steps | 4 | Subject: [PATCH] Remove "check_build_deps" build steps |
@@ -11,6 +11,7 @@ Also setting "is_cross_compiling" to true, so that the host-side tools | |||
11 | rather than the Bitbake-generated one. | 11 | rather than the Bitbake-generated one. |
12 | 12 | ||
13 | Signed-off-by: Sui Chen <suichen6@gmail.com> | 13 | Signed-off-by: Sui Chen <suichen6@gmail.com> |
14 | Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> | ||
14 | --- | 15 | --- |
15 | Upstream-Status: Pending | 16 | Upstream-Status: Pending |
16 | 17 | ||
@@ -20,10 +21,10 @@ Upstream-Status: Pending | |||
20 | 3 files changed, 9 insertions(+), 9 deletions(-) | 21 | 3 files changed, 9 insertions(+), 9 deletions(-) |
21 | 22 | ||
22 | diff --git a/gn/BUILD.gn b/gn/BUILD.gn | 23 | diff --git a/gn/BUILD.gn b/gn/BUILD.gn |
23 | index 8a7ca72a8..e4a2d39f0 100644 | 24 | index ed055ee700..ea79979ec5 100644 |
24 | --- a/gn/BUILD.gn | 25 | --- a/gn/BUILD.gn |
25 | +++ b/gn/BUILD.gn | 26 | +++ b/gn/BUILD.gn |
26 | @@ -111,7 +111,6 @@ group("default_deps") { | 27 | @@ -117,7 +117,6 @@ group("default_deps") { |
27 | deps = [ ":gen_buildflags" ] | 28 | deps = [ ":gen_buildflags" ] |
28 | if (perfetto_build_standalone) { | 29 | if (perfetto_build_standalone) { |
29 | public_deps = [ | 30 | public_deps = [ |
@@ -32,10 +33,10 @@ index 8a7ca72a8..e4a2d39f0 100644 | |||
32 | "//gn/standalone/sanitizers:deps", | 33 | "//gn/standalone/sanitizers:deps", |
33 | ] | 34 | ] |
34 | diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn | 35 | diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn |
35 | index 582e9b867..9c77ac64c 100644 | 36 | index 36fb6371a5..f7bc97b1a6 100644 |
36 | --- a/gn/standalone/BUILD.gn | 37 | --- a/gn/standalone/BUILD.gn |
37 | +++ b/gn/standalone/BUILD.gn | 38 | +++ b/gn/standalone/BUILD.gn |
38 | @@ -441,10 +441,10 @@ config("android_liblog") { | 39 | @@ -469,10 +469,10 @@ config("android_liblog") { |
39 | } | 40 | } |
40 | 41 | ||
41 | # Checks that tools/install-build-deps has been run since it last changed. | 42 | # Checks that tools/install-build-deps has been run since it last changed. |
@@ -53,7 +54,7 @@ index 582e9b867..9c77ac64c 100644 | |||
53 | +# args = [ "--android" ] | 54 | +# args = [ "--android" ] |
54 | +#} | 55 | +#} |
55 | diff --git a/gn/standalone/BUILDCONFIG.gn b/gn/standalone/BUILDCONFIG.gn | 56 | diff --git a/gn/standalone/BUILDCONFIG.gn b/gn/standalone/BUILDCONFIG.gn |
56 | index 6f32686c1..c041989b0 100644 | 57 | index 05ed548f9d..94db724b2b 100644 |
57 | --- a/gn/standalone/BUILDCONFIG.gn | 58 | --- a/gn/standalone/BUILDCONFIG.gn |
58 | +++ b/gn/standalone/BUILDCONFIG.gn | 59 | +++ b/gn/standalone/BUILDCONFIG.gn |
59 | @@ -59,8 +59,9 @@ declare_args() { | 60 | @@ -59,8 +59,9 @@ declare_args() { |
@@ -67,7 +68,4 @@ index 6f32686c1..c041989b0 100644 | |||
67 | + is_cross_compiling = true | 68 | + is_cross_compiling = true |
68 | } | 69 | } |
69 | default_configs = [ | 70 | default_configs = [ |
70 | "//gn/standalone:debug_symbols", | 71 | "//gn/standalone:default", |
71 | -- | ||
72 | 2.37.1 | ||
73 | |||
diff --git a/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch b/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch new file mode 100644 index 000000000..49b798935 --- /dev/null +++ b/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From d005c0123b2f929b918359a53ffe61d7ca2212a0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lalit Maganti <lalitm@google.com> | ||
3 | Date: Wed, 14 Aug 2024 11:56:47 +0100 | ||
4 | Subject: [PATCH] traced: fix missing include | ||
5 | |||
6 | Change-Id: Ib9ce8ce5b057e89fa451ccef228228d607b36793 | ||
7 | Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> | ||
8 | --- | ||
9 | Upstream-Status: Backport [https://github.com/google/perfetto/commit/d005c0123b2f929b918359a53ffe61d7ca2212a0] | ||
10 | |||
11 | src/traced/probes/sys_stats/sys_stats_data_source.h | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/src/traced/probes/sys_stats/sys_stats_data_source.h b/src/traced/probes/sys_stats/sys_stats_data_source.h | ||
15 | index e09cd8a2ca..7e4749bdcd 100644 | ||
16 | --- a/src/traced/probes/sys_stats/sys_stats_data_source.h | ||
17 | +++ b/src/traced/probes/sys_stats/sys_stats_data_source.h | ||
18 | @@ -21,6 +21,7 @@ | ||
19 | |||
20 | #include <map> | ||
21 | #include <memory> | ||
22 | +#include <optional> | ||
23 | #include <string> | ||
24 | |||
25 | #include "perfetto/ext/base/paged_memory.h" | ||
26 | -- | ||
27 | 2.43.0 | ||
28 | |||
diff --git a/meta-oe/recipes-devtools/perl/exiftool_12.85.bb b/meta-oe/recipes-devtools/perl/exiftool_12.89.bb index 66e9a3b71..3d745146f 100644 --- a/meta-oe/recipes-devtools/perl/exiftool_12.85.bb +++ b/meta-oe/recipes-devtools/perl/exiftool_12.89.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff | |||
7 | 7 | ||
8 | inherit cpan | 8 | inherit cpan |
9 | 9 | ||
10 | SRCREV = "405674e0c477931b60b10a78828483ef54761385" | 10 | SRCREV = "e04534a40925354187e8432d44248229d774f34a" |
11 | SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master" |
12 | 12 | ||
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl/0001-Fix-building-on-Fedora-40-with-GCC-14.2.1.patch b/meta-oe/recipes-devtools/perl/libdbi-perl/0001-Fix-building-on-Fedora-40-with-GCC-14.2.1.patch new file mode 100644 index 000000000..f29d6c4d8 --- /dev/null +++ b/meta-oe/recipes-devtools/perl/libdbi-perl/0001-Fix-building-on-Fedora-40-with-GCC-14.2.1.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From dc970a868a4c2d7e2051b533e0a3588ef1d35530 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= <git@myname.nl> | ||
3 | Date: Mon, 26 Aug 2024 10:17:01 +0200 | ||
4 | Subject: [PATCH] Fix building on Fedora 40 with GCC 14.2.1 | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/perl5-dbi/dbi/commit/d6e2bf13ac6043f5b0a9a147805b4915bd70e631] | ||
7 | |||
8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
9 | --- | ||
10 | DBI.xs | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/DBI.xs b/DBI.xs | ||
14 | index 747e341..9b1d136 100644 | ||
15 | --- a/DBI.xs | ||
16 | +++ b/DBI.xs | ||
17 | @@ -1106,7 +1106,7 @@ dbih_inner(pTHX_ SV *orv, const char *what) | ||
18 | if (!SvMAGICAL(ohv)) { | ||
19 | if (!what) | ||
20 | return NULL; | ||
21 | - if (!hv_fetch(ohv,"_NO_DESTRUCT_WARN",17,0)) | ||
22 | + if (!hv_fetch((HV*)ohv,"_NO_DESTRUCT_WARN",17,0)) | ||
23 | sv_dump(orv); | ||
24 | croak("%s handle %s is not a DBI handle (has no magic)", | ||
25 | what, neatsvpv(orv,0)); | ||
26 | -- | ||
27 | 2.46.0 | ||
28 | |||
diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch b/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch deleted file mode 100644 index b41bbe0a5..000000000 --- a/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | Backport patch to fix CVE-2014-10402. | ||
2 | |||
3 | CVE: CVE-2014-10402 | ||
4 | Upstream-Status: Backport [https://github.com/rehsack/dbi/commit/19d0fb1] | ||
5 | |||
6 | Ref: | ||
7 | https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=972180#12 | ||
8 | |||
9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
10 | |||
11 | |||
12 | From 19d0fb169eed475e1c053e99036b8668625cfa94 Mon Sep 17 00:00:00 2001 | ||
13 | From: Jens Rehsack <sno@netbsd.org> | ||
14 | Date: Tue, 6 Oct 2020 10:22:17 +0200 | ||
15 | Subject: [PATCH] lib/DBD/File.pm: fix CVE-2014-10401 | ||
16 | |||
17 | Dig into the root cause of RT#99508 - which resulted in CVE-2014-10401 - and | ||
18 | figure out that DBI->parse_dsn is the wrong helper to parse our attributes in | ||
19 | DSN, since in DBD::dr::connect only the "dbname" remains from DSN which causes | ||
20 | parse_dsn to bailout. | ||
21 | |||
22 | Parsing on our own similar to parse_dsn shows the way out. | ||
23 | |||
24 | Signed-off-by: Jens Rehsack <sno@netbsd.org> | ||
25 | --- | ||
26 | lib/DBD/File.pm | 7 +++++-- | ||
27 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
28 | |||
29 | diff --git a/lib/DBD/File.pm b/lib/DBD/File.pm | ||
30 | index fb14e9a..f55076f 100644 | ||
31 | --- a/lib/DBD/File.pm | ||
32 | +++ b/lib/DBD/File.pm | ||
33 | @@ -109,7 +109,11 @@ sub connect | ||
34 | # We do not (yet) care about conflicting attributes here | ||
35 | # my $dbh = DBI->connect ("dbi:CSV:f_dir=test", undef, undef, { f_dir => "text" }); | ||
36 | # will test here that both test and text should exist | ||
37 | - if (my $attr_hash = (DBI->parse_dsn ($dbname))[3]) { | ||
38 | + # | ||
39 | + # Parsing on our own similar to parse_dsn to find attributes in 'dbname' parameter. | ||
40 | + if ($dbname) { | ||
41 | + my @attrs = split /;/ => $dbname; | ||
42 | + my $attr_hash = { map { split /\s*=>?\s*|\s*,\s*/, $_} @attrs }; | ||
43 | if (defined $attr_hash->{f_dir} && ! -d $attr_hash->{f_dir}) { | ||
44 | my $msg = "No such directory '$attr_hash->{f_dir}"; | ||
45 | $drh->set_err (2, $msg); | ||
46 | @@ -120,7 +124,6 @@ sub connect | ||
47 | if ($attr and defined $attr->{f_dir} && ! -d $attr->{f_dir}) { | ||
48 | my $msg = "No such directory '$attr->{f_dir}"; | ||
49 | $drh->set_err (2, $msg); | ||
50 | - $attr->{RaiseError} and croak $msg; | ||
51 | return; | ||
52 | } | ||
53 | |||
54 | -- | ||
55 | 2.17.1 | ||
56 | |||
diff --git a/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb b/meta-oe/recipes-devtools/perl/libdbi-perl_1.644.bb index 1fee83a8f..7f6c9059d 100644 --- a/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb +++ b/meta-oe/recipes-devtools/perl/libdbi-perl_1.644.bb | |||
@@ -7,13 +7,12 @@ database interface independent of the actual database being used. \ | |||
7 | HOMEPAGE = "http://search.cpan.org/dist/DBI/" | 7 | HOMEPAGE = "http://search.cpan.org/dist/DBI/" |
8 | SECTION = "libs" | 8 | SECTION = "libs" |
9 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 9 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8097b88c6165f0d43949441e6ea581cd" |
11 | 11 | ||
12 | SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz \ | 12 | SRC_URI = "https://cpan.metacpan.org/authors/id/H/HM/HMBRAND/DBI-${PV}.tar.gz \ |
13 | file://CVE-2014-10402.patch \ | 13 | file://0001-Fix-building-on-Fedora-40-with-GCC-14.2.1.patch \ |
14 | " | 14 | " |
15 | SRC_URI[md5sum] = "352f80b1e23769c116082a90905d7398" | 15 | SRC_URI[sha256sum] = "2297b99de09e67086640b590699e0e982fb469da63a93fe28dc14782db7a53c8" |
16 | SRC_URI[sha256sum] = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa" | ||
17 | 16 | ||
18 | S = "${WORKDIR}/DBI-${PV}" | 17 | S = "${WORKDIR}/DBI-${PV}" |
19 | 18 | ||
diff --git a/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb b/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb index ff4e1f056..ff1552a99 100644 --- a/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb +++ b/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb | |||
@@ -8,8 +8,10 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | |||
8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 8 | LIC_FILES_CHKSUM = "file://LICENCE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
9 | 9 | ||
10 | SRC_URI = "https://cpan.metacpan.org/authors/id/W/WH/WHOM/pcsc-perl-${PV}.tar.bz2" | 10 | SRC_URI = "https://cpan.metacpan.org/authors/id/W/WH/WHOM/pcsc-perl-${PV}.tar.bz2" |
11 | SRC_URI[md5sum] = "45601505dbb7b27329811ac9bad35fab" | 11 | SRC_URI[sha256sum] = "5cc834438739bd6e4e837fb7e10bd8befb809cd185ae6cf4b33e5fa9161f59fe" |
12 | SRC_URI[sha256sum] = "2722b7e5543e4faf3ba1ec6b29a7dfec6d92be1edec09d0a3191992d4d88c69d" | 12 | |
13 | UPSTREAM_CHECK_URI = "https://cpan.metacpan.org/authors/id/W/WH/WHOM/" | ||
14 | UPSTREAM_CHECK_REGEX = "pcsc-perl-(?P<pver>\d+(\.\d+)+)" | ||
13 | 15 | ||
14 | S = "${WORKDIR}/pcsc-perl-${PV}" | 16 | S = "${WORKDIR}/pcsc-perl-${PV}" |
15 | 17 | ||
diff --git a/meta-oe/recipes-devtools/php/php_8.2.18.bb b/meta-oe/recipes-devtools/php/php_8.2.20.bb index e662f6806..f306b1693 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.18.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.20.bb | |||
@@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \ | |||
34 | " | 34 | " |
35 | 35 | ||
36 | S = "${WORKDIR}/php-${PV}" | 36 | S = "${WORKDIR}/php-${PV}" |
37 | SRC_URI[sha256sum] = "ca0b07c254200320f518ac5b3df540a9cf14d866f3c93edc3013b52e06fac796" | 37 | SRC_URI[sha256sum] = "5dec6fa61c7b9c47aa1d76666be651f2642ed2bcf6cd8638c57e3571ce2aac61" |
38 | 38 | ||
39 | CVE_STATUS_GROUPS += "CVE_STATUS_PHP" | 39 | CVE_STATUS_GROUPS += "CVE_STATUS_PHP" |
40 | 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." | 40 | 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." |
@@ -43,6 +43,7 @@ CVE_STATUS_PHP = " \ | |||
43 | CVE-2007-3205 \ | 43 | CVE-2007-3205 \ |
44 | CVE-2007-4596 \ | 44 | CVE-2007-4596 \ |
45 | " | 45 | " |
46 | CVE_STATUS[CVE-2022-4900] = "cpe-incorrect: The current version (8.2.20) is not affected." | ||
46 | 47 | ||
47 | inherit autotools pkgconfig python3native gettext multilib_header multilib_script systemd | 48 | inherit autotools pkgconfig python3native gettext multilib_header multilib_script systemd |
48 | 49 | ||
diff --git a/meta-oe/recipes-devtools/poke/poke_4.1.bb b/meta-oe/recipes-devtools/poke/poke_4.2.bb index 296368070..eb840435c 100644 --- a/meta-oe/recipes-devtools/poke/poke_4.1.bb +++ b/meta-oe/recipes-devtools/poke/poke_4.2.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \ | |||
11 | 11 | ||
12 | DEPENDS = "flex-native bison-native bdwgc readline" | 12 | DEPENDS = "flex-native bison-native bdwgc readline" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "08ecaea41f7374acd4238e12bbf97e8cd5e572d5917e956b73b9d43026e9d740" | 14 | SRC_URI[sha256sum] = "8aaf36e61e367a53140ea40e2559e9ec512e779c42bee34e7ac24b34ba119bde" |
15 | 15 | ||
16 | # poke does not support using out-of-tree builds | 16 | # poke does not support using out-of-tree builds |
17 | inherit autotools-brokensep gettext pkgconfig | 17 | inherit autotools-brokensep gettext pkgconfig |
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb index 24de6b811..82aaf1bae 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb | |||
@@ -36,3 +36,6 @@ RDEPENDS:${PN}-compiler = "protobuf-compiler" | |||
36 | RDEPENDS:${PN}-dev += "${PN}-compiler" | 36 | RDEPENDS:${PN}-dev += "${PN}-compiler" |
37 | 37 | ||
38 | BBCLASSEXTEND = "native nativesdk" | 38 | BBCLASSEXTEND = "native nativesdk" |
39 | |||
40 | # No 64bit atomics | ||
41 | LDFLAGS:append:riscv32 = " -latomic" | ||
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb index 4f8515471..d5fd90137 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" | |||
10 | DEPENDS = "zlib abseil-cpp" | 10 | DEPENDS = "zlib abseil-cpp" |
11 | DEPENDS:append:class-target = " protobuf-native" | 11 | DEPENDS:append:class-target = " protobuf-native" |
12 | 12 | ||
13 | SRCREV = "4a2aef570deb2bfb8927426558701e8bfc26f2a4" | 13 | SRCREV = "9d0ec0f92b5b5fdeeda11f9dcecc1872ff378014" |
14 | 14 | ||
15 | SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol=https \ | 15 | SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol=https \ |
16 | file://run-ptest \ | 16 | file://run-ptest \ |
@@ -19,6 +19,8 @@ SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol= | |||
19 | SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " | 19 | SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " |
20 | SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " | 20 | SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " |
21 | 21 | ||
22 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.(25\.(\d+)))" | ||
23 | |||
22 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |
23 | 25 | ||
24 | inherit cmake pkgconfig ptest | 26 | inherit cmake pkgconfig ptest |
@@ -104,6 +106,8 @@ FILES:${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" | |||
104 | # CMake requires protoc binary to exist in sysroot, even if it has wrong architecture. | 106 | # CMake requires protoc binary to exist in sysroot, even if it has wrong architecture. |
105 | SYSROOT_DIRS += "${bindir}" | 107 | SYSROOT_DIRS += "${bindir}" |
106 | 108 | ||
109 | RDEPENDS:${PN} = "abseil-cpp" | ||
110 | RDEPENDS:${PN}-lite = "abseil-cpp" | ||
107 | RDEPENDS:${PN}-compiler = "${PN}" | 111 | RDEPENDS:${PN}-compiler = "${PN}" |
108 | RDEPENDS:${PN}-dev += "${PN}-compiler" | 112 | RDEPENDS:${PN}-dev += "${PN}-compiler" |
109 | RDEPENDS:${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-protobuf', '', d)}" | 113 | RDEPENDS:${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-protobuf', '', d)}" |
diff --git a/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb b/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb index 458958edf..19207883b 100644 --- a/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb +++ b/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" | |||
13 | SRC_URI[sha256sum] = "2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015" | 13 | SRC_URI[sha256sum] = "2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" | 15 | UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" |
16 | UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" | ||
16 | 17 | ||
17 | inherit cmake | 18 | inherit cmake |
18 | 19 | ||
diff --git a/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb b/meta-oe/recipes-devtools/python/python3-pefile_2024.8.26.bb index e30b36232..87e651d9d 100644 --- a/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb +++ b/meta-oe/recipes-devtools/python/python3-pefile_2024.8.26.bb | |||
@@ -2,10 +2,10 @@ SUMMARY = "Python PE parsing module" | |||
2 | DESCRIPTION = "A multi-platform Python module to parse and work with Portable Executable (PE) files." | 2 | DESCRIPTION = "A multi-platform Python module to parse and work with Portable Executable (PE) files." |
3 | HOMEPAGE = "https://github.com/erocarrera/pefile" | 3 | HOMEPAGE = "https://github.com/erocarrera/pefile" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38066667888b01d8118ff9cc23da1873" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e34c75178086aca0a17551ffbacaca53" |
6 | 6 | ||
7 | inherit setuptools3 ptest | 7 | inherit setuptools3 ptest |
8 | SRCREV = "1ab2807c4eec16041e791d7a6acc68cc23fd5266" | 8 | SRCREV = "4b3b1e2e568a88d4f1897d694d684f23d9e270c4" |
9 | SRC_URI = "git://github.com/erocarrera/pefile;branch=master;protocol=https \ | 9 | SRC_URI = "git://github.com/erocarrera/pefile;branch=master;protocol=https \ |
10 | file://run-ptest" | 10 | file://run-ptest" |
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/python/python3-psycopg_3.2.2.bb b/meta-oe/recipes-devtools/python/python3-psycopg_3.2.2.bb new file mode 100644 index 000000000..f92c55600 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python3-psycopg_3.2.2.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "Psycopg 3 is the implementation of a PostgreSQL adapter for Python." | ||
2 | DESCRIPTION = "Psycopg is the most popular PostgreSQL adapter for the Python \ | ||
3 | programming language. Its core is a complete implementation of the Python DB \ | ||
4 | API 2.0 specifications. Several extensions allow access to many of the \ | ||
5 | features offered by PostgreSQL." | ||
6 | |||
7 | LICENSE = "LGPL-3.0-only" | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404" | ||
9 | |||
10 | SRC_URI[sha256sum] = "8bad2e497ce22d556dac1464738cb948f8d6bab450d965cf1d8a8effd52412e0" | ||
11 | |||
12 | inherit pypi python_setuptools_build_meta | ||
13 | |||
14 | RDEPENDS:${PN} = "libpq" | ||
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb index 237c4e738..7159e74c2 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb | |||
@@ -26,6 +26,9 @@ SRC_URI = "\ | |||
26 | SRC_URI[md5sum] = "602a47ad9ecac7bf655ada729d140a94" | 26 | SRC_URI[md5sum] = "602a47ad9ecac7bf655ada729d140a94" |
27 | SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386" | 27 | SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386" |
28 | 28 | ||
29 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/" | ||
30 | UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/" | ||
31 | |||
29 | S = "${WORKDIR}/${BPN}${PV}/unix" | 32 | S = "${WORKDIR}/${BPN}${PV}/unix" |
30 | 33 | ||
31 | DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${S}/../=${TARGET_DBGSRC_DIR}/.." | 34 | DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${S}/../=${TARGET_DBGSRC_DIR}/.." |
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 7e3bddb58..3b8da9144 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | |||
@@ -53,3 +53,10 @@ ALLOW_EMPTY:${PN} = "1" | |||
53 | 53 | ||
54 | PARALLEL_MAKE = "" | 54 | PARALLEL_MAKE = "" |
55 | 55 | ||
56 | # http://errors.yoctoproject.org/Errors/Details/766915/ | ||
57 | # unix.c:235:21: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
58 | # unix.c:1002:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
59 | # unix.c:1163:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
60 | # unix.c:1428:40: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
61 | # unix.c:2254:33: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
62 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-devtools/valijson/valijson_1.0.2.bb b/meta-oe/recipes-devtools/valijson/valijson_1.0.3.bb index f531218ae..82201211b 100644 --- a/meta-oe/recipes-devtools/valijson/valijson_1.0.2.bb +++ b/meta-oe/recipes-devtools/valijson/valijson_1.0.3.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5c4583a434195e4f3b418e17c8ca2daf" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5c4583a434195e4f3b418e17c8ca2daf" |
5 | 5 | ||
6 | SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https" | 6 | SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https" |
7 | SRCREV = "0b4771e273a065d437814baf426bcfcafec0f434" | 7 | SRCREV = "fc9ddf14db683c9443c48ae3a6bf83e0ce3ad37c" |
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | 10 | ||
diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch b/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch new file mode 100644 index 000000000..2ad7beb51 --- /dev/null +++ b/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From d001f12d428f7adaeaadee5263a22c797c99d67b Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <martin.jansa@gmail.com> | ||
3 | Date: Fri, 30 Aug 2024 11:42:27 +0200 | ||
4 | Subject: [PATCH] aclocal.m4: don't use full path of $with_curl in xerces-c.pc | ||
5 | |||
6 | * fixes: | ||
7 | ERROR: QA Issue: File /usr/lib32/pkgconfig/xerces-c.pc in package lib32-libxerces-c-dev contains reference to TMPDIR [buildpaths] | ||
8 | |||
9 | * xerces-c was blacklisted due to tmpdir since 2016: | ||
10 | https://git.openembedded.org/meta-openembedded/commit/?id=1af196e42c811947bb483df30bfce758adee83d1 | ||
11 | |||
12 | * then sed call: | ||
13 | sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc | ||
14 | was added to do_install:append and blacklist dropped in: | ||
15 | https://git.openembedded.org/meta-openembedded/commit/?id=87b9efff79e62f569525e4760adc594d0d9ac476 | ||
16 | |||
17 | * sed call was adjusted in: | ||
18 | https://git.openembedded.org/meta-openembedded/commit/?id=87c9e9537dc43468a6aaf706853b784ce6de14e0 | ||
19 | sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc | ||
20 | |||
21 | * but it was still failing in some cases, e.g. with multilib where libdir is /usr/lib64, so the sed call is: | ||
22 | sed -i s:-L{WORKDIR}/recipe-sysroot/usr/lib64::g ${WORKDIR}/build/xerces-c.pc | ||
23 | but the actual xerces-c.pc file still has: | ||
24 | |||
25 | Libs: -L${libdir} -lxerces-c | ||
26 | Libs.private: -L${WORKDIR}/recipe-sysroot/usr/lib -lcurl | ||
27 | |||
28 | because this aclocal was always hardcoding "lib" (appended to --with-curl | ||
29 | value which is passed together with ${prefix}) and not respecting the libdir value: | ||
30 | PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl" | ||
31 | PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu" | ||
32 | |||
33 | * xerces-c supports CMake since 2017: | ||
34 | https://github.com/apache/xerces-c/commit/2606b2924c3e2bf0cf50f72b79378721b6bcf04e | ||
35 | switching from autotools to CMake would probably resolve some of this as well | ||
36 | |||
37 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
38 | --- | ||
39 | Upstream-Status: Pending [It would be better to just switch to CMake] | ||
40 | |||
41 | m4/xerces_curl_prefix.m4 | 4 ++-- | ||
42 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
43 | |||
44 | diff --git a/m4/xerces_curl_prefix.m4 b/m4/xerces_curl_prefix.m4 | ||
45 | index d1d015c..7928bdc 100644 | ||
46 | --- a/m4/xerces_curl_prefix.m4 | ||
47 | +++ b/m4/xerces_curl_prefix.m4 | ||
48 | @@ -39,8 +39,8 @@ AC_DEFUN([XERCES_CURL_PREFIX], | ||
49 | curl_libs=`$curl_config --libs` | ||
50 | else | ||
51 | if test -n "$with_curl"; then | ||
52 | - curl_flags="-I$with_curl/include" | ||
53 | - curl_libs="-L$with_curl/lib -lcurl" | ||
54 | + curl_flags="" | ||
55 | + curl_libs="-lcurl" | ||
56 | else | ||
57 | # Default compiler paths. | ||
58 | # | ||
diff --git a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb index 1643af254..9fd7e8fba 100644 --- a/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb +++ b/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb | |||
@@ -9,7 +9,9 @@ SECTION = "libs" | |||
9 | LICENSE = "Apache-2.0" | 9 | LICENSE = "Apache-2.0" |
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
11 | 11 | ||
12 | SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2" | 12 | SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2 \ |
13 | file://0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch \ | ||
14 | " | ||
13 | SRC_URI[sha256sum] = "1db4028c9b7f1f778efbf4a9462d65e13f9938f2c22f9e9994e12c49ba97e252" | 15 | SRC_URI[sha256sum] = "1db4028c9b7f1f778efbf4a9462d65e13f9938f2c22f9e9994e12c49ba97e252" |
14 | 16 | ||
15 | inherit autotools | 17 | inherit autotools |
@@ -18,10 +20,6 @@ PACKAGECONFIG ??= "curl icu" | |||
18 | PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl" | 20 | PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl" |
19 | PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu" | 21 | PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu" |
20 | 22 | ||
21 | do_install:prepend () { | ||
22 | sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc | ||
23 | } | ||
24 | |||
25 | PACKAGES = "libxerces-c \ | 23 | PACKAGES = "libxerces-c \ |
26 | libxerces-c-dev \ | 24 | libxerces-c-dev \ |
27 | xerces-c-samples \ | 25 | xerces-c-samples \ |
diff --git a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb index 178a5eb0b..4d560eb4b 100644 --- a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb +++ b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb | |||
@@ -18,6 +18,7 @@ SRC_URI = "https://github.com/mellowcandle/bitwise/releases/download/v${PV}/bitw | |||
18 | SRC_URI[sha256sum] = "806271fa5bf31de0600315e8720004a8f529954480e991ca84a9868dc1cae97e" | 18 | SRC_URI[sha256sum] = "806271fa5bf31de0600315e8720004a8f529954480e991ca84a9868dc1cae97e" |
19 | 19 | ||
20 | UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases" | 20 | UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases" |
21 | UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" | ||
21 | 22 | ||
22 | S = "${WORKDIR}/${BPN}-v${PV}" | 23 | S = "${WORKDIR}/${BPN}-v${PV}" |
23 | 24 | ||
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb index 4e35283dd..cfd134dd4 100644 --- a/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb +++ b/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb | |||
@@ -77,6 +77,10 @@ do_install:prepend() { | |||
77 | mkdir -p ${D}${sysconfdir}/default | 77 | mkdir -p ${D}${sysconfdir}/default |
78 | } | 78 | } |
79 | 79 | ||
80 | do_install:append() { | ||
81 | sed -i -e 's#${S}##g' ${D}${includedir}/boinc/svn_version.h | ||
82 | } | ||
83 | |||
80 | SYSTEMD_SERVICE:${PN} = "boinc-client.service" | 84 | SYSTEMD_SERVICE:${PN} = "boinc-client.service" |
81 | 85 | ||
82 | FILES:${PN} += "${libdir}/systemd" | 86 | FILES:${PN} += "${libdir}/systemd" |
diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.5.bb index 68d404255..acd5b1e80 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.5.bb | |||
@@ -23,7 +23,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bb843e794feb6890f7697637b461c36e" | |||
23 | SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ | 23 | SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ |
24 | " | 24 | " |
25 | #SRC_URI[md5sum] = "5df2f85c75efc351ffadebcc11046a98" | 25 | #SRC_URI[md5sum] = "5df2f85c75efc351ffadebcc11046a98" |
26 | SRC_URI[sha256sum] = "013ebe68599915cedb4bf753b471713d91901a991623358b9a967d9a779bcc16" | 26 | SRC_URI[sha256sum] = "0adcfcf36d47317776ad64331058a4d2e3669683314716ddb885f8a13309f47d" |
27 | |||
28 | UPSTREAM_CHECK_URI = "https://github.com/cfengine/masterfiles/releases" | ||
29 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
27 | 30 | ||
28 | inherit autotools | 31 | inherit autotools |
29 | 32 | ||
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 cc8860253..4f2585fe7 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 | |||
@@ -33,3 +33,7 @@ FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/* | |||
33 | FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so" | 33 | FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so" |
34 | 34 | ||
35 | BBCLASSEXTEND = "native" | 35 | BBCLASSEXTEND = "native" |
36 | |||
37 | # http://errors.yoctoproject.org/Errors/Details/766910/ | ||
38 | # 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] | ||
39 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-extended/dialog/dialog_1.3-20240307.bb b/meta-oe/recipes-extended/dialog/dialog_1.3-20240619.bb index a49717536..0fccce5e8 100644 --- a/meta-oe/recipes-extended/dialog/dialog_1.3-20240307.bb +++ b/meta-oe/recipes-extended/dialog/dialog_1.3-20240619.bb | |||
@@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" |
10 | 10 | ||
11 | SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz" | 11 | SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz" |
12 | SRC_URI[sha256sum] = "339d311c6abb240213426b99ad63565cbcb3e8641ef1989c033e945b754d34ef" | 12 | SRC_URI[sha256sum] = "5d8c4318963db3fd383525340276e0e05ee3dea9a6686c20779f5433b199547d" |
13 | 13 | ||
14 | # hardcoded here for use in dialog-static recipe | 14 | # hardcoded here for use in dialog-static recipe |
15 | S = "${WORKDIR}/dialog-${PV}" | 15 | S = "${WORKDIR}/dialog-${PV}" |
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 ef016b868..afa0e4c8f 100644 --- a/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb +++ b/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb | |||
@@ -11,6 +11,8 @@ inherit ptest | |||
11 | 11 | ||
12 | SRC_URI[sha256sum] = "90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890" | 12 | SRC_URI[sha256sum] = "90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890" |
13 | 13 | ||
14 | UPSTREAM_CHECK_URI = "https://duktape.org/download" | ||
15 | |||
14 | EXTRA_OEMAKE = "INSTALL_PREFIX='${prefix}' DESTDIR='${D}' LIBDIR='/${baselib}'" | 16 | EXTRA_OEMAKE = "INSTALL_PREFIX='${prefix}' DESTDIR='${D}' LIBDIR='/${baselib}'" |
15 | 17 | ||
16 | do_compile () { | 18 | do_compile () { |
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch new file mode 100644 index 000000000..87000b663 --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From aeb34f58782fb6d06aea4f5cbeccb23a0224466e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 4 Sep 2024 14:54:42 -0700 | ||
4 | Subject: [PATCH] Replacing GPR_ASSERT with c assert | ||
5 | |||
6 | Latest GRPC >= 2.66 has dropped GRPC_ASSERT macro [1] | ||
7 | |||
8 | [1] https://github.com/grpc/grpc/commit/0e23c2259da967a037e839e80cafd62bc6f9f68e | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/pull/281] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | src/v3/Action.cpp | 9 +++++++++ | ||
14 | 1 file changed, 9 insertions(+) | ||
15 | |||
16 | --- a/src/v3/Action.cpp | ||
17 | +++ b/src/v3/Action.cpp | ||
18 | @@ -2,6 +2,15 @@ | ||
19 | #include <grpc/support/log.h> | ||
20 | #include <grpcpp/support/status.h> | ||
21 | #include "etcd/v3/action_constants.hpp" | ||
22 | +#include <cstdlib> | ||
23 | + | ||
24 | +#ifndef GPR_ASSERT | ||
25 | +#define GPR_ASSERT(x) \ | ||
26 | + if (!(x)) { \ | ||
27 | + fprintf(stderr, "%s:%d assert failed\n", __FILE__, __LINE__); \ | ||
28 | + abort(); \ | ||
29 | +} | ||
30 | +#endif | ||
31 | |||
32 | etcdv3::Action::Action(etcdv3::ActionParameters const& params) { | ||
33 | parameters = params; | ||
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb index 88a8ba346..0e6509d2d 100644 --- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb | |||
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" | |||
7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
8 | git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ | 8 | git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ |
9 | file://0001-include-stdint.h-for-int64_t-types.patch \ | 9 | file://0001-include-stdint.h-for-int64_t-types.patch \ |
10 | file://0001-Replacing-GPR_ASSERT-with-c-assert.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRCREV = "ba6216385fc332b23d95683966824c2b86c2474e" | 13 | SRCREV = "ba6216385fc332b23d95683966824c2b86c2474e" |
@@ -19,5 +20,9 @@ S = "${WORKDIR}/git" | |||
19 | 20 | ||
20 | EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON" | 21 | EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON" |
21 | 22 | ||
23 | do_install:append() { | ||
24 | sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${libdir}/cmake/etcd-cpp-api/etcd-targets.cmake | ||
25 | } | ||
26 | |||
22 | SOLIBS = ".so" | 27 | SOLIBS = ".so" |
23 | FILES_SOLIBSDEV = "" | 28 | FILES_SOLIBSDEV = "" |
diff --git a/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.5.bb b/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb index 423c6faf7..5dfba2514 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.5.bb +++ b/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
5 | 5 | ||
6 | SRC_URI = "git://github.com/flatpak/flatpak-xdg-utils.git;protocol=https;branch=main" | 6 | SRC_URI = "git://github.com/flatpak/flatpak-xdg-utils.git;protocol=https;branch=main" |
7 | 7 | ||
8 | SRCREV = "5ba39872f81bf8d98d58c5f8acb86604645be468" | 8 | SRCREV = "05abdd7421688be5835a6b12f2b068086c38d4aa" |
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.10.bb index 8351e7d65..c9d04e926 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.10.bb | |||
@@ -4,22 +4,22 @@ LICENSE = "LGPL-2.1-only" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
5 | 5 | ||
6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
7 | gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \ | 7 | git://github.com/flatpak/flatpak;protocol=https;branch=main \ |
8 | file://0001-flatpak-pc-add-pc_sysrootdir.patch \ | 8 | file://0001-flatpak-pc-add-pc_sysrootdir.patch \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRCREV = "925c80f913d69e7ca424428823e1431c4ffb0deb" | 11 | SRCREV = "8b4f523c4f8287d57f1a84a3a8216efe200c5fbf" |
12 | 12 | ||
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | 14 | ||
15 | inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native useradd mime features_check | 15 | inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check |
16 | 16 | ||
17 | REQUIRED_DISTRO_FEATURES = "polkit" | 17 | REQUIRED_DISTRO_FEATURES = "polkit" |
18 | 18 | ||
19 | DEPENDS = " \ | 19 | DEPENDS = " \ |
20 | appstream \ | 20 | appstream \ |
21 | bison-native \ | 21 | bison-native \ |
22 | dconf \ | 22 | bubblewrap-native \ |
23 | fuse3 \ | 23 | fuse3 \ |
24 | gdk-pixbuf \ | 24 | gdk-pixbuf \ |
25 | glib-2.0 \ | 25 | glib-2.0 \ |
@@ -31,14 +31,16 @@ DEPENDS = " \ | |||
31 | ostree \ | 31 | ostree \ |
32 | polkit \ | 32 | polkit \ |
33 | python3-pyparsing-native \ | 33 | python3-pyparsing-native \ |
34 | xdg-dbus-proxy-native \ | ||
34 | zstd \ | 35 | zstd \ |
35 | " | 36 | " |
36 | 37 | ||
37 | RDEPENDS:${PN} = " \ | 38 | RDEPENDS:${PN} = " \ |
38 | ca-certificates \ | 39 | ca-certificates \ |
39 | dconf \ | ||
40 | flatpak-xdg-utils \ | 40 | flatpak-xdg-utils \ |
41 | fuse3-utils \ | 41 | fuse3-utils \ |
42 | bubblewrap \ | ||
43 | xdg-dbus-proxy \ | ||
42 | " | 44 | " |
43 | 45 | ||
44 | GIR_MESON_OPTION = "gir" | 46 | GIR_MESON_OPTION = "gir" |
@@ -49,6 +51,7 @@ GTKDOC_MESON_ENABLE_FLAG = 'enabled' | |||
49 | GTKDOC_MESON_DISABLE_FLAG = 'disabled' | 51 | GTKDOC_MESON_DISABLE_FLAG = 'disabled' |
50 | 52 | ||
51 | PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl" | 53 | PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl" |
54 | PACKAGECONFIG[dconf] = "-Ddconf=enabled,-Ddconf=disabled,dconf" | ||
52 | PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native" | 55 | PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native" |
53 | PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native" | 56 | PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native" |
54 | PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4" | 57 | PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4" |
@@ -66,15 +69,10 @@ PACKAGECONFIG ?= " \ | |||
66 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \ | 69 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \ |
67 | " | 70 | " |
68 | 71 | ||
69 | EXTRA_OEMESON = "-Dsystem_fusermount=${bindir}/fusermount3" | 72 | EXTRA_OEMESON = " \ |
73 | -Dsystem_fusermount=fusermount3 \ | ||
74 | -Dsystem_bubblewrap=bwrap \ | ||
75 | -Dsystem_dbus_proxy=xdg-dbus-proxy \ | ||
76 | " | ||
70 | 77 | ||
71 | FILES:${PN} += "${libdir} ${datadir}" | 78 | FILES:${PN} += "${libdir} ${datadir}" |
72 | |||
73 | USERADD_PACKAGES = "${PN}" | ||
74 | USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" | ||
75 | |||
76 | do_install:append() { | ||
77 | chmod 0700 ${D}/${datadir}/polkit-1/rules.d | ||
78 | chown polkitd ${D}/${datadir}/polkit-1/rules.d | ||
79 | chgrp root ${D}/${datadir}/polkit-1/rules.d | ||
80 | } | ||
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb index ef0411113..660a3a63e 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb | |||
@@ -93,3 +93,5 @@ SYSTEMD_SERVICE:${PN} = "td-agent-bit.service" | |||
93 | 93 | ||
94 | EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/" | 94 | EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/" |
95 | TARGET_CC_ARCH += " ${SELECTED_OPTIMIZATION}" | 95 | TARGET_CC_ARCH += " ${SELECTED_OPTIMIZATION}" |
96 | |||
97 | SKIP_RECIPE[fluentbit] ?= "It is not reproducible. QA Issue: File /usr/bin/.debug/td-agent-bit in package fluentbit-dbg contains reference to TMPDIR [buildpaths]" | ||
diff --git a/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch b/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch new file mode 100644 index 000000000..bafe218f0 --- /dev/null +++ b/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch | |||
@@ -0,0 +1,76 @@ | |||
1 | From 5d40c0c49f9acde83ba71b6f59094cdbd12e1b78 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 17 Sep 2024 18:22:36 +0000 | ||
4 | Subject: [PATCH] Add cmake check for deducing 32bit or 64bit RISCV | ||
5 | |||
6 | Currently its only compilable for RV64 when RVV is | ||
7 | enabled, this will extend it to build for RV32 with | ||
8 | RVV as well | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | CMakeLists.txt | 36 ++++++++++++++++++++++++++++++++++-- | ||
14 | 1 file changed, 34 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
17 | index ea8b330c..cd824787 100644 | ||
18 | --- a/CMakeLists.txt | ||
19 | +++ b/CMakeLists.txt | ||
20 | @@ -65,6 +65,34 @@ if (NOT CMAKE_BUILD_TYPE) | ||
21 | set(CMAKE_BUILD_TYPE RelWithDebInfo) | ||
22 | endif() | ||
23 | |||
24 | +include(CheckCSourceCompiles) | ||
25 | + | ||
26 | +check_c_source_compiles(" | ||
27 | +#if __riscv_xlen == 64 | ||
28 | +int main() { return 0; } | ||
29 | +#else | ||
30 | +#error Not RISCV-64 | ||
31 | +#endif | ||
32 | +" IS_RISCV_XLEN_64) | ||
33 | + | ||
34 | +check_c_source_compiles(" | ||
35 | +#if __riscv_xlen == 32 | ||
36 | +int main() { return 0; } | ||
37 | +#else | ||
38 | +#error Not RISCV-32 | ||
39 | +#endif | ||
40 | +" IS_RISCV_XLEN_32) | ||
41 | + | ||
42 | +if(IS_RISCV_XLEN_32) | ||
43 | + set(RISCV_XLEN 32) | ||
44 | +elseif(IS_RISCV_XLEN_64) | ||
45 | + set(RISCV_XLEN 64) | ||
46 | +else() | ||
47 | + message(WARNING "Unable to determine RISC-V XLEN") | ||
48 | +endif() | ||
49 | + | ||
50 | +message(STATUS "RISC-V XLEN: ${RISCV_XLEN}") | ||
51 | + | ||
52 | # The following is only required with GCC < 6.1.0 or CLANG < 16.0 | ||
53 | set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4)?") | ||
54 | |||
55 | @@ -72,7 +100,7 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4 | ||
56 | # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. | ||
57 | set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?") | ||
58 | |||
59 | -# Currently this will compile the entire codebase with `-march=rv64gcv1p0`: | ||
60 | +# Currently this will compile the entire codebase with `-march=rv<XLEN>gcv1p0`: | ||
61 | set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?") | ||
62 | |||
63 | # Unconditionally adding -Werror risks breaking the build when new warnings | ||
64 | @@ -378,7 +406,11 @@ else() | ||
65 | # we add the gcv compiler flag, which then requires the CPU (now when using | ||
66 | # either compiler) to support V. | ||
67 | if(HWY_CMAKE_RVV) | ||
68 | - list(APPEND HWY_FLAGS -march=rv64gcv1p0) | ||
69 | + if(RISCV_XLEN EQUAL 64) | ||
70 | + list(APPEND HWY_FLAGS -march=rv64gcv1p0) | ||
71 | + elseif(RISCV_XLEN EQUAL 32) | ||
72 | + list(APPEND HWY_FLAGS -march=rv32gcv1p0) | ||
73 | + endif() | ||
74 | if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") | ||
75 | list(APPEND HWY_FLAGS -menable-experimental-extensions) | ||
76 | endif() | ||
diff --git a/meta-oe/recipes-extended/highway/highway_1.2.0.bb b/meta-oe/recipes-extended/highway/highway_1.2.0.bb index 5d7494124..d226cd82c 100644 --- a/meta-oe/recipes-extended/highway/highway_1.2.0.bb +++ b/meta-oe/recipes-extended/highway/highway_1.2.0.bb | |||
@@ -6,12 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9" | |||
6 | 6 | ||
7 | inherit cmake | 7 | inherit cmake |
8 | 8 | ||
9 | SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master" | 9 | SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master \ |
10 | file://0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch" | ||
10 | 11 | ||
11 | SRCREV = "457c891775a7397bdb0376bb1031e6e027af1c48" | 12 | SRCREV = "457c891775a7397bdb0376bb1031e6e027af1c48" |
12 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
13 | 14 | ||
14 | EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release" | 15 | EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release" |
16 | |||
15 | CXXFLAGS:append:arm = " -mfp16-format=ieee" | 17 | CXXFLAGS:append:arm = " -mfp16-format=ieee" |
16 | # Option not supported with clang and its default format for __fp16 anyway with clang | 18 | # Option not supported with clang and its default format for __fp16 anyway with clang |
17 | CXXFLAGS:remove:toolchain-clang = "-mfp16-format=ieee" | 19 | CXXFLAGS:remove:toolchain-clang = "-mfp16-format=ieee" |
20 | |||
21 | TOOLCHAIN = "gcc" | ||
diff --git a/meta-oe/recipes-extended/hiredis/hiredis/run-ptest b/meta-oe/recipes-extended/hiredis/hiredis/run-ptest index 8d450b881..8b352c340 100644 --- a/meta-oe/recipes-extended/hiredis/hiredis/run-ptest +++ b/meta-oe/recipes-extended/hiredis/hiredis/run-ptest | |||
@@ -2,17 +2,17 @@ | |||
2 | 2 | ||
3 | TEST_SSL=0 TEST_ASYNC=0 ./test.sh | sed -e 's/PASSED/PASS/g' -e 's/FAILED/FAIL/g' -e 's/SKIPPED/SKIP/g' | awk ' | 3 | TEST_SSL=0 TEST_ASYNC=0 ./test.sh | sed -e 's/PASSED/PASS/g' -e 's/FAILED/FAIL/g' -e 's/SKIPPED/SKIP/g' | awk ' |
4 | { | 4 | { |
5 | if ($NF == "\033[0;32mPASS\033[0;0m" || $NF == "\033[0;31mFAIL\033[0;0m" || $NF == "\033[01;33mSKIP\033[0;0m") { | 5 | gsub(/\x1B\[[0-9;]*m/, "") |
6 | if ($NF == "PASS" || $NF == "FAIL" || $NF == "SKIP") { | ||
6 | printf "%s: %s\n", $NF, $0 | 7 | printf "%s: %s\n", $NF, $0 |
7 | } else { | 8 | } else { |
8 | 9 | ||
9 | } | 10 | } |
10 | }'| awk '{ | 11 | }' | awk '{ |
11 | if ($NF == "\033[0;32mPASS\033[0;0m" || $NF == "\033[0;31mFAIL\033[0;0m" || $NF == "\033[01;33mSKIP\033[0;0m") { | 12 | if ($NF == "PASS" || $NF == "FAIL" || $NF == "SKIP") { |
12 | $NF = "" | 13 | $NF = "" |
13 | print $0 | 14 | print $0 |
14 | } else { | 15 | } else { |
15 | 16 | ||
16 | } | 17 | } |
17 | }' | awk '{gsub(/:/,"",$NF)}1' | 18 | }' | awk '{gsub(/:/,"",$NF)}1' |
18 | |||
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb index be420b483..c54b2e0d8 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb | |||
@@ -19,6 +19,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ | |||
19 | file://0001-Drop-using-register-storage-classifier.patch" | 19 | file://0001-Drop-using-register-storage-classifier.patch" |
20 | SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" | 20 | SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" |
21 | 21 | ||
22 | UPSTREAM_CHECK_URI = "https://sourceforge.net/p/hplip/activity" | ||
23 | |||
22 | DEPENDS += "cups python3 libusb1 python3-setuptools-native" | 24 | DEPENDS += "cups python3 libusb1 python3-setuptools-native" |
23 | 25 | ||
24 | inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd | 26 | inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd |
@@ -49,7 +51,7 @@ EXTRA_OECONF += "\ | |||
49 | --with-cupsfilterdir=${libexecdir}/cups/filter \ | 51 | --with-cupsfilterdir=${libexecdir}/cups/filter \ |
50 | " | 52 | " |
51 | 53 | ||
52 | EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/" | 54 | EXTRA_OEMAKE = "CPPFLAGS='${CFLAGS}' rulessystemdir=${systemd_unitdir}/system/" |
53 | 55 | ||
54 | do_install:append() { | 56 | do_install:append() { |
55 | rm -rf ${D}${datadir}/hplip/upgrade.py | 57 | rm -rf ${D}${datadir}/hplip/upgrade.py |
diff --git a/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch b/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch index c5e210afc..994f252a1 100644 --- a/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch +++ b/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c2a67c1f62175ab061bc03d10dd766f968c6a097 Mon Sep 17 00:00:00 2001 | 1 | From 06207b1340963e77f2e5d08ebf9727180ad86a36 Mon Sep 17 00:00:00 2001 |
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | 2 | From: Naveen Saini <naveen.kumar.saini@intel.com> |
3 | Date: Fri, 2 Aug 2019 10:41:26 +0800 | 3 | Date: Fri, 2 Aug 2019 10:41:26 +0800 |
4 | Subject: [PATCH] configure.ac: skip running test program when cross-compiling | 4 | Subject: [PATCH] configure.ac: skip running test program when cross-compiling |
@@ -7,12 +7,14 @@ Upstream-Status: Inappropriate [OE-Specific] | |||
7 | 7 | ||
8 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | 8 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> |
9 | --- | 9 | --- |
10 | configure.ac | 4 ++-- | 10 | configure.ac | 19 ++----------------- |
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 17 deletions(-) |
12 | 12 | ||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index c4a9b02..3f5a792 100644 | ||
13 | --- a/configure.ac | 15 | --- a/configure.ac |
14 | +++ b/configure.ac | 16 | +++ b/configure.ac |
15 | @@ -160,7 +160,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd mem | 17 | @@ -151,7 +151,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd memrchr sysctl sysctlbyname]) |
16 | AC_FUNC_SELECT_ARGTYPES | 18 | AC_FUNC_SELECT_ARGTYPES |
17 | 19 | ||
18 | AC_MSG_CHECKING([for strlcpy]) | 20 | AC_MSG_CHECKING([for strlcpy]) |
@@ -21,7 +23,7 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | |||
21 | char a[2]; | 23 | char a[2]; |
22 | if (strlcpy(a, "yes", 2) != 3) | 24 | if (strlcpy(a, "yes", 2) != 3) |
23 | return 1;]])], | 25 | return 1;]])], |
24 | @@ -176,7 +176,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ | 26 | @@ -167,7 +167,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ |
25 | ]) | 27 | ]) |
26 | 28 | ||
27 | AC_MSG_CHECKING([for strlcat]) | 29 | AC_MSG_CHECKING([for strlcat]) |
@@ -30,7 +32,7 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | |||
30 | char a[4] = "no"; | 32 | char a[4] = "no"; |
31 | if (strlcat(a, "yes", 4) != 5) | 33 | if (strlcat(a, "yes", 4) != 5) |
32 | return 1;]])], | 34 | return 1;]])], |
33 | @@ -191,21 +191,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ | 35 | @@ -182,21 +182,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ |
34 | [Define to 1 if you have the strlcat function.]) | 36 | [Define to 1 if you have the strlcat function.]) |
35 | ]) | 37 | ]) |
36 | 38 | ||
diff --git a/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb b/meta-oe/recipes-extended/icewm/icewm_3.6.0.bb index 6e50231c8..c6202905d 100644 --- a/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb +++ b/meta-oe/recipes-extended/icewm/icewm_3.6.0.bb | |||
@@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" | |||
5 | SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \ | 5 | SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \ |
6 | file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ | 6 | file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ |
7 | " | 7 | " |
8 | SRC_URI[sha256sum] = "8d1afe9a2d5e28e88261b68906337449307e53f06c08218e1a6409083998a5f1" | 8 | SRC_URI[sha256sum] = "979fafd3a3371f73cbafe592e2be052475637ac4bb4385bb132331fd6924bc76" |
9 | 9 | ||
10 | UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" | 10 | UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" |
11 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
11 | 12 | ||
12 | inherit autotools pkgconfig gettext perlnative features_check qemu update-alternatives | 13 | inherit autotools pkgconfig gettext perlnative features_check qemu update-alternatives |
13 | REQUIRED_DISTRO_FEATURES = "x11" | 14 | REQUIRED_DISTRO_FEATURES = "x11" |
diff --git a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb index 5f2993dd4..87fcf8cc6 100644 --- a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb +++ b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb | |||
@@ -31,6 +31,6 @@ RPROVIDES:${BPN}-dbg += "python3-${BPN}-dbg" | |||
31 | 31 | ||
32 | FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" | 32 | FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" |
33 | 33 | ||
34 | SRCREV = "3f4c9bd3f21ec9ac75a025dfa3fa30fe3f621831" | 34 | SRCREV = "ed1f54de86b5d507c4cfa552923e9ddfddd9b893" |
35 | 35 | ||
36 | BBCLASSEXTEND = "native" | 36 | BBCLASSEXTEND = "native" |
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.14.bb b/meta-oe/recipes-extended/jansson/jansson_2.14.bb index 833060686..fb42509f3 100644 --- a/meta-oe/recipes-extended/jansson/jansson_2.14.bb +++ b/meta-oe/recipes-extended/jansson/jansson_2.14.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar. | |||
11 | SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9" | 11 | SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9" |
12 | 12 | ||
13 | UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases" | 13 | UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases" |
14 | UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\.tar" | 14 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
15 | 15 | ||
16 | inherit cmake pkgconfig | 16 | inherit cmake pkgconfig |
17 | 17 | ||
diff --git a/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb b/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb deleted file mode 100644 index 43deac383..000000000 --- a/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | SUMMARY = "Y2038 safe version of lastlog" | ||
2 | HOMEPAGE = "https://github.com/thkukuk/lastlog2" | ||
3 | DESCRIPTION = "lastlog reports the last login of a given user or of all users who did ever login on a system." | ||
4 | LICENSE = "BSD-2-Clause" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=020090a00b69dd2af9ab82eb0003ea2c" | ||
6 | SECTION = "libs" | ||
7 | |||
8 | SRCREV = "6138dff6f2a5216065fa4833a223b56d98cb62f3" | ||
9 | |||
10 | SRC_URI = "git://github.com/thkukuk/lastlog2.git;branch=main;protocol=https \ | ||
11 | file://0001-remove-lto-to-fix-link-error-of-clang.patch \ | ||
12 | " | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit meson pkgconfig systemd features_check | ||
17 | |||
18 | DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} sqlite3 " | ||
19 | REQUIRED_DISTRO_FEATURES = "pam" | ||
20 | |||
21 | SYSTEMD_SERVICE:${PN} = "lastlog2-import.service" | ||
22 | |||
23 | EXTRA_OEMESON = " -Dpamlibdir=${libdir}" | ||
24 | |||
25 | do_install:append () { | ||
26 | if [ -d ${D}${prefix}/lib/systemd -a ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then | ||
27 | # Fix makefile hardcoded path assumptions for systemd (assumes $prefix) | ||
28 | # without usrmerge distro feature enabled | ||
29 | install -d `dirname ${D}${systemd_unitdir}` | ||
30 | mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}` | ||
31 | fi | ||
32 | } | ||
33 | |||
34 | FILES:${PN} += " ${systemd_system_unitdir} " | ||
35 | FILES:${PN} += " ${libdir} " | ||
36 | FILES:${PN} += " ${nonarch_libdir}/tmpfiles.d/* " | ||
diff --git a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb index d540737bc..0c2382fe8 100644 --- a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb +++ b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https;branch=ma | |||
13 | PV = "1.0+git" | 13 | PV = "1.0+git" |
14 | SRCREV = "9ae4f4ae4481b1e69d38ed810980d33103544613" | 14 | SRCREV = "9ae4f4ae4481b1e69d38ed810980d33103544613" |
15 | 15 | ||
16 | # The current PV is not a git tag but a README content | ||
17 | UPSTREAM_CHECK_COMMITS = "1" | ||
18 | |||
16 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
17 | 20 | ||
18 | inherit autotools | 21 | inherit autotools |
diff --git a/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch b/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch new file mode 100644 index 000000000..8129c1e2a --- /dev/null +++ b/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch | |||
@@ -0,0 +1,92 @@ | |||
1 | From 3aad8d471201da4125bd03d7a6921707461fe182 Mon Sep 17 00:00:00 2001 | ||
2 | From: Vojtech Trefny <vtrefny@redhat.com> | ||
3 | Date: Fri, 7 Jun 2024 10:06:22 +0200 | ||
4 | Subject: [PATCH 1/3] fs: Ignore unused-parameter warning in the FS plugin | ||
5 | |||
6 | There are some unused parameters in the libext2fs header which | ||
7 | together with Wall and Werror means the plugin compilation fails. | ||
8 | As a workaround we'll disable the unused-parameter warning for | ||
9 | now. | ||
10 | |||
11 | Fixes: #1026 | ||
12 | |||
13 | Taken from Fedora | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | |||
18 | --- | ||
19 | src/plugins/fs/Makefile.am | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am | ||
23 | index 7d4849c0..00474d5a 100644 | ||
24 | --- a/src/plugins/fs/Makefile.am | ||
25 | +++ b/src/plugins/fs/Makefile.am | ||
26 | @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects | ||
27 | |||
28 | lib_LTLIBRARIES = libbd_fs.la | ||
29 | |||
30 | -libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror | ||
31 | +libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter | ||
32 | libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) | ||
33 | libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' | ||
34 | libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ | ||
35 | -- | ||
36 | 2.45.2 | ||
37 | |||
38 | |||
39 | From da5c14f3e2f83c8c40203897154ee2b788782792 Mon Sep 17 00:00:00 2001 | ||
40 | From: Vojtech Trefny <vtrefny@redhat.com> | ||
41 | Date: Fri, 7 Jun 2024 15:21:09 +0200 | ||
42 | Subject: [PATCH 2/3] fs: Ignore shift-count-overflow warning in FS plugin | ||
43 | |||
44 | The warning happens in the libext2fs header. | ||
45 | --- | ||
46 | src/plugins/fs/Makefile.am | 2 +- | ||
47 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
48 | |||
49 | diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am | ||
50 | index 00474d5a..42e1c777 100644 | ||
51 | --- a/src/plugins/fs/Makefile.am | ||
52 | +++ b/src/plugins/fs/Makefile.am | ||
53 | @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects | ||
54 | |||
55 | lib_LTLIBRARIES = libbd_fs.la | ||
56 | |||
57 | -libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter | ||
58 | +libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow | ||
59 | libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) | ||
60 | libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' | ||
61 | libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ | ||
62 | -- | ||
63 | 2.45.2 | ||
64 | |||
65 | |||
66 | From 90ceb4b52fbda34673fe5303da84b9a902187503 Mon Sep 17 00:00:00 2001 | ||
67 | From: Vojtech Trefny <vtrefny@redhat.com> | ||
68 | Date: Wed, 12 Jun 2024 15:34:02 +0200 | ||
69 | Subject: [PATCH 3/3] fs: Fix ignoring errors from libext2fs | ||
70 | |||
71 | Follow-up for #1028, we still want to show the warning and not | ||
72 | completely supress it. | ||
73 | --- | ||
74 | src/plugins/fs/Makefile.am | 2 +- | ||
75 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
76 | |||
77 | diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am | ||
78 | index 42e1c777..1ee256f0 100644 | ||
79 | --- a/src/plugins/fs/Makefile.am | ||
80 | +++ b/src/plugins/fs/Makefile.am | ||
81 | @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects | ||
82 | |||
83 | lib_LTLIBRARIES = libbd_fs.la | ||
84 | |||
85 | -libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow | ||
86 | +libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-error=unused-parameter -Wno-error=shift-count-overflow | ||
87 | libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) | ||
88 | libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' | ||
89 | libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ | ||
90 | -- | ||
91 | 2.45.2 | ||
92 | |||
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb index fb778005f..a42e09d33 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb | |||
@@ -14,6 +14,7 @@ DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme" | |||
14 | 14 | ||
15 | SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \ | 15 | SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \ |
16 | file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ | 16 | file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ |
17 | file://0001-libext2fs-unused-parameters-fix.patch \ | ||
17 | " | 18 | " |
18 | SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050" | 19 | SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050" |
19 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb index 7498a5704..85d3853f4 100644 --- a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb +++ b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATG | |||
14 | SRC_URI[sha256sum] = "5688aa4a685547d7174a8a373ea9d8ee927e766e3cc302bdee34523c2c5d6c11" | 14 | SRC_URI[sha256sum] = "5688aa4a685547d7174a8a373ea9d8ee927e766e3cc302bdee34523c2c5d6c11" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 16 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
17 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\_\d+)+)" | ||
17 | 18 | ||
18 | # Perl5 is for tests only | 19 | # Perl5 is for tests only |
19 | EXTRA_OECONF = "--without-perl5 --with-mnttab=/proc/mounts" | 20 | EXTRA_OECONF = "--without-perl5 --with-mnttab=/proc/mounts" |
diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb index 93b58057c..58bfd1f25 100644 --- a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb +++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb | |||
@@ -24,6 +24,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=ta | |||
24 | SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0" | 24 | SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0" |
25 | SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8" | 25 | SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8" |
26 | 26 | ||
27 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/wvware/files/libwmf/" | ||
28 | UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" | ||
29 | |||
30 | do_install:append() { | ||
31 | sed -i -e 's@${RECIPE_SYSROOT}@@g' ${D}${bindir}/libwmf-config | ||
32 | } | ||
33 | |||
27 | FILES:${PN}-dbg += "${libdir}/gtk-2.0/2.10.0/loaders/.debug" | 34 | FILES:${PN}-dbg += "${libdir}/gtk-2.0/2.10.0/loaders/.debug" |
28 | FILES:${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la" | 35 | FILES:${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la" |
29 | FILES:${PN}-staticdev += "${libdir}/gtk-2.0/2.10.0/loaders/*.a" | 36 | FILES:${PN}-staticdev += "${libdir}/gtk-2.0/2.10.0/loaders/*.a" |
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb index f11c52dd1..ae2714d7e 100644 --- a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb +++ b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb | |||
@@ -16,6 +16,8 @@ SRC_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/l | |||
16 | " | 16 | " |
17 | SRC_URI[sha256sum] = "5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048" | 17 | SRC_URI[sha256sum] = "5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048" |
18 | 18 | ||
19 | UPSTREAM_CHECK_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/" | ||
20 | |||
19 | BPN = "libx86" | 21 | BPN = "libx86" |
20 | COMPATIBLE_HOST = '(x86_64|i.86).*-linux' | 22 | COMPATIBLE_HOST = '(x86_64|i.86).*-linux' |
21 | 23 | ||
diff --git a/meta-oe/recipes-extended/logwatch/logwatch_7.10.bb b/meta-oe/recipes-extended/logwatch/logwatch_7.11.bb index 2efaa2b3c..89012f885 100644 --- a/meta-oe/recipes-extended/logwatch/logwatch_7.10.bb +++ b/meta-oe/recipes-extended/logwatch/logwatch_7.11.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ba882fa9b4b6b217a51780be3f4db9c8" | |||
12 | RDEPENDS:${PN} = "perl" | 12 | RDEPENDS:${PN} = "perl" |
13 | 13 | ||
14 | SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz" | 14 | SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz" |
15 | SRC_URI[sha256sum] = "329df0991b879764ed7e50a869de5b6bfa70d241eb254397a5659d1ff5f2588f" | 15 | SRC_URI[sha256sum] = "5eb42d983a9667003368b572149fce788c0d7e13daaf1f28ad1bf3a140b865cf" |
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
18 | install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts | 18 | install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts |
diff --git a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb index 73e4eac3d..c1a8aadff 100644 --- a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb +++ b/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb | |||
@@ -9,9 +9,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ | |||
9 | SRC_URI[md5sum] = "5901bed95e61d2bea3ba3056056af432" | 9 | SRC_URI[md5sum] = "5901bed95e61d2bea3ba3056056af432" |
10 | SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10" | 10 | SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10" |
11 | 11 | ||
12 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lprng/files/lprng/" | ||
13 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" | ||
14 | |||
12 | inherit autotools gettext | 15 | inherit autotools gettext |
13 | 16 | ||
14 | EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost" | 17 | EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost \ |
18 | CHOWN=${base_bindir}/chown CHGRP=${base_bindir}/chgrp \ | ||
19 | OPENSSL=${bindir}/openssl PRUTIL=${bindir}/pr" | ||
15 | FILES:${PN}-dbg += "${libdir}/lprng/filters/.debug" | 20 | FILES:${PN}-dbg += "${libdir}/lprng/filters/.debug" |
16 | 21 | ||
17 | # configure: WARNING: Program 'clear' is not found. Set environment CLEAR=no if you do not want to use it | 22 | # configure: WARNING: Program 'clear' is not found. Set environment CLEAR=no if you do not want to use it |
diff --git a/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.5.bb b/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.6.bb index 096f869c3..01a134a5b 100644 --- a/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.5.bb +++ b/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.6.bb | |||
@@ -9,14 +9,14 @@ BUGTRACKER = "https://github.com/Neargye/magic_enum/issues" | |||
9 | HOMEPAGE = "https://github.com/Neargye/magic_enum" | 9 | HOMEPAGE = "https://github.com/Neargye/magic_enum" |
10 | 10 | ||
11 | LICENSE = "MIT" | 11 | LICENSE = "MIT" |
12 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b15f48588464ec8ef87d2b560aad2caa" | 12 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7e7717cf723eb72f57e80fdb651cb318" |
13 | 13 | ||
14 | SRC_URI = " \ | 14 | SRC_URI = " \ |
15 | git://github.com/Neargye/magic_enum.git;protocol=https;branch=master \ | 15 | git://github.com/Neargye/magic_enum.git;protocol=https;branch=master \ |
16 | file://run-ptest \ | 16 | file://run-ptest \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV = "e55b9b54d5cf61f8e117cafb17846d7d742dd3b4" | 19 | SRCREV = "dd6a39d0ba1852cf06907e0f0573a2a10d23c2ad" |
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
22 | inherit cmake ptest | 22 | inherit cmake ptest |
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/1849070.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/1849070.patch new file mode 100644 index 000000000..c19a32690 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-115/1849070.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Bug 1849070 - Avoid using char_traits<unsigned char>. r=spidermonkey-reviewers,anba | ||
2 | |||
3 | It is not guaranteed to exist by the standard, and is actively being | ||
4 | removed from libc++ in LLVM 18. | ||
5 | |||
6 | Differential Revision: https://phabricator.services.mozilla.com/D186421 | ||
7 | |||
8 | Upstream-Status: Backport [https://hg.mozilla.org/mozilla-central/rev/68ff4d3f7338248b4d67cf03aade5a73f8d396b2] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | --- a/js/src/builtin/intl/Locale.cpp | ||
12 | +++ b/js/src/builtin/intl/Locale.cpp | ||
13 | @@ -802,8 +802,10 @@ static inline auto FindUnicodeExtensionT | ||
14 | UnicodeKey key) { | ||
15 | JS::AutoCheckCannotGC nogc; | ||
16 | return unicodeExtension->hasLatin1Chars() | ||
17 | - ? FindUnicodeExtensionType(unicodeExtension->latin1Chars(nogc), | ||
18 | - unicodeExtension->length(), key) | ||
19 | + ? FindUnicodeExtensionType( | ||
20 | + reinterpret_cast<const char*>( | ||
21 | + unicodeExtension->latin1Chars(nogc)), | ||
22 | + unicodeExtension->length(), key) | ||
23 | : FindUnicodeExtensionType(unicodeExtension->twoByteChars(nogc), | ||
24 | unicodeExtension->length(), key); | ||
25 | } | ||
26 | @@ -920,7 +922,9 @@ static BaseNamePartsResult BaseNameParts | ||
27 | static inline auto BaseNameParts(JSLinearString* baseName) { | ||
28 | JS::AutoCheckCannotGC nogc; | ||
29 | return baseName->hasLatin1Chars() | ||
30 | - ? BaseNameParts(baseName->latin1Chars(nogc), baseName->length()) | ||
31 | + ? BaseNameParts( | ||
32 | + reinterpret_cast<const char*>(baseName->latin1Chars(nogc)), | ||
33 | + baseName->length()) | ||
34 | : BaseNameParts(baseName->twoByteChars(nogc), baseName->length()); | ||
35 | } | ||
36 | |||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/1894423.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/1894423.patch new file mode 100644 index 000000000..93e0f0f4f --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-115/1894423.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Bug 1894423 - Remove unused ExclusiveData move constructor. r=spidermonkey-reviewers,jonco | ||
2 | |||
3 | Because the constructor is actually not used, the compiler used to not | ||
4 | complain about it being broken. Recent changes on clang trunk made it | ||
5 | catch this problem without the constructor being used. | ||
6 | |||
7 | As Mutex doesn't have a move constructor, it's also not only a matter of | ||
8 | adding the missing underscore to lock. | ||
9 | |||
10 | As the constructor is never used, just remove it. | ||
11 | |||
12 | Differential Revision: https://phabricator.services.mozilla.com/D209108 | ||
13 | |||
14 | Upstream-Status: Backport [https://hg.mozilla.org/mozilla-central/rev/223087fdc29f] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | |||
17 | --- a/js/src/threading/ExclusiveData.h | ||
18 | +++ b/js/src/threading/ExclusiveData.h | ||
19 | @@ -109,11 +109,6 @@ class ExclusiveData { | ||
20 | explicit ExclusiveData(const MutexId& id, Args&&... args) | ||
21 | : lock_(id), value_(std::forward<Args>(args)...) {} | ||
22 | |||
23 | - ExclusiveData(ExclusiveData&& rhs) | ||
24 | - : lock_(std::move(rhs.lock)), value_(std::move(rhs.value_)) { | ||
25 | - MOZ_ASSERT(&rhs != this, "self-move disallowed!"); | ||
26 | - } | ||
27 | - | ||
28 | ExclusiveData& operator=(ExclusiveData&& rhs) { | ||
29 | this->~ExclusiveData(); | ||
30 | new (mozilla::KnownNotNull, this) ExclusiveData(std::move(rhs)); | ||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb index b08828602..f25c5a8f9 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb | |||
@@ -16,9 +16,14 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire | |||
16 | file://musl-disable-stackwalk.patch \ | 16 | file://musl-disable-stackwalk.patch \ |
17 | file://0001-add-arm-to-list-of-mozinline.patch \ | 17 | file://0001-add-arm-to-list-of-mozinline.patch \ |
18 | file://armv5.patch \ | 18 | file://armv5.patch \ |
19 | file://1849070.patch \ | ||
20 | file://1894423.patch \ | ||
19 | " | 21 | " |
20 | SRC_URI[sha256sum] = "16be46f16a356a2b8bd3541805a24c8a2acf6f077cf8a65859689685c26025e0" | 22 | SRC_URI[sha256sum] = "16be46f16a356a2b8bd3541805a24c8a2acf6f077cf8a65859689685c26025e0" |
21 | 23 | ||
24 | UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs115" | ||
25 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
26 | |||
22 | S = "${WORKDIR}/firefox-${PV}" | 27 | S = "${WORKDIR}/firefox-${PV}" |
23 | 28 | ||
24 | inherit pkgconfig perlnative python3native rust | 29 | inherit pkgconfig perlnative python3native rust |
@@ -62,6 +67,8 @@ ICU ?= "--with-system-icu" | |||
62 | ICU:mipsarch = "" | 67 | ICU:mipsarch = "" |
63 | ICU:powerpc:toolchain-clang = "" | 68 | ICU:powerpc:toolchain-clang = "" |
64 | 69 | ||
70 | LDFLAGS:append:riscv32 = " -latomic" | ||
71 | |||
65 | do_configure() { | 72 | do_configure() { |
66 | cd ${B} | 73 | cd ${B} |
67 | python3 ${S}/configure.py \ | 74 | python3 ${S}/configure.py \ |
diff --git a/meta-oe/recipes-extended/ostree/ostree_2024.6.bb b/meta-oe/recipes-extended/ostree/ostree_2024.7.bb index 7f30dbfc5..8cecf5334 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2024.6.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2024.7.bb | |||
@@ -22,7 +22,7 @@ GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" | |||
22 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ | 22 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ |
23 | file://run-ptest \ | 23 | file://run-ptest \ |
24 | " | 24 | " |
25 | SRC_URI[sha256sum] = "8b61c856697aa412f2f1724322ada40bdd7b1bf9e7783e2c594faa7a594f868f" | 25 | SRC_URI[sha256sum] = "72451efffe5a10acb4cfdd6eb849db97fa9e61a81e4113fc656eece77eb93355" |
26 | 26 | ||
27 | S = "${WORKDIR}/libostree-${PV}" | 27 | S = "${WORKDIR}/libostree-${PV}" |
28 | 28 | ||
diff --git a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb index e795482eb..498623cc8 100644 --- a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb +++ b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb | |||
@@ -17,6 +17,9 @@ SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_al | |||
17 | SRC_URI[md5sum] = "a0128d661cfe7cc8c121e73519c54fbf" | 17 | SRC_URI[md5sum] = "a0128d661cfe7cc8c121e73519c54fbf" |
18 | SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f" | 18 | SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f" |
19 | 19 | ||
20 | UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/p7zip" | ||
21 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
22 | |||
20 | S = "${WORKDIR}/${BPN}_${PV}" | 23 | S = "${WORKDIR}/${BPN}_${PV}" |
21 | 24 | ||
22 | do_compile:append() { | 25 | do_compile:append() { |
diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb index 81d0746f8..1637389db 100644 --- a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb +++ b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb | |||
@@ -15,6 +15,9 @@ SRC_URI = "git://github.com/PADL/pam_ccreds;branch=master;protocol=https \ | |||
15 | file://0001-configure-Check-for-function-from-libdb-during-confi.patch \ | 15 | file://0001-configure-Check-for-function-from-libdb-during-confi.patch \ |
16 | " | 16 | " |
17 | 17 | ||
18 | # Upstream repo does not tag | ||
19 | UPSTREAM_CHECK_COMMITS = "1" | ||
20 | |||
18 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
19 | 22 | ||
20 | inherit autotools | 23 | inherit autotools |
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 b5bcc6333..e9508b6d4 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 () { | |||
53 | # | 53 | # |
54 | FILES:${PN} += "${base_libdir}/security/pam*" | 54 | FILES:${PN} += "${base_libdir}/security/pam*" |
55 | FILES:${PN}-dbg += "${base_libdir}/security/.debug" | 55 | FILES:${PN}-dbg += "${base_libdir}/security/.debug" |
56 | |||
57 | # This one is reproducible only on 32bit MACHINEs | ||
58 | # http://errors.yoctoproject.org/Errors/Details/766965/ | ||
59 | # ssh-rsa.c:59:24: error: passing argument 1 of 'EVP_DigestInit' from incompatible pointer type [-Wincompatible-pointer-types] | ||
60 | # ssh-rsa.c:60:26: error: passing argument 1 of 'EVP_DigestUpdate' from incompatible pointer type [-Wincompatible-pointer-types] | ||
61 | # ssh-rsa.c:61:25: error: passing argument 1 of 'EVP_DigestFinal' from incompatible pointer type [-Wincompatible-pointer-types] | ||
62 | # ssh-ecdsa.c:76:18: error: passing argument 1 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] | ||
63 | # ssh-ecdsa.c:76:23: error: passing argument 2 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] | ||
64 | # ssh-ecdsa.c:76:27: error: passing argument 3 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] | ||
65 | # ssh-ecdsa.c:148:18: error: passing argument 1 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] | ||
66 | # ssh-ecdsa.c:148:23: error: passing argument 2 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] | ||
67 | # ssh-ecdsa.c:148:27: error: passing argument 3 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types] | ||
68 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-extended/pegtl/pegtl/run-ptest b/meta-oe/recipes-extended/pegtl/pegtl/run-ptest new file mode 100644 index 000000000..e819628c9 --- /dev/null +++ b/meta-oe/recipes-extended/pegtl/pegtl/run-ptest | |||
@@ -0,0 +1,23 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | fail_count=0 | ||
4 | all_count=0 | ||
5 | |||
6 | for test_suite in src/test/pegtl/pegtl-test-* | ||
7 | do | ||
8 | if "./$test_suite" | ||
9 | then | ||
10 | echo "PASS: $test_suite" | ||
11 | else | ||
12 | echo "FAIL: $test_suite" | ||
13 | fail_count=$((fail_count + 1)) | ||
14 | fi | ||
15 | all_count=$((all_count + 1)) | ||
16 | done | ||
17 | |||
18 | if [ $fail_count -eq 0 ] | ||
19 | then | ||
20 | echo "PASS: All $all_count tests passed" | ||
21 | else | ||
22 | echo "FAIL: $fail_count of $all_count tests failed" | ||
23 | fi | ||
diff --git a/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb b/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb deleted file mode 100644 index 237828dbf..000000000 --- a/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" | ||
2 | HOMEPAGE="https://github.com/taocpp/PEGTL" | ||
3 | LICENSE="MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dccf35ef30bf912bb07b01d469965293" | ||
5 | |||
6 | SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x" | ||
7 | SRCREV = "cf639f7f4ee125f68e1ccfba8d99ebc0de57b9fe" | ||
8 | |||
9 | inherit cmake | ||
10 | |||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | CXXFLAGS += " -Wno-error=type-limits" | ||
diff --git a/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb b/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb new file mode 100644 index 000000000..fc227734d --- /dev/null +++ b/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" | ||
2 | HOMEPAGE="https://github.com/taocpp/PEGTL" | ||
3 | LICENSE="MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dccf35ef30bf912bb07b01d469965293" | ||
5 | |||
6 | SRC_URI = " \ | ||
7 | git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x \ | ||
8 | file://run-ptest \ | ||
9 | " | ||
10 | |||
11 | SRCREV = "be527327653e94b02e711f7eff59285ad13e1db0" | ||
12 | |||
13 | inherit cmake ptest | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | do_install_ptest () { | ||
18 | install -d ${D}${PTEST_PATH}/src/test/pegtl/data | ||
19 | install -m 0755 ${B}/src/test/pegtl/pegtl-test-* ${D}${PTEST_PATH}/src/test/pegtl | ||
20 | install ${S}/src/test/pegtl/file_*.txt ${D}${PTEST_PATH}/src/test/pegtl | ||
21 | install ${S}/src/test/pegtl/data/*.json ${D}${PTEST_PATH}/src/test/pegtl/data | ||
22 | } | ||
23 | |||
24 | CXXFLAGS += " -Wno-error=type-limits" | ||
diff --git a/meta-oe/recipes-extended/polkit/files/meson-build-Support-openembedded-OS-for-PAM-config.patch b/meta-oe/recipes-extended/polkit/files/meson-build-Support-openembedded-OS-for-PAM-config.patch new file mode 100644 index 000000000..445f2fbdb --- /dev/null +++ b/meta-oe/recipes-extended/polkit/files/meson-build-Support-openembedded-OS-for-PAM-config.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 7c89b88f0f81ad220d08d69d212c14c6eeefb647 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yoann Congal <yoann.congal@smile.fr> | ||
3 | Date: Tue, 3 Sep 2024 12:17:42 +0200 | ||
4 | Subject: [PATCH] meson.build: Support "openembedded" OS for PAM config | ||
5 | |||
6 | In Openembedded, same as Suse/Solaris: PAM files are common-*: | ||
7 | * PAM_FILE_INCLUDE_AUTH: common-auth | ||
8 | * PAM_FILE_INCLUDE_ACCOUNT: common-account | ||
9 | * PAM_FILE_INCLUDE_PASSWORD: common-password | ||
10 | * PAM_FILE_INCLUDE_SESSION: common-session | ||
11 | See OE-Core libpam recipe. | ||
12 | |||
13 | NB: This is also the same config as Debian but its not mentioned in the | ||
14 | code. | ||
15 | |||
16 | Signed-off-by: Yoann Congal <yoann.congal@smile.fr> | ||
17 | Upstream-Status: Backport [https://github.com/polkit-org/polkit/commit/1d4f7f4d9f3d74fb2649c96faa8677416c1aefc2] | ||
18 | --- | ||
19 | meson.build | 2 +- | ||
20 | meson_options.txt | 2 +- | ||
21 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/meson.build b/meson.build | ||
24 | index 302c189..a55f2d6 100644 | ||
25 | --- a/meson.build | ||
26 | +++ b/meson.build | ||
27 | @@ -311,7 +311,7 @@ endif | ||
28 | |||
29 | pam_include = get_option('pam_include') | ||
30 | if pam_include == '' | ||
31 | - if ['suse', 'solaris'].contains(os_type) | ||
32 | + if ['suse', 'solaris', 'openembedded'].contains(os_type) | ||
33 | pam_conf = { | ||
34 | 'PAM_FILE_INCLUDE_AUTH': 'common-auth', | ||
35 | 'PAM_FILE_INCLUDE_ACCOUNT': 'common-account', | ||
36 | diff --git a/meson_options.txt b/meson_options.txt | ||
37 | index c2e4a6c..14d7a50 100644 | ||
38 | --- a/meson_options.txt | ||
39 | +++ b/meson_options.txt | ||
40 | @@ -6,7 +6,7 @@ option('polkitd_user', type: 'string', value: 'polkitd', description: 'User for | ||
41 | option('polkitd_uid', type: 'string', value: '-', description: 'Fixed UID for user running polkitd (polkitd)') | ||
42 | |||
43 | option('authfw', type: 'combo', choices: ['pam', 'shadow', 'bsdauth'], value: 'pam', description: 'Authentication framework (pam/shadow)') | ||
44 | -option('os_type', type: 'combo', choices: ['redhat', 'suse', 'gentoo', 'pardus', 'solaris', 'netbsd', 'lfs', ''], value: '', description: 'distribution or OS') | ||
45 | +option('os_type', type: 'combo', choices: ['redhat', 'suse', 'gentoo', 'pardus', 'solaris', 'netbsd', 'lfs', 'openembedded', ''], value: '', description: 'distribution or OS') | ||
46 | |||
47 | option('pam_include', type: 'string', value: '', description: 'pam file to include') | ||
48 | option('pam_module_dir', type: 'string', value: '', description: 'directory to install PAM security module') | ||
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 2159482eb..c0066d563 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 | |||
7 | SRC_URI = "file://50-org.freedesktop.timedate1.rules" | 7 | SRC_URI = "file://50-org.freedesktop.timedate1.rules" |
8 | 8 | ||
9 | do_install() { | 9 | do_install() { |
10 | install -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d | 10 | install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${datadir}/polkit-1/rules.d |
11 | } | 11 | } |
12 | 12 | ||
13 | USERADD_PACKAGES = "${PN}" | 13 | 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 bfd3361df..ec8ff868d 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 | |||
7 | SRC_URI = "file://50-org.freedesktop.NetworkManager.rules" | 7 | SRC_URI = "file://50-org.freedesktop.NetworkManager.rules" |
8 | 8 | ||
9 | do_install() { | 9 | do_install() { |
10 | install -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d | 10 | install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${datadir}/polkit-1/rules.d |
11 | } | 11 | } |
12 | 12 | ||
13 | USERADD_PACKAGES = "${PN}" | 13 | 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 8dc8c5e25..884590d47 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" | |||
10 | RDEPENDS:${PN} += "udisks2" | 10 | RDEPENDS:${PN} += "udisks2" |
11 | 11 | ||
12 | do_install() { | 12 | do_install() { |
13 | install -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d | 13 | install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${datadir}/polkit-1/rules.d |
14 | } | 14 | } |
15 | 15 | ||
16 | USERADD_PACKAGES = "${PN}" | 16 | USERADD_PACKAGES = "${PN}" |
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc index 4aeeb77d0..f57ca2611 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc | |||
@@ -6,8 +6,4 @@ REQUIRED_DISTRO_FEATURES = "polkit" | |||
6 | 6 | ||
7 | inherit useradd | 7 | inherit useradd |
8 | 8 | ||
9 | do_install:prepend() { | 9 | FILES:${PN} += "${datadir}/polkit-1/rules.d" |
10 | install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d | ||
11 | chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d | ||
12 | } | ||
13 | USERADD_PARAM:${PN}:prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;" | ||
diff --git a/meta-oe/recipes-extended/polkit/polkit_124.bb b/meta-oe/recipes-extended/polkit/polkit_125.bb index 9e2eb05c6..a67aaf908 100644 --- a/meta-oe/recipes-extended/polkit/polkit_124.bb +++ b/meta-oe/recipes-extended/polkit/polkit_125.bb | |||
@@ -1,13 +1,16 @@ | |||
1 | SUMMARY = "PolicyKit Authorization Framework" | 1 | SUMMARY = "Polkit Authorization Framework" |
2 | DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes." | 2 | DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes." |
3 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit" | 3 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit" |
4 | LICENSE = "LGPL-2.0-or-later" | 4 | LICENSE = "LGPL-2.0-or-later" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb" |
6 | BUGTRACKER = "https://github.com/polkit-org/polkit/issues" | ||
6 | 7 | ||
7 | SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master" | 8 | SRC_URI = "git://github.com/polkit-org/polkit.git;protocol=https;branch=main \ |
9 | file://meson-build-Support-openembedded-OS-for-PAM-config.patch \ | ||
10 | " | ||
8 | 11 | ||
9 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
10 | SRCREV = "82f0924dc0eb23b9df68e88dbaf9e07c81940a5a" | 13 | SRCREV = "112752c12da812a163dac67d7f675b60de8f7d7b" |
11 | 14 | ||
12 | DEPENDS = "expat glib-2.0" | 15 | DEPENDS = "expat glib-2.0" |
13 | 16 | ||
@@ -15,6 +18,10 @@ inherit meson pkgconfig useradd systemd gettext gobject-introspection features_c | |||
15 | 18 | ||
16 | REQUIRED_DISTRO_FEATURES = "polkit" | 19 | REQUIRED_DISTRO_FEATURES = "polkit" |
17 | 20 | ||
21 | # Prevent meson.build to try to autodetect host OS (which could lead to | ||
22 | # non-reproducibility) | ||
23 | EXTRA_OEMESON = "-Dos_type=openembedded" | ||
24 | |||
18 | PACKAGECONFIG = " \ | 25 | PACKAGECONFIG = " \ |
19 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ | 26 | ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ |
20 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ | 27 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ |
@@ -24,8 +31,10 @@ PACKAGECONFIG = " \ | |||
24 | PACKAGECONFIG[dbus] = ",,dbus" | 31 | PACKAGECONFIG[dbus] = ",,dbus" |
25 | PACKAGECONFIG[gtk-doc] = "-Dgtk_doc=true,-Dgtk_doc=false,gtk-doc-native" | 32 | PACKAGECONFIG[gtk-doc] = "-Dgtk_doc=true,-Dgtk_doc=false,gtk-doc-native" |
26 | PACKAGECONFIG[pam] = "-Dauthfw=pam,-Dauthfw=shadow,libpam,libpam" | 33 | PACKAGECONFIG[pam] = "-Dauthfw=pam,-Dauthfw=shadow,libpam,libpam" |
27 | PACKAGECONFIG[systemd] = "-Dsession_tracking=libsystemd-login,-Dsession_tracking=ConsoleKit,systemd" | 34 | PACKAGECONFIG[systemd] = "-Dsession_tracking=logind,,systemd,,,consolekit elogind" |
28 | PACKAGECONFIG[consolekit] = ",,,consolekit" | 35 | PACKAGECONFIG[consolekit] = "-Dsession_tracking=ConsoleKit,,,consolekit,,systemd elogind" |
36 | PACKAGECONFIG[elogind] = "-Dsession_tracking=libelogin,,elogind,,,systemd consolekit" | ||
37 | PACKAGECONFIG[libs-only] = "-Dlibs-only=true,-Dlibs-only=false" | ||
29 | 38 | ||
30 | # Default to mozjs javascript library | 39 | # Default to mozjs javascript library |
31 | PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-115,,,duktape" | 40 | PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-115,,,duktape" |
@@ -42,18 +51,26 @@ SYSTEMD_AUTO_ENABLE = "disable" | |||
42 | 51 | ||
43 | do_install:append() { | 52 | do_install:append() { |
44 | #Fix up permissions on polkit rules.d to work with rpm4 constraints | 53 | #Fix up permissions on polkit rules.d to work with rpm4 constraints |
45 | chmod 700 ${D}/${datadir}/polkit-1/rules.d | 54 | if ${@bb.utils.contains('PACKAGECONFIG', 'libs-only', 'false', 'true', d)}; then |
46 | chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d | 55 | chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d |
47 | chown polkitd:root ${D}/${datadir}/polkit-1/rules.d | 56 | chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d |
48 | chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d | 57 | fi |
58 | |||
59 | # Polkit unconditionally installs a systemd service, remove it on SysVinit | ||
60 | # systems to avoid "installed but not packaged file" error. | ||
61 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | ||
62 | rm -r ${D}${libdir}/systemd | ||
63 | fi | ||
49 | } | 64 | } |
50 | 65 | ||
51 | FILES:${PN} += " \ | 66 | FILES:${PN} += " \ |
52 | ${libdir}/pam.d/polkit-1 \ | 67 | ${libdir}/pam.d/polkit-1 \ |
53 | ${libdir}/sysusers.d \ | 68 | ${libdir}/sysusers.d \ |
69 | ${libdir}/tmpfiles.d \ | ||
54 | ${libdir}/polkit-1 \ | 70 | ${libdir}/polkit-1 \ |
55 | ${nonarch_libdir}/pam.d/polkit-1 \ | 71 | ${nonarch_libdir}/pam.d/polkit-1 \ |
56 | ${nonarch_libdir}/sysusers.d \ | 72 | ${nonarch_libdir}/sysusers.d \ |
73 | ${nonarch_libdir}/tmpfiles.d \ | ||
57 | ${nonarch_libdir}/polkit-1 \ | 74 | ${nonarch_libdir}/polkit-1 \ |
58 | ${datadir} \ | 75 | ${datadir} \ |
59 | " | 76 | " |
diff --git a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb index 25951c9de..029ec2337 100644 --- a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb +++ b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb | |||
@@ -11,6 +11,9 @@ PV = "0.0.1+git" | |||
11 | SRCREV = "45863e849b39c4921d6553e6d27e267a96ac7d77" | 11 | SRCREV = "45863e849b39c4921d6553e6d27e267a96ac7d77" |
12 | SRC_URI = "git://github.com/lib-cpp/${BPN}.git;branch=master;protocol=https" | 12 | SRC_URI = "git://github.com/lib-cpp/${BPN}.git;branch=master;protocol=https" |
13 | 13 | ||
14 | # Upstream repo does not tag | ||
15 | UPSTREAM_CHECK_COMMITS = "1" | ||
16 | |||
14 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
15 | 18 | ||
16 | do_configure:prepend() { | 19 | do_configure:prepend() { |
diff --git a/meta-oe/recipes-extended/qad/qad_git.bb b/meta-oe/recipes-extended/qad/qad_git.bb index 0bc94121a..c68469fce 100644 --- a/meta-oe/recipes-extended/qad/qad_git.bb +++ b/meta-oe/recipes-extended/qad/qad_git.bb | |||
@@ -14,6 +14,9 @@ SRC_URI = "git://gitlab.com/CodethinkLabs/qad/qad;branch=main;protocol=https \ | |||
14 | 14 | ||
15 | SRCREV = "ae0c099c1fdc0ca6f5d631cea6b302937122b362" | 15 | SRCREV = "ae0c099c1fdc0ca6f5d631cea6b302937122b362" |
16 | 16 | ||
17 | # Upstream repo does not tag | ||
18 | UPSTREAM_CHECK_COMMITS = "1" | ||
19 | |||
17 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
18 | PV = "0.0+git" | 21 | PV = "0.0+git" |
19 | 22 | ||
diff --git a/meta-oe/recipes-extended/qcbor/qcbor_1.3.bb b/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb index f90e814f7..b04d8df13 100644 --- a/meta-oe/recipes-extended/qcbor/qcbor_1.3.bb +++ b/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=498c298542365dfcfe29948c72a5849b" | |||
10 | 10 | ||
11 | SRC_URI = "git://github.com/laurencelundblade/QCBOR;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/laurencelundblade/QCBOR;protocol=https;branch=master" |
12 | 12 | ||
13 | SRCREV = "1eba85dbbe78fc1938f8aba2112ba1b228caed30" | 13 | SRCREV = "4487f10e1bf258434fb8a39e4f59c29e31910ad0" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.5.bb b/meta-oe/recipes-extended/redis/redis_7.2.5.bb index bfb46240a..930c1cd9a 100644 --- a/meta-oe/recipes-extended/redis/redis_7.2.5.bb +++ b/meta-oe/recipes-extended/redis/redis_7.2.5.bb | |||
@@ -68,3 +68,5 @@ INITSCRIPT_NAME = "redis-server" | |||
68 | INITSCRIPT_PARAMS = "defaults 87" | 68 | INITSCRIPT_PARAMS = "defaults 87" |
69 | 69 | ||
70 | SYSTEMD_SERVICE:${PN} = "redis.service" | 70 | SYSTEMD_SERVICE:${PN} = "redis.service" |
71 | |||
72 | CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows." | ||
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 d843f82b2..af19043ef 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb | |||
@@ -135,3 +135,7 @@ RDEPENDS:${PN}-python = "python3" | |||
135 | 135 | ||
136 | FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \ | 136 | FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \ |
137 | ${PYTHON_SITEPACKAGES_DIR}/.debug" | 137 | ${PYTHON_SITEPACKAGES_DIR}/.debug" |
138 | |||
139 | # http://errors.yoctoproject.org/Errors/Details/766911/ | ||
140 | # rrd_tune.c:239:35: error: passing argument 3 of 'optparse_init' from incompatible pointer type [-Wincompatible-pointer-types] | ||
141 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch index c1480406f..13d1a7814 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 194e199ce08acc2192f6a63420ff24d9064666e5 Mon Sep 17 00:00:00 2001 | 1 | From 640b191b9566a6c18af73bf9cc4b9366a76acf62 Mon Sep 17 00:00:00 2001 |
2 | From: Yi Fan Yu <yifan.yu@windriver.com> | 2 | From: Yi Fan Yu <yifan.yu@windriver.com> |
3 | Date: Sat, 27 Mar 2021 19:18:25 -0400 | 3 | Date: Sat, 27 Mar 2021 19:18:25 -0400 |
4 | Subject: [PATCH] tests: disable the check for inotify | 4 | Subject: [PATCH] tests: disable the check for inotify |
@@ -20,10 +20,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | |||
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
21 | 21 | ||
22 | diff --git a/tests/diag.sh b/tests/diag.sh | 22 | diff --git a/tests/diag.sh b/tests/diag.sh |
23 | index 6cd60ea88..7424f48c5 100755 | 23 | index f4f3d86..497bb17 100755 |
24 | --- a/tests/diag.sh | 24 | --- a/tests/diag.sh |
25 | +++ b/tests/diag.sh | 25 | +++ b/tests/diag.sh |
26 | @@ -2672,7 +2672,7 @@ case $1 in | 26 | @@ -2950,7 +2950,7 @@ case $1 in |
27 | fi | 27 | fi |
28 | ;; | 28 | ;; |
29 | 'check-inotify') # Check for inotify/fen support | 29 | 'check-inotify') # Check for inotify/fen support |
@@ -32,7 +32,7 @@ index 6cd60ea88..7424f48c5 100755 | |||
32 | echo [inotify mode] | 32 | echo [inotify mode] |
33 | elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then | 33 | elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then |
34 | grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h | 34 | grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h |
35 | @@ -2687,7 +2687,7 @@ case $1 in | 35 | @@ -2965,7 +2965,7 @@ case $1 in |
36 | fi | 36 | fi |
37 | ;; | 37 | ;; |
38 | 'check-inotify-only') # Check for ONLY inotify support | 38 | 'check-inotify-only') # Check for ONLY inotify support |
@@ -41,6 +41,3 @@ index 6cd60ea88..7424f48c5 100755 | |||
41 | echo [inotify mode] | 41 | echo [inotify mode] |
42 | else | 42 | else |
43 | echo [inotify not supported, skipping...] | 43 | echo [inotify not supported, skipping...] |
44 | -- | ||
45 | 2.29.2 | ||
46 | |||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch index 035258726..45359a166 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001 | 1 | From ceeaadb282531a416c1f605fa2100faa5de701e0 Mon Sep 17 00:00:00 2001 |
2 | From: Roy Li <rongqing.li@windriver.com> | 2 | From: Roy Li <rongqing.li@windriver.com> |
3 | Date: Wed, 18 Jun 2014 13:46:52 +0800 | 3 | Date: Wed, 18 Jun 2014 13:46:52 +0800 |
4 | Subject: [PATCH] use pkgconfig to check libgcrypt | 4 | Subject: [PATCH] use pkgconfig to check libgcrypt |
@@ -10,16 +10,15 @@ libgcrypt does no longer provide libgcrypt-config, and provide | |||
10 | 10 | ||
11 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 11 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
12 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | 12 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
13 | |||
14 | --- | 13 | --- |
15 | configure.ac | 15 +-------------- | 14 | configure.ac | 15 +-------------- |
16 | 1 file changed, 1 insertion(+), 14 deletions(-) | 15 | 1 file changed, 1 insertion(+), 14 deletions(-) |
17 | 16 | ||
18 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
19 | index 62178c3..b56c9c7 100644 | 18 | index 4af95c4..97e6282 100644 |
20 | --- a/configure.ac | 19 | --- a/configure.ac |
21 | +++ b/configure.ac | 20 | +++ b/configure.ac |
22 | @@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt, | 21 | @@ -1200,20 +1200,7 @@ AC_ARG_ENABLE(libgcrypt, |
23 | [enable_libgcrypt=yes] | 22 | [enable_libgcrypt=yes] |
24 | ) | 23 | ) |
25 | if test "x$enable_libgcrypt" = "xyes"; then | 24 | if test "x$enable_libgcrypt" = "xyes"; then |
@@ -40,4 +39,4 @@ index 62178c3..b56c9c7 100644 | |||
40 | + PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt) | 39 | + PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt) |
41 | fi | 40 | fi |
42 | AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) | 41 | AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) |
43 | AC_SUBST(LIBGCRYPT_CFLAGS) | 42 | AM_CONDITIONAL(ENABLE_RSCRYUTIL, test x$enable_libgcrypt = xyes || test x$enable_openssl_crypto_provider = xyes) |
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb index ac1645f67..41e396358 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb | |||
@@ -32,9 +32,9 @@ SRC_URI:append:libc-musl = " \ | |||
32 | file://0001-Include-sys-time-h.patch \ | 32 | file://0001-Include-sys-time-h.patch \ |
33 | file://disable-omfile-outchannel.patch \ | 33 | file://disable-omfile-outchannel.patch \ |
34 | " | 34 | " |
35 | SRC_URI[sha256sum] = "30528d140ec1b1f079224081fa37df6e06587ff42b02e3e61f2daa0526c54d33" | 35 | SRC_URI[sha256sum] = "8bb2f15f9bf9bb7e635182e3d3e370bfc39d08bf35a367dce9714e186f787206" |
36 | 36 | ||
37 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" | 37 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags" |
38 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 38 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
39 | 39 | ||
40 | inherit autotools pkgconfig systemd update-rc.d ptest | 40 | inherit autotools pkgconfig systemd update-rc.d ptest |
diff --git a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch b/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch deleted file mode 100644 index 41f98281f..000000000 --- a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From 9db4c0f6bc0dd11c77b54296fce6b8afe18f4325 Mon Sep 17 00:00:00 2001 | ||
2 | From: Steffen Nurpmeso <steffen@sdaoden.eu> | ||
3 | Date: Thu, 9 Jun 2022 18:26:38 +0800 | ||
4 | Subject: [PATCH] su_INLINE: eh no; give up, share detection with clang but for | ||
5 | a thing | ||
6 | |||
7 | Upstream-Status: Backport [https://git.sdaoden.eu/browse/s-nail.git/commit/?id=de2a44c393a39d80ddf12154aec94cace84b19c1] | ||
8 | |||
9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
10 | --- | ||
11 | include/su/code.h | 34 +++++++++------------------------- | ||
12 | 1 file changed, 9 insertions(+), 25 deletions(-) | ||
13 | |||
14 | diff --git a/include/su/code.h b/include/su/code.h | ||
15 | index 9683f4a..c7a2af3 100644 | ||
16 | --- a/include/su/code.h | ||
17 | +++ b/include/su/code.h | ||
18 | @@ -308,29 +308,8 @@ do{\ | ||
19 | # ifdef DOXYGEN | ||
20 | # define su_INLINE inline | ||
21 | # define su_SINLINE inline | ||
22 | -# elif su_CC_GCC | ||
23 | -# if !su_CC_VCHECK_GCC(3, 1) | ||
24 | -# define su_INLINE extern __inline__ | ||
25 | -# define su_SINLINE static __inline__ | ||
26 | -# elif !defined __GNUC_GNU_INLINE__ /*4.1.3; !su_CC_VCHECK_GCC(4, 2)*/ | ||
27 | -# define su_INLINE extern __inline __attribute__((always_inline)) | ||
28 | -# define su_SINLINE static __inline __attribute__((always_inline)) | ||
29 | - /* gcc 8.3.0 bug: does not gracefully inline with -Os | ||
30 | - * gcc 12.1.0 bug: ditto, -Og | ||
31 | - * Thus: always gcc-specific! */ | ||
32 | -# elif 1 /*!defined __OPTIMIZE__ || \ | ||
33 | - !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L*/ | ||
34 | -# define su_INLINE extern __inline __attribute__((gnu_inline)) | ||
35 | -# define su_SINLINE static __inline __attribute__((gnu_inline)) | ||
36 | -# elif !defined NDEBUG || !defined __OPTIMIZE__ | ||
37 | -# define su_INLINE static inline | ||
38 | -# define su_SINLINE static inline | ||
39 | -# else | ||
40 | -# define su_INLINE inline | ||
41 | -# define su_SINLINE static inline | ||
42 | -# endif | ||
43 | -# elif su_CC_CLANG || su_CC_PCC | ||
44 | -# if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 199901L | ||
45 | +# elif su_CC_CLANG || su_CC_GCC || su_CC_PCC | ||
46 | +# if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 199901l | ||
47 | # if !defined NDEBUG || !defined __OPTIMIZE__ | ||
48 | # define su_INLINE static inline | ||
49 | # define su_SINLINE static inline | ||
50 | @@ -340,8 +319,13 @@ do{\ | ||
51 | # define su_SINLINE static inline __attribute__((always_inline)) | ||
52 | # endif | ||
53 | # else | ||
54 | -# define su_INLINE static __inline | ||
55 | -# define su_SINLINE static __inline | ||
56 | +# if su_CC_VCHECK_GCC(3, 1) | ||
57 | +# define su_INLINE static __inline __attribute__((always_inline)) | ||
58 | +# define su_SINLINE static __inline __attribute__((always_inline)) | ||
59 | +# else | ||
60 | +# define su_INLINE static __inline | ||
61 | +# define su_SINLINE static __inline | ||
62 | +# endif | ||
63 | # endif | ||
64 | # else | ||
65 | # define su_INLINE static /* TODO __attribute__((unused)) alike? */ | ||
66 | -- | ||
67 | 2.25.1 | ||
68 | |||
diff --git a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch b/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch deleted file mode 100644 index 37ecb0c1f..000000000 --- a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 5429b9e343c808951b1418d8626e544c9dcb28de Mon Sep 17 00:00:00 2001 | ||
2 | From: Steffen Nurpmeso <steffen@sdaoden.eu> | ||
3 | Date: Thu, 9 Jun 2022 18:06:04 +0800 | ||
4 | Subject: [PATCH] su_INLINE: gcc: only GNU specifics after -Og | ||
5 | |||
6 | Upstream-Status: Backport [https://git.sdaoden.eu/browse/s-nail.git/commit/?id=c5544b66c3b4b2e161166562349908a07e324b38] | ||
7 | |||
8 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
9 | --- | ||
10 | include/su/code.h | 17 +++++++++-------- | ||
11 | 1 file changed, 9 insertions(+), 8 deletions(-) | ||
12 | |||
13 | diff --git a/include/su/code.h b/include/su/code.h | ||
14 | index 4d552c1..9683f4a 100644 | ||
15 | --- a/include/su/code.h | ||
16 | +++ b/include/su/code.h | ||
17 | @@ -309,16 +309,17 @@ do{\ | ||
18 | # define su_INLINE inline | ||
19 | # define su_SINLINE inline | ||
20 | # elif su_CC_GCC | ||
21 | - /* After lots of trouble with OpenBSD/gcc 4.2.1 and SunOS/gcc 3.4.3 */ | ||
22 | -# if !su_CC_VCHECK_GCC(3, 2) /* Unsure: only used C++ at that time */ | ||
23 | -# define su_INLINE extern __inline | ||
24 | -# define su_SINLINE static __inline | ||
25 | -# elif !su_CC_VCHECK_GCC(4, 3) | ||
26 | +# if !su_CC_VCHECK_GCC(3, 1) | ||
27 | +# define su_INLINE extern __inline__ | ||
28 | +# define su_SINLINE static __inline__ | ||
29 | +# elif !defined __GNUC_GNU_INLINE__ /*4.1.3; !su_CC_VCHECK_GCC(4, 2)*/ | ||
30 | # define su_INLINE extern __inline __attribute__((always_inline)) | ||
31 | # define su_SINLINE static __inline __attribute__((always_inline)) | ||
32 | - /* xxx gcc 8.3.0 bug: does not truly inline with -Os */ | ||
33 | -# elif !su_CC_VCHECK_GCC(8, 3) || !defined __OPTIMIZE__ ||\ | ||
34 | - !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L | ||
35 | + /* gcc 8.3.0 bug: does not gracefully inline with -Os | ||
36 | + * gcc 12.1.0 bug: ditto, -Og | ||
37 | + * Thus: always gcc-specific! */ | ||
38 | +# elif 1 /*!defined __OPTIMIZE__ || \ | ||
39 | + !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L*/ | ||
40 | # define su_INLINE extern __inline __attribute__((gnu_inline)) | ||
41 | # define su_SINLINE static __inline __attribute__((gnu_inline)) | ||
42 | # elif !defined NDEBUG || !defined __OPTIMIZE__ | ||
43 | -- | ||
44 | 2.25.1 | ||
45 | |||
diff --git a/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb b/meta-oe/recipes-extended/s-nail/s-nail_14.9.25.bb index bcdb1e478..93a852a6d 100644 --- a/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb +++ b/meta-oe/recipes-extended/s-nail/s-nail_14.9.25.bb | |||
@@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=87266591c81260f10221f1f38872d023" | |||
8 | SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \ | 8 | SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \ |
9 | file://make-errors.patch \ | 9 | file://make-errors.patch \ |
10 | file://0001-make.rc-set-VAL_MTA.patch \ | 10 | file://0001-make.rc-set-VAL_MTA.patch \ |
11 | file://0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch \ | ||
12 | file://0001-su_INLINE-eh-no-give-up-share-detection.patch \ | ||
13 | file://0001-mk-make-config.sh-not-reveal-the-build-env.patch \ | 11 | file://0001-mk-make-config.sh-not-reveal-the-build-env.patch \ |
14 | " | 12 | " |
15 | SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c" | 13 | SRC_URI[sha256sum] = "20ff055be9829b69d46ebc400dfe516a40d287d7ce810c74355d6bdc1a28d8a9" |
16 | 14 | ||
17 | DEPENDS = "coreutils-native" | 15 | DEPENDS = "coreutils-native" |
18 | 16 | ||
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.9.3.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.9.4.bb index 3b558cafc..9e879ff38 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.9.3.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.9.4.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ | |||
17 | file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ | 17 | file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ |
18 | file://0001-add-missing-system-header-string.h.patch \ | 18 | file://0001-add-missing-system-header-string.h.patch \ |
19 | " | 19 | " |
20 | SRCREV = "79b35bba8298f4444923c15e11bed38380cb18ee" | 20 | SRCREV = "e077f1a99a07c32ef460db89ed395b441f5e8b03" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
diff --git a/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb b/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb index 0e5fc7b6b..b71ad234e 100644 --- a/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb +++ b/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sblim/${BP}.tar.bz2 \ | |||
13 | SRC_URI[md5sum] = "b934616f88a848f17ca3cf1b9e792cbf" | 13 | SRC_URI[md5sum] = "b934616f88a848f17ca3cf1b9e792cbf" |
14 | SRC_URI[sha256sum] = "1671cabff6b922b6fde897673d9fdafd56c9310f82a7eacc0547d596b9cdfea6" | 14 | SRC_URI[sha256sum] = "1671cabff6b922b6fde897673d9fdafd56c9310f82a7eacc0547d596b9cdfea6" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sblim/files/development%20pkgs/sblim-cmpi-devel/" | ||
17 | UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" | ||
18 | |||
16 | inherit autotools | 19 | inherit autotools |
17 | 20 | ||
18 | BBCLASSEXTEND = "native" | 21 | BBCLASSEXTEND = "native" |
diff --git a/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb b/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb index 4e90215c0..d2bab6ce5 100644 --- a/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb +++ b/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb | |||
@@ -14,6 +14,8 @@ SRC_URI = "http://downloads.sourceforge.net/sblim/sblim-sfcCommon-${PV}.tar.bz2" | |||
14 | SRC_URI[md5sum] = "8aa2655d97bdea54c4750f220b40990c" | 14 | SRC_URI[md5sum] = "8aa2655d97bdea54c4750f220b40990c" |
15 | SRC_URI[sha256sum] = "b9b1037173d6ae0181c3bd5a316ddab5afd6a342ad0dbdc18e940fc0ad2c3297" | 15 | SRC_URI[sha256sum] = "b9b1037173d6ae0181c3bd5a316ddab5afd6a342ad0dbdc18e940fc0ad2c3297" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sblim/files/sblim-sfcCommon/" | ||
18 | |||
17 | inherit autotools | 19 | inherit autotools |
18 | 20 | ||
19 | do_install() { | 21 | do_install() { |
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 508939791..6126a3a38 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 | |||
@@ -86,3 +86,8 @@ FILES:${PN} += "${libdir}/sfcb ${datadir}/sfcb" | |||
86 | FILES:${PN}-dbg += "${libdir}/sfcb/.debug" | 86 | FILES:${PN}-dbg += "${libdir}/sfcb/.debug" |
87 | 87 | ||
88 | RDEPENDS:${PN} = "perl bash" | 88 | RDEPENDS:${PN} = "perl bash" |
89 | |||
90 | # This one is reproducible only on 32bit MACHINEs | ||
91 | # http://errors.yoctoproject.org/Errors/Details/766970/ | ||
92 | # sblim-sfcb-1.4.9/trace.c:214:18: error: passing argument 1 of 'gmtime_r' from incompatible pointer type [-Wincompatible-pointer-types] | ||
93 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch new file mode 100644 index 000000000..5e8f4fa0d --- /dev/null +++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | From 5151163d6f4d4de0699d1e85c54fbe2cb5b55460 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
3 | Date: Thu, 27 Jun 2024 01:51:36 +0000 | ||
4 | Subject: Fix incompatible pointer type error with gcc option | ||
5 | -Wincompatible-pointer-types | ||
6 | |||
7 | | ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c: In function 'main': | ||
8 | | ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c:86:31: error: passing argument 1 of 'showClass' from incompatible pointer type [-Wincompatible-pointer-types] | ||
9 | | 86 | showClass(data.value.cls); | ||
10 | | | ~~~~~~~~~~^~~~ | ||
11 | | | | | ||
12 | | | CIMCClass * {aka struct _CIMCClass *} | ||
13 | | In file included from ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c:7: | ||
14 | | ../../sblim-sfcc-2.2.8/TEST/show.h:9:34: note: expected 'CMPIConstClass *' {aka 'struct _CMPIConstClass *'} but argument is of type 'CIMCClass *' {aka 'struct _CIMCClass *'} | ||
15 | | 9 | void showClass( CMPIConstClass * in_class ); | ||
16 | | | ~~~~~~~~~~~~~~~~~^~~~~~~~ | ||
17 | |||
18 | | ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c: In function 'main': | ||
19 | | ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c:96:36: error: passing argument 1 of 'showObjectPath' from incompatible pointer type [-Wincompatible-pointer-types] | ||
20 | | 96 | showObjectPath(data.value.ref); | ||
21 | | | ~~~~~~~~~~^~~~ | ||
22 | | | | | ||
23 | | | CIMCObjectPath * {aka struct _CIMCObjectPath *} | ||
24 | | In file included from ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c:7: | ||
25 | | ../../sblim-sfcc-2.2.8/TEST/show.h:7:39: note: expected 'CMPIObjectPath *' {aka 'struct _CMPIObjectPath *'} but argument is of type 'CIMCObjectPath *' {aka 'struct _CIMCObjectPath *'} | ||
26 | | 7 | void showObjectPath( CMPIObjectPath * objectpath ); | ||
27 | | | ~~~~~~~~~~~~~~~~~^~~~~~~~~~ | ||
28 | | make[2]: *** [Makefile:1110: v2test_ein.o] Error 1 | ||
29 | | make[2]: *** Waiting for unfinished jobs.... | ||
30 | | ../../sblim-sfcc-2.2.8/TEST/v2test_im.c: In function 'main': | ||
31 | | ../../sblim-sfcc-2.2.8/TEST/v2test_im.c:82:40: warning: '%s' directive argument is null [-Wformat-overflow=] | ||
32 | | 82 | printf( "invokeMethod() rc=%d, msg=%s\n", | ||
33 | | | ^~ | ||
34 | |||
35 | Upstream-Status: Backport | ||
36 | [https://github.com/kkaempf/sblim-sfcc/commit/881fccbaf19e26cbef3da1bebe2b42b3a9de1147#diff-ad9eeee99837ead0f29c70cd5f3956178dc3d51bd79618affd53d72a31404d5f] | ||
37 | |||
38 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
39 | --- | ||
40 | TEST/v2test_ec.c | 2 +- | ||
41 | TEST/v2test_ein.c | 2 +- | ||
42 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
43 | |||
44 | diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c | ||
45 | index 940ca57..72a93a5 100644 | ||
46 | --- a/TEST/v2test_ec.c | ||
47 | +++ b/TEST/v2test_ec.c | ||
48 | @@ -83,7 +83,7 @@ int main() | ||
49 | count = enm->ft->hasNext(enm, NULL) ; | ||
50 | while (count > 0) { | ||
51 | data = enm->ft->getNext(enm, NULL); | ||
52 | - showClass(data.value.cls); | ||
53 | + showClass((CMPIConstClass *)data.value.cls); | ||
54 | /* | ||
55 | * see if we have any more | ||
56 | */ | ||
57 | diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c | ||
58 | index ede95c1..c9d1152 100644 | ||
59 | --- a/TEST/v2test_ein.c | ||
60 | +++ b/TEST/v2test_ein.c | ||
61 | @@ -93,7 +93,7 @@ int count = 0; | ||
62 | |||
63 | data = enm->ft->getNext(enm, NULL); | ||
64 | |||
65 | - showObjectPath(data.value.ref); | ||
66 | + showObjectPath((CMPIObjectPath *)data.value.ref); | ||
67 | /* | ||
68 | * see if we have any more | ||
69 | */ | ||
70 | -- | ||
71 | 2.34.1 | ||
72 | |||
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 c9d3ddd6b..4eb1c2f25 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 | |||
@@ -5,14 +5,22 @@ HOMEPAGE = "http://www.sblim.org" | |||
5 | SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \ | 5 | SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \ |
6 | file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \ | 6 | file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \ |
7 | file://0001-Fix-implicit-function-declarations.patch \ | 7 | file://0001-Fix-implicit-function-declarations.patch \ |
8 | file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \ | ||
8 | " | 9 | " |
9 | 10 | ||
10 | SRC_URI[md5sum] = "0bac0dec19f17ec065b6c332a56d7bae" | 11 | SRC_URI[md5sum] = "0bac0dec19f17ec065b6c332a56d7bae" |
11 | SRC_URI[sha256sum] = "1b8f187583bc6c6b0a63aae0165ca37892a2a3bd4bb0682cd76b56268b42c3d6" | 12 | SRC_URI[sha256sum] = "1b8f187583bc6c6b0a63aae0165ca37892a2a3bd4bb0682cd76b56268b42c3d6" |
12 | 13 | ||
14 | UPSTREAM_CHECK_URI="https://sourceforge.net/projects/sblim/files/sblim-sfcc/" | ||
15 | |||
13 | LICENSE = "EPL-1.0" | 16 | LICENSE = "EPL-1.0" |
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" | 17 | LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" |
15 | 18 | ||
16 | DEPENDS = "curl" | 19 | DEPENDS = "curl" |
17 | 20 | ||
18 | inherit autotools | 21 | inherit autotools |
22 | |||
23 | # http://errors.yoctoproject.org/Errors/Details/766897/ | ||
24 | # sblim-sfcc-2.2.8/TEST/v2test_ec.c:86:31: error: passing argument 1 of 'showClass' from incompatible pointer type [-Wincompatible-pointer-types] | ||
25 | # sblim-sfcc-2.2.8/TEST/v2test_ein.c:96:36: error: passing argument 1 of 'showObjectPath' from incompatible pointer type [-Wincompatible-pointer-types] | ||
26 | 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 999d2b9e9..c9a5bd1f9 100644 --- a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb | |||
@@ -44,3 +44,18 @@ FILES:${PN}-raidmon = "${sbindir}/sgraidmon ${sysconfdir}/init.d/sgraid" | |||
44 | RDEPENDS:${PN} += "bash" | 44 | RDEPENDS:${PN} += "bash" |
45 | RDEPENDS:${PN}-diskmon += "${PN} bash" | 45 | RDEPENDS:${PN}-diskmon += "${PN} bash" |
46 | RDEPENDS:${PN}-raidmon += "${PN} bash" | 46 | RDEPENDS:${PN}-raidmon += "${PN} bash" |
47 | |||
48 | # This one is reproducible only on 32bit MACHINEs | ||
49 | # http://errors.yoctoproject.org/Errors/Details/766967/ | ||
50 | # scsirastools-1.6.6/src/sgdiag.c:238:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
51 | # scsirastools-1.6.6/src/sgdiag.c:697:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] | ||
52 | # scsirastools-1.6.6/src/sgdiag.c:699:30: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
53 | # scsirastools-1.6.6/src/sgdiag.c:733:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] | ||
54 | # scsirastools-1.6.6/src/sgdefects.c:214:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
55 | # scsirastools-1.6.6/src/sgmode.c:290:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
56 | # scsirastools-1.6.6/src/sgdiskmon.c:1278:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
57 | # scsirastools-1.6.6/src/sgdskfl.c:318:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
58 | # scsirastools-1.6.6/src/sgdskfl.c:829:37: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
59 | # scsirastools-1.6.6/src/sgraidmon.c:1641:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
60 | # scsirastools-1.6.6/src/sgsafte.c:1298:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
61 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index ab97356e9..fa43c9de5 100644 --- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb | |||
@@ -5,6 +5,8 @@ PV = "1.0+git" | |||
5 | 5 | ||
6 | SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master" | 6 | SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master" |
7 | 7 | ||
8 | # Upstream repo does not tag | ||
9 | UPSTREAM_CHECK_COMMITS = "1" | ||
8 | 10 | ||
9 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
10 | 12 | ||
diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 580d03cbb..71b62cc51 100644 --- a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb | |||
@@ -46,7 +46,7 @@ do_install:append() { | |||
46 | # Install systemd related configuration file | 46 | # Install systemd related configuration file |
47 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 47 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
48 | install -d ${D}${sysconfdir}/modules-load.d | 48 | install -d ${D}${sysconfdir}/modules-load.d |
49 | install -m 0644 ${WORKDIR}/tipcutils.conf ${D}${sysconfdir}/modules-load.d | 49 | install -m 0644 ${UNPACKDIR}/tipcutils.conf ${D}${sysconfdir}/modules-load.d |
50 | fi | 50 | fi |
51 | } | 51 | } |
52 | 52 | ||
diff --git a/meta-oe/recipes-extended/tmux/tmux_3.3a.bb b/meta-oe/recipes-extended/tmux/tmux_3.4.bb index 518722283..4360edf4b 100644 --- a/meta-oe/recipes-extended/tmux/tmux_3.3a.bb +++ b/meta-oe/recipes-extended/tmux/tmux_3.4.bb | |||
@@ -5,13 +5,13 @@ SECTION = "console/utils" | |||
5 | LICENSE = "ISC" | 5 | LICENSE = "ISC" |
6 | LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf19144bdaca107" | 6 | LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf19144bdaca107" |
7 | 7 | ||
8 | DEPENDS = "ncurses libevent" | 8 | DEPENDS = "ncurses libevent bison-native" |
9 | 9 | ||
10 | SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" | 10 | SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" |
11 | SRC_URI[md5sum] = "8eee5883b9f6550fa4efaad0c9ec38f3" | 11 | SRC_URI[sha256sum] = "551ab8dea0bf505c0ad6b7bb35ef567cdde0ccb84357df142c254f35a23e19aa" |
12 | SRC_URI[sha256sum] = "e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f" | ||
13 | 12 | ||
14 | UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases" | 13 | UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases" |
14 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
15 | 15 | ||
16 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig |
17 | 17 | ||
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb index 6a99e8d29..93daafbeb 100644 --- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_ | |||
14 | SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a" | 14 | SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a" |
15 | SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41" | 15 | SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/user-mode-linux/files/tools/1/" | ||
17 | 18 | ||
18 | S = "${WORKDIR}/tools" | 19 | S = "${WORKDIR}/tools" |
19 | 20 | ||
diff --git a/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch new file mode 100644 index 000000000..ab2265bdb --- /dev/null +++ b/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From b4cf6e677cec75a0d2b57dcb2960ad1e16908c82 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 10 Sep 2019 20:04:26 -0700 | ||
4 | Subject: [PATCH] src: Do not reset FINAL_LIBS | ||
5 | |||
6 | This helps case where additional libraries are needed to be passed from | ||
7 | environment to get it going | ||
8 | |||
9 | e.g. -latomic is needed on clang/x86 to provide for 64bit atomics | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
14 | --- | ||
15 | src/Makefile | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/Makefile b/src/Makefile | ||
19 | index e0b1d2722..48988e271 100644 | ||
20 | --- a/src/Makefile | ||
21 | +++ b/src/Makefile | ||
22 | @@ -145,7 +145,7 @@ ifeq ($(SERVER_TEST),yes) | ||
23 | FINAL_CFLAGS +=-DSERVER_TEST=1 | ||
24 | endif | ||
25 | FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(SERVER_LDFLAGS) $(DEBUG) | ||
26 | -FINAL_LIBS=-lm | ||
27 | +FINAL_LIBS+=-lm | ||
28 | DEBUG=-g -ggdb | ||
29 | |||
30 | # Linux ARM32 needs -latomic at linking time | ||
31 | -- | ||
32 | 2.39.5 | ||
33 | |||
diff --git a/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch b/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch new file mode 100644 index 000000000..fa11d058f --- /dev/null +++ b/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From f3dd59789e4a8b06777be2725c6c3e36050fd6ec Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 21 Dec 2019 12:09:51 -0800 | ||
4 | Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER | ||
5 | |||
6 | Fixes | ||
7 | | zmalloc.c:87:37: error: 'PTHREAD_MUTEX_DEFAULT' undeclared here (not in a function) | ||
8 | | 87 | pthread_mutex_t used_memory_mutex = PTHREAD_MUTEX_INITIALIZER; | ||
9 | | | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
14 | --- | ||
15 | src/zmalloc.c | 1 + | ||
16 | 1 file changed, 1 insertion(+) | ||
17 | |||
18 | diff --git a/src/zmalloc.c b/src/zmalloc.c | ||
19 | index 7b19107b6..bd365c11c 100644 | ||
20 | --- a/src/zmalloc.c | ||
21 | +++ b/src/zmalloc.c | ||
22 | @@ -33,6 +33,7 @@ | ||
23 | #include "solarisfixes.h" | ||
24 | #include "serverassert.h" | ||
25 | |||
26 | +#define _GNU_SOURCE | ||
27 | #include <stdio.h> | ||
28 | #include <stdlib.h> | ||
29 | #include <stdint.h> | ||
diff --git a/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch new file mode 100644 index 000000000..3168c5860 --- /dev/null +++ b/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 5e6c3052930f1d831d3479cb59533c08277700ff Mon Sep 17 00:00:00 2001 | ||
2 | From: Venture Research <tech@ventureresearch.com> | ||
3 | Date: Fri, 8 Feb 2013 17:39:52 -0600 | ||
4 | Subject: [PATCH] hiredis: use default CC if it is set | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Instead of trying to automagically figure out CC, which breaks with OE | ||
10 | as CC has spaces in it, just skip it if one was already passed in. | ||
11 | |||
12 | Signed-off-by: Venture Research <tech@ventureresearch.com> | ||
13 | |||
14 | Update to work with 4.0.8 | ||
15 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | ||
16 | |||
17 | Reworked for 6.0.4 | ||
18 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
19 | |||
20 | Reworked for 8.0.0 | ||
21 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
22 | |||
23 | --- | ||
24 | Upstream-Status: Pending | ||
25 | |||
26 | deps/hiredis/Makefile | 2 -- | ||
27 | 1 file changed, 2 deletions(-) | ||
28 | |||
29 | diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile | ||
30 | index 4a3de1f6e..49bb525cd 100644 | ||
31 | --- a/deps/hiredis/Makefile | ||
32 | +++ b/deps/hiredis/Makefile | ||
33 | @@ -36,8 +36,6 @@ endef | ||
34 | export REDIS_TEST_CONFIG | ||
35 | |||
36 | # Fallback to gcc when $CC is not in $PATH. | ||
37 | -CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') | ||
38 | -CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') | ||
39 | OPTIMIZATION?=-O3 | ||
40 | WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers | ||
41 | DEBUG_FLAGS?= -g -ggdb | ||
diff --git a/meta-oe/recipes-extended/valkey/valkey/init-valkey-server b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server new file mode 100755 index 000000000..873179574 --- /dev/null +++ b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server | |||
@@ -0,0 +1,71 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | ### BEGIN INIT INFO | ||
4 | # Provides: valkey-server | ||
5 | # Required-Start: $network | ||
6 | # Required-Stop: $network | ||
7 | # Default-Start: S 2 3 4 5 | ||
8 | # Default-Stop: 0 1 6 | ||
9 | # Short-Description: Redis, a key-value store | ||
10 | # Description: Redis is an open source, advanced key-value store. | ||
11 | # http://valkey.io | ||
12 | ### END INIT INFO | ||
13 | |||
14 | test -f /usr/bin/valkey-server || exit 0 | ||
15 | |||
16 | ARGS="/etc/valkey/valkey.conf" | ||
17 | |||
18 | case "$1" in | ||
19 | start) | ||
20 | echo "Starting valkey-server..." | ||
21 | start-stop-daemon --start --quiet --exec /usr/bin/valkey-server -- $ARGS | ||
22 | ;; | ||
23 | stop) | ||
24 | echo "Stopping valkey-server..." | ||
25 | start-stop-daemon --stop --quiet --exec /usr/bin/valkey-server | ||
26 | ;; | ||
27 | restart) | ||
28 | echo "Stopping valkey-server..." | ||
29 | start-stop-daemon --stop --quiet --exec /usr/bin/valkey-server | ||
30 | |||
31 | # Since busybox implementation ignores --retry arguments repeatedly check | ||
32 | # if the process is still running and try another signal after a timeout, | ||
33 | # efectively simulating a stop with --retry=TERM/5/KILL/5 schedule. | ||
34 | waitAfterTerm=5000000 # us / 5000 ms / 5 s | ||
35 | waitAfterKill=5000000 # us / 5000 ms / 5 s | ||
36 | waitStep=100000 # us / 100 ms / 0.1 s | ||
37 | waited=0 | ||
38 | start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server | ||
39 | processOff=$? | ||
40 | while [ $processOff -eq 0 ] && [ $waited -le $waitAfterTerm ] ; do | ||
41 | usleep ${waitStep} | ||
42 | ((waited+=${waitStep})) | ||
43 | start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server | ||
44 | processOff=$? | ||
45 | done | ||
46 | if [ $processOff -eq 0 ] ; then | ||
47 | start-stop-daemon --stop --signal KILL --exec /usr/bin/valkey-server | ||
48 | start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server | ||
49 | processOff=$? | ||
50 | fi | ||
51 | waited=0 | ||
52 | while [ $processOff -eq 0 ] && [ $waited -le $waitAfterKill ] ; do | ||
53 | usleep ${waitStep} | ||
54 | ((waited+=${waitStep})) | ||
55 | start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server | ||
56 | processOff=$? | ||
57 | done | ||
58 | # Here $processOff will indicate if waiting and retrying according to | ||
59 | # the schedule ended in a successfull stop or not. | ||
60 | |||
61 | echo "Starting valkey-server..." | ||
62 | start-stop-daemon --start --quiet --exec /usr/bin/valkey-server -- $ARGS | ||
63 | ;; | ||
64 | *) | ||
65 | echo "Usage: /etc/init.d/valkey-server {start|stop|restart}" | ||
66 | exit 1 | ||
67 | ;; | ||
68 | esac | ||
69 | |||
70 | exit 0 | ||
71 | |||
diff --git a/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch new file mode 100644 index 000000000..1c3762638 --- /dev/null +++ b/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch | |||
@@ -0,0 +1,78 @@ | |||
1 | From 892225f5101b1131434d323c55e79a93dc189609 Mon Sep 17 00:00:00 2001 | ||
2 | From: Venture Research <tech@ventureresearch.com> | ||
3 | Date: Fri, 8 Feb 2013 20:22:19 -0600 | ||
4 | Subject: [PATCH] lua: update Makefile to use environment build settings | ||
5 | |||
6 | OE-specific parameters, instead of overriding all of these simply use | ||
7 | the ones that are already passed in. Also configure for only Linux... | ||
8 | |||
9 | Signed-off-by: Venture Research <tech@ventureresearch.com> | ||
10 | |||
11 | Updated to work with 3.0.x | ||
12 | |||
13 | Signed-off-by: Armin Kuster <akust808@gmail.com> | ||
14 | |||
15 | updated to work wtih 6.2.1 | ||
16 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | ||
17 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
18 | --- | ||
19 | Upstream-Status: Pending | ||
20 | |||
21 | deps/Makefile | 1 - | ||
22 | deps/lua/Makefile | 1 - | ||
23 | deps/lua/src/Makefile | 16 ++++++---------- | ||
24 | 3 files changed, 6 insertions(+), 12 deletions(-) | ||
25 | |||
26 | diff --git a/deps/Makefile b/deps/Makefile | ||
27 | index f1e4bd6ce..b9e50d049 100644 | ||
28 | --- a/deps/Makefile | ||
29 | +++ b/deps/Makefile | ||
30 | @@ -94,7 +94,6 @@ endif | ||
31 | # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more | ||
32 | # challenging to cross-compile lua (and redis). These defines make it easier | ||
33 | # to fit redis into cross-compilation environments, which typically set AR. | ||
34 | -AR=ar | ||
35 | ARFLAGS=rc | ||
36 | |||
37 | lua: .make-prerequisites | ||
38 | diff --git a/deps/lua/Makefile b/deps/lua/Makefile | ||
39 | index 209a13244..72f4b2bf2 100644 | ||
40 | --- a/deps/lua/Makefile | ||
41 | +++ b/deps/lua/Makefile | ||
42 | @@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644 | ||
43 | |||
44 | # Utilities. | ||
45 | MKDIR= mkdir -p | ||
46 | -RANLIB= ranlib | ||
47 | |||
48 | # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= | ||
49 | |||
50 | diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile | ||
51 | index f3bba2f81..1555ec028 100644 | ||
52 | --- a/deps/lua/src/Makefile | ||
53 | +++ b/deps/lua/src/Makefile | ||
54 | @@ -5,18 +5,14 @@ | ||
55 | # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= | ||
56 | |||
57 | # Your platform. See PLATS for possible values. | ||
58 | -PLAT= none | ||
59 | +PLAT= linux | ||
60 | |||
61 | -CC?= gcc | ||
62 | -CFLAGS= -O2 -Wall $(MYCFLAGS) | ||
63 | -AR= ar rcu | ||
64 | -RANLIB= ranlib | ||
65 | -RM= rm -f | ||
66 | -LIBS= -lm $(MYLIBS) | ||
67 | - | ||
68 | -MYCFLAGS= | ||
69 | +MYCFLAGS=-DLUA_USE_LINUX | ||
70 | MYLDFLAGS= | ||
71 | -MYLIBS= | ||
72 | +MYLIBS=-Wl,-E -ldl -lreadline -lhistory -lncurses | ||
73 | + | ||
74 | +CFLAGS += $(MYCFLAGS) | ||
75 | +LIBS += -lm $(MYLIBS) | ||
76 | |||
77 | # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= | ||
78 | |||
diff --git a/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch new file mode 100644 index 000000000..3bab01e3f --- /dev/null +++ b/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From ad79a81d6582555e580bdba42c959477e7d35ae7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Venture Research <tech@ventureresearch.com> | ||
3 | Date: Wed, 6 Feb 2013 20:51:02 -0600 | ||
4 | Subject: [PATCH] hack to force use of libc malloc | ||
5 | |||
6 | Hack to force libc usage as it seems the option to pass it in has been | ||
7 | removed in favor of magic. | ||
8 | |||
9 | Note that this of course doesn't allow tcmalloc and jemalloc, however | ||
10 | jemalloc wasn't building correctly. | ||
11 | |||
12 | Signed-off-by: Venture Research <tech@ventureresearch.com> | ||
13 | |||
14 | Update to work with 4.0.8 | ||
15 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | ||
16 | |||
17 | Update to work with 8.0.0 | ||
18 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
19 | |||
20 | --- | ||
21 | Upstream-Status: Pending | ||
22 | |||
23 | src/Makefile | 3 ++- | ||
24 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/src/Makefile b/src/Makefile | ||
27 | index 13fa1c027..e0b1d2722 100644 | ||
28 | --- a/src/Makefile | ||
29 | +++ b/src/Makefile | ||
30 | @@ -13,7 +13,8 @@ | ||
31 | # Just use 'make dep', but this is only needed by developers. | ||
32 | |||
33 | release_hdr := $(shell sh -c './mkreleasehdr.sh') | ||
34 | -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | ||
35 | +# use fake uname option to force use of generic libc | ||
36 | +uname_S := "USE_LIBC_MALLOC" | ||
37 | uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') | ||
38 | CLANG := $(findstring clang,$(shell sh -c '$(CC) --version | head -1')) | ||
39 | |||
diff --git a/meta-oe/recipes-extended/valkey/valkey/valkey.conf b/meta-oe/recipes-extended/valkey/valkey/valkey.conf new file mode 100644 index 000000000..5efff8fd4 --- /dev/null +++ b/meta-oe/recipes-extended/valkey/valkey/valkey.conf | |||
@@ -0,0 +1,1314 @@ | |||
1 | # Redis configuration file example. | ||
2 | # | ||
3 | # Note that in order to read the configuration file, Redis must be | ||
4 | # started with the file path as first argument: | ||
5 | # | ||
6 | # ./valkey-server /path/to/valkey.conf | ||
7 | |||
8 | # Note on units: when memory size is needed, it is possible to specify | ||
9 | # it in the usual form of 1k 5GB 4M and so forth: | ||
10 | # | ||
11 | # 1k => 1000 bytes | ||
12 | # 1kb => 1024 bytes | ||
13 | # 1m => 1000000 bytes | ||
14 | # 1mb => 1024*1024 bytes | ||
15 | # 1g => 1000000000 bytes | ||
16 | # 1gb => 1024*1024*1024 bytes | ||
17 | # | ||
18 | # units are case insensitive so 1GB 1Gb 1gB are all the same. | ||
19 | |||
20 | ################################## INCLUDES ################################### | ||
21 | |||
22 | # Include one or more other config files here. This is useful if you | ||
23 | # have a standard template that goes to all Redis servers but also need | ||
24 | # to customize a few per-server settings. Include files can include | ||
25 | # other files, so use this wisely. | ||
26 | # | ||
27 | # Notice option "include" won't be rewritten by command "CONFIG REWRITE" | ||
28 | # from admin or Redis Sentinel. Since Redis always uses the last processed | ||
29 | # line as value of a configuration directive, you'd better put includes | ||
30 | # at the beginning of this file to avoid overwriting config change at runtime. | ||
31 | # | ||
32 | # If instead you are interested in using includes to override configuration | ||
33 | # options, it is better to use include as the last line. | ||
34 | # | ||
35 | # include /path/to/local.conf | ||
36 | # include /path/to/other.conf | ||
37 | |||
38 | ################################## MODULES ##################################### | ||
39 | |||
40 | # Load modules at startup. If the server is not able to load modules | ||
41 | # it will abort. It is possible to use multiple loadmodule directives. | ||
42 | # | ||
43 | # loadmodule /path/to/my_module.so | ||
44 | # loadmodule /path/to/other_module.so | ||
45 | |||
46 | ################################## NETWORK ##################################### | ||
47 | |||
48 | # By default, if no "bind" configuration directive is specified, Redis listens | ||
49 | # for connections from all the network interfaces available on the server. | ||
50 | # It is possible to listen to just one or multiple selected interfaces using | ||
51 | # the "bind" configuration directive, followed by one or more IP addresses. | ||
52 | # | ||
53 | # Examples: | ||
54 | # | ||
55 | # bind 192.168.1.100 10.0.0.1 | ||
56 | # bind 127.0.0.1 ::1 | ||
57 | # | ||
58 | # ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the | ||
59 | # internet, binding to all the interfaces is dangerous and will expose the | ||
60 | # instance to everybody on the internet. So by default we uncomment the | ||
61 | # following bind directive, that will force Redis to listen only into | ||
62 | # the IPv4 lookback interface address (this means Redis will be able to | ||
63 | # accept connections only from clients running into the same computer it | ||
64 | # is running). | ||
65 | # | ||
66 | # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES | ||
67 | # JUST COMMENT THE FOLLOWING LINE. | ||
68 | # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
69 | bind 127.0.0.1 | ||
70 | |||
71 | # Protected mode is a layer of security protection, in order to avoid that | ||
72 | # Redis instances left open on the internet are accessed and exploited. | ||
73 | # | ||
74 | # When protected mode is on and if: | ||
75 | # | ||
76 | # 1) The server is not binding explicitly to a set of addresses using the | ||
77 | # "bind" directive. | ||
78 | # 2) No password is configured. | ||
79 | # | ||
80 | # The server only accepts connections from clients connecting from the | ||
81 | # IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain | ||
82 | # sockets. | ||
83 | # | ||
84 | # By default protected mode is enabled. You should disable it only if | ||
85 | # you are sure you want clients from other hosts to connect to Redis | ||
86 | # even if no authentication is configured, nor a specific set of interfaces | ||
87 | # are explicitly listed using the "bind" directive. | ||
88 | protected-mode yes | ||
89 | |||
90 | # Accept connections on the specified port, default is 6379 (IANA #815344). | ||
91 | # If port 0 is specified Redis will not listen on a TCP socket. | ||
92 | port 6379 | ||
93 | |||
94 | # TCP listen() backlog. | ||
95 | # | ||
96 | # In high requests-per-second environments you need an high backlog in order | ||
97 | # to avoid slow clients connections issues. Note that the Linux kernel | ||
98 | # will silently truncate it to the value of /proc/sys/net/core/somaxconn so | ||
99 | # make sure to raise both the value of somaxconn and tcp_max_syn_backlog | ||
100 | # in order to get the desired effect. | ||
101 | tcp-backlog 511 | ||
102 | |||
103 | # Unix socket. | ||
104 | # | ||
105 | # Specify the path for the Unix socket that will be used to listen for | ||
106 | # incoming connections. There is no default, so Redis will not listen | ||
107 | # on a unix socket when not specified. | ||
108 | # | ||
109 | # unixsocket /tmp/valkey.sock | ||
110 | # unixsocketperm 700 | ||
111 | |||
112 | # Close the connection after a client is idle for N seconds (0 to disable) | ||
113 | timeout 0 | ||
114 | |||
115 | # TCP keepalive. | ||
116 | # | ||
117 | # If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence | ||
118 | # of communication. This is useful for two reasons: | ||
119 | # | ||
120 | # 1) Detect dead peers. | ||
121 | # 2) Take the connection alive from the point of view of network | ||
122 | # equipment in the middle. | ||
123 | # | ||
124 | # On Linux, the specified value (in seconds) is the period used to send ACKs. | ||
125 | # Note that to close the connection the double of the time is needed. | ||
126 | # On other kernels the period depends on the kernel configuration. | ||
127 | # | ||
128 | # A reasonable value for this option is 300 seconds, which is the new | ||
129 | # Redis default starting with Redis 3.2.1. | ||
130 | tcp-keepalive 300 | ||
131 | |||
132 | ################################# GENERAL ##################################### | ||
133 | |||
134 | # OE: run as a daemon. | ||
135 | daemonize yes | ||
136 | |||
137 | # If you run Redis from upstart or systemd, Redis can interact with your | ||
138 | # supervision tree. Options: | ||
139 | # supervised no - no supervision interaction | ||
140 | # supervised upstart - signal upstart by putting Redis into SIGSTOP mode | ||
141 | # supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET | ||
142 | # supervised auto - detect upstart or systemd method based on | ||
143 | # UPSTART_JOB or NOTIFY_SOCKET environment variables | ||
144 | # Note: these supervision methods only signal "process is ready." | ||
145 | # They do not enable continuous liveness pings back to your supervisor. | ||
146 | supervised no | ||
147 | |||
148 | # If a pid file is specified, Redis writes it where specified at startup | ||
149 | # and removes it at exit. | ||
150 | # | ||
151 | # When the server runs non daemonized, no pid file is created if none is | ||
152 | # specified in the configuration. When the server is daemonized, the pid file | ||
153 | # is used even if not specified, defaulting to "/var/run/valkey.pid". | ||
154 | # | ||
155 | # Creating a pid file is best effort: if Redis is not able to create it | ||
156 | # nothing bad happens, the server will start and run normally. | ||
157 | |||
158 | # When running daemonized, Redis writes a pid file in /var/run/valkey.pid by | ||
159 | # default. You can specify a custom pid file location here. | ||
160 | pidfile /var/run/valkey.pid | ||
161 | |||
162 | # Specify the server verbosity level. | ||
163 | # This can be one of: | ||
164 | # debug (a lot of information, useful for development/testing) | ||
165 | # verbose (many rarely useful info, but not a mess like the debug level) | ||
166 | # notice (moderately verbose, what you want in production probably) | ||
167 | # warning (only very important / critical messages are logged) | ||
168 | loglevel notice | ||
169 | |||
170 | # Specify the log file name. Also the empty string can be used to force | ||
171 | # Redis to log on the standard output. Note that if you use standard | ||
172 | # output for logging but daemonize, logs will be sent to /dev/null | ||
173 | logfile "" | ||
174 | |||
175 | # To enable logging to the system logger, just set 'syslog-enabled' to yes, | ||
176 | # and optionally update the other syslog parameters to suit your needs. | ||
177 | syslog-enabled yes | ||
178 | |||
179 | # Specify the syslog identity. | ||
180 | syslog-ident valkey | ||
181 | |||
182 | # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. | ||
183 | # syslog-facility local0 | ||
184 | |||
185 | # Set the number of databases. The default database is DB 0, you can select | ||
186 | # a different one on a per-connection basis using SELECT <dbid> where | ||
187 | # dbid is a number between 0 and 'databases'-1 | ||
188 | databases 16 | ||
189 | |||
190 | # By default Redis shows an ASCII art logo only when started to log to the | ||
191 | # standard output and if the standard output is a TTY. Basically this means | ||
192 | # that normally a logo is displayed only in interactive sessions. | ||
193 | # | ||
194 | # However it is possible to force the pre-4.0 behavior and always show a | ||
195 | # ASCII art logo in startup logs by setting the following option to yes. | ||
196 | always-show-logo yes | ||
197 | |||
198 | ################################ SNAPSHOTTING ################################ | ||
199 | # | ||
200 | # Save the DB on disk: | ||
201 | # | ||
202 | # save <seconds> <changes> | ||
203 | # | ||
204 | # Will save the DB if both the given number of seconds and the given | ||
205 | # number of write operations against the DB occurred. | ||
206 | # | ||
207 | # In the example below the behaviour will be to save: | ||
208 | # after 900 sec (15 min) if at least 1 key changed | ||
209 | # after 300 sec (5 min) if at least 10 keys changed | ||
210 | # after 60 sec if at least 10000 keys changed | ||
211 | # | ||
212 | # Note: you can disable saving completely by commenting out all "save" lines. | ||
213 | # | ||
214 | # It is also possible to remove all the previously configured save | ||
215 | # points by adding a save directive with a single empty string argument | ||
216 | # like in the following example: | ||
217 | # | ||
218 | # save "" | ||
219 | |||
220 | #save 900 1 | ||
221 | #save 300 10 | ||
222 | #save 60 10000 | ||
223 | |||
224 | # OE: tune for a small embedded system with a limited # of keys. | ||
225 | save 120 1 | ||
226 | save 60 100 | ||
227 | save 30 1000 | ||
228 | |||
229 | # By default Redis will stop accepting writes if RDB snapshots are enabled | ||
230 | # (at least one save point) and the latest background save failed. | ||
231 | # This will make the user aware (in a hard way) that data is not persisting | ||
232 | # on disk properly, otherwise chances are that no one will notice and some | ||
233 | # disaster will happen. | ||
234 | # | ||
235 | # If the background saving process will start working again Redis will | ||
236 | # automatically allow writes again. | ||
237 | # | ||
238 | # However if you have setup your proper monitoring of the Redis server | ||
239 | # and persistence, you may want to disable this feature so that Redis will | ||
240 | # continue to work as usual even if there are problems with disk, | ||
241 | # permissions, and so forth. | ||
242 | stop-writes-on-bgsave-error yes | ||
243 | |||
244 | # Compress string objects using LZF when dump .rdb databases? | ||
245 | # For default that's set to 'yes' as it's almost always a win. | ||
246 | # If you want to save some CPU in the saving child set it to 'no' but | ||
247 | # the dataset will likely be bigger if you have compressible values or keys. | ||
248 | rdbcompression yes | ||
249 | |||
250 | # Since version 5 of RDB a CRC64 checksum is placed at the end of the file. | ||
251 | # This makes the format more resistant to corruption but there is a performance | ||
252 | # hit to pay (around 10%) when saving and loading RDB files, so you can disable it | ||
253 | # for maximum performances. | ||
254 | # | ||
255 | # RDB files created with checksum disabled have a checksum of zero that will | ||
256 | # tell the loading code to skip the check. | ||
257 | rdbchecksum yes | ||
258 | |||
259 | # The filename where to dump the DB | ||
260 | dbfilename dump.rdb | ||
261 | |||
262 | # The working directory. | ||
263 | # | ||
264 | # The DB will be written inside this directory, with the filename specified | ||
265 | # above using the 'dbfilename' configuration directive. | ||
266 | # | ||
267 | # The Append Only File will also be created inside this directory. | ||
268 | # | ||
269 | # Note that you must specify a directory here, not a file name. | ||
270 | dir /var/lib/valkey/ | ||
271 | |||
272 | ################################# REPLICATION ################################# | ||
273 | |||
274 | # Master-Slave replication. Use slaveof to make a Redis instance a copy of | ||
275 | # another Redis server. A few things to understand ASAP about Redis replication. | ||
276 | # | ||
277 | # 1) Redis replication is asynchronous, but you can configure a master to | ||
278 | # stop accepting writes if it appears to be not connected with at least | ||
279 | # a given number of slaves. | ||
280 | # 2) Redis slaves are able to perform a partial resynchronization with the | ||
281 | # master if the replication link is lost for a relatively small amount of | ||
282 | # time. You may want to configure the replication backlog size (see the next | ||
283 | # sections of this file) with a sensible value depending on your needs. | ||
284 | # 3) Replication is automatic and does not need user intervention. After a | ||
285 | # network partition slaves automatically try to reconnect to masters | ||
286 | # and resynchronize with them. | ||
287 | # | ||
288 | # slaveof <masterip> <masterport> | ||
289 | |||
290 | # If the master is password protected (using the "requirepass" configuration | ||
291 | # directive below) it is possible to tell the slave to authenticate before | ||
292 | # starting the replication synchronization process, otherwise the master will | ||
293 | # refuse the slave request. | ||
294 | # | ||
295 | # masterauth <master-password> | ||
296 | |||
297 | # When a slave loses its connection with the master, or when the replication | ||
298 | # is still in progress, the slave can act in two different ways: | ||
299 | # | ||
300 | # 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will | ||
301 | # still reply to client requests, possibly with out of date data, or the | ||
302 | # data set may just be empty if this is the first synchronization. | ||
303 | # | ||
304 | # 2) if slave-serve-stale-data is set to 'no' the slave will reply with | ||
305 | # an error "SYNC with master in progress" to all the kind of commands | ||
306 | # but to INFO and SLAVEOF. | ||
307 | # | ||
308 | slave-serve-stale-data yes | ||
309 | |||
310 | # You can configure a slave instance to accept writes or not. Writing against | ||
311 | # a slave instance may be useful to store some ephemeral data (because data | ||
312 | # written on a slave will be easily deleted after resync with the master) but | ||
313 | # may also cause problems if clients are writing to it because of a | ||
314 | # misconfiguration. | ||
315 | # | ||
316 | # Since Redis 2.6 by default slaves are read-only. | ||
317 | # | ||
318 | # Note: read only slaves are not designed to be exposed to untrusted clients | ||
319 | # on the internet. It's just a protection layer against misuse of the instance. | ||
320 | # Still a read only slave exports by default all the administrative commands | ||
321 | # such as CONFIG, DEBUG, and so forth. To a limited extent you can improve | ||
322 | # security of read only slaves using 'rename-command' to shadow all the | ||
323 | # administrative / dangerous commands. | ||
324 | slave-read-only yes | ||
325 | |||
326 | # Replication SYNC strategy: disk or socket. | ||
327 | # | ||
328 | # ------------------------------------------------------- | ||
329 | # WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY | ||
330 | # ------------------------------------------------------- | ||
331 | # | ||
332 | # New slaves and reconnecting slaves that are not able to continue the replication | ||
333 | # process just receiving differences, need to do what is called a "full | ||
334 | # synchronization". An RDB file is transmitted from the master to the slaves. | ||
335 | # The transmission can happen in two different ways: | ||
336 | # | ||
337 | # 1) Disk-backed: The Redis master creates a new process that writes the RDB | ||
338 | # file on disk. Later the file is transferred by the parent | ||
339 | # process to the slaves incrementally. | ||
340 | # 2) Diskless: The Redis master creates a new process that directly writes the | ||
341 | # RDB file to slave sockets, without touching the disk at all. | ||
342 | # | ||
343 | # With disk-backed replication, while the RDB file is generated, more slaves | ||
344 | # can be queued and served with the RDB file as soon as the current child producing | ||
345 | # the RDB file finishes its work. With diskless replication instead once | ||
346 | # the transfer starts, new slaves arriving will be queued and a new transfer | ||
347 | # will start when the current one terminates. | ||
348 | # | ||
349 | # When diskless replication is used, the master waits a configurable amount of | ||
350 | # time (in seconds) before starting the transfer in the hope that multiple slaves | ||
351 | # will arrive and the transfer can be parallelized. | ||
352 | # | ||
353 | # With slow disks and fast (large bandwidth) networks, diskless replication | ||
354 | # works better. | ||
355 | repl-diskless-sync no | ||
356 | |||
357 | # When diskless replication is enabled, it is possible to configure the delay | ||
358 | # the server waits in order to spawn the child that transfers the RDB via socket | ||
359 | # to the slaves. | ||
360 | # | ||
361 | # This is important since once the transfer starts, it is not possible to serve | ||
362 | # new slaves arriving, that will be queued for the next RDB transfer, so the server | ||
363 | # waits a delay in order to let more slaves arrive. | ||
364 | # | ||
365 | # The delay is specified in seconds, and by default is 5 seconds. To disable | ||
366 | # it entirely just set it to 0 seconds and the transfer will start ASAP. | ||
367 | repl-diskless-sync-delay 5 | ||
368 | |||
369 | # Slaves send PINGs to server in a predefined interval. It's possible to change | ||
370 | # this interval with the repl_ping_slave_period option. The default value is 10 | ||
371 | # seconds. | ||
372 | # | ||
373 | # repl-ping-slave-period 10 | ||
374 | |||
375 | # The following option sets the replication timeout for: | ||
376 | # | ||
377 | # 1) Bulk transfer I/O during SYNC, from the point of view of slave. | ||
378 | # 2) Master timeout from the point of view of slaves (data, pings). | ||
379 | # 3) Slave timeout from the point of view of masters (REPLCONF ACK pings). | ||
380 | # | ||
381 | # It is important to make sure that this value is greater than the value | ||
382 | # specified for repl-ping-slave-period otherwise a timeout will be detected | ||
383 | # every time there is low traffic between the master and the slave. | ||
384 | # | ||
385 | # repl-timeout 60 | ||
386 | |||
387 | # Disable TCP_NODELAY on the slave socket after SYNC? | ||
388 | # | ||
389 | # If you select "yes" Redis will use a smaller number of TCP packets and | ||
390 | # less bandwidth to send data to slaves. But this can add a delay for | ||
391 | # the data to appear on the slave side, up to 40 milliseconds with | ||
392 | # Linux kernels using a default configuration. | ||
393 | # | ||
394 | # If you select "no" the delay for data to appear on the slave side will | ||
395 | # be reduced but more bandwidth will be used for replication. | ||
396 | # | ||
397 | # By default we optimize for low latency, but in very high traffic conditions | ||
398 | # or when the master and slaves are many hops away, turning this to "yes" may | ||
399 | # be a good idea. | ||
400 | repl-disable-tcp-nodelay no | ||
401 | |||
402 | # Set the replication backlog size. The backlog is a buffer that accumulates | ||
403 | # slave data when slaves are disconnected for some time, so that when a slave | ||
404 | # wants to reconnect again, often a full resync is not needed, but a partial | ||
405 | # resync is enough, just passing the portion of data the slave missed while | ||
406 | # disconnected. | ||
407 | # | ||
408 | # The bigger the replication backlog, the longer the time the slave can be | ||
409 | # disconnected and later be able to perform a partial resynchronization. | ||
410 | # | ||
411 | # The backlog is only allocated once there is at least a slave connected. | ||
412 | # | ||
413 | # repl-backlog-size 1mb | ||
414 | |||
415 | # After a master has no longer connected slaves for some time, the backlog | ||
416 | # will be freed. The following option configures the amount of seconds that | ||
417 | # need to elapse, starting from the time the last slave disconnected, for | ||
418 | # the backlog buffer to be freed. | ||
419 | # | ||
420 | # Note that slaves never free the backlog for timeout, since they may be | ||
421 | # promoted to masters later, and should be able to correctly "partially | ||
422 | # resynchronize" with the slaves: hence they should always accumulate backlog. | ||
423 | # | ||
424 | # A value of 0 means to never release the backlog. | ||
425 | # | ||
426 | # repl-backlog-ttl 3600 | ||
427 | |||
428 | # The slave priority is an integer number published by Redis in the INFO output. | ||
429 | # It is used by Redis Sentinel in order to select a slave to promote into a | ||
430 | # master if the master is no longer working correctly. | ||
431 | # | ||
432 | # A slave with a low priority number is considered better for promotion, so | ||
433 | # for instance if there are three slaves with priority 10, 100, 25 Sentinel will | ||
434 | # pick the one with priority 10, that is the lowest. | ||
435 | # | ||
436 | # However a special priority of 0 marks the slave as not able to perform the | ||
437 | # role of master, so a slave with priority of 0 will never be selected by | ||
438 | # Redis Sentinel for promotion. | ||
439 | # | ||
440 | # By default the priority is 100. | ||
441 | slave-priority 100 | ||
442 | |||
443 | # It is possible for a master to stop accepting writes if there are less than | ||
444 | # N slaves connected, having a lag less or equal than M seconds. | ||
445 | # | ||
446 | # The N slaves need to be in "online" state. | ||
447 | # | ||
448 | # The lag in seconds, that must be <= the specified value, is calculated from | ||
449 | # the last ping received from the slave, that is usually sent every second. | ||
450 | # | ||
451 | # This option does not GUARANTEE that N replicas will accept the write, but | ||
452 | # will limit the window of exposure for lost writes in case not enough slaves | ||
453 | # are available, to the specified number of seconds. | ||
454 | # | ||
455 | # For example to require at least 3 slaves with a lag <= 10 seconds use: | ||
456 | # | ||
457 | # min-slaves-to-write 3 | ||
458 | # min-slaves-max-lag 10 | ||
459 | # | ||
460 | # Setting one or the other to 0 disables the feature. | ||
461 | # | ||
462 | # By default min-slaves-to-write is set to 0 (feature disabled) and | ||
463 | # min-slaves-max-lag is set to 10. | ||
464 | |||
465 | # A Redis master is able to list the address and port of the attached | ||
466 | # slaves in different ways. For example the "INFO replication" section | ||
467 | # offers this information, which is used, among other tools, by | ||
468 | # Redis Sentinel in order to discover slave instances. | ||
469 | # Another place where this info is available is in the output of the | ||
470 | # "ROLE" command of a master. | ||
471 | # | ||
472 | # The listed IP and address normally reported by a slave is obtained | ||
473 | # in the following way: | ||
474 | # | ||
475 | # IP: The address is auto detected by checking the peer address | ||
476 | # of the socket used by the slave to connect with the master. | ||
477 | # | ||
478 | # Port: The port is communicated by the slave during the replication | ||
479 | # handshake, and is normally the port that the slave is using to | ||
480 | # list for connections. | ||
481 | # | ||
482 | # However when port forwarding or Network Address Translation (NAT) is | ||
483 | # used, the slave may be actually reachable via different IP and port | ||
484 | # pairs. The following two options can be used by a slave in order to | ||
485 | # report to its master a specific set of IP and port, so that both INFO | ||
486 | # and ROLE will report those values. | ||
487 | # | ||
488 | # There is no need to use both the options if you need to override just | ||
489 | # the port or the IP address. | ||
490 | # | ||
491 | # slave-announce-ip 5.5.5.5 | ||
492 | # slave-announce-port 1234 | ||
493 | |||
494 | ################################## SECURITY ################################### | ||
495 | |||
496 | # Require clients to issue AUTH <PASSWORD> before processing any other | ||
497 | # commands. This might be useful in environments in which you do not trust | ||
498 | # others with access to the host running valkey-server. | ||
499 | # | ||
500 | # This should stay commented out for backward compatibility and because most | ||
501 | # people do not need auth (e.g. they run their own servers). | ||
502 | # | ||
503 | # Warning: since Redis is pretty fast an outside user can try up to | ||
504 | # 150k passwords per second against a good box. This means that you should | ||
505 | # use a very strong password otherwise it will be very easy to break. | ||
506 | # | ||
507 | # requirepass foobared | ||
508 | |||
509 | # Command renaming. | ||
510 | # | ||
511 | # It is possible to change the name of dangerous commands in a shared | ||
512 | # environment. For instance the CONFIG command may be renamed into something | ||
513 | # hard to guess so that it will still be available for internal-use tools | ||
514 | # but not available for general clients. | ||
515 | # | ||
516 | # Example: | ||
517 | # | ||
518 | # rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52 | ||
519 | # | ||
520 | # It is also possible to completely kill a command by renaming it into | ||
521 | # an empty string: | ||
522 | # | ||
523 | # rename-command CONFIG "" | ||
524 | # | ||
525 | # Please note that changing the name of commands that are logged into the | ||
526 | # AOF file or transmitted to slaves may cause problems. | ||
527 | |||
528 | ################################### CLIENTS #################################### | ||
529 | |||
530 | # Set the max number of connected clients at the same time. By default | ||
531 | # this limit is set to 10000 clients, however if the Redis server is not | ||
532 | # able to configure the process file limit to allow for the specified limit | ||
533 | # the max number of allowed clients is set to the current file limit | ||
534 | # minus 32 (as Redis reserves a few file descriptors for internal uses). | ||
535 | # | ||
536 | # Once the limit is reached Redis will close all the new connections sending | ||
537 | # an error 'max number of clients reached'. | ||
538 | # | ||
539 | # maxclients 10000 | ||
540 | |||
541 | ############################## MEMORY MANAGEMENT ################################ | ||
542 | |||
543 | # Set a memory usage limit to the specified amount of bytes. | ||
544 | # When the memory limit is reached Redis will try to remove keys | ||
545 | # according to the eviction policy selected (see maxmemory-policy). | ||
546 | # | ||
547 | # If Redis can't remove keys according to the policy, or if the policy is | ||
548 | # set to 'noeviction', Redis will start to reply with errors to commands | ||
549 | # that would use more memory, like SET, LPUSH, and so on, and will continue | ||
550 | # to reply to read-only commands like GET. | ||
551 | # | ||
552 | # This option is usually useful when using Redis as an LRU or LFU cache, or to | ||
553 | # set a hard memory limit for an instance (using the 'noeviction' policy). | ||
554 | # | ||
555 | # WARNING: If you have slaves attached to an instance with maxmemory on, | ||
556 | # the size of the output buffers needed to feed the slaves are subtracted | ||
557 | # from the used memory count, so that network problems / resyncs will | ||
558 | # not trigger a loop where keys are evicted, and in turn the output | ||
559 | # buffer of slaves is full with DELs of keys evicted triggering the deletion | ||
560 | # of more keys, and so forth until the database is completely emptied. | ||
561 | # | ||
562 | # In short... if you have slaves attached it is suggested that you set a lower | ||
563 | # limit for maxmemory so that there is some free RAM on the system for slave | ||
564 | # output buffers (but this is not needed if the policy is 'noeviction'). | ||
565 | # | ||
566 | # maxmemory <bytes> | ||
567 | |||
568 | # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory | ||
569 | # is reached. You can select among five behaviors: | ||
570 | # | ||
571 | # volatile-lru -> Evict using approximated LRU among the keys with an expire set. | ||
572 | # allkeys-lru -> Evict any key using approximated LRU. | ||
573 | # volatile-lfu -> Evict using approximated LFU among the keys with an expire set. | ||
574 | # allkeys-lfu -> Evict any key using approximated LFU. | ||
575 | # volatile-random -> Remove a random key among the ones with an expire set. | ||
576 | # allkeys-random -> Remove a random key, any key. | ||
577 | # volatile-ttl -> Remove the key with the nearest expire time (minor TTL) | ||
578 | # noeviction -> Don't evict anything, just return an error on write operations. | ||
579 | # | ||
580 | # LRU means Least Recently Used | ||
581 | # LFU means Least Frequently Used | ||
582 | # | ||
583 | # Both LRU, LFU and volatile-ttl are implemented using approximated | ||
584 | # randomized algorithms. | ||
585 | # | ||
586 | # Note: with any of the above policies, Redis will return an error on write | ||
587 | # operations, when there are no suitable keys for eviction. | ||
588 | # | ||
589 | # At the date of writing these commands are: set setnx setex append | ||
590 | # incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd | ||
591 | # sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby | ||
592 | # zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby | ||
593 | # getset mset msetnx exec sort | ||
594 | # | ||
595 | # The default is: | ||
596 | # | ||
597 | # maxmemory-policy noeviction | ||
598 | |||
599 | # LRU, LFU and minimal TTL algorithms are not precise algorithms but approximated | ||
600 | # algorithms (in order to save memory), so you can tune it for speed or | ||
601 | # accuracy. For default Redis will check five keys and pick the one that was | ||
602 | # used less recently, you can change the sample size using the following | ||
603 | # configuration directive. | ||
604 | # | ||
605 | # The default of 5 produces good enough results. 10 Approximates very closely | ||
606 | # true LRU but costs more CPU. 3 is faster but not very accurate. | ||
607 | # | ||
608 | # maxmemory-samples 5 | ||
609 | |||
610 | ############################# LAZY FREEING #################################### | ||
611 | |||
612 | # Redis has two primitives to delete keys. One is called DEL and is a blocking | ||
613 | # deletion of the object. It means that the server stops processing new commands | ||
614 | # in order to reclaim all the memory associated with an object in a synchronous | ||
615 | # way. If the key deleted is associated with a small object, the time needed | ||
616 | # in order to execute the DEL command is very small and comparable to most other | ||
617 | # O(1) or O(log_N) commands in Redis. However if the key is associated with an | ||
618 | # aggregated value containing millions of elements, the server can block for | ||
619 | # a long time (even seconds) in order to complete the operation. | ||
620 | # | ||
621 | # For the above reasons Redis also offers non blocking deletion primitives | ||
622 | # such as UNLINK (non blocking DEL) and the ASYNC option of FLUSHALL and | ||
623 | # FLUSHDB commands, in order to reclaim memory in background. Those commands | ||
624 | # are executed in constant time. Another thread will incrementally free the | ||
625 | # object in the background as fast as possible. | ||
626 | # | ||
627 | # DEL, UNLINK and ASYNC option of FLUSHALL and FLUSHDB are user-controlled. | ||
628 | # It's up to the design of the application to understand when it is a good | ||
629 | # idea to use one or the other. However the Redis server sometimes has to | ||
630 | # delete keys or flush the whole database as a side effect of other operations. | ||
631 | # Specifically Redis deletes objects independently of a user call in the | ||
632 | # following scenarios: | ||
633 | # | ||
634 | # 1) On eviction, because of the maxmemory and maxmemory policy configurations, | ||
635 | # in order to make room for new data, without going over the specified | ||
636 | # memory limit. | ||
637 | # 2) Because of expire: when a key with an associated time to live (see the | ||
638 | # EXPIRE command) must be deleted from memory. | ||
639 | # 3) Because of a side effect of a command that stores data on a key that may | ||
640 | # already exist. For example the RENAME command may delete the old key | ||
641 | # content when it is replaced with another one. Similarly SUNIONSTORE | ||
642 | # or SORT with STORE option may delete existing keys. The SET command | ||
643 | # itself removes any old content of the specified key in order to replace | ||
644 | # it with the specified string. | ||
645 | # 4) During replication, when a slave performs a full resynchronization with | ||
646 | # its master, the content of the whole database is removed in order to | ||
647 | # load the RDB file just transfered. | ||
648 | # | ||
649 | # In all the above cases the default is to delete objects in a blocking way, | ||
650 | # like if DEL was called. However you can configure each case specifically | ||
651 | # in order to instead release memory in a non-blocking way like if UNLINK | ||
652 | # was called, using the following configuration directives: | ||
653 | |||
654 | lazyfree-lazy-eviction no | ||
655 | lazyfree-lazy-expire no | ||
656 | lazyfree-lazy-server-del no | ||
657 | slave-lazy-flush no | ||
658 | |||
659 | ############################## APPEND ONLY MODE ############################### | ||
660 | |||
661 | # By default Redis asynchronously dumps the dataset on disk. This mode is | ||
662 | # good enough in many applications, but an issue with the Redis process or | ||
663 | # a power outage may result into a few minutes of writes lost (depending on | ||
664 | # the configured save points). | ||
665 | # | ||
666 | # The Append Only File is an alternative persistence mode that provides | ||
667 | # much better durability. For instance using the default data fsync policy | ||
668 | # (see later in the config file) Redis can lose just one second of writes in a | ||
669 | # dramatic event like a server power outage, or a single write if something | ||
670 | # wrong with the Redis process itself happens, but the operating system is | ||
671 | # still running correctly. | ||
672 | # | ||
673 | # AOF and RDB persistence can be enabled at the same time without problems. | ||
674 | # If the AOF is enabled on startup Redis will load the AOF, that is the file | ||
675 | # with the better durability guarantees. | ||
676 | # | ||
677 | # Please check http://valkey.io/topics/persistence for more information. | ||
678 | |||
679 | # OE: changed default to enable this | ||
680 | appendonly yes | ||
681 | |||
682 | # The name of the append only file (default: "appendonly.aof") | ||
683 | |||
684 | appendfilename "appendonly.aof" | ||
685 | |||
686 | # The fsync() call tells the Operating System to actually write data on disk | ||
687 | # instead of waiting for more data in the output buffer. Some OS will really flush | ||
688 | # data on disk, some other OS will just try to do it ASAP. | ||
689 | # | ||
690 | # Redis supports three different modes: | ||
691 | # | ||
692 | # no: don't fsync, just let the OS flush the data when it wants. Faster. | ||
693 | # always: fsync after every write to the append only log. Slow, Safest. | ||
694 | # everysec: fsync only one time every second. Compromise. | ||
695 | # | ||
696 | # The default is "everysec", as that's usually the right compromise between | ||
697 | # speed and data safety. It's up to you to understand if you can relax this to | ||
698 | # "no" that will let the operating system flush the output buffer when | ||
699 | # it wants, for better performances (but if you can live with the idea of | ||
700 | # some data loss consider the default persistence mode that's snapshotting), | ||
701 | # or on the contrary, use "always" that's very slow but a bit safer than | ||
702 | # everysec. | ||
703 | # | ||
704 | # More details please check the following article: | ||
705 | # http://antirez.com/post/valkey-persistence-demystified.html | ||
706 | # | ||
707 | # If unsure, use "everysec". | ||
708 | |||
709 | # appendfsync always | ||
710 | appendfsync everysec | ||
711 | # appendfsync no | ||
712 | |||
713 | # When the AOF fsync policy is set to always or everysec, and a background | ||
714 | # saving process (a background save or AOF log background rewriting) is | ||
715 | # performing a lot of I/O against the disk, in some Linux configurations | ||
716 | # Redis may block too long on the fsync() call. Note that there is no fix for | ||
717 | # this currently, as even performing fsync in a different thread will block | ||
718 | # our synchronous write(2) call. | ||
719 | # | ||
720 | # In order to mitigate this problem it's possible to use the following option | ||
721 | # that will prevent fsync() from being called in the main process while a | ||
722 | # BGSAVE or BGREWRITEAOF is in progress. | ||
723 | # | ||
724 | # This means that while another child is saving, the durability of Redis is | ||
725 | # the same as "appendfsync none". In practical terms, this means that it is | ||
726 | # possible to lose up to 30 seconds of log in the worst scenario (with the | ||
727 | # default Linux settings). | ||
728 | # | ||
729 | # If you have latency problems turn this to "yes". Otherwise leave it as | ||
730 | # "no" that is the safest pick from the point of view of durability. | ||
731 | |||
732 | no-appendfsync-on-rewrite no | ||
733 | |||
734 | # Automatic rewrite of the append only file. | ||
735 | # Redis is able to automatically rewrite the log file implicitly calling | ||
736 | # BGREWRITEAOF when the AOF log size grows by the specified percentage. | ||
737 | # | ||
738 | # This is how it works: Redis remembers the size of the AOF file after the | ||
739 | # latest rewrite (if no rewrite has happened since the restart, the size of | ||
740 | # the AOF at startup is used). | ||
741 | # | ||
742 | # This base size is compared to the current size. If the current size is | ||
743 | # bigger than the specified percentage, the rewrite is triggered. Also | ||
744 | # you need to specify a minimal size for the AOF file to be rewritten, this | ||
745 | # is useful to avoid rewriting the AOF file even if the percentage increase | ||
746 | # is reached but it is still pretty small. | ||
747 | # | ||
748 | # Specify a percentage of zero in order to disable the automatic AOF | ||
749 | # rewrite feature. | ||
750 | |||
751 | auto-aof-rewrite-percentage 100 | ||
752 | auto-aof-rewrite-min-size 64mb | ||
753 | |||
754 | # An AOF file may be found to be truncated at the end during the Redis | ||
755 | # startup process, when the AOF data gets loaded back into memory. | ||
756 | # This may happen when the system where Redis is running | ||
757 | # crashes, especially when an ext4 filesystem is mounted without the | ||
758 | # data=ordered option (however this can't happen when Redis itself | ||
759 | # crashes or aborts but the operating system still works correctly). | ||
760 | # | ||
761 | # Redis can either exit with an error when this happens, or load as much | ||
762 | # data as possible (the default now) and start if the AOF file is found | ||
763 | # to be truncated at the end. The following option controls this behavior. | ||
764 | # | ||
765 | # If aof-load-truncated is set to yes, a truncated AOF file is loaded and | ||
766 | # the Redis server starts emitting a log to inform the user of the event. | ||
767 | # Otherwise if the option is set to no, the server aborts with an error | ||
768 | # and refuses to start. When the option is set to no, the user requires | ||
769 | # to fix the AOF file using the "valkey-check-aof" utility before to restart | ||
770 | # the server. | ||
771 | # | ||
772 | # Note that if the AOF file will be found to be corrupted in the middle | ||
773 | # the server will still exit with an error. This option only applies when | ||
774 | # Redis will try to read more data from the AOF file but not enough bytes | ||
775 | # will be found. | ||
776 | aof-load-truncated yes | ||
777 | |||
778 | # When rewriting the AOF file, Redis is able to use an RDB preamble in the | ||
779 | # AOF file for faster rewrites and recoveries. When this option is turned | ||
780 | # on the rewritten AOF file is composed of two different stanzas: | ||
781 | # | ||
782 | # [RDB file][AOF tail] | ||
783 | # | ||
784 | # When loading Redis recognizes that the AOF file starts with the "REDIS" | ||
785 | # string and loads the prefixed RDB file, and continues loading the AOF | ||
786 | # tail. | ||
787 | # | ||
788 | # This is currently turned off by default in order to avoid the surprise | ||
789 | # of a format change, but will at some point be used as the default. | ||
790 | aof-use-rdb-preamble no | ||
791 | |||
792 | ################################ LUA SCRIPTING ############################### | ||
793 | |||
794 | # Max execution time of a Lua script in milliseconds. | ||
795 | # | ||
796 | # If the maximum execution time is reached Redis will log that a script is | ||
797 | # still in execution after the maximum allowed time and will start to | ||
798 | # reply to queries with an error. | ||
799 | # | ||
800 | # When a long running script exceeds the maximum execution time only the | ||
801 | # SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be | ||
802 | # used to stop a script that did not yet called write commands. The second | ||
803 | # is the only way to shut down the server in the case a write command was | ||
804 | # already issued by the script but the user doesn't want to wait for the natural | ||
805 | # termination of the script. | ||
806 | # | ||
807 | # Set it to 0 or a negative value for unlimited execution without warnings. | ||
808 | lua-time-limit 5000 | ||
809 | |||
810 | ################################ REDIS CLUSTER ############################### | ||
811 | # | ||
812 | # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
813 | # WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however | ||
814 | # in order to mark it as "mature" we need to wait for a non trivial percentage | ||
815 | # of users to deploy it in production. | ||
816 | # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
817 | # | ||
818 | # Normal Redis instances can't be part of a Redis Cluster; only nodes that are | ||
819 | # started as cluster nodes can. In order to start a Redis instance as a | ||
820 | # cluster node enable the cluster support uncommenting the following: | ||
821 | # | ||
822 | # cluster-enabled yes | ||
823 | |||
824 | # Every cluster node has a cluster configuration file. This file is not | ||
825 | # intended to be edited by hand. It is created and updated by Redis nodes. | ||
826 | # Every Redis Cluster node requires a different cluster configuration file. | ||
827 | # Make sure that instances running in the same system do not have | ||
828 | # overlapping cluster configuration file names. | ||
829 | # | ||
830 | # cluster-config-file nodes-6379.conf | ||
831 | |||
832 | # Cluster node timeout is the amount of milliseconds a node must be unreachable | ||
833 | # for it to be considered in failure state. | ||
834 | # Most other internal time limits are multiple of the node timeout. | ||
835 | # | ||
836 | # cluster-node-timeout 15000 | ||
837 | |||
838 | # A slave of a failing master will avoid to start a failover if its data | ||
839 | # looks too old. | ||
840 | # | ||
841 | # There is no simple way for a slave to actually have an exact measure of | ||
842 | # its "data age", so the following two checks are performed: | ||
843 | # | ||
844 | # 1) If there are multiple slaves able to failover, they exchange messages | ||
845 | # in order to try to give an advantage to the slave with the best | ||
846 | # replication offset (more data from the master processed). | ||
847 | # Slaves will try to get their rank by offset, and apply to the start | ||
848 | # of the failover a delay proportional to their rank. | ||
849 | # | ||
850 | # 2) Every single slave computes the time of the last interaction with | ||
851 | # its master. This can be the last ping or command received (if the master | ||
852 | # is still in the "connected" state), or the time that elapsed since the | ||
853 | # disconnection with the master (if the replication link is currently down). | ||
854 | # If the last interaction is too old, the slave will not try to failover | ||
855 | # at all. | ||
856 | # | ||
857 | # The point "2" can be tuned by user. Specifically a slave will not perform | ||
858 | # the failover if, since the last interaction with the master, the time | ||
859 | # elapsed is greater than: | ||
860 | # | ||
861 | # (node-timeout * slave-validity-factor) + repl-ping-slave-period | ||
862 | # | ||
863 | # So for example if node-timeout is 30 seconds, and the slave-validity-factor | ||
864 | # is 10, and assuming a default repl-ping-slave-period of 10 seconds, the | ||
865 | # slave will not try to failover if it was not able to talk with the master | ||
866 | # for longer than 310 seconds. | ||
867 | # | ||
868 | # A large slave-validity-factor may allow slaves with too old data to failover | ||
869 | # a master, while a too small value may prevent the cluster from being able to | ||
870 | # elect a slave at all. | ||
871 | # | ||
872 | # For maximum availability, it is possible to set the slave-validity-factor | ||
873 | # to a value of 0, which means, that slaves will always try to failover the | ||
874 | # master regardless of the last time they interacted with the master. | ||
875 | # (However they'll always try to apply a delay proportional to their | ||
876 | # offset rank). | ||
877 | # | ||
878 | # Zero is the only value able to guarantee that when all the partitions heal | ||
879 | # the cluster will always be able to continue. | ||
880 | # | ||
881 | # cluster-slave-validity-factor 10 | ||
882 | |||
883 | # Cluster slaves are able to migrate to orphaned masters, that are masters | ||
884 | # that are left without working slaves. This improves the cluster ability | ||
885 | # to resist to failures as otherwise an orphaned master can't be failed over | ||
886 | # in case of failure if it has no working slaves. | ||
887 | # | ||
888 | # Slaves migrate to orphaned masters only if there are still at least a | ||
889 | # given number of other working slaves for their old master. This number | ||
890 | # is the "migration barrier". A migration barrier of 1 means that a slave | ||
891 | # will migrate only if there is at least 1 other working slave for its master | ||
892 | # and so forth. It usually reflects the number of slaves you want for every | ||
893 | # master in your cluster. | ||
894 | # | ||
895 | # Default is 1 (slaves migrate only if their masters remain with at least | ||
896 | # one slave). To disable migration just set it to a very large value. | ||
897 | # A value of 0 can be set but is useful only for debugging and dangerous | ||
898 | # in production. | ||
899 | # | ||
900 | # cluster-migration-barrier 1 | ||
901 | |||
902 | # By default Redis Cluster nodes stop accepting queries if they detect there | ||
903 | # is at least an hash slot uncovered (no available node is serving it). | ||
904 | # This way if the cluster is partially down (for example a range of hash slots | ||
905 | # are no longer covered) all the cluster becomes, eventually, unavailable. | ||
906 | # It automatically returns available as soon as all the slots are covered again. | ||
907 | # | ||
908 | # However sometimes you want the subset of the cluster which is working, | ||
909 | # to continue to accept queries for the part of the key space that is still | ||
910 | # covered. In order to do so, just set the cluster-require-full-coverage | ||
911 | # option to no. | ||
912 | # | ||
913 | # cluster-require-full-coverage yes | ||
914 | |||
915 | # In order to setup your cluster make sure to read the documentation | ||
916 | # available at http://valkey.io web site. | ||
917 | |||
918 | ########################## CLUSTER DOCKER/NAT support ######################## | ||
919 | |||
920 | # In certain deployments, Redis Cluster nodes address discovery fails, because | ||
921 | # addresses are NAT-ted or because ports are forwarded (the typical case is | ||
922 | # Docker and other containers). | ||
923 | # | ||
924 | # In order to make Redis Cluster working in such environments, a static | ||
925 | # configuration where each node knows its public address is needed. The | ||
926 | # following two options are used for this scope, and are: | ||
927 | # | ||
928 | # * cluster-announce-ip | ||
929 | # * cluster-announce-port | ||
930 | # * cluster-announce-bus-port | ||
931 | # | ||
932 | # Each instruct the node about its address, client port, and cluster message | ||
933 | # bus port. The information is then published in the header of the bus packets | ||
934 | # so that other nodes will be able to correctly map the address of the node | ||
935 | # publishing the information. | ||
936 | # | ||
937 | # If the above options are not used, the normal Redis Cluster auto-detection | ||
938 | # will be used instead. | ||
939 | # | ||
940 | # Note that when remapped, the bus port may not be at the fixed offset of | ||
941 | # clients port + 10000, so you can specify any port and bus-port depending | ||
942 | # on how they get remapped. If the bus-port is not set, a fixed offset of | ||
943 | # 10000 will be used as usually. | ||
944 | # | ||
945 | # Example: | ||
946 | # | ||
947 | # cluster-announce-ip 10.1.1.5 | ||
948 | # cluster-announce-port 6379 | ||
949 | # cluster-announce-bus-port 6380 | ||
950 | |||
951 | ################################## SLOW LOG ################################### | ||
952 | |||
953 | # The Redis Slow Log is a system to log queries that exceeded a specified | ||
954 | # execution time. The execution time does not include the I/O operations | ||
955 | # like talking with the client, sending the reply and so forth, | ||
956 | # but just the time needed to actually execute the command (this is the only | ||
957 | # stage of command execution where the thread is blocked and can not serve | ||
958 | # other requests in the meantime). | ||
959 | # | ||
960 | # You can configure the slow log with two parameters: one tells Redis | ||
961 | # what is the execution time, in microseconds, to exceed in order for the | ||
962 | # command to get logged, and the other parameter is the length of the | ||
963 | # slow log. When a new command is logged the oldest one is removed from the | ||
964 | # queue of logged commands. | ||
965 | |||
966 | # The following time is expressed in microseconds, so 1000000 is equivalent | ||
967 | # to one second. Note that a negative number disables the slow log, while | ||
968 | # a value of zero forces the logging of every command. | ||
969 | slowlog-log-slower-than 10000 | ||
970 | |||
971 | # There is no limit to this length. Just be aware that it will consume memory. | ||
972 | # You can reclaim memory used by the slow log with SLOWLOG RESET. | ||
973 | slowlog-max-len 128 | ||
974 | |||
975 | ################################ LATENCY MONITOR ############################## | ||
976 | |||
977 | # The Redis latency monitoring subsystem samples different operations | ||
978 | # at runtime in order to collect data related to possible sources of | ||
979 | # latency of a Redis instance. | ||
980 | # | ||
981 | # Via the LATENCY command this information is available to the user that can | ||
982 | # print graphs and obtain reports. | ||
983 | # | ||
984 | # The system only logs operations that were performed in a time equal or | ||
985 | # greater than the amount of milliseconds specified via the | ||
986 | # latency-monitor-threshold configuration directive. When its value is set | ||
987 | # to zero, the latency monitor is turned off. | ||
988 | # | ||
989 | # By default latency monitoring is disabled since it is mostly not needed | ||
990 | # if you don't have latency issues, and collecting data has a performance | ||
991 | # impact, that while very small, can be measured under big load. Latency | ||
992 | # monitoring can easily be enabled at runtime using the command | ||
993 | # "CONFIG SET latency-monitor-threshold <milliseconds>" if needed. | ||
994 | latency-monitor-threshold 0 | ||
995 | |||
996 | ############################# EVENT NOTIFICATION ############################## | ||
997 | |||
998 | # Redis can notify Pub/Sub clients about events happening in the key space. | ||
999 | # This feature is documented at http://valkey.io/topics/notifications | ||
1000 | # | ||
1001 | # For instance if keyspace events notification is enabled, and a client | ||
1002 | # performs a DEL operation on key "foo" stored in the Database 0, two | ||
1003 | # messages will be published via Pub/Sub: | ||
1004 | # | ||
1005 | # PUBLISH __keyspace@0__:foo del | ||
1006 | # PUBLISH __keyevent@0__:del foo | ||
1007 | # | ||
1008 | # It is possible to select the events that Redis will notify among a set | ||
1009 | # of classes. Every class is identified by a single character: | ||
1010 | # | ||
1011 | # K Keyspace events, published with __keyspace@<db>__ prefix. | ||
1012 | # E Keyevent events, published with __keyevent@<db>__ prefix. | ||
1013 | # g Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ... | ||
1014 | # $ String commands | ||
1015 | # l List commands | ||
1016 | # s Set commands | ||
1017 | # h Hash commands | ||
1018 | # z Sorted set commands | ||
1019 | # x Expired events (events generated every time a key expires) | ||
1020 | # e Evicted events (events generated when a key is evicted for maxmemory) | ||
1021 | # A Alias for g$lshzxe, so that the "AKE" string means all the events. | ||
1022 | # | ||
1023 | # The "notify-keyspace-events" takes as argument a string that is composed | ||
1024 | # of zero or multiple characters. The empty string means that notifications | ||
1025 | # are disabled. | ||
1026 | # | ||
1027 | # Example: to enable list and generic events, from the point of view of the | ||
1028 | # event name, use: | ||
1029 | # | ||
1030 | # notify-keyspace-events Elg | ||
1031 | # | ||
1032 | # Example 2: to get the stream of the expired keys subscribing to channel | ||
1033 | # name __keyevent@0__:expired use: | ||
1034 | # | ||
1035 | # notify-keyspace-events Ex | ||
1036 | # | ||
1037 | # By default all notifications are disabled because most users don't need | ||
1038 | # this feature and the feature has some overhead. Note that if you don't | ||
1039 | # specify at least one of K or E, no events will be delivered. | ||
1040 | notify-keyspace-events "" | ||
1041 | |||
1042 | ############################### ADVANCED CONFIG ############################### | ||
1043 | |||
1044 | # Hashes are encoded using a memory efficient data structure when they have a | ||
1045 | # small number of entries, and the biggest entry does not exceed a given | ||
1046 | # threshold. These thresholds can be configured using the following directives. | ||
1047 | hash-max-ziplist-entries 512 | ||
1048 | hash-max-ziplist-value 64 | ||
1049 | |||
1050 | # Lists are also encoded in a special way to save a lot of space. | ||
1051 | # The number of entries allowed per internal list node can be specified | ||
1052 | # as a fixed maximum size or a maximum number of elements. | ||
1053 | # For a fixed maximum size, use -5 through -1, meaning: | ||
1054 | # -5: max size: 64 Kb <-- not recommended for normal workloads | ||
1055 | # -4: max size: 32 Kb <-- not recommended | ||
1056 | # -3: max size: 16 Kb <-- probably not recommended | ||
1057 | # -2: max size: 8 Kb <-- good | ||
1058 | # -1: max size: 4 Kb <-- good | ||
1059 | # Positive numbers mean store up to _exactly_ that number of elements | ||
1060 | # per list node. | ||
1061 | # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size), | ||
1062 | # but if your use case is unique, adjust the settings as necessary. | ||
1063 | list-max-ziplist-size -2 | ||
1064 | |||
1065 | # Lists may also be compressed. | ||
1066 | # Compress depth is the number of quicklist ziplist nodes from *each* side of | ||
1067 | # the list to *exclude* from compression. The head and tail of the list | ||
1068 | # are always uncompressed for fast push/pop operations. Settings are: | ||
1069 | # 0: disable all list compression | ||
1070 | # 1: depth 1 means "don't start compressing until after 1 node into the list, | ||
1071 | # going from either the head or tail" | ||
1072 | # So: [head]->node->node->...->node->[tail] | ||
1073 | # [head], [tail] will always be uncompressed; inner nodes will compress. | ||
1074 | # 2: [head]->[next]->node->node->...->node->[prev]->[tail] | ||
1075 | # 2 here means: don't compress head or head->next or tail->prev or tail, | ||
1076 | # but compress all nodes between them. | ||
1077 | # 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail] | ||
1078 | # etc. | ||
1079 | list-compress-depth 0 | ||
1080 | |||
1081 | # Sets have a special encoding in just one case: when a set is composed | ||
1082 | # of just strings that happen to be integers in radix 10 in the range | ||
1083 | # of 64 bit signed integers. | ||
1084 | # The following configuration setting sets the limit in the size of the | ||
1085 | # set in order to use this special memory saving encoding. | ||
1086 | set-max-intset-entries 512 | ||
1087 | |||
1088 | # Similarly to hashes and lists, sorted sets are also specially encoded in | ||
1089 | # order to save a lot of space. This encoding is only used when the length and | ||
1090 | # elements of a sorted set are below the following limits: | ||
1091 | zset-max-ziplist-entries 128 | ||
1092 | zset-max-ziplist-value 64 | ||
1093 | |||
1094 | # HyperLogLog sparse representation bytes limit. The limit includes the | ||
1095 | # 16 bytes header. When an HyperLogLog using the sparse representation crosses | ||
1096 | # this limit, it is converted into the dense representation. | ||
1097 | # | ||
1098 | # A value greater than 16000 is totally useless, since at that point the | ||
1099 | # dense representation is more memory efficient. | ||
1100 | # | ||
1101 | # The suggested value is ~ 3000 in order to have the benefits of | ||
1102 | # the space efficient encoding without slowing down too much PFADD, | ||
1103 | # which is O(N) with the sparse encoding. The value can be raised to | ||
1104 | # ~ 10000 when CPU is not a concern, but space is, and the data set is | ||
1105 | # composed of many HyperLogLogs with cardinality in the 0 - 15000 range. | ||
1106 | hll-sparse-max-bytes 3000 | ||
1107 | |||
1108 | # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in | ||
1109 | # order to help rehashing the main Redis hash table (the one mapping top-level | ||
1110 | # keys to values). The hash table implementation Redis uses (see dict.c) | ||
1111 | # performs a lazy rehashing: the more operation you run into a hash table | ||
1112 | # that is rehashing, the more rehashing "steps" are performed, so if the | ||
1113 | # server is idle the rehashing is never complete and some more memory is used | ||
1114 | # by the hash table. | ||
1115 | # | ||
1116 | # The default is to use this millisecond 10 times every second in order to | ||
1117 | # actively rehash the main dictionaries, freeing memory when possible. | ||
1118 | # | ||
1119 | # If unsure: | ||
1120 | # use "activerehashing no" if you have hard latency requirements and it is | ||
1121 | # not a good thing in your environment that Redis can reply from time to time | ||
1122 | # to queries with 2 milliseconds delay. | ||
1123 | # | ||
1124 | # use "activerehashing yes" if you don't have such hard requirements but | ||
1125 | # want to free memory asap when possible. | ||
1126 | activerehashing yes | ||
1127 | |||
1128 | # The client output buffer limits can be used to force disconnection of clients | ||
1129 | # that are not reading data from the server fast enough for some reason (a | ||
1130 | # common reason is that a Pub/Sub client can't consume messages as fast as the | ||
1131 | # publisher can produce them). | ||
1132 | # | ||
1133 | # The limit can be set differently for the three different classes of clients: | ||
1134 | # | ||
1135 | # normal -> normal clients including MONITOR clients | ||
1136 | # slave -> slave clients | ||
1137 | # pubsub -> clients subscribed to at least one pubsub channel or pattern | ||
1138 | # | ||
1139 | # The syntax of every client-output-buffer-limit directive is the following: | ||
1140 | # | ||
1141 | # client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds> | ||
1142 | # | ||
1143 | # A client is immediately disconnected once the hard limit is reached, or if | ||
1144 | # the soft limit is reached and remains reached for the specified number of | ||
1145 | # seconds (continuously). | ||
1146 | # So for instance if the hard limit is 32 megabytes and the soft limit is | ||
1147 | # 16 megabytes / 10 seconds, the client will get disconnected immediately | ||
1148 | # if the size of the output buffers reach 32 megabytes, but will also get | ||
1149 | # disconnected if the client reaches 16 megabytes and continuously overcomes | ||
1150 | # the limit for 10 seconds. | ||
1151 | # | ||
1152 | # By default normal clients are not limited because they don't receive data | ||
1153 | # without asking (in a push way), but just after a request, so only | ||
1154 | # asynchronous clients may create a scenario where data is requested faster | ||
1155 | # than it can read. | ||
1156 | # | ||
1157 | # Instead there is a default limit for pubsub and slave clients, since | ||
1158 | # subscribers and slaves receive data in a push fashion. | ||
1159 | # | ||
1160 | # Both the hard or the soft limit can be disabled by setting them to zero. | ||
1161 | client-output-buffer-limit normal 0 0 0 | ||
1162 | client-output-buffer-limit slave 256mb 64mb 60 | ||
1163 | client-output-buffer-limit pubsub 32mb 8mb 60 | ||
1164 | |||
1165 | # Client query buffers accumulate new commands. They are limited to a fixed | ||
1166 | # amount by default in order to avoid that a protocol desynchronization (for | ||
1167 | # instance due to a bug in the client) will lead to unbound memory usage in | ||
1168 | # the query buffer. However you can configure it here if you have very special | ||
1169 | # needs, such us huge multi/exec requests or alike. | ||
1170 | # | ||
1171 | # client-query-buffer-limit 1gb | ||
1172 | |||
1173 | # In the Redis protocol, bulk requests, that are, elements representing single | ||
1174 | # strings, are normally limited ot 512 mb. However you can change this limit | ||
1175 | # here. | ||
1176 | # | ||
1177 | # proto-max-bulk-len 512mb | ||
1178 | |||
1179 | # Redis calls an internal function to perform many background tasks, like | ||
1180 | # closing connections of clients in timeout, purging expired keys that are | ||
1181 | # never requested, and so forth. | ||
1182 | # | ||
1183 | # Not all tasks are performed with the same frequency, but Redis checks for | ||
1184 | # tasks to perform according to the specified "hz" value. | ||
1185 | # | ||
1186 | # By default "hz" is set to 10. Raising the value will use more CPU when | ||
1187 | # Redis is idle, but at the same time will make Redis more responsive when | ||
1188 | # there are many keys expiring at the same time, and timeouts may be | ||
1189 | # handled with more precision. | ||
1190 | # | ||
1191 | # The range is between 1 and 500, however a value over 100 is usually not | ||
1192 | # a good idea. Most users should use the default of 10 and raise this up to | ||
1193 | # 100 only in environments where very low latency is required. | ||
1194 | hz 10 | ||
1195 | |||
1196 | # When a child rewrites the AOF file, if the following option is enabled | ||
1197 | # the file will be fsync-ed every 32 MB of data generated. This is useful | ||
1198 | # in order to commit the file to the disk more incrementally and avoid | ||
1199 | # big latency spikes. | ||
1200 | aof-rewrite-incremental-fsync yes | ||
1201 | |||
1202 | # Redis LFU eviction (see maxmemory setting) can be tuned. However it is a good | ||
1203 | # idea to start with the default settings and only change them after investigating | ||
1204 | # how to improve the performances and how the keys LFU change over time, which | ||
1205 | # is possible to inspect via the OBJECT FREQ command. | ||
1206 | # | ||
1207 | # There are two tunable parameters in the Redis LFU implementation: the | ||
1208 | # counter logarithm factor and the counter decay time. It is important to | ||
1209 | # understand what the two parameters mean before changing them. | ||
1210 | # | ||
1211 | # The LFU counter is just 8 bits per key, it's maximum value is 255, so Redis | ||
1212 | # uses a probabilistic increment with logarithmic behavior. Given the value | ||
1213 | # of the old counter, when a key is accessed, the counter is incremented in | ||
1214 | # this way: | ||
1215 | # | ||
1216 | # 1. A random number R between 0 and 1 is extracted. | ||
1217 | # 2. A probability P is calculated as 1/(old_value*lfu_log_factor+1). | ||
1218 | # 3. The counter is incremented only if R < P. | ||
1219 | # | ||
1220 | # The default lfu-log-factor is 10. This is a table of how the frequency | ||
1221 | # counter changes with a different number of accesses with different | ||
1222 | # logarithmic factors: | ||
1223 | # | ||
1224 | # +--------+------------+------------+------------+------------+------------+ | ||
1225 | # | factor | 100 hits | 1000 hits | 100K hits | 1M hits | 10M hits | | ||
1226 | # +--------+------------+------------+------------+------------+------------+ | ||
1227 | # | 0 | 104 | 255 | 255 | 255 | 255 | | ||
1228 | # +--------+------------+------------+------------+------------+------------+ | ||
1229 | # | 1 | 18 | 49 | 255 | 255 | 255 | | ||
1230 | # +--------+------------+------------+------------+------------+------------+ | ||
1231 | # | 10 | 10 | 18 | 142 | 255 | 255 | | ||
1232 | # +--------+------------+------------+------------+------------+------------+ | ||
1233 | # | 100 | 8 | 11 | 49 | 143 | 255 | | ||
1234 | # +--------+------------+------------+------------+------------+------------+ | ||
1235 | # | ||
1236 | # NOTE: The above table was obtained by running the following commands: | ||
1237 | # | ||
1238 | # valkey-benchmark -n 1000000 incr foo | ||
1239 | # valkey-cli object freq foo | ||
1240 | # | ||
1241 | # NOTE 2: The counter initial value is 5 in order to give new objects a chance | ||
1242 | # to accumulate hits. | ||
1243 | # | ||
1244 | # The counter decay time is the time, in minutes, that must elapse in order | ||
1245 | # for the key counter to be divided by two (or decremented if it has a value | ||
1246 | # less <= 10). | ||
1247 | # | ||
1248 | # The default value for the lfu-decay-time is 1. A Special value of 0 means to | ||
1249 | # decay the counter every time it happens to be scanned. | ||
1250 | # | ||
1251 | # lfu-log-factor 10 | ||
1252 | # lfu-decay-time 1 | ||
1253 | |||
1254 | ########################### ACTIVE DEFRAGMENTATION ####################### | ||
1255 | # | ||
1256 | # WARNING THIS FEATURE IS EXPERIMENTAL. However it was stress tested | ||
1257 | # even in production and manually tested by multiple engineers for some | ||
1258 | # time. | ||
1259 | # | ||
1260 | # What is active defragmentation? | ||
1261 | # ------------------------------- | ||
1262 | # | ||
1263 | # Active (online) defragmentation allows a Redis server to compact the | ||
1264 | # spaces left between small allocations and deallocations of data in memory, | ||
1265 | # thus allowing to reclaim back memory. | ||
1266 | # | ||
1267 | # Fragmentation is a natural process that happens with every allocator (but | ||
1268 | # less so with Jemalloc, fortunately) and certain workloads. Normally a server | ||
1269 | # restart is needed in order to lower the fragmentation, or at least to flush | ||
1270 | # away all the data and create it again. However thanks to this feature | ||
1271 | # implemented by Oran Agra for Redis 4.0 this process can happen at runtime | ||
1272 | # in an "hot" way, while the server is running. | ||
1273 | # | ||
1274 | # Basically when the fragmentation is over a certain level (see the | ||
1275 | # configuration options below) Redis will start to create new copies of the | ||
1276 | # values in contiguous memory regions by exploiting certain specific Jemalloc | ||
1277 | # features (in order to understand if an allocation is causing fragmentation | ||
1278 | # and to allocate it in a better place), and at the same time, will release the | ||
1279 | # old copies of the data. This process, repeated incrementally for all the keys | ||
1280 | # will cause the fragmentation to drop back to normal values. | ||
1281 | # | ||
1282 | # Important things to understand: | ||
1283 | # | ||
1284 | # 1. This feature is disabled by default, and only works if you compiled Redis | ||
1285 | # to use the copy of Jemalloc we ship with the source code of Redis. | ||
1286 | # This is the default with Linux builds. | ||
1287 | # | ||
1288 | # 2. You never need to enable this feature if you don't have fragmentation | ||
1289 | # issues. | ||
1290 | # | ||
1291 | # 3. Once you experience fragmentation, you can enable this feature when | ||
1292 | # needed with the command "CONFIG SET activedefrag yes". | ||
1293 | # | ||
1294 | # The configuration parameters are able to fine tune the behavior of the | ||
1295 | # defragmentation process. If you are not sure about what they mean it is | ||
1296 | # a good idea to leave the defaults untouched. | ||
1297 | |||
1298 | # Enabled active defragmentation | ||
1299 | # activedefrag yes | ||
1300 | |||
1301 | # Minimum amount of fragmentation waste to start active defrag | ||
1302 | # active-defrag-ignore-bytes 100mb | ||
1303 | |||
1304 | # Minimum percentage of fragmentation to start active defrag | ||
1305 | # active-defrag-threshold-lower 10 | ||
1306 | |||
1307 | # Maximum percentage of fragmentation at which we use maximum effort | ||
1308 | # active-defrag-threshold-upper 100 | ||
1309 | |||
1310 | # Minimal effort for defrag in CPU percentage | ||
1311 | # active-defrag-cycle-min 25 | ||
1312 | |||
1313 | # Maximal effort for defrag in CPU percentage | ||
1314 | # active-defrag-cycle-max 75 | ||
diff --git a/meta-oe/recipes-extended/valkey/valkey/valkey.service b/meta-oe/recipes-extended/valkey/valkey/valkey.service new file mode 100644 index 000000000..5c6aa5b17 --- /dev/null +++ b/meta-oe/recipes-extended/valkey/valkey/valkey.service | |||
@@ -0,0 +1,16 @@ | |||
1 | [Unit] | ||
2 | Description=Valkey: an open source, in-memory data store | ||
3 | After=network.target | ||
4 | |||
5 | [Service] | ||
6 | User=valkey | ||
7 | Group=valkey | ||
8 | ExecStart=/usr/bin/valkey-server /etc/valkey/valkey.conf | ||
9 | ExecStop=/usr/bin/valkey-cli shutdown | ||
10 | Restart=always | ||
11 | LimitNOFILE=10032 | ||
12 | StateDirectory=valkey | ||
13 | |||
14 | [Install] | ||
15 | WantedBy=multi-user.target | ||
16 | |||
diff --git a/meta-oe/recipes-extended/valkey/valkey_8.0.0.bb b/meta-oe/recipes-extended/valkey/valkey_8.0.0.bb new file mode 100644 index 000000000..373ebd469 --- /dev/null +++ b/meta-oe/recipes-extended/valkey/valkey_8.0.0.bb | |||
@@ -0,0 +1,74 @@ | |||
1 | SUMMARY = "Valkey key-value store" | ||
2 | DESCRIPTION = "A flexible distributed key-value datastore that supports both caching and beyond caching workloads." | ||
3 | HOMEPAGE = "http://valkey.io" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "BSD-3-Clause" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=f924153a31f3091d2c9c500317d53425" | ||
7 | DEPENDS = "readline lua ncurses" | ||
8 | |||
9 | SRC_URI = " \ | ||
10 | git://github.com/valkey-io/valkey.git;branch=8.0;protocol=https \ | ||
11 | file://valkey.conf \ | ||
12 | file://init-valkey-server \ | ||
13 | file://valkey.service \ | ||
14 | file://hiredis-use-default-CC-if-it-is-set.patch \ | ||
15 | file://lua-update-Makefile-to-use-environment-build-setting.patch \ | ||
16 | file://oe-use-libc-malloc.patch \ | ||
17 | file://0001-src-Do-not-reset-FINAL_LIBS.patch \ | ||
18 | file://GNU_SOURCE-7.patch \ | ||
19 | " | ||
20 | SRCREV = "2b5c7a0dbd61fd4281ef6166b7d119ba7fe7368c" | ||
21 | |||
22 | S = "${WORKDIR}/git" | ||
23 | |||
24 | inherit autotools-brokensep pkgconfig update-rc.d systemd useradd | ||
25 | |||
26 | FINAL_LIBS:x86:toolchain-clang = "-latomic" | ||
27 | FINAL_LIBS:riscv32:toolchain-clang = "-latomic" | ||
28 | FINAL_LIBS:mips = "-latomic" | ||
29 | FINAL_LIBS:arm = "-latomic" | ||
30 | FINAL_LIBS:powerpc = "-latomic" | ||
31 | |||
32 | export FINAL_LIBS | ||
33 | |||
34 | USERADD_PACKAGES = "${PN}" | ||
35 | USERADD_PARAM:${PN} = "--system --home-dir /var/lib/valkey -g valkey --shell /bin/false valkey" | ||
36 | GROUPADD_PARAM:${PN} = "--system valkey" | ||
37 | |||
38 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | ||
39 | PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd" | ||
40 | |||
41 | EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" | ||
42 | |||
43 | do_compile:prepend() { | ||
44 | (cd deps && oe_runmake hiredis lua linenoise) | ||
45 | } | ||
46 | |||
47 | do_install() { | ||
48 | export PREFIX=${D}/${prefix} | ||
49 | oe_runmake install | ||
50 | install -d ${D}/${sysconfdir}/valkey | ||
51 | install -m 0644 ${UNPACKDIR}/valkey.conf ${D}/${sysconfdir}/valkey/valkey.conf | ||
52 | install -d ${D}/${sysconfdir}/init.d | ||
53 | install -m 0755 ${UNPACKDIR}/init-valkey-server ${D}/${sysconfdir}/init.d/valkey-server | ||
54 | install -d ${D}/var/lib/valkey/ | ||
55 | chown valkey.valkey ${D}/var/lib/valkey/ | ||
56 | |||
57 | install -d ${D}${systemd_system_unitdir} | ||
58 | install -m 0644 ${UNPACKDIR}/valkey.service ${D}${systemd_system_unitdir} | ||
59 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/valkey.service | ||
60 | |||
61 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | ||
62 | sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/valkey/valkey.conf | ||
63 | sed -i 's!supervised no!supervised systemd!' ${D}/${sysconfdir}/valkey/valkey.conf | ||
64 | fi | ||
65 | } | ||
66 | |||
67 | CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf" | ||
68 | |||
69 | INITSCRIPT_NAME = "valkey-server" | ||
70 | INITSCRIPT_PARAMS = "defaults 87" | ||
71 | |||
72 | SYSTEMD_SERVICE:${PN} = "valkey.service" | ||
73 | |||
74 | CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows." | ||
diff --git a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb index 785ae50e9..7fb31f208 100644 --- a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb +++ b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb | |||
@@ -19,7 +19,7 @@ REQUIRED_DISTRO_FEATURES = "pam" | |||
19 | 19 | ||
20 | SYSTEMD_SERVICE:${PN} = "wtmpdb-update-boot.service wtmpdb-rotate.service" | 20 | SYSTEMD_SERVICE:${PN} = "wtmpdb-update-boot.service wtmpdb-rotate.service" |
21 | 21 | ||
22 | EXTRA_OEMESON = " -Dpamlibdir=${libdir}" | 22 | EXTRA_OEMESON = " -Dpamlibdir=${base_libdir}/security" |
23 | 23 | ||
24 | do_install:append () { | 24 | do_install:append () { |
25 | if [ -d ${D}${prefix}/lib/systemd -a ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then | 25 | if [ -d ${D}${prefix}/lib/systemd -a ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then |
diff --git a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb index 1bc4010f8..be658561e 100644 --- a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb +++ b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb | |||
@@ -12,9 +12,18 @@ SRCREV = "00141c2806ccc4ddf2ff6263ee1612d19c0b713f" | |||
12 | 12 | ||
13 | PV = "0.6.2+git" | 13 | PV = "0.6.2+git" |
14 | 14 | ||
15 | # Upstream repo does not tag | ||
16 | UPSTREAM_CHECK_COMMITS = "1" | ||
17 | |||
15 | inherit autotools | 18 | inherit autotools |
16 | 19 | ||
17 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
18 | AUTOTOOLS_SCRIPT_PATH = "${S}/src" | 21 | AUTOTOOLS_SCRIPT_PATH = "${S}/src" |
19 | 22 | ||
20 | BBCLASSEXTEND = "native nativesdk" | 23 | BBCLASSEXTEND = "native nativesdk" |
24 | |||
25 | # http://errors.yoctoproject.org/Errors/Details/766891/ | ||
26 | # git/src/libzsync/zsync.c:445:18: error: returning 'char **' from a function with incompatible return type 'const char * const*' [-Wincompatible-pointer-types] | ||
27 | # git/src/libzsync/zsync.c:450:18: error: returning 'char **' from a function with incompatible return type 'const char * const*' [-Wincompatible-pointer-types] | ||
28 | # git/src/libzsync/zsync.c:932:43: error: passing argument 4 of 'zsync_configure_zstream_for_zdata' from incompatible pointer type [-Wincompatible-pointer-types] | ||
29 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch b/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch new file mode 100644 index 000000000..dd6ae1b42 --- /dev/null +++ b/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 6fa1b6d3f72caf6d0cf61752b522dc19fb9933b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <martin.jansa@gmail.com> | ||
3 | Date: Fri, 30 Aug 2024 10:44:17 +0200 | ||
4 | Subject: [PATCH] gcab-enums.c.etemplate: include @basename@ instead of full | ||
5 | path from @filename@ | ||
6 | |||
7 | * fixes: | ||
8 | ERROR: QA Issue: File /usr/src/debug/gcab/1.6/libgcab/gcab-enums.c in package gcab-src contains reference to TMPDIR [buildpaths] | ||
9 | |||
10 | lib32-gcab/1.6/package $ grep -R styhead . | ||
11 | ./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-file.h" | ||
12 | ./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-folder.h" | ||
13 | |||
14 | glib-mkenum supports also @basename@ since 2.22 which would avoid this QA issue | ||
15 | @filename@ name of current input file | ||
16 | @basename@ base name of the current input file (Since: 2.22) | ||
17 | |||
18 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
19 | --- | ||
20 | Upstream-Status: Pending | ||
21 | |||
22 | libgcab/gcab-enums.c.etemplate | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/libgcab/gcab-enums.c.etemplate b/libgcab/gcab-enums.c.etemplate | ||
26 | index 194b1e0..2e85824 100644 | ||
27 | --- a/libgcab/gcab-enums.c.etemplate | ||
28 | +++ b/libgcab/gcab-enums.c.etemplate | ||
29 | @@ -21,7 +21,7 @@ | ||
30 | /*** END file-header ***/ | ||
31 | |||
32 | /*** BEGIN file-production ***/ | ||
33 | -#include "@filename@" | ||
34 | +#include "@basename@" | ||
35 | /*** END file-production ***/ | ||
36 | |||
37 | |||
diff --git a/meta-oe/recipes-gnome/gcab/gcab_1.6.bb b/meta-oe/recipes-gnome/gcab/gcab_1.6.bb index 4278fc945..503d25271 100644 --- a/meta-oe/recipes-gnome/gcab/gcab_1.6.bb +++ b/meta-oe/recipes-gnome/gcab/gcab_1.6.bb | |||
@@ -7,6 +7,7 @@ DEPENDS = "glib-2.0" | |||
7 | 7 | ||
8 | SRC_URI = "\ | 8 | SRC_URI = "\ |
9 | ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \ | 9 | ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \ |
10 | file://0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch \ | ||
10 | file://run-ptest \ | 11 | file://run-ptest \ |
11 | " | 12 | " |
12 | SRC_URI[sha256sum] = "2f0c9615577c4126909e251f9de0626c3ee7a152376c15b5544df10fc87e560b" | 13 | SRC_URI[sha256sum] = "2f0c9615577c4126909e251f9de0626c3ee7a152376c15b5544df10fc87e560b" |
diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.15.bb index 54b37912b..c49859afc 100644 --- a/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb +++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.15.bb | |||
@@ -11,7 +11,10 @@ inherit gnomebase gobject-introspection vala gtk-doc | |||
11 | SRC_URI = "https://github.com/jstedfast/${BPN}/releases/download/${PV}/${BP}.tar.xz \ | 11 | SRC_URI = "https://github.com/jstedfast/${BPN}/releases/download/${PV}/${BP}.tar.xz \ |
12 | file://iconv-detect.h \ | 12 | file://iconv-detect.h \ |
13 | " | 13 | " |
14 | SRC_URI[sha256sum] = "2e10a54d4821daf8b16c019ad5d567e0fb8e766f8ffe5fec3d4c6a37373d6406" | 14 | SRC_URI[sha256sum] = "84cd2a481a27970ec39b5c95f72db026722904a2ccf3fdbd57b280cf2d02b5c4" |
15 | |||
16 | UPSTREAM_CHECK_URI = "https://github.com/jstedfast/gmime/releases" | ||
17 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
15 | 18 | ||
16 | EXTRA_OECONF += "--enable-largefile" | 19 | EXTRA_OECONF += "--enable-largefile" |
17 | 20 | ||
diff --git a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb index 3456383c3..90756dac3 100644 --- a/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb +++ b/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb | |||
@@ -19,6 +19,9 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz;name=archive" | |||
19 | SRC_URI[archive.md5sum] = "f9f2c6c521948da427f702372e16f826" | 19 | SRC_URI[archive.md5sum] = "f9f2c6c521948da427f702372e16f826" |
20 | SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819" | 20 | SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819" |
21 | 21 | ||
22 | UPSTREAM_CHECK_URI = "https://gitlab.gnome.org/Archive/gnome-themes-extra/-/tags" | ||
23 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
24 | |||
22 | EXTRA_OECONF = "--disable-gtk2-engine" | 25 | EXTRA_OECONF = "--disable-gtk2-engine" |
23 | 26 | ||
24 | do_install:append() { | 27 | do_install:append() { |
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch b/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch new file mode 100644 index 000000000..dfa54f2f3 --- /dev/null +++ b/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 3bbf0b6176d42836d23c36a6ac410e807ec0a7a7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthias Clasen <mclasen@redhat.com> | ||
3 | Date: Sat, 15 Jun 2024 14:18:01 -0400 | ||
4 | Subject: [PATCH] Stop looking for modules in cwd | ||
5 | |||
6 | This is just not a good idea. It is surprising, and can be misused. | ||
7 | |||
8 | Fixes: #6786 | ||
9 | |||
10 | CVE: CVE-2024-6655 | ||
11 | |||
12 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7] | ||
13 | |||
14 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> | ||
15 | --- | ||
16 | gtk/gtkmodules.c | 9 ++------- | ||
17 | 1 file changed, 2 insertions(+), 7 deletions(-) | ||
18 | |||
19 | diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c | ||
20 | index e09b583..e75810c 100644 | ||
21 | --- a/gtk/gtkmodules.c | ||
22 | +++ b/gtk/gtkmodules.c | ||
23 | @@ -225,13 +225,8 @@ find_module (const gchar *name) | ||
24 | gchar *module_name; | ||
25 | |||
26 | module_name = _gtk_find_module (name, "modules"); | ||
27 | - if (!module_name) | ||
28 | - { | ||
29 | - /* As last resort, try loading without an absolute path (using system | ||
30 | - * library path) | ||
31 | - */ | ||
32 | - module_name = g_module_build_path (NULL, name); | ||
33 | - } | ||
34 | + if (module_name == NULL) | ||
35 | + return NULL; | ||
36 | |||
37 | module = g_module_open (module_name, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY); | ||
38 | |||
39 | -- | ||
40 | 2.40.0 | ||
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 74b053141..d55aa8d28 100644 --- a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb +++ b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb | |||
@@ -11,6 +11,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ | |||
11 | file://strict-prototypes.patch \ | 11 | file://strict-prototypes.patch \ |
12 | file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ | 12 | file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ |
13 | file://0001-Fix-signature-of-create_menu-function.patch \ | 13 | file://0001-Fix-signature-of-create_menu-function.patch \ |
14 | file://CVE-2024-6655.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da" | 17 | SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da" |
diff --git a/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb b/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb index 2d95e1444..7dc88d727 100644 --- a/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb +++ b/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb | |||
@@ -32,3 +32,5 @@ GTKDOC_MESON_OPTION = "gtkdoc" | |||
32 | RDEPENDS:${PN}:class-target = "\ | 32 | RDEPENDS:${PN}:class-target = "\ |
33 | ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ | 33 | ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ |
34 | " | 34 | " |
35 | |||
36 | INSANE_SKIP:${PN}-ptest += "buildpaths" | ||
diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.bb b/meta-oe/recipes-gnome/malcontent/malcontent.bb index c4bc50fa8..b30d85080 100644 --- a/meta-oe/recipes-gnome/malcontent/malcontent.bb +++ b/meta-oe/recipes-gnome/malcontent/malcontent.bb | |||
@@ -17,7 +17,7 @@ DEPENDS = " \ | |||
17 | 17 | ||
18 | GIR_MESON_OPTION = "" | 18 | GIR_MESON_OPTION = "" |
19 | 19 | ||
20 | inherit meson pkgconfig gobject-introspection gettext features_check useradd | 20 | inherit meson pkgconfig gobject-introspection gettext features_check |
21 | 21 | ||
22 | REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" | 22 | REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" |
23 | 23 | ||
@@ -26,15 +26,6 @@ PACKAGECONFIG[ui] = ",,,malcontent-ui" | |||
26 | 26 | ||
27 | EXTRA_OEMESON = "-Dui=disabled" | 27 | EXTRA_OEMESON = "-Dui=disabled" |
28 | 28 | ||
29 | USERADD_PACKAGES = "${PN}" | ||
30 | USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" | ||
31 | |||
32 | do_install:append() { | ||
33 | # Fix up permissions on polkit rules.d to work with rpm4 constraints | ||
34 | chmod 700 ${D}/${datadir}/polkit-1/rules.d | ||
35 | chown polkitd:root ${D}/${datadir}/polkit-1/rules.d | ||
36 | } | ||
37 | |||
38 | FILES:${PN} += " \ | 29 | FILES:${PN} += " \ |
39 | ${libdir}/security/pam_malcontent.so \ | 30 | ${libdir}/security/pam_malcontent.so \ |
40 | ${datadir}/accountsservice \ | 31 | ${datadir}/accountsservice \ |
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc b/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc new file mode 100644 index 000000000..09a3f675a --- /dev/null +++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc | |||
@@ -0,0 +1,268 @@ | |||
1 | # Autogenerated with 'bitbake -c update_crates deqp-runner' | ||
2 | |||
3 | # from Cargo.lock | ||
4 | SRC_URI += " \ | ||
5 | crate://crates.io/adler/1.0.2 \ | ||
6 | crate://crates.io/aho-corasick/1.0.5 \ | ||
7 | crate://crates.io/android-tzdata/0.1.1 \ | ||
8 | crate://crates.io/android_system_properties/0.1.5 \ | ||
9 | crate://crates.io/ansi_term/0.12.1 \ | ||
10 | crate://crates.io/anyhow/1.0.75 \ | ||
11 | crate://crates.io/atty/0.2.14 \ | ||
12 | crate://crates.io/autocfg/1.1.0 \ | ||
13 | crate://crates.io/bitflags/1.3.2 \ | ||
14 | crate://crates.io/bitflags/2.4.0 \ | ||
15 | crate://crates.io/bumpalo/3.13.0 \ | ||
16 | crate://crates.io/cast/0.3.0 \ | ||
17 | crate://crates.io/cc/1.0.83 \ | ||
18 | crate://crates.io/cfg-if/1.0.0 \ | ||
19 | crate://crates.io/chrono/0.4.30 \ | ||
20 | crate://crates.io/clap/2.34.0 \ | ||
21 | crate://crates.io/core-foundation-sys/0.8.4 \ | ||
22 | crate://crates.io/crc32fast/1.3.2 \ | ||
23 | crate://crates.io/criterion/0.3.6 \ | ||
24 | crate://crates.io/criterion-plot/0.4.5 \ | ||
25 | crate://crates.io/crossbeam-channel/0.5.8 \ | ||
26 | crate://crates.io/crossbeam-deque/0.8.3 \ | ||
27 | crate://crates.io/crossbeam-epoch/0.9.15 \ | ||
28 | crate://crates.io/crossbeam-utils/0.8.16 \ | ||
29 | crate://crates.io/csv/1.2.2 \ | ||
30 | crate://crates.io/csv-core/0.1.10 \ | ||
31 | crate://crates.io/derive-getters/0.1.1 \ | ||
32 | crate://crates.io/either/1.9.0 \ | ||
33 | crate://crates.io/errno/0.3.3 \ | ||
34 | crate://crates.io/errno-dragonfly/0.1.2 \ | ||
35 | crate://crates.io/fastrand/2.0.0 \ | ||
36 | crate://crates.io/flate2/1.0.27 \ | ||
37 | crate://crates.io/getrandom/0.1.16 \ | ||
38 | crate://crates.io/half/1.8.2 \ | ||
39 | crate://crates.io/hashbrown/0.12.3 \ | ||
40 | crate://crates.io/heck/0.3.3 \ | ||
41 | crate://crates.io/hermit-abi/0.1.19 \ | ||
42 | crate://crates.io/hermit-abi/0.3.2 \ | ||
43 | crate://crates.io/iana-time-zone/0.1.57 \ | ||
44 | crate://crates.io/iana-time-zone-haiku/0.1.2 \ | ||
45 | crate://crates.io/indexmap/1.9.3 \ | ||
46 | crate://crates.io/itertools/0.10.5 \ | ||
47 | crate://crates.io/itoa/1.0.9 \ | ||
48 | crate://crates.io/js-sys/0.3.64 \ | ||
49 | crate://crates.io/junit-report/0.4.0 \ | ||
50 | crate://crates.io/lazy_static/1.4.0 \ | ||
51 | crate://crates.io/libc/0.2.147 \ | ||
52 | crate://crates.io/linux-raw-sys/0.4.7 \ | ||
53 | crate://crates.io/log/0.4.20 \ | ||
54 | crate://crates.io/memchr/2.6.3 \ | ||
55 | crate://crates.io/memoffset/0.9.0 \ | ||
56 | crate://crates.io/miniz_oxide/0.7.1 \ | ||
57 | crate://crates.io/mio/0.8.8 \ | ||
58 | crate://crates.io/num-traits/0.2.16 \ | ||
59 | crate://crates.io/num_cpus/1.16.0 \ | ||
60 | crate://crates.io/once_cell/1.18.0 \ | ||
61 | crate://crates.io/oorandom/11.1.3 \ | ||
62 | crate://crates.io/plotters/0.3.5 \ | ||
63 | crate://crates.io/plotters-backend/0.3.5 \ | ||
64 | crate://crates.io/plotters-svg/0.3.5 \ | ||
65 | crate://crates.io/ppv-lite86/0.2.17 \ | ||
66 | crate://crates.io/proc-macro-error/1.0.4 \ | ||
67 | crate://crates.io/proc-macro-error-attr/1.0.4 \ | ||
68 | crate://crates.io/proc-macro2/1.0.66 \ | ||
69 | crate://crates.io/quote/1.0.33 \ | ||
70 | crate://crates.io/rand/0.7.3 \ | ||
71 | crate://crates.io/rand_chacha/0.2.2 \ | ||
72 | crate://crates.io/rand_core/0.5.1 \ | ||
73 | crate://crates.io/rand_hc/0.2.0 \ | ||
74 | crate://crates.io/rayon/1.7.0 \ | ||
75 | crate://crates.io/rayon-core/1.11.0 \ | ||
76 | crate://crates.io/redox_syscall/0.3.5 \ | ||
77 | crate://crates.io/regex/1.9.5 \ | ||
78 | crate://crates.io/regex-automata/0.3.8 \ | ||
79 | crate://crates.io/regex-syntax/0.7.5 \ | ||
80 | crate://crates.io/roxmltree/0.13.1 \ | ||
81 | crate://crates.io/rustix/0.38.13 \ | ||
82 | crate://crates.io/ryu/1.0.15 \ | ||
83 | crate://crates.io/same-file/1.0.6 \ | ||
84 | crate://crates.io/scopeguard/1.2.0 \ | ||
85 | crate://crates.io/serde/1.0.188 \ | ||
86 | crate://crates.io/serde-tuple-vec-map/1.0.1 \ | ||
87 | crate://crates.io/serde_cbor/0.11.2 \ | ||
88 | crate://crates.io/serde_derive/1.0.188 \ | ||
89 | crate://crates.io/serde_json/1.0.106 \ | ||
90 | crate://crates.io/serde_yaml/0.9.21 \ | ||
91 | crate://crates.io/stderrlog/0.5.4 \ | ||
92 | crate://crates.io/strsim/0.8.0 \ | ||
93 | crate://crates.io/structopt/0.3.26 \ | ||
94 | crate://crates.io/structopt-derive/0.4.18 \ | ||
95 | crate://crates.io/syn/1.0.109 \ | ||
96 | crate://crates.io/syn/2.0.32 \ | ||
97 | crate://crates.io/tempfile/3.8.0 \ | ||
98 | crate://crates.io/termcolor/1.1.3 \ | ||
99 | crate://crates.io/textwrap/0.11.0 \ | ||
100 | crate://crates.io/thiserror/1.0.48 \ | ||
101 | crate://crates.io/thiserror-impl/1.0.48 \ | ||
102 | crate://crates.io/thread_local/1.1.7 \ | ||
103 | crate://crates.io/tinytemplate/1.2.1 \ | ||
104 | crate://crates.io/toml/0.5.11 \ | ||
105 | crate://crates.io/unicode-ident/1.0.11 \ | ||
106 | crate://crates.io/unicode-segmentation/1.10.1 \ | ||
107 | crate://crates.io/unicode-width/0.1.10 \ | ||
108 | crate://crates.io/unsafe-libyaml/0.2.9 \ | ||
109 | crate://crates.io/vec_map/0.8.2 \ | ||
110 | crate://crates.io/version_check/0.9.4 \ | ||
111 | crate://crates.io/walkdir/2.4.0 \ | ||
112 | crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \ | ||
113 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ | ||
114 | crate://crates.io/wasm-bindgen/0.2.87 \ | ||
115 | crate://crates.io/wasm-bindgen-backend/0.2.87 \ | ||
116 | crate://crates.io/wasm-bindgen-macro/0.2.87 \ | ||
117 | crate://crates.io/wasm-bindgen-macro-support/0.2.87 \ | ||
118 | crate://crates.io/wasm-bindgen-shared/0.2.87 \ | ||
119 | crate://crates.io/web-sys/0.3.64 \ | ||
120 | crate://crates.io/winapi/0.3.9 \ | ||
121 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ | ||
122 | crate://crates.io/winapi-util/0.1.5 \ | ||
123 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ | ||
124 | crate://crates.io/windows/0.48.0 \ | ||
125 | crate://crates.io/windows-sys/0.48.0 \ | ||
126 | crate://crates.io/windows-targets/0.48.5 \ | ||
127 | crate://crates.io/windows_aarch64_gnullvm/0.48.5 \ | ||
128 | crate://crates.io/windows_aarch64_msvc/0.48.5 \ | ||
129 | crate://crates.io/windows_i686_gnu/0.48.5 \ | ||
130 | crate://crates.io/windows_i686_msvc/0.48.5 \ | ||
131 | crate://crates.io/windows_x86_64_gnu/0.48.5 \ | ||
132 | crate://crates.io/windows_x86_64_gnullvm/0.48.5 \ | ||
133 | crate://crates.io/windows_x86_64_msvc/0.48.5 \ | ||
134 | crate://crates.io/xml-rs/0.8.18 \ | ||
135 | crate://crates.io/xmlparser/0.13.5 \ | ||
136 | " | ||
137 | |||
138 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" | ||
139 | SRC_URI[aho-corasick-1.0.5.sha256sum] = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" | ||
140 | SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" | ||
141 | SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" | ||
142 | SRC_URI[ansi_term-0.12.1.sha256sum] = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" | ||
143 | SRC_URI[anyhow-1.0.75.sha256sum] = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" | ||
144 | SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" | ||
145 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" | ||
146 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | ||
147 | SRC_URI[bitflags-2.4.0.sha256sum] = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" | ||
148 | SRC_URI[bumpalo-3.13.0.sha256sum] = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" | ||
149 | SRC_URI[cast-0.3.0.sha256sum] = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" | ||
150 | SRC_URI[cc-1.0.83.sha256sum] = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" | ||
151 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | ||
152 | SRC_URI[chrono-0.4.30.sha256sum] = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" | ||
153 | SRC_URI[clap-2.34.0.sha256sum] = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" | ||
154 | SRC_URI[core-foundation-sys-0.8.4.sha256sum] = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" | ||
155 | SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" | ||
156 | SRC_URI[criterion-0.3.6.sha256sum] = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" | ||
157 | SRC_URI[criterion-plot-0.4.5.sha256sum] = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" | ||
158 | SRC_URI[crossbeam-channel-0.5.8.sha256sum] = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" | ||
159 | SRC_URI[crossbeam-deque-0.8.3.sha256sum] = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" | ||
160 | SRC_URI[crossbeam-epoch-0.9.15.sha256sum] = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" | ||
161 | SRC_URI[crossbeam-utils-0.8.16.sha256sum] = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" | ||
162 | SRC_URI[csv-1.2.2.sha256sum] = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" | ||
163 | SRC_URI[csv-core-0.1.10.sha256sum] = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" | ||
164 | SRC_URI[derive-getters-0.1.1.sha256sum] = "16dc4e2517f08ca167440ccb11023c1308ee19a4022d7b03c0e652f971171869" | ||
165 | SRC_URI[either-1.9.0.sha256sum] = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" | ||
166 | SRC_URI[errno-0.3.3.sha256sum] = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" | ||
167 | SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" | ||
168 | SRC_URI[fastrand-2.0.0.sha256sum] = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" | ||
169 | SRC_URI[flate2-1.0.27.sha256sum] = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" | ||
170 | SRC_URI[getrandom-0.1.16.sha256sum] = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" | ||
171 | SRC_URI[half-1.8.2.sha256sum] = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" | ||
172 | SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" | ||
173 | SRC_URI[heck-0.3.3.sha256sum] = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" | ||
174 | SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" | ||
175 | SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" | ||
176 | SRC_URI[iana-time-zone-0.1.57.sha256sum] = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" | ||
177 | SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" | ||
178 | SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" | ||
179 | SRC_URI[itertools-0.10.5.sha256sum] = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" | ||
180 | SRC_URI[itoa-1.0.9.sha256sum] = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" | ||
181 | SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" | ||
182 | SRC_URI[junit-report-0.4.0.sha256sum] = "e4e00ad2de771fc4988af88b02cbd618c08c17920208c35c4bbfe67ccfab31eb" | ||
183 | SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" | ||
184 | SRC_URI[libc-0.2.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" | ||
185 | SRC_URI[linux-raw-sys-0.4.7.sha256sum] = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" | ||
186 | SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" | ||
187 | SRC_URI[memchr-2.6.3.sha256sum] = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" | ||
188 | SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" | ||
189 | SRC_URI[miniz_oxide-0.7.1.sha256sum] = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" | ||
190 | SRC_URI[mio-0.8.8.sha256sum] = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" | ||
191 | SRC_URI[num-traits-0.2.16.sha256sum] = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" | ||
192 | SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" | ||
193 | SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" | ||
194 | SRC_URI[oorandom-11.1.3.sha256sum] = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" | ||
195 | SRC_URI[plotters-0.3.5.sha256sum] = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" | ||
196 | SRC_URI[plotters-backend-0.3.5.sha256sum] = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" | ||
197 | SRC_URI[plotters-svg-0.3.5.sha256sum] = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" | ||
198 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" | ||
199 | SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" | ||
200 | SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" | ||
201 | SRC_URI[proc-macro2-1.0.66.sha256sum] = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" | ||
202 | SRC_URI[quote-1.0.33.sha256sum] = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" | ||
203 | SRC_URI[rand-0.7.3.sha256sum] = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" | ||
204 | SRC_URI[rand_chacha-0.2.2.sha256sum] = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" | ||
205 | SRC_URI[rand_core-0.5.1.sha256sum] = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" | ||
206 | SRC_URI[rand_hc-0.2.0.sha256sum] = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" | ||
207 | SRC_URI[rayon-1.7.0.sha256sum] = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" | ||
208 | SRC_URI[rayon-core-1.11.0.sha256sum] = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" | ||
209 | SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" | ||
210 | SRC_URI[regex-1.9.5.sha256sum] = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" | ||
211 | SRC_URI[regex-automata-0.3.8.sha256sum] = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" | ||
212 | SRC_URI[regex-syntax-0.7.5.sha256sum] = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" | ||
213 | SRC_URI[roxmltree-0.13.1.sha256sum] = "dbf7d7b1ea646d380d0e8153158063a6da7efe30ddbf3184042848e3f8a6f671" | ||
214 | SRC_URI[rustix-0.38.13.sha256sum] = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" | ||
215 | SRC_URI[ryu-1.0.15.sha256sum] = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" | ||
216 | SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" | ||
217 | SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" | ||
218 | SRC_URI[serde-1.0.188.sha256sum] = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" | ||
219 | SRC_URI[serde-tuple-vec-map-1.0.1.sha256sum] = "a04d0ebe0de77d7d445bb729a895dcb0a288854b267ca85f030ce51cdc578c82" | ||
220 | SRC_URI[serde_cbor-0.11.2.sha256sum] = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" | ||
221 | SRC_URI[serde_derive-1.0.188.sha256sum] = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" | ||
222 | SRC_URI[serde_json-1.0.106.sha256sum] = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" | ||
223 | SRC_URI[serde_yaml-0.9.21.sha256sum] = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" | ||
224 | SRC_URI[stderrlog-0.5.4.sha256sum] = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b" | ||
225 | SRC_URI[strsim-0.8.0.sha256sum] = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" | ||
226 | SRC_URI[structopt-0.3.26.sha256sum] = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" | ||
227 | SRC_URI[structopt-derive-0.4.18.sha256sum] = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" | ||
228 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" | ||
229 | SRC_URI[syn-2.0.32.sha256sum] = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" | ||
230 | SRC_URI[tempfile-3.8.0.sha256sum] = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" | ||
231 | SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" | ||
232 | SRC_URI[textwrap-0.11.0.sha256sum] = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" | ||
233 | SRC_URI[thiserror-1.0.48.sha256sum] = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" | ||
234 | SRC_URI[thiserror-impl-1.0.48.sha256sum] = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" | ||
235 | SRC_URI[thread_local-1.1.7.sha256sum] = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" | ||
236 | SRC_URI[tinytemplate-1.2.1.sha256sum] = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" | ||
237 | SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" | ||
238 | SRC_URI[unicode-ident-1.0.11.sha256sum] = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" | ||
239 | SRC_URI[unicode-segmentation-1.10.1.sha256sum] = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" | ||
240 | SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" | ||
241 | SRC_URI[unsafe-libyaml-0.2.9.sha256sum] = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" | ||
242 | SRC_URI[vec_map-0.8.2.sha256sum] = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" | ||
243 | SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" | ||
244 | SRC_URI[walkdir-2.4.0.sha256sum] = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" | ||
245 | SRC_URI[wasi-0.9.0+wasi-snapshot-preview1.sha256sum] = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" | ||
246 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" | ||
247 | SRC_URI[wasm-bindgen-0.2.87.sha256sum] = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" | ||
248 | SRC_URI[wasm-bindgen-backend-0.2.87.sha256sum] = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" | ||
249 | SRC_URI[wasm-bindgen-macro-0.2.87.sha256sum] = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" | ||
250 | SRC_URI[wasm-bindgen-macro-support-0.2.87.sha256sum] = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" | ||
251 | SRC_URI[wasm-bindgen-shared-0.2.87.sha256sum] = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" | ||
252 | SRC_URI[web-sys-0.3.64.sha256sum] = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" | ||
253 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" | ||
254 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" | ||
255 | SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" | ||
256 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" | ||
257 | SRC_URI[windows-0.48.0.sha256sum] = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" | ||
258 | SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" | ||
259 | SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" | ||
260 | SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" | ||
261 | SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" | ||
262 | SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" | ||
263 | SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" | ||
264 | SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" | ||
265 | SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" | ||
266 | SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" | ||
267 | SRC_URI[xml-rs-0.8.18.sha256sum] = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a" | ||
268 | SRC_URI[xmlparser-0.13.5.sha256sum] = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" | ||
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch new file mode 100644 index 000000000..e29b78fde --- /dev/null +++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch | |||
@@ -0,0 +1,172 @@ | |||
1 | From f453ec77fa9e6fd961a1f5f0b221260a5a21bba2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
3 | Date: Tue, 27 Aug 2024 14:08:47 +0300 | ||
4 | Subject: [PATCH] deqp-runner: drop zstd support | ||
5 | |||
6 | Building zstd-sys results in the "foo contains reference to TMPDIR" QA | ||
7 | error. Revert commit 1adddf3aa89f21b472d8046347ccdfa4612f141b to drop | ||
8 | zstd dependency. | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe specific] | ||
11 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
12 | --- | ||
13 | Cargo.lock | 45 --------------------------------------------- | ||
14 | Cargo.toml | 3 --- | ||
15 | src/lib.rs | 31 +++++++------------------------ | ||
16 | 3 files changed, 7 insertions(+), 72 deletions(-) | ||
17 | |||
18 | diff --git a/Cargo.lock b/Cargo.lock | ||
19 | index 8443695e2bd5..50924576a8e3 100644 | ||
20 | --- a/Cargo.lock | ||
21 | +++ b/Cargo.lock | ||
22 | @@ -94,7 +94,6 @@ version = "1.0.83" | ||
23 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
24 | checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" | ||
25 | dependencies = [ | ||
26 | - "jobserver", | ||
27 | "libc", | ||
28 | ] | ||
29 | |||
30 | @@ -271,7 +270,6 @@ dependencies = [ | ||
31 | "structopt", | ||
32 | "tempfile", | ||
33 | "toml", | ||
34 | - "zstd", | ||
35 | ] | ||
36 | |||
37 | [[package]] | ||
38 | @@ -423,15 +421,6 @@ version = "1.0.9" | ||
39 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
40 | checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" | ||
41 | |||
42 | -[[package]] | ||
43 | -name = "jobserver" | ||
44 | -version = "0.1.31" | ||
45 | -source = "registry+https://github.com/rust-lang/crates.io-index" | ||
46 | -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" | ||
47 | -dependencies = [ | ||
48 | - "libc", | ||
49 | -] | ||
50 | - | ||
51 | [[package]] | ||
52 | name = "js-sys" | ||
53 | version = "0.3.64" | ||
54 | @@ -544,12 +533,6 @@ version = "11.1.3" | ||
55 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
56 | checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" | ||
57 | |||
58 | -[[package]] | ||
59 | -name = "pkg-config" | ||
60 | -version = "0.3.30" | ||
61 | -source = "registry+https://github.com/rust-lang/crates.io-index" | ||
62 | -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" | ||
63 | - | ||
64 | [[package]] | ||
65 | name = "plotters" | ||
66 | version = "0.3.5" | ||
67 | @@ -1217,31 +1200,3 @@ name = "xmlparser" | ||
68 | version = "0.13.5" | ||
69 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
70 | checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" | ||
71 | - | ||
72 | -[[package]] | ||
73 | -name = "zstd" | ||
74 | -version = "0.13.1" | ||
75 | -source = "registry+https://github.com/rust-lang/crates.io-index" | ||
76 | -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" | ||
77 | -dependencies = [ | ||
78 | - "zstd-safe", | ||
79 | -] | ||
80 | - | ||
81 | -[[package]] | ||
82 | -name = "zstd-safe" | ||
83 | -version = "7.1.0" | ||
84 | -source = "registry+https://github.com/rust-lang/crates.io-index" | ||
85 | -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" | ||
86 | -dependencies = [ | ||
87 | - "zstd-sys", | ||
88 | -] | ||
89 | - | ||
90 | -[[package]] | ||
91 | -name = "zstd-sys" | ||
92 | -version = "2.0.11+zstd.1.5.6" | ||
93 | -source = "registry+https://github.com/rust-lang/crates.io-index" | ||
94 | -checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" | ||
95 | -dependencies = [ | ||
96 | - "cc", | ||
97 | - "pkg-config", | ||
98 | -] | ||
99 | diff --git a/Cargo.toml b/Cargo.toml | ||
100 | index ac6295763e87..1fa1344a3105 100644 | ||
101 | --- a/Cargo.toml | ||
102 | +++ b/Cargo.toml | ||
103 | @@ -120,9 +120,6 @@ version = "3.2" | ||
104 | [dependencies.toml] | ||
105 | version = "0.5" | ||
106 | |||
107 | -[dependencies.zstd] | ||
108 | -version = "0.13.0" | ||
109 | - | ||
110 | [dev-dependencies.criterion] | ||
111 | version = "0.3.0" | ||
112 | |||
113 | diff --git a/src/lib.rs b/src/lib.rs | ||
114 | index e7095267f1cd..ff7bc4f5d025 100644 | ||
115 | --- a/src/lib.rs | ||
116 | +++ b/src/lib.rs | ||
117 | @@ -63,7 +63,6 @@ use rayon::prelude::*; | ||
118 | use regex::RegexSet; | ||
119 | use serde::Deserialize; | ||
120 | use std::collections::HashMap; | ||
121 | -use std::ffi::OsStr; | ||
122 | use std::fs::File; | ||
123 | use std::io::prelude::*; | ||
124 | use std::io::BufReader; | ||
125 | @@ -76,7 +75,6 @@ use std::time::Duration; | ||
126 | use std::time::Instant; | ||
127 | use structopt::StructOpt; | ||
128 | use timeout::{TimeoutChildExt, TimeoutChildStdout, Timer}; | ||
129 | -use zstd::stream::read::Decoder; | ||
130 | |||
131 | fn parse_key_val<T, U>(s: &str) -> Result<(T, U), Box<dyn std::error::Error>> | ||
132 | where | ||
133 | @@ -1082,32 +1080,17 @@ pub fn read_lines<I: IntoIterator<Item = impl AsRef<Path>>>(files: I) -> Result< | ||
134 | let mut lines: Vec<String> = Vec::new(); | ||
135 | |||
136 | for path in files { | ||
137 | - let mut path: &Path = path.as_ref(); | ||
138 | - let mut path_compressed: PathBuf = path.to_path_buf(); | ||
139 | - | ||
140 | - // always try append zst extension (and keep existing one, e.g. .txt) | ||
141 | - let ext = if let Some(file_ext) = path.extension().and_then(|ext| ext.to_str()) { | ||
142 | - format!("{}.zst", file_ext) | ||
143 | - } else { | ||
144 | - (".zst").to_string() | ||
145 | - }; | ||
146 | - | ||
147 | - path_compressed.set_extension(ext); | ||
148 | - if path_compressed.exists() { | ||
149 | - path = path_compressed.as_ref(); | ||
150 | - } | ||
151 | - let file = File::open(path).with_context(|| format!("opening path: {}", path.display()))?; | ||
152 | - let reader: Box<dyn Read> = match path.extension().and_then(OsStr::to_str) { | ||
153 | - Some("zst") => Box::new(Decoder::new(file).unwrap()), | ||
154 | - _ => Box::new(file), | ||
155 | - }; | ||
156 | - | ||
157 | - for line in BufReader::new(reader).lines() { | ||
158 | + let path = path.as_ref(); | ||
159 | + for line in BufReader::new( | ||
160 | + File::open(path).with_context(|| format!("opening path: {}", path.display()))?, | ||
161 | + ) | ||
162 | + .lines() | ||
163 | + { | ||
164 | let line = line.with_context(|| format!("reading line from {}", path.display()))?; | ||
165 | // In newer dEQP, vk-master.txt just contains a list of .txt | ||
166 | // caselist files relative to its current path, so recursively read | ||
167 | // thoseand append their contents. | ||
168 | - if line.ends_with(".txt") || line.ends_with(".txt.zst") { | ||
169 | + if line.ends_with(".txt") { | ||
170 | let sub_path = path.parent().context("Getting path parent dir")?.join(line); | ||
171 | |||
172 | lines.extend_from_slice( | ||
diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb b/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb new file mode 100644 index 000000000..04de074d2 --- /dev/null +++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "A VK-GL-CTS/dEQP wrapper program to parallelize it across CPUs and report results against a baseline." | ||
2 | HOMEPAGE = "https://gitlab.freedesktop.org/mesa/deqp-runner" | ||
3 | LICENSE = "MIT" | ||
4 | |||
5 | LIC_FILES_CHKSUM = " \ | ||
6 | file://LICENSE;md5=4f59d6446bf2e004e80df1a0937129fa\ | ||
7 | " | ||
8 | |||
9 | inherit cargo cargo-update-recipe-crates | ||
10 | |||
11 | SRC_URI += " \ | ||
12 | crate://crates.io/deqp-runner/0.20.0 \ | ||
13 | file://0001-deqp-runner-drop-zstd-support.patch \ | ||
14 | " | ||
15 | |||
16 | SRC_URI[deqp-runner-0.20.0.sha256sum] = "a3f4fab1179a01cbbdbe4b93e0a040f74de7b9086498d91976d93844a31439dd" | ||
17 | |||
18 | require deqp-runner-crates.inc | ||
diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index 54aeb06aa..59796cc65 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc | |||
@@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" |
10 | 10 | ||
11 | HOMEPAGE = "http://directfb.org" | 11 | HOMEPAGE = "http://directfb.org" |
12 | DEPENDS = "jpeg libpng freetype zlib sysfsutils" | 12 | DEPENDS = "jpeg libpng sysfsutils" |
13 | 13 | ||
14 | SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \ | 14 | SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \ |
15 | file://configurefix.patch \ | 15 | file://configurefix.patch \ |
@@ -25,6 +25,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g | |||
25 | file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \ | 25 | file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \ |
26 | file://0001-include-libgen.h-for-basename.patch \ | 26 | file://0001-include-libgen.h-for-basename.patch \ |
27 | file://0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch \ | 27 | file://0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch \ |
28 | file://0001-libdirect-remove-use-of-keyword-register.patch \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | S = "${WORKDIR}/DirectFB-${PV}" | 31 | S = "${WORKDIR}/DirectFB-${PV}" |
@@ -40,21 +41,21 @@ BINCONFIG = "${bindir}/directfb-config" | |||
40 | 41 | ||
41 | inherit autotools binconfig-disabled pkgconfig | 42 | inherit autotools binconfig-disabled pkgconfig |
42 | 43 | ||
43 | PACKAGECONFIG ??= "linuxinput" | 44 | PACKAGECONFIG ??= "freetype linuxinput zlib" |
44 | PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" | ||
45 | PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" | 45 | PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" |
46 | PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" | 46 | PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype,freetype" |
47 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" | 47 | PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" |
48 | PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib" | 48 | PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa," |
49 | PACKAGECONFIG[linuxinput] = "--with-inputdrivers=linuxinput,," | 49 | PACKAGECONFIG[linuxinput] = "--with-inputdrivers=linuxinput,," |
50 | PACKAGECONFIG[noinput] = "--with-inputdrivers=none,," | 50 | PACKAGECONFIG[noinput] = "--with-inputdrivers=none,," |
51 | PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa," | 51 | PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" |
52 | PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib" | ||
53 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" | ||
52 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,xserver-xorg," | 54 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,xserver-xorg," |
55 | PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" | ||
53 | 56 | ||
54 | EXTRA_OECONF = "\ | 57 | EXTRA_OECONF = "\ |
55 | --with-gfxdrivers=none \ | 58 | --with-gfxdrivers=none \ |
56 | --enable-freetype=yes \ | ||
57 | --enable-zlib \ | ||
58 | --disable-imlib2 \ | 59 | --disable-imlib2 \ |
59 | --disable-sdl \ | 60 | --disable-sdl \ |
60 | --disable-vnc \ | 61 | --disable-vnc \ |
diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch new file mode 100644 index 000000000..24d977f4d --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From f6cdb9f1c3dbef8ef695703a2a5fb4e92b2dd8a0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Barth <simon.barth@gmx.de> | ||
3 | Date: Mon, 5 Aug 2024 19:35:16 +0200 | ||
4 | Subject: [PATCH] libdirect: remove use of keyword 'register' | ||
5 | |||
6 | The 'register' keyword was removed in C++17 and is now unused and | ||
7 | reserved. When compiling code that uses DirecthFB with C++17, | ||
8 | compilation fails. | ||
9 | |||
10 | Since modern compilers likely don't produce different code whether the | ||
11 | 'register' keyword is used or not, there shouldn't be any performance | ||
12 | impact introduced by this change. | ||
13 | |||
14 | Signed-off-by: Simon Barth <simon.barth@gmx.de> | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/deniskropp/DirectFB/pull/25] | ||
17 | --- | ||
18 | lib/direct/util.h | 4 ++-- | ||
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/lib/direct/util.h b/lib/direct/util.h | ||
22 | index 2109b6ca1..734645796 100644 | ||
23 | --- a/lib/direct/util.h | ||
24 | +++ b/lib/direct/util.h | ||
25 | @@ -220,7 +220,7 @@ void DIRECT_API direct_md5_sum( void *dst, const void *src, const int len ); | ||
26 | static __inline__ int | ||
27 | direct_util_count_bits( unsigned int mask ) | ||
28 | { | ||
29 | - register int ret = 0; | ||
30 | + int ret = 0; | ||
31 | |||
32 | while (mask) { | ||
33 | ret += mask & 1; | ||
34 | @@ -325,7 +325,7 @@ D_ICEIL(float f) | ||
35 | static __inline__ int | ||
36 | direct_log2( int val ) | ||
37 | { | ||
38 | - register int ret = 0; | ||
39 | + int ret = 0; | ||
40 | |||
41 | while (val >> ++ret); | ||
42 | |||
43 | -- | ||
44 | 2.25.1 | ||
diff --git a/meta-oe/recipes-graphics/feh/feh_3.10.2.bb b/meta-oe/recipes-graphics/feh/feh_3.10.3.bb index 2c38ce614..5ab333c60 100644 --- a/meta-oe/recipes-graphics/feh/feh_3.10.2.bb +++ b/meta-oe/recipes-graphics/feh/feh_3.10.3.bb | |||
@@ -9,7 +9,7 @@ DEPENDS = "\ | |||
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" | 11 | SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" |
12 | SRC_URI[sha256sum] = "5f94a77de25c5398876f0cf431612d782b842f4db154d2139b778c8f196e8969" | 12 | SRC_URI[sha256sum] = "5426e2799770217af1e01c2e8c182d9ca8687d84613321d8ab4a66fe4041e9c8" |
13 | 13 | ||
14 | inherit mime-xdg features_check | 14 | inherit mime-xdg features_check |
15 | # depends on virtual/libx11 | 15 | # depends on virtual/libx11 |
diff --git a/meta-oe/recipes-graphics/fontforge/libspiro_20221101.bb b/meta-oe/recipes-graphics/fontforge/libspiro_20240903.bb index 0adac8464..7e07906e1 100644 --- a/meta-oe/recipes-graphics/fontforge/libspiro_20221101.bb +++ b/meta-oe/recipes-graphics/fontforge/libspiro_20240903.bb | |||
@@ -7,7 +7,10 @@ LICENSE = "GPL-3.0-or-later" | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
8 | 8 | ||
9 | SRC_URI = "https://github.com/fontforge/libspiro/releases/download/${PV}/libspiro-dist-${PV}.tar.gz" | 9 | SRC_URI = "https://github.com/fontforge/libspiro/releases/download/${PV}/libspiro-dist-${PV}.tar.gz" |
10 | SRC_URI[sha256sum] = "5984fb5af3e4e1f927f3a74850b705a711fb86284802a5e6170b09786440e8be" | 10 | SRC_URI[sha256sum] = "1412a21b943c6e1db834ee2d74145aad20b3f62b12152d475613b8241d9cde10" |
11 | |||
12 | UPSTREAM_CHECK_URI = "https://github.com/fontforge/libspiro/releases" | ||
13 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+)" | ||
11 | 14 | ||
12 | inherit autotools | 15 | inherit autotools |
13 | 16 | ||
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch deleted file mode 100644 index 385bff8dd..000000000 --- a/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From e3bce98a60d6db3b719bbf5d71f732f9b86cb566 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 9 Feb 2019 08:28:09 -0800 | ||
4 | Subject: [PATCH] Explicit typecast to avoid implicit double to float | ||
5 | conversion | ||
6 | |||
7 | fixes compile errors e.g. | ||
8 | |||
9 | ../../ftgl-2.1.3~rc5/demo/simple.cpp:110:27: error: non-constant-expression cannot be narrowed from type 'double' to | ||
10 | 'float' in initializer list [-Wc++11-narrowing] | ||
11 | (t3 + 2.0) / 3, 0.3 }; | ||
12 | ^~~~~~~~~~~~~~ | ||
13 | Upstream-Status: Pending | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | demo/simple.cpp | 6 +++--- | ||
17 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/demo/simple.cpp b/demo/simple.cpp | ||
20 | index 532e862..aba55b4 100644 | ||
21 | --- a/demo/simple.cpp | ||
22 | +++ b/demo/simple.cpp | ||
23 | @@ -105,9 +105,9 @@ static void RenderScene(void) | ||
24 | float t2 = sin(n / 50 + 1); | ||
25 | float t3 = sin(n / 30 + 2); | ||
26 | |||
27 | - float ambient[4] = { (t1 + 2.0) / 3, | ||
28 | - (t2 + 2.0) / 3, | ||
29 | - (t3 + 2.0) / 3, 0.3 }; | ||
30 | + float ambient[4] = { float(t1 + 2.0) / 3, | ||
31 | + float(t2 + 2.0) / 3, | ||
32 | + float(t3 + 2.0) / 3, 0.3 }; | ||
33 | float diffuse[4] = { 1.0, 0.9, 0.9, 1.0 }; | ||
34 | float specular[4] = { 1.0, 0.7, 0.7, 1.0 }; | ||
35 | float position[4] = { 100.0, 100.0, 0.0, 1.0 }; | ||
36 | -- | ||
37 | 2.20.1 | ||
38 | |||
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch new file mode 100644 index 000000000..9c91b5be1 --- /dev/null +++ b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From d11219b681a080c71e33c51c9404c28b134e1745 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 21 Aug 2024 13:50:34 -0700 | ||
4 | Subject: [PATCH] Fix type mismatch with latest FreeType | ||
5 | |||
6 | This change is intrumented due to a type change in freetype [1] with release 2.13.3 | ||
7 | |||
8 | Fixes | ||
9 | | ../../git/src/FTVectoriser.cpp:171:15: error: cannot initialize a variable of type 'char *' with an rvalue of type 'unsigned char *' | ||
10 | | 171 | char* tagList = &outline.tags[startIndex]; | ||
11 | | | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
12 | |||
13 | [1] https://gitlab.freedesktop.org/freetype/freetype/-/commit/044d142be7b6a93b6940367a1bc5847451ff4775 | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/HamzaM3/ftgl/pull/1] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | src/FTVectoriser.cpp | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/src/FTVectoriser.cpp b/src/FTVectoriser.cpp | ||
22 | index 26e7da8..3610215 100644 | ||
23 | --- a/src/FTVectoriser.cpp | ||
24 | +++ b/src/FTVectoriser.cpp | ||
25 | @@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours() | ||
26 | for(int i = 0; i < ftContourCount; ++i) | ||
27 | { | ||
28 | FT_Vector* pointList = &outline.points[startIndex]; | ||
29 | - char* tagList = &outline.tags[startIndex]; | ||
30 | + char* tagList = (char*)&outline.tags[startIndex]; | ||
31 | |||
32 | endIndex = outline.contours[i]; | ||
33 | contourLength = (endIndex - startIndex) + 1; | ||
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch deleted file mode 100644 index e5ed0bdb8..000000000 --- a/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Sun, 23 Oct 2016 22:46:43 +0200 | ||
4 | Subject: [PATCH] use pkg-config to find freetype2 | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | --- | ||
13 | configure.ac | 9 +++++++-- | ||
14 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 53560ea..b5bb6a3 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup) | ||
21 | |||
22 | AC_PATH_X | ||
23 | |||
24 | -AC_CHECK_FT2([9.0.3],[], | ||
25 | - [AC_MSG_ERROR([FreeType2 is required to compile this library])]) | ||
26 | +PKG_CHECK_MODULES(FT2, freetype2, | ||
27 | + CFLAGS="$CFLAGS $FT2_CFLAGS" | ||
28 | + LIBS="$LIBS $FT2_LIBS", | ||
29 | + AC_MSG_ERROR([FreeType2 is required to compile this library]) | ||
30 | +) | ||
31 | +AC_SUBST([FT2_CFLAGS]) | ||
32 | +AC_SUBST([FT2_LIBS]) | ||
33 | |||
34 | AC_PATH_XTRA | ||
35 | |||
36 | -- | ||
37 | 2.5.5 | ||
38 | |||
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch deleted file mode 100644 index 830783e20..000000000 --- a/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Sun, 23 Oct 2016 23:54:14 +0200 | ||
4 | Subject: [PATCH] Makefile.am: remove useless and breaking code | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | --- | ||
13 | Makefile.am | 9 --------- | ||
14 | 1 file changed, 9 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile.am b/Makefile.am | ||
17 | index 89a8a7f..e582a34 100644 | ||
18 | --- a/Makefile.am | ||
19 | +++ b/Makefile.am | ||
20 | @@ -24,15 +24,6 @@ EXTRA_DIST = \ | ||
21 | m4 \ | ||
22 | $(NULL) | ||
23 | |||
24 | -# Print out an informative summary. | ||
25 | -all-local: | ||
26 | - @$(ECHO) "Done." | ||
27 | - @$(ECHO) | ||
28 | - @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \ | ||
29 | - $(ECHO) "---" ;\ | ||
30 | - $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\ | ||
31 | - fi | ||
32 | - @$(ECHO) | ||
33 | |||
34 | # Upload documentation | ||
35 | DOC = docs/html docs/latex/ftgl.pdf | ||
36 | -- | ||
37 | 2.5.5 | ||
38 | |||
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb b/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb deleted file mode 100644 index 65f72747c..000000000 --- a/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | SUMMARY = "OpenGL frontend to Freetype 2" | ||
2 | HOMEPAGE = "https://sourceforge.net/projects/ftgl/" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4" | ||
5 | |||
6 | inherit autotools pkgconfig features_check | ||
7 | |||
8 | REQUIRED_DISTRO_FEATURES = "opengl x11" | ||
9 | |||
10 | DEPENDS += " \ | ||
11 | freetype \ | ||
12 | freeglut \ | ||
13 | " | ||
14 | |||
15 | SRC_URI = " \ | ||
16 | ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | ||
17 | file://0001-use-pkg-config-to-find-freetype2.patch \ | ||
18 | file://0002-Makefile.am-remove-useless-and-breaking-code.patch \ | ||
19 | file://0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch \ | ||
20 | " | ||
21 | SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503" | ||
22 | SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59" | ||
23 | |||
24 | S = "${WORKDIR}/ftgl-2.1.3~rc5" | ||
25 | |||
26 | # undefined reference to symbol 'sin@@GLIBC_2.4' | ||
27 | CFLAGS += "-lm" | ||
diff --git a/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb b/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb new file mode 100644 index 000000000..4db453bc6 --- /dev/null +++ b/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "OpenGL frontend to Freetype 2" | ||
2 | HOMEPAGE = "https://sourceforge.net/projects/ftgl/" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4" | ||
5 | |||
6 | inherit autotools pkgconfig features_check | ||
7 | |||
8 | REQUIRED_DISTRO_FEATURES = "opengl x11" | ||
9 | |||
10 | DEPENDS += " \ | ||
11 | freetype \ | ||
12 | freeglut \ | ||
13 | " | ||
14 | SRCREV = "b787042cc1d1e4861337d5f9a6727e4c6900a4f2" | ||
15 | PV .= "+git" | ||
16 | |||
17 | SRC_URI = "git://github.com/HamzaM3/ftgl;protocol=https;branch=master \ | ||
18 | file://0001-Fix-type-mismatch-with-latest-FreeType.patch" | ||
19 | |||
20 | S = "${WORKDIR}/git" | ||
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 df349494a..fcf1bd9ca 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb +++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb | |||
@@ -72,6 +72,8 @@ EXTRA_OECONF = " \ | |||
72 | --without-xpm-library \ | 72 | --without-xpm-library \ |
73 | ac_cv_func_mkstemp=no \ | 73 | ac_cv_func_mkstemp=no \ |
74 | has_safety_mkstemp=yes \ | 74 | has_safety_mkstemp=yes \ |
75 | ac_cv_path_FVWM_CPP=cpp \ | ||
76 | ac_cv_path_PERL=perl \ | ||
75 | " | 77 | " |
76 | 78 | ||
77 | # show the exact commands in the log file | 79 | # show the exact commands in the log file |
@@ -90,6 +92,7 @@ do_install:append() { | |||
90 | sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${bindir}/fvwm-* | 92 | sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${bindir}/fvwm-* |
91 | sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${libexecdir}/fvwm/*/Fvwm* | 93 | sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${libexecdir}/fvwm/*/Fvwm* |
92 | sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/fvwm-menu-desktop | 94 | sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/fvwm-menu-desktop |
95 | sed -i -e 's:${WORKDIR}::g' ${D}${bindir}/fvwm-bug | ||
93 | } | 96 | } |
94 | 97 | ||
95 | # the only needed packages (note: locale packages are automatically generated | 98 | # the only needed packages (note: locale packages are automatically generated |
diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb index 513845194..aba590aa0 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb | |||
@@ -19,3 +19,8 @@ EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \ | |||
19 | --without-cdk \ | 19 | --without-cdk \ |
20 | " | 20 | " |
21 | 21 | ||
22 | INSANE_SKIP:${PN} = "already-stripped" | ||
23 | |||
24 | do_install:append() { | ||
25 | sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${bindir}/gphoto2 | ||
26 | } | ||
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 38d738310..7548e976f 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb | |||
@@ -30,6 +30,9 @@ SRC_URI:append:class-nativesdk = "\ | |||
30 | " | 30 | " |
31 | SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565" | 31 | SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565" |
32 | 32 | ||
33 | UPSTREAM_CHECK_URI = "https://graphviz.org/download/" | ||
34 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
35 | |||
33 | PACKAGECONFIG ??= "librsvg" | 36 | PACKAGECONFIG ??= "librsvg" |
34 | PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg" | 37 | PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg" |
35 | 38 | ||
diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb index 30964a1b9..a5c8de8f6 100644 --- a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb | |||
@@ -14,6 +14,9 @@ SRC_URI = "http://prdownloads.sourceforge.net/${BPN}/${BPN}_${PV}.tar.gz \ | |||
14 | SRC_URI[md5sum] = "4331dde4bb83865e15482885fcb0cc53" | 14 | SRC_URI[md5sum] = "4331dde4bb83865e15482885fcb0cc53" |
15 | SRC_URI[sha256sum] = "9704344e732038eecbd007dd996a56293a6b027b5b76f3f036273a3fae1ab27b" | 15 | SRC_URI[sha256sum] = "9704344e732038eecbd007dd996a56293a6b027b5b76f3f036273a3fae1ab27b" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gtkperf/files/gtkperf/" | ||
18 | UPSTREAM_CHECK_REGEX = "${BPN}_(?P<pver>\d+(\.\d+)+)" | ||
19 | |||
17 | DEPENDS = "gtk+" | 20 | DEPENDS = "gtk+" |
18 | 21 | ||
19 | S = "${WORKDIR}/${BPN}" | 22 | S = "${WORKDIR}/${BPN}" |
diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.119.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.120.bb index 0b1b05404..b7807c885 100644 --- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.119.bb +++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.120.bb | |||
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" |
7 | 7 | ||
8 | SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz" | 8 | SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz" |
9 | SRC_URI[sha256sum] = "eab3e09e7641115c07848bfb30f7dd0c3bbe2b8cbe45017e95e077dbba6ac038" | 9 | SRC_URI[sha256sum] = "5da94863fb2e5d88cc019e2bfdc676022398113894b585d864e11ca8341b24d8" |
10 | S = "${WORKDIR}/${BPN}-gtk3-${PV}" | 10 | S = "${WORKDIR}/${BPN}-gtk3-${PV}" |
11 | 11 | ||
12 | DEPENDS = " \ | 12 | DEPENDS = " \ |
diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb index 87e7ed4a6..8e5febd7a 100644 --- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb +++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb | |||
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" | |||
7 | 7 | ||
8 | DEPENDS = "freetype " | 8 | DEPENDS = "freetype " |
9 | PROVIDES = "virtual/imlib2" | 9 | PROVIDES = "virtual/imlib2" |
10 | PV = "1.12.2" | 10 | PV = "1.12.3" |
11 | SRCREV = "a860e34b19af6b0a73d86ddc0e4829145e18fa6e" | 11 | SRCREV = "143c60194c0948aac484d37bb23c59edea2ccf19" |
12 | 12 | ||
13 | inherit autotools pkgconfig lib_package | 13 | inherit autotools pkgconfig lib_package |
14 | 14 | ||
diff --git a/meta-oe/recipes-graphics/leptonica/leptonica_1.82.0.bb b/meta-oe/recipes-graphics/leptonica/leptonica_1.84.1.bb index c0a2b45a4..89a35116c 100644 --- a/meta-oe/recipes-graphics/leptonica/leptonica_1.82.0.bb +++ b/meta-oe/recipes-graphics/leptonica/leptonica_1.84.1.bb | |||
@@ -4,9 +4,10 @@ LICENSE = "BSD-2-Clause" | |||
4 | LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=809b282cea2df68975fbe0ffe02b560f" | 4 | LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=809b282cea2df68975fbe0ffe02b560f" |
5 | 5 | ||
6 | UPSTREAM_CHECK_URI = "https://github.com/DanBloomberg/leptonica/releases" | 6 | UPSTREAM_CHECK_URI = "https://github.com/DanBloomberg/leptonica/releases" |
7 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
7 | 8 | ||
8 | SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz" | 9 | SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz" |
9 | SRC_URI[sha256sum] = "155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6" | 10 | SRC_URI[sha256sum] = "2b3e1254b1cca381e77c819b59ca99774ff43530209b9aeb511e1d46588a64f6" |
10 | 11 | ||
11 | EXTRA_OECONF += " \ | 12 | EXTRA_OECONF += " \ |
12 | --without-libwebp \ | 13 | --without-libwebp \ |
diff --git a/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb index 251c07adf..db648ec8c 100644 --- a/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb +++ b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb | |||
@@ -24,3 +24,8 @@ DEPENDS = "libxpm jpeg libx11 virtual/libgl" | |||
24 | RDEPENDS:${PN} = "bash" | 24 | RDEPENDS:${PN} = "bash" |
25 | 25 | ||
26 | EXTRA_OECONF = "--with-extra-inc=${S}/lib" | 26 | EXTRA_OECONF = "--with-extra-inc=${S}/lib" |
27 | |||
28 | do_compile:append() { | ||
29 | sed -i -e 's|${B}|.|' ${B}/fd2ps/fd2ps | ||
30 | sed -i -e 's|${B}|.|' ${B}/fdesign/fdesign | ||
31 | } | ||
diff --git a/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb b/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb index ba928d281..f9d3496d9 100644 --- a/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb +++ b/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" | |||
13 | SRC_URI[md5sum] = "7e9a12ba2a99dff7e736902ea07383d4" | 13 | SRC_URI[md5sum] = "7e9a12ba2a99dff7e736902ea07383d4" |
14 | SRC_URI[sha256sum] = "cf112a1fb02f5b1c0fce5cab11ea8243852c139e669c44014125874b14b7dfaa" | 14 | SRC_URI[sha256sum] = "cf112a1fb02f5b1c0fce5cab11ea8243852c139e669c44014125874b14b7dfaa" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libmng/files/libmng-devel/" | ||
17 | UPSTREAM_CHECK_REGEX = "libmng-devel/(?P<pver>\d+(\.\d+)+)" | ||
18 | |||
16 | inherit autotools-brokensep pkgconfig | 19 | inherit autotools-brokensep pkgconfig |
17 | 20 | ||
18 | PACKAGECONFIG ??= "jpeg" | 21 | PACKAGECONFIG ??= "jpeg" |
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb index 666442fba..4f702029d 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb | |||
@@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d1de21f0b70830e299905eac3419084" | |||
6 | DEPENDS = "libsdl" | 6 | DEPENDS = "libsdl" |
7 | 7 | ||
8 | SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz" | 8 | SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz" |
9 | SRC_URI[md5sum] = "ea24ed4b82ff1304809c363494fa8e16" | 9 | SRC_URI[sha256sum] = "dfb15ac5f8ce7a4952dc12d2aed9747518c5e6b335c0e31636d23f93c630f419" |
10 | SRC_URI[sha256sum] = "556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0" | 10 | |
11 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sdlgfx/files/" | ||
11 | 12 | ||
12 | S = "${WORKDIR}/SDL_gfx-${PV}" | 13 | S = "${WORKDIR}/SDL_gfx-${PV}" |
13 | 14 | ||
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch deleted file mode 100644 index b29e5dc7b..000000000 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch +++ /dev/null | |||
@@ -1,176 +0,0 @@ | |||
1 | From b81fb7942ab77b0bf6791e5fd98411dd68f133d9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 18 Dec 2022 15:13:00 -0800 | ||
4 | Subject: [PATCH] libyui-ncurses: Replace off64_t with off_t and stat64 with stat | ||
5 | |||
6 | stat is same as stat64 when 64bit off_t is used. | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/88] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 2 +- | ||
12 | src/NCAskForFile.cc | 6 +++--- | ||
13 | src/NCFileSelection.cc | 24 ++++++++++++------------ | ||
14 | src/NCFileSelection.h | 6 +++--- | ||
15 | 4 files changed, 19 insertions(+), 19 deletions(-) | ||
16 | |||
17 | diff --git a/CMakeLists.txt b/libyui-ncurses/CMakeLists.txt | ||
18 | index b10eab8e..2000bb58 100644 | ||
19 | --- a/CMakeLists.txt | ||
20 | +++ b/CMakeLists.txt | ||
21 | @@ -58,7 +58,7 @@ set( CMAKE_INSTALL_MESSAGE LAZY ) # Suppress "up-to-date" messages during "make | ||
22 | # Initialize compiler flags for all targets in all subdirectories | ||
23 | add_compile_options( "-Wall" ) | ||
24 | add_compile_options( "-Os" ) # Optimize for size (overrides CMake's -O3 in RELEASE builds) | ||
25 | - | ||
26 | +add_compile_options( "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ) # Enable largefile support | ||
27 | if ( WERROR ) | ||
28 | add_compile_options( "-Werror" ) | ||
29 | endif() | ||
30 | diff --git a/src/NCAskForFile.cc b/libyui-ncurses/src/NCAskForFile.cc | ||
31 | index aba6e0a6..44bb81bc 100644 | ||
32 | --- a/src/NCAskForFile.cc | ||
33 | +++ b/src/NCAskForFile.cc | ||
34 | @@ -73,8 +73,8 @@ std::string NCAskForFile::checkIniDir( std::string iniDir ) | ||
35 | { | ||
36 | std::string dname = ""; | ||
37 | |||
38 | - struct stat64 statInfo; | ||
39 | - stat64( iniDir.c_str(), &statInfo ); | ||
40 | + struct stat statInfo; | ||
41 | + stat( iniDir.c_str(), &statInfo ); | ||
42 | |||
43 | if ( S_ISDIR( statInfo.st_mode ) ) | ||
44 | { | ||
45 | @@ -90,7 +90,7 @@ std::string NCAskForFile::checkIniDir( std::string iniDir ) | ||
46 | && pos != 0 ) | ||
47 | { | ||
48 | std::string dir = iniDir.substr( 0, pos ); | ||
49 | - stat64( dir.c_str(), &statInfo ); | ||
50 | + stat( dir.c_str(), &statInfo ); | ||
51 | |||
52 | if ( S_ISDIR( statInfo.st_mode ) ) | ||
53 | { | ||
54 | diff --git a/src/NCFileSelection.cc b/libyui-ncurses/src/NCFileSelection.cc | ||
55 | index 3eb9c908..8894dc72 100644 | ||
56 | --- a/src/NCFileSelection.cc | ||
57 | +++ b/src/NCFileSelection.cc | ||
58 | @@ -46,7 +46,7 @@ using std::list; | ||
59 | |||
60 | |||
61 | NCFileInfo::NCFileInfo( string fileName, | ||
62 | - struct stat64 * statInfo, | ||
63 | + struct stat * statInfo, | ||
64 | bool link ) | ||
65 | { | ||
66 | _name = fileName; | ||
67 | @@ -146,7 +146,7 @@ NCFileInfo::NCFileInfo() | ||
68 | _mode = ( mode_t )0; | ||
69 | _device = ( dev_t )0; | ||
70 | _links = ( nlink_t )0; | ||
71 | - _size = ( off64_t )0; | ||
72 | + _size = ( off_t )0; | ||
73 | _mtime = ( time_t )0; | ||
74 | } | ||
75 | |||
76 | @@ -177,11 +177,11 @@ NCFileSelection::NCFileSelection( YWidget * parent, | ||
77 | { | ||
78 | SetSepChar( ' ' ); | ||
79 | |||
80 | - struct stat64 statInfo; | ||
81 | + struct stat statInfo; | ||
82 | |||
83 | if ( !iniDir.empty() ) | ||
84 | { | ||
85 | - stat64( iniDir.c_str(), &statInfo ); | ||
86 | + stat( iniDir.c_str(), &statInfo ); | ||
87 | } | ||
88 | |||
89 | if ( iniDir.empty() | ||
90 | @@ -559,8 +559,8 @@ NCursesEvent NCFileTable::wHandleInput( wint_t key ) | ||
91 | bool NCFileTable::fillList() | ||
92 | { | ||
93 | |||
94 | - struct stat64 statInfo; | ||
95 | - struct stat64 linkInfo; | ||
96 | + struct stat statInfo; | ||
97 | + struct stat linkInfo; | ||
98 | struct dirent * entry; | ||
99 | list<string> tmpList; | ||
100 | list<string>::iterator it; | ||
101 | @@ -592,7 +592,7 @@ bool NCFileTable::fillList() | ||
102 | { | ||
103 | string fullName = currentDir + "/" + ( *it ); | ||
104 | |||
105 | - if ( lstat64( fullName.c_str(), &statInfo ) == 0 ) | ||
106 | + if ( lstat( fullName.c_str(), &statInfo ) == 0 ) | ||
107 | { | ||
108 | if ( S_ISREG( statInfo.st_mode ) || S_ISBLK( statInfo.st_mode ) ) | ||
109 | { | ||
110 | @@ -604,7 +604,7 @@ bool NCFileTable::fillList() | ||
111 | } | ||
112 | else if ( S_ISLNK( statInfo.st_mode ) ) | ||
113 | { | ||
114 | - if ( stat64( fullName.c_str(), &linkInfo ) == 0 ) | ||
115 | + if ( stat( fullName.c_str(), &linkInfo ) == 0 ) | ||
116 | { | ||
117 | if ( S_ISREG( linkInfo.st_mode ) || S_ISBLK( linkInfo.st_mode ) ) | ||
118 | { | ||
119 | @@ -701,8 +701,8 @@ void NCDirectoryTable::fillHeader() | ||
120 | |||
121 | bool NCDirectoryTable::fillList() | ||
122 | { | ||
123 | - struct stat64 statInfo; | ||
124 | - struct stat64 linkInfo; | ||
125 | + struct stat statInfo; | ||
126 | + struct stat linkInfo; | ||
127 | struct dirent * entry; | ||
128 | list<string> tmpList; | ||
129 | list<string>::iterator it; | ||
130 | @@ -734,7 +734,7 @@ bool NCDirectoryTable::fillList() | ||
131 | { | ||
132 | string fullName = currentDir + "/" + ( *it ); | ||
133 | |||
134 | - if ( lstat64( fullName.c_str(), &statInfo ) == 0 ) | ||
135 | + if ( lstat( fullName.c_str(), &statInfo ) == 0 ) | ||
136 | { | ||
137 | if ( S_ISDIR( statInfo.st_mode ) ) | ||
138 | { | ||
139 | @@ -746,7 +746,7 @@ bool NCDirectoryTable::fillList() | ||
140 | } | ||
141 | else if ( S_ISLNK( statInfo.st_mode ) ) | ||
142 | { | ||
143 | - if ( stat64( fullName.c_str(), &linkInfo ) == 0 ) | ||
144 | + if ( stat( fullName.c_str(), &linkInfo ) == 0 ) | ||
145 | { | ||
146 | if ( S_ISDIR( linkInfo.st_mode ) ) | ||
147 | { | ||
148 | diff --git a/src/NCFileSelection.h b/libyui-ncurses/src/NCFileSelection.h | ||
149 | index 0569215d..5c459d62 100644 | ||
150 | --- a/src/NCFileSelection.h | ||
151 | +++ b/src/NCFileSelection.h | ||
152 | @@ -44,10 +44,10 @@ | ||
153 | struct NCFileInfo | ||
154 | { | ||
155 | /** | ||
156 | - * Constructor from a stat buffer (i.e. based on an lstat64() call). | ||
157 | + * Constructor from a stat buffer (i.e. based on an lstat() call). | ||
158 | **/ | ||
159 | NCFileInfo( std::string fileName, | ||
160 | - struct stat64 * statInfo, | ||
161 | + struct stat * statInfo, | ||
162 | bool link = false ); | ||
163 | |||
164 | NCFileInfo(); | ||
165 | @@ -65,7 +65,7 @@ struct NCFileInfo | ||
166 | dev_t _device; // device this object resides on | ||
167 | mode_t _mode; // file permissions + object type | ||
168 | nlink_t _links; // number of links | ||
169 | - off64_t _size; // size in bytes | ||
170 | + off_t _size; // size in bytes | ||
171 | time_t _mtime; // modification time | ||
172 | |||
173 | bool isDir() { return (( S_ISDIR( _mode ) ) ? true : false ); } | ||
174 | -- | ||
175 | 2.39.0 | ||
176 | |||
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.2.3.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb index bcc5ef33e..4196449f3 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.2.3.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb | |||
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad0 | |||
5 | " | 5 | " |
6 | 6 | ||
7 | SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \ | 7 | SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \ |
8 | file://0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch \ | ||
9 | " | 8 | " |
10 | 9 | ||
11 | SRC_URI:append:class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" | 10 | SRC_URI:append:class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" |
12 | 11 | ||
13 | SRCREV = "dabdcd9cc6a0058fd6966d7d2e19d508debcc0ac" | 12 | SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516" |
14 | 13 | ||
15 | S = "${WORKDIR}/git/libyui-ncurses" | 14 | S = "${WORKDIR}/git/libyui-ncurses" |
16 | 15 | ||
@@ -20,9 +19,16 @@ DEPENDS += "boost libyui ncurses" | |||
20 | 19 | ||
21 | BBCLASSEXTEND = "nativesdk" | 20 | BBCLASSEXTEND = "nativesdk" |
22 | 21 | ||
23 | EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" | 22 | EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release -DWERROR=OFF -DCMAKE_SKIP_RPATH=1" |
23 | |||
24 | # TODO: Check with newer GCC, it works ok with GCC | ||
25 | # GCC-14 causes buildpaths QA error | ||
26 | # WARNING: libyui-ncurses-4.6.2-r0 do_package_qa: QA Issue: File /usr/lib/yui/.debug/libyui-ncurses.so.16.0.0 in package libyui-ncurses-dbg contains reference to TMPDIR [buildpaths | ||
27 | |||
28 | DEBUG_LEVELFLAG = "" | ||
24 | 29 | ||
25 | CXXFLAGS += "-DNCURSES_WIDECHAR" | 30 | CXXFLAGS += "-DNCURSES_WIDECHAR" |
31 | LDFLAGS += "-L${B}/src" | ||
26 | 32 | ||
27 | do_configure:prepend () { | 33 | do_configure:prepend () { |
28 | cd ${S} | 34 | cd ${S} |
diff --git a/meta-oe/recipes-graphics/libyui/libyui_4.2.3.bb b/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb index 939f3f36e..419a9522a 100644 --- a/meta-oe/recipes-graphics/libyui/libyui_4.2.3.bb +++ b/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \ | |||
10 | file://0001-Use-relative-install-paths-for-CMake.patch \ | 10 | file://0001-Use-relative-install-paths-for-CMake.patch \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRCREV = "dabdcd9cc6a0058fd6966d7d2e19d508debcc0ac" | 13 | SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516" |
14 | 14 | ||
15 | S = "${WORKDIR}/git/libyui" | 15 | S = "${WORKDIR}/git/libyui" |
16 | 16 | ||
@@ -20,6 +20,7 @@ DEPENDS += "boost" | |||
20 | 20 | ||
21 | EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" | 21 | EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" |
22 | 22 | ||
23 | LDFLAGS += "-L${B}/src" | ||
23 | BBCLASSEXTEND = "native nativesdk" | 24 | BBCLASSEXTEND = "native nativesdk" |
24 | 25 | ||
25 | do_install:append () { | 26 | do_install:append () { |
diff --git a/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch b/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch index bd619b157..0bfc3f3e7 100644 --- a/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch +++ b/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch | |||
@@ -10,7 +10,7 @@ the case, e.g. the lv_demo_fb uses encoded images which are of type | |||
10 | LV_IMAGE_SRC_VARIABLE and instead of filename, come with a buffer of | 10 | LV_IMAGE_SRC_VARIABLE and instead of filename, come with a buffer of |
11 | pixels. Handle the later using SDL_CreateRGBSurfaceFrom(). | 11 | pixels. Handle the later using SDL_CreateRGBSurfaceFrom(). |
12 | 12 | ||
13 | Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/5852] | 13 | Upstream-Status: Backport [b339e67581864b2fb6bb8897735a1e110c324ddc] |
14 | Signed-off-by: Marek Vasut <marex@denx.de> | 14 | Signed-off-by: Marek Vasut <marex@denx.de> |
15 | --- | 15 | --- |
16 | src/draw/sdl/lv_draw_sdl.c | 30 +++++++++++++++++++++++++++--- | 16 | src/draw/sdl/lv_draw_sdl.c | 30 +++++++++++++++++++++++++++--- |
diff --git a/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch b/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch index 73c01cb59..7e542bcfb 100644 --- a/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch +++ b/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch | |||
@@ -9,7 +9,7 @@ case it is, use it as the video card file in lv_linux_fbdev_set_file(). | |||
9 | Otherwise fall back to /dev/fb0, i.e. the current behavior. This way, | 9 | Otherwise fall back to /dev/fb0, i.e. the current behavior. This way, |
10 | it is possible to test LVGL on systems with multiple fbdev devices. | 10 | it is possible to test LVGL on systems with multiple fbdev devices. |
11 | 11 | ||
12 | Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47] | 12 | Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] |
13 | Signed-off-by: Marek Vasut <marex@denx.de> | 13 | Signed-off-by: Marek Vasut <marex@denx.de> |
14 | --- | 14 | --- |
15 | main.c | 8 +++++++- | 15 | main.c | 8 +++++++- |
diff --git a/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch b/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch index d24d150c0..6843af0aa 100644 --- a/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch +++ b/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch | |||
@@ -8,7 +8,7 @@ around it, so it can be conditionally compiled in. This is done in | |||
8 | preparation for addition of other backend initialization example | 8 | preparation for addition of other backend initialization example |
9 | code. | 9 | code. |
10 | 10 | ||
11 | Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47] | 11 | Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] |
12 | Signed-off-by: Marek Vasut <marex@denx.de> | 12 | Signed-off-by: Marek Vasut <marex@denx.de> |
13 | --- | 13 | --- |
14 | main.c | 18 ++++++++++++++---- | 14 | main.c | 18 ++++++++++++++---- |
diff --git a/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch b/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch index 9ee7a7f19..2d2c4c60f 100644 --- a/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch +++ b/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch | |||
@@ -13,7 +13,7 @@ To use DRM/KMS support, adjust lv_conf.h as follows: | |||
13 | LV_USE_LINUX_FBDEV=0 | 13 | LV_USE_LINUX_FBDEV=0 |
14 | LV_USE_LINUX_DRM=1 | 14 | LV_USE_LINUX_DRM=1 |
15 | 15 | ||
16 | Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47] | 16 | Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] |
17 | Signed-off-by: Marek Vasut <marex@denx.de> | 17 | Signed-off-by: Marek Vasut <marex@denx.de> |
18 | --- | 18 | --- |
19 | CMakeLists.txt | 5 ++++- | 19 | CMakeLists.txt | 5 ++++- |
diff --git a/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch b/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch index 691ee80b5..cfb6c6e81 100644 --- a/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch +++ b/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch | |||
@@ -22,7 +22,7 @@ LV_USE_LINUX_FBDEV=0 | |||
22 | LV_USE_LINUX_DRM=0 | 22 | LV_USE_LINUX_DRM=0 |
23 | LV_USE_SDL=1 | 23 | LV_USE_SDL=1 |
24 | 24 | ||
25 | Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47] | 25 | Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] |
26 | Signed-off-by: Marek Vasut <marex@denx.de> | 26 | Signed-off-by: Marek Vasut <marex@denx.de> |
27 | --- | 27 | --- |
28 | CMakeLists.txt | 6 +++++- | 28 | CMakeLists.txt | 6 +++++- |
diff --git a/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch b/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch index 6997d8415..f5d39396f 100644 --- a/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch +++ b/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch | |||
@@ -7,10 +7,10 @@ Add missing version suffix to shared libraries. Currently the filename of | |||
7 | generated shared libraries is only liblvgl.so, which prevents coexistence | 7 | generated shared libraries is only liblvgl.so, which prevents coexistence |
8 | of different versions of LVGL on the same system. Set VERSION and SOVERSION | 8 | of different versions of LVGL on the same system. Set VERSION and SOVERSION |
9 | to make cmake add the version suffix to generated shared libraries. That | 9 | to make cmake add the version suffix to generated shared libraries. That |
10 | changes the filename to liblvgl.so.9.0.0 and includes symlink with major | 10 | changes the filename to liblvgl.so.9.1.0 and includes symlink with major |
11 | ABI version, i.e. liblvgl.so.9 . | 11 | ABI version, i.e. liblvgl.so.9 . |
12 | 12 | ||
13 | Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/5865] | 13 | Upstream-Status: Backport [2c469279f53f9dee63d71295c6058749bc87ce73] |
14 | Signed-off-by: Marek Vasut <marex@denx.de> | 14 | Signed-off-by: Marek Vasut <marex@denx.de> |
15 | --- | 15 | --- |
16 | env_support/cmake/custom.cmake | 11 +++++++++++ | 16 | env_support/cmake/custom.cmake | 11 +++++++++++ |
@@ -21,7 +21,7 @@ index 9800468eb..6f33f1cc8 100644 | |||
21 | --- a/env_support/cmake/custom.cmake | 21 | --- a/env_support/cmake/custom.cmake |
22 | +++ b/env_support/cmake/custom.cmake | 22 | +++ b/env_support/cmake/custom.cmake |
23 | @@ -1,3 +1,6 @@ | 23 | @@ -1,3 +1,6 @@ |
24 | +set(LVGL_VERSION "9.0.0") | 24 | +set(LVGL_VERSION "9.1.0") |
25 | +set(LVGL_SOVERSION "9") | 25 | +set(LVGL_SOVERSION "9") |
26 | + | 26 | + |
27 | # Option to define LV_LVGL_H_INCLUDE_SIMPLE, default: ON | 27 | # Option to define LV_LVGL_H_INCLUDE_SIMPLE, default: ON |
diff --git a/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch b/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch index 449db53df..5cafb41d5 100644 --- a/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch +++ b/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch | |||
@@ -6,7 +6,7 @@ Subject: [PATCH] fix(fbdev): set resolution prior to buffer | |||
6 | Otherwise it ends up with using the default value 800x480 and may fail | 6 | Otherwise it ends up with using the default value 800x480 and may fail |
7 | at lv_display_set_buffers due to incorrect resolution. | 7 | at lv_display_set_buffers due to incorrect resolution. |
8 | 8 | ||
9 | Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/6004] | 9 | Upstream-Status: Backport [29662d1c357c15135d076a2a924b9ef056c82120] |
10 | Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com> | 10 | Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com> |
11 | --- | 11 | --- |
12 | 12 | ||
diff --git a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.0.bb b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb index c9c4a6c27..9065050c6 100644 --- a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.0.bb +++ b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb | |||
@@ -4,9 +4,9 @@ HOMEPAGE = "https://github.com/any1/neatvnc" | |||
4 | LICENSE = "ISC" | 4 | LICENSE = "ISC" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=94fc374e7174f41e3afe0f027ee59ff7" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=94fc374e7174f41e3afe0f027ee59ff7" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/any1/neatvnc;branch=master;protocol=https" | 7 | SRC_URI = "git://github.com/any1/neatvnc;branch=v0.8;protocol=https" |
8 | 8 | ||
9 | SRCREV = "46432ce8cade0b54a38d4bb42eb07f96c8ff49fd" | 9 | SRCREV = "07081567ab21a2b099ceb41ae8cab872a31cbb9a" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
diff --git a/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch b/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch new file mode 100644 index 000000000..8bc2b80f6 --- /dev/null +++ b/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From d41128e5a1002af41c976c8860f8299cfcd3cd72 Mon Sep 17 00:00:00 2001 | ||
2 | From: pldubouilh <pldubouilh@gmail.com> | ||
3 | Date: Fri, 17 Mar 2023 18:23:47 +0100 | ||
4 | Subject: [PATCH] Fix list traversal issue in client_calc_layer | ||
5 | |||
6 | The calls to client_calc_layer_internal can modify stacking_list, which | ||
7 | can cause us to follow dangling ->next pointers (either by the pointer | ||
8 | itself already being freed, or it pointing to a freed area). Avoid this | ||
9 | by copying the list first, the goal is to visit every client in the list | ||
10 | once so this should be fine. | ||
11 | |||
12 | Upstream-Status: Backport [http://git.openbox.org/?p=mikachu/openbox.git;a=commit;h=d41128e5a1002af41c976c8860f8299cfcd3cd72] | ||
13 | Signed-off-by: Alexandre Videgrain <alexandre.videgrain@smile.fr> | ||
14 | --- | ||
15 | openbox/client.c | 9 +++++++-- | ||
16 | 1 file changed, 7 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/openbox/client.c b/openbox/client.c | ||
19 | index 7168b240..b8264587 100644 | ||
20 | --- a/openbox/client.c | ||
21 | +++ b/openbox/client.c | ||
22 | @@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self) | ||
23 | void client_calc_layer(ObClient *self) | ||
24 | { | ||
25 | GList *it; | ||
26 | + /* the client_calc_layer_internal calls below modify stacking_list, | ||
27 | + so we have to make a copy to iterate over */ | ||
28 | + GList *list = g_list_copy(stacking_list); | ||
29 | |||
30 | /* skip over stuff above fullscreen layer */ | ||
31 | - for (it = stacking_list; it; it = g_list_next(it)) | ||
32 | + for (it = list; it; it = g_list_next(it)) | ||
33 | if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; | ||
34 | |||
35 | /* find the windows in the fullscreen layer, and mark them not-visited */ | ||
36 | @@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self) | ||
37 | client_calc_layer_internal(self); | ||
38 | |||
39 | /* skip over stuff above fullscreen layer */ | ||
40 | - for (it = stacking_list; it; it = g_list_next(it)) | ||
41 | + for (it = list; it; it = g_list_next(it)) | ||
42 | if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; | ||
43 | |||
44 | /* now recalc any windows in the fullscreen layer which have not | ||
45 | @@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self) | ||
46 | !WINDOW_AS_CLIENT(it->data)->visited) | ||
47 | client_calc_layer_internal(it->data); | ||
48 | } | ||
49 | + | ||
50 | + g_list_free(it); | ||
51 | } | ||
52 | |||
53 | gboolean client_should_show(ObClient *self) | ||
54 | -- | ||
55 | 2.34.1 | ||
56 | |||
diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index 9a1507731..50231602d 100644 --- a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb | |||
@@ -8,11 +8,15 @@ SRC_URI = " \ | |||
8 | http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \ | 8 | http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \ |
9 | file://0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch \ | 9 | file://0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch \ |
10 | file://0001-openbox-xdg-autostart-convert-to-python3.patch \ | 10 | file://0001-openbox-xdg-autostart-convert-to-python3.patch \ |
11 | file://0001-Fix-list-traversal-issue-in-client_calc_layer.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204" | 14 | SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204" |
14 | SRC_URI[sha256sum] = "8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7" | 15 | SRC_URI[sha256sum] = "8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7" |
15 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://github.com/Mikachu/openbox/tags" | ||
18 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
19 | |||
16 | inherit autotools gettext update-alternatives pkgconfig features_check | 20 | inherit autotools gettext update-alternatives pkgconfig features_check |
17 | # depends on virtual/libx11 | 21 | # depends on virtual/libx11 |
18 | REQUIRED_DISTRO_FEATURES = "x11" | 22 | REQUIRED_DISTRO_FEATURES = "x11" |
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch index 0ba13cf88..2e25ecc7e 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4681de07e21f17aa28710d3a51fabe7da60463f9 Mon Sep 17 00:00:00 2001 | 1 | From 805ce4d40c5aaae12aa73452ff07babe8eb43a62 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
3 | Date: Fri, 28 Sep 2018 00:38:50 +0200 | 3 | Date: Fri, 28 Sep 2018 00:38:50 +0200 |
4 | Subject: [PATCH] Do not ask cmake to export binaries - they don't make it | 4 | Subject: [PATCH] Do not ask cmake to export binaries - they don't make it |
@@ -15,17 +15,17 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | |||
15 | 1 file changed, 1 deletion(-) | 15 | 1 file changed, 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt | 17 | diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt |
18 | index 4324c36d..2c11fe02 100644 | 18 | index 26156bcb..9eff04aa 100644 |
19 | --- a/src/bin/jp2/CMakeLists.txt | 19 | --- a/src/bin/jp2/CMakeLists.txt |
20 | +++ b/src/bin/jp2/CMakeLists.txt | 20 | +++ b/src/bin/jp2/CMakeLists.txt |
21 | @@ -66,7 +66,6 @@ foreach(exe opj_decompress opj_compress opj_dump) | 21 | @@ -64,7 +64,6 @@ foreach(exe opj_decompress opj_compress opj_dump) |
22 | endif() | 22 | endif() |
23 | # Install exe | 23 | # Install exe |
24 | install(TARGETS ${exe} | 24 | install(TARGETS ${exe} |
25 | - EXPORT OpenJPEGTargets | 25 | - EXPORT OpenJPEGTargets |
26 | DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications | 26 | DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications |
27 | ) | 27 | ) |
28 | if(OPJ_USE_DSYMUTIL) | 28 | if(OPJ_USE_DSYMUTIL) |
29 | -- | 29 | -- |
30 | 2.14.4 | 30 | 2.25.1 |
31 | 31 | ||
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb index f2d74078e..45f1b5ef4 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb | |||
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" | |||
6 | DEPENDS = "libpng tiff lcms zlib" | 6 | DEPENDS = "libpng tiff lcms zlib" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ | 8 | SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ |
9 | file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ | 9 | file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ |
10 | " | 10 | " |
11 | SRCREV = "a5891555eb49ed7cc26b2901ea680acda136d811" | 11 | SRCREV = "39e8c50a2f9bdcf36810ee3d41bcbf1cc78968ae" |
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | inherit cmake | 14 | inherit cmake |
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch new file mode 100644 index 000000000..1c714f84d --- /dev/null +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 4eb26927eebebfc4df8789ba69f60f3c28b8ba33 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 2 Jul 2024 23:36:23 -0700 | ||
4 | Subject: [PATCH] jpeg-compressor: Reorder stdio.h include location | ||
5 | |||
6 | Current, location ends up with compile errors with clang and glibc 2.40 | ||
7 | fortified headers | ||
8 | |||
9 | | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/renderdoc/1.33/recipe-sysroot/usr/include/bits/stdio2.h:128:13: error: use of undeclared identifier '__builtin___vfprintf_chk'; did you mean '__builtin___sprintf_chk'? | ||
10 | | 128 | int __r = __builtin___vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, | ||
11 | | | ^ | ||
12 | | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/renderdoc/1.33/recipe-sysroot/usr/include/bits/stdio2.h:128:39: error: cannot initialize a parameter of type 'char *' with an lvalue of type 'FILE *const __restrict' (aka 'jpge::_IO_FILE *const __restrict') | ||
13 | | 128 | int __r = __builtin___vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, | ||
14 | | | ^~~~~~~~ | ||
15 | |||
16 | This re-ordering ensures that fortified function prototypes are used correctly. | ||
17 | |||
18 | Upstream-Status: Submitted [https://github.com/baldurk/renderdoc/pull/3369] | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | --- | ||
21 | renderdoc/3rdparty/jpeg-compressor/jpge.cpp | 2 +- | ||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/renderdoc/3rdparty/jpeg-compressor/jpge.cpp b/renderdoc/3rdparty/jpeg-compressor/jpge.cpp | ||
25 | index 74d9d1006..d58e41664 100644 | ||
26 | --- a/renderdoc/3rdparty/jpeg-compressor/jpge.cpp | ||
27 | +++ b/renderdoc/3rdparty/jpeg-compressor/jpge.cpp | ||
28 | @@ -10,6 +10,7 @@ | ||
29 | |||
30 | #include "jpge.h" | ||
31 | |||
32 | +#include <stdio.h> | ||
33 | #include <stdlib.h> | ||
34 | #include <string.h> | ||
35 | |||
36 | @@ -897,7 +898,6 @@ bool jpeg_encoder::process_scanline(const void* pScanline) | ||
37 | } | ||
38 | |||
39 | // Higher level wrappers/examples (optional). | ||
40 | -#include <stdio.h> | ||
41 | |||
42 | class cfile_stream : public output_stream | ||
43 | { | ||
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb index 58f227573..833845b5a 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb | |||
@@ -2,11 +2,12 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd" | |||
2 | DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" | 2 | DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" |
3 | HOMEPAGE = "https://github.com/baldurk/renderdoc" | 3 | HOMEPAGE = "https://github.com/baldurk/renderdoc" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=36d34a46cb71546195d2b0c626a52e5d" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5536c2b72eeed14bafaf4d2a6c032b87" |
6 | 6 | ||
7 | SRCREV = "35b13a8e8fd2a331854dba6da81a20452e142d6f" | 7 | SRCREV = "cae289323847ce0a84a0deca4958183567eee17e" |
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
9 | git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ | 9 | git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ |
10 | file://0001-jpeg-compressor-Reorder-stdio.h-include-location.patch \ | ||
10 | " | 11 | " |
11 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
12 | 13 | ||
diff --git a/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb b/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb index 161650f75..f2ffee64f 100644 --- a/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb +++ b/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb | |||
@@ -11,6 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2" | |||
11 | SRC_URI[md5sum] = "ae95dbbacc2620e032acea8abab8c9ef" | 11 | SRC_URI[md5sum] = "ae95dbbacc2620e032acea8abab8c9ef" |
12 | SRC_URI[sha256sum] = "36548a588b2d466913423245dda6ffb6313132cd0cec635a117d37b3dab5fd4c" | 12 | SRC_URI[sha256sum] = "36548a588b2d466913423245dda6ffb6313132cd0cec635a117d37b3dab5fd4c" |
13 | 13 | ||
14 | UPSTREAM_CHECK_REGEX = "files/v(?P<pver>\d+(\.\d+)+)" | ||
15 | |||
14 | inherit autotools features_check | 16 | inherit autotools features_check |
15 | 17 | ||
16 | REQUIRED_DISTRO_FEATURES = "x11" | 18 | REQUIRED_DISTRO_FEATURES = "x11" |
diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_5.3.4.bb b/meta-oe/recipes-graphics/tesseract/tesseract_5.4.1.bb index b32bf3451..1177e34cd 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract_5.3.4.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract_5.4.1.bb | |||
@@ -5,7 +5,7 @@ BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues" | |||
5 | LICENSE = "Apache-2.0" | 5 | LICENSE = "Apache-2.0" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
7 | 7 | ||
8 | SRCREV = "8ee020e14cf5be4e3f0e9beb09b6b050a1871854" | 8 | SRCREV = "b5f279ec7582dc57f6464557ed938558791f200d" |
9 | SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https" | 9 | SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
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 e7ec00405..15449b216 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 | |||
@@ -14,6 +14,9 @@ SRC_URI = " \ | |||
14 | SRC_URI[sha256sum] = "da2ac159497d31b0c6d9daa8fc390fb8252e75b4a9805ace6a2c9cccaed4932e" | 14 | SRC_URI[sha256sum] = "da2ac159497d31b0c6d9daa8fc390fb8252e75b4a9805ace6a2c9cccaed4932e" |
15 | S = "${WORKDIR}/source-code-pro-2.030R-ro-1.050R-it" | 15 | S = "${WORKDIR}/source-code-pro-2.030R-ro-1.050R-it" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://github.com/adobe-fonts/source-code-pro/tags" | ||
18 | UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+\.\d+)R" | ||
19 | |||
17 | do_install() { | 20 | do_install() { |
18 | install -d ${D}${sysconfdir}/fonts/conf.d/ | 21 | install -d ${D}${sysconfdir}/fonts/conf.d/ |
19 | install -m 0644 ${UNPACKDIR}/44-source-code-pro-fonts-fontconfig.conf ${D}${sysconfdir}/fonts/conf.d/ | 22 | install -m 0644 ${UNPACKDIR}/44-source-code-pro-fonts-fontconfig.conf ${D}${sysconfdir}/fonts/conf.d/ |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.100.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.201.bb index bce37a2e0..1253cf883 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.100.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.201.bb | |||
@@ -3,13 +3,15 @@ require ttf.inc | |||
3 | SUMMARY = "Ethiopia and Eritrea (Amharic) font - TTF Edition" | 3 | SUMMARY = "Ethiopia and Eritrea (Amharic) font - TTF Edition" |
4 | HOMEPAGE = "http://software.sil.org/abyssinica/" | 4 | HOMEPAGE = "http://software.sil.org/abyssinica/" |
5 | LICENSE = "OFL-1.1" | 5 | LICENSE = "OFL-1.1" |
6 | LIC_FILES_CHKSUM = "file://OFL.txt;md5=fd664aaab50445c3c1c97544554a6bda" | 6 | LIC_FILES_CHKSUM = "file://OFL.txt;md5=347eaa34fdf555aaf6b2144a5ccca45b" |
7 | 7 | ||
8 | SRCNAME = "AbyssinicaSIL" | 8 | SRCNAME = "AbyssinicaSIL" |
9 | SRC_URI = "http://software.sil.org/downloads/r/abyssinica/${SRCNAME}-${PV}.zip" | 9 | SRC_URI = "http://software.sil.org/downloads/r/abyssinica/${SRCNAME}-${PV}.zip" |
10 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 10 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "1a1fc8e82f0c0f2e824f42bff05c1f4a0356330a89dc7ba798c1a20bc3e333e0" | 12 | UPSTREAM_CHECK_URI = "https://software.sil.org/abyssinica/download/" |
13 | |||
14 | SRC_URI[sha256sum] = "961259a1d9ace083f737eb1e55cec40c9a56f4855866d7474bf212d2a4366ab8" | ||
13 | 15 | ||
14 | FONT_PACKAGES = "${PN}" | 16 | FONT_PACKAGES = "${PN}" |
15 | FILES:${PN} = "${datadir}" | 17 | FILES:${PN} = "${datadir}" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb index d118769cc..0c29a20cd 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = "https://assets.ubuntu.com/v1/${SHA1SUM}-ubuntu-font-family-${PV}.zip" | |||
13 | SRC_URI[md5sum] = "c5a5059d6856b4ddf79d824dcaf5ad32" | 13 | SRC_URI[md5sum] = "c5a5059d6856b4ddf79d824dcaf5ad32" |
14 | SRC_URI[sha256sum] = "61a2b342526fd552f19fef438bb9211a8212de19ad96e32a1209c039f1d68ecf" | 14 | SRC_URI[sha256sum] = "61a2b342526fd552f19fef438bb9211a8212de19ad96e32a1209c039f1d68ecf" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://repology.org/project/fonts:ubuntu/packages" | ||
17 | UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" | ||
18 | |||
16 | S = "${WORKDIR}/ubuntu-font-family-${PV}" | 19 | S = "${WORKDIR}/ubuntu-font-family-${PV}" |
17 | 20 | ||
18 | PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans" | 21 | PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb index 21897a758..e2925b6c9 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb | |||
@@ -9,6 +9,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/wqy/wqy-zenhei-${PV}.tar.gz" | |||
9 | SRC_URI[md5sum] = "4c6c3f4e902dd5ee0a121e8c41d040bd" | 9 | SRC_URI[md5sum] = "4c6c3f4e902dd5ee0a121e8c41d040bd" |
10 | SRC_URI[sha256sum] = "e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6" | 10 | SRC_URI[sha256sum] = "e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6" |
11 | 11 | ||
12 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/wqy/files/wqy-zenhei/" | ||
13 | UPSTREAM_CHECK_REGEX = "wqy-zenhei/(?P<pver>\d+(\.\d+)+)" | ||
14 | |||
12 | S = "${WORKDIR}/wqy-zenhei" | 15 | S = "${WORKDIR}/wqy-zenhei" |
13 | 16 | ||
14 | do_install:append () { | 17 | do_install:append () { |
diff --git a/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb b/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb new file mode 100644 index 000000000..3f44e537a --- /dev/null +++ b/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | DESCRIPTION = "Tool to query the capabilities of a VDPAU implementation" | ||
2 | HOMEPAGE = "https://gitlab.freedesktop.org/vdpau/vdpauinfo" | ||
3 | |||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5b6e110c362fe46168199f3490e52c3c" | ||
6 | |||
7 | DEPENDS = "libvdpau" | ||
8 | |||
9 | # libvdpau is available only with x11 | ||
10 | inherit features_check | ||
11 | REQUIRED_DISTRO_FEATURES = "x11" | ||
12 | |||
13 | RDEPENDS:${PN} = "libvdpau" | ||
14 | |||
15 | SRCREV = "d3c5bd63bf8878d59b22d618d2bb5116db392d28" | ||
16 | SRC_URI = "git://anongit.freedesktop.org/vdpau/vdpauinfo;branch=master" | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | inherit autotools pkgconfig | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch index f659e3606..9eef9a702 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch | |||
@@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 15 | ||
16 | --- a/framework/platform/CMakeLists.txt | 16 | --- a/framework/platform/CMakeLists.txt |
17 | +++ b/framework/platform/CMakeLists.txt | 17 | +++ b/framework/platform/CMakeLists.txt |
18 | @@ -73,8 +73,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) | 18 | @@ -83,8 +83,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) |
19 | add_definitions(-DDEQP_SUPPORT_WAYLAND=1) | 19 | configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.c ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.c COPYONLY) |
20 | include_directories(lnx/wayland) | 20 | configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.h ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.h COPYONLY) |
21 | 21 | else () | |
22 | - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) | 22 | - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) |
23 | - | 23 | - |
24 | + if (NOT WAYLAND_PROTOCOLS_DIR) | 24 | + if (NOT WAYLAND_PROTOCOL_DIR) |
25 | + pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) | 25 | + pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) |
26 | + endif() | 26 | + endif() |
27 | if (NOT WAYLAND_SCANNER) | 27 | if (NOT WAYLAND_SCANNER) |
28 | pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) | 28 | pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) |
29 | endif() | 29 | endif() |
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch new file mode 100644 index 000000000..774b7aefe --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch | |||
@@ -0,0 +1,123 @@ | |||
1 | From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Woerner <twoerner@gmail.com> | ||
3 | Date: Thu, 23 Sep 2021 19:36:43 -0400 | ||
4 | Subject: [PATCH] use library sonames for linking | ||
5 | |||
6 | The recommended "best practices" for applications is to link to library | ||
7 | sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This | ||
8 | ensures that applications don't try to use libraries if an incompatible ABI | ||
9 | change occurs. | ||
10 | |||
11 | Upstream-Status: Denied [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] | ||
12 | Signed-off-by: Trevor Woerner <twoerner@gmail.com> | ||
13 | --- | ||
14 | framework/egl/egluGLContextFactory.cpp | 4 ++-- | ||
15 | framework/egl/wrapper/eglwLibrary.cpp | 2 +- | ||
16 | framework/platform/android/tcuAndroidPlatform.cpp | 2 +- | ||
17 | framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- | ||
18 | .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- | ||
19 | framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- | ||
20 | 6 files changed, 9 insertions(+), 9 deletions(-) | ||
21 | |||
22 | --- a/framework/egl/egluGLContextFactory.cpp | ||
23 | +++ b/framework/egl/egluGLContextFactory.cpp | ||
24 | @@ -63,7 +63,7 @@ using std::vector; | ||
25 | #if (DE_OS == DE_OS_WIN32) | ||
26 | #define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" | ||
27 | #else | ||
28 | -#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
29 | +#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
30 | #endif | ||
31 | #endif | ||
32 | |||
33 | @@ -75,7 +75,7 @@ using std::vector; | ||
34 | #if (DE_OS == DE_OS_WIN32) | ||
35 | #define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" | ||
36 | #else | ||
37 | -#define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
38 | +#define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
39 | #endif | ||
40 | #endif | ||
41 | |||
42 | --- a/framework/egl/wrapper/eglwLibrary.cpp | ||
43 | +++ b/framework/egl/wrapper/eglwLibrary.cpp | ||
44 | @@ -145,7 +145,7 @@ DefaultLibrary::~DefaultLibrary(void) | ||
45 | const char *DefaultLibrary::getLibraryFileName(void) | ||
46 | { | ||
47 | #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) | ||
48 | - return "libEGL.so"; | ||
49 | + return "libEGL.so.1"; | ||
50 | #elif (DE_OS == DE_OS_WIN32) | ||
51 | return "libEGL.dll"; | ||
52 | #else | ||
53 | --- a/framework/platform/android/tcuAndroidPlatform.cpp | ||
54 | +++ b/framework/platform/android/tcuAndroidPlatform.cpp | ||
55 | @@ -56,7 +56,7 @@ static const eglu::NativeWindow::Capabil | ||
56 | class NativeDisplay : public eglu::NativeDisplay | ||
57 | { | ||
58 | public: | ||
59 | - NativeDisplay(void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") | ||
60 | + NativeDisplay(void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") | ||
61 | { | ||
62 | } | ||
63 | virtual ~NativeDisplay(void) | ||
64 | @@ -223,7 +223,7 @@ class VulkanLibrary : public vk::Library | ||
65 | { | ||
66 | public: | ||
67 | VulkanLibrary(const char *libraryPath) | ||
68 | - : m_library(libraryPath != DE_NULL ? libraryPath : "libvulkan.so") | ||
69 | + : m_library(libraryPath != DE_NULL ? libraryPath : "libvulkan.so.1") | ||
70 | , m_driver(m_library) | ||
71 | { | ||
72 | } | ||
73 | --- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
74 | +++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
75 | @@ -77,7 +77,7 @@ using tcu::TextureLevel; | ||
76 | class Library : public eglw::DefaultLibrary | ||
77 | { | ||
78 | public: | ||
79 | - Library(void) : eglw::DefaultLibrary("libEGL.so") | ||
80 | + Library(void) : eglw::DefaultLibrary("libEGL.so.1") | ||
81 | { | ||
82 | } | ||
83 | |||
84 | --- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
85 | +++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
86 | @@ -64,7 +64,7 @@ public: | ||
87 | Display(MovePtr<wayland::Display> waylandDisplay) | ||
88 | : NativeDisplay(CAPABILITIES, EGL_PLATFORM_WAYLAND_KHR, "EGL_KHR_platform_wayland") | ||
89 | , m_display(waylandDisplay) | ||
90 | - , m_library("libEGL.so") | ||
91 | + , m_library("libEGL.so.1") | ||
92 | { | ||
93 | } | ||
94 | |||
95 | --- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
96 | +++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
97 | @@ -69,7 +69,7 @@ using std::vector; | ||
98 | |||
99 | // Default library names | ||
100 | #if !defined(DEQP_GLES2_LIBRARY_PATH) | ||
101 | -#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
102 | +#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
103 | #endif | ||
104 | |||
105 | #if !defined(DEQP_GLES3_LIBRARY_PATH) | ||
106 | @@ -77,7 +77,7 @@ using std::vector; | ||
107 | #endif | ||
108 | |||
109 | #if !defined(DEQP_OPENGL_LIBRARY_PATH) | ||
110 | -#define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
111 | +#define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
112 | #endif | ||
113 | |||
114 | #if !defined(DEQP_VULKAN_LIBRARY_PATH) | ||
115 | @@ -258,7 +258,7 @@ glu::RenderContext *ContextFactory::crea | ||
116 | |||
117 | EglRenderContext::EglRenderContext(const glu::RenderConfig &config, const tcu::CommandLine &cmdLine, | ||
118 | const glu::RenderContext *sharedContext) | ||
119 | - : m_egl("libEGL.so") | ||
120 | + : m_egl("libEGL.so.1") | ||
121 | , m_contextType(config.type) | ||
122 | , m_eglDisplay(EGL_NO_DISPLAY) | ||
123 | , m_eglContext(EGL_NO_CONTEXT) | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch deleted file mode 100644 index 0dd59713a..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From b07f6ecd6ab83b788301a555dc546b9a5c9dd8a2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 25 Jan 2023 19:19:34 -0800 | ||
4 | Subject: [PATCH] Include missing <cstdint> | ||
5 | |||
6 | This error is seen with gcc-13 where include headers are not implicitly | ||
7 | included [1] | ||
8 | |||
9 | Fixes errors e.g. | ||
10 | error: 'uint32_t' does not name a type | ||
11 | |||
12 | [1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | framework/common/tcuDefs.hpp | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/framework/common/tcuDefs.hpp b/framework/common/tcuDefs.hpp | ||
21 | index ad3d0736d..6dfac10fb 100644 | ||
22 | --- a/framework/common/tcuDefs.hpp | ||
23 | +++ b/framework/common/tcuDefs.hpp | ||
24 | @@ -26,6 +26,7 @@ | ||
25 | #include "deDefs.hpp" | ||
26 | #include "qpTestLog.h" | ||
27 | |||
28 | +#include <cstdint> | ||
29 | #include <string> | ||
30 | #include <stdexcept> | ||
31 | |||
32 | -- | ||
33 | 2.39.1 | ||
34 | |||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch deleted file mode 100644 index 40aea8f20..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 1b7646ced0f0b969f818084887885827ed1a4244 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 31 May 2021 17:31:33 -0700 | ||
4 | Subject: [PATCH] vulkancts: Include missing <cstdint> | ||
5 | |||
6 | Fixes build with gcc-13 | ||
7 | |||
8 | ../git/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp:2798:102: error: 'uintptr_t' in namespace 'std' does not name a type | ||
9 | 2798 | BufferDataType type = static_cast<BufferDataType>(reinterpret_cast<std::uintptr_t>(expectedOutputs[resultIndex].getUserData())); | ||
10 | | ^~~~~~~~~ | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 1 + | ||
16 | 1 file changed, 1 insertion(+) | ||
17 | |||
18 | diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | ||
19 | index ab02be1dc..3d3ee4829 100644 | ||
20 | --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | ||
21 | +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | ||
22 | @@ -33,6 +33,7 @@ | ||
23 | #include "deFloat16.h" | ||
24 | #include "vkQueryUtil.hpp" | ||
25 | #include "vkRefUtil.hpp" | ||
26 | +#include <cstdint> | ||
27 | #include <cstring> | ||
28 | #include <vector> | ||
29 | #include <limits> | ||
30 | -- | ||
31 | 2.39.1 | ||
32 | |||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch index 4ecc371ca..af59dd3e6 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch | |||
@@ -2,7 +2,7 @@ Upstream-Status: Pending | |||
2 | 2 | ||
3 | --- a/external/glslang/src/glslang/Include/PoolAlloc.h | 3 | --- a/external/glslang/src/glslang/Include/PoolAlloc.h |
4 | +++ b/external/glslang/src/glslang/Include/PoolAlloc.h | 4 | +++ b/external/glslang/src/glslang/Include/PoolAlloc.h |
5 | @@ -240,8 +240,9 @@ protected: | 5 | @@ -245,8 +245,9 @@ protected: |
6 | 6 | ||
7 | int numCalls; // just an interesting statistic | 7 | int numCalls; // just an interesting statistic |
8 | size_t totalBytes; // just an interesting statistic | 8 | size_t totalBytes; // just an interesting statistic |
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch index 58dc1f24d..717d48978 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch | |||
@@ -2,9 +2,9 @@ Upstream-Status: Pending | |||
2 | 2 | ||
3 | --- a/framework/delibs/dethread/CMakeLists.txt | 3 | --- a/framework/delibs/dethread/CMakeLists.txt |
4 | +++ b/framework/delibs/dethread/CMakeLists.txt | 4 | +++ b/framework/delibs/dethread/CMakeLists.txt |
5 | @@ -42,6 +42,7 @@ if (DE_OS_IS_UNIX) | 5 | @@ -41,6 +41,7 @@ if (DE_OS_IS_UNIX) |
6 | if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") | ||
6 | add_definitions(-D__BSD_VISIBLE) | 7 | add_definitions(-D__BSD_VISIBLE) |
7 | add_definitions(-D_XOPEN_SOURCE=600) | ||
8 | endif () | 8 | endif () |
9 | + add_definitions(-D_XOPEN_SOURCE=600) | 9 | + add_definitions(-D_XOPEN_SOURCE=600) |
10 | add_definitions(-D_GNU_SOURCE) | 10 | add_definitions(-D_GNU_SOURCE) |
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch deleted file mode 100644 index 8a8d8d2c3..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Prepend instead of append to the module search path, as this script needs to use | ||
2 | the local module build, not the host module build. | ||
3 | |||
4 | Upstream-Status: Submitted | ||
5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
6 | |||
7 | diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py | ||
8 | index 83c5329ce..10e720910 100755 | ||
9 | --- a/external/vulkancts/scripts/gen_framework.py | ||
10 | +++ b/external/vulkancts/scripts/gen_framework.py | ||
11 | @@ -33 +33 @@ from collections import OrderedDict | ||
12 | -sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) | ||
13 | +sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) | ||
14 | diff --git a/external/vulkancts/scripts/gen_framework_c.py b/external/vulkancts/scripts/gen_framework_c.py | ||
15 | index 95587e642..84b878cb2 100644 | ||
16 | --- a/external/vulkancts/scripts/gen_framework_c.py | ||
17 | +++ b/external/vulkancts/scripts/gen_framework_c.py | ||
18 | @@ -28 +28 @@ import re | ||
19 | -sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) | ||
20 | +sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 09f1fbcae..0322ef453 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc | |||
@@ -3,20 +3,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
3 | 3 | ||
4 | SRC_URI = "\ | 4 | SRC_URI = "\ |
5 | git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ | 5 | git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ |
6 | git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \ | 6 | git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;nobranch=1 \ |
7 | git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=main \ | 7 | git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;nobranch=1 \ |
8 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=main \ | 8 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;nobranch=1 \ |
9 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=main \ | 9 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;nobranch=1 \ |
10 | git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;branch=master \ | 10 | git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;nobranch=1 \ |
11 | git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main \ | 11 | git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;nobranch=1 \ |
12 | https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ | 12 | git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;destsuffix=git/external/vulkan-validationlayers/src;name=vulkan-validationlayers;nobranch=1 \ |
13 | git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;branch=main \ | 13 | git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;nobranch=1 \ |
14 | git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1 \ | 14 | git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1 \ |
15 | https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | S = "${WORKDIR}/git" | 18 | SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_video-parser_vulkan-docs_vulkan-validationlayers" |
18 | |||
19 | SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_vulkan-docs" | ||
20 | 19 | ||
21 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
22 | 21 | ||
@@ -27,7 +26,7 @@ ANY_OF_DISTRO_FEATURES += "opengl vulkan" | |||
27 | DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" | 26 | DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" |
28 | 27 | ||
29 | SRC_URI += " \ | 28 | SRC_URI += " \ |
30 | file://0001-vulkancts-Include-missing-cstdint.patch \ | 29 | file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ |
31 | file://0001-use-library-sonames-for-linking.patch \ | 30 | file://0001-use-library-sonames-for-linking.patch \ |
32 | " | 31 | " |
33 | 32 | ||
@@ -39,7 +38,7 @@ DEPENDS:append:libc-musl = " libexecinfo" | |||
39 | SRC_URI:append:toolchain-clang = "\ | 38 | SRC_URI:append:toolchain-clang = "\ |
40 | file://fix-clang-private-operator.patch \ | 39 | file://fix-clang-private-operator.patch \ |
41 | " | 40 | " |
42 | 41 | EXTRA_OECMAKE += "-DUPDATE_DEPS=OFF" | |
43 | EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols -DAMBER_DISABLE_WERROR=ON" | 42 | EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols -DAMBER_DISABLE_WERROR=ON" |
44 | 43 | ||
45 | # The best thing for the user to do is to not specify any of the following | 44 | # The best thing for the user to do is to not specify any of the following |
@@ -81,3 +80,11 @@ python __anonymous() { | |||
81 | CTSDIR = "/usr/lib/${BPN}" | 80 | CTSDIR = "/usr/lib/${BPN}" |
82 | 81 | ||
83 | FILES:${PN} += "${CTSDIR}" | 82 | FILES:${PN} += "${CTSDIR}" |
83 | |||
84 | # does not work with libc++-19 due | ||
85 | # error: implicit instantiation of undefined template 'std::char_traits<unsigned int>' | ||
86 | TOOLCHAIN = "gcc" | ||
87 | |||
88 | # Validation-layers requires access during configure as it fetches validation-headers | ||
89 | # and bunch of other packages from khronos github | ||
90 | do_configure[network] = "1" | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch deleted file mode 100644 index b5a1d331e..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch +++ /dev/null | |||
@@ -1,114 +0,0 @@ | |||
1 | From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Woerner <twoerner@gmail.com> | ||
3 | Date: Thu, 23 Sep 2021 19:36:43 -0400 | ||
4 | Subject: [PATCH] use library sonames for linking | ||
5 | |||
6 | The recommended "best practices" for applications is to link to library | ||
7 | sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This | ||
8 | ensures that applications don't try to use libraries if an incompatible ABI | ||
9 | change occurs. | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] | ||
12 | Signed-off-by: Trevor Woerner <twoerner@gmail.com> | ||
13 | --- | ||
14 | framework/egl/egluGLContextFactory.cpp | 4 ++-- | ||
15 | framework/egl/wrapper/eglwLibrary.cpp | 2 +- | ||
16 | framework/platform/android/tcuAndroidPlatform.cpp | 2 +- | ||
17 | framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- | ||
18 | .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- | ||
19 | framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- | ||
20 | 6 files changed, 9 insertions(+), 9 deletions(-) | ||
21 | |||
22 | --- a/framework/egl/egluGLContextFactory.cpp | ||
23 | +++ b/framework/egl/egluGLContextFactory.cpp | ||
24 | @@ -63,7 +63,7 @@ using std::vector; | ||
25 | # if (DE_OS == DE_OS_WIN32) | ||
26 | # define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" | ||
27 | # else | ||
28 | -# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
29 | +# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
30 | # endif | ||
31 | #endif | ||
32 | |||
33 | @@ -75,7 +75,7 @@ using std::vector; | ||
34 | # if (DE_OS == DE_OS_WIN32) | ||
35 | # define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" | ||
36 | # else | ||
37 | -# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
38 | +# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
39 | # endif | ||
40 | #endif | ||
41 | |||
42 | --- a/framework/egl/wrapper/eglwLibrary.cpp | ||
43 | +++ b/framework/egl/wrapper/eglwLibrary.cpp | ||
44 | @@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) | ||
45 | const char* DefaultLibrary::getLibraryFileName (void) | ||
46 | { | ||
47 | #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) | ||
48 | - return "libEGL.so"; | ||
49 | + return "libEGL.so.1"; | ||
50 | #elif (DE_OS == DE_OS_WIN32) | ||
51 | return "libEGL.dll"; | ||
52 | #else | ||
53 | --- a/framework/platform/android/tcuAndroidPlatform.cpp | ||
54 | +++ b/framework/platform/android/tcuAndroidPlatform.cpp | ||
55 | @@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil | ||
56 | class NativeDisplay : public eglu::NativeDisplay | ||
57 | { | ||
58 | public: | ||
59 | - NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {} | ||
60 | + NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {} | ||
61 | virtual ~NativeDisplay (void) {} | ||
62 | |||
63 | virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } | ||
64 | --- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
65 | +++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
66 | @@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr | ||
67 | { | ||
68 | public: | ||
69 | Library (void) | ||
70 | - : eglw::DefaultLibrary("libEGL.so") | ||
71 | + : eglw::DefaultLibrary("libEGL.so.1") | ||
72 | { | ||
73 | } | ||
74 | |||
75 | --- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
76 | +++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
77 | @@ -66,7 +66,7 @@ public: | ||
78 | EGL_PLATFORM_WAYLAND_KHR, | ||
79 | "EGL_KHR_platform_wayland") | ||
80 | , m_display (waylandDisplay) | ||
81 | - , m_library ("libEGL.so") {} | ||
82 | + , m_library ("libEGL.so.1") {} | ||
83 | |||
84 | ~Display(void) {} | ||
85 | wayland::Display& getWaylandDisplay (void) { return *m_display; } | ||
86 | --- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
87 | +++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
88 | @@ -69,7 +69,7 @@ using std::vector; | ||
89 | |||
90 | // Default library names | ||
91 | #if !defined(DEQP_GLES2_LIBRARY_PATH) | ||
92 | -# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
93 | +# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
94 | #endif | ||
95 | |||
96 | #if !defined(DEQP_GLES3_LIBRARY_PATH) | ||
97 | @@ -77,7 +77,7 @@ using std::vector; | ||
98 | #endif | ||
99 | |||
100 | #if !defined(DEQP_OPENGL_LIBRARY_PATH) | ||
101 | -# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
102 | +# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
103 | #endif | ||
104 | |||
105 | #if !defined(DEQP_VULKAN_LIBRARY_PATH) | ||
106 | @@ -234,7 +234,7 @@ glu::RenderContext* ContextFactory::crea | ||
107 | } | ||
108 | |||
109 | EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine) | ||
110 | - : m_egl("libEGL.so") | ||
111 | + : m_egl("libEGL.so.1") | ||
112 | , m_contextType(config.type) | ||
113 | , m_eglDisplay(EGL_NO_DISPLAY) | ||
114 | , m_eglContext(EGL_NO_CONTEXT) | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.11.0.bb index 0656d724b..7dd60dffd 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb +++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.11.0.bb | |||
@@ -1,25 +1,20 @@ | |||
1 | DESCRIPTION = "OpenGL CTS" | 1 | DESCRIPTION = "OpenGL CTS" |
2 | 2 | ||
3 | require khronos-cts.inc | 3 | require khronos-cts.inc |
4 | # opengl-es-cts-3.2.9.3 | 4 | # opengl-es-cts-3.2.11.0 |
5 | SRCREV_vk-gl-cts = "7f5fb62245d535a1fc0bf50b2c7e5a342dc551fe" | 5 | SRCREV_vk-gl-cts = "66956d195169596472e956e3aebf2df8e3bd960d" |
6 | SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273" | 6 | SRCREV_amber = "0f003c2785489f59cd01bb2440fcf303149100f2" |
7 | SRCREV_glslang = "a0ad0d7067521fff880e36acfb8ce453421c3f25" | 7 | SRCREV_glslang = "4da479aa6afa43e5a2ce4c4148c572a03123faf3" |
8 | SRCREV_spirv-headers = "87d5b782bec60822aa878941e6b13c0a9a954c9b" | 8 | SRCREV_spirv-headers = "ff2afc3afc48dff4eec2a10f0212402a80708e38" |
9 | SRCREV_spirv-tools = "f98473ceeb1d33700d01e20910433583e5256030" | 9 | SRCREV_spirv-tools = "148c97f6876e427efd76d2328122c3075eab4b8f" |
10 | SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" | 10 | SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" |
11 | # Not yet needed | 11 | # Not yet needed |
12 | SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" | 12 | SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" |
13 | SRCREV_vulkan-docs = "9a2e576a052a1e65a5d41b593e693ff02745604b" | 13 | SRCREV_vulkan-docs = "ed4ba0242beb89a1795d6084709fa9e713559c94" |
14 | SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904" | 14 | SRCREV_vulkan-validationlayers = "a92629196a4fed15e59c74aa965dd47bd5ece3b7" |
15 | SRCREV_video-parser = "6821adf11eb4f84a2168264b954c170d03237699" | ||
15 | SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" | 16 | SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" |
16 | 17 | ||
17 | SRC_URI += "\ | ||
18 | git://github.com/nvpro-samples/vk_video_samples.git;protocol=https;destsuffix=git/external/video-parser/src;name=video-parser;branch=main \ | ||
19 | file://gen-framework-path.patch \ | ||
20 | " | ||
21 | S = "${WORKDIR}/git" | ||
22 | |||
23 | do_install() { | 18 | do_install() { |
24 | install -d ${D}/${CTSDIR} | 19 | install -d ${D}/${CTSDIR} |
25 | cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} | 20 | cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} |
@@ -37,4 +32,3 @@ do_install() { | |||
37 | 32 | ||
38 | SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" | 33 | SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" |
39 | LTO = "" | 34 | LTO = "" |
40 | |||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch deleted file mode 100644 index f12abd0c1..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch +++ /dev/null | |||
@@ -1,114 +0,0 @@ | |||
1 | From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Woerner <twoerner@gmail.com> | ||
3 | Date: Thu, 23 Sep 2021 19:36:43 -0400 | ||
4 | Subject: [PATCH] use library sonames for linking | ||
5 | |||
6 | The recommended "best practices" for applications is to link to library | ||
7 | sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This | ||
8 | ensures that applications don't try to use libraries if an incompatible ABI | ||
9 | change occurs. | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] | ||
12 | Signed-off-by: Trevor Woerner <twoerner@gmail.com> | ||
13 | --- | ||
14 | framework/egl/egluGLContextFactory.cpp | 4 ++-- | ||
15 | framework/egl/wrapper/eglwLibrary.cpp | 2 +- | ||
16 | framework/platform/android/tcuAndroidPlatform.cpp | 2 +- | ||
17 | framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- | ||
18 | .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- | ||
19 | framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- | ||
20 | 6 files changed, 9 insertions(+), 9 deletions(-) | ||
21 | |||
22 | --- a/framework/egl/egluGLContextFactory.cpp | ||
23 | +++ b/framework/egl/egluGLContextFactory.cpp | ||
24 | @@ -63,7 +63,7 @@ using std::vector; | ||
25 | # if (DE_OS == DE_OS_WIN32) | ||
26 | # define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" | ||
27 | # else | ||
28 | -# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
29 | +# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
30 | # endif | ||
31 | #endif | ||
32 | |||
33 | @@ -75,7 +75,7 @@ using std::vector; | ||
34 | # if (DE_OS == DE_OS_WIN32) | ||
35 | # define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" | ||
36 | # else | ||
37 | -# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
38 | +# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
39 | # endif | ||
40 | #endif | ||
41 | |||
42 | --- a/framework/egl/wrapper/eglwLibrary.cpp | ||
43 | +++ b/framework/egl/wrapper/eglwLibrary.cpp | ||
44 | @@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) | ||
45 | const char* DefaultLibrary::getLibraryFileName (void) | ||
46 | { | ||
47 | #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) | ||
48 | - return "libEGL.so"; | ||
49 | + return "libEGL.so.1"; | ||
50 | #elif (DE_OS == DE_OS_WIN32) | ||
51 | return "libEGL.dll"; | ||
52 | #else | ||
53 | --- a/framework/platform/android/tcuAndroidPlatform.cpp | ||
54 | +++ b/framework/platform/android/tcuAndroidPlatform.cpp | ||
55 | @@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil | ||
56 | class NativeDisplay : public eglu::NativeDisplay | ||
57 | { | ||
58 | public: | ||
59 | - NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {} | ||
60 | + NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {} | ||
61 | virtual ~NativeDisplay (void) {} | ||
62 | |||
63 | virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } | ||
64 | --- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
65 | +++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | ||
66 | @@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr | ||
67 | { | ||
68 | public: | ||
69 | Library (void) | ||
70 | - : eglw::DefaultLibrary("libEGL.so") | ||
71 | + : eglw::DefaultLibrary("libEGL.so.1") | ||
72 | { | ||
73 | } | ||
74 | |||
75 | --- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
76 | +++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | ||
77 | @@ -66,7 +66,7 @@ public: | ||
78 | EGL_PLATFORM_WAYLAND_KHR, | ||
79 | "EGL_KHR_platform_wayland") | ||
80 | , m_display (waylandDisplay) | ||
81 | - , m_library ("libEGL.so") {} | ||
82 | + , m_library ("libEGL.so.1") {} | ||
83 | |||
84 | ~Display(void) {} | ||
85 | wayland::Display& getWaylandDisplay (void) { return *m_display; } | ||
86 | --- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
87 | +++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | ||
88 | @@ -69,7 +69,7 @@ using std::vector; | ||
89 | |||
90 | // Default library names | ||
91 | #if !defined(DEQP_GLES2_LIBRARY_PATH) | ||
92 | -# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" | ||
93 | +# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" | ||
94 | #endif | ||
95 | |||
96 | #if !defined(DEQP_GLES3_LIBRARY_PATH) | ||
97 | @@ -77,7 +77,7 @@ using std::vector; | ||
98 | #endif | ||
99 | |||
100 | #if !defined(DEQP_OPENGL_LIBRARY_PATH) | ||
101 | -# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" | ||
102 | +# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" | ||
103 | #endif | ||
104 | |||
105 | #if !defined(DEQP_VULKAN_LIBRARY_PATH) | ||
106 | @@ -237,7 +237,7 @@ glu::RenderContext* ContextFactory::crea | ||
107 | } | ||
108 | |||
109 | EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine, const glu::RenderContext *sharedContext) | ||
110 | - : m_egl("libEGL.so") | ||
111 | + : m_egl("libEGL.so.1") | ||
112 | , m_contextType(config.type) | ||
113 | , m_eglDisplay(EGL_NO_DISPLAY) | ||
114 | , m_eglContext(EGL_NO_CONTEXT) | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb deleted file mode 100644 index 7492fe9aa..000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | DESCRIPTION = "Vulkan CTS" | ||
2 | |||
3 | require khronos-cts.inc | ||
4 | |||
5 | SRC_URI += "git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1" | ||
6 | |||
7 | # vulkan-cts-1.3.7.3 | ||
8 | SRCREV_vk-gl-cts = "d71a36db16d98313c431829432a136dbda692a08" | ||
9 | SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273" | ||
10 | SRCREV_glslang = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3" | ||
11 | SRCREV_spirv-headers = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c" | ||
12 | SRCREV_spirv-tools = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0" | ||
13 | SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" | ||
14 | SRCREV_vulkan-docs = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0" | ||
15 | SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" | ||
16 | # Not yet needed | ||
17 | SRCREV_ESExtractor = "75ffcaf55bb069f7a23764194742d2fb78c7f71f" | ||
18 | SRCREV_video-parser = "138bbe048221d315962ddf8413aa6a08cc62a381" | ||
19 | |||
20 | SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ | ||
21 | file://0001-vulkan-cts-include-missing-cstdint.patch \ | ||
22 | " | ||
23 | |||
24 | TOOLCHAIN = "gcc" | ||
25 | |||
26 | # Workaround an optimization bug that breaks createMeshShaderMiscTestsEXT | ||
27 | OECMAKE_CXX_FLAGS:remove:toolchain-gcc = "-O2" | ||
28 | |||
29 | S = "${WORKDIR}/git" | ||
30 | |||
31 | REQUIRED_DISTRO_FEATURES = "vulkan" | ||
32 | inherit features_check | ||
33 | |||
34 | DEPENDS += " vulkan-loader" | ||
35 | |||
36 | do_install() { | ||
37 | install -d ${D}/${CTSDIR} | ||
38 | cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ | ||
39 | rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles | ||
40 | rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles | ||
41 | } | ||
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb new file mode 100644 index 000000000..4ba761b67 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb | |||
@@ -0,0 +1,32 @@ | |||
1 | DESCRIPTION = "Vulkan CTS" | ||
2 | |||
3 | require khronos-cts.inc | ||
4 | |||
5 | # vulkan-cts-1.3.9.2 | ||
6 | SRCREV_vk-gl-cts = "24c1b1498ba4f05777f47541968ffe686265c645" | ||
7 | SRCREV_amber = "0f003c2785489f59cd01bb2440fcf303149100f2" | ||
8 | SRCREV_glslang = "2b19bf7e1bc0b60cf2fe9d33e5ba6b37dfc1cc83" | ||
9 | SRCREV_spirv-headers = "db5a00f8cebe81146cafabf89019674a3c4bf03d" | ||
10 | SRCREV_spirv-tools = "4c7e1fa5c3d988cca0e626d359d30b117b9c2822" | ||
11 | SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" | ||
12 | SRCREV_vulkan-docs = "7bb606eb87cde1d34f65f36f4d4c6f2c78f072c8" | ||
13 | SRCREV_vulkan-validationlayers = "a92629196a4fed15e59c74aa965dd47bd5ece3b7" | ||
14 | SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" | ||
15 | # Not yet needed | ||
16 | SRCREV_ESExtractor = "75ffcaf55bb069f7a23764194742d2fb78c7f71f" | ||
17 | SRCREV_video-parser = "6821adf11eb4f84a2168264b954c170d03237699" | ||
18 | |||
19 | # Workaround an optimization bug that breaks createMeshShaderMiscTestsEXT | ||
20 | OECMAKE_CXX_FLAGS:remove:toolchain-gcc = "-O2" | ||
21 | |||
22 | REQUIRED_DISTRO_FEATURES = "vulkan" | ||
23 | inherit features_check | ||
24 | |||
25 | DEPENDS += " vulkan-loader" | ||
26 | |||
27 | do_install() { | ||
28 | install -d ${D}/${CTSDIR} | ||
29 | cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ | ||
30 | rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles | ||
31 | rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles | ||
32 | } | ||
diff --git a/meta-oe/recipes-graphics/wayland/libei_1.2.1.bb b/meta-oe/recipes-graphics/wayland/libei_1.3.0.bb index 807dcea1e..ee3ee01c7 100644 --- a/meta-oe/recipes-graphics/wayland/libei_1.2.1.bb +++ b/meta-oe/recipes-graphics/wayland/libei_1.3.0.bb | |||
@@ -17,7 +17,7 @@ DEPENDS = " \ | |||
17 | SRC_URI = "git://gitlab.freedesktop.org/libinput/libei.git;protocol=https;branch=main" | 17 | SRC_URI = "git://gitlab.freedesktop.org/libinput/libei.git;protocol=https;branch=main" |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
20 | SRCREV = "08f1d41085a6ae4bac7bc52abe2955d3354342cb" | 20 | SRCREV = "997b7c0f37faea4f8bae59613c8f27370925d5b0" |
21 | 21 | ||
22 | inherit meson pkgconfig | 22 | inherit meson pkgconfig |
23 | 23 | ||
diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb b/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb index cef82bd34..33e4e0998 100644 --- a/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb +++ b/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb | |||
@@ -14,6 +14,9 @@ SRC_URI[sha256sum] = "96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd34 | |||
14 | 14 | ||
15 | EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLLIB=${libdir} INSTALLMAN=${mandir}" | 15 | EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLLIB=${libdir} INSTALLMAN=${mandir}" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI="https://github.com/jordansissel/xdotool/tags" | ||
18 | UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+\.\d{8}\.\d+)" | ||
19 | |||
17 | do_install() { | 20 | do_install() { |
18 | oe_runmake install DESTDIR=${D} PREFIX=${prefix} | 21 | oe_runmake install DESTDIR=${D} PREFIX=${prefix} |
19 | } | 22 | } |
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_392.bb b/meta-oe/recipes-graphics/xorg-app/xterm_394.bb index 677f5c999..94953b288 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_392.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_394.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=1a3032aa728f8fda9d | |||
7 | SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ | 7 | SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ |
8 | file://0001-include-missing-pty.h-header-for-openpty.patch \ | 8 | file://0001-include-missing-pty.h-header-for-openpty.patch \ |
9 | " | 9 | " |
10 | SRC_URI[sha256sum] = "4d57372ef08eafa9fb7682db8d07be0fe0513e58e8478c2ec8e9b62486e7fe5e" | 10 | SRC_URI[sha256sum] = "a2a0cb206eb0423dedc34794f5c2d38c83390d2dd1106b66aba0960c3a976c7a" |
11 | 11 | ||
12 | PACKAGECONFIG ?= "" | 12 | PACKAGECONFIG ?= "" |
13 | PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" | 13 | PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" |
@@ -47,3 +47,5 @@ ALTERNATIVE:${PN} = "resize x-terminal-emulator" | |||
47 | ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" | 47 | ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" |
48 | # rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. | 48 | # rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. |
49 | ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" | 49 | ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" |
50 | |||
51 | CVE_STATUS[CVE-1999-0965] = "cpe-incorrect: Current version (392) not affected. This was fixed in version X11R5-fix-26 (R11R6 from 1994)" | ||
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 8c26bf798..171b2dec7 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 | |||
@@ -9,6 +9,8 @@ RRECOMMENDS:${PN} += "tslib-calibrate" | |||
9 | SRC_URI = "https://github.com/merge/xf86-input-tslib/releases/download/${PV}/xf86-input-tslib-${PV}.tar.xz \ | 9 | SRC_URI = "https://github.com/merge/xf86-input-tslib/releases/download/${PV}/xf86-input-tslib-${PV}.tar.xz \ |
10 | file://99-xf86-input-tslib.rules \ | 10 | file://99-xf86-input-tslib.rules \ |
11 | " | 11 | " |
12 | UPSTREAM_CHECK_URI="https://github.com/merge/xf86-input-tslib/tags" | ||
13 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" | ||
12 | 14 | ||
13 | SRC_URI[sha256sum] = "b596168c4ed2f1023212dc828ce49cbe82a0bbd1aac3c5e2958154d78870ca88" | 15 | SRC_URI[sha256sum] = "b596168c4ed2f1023212dc828ce49cbe82a0bbd1aac3c5e2958154d78870ca88" |
14 | 16 | ||
diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb index d698efa5e..073b3f091 100644 --- a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb +++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb | |||
@@ -13,6 +13,8 @@ MIRRORS += "https://www.jwz.org/${BPN} https://ftp.osuosl.org/pub/blfs/conglomer | |||
13 | 13 | ||
14 | SRC_URI[sha256sum] = "787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152" | 14 | SRC_URI[sha256sum] = "787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://www.jwz.org/xscreensaver/download.html" | ||
17 | |||
16 | DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam jpeg" | 18 | DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam jpeg" |
17 | # These are only needed as part of the stopgap screensaver implementation: | 19 | # These are only needed as part of the stopgap screensaver implementation: |
18 | RDEPENDS:${PN} = " \ | 20 | RDEPENDS:${PN} = " \ |
diff --git a/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-oe/recipes-kernel/bpftool/bpftool.bb index b22334fe9..8bddde945 100644 --- a/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-oe/recipes-kernel/bpftool/bpftool.bb | |||
@@ -26,7 +26,7 @@ SECURITY_CFLAGS = "" | |||
26 | 26 | ||
27 | do_configure[depends] += "virtual/kernel:do_shared_workdir" | 27 | do_configure[depends] += "virtual/kernel:do_shared_workdir" |
28 | 28 | ||
29 | COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" | 29 | COMPATIBLE_HOST = "(x86_64|aarch64|riscv64).*-linux" |
30 | COMPATIBLE_HOST:libc-musl = 'null' | 30 | COMPATIBLE_HOST:libc-musl = 'null' |
31 | 31 | ||
32 | do_compile() { | 32 | do_compile() { |
diff --git a/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.4.bb b/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.5.bb index 54883cef3..54883cef3 100644 --- a/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.4.bb +++ b/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.5.bb | |||
diff --git a/meta-oe/recipes-kernel/crash/crash.inc b/meta-oe/recipes-kernel/crash/crash.inc index 04318b150..29cff569f 100644 --- a/meta-oe/recipes-kernel/crash/crash.inc +++ b/meta-oe/recipes-kernel/crash/crash.inc | |||
@@ -23,7 +23,7 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=http | |||
23 | file://donnot-extract-gdb-during-do-compile.patch \ | 23 | file://donnot-extract-gdb-during-do-compile.patch \ |
24 | file://gdb_build_jobs_and_not_write_crash_target.patch \ | 24 | file://gdb_build_jobs_and_not_write_crash_target.patch \ |
25 | " | 25 | " |
26 | SRCREV = "a6832f608cb5d473739cf33bbf84ab1df8d98fd5" | 26 | SRCREV = "ceacceef7d13134d327719a624cfafed99e90f8a" |
27 | 27 | ||
28 | SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350" | 28 | SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350" |
29 | 29 | ||
diff --git a/meta-oe/recipes-kernel/crash/crash_8.0.4.bb b/meta-oe/recipes-kernel/crash/crash_8.0.5.bb index 1af90978e..1af90978e 100644 --- a/meta-oe/recipes-kernel/crash/crash_8.0.4.bb +++ b/meta-oe/recipes-kernel/crash/crash_8.0.5.bb | |||
diff --git a/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.27.bb b/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.27.bb new file mode 100644 index 000000000..10d7c6ffd --- /dev/null +++ b/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.27.bb | |||
@@ -0,0 +1,80 @@ | |||
1 | SUMMARY = "drgn (pronounced dragon) is a debugger with an emphasis on \ | ||
2 | programmability. drgn exposes the types and variables in a program for easy, \ | ||
3 | expressive scripting in Python." | ||
4 | HOMEPAGE = "https://github.com/osandov/drgn" | ||
5 | LICENSE = " LGPL-2.1-or-later" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=7c83d30e99508d6b790eacdd3abab846" | ||
7 | |||
8 | SRC_URI = "git://github.com/osandov/drgn.git;protocol=https;branch=main" | ||
9 | SRCREV = "a8dfc9e31f551d4b3c3d4307fa19ab6b3bfafb1c" | ||
10 | |||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | DEPENDS = "\ | ||
14 | autoconf-native \ | ||
15 | automake-native \ | ||
16 | libtool-native \ | ||
17 | elfutils \ | ||
18 | " | ||
19 | |||
20 | DEPENDS:append:toolchain-clang:class-target ="\ | ||
21 | openmp \ | ||
22 | " | ||
23 | |||
24 | OPENMP_LIB = "libgomp" | ||
25 | OPENMP_LIB:toolchain-clang:class-target = "openmp" | ||
26 | |||
27 | RDEPENDS:${PN} = "\ | ||
28 | python3-crypt \ | ||
29 | python3-io \ | ||
30 | python3-logging \ | ||
31 | python3-math \ | ||
32 | python3-pickle \ | ||
33 | python3-stringold \ | ||
34 | python3-compression \ | ||
35 | " | ||
36 | |||
37 | RDEPENDS:${PN}:append:class-target = "\ | ||
38 | libdw \ | ||
39 | libelf \ | ||
40 | ${OPENMP_LIB} \ | ||
41 | " | ||
42 | |||
43 | RDEPENDS:${PN}:append:class-native = "\ | ||
44 | elfutils-native \ | ||
45 | " | ||
46 | |||
47 | RDEPENDS:${PN}:append:class-nativesdk = "\ | ||
48 | nativesdk-elfutils \ | ||
49 | " | ||
50 | |||
51 | OPENMP_LIB_NAME = "gomp" | ||
52 | OPENMP_LIB_NAME:toolchain-clang:class-target = "omp" | ||
53 | |||
54 | export CONFIGURE_FLAGS = "\ | ||
55 | --build=${BUILD_SYS}, \ | ||
56 | --host=${HOST_SYS}, \ | ||
57 | --target=${TARGET_SYS}, \ | ||
58 | --prefix=${prefix}, \ | ||
59 | --exec_prefix=${exec_prefix}, \ | ||
60 | --bindir=${bindir}, \ | ||
61 | --sbindir=${sbindir}, \ | ||
62 | --libexecdir=${libexecdir}, \ | ||
63 | --datadir=${datadir}, \ | ||
64 | --sysconfdir=${sysconfdir}, \ | ||
65 | --sharedstatedir=${sharedstatedir}, \ | ||
66 | --localstatedir=${localstatedir}, \ | ||
67 | --libdir=${libdir}, \ | ||
68 | --includedir=${includedir}, \ | ||
69 | --oldincludedir=${includedir}, \ | ||
70 | --infodir=${infodir}, \ | ||
71 | --mandir=${mandir}, \ | ||
72 | --enable-openmp=${OPENMP_LIB_NAME} \ | ||
73 | " | ||
74 | |||
75 | export PYTHON_CPPFLAGS = "-I${STAGING_INCDIR}/${PYTHON_DIR}" | ||
76 | |||
77 | inherit python3native pkgconfig setuptools3 | ||
78 | |||
79 | BBCLASSEXTEND = "native nativesdk" | ||
80 | |||
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 7a15d16bc..dcd3edaf3 100644 --- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb | |||
@@ -57,3 +57,6 @@ EXTRA_OECONF = "--disable-dependency-tracking --enable-file-security --disable-i | |||
57 | --disable-registry-download \ | 57 | --disable-registry-download \ |
58 | " | 58 | " |
59 | 59 | ||
60 | # http://errors.yoctoproject.org/Errors/Details/766896/ | ||
61 | # 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] | ||
62 | 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 3f57ef3bf..889fe3e22 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | |||
@@ -12,6 +12,7 @@ SRC_URI:append:libc-musl = "\ | |||
12 | " | 12 | " |
13 | SRC_URI += "file://run-ptest \ | 13 | SRC_URI += "file://run-ptest \ |
14 | file://COPYING \ | 14 | file://COPYING \ |
15 | file://0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | # now we just test bpf and vm | 18 | # now we just test bpf and vm |
@@ -149,6 +150,8 @@ remove_unrelated() { | |||
149 | fi | 150 | fi |
150 | } | 151 | } |
151 | 152 | ||
153 | do_configure[dirs] = "${S}" | ||
154 | |||
152 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 155 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
153 | 156 | ||
154 | INHIBIT_PACKAGE_DEBUG_SPLIT="1" | 157 | INHIBIT_PACKAGE_DEBUG_SPLIT="1" |
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch new file mode 100644 index 000000000..bf5525c36 --- /dev/null +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 34021e84d03e2becb88e6c28e8e4867e82a81da5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 17 Sep 2024 17:40:03 -0700 | ||
4 | Subject: [PATCH] selftests: timers: Fix clock_adjtime for newer 32-bit arches | ||
5 | |||
6 | Newer 32-bit architectures e.g. riscv32 are using 64-bit time_t | ||
7 | from get go, they have not wired __NR_clock_adjtime at all | ||
8 | valid-adjtimex testcase fails to compile on such architectures. | ||
9 | if this condition is found then use 64-bit adjtime syscall | ||
10 | |||
11 | Upstream-Status: Submitted [https://patchwork.kernel.org/project/linux-kselftest/patch/20240918004731.3295870-1-raj.khem@gmail.com/] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | Cc: John Stultz <jstultz@google.com> | ||
14 | Cc: Shuah Khan <shuah@kernel.org> | ||
15 | --- | ||
16 | tools/testing/selftests/timers/valid-adjtimex.c | 4 ++++ | ||
17 | 1 file changed, 4 insertions(+) | ||
18 | |||
19 | diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c | ||
20 | index d500884801d8..ff4ff8b1d127 100644 | ||
21 | --- a/tools/testing/selftests/timers/valid-adjtimex.c | ||
22 | +++ b/tools/testing/selftests/timers/valid-adjtimex.c | ||
23 | @@ -39,7 +39,11 @@ | ||
24 | #include <sys/syscall.h> | ||
25 | int clock_adjtime(clockid_t id, struct timex *tx) | ||
26 | { | ||
27 | +#if !defined(__NR_clock_adjtime) && defined(__NR_clock_adjtime64) | ||
28 | + return syscall(__NR_clock_adjtime64, id, tx); | ||
29 | +#else | ||
30 | return syscall(__NR_clock_adjtime, id, tx); | ||
31 | +#endif | ||
32 | } | ||
33 | |||
34 | |||
diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.6.bb index 928482ba3..914ac9f08 100644 --- a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb +++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.6.bb | |||
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238 | |||
8 | 8 | ||
9 | DEPENDS = "zlib elfutils" | 9 | DEPENDS = "zlib elfutils" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.2" | 11 | SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.6" |
12 | SRCREV = "1b357586a7a62db7fe27af4ebe4bdefe6986cfd6" | 12 | SRCREV = "fdf402b384cc42ce29bb9e27011633be3cbafe1e" |
13 | 13 | ||
14 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 14 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
15 | COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux" | 15 | COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux" |
diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb index c90ac19fa..66869b29a 100644 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb +++ b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 | |||
9 | SECTION = "libs" | 9 | SECTION = "libs" |
10 | DEPENDS = "libtraceevent bison-native flex-native" | 10 | DEPENDS = "libtraceevent bison-native flex-native" |
11 | 11 | ||
12 | SRCREV = "67f3b2ab9f836e6c9c70c94db7aac3251119a263" | 12 | SRCREV = "417c2e3aa21af670cc5c13db633dd35292f2d0fa" |
13 | SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \ | 13 | SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \ |
14 | file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \ | 14 | file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \ |
15 | " | 15 | " |
diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index 4770fae50..cfe3bb968 100644 --- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | |||
@@ -33,7 +33,7 @@ do_populate_lic[depends] = "${PN}:do_configure" | |||
33 | 33 | ||
34 | 34 | ||
35 | EXTRA_OEMAKE = '\ | 35 | EXTRA_OEMAKE = '\ |
36 | CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}' \ | 36 | CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}' \ |
37 | ' | 37 | ' |
38 | 38 | ||
39 | # If we build under STAGING_KERNEL_DIR, source will not be put | 39 | # If we build under STAGING_KERNEL_DIR, source will not be put |
@@ -52,12 +52,21 @@ do_configure:prepend() { | |||
52 | cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S} | 52 | cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S} |
53 | cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} | 53 | cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} |
54 | fi | 54 | fi |
55 | if [ -f "${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h" ]; then | ||
56 | cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h ${S} | ||
57 | fi | ||
58 | cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler.h ${S} | ||
59 | cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler_types.h ${S} | ||
60 | cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler-gcc.h ${S} | ||
55 | cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} | 61 | cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} |
56 | } | 62 | } |
57 | 63 | ||
58 | 64 | ||
59 | do_compile() { | 65 | do_compile() { |
60 | sed -i 's#<linux/bits.h>#"bits.h"#' msr-index.h | 66 | sed -i 's#<linux/bits.h>#"bits.h"#' msr-index.h |
67 | sed -i 's#<linux/compiler.h>#"compiler.h"#' build_bug.h | ||
68 | sed -i 's#<linux/compiler_types.h>#"compiler_types.h"#' compiler.h | ||
69 | sed -i 's#<linux/compiler-gcc.h>#"compiler-gcc.h"#' compiler_types.h | ||
61 | 'TMPCHECK='grep "<vdso/const.h>" bits.h'' || true | 70 | 'TMPCHECK='grep "<vdso/const.h>" bits.h'' || true |
62 | if [ -n $TMPCHECK ]; then | 71 | if [ -n $TMPCHECK ]; then |
63 | sed -i 's#<vdso/const.h>#"const.h"#' bits.h | 72 | sed -i 's#<vdso/const.h>#"const.h"#' bits.h |
@@ -66,8 +75,15 @@ do_compile() { | |||
66 | sed -i 's#<linux/const.h>#"const.h"#' bits.h | 75 | sed -i 's#<linux/const.h>#"const.h"#' bits.h |
67 | sed -i -e 's#<uapi/linux/const.h>#<linux/const.h>#' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h | 76 | sed -i -e 's#<uapi/linux/const.h>#<linux/const.h>#' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h |
68 | fi | 77 | fi |
78 | echo '#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))' >> msr-index.h | ||
79 | echo "#define BIT(x) (1 << (x))" > bits.h | ||
80 | echo "#define BIT_ULL(nr) (1ULL << (nr))" >> bits.h | ||
81 | echo "#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (sizeof(long) * 8 - 1 - (h))))" >> bits.h | ||
82 | echo "#define GENMASK_ULL(h, l) (((~0ULL) << (l)) & (~0ULL >> (sizeof(long long) * 8 - 1 - (h))))" >> bits.h | ||
83 | |||
69 | sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c | 84 | sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c |
70 | sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c | 85 | sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c |
86 | sed -i 's#BUILD_BUG_HEADER#"build_bug.h"#' turbostat.c | ||
71 | sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile | 87 | sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile |
72 | oe_runmake STAGING_KERNEL_DIR=${STAGING_KERNEL_DIR} | 88 | oe_runmake STAGING_KERNEL_DIR=${STAGING_KERNEL_DIR} |
73 | } | 89 | } |
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 bbce3e3bf..225bc8ecb 100644 --- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | |||
@@ -63,3 +63,8 @@ do_install:append() { | |||
63 | } | 63 | } |
64 | 64 | ||
65 | BBCLASSEXTEND = "native nativesdk" | 65 | BBCLASSEXTEND = "native nativesdk" |
66 | |||
67 | # http://errors.yoctoproject.org/Errors/Details/766905/ | ||
68 | # 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] | ||
69 | # 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] | ||
70 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-multimedia/libass/libass_0.17.2.bb b/meta-oe/recipes-multimedia/libass/libass_0.17.3.bb index e239d028e..3dd678f05 100644 --- a/meta-oe/recipes-multimedia/libass/libass_0.17.2.bb +++ b/meta-oe/recipes-multimedia/libass/libass_0.17.3.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75" | |||
8 | DEPENDS = "fontconfig freetype fribidi harfbuzz" | 8 | DEPENDS = "fontconfig freetype fribidi harfbuzz" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=master" | 10 | SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=master" |
11 | SRCREV = "cbb48cc4f2f076300004b8b06a86bec55281d0c2" | 11 | SRCREV = "e46aedea0a0d17da4c4ef49d84b94a7994664ab5" |
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb index 53404e54a..42507051f 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb | |||
@@ -9,6 +9,9 @@ DEPENDS = "libcdio" | |||
9 | SRC_URI = "${GNU_MIRROR}/libcdio/${BP}.tar.bz2" | 9 | SRC_URI = "${GNU_MIRROR}/libcdio/${BP}.tar.bz2" |
10 | SRC_URI[sha256sum] = "33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a" | 10 | SRC_URI[sha256sum] = "33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a" |
11 | 11 | ||
12 | UPSTREAM_CHECK_URI = "https://github.com/rocky/libcdio-paranoia/releases" | ||
13 | UPSTREAM_CHECK_REGEX = "release-(?P<pver>\d+(\.\d+)+\+\d+(\.\d+)+)" | ||
14 | |||
12 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
13 | 16 | ||
14 | PACKAGES += "${PN}-utils" | 17 | PACKAGES += "${PN}-utils" |
diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch b/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch new file mode 100644 index 000000000..287dfc8ca --- /dev/null +++ b/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 0cf439c243dfdb6eee6133ee87172235a42e59c9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 14 Sep 2024 22:04:06 +0000 | ||
4 | Subject: [PATCH] cmake: Do not use -mrelax-all with clang on RISCV64 | ||
5 | |||
6 | This option causes clang 19+ to crash on riscv64 | ||
7 | |||
8 | For RISC-V -mrelax-all causes the assembler stage to convert | ||
9 | all conditional branches into | ||
10 | |||
11 | bcc reg, reg, tmplabel | ||
12 | jmp target | ||
13 | tmplabel: | ||
14 | |||
15 | Unconditional jmp can reach targets a lot further than a conditional branch. | ||
16 | Unfortunately, jmp also has a limited range so sometimes needs to be | ||
17 | converted to an indirect jump which requires a scratch register. | ||
18 | We do all branch relaxation early for RISC-V during the compilation | ||
19 | stage so we can allocate the scratch register. | ||
20 | |||
21 | If the assembler also does branch relaxation it will increase the size | ||
22 | of the function and may cause unconditional jmps to go out of range. | ||
23 | If this happens, linking will fail. | ||
24 | |||
25 | Upstream-Status: Submitted [https://github.com/libjxl/libjxl/pull/3826] | ||
26 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
27 | --- | ||
28 | CMakeLists.txt | 2 +- | ||
29 | CONTRIBUTORS | 1 + | ||
30 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
33 | index 8b2ccb57..39bee096 100644 | ||
34 | --- a/CMakeLists.txt | ||
35 | +++ b/CMakeLists.txt | ||
36 | @@ -335,7 +335,7 @@ else () | ||
37 | |||
38 | # Machine flags. | ||
39 | add_compile_options(-funwind-tables) | ||
40 | - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") | ||
41 | + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "riscv") | ||
42 | add_compile_options("SHELL:-Xclang -mrelax-all") | ||
43 | endif() | ||
44 | if (CXX_CONSTRUCTOR_ALIASES_SUPPORTED) | ||
45 | diff --git a/CONTRIBUTORS b/CONTRIBUTORS | ||
46 | index 848096f9..a88c6157 100644 | ||
47 | --- a/CONTRIBUTORS | ||
48 | +++ b/CONTRIBUTORS | ||
49 | @@ -10,6 +10,7 @@ Iulia-Maria Comșa | ||
50 | Jan Wassenberg | ||
51 | Jon Sneyers | ||
52 | Jyrki Alakuijala | ||
53 | +Khem Raj | ||
54 | Krzysztof Potempa | ||
55 | Lode Vandevenne | ||
56 | Luca Versari | ||
diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb b/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.3.bb index 8df0e9a2c..505fca4c8 100644 --- a/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb +++ b/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.3.bb | |||
@@ -8,9 +8,11 @@ inherit cmake pkgconfig mime | |||
8 | 8 | ||
9 | DEPENDS = "highway brotli" | 9 | DEPENDS = "highway brotli" |
10 | 10 | ||
11 | SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1" | 11 | SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1 \ |
12 | file://0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch \ | ||
13 | " | ||
12 | 14 | ||
13 | SRCREV = "e1489592a770b989303b0edc5cc1dc447bbe0515" | 15 | SRCREV = "4a3b22d2600f92d8706fb72d85d52bfee2acbd54" |
14 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
15 | 17 | ||
16 | EXTRA_OECMAKE = " \ | 18 | EXTRA_OECMAKE = " \ |
@@ -36,6 +38,7 @@ PACKAGECONFIG ?= "mime gdk-pixbuf-loader sizeless-vectors" | |||
36 | # 591 | HWY_RVV_FOREACH(HWY_RVV_LANES, Lanes, setvlmax_e, _ALL) | 38 | # 591 | HWY_RVV_FOREACH(HWY_RVV_LANES, Lanes, setvlmax_e, _ALL) |
37 | # | ^ | 39 | # | ^ |
38 | PACKAGECONFIG:remove:riscv64 = "sizeless-vectors" | 40 | PACKAGECONFIG:remove:riscv64 = "sizeless-vectors" |
41 | PACKAGECONFIG:remove:riscv32 = "sizeless-vectors" | ||
39 | PACKAGECONFIG[gdk-pixbuf-loader] = "-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=ON,-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=OFF,gdk-pixbuf" | 42 | PACKAGECONFIG[gdk-pixbuf-loader] = "-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=ON,-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=OFF,gdk-pixbuf" |
40 | PACKAGECONFIG[gimp] = "-DJPEGXL_ENABLE_PLUGIN_GIMP210=ON,-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF,gimp" | 43 | PACKAGECONFIG[gimp] = "-DJPEGXL_ENABLE_PLUGIN_GIMP210=ON,-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF,gimp" |
41 | PACKAGECONFIG[mime] = "-DJPEGXL_ENABLE_PLUGIN_MIME=ON,-DJPEGXL_ENABLE_PLUGIN_MIME=OFF" | 44 | PACKAGECONFIG[mime] = "-DJPEGXL_ENABLE_PLUGIN_MIME=ON,-DJPEGXL_ENABLE_PLUGIN_MIME=OFF" |
diff --git a/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb b/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb index 596c5fe86..151530ab8 100644 --- a/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb +++ b/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb | |||
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=174b92049c2c697eb73112801662a07c" | |||
8 | 8 | ||
9 | DEPENDS = "libopus" | 9 | DEPENDS = "libopus" |
10 | 10 | ||
11 | UPSTREAM_CHECK_URI = "https://github.com/xiph/libopusenc/releases" | 11 | UPSTREAM_CHECK_URI = "https://github.com/xiph/libopusenc/tags" |
12 | UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" | ||
12 | 13 | ||
13 | SRC_URI = "https://ftp.osuosl.org/pub/xiph/releases/opus/libopusenc-${PV}.tar.gz" | 14 | SRC_URI = "https://ftp.osuosl.org/pub/xiph/releases/opus/libopusenc-${PV}.tar.gz" |
14 | SRC_URI[md5sum] = "f038ea0f4168d184c76b42d293697c57" | 15 | SRC_URI[md5sum] = "f038ea0f4168d184c76b42d293697c57" |
diff --git a/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb new file mode 100644 index 000000000..b68e67a8c --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY ="Reusable library for GPU-accelerated video/image rendering primitives" | ||
2 | LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0 & MIT" | ||
3 | LIC_FILES_CHKSUM = "file://3rdparty/Vulkan-Headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
4 | file://3rdparty/fast_float/LICENSE-APACHE;md5=81db248e90379bcfc0582b578b009bc3 \ | ||
5 | file://3rdparty/fast_float/LICENSE-BOOST;md5=2c7a3fa82e66676005cd4ee2608fd7d2 \ | ||
6 | file://3rdparty/fast_float/LICENSE-MIT;md5=32b11d50c7d9788d4270f6a83f3e68eb \ | ||
7 | file://3rdparty/glad/LICENSE;md5=ae570f26774ac096cff8f992091a223c \ | ||
8 | file://3rdparty/jinja/LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462 \ | ||
9 | file://3rdparty/jinja/docs/license.rst;md5=5f4c795946979fabc2361be4c70d0a9f \ | ||
10 | file://3rdparty/markupsafe/LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75 \ | ||
11 | file://3rdparty/markupsafe/docs/license.rst;md5=5f4c795946979fabc2361be4c70d0a9f \ | ||
12 | file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da \ | ||
13 | file://demos/3rdparty/nuklear/src/LICENSE;md5=6052431ae6cd4f0082276c54996e7770 \ | ||
14 | file://demos/LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032" | ||
15 | |||
16 | SRC_URI = "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master" | ||
17 | |||
18 | SRCREV = "1fd3c7bde7b943fe8985c893310b5269a09b46c5" | ||
19 | |||
20 | inherit meson pkgconfig | ||
21 | |||
22 | S = "${WORKDIR}/git" | ||
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch b/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch new file mode 100644 index 000000000..b96ec5d4c --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 9878681df9919d28da3e4c6cc706e264abd9df92 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 29 Aug 2024 17:54:15 -0700 | ||
4 | Subject: [PATCH] file2string: Avoid emitting absolute filepaths into generated | ||
5 | sources | ||
6 | |||
7 | These sources are bundled into src packages to be distributed and leaking | ||
8 | buildpaths results in violating reproducibility norms. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/mpv-player/mpv/pull/14763] | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | TOOLS/file2string.py | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/TOOLS/file2string.py b/TOOLS/file2string.py | ||
18 | index 5b1c4a95d1..39c1122a35 100755 | ||
19 | --- a/TOOLS/file2string.py | ||
20 | +++ b/TOOLS/file2string.py | ||
21 | @@ -22,10 +22,10 @@ | ||
22 | # License along with mpv. If not, see <http://www.gnu.org/licenses/>. | ||
23 | # | ||
24 | |||
25 | -import sys | ||
26 | +import os, sys | ||
27 | |||
28 | def file2string(infilename, infile, outfile): | ||
29 | - outfile.write("// Generated from %s\n\n" % infilename) | ||
30 | + outfile.write("// Generated from %s\n\n" % os.path.basename(infilename)) | ||
31 | |||
32 | conv = ["\\%03o" % c for c in range(256)] | ||
33 | safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \ | ||
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb index 0f50a6e8f..80e0f7ca7 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb | |||
@@ -9,20 +9,20 @@ DEPENDS = " \ | |||
9 | jpeg \ | 9 | jpeg \ |
10 | libv4l \ | 10 | libv4l \ |
11 | libass \ | 11 | libass \ |
12 | libplacebo \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | LICENSE = "GPL-2.0-or-later" | 15 | LICENSE = "GPL-2.0-or-later" |
15 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 16 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
16 | 17 | ||
17 | SRCREV_mpv = "140ec21c89d671d392877a7f3b91d67e7d7b9239" | 18 | SRCREV_mpv = "02254b92dd237f03aa0a151c2a68778c4ea848f9" |
18 | SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.35;protocol=https \ | 19 | SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.38;protocol=https \ |
19 | https://waf.io/waf-2.0.25;name=waf;subdir=git \ | 20 | file://0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch \ |
20 | " | 21 | " |
21 | SRC_URI[waf.sha256sum] = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5" | ||
22 | 22 | ||
23 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
24 | 24 | ||
25 | inherit waf pkgconfig mime-xdg | 25 | inherit meson pkgconfig mime-xdg |
26 | 26 | ||
27 | LDFLAGS:append:riscv64 = " -latomic" | 27 | LDFLAGS:append:riscv64 = " -latomic" |
28 | 28 | ||
@@ -42,59 +42,55 @@ PACKAGECONFIG ??= " \ | |||
42 | ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ | 42 | ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ |
43 | " | 43 | " |
44 | 44 | ||
45 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext" | 45 | PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext" |
46 | PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv" | 46 | PACKAGECONFIG[xv] = "-Dxv=enabled,-Dxv=disabled,libxv" |
47 | PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" | 47 | PACKAGECONFIG[opengl] = "-Dgl=enabled,-Dgl=disabled,virtual/libgl" |
48 | PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" | 48 | PACKAGECONFIG[egl] = "-Degl=enabled,-Degl-disabled,virtual/egl" |
49 | PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" | 49 | PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm" |
50 | PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm" | 50 | PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm" |
51 | PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" | 51 | PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,lua luajit" |
52 | PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" | 52 | PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive" |
53 | PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack" | 53 | PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" |
54 | PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" | 54 | PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva" |
55 | PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" | 55 | PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau" |
56 | PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native libxkbcommon" | 56 | PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon" |
57 | 57 | ||
58 | python __anonymous() { | 58 | python __anonymous() { |
59 | packageconfig = (d.getVar("PACKAGECONFIG") or "").split() | 59 | packageconfig = (d.getVar("PACKAGECONFIG") or "").split() |
60 | extras = [] | 60 | extras = [] |
61 | if "x11" in packageconfig and "opengl" in packageconfig: | 61 | if "x11" in packageconfig and "opengl" in packageconfig: |
62 | extras.append(" --enable-gl-x11") | 62 | extras.append(" -Dgl-x11=enabled") |
63 | if "x11" in packageconfig and "egl" in packageconfig: | 63 | if "x11" in packageconfig and "egl" in packageconfig: |
64 | extras.append(" --enable-egl-x11") | 64 | extras.append(" -Degl-x11=enabled") |
65 | if "egl" in packageconfig and "drm" in packageconfig: | 65 | if "egl" in packageconfig and "drm" in packageconfig: |
66 | extras.append(" --enable-egl-drm") | 66 | extras.append(" -Degl-drm=enabled") |
67 | if "vaapi" in packageconfig and "x11" in packageconfig: | 67 | if "vaapi" in packageconfig and "x11" in packageconfig: |
68 | extras.append(" --enable-vaapi-x11") | 68 | extras.append(" -Dvaapi-x11=enabled") |
69 | if "vaapi" in packageconfig and "drm" in packageconfig: | 69 | if "vaapi" in packageconfig and "drm" in packageconfig: |
70 | extras.append(" --enable-vaapi-drm") | 70 | extras.append(" -Dvaapi-drm=enabled") |
71 | if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig: | 71 | if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig: |
72 | extras.append(" --enable-vaapi-x-egl") | 72 | extras.append(" -Dvaapi-x-egl=enabled") |
73 | if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig: | 73 | if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig: |
74 | extras.append(" --enable-vdpau-gl-x11") | 74 | extras.append(" -Dvdpau-gl-x11=enabled") |
75 | if "wayland" in packageconfig and "opengl" in packageconfig: | 75 | if "wayland" in packageconfig and "opengl" in packageconfig: |
76 | extras.append(" --enable-gl-wayland") | 76 | extras.append(" -Dgl-wayland=enabled") |
77 | if "wayland" in packageconfig and "vaapi" in packageconfig: | 77 | if "wayland" in packageconfig and "vaapi" in packageconfig: |
78 | extras.append(" --enable-vaapi-wayland") | 78 | extras.append(" -Dvaapi-wayland=enabled") |
79 | if extras: | 79 | if extras: |
80 | d.appendVar("EXTRA_OECONF", "".join(extras)) | 80 | d.appendVar("EXTRA_OECONF", "".join(extras)) |
81 | } | 81 | } |
82 | 82 | ||
83 | SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" | 83 | #SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" |
84 | 84 | ||
85 | EXTRA_OECONF = " \ | 85 | EXTRA_OECONF = " \ |
86 | --prefix=${prefix} \ | 86 | -Dmanpage-build=disabled \ |
87 | --target=${SIMPLE_TARGET_SYS} \ | 87 | -Dlibbluray=disabled \ |
88 | --confdir=${sysconfdir} \ | 88 | -Ddvdnav=disabled \ |
89 | --datadir=${datadir} \ | 89 | -Dcdda=disabled \ |
90 | --disable-manpage-build \ | 90 | -Duchardet=disabled \ |
91 | --disable-libbluray \ | 91 | -Drubberband=disabled \ |
92 | --disable-dvdnav \ | 92 | -Dlcms2=disabled \ |
93 | --disable-cdda \ | 93 | -Dvapoursynth=disabled \ |
94 | --disable-uchardet \ | ||
95 | --disable-rubberband \ | ||
96 | --disable-lcms2 \ | ||
97 | --disable-vapoursynth \ | ||
98 | ${PACKAGECONFIG_CONFARGS} \ | 94 | ${PACKAGECONFIG_CONFARGS} \ |
99 | " | 95 | " |
100 | 96 | ||
@@ -102,11 +98,6 @@ do_configure:append() { | |||
102 | sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h | 98 | sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h |
103 | } | 99 | } |
104 | 100 | ||
105 | link_waf() { | ||
106 | ln -s waf-2.0.25 ${S}/waf | ||
107 | } | ||
108 | do_unpack[postfuncs] += "link_waf" | ||
109 | |||
110 | FILES:${PN} += " \ | 101 | FILES:${PN} += " \ |
111 | ${datadir}/icons \ | 102 | ${datadir}/icons \ |
112 | ${datadir}/zsh \ | 103 | ${datadir}/zsh \ |
diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb index 012fc3a94..29500bdb9 100644 --- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb | |||
@@ -14,7 +14,7 @@ inherit autotools features_check perlnative pkgconfig | |||
14 | 14 | ||
15 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 15 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
16 | 16 | ||
17 | SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" | 17 | SRC_URI = "http://www.freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" |
18 | SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-pavucontrol-remove-canberra-gtk-support.patch', '', d)}" | 18 | SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-pavucontrol-remove-canberra-gtk-support.patch', '', d)}" |
19 | 19 | ||
20 | SRC_URI[sha256sum] = "ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a" | 20 | SRC_URI[sha256sum] = "ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a" |
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch deleted file mode 100644 index 64c01e497..000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 502c0302827cec3d2b2a69fb25189646685ef2ff Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabio Estevam <festevam@denx.de> | ||
3 | Date: Fri, 12 Jan 2024 00:17:14 -0300 | ||
4 | Subject: [PATCH] keytable: meson: Restrict the installation of | ||
5 | 50-rc_keymap.conf | ||
6 | |||
7 | Currently, meson tries to install 50-rc_keymap.conf even if systemd | ||
8 | is not used. | ||
9 | |||
10 | Commit 01f2c6c58e6f ("keytable: restrict installation of 50-rc_keymap.conf"), | ||
11 | only allowed 50-rc_keymap.conf to be installed when both BPF and systemd | ||
12 | were used. | ||
13 | |||
14 | Apply the same logic in meson to fix the problem. | ||
15 | |||
16 | Signed-off-by: Fabio Estevam <festevam@denx.de> | ||
17 | Signed-off-by: Sean Young <sean@mess.org> | ||
18 | Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=a21924ec424c4744af6f2a794e0677eba35dd168] | ||
19 | --- | ||
20 | utils/keytable/meson.build | 4 ++++ | ||
21 | 1 file changed, 4 insertions(+) | ||
22 | |||
23 | diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build | ||
24 | index 4130a4bea514..76ce329eae8e 100644 | ||
25 | --- a/utils/keytable/meson.build | ||
26 | +++ b/utils/keytable/meson.build | ||
27 | @@ -69,6 +69,8 @@ ir_keytable_udev_rules = files( | ||
28 | install_data(ir_keytable_udev_rules, | ||
29 | install_dir : ir_keytable_system_dir / 'rules.d') | ||
30 | |||
31 | +if ir_bpf_enabled | ||
32 | +if dep_systemd.found() | ||
33 | if have_udevdsyscallfilter | ||
34 | ir_keytable_systemd_files = files( | ||
35 | '50-rc_keymap.conf', | ||
36 | @@ -76,6 +78,8 @@ if have_udevdsyscallfilter | ||
37 | install_data(ir_keytable_systemd_files, | ||
38 | install_dir : systemd_systemdir / 'systemd-udevd.service.d') | ||
39 | endif | ||
40 | +endif | ||
41 | +endif | ||
42 | |||
43 | # Install non-existing directory to create empty directory structure | ||
44 | # See: https://github.com/mesonbuild/meson/issues/2904 | ||
45 | -- | ||
46 | 2.34.1 | ||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch new file mode 100644 index 000000000..6c946d8c4 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch | |||
@@ -0,0 +1,78 @@ | |||
1 | From 3867fcfa4389c7fa271705f1fd1d4bfb74bc1bd1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Neel Gandhi <neel.gandhi@amd.com> | ||
3 | Date: Wed, 5 Jun 2024 13:51:36 +0530 | ||
4 | Subject: [PATCH] media-ctl: Install media-ctl header and library files | ||
5 | |||
6 | Install mediactl and v4l2subdev header and library | ||
7 | files, which may be required by 3rd party applications | ||
8 | to populate and control v4l2subdev device node tree | ||
9 | |||
10 | Install of these files was removed in upstream commit | ||
11 | 0911dce53b08b0df3066be2c75f67e8a314d8729. | ||
12 | |||
13 | Upstream-Status: Denied | ||
14 | |||
15 | v4l-utils maintainers do not promise a stable API for this library, and | ||
16 | do not currently have the time to do so. So exporting the API in this | ||
17 | way is fine, as long as we understand that it will change and users of | ||
18 | the API will need to adapt over time. | ||
19 | |||
20 | Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> | ||
21 | Signed-off-by: Mark Hatle <mark.hatle@amd.com> | ||
22 | --- | ||
23 | utils/media-ctl/meson.build | 28 +++++++++++++++++++++------- | ||
24 | 1 file changed, 21 insertions(+), 7 deletions(-) | ||
25 | |||
26 | diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build | ||
27 | index 3a7b0c9a..40669b4c 100644 | ||
28 | --- a/utils/media-ctl/meson.build | ||
29 | +++ b/utils/media-ctl/meson.build | ||
30 | @@ -3,14 +3,24 @@ libmediactl_sources = files( | ||
31 | 'mediactl-priv.h', | ||
32 | ) | ||
33 | |||
34 | +libmediactl_api = files( | ||
35 | + 'mediactl.h', | ||
36 | + 'v4l2subdev.h', | ||
37 | +) | ||
38 | + | ||
39 | +install_headers(libmediactl_api, subdir: 'mediactl') | ||
40 | + | ||
41 | libmediactl_deps = [ | ||
42 | dep_libudev, | ||
43 | ] | ||
44 | |||
45 | -libmediactl = static_library('mediactl', | ||
46 | - libmediactl_sources, | ||
47 | - dependencies : libmediactl_deps, | ||
48 | - include_directories : v4l2_utils_incdir) | ||
49 | +libmediactl = library('mediactl', | ||
50 | + libmediactl_sources, | ||
51 | + soversion: '0', | ||
52 | + version: '0.0.0', | ||
53 | + install : true, | ||
54 | + dependencies : libmediactl_deps, | ||
55 | + include_directories : v4l2_utils_incdir) | ||
56 | |||
57 | dep_libmediactl = declare_dependency(link_with : libmediactl) | ||
58 | |||
59 | @@ -18,9 +28,13 @@ libv4l2subdev_sources = files('libv4l2subdev.c') | ||
60 | libv4l2subdev_sources += media_bus_format_names_h | ||
61 | libv4l2subdev_sources += media_bus_format_codes_h | ||
62 | |||
63 | -libv4l2subdev = static_library('v4l2subdev', | ||
64 | - libv4l2subdev_sources, | ||
65 | - include_directories : v4l2_utils_incdir) | ||
66 | +libv4l2subdev = library('v4l2subdev', | ||
67 | + libv4l2subdev_sources, | ||
68 | + soversion: '0', | ||
69 | + version: '0.0.0', | ||
70 | + install : true, | ||
71 | + dependencies : dep_libmediactl, | ||
72 | + include_directories : v4l2_utils_incdir) | ||
73 | |||
74 | dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev) | ||
75 | |||
76 | -- | ||
77 | 2.34.1 | ||
78 | |||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch new file mode 100644 index 000000000..8a009ae80 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From a422ddf7f8805d34ff1fbb46d335993c9cd05ead Mon Sep 17 00:00:00 2001 | ||
2 | From: Einar Jon Gunnarsson <tolvupostur@gmail.com> | ||
3 | Date: Fri, 10 May 2024 11:56:17 +0200 | ||
4 | Subject: [PATCH] media-ctl: Install media-ctl pkg-config files | ||
5 | |||
6 | libv4l2subdev/libmediactl can not be used in projects without the | ||
7 | pkg-config files. This adds them as well. | ||
8 | |||
9 | Upstream-Status: Denied | ||
10 | |||
11 | This is an add-on to the previous patch: | ||
12 | 0001-media-ctl-Install-media-ctl-header-and-library-files.patch | ||
13 | so same restrictions apply. | ||
14 | |||
15 | Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com> | ||
16 | --- | ||
17 | utils/media-ctl/meson.build | 12 ++++++++++++ | ||
18 | 1 file changed, 12 insertions(+) | ||
19 | |||
20 | diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build | ||
21 | index 40669b4c..6feba1af 100644 | ||
22 | --- a/utils/media-ctl/meson.build | ||
23 | +++ b/utils/media-ctl/meson.build | ||
24 | @@ -38,6 +38,12 @@ libv4l2subdev = library('v4l2subdev', | ||
25 | |||
26 | dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev) | ||
27 | |||
28 | +pkg.generate( | ||
29 | + libv4l2subdev, | ||
30 | + name : 'libv4l2subdev', | ||
31 | + version : meson.project_version(), | ||
32 | + description : 'v4l2 subdev library') | ||
33 | + | ||
34 | media_ctl_sources = files( | ||
35 | 'media-ctl.c', | ||
36 | 'options.c', | ||
37 | @@ -55,3 +61,9 @@ media_ctl = executable('media-ctl', | ||
38 | dependencies : media_ctl_deps, | ||
39 | install : true, | ||
40 | include_directories : v4l2_utils_incdir) | ||
41 | + | ||
42 | +pkg.generate( | ||
43 | + libmediactl, | ||
44 | + name : 'libmediactl', | ||
45 | + version : meson.project_version(), | ||
46 | + description : 'v4l2 mediactl library') | ||
47 | -- | ||
48 | 2.43.5 | ||
49 | |||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb index 52759ef18..afe217e1f 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb | |||
@@ -26,16 +26,17 @@ PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled" | |||
26 | PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" | 26 | PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" |
27 | 27 | ||
28 | SRC_URI = "\ | 28 | SRC_URI = "\ |
29 | git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ | 29 | git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.28 \ |
30 | file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \ | 30 | file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ |
31 | file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \ | ||
31 | " | 32 | " |
32 | 33 | ||
33 | SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" | 34 | SRCREV = "fc15e229d9d337e46d730f00647821adbbd58548" |
34 | |||
35 | PV .= "+git" | ||
36 | 35 | ||
37 | S = "${WORKDIR}/git" | 36 | S = "${WORKDIR}/git" |
38 | 37 | ||
38 | UPSTREAM_CHECK_GITTAGREGEX = "v4l-utils-(?P<pver>\d+(\.\d+)+)" | ||
39 | |||
39 | EXTRA_OEMESON = "-Dudevdir=${base_libdir}/udev -Dv4l2-compliance-32=false -Dv4l2-ctl-32=false" | 40 | EXTRA_OEMESON = "-Dudevdir=${base_libdir}/udev -Dv4l2-compliance-32=false -Dv4l2-ctl-32=false" |
40 | 41 | ||
41 | # Disable the erroneous installation of gconv-modules that would break glib | 42 | # Disable the erroneous installation of gconv-modules that would break glib |
diff --git a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb index 306952830..699b5608d 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb | |||
@@ -2,23 +2,14 @@ SUMMARY = "Yet Another V4L2 Test Application" | |||
2 | LICENSE = "GPL-2.0-only" | 2 | LICENSE = "GPL-2.0-only" |
3 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" | 3 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" |
4 | 4 | ||
5 | SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master \ | 5 | SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master;protocol=https \ |
6 | " | 6 | " |
7 | SRCREV = "65f740aa1758531fd810339bc1b7d1d33666e28a" | 7 | SRCREV = "52c975e5542504ac10bed8b1d68df5c75951d202" |
8 | 8 | ||
9 | PV = "0.0" | 9 | PV = "0.0" |
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
12 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | 12 | # Upstream repo does not tag |
13 | 13 | UPSTREAM_CHECK_COMMITS = "1" | |
14 | # The yavta sources include copies of the headers required to build in the | ||
15 | # include directory. The Makefile uses CFLAGS to include these, but since | ||
16 | # we override the CFLAGS then we need to add this include path back in. | ||
17 | CFLAGS += "-I${S}/include" | ||
18 | |||
19 | do_install() { | ||
20 | install -d ${D}${bindir} | ||
21 | install -m 0755 yavta ${D}${bindir} | ||
22 | } | ||
23 | |||
24 | 14 | ||
15 | inherit meson | ||
diff --git a/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb b/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb index c611da48c..32f7bae0d 100644 --- a/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb +++ b/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb | |||
@@ -13,3 +13,5 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
13 | 13 | ||
14 | SRC_URI[md5sum] = "2a0d8d02228d4cbd28b6e07bb7c17cf5" | 14 | SRC_URI[md5sum] = "2a0d8d02228d4cbd28b6e07bb7c17cf5" |
15 | SRC_URI[sha256sum] = "8b722b952b64841d996c70c3278499886c81bb5012991beed5f66f4158418f59" | 15 | SRC_URI[sha256sum] = "8b722b952b64841d996c70c3278499886c81bb5012991beed5f66f4158418f59" |
16 | |||
17 | CVE_STATUS[CVE-2006-2658] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different xsp package compared to the one which has the CVE issue." | ||
diff --git a/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch b/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch index 18e718564..d2c0e4df6 100644 --- a/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch +++ b/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch | |||
@@ -8,10 +8,10 @@ Subject: [PATCH] libgeoclue: don't try to use g-ir-scanner when introspection | |||
8 | http://errors.yoctoproject.org/Errors/Details/702778/ | 8 | http://errors.yoctoproject.org/Errors/Details/702778/ |
9 | geoclue/2.7.0-r0/recipe-sysroot/usr/bin/g-ir-scanner-wrapper: line 5: g-ir-scanner: command not found | 9 | geoclue/2.7.0-r0/recipe-sysroot/usr/bin/g-ir-scanner-wrapper: line 5: g-ir-scanner: command not found |
10 | 10 | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
14 | 12 | ||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | libgeoclue/meson.build | 2 +- | 15 | libgeoclue/meson.build | 2 +- |
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 17 | ||
diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.7.1.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.2.bb index 9fcd1e6f1..db0142502 100644 --- a/meta-oe/recipes-navigation/geoclue/geoclue_2.7.1.bb +++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.2.bb | |||
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" | |||
10 | 10 | ||
11 | DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native" | 11 | DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native" |
12 | 12 | ||
13 | inherit meson pkgconfig gtk-doc gobject-introspection vala useradd | 13 | inherit meson pkgconfig gtk-doc gobject-introspection vala |
14 | 14 | ||
15 | SRCREV = "8a24f60969d4c235d9918796c38a6a9c42e10131" | 15 | SRCREV = "ab0a7a447ac037d5043aa04df3030796bf47d94d" |
16 | SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;branch=master \ | 16 | SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;branch=master \ |
17 | file://0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch \ | 17 | file://0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch \ |
18 | " | 18 | " |
@@ -36,17 +36,6 @@ EXTRA_OEMESON += " \ | |||
36 | -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ | 36 | -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ |
37 | " | 37 | " |
38 | 38 | ||
39 | USERADD_PACKAGES = "${PN}" | ||
40 | USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" | ||
41 | |||
42 | do_install:append() { | ||
43 | if ${@bb.utils.contains('PACKAGECONFIG', 'modem-gps', 'true', 'false', d)}; then | ||
44 | # Fix up permissions on polkit rules.d to work with rpm4 constraints | ||
45 | chmod 700 ${D}/${datadir}/polkit-1/rules.d | ||
46 | chown polkitd:root ${D}/${datadir}/polkit-1/rules.d | ||
47 | fi | ||
48 | } | ||
49 | |||
50 | FILES:${PN} += " \ | 39 | FILES:${PN} += " \ |
51 | ${datadir}/dbus-1/system-services \ | 40 | ${datadir}/dbus-1/system-services \ |
52 | ${datadir}/polkit-1/rules.d \ | 41 | ${datadir}/polkit-1/rules.d \ |
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/fix-pps_strerror_r.patch b/meta-oe/recipes-navigation/gpsd/gpsd/fix-pps_strerror_r.patch new file mode 100644 index 000000000..8942b3952 --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd/fix-pps_strerror_r.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From c72a489e2eb13296c7b514b7341033114abf430a Mon Sep 17 00:00:00 2001 | ||
2 | From: Miroslav Lichvar <mlichvar@redhat.com> | ||
3 | Date: Mon, 22 Apr 2024 11:31:24 +0200 | ||
4 | Subject: [PATCH 1/2] SConscript: provide variable names to MergeFlags | ||
5 | |||
6 | If the scons MergeFlags() function is provided with a list of | ||
7 | compiler/linker options, it needs to guess what options belong where. If | ||
8 | it doesn't recognize an option, it is silently ignored. There are also | ||
9 | ambiguous options that could be both in CFLAGS and LINKFLAGS (e.g. -spec). | ||
10 | |||
11 | Provide MergeFlags() with a dict instead of list to avoid the guesswork | ||
12 | in order to pass all options, even if some are not recognized by scons. | ||
13 | Switch LDFLAGS to LINKFLAGS for better compatibility with existing | ||
14 | scripts. | ||
15 | |||
16 | Upstream-Status: Submitted [https://gitlab.com/gpsd/gpsd/-/merge_requests/406] | ||
17 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
18 | |||
19 | --- | ||
20 | SConscript | 11 ++++++----- | ||
21 | 1 file changed, 6 insertions(+), 5 deletions(-) | ||
22 | |||
23 | diff --git a/SConscript b/SConscript | ||
24 | index dab481654..ee90d87c4 100644 | ||
25 | --- a/SConscript | ||
26 | +++ b/SConscript | ||
27 | @@ -585,8 +585,8 @@ env['SC_PYTHON'] = sys.executable # Path to SCons Python | ||
28 | # explicitly quote them or (better yet) use the "=" form of GNU option | ||
29 | # settings. | ||
30 | # | ||
31 | -# Scons also uses different internal names than most other build-systems. | ||
32 | -# So we rely on MergeFlags/ParseFlags to do the right thing for us. | ||
33 | +# Scons also uses different internal names than most other build-systems, | ||
34 | +# e.g. it uses LINKFLAGS instead of LDFLAGS. | ||
35 | # | ||
36 | # scons uses gcc, or clang, to link. Thus LDFLAGS does not serve its | ||
37 | # traditional function of providing arguments to ln. LDFLAGS set in the | ||
38 | @@ -618,7 +618,10 @@ for i in ["ARFLAGS", | ||
39 | "SHLINKFLAGS", | ||
40 | ]: | ||
41 | if i in os.environ: | ||
42 | - env.MergeFlags(Split(os.getenv(i))) | ||
43 | + t = i | ||
44 | + if t == "LDFLAGS": | ||
45 | + t = "LINKFLAGS" | ||
46 | + env.MergeFlags({t: Split(os.getenv(i))}) | ||
47 | |||
48 | |||
49 | # Keep scan-build options in the environment | ||
50 | -- | ||
51 | GitLab | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb index ddea8ad2e..e3b2f8bf6 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb | |||
@@ -7,8 +7,9 @@ PROVIDES = "virtual/gpsd" | |||
7 | 7 | ||
8 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ | 8 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ |
9 | file://gpsd.init \ | 9 | file://gpsd.init \ |
10 | file://fix-pps_strerror_r.patch \ | ||
10 | " | 11 | " |
11 | SRC_URI[sha256sum] = "00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c" | 12 | SRC_URI[sha256sum] = "b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2" |
12 | 13 | ||
13 | inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig | 14 | inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig |
14 | 15 | ||
@@ -26,6 +27,7 @@ CLEANBROKEN = "1" | |||
26 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} usb" | 27 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} usb" |
27 | PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez5" | 28 | PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez5" |
28 | PACKAGECONFIG[qt] = "qt='yes' qt_versioned=5,qt='no',qtbase" | 29 | PACKAGECONFIG[qt] = "qt='yes' qt_versioned=5,qt='no',qtbase" |
30 | PACKAGECONFIG[pyserial] = "" | ||
29 | PACKAGECONFIG[usb] = "usb='true',usb='false',libusb1" | 31 | PACKAGECONFIG[usb] = "usb='true',usb='false',libusb1" |
30 | EXTRA_OESCONS = " \ | 32 | EXTRA_OESCONS = " \ |
31 | sysroot=${STAGING_DIR_TARGET} \ | 33 | sysroot=${STAGING_DIR_TARGET} \ |
@@ -79,7 +81,7 @@ do_install:append() { | |||
79 | fi | 81 | fi |
80 | } | 82 | } |
81 | 83 | ||
82 | PACKAGES =+ "libgps python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils gps-utils-python" | 84 | PACKAGES =+ "libgps python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gpsd-snmp gps-utils gps-utils-python" |
83 | 85 | ||
84 | RPROVIDES:${PN}-dbg += "python-pygps-dbg" | 86 | RPROVIDES:${PN}-dbg += "python-pygps-dbg" |
85 | 87 | ||
@@ -104,6 +106,9 @@ CONFFILES:gpsd-conf = "${sysconfdir}/default/gpsd.default" | |||
104 | SUMMARY:gpsd-gpsctl = "Tool for tweaking GPS modes" | 106 | SUMMARY:gpsd-gpsctl = "Tool for tweaking GPS modes" |
105 | FILES:gpsd-gpsctl = "${bindir}/gpsctl" | 107 | FILES:gpsd-gpsctl = "${bindir}/gpsctl" |
106 | 108 | ||
109 | SUMMARY:gpsd-snmp = "MIB for using SNMP with gpsd" | ||
110 | FILES:gpsd-snmp = "${datadir}/snmp" | ||
111 | |||
107 | SUMMARY:gps-utils = "Utils used for simulating, monitoring,... a GPS" | 112 | SUMMARY:gps-utils = "Utils used for simulating, monitoring,... a GPS" |
108 | FILES:gps-utils = "\ | 113 | FILES:gps-utils = "\ |
109 | ${bindir}/cgps \ | 114 | ${bindir}/cgps \ |
@@ -143,7 +148,7 @@ FILES:python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir} | |||
143 | RDEPENDS:python3-pygps = " \ | 148 | RDEPENDS:python3-pygps = " \ |
144 | python3-core \ | 149 | python3-core \ |
145 | python3-io \ | 150 | python3-io \ |
146 | python3-pyserial \ | 151 | ${@bb.utils.contains('PACKAGECONFIG', 'pyserial', 'python3-pyserial', '', d)} \ |
147 | python3-threading \ | 152 | python3-threading \ |
148 | python3-terminal \ | 153 | python3-terminal \ |
149 | gpsd \ | 154 | gpsd \ |
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch new file mode 100644 index 000000000..daef7fab4 --- /dev/null +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 406e841b3e011e1090f23dba12b12cdd9ec4707e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 24 Aug 2024 15:19:35 -0700 | ||
4 | Subject: [PATCH] wfs: Cover xmlNanoHTTPCleanup with LIBXML_HTTP_ENABLED | ||
5 | |||
6 | libxml2 has deprecated internal http support [1] | ||
7 | |||
8 | [1] https://www.gaia-gis.it/fossil/libspatialite/tktview?name=7c452740fe | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | src/wfs/wfs_in.c | 2 ++ | ||
14 | 1 file changed, 2 insertions(+) | ||
15 | |||
16 | diff --git a/src/wfs/wfs_in.c b/src/wfs/wfs_in.c | ||
17 | index 1cfe39d..41ad2ab 100644 | ||
18 | --- a/src/wfs/wfs_in.c | ||
19 | +++ b/src/wfs/wfs_in.c | ||
20 | @@ -4638,7 +4638,9 @@ SPATIALITE_DECLARE void | ||
21 | reset_wfs_http_connection (void) | ||
22 | { | ||
23 | /* Resets the libxml2 "nano HTTP": useful when changing the HTTP_PROXY settings */ | ||
24 | +#ifdef LIBXML_HTTP_ENABLED | ||
25 | xmlNanoHTTPCleanup (); | ||
26 | +#endif | ||
27 | } | ||
28 | |||
29 | #else /* LIBXML2 isn't enabled */ | ||
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch deleted file mode 100644 index 6f1c165f5..000000000 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac | ||
4 | --- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:18.748858216 +0100 | ||
5 | +++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:18.751858215 +0100 | ||
6 | @@ -96,7 +96,7 @@ AC_PROG_INSTALL | ||
7 | AC_PROG_LN_S | ||
8 | AC_PROG_MAKE_SET | ||
9 | AC_LIBTOOL_WIN32_DLL | ||
10 | -AC_PROG_LIBTOOL | ||
11 | +LT_INIT | ||
12 | |||
13 | # Checks for typedefs, structures, and compiler characteristics. | ||
14 | AC_C_CONST | ||
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch index de6e50a58..4b381eda8 100644 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch | |||
@@ -1,13 +1,13 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Pending |
2 | 2 | ||
3 | diff -rupN libspatialite-5.0.1/spatialite.pc.in libspatialite-5.0.1-new/spatialite.pc.in | 3 | --- a/spatialite.pc.in |
4 | --- libspatialite-5.0.1/spatialite.pc.in 2021-02-07 16:53:46.000000000 +0100 | 4 | +++ b/spatialite.pc.in |
5 | +++ libspatialite-5.0.1-new/spatialite.pc.in 2021-02-10 09:54:09.647552994 +0100 | 5 | @@ -8,5 +8,7 @@ includedir=@includedir@ |
6 | @@ -8,5 +8,6 @@ includedir=@includedir@ | ||
7 | Name: spatialite | 6 | Name: spatialite |
8 | Description: Spatial SQL database engine based on SQLite | 7 | Description: Spatial SQL database engine based on SQLite |
9 | Version: @VERSION@ | 8 | Version: @VERSION@ |
10 | -Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ -lm | 9 | -Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm |
11 | +Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ -lm | 10 | +Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm |
12 | +Libs: -L${libdir} -lspatialite | 11 | +Libs: -L${libdir} -lspatialite |
12 | + | ||
13 | Cflags: -I${includedir} | 13 | Cflags: -I${includedir} |
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb b/meta-oe/recipes-navigation/libspatialite/libspatialite_5.1.0.bb index f46b1083e..0fe0bb119 100644 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite_5.1.0.bb | |||
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e" | |||
8 | 8 | ||
9 | SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \ | 9 | SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \ |
10 | file://libspatialite_geos.patch \ | 10 | file://libspatialite_geos.patch \ |
11 | file://libspatialite_macros.patch \ | ||
12 | file://libspatialite_pkgconfig.patch \ | 11 | file://libspatialite_pkgconfig.patch \ |
12 | file://0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch \ | ||
13 | " | 13 | " |
14 | 14 | SRC_URI[sha256sum] = "43be2dd349daffe016dd1400c5d11285828c22fea35ca5109f21f3ed50605080" | |
15 | SRC_URI[sha256sum] = "eecbc94311c78012d059ebc0fae86ea5ef6eecb13303e6e82b3753c1b3409e98" | ||
16 | 15 | ||
17 | inherit autotools-brokensep pkgconfig | 16 | inherit autotools-brokensep pkgconfig |
18 | 17 | ||
diff --git a/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb b/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb index efcd1aab8..ff4ed1679 100644 --- a/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb +++ b/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb | |||
@@ -11,6 +11,8 @@ SRC_URI = " \ | |||
11 | " | 11 | " |
12 | SRC_URI[sha256sum] = "b5152e3dd148ed73835827ac2f219df7cf5808dbf9dbaec2aa0127b44de800d8" | 12 | SRC_URI[sha256sum] = "b5152e3dd148ed73835827ac2f219df7cf5808dbf9dbaec2aa0127b44de800d8" |
13 | 13 | ||
14 | UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups-filters/releases" | ||
15 | |||
14 | inherit autotools gettext pkgconfig github-releases | 16 | inherit autotools gettext pkgconfig github-releases |
15 | 17 | ||
16 | EXTRA_OECONF += " \ | 18 | EXTRA_OECONF += " \ |
diff --git a/meta-oe/recipes-printing/qpdf/qpdf_11.9.0.bb b/meta-oe/recipes-printing/qpdf/qpdf_11.9.1.bb index 4778be42b..f8b398c32 100644 --- a/meta-oe/recipes-printing/qpdf/qpdf_11.9.0.bb +++ b/meta-oe/recipes-printing/qpdf/qpdf_11.9.1.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
6 | DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" | 6 | DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main" | 8 | SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main" |
9 | SRCREV = "3b97c9bd266b7c32ea36d3536e22dab77412886d" | 9 | SRCREV = "c03ee7aa663c4361e23ca32b596adf6e8be0e8ac" |
10 | 10 | ||
11 | inherit cmake pkgconfig gettext | 11 | inherit cmake pkgconfig gettext |
12 | 12 | ||
diff --git a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch deleted file mode 100644 index b1f324f22..000000000 --- a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From 88c9b2c5cebebf13f90890baebbadc60d9fe8d16 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 9 Aug 2022 23:57:03 -0700 | ||
4 | Subject: [PATCH] Replace __attribute_malloc__ with __attribute__((__malloc__)) | ||
5 | |||
6 | __attribute_malloc__ is not available on musl | ||
7 | |||
8 | Fixes | ||
9 | | ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator | ||
10 | | __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); | ||
11 | | ^ | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | audisp/plugins/remote/queue.h | 2 +- | ||
18 | auparse/auparse.h | 2 +- | ||
19 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/audisp/plugins/remote/queue.h b/audisp/plugins/remote/queue.h | ||
22 | index 36b70d04..031507dc 100644 | ||
23 | --- a/audisp/plugins/remote/queue.h | ||
24 | +++ b/audisp/plugins/remote/queue.h | ||
25 | @@ -53,7 +53,7 @@ void q_close(struct queue *q); | ||
26 | * On error, return NULL and set errno. */ | ||
27 | struct queue *q_open(int q_flags, const char *path, size_t num_entries, | ||
28 | size_t entry_size) | ||
29 | - __attribute_malloc__ __attr_dealloc (q_close, 1) __wur; | ||
30 | + __attribute__((__malloc__)) __attr_dealloc (q_close, 1) __wur; | ||
31 | |||
32 | /* Add DATA to tail of Q. Return 0 on success, -1 on error and set errno. */ | ||
33 | int q_append(struct queue *q, const char *data); | ||
34 | diff --git a/auparse/auparse.h b/auparse/auparse.h | ||
35 | index c27f1ff9..87c52965 100644 | ||
36 | --- a/auparse/auparse.h | ||
37 | +++ b/auparse/auparse.h | ||
38 | @@ -55,7 +55,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au, | ||
39 | void auparse_destroy(auparse_state_t *au); | ||
40 | void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what); | ||
41 | auparse_state_t *auparse_init(ausource_t source, const void *b) | ||
42 | - __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); | ||
43 | + __attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1); | ||
44 | int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len) | ||
45 | __attr_access ((__read_only__, 2, 3)); | ||
46 | int auparse_feed(auparse_state_t *au, const char *data, size_t data_len) | ||
47 | -- | ||
48 | 2.25.1 | ||
49 | |||
diff --git a/meta-oe/recipes-security/audit/audit_4.0.1.bb b/meta-oe/recipes-security/audit/audit_4.0.2.bb index c189cfea5..6bb8a2c70 100644 --- a/meta-oe/recipes-security/audit/audit_4.0.1.bb +++ b/meta-oe/recipes-security/audit/audit_4.0.2.bb | |||
@@ -13,10 +13,8 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;proto | |||
13 | file://audit-volatile.conf \ | 13 | file://audit-volatile.conf \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI:append:libc-musl = " file://0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch" | ||
17 | |||
18 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
19 | SRCREV = "22ccbd984e493524050ac445f796e9a7e90e1149" | 17 | SRCREV = "4e6deae41d4646d28bb3ba9524a8a227a38ccd0b" |
20 | 18 | ||
21 | inherit autotools python3targetconfig update-rc.d systemd | 19 | inherit autotools python3targetconfig update-rc.d systemd |
22 | 20 | ||
@@ -101,3 +99,5 @@ do_install:append() { | |||
101 | # Create /var/spool/audit directory for audisp-remote | 99 | # Create /var/spool/audit directory for audisp-remote |
102 | install -d -m 0700 ${D}${localstatedir}/spool/audit | 100 | install -d -m 0700 ${D}${localstatedir}/spool/audit |
103 | } | 101 | } |
102 | |||
103 | CVE_PRODUCT = "linux:audit" | ||
diff --git a/meta-oe/recipes-security/bubblewrap/bubblewrap_0.9.0.bb b/meta-oe/recipes-security/bubblewrap/bubblewrap_0.10.0.bb index c60c1dfd6..60155e035 100644 --- a/meta-oe/recipes-security/bubblewrap/bubblewrap_0.9.0.bb +++ b/meta-oe/recipes-security/bubblewrap/bubblewrap_0.10.0.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | |||
6 | DEPENDS = "libcap" | 6 | DEPENDS = "libcap" |
7 | 7 | ||
8 | SRC_URI = "https://github.com/containers/${BPN}/releases/download/v${PV}/${BP}.tar.xz" | 8 | SRC_URI = "https://github.com/containers/${BPN}/releases/download/v${PV}/${BP}.tar.xz" |
9 | SRC_URI[sha256sum] = "c6347eaced49ac0141996f46bba3b089e5e6ea4408bc1c43bab9f2d05dd094e1" | 9 | SRC_URI[sha256sum] = "65d92cf44a63a51e1b7771f70c05013dce5bd6b0b2841c4b4be54b0c45565471" |
10 | 10 | ||
11 | inherit autotools bash-completion github-releases manpages pkgconfig | 11 | inherit autotools bash-completion github-releases manpages pkgconfig |
12 | 12 | ||
diff --git a/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch b/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch deleted file mode 100644 index 2ca18b0ef..000000000 --- a/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch +++ /dev/null | |||
@@ -1,1720 +0,0 @@ | |||
1 | From bbbf474b2ebdbdac4d557e3351210f3fe2175c33 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Fri, 14 Feb 2020 10:09:55 +0000 | ||
4 | Subject: [PATCH] Make ndiff support python3 | ||
5 | |||
6 | Backport a patch from debian to make ndiff support | ||
7 | python3. | ||
8 | |||
9 | Refer to https://sources.debian.org/data/main/n/nmap/7.80+dfsg1-2/debian/patches/0004-Python3-port-of-ndiff.patch | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
14 | --- | ||
15 | Makefile.in | 12 +- | ||
16 | ndiff/ndiff.py | 495 +++++++++++++++++----------------- | ||
17 | ndiff/ndifftest.py | 94 +++---- | ||
18 | ndiff/scripts/ndiff | 14 +- | ||
19 | ndiff/setup.py | 34 +-- | ||
20 | ndiff/test-scans/anonymize.py | 18 +- | ||
21 | 6 files changed, 333 insertions(+), 334 deletions(-) | ||
22 | mode change 100644 => 100755 ndiff/setup.py | ||
23 | |||
24 | diff --git a/Makefile.in b/Makefile.in | ||
25 | index eee8863..32f86ba 100644 | ||
26 | --- a/Makefile.in | ||
27 | +++ b/Makefile.in | ||
28 | @@ -35,6 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@ | ||
29 | NDIFFDIR = @NDIFFDIR@ | ||
30 | NPINGDIR = @NPINGDIR@ | ||
31 | PYTHON = @PYTHON@ | ||
32 | +PYTHON3 = /usr/bin/env python3 | ||
33 | DEFS = @DEFS@ -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" | ||
34 | # With GCC, add extra security checks to source code. | ||
35 | # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html | ||
36 | @@ -260,7 +261,7 @@ clean-zenmap: | ||
37 | rm -f $(ZENMAPDIR)/zenmapCore/Name.pyc | ||
38 | |||
39 | clean-ndiff: | ||
40 | - -cd $(NDIFFDIR) && $(PYTHON) setup.py clean --all | ||
41 | + -cd $(NDIFFDIR) && $(PYTHON3) setup.py clean --all | ||
42 | |||
43 | clean-nping: | ||
44 | -cd $(NPINGDIR) && $(MAKE) clean | ||
45 | @@ -368,6 +369,7 @@ tests/check_dns: $(OBJS) | ||
46 | # this as the location of the interpreter whenever we're not doing a | ||
47 | # local installation. | ||
48 | DEFAULT_PYTHON_PATH = /usr/bin/env python | ||
49 | +DEFAULT_PYTHON3_PATH = /usr/bin/env python3 | ||
50 | |||
51 | build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py | ||
52 | # When DESTDIR is defined, assume we're building an executable | ||
53 | @@ -388,13 +390,13 @@ install-zenmap: $(ZENMAPDIR)/setup.py | ||
54 | ln -sf zenmap $(DESTDIR)$(bindir)/xnmap | ||
55 | |||
56 | build-ndiff: | ||
57 | - cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") | ||
58 | + cd $(NDIFFDIR) && $(PYTHON3) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON3_PATH)") | ||
59 | |||
60 | build-nping: $(NPINGDIR)/Makefile build-nbase build-nsock build-netutil $(NPINGDIR)/nping.h @DNET_BUILD@ @PCAP_BUILD@ | ||
61 | @cd $(NPINGDIR) && $(MAKE) | ||
62 | |||
63 | install-ndiff: | ||
64 | - cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") | ||
65 | + cd $(NDIFFDIR) && $(PYTHON3) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") | ||
66 | |||
67 | NSE_FILES = scripts/script.db scripts/*.nse | ||
68 | NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc | ||
69 | @@ -443,7 +445,7 @@ uninstall-zenmap: | ||
70 | rm -f $(DESTDIR)$(bindir)/xnmap | ||
71 | |||
72 | uninstall-ndiff: | ||
73 | - cd $(NDIFFDIR) && $(PYTHON) setup.py uninstall | ||
74 | + cd $(NDIFFDIR) && $(PYTHON3) setup.py uninstall | ||
75 | |||
76 | uninstall-ncat: | ||
77 | @cd $(NCATDIR) && $(MAKE) uninstall | ||
78 | @@ -458,7 +460,7 @@ check-ncat: | ||
79 | @cd $(NCATDIR) && $(MAKE) check | ||
80 | |||
81 | check-ndiff: | ||
82 | - @cd $(NDIFFDIR) && $(PYTHON) ndifftest.py | ||
83 | + @cd $(NDIFFDIR) && $(PYTHON3) ndifftest.py | ||
84 | |||
85 | check-nsock: | ||
86 | @cd $(NSOCKDIR)/src && $(MAKE) check | ||
87 | diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py | ||
88 | index 043273f..abbd1c5 100755 | ||
89 | --- a/ndiff/ndiff.py | ||
90 | +++ b/ndiff/ndiff.py | ||
91 | @@ -1,4 +1,4 @@ | ||
92 | -#!/usr/bin/env python | ||
93 | +#!/usr/bin/env python3 | ||
94 | |||
95 | # Ndiff | ||
96 | # | ||
97 | @@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x] | ||
98 | import xml.sax | ||
99 | import xml.sax.saxutils | ||
100 | import xml.dom.minidom | ||
101 | -from StringIO import StringIO | ||
102 | +from io import StringIO | ||
103 | |||
104 | verbose = False | ||
105 | |||
106 | -NDIFF_XML_VERSION = u"1" | ||
107 | +NDIFF_XML_VERSION = "1" | ||
108 | |||
109 | |||
110 | class OverrideEntityResolver(xml.sax.handler.EntityResolver): | ||
111 | @@ -78,35 +78,35 @@ class Scan(object): | ||
112 | def write_nmaprun_open(self, writer): | ||
113 | attrs = {} | ||
114 | if self.scanner is not None: | ||
115 | - attrs[u"scanner"] = self.scanner | ||
116 | + attrs["scanner"] = self.scanner | ||
117 | if self.args is not None: | ||
118 | - attrs[u"args"] = self.args | ||
119 | + attrs["args"] = self.args | ||
120 | if self.start_date is not None: | ||
121 | - attrs[u"start"] = "%d" % time.mktime(self.start_date.timetuple()) | ||
122 | - attrs[u"startstr"] = self.start_date.strftime( | ||
123 | + attrs["start"] = "%d" % time.mktime(self.start_date.timetuple()) | ||
124 | + attrs["startstr"] = self.start_date.strftime( | ||
125 | "%a %b %d %H:%M:%S %Y") | ||
126 | if self.version is not None: | ||
127 | - attrs[u"version"] = self.version | ||
128 | - writer.startElement(u"nmaprun", attrs) | ||
129 | + attrs["version"] = self.version | ||
130 | + writer.startElement("nmaprun", attrs) | ||
131 | |||
132 | def write_nmaprun_close(self, writer): | ||
133 | - writer.endElement(u"nmaprun") | ||
134 | + writer.endElement("nmaprun") | ||
135 | |||
136 | def nmaprun_to_dom_fragment(self, document): | ||
137 | frag = document.createDocumentFragment() | ||
138 | - elem = document.createElement(u"nmaprun") | ||
139 | + elem = document.createElement("nmaprun") | ||
140 | if self.scanner is not None: | ||
141 | - elem.setAttribute(u"scanner", self.scanner) | ||
142 | + elem.setAttribute("scanner", self.scanner) | ||
143 | if self.args is not None: | ||
144 | - elem.setAttribute(u"args", self.args) | ||
145 | + elem.setAttribute("args", self.args) | ||
146 | if self.start_date is not None: | ||
147 | elem.setAttribute( | ||
148 | - u"start", "%d" % time.mktime(self.start_date.timetuple())) | ||
149 | + "start", "%d" % time.mktime(self.start_date.timetuple())) | ||
150 | elem.setAttribute( | ||
151 | - u"startstr", | ||
152 | + "startstr", | ||
153 | self.start_date.strftime("%a %b %d %H:%M:%S %Y")) | ||
154 | if self.version is not None: | ||
155 | - elem.setAttribute(u"version", self.version) | ||
156 | + elem.setAttribute("version", self.version) | ||
157 | frag.appendChild(elem) | ||
158 | return frag | ||
159 | |||
160 | @@ -136,17 +136,17 @@ class Host(object): | ||
161 | |||
162 | def format_name(self): | ||
163 | """Return a human-readable identifier for this host.""" | ||
164 | - address_s = u", ".join(a.s for a in sorted(self.addresses)) | ||
165 | - hostname_s = u", ".join(sorted(self.hostnames)) | ||
166 | + address_s = ", ".join(a.s for a in sorted(self.addresses)) | ||
167 | + hostname_s = ", ".join(sorted(self.hostnames)) | ||
168 | if len(hostname_s) > 0: | ||
169 | if len(address_s) > 0: | ||
170 | - return u"%s (%s)" % (hostname_s, address_s) | ||
171 | + return "%s (%s)" % (hostname_s, address_s) | ||
172 | else: | ||
173 | return hostname_s | ||
174 | elif len(address_s) > 0: | ||
175 | return address_s | ||
176 | else: | ||
177 | - return u"<no name>" | ||
178 | + return "<no name>" | ||
179 | |||
180 | def add_port(self, port): | ||
181 | self.ports[port.spec] = port | ||
182 | @@ -163,46 +163,46 @@ class Host(object): | ||
183 | return state is None or state in self.extraports | ||
184 | |||
185 | def extraports_string(self): | ||
186 | - list = [(count, state) for (state, count) in self.extraports.items()] | ||
187 | + locallist = [(count, state) for (state, count) in list(self.extraports.items())] | ||
188 | # Reverse-sort by count. | ||
189 | - list.sort(reverse=True) | ||
190 | - return u", ".join( | ||
191 | - [u"%d %s ports" % (count, state) for (count, state) in list]) | ||
192 | + locallist.sort(reverse=True) | ||
193 | + return ", ".join( | ||
194 | + ["%d %s ports" % (count, state) for (count, state) in locallist]) | ||
195 | |||
196 | def state_to_dom_fragment(self, document): | ||
197 | frag = document.createDocumentFragment() | ||
198 | if self.state is not None: | ||
199 | - elem = document.createElement(u"status") | ||
200 | - elem.setAttribute(u"state", self.state) | ||
201 | + elem = document.createElement("status") | ||
202 | + elem.setAttribute("state", self.state) | ||
203 | frag.appendChild(elem) | ||
204 | return frag | ||
205 | |||
206 | def hostname_to_dom_fragment(self, document, hostname): | ||
207 | frag = document.createDocumentFragment() | ||
208 | - elem = document.createElement(u"hostname") | ||
209 | - elem.setAttribute(u"name", hostname) | ||
210 | + elem = document.createElement("hostname") | ||
211 | + elem.setAttribute("name", hostname) | ||
212 | frag.appendChild(elem) | ||
213 | return frag | ||
214 | |||
215 | def extraports_to_dom_fragment(self, document): | ||
216 | frag = document.createDocumentFragment() | ||
217 | - for state, count in self.extraports.items(): | ||
218 | - elem = document.createElement(u"extraports") | ||
219 | - elem.setAttribute(u"state", state) | ||
220 | - elem.setAttribute(u"count", unicode(count)) | ||
221 | + for state, count in list(self.extraports.items()): | ||
222 | + elem = document.createElement("extraports") | ||
223 | + elem.setAttribute("state", state) | ||
224 | + elem.setAttribute("count", str(count)) | ||
225 | frag.appendChild(elem) | ||
226 | return frag | ||
227 | |||
228 | def os_to_dom_fragment(self, document, os): | ||
229 | frag = document.createDocumentFragment() | ||
230 | - elem = document.createElement(u"osmatch") | ||
231 | - elem.setAttribute(u"name", os) | ||
232 | + elem = document.createElement("osmatch") | ||
233 | + elem.setAttribute("name", os) | ||
234 | frag.appendChild(elem) | ||
235 | return frag | ||
236 | |||
237 | def to_dom_fragment(self, document): | ||
238 | frag = document.createDocumentFragment() | ||
239 | - elem = document.createElement(u"host") | ||
240 | + elem = document.createElement("host") | ||
241 | |||
242 | if self.state is not None: | ||
243 | elem.appendChild(self.state_to_dom_fragment(document)) | ||
244 | @@ -211,13 +211,13 @@ class Host(object): | ||
245 | elem.appendChild(addr.to_dom_fragment(document)) | ||
246 | |||
247 | if len(self.hostnames) > 0: | ||
248 | - hostnames_elem = document.createElement(u"hostnames") | ||
249 | + hostnames_elem = document.createElement("hostnames") | ||
250 | for hostname in self.hostnames: | ||
251 | hostnames_elem.appendChild( | ||
252 | self.hostname_to_dom_fragment(document, hostname)) | ||
253 | elem.appendChild(hostnames_elem) | ||
254 | |||
255 | - ports_elem = document.createElement(u"ports") | ||
256 | + ports_elem = document.createElement("ports") | ||
257 | ports_elem.appendChild(self.extraports_to_dom_fragment(document)) | ||
258 | for port in sorted(self.ports.values()): | ||
259 | if not self.is_extraports(port.state): | ||
260 | @@ -226,13 +226,13 @@ class Host(object): | ||
261 | elem.appendChild(ports_elem) | ||
262 | |||
263 | if len(self.os) > 0: | ||
264 | - os_elem = document.createElement(u"os") | ||
265 | + os_elem = document.createElement("os") | ||
266 | for os in self.os: | ||
267 | os_elem.appendChild(self.os_to_dom_fragment(document, os)) | ||
268 | elem.appendChild(os_elem) | ||
269 | |||
270 | if len(self.script_results) > 0: | ||
271 | - hostscript_elem = document.createElement(u"hostscript") | ||
272 | + hostscript_elem = document.createElement("hostscript") | ||
273 | for sr in self.script_results: | ||
274 | hostscript_elem.appendChild(sr.to_dom_fragment(document)) | ||
275 | elem.appendChild(hostscript_elem) | ||
276 | @@ -246,7 +246,7 @@ class Address(object): | ||
277 | self.s = s | ||
278 | |||
279 | def __eq__(self, other): | ||
280 | - return self.__cmp__(other) == 0 | ||
281 | + return self.sort_key() == other.sort_key() | ||
282 | |||
283 | def __ne__(self, other): | ||
284 | return not self.__eq__(other) | ||
285 | @@ -254,8 +254,8 @@ class Address(object): | ||
286 | def __hash__(self): | ||
287 | return hash(self.sort_key()) | ||
288 | |||
289 | - def __cmp__(self, other): | ||
290 | - return cmp(self.sort_key(), other.sort_key()) | ||
291 | + def __lt__(self, other): | ||
292 | + return self.sort_key() < other.sort_key() | ||
293 | |||
294 | def __str__(self): | ||
295 | return str(self.s) | ||
296 | @@ -264,21 +264,21 @@ class Address(object): | ||
297 | return self.s | ||
298 | |||
299 | def new(type, s): | ||
300 | - if type == u"ipv4": | ||
301 | + if type == "ipv4": | ||
302 | return IPv4Address(s) | ||
303 | - elif type == u"ipv6": | ||
304 | + elif type == "ipv6": | ||
305 | return IPv6Address(s) | ||
306 | - elif type == u"mac": | ||
307 | + elif type == "mac": | ||
308 | return MACAddress(s) | ||
309 | else: | ||
310 | - raise ValueError(u"Unknown address type %s." % type) | ||
311 | + raise ValueError("Unknown address type %s." % type) | ||
312 | new = staticmethod(new) | ||
313 | |||
314 | def to_dom_fragment(self, document): | ||
315 | frag = document.createDocumentFragment() | ||
316 | - elem = document.createElement(u"address") | ||
317 | - elem.setAttribute(u"addr", self.s) | ||
318 | - elem.setAttribute(u"addrtype", self.type) | ||
319 | + elem = document.createElement("address") | ||
320 | + elem.setAttribute("addr", self.s) | ||
321 | + elem.setAttribute("addrtype", self.type) | ||
322 | frag.appendChild(elem) | ||
323 | return frag | ||
324 | |||
325 | @@ -287,21 +287,21 @@ class Address(object): | ||
326 | |||
327 | |||
328 | class IPv4Address(Address): | ||
329 | - type = property(lambda self: u"ipv4") | ||
330 | + type = property(lambda self: "ipv4") | ||
331 | |||
332 | def sort_key(self): | ||
333 | return (0, self.s) | ||
334 | |||
335 | |||
336 | class IPv6Address(Address): | ||
337 | - type = property(lambda self: u"ipv6") | ||
338 | + type = property(lambda self: "ipv6") | ||
339 | |||
340 | def sort_key(self): | ||
341 | return (1, self.s) | ||
342 | |||
343 | |||
344 | class MACAddress(Address): | ||
345 | - type = property(lambda self: u"mac") | ||
346 | + type = property(lambda self: "mac") | ||
347 | |||
348 | def sort_key(self): | ||
349 | return (2, self.s) | ||
350 | @@ -320,28 +320,25 @@ class Port(object): | ||
351 | |||
352 | def state_string(self): | ||
353 | if self.state is None: | ||
354 | - return u"unknown" | ||
355 | + return "unknown" | ||
356 | else: | ||
357 | - return unicode(self.state) | ||
358 | + return str(self.state) | ||
359 | |||
360 | def spec_string(self): | ||
361 | - return u"%d/%s" % self.spec | ||
362 | + return "%d/%s" % self.spec | ||
363 | |||
364 | - def __cmp__(self, other): | ||
365 | - d = cmp(self.spec, other.spec) | ||
366 | - if d != 0: | ||
367 | - return d | ||
368 | - return cmp((self.spec, self.service, self.script_results), | ||
369 | - (other.spec, other.service, other.script_results)) | ||
370 | + def __lt__(self, other): | ||
371 | + return (self.spec, self.service, self.script_results) < ( | ||
372 | + other.spec, other.service, other.script_results) | ||
373 | |||
374 | def to_dom_fragment(self, document): | ||
375 | frag = document.createDocumentFragment() | ||
376 | - elem = document.createElement(u"port") | ||
377 | - elem.setAttribute(u"portid", unicode(self.spec[0])) | ||
378 | - elem.setAttribute(u"protocol", self.spec[1]) | ||
379 | + elem = document.createElement("port") | ||
380 | + elem.setAttribute("portid", str(self.spec[0])) | ||
381 | + elem.setAttribute("protocol", self.spec[1]) | ||
382 | if self.state is not None: | ||
383 | - state_elem = document.createElement(u"state") | ||
384 | - state_elem.setAttribute(u"state", self.state) | ||
385 | + state_elem = document.createElement("state") | ||
386 | + state_elem.setAttribute("state", self.state) | ||
387 | elem.appendChild(state_elem) | ||
388 | elem.appendChild(self.service.to_dom_fragment(document)) | ||
389 | for sr in self.script_results: | ||
390 | @@ -385,7 +382,7 @@ class Service(object): | ||
391 | if len(parts) == 0: | ||
392 | return None | ||
393 | else: | ||
394 | - return u"/".join(parts) | ||
395 | + return "/".join(parts) | ||
396 | |||
397 | def version_string(self): | ||
398 | """Get a string like in the VERSION column of Nmap output.""" | ||
399 | @@ -395,17 +392,17 @@ class Service(object): | ||
400 | if self.version is not None: | ||
401 | parts.append(self.version) | ||
402 | if self.extrainfo is not None: | ||
403 | - parts.append(u"(%s)" % self.extrainfo) | ||
404 | + parts.append("(%s)" % self.extrainfo) | ||
405 | |||
406 | if len(parts) == 0: | ||
407 | return None | ||
408 | else: | ||
409 | - return u" ".join(parts) | ||
410 | + return " ".join(parts) | ||
411 | |||
412 | def to_dom_fragment(self, document): | ||
413 | frag = document.createDocumentFragment() | ||
414 | - elem = document.createElement(u"service") | ||
415 | - for attr in (u"name", u"product", u"version", u"extrainfo", u"tunnel"): | ||
416 | + elem = document.createElement("service") | ||
417 | + for attr in ("name", "product", "version", "extrainfo", "tunnel"): | ||
418 | v = getattr(self, attr) | ||
419 | if v is None: | ||
420 | continue | ||
421 | @@ -435,53 +432,53 @@ class ScriptResult(object): | ||
422 | result = [] | ||
423 | lines = self.output.splitlines() | ||
424 | if len(lines) > 0: | ||
425 | - lines[0] = self.id + u": " + lines[0] | ||
426 | + lines[0] = self.id + ": " + lines[0] | ||
427 | for line in lines[:-1]: | ||
428 | - result.append(u"| " + line) | ||
429 | + result.append("| " + line) | ||
430 | if len(lines) > 0: | ||
431 | - result.append(u"|_ " + lines[-1]) | ||
432 | + result.append("|_ " + lines[-1]) | ||
433 | return result | ||
434 | |||
435 | def to_dom_fragment(self, document): | ||
436 | frag = document.createDocumentFragment() | ||
437 | - elem = document.createElement(u"script") | ||
438 | - elem.setAttribute(u"id", self.id) | ||
439 | - elem.setAttribute(u"output", self.output) | ||
440 | + elem = document.createElement("script") | ||
441 | + elem.setAttribute("id", self.id) | ||
442 | + elem.setAttribute("output", self.output) | ||
443 | frag.appendChild(elem) | ||
444 | return frag | ||
445 | |||
446 | |||
447 | def format_banner(scan): | ||
448 | """Format a startup banner more or less like Nmap does.""" | ||
449 | - scanner = u"Nmap" | ||
450 | - if scan.scanner is not None and scan.scanner != u"nmap": | ||
451 | + scanner = "Nmap" | ||
452 | + if scan.scanner is not None and scan.scanner != "nmap": | ||
453 | scanner = scan.scanner | ||
454 | parts = [scanner] | ||
455 | if scan.version is not None: | ||
456 | parts.append(scan.version) | ||
457 | - parts.append(u"scan") | ||
458 | + parts.append("scan") | ||
459 | if scan.start_date is not None: | ||
460 | - parts.append(u"initiated %s" % scan.start_date.strftime( | ||
461 | + parts.append("initiated %s" % scan.start_date.strftime( | ||
462 | "%a %b %d %H:%M:%S %Y")) | ||
463 | if scan.args is not None: | ||
464 | - parts.append(u"as: %s" % scan.args) | ||
465 | - return u" ".join(parts) | ||
466 | + parts.append("as: %s" % scan.args) | ||
467 | + return " ".join(parts) | ||
468 | |||
469 | |||
470 | def print_script_result_diffs_text(title, script_results_a, script_results_b, | ||
471 | script_result_diffs, f=sys.stdout): | ||
472 | - table = Table(u"*") | ||
473 | + table = Table("*") | ||
474 | for sr_diff in script_result_diffs: | ||
475 | sr_diff.append_to_port_table(table) | ||
476 | if len(table) > 0: | ||
477 | - print >> f | ||
478 | + print(file=f) | ||
479 | if len(script_results_b) == 0: | ||
480 | - print >> f, u"-%s:" % title | ||
481 | + print("-%s:" % title, file=f) | ||
482 | elif len(script_results_a) == 0: | ||
483 | - print >> f, u"+%s:" % title | ||
484 | + print("+%s:" % title, file=f) | ||
485 | else: | ||
486 | - print >> f, u" %s:" % title | ||
487 | - print >> f, table | ||
488 | + print(" %s:" % title, file=f) | ||
489 | + print(table, file=f) | ||
490 | |||
491 | |||
492 | def script_result_diffs_to_dom_fragment(elem, script_results_a, | ||
493 | @@ -489,13 +486,13 @@ def script_result_diffs_to_dom_fragment(elem, script_results_a, | ||
494 | if len(script_results_a) == 0 and len(script_results_b) == 0: | ||
495 | return document.createDocumentFragment() | ||
496 | elif len(script_results_b) == 0: | ||
497 | - a_elem = document.createElement(u"a") | ||
498 | + a_elem = document.createElement("a") | ||
499 | for sr in script_results_a: | ||
500 | elem.appendChild(sr.to_dom_fragment(document)) | ||
501 | a_elem.appendChild(elem) | ||
502 | return a_elem | ||
503 | elif len(script_results_a) == 0: | ||
504 | - b_elem = document.createElement(u"b") | ||
505 | + b_elem = document.createElement("b") | ||
506 | for sr in script_results_b: | ||
507 | elem.appendChild(sr.to_dom_fragment(document)) | ||
508 | b_elem.appendChild(elem) | ||
509 | @@ -581,10 +578,10 @@ class ScanDiffText(ScanDiff): | ||
510 | banner_a = format_banner(self.scan_a) | ||
511 | banner_b = format_banner(self.scan_b) | ||
512 | if banner_a != banner_b: | ||
513 | - print >> self.f, u"-%s" % banner_a | ||
514 | - print >> self.f, u"+%s" % banner_b | ||
515 | + print("-%s" % banner_a, file=self.f) | ||
516 | + print("+%s" % banner_b, file=self.f) | ||
517 | elif verbose: | ||
518 | - print >> self.f, u" %s" % banner_a | ||
519 | + print(" %s" % banner_a, file=self.f) | ||
520 | |||
521 | def output_pre_scripts(self, pre_script_result_diffs): | ||
522 | print_script_result_diffs_text("Pre-scan script results", | ||
523 | @@ -597,7 +594,7 @@ class ScanDiffText(ScanDiff): | ||
524 | post_script_result_diffs, self.f) | ||
525 | |||
526 | def output_host_diff(self, h_diff): | ||
527 | - print >> self.f | ||
528 | + print(file=self.f) | ||
529 | h_diff.print_text(self.f) | ||
530 | |||
531 | def output_ending(self): | ||
532 | @@ -622,8 +619,8 @@ class ScanDiffXML(ScanDiff): | ||
533 | |||
534 | def output_beginning(self): | ||
535 | self.writer.startDocument() | ||
536 | - self.writer.startElement(u"nmapdiff", {u"version": NDIFF_XML_VERSION}) | ||
537 | - self.writer.startElement(u"scandiff", {}) | ||
538 | + self.writer.startElement("nmapdiff", {"version": NDIFF_XML_VERSION}) | ||
539 | + self.writer.startElement("scandiff", {}) | ||
540 | |||
541 | if self.nmaprun_differs(): | ||
542 | self.writer.frag_a( | ||
543 | @@ -636,7 +633,7 @@ class ScanDiffXML(ScanDiff): | ||
544 | |||
545 | def output_pre_scripts(self, pre_script_result_diffs): | ||
546 | if len(pre_script_result_diffs) > 0 or verbose: | ||
547 | - prescript_elem = self.document.createElement(u"prescript") | ||
548 | + prescript_elem = self.document.createElement("prescript") | ||
549 | frag = script_result_diffs_to_dom_fragment( | ||
550 | prescript_elem, self.scan_a.pre_script_results, | ||
551 | self.scan_b.pre_script_results, pre_script_result_diffs, | ||
552 | @@ -646,7 +643,7 @@ class ScanDiffXML(ScanDiff): | ||
553 | |||
554 | def output_post_scripts(self, post_script_result_diffs): | ||
555 | if len(post_script_result_diffs) > 0 or verbose: | ||
556 | - postscript_elem = self.document.createElement(u"postscript") | ||
557 | + postscript_elem = self.document.createElement("postscript") | ||
558 | frag = script_result_diffs_to_dom_fragment( | ||
559 | postscript_elem, self.scan_a.post_script_results, | ||
560 | self.scan_b.post_script_results, post_script_result_diffs, | ||
561 | @@ -660,8 +657,8 @@ class ScanDiffXML(ScanDiff): | ||
562 | frag.unlink() | ||
563 | |||
564 | def output_ending(self): | ||
565 | - self.writer.endElement(u"scandiff") | ||
566 | - self.writer.endElement(u"nmapdiff") | ||
567 | + self.writer.endElement("scandiff") | ||
568 | + self.writer.endElement("nmapdiff") | ||
569 | self.writer.endDocument() | ||
570 | |||
571 | |||
572 | @@ -719,9 +716,9 @@ class HostDiff(object): | ||
573 | self.cost += os_cost | ||
574 | |||
575 | extraports_a = tuple((count, state) | ||
576 | - for (state, count) in self.host_a.extraports.items()) | ||
577 | + for (state, count) in list(self.host_a.extraports.items())) | ||
578 | extraports_b = tuple((count, state) | ||
579 | - for (state, count) in self.host_b.extraports.items()) | ||
580 | + for (state, count) in list(self.host_b.extraports.items())) | ||
581 | if extraports_a != extraports_b: | ||
582 | self.extraports_changed = True | ||
583 | self.cost += 1 | ||
584 | @@ -747,69 +744,69 @@ class HostDiff(object): | ||
585 | # Names and addresses. | ||
586 | if self.id_changed: | ||
587 | if host_a.state is not None: | ||
588 | - print >> f, u"-%s:" % host_a.format_name() | ||
589 | + print("-%s:" % host_a.format_name(), file=f) | ||
590 | if self.host_b.state is not None: | ||
591 | - print >> f, u"+%s:" % host_b.format_name() | ||
592 | + print("+%s:" % host_b.format_name(), file=f) | ||
593 | else: | ||
594 | - print >> f, u" %s:" % host_a.format_name() | ||
595 | + print(" %s:" % host_a.format_name(), file=f) | ||
596 | |||
597 | # State. | ||
598 | if self.state_changed: | ||
599 | if host_a.state is not None: | ||
600 | - print >> f, u"-Host is %s." % host_a.state | ||
601 | + print("-Host is %s." % host_a.state, file=f) | ||
602 | if host_b.state is not None: | ||
603 | - print >> f, u"+Host is %s." % host_b.state | ||
604 | + print("+Host is %s." % host_b.state, file=f) | ||
605 | elif verbose: | ||
606 | - print >> f, u" Host is %s." % host_b.state | ||
607 | + print(" Host is %s." % host_b.state, file=f) | ||
608 | |||
609 | # Extraports. | ||
610 | if self.extraports_changed: | ||
611 | if len(host_a.extraports) > 0: | ||
612 | - print >> f, u"-Not shown: %s" % host_a.extraports_string() | ||
613 | + print("-Not shown: %s" % host_a.extraports_string(), file=f) | ||
614 | if len(host_b.extraports) > 0: | ||
615 | - print >> f, u"+Not shown: %s" % host_b.extraports_string() | ||
616 | + print("+Not shown: %s" % host_b.extraports_string(), file=f) | ||
617 | elif verbose: | ||
618 | if len(host_a.extraports) > 0: | ||
619 | - print >> f, u" Not shown: %s" % host_a.extraports_string() | ||
620 | + print(" Not shown: %s" % host_a.extraports_string(), file=f) | ||
621 | |||
622 | # Port table. | ||
623 | - port_table = Table(u"** * * *") | ||
624 | + port_table = Table("** * * *") | ||
625 | if host_a.state is None: | ||
626 | - mark = u"+" | ||
627 | + mark = "+" | ||
628 | elif host_b.state is None: | ||
629 | - mark = u"-" | ||
630 | + mark = "-" | ||
631 | else: | ||
632 | - mark = u" " | ||
633 | - port_table.append((mark, u"PORT", u"STATE", u"SERVICE", u"VERSION")) | ||
634 | + mark = " " | ||
635 | + port_table.append((mark, "PORT", "STATE", "SERVICE", "VERSION")) | ||
636 | |||
637 | for port in self.ports: | ||
638 | port_diff = self.port_diffs[port] | ||
639 | port_diff.append_to_port_table(port_table, host_a, host_b) | ||
640 | |||
641 | if len(port_table) > 1: | ||
642 | - print >> f, port_table | ||
643 | + print(port_table, file=f) | ||
644 | |||
645 | # OS changes. | ||
646 | if self.os_changed or verbose: | ||
647 | if len(host_a.os) > 0: | ||
648 | if len(host_b.os) > 0: | ||
649 | - print >> f, u" OS details:" | ||
650 | + print(" OS details:", file=f) | ||
651 | else: | ||
652 | - print >> f, u"-OS details:" | ||
653 | + print("-OS details:", file=f) | ||
654 | elif len(host_b.os) > 0: | ||
655 | - print >> f, u"+OS details:" | ||
656 | + print("+OS details:", file=f) | ||
657 | # os_diffs is a list of 5-tuples returned by | ||
658 | # difflib.SequenceMatcher. | ||
659 | for op, i1, i2, j1, j2 in self.os_diffs: | ||
660 | if op == "replace" or op == "delete": | ||
661 | for i in range(i1, i2): | ||
662 | - print >> f, "- %s" % host_a.os[i] | ||
663 | + print("- %s" % host_a.os[i], file=f) | ||
664 | if op == "replace" or op == "insert": | ||
665 | for i in range(j1, j2): | ||
666 | - print >> f, "+ %s" % host_b.os[i] | ||
667 | + print("+ %s" % host_b.os[i], file=f) | ||
668 | if op == "equal": | ||
669 | for i in range(i1, i2): | ||
670 | - print >> f, " %s" % host_a.os[i] | ||
671 | + print(" %s" % host_a.os[i], file=f) | ||
672 | |||
673 | print_script_result_diffs_text("Host script results", | ||
674 | host_a.script_results, host_b.script_results, | ||
675 | @@ -820,32 +817,32 @@ class HostDiff(object): | ||
676 | host_b = self.host_b | ||
677 | |||
678 | frag = document.createDocumentFragment() | ||
679 | - hostdiff_elem = document.createElement(u"hostdiff") | ||
680 | + hostdiff_elem = document.createElement("hostdiff") | ||
681 | frag.appendChild(hostdiff_elem) | ||
682 | |||
683 | if host_a.state is None or host_b.state is None: | ||
684 | # The host is missing in one scan. Output the whole thing. | ||
685 | if host_a.state is not None: | ||
686 | - a_elem = document.createElement(u"a") | ||
687 | + a_elem = document.createElement("a") | ||
688 | a_elem.appendChild(host_a.to_dom_fragment(document)) | ||
689 | hostdiff_elem.appendChild(a_elem) | ||
690 | elif host_b.state is not None: | ||
691 | - b_elem = document.createElement(u"b") | ||
692 | + b_elem = document.createElement("b") | ||
693 | b_elem.appendChild(host_b.to_dom_fragment(document)) | ||
694 | hostdiff_elem.appendChild(b_elem) | ||
695 | return frag | ||
696 | |||
697 | - host_elem = document.createElement(u"host") | ||
698 | + host_elem = document.createElement("host") | ||
699 | |||
700 | # State. | ||
701 | if host_a.state == host_b.state: | ||
702 | if verbose: | ||
703 | host_elem.appendChild(host_a.state_to_dom_fragment(document)) | ||
704 | else: | ||
705 | - a_elem = document.createElement(u"a") | ||
706 | + a_elem = document.createElement("a") | ||
707 | a_elem.appendChild(host_a.state_to_dom_fragment(document)) | ||
708 | host_elem.appendChild(a_elem) | ||
709 | - b_elem = document.createElement(u"b") | ||
710 | + b_elem = document.createElement("b") | ||
711 | b_elem.appendChild(host_b.state_to_dom_fragment(document)) | ||
712 | host_elem.appendChild(b_elem) | ||
713 | |||
714 | @@ -854,31 +851,31 @@ class HostDiff(object): | ||
715 | addrset_b = set(host_b.addresses) | ||
716 | for addr in sorted(addrset_a.intersection(addrset_b)): | ||
717 | host_elem.appendChild(addr.to_dom_fragment(document)) | ||
718 | - a_elem = document.createElement(u"a") | ||
719 | + a_elem = document.createElement("a") | ||
720 | for addr in sorted(addrset_a - addrset_b): | ||
721 | a_elem.appendChild(addr.to_dom_fragment(document)) | ||
722 | if a_elem.hasChildNodes(): | ||
723 | host_elem.appendChild(a_elem) | ||
724 | - b_elem = document.createElement(u"b") | ||
725 | + b_elem = document.createElement("b") | ||
726 | for addr in sorted(addrset_b - addrset_a): | ||
727 | b_elem.appendChild(addr.to_dom_fragment(document)) | ||
728 | if b_elem.hasChildNodes(): | ||
729 | host_elem.appendChild(b_elem) | ||
730 | |||
731 | # Host names. | ||
732 | - hostnames_elem = document.createElement(u"hostnames") | ||
733 | + hostnames_elem = document.createElement("hostnames") | ||
734 | hostnameset_a = set(host_a.hostnames) | ||
735 | hostnameset_b = set(host_b.hostnames) | ||
736 | for hostname in sorted(hostnameset_a.intersection(hostnameset_b)): | ||
737 | hostnames_elem.appendChild( | ||
738 | host_a.hostname_to_dom_fragment(document, hostname)) | ||
739 | - a_elem = document.createElement(u"a") | ||
740 | + a_elem = document.createElement("a") | ||
741 | for hostname in sorted(hostnameset_a - hostnameset_b): | ||
742 | a_elem.appendChild( | ||
743 | host_a.hostname_to_dom_fragment(document, hostname)) | ||
744 | if a_elem.hasChildNodes(): | ||
745 | hostnames_elem.appendChild(a_elem) | ||
746 | - b_elem = document.createElement(u"b") | ||
747 | + b_elem = document.createElement("b") | ||
748 | for hostname in sorted(hostnameset_b - hostnameset_a): | ||
749 | b_elem.appendChild( | ||
750 | host_b.hostname_to_dom_fragment(document, hostname)) | ||
751 | @@ -887,15 +884,15 @@ class HostDiff(object): | ||
752 | if hostnames_elem.hasChildNodes(): | ||
753 | host_elem.appendChild(hostnames_elem) | ||
754 | |||
755 | - ports_elem = document.createElement(u"ports") | ||
756 | + ports_elem = document.createElement("ports") | ||
757 | # Extraports. | ||
758 | if host_a.extraports == host_b.extraports: | ||
759 | ports_elem.appendChild(host_a.extraports_to_dom_fragment(document)) | ||
760 | else: | ||
761 | - a_elem = document.createElement(u"a") | ||
762 | + a_elem = document.createElement("a") | ||
763 | a_elem.appendChild(host_a.extraports_to_dom_fragment(document)) | ||
764 | ports_elem.appendChild(a_elem) | ||
765 | - b_elem = document.createElement(u"b") | ||
766 | + b_elem = document.createElement("b") | ||
767 | b_elem.appendChild(host_b.extraports_to_dom_fragment(document)) | ||
768 | ports_elem.appendChild(b_elem) | ||
769 | # Port list. | ||
770 | @@ -911,18 +908,18 @@ class HostDiff(object): | ||
771 | |||
772 | # OS changes. | ||
773 | if self.os_changed or verbose: | ||
774 | - os_elem = document.createElement(u"os") | ||
775 | + os_elem = document.createElement("os") | ||
776 | # os_diffs is a list of 5-tuples returned by | ||
777 | # difflib.SequenceMatcher. | ||
778 | for op, i1, i2, j1, j2 in self.os_diffs: | ||
779 | if op == "replace" or op == "delete": | ||
780 | - a_elem = document.createElement(u"a") | ||
781 | + a_elem = document.createElement("a") | ||
782 | for i in range(i1, i2): | ||
783 | a_elem.appendChild(host_a.os_to_dom_fragment( | ||
784 | document, host_a.os[i])) | ||
785 | os_elem.appendChild(a_elem) | ||
786 | if op == "replace" or op == "insert": | ||
787 | - b_elem = document.createElement(u"b") | ||
788 | + b_elem = document.createElement("b") | ||
789 | for i in range(j1, j2): | ||
790 | b_elem.appendChild(host_b.os_to_dom_fragment( | ||
791 | document, host_b.os[i])) | ||
792 | @@ -936,7 +933,7 @@ class HostDiff(object): | ||
793 | |||
794 | # Host script changes. | ||
795 | if len(self.script_result_diffs) > 0 or verbose: | ||
796 | - hostscript_elem = document.createElement(u"hostscript") | ||
797 | + hostscript_elem = document.createElement("hostscript") | ||
798 | host_elem.appendChild(script_result_diffs_to_dom_fragment( | ||
799 | hostscript_elem, host_a.script_results, | ||
800 | host_b.script_results, self.script_result_diffs, | ||
801 | @@ -989,38 +986,38 @@ class PortDiff(object): | ||
802 | self.port_b.service.version_string()] | ||
803 | if a_columns == b_columns: | ||
804 | if verbose or self.script_result_diffs > 0: | ||
805 | - table.append([u" "] + a_columns) | ||
806 | + table.append([" "] + a_columns) | ||
807 | else: | ||
808 | if not host_a.is_extraports(self.port_a.state): | ||
809 | - table.append([u"-"] + a_columns) | ||
810 | + table.append(["-"] + a_columns) | ||
811 | if not host_b.is_extraports(self.port_b.state): | ||
812 | - table.append([u"+"] + b_columns) | ||
813 | + table.append(["+"] + b_columns) | ||
814 | |||
815 | for sr_diff in self.script_result_diffs: | ||
816 | sr_diff.append_to_port_table(table) | ||
817 | |||
818 | def to_dom_fragment(self, document): | ||
819 | frag = document.createDocumentFragment() | ||
820 | - portdiff_elem = document.createElement(u"portdiff") | ||
821 | + portdiff_elem = document.createElement("portdiff") | ||
822 | frag.appendChild(portdiff_elem) | ||
823 | if (self.port_a.spec == self.port_b.spec and | ||
824 | self.port_a.state == self.port_b.state): | ||
825 | - port_elem = document.createElement(u"port") | ||
826 | - port_elem.setAttribute(u"portid", unicode(self.port_a.spec[0])) | ||
827 | - port_elem.setAttribute(u"protocol", self.port_a.spec[1]) | ||
828 | + port_elem = document.createElement("port") | ||
829 | + port_elem.setAttribute("portid", str(self.port_a.spec[0])) | ||
830 | + port_elem.setAttribute("protocol", self.port_a.spec[1]) | ||
831 | if self.port_a.state is not None: | ||
832 | - state_elem = document.createElement(u"state") | ||
833 | - state_elem.setAttribute(u"state", self.port_a.state) | ||
834 | + state_elem = document.createElement("state") | ||
835 | + state_elem.setAttribute("state", self.port_a.state) | ||
836 | port_elem.appendChild(state_elem) | ||
837 | if self.port_a.service == self.port_b.service: | ||
838 | port_elem.appendChild( | ||
839 | self.port_a.service.to_dom_fragment(document)) | ||
840 | else: | ||
841 | - a_elem = document.createElement(u"a") | ||
842 | + a_elem = document.createElement("a") | ||
843 | a_elem.appendChild( | ||
844 | self.port_a.service.to_dom_fragment(document)) | ||
845 | port_elem.appendChild(a_elem) | ||
846 | - b_elem = document.createElement(u"b") | ||
847 | + b_elem = document.createElement("b") | ||
848 | b_elem.appendChild( | ||
849 | self.port_b.service.to_dom_fragment(document)) | ||
850 | port_elem.appendChild(b_elem) | ||
851 | @@ -1028,10 +1025,10 @@ class PortDiff(object): | ||
852 | port_elem.appendChild(sr_diff.to_dom_fragment(document)) | ||
853 | portdiff_elem.appendChild(port_elem) | ||
854 | else: | ||
855 | - a_elem = document.createElement(u"a") | ||
856 | + a_elem = document.createElement("a") | ||
857 | a_elem.appendChild(self.port_a.to_dom_fragment(document)) | ||
858 | portdiff_elem.appendChild(a_elem) | ||
859 | - b_elem = document.createElement(u"b") | ||
860 | + b_elem = document.createElement("b") | ||
861 | b_elem.appendChild(self.port_b.to_dom_fragment(document)) | ||
862 | portdiff_elem.appendChild(b_elem) | ||
863 | |||
864 | @@ -1086,13 +1083,13 @@ class ScriptResultDiff(object): | ||
865 | for op, i1, i2, j1, j2 in diffs.get_opcodes(): | ||
866 | if op == "replace" or op == "delete": | ||
867 | for k in range(i1, i2): | ||
868 | - table.append_raw(u"-" + a_lines[k]) | ||
869 | + table.append_raw("-" + a_lines[k]) | ||
870 | if op == "replace" or op == "insert": | ||
871 | for k in range(j1, j2): | ||
872 | - table.append_raw(u"+" + b_lines[k]) | ||
873 | + table.append_raw("+" + b_lines[k]) | ||
874 | if op == "equal": | ||
875 | for k in range(i1, i2): | ||
876 | - table.append_raw(u" " + a_lines[k]) | ||
877 | + table.append_raw(" " + a_lines[k]) | ||
878 | |||
879 | def to_dom_fragment(self, document): | ||
880 | frag = document.createDocumentFragment() | ||
881 | @@ -1102,11 +1099,11 @@ class ScriptResultDiff(object): | ||
882 | frag.appendChild(self.sr_a.to_dom_fragment(document)) | ||
883 | else: | ||
884 | if self.sr_a is not None: | ||
885 | - a_elem = document.createElement(u"a") | ||
886 | + a_elem = document.createElement("a") | ||
887 | a_elem.appendChild(self.sr_a.to_dom_fragment(document)) | ||
888 | frag.appendChild(a_elem) | ||
889 | if self.sr_b is not None: | ||
890 | - b_elem = document.createElement(u"b") | ||
891 | + b_elem = document.createElement("b") | ||
892 | b_elem.appendChild(self.sr_b.to_dom_fragment(document)) | ||
893 | frag.appendChild(b_elem) | ||
894 | return frag | ||
895 | @@ -1120,7 +1117,7 @@ class Table(object): | ||
896 | copied to the output.""" | ||
897 | self.widths = [] | ||
898 | self.rows = [] | ||
899 | - self.prefix = u"" | ||
900 | + self.prefix = "" | ||
901 | self.padding = [] | ||
902 | j = 0 | ||
903 | while j < len(template) and template[j] != "*": | ||
904 | @@ -1145,7 +1142,7 @@ class Table(object): | ||
905 | |||
906 | for i in range(len(row)): | ||
907 | if row[i] is None: | ||
908 | - s = u"" | ||
909 | + s = "" | ||
910 | else: | ||
911 | s = str(row[i]) | ||
912 | if i == len(self.widths): | ||
913 | @@ -1167,7 +1164,7 @@ class Table(object): | ||
914 | for row in self.rows: | ||
915 | parts = [self.prefix] | ||
916 | i = 0 | ||
917 | - if isinstance(row, basestring): | ||
918 | + if isinstance(row, str): | ||
919 | # A raw string. | ||
920 | lines.append(row) | ||
921 | else: | ||
922 | @@ -1176,13 +1173,13 @@ class Table(object): | ||
923 | if i < len(self.padding): | ||
924 | parts.append(self.padding[i]) | ||
925 | i += 1 | ||
926 | - lines.append(u"".join(parts).rstrip()) | ||
927 | - return u"\n".join(lines) | ||
928 | + lines.append("".join(parts).rstrip()) | ||
929 | + return "\n".join(lines) | ||
930 | |||
931 | |||
932 | def warn(str): | ||
933 | """Print a warning to stderr.""" | ||
934 | - print >> sys.stderr, str | ||
935 | + print(str, file=sys.stderr) | ||
936 | |||
937 | |||
938 | class NmapContentHandler(xml.sax.handler.ContentHandler): | ||
939 | @@ -1200,22 +1197,22 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): | ||
940 | self.current_port = None | ||
941 | |||
942 | self._start_elem_handlers = { | ||
943 | - u"nmaprun": self._start_nmaprun, | ||
944 | - u"host": self._start_host, | ||
945 | - u"status": self._start_status, | ||
946 | - u"address": self._start_address, | ||
947 | - u"hostname": self._start_hostname, | ||
948 | - u"extraports": self._start_extraports, | ||
949 | - u"port": self._start_port, | ||
950 | - u"state": self._start_state, | ||
951 | - u"service": self._start_service, | ||
952 | - u"script": self._start_script, | ||
953 | - u"osmatch": self._start_osmatch, | ||
954 | - u"finished": self._start_finished, | ||
955 | + "nmaprun": self._start_nmaprun, | ||
956 | + "host": self._start_host, | ||
957 | + "status": self._start_status, | ||
958 | + "address": self._start_address, | ||
959 | + "hostname": self._start_hostname, | ||
960 | + "extraports": self._start_extraports, | ||
961 | + "port": self._start_port, | ||
962 | + "state": self._start_state, | ||
963 | + "service": self._start_service, | ||
964 | + "script": self._start_script, | ||
965 | + "osmatch": self._start_osmatch, | ||
966 | + "finished": self._start_finished, | ||
967 | } | ||
968 | self._end_elem_handlers = { | ||
969 | - u'host': self._end_host, | ||
970 | - u'port': self._end_port, | ||
971 | + 'host': self._end_host, | ||
972 | + 'port': self._end_port, | ||
973 | } | ||
974 | |||
975 | def parent_element(self): | ||
976 | @@ -1245,68 +1242,68 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): | ||
977 | def _start_nmaprun(self, name, attrs): | ||
978 | assert self.parent_element() is None | ||
979 | if "start" in attrs: | ||
980 | - start_timestamp = int(attrs.get(u"start")) | ||
981 | + start_timestamp = int(attrs.get("start")) | ||
982 | self.scan.start_date = datetime.datetime.fromtimestamp( | ||
983 | start_timestamp) | ||
984 | - self.scan.scanner = attrs.get(u"scanner") | ||
985 | - self.scan.args = attrs.get(u"args") | ||
986 | - self.scan.version = attrs.get(u"version") | ||
987 | + self.scan.scanner = attrs.get("scanner") | ||
988 | + self.scan.args = attrs.get("args") | ||
989 | + self.scan.version = attrs.get("version") | ||
990 | |||
991 | def _start_host(self, name, attrs): | ||
992 | - assert self.parent_element() == u"nmaprun" | ||
993 | + assert self.parent_element() == "nmaprun" | ||
994 | self.current_host = Host() | ||
995 | self.scan.hosts.append(self.current_host) | ||
996 | |||
997 | def _start_status(self, name, attrs): | ||
998 | - assert self.parent_element() == u"host" | ||
999 | + assert self.parent_element() == "host" | ||
1000 | assert self.current_host is not None | ||
1001 | - state = attrs.get(u"state") | ||
1002 | + state = attrs.get("state") | ||
1003 | if state is None: | ||
1004 | warn(u'%s element of host %s is missing the "state" attribute; ' | ||
1005 | - 'assuming \unknown\.' % ( | ||
1006 | + r'assuming \unknown\.' % ( | ||
1007 | name, self.current_host.format_name())) | ||
1008 | return | ||
1009 | self.current_host.state = state | ||
1010 | |||
1011 | def _start_address(self, name, attrs): | ||
1012 | - assert self.parent_element() == u"host" | ||
1013 | + assert self.parent_element() == "host" | ||
1014 | assert self.current_host is not None | ||
1015 | - addr = attrs.get(u"addr") | ||
1016 | + addr = attrs.get("addr") | ||
1017 | if addr is None: | ||
1018 | - warn(u'%s element of host %s is missing the "addr" ' | ||
1019 | + warn('%s element of host %s is missing the "addr" ' | ||
1020 | 'attribute; skipping.' % ( | ||
1021 | name, self.current_host.format_name())) | ||
1022 | return | ||
1023 | - addrtype = attrs.get(u"addrtype", u"ipv4") | ||
1024 | + addrtype = attrs.get("addrtype", "ipv4") | ||
1025 | self.current_host.add_address(Address.new(addrtype, addr)) | ||
1026 | |||
1027 | def _start_hostname(self, name, attrs): | ||
1028 | - assert self.parent_element() == u"hostnames" | ||
1029 | + assert self.parent_element() == "hostnames" | ||
1030 | assert self.current_host is not None | ||
1031 | - hostname = attrs.get(u"name") | ||
1032 | + hostname = attrs.get("name") | ||
1033 | if hostname is None: | ||
1034 | - warn(u'%s element of host %s is missing the "name" ' | ||
1035 | + warn('%s element of host %s is missing the "name" ' | ||
1036 | 'attribute; skipping.' % ( | ||
1037 | name, self.current_host.format_name())) | ||
1038 | return | ||
1039 | self.current_host.add_hostname(hostname) | ||
1040 | |||
1041 | def _start_extraports(self, name, attrs): | ||
1042 | - assert self.parent_element() == u"ports" | ||
1043 | + assert self.parent_element() == "ports" | ||
1044 | assert self.current_host is not None | ||
1045 | - state = attrs.get(u"state") | ||
1046 | + state = attrs.get("state") | ||
1047 | if state is None: | ||
1048 | - warn(u'%s element of host %s is missing the "state" ' | ||
1049 | + warn('%s element of host %s is missing the "state" ' | ||
1050 | 'attribute; assuming "unknown".' % ( | ||
1051 | name, self.current_host.format_name())) | ||
1052 | state = None | ||
1053 | if state in self.current_host.extraports: | ||
1054 | - warn(u'Duplicate extraports state "%s" in host %s.' % ( | ||
1055 | + warn('Duplicate extraports state "%s" in host %s.' % ( | ||
1056 | state, self.current_host.format_name())) | ||
1057 | |||
1058 | - count = attrs.get(u"count") | ||
1059 | + count = attrs.get("count") | ||
1060 | if count is None: | ||
1061 | - warn(u'%s element of host %s is missing the "count" ' | ||
1062 | + warn('%s element of host %s is missing the "count" ' | ||
1063 | 'attribute; assuming 0.' % ( | ||
1064 | name, self.current_host.format_name())) | ||
1065 | count = 0 | ||
1066 | @@ -1314,99 +1311,99 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): | ||
1067 | try: | ||
1068 | count = int(count) | ||
1069 | except ValueError: | ||
1070 | - warn(u"Can't convert extraports count \"%s\" " | ||
1071 | + warn("Can't convert extraports count \"%s\" " | ||
1072 | "to an integer in host %s; assuming 0." % ( | ||
1073 | - attrs[u"count"], self.current_host.format_name())) | ||
1074 | + attrs["count"], self.current_host.format_name())) | ||
1075 | count = 0 | ||
1076 | self.current_host.extraports[state] = count | ||
1077 | |||
1078 | def _start_port(self, name, attrs): | ||
1079 | - assert self.parent_element() == u"ports" | ||
1080 | + assert self.parent_element() == "ports" | ||
1081 | assert self.current_host is not None | ||
1082 | - portid_str = attrs.get(u"portid") | ||
1083 | + portid_str = attrs.get("portid") | ||
1084 | if portid_str is None: | ||
1085 | - warn(u'%s element of host %s missing the "portid" ' | ||
1086 | + warn('%s element of host %s missing the "portid" ' | ||
1087 | 'attribute; skipping.' % ( | ||
1088 | name, self.current_host.format_name())) | ||
1089 | return | ||
1090 | try: | ||
1091 | portid = int(portid_str) | ||
1092 | except ValueError: | ||
1093 | - warn(u"Can't convert portid \"%s\" to an integer " | ||
1094 | + warn("Can't convert portid \"%s\" to an integer " | ||
1095 | "in host %s; skipping port." % ( | ||
1096 | portid_str, self.current_host.format_name())) | ||
1097 | return | ||
1098 | - protocol = attrs.get(u"protocol") | ||
1099 | + protocol = attrs.get("protocol") | ||
1100 | if protocol is None: | ||
1101 | - warn(u'%s element of host %s missing the "protocol" ' | ||
1102 | + warn('%s element of host %s missing the "protocol" ' | ||
1103 | 'attribute; skipping.' % ( | ||
1104 | name, self.current_host.format_name())) | ||
1105 | return | ||
1106 | self.current_port = Port((portid, protocol)) | ||
1107 | |||
1108 | def _start_state(self, name, attrs): | ||
1109 | - assert self.parent_element() == u"port" | ||
1110 | + assert self.parent_element() == "port" | ||
1111 | assert self.current_host is not None | ||
1112 | if self.current_port is None: | ||
1113 | return | ||
1114 | if "state" not in attrs: | ||
1115 | - warn(u'%s element of port %s is missing the "state" ' | ||
1116 | + warn('%s element of port %s is missing the "state" ' | ||
1117 | 'attribute; assuming "unknown".' % ( | ||
1118 | name, self.current_port.spec_string())) | ||
1119 | return | ||
1120 | - self.current_port.state = attrs[u"state"] | ||
1121 | + self.current_port.state = attrs["state"] | ||
1122 | self.current_host.add_port(self.current_port) | ||
1123 | |||
1124 | def _start_service(self, name, attrs): | ||
1125 | - assert self.parent_element() == u"port" | ||
1126 | + assert self.parent_element() == "port" | ||
1127 | assert self.current_host is not None | ||
1128 | if self.current_port is None: | ||
1129 | return | ||
1130 | - self.current_port.service.name = attrs.get(u"name") | ||
1131 | - self.current_port.service.product = attrs.get(u"product") | ||
1132 | - self.current_port.service.version = attrs.get(u"version") | ||
1133 | - self.current_port.service.extrainfo = attrs.get(u"extrainfo") | ||
1134 | - self.current_port.service.tunnel = attrs.get(u"tunnel") | ||
1135 | + self.current_port.service.name = attrs.get("name") | ||
1136 | + self.current_port.service.product = attrs.get("product") | ||
1137 | + self.current_port.service.version = attrs.get("version") | ||
1138 | + self.current_port.service.extrainfo = attrs.get("extrainfo") | ||
1139 | + self.current_port.service.tunnel = attrs.get("tunnel") | ||
1140 | |||
1141 | def _start_script(self, name, attrs): | ||
1142 | result = ScriptResult() | ||
1143 | - result.id = attrs.get(u"id") | ||
1144 | + result.id = attrs.get("id") | ||
1145 | if result.id is None: | ||
1146 | - warn(u'%s element missing the "id" attribute; skipping.' % name) | ||
1147 | + warn('%s element missing the "id" attribute; skipping.' % name) | ||
1148 | return | ||
1149 | |||
1150 | - result.output = attrs.get(u"output") | ||
1151 | + result.output = attrs.get("output") | ||
1152 | if result.output is None: | ||
1153 | - warn(u'%s element missing the "output" attribute; skipping.' | ||
1154 | + warn('%s element missing the "output" attribute; skipping.' | ||
1155 | % name) | ||
1156 | return | ||
1157 | - if self.parent_element() == u"prescript": | ||
1158 | + if self.parent_element() == "prescript": | ||
1159 | self.scan.pre_script_results.append(result) | ||
1160 | - elif self.parent_element() == u"postscript": | ||
1161 | + elif self.parent_element() == "postscript": | ||
1162 | self.scan.post_script_results.append(result) | ||
1163 | - elif self.parent_element() == u"hostscript": | ||
1164 | + elif self.parent_element() == "hostscript": | ||
1165 | self.current_host.script_results.append(result) | ||
1166 | - elif self.parent_element() == u"port": | ||
1167 | + elif self.parent_element() == "port": | ||
1168 | self.current_port.script_results.append(result) | ||
1169 | else: | ||
1170 | - warn(u"%s element not inside prescript, postscript, hostscript, " | ||
1171 | + warn("%s element not inside prescript, postscript, hostscript, " | ||
1172 | "or port element; ignoring." % name) | ||
1173 | return | ||
1174 | |||
1175 | def _start_osmatch(self, name, attrs): | ||
1176 | - assert self.parent_element() == u"os" | ||
1177 | + assert self.parent_element() == "os" | ||
1178 | assert self.current_host is not None | ||
1179 | if "name" not in attrs: | ||
1180 | - warn(u'%s element of host %s is missing the "name" ' | ||
1181 | + warn('%s element of host %s is missing the "name" ' | ||
1182 | 'attribute; skipping.' % ( | ||
1183 | name, self.current_host.format_name())) | ||
1184 | return | ||
1185 | - self.current_host.os.append(attrs[u"name"]) | ||
1186 | + self.current_host.os.append(attrs["name"]) | ||
1187 | |||
1188 | def _start_finished(self, name, attrs): | ||
1189 | - assert self.parent_element() == u"runstats" | ||
1190 | + assert self.parent_element() == "runstats" | ||
1191 | if "time" in attrs: | ||
1192 | - end_timestamp = int(attrs.get(u"time")) | ||
1193 | + end_timestamp = int(attrs.get("time")) | ||
1194 | self.scan.end_date = datetime.datetime.fromtimestamp(end_timestamp) | ||
1195 | |||
1196 | def _end_host(self, name): | ||
1197 | @@ -1425,23 +1422,23 @@ class XMLWriter (xml.sax.saxutils.XMLGenerator): | ||
1198 | |||
1199 | def frag(self, frag): | ||
1200 | for node in frag.childNodes: | ||
1201 | - node.writexml(self.f, newl=u"\n") | ||
1202 | + node.writexml(self.f, newl="\n") | ||
1203 | |||
1204 | def frag_a(self, frag): | ||
1205 | - self.startElement(u"a", {}) | ||
1206 | + self.startElement("a", {}) | ||
1207 | for node in frag.childNodes: | ||
1208 | - node.writexml(self.f, newl=u"\n") | ||
1209 | - self.endElement(u"a") | ||
1210 | + node.writexml(self.f, newl="\n") | ||
1211 | + self.endElement("a") | ||
1212 | |||
1213 | def frag_b(self, frag): | ||
1214 | - self.startElement(u"b", {}) | ||
1215 | + self.startElement("b", {}) | ||
1216 | for node in frag.childNodes: | ||
1217 | - node.writexml(self.f, newl=u"\n") | ||
1218 | - self.endElement(u"b") | ||
1219 | + node.writexml(self.f, newl="\n") | ||
1220 | + self.endElement("b") | ||
1221 | |||
1222 | |||
1223 | def usage(): | ||
1224 | - print u"""\ | ||
1225 | + print("""\ | ||
1226 | Usage: %s [option] FILE1 FILE2 | ||
1227 | Compare two Nmap XML files and display a list of their differences. | ||
1228 | Differences include host state changes, port state changes, and changes to | ||
1229 | @@ -1451,7 +1448,7 @@ service and OS detection. | ||
1230 | -v, --verbose also show hosts and ports that haven't changed. | ||
1231 | --text display output in text format (default) | ||
1232 | --xml display output in XML format\ | ||
1233 | -""" % sys.argv[0] | ||
1234 | +""" % sys.argv[0]) | ||
1235 | |||
1236 | EXIT_EQUAL = 0 | ||
1237 | EXIT_DIFFERENT = 1 | ||
1238 | @@ -1459,8 +1456,8 @@ EXIT_ERROR = 2 | ||
1239 | |||
1240 | |||
1241 | def usage_error(msg): | ||
1242 | - print >> sys.stderr, u"%s: %s" % (sys.argv[0], msg) | ||
1243 | - print >> sys.stderr, u"Try '%s -h' for help." % sys.argv[0] | ||
1244 | + print("%s: %s" % (sys.argv[0], msg), file=sys.stderr) | ||
1245 | + print("Try '%s -h' for help." % sys.argv[0], file=sys.stderr) | ||
1246 | sys.exit(EXIT_ERROR) | ||
1247 | |||
1248 | |||
1249 | @@ -1471,7 +1468,7 @@ def main(): | ||
1250 | try: | ||
1251 | opts, input_filenames = getopt.gnu_getopt( | ||
1252 | sys.argv[1:], "hv", ["help", "text", "verbose", "xml"]) | ||
1253 | - except getopt.GetoptError, e: | ||
1254 | + except getopt.GetoptError as e: | ||
1255 | usage_error(e.msg) | ||
1256 | for o, a in opts: | ||
1257 | if o == "-h" or o == "--help": | ||
1258 | @@ -1481,15 +1478,15 @@ def main(): | ||
1259 | verbose = True | ||
1260 | elif o == "--text": | ||
1261 | if output_format is not None and output_format != "text": | ||
1262 | - usage_error(u"contradictory output format options.") | ||
1263 | + usage_error("contradictory output format options.") | ||
1264 | output_format = "text" | ||
1265 | elif o == "--xml": | ||
1266 | if output_format is not None and output_format != "xml": | ||
1267 | - usage_error(u"contradictory output format options.") | ||
1268 | + usage_error("contradictory output format options.") | ||
1269 | output_format = "xml" | ||
1270 | |||
1271 | if len(input_filenames) != 2: | ||
1272 | - usage_error(u"need exactly two input filenames.") | ||
1273 | + usage_error("need exactly two input filenames.") | ||
1274 | |||
1275 | if output_format is None: | ||
1276 | output_format = "text" | ||
1277 | @@ -1502,8 +1499,8 @@ def main(): | ||
1278 | scan_a.load_from_file(filename_a) | ||
1279 | scan_b = Scan() | ||
1280 | scan_b.load_from_file(filename_b) | ||
1281 | - except IOError, e: | ||
1282 | - print >> sys.stderr, u"Can't open file: %s" % str(e) | ||
1283 | + except IOError as e: | ||
1284 | + print("Can't open file: %s" % str(e), file=sys.stderr) | ||
1285 | sys.exit(EXIT_ERROR) | ||
1286 | |||
1287 | if output_format == "text": | ||
1288 | diff --git a/ndiff/ndifftest.py b/ndiff/ndifftest.py | ||
1289 | index 2fa4ae0..27fc525 100755 | ||
1290 | --- a/ndiff/ndifftest.py | ||
1291 | +++ b/ndiff/ndifftest.py | ||
1292 | @@ -1,4 +1,4 @@ | ||
1293 | -#!/usr/bin/env python | ||
1294 | +#!/usr/bin/env python3 | ||
1295 | |||
1296 | # Unit tests for Ndiff. | ||
1297 | |||
1298 | @@ -22,7 +22,7 @@ for x in dir(ndiff): | ||
1299 | sys.dont_write_bytecode = dont_write_bytecode | ||
1300 | del dont_write_bytecode | ||
1301 | |||
1302 | -import StringIO | ||
1303 | +import io | ||
1304 | |||
1305 | |||
1306 | class scan_test(unittest.TestCase): | ||
1307 | @@ -52,7 +52,7 @@ class scan_test(unittest.TestCase): | ||
1308 | scan.load_from_file("test-scans/single.xml") | ||
1309 | host = scan.hosts[0] | ||
1310 | self.assertEqual(len(host.ports), 5) | ||
1311 | - self.assertEqual(host.extraports.items(), [("filtered", 95)]) | ||
1312 | + self.assertEqual(list(host.extraports.items()), [("filtered", 95)]) | ||
1313 | |||
1314 | def test_extraports_multi(self): | ||
1315 | """Test that the correct number of known ports is returned when there | ||
1316 | @@ -68,9 +68,9 @@ class scan_test(unittest.TestCase): | ||
1317 | """Test that nmaprun information is recorded.""" | ||
1318 | scan = Scan() | ||
1319 | scan.load_from_file("test-scans/empty.xml") | ||
1320 | - self.assertEqual(scan.scanner, u"nmap") | ||
1321 | - self.assertEqual(scan.version, u"4.90RC2") | ||
1322 | - self.assertEqual(scan.args, u"nmap -oX empty.xml -p 1-100") | ||
1323 | + self.assertEqual(scan.scanner, "nmap") | ||
1324 | + self.assertEqual(scan.version, "4.90RC2") | ||
1325 | + self.assertEqual(scan.args, "nmap -oX empty.xml -p 1-100") | ||
1326 | |||
1327 | def test_addresses(self): | ||
1328 | """Test that addresses are recorded.""" | ||
1329 | @@ -84,7 +84,7 @@ class scan_test(unittest.TestCase): | ||
1330 | scan = Scan() | ||
1331 | scan.load_from_file("test-scans/simple.xml") | ||
1332 | host = scan.hosts[0] | ||
1333 | - self.assertEqual(host.hostnames, [u"scanme.nmap.org"]) | ||
1334 | + self.assertEqual(host.hostnames, ["scanme.nmap.org"]) | ||
1335 | |||
1336 | def test_os(self): | ||
1337 | """Test that OS information is recorded.""" | ||
1338 | @@ -99,7 +99,7 @@ class scan_test(unittest.TestCase): | ||
1339 | scan.load_from_file("test-scans/complex.xml") | ||
1340 | host = scan.hosts[0] | ||
1341 | self.assertTrue(len(host.script_results) > 0) | ||
1342 | - self.assertTrue(len(host.ports[(22, u"tcp")].script_results) > 0) | ||
1343 | + self.assertTrue(len(host.ports[(22, "tcp")].script_results) > 0) | ||
1344 | |||
1345 | # This test is commented out because Nmap XML doesn't store any information | ||
1346 | # about down hosts, not even the fact that they are down. Recovering the list | ||
1347 | @@ -128,16 +128,16 @@ class host_test(unittest.TestCase): | ||
1348 | |||
1349 | def test_format_name(self): | ||
1350 | h = Host() | ||
1351 | - self.assertTrue(isinstance(h.format_name(), basestring)) | ||
1352 | - h.add_address(IPv4Address(u"127.0.0.1")) | ||
1353 | - self.assertTrue(u"127.0.0.1" in h.format_name()) | ||
1354 | + self.assertTrue(isinstance(h.format_name(), str)) | ||
1355 | + h.add_address(IPv4Address("127.0.0.1")) | ||
1356 | + self.assertTrue("127.0.0.1" in h.format_name()) | ||
1357 | h.add_address(IPv6Address("::1")) | ||
1358 | - self.assertTrue(u"127.0.0.1" in h.format_name()) | ||
1359 | - self.assertTrue(u"::1" in h.format_name()) | ||
1360 | - h.add_hostname(u"localhost") | ||
1361 | - self.assertTrue(u"127.0.0.1" in h.format_name()) | ||
1362 | - self.assertTrue(u"::1" in h.format_name()) | ||
1363 | - self.assertTrue(u"localhost" in h.format_name()) | ||
1364 | + self.assertTrue("127.0.0.1" in h.format_name()) | ||
1365 | + self.assertTrue("::1" in h.format_name()) | ||
1366 | + h.add_hostname("localhost") | ||
1367 | + self.assertTrue("127.0.0.1" in h.format_name()) | ||
1368 | + self.assertTrue("::1" in h.format_name()) | ||
1369 | + self.assertTrue("localhost" in h.format_name()) | ||
1370 | |||
1371 | def test_empty_get_port(self): | ||
1372 | h = Host() | ||
1373 | @@ -197,8 +197,8 @@ class host_test(unittest.TestCase): | ||
1374 | h = s.hosts[0] | ||
1375 | self.assertEqual(len(h.ports), 5) | ||
1376 | self.assertEqual(len(h.extraports), 1) | ||
1377 | - self.assertEqual(h.extraports.keys()[0], u"filtered") | ||
1378 | - self.assertEqual(h.extraports.values()[0], 95) | ||
1379 | + self.assertEqual(list(h.extraports.keys())[0], "filtered") | ||
1380 | + self.assertEqual(list(h.extraports.values())[0], 95) | ||
1381 | self.assertEqual(h.state, "up") | ||
1382 | |||
1383 | |||
1384 | @@ -241,13 +241,13 @@ class port_test(unittest.TestCase): | ||
1385 | """Test the Port class.""" | ||
1386 | def test_spec_string(self): | ||
1387 | p = Port((10, "tcp")) | ||
1388 | - self.assertEqual(p.spec_string(), u"10/tcp") | ||
1389 | + self.assertEqual(p.spec_string(), "10/tcp") | ||
1390 | p = Port((100, "ip")) | ||
1391 | - self.assertEqual(p.spec_string(), u"100/ip") | ||
1392 | + self.assertEqual(p.spec_string(), "100/ip") | ||
1393 | |||
1394 | def test_state_string(self): | ||
1395 | p = Port((10, "tcp")) | ||
1396 | - self.assertEqual(p.state_string(), u"unknown") | ||
1397 | + self.assertEqual(p.state_string(), "unknown") | ||
1398 | |||
1399 | |||
1400 | class service_test(unittest.TestCase): | ||
1401 | @@ -255,47 +255,47 @@ class service_test(unittest.TestCase): | ||
1402 | def test_compare(self): | ||
1403 | """Test that services with the same contents compare equal.""" | ||
1404 | a = Service() | ||
1405 | - a.name = u"ftp" | ||
1406 | - a.product = u"FooBar FTP" | ||
1407 | - a.version = u"1.1.1" | ||
1408 | - a.tunnel = u"ssl" | ||
1409 | + a.name = "ftp" | ||
1410 | + a.product = "FooBar FTP" | ||
1411 | + a.version = "1.1.1" | ||
1412 | + a.tunnel = "ssl" | ||
1413 | self.assertEqual(a, a) | ||
1414 | b = Service() | ||
1415 | - b.name = u"ftp" | ||
1416 | - b.product = u"FooBar FTP" | ||
1417 | - b.version = u"1.1.1" | ||
1418 | - b.tunnel = u"ssl" | ||
1419 | + b.name = "ftp" | ||
1420 | + b.product = "FooBar FTP" | ||
1421 | + b.version = "1.1.1" | ||
1422 | + b.tunnel = "ssl" | ||
1423 | self.assertEqual(a, b) | ||
1424 | - b.name = u"http" | ||
1425 | + b.name = "http" | ||
1426 | self.assertNotEqual(a, b) | ||
1427 | c = Service() | ||
1428 | self.assertNotEqual(a, c) | ||
1429 | |||
1430 | def test_tunnel(self): | ||
1431 | serv = Service() | ||
1432 | - serv.name = u"http" | ||
1433 | - serv.tunnel = u"ssl" | ||
1434 | - self.assertEqual(serv.name_string(), u"ssl/http") | ||
1435 | + serv.name = "http" | ||
1436 | + serv.tunnel = "ssl" | ||
1437 | + self.assertEqual(serv.name_string(), "ssl/http") | ||
1438 | |||
1439 | def test_version_string(self): | ||
1440 | serv = Service() | ||
1441 | - serv.product = u"FooBar" | ||
1442 | + serv.product = "FooBar" | ||
1443 | self.assertTrue(len(serv.version_string()) > 0) | ||
1444 | serv = Service() | ||
1445 | - serv.version = u"1.2.3" | ||
1446 | + serv.version = "1.2.3" | ||
1447 | self.assertTrue(len(serv.version_string()) > 0) | ||
1448 | serv = Service() | ||
1449 | - serv.extrainfo = u"misconfigured" | ||
1450 | + serv.extrainfo = "misconfigured" | ||
1451 | self.assertTrue(len(serv.version_string()) > 0) | ||
1452 | serv = Service() | ||
1453 | - serv.product = u"FooBar" | ||
1454 | - serv.version = u"1.2.3" | ||
1455 | + serv.product = "FooBar" | ||
1456 | + serv.version = "1.2.3" | ||
1457 | # Must match Nmap output. | ||
1458 | self.assertEqual(serv.version_string(), | ||
1459 | - u"%s %s" % (serv.product, serv.version)) | ||
1460 | - serv.extrainfo = u"misconfigured" | ||
1461 | + "%s %s" % (serv.product, serv.version)) | ||
1462 | + serv.extrainfo = "misconfigured" | ||
1463 | self.assertEqual(serv.version_string(), | ||
1464 | - u"%s %s (%s)" % (serv.product, serv.version, serv.extrainfo)) | ||
1465 | + "%s %s (%s)" % (serv.product, serv.version, serv.extrainfo)) | ||
1466 | |||
1467 | |||
1468 | class ScanDiffSub(ScanDiff): | ||
1469 | @@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCase): | ||
1470 | a.load_from_file("test-scans/empty.xml") | ||
1471 | b = Scan() | ||
1472 | b.load_from_file("test-scans/simple.xml") | ||
1473 | - f = StringIO.StringIO() | ||
1474 | + f = io.StringIO() | ||
1475 | self.scan_diff = ScanDiffXML(a, b, f) | ||
1476 | self.scan_diff.output() | ||
1477 | self.xml = f.getvalue() | ||
1478 | @@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCase): | ||
1479 | def test_well_formed(self): | ||
1480 | try: | ||
1481 | document = xml.dom.minidom.parseString(self.xml) | ||
1482 | - except Exception, e: | ||
1483 | - self.fail(u"Parsing XML diff output caused the exception: %s" | ||
1484 | + except Exception as e: | ||
1485 | + self.fail("Parsing XML diff output caused the exception: %s" | ||
1486 | % str(e)) | ||
1487 | |||
1488 | |||
1489 | @@ -739,8 +739,8 @@ def host_apply_diff(host, diff): | ||
1490 | host.os = diff.host_b.os[:] | ||
1491 | |||
1492 | if diff.extraports_changed: | ||
1493 | - for state in host.extraports.keys(): | ||
1494 | - for port in host.ports.values(): | ||
1495 | + for state in list(host.extraports.keys()): | ||
1496 | + for port in list(host.ports.values()): | ||
1497 | if port.state == state: | ||
1498 | del host.ports[port.spec] | ||
1499 | host.extraports = diff.host_b.extraports.copy() | ||
1500 | diff --git a/ndiff/scripts/ndiff b/ndiff/scripts/ndiff | ||
1501 | index 8517c07..4671e73 100755 | ||
1502 | --- a/ndiff/scripts/ndiff | ||
1503 | +++ b/ndiff/scripts/ndiff | ||
1504 | @@ -1,4 +1,4 @@ | ||
1505 | -#!/usr/bin/env python | ||
1506 | +#!/usr/bin/env python3 | ||
1507 | |||
1508 | # Ndiff | ||
1509 | # | ||
1510 | @@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure_dir(INSTALL_LIB): | ||
1511 | |||
1512 | try: | ||
1513 | import ndiff | ||
1514 | -except ImportError, e: | ||
1515 | - print >> sys.stderr, """\ | ||
1516 | +except ImportError as e: | ||
1517 | + print("""\ | ||
1518 | Could not import the ndiff module: %s. | ||
1519 | -I checked in these directories:""" % repr(e.message) | ||
1520 | +I checked in these directories:""" % repr(e), file=sys.stderr) | ||
1521 | for dir in sys.path: | ||
1522 | - print >> sys.stderr, " %s" % dir | ||
1523 | - print >> sys.stderr, """\ | ||
1524 | + print(" %s" % dir, file=sys.stderr) | ||
1525 | + print("""\ | ||
1526 | If you installed Ndiff in another directory, you may have to add the | ||
1527 | -modules directory to the PYTHONPATH environment variable.""" | ||
1528 | +modules directory to the PYTHONPATH environment variable.""", file=sys.stderr) | ||
1529 | sys.exit(1) | ||
1530 | |||
1531 | import ndiff | ||
1532 | diff --git a/ndiff/setup.py b/ndiff/setup.py | ||
1533 | old mode 100644 | ||
1534 | new mode 100755 | ||
1535 | index b5e254c..c49bcf3 | ||
1536 | --- a/ndiff/setup.py | ||
1537 | +++ b/ndiff/setup.py | ||
1538 | @@ -94,7 +94,7 @@ class checked_install(distutils.command.install.install): | ||
1539 | self.saved_prefix = sys.prefix | ||
1540 | try: | ||
1541 | distutils.command.install.install.finalize_options(self) | ||
1542 | - except distutils.errors.DistutilsPlatformError, e: | ||
1543 | + except distutils.errors.DistutilsPlatformError as e: | ||
1544 | raise distutils.errors.DistutilsPlatformError(str(e) + """ | ||
1545 | Installing your distribution's python-dev package may solve this problem.""") | ||
1546 | |||
1547 | @@ -155,13 +155,13 @@ Installing your distribution's python-dev package may solve this problem.""") | ||
1548 | #!/usr/bin/env python | ||
1549 | import errno, os, os.path, sys | ||
1550 | |||
1551 | -print 'Uninstall %(name)s' | ||
1552 | +print('Uninstall %(name)s') | ||
1553 | |||
1554 | answer = raw_input('Are you sure that you want to uninstall ' | ||
1555 | '%(name)s (yes/no) ') | ||
1556 | |||
1557 | if answer != 'yes' and answer != 'y': | ||
1558 | - print 'Not uninstalling.' | ||
1559 | + print('Not uninstalling.') | ||
1560 | sys.exit(0) | ||
1561 | |||
1562 | """ % {'name': APP_NAME} | ||
1563 | @@ -177,8 +177,8 @@ if answer != 'yes' and answer != 'y': | ||
1564 | # This should never happen (everything gets installed | ||
1565 | # inside the root), but if it does, be safe and don't | ||
1566 | # delete anything. | ||
1567 | - uninstaller += ("print '%s was not installed inside " | ||
1568 | - "the root %s; skipping.'\n" % (output, self.root)) | ||
1569 | + uninstaller += ("print('%s was not installed inside " | ||
1570 | + "the root %s; skipping.')\n" % (output, self.root)) | ||
1571 | continue | ||
1572 | output = path_strip_prefix(output, self.root) | ||
1573 | assert os.path.isabs(output) | ||
1574 | @@ -202,24 +202,24 @@ for path in INSTALLED_FILES: | ||
1575 | dirs.append(path) | ||
1576 | # Delete the files. | ||
1577 | for file in files: | ||
1578 | - print "Removing '%s'." % file | ||
1579 | + print("Removing '%s'." % file) | ||
1580 | try: | ||
1581 | os.remove(file) | ||
1582 | - except OSError, e: | ||
1583 | - print >> sys.stderr, ' Error: %s.' % str(e) | ||
1584 | + except OSError as e: | ||
1585 | + print(' Error: %s.' % str(e), file=sys.stderr) | ||
1586 | # Delete the directories. First reverse-sort the normalized paths by | ||
1587 | # length so that child directories are deleted before their parents. | ||
1588 | dirs = [os.path.normpath(dir) for dir in dirs] | ||
1589 | dirs.sort(key = len, reverse = True) | ||
1590 | for dir in dirs: | ||
1591 | try: | ||
1592 | - print "Removing the directory '%s'." % dir | ||
1593 | + print("Removing the directory '%s'." % dir) | ||
1594 | os.rmdir(dir) | ||
1595 | - except OSError, e: | ||
1596 | + except OSError as e: | ||
1597 | if e.errno == errno.ENOTEMPTY: | ||
1598 | - print "Directory '%s' not empty; not removing." % dir | ||
1599 | + print("Directory '%s' not empty; not removing." % dir) | ||
1600 | else: | ||
1601 | - print >> sys.stderr, str(e) | ||
1602 | + print(str(e), file=sys.stderr) | ||
1603 | """ | ||
1604 | |||
1605 | uninstaller_file = open(uninstaller_filename, 'w') | ||
1606 | @@ -227,7 +227,7 @@ for dir in dirs: | ||
1607 | uninstaller_file.close() | ||
1608 | |||
1609 | # Set exec bit for uninstaller | ||
1610 | - mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0555) & 07777 | ||
1611 | + mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0o555) & 0o7777 | ||
1612 | os.chmod(uninstaller_filename, mode) | ||
1613 | |||
1614 | def write_installed_files(self): | ||
1615 | @@ -242,7 +242,7 @@ for dir in dirs: | ||
1616 | try: | ||
1617 | for output in self.get_installed_files(): | ||
1618 | assert "\n" not in output | ||
1619 | - print >> f, output | ||
1620 | + print(output, file=f) | ||
1621 | finally: | ||
1622 | f.close() | ||
1623 | |||
1624 | @@ -266,7 +266,7 @@ class my_uninstall(distutils.cmd.Command): | ||
1625 | # Read the list of installed files. | ||
1626 | try: | ||
1627 | f = open(INSTALLED_FILES_NAME, "r") | ||
1628 | - except IOError, e: | ||
1629 | + except IOError as e: | ||
1630 | if e.errno == errno.ENOENT: | ||
1631 | log.error("Couldn't open the installation record '%s'. " | ||
1632 | "Have you installed yet?" % INSTALLED_FILES_NAME) | ||
1633 | @@ -289,7 +289,7 @@ class my_uninstall(distutils.cmd.Command): | ||
1634 | try: | ||
1635 | if not self.dry_run: | ||
1636 | os.remove(file) | ||
1637 | - except OSError, e: | ||
1638 | + except OSError as e: | ||
1639 | log.error(str(e)) | ||
1640 | # Delete the directories. First reverse-sort the normalized paths by | ||
1641 | # length so that child directories are deleted before their parents. | ||
1642 | @@ -300,7 +300,7 @@ class my_uninstall(distutils.cmd.Command): | ||
1643 | log.info("Removing the directory '%s'." % dir) | ||
1644 | if not self.dry_run: | ||
1645 | os.rmdir(dir) | ||
1646 | - except OSError, e: | ||
1647 | + except OSError as e: | ||
1648 | if e.errno == errno.ENOTEMPTY: | ||
1649 | log.info("Directory '%s' not empty; not removing." % dir) | ||
1650 | else: | ||
1651 | diff --git a/ndiff/test-scans/anonymize.py b/ndiff/test-scans/anonymize.py | ||
1652 | index 9ba612a..fd251fe 100755 | ||
1653 | --- a/ndiff/test-scans/anonymize.py | ||
1654 | +++ b/ndiff/test-scans/anonymize.py | ||
1655 | @@ -1,4 +1,4 @@ | ||
1656 | -#!/usr/bin/env python | ||
1657 | +#!/usr/bin/env python3 | ||
1658 | |||
1659 | # Anonymize an Nmap XML file, replacing host name and IP addresses with random | ||
1660 | # anonymous ones. Anonymized names will be consistent between runs of the | ||
1661 | @@ -20,20 +20,20 @@ r = random.Random() | ||
1662 | |||
1663 | |||
1664 | def hash(s): | ||
1665 | - digest = hashlib.sha512(s).hexdigest() | ||
1666 | + digest = hashlib.sha512(s.encode()).hexdigest() | ||
1667 | return int(digest, 16) | ||
1668 | |||
1669 | |||
1670 | def anonymize_mac_address(addr): | ||
1671 | r.seed(hash(addr)) | ||
1672 | nums = (0, 0, 0) + tuple(r.randrange(256) for i in range(3)) | ||
1673 | - return u":".join(u"%02X" % x for x in nums) | ||
1674 | + return ":".join("%02X" % x for x in nums) | ||
1675 | |||
1676 | |||
1677 | def anonymize_ipv4_address(addr): | ||
1678 | r.seed(hash(addr)) | ||
1679 | nums = (10,) + tuple(r.randrange(256) for i in range(3)) | ||
1680 | - return u".".join(unicode(x) for x in nums) | ||
1681 | + return ".".join(str(x) for x in nums) | ||
1682 | |||
1683 | |||
1684 | def anonymize_ipv6_address(addr): | ||
1685 | @@ -41,7 +41,7 @@ def anonymize_ipv6_address(addr): | ||
1686 | # RFC 4193. | ||
1687 | nums = (0xFD00 + r.randrange(256),) | ||
1688 | nums = nums + tuple(r.randrange(65536) for i in range(7)) | ||
1689 | - return u":".join("%04X" % x for x in nums) | ||
1690 | + return ":".join("%04X" % x for x in nums) | ||
1691 | |||
1692 | # Maps to memoize address and host name conversions. | ||
1693 | hostname_map = {} | ||
1694 | @@ -54,11 +54,11 @@ def anonymize_hostname(name): | ||
1695 | LETTERS = "acbdefghijklmnopqrstuvwxyz" | ||
1696 | r.seed(hash(name)) | ||
1697 | length = r.randrange(5, 10) | ||
1698 | - prefix = u"".join(r.sample(LETTERS, length)) | ||
1699 | + prefix = "".join(r.sample(LETTERS, length)) | ||
1700 | num = r.randrange(1000) | ||
1701 | - hostname_map[name] = u"%s-%d.example.com" % (prefix, num) | ||
1702 | + hostname_map[name] = "%s-%d.example.com" % (prefix, num) | ||
1703 | if VERBOSE: | ||
1704 | - print >> sys.stderr, "Replace %s with %s" % (name, hostname_map[name]) | ||
1705 | + print("Replace %s with %s" % (name, hostname_map[name]), file=sys.stderr) | ||
1706 | return hostname_map[name] | ||
1707 | |||
1708 | mac_re = re.compile(r'\b([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}\b') | ||
1709 | @@ -78,7 +78,7 @@ def anonymize_address(addr): | ||
1710 | else: | ||
1711 | assert False | ||
1712 | if VERBOSE: | ||
1713 | - print >> sys.stderr, "Replace %s with %s" % (addr, address_map[addr]) | ||
1714 | + print("Replace %s with %s" % (addr, address_map[addr]), file=sys.stderr) | ||
1715 | return address_map[addr] | ||
1716 | |||
1717 | |||
1718 | -- | ||
1719 | 2.24.1 | ||
1720 | |||
diff --git a/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch b/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch deleted file mode 100644 index c43ff9f4d..000000000 --- a/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From 562893e665a6c9e1b60c8b3242bab6fe78318b3b Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Fri, 14 Feb 2020 08:19:54 +0000 | ||
4 | Subject: [PATCH] configure.ac: make ndiff depend on python3 | ||
5 | |||
6 | Python 2 ceased being maintained on the 1st January 2020. | ||
7 | We've already removed all users of it from oe-core, so | ||
8 | let ndiff depend on python3. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
13 | --- | ||
14 | .../nmap/7.80-r0/nmap-7.80/configure.ac | 11 ++++++++--- | ||
15 | 1 file changed, 8 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 9d2fff8..5ffdd55 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -237,16 +237,21 @@ if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x2"; then | ||
22 | HAVE_PYTHON2=true | ||
23 | fi | ||
24 | |||
25 | +HAVE_PYTHON3=false | ||
26 | +if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x3"; then | ||
27 | + HAVE_PYTHON3=true | ||
28 | +fi | ||
29 | + | ||
30 | NDIFFDIR=ndiff | ||
31 | |||
32 | # Do they want Ndiff? | ||
33 | AC_ARG_WITH(ndiff, AC_HELP_STRING([--without-ndiff], [Skip installation of the Ndiff utility]), [], [with_ndiff=check]) | ||
34 | -if $HAVE_PYTHON2 ; then : ; | ||
35 | +if $HAVE_PYTHON3 ; then : ; | ||
36 | else | ||
37 | if test "$with_ndiff" = "check" ; then | ||
38 | - AC_MSG_WARN([Not building Ndiff because Python 2.x with x>=4 was not found]) | ||
39 | + AC_MSG_WARN([Not building Ndiff because Python3 was not found]) | ||
40 | elif test "$with_ndiff" = "yes"; then | ||
41 | - AC_MSG_FAILURE([--with-ndiff requires Python 2.x with x>=4]) | ||
42 | + AC_MSG_FAILURE([--with-ndiff requires Python3]) | ||
43 | fi | ||
44 | with_ndiff=no | ||
45 | fi | ||
46 | -- | ||
47 | 2.24.1 | ||
48 | |||
diff --git a/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch b/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch index 356b5071b..5669ccdf6 100644 --- a/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch +++ b/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch | |||
@@ -10,20 +10,9 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> | |||
10 | Makefile.in | 4 ++-- | 10 | Makefile.in | 4 ++-- |
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
12 | 12 | ||
13 | diff --git a/Makefile.in b/Makefile.in | ||
14 | index 1bb062c..cced2fb 100644 | ||
15 | --- a/Makefile.in | 13 | --- a/Makefile.in |
16 | +++ b/Makefile.in | 14 | +++ b/Makefile.in |
17 | @@ -311,7 +311,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py | 15 | @@ -383,7 +383,7 @@ build-nping: $(NPINGDIR)/Makefile build- |
18 | |||
19 | install-zenmap: $(ZENMAPDIR)/setup.py | ||
20 | $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 | ||
21 | - cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") | ||
22 | + cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --force $(if $(DESTDIR),--root "$(DESTDIR)") | ||
23 | $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ | ||
24 | # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is | ||
25 | # already a link. | ||
26 | @@ -328,7 +328,7 @@ build-nping: $(NPINGDIR)/Makefile nbase_build nsock_build netutil_build $(NPINGD | ||
27 | @cd $(NPINGDIR) && $(MAKE) | 16 | @cd $(NPINGDIR) && $(MAKE) |
28 | 17 | ||
29 | install-ndiff: | 18 | install-ndiff: |
@@ -32,6 +21,3 @@ index 1bb062c..cced2fb 100644 | |||
32 | 21 | ||
33 | NSE_FILES = scripts/script.db scripts/*.nse | 22 | NSE_FILES = scripts/script.db scripts/*.nse |
34 | NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc | 23 | NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc |
35 | -- | ||
36 | 1.9.1 | ||
37 | |||
diff --git a/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch b/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch index cfe043af4..a07061d4d 100644 --- a/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch +++ b/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch | |||
@@ -12,11 +12,9 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> | |||
12 | nmap-update/Makefile.in | 2 +- | 12 | nmap-update/Makefile.in | 2 +- |
13 | 2 files changed, 3 insertions(+), 3 deletions(-) | 13 | 2 files changed, 3 insertions(+), 3 deletions(-) |
14 | 14 | ||
15 | diff --git a/ncat/Makefile.in b/ncat/Makefile.in | ||
16 | index cfd306d..2166e08 100644 | ||
17 | --- a/ncat/Makefile.in | 15 | --- a/ncat/Makefile.in |
18 | +++ b/ncat/Makefile.in | 16 | +++ b/ncat/Makefile.in |
19 | @@ -163,11 +163,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Makefile | 17 | @@ -162,11 +162,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Make |
20 | 18 | ||
21 | install: $(TARGET) | 19 | install: $(TARGET) |
22 | @echo Installing Ncat; | 20 | @echo Installing Ncat; |
@@ -30,19 +28,3 @@ index cfd306d..2166e08 100644 | |||
30 | $(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/; \ | 28 | $(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/; \ |
31 | fi | 29 | fi |
32 | $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1 | 30 | $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1 |
33 | diff --git a/nmap-update/Makefile.in b/nmap-update/Makefile.in | ||
34 | index 89ff928..93f48d8 100644 | ||
35 | --- a/nmap-update/Makefile.in | ||
36 | +++ b/nmap-update/Makefile.in | ||
37 | @@ -37,7 +37,7 @@ $(NBASELIB): | ||
38 | cd $(NBASEDIR) && $(MAKE) | ||
39 | |||
40 | install: nmap-update | ||
41 | - $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 | ||
42 | + mkdir -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 | ||
43 | $(INSTALL) -c -m 755 nmap-update $(DESTDIR)$(bindir) | ||
44 | $(STRIP) -x $(DESTDIR)$(bindir)/nmap-update | ||
45 | $(INSTALL) -c -m 644 ../docs/nmap-update.1 $(DESTDIR)$(mandir)/man1/ | ||
46 | -- | ||
47 | 1.9.1 | ||
48 | |||
diff --git a/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-oe/recipes-security/nmap/nmap_7.95.bb index f9fe82a91..79c28e71f 100644 --- a/meta-oe/recipes-security/nmap/nmap_7.80.bb +++ b/meta-oe/recipes-security/nmap/nmap_7.95.bb | |||
@@ -1,28 +1,23 @@ | |||
1 | SUMMARY = "network auditing tool" | 1 | SUMMARY = "network auditing tool" |
2 | DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf" | 2 | DESCRIPTION = "Nmap (Network Mapper) is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf" |
3 | SECTION = "security" | 3 | SECTION = "security" |
4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=66938a7e5b4c118eda78271de14874c2" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=895af8527fe4bcb72f271fd1841fd2f6" |
7 | 7 | ||
8 | SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ | 8 | SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ |
9 | file://nmap-redefine-the-python-library-dir.patch \ | 9 | file://nmap-redefine-the-python-library-dir.patch \ |
10 | file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \ | 10 | file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \ |
11 | file://0001-Include-time.h-header-to-pass-clang-compilation.patch \ | 11 | file://0001-Include-time.h-header-to-pass-clang-compilation.patch \ |
12 | file://0002-Fix-building-with-libc.patch \ | 12 | file://0002-Fix-building-with-libc.patch \ |
13 | file://0001-Make-ndiff-support-python3.patch \ | ||
14 | file://0001-configure.ac-make-ndiff-depend-on-python3.patch \ | ||
15 | " | 13 | " |
16 | 14 | SRC_URI[sha256sum] = "e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778" | |
17 | SRC_URI[md5sum] = "d37b75b06d1d40f27b76d60db420a1f5" | ||
18 | SRC_URI[sha256sum] = "fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa" | ||
19 | |||
20 | inherit autotools-brokensep pkgconfig python3native | 15 | inherit autotools-brokensep pkgconfig python3native |
21 | 16 | ||
22 | PACKAGECONFIG ?= "ncat nping pcap" | 17 | PACKAGECONFIG ?= "pcre ncat nping pcap" |
23 | 18 | ||
24 | PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" | 19 | PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" |
25 | PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre" | 20 | PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre2" |
26 | PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" | 21 | PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" |
27 | PACKAGECONFIG[ssh2] = "--with-openssh2=${STAGING_LIBDIR}/.., --without-openssh2, libssh2, libssh2" | 22 | PACKAGECONFIG[ssh2] = "--with-openssh2=${STAGING_LIBDIR}/.., --without-openssh2, libssh2, libssh2" |
28 | PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, zlib" | 23 | PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, zlib" |
diff --git a/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch b/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch new file mode 100644 index 000000000..6e61aeac3 --- /dev/null +++ b/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch | |||
@@ -0,0 +1,672 @@ | |||
1 | From 41968e7b742ad59046523a7eeb63514237fb63af Mon Sep 17 00:00:00 2001 | ||
2 | From: Neil Horman <nhorman@openssl.org> | ||
3 | Date: Fri, 27 Oct 2023 14:57:37 -0400 | ||
4 | Subject: [PATCH] Prevent accessing of global c++ objects once they are deleted | ||
5 | |||
6 | Fixes (Maybe) #729. | ||
7 | Reset objects_deleted after reset is called. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/opendnssec/SoftHSMv2/pull/742] | ||
10 | --- | ||
11 | src/lib/SoftHSM.cpp | 5 ++ | ||
12 | src/lib/main.cpp | 138 ++++++++++++++++++++++++++++++++++++++++++++ | ||
13 | 2 files changed, 143 insertions(+) | ||
14 | |||
15 | diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp | ||
16 | index 02c0f95..95bf208 100644 | ||
17 | --- a/src/lib/SoftHSM.cpp | ||
18 | +++ b/src/lib/SoftHSM.cpp | ||
19 | @@ -89,6 +89,8 @@ | ||
20 | |||
21 | // Initialise the one-and-only instance | ||
22 | |||
23 | +int objects_deleted = 0; | ||
24 | + | ||
25 | #ifdef HAVE_CXX11 | ||
26 | |||
27 | std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr); | ||
28 | @@ -406,6 +408,8 @@ void SoftHSM::reset() | ||
29 | { | ||
30 | if (instance.get()) | ||
31 | instance.reset(); | ||
32 | + | ||
33 | + objects_deleted = 0; | ||
34 | } | ||
35 | |||
36 | // Constructor | ||
37 | @@ -445,6 +449,7 @@ SoftHSM::~SoftHSM() | ||
38 | |||
39 | isInitialised = false; | ||
40 | |||
41 | + objects_deleted = 1; | ||
42 | resetMutexFactoryCallbacks(); | ||
43 | } | ||
44 | |||
45 | diff --git a/src/lib/main.cpp b/src/lib/main.cpp | ||
46 | index 2dfd0eb..e89f18c 100644 | ||
47 | --- a/src/lib/main.cpp | ||
48 | +++ b/src/lib/main.cpp | ||
49 | @@ -49,6 +49,8 @@ | ||
50 | #define PKCS_API | ||
51 | #endif | ||
52 | |||
53 | +extern int objects_deleted; | ||
54 | + | ||
55 | // PKCS #11 function list | ||
56 | static CK_FUNCTION_LIST functionList = | ||
57 | { | ||
58 | @@ -130,6 +132,8 @@ PKCS_API CK_RV C_Initialize(CK_VOID_PTR pInitArgs) | ||
59 | { | ||
60 | try | ||
61 | { | ||
62 | + if (objects_deleted == 1) | ||
63 | + return CKR_FUNCTION_FAILED; | ||
64 | return SoftHSM::i()->C_Initialize(pInitArgs); | ||
65 | } | ||
66 | catch (...) | ||
67 | @@ -145,6 +149,8 @@ PKCS_API CK_RV C_Finalize(CK_VOID_PTR pReserved) | ||
68 | { | ||
69 | try | ||
70 | { | ||
71 | + if (objects_deleted == 1) | ||
72 | + return CKR_FUNCTION_FAILED; | ||
73 | return SoftHSM::i()->C_Finalize(pReserved); | ||
74 | } | ||
75 | catch (...) | ||
76 | @@ -160,6 +166,8 @@ PKCS_API CK_RV C_GetInfo(CK_INFO_PTR pInfo) | ||
77 | { | ||
78 | try | ||
79 | { | ||
80 | + if (objects_deleted == 1) | ||
81 | + return CKR_FUNCTION_FAILED; | ||
82 | return SoftHSM::i()->C_GetInfo(pInfo); | ||
83 | } | ||
84 | catch (...) | ||
85 | @@ -175,6 +183,8 @@ PKCS_API CK_RV C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList) | ||
86 | { | ||
87 | try | ||
88 | { | ||
89 | + if (objects_deleted == 1) | ||
90 | + return CKR_FUNCTION_FAILED; | ||
91 | if (ppFunctionList == NULL_PTR) return CKR_ARGUMENTS_BAD; | ||
92 | |||
93 | *ppFunctionList = &functionList; | ||
94 | @@ -194,6 +204,8 @@ PKCS_API CK_RV C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK | ||
95 | { | ||
96 | try | ||
97 | { | ||
98 | + if (objects_deleted == 1) | ||
99 | + return CKR_FUNCTION_FAILED; | ||
100 | return SoftHSM::i()->C_GetSlotList(tokenPresent, pSlotList, pulCount); | ||
101 | } | ||
102 | catch (...) | ||
103 | @@ -209,6 +221,8 @@ PKCS_API CK_RV C_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo) | ||
104 | { | ||
105 | try | ||
106 | { | ||
107 | + if (objects_deleted == 1) | ||
108 | + return CKR_FUNCTION_FAILED; | ||
109 | return SoftHSM::i()->C_GetSlotInfo(slotID, pInfo); | ||
110 | } | ||
111 | catch (...) | ||
112 | @@ -224,6 +238,8 @@ PKCS_API CK_RV C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) | ||
113 | { | ||
114 | try | ||
115 | { | ||
116 | + if (objects_deleted == 1) | ||
117 | + return CKR_FUNCTION_FAILED; | ||
118 | return SoftHSM::i()->C_GetTokenInfo(slotID, pInfo); | ||
119 | } | ||
120 | catch (...) | ||
121 | @@ -239,6 +255,8 @@ PKCS_API CK_RV C_GetMechanismList(CK_SLOT_ID slotID, CK_MECHANISM_TYPE_PTR pMech | ||
122 | { | ||
123 | try | ||
124 | { | ||
125 | + if (objects_deleted == 1) | ||
126 | + return CKR_FUNCTION_FAILED; | ||
127 | return SoftHSM::i()->C_GetMechanismList(slotID, pMechanismList, pulCount); | ||
128 | } | ||
129 | catch (...) | ||
130 | @@ -254,6 +272,8 @@ PKCS_API CK_RV C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, CK_ | ||
131 | { | ||
132 | try | ||
133 | { | ||
134 | + if (objects_deleted == 1) | ||
135 | + return CKR_FUNCTION_FAILED; | ||
136 | return SoftHSM::i()->C_GetMechanismInfo(slotID, type, pInfo); | ||
137 | } | ||
138 | catch (...) | ||
139 | @@ -269,6 +289,8 @@ PKCS_API CK_RV C_InitToken(CK_SLOT_ID slotID, CK_UTF8CHAR_PTR pPin, CK_ULONG ulP | ||
140 | { | ||
141 | try | ||
142 | { | ||
143 | + if (objects_deleted == 1) | ||
144 | + return CKR_FUNCTION_FAILED; | ||
145 | return SoftHSM::i()->C_InitToken(slotID, pPin, ulPinLen, pLabel); | ||
146 | } | ||
147 | catch (...) | ||
148 | @@ -284,6 +306,8 @@ PKCS_API CK_RV C_InitPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pPin, CK_UL | ||
149 | { | ||
150 | try | ||
151 | { | ||
152 | + if (objects_deleted == 1) | ||
153 | + return CKR_FUNCTION_FAILED; | ||
154 | return SoftHSM::i()->C_InitPIN(hSession, pPin, ulPinLen); | ||
155 | } | ||
156 | catch (...) | ||
157 | @@ -299,6 +323,8 @@ PKCS_API CK_RV C_SetPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pOldPin, CK_ | ||
158 | { | ||
159 | try | ||
160 | { | ||
161 | + if (objects_deleted == 1) | ||
162 | + return CKR_FUNCTION_FAILED; | ||
163 | return SoftHSM::i()->C_SetPIN(hSession, pOldPin, ulOldLen, pNewPin, ulNewLen); | ||
164 | } | ||
165 | catch (...) | ||
166 | @@ -314,6 +340,8 @@ PKCS_API CK_RV C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApp | ||
167 | { | ||
168 | try | ||
169 | { | ||
170 | + if (objects_deleted == 1) | ||
171 | + return CKR_FUNCTION_FAILED; | ||
172 | return SoftHSM::i()->C_OpenSession(slotID, flags, pApplication, notify, phSession); | ||
173 | } | ||
174 | catch (...) | ||
175 | @@ -329,6 +357,8 @@ PKCS_API CK_RV C_CloseSession(CK_SESSION_HANDLE hSession) | ||
176 | { | ||
177 | try | ||
178 | { | ||
179 | + if (objects_deleted == 1) | ||
180 | + return CKR_FUNCTION_FAILED; | ||
181 | return SoftHSM::i()->C_CloseSession(hSession); | ||
182 | } | ||
183 | catch (...) | ||
184 | @@ -344,6 +374,8 @@ PKCS_API CK_RV C_CloseAllSessions(CK_SLOT_ID slotID) | ||
185 | { | ||
186 | try | ||
187 | { | ||
188 | + if (objects_deleted == 1) | ||
189 | + return CKR_FUNCTION_FAILED; | ||
190 | return SoftHSM::i()->C_CloseAllSessions(slotID); | ||
191 | } | ||
192 | catch (...) | ||
193 | @@ -359,6 +391,8 @@ PKCS_API CK_RV C_GetSessionInfo(CK_SESSION_HANDLE hSession, CK_SESSION_INFO_PTR | ||
194 | { | ||
195 | try | ||
196 | { | ||
197 | + if (objects_deleted == 1) | ||
198 | + return CKR_FUNCTION_FAILED; | ||
199 | return SoftHSM::i()->C_GetSessionInfo(hSession, pInfo); | ||
200 | } | ||
201 | catch (...) | ||
202 | @@ -374,6 +408,8 @@ PKCS_API CK_RV C_GetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper | ||
203 | { | ||
204 | try | ||
205 | { | ||
206 | + if (objects_deleted == 1) | ||
207 | + return CKR_FUNCTION_FAILED; | ||
208 | return SoftHSM::i()->C_GetOperationState(hSession, pOperationState, pulOperationStateLen); | ||
209 | } | ||
210 | catch (...) | ||
211 | @@ -389,6 +425,8 @@ PKCS_API CK_RV C_SetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper | ||
212 | { | ||
213 | try | ||
214 | { | ||
215 | + if (objects_deleted == 1) | ||
216 | + return CKR_FUNCTION_FAILED; | ||
217 | return SoftHSM::i()->C_SetOperationState(hSession, pOperationState, ulOperationStateLen, hEncryptionKey, hAuthenticationKey); | ||
218 | } | ||
219 | catch (...) | ||
220 | @@ -404,6 +442,8 @@ PKCS_API CK_RV C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, CK_UTF | ||
221 | { | ||
222 | try | ||
223 | { | ||
224 | + if (objects_deleted == 1) | ||
225 | + return CKR_FUNCTION_FAILED; | ||
226 | return SoftHSM::i()->C_Login(hSession, userType, pPin, ulPinLen); | ||
227 | } | ||
228 | catch (...) | ||
229 | @@ -419,6 +459,8 @@ PKCS_API CK_RV C_Logout(CK_SESSION_HANDLE hSession) | ||
230 | { | ||
231 | try | ||
232 | { | ||
233 | + if (objects_deleted == 1) | ||
234 | + return CKR_FUNCTION_FAILED; | ||
235 | return SoftHSM::i()->C_Logout(hSession); | ||
236 | } | ||
237 | catch (...) | ||
238 | @@ -434,6 +476,8 @@ PKCS_API CK_RV C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemp | ||
239 | { | ||
240 | try | ||
241 | { | ||
242 | + if (objects_deleted == 1) | ||
243 | + return CKR_FUNCTION_FAILED; | ||
244 | return SoftHSM::i()->C_CreateObject(hSession, pTemplate, ulCount, phObject); | ||
245 | } | ||
246 | catch (...) | ||
247 | @@ -449,6 +493,8 @@ PKCS_API CK_RV C_CopyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject | ||
248 | { | ||
249 | try | ||
250 | { | ||
251 | + if (objects_deleted == 1) | ||
252 | + return CKR_FUNCTION_FAILED; | ||
253 | return SoftHSM::i()->C_CopyObject(hSession, hObject, pTemplate, ulCount, phNewObject); | ||
254 | } | ||
255 | catch (...) | ||
256 | @@ -464,6 +510,8 @@ PKCS_API CK_RV C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj | ||
257 | { | ||
258 | try | ||
259 | { | ||
260 | + if (objects_deleted == 1) | ||
261 | + return CKR_FUNCTION_FAILED; | ||
262 | return SoftHSM::i()->C_DestroyObject(hSession, hObject); | ||
263 | } | ||
264 | catch (...) | ||
265 | @@ -479,6 +527,8 @@ PKCS_API CK_RV C_GetObjectSize(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj | ||
266 | { | ||
267 | try | ||
268 | { | ||
269 | + if (objects_deleted == 1) | ||
270 | + return CKR_FUNCTION_FAILED; | ||
271 | return SoftHSM::i()->C_GetObjectSize(hSession, hObject, pulSize); | ||
272 | } | ||
273 | catch (...) | ||
274 | @@ -494,6 +544,8 @@ PKCS_API CK_RV C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE | ||
275 | { | ||
276 | try | ||
277 | { | ||
278 | + if (objects_deleted == 1) | ||
279 | + return CKR_FUNCTION_FAILED; | ||
280 | return SoftHSM::i()->C_GetAttributeValue(hSession, hObject, pTemplate, ulCount); | ||
281 | } | ||
282 | catch (...) | ||
283 | @@ -509,6 +561,8 @@ PKCS_API CK_RV C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE | ||
284 | { | ||
285 | try | ||
286 | { | ||
287 | + if (objects_deleted == 1) | ||
288 | + return CKR_FUNCTION_FAILED; | ||
289 | return SoftHSM::i()->C_SetAttributeValue(hSession, hObject, pTemplate, ulCount); | ||
290 | } | ||
291 | catch (...) | ||
292 | @@ -524,6 +578,8 @@ PKCS_API CK_RV C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pT | ||
293 | { | ||
294 | try | ||
295 | { | ||
296 | + if (objects_deleted == 1) | ||
297 | + return CKR_FUNCTION_FAILED; | ||
298 | return SoftHSM::i()->C_FindObjectsInit(hSession, pTemplate, ulCount); | ||
299 | } | ||
300 | catch (...) | ||
301 | @@ -539,6 +595,8 @@ PKCS_API CK_RV C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR ph | ||
302 | { | ||
303 | try | ||
304 | { | ||
305 | + if (objects_deleted == 1) | ||
306 | + return CKR_FUNCTION_FAILED; | ||
307 | return SoftHSM::i()->C_FindObjects(hSession, phObject, ulMaxObjectCount, pulObjectCount); | ||
308 | } | ||
309 | catch (...) | ||
310 | @@ -554,6 +612,8 @@ PKCS_API CK_RV C_FindObjectsFinal(CK_SESSION_HANDLE hSession) | ||
311 | { | ||
312 | try | ||
313 | { | ||
314 | + if (objects_deleted == 1) | ||
315 | + return CKR_FUNCTION_FAILED; | ||
316 | return SoftHSM::i()->C_FindObjectsFinal(hSession); | ||
317 | } | ||
318 | catch (...) | ||
319 | @@ -569,6 +629,8 @@ PKCS_API CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha | ||
320 | { | ||
321 | try | ||
322 | { | ||
323 | + if (objects_deleted == 1) | ||
324 | + return CKR_FUNCTION_FAILED; | ||
325 | return SoftHSM::i()->C_EncryptInit(hSession, pMechanism, hObject); | ||
326 | } | ||
327 | catch (...) | ||
328 | @@ -584,6 +646,8 @@ PKCS_API CK_RV C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG | ||
329 | { | ||
330 | try | ||
331 | { | ||
332 | + if (objects_deleted == 1) | ||
333 | + return CKR_FUNCTION_FAILED; | ||
334 | return SoftHSM::i()->C_Encrypt(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen); | ||
335 | } | ||
336 | catch (...) | ||
337 | @@ -599,6 +663,8 @@ PKCS_API CK_RV C_EncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK | ||
338 | { | ||
339 | try | ||
340 | { | ||
341 | + if (objects_deleted == 1) | ||
342 | + return CKR_FUNCTION_FAILED; | ||
343 | return SoftHSM::i()->C_EncryptUpdate(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen); | ||
344 | } | ||
345 | catch (...) | ||
346 | @@ -614,6 +680,8 @@ PKCS_API CK_RV C_EncryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypted | ||
347 | { | ||
348 | try | ||
349 | { | ||
350 | + if (objects_deleted == 1) | ||
351 | + return CKR_FUNCTION_FAILED; | ||
352 | return SoftHSM::i()->C_EncryptFinal(hSession, pEncryptedData, pulEncryptedDataLen); | ||
353 | } | ||
354 | catch (...) | ||
355 | @@ -629,6 +697,8 @@ PKCS_API CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha | ||
356 | { | ||
357 | try | ||
358 | { | ||
359 | + if (objects_deleted == 1) | ||
360 | + return CKR_FUNCTION_FAILED; | ||
361 | return SoftHSM::i()->C_DecryptInit(hSession, pMechanism, hObject); | ||
362 | } | ||
363 | catch (...) | ||
364 | @@ -644,6 +714,8 @@ PKCS_API CK_RV C_Decrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncryptedData, | ||
365 | { | ||
366 | try | ||
367 | { | ||
368 | + if (objects_deleted == 1) | ||
369 | + return CKR_FUNCTION_FAILED; | ||
370 | return SoftHSM::i()->C_Decrypt(hSession, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen); | ||
371 | } | ||
372 | catch (...) | ||
373 | @@ -659,6 +731,8 @@ PKCS_API CK_RV C_DecryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypte | ||
374 | { | ||
375 | try | ||
376 | { | ||
377 | + if (objects_deleted == 1) | ||
378 | + return CKR_FUNCTION_FAILED; | ||
379 | return SoftHSM::i()->C_DecryptUpdate(hSession, pEncryptedData, ulEncryptedDataLen, pData, pDataLen); | ||
380 | } | ||
381 | catch (...) | ||
382 | @@ -674,6 +748,8 @@ PKCS_API CK_RV C_DecryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ | ||
383 | { | ||
384 | try | ||
385 | { | ||
386 | + if (objects_deleted == 1) | ||
387 | + return CKR_FUNCTION_FAILED; | ||
388 | return SoftHSM::i()->C_DecryptFinal(hSession, pData, pDataLen); | ||
389 | } | ||
390 | catch (...) | ||
391 | @@ -689,6 +765,8 @@ PKCS_API CK_RV C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan | ||
392 | { | ||
393 | try | ||
394 | { | ||
395 | + if (objects_deleted == 1) | ||
396 | + return CKR_FUNCTION_FAILED; | ||
397 | return SoftHSM::i()->C_DigestInit(hSession, pMechanism); | ||
398 | } | ||
399 | catch (...) | ||
400 | @@ -704,6 +782,8 @@ PKCS_API CK_RV C_Digest(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG | ||
401 | { | ||
402 | try | ||
403 | { | ||
404 | + if (objects_deleted == 1) | ||
405 | + return CKR_FUNCTION_FAILED; | ||
406 | return SoftHSM::i()->C_Digest(hSession, pData, ulDataLen, pDigest, pulDigestLen); | ||
407 | } | ||
408 | catch (...) | ||
409 | @@ -719,6 +799,8 @@ PKCS_API CK_RV C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_ | ||
410 | { | ||
411 | try | ||
412 | { | ||
413 | + if (objects_deleted == 1) | ||
414 | + return CKR_FUNCTION_FAILED; | ||
415 | return SoftHSM::i()->C_DigestUpdate(hSession, pPart, ulPartLen); | ||
416 | } | ||
417 | catch (...) | ||
418 | @@ -734,6 +816,8 @@ PKCS_API CK_RV C_DigestKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) | ||
419 | { | ||
420 | try | ||
421 | { | ||
422 | + if (objects_deleted == 1) | ||
423 | + return CKR_FUNCTION_FAILED; | ||
424 | return SoftHSM::i()->C_DigestKey(hSession, hObject); | ||
425 | } | ||
426 | catch (...) | ||
427 | @@ -749,6 +833,8 @@ PKCS_API CK_RV C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, CK | ||
428 | { | ||
429 | try | ||
430 | { | ||
431 | + if (objects_deleted == 1) | ||
432 | + return CKR_FUNCTION_FAILED; | ||
433 | return SoftHSM::i()->C_DigestFinal(hSession, pDigest, pulDigestLen); | ||
434 | } | ||
435 | catch (...) | ||
436 | @@ -764,6 +850,8 @@ PKCS_API CK_RV C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanis | ||
437 | { | ||
438 | try | ||
439 | { | ||
440 | + if (objects_deleted == 1) | ||
441 | + return CKR_FUNCTION_FAILED; | ||
442 | return SoftHSM::i()->C_SignInit(hSession, pMechanism, hKey); | ||
443 | } | ||
444 | catch (...) | ||
445 | @@ -779,6 +867,8 @@ PKCS_API CK_RV C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ul | ||
446 | { | ||
447 | try | ||
448 | { | ||
449 | + if (objects_deleted == 1) | ||
450 | + return CKR_FUNCTION_FAILED; | ||
451 | return SoftHSM::i()->C_Sign(hSession, pData, ulDataLen, pSignature, pulSignatureLen); | ||
452 | } | ||
453 | catch (...) | ||
454 | @@ -794,6 +884,8 @@ PKCS_API CK_RV C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_UL | ||
455 | { | ||
456 | try | ||
457 | { | ||
458 | + if (objects_deleted == 1) | ||
459 | + return CKR_FUNCTION_FAILED; | ||
460 | return SoftHSM::i()->C_SignUpdate(hSession, pPart, ulPartLen); | ||
461 | } | ||
462 | catch (...) | ||
463 | @@ -809,6 +901,8 @@ PKCS_API CK_RV C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, C | ||
464 | { | ||
465 | try | ||
466 | { | ||
467 | + if (objects_deleted == 1) | ||
468 | + return CKR_FUNCTION_FAILED; | ||
469 | return SoftHSM::i()->C_SignFinal(hSession, pSignature, pulSignatureLen); | ||
470 | } | ||
471 | catch (...) | ||
472 | @@ -824,6 +918,8 @@ PKCS_API CK_RV C_SignRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pM | ||
473 | { | ||
474 | try | ||
475 | { | ||
476 | + if (objects_deleted == 1) | ||
477 | + return CKR_FUNCTION_FAILED; | ||
478 | return SoftHSM::i()->C_SignRecoverInit(hSession, pMechanism, hKey); | ||
479 | } | ||
480 | catch (...) | ||
481 | @@ -839,6 +935,8 @@ PKCS_API CK_RV C_SignRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_U | ||
482 | { | ||
483 | try | ||
484 | { | ||
485 | + if (objects_deleted == 1) | ||
486 | + return CKR_FUNCTION_FAILED; | ||
487 | return SoftHSM::i()->C_SignRecover(hSession, pData, ulDataLen, pSignature, pulSignatureLen); | ||
488 | } | ||
489 | catch (...) | ||
490 | @@ -854,6 +952,8 @@ PKCS_API CK_RV C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan | ||
491 | { | ||
492 | try | ||
493 | { | ||
494 | + if (objects_deleted == 1) | ||
495 | + return CKR_FUNCTION_FAILED; | ||
496 | return SoftHSM::i()->C_VerifyInit(hSession, pMechanism, hKey); | ||
497 | } | ||
498 | catch (...) | ||
499 | @@ -869,6 +969,8 @@ PKCS_API CK_RV C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG | ||
500 | { | ||
501 | try | ||
502 | { | ||
503 | + if (objects_deleted == 1) | ||
504 | + return CKR_FUNCTION_FAILED; | ||
505 | return SoftHSM::i()->C_Verify(hSession, pData, ulDataLen, pSignature, ulSignatureLen); | ||
506 | } | ||
507 | catch (...) | ||
508 | @@ -884,6 +986,8 @@ PKCS_API CK_RV C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_ | ||
509 | { | ||
510 | try | ||
511 | { | ||
512 | + if (objects_deleted == 1) | ||
513 | + return CKR_FUNCTION_FAILED; | ||
514 | return SoftHSM::i()->C_VerifyUpdate(hSession, pPart, ulPartLen); | ||
515 | } | ||
516 | catch (...) | ||
517 | @@ -899,6 +1003,8 @@ PKCS_API CK_RV C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, | ||
518 | { | ||
519 | try | ||
520 | { | ||
521 | + if (objects_deleted == 1) | ||
522 | + return CKR_FUNCTION_FAILED; | ||
523 | return SoftHSM::i()->C_VerifyFinal(hSession, pSignature, ulSignatureLen); | ||
524 | } | ||
525 | catch (...) | ||
526 | @@ -914,6 +1020,8 @@ PKCS_API CK_RV C_VerifyRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR | ||
527 | { | ||
528 | try | ||
529 | { | ||
530 | + if (objects_deleted == 1) | ||
531 | + return CKR_FUNCTION_FAILED; | ||
532 | return SoftHSM::i()->C_VerifyRecoverInit(hSession, pMechanism, hKey); | ||
533 | } | ||
534 | catch (...) | ||
535 | @@ -929,6 +1037,8 @@ PKCS_API CK_RV C_VerifyRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignatur | ||
536 | { | ||
537 | try | ||
538 | { | ||
539 | + if (objects_deleted == 1) | ||
540 | + return CKR_FUNCTION_FAILED; | ||
541 | return SoftHSM::i()->C_VerifyRecover(hSession, pSignature, ulSignatureLen, pData, pulDataLen); | ||
542 | } | ||
543 | catch (...) | ||
544 | @@ -944,6 +1054,8 @@ PKCS_API CK_RV C_DigestEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa | ||
545 | { | ||
546 | try | ||
547 | { | ||
548 | + if (objects_deleted == 1) | ||
549 | + return CKR_FUNCTION_FAILED; | ||
550 | return SoftHSM::i()->C_DigestEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen); | ||
551 | } | ||
552 | catch (...) | ||
553 | @@ -959,6 +1071,8 @@ PKCS_API CK_RV C_DecryptDigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa | ||
554 | { | ||
555 | try | ||
556 | { | ||
557 | + if (objects_deleted == 1) | ||
558 | + return CKR_FUNCTION_FAILED; | ||
559 | return SoftHSM::i()->C_DecryptDigestUpdate(hSession, pPart, ulPartLen, pDecryptedPart, pulDecryptedPartLen); | ||
560 | } | ||
561 | catch (...) | ||
562 | @@ -974,6 +1088,8 @@ PKCS_API CK_RV C_SignEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart | ||
563 | { | ||
564 | try | ||
565 | { | ||
566 | + if (objects_deleted == 1) | ||
567 | + return CKR_FUNCTION_FAILED; | ||
568 | return SoftHSM::i()->C_SignEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen); | ||
569 | } | ||
570 | catch (...) | ||
571 | @@ -989,6 +1105,8 @@ PKCS_API CK_RV C_DecryptVerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEn | ||
572 | { | ||
573 | try | ||
574 | { | ||
575 | + if (objects_deleted == 1) | ||
576 | + return CKR_FUNCTION_FAILED; | ||
577 | return SoftHSM::i()->C_DecryptVerifyUpdate(hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen); | ||
578 | } | ||
579 | catch (...) | ||
580 | @@ -1004,6 +1122,8 @@ PKCS_API CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha | ||
581 | { | ||
582 | try | ||
583 | { | ||
584 | + if (objects_deleted == 1) | ||
585 | + return CKR_FUNCTION_FAILED; | ||
586 | return SoftHSM::i()->C_GenerateKey(hSession, pMechanism, pTemplate, ulCount, phKey); | ||
587 | } | ||
588 | catch (...) | ||
589 | @@ -1029,6 +1149,8 @@ PKCS_API CK_RV C_GenerateKeyPair | ||
590 | { | ||
591 | try | ||
592 | { | ||
593 | + if (objects_deleted == 1) | ||
594 | + return CKR_FUNCTION_FAILED; | ||
595 | return SoftHSM::i()->C_GenerateKeyPair(hSession, pMechanism, pPublicKeyTemplate, ulPublicKeyAttributeCount, pPrivateKeyTemplate, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey); | ||
596 | } | ||
597 | catch (...) | ||
598 | @@ -1052,6 +1174,8 @@ PKCS_API CK_RV C_WrapKey | ||
599 | { | ||
600 | try | ||
601 | { | ||
602 | + if (objects_deleted == 1) | ||
603 | + return CKR_FUNCTION_FAILED; | ||
604 | return SoftHSM::i()->C_WrapKey(hSession, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen); | ||
605 | } | ||
606 | catch (...) | ||
607 | @@ -1077,6 +1201,8 @@ PKCS_API CK_RV C_UnwrapKey | ||
608 | { | ||
609 | try | ||
610 | { | ||
611 | + if (objects_deleted == 1) | ||
612 | + return CKR_FUNCTION_FAILED; | ||
613 | return SoftHSM::i()->C_UnwrapKey(hSession, pMechanism, hUnwrappingKey, pWrappedKey, ulWrappedKeyLen, pTemplate, ulCount, phKey); | ||
614 | } | ||
615 | catch (...) | ||
616 | @@ -1100,6 +1226,8 @@ PKCS_API CK_RV C_DeriveKey | ||
617 | { | ||
618 | try | ||
619 | { | ||
620 | + if (objects_deleted == 1) | ||
621 | + return CKR_FUNCTION_FAILED; | ||
622 | return SoftHSM::i()->C_DeriveKey(hSession, pMechanism, hBaseKey, pTemplate, ulCount, phKey); | ||
623 | } | ||
624 | catch (...) | ||
625 | @@ -1115,6 +1243,8 @@ PKCS_API CK_RV C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_UL | ||
626 | { | ||
627 | try | ||
628 | { | ||
629 | + if (objects_deleted == 1) | ||
630 | + return CKR_FUNCTION_FAILED; | ||
631 | return SoftHSM::i()->C_SeedRandom(hSession, pSeed, ulSeedLen); | ||
632 | } | ||
633 | catch (...) | ||
634 | @@ -1130,6 +1260,8 @@ PKCS_API CK_RV C_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pRandomD | ||
635 | { | ||
636 | try | ||
637 | { | ||
638 | + if (objects_deleted == 1) | ||
639 | + return CKR_FUNCTION_FAILED; | ||
640 | return SoftHSM::i()->C_GenerateRandom(hSession, pRandomData, ulRandomLen); | ||
641 | } | ||
642 | catch (...) | ||
643 | @@ -1145,6 +1277,8 @@ PKCS_API CK_RV C_GetFunctionStatus(CK_SESSION_HANDLE hSession) | ||
644 | { | ||
645 | try | ||
646 | { | ||
647 | + if (objects_deleted == 1) | ||
648 | + return CKR_FUNCTION_FAILED; | ||
649 | return SoftHSM::i()->C_GetFunctionStatus(hSession); | ||
650 | } | ||
651 | catch (...) | ||
652 | @@ -1160,6 +1294,8 @@ PKCS_API CK_RV C_CancelFunction(CK_SESSION_HANDLE hSession) | ||
653 | { | ||
654 | try | ||
655 | { | ||
656 | + if (objects_deleted == 1) | ||
657 | + return CKR_FUNCTION_FAILED; | ||
658 | return SoftHSM::i()->C_CancelFunction(hSession); | ||
659 | } | ||
660 | catch (...) | ||
661 | @@ -1175,6 +1311,8 @@ PKCS_API CK_RV C_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, CK_VOID_ | ||
662 | { | ||
663 | try | ||
664 | { | ||
665 | + if (objects_deleted == 1) | ||
666 | + return CKR_FUNCTION_FAILED; | ||
667 | return SoftHSM::i()->C_WaitForSlotEvent(flags, pSlot, pReserved); | ||
668 | } | ||
669 | catch (...) | ||
670 | -- | ||
671 | 2.42.0 | ||
672 | |||
diff --git a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb index 930bca96f..66f048879 100644 --- a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb +++ b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb | |||
@@ -7,6 +7,7 @@ DEPENDS = "sqlite3" | |||
7 | 7 | ||
8 | SRC_URI = "https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz \ | 8 | SRC_URI = "https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz \ |
9 | file://0001-avoid-unnecessary-check-for-sqlite3-binary.patch \ | 9 | file://0001-avoid-unnecessary-check-for-sqlite3-binary.patch \ |
10 | file://0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch \ | ||
10 | " | 11 | " |
11 | SRC_URI[sha256sum] = "61249473054bcd1811519ef9a989a880a7bdcc36d317c9c25457fc614df475f2" | 12 | SRC_URI[sha256sum] = "61249473054bcd1811519ef9a989a880a7bdcc36d317c9c25457fc614df475f2" |
12 | 13 | ||
diff --git a/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb b/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb index 752938057..ede9a5f05 100644 --- a/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb +++ b/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb | |||
@@ -27,6 +27,8 @@ EXTRA_OECONF += "\ | |||
27 | --with-bundled-pegtl \ | 27 | --with-bundled-pegtl \ |
28 | " | 28 | " |
29 | 29 | ||
30 | LDFLAGS:append:riscv32 = " -latomic" | ||
31 | |||
30 | PACKAGECONFIG ?= "\ | 32 | PACKAGECONFIG ?= "\ |
31 | openssl \ | 33 | openssl \ |
32 | ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ | 34 | ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ |
diff --git a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch b/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch deleted file mode 100644 index fb8fa3427..000000000 --- a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | Origin: commit c187154f47697cdbf822c2f9d714d570ed4a0fd1 | ||
2 | From: Oliver Kiddle <opk@zsh.org> | ||
3 | Date: Wed, 15 Dec 2021 01:56:40 +0100 | ||
4 | Subject: [PATCH 1/9] security/41: Don't perform PROMPT_SUBST evaluation on | ||
5 | %F/%K arguments | ||
6 | |||
7 | Mitigates CVE-2021-45444 | ||
8 | |||
9 | https://salsa.debian.org/debian/zsh/-/raw/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_1.patch?inline=false | ||
10 | Upstream-Status: Backport | ||
11 | CVE: CVE-2021-45444 | ||
12 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
13 | --- | ||
14 | ChangeLog | 5 +++++ | ||
15 | Src/prompt.c | 10 ++++++++++ | ||
16 | 2 files changed, 15 insertions(+) | ||
17 | |||
18 | diff --git a/ChangeLog b/ChangeLog | ||
19 | index 8d7dfc169..eb248ec06 100644 | ||
20 | --- a/ChangeLog | ||
21 | +++ b/ChangeLog | ||
22 | @@ -1,3 +1,8 @@ | ||
23 | +2022-01-27 dana <dana@dana.is> | ||
24 | + | ||
25 | + * Oliver Kiddle: security/41: Src/prompt.c: Prevent recursive | ||
26 | + PROMPT_SUBST | ||
27 | + | ||
28 | 2020-02-14 dana <dana@dana.is> | ||
29 | |||
30 | * unposted: Config/version.mk: Update for 5.8 | ||
31 | diff --git a/Src/prompt.c b/Src/prompt.c | ||
32 | index b65bfb86b..91e21c8e9 100644 | ||
33 | --- a/Src/prompt.c | ||
34 | +++ b/Src/prompt.c | ||
35 | @@ -244,6 +244,12 @@ parsecolorchar(zattr arg, int is_fg) | ||
36 | bv->fm += 2; /* skip over F{ */ | ||
37 | if ((ep = strchr(bv->fm, '}'))) { | ||
38 | char oc = *ep, *col, *coll; | ||
39 | + int ops = opts[PROMPTSUBST], opb = opts[PROMPTBANG]; | ||
40 | + int opp = opts[PROMPTPERCENT]; | ||
41 | + | ||
42 | + opts[PROMPTPERCENT] = 1; | ||
43 | + opts[PROMPTSUBST] = opts[PROMPTBANG] = 0; | ||
44 | + | ||
45 | *ep = '\0'; | ||
46 | /* expand the contents of the argument so you can use | ||
47 | * %v for example */ | ||
48 | @@ -252,6 +258,10 @@ parsecolorchar(zattr arg, int is_fg) | ||
49 | arg = match_colour((const char **)&coll, is_fg, 0); | ||
50 | free(col); | ||
51 | bv->fm = ep; | ||
52 | + | ||
53 | + opts[PROMPTSUBST] = ops; | ||
54 | + opts[PROMPTBANG] = opb; | ||
55 | + opts[PROMPTPERCENT] = opp; | ||
56 | } else { | ||
57 | arg = match_colour((const char **)&bv->fm, is_fg, 0); | ||
58 | if (*bv->fm != '}') | ||
59 | -- | ||
60 | 2.34.1 | ||
diff --git a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch b/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch deleted file mode 100644 index e5b6d7cdc..000000000 --- a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch +++ /dev/null | |||
@@ -1,140 +0,0 @@ | |||
1 | From 8a4d65ef6d0023ab9b238529410afb433553d2fa Mon Sep 17 00:00:00 2001 | ||
2 | From: Marc Cornellà <hello@mcornella.com> | ||
3 | Date: Mon, 24 Jan 2022 09:43:28 +0100 | ||
4 | Subject: [PATCH 2/9] security/89: Add patch which can optionally be used to | ||
5 | work around CVE-2021-45444 in VCS_Info | ||
6 | Comment: Updated to use the same file name without blanks as actually | ||
7 | used in the final 5.8.1 release. | ||
8 | |||
9 | |||
10 | https://salsa.debian.org/debian/zsh/-/blob/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_2.patch | ||
11 | Upstream-Status: Backport | ||
12 | CVE: CVE-2021-45444 | ||
13 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
14 | --- | ||
15 | ChangeLog | 5 + | ||
16 | Etc/CVE-2021-45444-VCS_Info-workaround.patch | 98 ++++++++++++++++++++ | ||
17 | 2 files changed, 103 insertions(+) | ||
18 | create mode 100644 Etc/CVE-2021-45444-VCS_Info-workaround.patch | ||
19 | |||
20 | diff --git a/ChangeLog b/ChangeLog | ||
21 | index eb248ec06..9a05a09e1 100644 | ||
22 | --- a/ChangeLog | ||
23 | +++ b/ChangeLog | ||
24 | @@ -1,5 +1,10 @@ | ||
25 | 2022-01-27 dana <dana@dana.is> | ||
26 | |||
27 | + * Marc Cornellà: security/89: | ||
28 | + Etc/CVE-2021-45444-VCS_Info-workaround.patch: Add patch which | ||
29 | + can optionally be used to work around recursive PROMPT_SUBST | ||
30 | + issue in VCS_Info | ||
31 | + | ||
32 | * Oliver Kiddle: security/41: Src/prompt.c: Prevent recursive | ||
33 | PROMPT_SUBST | ||
34 | |||
35 | diff --git a/Etc/CVE-2021-45444-VCS_Info-workaround.patch b/Etc/CVE-2021-45444-VCS_Info-workaround.patch | ||
36 | new file mode 100644 | ||
37 | index 000000000..13e54be77 | ||
38 | --- /dev/null | ||
39 | +++ b/Etc/CVE-2021-45444-VCS_Info-workaround.patch | ||
40 | @@ -0,0 +1,98 @@ | ||
41 | +From 972887bbe5eb6a00e5f0e73781d6d73bfdcafb93 Mon Sep 17 00:00:00 2001 | ||
42 | +From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com> | ||
43 | +Date: Mon, 24 Jan 2022 09:43:28 +0100 | ||
44 | +Subject: [PATCH] security/89: Partially work around CVE-2021-45444 in VCS_Info | ||
45 | +MIME-Version: 1.0 | ||
46 | +Content-Type: text/plain; charset=UTF-8 | ||
47 | +Content-Transfer-Encoding: 8bit | ||
48 | + | ||
49 | +This patch is a partial, VCS_Info-specific work-around for CVE-2021-45444, | ||
50 | +which is mitigated in the shell itself in 5.8.1 and later versions. It is | ||
51 | +offered for users who are concerned about an exploit but are unable to update | ||
52 | +their binaries to receive the complete fix. | ||
53 | + | ||
54 | +The patch works around the vulnerability by pre-escaping values substituted | ||
55 | +into format strings in VCS_Info. Please note that this may break some user | ||
56 | +configurations that rely on those values being un-escaped (which is why it was | ||
57 | +not included directly in 5.8.1). It may be possible to limit this breakage by | ||
58 | +adjusting exactly which ones are pre-escaped, but of course this may leave | ||
59 | +them vulnerable again. | ||
60 | + | ||
61 | +If applying the patch to the file system is inconvenient or not possible, the | ||
62 | +following script can be used to idempotently patch the relevant function | ||
63 | +running in memory (and thus must be re-run when the shell is restarted): | ||
64 | + | ||
65 | + | ||
66 | +# Impacted versions go from v5.0.3 to v5.8 (v5.8.1 is the first patched version) | ||
67 | +autoload -Uz is-at-least | ||
68 | +if is-at-least 5.8.1 || ! is-at-least 5.0.3; then | ||
69 | + return | ||
70 | +fi | ||
71 | + | ||
72 | +# Quote necessary $hook_com[<field>] items just before they are used | ||
73 | +# in the line "VCS_INFO_hook 'post-backend'" of the VCS_INFO_formats | ||
74 | +# function, where <field> is: | ||
75 | +# | ||
76 | +# base: the full path of the repository's root directory. | ||
77 | +# base-name: the name of the repository's root directory. | ||
78 | +# branch: the name of the currently checked out branch. | ||
79 | +# revision: an identifier of the currently checked out revision. | ||
80 | +# subdir: the path of the current directory relative to the | ||
81 | +# repository's root directory. | ||
82 | +# misc: a string that may contain anything the vcs_info backend wants. | ||
83 | +# | ||
84 | +# This patch %-quotes these fields previous to their use in vcs_info hooks and | ||
85 | +# the zformat call and, eventually, when they get expanded in the prompt. | ||
86 | +# It's important to quote these here, and not later after hooks have modified the | ||
87 | +# fields, because then we could be quoting % characters from valid prompt sequences, | ||
88 | +# like %F{color}, %B, etc. | ||
89 | +# | ||
90 | +# 32 │ hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})" | ||
91 | +# 33 │ hook_com[subdir_orig]="${hook_com[subdir]}" | ||
92 | +# 34 │ | ||
93 | +# 35 + │ for tmp in base base-name branch misc revision subdir; do | ||
94 | +# 36 + │ hook_com[$tmp]="${hook_com[$tmp]//\%/%%}" | ||
95 | +# 37 + │ done | ||
96 | +# 38 + │ | ||
97 | +# 39 │ VCS_INFO_hook 'post-backend' | ||
98 | +# | ||
99 | +# This is especially important so that no command substitution is performed | ||
100 | +# due to malicious input as a consequence of CVE-2021-45444, which affects | ||
101 | +# zsh versions from 5.0.3 to 5.8. | ||
102 | +# | ||
103 | +autoload -Uz +X regexp-replace VCS_INFO_formats | ||
104 | + | ||
105 | +# We use $tmp here because it's already a local variable in VCS_INFO_formats | ||
106 | +typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"' | ||
107 | +# Unique string to avoid reapplying the patch if this code gets called twice | ||
108 | +typeset PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b | ||
109 | +# Only patch the VCS_INFO_formats function if not already patched | ||
110 | +if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then | ||
111 | + regexp-replace 'functions[VCS_INFO_formats]' \ | ||
112 | + "VCS_INFO_hook 'post-backend'" \ | ||
113 | + ': ${PATCH_ID}; ${PATCH}; ${MATCH}' | ||
114 | +fi | ||
115 | +unset PATCH PATCH_ID | ||
116 | + | ||
117 | + | ||
118 | +--- | ||
119 | + Functions/VCS_Info/VCS_INFO_formats | 4 ++++ | ||
120 | + 1 file changed, 4 insertions(+) | ||
121 | + | ||
122 | +diff --git a/Functions/VCS_Info/VCS_INFO_formats b/Functions/VCS_Info/VCS_INFO_formats | ||
123 | +index e0e1dc738..4d88e28b6 100644 | ||
124 | +--- a/Functions/VCS_Info/VCS_INFO_formats | ||
125 | ++++ b/Functions/VCS_Info/VCS_INFO_formats | ||
126 | +@@ -32,6 +32,10 @@ hook_com[base-name_orig]="${hook_com[base_name]}" | ||
127 | + hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})" | ||
128 | + hook_com[subdir_orig]="${hook_com[subdir]}" | ||
129 | + | ||
130 | ++for tmp in base base-name branch misc revision subdir; do | ||
131 | ++ hook_com[$tmp]="${hook_com[$tmp]//\%/%%}" | ||
132 | ++done | ||
133 | ++ | ||
134 | + VCS_INFO_hook 'post-backend' | ||
135 | + | ||
136 | + ## description (for backend authors): | ||
137 | +-- | ||
138 | +2.34.1 | ||
139 | -- | ||
140 | 2.34.1 | ||
diff --git a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch b/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch deleted file mode 100644 index adfc00ae5..000000000 --- a/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | From 4abf2fc193fc2f3e680deecbf81289a7b02e245b Mon Sep 17 00:00:00 2001 | ||
2 | From: dana <dana@dana.is> | ||
3 | Date: Tue, 21 Dec 2021 13:13:33 -0600 | ||
4 | Subject: [PATCH 3/9] CVE-2021-45444: Update NEWS/README | ||
5 | |||
6 | https://salsa.debian.org/debian/zsh/-/blob/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_3.patch | ||
7 | Upstream-Status: Backport | ||
8 | CVE: CVE-2021-45444 | ||
9 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
10 | --- | ||
11 | ChangeLog | 2 ++ | ||
12 | NEWS | 20 ++++++++++++++++++++ | ||
13 | README | 6 ++++++ | ||
14 | 3 files changed, 28 insertions(+) | ||
15 | |||
16 | diff --git a/ChangeLog b/ChangeLog | ||
17 | index 9a05a09e1..93b0bc337 100644 | ||
18 | --- a/ChangeLog | ||
19 | +++ b/ChangeLog | ||
20 | @@ -1,5 +1,7 @@ | ||
21 | 2022-01-27 dana <dana@dana.is> | ||
22 | |||
23 | + * CVE-2021-45444: NEWS, README: Document preceding two changes | ||
24 | + | ||
25 | * Marc Cornellà: security/89: | ||
26 | Etc/CVE-2021-45444-VCS_Info-workaround.patch: Add patch which | ||
27 | can optionally be used to work around recursive PROMPT_SUBST | ||
28 | diff --git a/NEWS b/NEWS | ||
29 | index 964e1633f..d34b3f79e 100644 | ||
30 | --- a/NEWS | ||
31 | +++ b/NEWS | ||
32 | @@ -4,6 +4,26 @@ CHANGES FROM PREVIOUS VERSIONS OF ZSH | ||
33 | |||
34 | Note also the list of incompatibilities in the README file. | ||
35 | |||
36 | +Changes since 5.8 | ||
37 | +----------------- | ||
38 | + | ||
39 | +CVE-2021-45444: Some prompt expansion sequences, such as %F, support | ||
40 | +'arguments' which are themselves expanded in case they contain colour | ||
41 | +values, etc. This additional expansion would trigger PROMPT_SUBST | ||
42 | +evaluation, if enabled. This could be abused to execute code the user | ||
43 | +didn't expect. e.g., given a certain prompt configuration, an attacker | ||
44 | +could trick a user into executing arbitrary code by having them check | ||
45 | +out a Git branch with a specially crafted name. | ||
46 | + | ||
47 | +This is fixed in the shell itself by no longer performing PROMPT_SUBST | ||
48 | +evaluation on these prompt-expansion arguments. | ||
49 | + | ||
50 | +Users who are concerned about an exploit but unable to update their | ||
51 | +binaries may apply the partial work-around described in the file | ||
52 | +'Etc/CVE-2021-45444 VCS_Info workaround.patch' included with the shell | ||
53 | +source. [ Reported by RyotaK <security@ryotak.me>. Additional thanks to | ||
54 | +Marc Cornellà <hello@mcornella.com>. ] | ||
55 | + | ||
56 | Changes since 5.7.1-test-3 | ||
57 | -------------------------- | ||
58 | |||
59 | diff --git a/README b/README | ||
60 | index 7f1dd5f92..c9e994ab3 100644 | ||
61 | --- a/README | ||
62 | +++ b/README | ||
63 | @@ -31,6 +31,12 @@ Zsh is a shell with lots of features. For a list of some of these, see the | ||
64 | file FEATURES, and for the latest changes see NEWS. For more | ||
65 | details, see the documentation. | ||
66 | |||
67 | +Incompatibilities since 5.8 | ||
68 | +--------------------------- | ||
69 | + | ||
70 | +PROMPT_SUBST expansion is no longer performed on arguments to prompt- | ||
71 | +expansion sequences such as %F. | ||
72 | + | ||
73 | Incompatibilities since 5.7.1 | ||
74 | ----------------------------- | ||
75 | |||
76 | -- | ||
77 | 2.34.1 | ||
diff --git a/meta-oe/recipes-shells/zsh/zsh_5.8.bb b/meta-oe/recipes-shells/zsh/zsh_5.9.bb index 7602ff9f6..7940970e4 100644 --- a/meta-oe/recipes-shells/zsh/zsh_5.8.bb +++ b/meta-oe/recipes-shells/zsh/zsh_5.9.bb | |||
@@ -10,12 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=1a4c4cda3e8096d2fd483ff2f4514fec" | |||
10 | 10 | ||
11 | DEPENDS = "ncurses bison-native libcap libpcre gdbm groff-native" | 11 | DEPENDS = "ncurses bison-native libcap libpcre gdbm groff-native" |
12 | 12 | ||
13 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/5.8/${BP}.tar.xz \ | 13 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.xz" |
14 | file://CVE-2021-45444_1.patch \ | 14 | SRC_URI[sha256sum] = "9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5" |
15 | file://CVE-2021-45444_2.patch \ | ||
16 | file://CVE-2021-45444_3.patch \ | ||
17 | " | ||
18 | SRC_URI[sha256sum] = "dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27" | ||
19 | 15 | ||
20 | inherit autotools-brokensep gettext update-alternatives manpages | 16 | inherit autotools-brokensep gettext update-alternatives manpages |
21 | 17 | ||
@@ -50,13 +46,17 @@ do_configure () { | |||
50 | oe_runconf | 46 | oe_runconf |
51 | } | 47 | } |
52 | 48 | ||
49 | do_install:append() { | ||
50 | sed -i -e '1!b; s:^#!.*[ /]zsh:#!${bindir}/zsh:; s#/usr/local/bin#${bindir}#;' \ | ||
51 | `find ${D}/usr/share/zsh/${PV}/functions -type f` | ||
52 | } | ||
53 | |||
53 | pkg_postinst:${PN} () { | 54 | pkg_postinst:${PN} () { |
54 | touch $D${sysconfdir}/shells | 55 | touch $D${sysconfdir}/shells |
55 | grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells | 56 | for i in zsh sh |
56 | grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells | 57 | do |
58 | grep -q "bin/$i" $D${sysconfdir}/shells || \ | ||
59 | printf >> $D${sysconfdir}/shells \ | ||
60 | "${bindir}/$i\n${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/$i\n', '', d)}" | ||
61 | done | ||
57 | } | 62 | } |
58 | |||
59 | # work around QA failures with usrmerge installing zsh in /usr/bin/zsh instead of /bin/zsh | ||
60 | # ERROR: QA Issue: /usr/share/zsh/5.8/functions/zed contained in package zsh requires /bin/zsh, but no providers found in RDEPENDS:zsh? [file-rdeps] | ||
61 | # like bash does since https://git.openembedded.org/openembedded-core/commit/?id=4759408677a4e60c5fa7131afcb5bc184cf2f90a | ||
62 | RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/zsh', '', d)}" | ||
diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb index f2bf52cdb..ed87b3de4 100644 --- a/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb | |||
@@ -17,6 +17,9 @@ SRC_URI:append:class-native = " file://native-helpers.patch" | |||
17 | SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108" | 17 | SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108" |
18 | SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547" | 18 | SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547" |
19 | 19 | ||
20 | UPSTREAM_CHECK_URI = "https://osdn.net/projects/anthy/releases/" | ||
21 | UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>(\d+)+(\w*))" | ||
22 | |||
20 | DEPENDS:class-target = "anthy-native" | 23 | DEPENDS:class-target = "anthy-native" |
21 | RDEPENDS:${PN}:class-target = "libanthy0" | 24 | RDEPENDS:${PN}:class-target = "libanthy0" |
22 | 25 | ||
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 4b0e74227..df45eede2 100644 --- a/meta-oe/recipes-support/atop/atop_2.4.0.bb +++ b/meta-oe/recipes-support/atop/atop_2.4.0.bb | |||
@@ -24,6 +24,9 @@ SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ | |||
24 | SRC_URI[md5sum] = "1077da884ed94f2bc3c81ac3ab970436" | 24 | SRC_URI[md5sum] = "1077da884ed94f2bc3c81ac3ab970436" |
25 | SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69" | 25 | SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69" |
26 | 26 | ||
27 | UPSTREAM_CHECK_URI = "https://atoptool.nl/downloadatop.php" | ||
28 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+).tar" | ||
29 | |||
27 | CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | 30 | CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." |
28 | 31 | ||
29 | do_compile() { | 32 | do_compile() { |
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 6ec25bdd2..0ac1deccc 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++" | |||
20 | inherit cmake pkgconfig | 20 | inherit cmake pkgconfig |
21 | 21 | ||
22 | BBCLASSEXTEND = "native nativesdk" | 22 | BBCLASSEXTEND = "native nativesdk" |
23 | |||
24 | # http://errors.yoctoproject.org/Errors/Details/766913/ | ||
25 | # avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:304:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference] | ||
26 | # avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:370:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference] | ||
27 | 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 bb7f53e45..bf84242e2 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 \ | |||
15 | S = "${WORKDIR}/git/lang/c" | 15 | S = "${WORKDIR}/git/lang/c" |
16 | 16 | ||
17 | inherit cmake pkgconfig | 17 | inherit cmake pkgconfig |
18 | |||
19 | # http://errors.yoctoproject.org/Errors/Details/766902/ | ||
20 | # 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] | ||
21 | # 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] | ||
22 | # 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] | ||
23 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb index a5a7a6365..fe51c1029 100644 --- a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb +++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb | |||
@@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075" | |||
23 | 23 | ||
24 | DEPENDS = "libatomic-ops" | 24 | DEPENDS = "libatomic-ops" |
25 | 25 | ||
26 | SRCREV = "e340b2e869e02718de9c9d7fa440ef4b35785388" | 26 | SRCREV = "ee59af3722e56de8404de6cd0c21c2493cc4d855" |
27 | SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https" | 27 | SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https" |
28 | 28 | ||
29 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-oe/recipes-support/ckermit/ckermit_302.bb index 1ee776cef..e32aba93c 100644 --- a/meta-oe/recipes-support/ckermit/ckermit_302.bb +++ b/meta-oe/recipes-support/ckermit/ckermit_302.bb | |||
@@ -14,6 +14,8 @@ SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subd | |||
14 | SRC_URI[md5sum] = "eac4dbf18b45775e4cdee5a7c74762b0" | 14 | SRC_URI[md5sum] = "eac4dbf18b45775e4cdee5a7c74762b0" |
15 | SRC_URI[sha256sum] = "0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711" | 15 | SRC_URI[sha256sum] = "0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://www.kermitproject.org/ck90.html" | ||
18 | UPSTREAM_CHECK_REGEX = "cku(?P<pver>\d+)\.tar" | ||
17 | 19 | ||
18 | export CC2 = "${CC}" | 20 | export CC2 = "${CC}" |
19 | export BINDIR = "${bindir}" | 21 | export BINDIR = "${bindir}" |
@@ -55,3 +57,11 @@ do_install () { | |||
55 | rm ${D}${BINDIR}/kermit-sshsub | 57 | rm ${D}${BINDIR}/kermit-sshsub |
56 | (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb) | 58 | (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb) |
57 | } | 59 | } |
60 | |||
61 | # This one is reproducible only on 32bit MACHINEs | ||
62 | # http://errors.yoctoproject.org/Errors/Details/766966/ | ||
63 | # ckutio.c:12057:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types] | ||
64 | # ckutio.c:12058:20: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
65 | # ckufio.c:5043:32: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
66 | # ckufio.c:5263:32: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
67 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-support/cmark/cmark_0.31.0.bb b/meta-oe/recipes-support/cmark/cmark_0.31.1.bb index ce8b4cd49..1edb95e45 100644 --- a/meta-oe/recipes-support/cmark/cmark_0.31.0.bb +++ b/meta-oe/recipes-support/cmark/cmark_0.31.1.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause & MIT" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" |
5 | 5 | ||
6 | SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" | 6 | SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" |
7 | SRCREV = "8fbf029685482827828b5858444157052f1b0a5f" | 7 | SRCREV = "bb3678d7a73cb02d35c8876ecd097072636200a8" |
8 | S = "${WORKDIR}/git" | 8 | S = "${WORKDIR}/git" |
9 | 9 | ||
10 | inherit cmake lib_package | 10 | inherit cmake lib_package |
diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb index e30022251..6eb9db8da 100644 --- a/meta-oe/recipes-support/colord/colord.bb +++ b/meta-oe/recipes-support/colord/colord.bb | |||
@@ -1,28 +1,33 @@ | |||
1 | require ${BPN}.inc | 1 | require ${BPN}.inc |
2 | 2 | ||
3 | inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd pkgconfig | 3 | inherit meson gobject-introspection gsettings gtk-doc gettext bash-completion systemd features_check useradd pkgconfig |
4 | 4 | ||
5 | # polkit and gobject-introspection are mandatory and cannot be configured | 5 | # polkit and gobject-introspection are mandatory and cannot be configured |
6 | REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" | 6 | REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" |
7 | GIR_MESON_OPTION = "" | 7 | GIR_MESON_OPTION = "" |
8 | 8 | ||
9 | DEPENDS += " \ | 9 | DEPENDS += " \ |
10 | ${BPN}-native \ | 10 | ${BPN}-native \ |
11 | glib-2.0 \ | 11 | dbus \ |
12 | lcms \ | 12 | glib-2.0 \ |
13 | sqlite3 \ | 13 | lcms \ |
14 | libgusb \ | 14 | libgudev \ |
15 | libgudev \ | 15 | libgusb \ |
16 | polkit \ | 16 | polkit \ |
17 | sqlite3 \ | ||
17 | " | 18 | " |
18 | 19 | ||
20 | RDEPENDS:${PN} += "hwdata" | ||
21 | |||
19 | SRC_URI += " \ | 22 | SRC_URI += " \ |
20 | file://0001-Run-native-cd_idt8-cd_create_profile.patch \ | 23 | file://0001-Run-native-cd_idt8-cd_create_profile.patch \ |
24 | file://08a32b2379fb5582f4312e59bf51a2823df56276.patch \ | ||
21 | " | 25 | " |
22 | 26 | ||
23 | EXTRA_OEMESON = " \ | 27 | EXTRA_OEMESON += " \ |
24 | -Dman=false \ | 28 | -Dman=false \ |
25 | -Ddocs=false \ | 29 | -Ddaemon_user=colord \ |
30 | -Dpnp_ids=${datadir}/hwdata/pnp.ids \ | ||
26 | " | 31 | " |
27 | 32 | ||
28 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 33 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
@@ -42,4 +47,5 @@ FILES:${PN} += " \ | |||
42 | " | 47 | " |
43 | 48 | ||
44 | USERADD_PACKAGES = "${PN}" | 49 | USERADD_PACKAGES = "${PN}" |
45 | USERADD_PARAM:${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" | 50 | USERADD_PARAM:${PN} = "--system --user-group -s /bin/false colord" |
51 | |||
diff --git a/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch b/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch new file mode 100644 index 000000000..860e6ab4a --- /dev/null +++ b/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 08a32b2379fb5582f4312e59bf51a2823df56276 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Hughes <richard@hughsie.com> | ||
3 | Date: Mon, 29 Jan 2024 10:37:11 +0000 | ||
4 | Subject: [PATCH] Fix writing to the database with ProtectSystem=strict | ||
5 | |||
6 | Fixes https://github.com/hughsie/colord/issues/166 | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/hughsie/colord/commit/08a32b2379fb5582f4312e59bf51a2823df56276] | ||
9 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
10 | --- | ||
11 | data/colord.service.in | 4 ++++ | ||
12 | 1 file changed, 4 insertions(+) | ||
13 | |||
14 | diff --git a/data/colord.service.in b/data/colord.service.in | ||
15 | index 6825d944..c358dc4b 100644 | ||
16 | --- a/data/colord.service.in | ||
17 | +++ b/data/colord.service.in | ||
18 | @@ -17,6 +17,10 @@ ProtectControlGroups=true | ||
19 | RestrictRealtime=true | ||
20 | RestrictAddressFamilies=AF_UNIX | ||
21 | |||
22 | +ConfigurationDirectory=colord | ||
23 | +StateDirectory=colord | ||
24 | +CacheDirectory=colord | ||
25 | + | ||
26 | # drop all capabilities | ||
27 | CapabilityBoundingSet=~CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_IPC_OWNER CAP_NET_ADMIN CAP_SYS_RAWIO CAP_SYS_TIME CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE CAP_KILL CAP_MKNOD CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RESOURCE CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_BOOT CAP_LINUX_IMMUTABLE CAP_IPC_LOCK CAP_SYS_CHROOT CAP_BLOCK_SUSPEND CAP_LEASE CAP_SYS_PACCT CAP_SYS_TTY_CONFIG CAP_WAKE_ALARM | ||
28 | |||
diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.4.bb b/meta-oe/recipes-support/composefs/composefs_1.0.5.bb index aaf33b40e..14133fdcb 100644 --- a/meta-oe/recipes-support/composefs/composefs_1.0.4.bb +++ b/meta-oe/recipes-support/composefs/composefs_1.0.5.bb | |||
@@ -13,21 +13,18 @@ LIC_FILES_CHKSUM = "\ | |||
13 | file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 13 | file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
14 | " | 14 | " |
15 | 15 | ||
16 | PV .= "+git${SRCPV}" | 16 | SRCREV = "098d985a1b9a15ac828d7b2382297a6955e31e40" |
17 | SRCREV = "7623e4dc89f62ada5724d4e41d0a16d2671312f5" | ||
18 | SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" | 17 | SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" |
19 | 18 | ||
20 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
21 | 20 | ||
22 | inherit autotools pkgconfig | 21 | inherit meson |
23 | 22 | ||
24 | DEPENDS = "openssl" | 23 | DEPENDS = "openssl" |
25 | 24 | ||
26 | EXTRA_OECONF += " \ | 25 | EXTRA_OEMESON += " \ |
27 | --disable-man \ | 26 | -Dman=disabled \ |
28 | --without-fuse \ | 27 | -Dfuse=disabled \ |
29 | " | 28 | " |
30 | 29 | ||
31 | LDFLAGS:append:class-native = " -pthread" | ||
32 | |||
33 | BBCLASSEXTEND = "native" | 30 | BBCLASSEXTEND = "native" |
diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index a35b54e3b..6561a4ae0 100644 --- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb | |||
@@ -29,6 +29,8 @@ SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ | |||
29 | SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc" | 29 | SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc" |
30 | SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f" | 30 | SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f" |
31 | 31 | ||
32 | UPSTREAM_CHECK_URI = "http://cr.yp.to/daemontools/install.html" | ||
33 | |||
32 | S = "${WORKDIR}/admin/${BP}" | 34 | S = "${WORKDIR}/admin/${BP}" |
33 | 35 | ||
34 | do_compile() { | 36 | do_compile() { |
@@ -46,3 +48,10 @@ do_install:append:class-target() { | |||
46 | inherit update-alternatives | 48 | inherit update-alternatives |
47 | ALTERNATIVE_PRIORITY = "100" | 49 | ALTERNATIVE_PRIORITY = "100" |
48 | ALTERNATIVE:${PN} = "svc svok" | 50 | ALTERNATIVE:${PN} = "svc svok" |
51 | |||
52 | # http://errors.yoctoproject.org/Errors/Details/766886/ | ||
53 | # pathexec_run.c:19:17: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] | ||
54 | # pathexec_run.c:19:22: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] | ||
55 | # pathexec_run.c:36:18: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] | ||
56 | # pathexec_run.c:36:23: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] | ||
57 | CC += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-support/devmem2/devmem2_2.0.bb b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb index aee6bfe3d..5d2e8463e 100644 --- a/meta-oe/recipes-support/devmem2/devmem2_2.0.bb +++ b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb | |||
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf9862 | |||
5 | SRC_URI = "git://github.com/denix0/devmem2.git;protocol=https;branch=main" | 5 | SRC_URI = "git://github.com/denix0/devmem2.git;protocol=https;branch=main" |
6 | SRCREV = "5b395a946894eb4f4ef5d07c80a50a88573a541e" | 6 | SRCREV = "5b395a946894eb4f4ef5d07c80a50a88573a541e" |
7 | 7 | ||
8 | # Upstream repo does not tag | ||
9 | UPSTREAM_CHECK_COMMITS = "1" | ||
10 | |||
8 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
9 | 12 | ||
10 | CFLAGS += "-DFORCE_STRICT_ALIGNMENT" | 13 | CFLAGS += "-DFORCE_STRICT_ALIGNMENT" |
diff --git a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb index 6eaec800c..37fe0e1bd 100644 --- a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb +++ b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb | |||
@@ -9,6 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" | |||
9 | SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" | 9 | SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" |
10 | SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" | 10 | SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" |
11 | PV = "0.0+git" | 11 | PV = "0.0+git" |
12 | |||
13 | # Upstream repo does not tag | ||
14 | UPSTREAM_CHECK_COMMITS = "1" | ||
15 | |||
12 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
13 | 17 | ||
14 | do_install() { | 18 | do_install() { |
diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb deleted file mode 100644 index 958810cf7..000000000 --- a/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" | ||
2 | LICENSE = "GPL-2.0-only" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" | ||
4 | |||
5 | DEPENDS = "zlib expat brotli libinih" | ||
6 | |||
7 | SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz" | ||
8 | SRC_URI[sha256sum] = "89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d" | ||
9 | # Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either | ||
10 | # inherit dos2unix | ||
11 | S = "${WORKDIR}/${BP}-Source" | ||
12 | |||
13 | inherit cmake gettext | ||
14 | |||
15 | do_install:append:class-target() { | ||
16 | # reproducibility: remove build host path | ||
17 | sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ | ||
18 | -e 's:${STAGING_DIR_HOST}::g' | ||
19 | } | ||
diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb new file mode 100644 index 000000000..3e33ab795 --- /dev/null +++ b/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" | ||
2 | LICENSE = "GPL-2.0-only" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" | ||
4 | |||
5 | DEPENDS = "zlib expat brotli libinih" | ||
6 | |||
7 | SRC_URI = "git://github.com/Exiv2/exiv2.git;protocol=https;branch=0.28.x" | ||
8 | SRCREV = "a6a79ef064f131ffd03c110acce2d3edb84ffa2e" | ||
9 | S = "${WORKDIR}/git" | ||
10 | |||
11 | inherit cmake gettext | ||
diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.10.bb b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb index af7117da7..52122b9c0 100644 --- a/meta-oe/recipes-support/fftw/fftw_3.3.10.bb +++ b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb | |||
@@ -11,6 +11,8 @@ SRC_URI = " \ | |||
11 | " | 11 | " |
12 | SRC_URI[sha256sum] = "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467" | 12 | SRC_URI[sha256sum] = "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467" |
13 | 13 | ||
14 | UPSTREAM_CHECK_URI = "http://www.fftw.org/download.html" | ||
15 | |||
14 | inherit autotools pkgconfig ptest | 16 | inherit autotools pkgconfig ptest |
15 | 17 | ||
16 | # we had multiple recipes in the past | 18 | # we had multiple recipes in the past |
diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb index 3e8e2cdf7..322a28430 100644 --- a/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-oe/recipes-support/fltk/fltk-native.bb | |||
@@ -4,6 +4,8 @@ DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native" | |||
4 | 4 | ||
5 | SRC_URI += "file://fltk-native-link-libdl.patch" | 5 | SRC_URI += "file://fltk-native-link-libdl.patch" |
6 | 6 | ||
7 | UPSTREAM_CHECK_URI = "https://www.fltk.org/software.php" | ||
8 | |||
7 | inherit native | 9 | inherit native |
8 | 10 | ||
9 | EXTRA_OECMAKE += " \ | 11 | EXTRA_OECMAKE += " \ |
diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb index 82007c4cf..4278a2fa3 100644 --- a/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-oe/recipes-support/fltk/fltk.bb | |||
@@ -7,6 +7,8 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
7 | 7 | ||
8 | SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch" | 8 | SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch" |
9 | 9 | ||
10 | UPSTREAM_CHECK_URI = "https://www.fltk.org/software.php" | ||
11 | |||
10 | EXTRA_OECMAKE = " \ | 12 | EXTRA_OECMAKE = " \ |
11 | -DOPTION_BUILD_SHARED_LIBS=ON \ | 13 | -DOPTION_BUILD_SHARED_LIBS=ON \ |
12 | -DOPTION_USE_THREADS=ON \ | 14 | -DOPTION_USE_THREADS=ON \ |
diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc index b1bc83578..0b2921095 100644 --- a/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-oe/recipes-support/fltk/fltk.inc | |||
@@ -11,8 +11,8 @@ SRC_URI = " \ | |||
11 | file://0002-always-build-fluid-and-export-pointers.patch \ | 11 | file://0002-always-build-fluid-and-export-pointers.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | PV = "1.3.8" | 14 | PV = "1.3.9" |
15 | SRC_URI[sha256sum] = "1d9832409fc08c908c64ab40ad9fd8b0e8af5d203651eb9690b810f41e2f412d" | 15 | SRC_URI[sha256sum] = "103441134915402808fd45424d4061778609437e804334434e946cfd26b196c2" |
16 | 16 | ||
17 | inherit cmake pkgconfig | 17 | inherit cmake pkgconfig |
18 | 18 | ||
diff --git a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch index d1cbb3547..0d47dac2d 100644 --- a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch +++ b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch | |||
@@ -16,10 +16,10 @@ Content-Transfer-Encoding: 8bit | |||
16 | | ^ | 16 | | ^ |
17 | | src/CMakeFiles/fltk.dir/build.make:1217: recipe for target 'src/CMakeFiles/fltk.dir/Fl_Preferences.cxx.o' failed | 17 | | src/CMakeFiles/fltk.dir/build.make:1217: recipe for target 'src/CMakeFiles/fltk.dir/Fl_Preferences.cxx.o' failed |
18 | 18 | ||
19 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
20 | --- | ||
21 | Upstream-Status: Pending | 19 | Upstream-Status: Pending |
22 | 20 | ||
21 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
22 | --- | ||
23 | src/Fl_Preferences.cxx | 2 +- | 23 | src/Fl_Preferences.cxx | 2 +- |
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
25 | 25 | ||
diff --git a/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch b/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch new file mode 100644 index 000000000..43e905f33 --- /dev/null +++ b/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 3018aa9822c680663ebd19542bcd757dc9baf20a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 8 Sep 2024 20:16:49 -0700 | ||
4 | Subject: [PATCH] Fix undeclared function errors | ||
5 | |||
6 | e.g. | ||
7 | |||
8 | ipmi-sel-string-supermicro-x10dimm-common.c:87:14: error: call to undeclared function 'sel_string_output_supermicro_dimm_event_d | ||
9 | | 87 | if ((ret = sel_string_output_supermicro_dimm_event_data2_event_data3 (ctx, | ||
10 | |||
11 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/freeipmi-devel/2024-09/msg00001.html] | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | ipmi-sensors/ipmi-sensors-oem-intel.c | 1 + | ||
16 | libfreeipmi/sel/ipmi-sel-string-supermicro-common.h | 9 +++++++++ | ||
17 | 2 files changed, 10 insertions(+) | ||
18 | |||
19 | diff --git a/ipmi-sensors/ipmi-sensors-oem-intel.c b/ipmi-sensors/ipmi-sensors-oem-intel.c | ||
20 | index 5e0f373..872a730 100644 | ||
21 | --- a/ipmi-sensors/ipmi-sensors-oem-intel.c | ||
22 | +++ b/ipmi-sensors/ipmi-sensors-oem-intel.c | ||
23 | @@ -36,6 +36,7 @@ | ||
24 | #include "ipmi-sensors-oem-intel-s2600jf.h" | ||
25 | #include "ipmi-sensors-oem-intel-quanta-qssc-s4r.h" | ||
26 | #include "ipmi-sensors-oem-intel-node-manager.h" | ||
27 | +#include "ipmi-sensors-oem-intel-s2600wp.h" | ||
28 | |||
29 | #include "freeipmi-portability.h" | ||
30 | #include "pstdout.h" | ||
31 | diff --git a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h | ||
32 | index 5785f2b..9e29bd6 100644 | ||
33 | --- a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h | ||
34 | +++ b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h | ||
35 | @@ -39,4 +39,13 @@ int sel_string_output_supermicro_overheat_event_data1_class_oem (ipmi_sel_ctx_t | ||
36 | unsigned int *wlen, | ||
37 | struct ipmi_sel_system_event_record_data *system_event_record_data); | ||
38 | |||
39 | +int sel_string_output_supermicro_dimm_event_data2_event_data3 (ipmi_sel_ctx_t ctx, | ||
40 | + struct ipmi_sel_entry *sel_entry, | ||
41 | + uint8_t sel_record_type, | ||
42 | + char *buf, | ||
43 | + unsigned int buflen, | ||
44 | + unsigned int flags, | ||
45 | + unsigned int *wlen, | ||
46 | + struct ipmi_sel_system_event_record_data *system_event_record_data, | ||
47 | + int *oem_rv); | ||
48 | #endif /* IPMI_SEL_STRING_SUPERMICRO_COMMON_H */ | ||
diff --git a/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb new file mode 100644 index 000000000..e9b28cee3 --- /dev/null +++ b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | LICENSE = "GPL-3.0-only" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | ||
3 | file://COPYING.ZRESEARCH;md5=d32239bcb673463ab874e80d47fae504 \ | ||
4 | file://COPYING.bmc-watchdog;md5=d32239bcb673463ab874e80d47fae504 \ | ||
5 | file://COPYING.ipmi-dcmi;md5=d32239bcb673463ab874e80d47fae504 \ | ||
6 | file://COPYING.ipmi-fru;md5=d32239bcb673463ab874e80d47fae504 \ | ||
7 | file://COPYING.ipmiconsole;md5=d32239bcb673463ab874e80d47fae504 \ | ||
8 | file://COPYING.ipmidetect;md5=d32239bcb673463ab874e80d47fae504 \ | ||
9 | file://COPYING.ipmimonitoring;md5=d32239bcb673463ab874e80d47fae504 \ | ||
10 | file://COPYING.ipmiping;md5=d32239bcb673463ab874e80d47fae504 \ | ||
11 | file://COPYING.ipmipower;md5=d32239bcb673463ab874e80d47fae504 \ | ||
12 | file://COPYING.ipmiseld;md5=d32239bcb673463ab874e80d47fae504 \ | ||
13 | file://COPYING.pstdout;md5=d32239bcb673463ab874e80d47fae504 \ | ||
14 | file://COPYING.sunbmc;md5=c03f21cd76ff5caba6b890d1213cbfbb" | ||
15 | |||
16 | SRC_URI = "${GNU_MIRROR}/freeipmi/freeipmi-${PV}.tar.gz \ | ||
17 | file://0001-Fix-undeclared-function-errors.patch" | ||
18 | SRC_URI[sha256sum] = "1a3dac5c76b7ccc4d4f86aa12b8ef9b212baef7489bf05e899b89abb7e14edb5" | ||
19 | |||
20 | DEPENDS = "libgcrypt" | ||
21 | DEPENDS:append:libc-musl = " argp-standalone" | ||
22 | |||
23 | inherit pkgconfig autotools | ||
24 | |||
25 | EXTRA_OECONF = "--without-random-device" | ||
26 | |||
diff --git a/meta-oe/recipes-support/genimage/genimage_18.bb b/meta-oe/recipes-support/genimage/genimage_18.bb new file mode 100644 index 000000000..23169f5d4 --- /dev/null +++ b/meta-oe/recipes-support/genimage/genimage_18.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "genimage - The image creation tool" | ||
2 | DESCRIPTION = "Genimage is a tool for generating filesystem and disk/flash images \ | ||
3 | from a root filesystem tree or existing filesystem images." | ||
4 | HOMEPAGE = "https://github.com/pengutronix/genimage" | ||
5 | |||
6 | SECTION = "base" | ||
7 | LICENSE = "GPL-2.0-only" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
9 | |||
10 | DEPENDS = "libconfuse" | ||
11 | |||
12 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/genimage-${PV}.tar.xz" | ||
13 | SRC_URI[sha256sum] = "ebc3f886c4d80064dd6c6d5e3c2e98e5a670078264108ce2f89ada8a2e13fedd" | ||
14 | |||
15 | EXTRA_OECONF = "--enable-largefile" | ||
16 | |||
17 | inherit pkgconfig autotools gettext github-releases | ||
18 | |||
19 | GITHUB_BASE_URI = "https://github.com/pengutronix/genimage/releases" | ||
20 | UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)*)" | ||
21 | |||
22 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb index 25e5414a3..a06648864 100644 --- a/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-oe/recipes-support/gpm/gpm_git.bb | |||
@@ -24,6 +24,10 @@ inherit autotools-brokensep update-rc.d systemd texinfo | |||
24 | INITSCRIPT_NAME = "gpm" | 24 | INITSCRIPT_NAME = "gpm" |
25 | INITSCRIPT_PARAMS = "defaults" | 25 | INITSCRIPT_PARAMS = "defaults" |
26 | 26 | ||
27 | # Avoid line statements with bison/yacc | ||
28 | # ERROR: lib32-gpm-1.99.7+gite82d1a653ca94aa4ed12441424da6ce780b1e530-r0 do_package_qa: QA Issue: File /usr/src/debug/lib32-gpm/1.99.7+gite82d1a653ca94aa4ed12441424da6ce780b1e530/src/prog/gpm-root.c in package lib32-gpm-src contains reference to TMPDIR [buildpaths] | ||
29 | EXTRA_OEMAKE = "YFLAGS='-l'" | ||
30 | |||
27 | do_configure:prepend() { | 31 | do_configure:prepend() { |
28 | (cd ${S};./autogen.sh;cd -) | 32 | (cd ${S};./autogen.sh;cd -) |
29 | } | 33 | } |
diff --git a/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb index c82b529f9..6238a04d9 100644 --- a/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb +++ b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb | |||
@@ -18,6 +18,8 @@ SRC_URI = "http://grsecurity.net/stable/${BP}.tar.gz \ | |||
18 | " | 18 | " |
19 | SRC_URI[sha256sum] = "2459290f367a47c8a1ce4ea2ec08359799ea33dc15ed4436439596ce88284fb9" | 19 | SRC_URI[sha256sum] = "2459290f367a47c8a1ce4ea2ec08359799ea33dc15ed4436439596ce88284fb9" |
20 | 20 | ||
21 | UPSTREAM_CHECK_URI = "https://grsecurity.net/download" | ||
22 | |||
21 | S = "${WORKDIR}/gradm" | 23 | S = "${WORKDIR}/gradm" |
22 | 24 | ||
23 | inherit autotools-brokensep | 25 | inherit autotools-brokensep |
diff --git a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch index 68d9c3a3c..0d016ccb4 100644 --- a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch +++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 4fa437782261c0da785d4574ad3a03700f624e66 Mon Sep 17 00:00:00 2001 | 1 | From 9f5afd99cce93e68996deb2b5fa7c32737d279fe Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
3 | Date: Tue, 19 Sep 2023 02:56:09 +0000 | 3 | Date: Tue, 16 Jul 2024 17:54:29 +0800 |
4 | Subject: [PATCH] cmake: remove build flags | 4 | Subject: [PATCH] cmake: remove build flags |
5 | 5 | ||
6 | Don't generate the build host related info and reemove the build flags | 6 | Don't generate the build host related info and reemove the build flags |
@@ -11,11 +11,10 @@ Upstream-Status: Inappropriate [oe specific] | |||
11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
12 | --- | 12 | --- |
13 | config/cmake/libhdf5.settings.cmake.in | 18 +++++++++--------- | 13 | config/cmake/libhdf5.settings.cmake.in | 18 +++++++++--------- |
14 | src/H5make_libsettings.c | 17 ----------------- | 14 | 1 file changed, 9 insertions(+), 9 deletions(-) |
15 | 2 files changed, 9 insertions(+), 26 deletions(-) | ||
16 | 15 | ||
17 | diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in | 16 | diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in |
18 | index f60f0de..f4433c0 100644 | 17 | index deb07ed..6f255c4 100644 |
19 | --- a/config/cmake/libhdf5.settings.cmake.in | 18 | --- a/config/cmake/libhdf5.settings.cmake.in |
20 | +++ b/config/cmake/libhdf5.settings.cmake.in | 19 | +++ b/config/cmake/libhdf5.settings.cmake.in |
21 | @@ -23,23 +23,23 @@ Linking Options: | 20 | @@ -23,23 +23,23 @@ Linking Options: |
@@ -28,7 +27,7 @@ index f60f0de..f4433c0 100644 | |||
28 | AM_LDFLAGS: @AM_LDFLAGS@ | 27 | AM_LDFLAGS: @AM_LDFLAGS@ |
29 | Extra libraries: @LINK_LIBS@ | 28 | Extra libraries: @LINK_LIBS@ |
30 | - Archiver: @CMAKE_AR@ | 29 | - Archiver: @CMAKE_AR@ |
31 | - AR_FLAGS: | 30 | - AR_FLAGS: |
32 | - Ranlib: @CMAKE_RANLIB@ | 31 | - Ranlib: @CMAKE_RANLIB@ |
33 | + Archiver: | 32 | + Archiver: |
34 | + AR_FLAGS: | 33 | + AR_FLAGS: |
@@ -63,34 +62,6 @@ index f60f0de..f4433c0 100644 | |||
63 | H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ | 62 | H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ |
64 | AM C++ Flags: @AM_CXXFLAGS@ | 63 | AM C++ Flags: @AM_CXXFLAGS@ |
65 | Shared C++ Library: @H5_ENABLE_SHARED_LIB@ | 64 | Shared C++ Library: @H5_ENABLE_SHARED_LIB@ |
66 | diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c | ||
67 | index 2661288..7c0f84f 100644 | ||
68 | --- a/src/H5make_libsettings.c | ||
69 | +++ b/src/H5make_libsettings.c | ||
70 | @@ -205,23 +205,6 @@ information about the library build configuration\n"; | ||
71 | fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n"); | ||
72 | fputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */ | ||
73 | |||
74 | - fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday, | ||
75 | - 1900 + tm->tm_year); | ||
76 | - if (pwd || real_name[0] || host_name[0]) { | ||
77 | - fprintf(rawoutstream, " *\t\t\t"); | ||
78 | - if (real_name[0]) | ||
79 | - fprintf(rawoutstream, "%s <", real_name); | ||
80 | -#ifdef H5_HAVE_GETPWUID | ||
81 | - if (pwd) | ||
82 | - fputs(pwd->pw_name, rawoutstream); | ||
83 | -#endif | ||
84 | - if (host_name[0]) | ||
85 | - fprintf(rawoutstream, "@%s", host_name); | ||
86 | - if (real_name[0]) | ||
87 | - fprintf(rawoutstream, ">"); | ||
88 | - fputc('\n', rawoutstream); | ||
89 | - } | ||
90 | - | ||
91 | fprintf(rawoutstream, " *\n * Purpose:\t\t"); | ||
92 | |||
93 | for (s = purpose; *s; s++) { | ||
94 | -- | 65 | -- |
95 | 2.35.5 | 66 | 2.25.1 |
96 | 67 | ||
diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb index b8a81bb0b..f34e5f183 100644 --- a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb +++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb | |||
@@ -5,18 +5,18 @@ HOMEPAGE = "https://www.hdfgroup.org/" | |||
5 | SECTION = "libs" | 5 | SECTION = "libs" |
6 | 6 | ||
7 | LICENSE = "HDF5" | 7 | LICENSE = "HDF5" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=adebb1ecf1b3b80c13359e18ef67301e" |
9 | 9 | ||
10 | inherit cmake siteinfo qemu multilib_header multilib_script | 10 | inherit cmake siteinfo qemu multilib_header multilib_script |
11 | 11 | ||
12 | DEPENDS += "qemu-native zlib" | 12 | DEPENDS += "qemu-native zlib" |
13 | 13 | ||
14 | SRC_URI = " \ | 14 | SRC_URI = " \ |
15 | https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ | 15 | https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.4/src/${BPN}-${PV}.tar.gz \ |
16 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ | 16 | file://0002-Remove-suffix-shared-from-shared-library-name.patch \ |
17 | file://0001-cmake-remove-build-flags.patch \ | 17 | file://0001-cmake-remove-build-flags.patch \ |
18 | " | 18 | " |
19 | SRC_URI[sha256sum] = "ea3c5e257ef322af5e77fc1e52ead3ad6bf3bb4ac06480dd17ee3900d7a24cfb" | 19 | SRC_URI[sha256sum] = "019ac451d9e1cf89c0482ba2a06f07a46166caf23f60fea5ef3c37724a318e03" |
20 | 20 | ||
21 | FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" | 21 | FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" |
22 | 22 | ||
@@ -44,10 +44,13 @@ MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \ | |||
44 | ${PN}:${bindir}/h5hlcc \ | 44 | ${PN}:${bindir}/h5hlcc \ |
45 | " | 45 | " |
46 | 46 | ||
47 | do_configure:append() { | ||
48 | sed -i -e 's|${WORKDIR}||g' ${B}/src/libhdf5.settings | ||
49 | sed -i -e 's|${WORKDIR}||g' ${B}/src/H5build_settings.c | ||
50 | } | ||
51 | |||
47 | do_install:append() { | 52 | do_install:append() { |
48 | # Used for generating config files on target | 53 | # Used for generating config files on target |
49 | install -m 755 ${B}/bin/H5detect ${D}${bindir} | ||
50 | install -m 755 ${B}/bin/H5make_libsettings ${D}${bindir} | ||
51 | oe_multilib_header H5pubconf.h | 54 | oe_multilib_header H5pubconf.h |
52 | # remove the buildpath | 55 | # remove the buildpath |
53 | sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc | 56 | sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc |
diff --git a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb index 0ec426afb..ed342d675 100644 --- a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb +++ b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb | |||
@@ -135,7 +135,10 @@ RDEPENDS:${PN} = "hunspell" | |||
135 | 135 | ||
136 | PV = "0.0.0+git" | 136 | PV = "0.0.0+git" |
137 | SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" | 137 | SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" |
138 | SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=master;protocol=https" | 138 | SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=main;protocol=https" |
139 | |||
140 | # Upstream repo does not tag | ||
141 | UPSTREAM_CHECK_COMMITS = "1" | ||
139 | 142 | ||
140 | S = "${WORKDIR}/git" | 143 | S = "${WORKDIR}/git" |
141 | 144 | ||
diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.383.bb b/meta-oe/recipes-support/hwdata/hwdata_0.387.bb index cfa6ae0e4..d73bb93aa 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_0.383.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_0.387.bb | |||
@@ -5,7 +5,7 @@ SECTION = "System/Base" | |||
5 | LICENSE = "GPL-2.0-or-later | XFree86-1.0" | 5 | LICENSE = "GPL-2.0-or-later | XFree86-1.0" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" |
7 | 7 | ||
8 | SRCREV = "229069b51b488bc776602d82315188cd1fbf4887" | 8 | SRCREV = "f0ba62c0b0401c215aed8abb42cf7dcdb7e6fecc" |
9 | SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" | 9 | SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb index 017e7d26a..b27c2b2e8 100644 --- a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb +++ b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb | |||
@@ -11,6 +11,9 @@ SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \ | |||
11 | file://fix-configure-option-parsing.patch \ | 11 | file://fix-configure-option-parsing.patch \ |
12 | file://avoid-obsolete-gnutls-apis.patch" | 12 | file://avoid-obsolete-gnutls-apis.patch" |
13 | 13 | ||
14 | # The current PV is not a git tag but a README content | ||
15 | UPSTREAM_CHECK_COMMITS = "1" | ||
16 | |||
14 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
15 | 18 | ||
16 | inherit autotools pkgconfig lib_package texinfo | 19 | inherit autotools pkgconfig lib_package texinfo |
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index 61dc1b795..5407c4e40 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb | |||
@@ -100,6 +100,7 @@ ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1" | |||
100 | ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1" | 100 | ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1" |
101 | ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1" | 101 | ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1" |
102 | 102 | ||
103 | CVE_STATUS[CVE-2007-1667] = "cpe-incorrect: CVE should not include a CPE for imagemagick" | ||
103 | CVE_STATUS[CVE-2014-9804] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | 104 | CVE_STATUS[CVE-2014-9804] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" |
104 | CVE_STATUS[CVE-2014-9805] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | 105 | CVE_STATUS[CVE-2014-9805] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" |
105 | CVE_STATUS[CVE-2014-9806] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | 106 | CVE_STATUS[CVE-2014-9806] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" |
@@ -118,4 +119,53 @@ CVE_STATUS[CVE-2014-9818] = "cpe-incorrect: The current version (7.1.1) is not a | |||
118 | CVE_STATUS[CVE-2014-9819] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | 119 | CVE_STATUS[CVE-2014-9819] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" |
119 | CVE_STATUS[CVE-2014-9820] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | 120 | CVE_STATUS[CVE-2014-9820] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" |
120 | CVE_STATUS[CVE-2014-9821] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | 121 | CVE_STATUS[CVE-2014-9821] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" |
122 | CVE_STATUS[CVE-2014-9822] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
123 | CVE_STATUS[CVE-2014-9823] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
124 | CVE_STATUS[CVE-2014-9824] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
125 | CVE_STATUS[CVE-2014-9825] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
126 | CVE_STATUS[CVE-2014-9826] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
127 | CVE_STATUS[CVE-2014-9827] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
128 | CVE_STATUS[CVE-2014-9828] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
129 | CVE_STATUS[CVE-2014-9829] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
130 | CVE_STATUS[CVE-2014-9830] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
131 | CVE_STATUS[CVE-2014-9831] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
132 | CVE_STATUS[CVE-2014-9848] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
133 | CVE_STATUS[CVE-2014-9852] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
134 | CVE_STATUS[CVE-2014-9853] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
135 | CVE_STATUS[CVE-2014-9854] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
136 | CVE_STATUS[CVE-2014-9907] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
137 | CVE_STATUS[CVE-2016-10062] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-10" | ||
138 | CVE_STATUS[CVE-2016-10144] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.7-1" | ||
139 | CVE_STATUS[CVE-2016-10145] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.7-1" | ||
140 | CVE_STATUS[CVE-2016-10146] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.6-8" | ||
141 | CVE_STATUS[CVE-2016-5118] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-7" | ||
142 | CVE_STATUS[CVE-2016-7513] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
143 | CVE_STATUS[CVE-2016-7514] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0" | ||
144 | CVE_STATUS[CVE-2016-7515] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
145 | CVE_STATUS[CVE-2016-7516] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
146 | CVE_STATUS[CVE-2016-7517] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
147 | CVE_STATUS[CVE-2016-7518] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
148 | CVE_STATUS[CVE-2016-7519] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
149 | CVE_STATUS[CVE-2016-7520] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
150 | CVE_STATUS[CVE-2016-7521] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
151 | CVE_STATUS[CVE-2016-7522] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
152 | CVE_STATUS[CVE-2016-7523] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
153 | CVE_STATUS[CVE-2016-7524] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
154 | CVE_STATUS[CVE-2016-7525] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
155 | CVE_STATUS[CVE-2016-7526] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
156 | CVE_STATUS[CVE-2016-7527] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
157 | CVE_STATUS[CVE-2016-7528] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
158 | CVE_STATUS[CVE-2016-7529] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
159 | CVE_STATUS[CVE-2016-7530] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
121 | CVE_STATUS[CVE-2016-7531] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0" | 160 | CVE_STATUS[CVE-2016-7531] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0" |
161 | CVE_STATUS[CVE-2016-7532] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
162 | CVE_STATUS[CVE-2016-7533] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
163 | CVE_STATUS[CVE-2016-7534] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
164 | CVE_STATUS[CVE-2016-7535] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
165 | CVE_STATUS[CVE-2016-7536] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
166 | CVE_STATUS[CVE-2016-7537] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
167 | CVE_STATUS[CVE-2016-7538] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0" | ||
168 | CVE_STATUS[CVE-2017-5506] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4" | ||
169 | CVE_STATUS[CVE-2017-5509] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4" | ||
170 | CVE_STATUS[CVE-2017-5510] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4" | ||
171 | CVE_STATUS[CVE-2017-5511] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-3" | ||
diff --git a/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb b/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb new file mode 100644 index 000000000..c4b7ce032 --- /dev/null +++ b/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb | |||
@@ -0,0 +1,39 @@ | |||
1 | SUMMARY = "i.MX code signing tool" | ||
2 | DESCRIPTION = "Code signing support that integrates the HABv4 and AHAB library for i.MX processors" | ||
3 | LICENSE = "BSD-3-Clause & Apache-2.0" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "\ | ||
6 | file://LICENSE.bsd3;md5=14aba05f9fa6c25527297c8aac95fcf6 \ | ||
7 | file://LICENSE.hidapi;md5=e0ea014f523f64f0adb13409055ee59e \ | ||
8 | file://LICENSE.openssl;md5=3441526b1df5cc01d812c7dfc218cea6 \ | ||
9 | " | ||
10 | |||
11 | DEPENDS = "byacc-native flex-native openssl" | ||
12 | |||
13 | # debian: 3.4.0+dfsg-2 | ||
14 | DEBIAN_PGK_NAME = "imx-code-signing-tool" | ||
15 | DEBIAN_PGK_VERSION = "${PV}+dfsg" | ||
16 | |||
17 | SRC_URI = "\ | ||
18 | ${DEBIAN_MIRROR}/main/i/${DEBIAN_PGK_NAME}/${DEBIAN_PGK_NAME}_${DEBIAN_PGK_VERSION}.orig.tar.xz \ | ||
19 | " | ||
20 | |||
21 | SRC_URI[sha256sum] = "52ee3cee3bc500a42095f73c4584e223b4b9d2dfc1cd3e5df965c5952eba8c8d" | ||
22 | |||
23 | S = "${WORKDIR}/${DEBIAN_PGK_NAME}-${DEBIAN_PGK_VERSION}" | ||
24 | |||
25 | EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" AR="${AR}" OBJCOPY="${OBJCOPY}"' | ||
26 | |||
27 | do_compile() { | ||
28 | oe_runmake -C code/obj.linux64 OSTYPE=linux64 ENCRYPTION=yes COPTIONS="${CFLAGS} ${CPPFLAGS}" LDOPTIONS="${LDFLAGS}" | ||
29 | oe_runmake -C add-ons/hab_csf_parser COPTS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" | ||
30 | } | ||
31 | |||
32 | do_install () { | ||
33 | install -d ${D}${bindir} | ||
34 | install -m 755 ${S}/code/obj.linux64/cst ${D}${bindir}/ | ||
35 | install -m 755 ${S}/code/obj.linux64/srktool ${D}${bindir} | ||
36 | install -m 755 ${S}/add-ons/hab_csf_parser/csf_parser ${D}${bindir} | ||
37 | } | ||
38 | |||
39 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb b/meta-oe/recipes-support/iniparser/iniparser_4.2.4.bb index 8c6c60a79..aeac9c30b 100644 --- a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb +++ b/meta-oe/recipes-support/iniparser/iniparser_4.2.4.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://gitlab.com/iniparser/iniparser" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" |
6 | SRCBRANCH = "main" | 6 | SRCBRANCH = "main" |
7 | SRCREV = "762715ca6cdba9dcf31a5af9297b444f3b5b8c00" | 7 | SRCREV = "4e5d1cc10215ce328c61bb5fd7839746e47375f9" |
8 | 8 | ||
9 | SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}" | 9 | SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}" |
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-support/lcov/lcov_1.16.bb b/meta-oe/recipes-support/lcov/lcov_1.16.bb index 22d68814e..4f35eff90 100755 --- a/meta-oe/recipes-support/lcov/lcov_1.16.bb +++ b/meta-oe/recipes-support/lcov/lcov_1.16.bb | |||
@@ -50,6 +50,9 @@ SRC_URI = "https://github.com/linux-test-project/lcov/releases/download/v${PV}/l | |||
50 | SRC_URI[md5sum] = "bfee0cef50d7b7bd1df03bfadf68dcef" | 50 | SRC_URI[md5sum] = "bfee0cef50d7b7bd1df03bfadf68dcef" |
51 | SRC_URI[sha256sum] = "987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b" | 51 | SRC_URI[sha256sum] = "987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b" |
52 | 52 | ||
53 | UPSTREAM_CHECK_URI = "https://github.com/linux-test-project/lcov/releases" | ||
54 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
55 | |||
53 | do_install() { | 56 | do_install() { |
54 | oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} LCOV_PERL_PATH="/usr/bin/env perl" | 57 | oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} LCOV_PERL_PATH="/usr/bin/env perl" |
55 | } | 58 | } |
diff --git a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb index f747ecbf7..59b26d821 100644 --- a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" | |||
5 | DEPENDS = "udev" | 5 | DEPENDS = "udev" |
6 | 6 | ||
7 | SRCREV = "de6258940960443038b4c1651dfda3620075e870" | 7 | SRCREV = "de6258940960443038b4c1651dfda3620075e870" |
8 | SRC_URI = "git://git.0pointer.de/libatasmart.git;branch=master \ | 8 | SRC_URI = "git://git.0pointer.net/libatasmart.git;protocol=https;branch=master \ |
9 | file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \ | 9 | file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \ |
10 | " | 10 | " |
11 | 11 | ||
diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb index daa01bfc3..214c2b284 100644 --- a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb +++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" | |||
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | 10 | ||
11 | SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d" | 11 | SRCREV = "9da72b2732508b0ba0ceed27f5e50bc276ef31f2" |
12 | SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https" | 12 | SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https" |
13 | 13 | ||
14 | inherit gettext autotools pkgconfig python3native | 14 | inherit gettext autotools pkgconfig python3native |
diff --git a/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch b/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch new file mode 100644 index 000000000..86ee6902f --- /dev/null +++ b/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 395cd70a8c28a4ea408a227d745fe20ed8af9105 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 10 Sep 2024 18:11:40 -0700 | ||
4 | Subject: [PATCH] Fix instances of | ||
5 | -Wmissing-template-arg-list-after-template-kw. | ||
6 | |||
7 | Clang has a new warning that requires a template argument list after using | ||
8 | the template keyword. Remove uses of the template keyword when we're not | ||
9 | specifying types. | ||
10 | |||
11 | See https://github.com/llvm/llvm-project/issues/94194 for the upstream | ||
12 | clang changes | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/835] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | include/cereal/types/tuple.hpp | 4 ++-- | ||
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/include/cereal/types/tuple.hpp b/include/cereal/types/tuple.hpp | ||
21 | index 80c68075..5c79eca9 100644 | ||
22 | --- a/include/cereal/types/tuple.hpp | ||
23 | +++ b/include/cereal/types/tuple.hpp | ||
24 | @@ -95,7 +95,7 @@ namespace cereal | ||
25 | template <class Archive, class ... Types> inline | ||
26 | static void apply( Archive & ar, std::tuple<Types...> & tuple ) | ||
27 | { | ||
28 | - serialize<Height - 1>::template apply( ar, tuple ); | ||
29 | + serialize<Height - 1>::apply( ar, tuple ); | ||
30 | ar( CEREAL_NVP_(tuple_element_name<Height - 1>::c_str(), | ||
31 | std::get<Height - 1>( tuple )) ); | ||
32 | } | ||
33 | @@ -116,7 +116,7 @@ namespace cereal | ||
34 | template <class Archive, class ... Types> inline | ||
35 | void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, std::tuple<Types...> & tuple ) | ||
36 | { | ||
37 | - tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::template apply( ar, tuple ); | ||
38 | + tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::apply( ar, tuple ); | ||
39 | } | ||
40 | } // namespace cereal | ||
41 | |||
diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index 6ad20d637..c2ab0d61b 100644 --- a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb | |||
@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \ | |||
22 | file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ | 22 | file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ |
23 | file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ | 23 | file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ |
24 | file://0001-doctest-Do-not-use-unnamed-class.patch \ | 24 | file://0001-doctest-Do-not-use-unnamed-class.patch \ |
25 | file://0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch \ | ||
25 | file://run-ptest \ | 26 | file://run-ptest \ |
26 | " | 27 | " |
27 | 28 | ||
diff --git a/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch b/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch new file mode 100644 index 000000000..aa9fab86e --- /dev/null +++ b/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From b684f4cc25821b6e86a58576f864e4b12dfdfecc Mon Sep 17 00:00:00 2001 | ||
2 | From: Rasmus Villemoes <rasmus.villemoes@prevas.dk> | ||
3 | Date: Sat, 5 Jun 2021 22:57:51 +0200 | ||
4 | Subject: [PATCH] only apply search path logic to relative pathnames | ||
5 | |||
6 | Adding any directory to the search path via cfg_add_searchpath breaks | ||
7 | lookup of absolute paths. So change the logic in cfg_searchpath() to | ||
8 | ignore the search path when the given filename is absolute, and merely | ||
9 | check that for existence. | ||
10 | |||
11 | This is technically an ABI change, but the current behaviour is quite | ||
12 | unusual and unexpected. | ||
13 | |||
14 | Upstream-Status: Backport [https://github.com/libconfuse/libconfuse/pull/155] | ||
15 | |||
16 | Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> | ||
17 | --- | ||
18 | src/confuse.c | 8 ++++++++ | ||
19 | 1 file changed, 8 insertions(+) | ||
20 | |||
21 | diff --git a/src/confuse.c b/src/confuse.c | ||
22 | index 2ea0254..19b56e3 100644 | ||
23 | --- a/src/confuse.c | ||
24 | +++ b/src/confuse.c | ||
25 | @@ -1746,12 +1746,20 @@ DLLIMPORT char *cfg_searchpath(cfg_searchpath_t *p, const char *file) | ||
26 | return NULL; | ||
27 | } | ||
28 | |||
29 | + if (file[0] == '/') { | ||
30 | + fullpath = strdup(file); | ||
31 | + if (!fullpath) | ||
32 | + return NULL; | ||
33 | + goto check; | ||
34 | + } | ||
35 | + | ||
36 | if ((fullpath = cfg_searchpath(p->next, file)) != NULL) | ||
37 | return fullpath; | ||
38 | |||
39 | if ((fullpath = cfg_make_fullpath(p->dir, file)) == NULL) | ||
40 | return NULL; | ||
41 | |||
42 | +check: | ||
43 | #ifdef HAVE_SYS_STAT_H | ||
44 | err = stat((const char *)fullpath, &st); | ||
45 | if ((!err) && S_ISREG(st.st_mode)) | ||
46 | -- | ||
47 | 2.31.1 | ||
48 | |||
diff --git a/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb new file mode 100644 index 000000000..e6f28c7b6 --- /dev/null +++ b/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "libConfuse is a configuration file parser library" | ||
2 | LICENSE = "ISC" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a" | ||
4 | |||
5 | SRC_URI = "https://github.com/libconfuse/libconfuse/releases/download/v${PV}/confuse-${PV}.tar.gz" | ||
6 | SRC_URI[sha256sum] = "3a59ded20bc652eaa8e6261ab46f7e483bc13dad79263c15af42ecbb329707b8" | ||
7 | |||
8 | SRC_URI += "file://0001-only-apply-search-path-logic-to-relative-pathnames.patch" | ||
9 | |||
10 | inherit autotools-brokensep pkgconfig gettext | ||
11 | |||
12 | S = "${WORKDIR}/confuse-${PV}" | ||
13 | |||
14 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc deleted file mode 100644 index 592109b95..000000000 --- a/meta-oe/recipes-support/libee/libee.inc +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | SUMMARY = "An Event Expression Library inspired by CEE" | ||
2 | DESCRIPTION = "The core idea of libee is to provide a small \ | ||
3 | but hopefully convenient API layer above the CEE standard." | ||
4 | |||
5 | HOMEPAGE = "http://www.libee.org" | ||
6 | SECTION = "base" | ||
7 | |||
8 | LICENSE = "LGPL-2.1-or-later" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=1c2687de35e36ba3b999136236a66cd6" | ||
10 | |||
11 | SRC_URI = "http://www.libee.org/download/files/download/${BPN}-${PV}.tar.gz\ | ||
12 | file://libee-parallel-make.patch \ | ||
13 | file://run-ptest \ | ||
14 | file://ezapi1.sh \ | ||
15 | " | ||
16 | |||
17 | inherit autotools ptest pkgconfig | ||
18 | |||
19 | DEPENDS += "libestr" | ||
20 | |||
21 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}" | ||
22 | |||
23 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," | ||
24 | PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,," | ||
25 | |||
26 | TESTDIR = "tests" | ||
27 | |||
28 | # We presume the tests we are going to install so just build them directly. | ||
29 | # | ||
30 | do_compile_ptest() { | ||
31 | oe_runmake -C ${TESTDIR} genfile ezapi1 | ||
32 | } | ||
33 | |||
34 | do_install_ptest() { | ||
35 | install -d ${D}${PTEST_PATH} | ||
36 | install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} | ||
37 | install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} | ||
38 | install -m 0755 ${UNPACKDIR}/ezapi1.sh ${D}${PTEST_PATH} | ||
39 | } | ||
diff --git a/meta-oe/recipes-support/libee/libee/ezapi1.sh b/meta-oe/recipes-support/libee/libee/ezapi1.sh deleted file mode 100755 index e9db5e614..000000000 --- a/meta-oe/recipes-support/libee/libee/ezapi1.sh +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | echo --------------------------------------------------------------------------- | ||
4 | echo A very basic test for the event class | ||
5 | echo --------------------------------------------------------------------------- | ||
6 | rm -f infile | ||
7 | ./genfile 100 > infile | ||
8 | ./ezapi1 -iinfile | ||
9 | if [ $? -ne 0 ] ; then | ||
10 | echo "FAIL: $0" | ||
11 | exit 1 | ||
12 | fi | ||
13 | echo "PASS: $0" | ||
14 | rm -f infile | ||
diff --git a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch deleted file mode 100644 index 8bb23aafc..000000000 --- a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | fix parallel compiling problem | ||
2 | |||
3 | without specifying libee_convert_DEPENDENCIES = libee.la, libee_convert | ||
4 | can't find libee.la when linking as libee is not generated yet. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Yao Zhao <yao.zhao@windriver.com> | ||
9 | --- | ||
10 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
11 | index 08aaa9e..f0c78f7 100644 | ||
12 | --- a/src/Makefile.am | ||
13 | +++ b/src/Makefile.am | ||
14 | @@ -46,5 +46,6 @@ libee_la_LDFLAGS = -version-info 0:0:0 | ||
15 | libee_convert_SOURCES = convert.c | ||
16 | libee_convert_CPPFLAGS = -I$(top_srcdir) $(LIBEE_CFLAGS) $(LIBESTR_CFLAGS) $(LIBXML2_CFLAGS) | ||
17 | libee_convert_LDADD = $(LIBEE_LIBS) $(LIBXML2_LIBS) $(LIBESTR_LIBS) | ||
18 | +libee_convert_DEPENDENCIES = libee.la | ||
19 | |||
20 | include_HEADERS = | ||
diff --git a/meta-oe/recipes-support/libee/libee/run-ptest b/meta-oe/recipes-support/libee/libee/run-ptest deleted file mode 100755 index 3cb660764..000000000 --- a/meta-oe/recipes-support/libee/libee/run-ptest +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | ./ezapi1.sh | ||
diff --git a/meta-oe/recipes-support/libee/libee_0.4.1.bb b/meta-oe/recipes-support/libee/libee_0.4.1.bb deleted file mode 100644 index ef2c20db5..000000000 --- a/meta-oe/recipes-support/libee/libee_0.4.1.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "7bbf4160876c12db6193c06e2badedb2" | ||
4 | SRC_URI[sha256sum] = "c0dac01938593deee06c3d161e4eda4ecc0fd7317e1321bd96e301aceb7fb027" | ||
diff --git a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb b/meta-oe/recipes-support/libfido2/libfido2_1.15.0.bb index d453d0ab9..74844855d 100644 --- a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb +++ b/meta-oe/recipes-support/libfido2/libfido2_1.15.0.bb | |||
@@ -7,10 +7,10 @@ LICENSE = "BSD-2-Clause" | |||
7 | SECTION = "libs/network" | 7 | SECTION = "libs/network" |
8 | DEPENDS = "libcbor openssl zlib udev" | 8 | DEPENDS = "libcbor openssl zlib udev" |
9 | 9 | ||
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5f14cb32bdf2b87063e0a2d20c4178d0" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=20be19aaa222f71738712b26f7f8717b" |
11 | 11 | ||
12 | SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz" | 12 | SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz" |
13 | SRC_URI[sha256sum] = "3601792e320032d428002c4cce8499a4c7b803319051a25a0c9f1f138ffee45a" | 13 | SRC_URI[sha256sum] = "abaab1318d21d262ece416fb8a7132fa9374bda89f6fa52b86a98a2f5712b61e" |
14 | 14 | ||
15 | inherit cmake pkgconfig manpages | 15 | inherit cmake pkgconfig manpages |
16 | 16 | ||
diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb index eae1c02f0..24dc5b228 100644 --- a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb +++ b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb | |||
@@ -14,6 +14,8 @@ DEPENDS = "libusb1 python3 swig-native" | |||
14 | SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" | 14 | SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" |
15 | SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049" | 15 | SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "http://www.intra2net.com/en/developer/libftdi/download.php" | ||
18 | |||
17 | S = "${WORKDIR}/${BPN}1-${PV}" | 19 | S = "${WORKDIR}/${BPN}1-${PV}" |
18 | 20 | ||
19 | inherit cmake binconfig pkgconfig python3native | 21 | inherit cmake binconfig pkgconfig python3native |
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb index b4665c156..6130371e4 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ | |||
10 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" | 10 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" |
11 | 11 | ||
12 | SRC_URI += "file://0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch" | 12 | SRC_URI += "file://0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch" |
13 | SRC_URI[sha256sum] = "7a148a5a7d1c97a1abb40474b9a392b6edd7a42fe077dfd7ff42cfba24308548" | 13 | SRC_URI[sha256sum] = "2be4c0b03e995d236c0e476e14aeb475d7b431dd1439609b6d65c540f91eaf58" |
14 | 14 | ||
15 | # Enable all project features for ptest | 15 | # Enable all project features for ptest |
16 | PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" | 16 | 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/libiodbc/libiodbc_3.52.15.bb b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb index ff976ed97..644c3ba07 100644 --- a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb +++ b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb | |||
@@ -9,11 +9,14 @@ HOMEPAGE = "http://www.iodbc.org/" | |||
9 | 9 | ||
10 | LICENSE = "LGPL-2.0-only | BSD-2-Clause" | 10 | LICENSE = "LGPL-2.0-only | BSD-2-Clause" |
11 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \ | 11 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \ |
12 | file://LICENSE.BSD;md5=ff3a66a194e500df485da930da7f2c62 \ | 12 | file://LICENSE.BSD;md5=5b36348a404e1d65b57df8d33fd6e414 \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz" | 15 | SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz" |
16 | SRC_URI[sha256sum] = "c74541e3327fc9a1c7ccf103645471c67bc014542d70f572476eb07c0b2dd43c" | 16 | SRC_URI[sha256sum] = "3898b32d07961360f6f2cf36db36036b719a230e476469258a80f32243e845fa" |
17 | |||
18 | UPSTREAM_CHECK_URI = "https://github.com/openlink/iODBC/releases" | ||
19 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
17 | 20 | ||
18 | inherit autotools | 21 | inherit autotools |
19 | 22 | ||
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 4f0d8e554..68b508670 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 | |||
@@ -7,6 +7,9 @@ SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/${BPN}_${PV}~d | |||
7 | 7 | ||
8 | SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a56da33b" | 8 | SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a56da33b" |
9 | 9 | ||
10 | UPSTREAM_CHECK_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/" | ||
11 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
12 | |||
10 | JQUERYDIR = "${datadir}/javascript/jquery" | 13 | JQUERYDIR = "${datadir}/javascript/jquery" |
11 | JQUERYDOCDIR = "${docdir}/libjs-jquery" | 14 | JQUERYDOCDIR = "${docdir}/libjs-jquery" |
12 | 15 | ||
diff --git a/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb b/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb deleted file mode 100644 index d0463a640..000000000 --- a/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | DESCRIPTION = "Liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.1.0 Standard Annex 14, Revision 22" | ||
2 | HOMEPAGE = "http://vimgadgets.sourceforge.net/liblinebreak/" | ||
3 | SECTION = "libs" | ||
4 | LICENSE = "Zlib" | ||
5 | LIC_FILES_CHKSUM = "file://LICENCE;md5=3715191da62bafb5cfc4ff36195b2ec3" | ||
6 | |||
7 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/vimgadgets/liblinebreak/${PV}/liblinebreak-${PV}.tar.gz" | ||
8 | SRC_URI[md5sum] = "d18039259001ccb24b5dd4648c49c5ad" | ||
9 | SRC_URI[sha256sum] = "9efcb0cb1afc75ad1e92d2b2dbf4d9c77b072d6656c5f1a150af8b718d0c7b76" | ||
10 | |||
11 | inherit autotools | ||
diff --git a/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb b/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb index db0542269..2e5940189 100644 --- a/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb +++ b/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
8 | DEPENDS = "libevdev libgudev" | 8 | DEPENDS = "libevdev libgudev" |
9 | 9 | ||
10 | SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz" | 10 | SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz" |
11 | SRC_URI[sha256sum] = "cddd5c02a131072c19c6cde6f2cb2cd57eae7dacb50d14c337efd980baa51a51" | 11 | SRC_URI[sha256sum] = "29366be5452f60a74c65fc64ffe2d74eddd4e6e6824c2cefa567a43bd92b688f" |
12 | 12 | ||
13 | inherit meson pkgconfig gobject-introspection ptest vala | 13 | inherit meson pkgconfig gobject-introspection ptest vala |
14 | 14 | ||
diff --git a/meta-oe/recipes-support/libnice/libnice_0.1.22.bb b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb index 175e10fdf..4b932029e 100644 --- a/meta-oe/recipes-support/libnice/libnice_0.1.22.bb +++ b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb | |||
@@ -11,6 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ | |||
11 | SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz" | 11 | SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz" |
12 | SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e" | 12 | SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e" |
13 | 13 | ||
14 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/libnice/libnice/-/tags" | ||
15 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
16 | |||
14 | DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" | 17 | DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" |
15 | 18 | ||
16 | PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp" | 19 | PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp" |
diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.9.bb b/meta-oe/recipes-support/libnvme/libnvme_1.10.bb index 1e03b4e7a..a05d1168e 100644 --- a/meta-oe/recipes-support/libnvme/libnvme_1.9.bb +++ b/meta-oe/recipes-support/libnvme/libnvme_1.10.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | |||
11 | file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ | 11 | file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ |
12 | file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" | 12 | file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" |
13 | DEPENDS = "json-c" | 13 | DEPENDS = "json-c" |
14 | SRCREV = "80c5cf2aa45f4afc7571dc48850fae3fd62828af" | 14 | SRCREV = "dd51fa8550564c93436423a4d8ed4be92ae50290" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" | 16 | SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" |
17 | 17 | ||
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb index 8ef7ac3df..727d5ecf8 100644 --- a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb +++ b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb | |||
@@ -32,4 +32,4 @@ EXTRA_OEMESON += " \ | |||
32 | -Dwith-usb-ids-path=${datadir}/hwdata/usb.ids \ | 32 | -Dwith-usb-ids-path=${datadir}/hwdata/usb.ids \ |
33 | " | 33 | " |
34 | 34 | ||
35 | RDEPENDS:${PN} = "hwdata" | 35 | RDEPENDS:${PN} = "hwdata osinfo-db" |
diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch b/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch new file mode 100644 index 000000000..edff5732c --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | Upstream-Status: Backport [https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/34378a4] | ||
2 | |||
3 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
4 | |||
5 | From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001 | ||
6 | From: Michal Privoznik <mprivozn@redhat.com> | ||
7 | Date: Mon, 27 Nov 2023 15:04:43 +0100 | ||
8 | Subject: [PATCH] Make xmlError structs constant | ||
9 | |||
10 | In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so | ||
11 | that: | ||
12 | |||
13 | 1) xmlGetLastError() returns pointer to a constant xmlError | ||
14 | struct, and | ||
15 | |||
16 | 2) xmlSetStructuredErrorFunc() changed the signature of callback | ||
17 | (validate_structured_error_nop()), it too is passed pointer to | ||
18 | a constant xmlError struct. | ||
19 | |||
20 | But of course, older libxml2 expects different callback | ||
21 | signature. Therefore, we need to typecast it anyway. | ||
22 | |||
23 | Also, drop obviously incorrect @error annotation in | ||
24 | validate_structured_error_nop; the variable is used. | ||
25 | |||
26 | Signed-off-by: Michal Privoznik <mprivozn@redhat.com> | ||
27 | --- | ||
28 | tools/osinfo-db-validate.c | 5 +++-- | ||
29 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
30 | |||
31 | diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c | ||
32 | index a721b4d..b1434a6 100644 | ||
33 | --- a/tools/osinfo-db-validate.c | ||
34 | +++ b/tools/osinfo-db-validate.c | ||
35 | @@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED, | ||
36 | } | ||
37 | |||
38 | static void validate_structured_error_nop(void *userData G_GNUC_UNUSED, | ||
39 | - xmlErrorPtr error G_GNUC_UNUSED) | ||
40 | + const xmlError *error) | ||
41 | { | ||
42 | if (error->file) | ||
43 | g_printerr("%s:%d %s", error->file, error->line, error->message); | ||
44 | @@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro | ||
45 | g_autofree gchar *schemapath = NULL; | ||
46 | |||
47 | xmlSetGenericErrorFunc(NULL, validate_generic_error_nop); | ||
48 | - xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop); | ||
49 | + /* Drop this typecast when >=libxml2-2.12.0 is required */ | ||
50 | + xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop); | ||
51 | |||
52 | schemapath = g_file_get_path(schema); | ||
53 | rngParser = xmlRelaxNGNewParserCtxt(schemapath); | ||
54 | -- | ||
55 | 2.34.1 | ||
56 | |||
diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb b/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb new file mode 100644 index 000000000..0584bee15 --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "Tools for managing the libosinfo database files" | ||
2 | HOMEPAGE = "https://libosinfo.org" | ||
3 | |||
4 | LICENSE = "GPL-2.0-or-later" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
6 | |||
7 | DEPENDS = "glib-2.0 json-glib libarchive libsoup-2.4" | ||
8 | |||
9 | SRC_URI = "git://gitlab.com/libosinfo/osinfo-db-tools.git;branch=main;protocol=https \ | ||
10 | file://0001-Make-xmlError-structs-constant.patch \ | ||
11 | " | ||
12 | SRCREV = "85a1788c6977419b6facad11dbfbf823e739eb3b" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit meson pkgconfig | ||
17 | |||
18 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db_20240701.bb b/meta-oe/recipes-support/libosinfo/osinfo-db_20240701.bb new file mode 100644 index 000000000..d36904605 --- /dev/null +++ b/meta-oe/recipes-support/libosinfo/osinfo-db_20240701.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "osinfo-db provides the database files for use with the libosinfo library" | ||
2 | HOMEPAGE = "https://libosinfo.org" | ||
3 | |||
4 | LICENSE = "GPL-2.0-or-later" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
6 | |||
7 | DEPENDS = "osinfo-db-tools-native" | ||
8 | |||
9 | SRC_URI = "git://gitlab.com/libosinfo/osinfo-db.git;branch=main;protocol=https" | ||
10 | |||
11 | SRCREV = "cde78484ab747c87532d47cf3f09b76f280c0b74" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | inherit allarch autotools-brokensep | ||
16 | |||
17 | EXTRA_OEMAKE = "OSINFO_DB_TARGET='--dir ${datadir}/osinfo'" | ||
18 | |||
19 | do_configure[noexec] = "1" | ||
20 | |||
21 | FILES:${PN} = "${datadir}/osinfo" | ||
diff --git a/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb b/meta-oe/recipes-support/libpaper/libpaper_2.2.5.bb index a45ffe184..3b0e1bf0d 100644 --- a/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb +++ b/meta-oe/recipes-support/libpaper/libpaper_2.2.5.bb | |||
@@ -2,7 +2,10 @@ LICENSE = "LGPL-2.1-only" | |||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
3 | 3 | ||
4 | SRC_URI = "https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz" | 4 | SRC_URI = "https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz" |
5 | SRC_URI[sha256sum] = "1fda0cf64efa46b9684a4ccc17df4386c4cc83254805419222c064bf62ea001f" | 5 | SRC_URI[sha256sum] = "7be50974ce0df0c74e7587f10b04272cd53fd675cb6a1273ae1cc5c9cc9cab09" |
6 | |||
7 | UPSTREAM_CHECK_URI = "https://github.com/rrthomas/libpaper/releases" | ||
8 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
6 | 9 | ||
7 | inherit perlnative autotools | 10 | inherit perlnative autotools |
8 | 11 | ||
diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb index 4d089f3b7..6b1355fa3 100644 --- a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb +++ b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb | |||
@@ -9,3 +9,6 @@ S = "${WORKDIR}/git" | |||
9 | inherit autotools pkgconfig | 9 | inherit autotools pkgconfig |
10 | 10 | ||
11 | DEPENDS = "jpeg jasper lcms" | 11 | DEPENDS = "jpeg jasper lcms" |
12 | |||
13 | CVE_STATUS[CVE-2020-22628] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2" | ||
14 | CVE_STATUS[CVE-2023-1729] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2" | ||
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 1f7442af0..0dda756dd 100644 --- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb | |||
@@ -14,6 +14,9 @@ SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \ | |||
14 | SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11" | 14 | SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11" |
15 | SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3" | 15 | SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://repology.org/project/libsmi/information" | ||
18 | UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" | ||
19 | |||
17 | DEPENDS += "bison-native flex-native wget-native gawk-native" | 20 | DEPENDS += "bison-native flex-native wget-native gawk-native" |
18 | 21 | ||
19 | inherit autotools-brokensep update-alternatives | 22 | inherit autotools-brokensep update-alternatives |
diff --git a/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch b/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch new file mode 100644 index 000000000..21af9a5a1 --- /dev/null +++ b/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 98a330971f4344619b698d4603a45bd31d6935d9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Sun, 15 Sep 2024 20:31:55 +0800 | ||
4 | Subject: [PATCH] CompilerChecks.cmake: drop -Wunused-variable flag | ||
5 | |||
6 | Drop -Wunused-variable flag to fix build with clang: | ||
7 | |||
8 | libssh/0.11.1/git/src/threads/libgcrypt.c:29:1: error: unused variable 'gcry_threads_pthread' [-Werror,-Wunused-variable] | ||
9 | 29 | GCRY_THREAD_OPTION_PTHREAD_IMPL; | ||
10 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
11 | libssh/0.11.1/recipe-sysroot/usr/include/gcrypt.h:217:33: note: expanded from macro 'GCRY_THREAD_OPTION_PTHREAD_IMPL' | ||
12 | 217 | static struct gcry_thread_cbs gcry_threads_pthread = { \ | ||
13 | | ^~~~~~~~~~~~~~~~~~~~ | ||
14 | |||
15 | Upstream-Status: Inappropriate [embedded specific] | ||
16 | |||
17 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
18 | --- | ||
19 | CompilerChecks.cmake | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake | ||
23 | index 9719e699..ec15fa2a 100644 | ||
24 | --- a/CompilerChecks.cmake | ||
25 | +++ b/CompilerChecks.cmake | ||
26 | @@ -48,7 +48,7 @@ if (UNIX) | ||
27 | add_c_compiler_flag("-Werror=implicit-int" SUPPORTED_COMPILER_FLAGS) | ||
28 | add_c_compiler_flag("-Wint-conversion" SUPPORTED_COMPILER_FLAGS) | ||
29 | add_c_compiler_flag("-Werror=int-conversion" SUPPORTED_COMPILER_FLAGS) | ||
30 | - add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS) | ||
31 | + #add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS) | ||
32 | |||
33 | check_c_compiler_flag("-Wformat" REQUIRED_FLAGS_WFORMAT) | ||
34 | if (REQUIRED_FLAGS_WFORMAT) | ||
35 | -- | ||
36 | 2.25.1 | ||
37 | |||
diff --git a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch b/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch deleted file mode 100644 index d2d1fb595..000000000 --- a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 49a8ae4d6f77434ed9f7a601b9df488b921e4a22 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 20 Mar 2023 21:59:19 -0700 | ||
4 | Subject: [PATCH] libgcrypt.c: Fix prototype of des3_encrypt/des3_decrypt | ||
5 | |||
6 | This is to match the prototype for callback functions which are now emitted as | ||
7 | errors by clang16 | ||
8 | |||
9 | Fixes | ||
10 | |||
11 | TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:903:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types] | ||
12 | .encrypt = des3_encrypt, | ||
13 | ^~~~~~~~~~~~ | ||
14 | TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:904:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types] | ||
15 | .decrypt = des3_decrypt | ||
16 | ^~~~~~~~~~~~ | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | |||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | |||
22 | --- | ||
23 | src/libgcrypt.c | 4 ++-- | ||
24 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
25 | |||
26 | diff --git a/src/libgcrypt.c b/src/libgcrypt.c | ||
27 | index f410d997..e3f66781 100644 | ||
28 | --- a/src/libgcrypt.c | ||
29 | +++ b/src/libgcrypt.c | ||
30 | @@ -416,12 +416,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { | ||
31 | } | ||
32 | |||
33 | static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in, | ||
34 | - void *out, unsigned long len) { | ||
35 | + void *out, size_t len) { | ||
36 | gcry_cipher_encrypt(cipher->key[0], out, len, in, len); | ||
37 | } | ||
38 | |||
39 | static void des3_decrypt(struct ssh_cipher_struct *cipher, void *in, | ||
40 | - void *out, unsigned long len) { | ||
41 | + void *out, size_t len) { | ||
42 | gcry_cipher_decrypt(cipher->key[0], out, len, in, len); | ||
43 | } | ||
44 | |||
diff --git a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch index d6bc75c3a..4803ff81d 100644 --- a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch +++ b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 69a89e8f015802f61637fed0d3791d20a594f298 Mon Sep 17 00:00:00 2001 | 1 | From 99fcb71903cca8458bcd6c0d5b676619a9710dab Mon Sep 17 00:00:00 2001 |
2 | From: Yi Zhao <yi.zhao@windriver.com> | 2 | From: Yi Zhao <yi.zhao@windriver.com> |
3 | Date: Wed, 15 Mar 2023 16:51:58 +0800 | 3 | Date: Wed, 15 Mar 2023 16:51:58 +0800 |
4 | Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host | 4 | Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host |
@@ -9,16 +9,15 @@ not required by unittests, we can skip the search. | |||
9 | Upstream-Status: Inappropriate [embedded specific] | 9 | Upstream-Status: Inappropriate [embedded specific] |
10 | 10 | ||
11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
12 | |||
13 | --- | 12 | --- |
14 | tests/CMakeLists.txt | 2 ++ | 13 | tests/CMakeLists.txt | 2 ++ |
15 | 1 file changed, 2 insertions(+) | 14 | 1 file changed, 2 insertions(+) |
16 | 15 | ||
17 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt | 16 | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt |
18 | index f5c30061..885c926a 100644 | 17 | index 89b95d08..e481534c 100644 |
19 | --- a/tests/CMakeLists.txt | 18 | --- a/tests/CMakeLists.txt |
20 | +++ b/tests/CMakeLists.txt | 19 | +++ b/tests/CMakeLists.txt |
21 | @@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES | 20 | @@ -96,6 +96,7 @@ set(TEST_TARGET_LIBRARIES |
22 | 21 | ||
23 | add_subdirectory(unittests) | 22 | add_subdirectory(unittests) |
24 | 23 | ||
@@ -26,11 +25,14 @@ index f5c30061..885c926a 100644 | |||
26 | # OpenSSH Capabilities are required for all unit tests | 25 | # OpenSSH Capabilities are required for all unit tests |
27 | find_program(SSH_EXECUTABLE NAMES ssh) | 26 | find_program(SSH_EXECUTABLE NAMES ssh) |
28 | if (SSH_EXECUTABLE) | 27 | if (SSH_EXECUTABLE) |
29 | @@ -302,6 +303,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) | 28 | @@ -345,6 +346,7 @@ endif (WITH_PKCS11_URI) |
29 | file(COPY gss/kdcsetup.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gss FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) | ||
30 | 30 | ||
31 | message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") | 31 | message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") |
32 | endif () | ||
33 | +endif () | 32 | +endif () |
34 | 33 | ||
35 | configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) | 34 | configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) |
36 | 35 | ||
36 | -- | ||
37 | 2.25.1 | ||
38 | |||
diff --git a/meta-oe/recipes-support/libssh/libssh_0.10.6.bb b/meta-oe/recipes-support/libssh/libssh_0.11.1.bb index 31f29c1b7..5f39c2d79 100644 --- a/meta-oe/recipes-support/libssh/libssh_0.10.6.bb +++ b/meta-oe/recipes-support/libssh/libssh_0.11.1.bb | |||
@@ -6,12 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" | |||
6 | 6 | ||
7 | DEPENDS = "zlib openssl" | 7 | DEPENDS = "zlib openssl" |
8 | 8 | ||
9 | SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10 \ | 9 | SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.11 \ |
10 | file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \ | 10 | file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \ |
11 | file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ | ||
12 | file://run-ptest \ | 11 | file://run-ptest \ |
13 | " | 12 | " |
14 | SRCREV = "10e09e273f69e149389b3e0e5d44b8c221c2e7f6" | 13 | |
14 | SRC_URI:append:toolchain-clang = " file://0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch" | ||
15 | |||
16 | SRCREV = "854795c654eda518ed6de6c1ebb4e2107fcb2e73" | ||
15 | 17 | ||
16 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
17 | 19 | ||
diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch new file mode 100644 index 000000000..90f028b85 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 7ea4e55a91e6d5564c6de762c2d1afc78ff9cfd3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 16 Sep 2024 22:58:38 +0000 | ||
4 | Subject: [PATCH] test: Compile nolibc.c only when CONFIG_NOLIBC is set | ||
5 | |||
6 | building nolibc.c fails for non nolibc targets | ||
7 | |||
8 | Fixes | ||
9 | In file included from nolibc.c:33: | ||
10 | ./../src/lib.h:20:2: error: "This arch doesn't support building liburing without libc" | ||
11 | 20 | #error "This arch doesn't support building liburing without libc" | ||
12 | | ^ | ||
13 | 1 error generated. | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/axboe/liburing/commit/a182f62c01f981cd9dd508ec952fbc975b263e3d] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | test/Makefile | 5 ++++- | ||
19 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/test/Makefile b/test/Makefile | ||
22 | index 0538a75..0dfecb8 100644 | ||
23 | --- a/test/Makefile | ||
24 | +++ b/test/Makefile | ||
25 | @@ -126,7 +126,6 @@ test_srcs := \ | ||
26 | msg-ring-overflow.c \ | ||
27 | multicqes_drain.c \ | ||
28 | no-mmap-inval.c \ | ||
29 | - nolibc.c \ | ||
30 | nop-all-sizes.c \ | ||
31 | nop.c \ | ||
32 | ooo-file-unreg.c \ | ||
33 | @@ -221,6 +220,10 @@ test_srcs := \ | ||
34 | all_targets := | ||
35 | include ../Makefile.quiet | ||
36 | |||
37 | +ifeq ($(CONFIG_NOLIBC),y) | ||
38 | + test_srcs += nolibc.c | ||
39 | +endif | ||
40 | + | ||
41 | ifdef CONFIG_HAVE_STATX | ||
42 | test_srcs += statx.c | ||
43 | else ifdef CONFIG_HAVE_GLIBC_STATX | ||
diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch new file mode 100644 index 000000000..62ca78a1e --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 684bcb2a8795fd399d6c164e51459a2785057b1c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 17 Sep 2024 09:56:42 -0700 | ||
4 | Subject: [PATCH 1/2] test: Drop including error.h header | ||
5 | |||
6 | There is no error APIs being used in this test, therefore | ||
7 | drop including it, this also makes it portable to musl | ||
8 | systems which do not have error.h | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1233] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | test/init-mem.c | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/test/init-mem.c b/test/init-mem.c | ||
17 | index 6f9a02a..f512190 100644 | ||
18 | --- a/test/init-mem.c | ||
19 | +++ b/test/init-mem.c | ||
20 | @@ -13,7 +13,6 @@ | ||
21 | #include <netinet/udp.h> | ||
22 | #include <arpa/inet.h> | ||
23 | #include <net/if.h> | ||
24 | -#include <error.h> | ||
25 | |||
26 | #include "liburing.h" | ||
27 | #include "helpers.h" | ||
diff --git a/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch b/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch new file mode 100644 index 000000000..8a1d54250 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From d06433ff1a1905436cfcde80e22ee51bd9591536 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 17 Sep 2024 09:59:31 -0700 | ||
4 | Subject: [PATCH 2/2] ooo-file-unreg.c: Include poll.h instead of sys/poll.h | ||
5 | |||
6 | This fixes a warning e.g. | ||
7 | |||
8 | In file included from ooo-file-unreg.c:12: | ||
9 | /mnt/b/yoe/master/build/tmp/work/riscv32-yoe-linux-musl/liburing/2.7/recipe-sysroot/usr/include/sys/poll.h:1:2: warning: redirecting incorrect #include <sys/poll.h> to <poll.h> [-W#warnings] | ||
10 | 1 | #warning redirecting incorrect #include <sys/poll.h> to <poll.h> | ||
11 | | ^ | ||
12 | 1 warning generated. | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1233] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | test/ooo-file-unreg.c | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/test/ooo-file-unreg.c b/test/ooo-file-unreg.c | ||
21 | index d76e0fb..dd6ea55 100644 | ||
22 | --- a/test/ooo-file-unreg.c | ||
23 | +++ b/test/ooo-file-unreg.c | ||
24 | @@ -9,7 +9,7 @@ | ||
25 | #include <sys/socket.h> | ||
26 | #include <unistd.h> | ||
27 | #include <stdlib.h> | ||
28 | -#include <sys/poll.h> | ||
29 | +#include <poll.h> | ||
30 | |||
31 | #include "liburing.h" | ||
32 | #include "helpers.h" | ||
diff --git a/meta-oe/recipes-support/liburing/liburing_2.6.bb b/meta-oe/recipes-support/liburing/liburing_2.7.bb index fc3fe1cac..b10fe40ca 100644 --- a/meta-oe/recipes-support/liburing/liburing_2.6.bb +++ b/meta-oe/recipes-support/liburing/liburing_2.7.bb | |||
@@ -9,8 +9,11 @@ SECTION = "libs" | |||
9 | LICENSE = "LGPL-2.1-only | MIT" | 9 | LICENSE = "LGPL-2.1-only | MIT" |
10 | LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" | 10 | LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" | 12 | SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ |
13 | SRCREV = "f7dcc1ea60819475dffd3a45059e16f04381bee7" | 13 | file://0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch \ |
14 | file://0001-test-Drop-including-error.h-header.patch \ | ||
15 | file://0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch" | ||
16 | SRCREV = "5227d48b28ad8671e61d444b72678da584d2e6c3" | ||
14 | 17 | ||
15 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
16 | 19 | ||
@@ -19,10 +22,11 @@ XCFLAGS = "-pthread" | |||
19 | XCFLAGS:append:libc-musl = " -lucontext" | 22 | XCFLAGS:append:libc-musl = " -lucontext" |
20 | 23 | ||
21 | USELIBC = "" | 24 | USELIBC = "" |
22 | # clang-18 on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro | 25 | # clang-18+ on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro |
23 | # this does not happen for gcc or older clang, so link with libc since we need memset API | 26 | # this does not happen for gcc or older clang, so link with libc since we need memset API |
24 | # -fno-builtin-memset does not help | 27 | # -fno-builtin-memset does not help |
25 | USELIBC:riscv64:toolchain-clang = "--use-libc" | 28 | USELIBC:riscv64:toolchain-clang = "--use-libc" |
29 | USELIBC:riscv32 = "--use-libc" | ||
26 | EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" | 30 | EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" |
27 | do_configure() { | 31 | do_configure() { |
28 | ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC} | 32 | ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC} |
diff --git a/meta-oe/recipes-support/links/links_2.29.bb b/meta-oe/recipes-support/links/links_2.29.bb index e3a15d181..311d84e48 100644 --- a/meta-oe/recipes-support/links/links_2.29.bb +++ b/meta-oe/recipes-support/links/links_2.29.bb | |||
@@ -9,3 +9,5 @@ EXTRA_OECONF = "--enable-graphics \ | |||
9 | --without-directfb --without-pmshell --without-atheos \ | 9 | --without-directfb --without-pmshell --without-atheos \ |
10 | --without-x" | 10 | --without-x" |
11 | SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" | 11 | SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" |
12 | |||
13 | CVE_STATUS[CVE-2008-3319] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different links package compared to the one which has the CVE issue." | ||
diff --git a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb index 729857eb6..a8b9b9a01 100644 --- a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb +++ b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb | |||
@@ -20,3 +20,7 @@ EXTRA_OECONF = "\ | |||
20 | " | 20 | " |
21 | 21 | ||
22 | CXXFLAGS += "-std=c++14" | 22 | CXXFLAGS += "-std=c++14" |
23 | |||
24 | do_install:append() { | ||
25 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${bindir}/log4cpp-config | ||
26 | } | ||
diff --git a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb b/meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb index 3549cb215..6be82979a 100644 --- a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb +++ b/meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb | |||
@@ -11,8 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
11 | 11 | ||
12 | SRC_URI = "https://s3.amazonaws.com/archie-public/${BPN}/${BP}.tar.gz" | 12 | SRC_URI = "https://s3.amazonaws.com/archie-public/${BPN}/${BP}.tar.gz" |
13 | 13 | ||
14 | SRC_URI[md5sum] = "e544a6230673ea54f7430bf817bb39d8" | 14 | SRC_URI[sha256sum] = "062d197349f4a43d8f69887fc642cb58b59a8e2cc54cc951d5c1c6abc4809a9a" |
15 | SRC_URI[sha256sum] = "8dbfcf9b28c782ab3bddd6a620d4fb95d1b0ffcbe93276996cdc4800aa9aebd1" | 15 | |
16 | UPSTREAM_CHECK_URI = "https://github.com/archiecobbs/logwarn/tags" | ||
17 | UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)" | ||
16 | 18 | ||
17 | inherit autotools-brokensep | 19 | inherit autotools-brokensep |
18 | 20 | ||
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 deleted file mode 100644 index f4b0f913d..000000000 --- a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From f261b2f1bc16c32a55a22e28bf1b2f15ac6c7a88 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Wed, 6 Dec 2023 10:24:46 +0800 | ||
4 | Subject: [PATCH] configure.ac: check egrep | ||
5 | |||
6 | The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed | ||
7 | from configure.ac, then it fails to substitute '@EGREP@': | ||
8 | |||
9 | | [GEN] command-lines-input.h | ||
10 | | /bin/bash: line 2: @EGREP@: command not found | ||
11 | | [GEN] command-count.h | ||
12 | |||
13 | Call AC_PROG_EGREP to fix the error. | ||
14 | |||
15 | Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4] | ||
16 | |||
17 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
18 | --- | ||
19 | configure.ac | 1 + | ||
20 | 1 file changed, 1 insertion(+) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index c2dbf3c9f..d9e7964c3 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -88,6 +88,7 @@ AC_PROG_EGREP | ||
27 | AC_PROG_MAKE_SET | ||
28 | AC_PROG_MKDIR_P | ||
29 | AC_PROG_RANLIB | ||
30 | +AC_PROG_EGREP | ||
31 | AC_CHECK_TOOL([READELF], [readelf]) | ||
32 | AC_CHECK_TOOL(AR, ar) | ||
33 | AC_PATH_TOOL(CFLOW_CMD, cflow) | ||
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 e11ac5ac0..196de644c 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 @@ | |||
1 | From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001 | 1 | From e2f24ea066e6dfb9f13f623009034acbf4ae8818 Mon Sep 17 00:00:00 2001 |
2 | From: Dengke Du <dengke.du@windriver.com> | 2 | From: Dengke Du <dengke.du@windriver.com> |
3 | Date: Tue, 25 Oct 2016 11:49:40 +0000 | 3 | Date: Tue, 25 Oct 2016 11:49:40 +0000 |
4 | Subject: [PATCH] implement libc specific reopen_stream | 4 | Subject: [PATCH] implement libc specific reopen_stream |
@@ -21,7 +21,7 @@ Upstream-Status: Pending | |||
21 | 2 files changed, 9 insertions(+), 3 deletions(-) | 21 | 2 files changed, 9 insertions(+), 3 deletions(-) |
22 | 22 | ||
23 | diff --git a/lib/log/log.c b/lib/log/log.c | 23 | diff --git a/lib/log/log.c b/lib/log/log.c |
24 | index 7b88252f0..e1720098a 100644 | 24 | index eafb3ef1c..ff3d751bf 100644 |
25 | --- a/lib/log/log.c | 25 | --- a/lib/log/log.c |
26 | +++ b/lib/log/log.c | 26 | +++ b/lib/log/log.c |
27 | @@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ | 27 | @@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ |
@@ -45,10 +45,10 @@ index 7b88252f0..e1720098a 100644 | |||
45 | void init_log_fn(lvm2_log_fn_t log_fn) | 45 | void init_log_fn(lvm2_log_fn_t log_fn) |
46 | { | 46 | { |
47 | diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c | 47 | diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c |
48 | index 3fd23a521..c2ee39905 100644 | 48 | index 1b2f7f47c..e0674d42d 100644 |
49 | --- a/tools/lvmcmdline.c | 49 | --- a/tools/lvmcmdline.c |
50 | +++ b/tools/lvmcmdline.c | 50 | +++ b/tools/lvmcmdline.c |
51 | @@ -3380,7 +3380,7 @@ static int _check_standard_fds(void) | 51 | @@ -3378,7 +3378,7 @@ static int _check_standard_fds(void) |
52 | int err = is_valid_fd(STDERR_FILENO); | 52 | int err = is_valid_fd(STDERR_FILENO); |
53 | 53 | ||
54 | if (!is_valid_fd(STDIN_FILENO) && | 54 | if (!is_valid_fd(STDIN_FILENO) && |
@@ -57,7 +57,7 @@ index 3fd23a521..c2ee39905 100644 | |||
57 | if (err) | 57 | if (err) |
58 | perror("stdin stream open"); | 58 | perror("stdin stream open"); |
59 | else | 59 | else |
60 | @@ -3390,7 +3390,7 @@ static int _check_standard_fds(void) | 60 | @@ -3388,7 +3388,7 @@ static int _check_standard_fds(void) |
61 | } | 61 | } |
62 | 62 | ||
63 | if (!is_valid_fd(STDOUT_FILENO) && | 63 | if (!is_valid_fd(STDOUT_FILENO) && |
@@ -66,7 +66,7 @@ index 3fd23a521..c2ee39905 100644 | |||
66 | if (err) | 66 | if (err) |
67 | perror("stdout stream open"); | 67 | perror("stdout stream open"); |
68 | /* else no stdout */ | 68 | /* else no stdout */ |
69 | @@ -3398,7 +3398,7 @@ static int _check_standard_fds(void) | 69 | @@ -3396,7 +3396,7 @@ static int _check_standard_fds(void) |
70 | } | 70 | } |
71 | 71 | ||
72 | if (!is_valid_fd(STDERR_FILENO) && | 72 | 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 83a7f936b..c57bff865 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 @@ | |||
1 | From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001 | 1 | From 4e2dc175e99792d84873a4785ff1524845267c3e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 25 Mar 2024 13:07:28 -0700 | 3 | Date: Mon, 25 Mar 2024 13:07:28 -0700 |
4 | Subject: [PATCH] include libgen.h for basename | 4 | Subject: [PATCH] include libgen.h for basename |
@@ -16,12 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
16 | 1 file changed, 1 insertion(+) | 16 | 1 file changed, 1 insertion(+) |
17 | 17 | ||
18 | diff --git a/lib/device/device_id.c b/lib/device/device_id.c | 18 | diff --git a/lib/device/device_id.c b/lib/device/device_id.c |
19 | index 2b183810a..53467cbbb 100644 | 19 | index b3330f2ba..291bd5c73 100644 |
20 | --- a/lib/device/device_id.c | 20 | --- a/lib/device/device_id.c |
21 | +++ b/lib/device/device_id.c | 21 | +++ b/lib/device/device_id.c |
22 | @@ -26,6 +26,7 @@ | 22 | @@ -28,6 +28,7 @@ |
23 | #include "lib/datastruct/str_list.h" | 23 | #include "lib/activate/activate.h" |
24 | #include "lib/metadata/metadata-exported.h" | 24 | #include "device_mapper/misc/dm-ioctl.h" |
25 | 25 | ||
26 | +#include <libgen.h> | 26 | +#include <libgen.h> |
27 | #include <sys/stat.h> | 27 | #include <sys/stat.h> |
diff --git a/meta-oe/recipes-support/lvm2/libdevmapper.bb b/meta-oe/recipes-support/lvm2/libdevmapper.bb index be558ce1d..3b4439c3a 100644 --- a/meta-oe/recipes-support/lvm2/libdevmapper.bb +++ b/meta-oe/recipes-support/lvm2/libdevmapper.bb | |||
@@ -5,6 +5,8 @@ require lvm2.inc | |||
5 | 5 | ||
6 | DEPENDS += "autoconf-archive-native" | 6 | DEPENDS += "autoconf-archive-native" |
7 | 7 | ||
8 | inherit nopackages | ||
9 | |||
8 | TARGET_CC_ARCH += "${LDFLAGS}" | 10 | TARGET_CC_ARCH += "${LDFLAGS}" |
9 | 11 | ||
10 | do_install() { | 12 | do_install() { |
diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2.bb index 868f5a249..f1a1aae2c 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.bb +++ b/meta-oe/recipes-support/lvm2/lvm2.bb | |||
@@ -68,7 +68,7 @@ FILES:libdevmapper = " \ | |||
68 | 68 | ||
69 | FILES:${PN} += " \ | 69 | FILES:${PN} += " \ |
70 | ${libdir}/device-mapper/*.so \ | 70 | ${libdir}/device-mapper/*.so \ |
71 | ${systemd_system_unitdir}/lvm2-pvscan@.service \ | 71 | ${systemd_system_unitdir} \ |
72 | ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ | 72 | ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ |
73 | ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ | 73 | ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ |
74 | " | 74 | " |
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index 29cc7425b..059ab6999 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -15,13 +15,12 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ | |||
15 | file://0005-do-not-build-manual.patch \ | 15 | file://0005-do-not-build-manual.patch \ |
16 | file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ | 16 | file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ |
17 | file://reproducible-build.patch \ | 17 | file://reproducible-build.patch \ |
18 | file://0001-configure.ac-check-egrep.patch \ | ||
19 | file://0001-include-libgen.h-for-basename.patch \ | 18 | file://0001-include-libgen.h-for-basename.patch \ |
20 | " | 19 | " |
21 | 20 | ||
22 | SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f" | 21 | SRCREV = "6de3937ac517a3ecfd6d8d90f3f055dab631157e" |
23 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
24 | PV = "2.03.24" | 23 | PV = "2.03.26" |
25 | 24 | ||
26 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" | 25 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" |
27 | 26 | ||
diff --git a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb index ccc21f418..d0e7e3920 100644 --- a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb +++ b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb | |||
@@ -8,6 +8,8 @@ SRC_URI = " \ | |||
8 | http://www.maier-komor.de/software/mbuffer/mbuffer-20140310.tgz \ | 8 | http://www.maier-komor.de/software/mbuffer/mbuffer-20140310.tgz \ |
9 | " | 9 | " |
10 | 10 | ||
11 | UPSTREAM_CHECK_URI = "http://www.maier-komor.de/mbuffer.html" | ||
12 | |||
11 | SRC_URI[md5sum] = "9937d7f666c19a2e6b2499b04dbecc44" | 13 | SRC_URI[md5sum] = "9937d7f666c19a2e6b2499b04dbecc44" |
12 | SRC_URI[sha256sum] = "ab90b6fdce16db2bf08bcda0bc5d2bfb053a9a163d2a24f95fbf246460549b99" | 14 | SRC_URI[sha256sum] = "ab90b6fdce16db2bf08bcda0bc5d2bfb053a9a163d2a24f95fbf246460549b99" |
13 | 15 | ||
diff --git a/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-oe/recipes-support/mcelog/mce-inject_git.bb index a228c3cc0..08ec8c574 100644 --- a/meta-oe/recipes-support/mcelog/mce-inject_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-inject_git.bb | |||
@@ -6,7 +6,7 @@ SECTION = "System Environment/Base" | |||
6 | 6 | ||
7 | SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master" | 7 | SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master" |
8 | 8 | ||
9 | SRCREV = "4cbe46321b4a81365ff3aafafe63967264dbfec5" | 9 | SRCREV = "7668d820cadce2da9d90b72aab14c3e637ca47d6" |
10 | 10 | ||
11 | UPSTREAM_CHECK_COMMITS = "1" | 11 | UPSTREAM_CHECK_COMMITS = "1" |
12 | 12 | ||
diff --git a/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-oe/recipes-support/mcelog/mce-test_git.bb index 05e98e86e..0a6fd684e 100644 --- a/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-oe/recipes-support/mcelog/mce-test_git.bb | |||
@@ -14,8 +14,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git; | |||
14 | file://makefile-remove-ldflags.patch \ | 14 | file://makefile-remove-ldflags.patch \ |
15 | file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ | 15 | file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ |
16 | " | 16 | " |
17 | SRCREV = "025014dedca39d2b8a57a82e52286e72e157d73a" | 17 | SRCREV = "9d11fc3e05eae7b454efeb5941beded56f80445b" |
18 | PV = "20222810+git" | 18 | PV = "20230601+git" |
19 | 19 | ||
20 | RDEPENDS:${PN} = "mcelog mce-inject dialog bash" | 20 | RDEPENDS:${PN} = "mcelog mce-inject dialog bash" |
21 | 21 | ||
diff --git a/meta-oe/recipes-support/mcelog/mcelog_199.bb b/meta-oe/recipes-support/mcelog/mcelog_200.bb index 0a48fc48c..9d72e7859 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_199.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_200.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;; | |||
10 | file://run-ptest \ | 10 | file://run-ptest \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf" | 13 | SRCREV = "955fd0917ab1b9f159443e5cbba1d0fa73486fac" |
14 | 14 | ||
15 | LICENSE = "GPL-2.0-only" | 15 | LICENSE = "GPL-2.0-only" |
16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
diff --git a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb index 371281d6e..b503506a2 100644 --- a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb +++ b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb | |||
@@ -9,6 +9,8 @@ SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz" | |||
9 | SRC_URI[md5sum] = "65c90fb5150d7176b65b793f0faa7377" | 9 | SRC_URI[md5sum] = "65c90fb5150d7176b65b793f0faa7377" |
10 | SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23" | 10 | SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23" |
11 | 11 | ||
12 | UPSTREAM_CHECK_URI = "https://www.mcternan.me.uk//mscgen/" | ||
13 | |||
12 | DEPENDS = "gd " | 14 | DEPENDS = "gd " |
13 | 15 | ||
14 | inherit autotools gettext pkgconfig | 16 | inherit autotools gettext pkgconfig |
diff --git a/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb index b4f4651e3..4c68e7adf 100644 --- a/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb +++ b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb | |||
@@ -11,6 +11,9 @@ SRC_URI = "https://github.com/msktutil/msktutil/releases/download/${PV}/${BP}.ta | |||
11 | file://0001-configure.ac-Remove-native-include-path.patch" | 11 | file://0001-configure.ac-Remove-native-include-path.patch" |
12 | SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d" | 12 | SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d" |
13 | 13 | ||
14 | UPSTREAM_CHECK_URI = "https://github.com/msktutil/msktutil/releases/" | ||
15 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
16 | |||
14 | DEPENDS += "krb5 cyrus-sasl openldap" | 17 | DEPENDS += "krb5 cyrus-sasl openldap" |
15 | 18 | ||
16 | inherit autotools | 19 | inherit autotools |
diff --git a/meta-oe/recipes-support/nano/nano_8.0.bb b/meta-oe/recipes-support/nano/nano_8.2.bb index 56aa47f64..46e5a15c1 100644 --- a/meta-oe/recipes-support/nano/nano_8.0.bb +++ b/meta-oe/recipes-support/nano/nano_8.2.bb | |||
@@ -13,7 +13,7 @@ RDEPENDS:${PN} = "ncurses-terminfo-base" | |||
13 | PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" | 13 | PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" |
14 | 14 | ||
15 | SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" | 15 | SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" |
16 | SRC_URI[sha256sum] = "c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4" | 16 | SRC_URI[sha256sum] = "d5ad07dd862facae03051c54c6535e54c7ed7407318783fcad1ad2d7076fffeb" |
17 | 17 | ||
18 | UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" | 18 | UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" |
19 | 19 | ||
diff --git a/meta-oe/recipes-support/nmon/nmon_16m.bb b/meta-oe/recipes-support/nmon/nmon_16m.bb index 1779dd227..495afd164 100644 --- a/meta-oe/recipes-support/nmon/nmon_16m.bb +++ b/meta-oe/recipes-support/nmon/nmon_16m.bb | |||
@@ -14,6 +14,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \ | |||
14 | SRC_URI[lmon.sha256sum] = "2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1" | 14 | SRC_URI[lmon.sha256sum] = "2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1" |
15 | SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278" | 15 | SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/nmon/files/" | ||
18 | UPSTREAM_CHECK_REGEX = "lmon(?P<pver>.*).c" | ||
19 | |||
17 | CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" | 20 | CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" |
18 | LDFLAGS += "-ltinfo -lncursesw -lm" | 21 | LDFLAGS += "-ltinfo -lncursesw -lm" |
19 | ASNEEDED:pn-nmon = "" | 22 | ASNEEDED:pn-nmon = "" |
diff --git a/meta-oe/recipes-support/nss/nss_3.101.bb b/meta-oe/recipes-support/nss/nss_3.103.bb index 5a01efb7e..64141e938 100644 --- a/meta-oe/recipes-support/nss/nss_3.101.bb +++ b/meta-oe/recipes-support/nss/nss_3.103.bb | |||
@@ -33,10 +33,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$ | |||
33 | file://nss-fix-nsinstall-build.patch \ | 33 | file://nss-fix-nsinstall-build.patch \ |
34 | file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ | 34 | file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ |
35 | " | 35 | " |
36 | SRC_URI[sha256sum] = "859748f0b4b7bb51e7e600ae5a88ef4d71f93e6964b1beed2727784dd9ed85e7" | 36 | SRC_URI[sha256sum] = "7b4ab657f772dc7520c46e8d481940b292dcfc6a4c90150a7c26672384cee962" |
37 | 37 | ||
38 | UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" | 38 | UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/" |
39 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" | 39 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)" |
40 | 40 | ||
41 | inherit siteinfo | 41 | inherit siteinfo |
42 | 42 | ||
diff --git a/meta-oe/recipes-support/onig/onig_6.9.9.bb b/meta-oe/recipes-support/onig/onig_6.9.9.bb index b29437db1..414d9bfc1 100644 --- a/meta-oe/recipes-support/onig/onig_6.9.9.bb +++ b/meta-oe/recipes-support/onig/onig_6.9.9.bb | |||
@@ -16,6 +16,9 @@ SRC_URI = "\ | |||
16 | 16 | ||
17 | SRC_URI[sha256sum] = "60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf" | 17 | SRC_URI[sha256sum] = "60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf" |
18 | 18 | ||
19 | UPSTREAM_CHECK_URI = "https://github.com/kkos/oniguruma/releases/" | ||
20 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
21 | |||
19 | BINCONFIG = "${bindir}/onig-config" | 22 | BINCONFIG = "${bindir}/onig-config" |
20 | 23 | ||
21 | inherit autotools binconfig-disabled ptest | 24 | inherit autotools binconfig-disabled ptest |
diff --git a/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch new file mode 100644 index 000000000..73c9d0666 --- /dev/null +++ b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From c4351058da555e1e6a2b4b15d913baee80f55865 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
3 | Date: Thu, 27 Jun 2024 06:27:18 +0000 | ||
4 | Subject: Fix incompatible pointer type error with gcc option | ||
5 | -Wincompatible-pointer-types | ||
6 | |||
7 | | ../../../openct-0.6.20/src/ifd/ifdhandler.c: In function 'ifdhandler_run': | ||
8 | | ../../../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] | ||
9 | | 239 | sock->fd = ifd_get_eventfd(reader, &sock->events); | ||
10 | | | ^~~~~~~~~~~~~ | ||
11 | | | | | ||
12 | | | int * | ||
13 | | In file included from ../../../openct-0.6.20/src/ifd/internal.h:17, | ||
14 | | from ../../../openct-0.6.20/src/ifd/ifdhandler.c:7: | ||
15 | | ../../../openct-0.6.20/src/include/openct/ifd.h:182:65: note: expected 'short int *' but argument is of type 'int *' | ||
16 | | 182 | extern int ifd_get_eventfd(ifd_reader_t *, short *); | ||
17 | | | ^~~~~~~ | ||
18 | |||
19 | | ../../../openct-0.6.20/src/ifd/process.c: In function 'do_memory_write': | ||
20 | | ../../../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] | ||
21 | | 461 | || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len)) | ||
22 | | | ^~~~~~~~~ | ||
23 | | | | | ||
24 | | | unsigned int * | ||
25 | | In file included from ../../../openct-0.6.20/src/ifd/process.c:20: | ||
26 | | ../../../openct-0.6.20/src/include/openct/tlv.h:40:62: note: expected 'size_t *' {aka 'long unsigned int *'} but argument is of type 'unsigned int *' | ||
27 | | 40 | ifd_tag_t, unsigned char **, size_t *); | ||
28 | |||
29 | Upstream-Status: Submitted | ||
30 | |||
31 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
32 | --- | ||
33 | src/ifd/ifdhandler.c | 2 +- | ||
34 | src/ifd/process.c | 2 +- | ||
35 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
36 | |||
37 | diff --git a/src/ifd/ifdhandler.c b/src/ifd/ifdhandler.c | ||
38 | index 12686c9..ebd1b53 100644 | ||
39 | --- a/src/ifd/ifdhandler.c | ||
40 | +++ b/src/ifd/ifdhandler.c | ||
41 | @@ -236,7 +236,7 @@ static void ifdhandler_run(ifd_reader_t * reader) | ||
42 | sock->fd = -1; | ||
43 | } | ||
44 | else { | ||
45 | - sock->fd = ifd_get_eventfd(reader, &sock->events); | ||
46 | + sock->fd = ifd_get_eventfd(reader, (short int *)&sock->events); | ||
47 | } | ||
48 | if (sock->fd == -1) { | ||
49 | ifd_debug(1, "events inactive for reader %s", reader->name); | ||
50 | diff --git a/src/ifd/process.c b/src/ifd/process.c | ||
51 | index 4563bdf..7088a76 100644 | ||
52 | --- a/src/ifd/process.c | ||
53 | +++ b/src/ifd/process.c | ||
54 | @@ -458,7 +458,7 @@ static int do_memory_write(ifd_reader_t * reader, int unit, | ||
55 | return IFD_ERROR_INVALID_SLOT; | ||
56 | |||
57 | if (ct_tlv_get_int(args, CT_TAG_ADDRESS, &address) == 0 | ||
58 | - || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len)) | ||
59 | + || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, (size_t *)&data_len)) | ||
60 | return IFD_ERROR_MISSING_ARG; | ||
61 | |||
62 | rc = ifd_card_write_memory(reader, unit, address, data, data_len); | ||
63 | -- | ||
64 | 2.34.1 | ||
65 | |||
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 e4b99089f..bcff90c86 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb | |||
@@ -18,11 +18,14 @@ SRC_URI = " \ | |||
18 | file://openct.init \ | 18 | file://openct.init \ |
19 | file://openct.sysconfig \ | 19 | file://openct.sysconfig \ |
20 | file://openct.service \ | 20 | file://openct.service \ |
21 | file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \ | ||
21 | " | 22 | " |
22 | 23 | ||
23 | SRC_URI[md5sum] = "a1da3358ab798f1cb9232f1dbababc21" | 24 | SRC_URI[md5sum] = "a1da3358ab798f1cb9232f1dbababc21" |
24 | SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d181a68" | 25 | SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d181a68" |
25 | 26 | ||
27 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/opensc/files/openct/" | ||
28 | |||
26 | LICENSE = "LGPL-2.0-or-later" | 29 | LICENSE = "LGPL-2.0-or-later" |
27 | LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" | 30 | LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" |
28 | 31 | ||
@@ -82,3 +85,8 @@ do_install () { | |||
82 | } | 85 | } |
83 | 86 | ||
84 | BBCLASSEXTEND = "native" | 87 | BBCLASSEXTEND = "native" |
88 | |||
89 | # http://errors.yoctoproject.org/Errors/Details/766890/ | ||
90 | # 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] | ||
91 | # 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] | ||
92 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-support/opencv/opencv_4.9.0.bb b/meta-oe/recipes-support/opencv/opencv_4.10.0.bb index cf836d3ec..07bdb37b7 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.9.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.10.0.bb | |||
@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm" | |||
10 | 10 | ||
11 | DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" | 11 | DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" |
12 | 12 | ||
13 | SRCREV_opencv = "dad8af6b17f8e60d7b95a1203a1b4d22f56574cf" | 13 | SRCREV_opencv = "a7d942b681c5edd0cc27407d8e4d3dbf36c7a40e" |
14 | SRCREV_contrib = "c7602a8f74205e44389bd6a4e8d727d32e7e27b4" | 14 | SRCREV_contrib = "1aab1f34815a58a5a63aee6d510fe234129754a2" |
15 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | 15 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" |
16 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | 16 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" |
17 | SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" | 17 | SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" |
@@ -86,7 +86,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON" | |||
86 | EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" | 86 | EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" |
87 | 87 | ||
88 | PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ | 88 | PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ |
89 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ | 89 | ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \ |
90 | ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" | 90 | ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" |
91 | 91 | ||
92 | # TBB does not build for powerpc so disable that package config | 92 | # TBB does not build for powerpc so disable that package config |
diff --git a/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch b/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch new file mode 100644 index 000000000..e6ab4e5a4 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 634017950c1c920d0de63fffa5c52e621de1d603 Mon Sep 17 00:00:00 2001 | ||
2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
3 | Date: Wed, 26 Jun 2024 07:41:01 +0000 | ||
4 | Subject: Fix incompatible pointer type error with gcc option | ||
5 | -Wincompatible-pointer-types | ||
6 | |||
7 | lib32-openldap do_compile failure with gcc-14: | ||
8 | | tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types] | ||
9 | | 971 | keyhash.bv_val, &keyhash.bv_len ) < 0 ) { | ||
10 | | | ^~~~~~~~~~~~~~~ | ||
11 | | | | | ||
12 | | | ber_len_t * {aka long unsigned int *} | ||
13 | | In file included from tls_g.c:44: | ||
14 | | /usr/include/gnutls/gnutls.h:2406:32: note: expected 'size_t *' {aka 'unsigned int *'} but argument is of type 'ber_len_t *' {aka 'long unsigned int *'} | ||
15 | | 2406 | size_t *result_size); | ||
16 | | | ^~~ | ||
17 | |||
18 | Upstream-Status: Submitted | ||
19 | |||
20 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
21 | --- | ||
22 | libraries/libldap/tls_g.c | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c | ||
26 | index 7c23875..b4b487d 100644 | ||
27 | --- a/libraries/libldap/tls_g.c | ||
28 | +++ b/libraries/libldap/tls_g.c | ||
29 | @@ -968,7 +968,7 @@ tlsg_session_pinning( LDAP *ld, tls_session *sess, char *hashalg, struct berval | ||
30 | keyhash.bv_len = gnutls_hash_get_len( alg ); | ||
31 | keyhash.bv_val = LDAP_MALLOC( keyhash.bv_len ); | ||
32 | if ( !keyhash.bv_val || gnutls_fingerprint( alg, &key, | ||
33 | - keyhash.bv_val, &keyhash.bv_len ) < 0 ) { | ||
34 | + keyhash.bv_val, (size_t *)&keyhash.bv_len ) < 0 ) { | ||
35 | goto done; | ||
36 | } | ||
37 | } else { | ||
38 | -- | ||
39 | 2.34.1 | ||
40 | |||
diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb b/meta-oe/recipes-support/openldap/openldap_2.6.8.bb index c229667d6..ca27ab23e 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.6.8.bb | |||
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" | |||
7 | # basically BSD. opensource.org does not record this license | 7 | # basically BSD. opensource.org does not record this license |
8 | # at present (so it is apparently not OSI certified). | 8 | # at present (so it is apparently not OSI certified). |
9 | LICENSE = "OpenLDAP" | 9 | LICENSE = "OpenLDAP" |
10 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \ | 10 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \ |
11 | file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ | 11 | file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ |
12 | " | 12 | " |
13 | SECTION = "libs" | 13 | SECTION = "libs" |
@@ -19,9 +19,10 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ | |||
19 | file://slapd.service \ | 19 | file://slapd.service \ |
20 | file://remove-user-host-pwd-from-version.patch \ | 20 | file://remove-user-host-pwd-from-version.patch \ |
21 | file://0001-build-top.mk-unset-STRIP_OPTS.patch \ | 21 | file://0001-build-top.mk-unset-STRIP_OPTS.patch \ |
22 | file://0001-fix-incompatible-pointer-type-error.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[sha256sum] = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930" | 25 | SRC_URI[sha256sum] = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e" |
25 | 26 | ||
26 | DEPENDS = "util-linux groff-native" | 27 | DEPENDS = "util-linux groff-native" |
27 | 28 | ||
@@ -229,3 +230,8 @@ python populate_packages:prepend () { | |||
229 | } | 230 | } |
230 | 231 | ||
231 | BBCLASSEXTEND = "native" | 232 | BBCLASSEXTEND = "native" |
233 | |||
234 | # This one is reproducible only on 32bit MACHINEs | ||
235 | # http://errors.yoctoproject.org/Errors/Details/766968/ | ||
236 | # tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types] | ||
237 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-support/opensc/opensc_0.25.1.bb b/meta-oe/recipes-support/opensc/opensc_0.25.1.bb index 19fb78092..636bfa036 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.25.1.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.25.1.bb | |||
@@ -5,24 +5,23 @@ functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO\ | |||
5 | keys on the smart card is possible with PKCS\ | 5 | keys on the smart card is possible with PKCS\ |
6 | such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\ | 6 | such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\ |
7 | eID cards have also been confirmed to work." | 7 | eID cards have also been confirmed to work." |
8 | |||
9 | HOMEPAGE = "https://github.com/OpenSC/OpenSC/wiki" | 8 | HOMEPAGE = "https://github.com/OpenSC/OpenSC/wiki" |
10 | SECTION = "System Environment/Libraries" | 9 | SECTION = "System Environment/Libraries" |
11 | LICENSE = "LGPL-2.0-or-later" | 10 | LICENSE = "LGPL-2.1-or-later" |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" |
12 | DEPENDS = "openssl" | ||
13 | 13 | ||
14 | #v0.21.0 | ||
15 | SRCREV = "0a4b772d6fdab9bfaaa3123775a48a7cb6c5e7c6" | 14 | SRCREV = "0a4b772d6fdab9bfaaa3123775a48a7cb6c5e7c6" |
16 | SRC_URI = "git://github.com/OpenSC/OpenSC;branch=stable-0.25;protocol=https" | 15 | SRC_URI = "git://github.com/OpenSC/OpenSC;branch=stable-0.25;protocol=https" |
17 | DEPENDS = "virtual/libiconv openssl" | ||
18 | 16 | ||
19 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | |||
20 | inherit autotools pkgconfig bash-completion | 19 | inherit autotools pkgconfig bash-completion |
21 | 20 | ||
22 | EXTRA_OECONF = " \ | 21 | EXTRA_OECONF = " \ |
23 | --disable-static \ | ||
24 | --disable-ctapi \ | 22 | --disable-ctapi \ |
25 | --disable-doc \ | 23 | --disable-doc \ |
24 | --disable-static \ | ||
26 | --disable-strict \ | 25 | --disable-strict \ |
27 | " | 26 | " |
28 | EXTRA_OEMAKE = "DESTDIR=${D}" | 27 | EXTRA_OEMAKE = "DESTDIR=${D}" |
@@ -31,12 +30,10 @@ PACKAGECONFIG ??= "pcsc" | |||
31 | 30 | ||
32 | PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" | 31 | PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" |
33 | PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib" | 32 | PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib" |
34 | 33 | PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" | |
35 | RDEPENDS:${PN} = "readline" | ||
36 | 34 | ||
37 | FILES:${PN} += "\ | 35 | FILES:${PN} += "\ |
38 | ${libdir}/opensc-pkcs11.so \ | 36 | ${libdir}/opensc-pkcs11.so \ |
39 | ${libdir}/onepin-opensc-pkcs11.so \ | ||
40 | ${libdir}/pkcs11-spy.so \ | 37 | ${libdir}/pkcs11-spy.so \ |
41 | " | 38 | " |
42 | FILES:${PN}-dev += "\ | 39 | FILES:${PN}-dev += "\ |
diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch new file mode 100644 index 000000000..2651eb6a7 --- /dev/null +++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 1a5b4035e4cb75b87c716b4ebd5ffe32cd604c6e Mon Sep 17 00:00:00 2001 | ||
2 | From: "Sergey A. Osokin" <osa@FreeBSD.org.ru> | ||
3 | Date: Sun, 8 Sep 2024 17:14:25 -0400 | ||
4 | Subject: [PATCH] Fix build with clang 19 | ||
5 | |||
6 | Please see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281359 | ||
7 | for details. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/open-telemetry/opentelemetry-cpp/pull/3055] | ||
10 | Credit: Dimitry Andric <dim@FreeBSD.org> | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | api/include/opentelemetry/logs/event_logger.h | 2 +- | ||
14 | api/include/opentelemetry/logs/logger.h | 2 +- | ||
15 | api/include/opentelemetry/logs/logger_type_traits.h | 2 +- | ||
16 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/api/include/opentelemetry/logs/event_logger.h b/api/include/opentelemetry/logs/event_logger.h | ||
19 | index b5c94a70..5892e041 100644 | ||
20 | --- a/api/include/opentelemetry/logs/event_logger.h | ||
21 | +++ b/api/include/opentelemetry/logs/event_logger.h | ||
22 | @@ -66,7 +66,7 @@ class EventLogger | ||
23 | nostd::unique_ptr<LogRecord> log_record = delegate_logger->CreateLogRecord(); | ||
24 | |||
25 | IgnoreTraitResult( | ||
26 | - detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set( | ||
27 | + detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set<>( | ||
28 | log_record.get(), std::forward<ArgumentType>(args))...); | ||
29 | |||
30 | EmitEvent(event_name, std::move(log_record)); | ||
31 | diff --git a/api/include/opentelemetry/logs/logger.h b/api/include/opentelemetry/logs/logger.h | ||
32 | index dc09a0c2..19da3942 100644 | ||
33 | --- a/api/include/opentelemetry/logs/logger.h | ||
34 | +++ b/api/include/opentelemetry/logs/logger.h | ||
35 | @@ -73,7 +73,7 @@ class Logger | ||
36 | } | ||
37 | |||
38 | IgnoreTraitResult( | ||
39 | - detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set( | ||
40 | + detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set<>( | ||
41 | log_record.get(), std::forward<ArgumentType>(args))...); | ||
42 | |||
43 | EmitLogRecord(std::move(log_record)); | ||
44 | diff --git a/api/include/opentelemetry/logs/logger_type_traits.h b/api/include/opentelemetry/logs/logger_type_traits.h | ||
45 | index 48613513..f140a545 100644 | ||
46 | --- a/api/include/opentelemetry/logs/logger_type_traits.h | ||
47 | +++ b/api/include/opentelemetry/logs/logger_type_traits.h | ||
48 | @@ -166,7 +166,7 @@ struct LogRecordSetterTrait | ||
49 | * = nullptr> | ||
50 | inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept | ||
51 | { | ||
52 | - return LogRecordSetterTrait<common::KeyValueIterable>::template Set( | ||
53 | + return LogRecordSetterTrait<common::KeyValueIterable>::template Set<>( | ||
54 | log_record, std::forward<ArgumentType>(arg)); | ||
55 | } | ||
56 | |||
diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb index 88033e58c..1d86f1abc 100644 --- a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb +++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb | |||
@@ -8,12 +8,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | |||
8 | 8 | ||
9 | DEPENDS = "nlohmann-json" | 9 | DEPENDS = "nlohmann-json" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;" | 11 | SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main \ |
12 | SRCREV = "054b0dc207c1f58e290d78cdaac5f314bc328b31" | 12 | file://0001-Fix-build-with-clang-19.patch" |
13 | SRCREV = "baecbb95bd63df53e0af16e87bc683967962c5f8" | ||
13 | 14 | ||
14 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
15 | inherit cmake pkgconfig lib_package | 16 | inherit cmake pkgconfig lib_package |
16 | 17 | ||
18 | LDFLAGS:append:riscv32 = " -latomic" | ||
19 | |||
17 | PACKAGECONFIG ?= "opentelemety_install otlp_api" | 20 | PACKAGECONFIG ?= "opentelemety_install otlp_api" |
18 | 21 | ||
19 | PACKAGECONFIG[opentelemety_install]="-DOPENTELEMETRY_INSTALL=ON,-DOPENTELEMETRY_INSTALL=OFF" | 22 | PACKAGECONFIG[opentelemety_install]="-DOPENTELEMETRY_INSTALL=ON,-DOPENTELEMETRY_INSTALL=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 10545b65e..f6f2a6575 100644 --- a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb +++ b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb | |||
@@ -93,6 +93,10 @@ do_install () { | |||
93 | sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf | 93 | sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf |
94 | sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf | 94 | sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf |
95 | sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf | 95 | sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf |
96 | sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}/${sysconfdir}/pcp.conf | ||
97 | sed -i -e 's#${RECIPE_SYSROOT}##g' \ | ||
98 | -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ | ||
99 | -e 's#${TMPDIR}##g' ${D}${includedir}/pcp/builddefs | ||
96 | } | 100 | } |
97 | 101 | ||
98 | PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ | 102 | PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ |
diff --git a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb index 97a94ec97..1dfba7c71 100644 --- a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb +++ b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
5 | 5 | ||
6 | SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" | 6 | SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" |
7 | 7 | ||
8 | SRCREV = "53834cd33155ae1f0332102b1baca6ce63660fc5" | 8 | SRCREV = "778da3d86a59f5166443118c158e11ba4da9a5f1" |
9 | 9 | ||
10 | inherit autotools pkgconfig | 10 | inherit autotools pkgconfig |
11 | 11 | ||
diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_2024.bb index cc0d88fac..c0c3e25de 100644 --- a/meta-oe/recipes-support/picocom/picocom_git.bb +++ b/meta-oe/recipes-support/picocom/picocom_2024.bb | |||
@@ -4,17 +4,14 @@ LICENSE = "GPL-2.0-or-later" | |||
4 | HOMEPAGE = "https://gitlab.com/wsakernel/picocom" | 4 | HOMEPAGE = "https://gitlab.com/wsakernel/picocom" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" |
6 | 6 | ||
7 | BASEPV = "2023-04" | 7 | SRCREV = "7b6acbd421a2d4ca99376b7b427828dc1bcba4d8" |
8 | PV = "${BASEPV}+git" | ||
9 | |||
10 | SRCREV = "12537df0314767d5af35bddddbbca3694e6a0342" | ||
11 | 8 | ||
12 | SRC_URI = "git://gitlab.com/wsakernel/picocom;branch=master;protocol=https \ | 9 | SRC_URI = "git://gitlab.com/wsakernel/picocom;branch=master;protocol=https \ |
13 | " | 10 | " |
14 | 11 | ||
15 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
16 | 13 | ||
17 | EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \ | 14 | EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${PV}' \ |
18 | 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' " | 15 | 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' " |
19 | 16 | ||
20 | do_install () { | 17 | do_install () { |
diff --git a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb index ad6a7501c..9337ae596 100644 --- a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb +++ b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb | |||
@@ -10,6 +10,9 @@ inherit pkgconfig | |||
10 | SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https" | 10 | SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https" |
11 | SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" | 11 | SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" |
12 | 12 | ||
13 | # Upstream repo does not tag | ||
14 | UPSTREAM_CHECK_COMMITS = "1" | ||
15 | |||
13 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
14 | 17 | ||
15 | do_compile() { | 18 | do_compile() { |
diff --git a/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-oe/recipes-support/pidgin/icyque_git.bb index ed58c4a76..b2f9944c1 100644 --- a/meta-oe/recipes-support/pidgin/icyque_git.bb +++ b/meta-oe/recipes-support/pidgin/icyque_git.bb | |||
@@ -12,6 +12,9 @@ inherit pkgconfig | |||
12 | SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https" | 12 | SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https" |
13 | SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5" | 13 | SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5" |
14 | 14 | ||
15 | # Upstream repo does not tag | ||
16 | UPSTREAM_CHECK_COMMITS = "1" | ||
17 | |||
15 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
16 | 19 | ||
17 | do_compile() { | 20 | do_compile() { |
diff --git a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb index d17a62306..f2fe4a7a9 100644 --- a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb +++ b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb | |||
@@ -15,6 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/pidgin/${BPN}/${PV}/${BP}.tar.xz \ | |||
15 | " | 15 | " |
16 | SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8" | 16 | SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8" |
17 | 17 | ||
18 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/pidgin/files/libgnt/" | ||
19 | UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" | ||
20 | |||
18 | EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false" | 21 | EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false" |
19 | 22 | ||
20 | FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" | 23 | FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" |
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 6ce42ec18..e96e11861 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} += " \ | |||
37 | ${datadir}/appdata \ | 37 | ${datadir}/appdata \ |
38 | ${datadir}/metainfo \ | 38 | ${datadir}/metainfo \ |
39 | " | 39 | " |
40 | |||
41 | # http://errors.yoctoproject.org/Errors/Details/766947/ | ||
42 | # 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] | ||
43 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch b/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch new file mode 100644 index 000000000..4e088ffc1 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch | |||
@@ -0,0 +1,177 @@ | |||
1 | # HG changeset patch | ||
2 | # User Yoann Congal <yoann.congal@smile.fr> | ||
3 | # Date 1720270125 -7200 | ||
4 | # Sat Jul 06 14:48:45 2024 +0200 | ||
5 | # Branch gcc-14-incompatible-pointer-types | ||
6 | # Node ID 06721b86a5a8e6fb8163d9411a7778d2a0274b26 | ||
7 | # Parent 21a56db5f9987efb88d76ab26ee1eadf316f3d7d | ||
8 | Fix incompatible pointer types for GtkItemFactoryCallbacks on gcc-14 | ||
9 | |||
10 | The GtkItemFactoryEntry struct callback is of type GtkItemFactoryCallbacks | ||
11 | (aka void (*)(void)) but is initialised with GtkItemFactoryCallback1 types | ||
12 | (aka void (*)(void *, guint, GtkWidget *)). | ||
13 | |||
14 | This is coherent with the gtk-2 documentation: | ||
15 | > gtk_item_factory_create_items(..., GtkItemFactoryEntry *entries,...) | ||
16 | > entries : an array of GtkItemFactoryEntrys whose callback members must by of | ||
17 | > type GtkItemFactoryCallback1 | ||
18 | |||
19 | But, under gcc-14, the implicit cast from GtkItemFactoryCallback1 to | ||
20 | GtkItemFactoryCallback triggers an incompatible-pointer-types error (See [0]). | ||
21 | |||
22 | An exemple of this error: | ||
23 | pidgin/gtkconv.c:3096:66: error: initialization of 'void (*)(void)' from incompatible pointer type 'void (*)(void *, guint, GtkWidget *)' {aka 'void (*)(void *, unsigned int, struct _GtkWidget *)'} [-Wincompatible-pointer-types] | ||
24 | 3096 | { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb, | ||
25 | | ^~~~~~~~~~~~~~~~ | ||
26 | pidgin/gtkconv.c:3096:66: note: (near initialization for 'menu_items[1].callback') | ||
27 | |||
28 | To fix this, explicitely cast to GtkItemFactoryCallback where needed. | ||
29 | |||
30 | Testing Done: | ||
31 | Built with gcc-14, started and clicked on some affected menus | ||
32 | |||
33 | [0]: https://gcc.gnu.org/gcc-14/porting_to.html#incompatible-pointer-types | ||
34 | |||
35 | Upstream-Status: Backport [https://keep.imfreedom.org/pidgin/pidgin/rev/210f318db492] | ||
36 | Signed-off-by: Yoann Congal <yoann.congal@smile.fr> | ||
37 | |||
38 | diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c | ||
39 | --- a/pidgin/gtkblist.c | ||
40 | +++ b/pidgin/gtkblist.c | ||
41 | @@ -3624,11 +3624,11 @@ static GtkItemFactoryEntry blist_menu[] | ||
42 | { N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL }, | ||
43 | { "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL }, | ||
44 | { N_("/Buddies/Sh_ow"), NULL, NULL, 0, "<Branch>", NULL}, | ||
45 | - { N_("/Buddies/Show/_Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL }, | ||
46 | - { N_("/Buddies/Show/_Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL }, | ||
47 | - { N_("/Buddies/Show/Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL }, | ||
48 | - { N_("/Buddies/Show/Idle _Times"), NULL, pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL }, | ||
49 | - { N_("/Buddies/Show/_Protocol Icons"), NULL, pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL }, | ||
50 | + { N_("/Buddies/Show/_Offline Buddies"), NULL, (GtkItemFactoryCallback)pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL }, | ||
51 | + { N_("/Buddies/Show/_Empty Groups"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL }, | ||
52 | + { N_("/Buddies/Show/Buddy _Details"), NULL, (GtkItemFactoryCallback)pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL }, | ||
53 | + { N_("/Buddies/Show/Idle _Times"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL }, | ||
54 | + { N_("/Buddies/Show/_Protocol Icons"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL }, | ||
55 | { N_("/Buddies/_Sort Buddies"), NULL, NULL, 0, "<Branch>", NULL }, | ||
56 | { "/Buddies/sep2", NULL, NULL, 0, "<Separator>", NULL }, | ||
57 | { N_("/Buddies/_Add Buddy..."), "<CTL>B", pidgin_blist_add_buddy_cb, 0, "<StockItem>", GTK_STOCK_ADD }, | ||
58 | @@ -3651,11 +3651,11 @@ static GtkItemFactoryEntry blist_menu[] | ||
59 | { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL }, | ||
60 | { N_("/Tools/Set _Mood"), "<CTL>D", set_mood_show, 0, "<Item>", NULL }, | ||
61 | { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, | ||
62 | - { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER }, | ||
63 | + { N_("/Tools/_File Transfers"), "<CTL>T", (GtkItemFactoryCallback)pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER }, | ||
64 | { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL }, | ||
65 | { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 3, "<Item>", NULL }, | ||
66 | { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL }, | ||
67 | - { N_("/Tools/Mute _Sounds"), NULL, pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, | ||
68 | + { N_("/Tools/Mute _Sounds"), NULL, (GtkItemFactoryCallback)pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, | ||
69 | /* Help */ | ||
70 | { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL }, | ||
71 | { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, | ||
72 | diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c | ||
73 | --- a/pidgin/gtkconv.c | ||
74 | +++ b/pidgin/gtkconv.c | ||
75 | @@ -3093,76 +3093,76 @@ static GtkItemFactoryEntry menu_items[] | ||
76 | /* Conversation menu */ | ||
77 | { N_("/_Conversation"), NULL, NULL, 0, "<Branch>", NULL }, | ||
78 | |||
79 | - { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb, | ||
80 | + { N_("/Conversation/New Instant _Message..."), "<CTL>M", (GtkItemFactoryCallback)menu_new_conv_cb, | ||
81 | 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW }, | ||
82 | - { N_("/Conversation/Join a _Chat..."), NULL, menu_join_chat_cb, | ||
83 | + { N_("/Conversation/Join a _Chat..."), NULL, (GtkItemFactoryCallback)menu_join_chat_cb, | ||
84 | 0, "<StockItem>", PIDGIN_STOCK_CHAT }, | ||
85 | |||
86 | { "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL }, | ||
87 | |||
88 | - { N_("/Conversation/_Find..."), NULL, menu_find_cb, 0, | ||
89 | + { N_("/Conversation/_Find..."), NULL, (GtkItemFactoryCallback)menu_find_cb, 0, | ||
90 | "<StockItem>", GTK_STOCK_FIND }, | ||
91 | - { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, "<Item>", NULL }, | ||
92 | - { N_("/Conversation/_Save As..."), NULL, menu_save_as_cb, 0, | ||
93 | + { N_("/Conversation/View _Log"), NULL, (GtkItemFactoryCallback)menu_view_log_cb, 0, "<Item>", NULL }, | ||
94 | + { N_("/Conversation/_Save As..."), NULL, (GtkItemFactoryCallback)menu_save_as_cb, 0, | ||
95 | "<StockItem>", GTK_STOCK_SAVE_AS }, | ||
96 | - { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR }, | ||
97 | + { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", (GtkItemFactoryCallback)menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR }, | ||
98 | |||
99 | { "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL }, | ||
100 | |||
101 | #ifdef USE_VV | ||
102 | { N_("/Conversation/M_edia"), NULL, NULL, 0, "<Branch>", NULL }, | ||
103 | |||
104 | - { N_("/Conversation/Media/_Audio Call"), NULL, menu_initiate_media_call_cb, 0, | ||
105 | + { N_("/Conversation/Media/_Audio Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 0, | ||
106 | "<StockItem>", PIDGIN_STOCK_TOOLBAR_AUDIO_CALL }, | ||
107 | - { N_("/Conversation/Media/_Video Call"), NULL, menu_initiate_media_call_cb, 1, | ||
108 | + { N_("/Conversation/Media/_Video Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 1, | ||
109 | "<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL }, | ||
110 | - { N_("/Conversation/Media/Audio\\/Video _Call"), NULL, menu_initiate_media_call_cb, 2, | ||
111 | + { N_("/Conversation/Media/Audio\\/Video _Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 2, | ||
112 | "<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL }, | ||
113 | #endif | ||
114 | |||
115 | - { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE }, | ||
116 | - { N_("/Conversation/Get _Attention"), NULL, menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION }, | ||
117 | - { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, | ||
118 | + { N_("/Conversation/Se_nd File..."), NULL, (GtkItemFactoryCallback)menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE }, | ||
119 | + { N_("/Conversation/Get _Attention"), NULL, (GtkItemFactoryCallback)menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION }, | ||
120 | + { N_("/Conversation/Add Buddy _Pounce..."), NULL, (GtkItemFactoryCallback)menu_add_pounce_cb, | ||
121 | 0, "<Item>", NULL }, | ||
122 | - { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0, | ||
123 | + { N_("/Conversation/_Get Info"), "<CTL>O", (GtkItemFactoryCallback)menu_get_info_cb, 0, | ||
124 | "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO }, | ||
125 | - { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, | ||
126 | + { N_("/Conversation/In_vite..."), NULL, (GtkItemFactoryCallback)menu_invite_cb, 0, | ||
127 | "<Item>", NULL }, | ||
128 | { N_("/Conversation/M_ore"), NULL, NULL, 0, "<Branch>", NULL }, | ||
129 | |||
130 | { "/Conversation/sep2", NULL, NULL, 0, "<Separator>", NULL }, | ||
131 | |||
132 | - { N_("/Conversation/Al_ias..."), NULL, menu_alias_cb, 0, | ||
133 | + { N_("/Conversation/Al_ias..."), NULL, (GtkItemFactoryCallback)menu_alias_cb, 0, | ||
134 | "<Item>", NULL }, | ||
135 | - { N_("/Conversation/_Block..."), NULL, menu_block_cb, 0, | ||
136 | + { N_("/Conversation/_Block..."), NULL, (GtkItemFactoryCallback)menu_block_cb, 0, | ||
137 | "<StockItem>", PIDGIN_STOCK_TOOLBAR_BLOCK }, | ||
138 | - { N_("/Conversation/_Unblock..."), NULL, menu_unblock_cb, 0, | ||
139 | + { N_("/Conversation/_Unblock..."), NULL, (GtkItemFactoryCallback)menu_unblock_cb, 0, | ||
140 | "<StockItem>", PIDGIN_STOCK_TOOLBAR_UNBLOCK }, | ||
141 | - { N_("/Conversation/_Add..."), NULL, menu_add_remove_cb, 0, | ||
142 | + { N_("/Conversation/_Add..."), NULL, (GtkItemFactoryCallback)menu_add_remove_cb, 0, | ||
143 | "<StockItem>", GTK_STOCK_ADD }, | ||
144 | - { N_("/Conversation/_Remove..."), NULL, menu_add_remove_cb, 0, | ||
145 | + { N_("/Conversation/_Remove..."), NULL, (GtkItemFactoryCallback)menu_add_remove_cb, 0, | ||
146 | "<StockItem>", GTK_STOCK_REMOVE }, | ||
147 | |||
148 | { "/Conversation/sep3", NULL, NULL, 0, "<Separator>", NULL }, | ||
149 | |||
150 | - { N_("/Conversation/Insert Lin_k..."), NULL, menu_insert_link_cb, 0, | ||
151 | + { N_("/Conversation/Insert Lin_k..."), NULL, (GtkItemFactoryCallback)menu_insert_link_cb, 0, | ||
152 | "<StockItem>", PIDGIN_STOCK_TOOLBAR_INSERT_LINK }, | ||
153 | - { N_("/Conversation/Insert Imag_e..."), NULL, menu_insert_image_cb, 0, | ||
154 | + { N_("/Conversation/Insert Imag_e..."), NULL, (GtkItemFactoryCallback)menu_insert_image_cb, 0, | ||
155 | "<StockItem>", PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE }, | ||
156 | |||
157 | { "/Conversation/sep4", NULL, NULL, 0, "<Separator>", NULL }, | ||
158 | |||
159 | |||
160 | - { N_("/Conversation/_Close"), NULL, menu_close_conv_cb, 0, | ||
161 | + { N_("/Conversation/_Close"), NULL, (GtkItemFactoryCallback)menu_close_conv_cb, 0, | ||
162 | "<StockItem>", GTK_STOCK_CLOSE }, | ||
163 | |||
164 | /* Options */ | ||
165 | { N_("/_Options"), NULL, NULL, 0, "<Branch>", NULL }, | ||
166 | - { N_("/Options/Enable _Logging"), NULL, menu_logging_cb, 0, "<CheckItem>", NULL }, | ||
167 | - { N_("/Options/Enable _Sounds"), NULL, menu_sounds_cb, 0, "<CheckItem>", NULL }, | ||
168 | + { N_("/Options/Enable _Logging"), NULL, (GtkItemFactoryCallback)menu_logging_cb, 0, "<CheckItem>", NULL }, | ||
169 | + { N_("/Options/Enable _Sounds"), NULL, (GtkItemFactoryCallback)menu_sounds_cb, 0, "<CheckItem>", NULL }, | ||
170 | { "/Options/sep0", NULL, NULL, 0, "<Separator>", NULL }, | ||
171 | - { N_("/Options/Show Formatting _Toolbars"), NULL, menu_toolbar_cb, 0, "<CheckItem>", NULL }, | ||
172 | - { N_("/Options/Show Ti_mestamps"), NULL, menu_timestamps_cb, 0, "<CheckItem>", NULL }, | ||
173 | + { N_("/Options/Show Formatting _Toolbars"), NULL, (GtkItemFactoryCallback)menu_toolbar_cb, 0, "<CheckItem>", NULL }, | ||
174 | + { N_("/Options/Show Ti_mestamps"), NULL, (GtkItemFactoryCallback)menu_timestamps_cb, 0, "<CheckItem>", NULL }, | ||
175 | }; | ||
176 | |||
177 | static const int menu_item_count = | ||
diff --git a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch deleted file mode 100644 index 1c4daa9f6..000000000 --- a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 43e9db656431ffb22b429d5fca4ce3b4af21bc9e Mon Sep 17 00:00:00 2001 | ||
2 | From: Herrie <github.com@herrie.org> | ||
3 | Date: Mon, 24 Jul 2017 21:30:16 +0200 | ||
4 | |||
5 | --- | ||
6 | Upstream-Status: Pending | ||
7 | |||
8 | libpurple/protocols/irc/irc.h | 4 ++-- | ||
9 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/libpurple/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h | ||
12 | index 596ddaf..b70f3a9 100644 | ||
13 | --- a/libpurple/protocols/irc/irc.h | ||
14 | +++ b/libpurple/protocols/irc/irc.h | ||
15 | @@ -40,9 +40,9 @@ | ||
16 | |||
17 | #define IRC_DEFAULT_CHARSET "UTF-8" | ||
18 | #define IRC_DEFAULT_AUTODETECT FALSE | ||
19 | -#define IRC_DEFAULT_ALIAS "purple" | ||
20 | +#define IRC_DEFAULT_ALIAS "OE-user" | ||
21 | |||
22 | -#define IRC_DEFAULT_QUIT "Leaving." | ||
23 | +#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org" | ||
24 | |||
25 | #define IRC_BUFSIZE_INCREMENT 1024 | ||
26 | #define IRC_MAX_BUFSIZE 16384 | ||
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb index ae251b5a0..ac62863f5 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb | |||
@@ -10,10 +10,10 @@ inherit autotools gettext pkgconfig gconf perlnative python3native | |||
10 | SRC_URI = "\ | 10 | SRC_URI = "\ |
11 | ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ | 11 | ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ |
12 | file://sanitize-configure.ac.patch \ | 12 | file://sanitize-configure.ac.patch \ |
13 | file://purple-OE-branding-25.patch \ | 13 | file://fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603" | 16 | SRC_URI[sha256sum] = "120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8" |
17 | 17 | ||
18 | CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | 18 | CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." |
19 | CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." | 19 | CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." |
@@ -21,7 +21,6 @@ CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't | |||
21 | PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ | 21 | PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ |
22 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ | 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ |
23 | " | 23 | " |
24 | PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2" | ||
25 | # --disable-gstreamer compile without GStreamer audio support | 24 | # --disable-gstreamer compile without GStreamer audio support |
26 | # --disable-gstreamer-video | 25 | # --disable-gstreamer-video |
27 | # compile without GStreamer 1.0 Video Overlay support | 26 | # compile without GStreamer 1.0 Video Overlay support |
@@ -29,8 +28,7 @@ PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2" | |||
29 | # compile without GStreamer 0.10 interface support | 28 | # compile without GStreamer 0.10 interface support |
30 | # --with-gstreamer=<version> | 29 | # --with-gstreamer=<version> |
31 | # compile with GStreamer 0.10 or 1.0 interface | 30 | # compile with GStreamer 0.10 or 1.0 interface |
32 | PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" | 31 | PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer1.0" |
33 | PACKAGECONFIG[vv] = "--enable-vv,--disable-vv,gstreamer" | ||
34 | PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" | 32 | PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" |
35 | PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" | 33 | PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" |
36 | PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" | 34 | PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" |
@@ -51,8 +49,17 @@ EXTRA_OECONF = " \ | |||
51 | --disable-meanwhile \ | 49 | --disable-meanwhile \ |
52 | --disable-nm \ | 50 | --disable-nm \ |
53 | --disable-screensaver \ | 51 | --disable-screensaver \ |
52 | --disable-farstream \ | ||
53 | --disable-vv \ | ||
54 | " | 54 | " |
55 | 55 | ||
56 | # CONFIG_ARGS is used to display build info. Replace full paths by reproducible | ||
57 | # variables ($S, $WORKDIR) | ||
58 | do_configure:append() { | ||
59 | sed -i -e "/CONFIG_ARGS/s|${S}|\$S|g" ${B}/config.h | ||
60 | sed -i -e "/CONFIG_ARGS/s|${WORKDIR}|\$WORKDIR|g" ${B}/config.h | ||
61 | } | ||
62 | |||
56 | OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" | 63 | OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" |
57 | OE_LT_RPATH_ALLOW[export]="1" | 64 | OE_LT_RPATH_ALLOW[export]="1" |
58 | 65 | ||
@@ -73,7 +80,7 @@ FILES:finch = "${bindir}/finch" | |||
73 | FILES:finch-dev = "${libdir}/finch/*.la" | 80 | FILES:finch-dev = "${libdir}/finch/*.la" |
74 | 81 | ||
75 | FILES:${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ | 82 | FILES:${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ |
76 | ${datadir}/applications" | 83 | ${datadir}/applications ${datadir}/metainfo" |
77 | RRECOMMENDS:${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" | 84 | RRECOMMENDS:${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" |
78 | 85 | ||
79 | FILES:${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" | 86 | FILES:${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" |
diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-Fix-types-for-old-32-bit-systems.patch b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-Fix-types-for-old-32-bit-systems.patch new file mode 100644 index 000000000..189a0e21b --- /dev/null +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-Fix-types-for-old-32-bit-systems.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 088f038de633b5de777fb0f95cd9598f320151f6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Simo Sorce <simo@redhat.com> | ||
3 | Date: Wed, 5 Jun 2024 11:22:35 -0400 | ||
4 | Subject: [PATCH] Fix types for old 32 bit systems | ||
5 | |||
6 | On x86 CK_ULONG and size_t have different sizes, ensure we use | ||
7 | compatible types on our helper functions. | ||
8 | |||
9 | Signed-off-by: Simo Sorce <simo@redhat.com> | ||
10 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
11 | --- | ||
12 | Upstream-Status: Backport [https://github.com/latchset/pkcs11-provider/commit/9fa16b7fd398b62f06cb10892fe93dc574d67399] | ||
13 | |||
14 | src/asymmetric_cipher.c | 4 ++-- | ||
15 | src/util.h | 2 +- | ||
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/src/asymmetric_cipher.c b/src/asymmetric_cipher.c | ||
19 | index 4d87b1c..3256fd2 100644 | ||
20 | --- a/src/asymmetric_cipher.c | ||
21 | +++ b/src/asymmetric_cipher.c | ||
22 | @@ -251,12 +251,12 @@ static int p11prov_rsaenc_decrypt_init(void *ctx, void *provkey, | ||
23 | static int | ||
24 | p11prov_tls_constant_time_depadding(struct p11prov_rsaenc_ctx *encctx, | ||
25 | unsigned char *out, unsigned char *buf, | ||
26 | - size_t *out_size, CK_ULONG *ret_cond) | ||
27 | + CK_ULONG *out_size, CK_ULONG *ret_cond) | ||
28 | { | ||
29 | unsigned char randbuf[SSL_MAX_MASTER_KEY_LENGTH]; | ||
30 | CK_ULONG ver_cond = 0; | ||
31 | CK_ULONG cond = 0; | ||
32 | - size_t length = SSL_MAX_MASTER_KEY_LENGTH; | ||
33 | + CK_ULONG length = SSL_MAX_MASTER_KEY_LENGTH; | ||
34 | int err; | ||
35 | |||
36 | /* always generate a random buffer, to constant_time swap in | ||
37 | diff --git a/src/util.h b/src/util.h | ||
38 | index bcbc2db..1b24666 100644 | ||
39 | --- a/src/util.h | ||
40 | +++ b/src/util.h | ||
41 | @@ -120,7 +120,7 @@ static inline int constant_select_int(CK_ULONG cond, int a, int b) | ||
42 | return (int)((A & mask) | (B & ~mask)); | ||
43 | } | ||
44 | |||
45 | -static inline void constant_select_buf(CK_ULONG cond, size_t size, | ||
46 | +static inline void constant_select_buf(CK_ULONG cond, CK_ULONG size, | ||
47 | unsigned char *dst, unsigned char *a, | ||
48 | unsigned char *b) | ||
49 | { | ||
diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.5.bb index 816ee967c..fcd8fe631 100644 --- a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb +++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.5.bb | |||
@@ -10,18 +10,16 @@ HOMEPAGE = "https://github.com/latchset/pkcs11-provider" | |||
10 | SECTION = "libs" | 10 | SECTION = "libs" |
11 | LICENSE = "Apache-2.0" | 11 | LICENSE = "Apache-2.0" |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" |
13 | DEPENDS = "\ | 13 | DEPENDS = "openssl" |
14 | autoconf-archive \ | ||
15 | openssl \ | ||
16 | p11-kit \ | ||
17 | " | ||
18 | 14 | ||
19 | SRCREV = "58040b4e32975cc1d7f39e424ee7b0097cd11311" | 15 | SRCREV = "3a4fdd2a2e5643af2a0f857b66a19b9fa109d40f" |
20 | 16 | ||
21 | SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" | 17 | SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https \ |
18 | file://0001-Fix-types-for-old-32-bit-systems.patch \ | ||
19 | " | ||
22 | 20 | ||
23 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
24 | 22 | ||
25 | inherit autotools pkgconfig | 23 | inherit meson pkgconfig |
26 | 24 | ||
27 | FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" | 25 | FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" |
diff --git a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb index 19da947d0..9cd27a2e6 100644 --- a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb +++ b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/png-mng/${BPN}/${PV}/${BPN}-${PV}.tar.g | |||
13 | SRC_URI[md5sum] = "980bd6d9a3830fdce746d7fe3c9166ee" | 13 | SRC_URI[md5sum] = "980bd6d9a3830fdce746d7fe3c9166ee" |
14 | SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f" | 14 | SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/png-mng/files/pngcheck/" | ||
17 | UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" | ||
18 | |||
16 | CFLAGS += "-DUSE_ZLIB" | 19 | CFLAGS += "-DUSE_ZLIB" |
17 | 20 | ||
18 | EXTRA_OEMAKE = "-f ${S}/Makefile.unx" | 21 | EXTRA_OEMAKE = "-f ${S}/Makefile.unx" |
diff --git a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch b/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch deleted file mode 100644 index b06135222..000000000 --- a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | From 4cbb225811205b51b65371d0d8abc2d2af8233b6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 26 Jan 2023 14:56:36 -0800 | ||
4 | Subject: [PATCH] Use std::atomic<int> instead of std::atomic<bool> | ||
5 | |||
6 | GCC on RISCV does not yet support inline subword atomics [1] | ||
7 | Therefore avoid them until fixed | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104338 | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | Foundation/include/Poco/AsyncChannel.h | 2 +- | ||
16 | Foundation/src/AsyncChannel.cpp | 5 ++--- | ||
17 | 2 files changed, 3 insertions(+), 4 deletions(-) | ||
18 | |||
19 | diff --git a/Foundation/include/Poco/AsyncChannel.h b/Foundation/include/Poco/AsyncChannel.h | ||
20 | index 190bae7dd..d73ea6c72 100644 | ||
21 | --- a/Foundation/include/Poco/AsyncChannel.h | ||
22 | +++ b/Foundation/include/Poco/AsyncChannel.h | ||
23 | @@ -111,7 +111,7 @@ private: | ||
24 | NotificationQueue _queue; | ||
25 | std::size_t _queueSize = 0; | ||
26 | std::size_t _dropCount = 0; | ||
27 | - std::atomic<bool> _closed; | ||
28 | + std::atomic<int> _closed; | ||
29 | }; | ||
30 | |||
31 | |||
32 | diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp | ||
33 | index 37cdec477..e829b180c 100644 | ||
34 | --- a/Foundation/src/AsyncChannel.cpp | ||
35 | +++ b/Foundation/src/AsyncChannel.cpp | ||
36 | @@ -48,11 +48,10 @@ private: | ||
37 | Message _msg; | ||
38 | }; | ||
39 | |||
40 | - | ||
41 | AsyncChannel::AsyncChannel(Channel::Ptr pChannel, Thread::Priority prio): | ||
42 | _pChannel(pChannel), | ||
43 | _thread("AsyncChannel"), | ||
44 | - _closed(false) | ||
45 | + _closed(0) | ||
46 | { | ||
47 | _thread.setPriority(prio); | ||
48 | } | ||
49 | @@ -95,7 +94,7 @@ void AsyncChannel::open() | ||
50 | |||
51 | void AsyncChannel::close() | ||
52 | { | ||
53 | - if (!_closed.exchange(true)) | ||
54 | + if (!_closed.exchange(1)) | ||
55 | { | ||
56 | if (_thread.isRunning()) | ||
57 | { | ||
58 | -- | ||
59 | 2.39.1 | ||
60 | |||
diff --git a/meta-oe/recipes-support/poco/poco_1.13.3.bb b/meta-oe/recipes-support/poco/poco_1.13.3.bb index 6ad577b37..0beffab99 100644 --- a/meta-oe/recipes-support/poco/poco_1.13.3.bb +++ b/meta-oe/recipes-support/poco/poco_1.13.3.bb | |||
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" | |||
8 | # These dependencies are required by Foundation | 8 | # These dependencies are required by Foundation |
9 | DEPENDS = "libpcre2 zlib" | 9 | DEPENDS = "libpcre2 zlib" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/pocoproject/poco.git;branch=master-unused;protocol=https \ | 11 | SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-1.13.3;protocol=https \ |
12 | file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ | ||
13 | file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ | 12 | file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ |
14 | file://run-ptest \ | 13 | file://run-ptest \ |
15 | " | 14 | " |
16 | SRCREV = "d6bd48a94c5f03e3c69cac1b024fdad5120e3a7b" | 15 | SRCREV = "7f848d25aa0461d3beeff1189dc61b48ffe8e2f4" |
17 | 16 | ||
18 | UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" | 17 | UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" |
19 | 18 | ||
diff --git a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch index adbe82263..ab2fbf7d9 100644 --- a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch +++ b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch | |||
@@ -40,11 +40,9 @@ Upstream-Status: Pending | |||
40 | utils/CMakeLists.txt | 10 +++++----- | 40 | utils/CMakeLists.txt | 10 +++++----- |
41 | 6 files changed, 16 insertions(+), 16 deletions(-) | 41 | 6 files changed, 16 insertions(+), 16 deletions(-) |
42 | 42 | ||
43 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
44 | index c6c757c..5f1c540 100644 | ||
45 | --- a/CMakeLists.txt | 43 | --- a/CMakeLists.txt |
46 | +++ b/CMakeLists.txt | 44 | +++ b/CMakeLists.txt |
47 | @@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS}) | 45 | @@ -628,10 +628,10 @@ add_library(poppler ${poppler_SRCS} ${LI |
48 | if (OpenJPEG_FOUND) | 46 | if (OpenJPEG_FOUND) |
49 | # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed | 47 | # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed |
50 | # target openjp2 may lack interface include directories | 48 | # target openjp2 may lack interface include directories |
@@ -56,9 +54,7 @@ index c6c757c..5f1c540 100644 | |||
56 | + target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) | 54 | + target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) |
57 | endif() | 55 | endif() |
58 | generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") | 56 | generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") |
59 | set_target_properties(poppler PROPERTIES VERSION 127.0.0 SOVERSION 127) | 57 | set_target_properties(poppler PROPERTIES |
60 | diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt | ||
61 | index 52e8687..08ab39a 100644 | ||
62 | --- a/glib/CMakeLists.txt | 58 | --- a/glib/CMakeLists.txt |
63 | +++ b/glib/CMakeLists.txt | 59 | +++ b/glib/CMakeLists.txt |
64 | @@ -4,7 +4,7 @@ include_directories( | 60 | @@ -4,7 +4,7 @@ include_directories( |
@@ -66,7 +62,7 @@ index 52e8687..08ab39a 100644 | |||
66 | 62 | ||
67 | include_directories( | 63 | include_directories( |
68 | - SYSTEM | 64 | - SYSTEM |
69 | + | 65 | + |
70 | ${GLIB2_INCLUDE_DIRS} | 66 | ${GLIB2_INCLUDE_DIRS} |
71 | ${CAIRO_INCLUDE_DIRS} | 67 | ${CAIRO_INCLUDE_DIRS} |
72 | ) | 68 | ) |
@@ -78,9 +74,7 @@ index 52e8687..08ab39a 100644 | |||
78 | +target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS}) | 74 | +target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS}) |
79 | install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 75 | install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
80 | 76 | ||
81 | install(FILES | 77 | if (ENABLE_NSS3) |
82 | diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt | ||
83 | index 5db3a6c..f242d29 100644 | ||
84 | --- a/qt5/src/CMakeLists.txt | 78 | --- a/qt5/src/CMakeLists.txt |
85 | +++ b/qt5/src/CMakeLists.txt | 79 | +++ b/qt5/src/CMakeLists.txt |
86 | @@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) | 80 | @@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) |
@@ -97,8 +91,6 @@ index 5db3a6c..f242d29 100644 | |||
97 | endif() | 91 | endif() |
98 | install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 92 | install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
99 | 93 | ||
100 | diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt | ||
101 | index cd91975..6c42e12 100644 | ||
102 | --- a/qt6/src/CMakeLists.txt | 94 | --- a/qt6/src/CMakeLists.txt |
103 | +++ b/qt6/src/CMakeLists.txt | 95 | +++ b/qt6/src/CMakeLists.txt |
104 | @@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) | 96 | @@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) |
@@ -115,8 +107,6 @@ index cd91975..6c42e12 100644 | |||
115 | endif() | 107 | endif() |
116 | install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | 108 | install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
117 | 109 | ||
118 | diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt | ||
119 | index afa1352..9bd3b9a 100644 | ||
120 | --- a/test/CMakeLists.txt | 110 | --- a/test/CMakeLists.txt |
121 | +++ b/test/CMakeLists.txt | 111 | +++ b/test/CMakeLists.txt |
122 | @@ -23,7 +23,7 @@ if (GTK_FOUND) | 112 | @@ -23,7 +23,7 @@ if (GTK_FOUND) |
@@ -146,11 +136,9 @@ index afa1352..9bd3b9a 100644 | |||
146 | endif () | 136 | endif () |
147 | endif () | 137 | endif () |
148 | 138 | ||
149 | diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt | ||
150 | index 1c3ebcb..bc1840a 100644 | ||
151 | --- a/utils/CMakeLists.txt | 139 | --- a/utils/CMakeLists.txt |
152 | +++ b/utils/CMakeLists.txt | 140 | +++ b/utils/CMakeLists.txt |
153 | @@ -16,7 +16,7 @@ add_executable(pdftoppm ${pdftoppm_SOURCES}) | 141 | @@ -18,7 +18,7 @@ add_executable(pdftoppm ${pdftoppm_SOURC |
154 | target_link_libraries(pdftoppm ${common_libs}) | 142 | target_link_libraries(pdftoppm ${common_libs}) |
155 | if(LCMS2_FOUND) | 143 | if(LCMS2_FOUND) |
156 | target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) | 144 | target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) |
@@ -159,7 +147,7 @@ index 1c3ebcb..bc1840a 100644 | |||
159 | endif() | 147 | endif() |
160 | install(TARGETS pdftoppm DESTINATION bin) | 148 | install(TARGETS pdftoppm DESTINATION bin) |
161 | install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) | 149 | install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
162 | @@ -37,10 +37,10 @@ if (HAVE_CAIRO) | 150 | @@ -39,10 +39,10 @@ if (HAVE_CAIRO) |
163 | add_definitions(${CAIRO_CFLAGS}) | 151 | add_definitions(${CAIRO_CFLAGS}) |
164 | add_executable(pdftocairo ${pdftocairo_SOURCES}) | 152 | add_executable(pdftocairo ${pdftocairo_SOURCES}) |
165 | target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) | 153 | target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) |
@@ -172,16 +160,16 @@ index 1c3ebcb..bc1840a 100644 | |||
172 | endif() | 160 | endif() |
173 | install(TARGETS pdftocairo DESTINATION bin) | 161 | install(TARGETS pdftocairo DESTINATION bin) |
174 | install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) | 162 | install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) |
175 | @@ -99,7 +99,7 @@ if (ENABLE_NSS3) | 163 | @@ -109,7 +109,7 @@ if (ENABLE_SIGNATURES) |
176 | pdfsig.cc | ||
177 | ) | ||
178 | add_executable(pdfsig ${pdfsig_SOURCES}) | 164 | add_executable(pdfsig ${pdfsig_SOURCES}) |
179 | - target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) | ||
180 | + target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS}) | ||
181 | target_link_libraries(pdfsig ${common_libs}) | 165 | target_link_libraries(pdfsig ${common_libs}) |
182 | install(TARGETS pdfsig DESTINATION bin) | 166 | if (ENABLE_NSS3) |
183 | install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) | 167 | - target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) |
184 | @@ -114,7 +114,7 @@ add_executable(pdftops ${pdftops_SOURCES}) | 168 | + target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS}) |
169 | endif() | ||
170 | if (Intl_FOUND) | ||
171 | target_link_libraries(pdfsig Intl::Intl) | ||
172 | @@ -127,7 +127,7 @@ add_executable(pdftops ${pdftops_SOURCES | ||
185 | target_link_libraries(pdftops ${common_libs}) | 173 | target_link_libraries(pdftops ${common_libs}) |
186 | if(LCMS2_FOUND) | 174 | if(LCMS2_FOUND) |
187 | target_link_libraries(pdftops ${LCMS2_LIBRARIES}) | 175 | target_link_libraries(pdftops ${LCMS2_LIBRARIES}) |
diff --git a/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch b/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch deleted file mode 100644 index cc942fad7..000000000 --- a/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 591235c8b6c65a2eee88991b9ae73490fd9afdfe Mon Sep 17 00:00:00 2001 | ||
2 | From: Albert Astals Cid <aacid@kde.org> | ||
3 | Date: Fri, 18 Aug 2023 11:36:06 +0000 | ||
4 | Subject: [PATCH] OutlineItem::open: Fix crash on malformed files | ||
5 | |||
6 | Fixes #1399 | ||
7 | |||
8 | CVE: CVE-2023-34872 | ||
9 | |||
10 | Upstream-Status: Backport [https://gitlab.freedesktop.org/poppler/poppler/-/commit/591235c8b6c65a2eee88991b9ae73490fd9afdfe] | ||
11 | |||
12 | Signed-off-by: Yogita Urade <yogita.urade@windriver.com> | ||
13 | --- | ||
14 | poppler/Outline.cc | 10 +++++++--- | ||
15 | 1 file changed, 7 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/poppler/Outline.cc b/poppler/Outline.cc | ||
18 | index cbb6cb4..4c68be9 100644 | ||
19 | --- a/poppler/Outline.cc | ||
20 | +++ b/poppler/Outline.cc | ||
21 | @@ -14,7 +14,7 @@ | ||
22 | // under GPL version 2 or later | ||
23 | // | ||
24 | // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com> | ||
25 | -// Copyright (C) 2008, 2016-2019, 2021 Albert Astals Cid <aacid@kde.org> | ||
26 | +// Copyright (C) 2008, 2016-2019, 2021, 2023 Albert Astals Cid <aacid@kde.org> | ||
27 | // Copyright (C) 2009 Nick Jones <nick.jones@network-box.com> | ||
28 | // Copyright (C) 2016 Jason Crain <jason@aquaticape.us> | ||
29 | // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> | ||
30 | @@ -483,8 +483,12 @@ void OutlineItem::open() | ||
31 | { | ||
32 | if (!kids) { | ||
33 | Object itemDict = xref->fetch(ref); | ||
34 | - const Object &firstRef = itemDict.dictLookupNF("First"); | ||
35 | - kids = readItemList(this, &firstRef, xref, doc); | ||
36 | + if (itemDict.isDict()) { | ||
37 | + const Object &firstRef = itemDict.dictLookupNF("First"); | ||
38 | + kids = readItemList(this, &firstRef, xref, doc); | ||
39 | + } else { | ||
40 | + kids = new std::vector<OutlineItem *>(); | ||
41 | + } | ||
42 | } | ||
43 | } | ||
44 | |||
45 | -- | ||
46 | 2.35.5 | ||
diff --git a/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch deleted file mode 100644 index 70ba1cf12..000000000 --- a/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 2986f06c7cc9d64a506ebe861b8bf38f73386e86 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jordan Abrahams-Whitehead <ajordanr@google.com> | ||
3 | Date: Tue, 16 May 2023 18:52:19 +0000 | ||
4 | Subject: [PATCH] Add missing #include <cstdio> prior to jpeglib.h | ||
5 | |||
6 | Fixes #1398 | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
10 | --- | ||
11 | goo/JpegWriter.cc | 2 +- | ||
12 | poppler/ImageEmbeddingUtils.cc | 1 + | ||
13 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc | ||
16 | index ca69fd055..566ee38f8 100644 | ||
17 | --- a/goo/JpegWriter.cc | ||
18 | +++ b/goo/JpegWriter.cc | ||
19 | @@ -23,7 +23,7 @@ | ||
20 | #ifdef ENABLE_LIBJPEG | ||
21 | |||
22 | # include "poppler/Error.h" | ||
23 | - | ||
24 | +# include <cstdio> | ||
25 | extern "C" { | ||
26 | # include <jpeglib.h> | ||
27 | } | ||
28 | diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc | ||
29 | index 0c13fe968..07b9dfb62 100644 | ||
30 | --- a/poppler/ImageEmbeddingUtils.cc | ||
31 | +++ b/poppler/ImageEmbeddingUtils.cc | ||
32 | @@ -14,6 +14,7 @@ | ||
33 | |||
34 | #include <memory> | ||
35 | #ifdef ENABLE_LIBJPEG | ||
36 | +# include <cstdio> | ||
37 | extern "C" { | ||
38 | # include <jpeglib.h> | ||
39 | } | ||
40 | -- | ||
41 | GitLab | ||
diff --git a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb b/meta-oe/recipes-support/poppler/poppler_24.09.0.bb index f4411e116..fb6b534cf 100644 --- a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_24.09.0.bb | |||
@@ -7,24 +7,24 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ | |||
7 | file://0001-Do-not-overwrite-all-our-build-flags.patch \ | 7 | file://0001-Do-not-overwrite-all-our-build-flags.patch \ |
8 | file://basename-include.patch \ | 8 | file://basename-include.patch \ |
9 | file://0001-cmake-Do-not-use-isystem.patch \ | 9 | file://0001-cmake-Do-not-use-isystem.patch \ |
10 | file://jpeg-stdio.patch \ | ||
11 | file://CVE-2023-34872.patch \ | ||
12 | " | 10 | " |
13 | SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" | 11 | SRC_URI[sha256sum] = "ebd857987e2395608c69fdc44009692d5906f13b612c5280beff65a0b75dc255" |
14 | 12 | ||
15 | DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" | 13 | DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" |
16 | 14 | ||
17 | inherit cmake pkgconfig gobject-introspection | 15 | inherit cmake pkgconfig gobject-introspection |
18 | 16 | ||
19 | PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" | 17 | PACKAGECONFIG ??= "boost jpeg nss openjpeg png tiff" |
18 | PACKAGECONFIG[boost] = "-DENABLE_BOOST=ON,-DENABLE_BOOST=OFF,boost" | ||
20 | PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" | 19 | PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" |
21 | PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" | 20 | PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" |
22 | PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" | 21 | PACKAGECONFIG[tiff] = "-DENABLE_LIBTIFF=ON,-DENABLE_LIBTIFF=OFF,tiff" |
23 | PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" | 22 | PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" |
24 | PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" | 23 | PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" |
25 | PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" | 24 | PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" |
26 | PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" | 25 | PACKAGECONFIG[nss] = "-DENABLE_NSS3=ON,-DENABLE_NSS3=OFF,nss" |
27 | PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" | 26 | PACKAGECONFIG[gpgme] = "-DENABLE_GPGME=ON,-DENABLE_GPGME=OFF,gpgme" |
27 | PACKAGECONFIG[qt6] = "-DENABLE_QT6=ON,-DENABLE_QT6=OFF,qtbase" | ||
28 | 28 | ||
29 | # surprise - did not expect this to work :) | 29 | # surprise - did not expect this to work :) |
30 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} | 30 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} |
@@ -32,10 +32,9 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} | |||
32 | SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" | 32 | SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" |
33 | 33 | ||
34 | EXTRA_OECMAKE += " \ | 34 | EXTRA_OECMAKE += " \ |
35 | -DENABLE_CMS=lcms2 \ | 35 | -DENABLE_LCMS=ON \ |
36 | -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ | 36 | -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ |
37 | -DBUILD_GTK_TESTS=OFF \ | 37 | -DBUILD_GTK_TESTS=OFF \ |
38 | -DENABLE_ZLIB=ON \ | ||
39 | -DRUN_GPERF_IF_PRESENT=OFF \ | 38 | -DRUN_GPERF_IF_PRESENT=OFF \ |
40 | -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ | 39 | -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ |
41 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ | 40 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ |
diff --git a/meta-oe/recipes-support/procmail/procmail_3.22.bb b/meta-oe/recipes-support/procmail/procmail_3.22.bb index 16917666a..abb87f993 100644 --- a/meta-oe/recipes-support/procmail/procmail_3.22.bb +++ b/meta-oe/recipes-support/procmail/procmail_3.22.bb | |||
@@ -33,7 +33,7 @@ do_configure() { | |||
33 | } | 33 | } |
34 | 34 | ||
35 | do_compile() { | 35 | do_compile() { |
36 | oe_runmake -i TARGET_CFLAGS="$TARGET_CFLAGS -Wno-comments -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}" | 36 | oe_runmake -i CFLAGS="$TARGET_CFLAGS -Wno-comments -Wno-implicit-int -Wno-implicit-function-declaration -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}" |
37 | } | 37 | } |
38 | 38 | ||
39 | do_install() { | 39 | do_install() { |
diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-oe/recipes-support/pv/pv_1.6.20.bb index 6a739af92..ac26ef936 100644 --- a/meta-oe/recipes-support/pv/pv_1.6.20.bb +++ b/meta-oe/recipes-support/pv/pv_1.6.20.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \ | |||
11 | SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" | 11 | SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" |
12 | 12 | ||
13 | UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" | 13 | UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" |
14 | UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar.bz2" | 14 | UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar" |
15 | 15 | ||
16 | inherit autotools ptest | 16 | inherit autotools ptest |
17 | 17 | ||
diff --git a/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch b/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch new file mode 100644 index 000000000..b12beff6c --- /dev/null +++ b/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | Do not use curl-config | ||
2 | |||
3 | Sourced from | ||
4 | https://bugs.gentoo.org/552474 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- a/configure.ac | ||
9 | +++ b/configure.ac | ||
10 | @@ -596,49 +596,12 @@ else | ||
11 | PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [have_libxslt=1], [have_libxslt=0]) | ||
12 | fi | ||
13 | |||
14 | -dnl curl | ||
15 | -AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="") | ||
16 | - | ||
17 | -if test "X$curl_config" != "Xno" ; then | ||
18 | - if test "X$curl_config" != "X" ; then | ||
19 | - AC_MSG_CHECKING(for $curl_config) | ||
20 | - | ||
21 | - if test -f $curl_config ; then | ||
22 | - CURL_CONFIG=$curl_config | ||
23 | - AC_MSG_RESULT(yes) | ||
24 | - else | ||
25 | - AC_MSG_RESULT(no - searching PATH) | ||
26 | - fi | ||
27 | - fi | ||
28 | - if test "X$CURL_CONFIG" = "X" ; then | ||
29 | - AC_CHECK_PROGS(CURL_CONFIG, curl-config) | ||
30 | - fi | ||
31 | -fi | ||
32 | - | ||
33 | libcurl_source=no | ||
34 | -if test "X$CURL_CONFIG" != "X"; then | ||
35 | - LIBCURL_CFLAGS=`$CURL_CONFIG --cflags` | ||
36 | - LIBCURL_LIBS=`$CURL_CONFIG --libs` | ||
37 | - | ||
38 | - CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS" | ||
39 | - LIBS="$LIBS $LIBCURL_LIBS" | ||
40 | - AC_CHECK_HEADER(curl/curl.h) | ||
41 | - AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no) | ||
42 | - | ||
43 | - AC_MSG_CHECKING(for libcurl via curl-config) | ||
44 | - if test $have_curl_easy_init = yes; then | ||
45 | - libcurl_source="curl-config" | ||
46 | - LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'` | ||
47 | - fi | ||
48 | - CPPFLAGS="$oCPPFLAGS" | ||
49 | - LIBS="$oLIBS" | ||
50 | -else | ||
51 | - PKG_CHECK_MODULES([LIBCURL],[libcurl],[ | ||
52 | - LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` | ||
53 | - libcurl_source="pkg-config" | ||
54 | - ], [:]) | ||
55 | - AC_MSG_CHECKING(for libcurl via pkg-config) | ||
56 | -fi | ||
57 | +PKG_CHECK_MODULES([LIBCURL],[libcurl],[ | ||
58 | + LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` | ||
59 | + libcurl_source="pkg-config" | ||
60 | +], [:]) | ||
61 | +AC_MSG_CHECKING(for libcurl via pkg-config) | ||
62 | |||
63 | if test "$libcurl_source" = "no"; then | ||
64 | AC_MSG_RESULT(no - not found) | ||
65 | @@ -1033,7 +996,7 @@ need_libcurl=0 | ||
66 | need_libxml_www=0 | ||
67 | need_libfetch=0 | ||
68 | |||
69 | -if test "X$CURL_CONFIG" != X; then | ||
70 | +if test "$libcurl_source" != "no"; then | ||
71 | CPPFLAGS="$CPPFLAGS $LIBCURL_CFLAGS" | ||
72 | LIBS="$LIBS $LIBCURL_LIBS" | ||
73 | AC_CHECK_HEADER(curl/curl.h) | ||
diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb index 85012bcfb..7014a28c0 100644 --- a/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb +++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb | |||
@@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = " \ | |||
7 | file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 7 | file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
8 | " | 8 | " |
9 | 9 | ||
10 | DEPENDS = "libxml2 libxslt curl yajl" | 10 | DEPENDS = "bison-native flex-native libxml2 libxslt curl yajl" |
11 | 11 | ||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ | 13 | http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ |
14 | file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ | 14 | file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ |
15 | file://raptor-2.0.16-dont_use_curl-config.patch \ | ||
15 | " | 16 | " |
16 | SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" | 17 | SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" |
17 | 18 | ||
18 | inherit autotools pkgconfig gtk-doc | 19 | inherit autotools pkgconfig gtk-doc perlnative |
19 | 20 | ||
20 | EXTRA_OECONF = " \ | 21 | EXTRA_OECONF = " \ |
21 | --without-xml2-config \ | 22 | --without-xml2-config \ |
22 | --without-curl-config \ | ||
23 | --without-xslt-config \ | 23 | --without-xslt-config \ |
24 | " | 24 | " |
diff --git a/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb index c038966ba..5e0c6cd21 100644 --- a/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb +++ b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb | |||
@@ -8,6 +8,9 @@ SRCREV = "84831b20512abd9033414ca5f5a023f333525335" | |||
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | 10 | ||
11 | # Upstream repo has not made releases/tags after 1.0.0 | ||
12 | UPSTREAM_CHECK_COMMITS = "1" | ||
13 | |||
11 | do_compile() { | 14 | do_compile() { |
12 | ${CC} ${CFLAGS} ${LDFLAGS} ${S}/reboot-mode.c -o ${B}/reboot-mode | 15 | ${CC} ${CFLAGS} ${LDFLAGS} ${S}/reboot-mode.c -o ${B}/reboot-mode |
13 | } | 16 | } |
diff --git a/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb index 57b31a78d..688975822 100644 --- a/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb +++ b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb | |||
@@ -27,3 +27,5 @@ do_compile () { | |||
27 | do_install () { | 27 | do_install () { |
28 | oe_runmake install 'DESTDIR=${D}' | 28 | oe_runmake install 'DESTDIR=${D}' |
29 | } | 29 | } |
30 | |||
31 | COMPATIBLE_HOST:riscv32 = "null" | ||
diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch new file mode 100644 index 000000000..6d8a5e212 --- /dev/null +++ b/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From fb8bf1c1b1d0bf8e9bc637c0e67219fab1a9eb03 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 14 Aug 2024 15:24:57 -0700 | ||
4 | Subject: [PATCH] libopts.m4: accept POSIX_SHELL from the environment during | ||
5 | the configure step | ||
6 | |||
7 | This lets us set it to the canonical path /bin/bash, even on systems | ||
8 | where both /bin/bash and /usr/bin/bash are available, and therefore | ||
9 | which(1) might return /usr/bin/bash (depending on PATH order). | ||
10 | |||
11 | Both copies of libopts.m4 are marked as generated files, but the files | ||
12 | from which they were generated do not seem to be present in the sharutils | ||
13 | package. This change is equivalent to part of a 2016 autogen commit | ||
14 | <https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a>. | ||
15 | |||
16 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a] | ||
17 | |||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | --- | ||
20 | libopts/m4/libopts.m4 | 1 + | ||
21 | m4/libopts.m4 | 1 + | ||
22 | 2 files changed, 2 insertions(+) | ||
23 | |||
24 | diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4 | ||
25 | index 1a896d9..3b88426 100644 | ||
26 | --- a/libopts/m4/libopts.m4 | ||
27 | +++ b/libopts/m4/libopts.m4 | ||
28 | @@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ | ||
29 | AC_PROG_SED | ||
30 | [while : | ||
31 | do | ||
32 | + test -x "$POSIX_SHELL" && break | ||
33 | POSIX_SHELL=`which bash` | ||
34 | test -x "$POSIX_SHELL" && break | ||
35 | POSIX_SHELL=`which dash` | ||
36 | diff --git a/m4/libopts.m4 b/m4/libopts.m4 | ||
37 | index c7ba4f3..a1127e1 100644 | ||
38 | --- a/m4/libopts.m4 | ||
39 | +++ b/m4/libopts.m4 | ||
40 | @@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ | ||
41 | AC_PROG_SED | ||
42 | [while : | ||
43 | do | ||
44 | + test -x "$POSIX_SHELL" && break | ||
45 | POSIX_SHELL=`which bash` | ||
46 | test -x "$POSIX_SHELL" && break | ||
47 | POSIX_SHELL=`which dash` | ||
diff --git a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb index 2a16b1828..7a506d034 100644 --- a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb +++ b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb | |||
@@ -13,10 +13,13 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ | |||
13 | file://0001-Fix-building-with-GCC-10.patch \ | 13 | file://0001-Fix-building-with-GCC-10.patch \ |
14 | file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \ | 14 | file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \ |
15 | file://0001-configure.ac-Check-and-define-intmax_t-type.patch \ | 15 | file://0001-configure.ac-Check-and-define-intmax_t-type.patch \ |
16 | file://0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800" | 18 | SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800" |
18 | SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" | 19 | SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" |
19 | 20 | ||
21 | EXTRA_OECONF = "POSIX_SHELL=${base_bindir}/sh" | ||
22 | |||
20 | do_install:append() { | 23 | do_install:append() { |
21 | if [ -e ${D}${libdir}/charset.alias ] | 24 | if [ -e ${D}${libdir}/charset.alias ] |
22 | then | 25 | then |
diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch deleted file mode 100644 index f21ad5d70..000000000 --- a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 896d77dd949b52d6ea5798e5a038ba97d6b802be Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Marko <peter.marko@siemens.com> | ||
3 | Date: Thu, 4 Apr 2024 15:44:18 +0200 | ||
4 | Subject: [PATCH] macros: guard ipv6 code with SYSLOG_NG_ENABLE_IPV6 | ||
5 | |||
6 | With ipv6 disabled, there are linking errors currently. | ||
7 | This fixes it by not using the symbols when IPv6 is disabled. | ||
8 | |||
9 | Solves #4810 with my config options | ||
10 | https://github.com/openembedded/meta-openembedded/blob/2487e65ee3842b6ae0c7a2628985be6189ed9ebf/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/4880] | ||
13 | |||
14 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
15 | --- | ||
16 | lib/template/macros.c | 2 ++ | ||
17 | 1 file changed, 2 insertions(+) | ||
18 | |||
19 | diff --git a/lib/template/macros.c b/lib/template/macros.c | ||
20 | index 54142706c..fcb83637f 100644 | ||
21 | --- a/lib/template/macros.c | ||
22 | +++ b/lib/template/macros.c | ||
23 | @@ -277,12 +277,14 @@ _get_originating_ip_protocol(const LogMessage *msg) | ||
24 | return 0; | ||
25 | if (g_sockaddr_inet_check(msg->saddr)) | ||
26 | return 4; | ||
27 | +#if SYSLOG_NG_ENABLE_IPV6 | ||
28 | if (g_sockaddr_inet6_check(msg->saddr)) | ||
29 | { | ||
30 | if (g_sockaddr_inet6_is_v4_mapped(msg->saddr)) | ||
31 | return 4; | ||
32 | return 6; | ||
33 | } | ||
34 | +#endif | ||
35 | return 0; | ||
36 | } | ||
37 | |||
38 | -- | ||
39 | 2.30.2 | ||
40 | |||
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.7.0.bb index ab4a8d182..588a38126 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb | |||
@@ -13,7 +13,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" | |||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec" | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec" |
14 | 14 | ||
15 | # util-linux added to get libuuid | 15 | # util-linux added to get libuuid |
16 | DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl" | 16 | DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl json-c" |
17 | 17 | ||
18 | SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ | 18 | SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ |
19 | file://syslog-ng.conf.systemd \ | 19 | file://syslog-ng.conf.systemd \ |
@@ -23,11 +23,10 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta | |||
23 | file://syslog-ng-tmp.conf \ | 23 | file://syslog-ng-tmp.conf \ |
24 | file://syslog-ng.service-the-syslog-ng-service.patch \ | 24 | file://syslog-ng.service-the-syslog-ng-service.patch \ |
25 | file://0001-Fix-buildpaths-warning.patch \ | 25 | file://0001-Fix-buildpaths-warning.patch \ |
26 | file://0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch \ | ||
27 | " | 26 | " |
28 | SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" | 27 | SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" |
29 | 28 | ||
30 | SRC_URI[sha256sum] = "b69e3360dfb96a754a4e1cbead4daef37128b1152a23572356db4ab64a475d4f" | 29 | SRC_URI[sha256sum] = "b601265362c633a25f26c497a7e57592739d5a583b7963b722ff58f01b853506" |
31 | 30 | ||
32 | UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" | 31 | UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" |
33 | 32 | ||
diff --git a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch b/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch deleted file mode 100644 index 640b13170..000000000 --- a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 7ffc1eba8596544d6e3af0fd5f4004fff6d56f84 Mon Sep 17 00:00:00 2001 | ||
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 15:48:57 +0800 | ||
4 | Subject: [PATCH] hwloc_detection.cmake: remove cross-compiation check | ||
5 | |||
6 | This check is preventing pkgconfig to | ||
7 | search for hwloc under cross-compilation. | ||
8 | |||
9 | pkgconfig able to find hwloc pkg from sysroot. | ||
10 | |||
11 | Upstream-Status: Inappropriate | ||
12 | |||
13 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
14 | --- | ||
15 | cmake/hwloc_detection.cmake | 2 -- | ||
16 | 1 file changed, 2 deletions(-) | ||
17 | |||
18 | diff --git a/cmake/hwloc_detection.cmake b/cmake/hwloc_detection.cmake | ||
19 | index 47233b17..5a7e84c3 100644 | ||
20 | --- a/cmake/hwloc_detection.cmake | ||
21 | +++ b/cmake/hwloc_detection.cmake | ||
22 | @@ -46,8 +46,6 @@ endforeach() | ||
23 | unset(HWLOC_TARGET_NAME) | ||
24 | |||
25 | if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND | ||
26 | - # No hwloc auto detection for cross compilation | ||
27 | - NOT CMAKE_CROSSCOMPILING AND | ||
28 | NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH | ||
29 | ) | ||
30 | find_package(PkgConfig QUIET) | ||
31 | -- | ||
32 | 2.37.3 | ||
33 | |||
diff --git a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.13.0.bb index f834726bd..e2b7543c0 100644 --- a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb +++ b/meta-oe/recipes-support/tbb/tbb_2021.13.0.bb | |||
@@ -13,10 +13,10 @@ DEPENDS:append:class-target = " hwloc" | |||
13 | PE = "1" | 13 | PE = "1" |
14 | 14 | ||
15 | BRANCH = "onetbb_2021" | 15 | BRANCH = "onetbb_2021" |
16 | SRCREV = "8b829acc65569019edb896c5150d427f288e8aba" | 16 | SRCREV = "1c4c93fc5398c4a1acb3492c02db4699f3048dea" |
17 | SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ | 17 | SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ |
18 | file://0001-hwloc_detection.cmake-remove-cross-compiation-check.patch \ | 18 | " |
19 | " | 19 | |
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
21 | 21 | ||
22 | inherit cmake pkgconfig | 22 | inherit cmake pkgconfig |
@@ -25,6 +25,7 @@ inherit cmake pkgconfig | |||
25 | EXTRA_OECMAKE += " \ | 25 | EXTRA_OECMAKE += " \ |
26 | -DTBB_TEST=OFF \ | 26 | -DTBB_TEST=OFF \ |
27 | -DCMAKE_BUILD_TYPE=Release \ | 27 | -DCMAKE_BUILD_TYPE=Release \ |
28 | -DTBB_STRICT=OFF \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | # Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi) | 31 | # Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi) |
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc index d71aa442f..c5c059dd1 100644 --- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc | |||
@@ -3,212 +3,214 @@ | |||
3 | # from Cargo.lock | 3 | # from Cargo.lock |
4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
5 | crate://crates.io/adler/1.0.2 \ | 5 | crate://crates.io/adler/1.0.2 \ |
6 | crate://crates.io/aho-corasick/1.1.2 \ | 6 | crate://crates.io/aho-corasick/1.1.3 \ |
7 | crate://crates.io/anstyle/1.0.6 \ | 7 | crate://crates.io/anstyle/1.0.7 \ |
8 | crate://crates.io/anyhow/1.0.80 \ | 8 | crate://crates.io/anyhow/1.0.86 \ |
9 | crate://crates.io/atty/0.2.14 \ | 9 | crate://crates.io/atty/0.2.14 \ |
10 | crate://crates.io/autocfg/1.1.0 \ | 10 | crate://crates.io/autocfg/1.3.0 \ |
11 | crate://crates.io/base64/0.21.7 \ | 11 | crate://crates.io/base64/0.22.1 \ |
12 | crate://crates.io/bitflags/1.3.2 \ | 12 | crate://crates.io/bitflags/1.3.2 \ |
13 | crate://crates.io/bitflags/2.4.2 \ | 13 | crate://crates.io/bitflags/2.6.0 \ |
14 | crate://crates.io/bytemuck/1.14.3 \ | 14 | crate://crates.io/bytemuck/1.16.1 \ |
15 | crate://crates.io/byteorder/1.5.0 \ | 15 | crate://crates.io/byteorder/1.5.0 \ |
16 | crate://crates.io/cassowary/0.3.0 \ | 16 | crate://crates.io/cassowary/0.3.0 \ |
17 | crate://crates.io/cfg-if/1.0.0 \ | 17 | crate://crates.io/cfg-if/1.0.0 \ |
18 | crate://crates.io/clap/4.5.1 \ | 18 | crate://crates.io/clap/4.5.9 \ |
19 | crate://crates.io/clap_builder/4.5.1 \ | 19 | crate://crates.io/clap_builder/4.5.9 \ |
20 | crate://crates.io/clap_lex/0.7.0 \ | 20 | crate://crates.io/clap_lex/0.7.1 \ |
21 | crate://crates.io/console/0.15.8 \ | 21 | crate://crates.io/console/0.15.8 \ |
22 | crate://crates.io/crc32c/0.6.5 \ | 22 | crate://crates.io/crc32c/0.6.8 \ |
23 | crate://crates.io/crc32fast/1.4.0 \ | 23 | crate://crates.io/crc32fast/1.4.2 \ |
24 | crate://crates.io/data-encoding/2.5.0 \ | 24 | crate://crates.io/data-encoding/2.6.0 \ |
25 | crate://crates.io/downcast/0.11.0 \ | 25 | crate://crates.io/downcast/0.11.0 \ |
26 | crate://crates.io/duct/0.13.7 \ | 26 | crate://crates.io/duct/0.13.7 \ |
27 | crate://crates.io/encode_unicode/0.3.6 \ | 27 | crate://crates.io/encode_unicode/0.3.6 \ |
28 | crate://crates.io/env_logger/0.8.4 \ | 28 | crate://crates.io/env_logger/0.8.4 \ |
29 | crate://crates.io/errno/0.3.8 \ | 29 | crate://crates.io/errno/0.3.9 \ |
30 | crate://crates.io/exitcode/1.1.2 \ | 30 | crate://crates.io/exitcode/1.1.2 \ |
31 | crate://crates.io/fastrand/2.0.1 \ | 31 | crate://crates.io/fastrand/2.1.0 \ |
32 | crate://crates.io/fixedbitset/0.4.2 \ | 32 | crate://crates.io/fixedbitset/0.4.2 \ |
33 | crate://crates.io/flate2/1.0.28 \ | 33 | crate://crates.io/flate2/1.0.30 \ |
34 | crate://crates.io/fragile/2.0.0 \ | 34 | crate://crates.io/fragile/2.0.0 \ |
35 | crate://crates.io/getrandom/0.2.12 \ | 35 | crate://crates.io/getrandom/0.2.15 \ |
36 | crate://crates.io/hermit-abi/0.1.19 \ | 36 | crate://crates.io/hermit-abi/0.1.19 \ |
37 | crate://crates.io/hermit-abi/0.3.6 \ | 37 | crate://crates.io/hermit-abi/0.3.9 \ |
38 | crate://crates.io/indicatif/0.17.8 \ | 38 | crate://crates.io/indicatif/0.17.8 \ |
39 | crate://crates.io/instant/0.1.12 \ | 39 | crate://crates.io/instant/0.1.13 \ |
40 | crate://crates.io/iovec/0.1.4 \ | 40 | crate://crates.io/iovec/0.1.4 \ |
41 | crate://crates.io/lazy_static/1.4.0 \ | 41 | crate://crates.io/lazy_static/1.5.0 \ |
42 | crate://crates.io/libc/0.2.153 \ | 42 | crate://crates.io/libc/0.2.155 \ |
43 | crate://crates.io/linux-raw-sys/0.4.13 \ | 43 | crate://crates.io/linux-raw-sys/0.4.14 \ |
44 | crate://crates.io/log/0.4.20 \ | 44 | crate://crates.io/log/0.4.22 \ |
45 | crate://crates.io/memchr/2.7.1 \ | 45 | crate://crates.io/memchr/2.7.4 \ |
46 | crate://crates.io/minimal-lexical/0.2.1 \ | 46 | crate://crates.io/minimal-lexical/0.2.1 \ |
47 | crate://crates.io/miniz_oxide/0.7.2 \ | 47 | crate://crates.io/miniz_oxide/0.7.4 \ |
48 | crate://crates.io/mockall/0.12.1 \ | 48 | crate://crates.io/mockall/0.12.1 \ |
49 | crate://crates.io/mockall_derive/0.12.1 \ | 49 | crate://crates.io/mockall_derive/0.12.1 \ |
50 | crate://crates.io/nom/7.1.3 \ | 50 | crate://crates.io/nom/7.1.3 \ |
51 | crate://crates.io/num-derive/0.4.2 \ | 51 | crate://crates.io/num-derive/0.4.2 \ |
52 | crate://crates.io/num-traits/0.2.18 \ | 52 | crate://crates.io/num-traits/0.2.19 \ |
53 | crate://crates.io/num_cpus/1.16.0 \ | 53 | crate://crates.io/num_cpus/1.16.0 \ |
54 | crate://crates.io/number_prefix/0.4.0 \ | 54 | crate://crates.io/number_prefix/0.4.0 \ |
55 | crate://crates.io/numtoa/0.1.0 \ | 55 | crate://crates.io/numtoa/0.1.0 \ |
56 | crate://crates.io/once_cell/1.19.0 \ | 56 | crate://crates.io/once_cell/1.19.0 \ |
57 | crate://crates.io/os_pipe/1.1.5 \ | 57 | crate://crates.io/os_pipe/1.2.0 \ |
58 | crate://crates.io/portable-atomic/1.6.0 \ | 58 | crate://crates.io/portable-atomic/1.6.0 \ |
59 | crate://crates.io/ppv-lite86/0.2.17 \ | 59 | crate://crates.io/ppv-lite86/0.2.17 \ |
60 | crate://crates.io/predicates/3.1.0 \ | 60 | crate://crates.io/predicates/3.1.0 \ |
61 | crate://crates.io/predicates-core/1.0.6 \ | 61 | crate://crates.io/predicates-core/1.0.6 \ |
62 | crate://crates.io/predicates-tree/1.0.9 \ | 62 | crate://crates.io/predicates-tree/1.0.9 \ |
63 | crate://crates.io/proc-macro2/1.0.78 \ | 63 | crate://crates.io/proc-macro2/1.0.86 \ |
64 | crate://crates.io/quick-xml/0.31.0 \ | 64 | crate://crates.io/quick-xml/0.36.0 \ |
65 | crate://crates.io/quickcheck/1.0.3 \ | 65 | crate://crates.io/quickcheck/1.0.3 \ |
66 | crate://crates.io/quickcheck_macros/1.0.0 \ | 66 | crate://crates.io/quickcheck_macros/1.0.0 \ |
67 | crate://crates.io/quote/1.0.35 \ | 67 | crate://crates.io/quote/1.0.36 \ |
68 | crate://crates.io/rand/0.8.5 \ | 68 | crate://crates.io/rand/0.8.5 \ |
69 | crate://crates.io/rand_chacha/0.3.1 \ | 69 | crate://crates.io/rand_chacha/0.3.1 \ |
70 | crate://crates.io/rand_core/0.6.4 \ | 70 | crate://crates.io/rand_core/0.6.4 \ |
71 | crate://crates.io/rangemap/1.5.0 \ | 71 | crate://crates.io/rangemap/1.5.1 \ |
72 | crate://crates.io/redox_syscall/0.2.16 \ | 72 | crate://crates.io/redox_syscall/0.2.16 \ |
73 | crate://crates.io/redox_termios/0.1.3 \ | 73 | crate://crates.io/redox_termios/0.1.3 \ |
74 | crate://crates.io/regex/1.10.3 \ | 74 | crate://crates.io/regex/1.10.5 \ |
75 | crate://crates.io/regex-automata/0.4.5 \ | 75 | crate://crates.io/regex-automata/0.4.7 \ |
76 | crate://crates.io/regex-syntax/0.8.2 \ | 76 | crate://crates.io/regex-syntax/0.8.4 \ |
77 | crate://crates.io/roaring/0.10.3 \ | 77 | crate://crates.io/roaring/0.10.6 \ |
78 | crate://crates.io/rustc_version/0.4.0 \ | 78 | crate://crates.io/rustc_version/0.4.0 \ |
79 | crate://crates.io/rustix/0.38.31 \ | 79 | crate://crates.io/rustix/0.38.34 \ |
80 | crate://crates.io/safemem/0.3.3 \ | 80 | crate://crates.io/safemem/0.3.3 \ |
81 | crate://crates.io/semver/1.0.22 \ | 81 | crate://crates.io/semver/1.0.23 \ |
82 | crate://crates.io/shared_child/1.0.0 \ | 82 | crate://crates.io/shared_child/1.0.0 \ |
83 | crate://crates.io/strsim/0.11.0 \ | 83 | crate://crates.io/strsim/0.11.1 \ |
84 | crate://crates.io/syn/1.0.109 \ | 84 | crate://crates.io/syn/1.0.109 \ |
85 | crate://crates.io/syn/2.0.50 \ | 85 | crate://crates.io/syn/2.0.70 \ |
86 | crate://crates.io/tempfile/3.10.0 \ | 86 | crate://crates.io/tempfile/3.10.1 \ |
87 | crate://crates.io/termion/1.5.6 \ | 87 | crate://crates.io/termion/1.5.6 \ |
88 | crate://crates.io/termtree/0.4.1 \ | 88 | crate://crates.io/termtree/0.4.1 \ |
89 | crate://crates.io/thiserror/1.0.57 \ | 89 | crate://crates.io/thiserror/1.0.61 \ |
90 | crate://crates.io/thiserror-impl/1.0.57 \ | 90 | crate://crates.io/thiserror-impl/1.0.61 \ |
91 | crate://crates.io/threadpool/1.8.1 \ | 91 | crate://crates.io/threadpool/1.8.1 \ |
92 | crate://crates.io/tui/0.19.0 \ | 92 | crate://crates.io/tui/0.19.0 \ |
93 | crate://crates.io/unicode-ident/1.0.12 \ | 93 | crate://crates.io/unicode-ident/1.0.12 \ |
94 | crate://crates.io/unicode-segmentation/1.11.0 \ | 94 | crate://crates.io/unicode-segmentation/1.11.0 \ |
95 | crate://crates.io/unicode-width/0.1.11 \ | 95 | crate://crates.io/unicode-width/0.1.13 \ |
96 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ | 96 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ |
97 | crate://crates.io/winapi/0.3.9 \ | 97 | crate://crates.io/winapi/0.3.9 \ |
98 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ | 98 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ |
99 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ | 99 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ |
100 | crate://crates.io/windows-sys/0.52.0 \ | 100 | crate://crates.io/windows-sys/0.52.0 \ |
101 | crate://crates.io/windows-targets/0.52.3 \ | 101 | crate://crates.io/windows-targets/0.52.6 \ |
102 | crate://crates.io/windows_aarch64_gnullvm/0.52.3 \ | 102 | crate://crates.io/windows_aarch64_gnullvm/0.52.6 \ |
103 | crate://crates.io/windows_aarch64_msvc/0.52.3 \ | 103 | crate://crates.io/windows_aarch64_msvc/0.52.6 \ |
104 | crate://crates.io/windows_i686_gnu/0.52.3 \ | 104 | crate://crates.io/windows_i686_gnu/0.52.6 \ |
105 | crate://crates.io/windows_i686_msvc/0.52.3 \ | 105 | crate://crates.io/windows_i686_gnullvm/0.52.6 \ |
106 | crate://crates.io/windows_x86_64_gnu/0.52.3 \ | 106 | crate://crates.io/windows_i686_msvc/0.52.6 \ |
107 | crate://crates.io/windows_x86_64_gnullvm/0.52.3 \ | 107 | crate://crates.io/windows_x86_64_gnu/0.52.6 \ |
108 | crate://crates.io/windows_x86_64_msvc/0.52.3 \ | 108 | crate://crates.io/windows_x86_64_gnullvm/0.52.6 \ |
109 | crate://crates.io/windows_x86_64_msvc/0.52.6 \ | ||
109 | " | 110 | " |
110 | 111 | ||
111 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" | 112 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" |
112 | SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" | 113 | SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" |
113 | SRC_URI[anstyle-1.0.6.sha256sum] = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" | 114 | SRC_URI[anstyle-1.0.7.sha256sum] = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" |
114 | SRC_URI[anyhow-1.0.80.sha256sum] = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" | 115 | SRC_URI[anyhow-1.0.86.sha256sum] = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" |
115 | SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" | 116 | SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" |
116 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" | 117 | SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" |
117 | SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" | 118 | SRC_URI[base64-0.22.1.sha256sum] = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" |
118 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | 119 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" |
119 | SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" | 120 | SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" |
120 | SRC_URI[bytemuck-1.14.3.sha256sum] = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" | 121 | SRC_URI[bytemuck-1.16.1.sha256sum] = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" |
121 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" | 122 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" |
122 | SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" | 123 | SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" |
123 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | 124 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" |
124 | SRC_URI[clap-4.5.1.sha256sum] = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" | 125 | SRC_URI[clap-4.5.9.sha256sum] = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" |
125 | SRC_URI[clap_builder-4.5.1.sha256sum] = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" | 126 | SRC_URI[clap_builder-4.5.9.sha256sum] = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" |
126 | SRC_URI[clap_lex-0.7.0.sha256sum] = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" | 127 | SRC_URI[clap_lex-0.7.1.sha256sum] = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" |
127 | SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" | 128 | SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" |
128 | SRC_URI[crc32c-0.6.5.sha256sum] = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" | 129 | SRC_URI[crc32c-0.6.8.sha256sum] = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" |
129 | SRC_URI[crc32fast-1.4.0.sha256sum] = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" | 130 | SRC_URI[crc32fast-1.4.2.sha256sum] = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" |
130 | SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" | 131 | SRC_URI[data-encoding-2.6.0.sha256sum] = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" |
131 | SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" | 132 | SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" |
132 | SRC_URI[duct-0.13.7.sha256sum] = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" | 133 | SRC_URI[duct-0.13.7.sha256sum] = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" |
133 | SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" | 134 | SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" |
134 | SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" | 135 | SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" |
135 | SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" | 136 | SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" |
136 | SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" | 137 | SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" |
137 | SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" | 138 | SRC_URI[fastrand-2.1.0.sha256sum] = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" |
138 | SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" | 139 | SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" |
139 | SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" | 140 | SRC_URI[flate2-1.0.30.sha256sum] = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" |
140 | SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" | 141 | SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" |
141 | SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" | 142 | SRC_URI[getrandom-0.2.15.sha256sum] = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" |
142 | SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" | 143 | SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" |
143 | SRC_URI[hermit-abi-0.3.6.sha256sum] = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" | 144 | SRC_URI[hermit-abi-0.3.9.sha256sum] = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" |
144 | SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" | 145 | SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" |
145 | SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" | 146 | SRC_URI[instant-0.1.13.sha256sum] = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" |
146 | SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" | 147 | SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" |
147 | SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" | 148 | SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" |
148 | SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" | 149 | SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" |
149 | SRC_URI[linux-raw-sys-0.4.13.sha256sum] = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" | 150 | SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" |
150 | SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" | 151 | SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" |
151 | SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" | 152 | SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" |
152 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" | 153 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" |
153 | SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" | 154 | SRC_URI[miniz_oxide-0.7.4.sha256sum] = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" |
154 | SRC_URI[mockall-0.12.1.sha256sum] = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" | 155 | SRC_URI[mockall-0.12.1.sha256sum] = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" |
155 | SRC_URI[mockall_derive-0.12.1.sha256sum] = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" | 156 | SRC_URI[mockall_derive-0.12.1.sha256sum] = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" |
156 | SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" | 157 | SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" |
157 | SRC_URI[num-derive-0.4.2.sha256sum] = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" | 158 | SRC_URI[num-derive-0.4.2.sha256sum] = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" |
158 | SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" | 159 | SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" |
159 | SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" | 160 | SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" |
160 | SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" | 161 | SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" |
161 | SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" | 162 | SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" |
162 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" | 163 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" |
163 | SRC_URI[os_pipe-1.1.5.sha256sum] = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" | 164 | SRC_URI[os_pipe-1.2.0.sha256sum] = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" |
164 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" | 165 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" |
165 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" | 166 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" |
166 | SRC_URI[predicates-3.1.0.sha256sum] = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" | 167 | SRC_URI[predicates-3.1.0.sha256sum] = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" |
167 | SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" | 168 | SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" |
168 | SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" | 169 | SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" |
169 | SRC_URI[proc-macro2-1.0.78.sha256sum] = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" | 170 | SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" |
170 | SRC_URI[quick-xml-0.31.0.sha256sum] = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" | 171 | SRC_URI[quick-xml-0.36.0.sha256sum] = "4091e032efecb09d7b1f711f487b85ab925632a842627e3200fb088382cde32c" |
171 | SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" | 172 | SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" |
172 | SRC_URI[quickcheck_macros-1.0.0.sha256sum] = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" | 173 | SRC_URI[quickcheck_macros-1.0.0.sha256sum] = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" |
173 | SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" | 174 | SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" |
174 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" | 175 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" |
175 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" | 176 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" |
176 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" | 177 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" |
177 | SRC_URI[rangemap-1.5.0.sha256sum] = "795915a3930a5d6bafd9053d37602fea3e61be2e5d4d788983a8ba9654c1c6f2" | 178 | SRC_URI[rangemap-1.5.1.sha256sum] = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" |
178 | SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" | 179 | SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" |
179 | SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" | 180 | SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" |
180 | SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" | 181 | SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" |
181 | SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" | 182 | SRC_URI[regex-automata-0.4.7.sha256sum] = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" |
182 | SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" | 183 | SRC_URI[regex-syntax-0.8.4.sha256sum] = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" |
183 | SRC_URI[roaring-0.10.3.sha256sum] = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" | 184 | SRC_URI[roaring-0.10.6.sha256sum] = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" |
184 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" | 185 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" |
185 | SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" | 186 | SRC_URI[rustix-0.38.34.sha256sum] = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" |
186 | SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" | 187 | SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" |
187 | SRC_URI[semver-1.0.22.sha256sum] = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" | 188 | SRC_URI[semver-1.0.23.sha256sum] = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" |
188 | SRC_URI[shared_child-1.0.0.sha256sum] = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" | 189 | SRC_URI[shared_child-1.0.0.sha256sum] = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" |
189 | SRC_URI[strsim-0.11.0.sha256sum] = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" | 190 | SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" |
190 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" | 191 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" |
191 | SRC_URI[syn-2.0.50.sha256sum] = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" | 192 | SRC_URI[syn-2.0.70.sha256sum] = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" |
192 | SRC_URI[tempfile-3.10.0.sha256sum] = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" | 193 | SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" |
193 | SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" | 194 | SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" |
194 | SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" | 195 | SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" |
195 | SRC_URI[thiserror-1.0.57.sha256sum] = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" | 196 | SRC_URI[thiserror-1.0.61.sha256sum] = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" |
196 | SRC_URI[thiserror-impl-1.0.57.sha256sum] = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" | 197 | SRC_URI[thiserror-impl-1.0.61.sha256sum] = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" |
197 | SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" | 198 | SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" |
198 | SRC_URI[tui-0.19.0.sha256sum] = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" | 199 | SRC_URI[tui-0.19.0.sha256sum] = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" |
199 | SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" | 200 | SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" |
200 | SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" | 201 | SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" |
201 | SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" | 202 | SRC_URI[unicode-width-0.1.13.sha256sum] = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" |
202 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" | 203 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" |
203 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" | 204 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" |
204 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" | 205 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" |
205 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" | 206 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" |
206 | SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" | 207 | SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" |
207 | SRC_URI[windows-targets-0.52.3.sha256sum] = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" | 208 | SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" |
208 | SRC_URI[windows_aarch64_gnullvm-0.52.3.sha256sum] = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" | 209 | SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" |
209 | SRC_URI[windows_aarch64_msvc-0.52.3.sha256sum] = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" | 210 | SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" |
210 | SRC_URI[windows_i686_gnu-0.52.3.sha256sum] = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" | 211 | SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" |
211 | SRC_URI[windows_i686_msvc-0.52.3.sha256sum] = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" | 212 | SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" |
212 | SRC_URI[windows_x86_64_gnu-0.52.3.sha256sum] = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" | 213 | SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" |
213 | SRC_URI[windows_x86_64_gnullvm-0.52.3.sha256sum] = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" | 214 | SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" |
214 | SRC_URI[windows_x86_64_msvc-0.52.3.sha256sum] = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" | 215 | SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" |
216 | SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" | ||
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.13.bb index 09b91f6b3..1d3c79724 100644 --- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.13.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = " \ | |||
11 | git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ | 11 | git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRCREV = "b2d57dad4c3378544d7b36f3fc61e60989c5c092" | 14 | SRCREV = "116c05345bed5fe727992c3458311606d5443ff6" |
15 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 15 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
16 | 16 | ||
17 | inherit cargo cargo-update-recipe-crates | 17 | inherit cargo cargo-update-recipe-crates |
@@ -34,16 +34,18 @@ do_install:append() { | |||
34 | thin_delta \ | 34 | thin_delta \ |
35 | thin_dump \ | 35 | thin_dump \ |
36 | thin_ls \ | 36 | thin_ls \ |
37 | thin_repair \ | ||
38 | thin_restore \ | ||
39 | thin_rmap \ | ||
40 | thin_metadata_size \ | 37 | thin_metadata_size \ |
41 | thin_metadata_pack \ | 38 | thin_metadata_pack \ |
42 | thin_metadata_unpack \ | 39 | thin_metadata_unpack \ |
40 | thin_repair \ | ||
41 | thin_restore \ | ||
42 | thin_rmap \ | ||
43 | thin_shrink \ | ||
43 | thin_trim \ | 44 | thin_trim \ |
44 | era_check \ | 45 | era_check \ |
45 | era_dump \ | 46 | era_dump \ |
46 | era_invalidate \ | 47 | era_invalidate \ |
48 | era_repair \ | ||
47 | era_restore; do | 49 | era_restore; do |
48 | ln -sf pdata_tools ${D}${sbindir}/$tool | 50 | ln -sf pdata_tools ${D}${sbindir}/$tool |
49 | done | 51 | done |
diff --git a/meta-oe/recipes-support/tree/tree_2.1.1.bb b/meta-oe/recipes-support/tree/tree_2.1.3.bb index 0b6114960..79e0d5e10 100644 --- a/meta-oe/recipes-support/tree/tree_2.1.1.bb +++ b/meta-oe/recipes-support/tree/tree_2.1.3.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | SUMMARY = "A recursive directory listing command" | 1 | SUMMARY = "A recursive directory listing command" |
2 | HOMEPAGE = "http://mama.indstate.edu/users/ice/tree/" | 2 | HOMEPAGE = "https://oldmanprogrammer.net/source.php?dir=projects/tree" |
3 | SECTION = "console/utils" | 3 | SECTION = "console/utils" |
4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "GPL-2.0-only" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" |
6 | 6 | ||
7 | SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz" | 7 | SRC_URI = "https://oldmanprogrammer.net/tar/tree/${BP}.tgz" |
8 | SRC_URI[sha256sum] = "d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5" | 8 | SRC_URI[sha256sum] = "c24c9bfbbb3bd31a43b16898f74fd338cfcf348e914de81438ddfcf052076ff4" |
9 | 9 | ||
10 | # tree's default CFLAGS for Linux | 10 | # tree's default CFLAGS for Linux |
11 | CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" | 11 | CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" |
diff --git a/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb b/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb index 8b334dbde..1a1d4ec33 100644 --- a/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb +++ b/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb | |||
@@ -6,7 +6,7 @@ DEPENDS = "libusb1" | |||
6 | LICENSE = "GPL-2.0-only" | 6 | LICENSE = "GPL-2.0-only" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
8 | 8 | ||
9 | SRCREV = "20276ad5ced147d018e2b3fccedabd94597aa25e" | 9 | SRCREV = "352f5878e999c0a9d5a453b34110479b2056d7e7" |
10 | SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https" | 10 | SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https" |
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
diff --git a/meta-oe/recipes-support/uim/uim_1.8.9.bb b/meta-oe/recipes-support/uim/uim_1.8.9.bb index f78c82f18..9d2068c6d 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.9.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.9.bb | |||
@@ -11,6 +11,7 @@ SRC_URI:append:class-target = "\ | |||
11 | SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4" | 11 | SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4" |
12 | 12 | ||
13 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 13 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
14 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | ||
14 | 15 | ||
15 | DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit" | 16 | DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit" |
16 | DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native" | 17 | DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native" |
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 dfad833e0..0927f5c90 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb | |||
@@ -15,6 +15,7 @@ SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ | |||
15 | " | 15 | " |
16 | SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" | 16 | SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" |
17 | 17 | ||
18 | UPSTREAM_CHECK_URI = "https://www.unixodbc.org/download.html" | ||
18 | UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" | 19 | UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" |
19 | 20 | ||
20 | inherit autotools-brokensep multilib_header qemu | 21 | inherit autotools-brokensep multilib_header qemu |
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb index 47f616e99..444b86a1b 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | SUMMARY = "VirtualBox Linux Guest Drivers" | 1 | SUMMARY = "VirtualBox Linux Guest Drivers" |
2 | SECTION = "core" | 2 | SECTION = "core" |
3 | LICENSE = "GPL-3.0-only" | 3 | LICENSE = "GPL-3.0-only" |
4 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e" | 4 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=217590d3a513571b94632edf5fa1169a" |
5 | 5 | ||
6 | DEPENDS = "virtual/kernel" | 6 | DEPENDS = "virtual/kernel" |
7 | 7 | ||
@@ -15,7 +15,7 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 | |||
15 | file://Makefile.utils \ | 15 | file://Makefile.utils \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRC_URI[sha256sum] = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5" | 18 | SRC_URI[sha256sum] = "5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02" |
19 | 19 | ||
20 | S ?= "${WORKDIR}/vbox_module" | 20 | S ?= "${WORKDIR}/vbox_module" |
21 | S:task-patch = "${WORKDIR}/${VBOX_NAME}" | 21 | S:task-patch = "${WORKDIR}/${VBOX_NAME}" |
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-issues-with-latest-Clang.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-issues-with-latest-Clang.patch new file mode 100644 index 000000000..6ef9835c2 --- /dev/null +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-issues-with-latest-Clang.patch | |||
@@ -0,0 +1,237 @@ | |||
1 | From 257ed304fb3e71d412568dcbed7129c145812fdf Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 2 Sep 2024 21:38:12 -0700 | ||
4 | Subject: [PATCH] Fix build issues with latest Clang | ||
5 | https://bugs.webkit.org/show_bug.cgi?id=276198 rdar://130933637 | ||
6 | |||
7 | Reviewed by Yusuke Suzuki. | ||
8 | |||
9 | The use of the template keyword to reference template members without a template argument list was deprecated in the C++ standard. | ||
10 | e.g. `foo.template bar()` nows needs to be `foo.template bar<>()`. I ran into a different issue with `std::reference_wrapper` that | ||
11 | blocked me from going any further, which AFAICT is a bug on the Clang side. | ||
12 | |||
13 | This also fixes a few other warnings that popped up while building with the new Clang denoted inline | ||
14 | |||
15 | * Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp: | ||
16 | (JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost. | ||
17 | * Source/JavaScriptCore/jit/AssemblyHelpers.cpp: | ||
18 | (JSC::AssemblyHelpers::emitNonNullDecodeZeroExtendedStructureID): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost. | ||
19 | * Source/JavaScriptCore/llint/InPlaceInterpreter.cpp: | ||
20 | * Source/JavaScriptCore/llint/LLIntData.h: | ||
21 | (JSC::LLInt::getCodeFunctionPtr): | ||
22 | (JSC::LLInt::getWide16CodeFunctionPtr): | ||
23 | (JSC::LLInt::getWide32CodeFunctionPtr): | ||
24 | * Source/JavaScriptCore/parser/Nodes.h: Missing definition of ModuleScopeData added include. | ||
25 | * Source/JavaScriptCore/runtime/JSCast.h: | ||
26 | (JSC::JSCastingHelpers::inherits): | ||
27 | (JSC::jsDynamicCast): | ||
28 | * Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/crypto/bio/connect.c: | ||
29 | (conn_callback_ctrl): Had a warning about an incompatible function type. Seems like this is intentional suppressed the warning. | ||
30 | * Source/WTF/wtf/cf/TypeCastsCF.h: Had a warning about extra namespace qualification. I just moved it out of the namespace. That said, it feels like this warning shouldn't apply to macro expansions... | ||
31 | * Source/WebCore/PAL/ThirdParty/libavif/ThirdParty/dav1d/src/decode.c: | ||
32 | (decode_b): Had a warning about different types on the middle/right of a ternary expression. I just pushed the comparison inside the ternary. | ||
33 | |||
34 | Canonical link: https://commits.webkit.org/280700@main | ||
35 | |||
36 | Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/62b6e2db547e#diff-136d848d7c1b400da9b486916b67592b54e5abf7c66ac247697a93ae2fb743a9] | ||
37 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
38 | --- | ||
39 | Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp | 6 ++++-- | ||
40 | Source/JavaScriptCore/jit/AssemblyHelpers.cpp | 6 ++++-- | ||
41 | .../JavaScriptCore/llint/InPlaceInterpreter.cpp | 16 ++++++++-------- | ||
42 | Source/JavaScriptCore/llint/LLIntData.h | 12 ++++++------ | ||
43 | Source/JavaScriptCore/llint/LLIntThunks.cpp | 2 +- | ||
44 | Source/JavaScriptCore/parser/Nodes.h | 4 ++-- | ||
45 | Source/JavaScriptCore/runtime/JSCast.h | 4 ++-- | ||
46 | 7 files changed, 27 insertions(+), 23 deletions(-) | ||
47 | |||
48 | --- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp | ||
49 | +++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp | ||
50 | @@ -22930,8 +22930,10 @@ IGNORE_CLANG_WARNINGS_END | ||
51 | return m_out.shl(m_out.zeroExtPtr(structureID), m_out.constIntPtr(StructureID::encodeShiftAmount)); | ||
52 | #else | ||
53 | LValue maskedStructureID = structureID; | ||
54 | - if constexpr (structureHeapAddressSize < 4 * GB) | ||
55 | - maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(StructureID::structureIDMask)); | ||
56 | + if constexpr (structureHeapAddressSize < 4 * GB) { | ||
57 | + static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask); | ||
58 | + maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(static_cast<uint32_t>(StructureID::structureIDMask))); | ||
59 | + } | ||
60 | return m_out.bitOr(m_out.constIntPtr(startOfStructureHeap()), m_out.zeroExtPtr(maskedStructureID)); | ||
61 | #endif | ||
62 | } | ||
63 | --- a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp | ||
64 | +++ b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp | ||
65 | @@ -677,8 +677,10 @@ void AssemblyHelpers::emitNonNullDecodeZ | ||
66 | if constexpr (structureHeapAddressSize >= 4 * GB) { | ||
67 | ASSERT(structureHeapAddressSize == 4 * GB); | ||
68 | move(source, dest); | ||
69 | - } else | ||
70 | - and32(TrustedImm32(StructureID::structureIDMask), source, dest); | ||
71 | + } else { | ||
72 | + static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask); | ||
73 | + and32(TrustedImm32(static_cast<uint32_t>(StructureID::structureIDMask)), source, dest); | ||
74 | + } | ||
75 | or64(TrustedImm64(startOfStructureHeap()), dest); | ||
76 | #else // not CPU(ADDRESS64) | ||
77 | move(source, dest); | ||
78 | --- a/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp | ||
79 | +++ b/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp | ||
80 | @@ -43,8 +43,8 @@ namespace JSC { namespace IPInt { | ||
81 | do { \ | ||
82 | void* base = reinterpret_cast<void*>(ipint_unreachable_validate); \ | ||
83 | void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ | ||
84 | - void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ | ||
85 | - void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ | ||
86 | + void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ | ||
87 | + void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ | ||
88 | RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ | ||
89 | } while (false); | ||
90 | |||
91 | @@ -52,8 +52,8 @@ do { \ | ||
92 | do { \ | ||
93 | void* base = reinterpret_cast<void*>(ipint_i32_trunc_sat_f32_s_validate); \ | ||
94 | void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ | ||
95 | - void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ | ||
96 | - void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ | ||
97 | + void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ | ||
98 | + void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ | ||
99 | RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ | ||
100 | } while (false); | ||
101 | |||
102 | @@ -61,8 +61,8 @@ do { \ | ||
103 | do { \ | ||
104 | void* base = reinterpret_cast<void*>(ipint_simd_v128_load_mem_validate); \ | ||
105 | void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ | ||
106 | - void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ | ||
107 | - void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ | ||
108 | + void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ | ||
109 | + void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ | ||
110 | RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ | ||
111 | } while (false); | ||
112 | |||
113 | @@ -70,8 +70,8 @@ do { \ | ||
114 | do { \ | ||
115 | void* base = reinterpret_cast<void*>(ipint_memory_atomic_notify_validate); \ | ||
116 | void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ | ||
117 | - void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ | ||
118 | - void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ | ||
119 | + void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ | ||
120 | + void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ | ||
121 | RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ | ||
122 | } while (false); | ||
123 | |||
124 | --- a/Source/JavaScriptCore/llint/LLIntData.h | ||
125 | +++ b/Source/JavaScriptCore/llint/LLIntData.h | ||
126 | @@ -217,7 +217,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionP | ||
127 | #if COMPILER(MSVC) | ||
128 | return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr()); | ||
129 | #else | ||
130 | - return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr()); | ||
131 | + return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>()); | ||
132 | #endif | ||
133 | } | ||
134 | |||
135 | @@ -227,7 +227,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFun | ||
136 | #if COMPILER(MSVC) | ||
137 | return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr()); | ||
138 | #else | ||
139 | - return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr()); | ||
140 | + return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>()); | ||
141 | #endif | ||
142 | } | ||
143 | |||
144 | @@ -237,7 +237,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFun | ||
145 | #if COMPILER(MSVC) | ||
146 | return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr()); | ||
147 | #else | ||
148 | - return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr()); | ||
149 | + return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>()); | ||
150 | #endif | ||
151 | } | ||
152 | #else // not ENABLE(JIT) | ||
153 | @@ -361,7 +361,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionP | ||
154 | #if COMPILER(MSVC) | ||
155 | return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr()); | ||
156 | #else | ||
157 | - return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr()); | ||
158 | + return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>()); | ||
159 | #endif | ||
160 | } | ||
161 | |||
162 | @@ -371,7 +371,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFun | ||
163 | #if COMPILER(MSVC) | ||
164 | return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr()); | ||
165 | #else | ||
166 | - return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr()); | ||
167 | + return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>()); | ||
168 | #endif | ||
169 | } | ||
170 | |||
171 | @@ -381,7 +381,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFun | ||
172 | #if COMPILER(MSVC) | ||
173 | return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr()); | ||
174 | #else | ||
175 | - return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr()); | ||
176 | + return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>()); | ||
177 | #endif | ||
178 | } | ||
179 | #else // not ENABLE(JIT) | ||
180 | --- a/Source/JavaScriptCore/llint/LLIntThunks.cpp | ||
181 | +++ b/Source/JavaScriptCore/llint/LLIntThunks.cpp | ||
182 | @@ -227,7 +227,7 @@ ALWAYS_INLINE void* untaggedPtr(void* pt | ||
183 | #if COMPILER(MSVC) | ||
184 | return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).untaggedPtr(); | ||
185 | #else | ||
186 | - return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); | ||
187 | + return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); | ||
188 | #endif | ||
189 | } | ||
190 | |||
191 | --- a/Source/JavaScriptCore/parser/Nodes.h | ||
192 | +++ b/Source/JavaScriptCore/parser/Nodes.h | ||
193 | @@ -1,7 +1,7 @@ | ||
194 | /* | ||
195 | * Copyright (C) 1999-2000 Harri Porten (porten@kde.org) | ||
196 | * Copyright (C) 2001 Peter Kelly (pmk@post.com) | ||
197 | - * Copyright (C) 2003-2019 Apple Inc. All rights reserved. | ||
198 | + * Copyright (C) 2003-2024 Apple Inc. All rights reserved. | ||
199 | * Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca) | ||
200 | * Copyright (C) 2007 Maks Orlovich | ||
201 | * Copyright (C) 2007 Eric Seidel <eric@webkit.org> | ||
202 | @@ -29,6 +29,7 @@ | ||
203 | #include "ImplementationVisibility.h" | ||
204 | #include "JITCode.h" | ||
205 | #include "Label.h" | ||
206 | +#include "ModuleScopeData.h" | ||
207 | #include "ParserArena.h" | ||
208 | #include "ParserModes.h" | ||
209 | #include "ParserTokens.h" | ||
210 | @@ -49,7 +50,6 @@ namespace JSC { | ||
211 | class FunctionMetadataNode; | ||
212 | class FunctionParameters; | ||
213 | class ModuleAnalyzer; | ||
214 | - class ModuleScopeData; | ||
215 | class PropertyListNode; | ||
216 | class ReadModifyResolveNode; | ||
217 | class RegisterID; | ||
218 | --- a/Source/JavaScriptCore/runtime/JSCast.h | ||
219 | +++ b/Source/JavaScriptCore/runtime/JSCast.h | ||
220 | @@ -236,7 +236,7 @@ template<typename Target, typename From> | ||
221 | bool inherits(From* from) | ||
222 | { | ||
223 | using Dispatcher = InheritsTraits<Target>; | ||
224 | - return Dispatcher::template inherits(from); | ||
225 | + return Dispatcher::template inherits<>(from); | ||
226 | } | ||
227 | |||
228 | } // namespace JSCastingHelpers | ||
229 | @@ -245,7 +245,7 @@ template<typename To, typename From> | ||
230 | To jsDynamicCast(From* from) | ||
231 | { | ||
232 | using Dispatcher = JSCastingHelpers::InheritsTraits<typename std::remove_cv<typename std::remove_pointer<To>::type>::type>; | ||
233 | - if (LIKELY(Dispatcher::template inherits(from))) | ||
234 | + if (LIKELY(Dispatcher::template inherits<>(from))) | ||
235 | return static_cast<To>(from); | ||
236 | return nullptr; | ||
237 | } | ||
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb index 31480b8d8..9493d8642 100644 --- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb | |||
@@ -15,8 +15,9 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ | |||
15 | file://no-musttail-arm.patch \ | 15 | file://no-musttail-arm.patch \ |
16 | file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ | 16 | file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ |
17 | file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ | 17 | file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ |
18 | file://0001-Fix-build-issues-with-latest-Clang.patch \ | ||
18 | " | 19 | " |
19 | SRC_URI[sha256sum] = "523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b" | 20 | SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54" |
20 | 21 | ||
21 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | 22 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen |
22 | 23 | ||
diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb index e10ccd04e..fa63196da 100644 --- a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb +++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb | |||
@@ -14,6 +14,6 @@ inherit meson pkgconfig | |||
14 | SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main" | 14 | SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | SRCREV = "7466c8137fc06f863fde8486521984e43a26cd10" | 17 | SRCREV = "1c1989e56f94b9eb3b7567f8a6e8a0aa16cba496" |
18 | 18 | ||
19 | BBCLASSEXTEND = "native" | 19 | BBCLASSEXTEND = "native" |
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch index f107f42da..697a8ee35 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4d73b85fb1b794c649359bc8a774b0111d36994a Mon Sep 17 00:00:00 2001 | 1 | From 1d7c01467e6f510b5636c73757f302a4bd277a3c Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Tue, 4 Feb 2020 23:39:49 -0800 | 3 | Date: Tue, 4 Feb 2020 23:39:49 -0800 |
4 | Subject: [PATCH] nss/nspr: fix for multilib | 4 | Subject: [PATCH] nss/nspr: fix for multilib |
@@ -6,16 +6,15 @@ Subject: [PATCH] nss/nspr: fix for multilib | |||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
9 | |||
10 | --- | 9 | --- |
11 | configure.ac | 16 ++++++++-------- | 10 | configure.ac | 16 ++++++++-------- |
12 | 1 file changed, 8 insertions(+), 8 deletions(-) | 11 | 1 file changed, 8 insertions(+), 8 deletions(-) |
13 | 12 | ||
14 | diff --git a/configure.ac b/configure.ac | 13 | diff --git a/configure.ac b/configure.ac |
15 | index 51621d6..3d23683 100644 | 14 | index 7f137c0..e15f5bc 100644 |
16 | --- a/configure.ac | 15 | --- a/configure.ac |
17 | +++ b/configure.ac | 16 | +++ b/configure.ac |
18 | @@ -960,24 +960,24 @@ fi | 17 | @@ -958,24 +958,24 @@ fi |
19 | dnl Priority 1: User specifies the path to installation | 18 | dnl Priority 1: User specifies the path to installation |
20 | if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then | 19 | if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then |
21 | AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) | 20 | AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) |
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch index 3a1531deb..61c56ffc8 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9c861646e034b1c80fafd389279b0a7da90a8ba7 Mon Sep 17 00:00:00 2001 | 1 | From b43fa6bf612ee59db57573b39e357b6ca96d48b6 Mon Sep 17 00:00:00 2001 |
2 | From: Yulong Pei <Yulong.pei@windriver.com> | 2 | From: Yulong Pei <Yulong.pei@windriver.com> |
3 | Date: Wed, 21 Jul 2010 22:33:43 +0800 | 3 | Date: Wed, 21 Jul 2010 22:33:43 +0800 |
4 | Subject: [PATCH] change finding path of nss and nspr | 4 | Subject: [PATCH] change finding path of nss and nspr |
@@ -8,16 +8,15 @@ Upstream-Status: Pending | |||
8 | Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> | 8 | Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> |
9 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | 9 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> |
10 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | 10 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
11 | |||
12 | --- | 11 | --- |
13 | configure.ac | 2 +- | 12 | configure.ac | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 14 | ||
16 | diff --git a/configure.ac b/configure.ac | 15 | diff --git a/configure.ac b/configure.ac |
17 | index ce8a278..51621d6 100644 | 16 | index 8add879..7f137c0 100644 |
18 | --- a/configure.ac | 17 | --- a/configure.ac |
19 | +++ b/configure.ac | 18 | +++ b/configure.ac |
20 | @@ -935,7 +935,7 @@ NSS_PACKAGE=mozilla-nss | 19 | @@ -933,7 +933,7 @@ NSS_PACKAGE=mozilla-nss |
21 | NSPR_INCLUDE_MARKER="nspr/nspr.h" | 20 | NSPR_INCLUDE_MARKER="nspr/nspr.h" |
22 | NSPR_LIB_MARKER="libnspr4$shrext" | 21 | NSPR_LIB_MARKER="libnspr4$shrext" |
23 | NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" | 22 | NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" |
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb index 7639209e1..994adef3a 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ | |||
22 | file://ensure-search-path-non-host.patch \ | 22 | file://ensure-search-path-non-host.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75" | 25 | SRC_URI[sha256sum] = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917" |
26 | 26 | ||
27 | inherit autotools-brokensep ptest pkgconfig | 27 | inherit autotools-brokensep ptest pkgconfig |
28 | 28 | ||
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 c1b75e613..7c85697d4 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb | |||
@@ -20,6 +20,9 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN | |||
20 | 20 | ||
21 | SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0" | 21 | SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0" |
22 | 22 | ||
23 | UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases" | ||
24 | UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" | ||
25 | |||
23 | CFLAGS += " -Wno-deprecated-declarations" | 26 | CFLAGS += " -Wno-deprecated-declarations" |
24 | 27 | ||
25 | PACKAGECONFIG ??= "" | 28 | PACKAGECONFIG ??= "" |
diff --git a/meta-oe/recipes-test/catch2/catch2_3.6.0.bb b/meta-oe/recipes-test/catch2/catch2_3.7.0.bb index c4541c4d5..2d571a9cf 100644 --- a/meta-oe/recipes-test/catch2/catch2_3.6.0.bb +++ b/meta-oe/recipes-test/catch2/catch2_3.7.0.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "BSL-1.0" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https" | 7 | SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https" |
8 | SRCREV = "4e8d92bf02f7d1c8006a0e7a5ecabd8e62d98502" | 8 | SRCREV = "31588bb4f56b638dd5afc28d3ebff9b9dcefb88d" |
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
diff --git a/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb index c5dfff225..8c8fb6098 100644 --- a/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb +++ b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb | |||
@@ -8,6 +8,8 @@ SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/${BP}. | |||
8 | SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec" | 8 | SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec" |
9 | SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8" | 9 | SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8" |
10 | 10 | ||
11 | UPSTREAM_CHECK_URI = "https://sourceforge.net/p/cxxtest/activity/" | ||
12 | |||
11 | inherit setuptools3 | 13 | inherit setuptools3 |
12 | 14 | ||
13 | SETUPTOOLS_SETUP_PATH = "${S}/python" | 15 | SETUPTOOLS_SETUP_PATH = "${S}/python" |
diff --git a/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb b/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb index 6082ea257..b19bba015 100644 --- a/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb +++ b/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb | |||
@@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" | |||
6 | SRCREV = "063ec650960c2d79ac51f5c5f026cb05343a33e2" | 6 | SRCREV = "063ec650960c2d79ac51f5c5f026cb05343a33e2" |
7 | SRC_URI = "git://github.com//ponty/fb-test-app.git;branch=master;protocol=https" | 7 | SRC_URI = "git://github.com//ponty/fb-test-app.git;branch=master;protocol=https" |
8 | 8 | ||
9 | # Upstream repo does not tag | ||
10 | UPSTREAM_CHECK_COMMITS = "1" | ||
11 | |||
9 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
10 | 13 | ||
11 | do_install() { | 14 | do_install() { |
diff --git a/meta-oe/recipes-test/googletest/googletest_1.14.0.bb b/meta-oe/recipes-test/googletest/googletest_1.15.2.bb index 654684571..bc479268b 100644 --- a/meta-oe/recipes-test/googletest/googletest_1.14.0.bb +++ b/meta-oe/recipes-test/googletest/googletest_1.15.2.bb | |||
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" | |||
7 | PROVIDES += "gmock gtest" | 7 | PROVIDES += "gmock gtest" |
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | SRCREV = "f8d7d77c06936315286eb55f8de22cd23c188571" | 10 | SRCREV = "b514bdc898e2951020cbdca1304b75f5950d1f59" |
11 | SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" | 11 | SRC_URI = "git://github.com/google/googletest.git;branch=v1.15.x;protocol=https" |
12 | 12 | ||
13 | inherit cmake pkgconfig | 13 | inherit cmake pkgconfig |
14 | 14 | ||
diff --git a/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb b/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb index e909676ab..734601115 100644 --- a/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb +++ b/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb | |||
@@ -8,6 +8,9 @@ SRC_URI = "git://github.com/cbrake/linux-serial-test.git;protocol=https;branch=m | |||
8 | PV = "0+git" | 8 | PV = "0+git" |
9 | SRCREV = "2ee61484167eab846f7b7c565284d7c350d738d3" | 9 | SRCREV = "2ee61484167eab846f7b7c565284d7c350d738d3" |
10 | 10 | ||
11 | # Upstream repo does not tag | ||
12 | UPSTREAM_CHECK_COMMITS = "1" | ||
13 | |||
11 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
12 | 15 | ||
13 | inherit cmake | 16 | inherit cmake |
diff --git a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb index 639f55de2..4043ab7ea 100644 --- a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb +++ b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IM | |||
13 | " | 13 | " |
14 | SRCREV = "25905f5d0a2a7883bd33491997556193582c6059" | 14 | SRCREV = "25905f5d0a2a7883bd33491997556193582c6059" |
15 | 15 | ||
16 | # Upstream repo does not tag | ||
17 | UPSTREAM_CHECK_COMMITS = "1" | ||
18 | |||
16 | export GOPROXY = "https://proxy.golang.org,direct" | 19 | export GOPROXY = "https://proxy.golang.org,direct" |
17 | # Workaround for network access issue during compile step. | 20 | # Workaround for network access issue during compile step. |
18 | # This needs to be fixed in the recipes buildsystem so that | 21 | # This needs to be fixed in the recipes buildsystem so that |
diff --git a/meta-oe/recipes-test/testfloat/testfloat_3e.bb b/meta-oe/recipes-test/testfloat/testfloat_3e.bb index 071be2a20..f5aace4d3 100644 --- a/meta-oe/recipes-test/testfloat/testfloat_3e.bb +++ b/meta-oe/recipes-test/testfloat/testfloat_3e.bb | |||
@@ -19,6 +19,8 @@ SRC_URI[TestFloat.sha256sum] = "6d4bdf0096b48a653aa59fc203a9e5fe18b5a58d7a1b7151 | |||
19 | SRC_URI[SoftFloat.md5sum] = "7dac954ea4aed0697cbfee800ba4f492" | 19 | SRC_URI[SoftFloat.md5sum] = "7dac954ea4aed0697cbfee800ba4f492" |
20 | SRC_URI[SoftFloat.sha256sum] = "21130ce885d35c1fe73fc1e1bf2244178167e05c6747cad5f450cc991714c746" | 20 | SRC_URI[SoftFloat.sha256sum] = "21130ce885d35c1fe73fc1e1bf2244178167e05c6747cad5f450cc991714c746" |
21 | 21 | ||
22 | UPSTREAM_CHECK_URI = "http://www.jhauser.us/arithmetic/TestFloat.html" | ||
23 | |||
22 | S = "${WORKDIR}/sources" | 24 | S = "${WORKDIR}/sources" |
23 | UNPACKDIR = "${S}" | 25 | UNPACKDIR = "${S}" |
24 | 26 | ||
diff --git a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.64.bb b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.66.bb index 7b67cd862..94fb4393c 100644 --- a/meta-perl/recipes-perl/libcgi/libcgi-perl_4.64.bb +++ b/meta-perl/recipes-perl/libcgi/libcgi-perl_4.66.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=415fc49abed2728f9480cd32c8d67beb" | |||
10 | 10 | ||
11 | SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" | 11 | SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "39bd8e40ce00cdab39e0a2bc71abd2bbe451d1d97bc7e54e41a2e199eb6226e7" | 13 | SRC_URI[sha256sum] = "4697437688a193e3f02556e1d223015590c1f2800b40becf83dc12d5cc5ed8e1" |
14 | 14 | ||
15 | S = "${WORKDIR}/CGI-${PV}" | 15 | S = "${WORKDIR}/CGI-${PV}" |
16 | 16 | ||
diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.212.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.213.bb index 712073041..63706d8f7 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.212.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.213.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=cd551ef796cc7fa3435 | |||
9 | 9 | ||
10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-${PV}.tar.gz" | 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-${PV}.tar.gz" |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "6caeee843c428f45fa9646ea98dc675470db63dbac0ee3e2d8e9ee4eb58a856d" | 12 | SRC_URI[sha256sum] = "8d75d3d366c9101ca18061b00d438d3da39478c06159147dea3c666770577c7b" |
13 | 13 | ||
14 | DEPENDS += "bzip2" | 14 | DEPENDS += "bzip2" |
15 | 15 | ||
diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.212.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.213.bb index c4cba470b..62521dfe8 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.212.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.213.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=2a0fd6d30eaf8828958 | |||
9 | 9 | ||
10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Lzma-${PV}.tar.gz" | 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Lzma-${PV}.tar.gz" |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "4ba7ab803bdba2d7be7d55d4a2668369d794eb8d8d6bb0db6b74fd9b4ce18cac" | 12 | SRC_URI[sha256sum] = "6b979a8347701ced3ac26123d428c1f202b7999850444da19c4aedbb7c862cb7" |
13 | 13 | ||
14 | DEPENDS += "xz" | 14 | DEPENDS += "xz" |
15 | 15 | ||
diff --git a/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.212.bb b/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.213.bb index d79a710a7..b8afcc207 100644 --- a/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.212.bb +++ b/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.213.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=8;endline=17;md5=1bb3479faca6bb2086c | |||
10 | 10 | ||
11 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Zlib-${PV}.tar.gz" | 11 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Zlib-${PV}.tar.gz" |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "6d9de0c11921fd520dfd99a3f6b0ca9f1fd9850274f8bec10bbaa4f6803cc049" | 13 | SRC_URI[sha256sum] = "56b21c99cb3a3a7f7876a74dd05daa3f41fc9143ddd4dc98f8e46710a106af45" |
14 | 14 | ||
15 | DEPENDS += "zlib" | 15 | DEPENDS += "zlib" |
16 | 16 | ||
diff --git a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.16.bb b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.17.bb index dc2075d13..c15d41713 100644 --- a/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.16.bb +++ b/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.17.bb | |||
@@ -2,10 +2,10 @@ SUMMARY = "Crypt::OpenSSL::Random - OpenSSL/LibreSSL pseudo-random number genera | |||
2 | SECTION = "libs" | 2 | SECTION = "libs" |
3 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 3 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=089c18d635ae273e1727ec385e64063b" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9e876d4149406d88b4ff1b37645363ad" |
6 | 6 | ||
7 | SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-Random-${PV}.tar.gz " | 7 | SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-Random-${PV}.tar.gz " |
8 | SRC_URI[sha256sum] = "fcf58cb2af4c3eda2fe1405527d9373efe9576268fce8adb34df9ce9b6b44d1e" | 8 | SRC_URI[sha256sum] = "a571b24181baaa76c96704e92acffc6934ff593e380dade274db4e43c140ad51" |
9 | 9 | ||
10 | S = "${WORKDIR}/Crypt-OpenSSL-Random-${PV}" | 10 | S = "${WORKDIR}/Crypt-OpenSSL-Random-${PV}" |
11 | 11 | ||
diff --git a/meta-perl/recipes-perl/libcurses/libcurses-perl/0001-testtyp.c-Use-proper-prototype-for-main-function.patch b/meta-perl/recipes-perl/libcurses/libcurses-perl/0001-testtyp.c-Use-proper-prototype-for-main-function.patch index ab5af3fa8..37c81d9b8 100644 --- a/meta-perl/recipes-perl/libcurses/libcurses-perl/0001-testtyp.c-Use-proper-prototype-for-main-function.patch +++ b/meta-perl/recipes-perl/libcurses/libcurses-perl/0001-testtyp.c-Use-proper-prototype-for-main-function.patch | |||
@@ -17,24 +17,22 @@ int | |||
17 | Upstream-Status: Pending | 17 | Upstream-Status: Pending |
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
19 | --- | 19 | --- |
20 | testtyp.c | 5 +++-- | 20 | testtyp.c | 3 ++- |
21 | 1 file changed, 3 insertions(+), 2 deletions(-) | 21 | 1 file changed, 2 insertions(+), 1 deletion(-) |
22 | 22 | ||
23 | diff --git a/testtyp.c b/testtyp.c | 23 | diff --git a/testtyp.c b/testtyp.c |
24 | index 949c3d4..4042f73 100644 | 24 | index 469cc48..6a48a77 100644 |
25 | --- a/testtyp.c | 25 | --- a/testtyp.c |
26 | +++ b/testtyp.c | 26 | +++ b/testtyp.c |
27 | @@ -7,7 +7,8 @@ | 27 | @@ -10,6 +10,7 @@ |
28 | #define _XOPEN_SOURCE_EXTENDED 1 /* We expect wide character functions */ | ||
29 | |||
30 | #include "c-config.h" | 28 | #include "c-config.h" |
31 | - | 29 | |
30 | int | ||
32 | -main() { | 31 | -main() { |
33 | +int | ||
34 | +main(int argc, char *argv[]) { | 32 | +main(int argc, char *argv[]) { |
35 | typedef SYM c_sym_t; | 33 | typedef SYM c_sym_t; |
36 | + return 0; | 34 | + return 0; |
37 | } | 35 | } |
38 | -- | 36 | -- |
39 | 2.37.3 | 37 | 2.34.1 |
40 | 38 | ||
diff --git a/meta-perl/recipes-perl/libcurses/libcurses-perl_1.41.bb b/meta-perl/recipes-perl/libcurses/libcurses-perl_1.45.bb index 421823d9c..7951e0ddb 100644 --- a/meta-perl/recipes-perl/libcurses/libcurses-perl_1.41.bb +++ b/meta-perl/recipes-perl/libcurses/libcurses-perl_1.45.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "http://www.cpan.org/authors/id/G/GI/GIRAFFED/Curses-${PV}.tar.gz \ | |||
12 | file://0001-testtyp.c-Use-proper-prototype-for-main-function.patch \ | 12 | file://0001-testtyp.c-Use-proper-prototype-for-main-function.patch \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "fb9efea8c7b5ed5f8ea5dee49d35252accfc05ee6e75cb9a37ab7c847cd261d7" | 15 | SRC_URI[sha256sum] = "84221e0013a2d64a0bae6a32bb44b1ae5734d2cb0465fb89af3e3abd6e05aeb2" |
16 | 16 | ||
17 | S = "${WORKDIR}/Curses-${PV}" | 17 | S = "${WORKDIR}/Curses-${PV}" |
18 | 18 | ||
diff --git a/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.026.bb b/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.028.bb index 8534822e6..3ee9df730 100644 --- a/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.026.bb +++ b/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.028.bb | |||
@@ -5,11 +5,10 @@ SECTION = "libs" | |||
5 | HOMEPAGE = "http://search.cpan.org/~leont/ExtUtils-Helpers/" | 5 | HOMEPAGE = "http://search.cpan.org/~leont/ExtUtils-Helpers/" |
6 | 6 | ||
7 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | 7 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=223c04045664f72c3a6556462612bddd" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c0280160e4f26faafef507664884bf63" |
9 | 9 | ||
10 | SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/ExtUtils-Helpers-${PV}.tar.gz" | 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/ExtUtils-Helpers-${PV}.tar.gz" |
11 | SRC_URI[md5sum] = "83b00c1e401321c425ae5db6b2b2fd12" | 11 | SRC_URI[sha256sum] = "c8574875cce073e7dc5345a7b06d502e52044d68894f9160203fcaab379514fe" |
12 | SRC_URI[sha256sum] = "de901b6790a4557cf4ec908149e035783b125bf115eb9640feb1bc1c24c33416" | ||
13 | 12 | ||
14 | S = "${WORKDIR}/ExtUtils-Helpers-${PV}" | 13 | S = "${WORKDIR}/ExtUtils-Helpers-${PV}" |
15 | 14 | ||
diff --git a/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.212.bb b/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.213.bb index cf5a9db66..f6733ad02 100644 --- a/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.212.bb +++ b/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.213.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=2a0fd6d30eaf8828958 | |||
9 | 9 | ||
10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-Lzma-${PV}.tar.gz" | 10 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-Lzma-${PV}.tar.gz" |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "51ef81f931cfd2c13fb2340c665204a9587843087dec1a57e9e9f4666d6dad40" | 12 | SRC_URI[sha256sum] = "daa63c3fa1f7708aa55b97a4d189820f5e849f8e4583dc24b5cceebd06a493eb" |
13 | 13 | ||
14 | S = "${WORKDIR}/IO-Compress-Lzma-${PV}" | 14 | S = "${WORKDIR}/IO-Compress-Lzma-${PV}" |
15 | 15 | ||
diff --git a/meta-perl/recipes-perl/libio/libio-compress-perl_2.212.bb b/meta-perl/recipes-perl/libio/libio-compress-perl_2.213.bb index ca04ffc8e..4e0a0be4f 100644 --- a/meta-perl/recipes-perl/libio/libio-compress-perl_2.212.bb +++ b/meta-perl/recipes-perl/libio/libio-compress-perl_2.213.bb | |||
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=254a3b5756814db98ee | |||
18 | 18 | ||
19 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-${PV}.tar.gz" | 19 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-${PV}.tar.gz" |
20 | 20 | ||
21 | SRC_URI[sha256sum] = "687490dbf9c4be42c22a945c4601812be5f4d38a9836018148915ba9e0ea65b1" | 21 | SRC_URI[sha256sum] = "ae4d01ae574e4568c5f2fb0573e74631e2720b71ad3bc5a3ffe9480f1cb9a851" |
22 | 22 | ||
23 | S = "${WORKDIR}/IO-Compress-${PV}" | 23 | S = "${WORKDIR}/IO-Compress-${PV}" |
24 | 24 | ||
diff --git a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.085.bb b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.089.bb index f7b3d416d..e745cecaf 100644 --- a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.085.bb +++ b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.089.bb | |||
@@ -21,7 +21,7 @@ RDEPENDS:${PN} += "\ | |||
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI = "${CPAN_MIRROR}/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz" | 23 | SRC_URI = "${CPAN_MIRROR}/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz" |
24 | SRC_URI[sha256sum] = "95b2f7c0628a7e246a159665fbf0620d0d7835e3a940f22d3fdd47c3aa799c2e" | 24 | SRC_URI[sha256sum] = "f683112c1642967e9149f51ad553eccd017833b2f22eb23a9055609d2e3a14d1" |
25 | 25 | ||
26 | S = "${WORKDIR}/IO-Socket-SSL-${PV}" | 26 | S = "${WORKDIR}/IO-Socket-SSL-${PV}" |
27 | 27 | ||
diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.45.bb b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.46.bb index 21f5b7f57..18ba6336f 100644 --- a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.45.bb +++ b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.46.bb | |||
@@ -9,7 +9,7 @@ DEPENDS += "perl" | |||
9 | 9 | ||
10 | SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" | 10 | SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "39f4b82ffe822f4d28691f6c4260f6f1fe6b5a09b546b56dd2410c21b38c1380" | 12 | SRC_URI[sha256sum] = "91b65cd0f12461802c61ca5474f87b3e29f5182d2e1b3a2ea70702a3efb4a743" |
13 | 13 | ||
14 | UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" | 14 | UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" |
15 | 15 | ||
diff --git a/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.48.bb b/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.50.bb index b14fc95f1..24b6806bc 100644 --- a/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.48.bb +++ b/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.50.bb | |||
@@ -26,7 +26,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | |||
26 | LIC_FILES_CHKSUM = "file://README;beginline=29;endline=30;md5=d41d8cd98f00b204e9800998ecf8427e" | 26 | LIC_FILES_CHKSUM = "file://README;beginline=29;endline=30;md5=d41d8cd98f00b204e9800998ecf8427e" |
27 | 27 | ||
28 | SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Test-Harness-${PV}.tar.gz" | 28 | SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Test-Harness-${PV}.tar.gz" |
29 | SRC_URI[sha256sum] = "e73ff89c81c1a53f6baeef6816841b89d3384403ad97422a7da9d1eeb20ef9c5" | 29 | SRC_URI[sha256sum] = "79b6acdc444f1924cd4c2e9ed868bdc6e09580021aca8ff078ede2ffef8a6f54" |
30 | 30 | ||
31 | UPSTREAM_CHECK_REGEX = "Test\-Harness\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" | 31 | UPSTREAM_CHECK_REGEX = "Test\-Harness\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" |
32 | 32 | ||
diff --git a/meta-python/conf/include/non-repro-meta-python.inc b/meta-python/conf/include/non-repro-meta-python.inc index 629dc4aa0..64dc69ed5 100755 --- a/meta-python/conf/include/non-repro-meta-python.inc +++ b/meta-python/conf/include/non-repro-meta-python.inc | |||
@@ -1,6 +1,8 @@ | |||
1 | # List of known non-reproducible package of the meta-python layer | 1 | # List of known non-reproducible package of the meta-python layer |
2 | # Please keep this list sorted | 2 | # Please keep this list sorted |
3 | KNOWN_NON_REPRO_META_PYTHON = " \ | 3 | KNOWN_NON_REPRO_META_PYTHON = " \ |
4 | python3-evdev \ | ||
5 | python3-evdev-dbg \ | ||
4 | python3-evdev-src \ | 6 | python3-evdev-src \ |
5 | python3-frozenlist \ | 7 | python3-frozenlist \ |
6 | python3-frozenlist-dbg \ | 8 | python3-frozenlist-dbg \ |
@@ -8,6 +10,7 @@ KNOWN_NON_REPRO_META_PYTHON = " \ | |||
8 | python3-pandas \ | 10 | python3-pandas \ |
9 | python3-pandas-dbg \ | 11 | python3-pandas-dbg \ |
10 | python3-pandas-src \ | 12 | python3-pandas-src \ |
13 | python3-pybind11-json-dev \ | ||
11 | python3-pycocotools-src \ | 14 | python3-pycocotools-src \ |
12 | python3-pydantic-core \ | 15 | python3-pydantic-core \ |
13 | python3-pynacl \ | 16 | python3-pynacl \ |
diff --git a/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-python/conf/include/ptest-packagelists-meta-python.inc index 56a5cf2f0..da6206c6b 100644 --- a/meta-python/conf/include/ptest-packagelists-meta-python.inc +++ b/meta-python/conf/include/ptest-packagelists-meta-python.inc | |||
@@ -24,6 +24,7 @@ PTESTS_FAST_META_PYTHON = "\ | |||
24 | python3-flexcache \ | 24 | python3-flexcache \ |
25 | python3-flexparser \ | 25 | python3-flexparser \ |
26 | python3-freezegun \ | 26 | python3-freezegun \ |
27 | python3-fsspec \ | ||
27 | python3-geojson \ | 28 | python3-geojson \ |
28 | python3-google-auth-oauthlib \ | 29 | python3-google-auth-oauthlib \ |
29 | python3-gpiod \ | 30 | python3-gpiod \ |
@@ -66,14 +67,17 @@ PTESTS_FAST_META_PYTHON = "\ | |||
66 | python3-semver \ | 67 | python3-semver \ |
67 | python3-serpent \ | 68 | python3-serpent \ |
68 | python3-service-identity \ | 69 | python3-service-identity \ |
70 | python3-setproctitle \ | ||
69 | python3-simpleeval \ | 71 | python3-simpleeval \ |
70 | python3-smpplib \ | 72 | python3-smpplib \ |
71 | python3-soupsieve \ | 73 | python3-soupsieve \ |
72 | python3-sqlparse \ | 74 | python3-sqlparse \ |
75 | python3-starlette \ | ||
73 | python3-tomli-w \ | 76 | python3-tomli-w \ |
74 | python3-tomlkit \ | 77 | python3-tomlkit \ |
75 | python3-trustme \ | 78 | python3-trustme \ |
76 | python3-typeguard \ | 79 | python3-typeguard \ |
80 | python3-tzdata \ | ||
77 | python3-ujson \ | 81 | python3-ujson \ |
78 | python3-u-msgpack-python \ | 82 | python3-u-msgpack-python \ |
79 | python3-unidiff \ | 83 | python3-unidiff \ |
diff --git a/meta-python/recipes-core/images/meta-python-image-ptest.bb b/meta-python/recipes-core/images/meta-python-image-ptest.bb index 002bd7a39..794b9d1e4 100644 --- a/meta-python/recipes-core/images/meta-python-image-ptest.bb +++ b/meta-python/recipes-core/images/meta-python-image-ptest.bb | |||
@@ -29,7 +29,8 @@ QB_MEM = "-m 1024" | |||
29 | #QB_MEM:virtclass-mcextend-<pn> = "-m 4096" | 29 | #QB_MEM:virtclass-mcextend-<pn> = "-m 4096" |
30 | # python3-scrypt ptests run into OOMs on RISCV64 qemu | 30 | # python3-scrypt ptests run into OOMs on RISCV64 qemu |
31 | QB_MEM:virtclass-mcextend-python3-scrypt = "-m 2048" | 31 | QB_MEM:virtclass-mcextend-python3-scrypt = "-m 2048" |
32 | QB_MEM:virtclass-mcextend-python3-fastjsonschema = "-m 2048" | 32 | # Needs atleast 5G to avoid OOMs |
33 | QB_MEM:virtclass-mcextend-python3-fastjsonschema = "-m 5120" | ||
33 | QB_MEM:virtclass-mcextend-python3-pillow = "-m 2048" | 34 | QB_MEM:virtclass-mcextend-python3-pillow = "-m 2048" |
34 | 35 | ||
35 | TEST_SUITES = "ping ssh parselogs ptest" | 36 | TEST_SUITES = "ping ssh parselogs ptest" |
diff --git a/meta-python/recipes-devtools/python/pamela_1.1.0.bb b/meta-python/recipes-devtools/python/pamela_1.2.0.bb index 3573de551..ff87e187c 100644 --- a/meta-python/recipes-devtools/python/pamela_1.1.0.bb +++ b/meta-python/recipes-devtools/python/pamela_1.2.0.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | DESCRIPTION = "Pamela: yet another Python wrapper for PAM" | 1 | DESCRIPTION = "Pamela: yet another Python wrapper for PAM" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://PKG-INFO;md5=6b706db92112b8384848de3e5c6adaa3" | 3 | LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b5fa9af58a8076d81145be56b6801a2b" |
4 | 4 | ||
5 | SRC_URI[sha256sum] = "d4b139fe600e192e176a2a368059207a6bffa0e7879879b13f4fcba0163481be" | 5 | SRC_URI[sha256sum] = "0ea6e2a99dded8c7783a4a06f2d31f5bdcad894d79101e8f09322e387a34aacf" |
6 | 6 | ||
7 | PYPI_PACKAGE = "pamela" | 7 | PYPI_PACKAGE = "pamela" |
8 | 8 | ||
diff --git a/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch b/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch new file mode 100644 index 000000000..8a646874e --- /dev/null +++ b/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 3531ff73631a0d59234eb4713e7b3a7f5ea57bbb Mon Sep 17 00:00:00 2001 | ||
2 | From: Nicola Lunghi <nicola.lunghi@jci.com> | ||
3 | Date: Thu, 14 Nov 2019 12:17:51 +0000 | ||
4 | Subject: [PATCH] setup.py: move pytest-runner to test_requirements | ||
5 | |||
6 | This fixes an issue with yocto build. | ||
7 | pytest-runner is only needed when running tests. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | --- | ||
11 | setup.py | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/setup.py b/setup.py | ||
15 | index 53ebea7..ebb0de2 100644 | ||
16 | --- a/setup.py | ||
17 | +++ b/setup.py | ||
18 | @@ -10,9 +10,9 @@ with open('README.md') as readme_file: | ||
19 | |||
20 | requirements = [] | ||
21 | |||
22 | -setup_requirements = ['pytest-runner', ] | ||
23 | +setup_requirements = [] | ||
24 | |||
25 | -test_requirements = ['pytest>=3', ] | ||
26 | +test_requirements = ['pytest>=3', 'pytest-runner'] | ||
27 | |||
28 | setup( | ||
29 | author="Nicolas Aimetti", | ||
30 | -- | ||
31 | 2.20.1 | ||
32 | |||
diff --git a/meta-python/recipes-devtools/python/python3-a2wsgi/run-ptest b/meta-python/recipes-devtools/python/python3-a2wsgi/run-ptest index 8d2017d39..951c73a6c 100644 --- a/meta-python/recipes-devtools/python/python3-a2wsgi/run-ptest +++ b/meta-python/recipes-devtools/python/python3-a2wsgi/run-ptest | |||
@@ -1,3 +1,3 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | pytest --automake | 3 | pytest --automake --deselect tests/test_asgi.py::test_baize_stream_response |
diff --git a/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.4.bb b/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.7.bb index e6b980266..023f22790 100644 --- a/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.4.bb +++ b/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.7.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e10d05d29ec6d8be8bfc503683f1bc9a" | |||
5 | 5 | ||
6 | inherit pypi python_setuptools_build_meta ptest | 6 | inherit pypi python_setuptools_build_meta ptest |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "50e81ac55aa609fa2c666e42bacc25c424c8884ce6072f1a7e902114b7ee5d63" | 8 | SRC_URI[sha256sum] = "ce462ff7e1daac0bc57183c6f800f09a71c2a7a98ddd5cdeca149e3eabf3338e" |
9 | 9 | ||
10 | DEPENDS += " \ | 10 | DEPENDS += " \ |
11 | python3-pdm-native \ | 11 | python3-pdm-native \ |
@@ -20,6 +20,7 @@ RDEPENDS:${PN}-ptest += " \ | |||
20 | python3-httpx \ | 20 | python3-httpx \ |
21 | python3-pytest \ | 21 | python3-pytest \ |
22 | python3-pytest-asyncio \ | 22 | python3-pytest-asyncio \ |
23 | python3-starlette \ | ||
23 | python3-unittest-automake-output \ | 24 | python3-unittest-automake-output \ |
24 | " | 25 | " |
25 | 26 | ||
diff --git a/meta-python/recipes-devtools/python/python3-aiofiles_23.2.1.bb b/meta-python/recipes-devtools/python/python3-aiofiles_24.1.0.bb index 73dc17423..1e9ebdf97 100644 --- a/meta-python/recipes-devtools/python/python3-aiofiles_23.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-aiofiles_24.1.0.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" | |||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "84ec2218d8419404abcb9f0c02df3f34c6e0a68ed41072acfb1cef5cbc29051a" | 7 | SRC_URI[sha256sum] = "22a075c9e5a3810f0c2e48f3008c94d68c65d763b9b03857924c99e57355166c" |
8 | 8 | ||
9 | PYPI_PACKAGE = "aiofiles" | 9 | PYPI_PACKAGE = "aiofiles" |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.3.2.bb b/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.4.0.bb index edad28e77..940492283 100644 --- a/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.3.2.bb +++ b/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.4.0.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohappyeyeballs" | |||
4 | LICENSE = "PSF-2.0" | 4 | LICENSE = "PSF-2.0" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "77e15a733090547a1f5369a1287ddfc944bd30df0eb8993f585259c34b405f4e" | 7 | SRC_URI[sha256sum] = "55a1714f084e63d49639800f95716da97a1f173d46a16dfcfda0016abb93b6b2" |
8 | 8 | ||
9 | inherit pypi python_poetry_core | 9 | inherit pypi python_poetry_core |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-aiohttp_3.9.5.bb b/meta-python/recipes-devtools/python/python3-aiohttp_3.10.5.bb index 57adb1eeb..f167b9d6e 100644 --- a/meta-python/recipes-devtools/python/python3-aiohttp_3.9.5.bb +++ b/meta-python/recipes-devtools/python/python3-aiohttp_3.10.5.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" | |||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=748073912af33aa59430d3702aa32d41" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=748073912af33aa59430d3702aa32d41" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "edea7d15772ceeb29db4aff55e482d4bcfb6ae160ce144f2682de02f6d693551" | 7 | SRC_URI[sha256sum] = "f071854b47d39591ce9a17981c46790acb30518e2f83dfca8db2dfa091178691" |
8 | 8 | ||
9 | PYPI_PACKAGE = "aiohttp" | 9 | PYPI_PACKAGE = "aiohttp" |
10 | inherit python_setuptools_build_meta pypi | 10 | inherit python_setuptools_build_meta pypi |
diff --git a/meta-python/recipes-devtools/python/python3-aiohue_4.7.1.bb b/meta-python/recipes-devtools/python/python3-aiohue_4.7.3.bb index 438c771db..bc4e4016f 100644 --- a/meta-python/recipes-devtools/python/python3-aiohue_4.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-aiohue_4.7.3.bb | |||
@@ -4,13 +4,12 @@ SECTION = "devel/python" | |||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "29b5e5ae05938cac195b1969e70bd6ad4e4e2e105d0e565849803d2a99ff47d1" | 7 | SRC_URI[sha256sum] = "9a50dfed1174dfc901ebbd29f1d0da5ce02c9704282ece004de40fce20774783" |
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
11 | RDEPENDS:${PN} += " \ | 11 | RDEPENDS:${PN} += "\ |
12 | python3-aiohttp \ | 12 | python3-aiohttp \ |
13 | python3-asyncio-throttle \ | 13 | python3-asyncio-throttle \ |
14 | python3-profile \ | 14 | python3-awesomeversion \ |
15 | python3-awesomeversion \ | ||
16 | " | 15 | " |
diff --git a/meta-python/recipes-devtools/python/python3-aioserial/0001-use-poetry-core-for-pyproject-base-build.patch b/meta-python/recipes-devtools/python/python3-aioserial/0001-use-poetry-core-for-pyproject-base-build.patch new file mode 100644 index 000000000..139bdb4f5 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-aioserial/0001-use-poetry-core-for-pyproject-base-build.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 5798a250b465572d84a024389b173dc996690b03 Mon Sep 17 00:00:00 2001 | ||
2 | From: alperak <alperyasinak1@gmail.com> | ||
3 | Date: Thu, 8 Aug 2024 12:56:31 +0300 | ||
4 | Subject: [PATCH] Use poetry-core for pyproject base build | ||
5 | |||
6 | https://github.com/python-poetry/poetry-core#why-is-this-required | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: alperak <alperyasinak1@gmail.com> | ||
11 | --- | ||
12 | pyproject.toml | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/pyproject.toml b/pyproject.toml | ||
16 | index 6243bff..06bc409 100644 | ||
17 | --- a/pyproject.toml | ||
18 | +++ b/pyproject.toml | ||
19 | @@ -15,5 +15,5 @@ python = "^3.6" | ||
20 | pyserial = "*" | ||
21 | |||
22 | [build-system] | ||
23 | -requires = ["poetry>=0.12"] | ||
24 | -build-backend = "poetry.masonry.api" | ||
25 | +requires = ["poetry-core>=0.12"] | ||
26 | +build-backend = "poetry.core.masonry.api" | ||
27 | -- | ||
28 | 2.25.1 | ||
29 | |||
diff --git a/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb b/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb index 8279f2704..5acbcbf97 100755 --- a/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb | |||
@@ -5,11 +5,10 @@ SECTION = "devel/python" | |||
5 | LICENSE = "MPL-2.0" | 5 | LICENSE = "MPL-2.0" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=650b9179efef1ea560df5c08bc32b494" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=650b9179efef1ea560df5c08bc32b494" |
7 | 7 | ||
8 | PYPI_PACKAGE = "aioserial" | 8 | SRC_URI += "file://0001-use-poetry-core-for-pyproject-base-build.patch" |
9 | |||
10 | SRC_URI[sha256sum] = "702bf03b0eb84b8ef2d8dac5cb925e1e685dce98f77b125569bc6fd2b3b58228" | 9 | SRC_URI[sha256sum] = "702bf03b0eb84b8ef2d8dac5cb925e1e685dce98f77b125569bc6fd2b3b58228" |
11 | 10 | ||
12 | inherit pypi setuptools3 | 11 | inherit pypi python_poetry_core |
13 | 12 | ||
14 | RDEPENDS:${PN} += " \ | 13 | RDEPENDS:${PN} += " \ |
15 | python3-asyncio \ | 14 | python3-asyncio \ |
diff --git a/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb b/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb index fd4ec767c..029f13cd4 100644 --- a/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cf056e8e7a0a5477451af18b7b5aa98c" | |||
5 | 5 | ||
6 | SRC_URI[sha256sum] = "54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc" | 6 | SRC_URI[sha256sum] = "54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
10 | BBCLASSEXTEND = "native nativesdk" | 10 | BBCLASSEXTEND = "native nativesdk" |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.13.1.bb b/meta-python/recipes-devtools/python/python3-alembic_1.13.2.bb index c4853c443..6f8fb8c33 100644 --- a/meta-python/recipes-devtools/python/python3-alembic_1.13.1.bb +++ b/meta-python/recipes-devtools/python/python3-alembic_1.13.2.bb | |||
@@ -1,10 +1,10 @@ | |||
1 | DESCRIPTION = "A database migration tool for SQLAlchemy" | 1 | DESCRIPTION = "A database migration tool for SQLAlchemy" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e3023b042cb6002cb398344b51c67093" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=00f8f5c8aab58c3e1cd61525a6675174" |
4 | 4 | ||
5 | inherit pypi setuptools3 | 5 | inherit pypi setuptools3 |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595" | 7 | SRC_URI[sha256sum] = "1ff0ae32975f4fd96028c39ed9bb3c867fe3af956bd7bb37343b54c9fe7445ef" |
8 | 8 | ||
9 | PYPI_PACKAGE = "alembic" | 9 | PYPI_PACKAGE = "alembic" |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb b/meta-python/recipes-devtools/python/python3-ansi2html_1.9.2.bb index 6af898917..d817d8ee5 100644 --- a/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb +++ b/meta-python/recipes-devtools/python/python3-ansi2html_1.9.2.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | DESCRPTION = "ansi2html - Convert text with ANSI color codes to HTML or to LaTeX" | 1 | DESCRPTION = "ansi2html - Convert text with ANSI color codes to HTML or to LaTeX" |
2 | HOMEPAGE = "https://github.com/ralphbean/ansi2html" | 2 | HOMEPAGE = "https://github.com/pycontribs/ansi2html" |
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404" |
4 | LICENSE = "GPL-3.0-only" | 4 | LICENSE = "LGPL-3.0-or-later" |
5 | 5 | ||
6 | PYPI_PACKAGE = "ansi2html" | 6 | PYPI_PACKAGE = "ansi2html" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "5c6837a13ecc1903aab7a545353312049dfedfe5105362ad3a8d9d207871ec71" | 8 | SRC_URI[sha256sum] = "3453bf87535d37b827b05245faaa756dbab4ec3d69925e352b6319c3c955c0a5" |
9 | 9 | ||
10 | inherit pypi python_setuptools_build_meta | 10 | inherit pypi python_setuptools_build_meta |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-apispec_6.4.0.bb b/meta-python/recipes-devtools/python/python3-apispec_6.6.1.bb index a48e1cfae..90d7ee271 100644 --- a/meta-python/recipes-devtools/python/python3-apispec_6.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-apispec_6.6.1.bb | |||
@@ -1,10 +1,10 @@ | |||
1 | SUMMARY = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification)." | 1 | SUMMARY = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification)." |
2 | HOMEPAGE = "https://github.com/marshmallow-code/apispec" | 2 | HOMEPAGE = "https://github.com/marshmallow-code/apispec" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3d9c303644a2e62578f0347748a80358" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a75956865b40c80a37c1e864716592b4" |
5 | 5 | ||
6 | inherit pypi setuptools3 | 6 | inherit pypi python_setuptools_build_meta |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "42b8a6833cf154c9dbd22d006b56bf9c49c972d32d24fe716fd734e0f6b739b8" | 8 | SRC_URI[sha256sum] = "f5caa47cee75fe03b9c50b5594048b4c052eeca2c212e0dac12dbb6175d9a659" |
9 | 9 | ||
10 | RDEPENDS:${PN} += "python3-packaging" | 10 | RDEPENDS:${PN} += "python3-packaging" |
diff --git a/meta-python/recipes-devtools/python/python3-argcomplete_3.3.0.bb b/meta-python/recipes-devtools/python/python3-argcomplete_3.5.0.bb index d96861010..a5cf6298a 100644 --- a/meta-python/recipes-devtools/python/python3-argcomplete_3.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-argcomplete_3.5.0.bb | |||
@@ -3,11 +3,15 @@ HOMEPAGE = "https://github.com/kislyuk/argcomplete" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "fd03ff4a5b9e6580569d34b273f741e85cd9e072f3feeeee3eba4891c70eda62" | 6 | SRC_URI[sha256sum] = "4349400469dccfb7950bb60334a680c58d88699bff6159df61251878dc6bf74b" |
7 | 7 | ||
8 | PYPI_PACKAGE = "argcomplete" | 8 | PYPI_PACKAGE = "argcomplete" |
9 | 9 | ||
10 | inherit pypi setuptools3 | 10 | inherit pypi python_setuptools_build_meta |
11 | |||
12 | DEPENDS += " \ | ||
13 | python3-setuptools-scm-native \ | ||
14 | " | ||
11 | 15 | ||
12 | RDEPENDS:${PN} += "\ | 16 | RDEPENDS:${PN} += "\ |
13 | python3-core \ | 17 | python3-core \ |
diff --git a/meta-python/recipes-devtools/python/python3-argh_0.31.2.bb b/meta-python/recipes-devtools/python/python3-argh_0.31.3.bb index afcd7d966..82b45d5aa 100644 --- a/meta-python/recipes-devtools/python/python3-argh_0.31.2.bb +++ b/meta-python/recipes-devtools/python/python3-argh_0.31.3.bb | |||
@@ -14,7 +14,7 @@ LICENSE = "LGPL-3.0-or-later" | |||
14 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ | 14 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[sha256sum] = "db1c34885804f7d4646c385dc2fb19b45298561322f4c15eae1b133993f9e323" | 17 | SRC_URI[sha256sum] = "f30023d8be14ca5ee6b1b3eeab829151d7bbda464ae07dc4dd5347919c5892f9" |
18 | 18 | ||
19 | inherit pypi python_flit_core | 19 | inherit pypi python_flit_core |
20 | 20 | ||
diff --git a/meta-python/recipes-devtools/python/python3-astroid_3.2.2.bb b/meta-python/recipes-devtools/python/python3-astroid_3.3.2.bb index d7e7f5698..e5f05bd0e 100644 --- a/meta-python/recipes-devtools/python/python3-astroid_3.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-astroid_3.3.2.bb | |||
@@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
4 | LICENSE = "LGPL-2.1-only" | 4 | LICENSE = "LGPL-2.1-only" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "8ead48e31b92b2e217b6c9733a21afafe479d52d6e164dd25fb1a770c7c3cf94" | 7 | SRC_URI[sha256sum] = "99e9b5b602cbb005434084309213d6af32bf7a9b743c836749168b8e2b330cbd" |
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb b/meta-python/recipes-devtools/python/python3-autobahn_24.4.2.bb index d9cc40b1b..d785a76cc 100644 --- a/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb +++ b/meta-python/recipes-devtools/python/python3-autobahn_24.4.2.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | DESCRIPTION = "WebSocket client & server library, WAMP real-time framework" | 1 | DESCRIPTION = "WebSocket client & server library, WAMP real-time framework" |
2 | HOMEPAGE = "http://crossbar.io/autobahn" | 2 | HOMEPAGE = "http://crossbar.io/autobahn" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3e2c2c2cc2915edc5321b0e6b1d3f5f8" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=588502cb4ffc65da2b26780d6baa5a40" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "ec9421c52a2103364d1ef0468036e6019ee84f71721e86b36fe19ad6966c1181" | 6 | SRC_URI[sha256sum] = "a2d71ef1b0cf780b6d11f8b205fd2c7749765e65795f2ea7d823796642ee92c9" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-automat_22.10.0.bb b/meta-python/recipes-devtools/python/python3-automat_24.8.1.bb index 9e33fe783..e2a31bea1 100644 --- a/meta-python/recipes-devtools/python/python3-automat_22.10.0.bb +++ b/meta-python/recipes-devtools/python/python3-automat_24.8.1.bb | |||
@@ -3,14 +3,9 @@ HOMEPAGE = "https://github.com/glyph/Automat" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e" | 6 | SRC_URI[sha256sum] = "b34227cf63f6325b8ad2399ede780675083e439b20c323d376373d8ee6306d88" |
7 | 7 | ||
8 | DEPENDS += "python3-setuptools-scm-native" | 8 | DEPENDS += "python3-setuptools-scm-native" |
9 | 9 | ||
10 | PYPI_PACKAGE = "Automat" | 10 | inherit pypi python_setuptools_build_meta |
11 | inherit pypi setuptools3 | ||
12 | 11 | ||
13 | RDEPENDS:${PN} += "\ | ||
14 | python3-attrs \ | ||
15 | python3-six \ | ||
16 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-awesomeversion_24.2.0.bb b/meta-python/recipes-devtools/python/python3-awesomeversion_24.6.0.bb index 8b19605b1..8bb5ddd54 100644 --- a/meta-python/recipes-devtools/python/python3-awesomeversion_24.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-awesomeversion_24.6.0.bb | |||
@@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENCE.md;md5=92622b5a8e216099be741d78328bae5d" | 5 | LIC_FILES_CHKSUM = "file://LICENCE.md;md5=92622b5a8e216099be741d78328bae5d" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "47a6dcbbe2921b725f75106a66ab30f26f1f33dbc5e07bc8e1e39d8eb921f53c" | 7 | SRC_URI[sha256sum] = "aee7ccbaed6f8d84e0f0364080c7734a0166d77ea6ccfcc4900b38917f1efc71" |
8 | 8 | ||
9 | RDEPENDS:${PN} += "python3-profile python3-logging" | 9 | RDEPENDS:${PN} += "python3-profile python3-logging" |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-bandit_1.7.8.bb b/meta-python/recipes-devtools/python/python3-bandit_1.7.9.bb index 8b0968857..730bf116a 100644 --- a/meta-python/recipes-devtools/python/python3-bandit_1.7.8.bb +++ b/meta-python/recipes-devtools/python/python3-bandit_1.7.9.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Security oriented static analyser for python code." | |||
2 | LICENSE = "Apache-2.0" | 2 | LICENSE = "Apache-2.0" |
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" |
4 | 4 | ||
5 | SRC_URI[sha256sum] = "36de50f720856ab24a24dbaa5fee2c66050ed97c1477e0a1159deab1775eab6b" | 5 | SRC_URI[sha256sum] = "7c395a436743018f7be0a4cbb0a4ea9b902b6d87264ddecf8cfdc73b4f78ff61" |
6 | 6 | ||
7 | DEPENDS = "python3-pbr-native python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" | 7 | DEPENDS = "python3-pbr-native python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" |
8 | 8 | ||
diff --git a/meta-python/recipes-devtools/python/python3-bitstruct_8.19.0.bb b/meta-python/recipes-devtools/python/python3-bitstruct_8.19.0.bb index 6401322e2..bdf77c7d0 100644 --- a/meta-python/recipes-devtools/python/python3-bitstruct_8.19.0.bb +++ b/meta-python/recipes-devtools/python/python3-bitstruct_8.19.0.bb | |||
@@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" | |||
5 | 5 | ||
6 | SRC_URI[sha256sum] = "d75ba9dded85c17e885a209a00eb8e248ee40762149f2f2a79360ca857467dac" | 6 | SRC_URI[sha256sum] = "d75ba9dded85c17e885a209a00eb8e248ee40762149f2f2a79360ca857467dac" |
7 | 7 | ||
8 | PYPI_PACKAGE = "bitstruct" | 8 | inherit pypi python_setuptools_build_meta |
9 | |||
10 | inherit pypi setuptools3 | ||
11 | 9 | ||
12 | CLEANBROKEN = "1" | 10 | CLEANBROKEN = "1" |
13 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-bleak_0.21.1.bb b/meta-python/recipes-devtools/python/python3-bleak_0.22.2.bb index 96f3fcbcf..bb1d7c2b1 100644 --- a/meta-python/recipes-devtools/python/python3-bleak_0.21.1.bb +++ b/meta-python/recipes-devtools/python/python3-bleak_0.22.2.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/hbldh/bleak" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bcbc2069a86cba1b5e47253679f66ed7" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bcbc2069a86cba1b5e47253679f66ed7" |
5 | 5 | ||
6 | SRCREV = "054b092e19c7a45d5ea07d8948022f54117fe5e8" | 6 | SRCREV = "c746071a3fcc3b5e69db6d6b23445ec3505d7730" |
7 | PYPI_SRC_URI = "git://github.com/hbldh/bleak.git;protocol=https;branch=develop" | 7 | PYPI_SRC_URI = "git://github.com/hbldh/bleak.git;protocol=https;branch=develop" |
8 | 8 | ||
9 | inherit pypi python_poetry_core ptest | 9 | inherit pypi python_poetry_core ptest |
@@ -26,8 +26,7 @@ do_install_ptest() { | |||
26 | } | 26 | } |
27 | 27 | ||
28 | RDEPENDS:${PN} += " \ | 28 | RDEPENDS:${PN} += " \ |
29 | python3-core (>3.7) \ | 29 | python3-core (>3.8) \ |
30 | python3-async-timeout \ | ||
31 | python3-dbus-fast \ | 30 | python3-dbus-fast \ |
32 | python3-xml \ | 31 | python3-xml \ |
33 | " | 32 | " |
diff --git a/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb b/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb index 678f12b73..542c8640d 100644 --- a/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb | |||
@@ -8,10 +8,10 @@ PYPI_PACKAGE = "Brotli" | |||
8 | 8 | ||
9 | SRC_URI[sha256sum] = "81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724" | 9 | SRC_URI[sha256sum] = "81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724" |
10 | 10 | ||
11 | inherit pypi setuptools3 | 11 | inherit pypi python_setuptools_build_meta |
12 | 12 | ||
13 | RDEPENDS:${PN} = "\ | 13 | RDEPENDS:${PN} += " \ |
14 | python3-cffi \ | 14 | python3-cffi \ |
15 | " | 15 | " |
16 | 16 | ||
17 | BBCLASSEXTEND = "native nativesdk" | 17 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/python3-cachetools_5.3.3.bb b/meta-python/recipes-devtools/python/python3-cachetools_5.5.0.bb index 3ef75d470..00e208f9c 100644 --- a/meta-python/recipes-devtools/python/python3-cachetools_5.3.3.bb +++ b/meta-python/recipes-devtools/python/python3-cachetools_5.5.0.bb | |||
@@ -28,6 +28,6 @@ do_install_ptest() { | |||
28 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | 28 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ |
29 | } | 29 | } |
30 | 30 | ||
31 | SRC_URI[sha256sum] = "ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105" | 31 | SRC_URI[sha256sum] = "2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a" |
32 | 32 | ||
33 | BBCLASSEXTEND = "native nativesdk" | 33 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/python3-can_4.2.2.bb b/meta-python/recipes-devtools/python/python3-can_4.2.2.bb index 9ca926d66..b0d87f4e3 100644 --- a/meta-python/recipes-devtools/python/python3-can_4.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-can_4.2.2.bb | |||
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" | |||
5 | 5 | ||
6 | SRC_URI[sha256sum] = "6ad50f4613289f3c4d276b6d2ac8901d776dcb929994cce93f55a69e858c595f" | 6 | SRC_URI[sha256sum] = "6ad50f4613289f3c4d276b6d2ac8901d776dcb929994cce93f55a69e858c595f" |
7 | 7 | ||
8 | PYPI_PACKAGE="python-can" | 8 | PYPI_PACKAGE = "python-can" |
9 | 9 | ||
10 | inherit pypi setuptools3 | 10 | inherit pypi python_setuptools_build_meta |
11 | 11 | ||
12 | RDEPENDS:${PN} += " \ | 12 | RDEPENDS:${PN} += " \ |
13 | python3-aenum \ | 13 | python3-aenum \ |
diff --git a/meta-python/recipes-devtools/python/python3-cbor2_5.6.4.bb b/meta-python/recipes-devtools/python/python3-cbor2_5.6.4.bb index 4033b985a..37c3ab647 100644 --- a/meta-python/recipes-devtools/python/python3-cbor2_5.6.4.bb +++ b/meta-python/recipes-devtools/python/python3-cbor2_5.6.4.bb | |||
@@ -1,31 +1,26 @@ | |||
1 | DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." | 1 | DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." |
2 | DEPENDS +="python3-setuptools-scm-native" | 2 | LICENSE = "MIT" |
3 | 3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a79e64179819c7ce293372c059f1dbd8" | |
4 | LICENSE = "Apache-2.0" | ||
5 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" | ||
6 | |||
7 | SRC_URI[sha256sum] = "1c533c50dde86bef1c6950602054a0ffa3c376e8b0e20c7b8f5b108793f6983e" | ||
8 | |||
9 | inherit pypi python_setuptools_build_meta ptest | ||
10 | |||
11 | DEPENDS += "python3-setuptools-scm-native" | 4 | DEPENDS += "python3-setuptools-scm-native" |
12 | 5 | ||
6 | SRC_URI[sha256sum] = "1c533c50dde86bef1c6950602054a0ffa3c376e8b0e20c7b8f5b108793f6983e" | ||
13 | SRC_URI += " \ | 7 | SRC_URI += " \ |
14 | file://run-ptest \ | 8 | file://run-ptest \ |
15 | " | 9 | " |
16 | 10 | ||
11 | inherit pypi python_setuptools_build_meta ptest | ||
12 | |||
13 | do_install_ptest() { | ||
14 | install -d ${D}${PTEST_PATH}/tests | ||
15 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
16 | } | ||
17 | |||
17 | RDEPENDS:${PN}-ptest += " \ | 18 | RDEPENDS:${PN}-ptest += " \ |
18 | python3-hypothesis \ | 19 | python3-hypothesis \ |
19 | python3-pytest \ | 20 | python3-pytest \ |
20 | python3-unittest-automake-output \ | 21 | python3-unittest-automake-output \ |
21 | python3-unixadmin \ | 22 | python3-unixadmin \ |
22 | " | 23 | " |
23 | |||
24 | do_install_ptest() { | ||
25 | install -d ${D}${PTEST_PATH}/tests | ||
26 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
27 | } | ||
28 | |||
29 | RDEPENDS:${PN} += " \ | 24 | RDEPENDS:${PN} += " \ |
30 | python3-datetime \ | 25 | python3-datetime \ |
31 | " | 26 | " |
diff --git a/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb b/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb index d9240e138..8daf82481 100644 --- a/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb +++ b/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb | |||
@@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=155fbcc756c8ae5265d252d23e20908f" | |||
5 | 5 | ||
6 | SRC_URI[sha256sum] = "4de4fdd6c5c38607bbd8ad76703d7cc4dbe007cfa78e8ef1f62fc6ac55303e23" | 6 | SRC_URI[sha256sum] = "4de4fdd6c5c38607bbd8ad76703d7cc4dbe007cfa78e8ef1f62fc6ac55303e23" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_poetry_core |
9 | 9 | ||
10 | RDEPENDS:${PN} += "python3-typing-extensions" | 10 | RDEPENDS:${PN} += "python3-typing-extensions" |
diff --git a/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb b/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb index b773ed6b8..46cf1b378 100644 --- a/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb | |||
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=580facc4832cac548fad94845542da44" | |||
5 | 5 | ||
6 | SRC_URI[sha256sum] = "17849c23dba3d667247dc4defe1757fff98694e90fe37474f3feebb69ced26a9" | 6 | SRC_URI[sha256sum] = "17849c23dba3d667247dc4defe1757fff98694e90fe37474f3feebb69ced26a9" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
10 | RDEPENDS:${PN} = "python3-click python3-prompt-toolkit" | 10 | RDEPENDS:${PN} += " \ |
11 | python3-click \ | ||
12 | python3-prompt-toolkit \ | ||
13 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb b/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb index 0f364c424..387124403 100644 --- a/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb +++ b/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | SUMMARY = "Cross-platform colored terminal text." | 1 | SUMMARY = "Cross-platform colored terminal text." |
2 | HOMEPAGE = "https://github.com/tartley/colorama" | 2 | HOMEPAGE = "https://github.com/tartley/colorama" |
3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26" |
5 | 5 | ||
6 | inherit pypi python_setuptools_build_meta | 6 | inherit pypi python_setuptools_build_meta |
diff --git a/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb b/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb index 8dc706fdf..96e579c78 100644 --- a/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb +++ b/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6f99b84d9a94610c62e48fa2e59e72" | |||
6 | PYPI_PACKAGE = "configobj" | 6 | PYPI_PACKAGE = "configobj" |
7 | SRC_URI[sha256sum] = "6f704434a07dc4f4dc7c9a745172c1cad449feb548febd9f7fe362629c627a97" | 7 | SRC_URI[sha256sum] = "6f704434a07dc4f4dc7c9a745172c1cad449feb548febd9f7fe362629c627a97" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
11 | RDEPENDS:${PN} += " \ | 11 | RDEPENDS:${PN} += " \ |
12 | python3-pprint \ | 12 | python3-pprint \ |
diff --git a/meta-python/recipes-devtools/python/python3-coverage_7.5.3.bb b/meta-python/recipes-devtools/python/python3-coverage_7.6.1.bb index 0df341c54..7749158f5 100644 --- a/meta-python/recipes-devtools/python/python3-coverage_7.5.3.bb +++ b/meta-python/recipes-devtools/python/python3-coverage_7.6.1.bb | |||
@@ -3,9 +3,9 @@ HOMEPAGE = "https://coverage.readthedocs.io" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "04aefca5190d1dc7a53a4c1a5a7f8568811306d7a8ee231c42fb69215571944f" | 6 | SRC_URI[sha256sum] = "953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
10 | RDEPENDS:${PN} += " \ | 10 | RDEPENDS:${PN} += " \ |
11 | python3-crypt \ | 11 | python3-crypt \ |
diff --git a/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb b/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb index da756ea07..125a7ad87 100644 --- a/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb +++ b/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | SUMMARY = "A python package implementing the crc32c algorithmin hardware and software" | 1 | SUMMARY = "A python package implementing the crc32c algorithmin hardware and software" |
2 | HOMEPAGE = "https://github.com/ICRAR/crc32c" | 2 | HOMEPAGE = "https://github.com/ICRAR/crc32c" |
3 | 3 | ||
4 | LICENSE = "BSD-2-Clause & BSD-3-Clause & CRC32C-ADLER & LGPL-2.0-or-later" | 4 | LICENSE = "BSD-2-Clause & BSD-3-Clause & CRC32C-ADLER & LGPL-2.1-or-later" |
5 | LIC_FILES_CHKSUM = " \ | 5 | LIC_FILES_CHKSUM = " \ |
6 | file://LICENSE;md5=4fbd65380cdd255951079008b364516c \ | 6 | file://LICENSE;md5=4fbd65380cdd255951079008b364516c \ |
7 | file://LICENSE.google-crc32c;md5=e9ed01b5e5ac9eae23fc2bb33701220c \ | 7 | file://LICENSE.google-crc32c;md5=e9ed01b5e5ac9eae23fc2bb33701220c \ |
diff --git a/meta-python/recipes-devtools/python/python3-croniter_2.0.5.bb b/meta-python/recipes-devtools/python/python3-croniter_3.0.3.bb index 01ee04840..b0cda74f4 100644 --- a/meta-python/recipes-devtools/python/python3-croniter_2.0.5.bb +++ b/meta-python/recipes-devtools/python/python3-croniter_3.0.3.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b8ee59850b882cbf623188489ea748e2" | |||
5 | 5 | ||
6 | PYPI_PACKAGE = "croniter" | 6 | PYPI_PACKAGE = "croniter" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "f1f8ca0af64212fbe99b1bee125ee5a1b53a9c1b433968d8bca8817b79d237f3" | 8 | SRC_URI[sha256sum] = "34117ec1741f10a7bd0ec3ad7d8f0eb8fa457a2feb9be32e6a2250e158957668" |
9 | 9 | ||
10 | inherit pypi setuptools3 | 10 | inherit pypi setuptools3 |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-daemon/0001-Use-version-from-packaging-module-instead-of-setupto.patch b/meta-python/recipes-devtools/python/python3-daemon/0001-Use-version-from-packaging-module-instead-of-setupto.patch new file mode 100644 index 000000000..316f7d961 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-daemon/0001-Use-version-from-packaging-module-instead-of-setupto.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From b7418ab4a3232431373bf0680c6b74fef06910de Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 10 Aug 2024 22:44:08 -0700 | ||
4 | Subject: [PATCH] Use version from packaging module instead of setuptools extern | ||
5 | |||
6 | Fixes build problems when using PEP-575 build backend | ||
7 | |||
8 | |||
9 | Drop the patch on upgrading to >= 3.0.2 | ||
10 | |||
11 | Upstream-Status: Backport [https://pagure.io/fork/khemraj/python-daemon/c/3bbc46967d35cd7e05677018bdc9d552efaeea3e?branch=main] | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | test_version.py | 2 +- | ||
16 | version.py | 2 +- | ||
17 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/test_version.py b/test_version.py | ||
20 | index c43cd36..d0a124d 100644 | ||
21 | --- a/test_version.py | ||
22 | +++ b/test_version.py | ||
23 | @@ -23,7 +23,7 @@ import docutils.writers | ||
24 | import setuptools | ||
25 | import setuptools.command | ||
26 | import setuptools.dist | ||
27 | -from setuptools.extern.packaging.version import InvalidVersion | ||
28 | +from packaging.version import InvalidVersion | ||
29 | import testscenarios | ||
30 | import testtools | ||
31 | |||
32 | diff --git a/version.py b/version.py | ||
33 | index 20d3ef3..fbdc462 100644 | ||
34 | --- a/version.py | ||
35 | +++ b/version.py | ||
36 | @@ -36,7 +36,7 @@ import setuptools.command.build | ||
37 | import setuptools.command.build_py | ||
38 | import setuptools.command.egg_info | ||
39 | import setuptools.dist | ||
40 | -import setuptools.extern.packaging.version | ||
41 | +import packaging.version | ||
42 | |||
43 | |||
44 | def ensure_class_bases_begin_with(namespace, class_name, base_class): | ||
diff --git a/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb b/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb index 715d3bf12..cb85262b4 100644 --- a/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb | |||
@@ -11,8 +11,9 @@ RDEPENDS:${PN} = "python3-docutils \ | |||
11 | LICENSE = "Apache-2.0 & GPL-3.0-only" | 11 | LICENSE = "Apache-2.0 & GPL-3.0-only" |
12 | LIC_FILES_CHKSUM = "file://README;md5=a3a94c615dc969a70525f1eebbacf235" | 12 | LIC_FILES_CHKSUM = "file://README;md5=a3a94c615dc969a70525f1eebbacf235" |
13 | 13 | ||
14 | inherit pypi setuptools3 | 14 | inherit pypi python_setuptools_build_meta |
15 | 15 | ||
16 | SRC_URI += "file://0001-Use-version-from-packaging-module-instead-of-setupto.patch" | ||
16 | SRC_URI[sha256sum] = "6c57452372f7eaff40934a1c03ad1826bf5e793558e87fef49131e6464b4dae5" | 17 | SRC_URI[sha256sum] = "6c57452372f7eaff40934a1c03ad1826bf5e793558e87fef49131e6464b4dae5" |
17 | 18 | ||
18 | PYPI_PACKAGE = "python-daemon" | 19 | PYPI_PACKAGE = "python-daemon" |
diff --git a/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.3.bb b/meta-python/recipes-devtools/python/python3-dbus-fast_2.24.2.bb index a4087d647..ccac69924 100644 --- a/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.3.bb +++ b/meta-python/recipes-devtools/python/python3-dbus-fast_2.24.2.bb | |||
@@ -3,11 +3,17 @@ HOMEPAGE = "https://github.com/bluetooth-devices/dbus-fast" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=729e372b5ea0168438e4fd4a00a04947" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=729e372b5ea0168438e4fd4a00a04947" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "8d0f0f61d007c1316ce79cde35ed52c0ce8ce229fd0f0bf8c9af2013ab4516a7" | 6 | SRC_URI[sha256sum] = "20c517dc70dbc940b8bf2e0f079abf3dfe821fdda3013641a17e3d8f18e131ae" |
7 | 7 | ||
8 | PYPI_PACKAGE = "dbus_fast" | 8 | PYPI_PACKAGE = "dbus_fast" |
9 | 9 | ||
10 | inherit pypi setuptools3 | 10 | inherit pypi python_poetry_core |
11 | |||
12 | DEPENDS += " \ | ||
13 | python3-setuptools-native \ | ||
14 | python3-wheel-native \ | ||
15 | python3-cython-native \ | ||
16 | " | ||
11 | 17 | ||
12 | RDEPENDS:${PN} += " \ | 18 | RDEPENDS:${PN} += " \ |
13 | python3-core (>=3.7) \ | 19 | python3-core (>=3.7) \ |
diff --git a/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb b/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb index 04e7f4bfb..3481ec06b 100644 --- a/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb +++ b/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb | |||
@@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a41509b57cc475ed93f8cb1dbbfaeec1" | |||
5 | 5 | ||
6 | SRC_URI[sha256sum] = "3ebe3c479ad625c4553aca177444d89b486b1d84982eeacded644afc0cf797ca" | 6 | SRC_URI[sha256sum] = "3ebe3c479ad625c4553aca177444d89b486b1d84982eeacded644afc0cf797ca" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
9 | |||
10 | PYPI_PACKAGE_EXT = "tar.gz" | ||
11 | 9 | ||
12 | RDEPENDS:${PN} += "\ | 10 | RDEPENDS:${PN} += "\ |
13 | python3-multiprocessing \ | 11 | python3-multiprocessing \ |
diff --git a/meta-python/recipes-devtools/python/python3-dirty-equals_0.7.1.bb b/meta-python/recipes-devtools/python/python3-dirty-equals_0.8.0.bb index ea9303b17..584d787a7 100644 --- a/meta-python/recipes-devtools/python/python3-dirty-equals_0.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-dirty-equals_0.8.0.bb | |||
@@ -10,7 +10,7 @@ HOMEPAGE = "https://github.com/samuelcolvin/dirty-equals" | |||
10 | LICENSE = "MIT" | 10 | LICENSE = "MIT" |
11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" | 11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "a580513f3285e93656a770a04e428f8bfc513848877bf278282dbfbb907fdbb4" | 13 | SRC_URI[sha256sum] = "798db3b9481b9a5024c0e520946507676ed2f0c65317d3e95bdce1a01657cf60" |
14 | 14 | ||
15 | S = "${WORKDIR}/dirty_equals-${PV}" | 15 | S = "${WORKDIR}/dirty_equals-${PV}" |
16 | 16 | ||
@@ -18,4 +18,9 @@ inherit pypi python_hatchling | |||
18 | 18 | ||
19 | PYPI_PACKAGE = "dirty_equals" | 19 | PYPI_PACKAGE = "dirty_equals" |
20 | 20 | ||
21 | RDEPENDS:${PN} += "python3-pytz" | 21 | RDEPENDS:${PN} += " \ |
22 | python3-pytz \ | ||
23 | python3-core \ | ||
24 | python3-json \ | ||
25 | python3-netclient \ | ||
26 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-django_4.2.11.bb b/meta-python/recipes-devtools/python/python3-django_4.2.16.bb index 0642b7e7c..9254e8b00 100644 --- a/meta-python/recipes-devtools/python/python3-django_4.2.11.bb +++ b/meta-python/recipes-devtools/python/python3-django_4.2.16.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require python-django.inc | 1 | require python-django.inc |
2 | inherit setuptools3 | 2 | inherit setuptools3 |
3 | 3 | ||
4 | SRC_URI[sha256sum] = "6e6ff3db2d8dd0c986b4eec8554c8e4f919b5c1ff62a5b4390c17aff2ed6e5c4" | 4 | SRC_URI[sha256sum] = "6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad" |
5 | 5 | ||
6 | RDEPENDS:${PN} += "\ | 6 | RDEPENDS:${PN} += "\ |
7 | python3-sqlparse \ | 7 | python3-sqlparse \ |
@@ -10,5 +10,5 @@ RDEPENDS:${PN} += "\ | |||
10 | 10 | ||
11 | # Set DEFAULT_PREFERENCE so that the LTS version of django is built by | 11 | # Set DEFAULT_PREFERENCE so that the LTS version of django is built by |
12 | # default. To build the 4.x branch, | 12 | # default. To build the 4.x branch, |
13 | # PREFERRED_VERSION_python3-django = "4.2.11" can be added to local.conf | 13 | # PREFERRED_VERSION_python3-django = "4.2.16" can be added to local.conf |
14 | DEFAULT_PREFERENCE = "-1" | 14 | DEFAULT_PREFERENCE = "-1" |
diff --git a/meta-python/recipes-devtools/python/python3-django_5.0.6.bb b/meta-python/recipes-devtools/python/python3-django_5.0.6.bb deleted file mode 100644 index 69b25742d..000000000 --- a/meta-python/recipes-devtools/python/python3-django_5.0.6.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | require python-django.inc | ||
2 | inherit setuptools3 | ||
3 | |||
4 | SRC_URI[sha256sum] = "ff1b61005004e476e0aeea47c7f79b85864c70124030e95146315396f1e7951f" | ||
5 | |||
6 | RDEPENDS:${PN} += "\ | ||
7 | python3-sqlparse \ | ||
8 | python3-asgiref \ | ||
9 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-django_5.0.9.bb b/meta-python/recipes-devtools/python/python3-django_5.0.9.bb new file mode 100644 index 000000000..b3fb301ed --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-django_5.0.9.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require python-django.inc | ||
2 | inherit python_setuptools_build_meta | ||
3 | |||
4 | SRC_URI[sha256sum] = "6333870d342329b60174da3a60dbd302e533f3b0bb0971516750e974a99b5a39" | ||
5 | |||
6 | RDEPENDS:${PN} += "\ | ||
7 | python3-sqlparse \ | ||
8 | python3-asgiref \ | ||
9 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-djangorestframework_3.15.1.bb b/meta-python/recipes-devtools/python/python3-djangorestframework_3.15.2.bb index 9515aa229..047aba137 100644 --- a/meta-python/recipes-devtools/python/python3-djangorestframework_3.15.1.bb +++ b/meta-python/recipes-devtools/python/python3-djangorestframework_3.15.2.bb | |||
@@ -5,7 +5,7 @@ HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework" | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" | 6 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "f88fad74183dfc7144b2756d0d2ac716ea5b4c7c9840995ac3bfd8ec034333c1" | 8 | SRC_URI[sha256sum] = "36fe88cd2d6c6bec23dca9804bab2ba5517a8bb9d8f47ebc68981b56840107ad" |
9 | 9 | ||
10 | PYPI_PACKAGE = "djangorestframework" | 10 | PYPI_PACKAGE = "djangorestframework" |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-elementpath_4.4.0.bb b/meta-python/recipes-devtools/python/python3-elementpath_4.5.0.bb index e095cb8a3..937d96860 100644 --- a/meta-python/recipes-devtools/python/python3-elementpath_4.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-elementpath_4.5.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "dfc4b8ca3d87966dcb0df40b5b6d04a98f053683271930fad9e7fa000924dfb2" | 6 | SRC_URI[sha256sum] = "affdc8de95af1a4c10d1d2ed79c6fa56b59c26c7fce64b73497569e9dea46998" |
7 | 7 | ||
8 | PYPI_PACKAGE = "elementpath" | 8 | PYPI_PACKAGE = "elementpath" |
9 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
diff --git a/meta-python/recipes-devtools/python/python3-email-validator_2.1.1.bb b/meta-python/recipes-devtools/python/python3-email-validator_2.2.0.bb index 90a22e5a0..c17cce723 100644 --- a/meta-python/recipes-devtools/python/python3-email-validator_2.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-email-validator_2.2.0.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | SUMMARY = "A robust email address syntax and deliverability validation library." | 1 | SUMMARY = "A robust email address syntax and deliverability validation library." |
2 | SECTION = "devel/python" | 2 | SECTION = "devel/python" |
3 | LICENSE = "CC0-1.0" | 3 | LICENSE = "Unlicense" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2890aee62bd2a4c3197e2059016a397e" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2890aee62bd2a4c3197e2059016a397e" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "200a70680ba08904be6d1eef729205cc0d687634399a5924d842533efb824b84" | 6 | SRC_URI[sha256sum] = "cb690f344c617a714f22e66ae771445a1ceb46821152df8e165c5f9a364582b7" |
7 | 7 | ||
8 | PYPI_PACKAGE = "email_validator" | 8 | PYPI_PACKAGE = "email_validator" |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb b/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb index 0f548cf86..1137e744c 100644 --- a/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb | |||
@@ -1,14 +1,20 @@ | |||
1 | SUMMARY = "The Ethereum hashing function, keccak256, sometimes (erroneously) called sha3." | 1 | SUMMARY = "eth-hash: The Ethereum hashing function, keccak256, sometimes (erroneously) called sha3" |
2 | HOMEPAGE = "https://github.com/ethereum/eth-hash" | 2 | HOMEPAGE = "https://github.com/ethereum/eth-hash" |
3 | SECTION = "devel/python" | ||
4 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3d7bdfe69b1ffbde073ca6e96f5c53f7" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3d7bdfe69b1ffbde073ca6e96f5c53f7" |
6 | 5 | ||
7 | SRC_URI[sha256sum] = "bacdc705bfd85dadd055ecd35fd1b4f846b671add101427e089a4ca2e8db310a" | 6 | SRC_URI[sha256sum] = "bacdc705bfd85dadd055ecd35fd1b4f846b671add101427e089a4ca2e8db310a" |
8 | 7 | ||
9 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
10 | 9 | ||
11 | RDEPENDS:${PN} = "\ | 10 | PACKAGECONFIG ?= "" |
12 | python3-logging \ | 11 | PACKAGECONFIG[dev] = ",,,python3-build python3-bumpversion python3-ipython python3-pre-commit python3-pytest python3-pytest-xdist python3-sphinx python3-sphinx_rtd_theme python3-towncrier python3-tox python3-twine python3-wheel" |
13 | python3-pycryptodome \ | 12 | PACKAGECONFIG[docs] = ",,,python3-sphinx python3-sphinx_rtd_theme python3-towncrier" |
14 | " | 13 | PACKAGECONFIG[pycryptodome] = ",,,python3-pycryptodome" |
14 | PACKAGECONFIG[pysha3python-version-smaller-3-dot-9] = ",,,python3-pysha3" | ||
15 | PACKAGECONFIG[pysha3python-version-bigger--equals-3-dot-9] = ",,,python3-safe-pysha3" | ||
16 | PACKAGECONFIG[test] = ",,,python3-pytest python3-pytest-xdist" | ||
17 | |||
18 | RDEPENDS:${PN} += "python3-core python3-logging python3-pycryptodome" | ||
19 | |||
20 | PYPI_PACKAGE = "eth-hash" | ||
diff --git a/meta-python/recipes-devtools/python/python3-eth-utils_4.1.1.bb b/meta-python/recipes-devtools/python/python3-eth-utils_5.0.0.bb index 54bd9a67c..f0a5e2441 100644 --- a/meta-python/recipes-devtools/python/python3-eth-utils_4.1.1.bb +++ b/meta-python/recipes-devtools/python/python3-eth-utils_5.0.0.bb | |||
@@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6749008d847c14b9718949c2e24d5c0a" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6749008d847c14b9718949c2e24d5c0a" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "71c8d10dec7494aeed20fa7a4d52ec2ce4a2e52fdce80aab4f5c3c19f3648b25" | 7 | SRC_URI[sha256sum] = "a5eb9555f43f4579eb83cb84f9dda9f3d6663bbd4a5a6b693f8d35045f305a1f" |
8 | 8 | ||
9 | PYPI_PACKAGE = "eth_utils" | 9 | PYPI_PACKAGE = "eth_utils" |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-evdev_1.7.1.bb b/meta-python/recipes-devtools/python/python3-evdev_1.7.1.bb index dcf50f339..f098ce4ab 100644 --- a/meta-python/recipes-devtools/python/python3-evdev_1.7.1.bb +++ b/meta-python/recipes-devtools/python/python3-evdev_1.7.1.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0ff275b442f45fc06287544cf713016f" | |||
5 | 5 | ||
6 | SRC_URI[sha256sum] = "0c72c370bda29d857e188d931019c32651a9c1ea977c08c8d939b1ced1637fde" | 6 | SRC_URI[sha256sum] = "0c72c370bda29d857e188d931019c32651a9c1ea977c08c8d939b1ced1637fde" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
10 | do_compile:prepend() { | 10 | do_compile:prepend() { |
11 | rm -rf ${S}/evdev/ecodes.c | 11 | rm -rf ${S}/evdev/ecodes.c |
diff --git a/meta-python/recipes-devtools/python/python3-eventlet_0.36.1.bb b/meta-python/recipes-devtools/python/python3-eventlet_0.37.0.bb index f70099ab9..84de0d8e4 100644 --- a/meta-python/recipes-devtools/python/python3-eventlet_0.36.1.bb +++ b/meta-python/recipes-devtools/python/python3-eventlet_0.37.0.bb | |||
@@ -4,9 +4,11 @@ SECTION = "devel/python" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "d227fe76a63d9e6a6cef53beb8ad0b2dc40a5e7737c801f4b474cfae1db07bc5" | 7 | SRC_URI[sha256sum] = "fa49bf5a549cdbaa06919679979ea022ac8f8f3cf0499f26849a1cd8e64c30b1" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi python_hatchling |
10 | |||
11 | DEPENDS += "python3-hatch-vcs-native" | ||
10 | 12 | ||
11 | RDEPENDS:${PN} += " \ | 13 | RDEPENDS:${PN} += " \ |
12 | python3-dnspython \ | 14 | python3-dnspython \ |
diff --git a/meta-python/recipes-devtools/python/python3-executing_2.0.1.bb b/meta-python/recipes-devtools/python/python3-executing_2.1.0.bb index 3ee1e66f9..4df84e638 100644 --- a/meta-python/recipes-devtools/python/python3-executing_2.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-executing_2.1.0.bb | |||
@@ -6,4 +6,4 @@ DEPENDS = "python3-setuptools-scm-native" | |||
6 | 6 | ||
7 | inherit pypi python_setuptools_build_meta | 7 | inherit pypi python_setuptools_build_meta |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "35afe2ce3affba8ee97f2d69927fa823b08b472b7b994e36a52a964b93d16147" | 9 | SRC_URI[sha256sum] = "8ea27ddd260da8150fa5a708269c4a10e76161e2496ec3e587da9e3c0fe4b9ab" |
diff --git a/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb b/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb index 2fbc27713..2099d791d 100644 --- a/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | SUMMARY = "Python bindings for Fast Artificial Neural Networks 2.2.0 (FANN >= 2.2.0)" | 1 | SUMMARY = "Python bindings for Fast Artificial Neural Networks 2.2.0 (FANN >= 2.2.0)" |
2 | SECTION = "devel/python" | 2 | SECTION = "devel/python" |
3 | LICENSE = "LGPL-2.0-only" | 3 | LICENSE = "LGPL-2.1-only" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c73b943dc75f6f65e007c56ac6515c8f" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c73b943dc75f6f65e007c56ac6515c8f" |
5 | 5 | ||
6 | SRC_URI[md5sum] = "0b85b418018746d63ed66b55465697a9" | 6 | SRC_URI[md5sum] = "0b85b418018746d63ed66b55465697a9" |
diff --git a/meta-python/recipes-devtools/python/python3-fastjsonschema_2.18.0.bb b/meta-python/recipes-devtools/python/python3-fastjsonschema_2.20.0.bb index b2e969c5c..4dd9444a9 100644 --- a/meta-python/recipes-devtools/python/python3-fastjsonschema_2.18.0.bb +++ b/meta-python/recipes-devtools/python/python3-fastjsonschema_2.20.0.bb | |||
@@ -6,23 +6,22 @@ HOMEPAGE = "https://github.com/seznam/python-fastjsonschema" | |||
6 | LICENSE = "BSD-3-Clause" | 6 | LICENSE = "BSD-3-Clause" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=18950e8362b69c0c617b42b8bd8e7532" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=18950e8362b69c0c617b42b8bd8e7532" |
8 | 8 | ||
9 | SRCREV = "756540088687cda351390f687b92e602feaa7dc6" | 9 | SRC_URI[sha256sum] = "3d48fc5300ee96f5d116f10fe6f28d938e6008f59a6a025c2649475b87f76a23" |
10 | PYPI_SRC_URI = "git://github.com/horejsek/python-fastjsonschema;protocol=https;branch=master" | ||
11 | 10 | ||
12 | SRC_URI += "file://run-ptest" | 11 | SRC_URI += "file://run-ptest" |
13 | 12 | ||
14 | inherit ptest pypi setuptools3 | 13 | inherit ptest pypi setuptools3 |
15 | 14 | ||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | do_install_ptest() { | 15 | do_install_ptest() { |
19 | install -d ${D}${PTEST_PATH}/tests | 16 | install -d ${D}${PTEST_PATH}/tests |
20 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | 17 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ |
21 | } | 18 | } |
22 | 19 | ||
20 | # python3-misc for timeit.py | ||
23 | RDEPENDS:${PN}-ptest += "\ | 21 | RDEPENDS:${PN}-ptest += "\ |
24 | python3-colorama \ | 22 | python3-colorama \ |
25 | python3-jsonschema \ | 23 | python3-jsonschema \ |
24 | python3-misc \ | ||
26 | python3-pylint \ | 25 | python3-pylint \ |
27 | python3-pytest \ | 26 | python3-pytest \ |
28 | python3-pytest-benchmark \ | 27 | python3-pytest-benchmark \ |
diff --git a/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb b/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb index 5289ad374..0491d02b1 100644 --- a/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb +++ b/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb | |||
@@ -7,9 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e949c0b3fb4fd86232f00c6ee0bdef3" | |||
7 | 7 | ||
8 | SRC_URI[sha256sum] = "a91d1483117f7ed48cd0238ad9be36b04824d57e9c38ea7523113989e81b9c53" | 8 | SRC_URI[sha256sum] = "a91d1483117f7ed48cd0238ad9be36b04824d57e9c38ea7523113989e81b9c53" |
9 | 9 | ||
10 | PYPI_PACKAGE="file-magic" | 10 | inherit pypi python_setuptools_build_meta |
11 | |||
12 | inherit pypi setuptools3 | ||
13 | 11 | ||
14 | RDEPENDS:${PN} += " \ | 12 | RDEPENDS:${PN} += " \ |
15 | file \ | 13 | file \ |
diff --git a/meta-python/recipes-devtools/python/python3-filelock_3.15.3.bb b/meta-python/recipes-devtools/python/python3-filelock_3.16.1.bb index 3bbf72319..abafa1245 100644 --- a/meta-python/recipes-devtools/python/python3-filelock_3.15.3.bb +++ b/meta-python/recipes-devtools/python/python3-filelock_3.16.1.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "https://py-filelock.readthedocs.io/" | |||
6 | LICENSE = "Unlicense" | 6 | LICENSE = "Unlicense" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "e1199bf5194a2277273dacd50269f0d87d0682088a3c561c15674ea9005d8635" | 9 | SRC_URI[sha256sum] = "c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435" |
10 | 10 | ||
11 | BBCLASSEXTEND = "native nativesdk" | 11 | BBCLASSEXTEND = "native nativesdk" |
12 | inherit pypi python_hatchling | 12 | inherit pypi python_hatchling |
diff --git a/meta-python/recipes-devtools/python/python3-flask-cors/CVE-2024-6221.patch b/meta-python/recipes-devtools/python/python3-flask-cors/CVE-2024-6221.patch new file mode 100644 index 000000000..9049b2ffe --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-flask-cors/CVE-2024-6221.patch | |||
@@ -0,0 +1,110 @@ | |||
1 | From 7ae310c56ac30e0b94fb42129aa377bf633256ec Mon Sep 17 00:00:00 2001 | ||
2 | From: Adriano Sela Aviles <adriano.selaviles@gmail.com> | ||
3 | Date: Fri, 30 Aug 2024 12:14:31 -0400 | ||
4 | Subject: [PATCH] Backwards Compatible Fix for CVE-2024-6221 (#363) | ||
5 | |||
6 | CVE: CVE-2024-6221 | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/corydolphin/flask-cors/commit/7ae310c56ac30e0b94fb42129aa377bf633256ec] | ||
9 | |||
10 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> | ||
11 | --- | ||
12 | docs/configuration.rst | 14 ++++++++++++++ | ||
13 | flask_cors/core.py | 8 +++++--- | ||
14 | flask_cors/extension.py | 16 ++++++++++++++++ | ||
15 | 3 files changed, 35 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/docs/configuration.rst b/docs/configuration.rst | ||
18 | index 91282d3..c750cf4 100644 | ||
19 | --- a/docs/configuration.rst | ||
20 | +++ b/docs/configuration.rst | ||
21 | @@ -23,6 +23,19 @@ CORS_ALLOW_HEADERS (:py:class:`~typing.List` or :py:class:`str`) | ||
22 | Headers to accept from the client. | ||
23 | Headers in the :http:header:`Access-Control-Request-Headers` request header (usually part of the preflight OPTIONS request) matching headers in this list will be included in the :http:header:`Access-Control-Allow-Headers` response header. | ||
24 | |||
25 | +CORS_ALLOW_PRIVATE_NETWORK (:py:class:`bool`) | ||
26 | + If True, the response header :http:header:`Access-Control-Allow-Private-Network` | ||
27 | + will be set with the value 'true' whenever the request header | ||
28 | + :http:header:`Access-Control-Request-Private-Network` has a value 'true'. | ||
29 | + | ||
30 | + If False, the reponse header :http:header:`Access-Control-Allow-Private-Network` | ||
31 | + will be set with the value 'false' whenever the request header | ||
32 | + :http:header:`Access-Control-Request-Private-Network` has a value of 'true'. | ||
33 | + | ||
34 | + If the request header :http:header:`Access-Control-Request-Private-Network` is | ||
35 | + not present or has a value other than 'true', the response header | ||
36 | + :http:header:`Access-Control-Allow-Private-Network` will not be set. | ||
37 | + | ||
38 | CORS_ALWAYS_SEND (:py:class:`bool`) | ||
39 | Usually, if a request doesn't include an :http:header:`Origin` header, the client did not request CORS. | ||
40 | This means we can ignore this request. | ||
41 | @@ -83,6 +96,7 @@ Default values | ||
42 | ~~~~~~~~~~~~~~ | ||
43 | |||
44 | * CORS_ALLOW_HEADERS: "*" | ||
45 | +* CORS_ALLOW_PRIVATE_NETWORK: True | ||
46 | * CORS_ALWAYS_SEND: True | ||
47 | * CORS_AUTOMATIC_OPTIONS: True | ||
48 | * CORS_EXPOSE_HEADERS: None | ||
49 | diff --git a/flask_cors/core.py b/flask_cors/core.py | ||
50 | index 5358036..bd011f4 100644 | ||
51 | --- a/flask_cors/core.py | ||
52 | +++ b/flask_cors/core.py | ||
53 | @@ -36,7 +36,7 @@ CONFIG_OPTIONS = ['CORS_ORIGINS', 'CORS_METHODS', 'CORS_ALLOW_HEADERS', | ||
54 | 'CORS_MAX_AGE', 'CORS_SEND_WILDCARD', | ||
55 | 'CORS_AUTOMATIC_OPTIONS', 'CORS_VARY_HEADER', | ||
56 | 'CORS_RESOURCES', 'CORS_INTERCEPT_EXCEPTIONS', | ||
57 | - 'CORS_ALWAYS_SEND'] | ||
58 | + 'CORS_ALWAYS_SEND', 'CORS_ALLOW_PRIVATE_NETWORK'] | ||
59 | # Attribute added to request object by decorator to indicate that CORS | ||
60 | # was evaluated, in case the decorator and extension are both applied | ||
61 | # to a view. | ||
62 | @@ -56,7 +56,8 @@ DEFAULT_OPTIONS = dict(origins='*', | ||
63 | vary_header=True, | ||
64 | resources=r'/*', | ||
65 | intercept_exceptions=True, | ||
66 | - always_send=True) | ||
67 | + always_send=True, | ||
68 | + allow_private_network=True) | ||
69 | |||
70 | |||
71 | def parse_resources(resources): | ||
72 | @@ -186,7 +187,8 @@ def get_cors_headers(options, request_headers, request_method): | ||
73 | |||
74 | if ACL_REQUEST_HEADER_PRIVATE_NETWORK in request_headers \ | ||
75 | and request_headers.get(ACL_REQUEST_HEADER_PRIVATE_NETWORK) == 'true': | ||
76 | - headers[ACL_RESPONSE_PRIVATE_NETWORK] = 'true' | ||
77 | + allow_private_network = 'true' if options.get('allow_private_network') else 'false' | ||
78 | + headers[ACL_RESPONSE_PRIVATE_NETWORK] = allow_private_network | ||
79 | |||
80 | # This is a preflight request | ||
81 | # http://www.w3.org/TR/cors/#resource-preflight-requests | ||
82 | diff --git a/flask_cors/extension.py b/flask_cors/extension.py | ||
83 | index c00cbff..694953f 100644 | ||
84 | --- a/flask_cors/extension.py | ||
85 | +++ b/flask_cors/extension.py | ||
86 | @@ -136,6 +136,22 @@ class CORS(object): | ||
87 | |||
88 | Default : True | ||
89 | :type vary_header: bool | ||
90 | + | ||
91 | + :param allow_private_network: | ||
92 | + If True, the response header `Access-Control-Allow-Private-Network` | ||
93 | + will be set with the value 'true' whenever the request header | ||
94 | + `Access-Control-Request-Private-Network` has a value 'true'. | ||
95 | + | ||
96 | + If False, the reponse header `Access-Control-Allow-Private-Network` | ||
97 | + will be set with the value 'false' whenever the request header | ||
98 | + `Access-Control-Request-Private-Network` has a value of 'true'. | ||
99 | + | ||
100 | + If the request header `Access-Control-Request-Private-Network` is | ||
101 | + not present or has a value other than 'true', the response header | ||
102 | + `Access-Control-Allow-Private-Network` will not be set. | ||
103 | + | ||
104 | + Default : True | ||
105 | + :type allow_private_network: bool | ||
106 | """ | ||
107 | |||
108 | def __init__(self, app=None, **kwargs): | ||
109 | -- | ||
110 | 2.40.0 | ||
diff --git a/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb b/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb index 1d0d86b4e..77b51c551 100644 --- a/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb | |||
@@ -9,6 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=118fecaa576ab51c1520f95e98db61ce" | |||
9 | 9 | ||
10 | PYPI_PACKAGE = "Flask-Cors" | 10 | PYPI_PACKAGE = "Flask-Cors" |
11 | 11 | ||
12 | SRC_URI += " \ | ||
13 | file://CVE-2024-6221.patch \ | ||
14 | " | ||
15 | |||
12 | SRC_URI[sha256sum] = "f268522fcb2f73e2ecdde1ef45e2fd5c71cc48fe03cffb4b441c6d1b40684eb0" | 16 | SRC_URI[sha256sum] = "f268522fcb2f73e2ecdde1ef45e2fd5c71cc48fe03cffb4b441c6d1b40684eb0" |
13 | 17 | ||
14 | inherit pypi setuptools3 | 18 | inherit pypi setuptools3 |
diff --git a/meta-python/recipes-devtools/python/python3-flask_3.0.3.bb b/meta-python/recipes-devtools/python/python3-flask_3.0.3.bb index 98e773008..de755dc29 100644 --- a/meta-python/recipes-devtools/python/python3-flask_3.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-flask_3.0.3.bb | |||
@@ -28,6 +28,10 @@ RDEPENDS:${PN} = " \ | |||
28 | python3-werkzeug \ | 28 | python3-werkzeug \ |
29 | " | 29 | " |
30 | 30 | ||
31 | RDEPENDS:${PN}-ptest += "\ | ||
32 | python3-pytest \ | ||
33 | python3-unittest-automake-output \ | ||
34 | " | ||
31 | do_install_ptest() { | 35 | do_install_ptest() { |
32 | install -d ${D}${PTEST_PATH}/tests | 36 | install -d ${D}${PTEST_PATH}/tests |
33 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | 37 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ |
diff --git a/meta-python/recipes-devtools/python/python3-flexparser_0.3.bb b/meta-python/recipes-devtools/python/python3-flexparser_0.3.1.bb index e45175f5a..7867dc501 100644 --- a/meta-python/recipes-devtools/python/python3-flexparser_0.3.bb +++ b/meta-python/recipes-devtools/python/python3-flexparser_0.3.1.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=32f547dac365c355d2cdbcd7ebea9144" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=32f547dac365c355d2cdbcd7ebea9144" |
5 | 5 | ||
6 | DEPENDS += "python3-setuptools-scm-native" | 6 | DEPENDS += "python3-setuptools-scm-native" |
7 | SRC_URI[sha256sum] = "692e7524d9e14b2b1231b772b091d7d6296951deb383f5a67bfbd0ecb0b9fa9a" | 7 | SRC_URI[sha256sum] = "36f795d82e50f5c9ae2fde1c33f21f88922fdd67b7629550a3cc4d0b40a66856" |
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta ptest | 9 | inherit pypi python_setuptools_build_meta ptest |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-fsspec_2024.9.0.bb b/meta-python/recipes-devtools/python/python3-fsspec_2024.9.0.bb new file mode 100644 index 000000000..49ca4b3e9 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-fsspec_2024.9.0.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "A specification that python filesystems should adhere to." | ||
2 | HOMEPAGE = "https://github.com/fsspec/filesystem_spec" | ||
3 | LICENSE = "BSD-3-Clause" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b38a11bf4dcdfc66307f8515ce1fbaa6" | ||
5 | |||
6 | DEPENDS = "python3-hatch-vcs-native python3-hatchling-native" | ||
7 | SRC_URI[sha256sum] = "4b0afb90c2f21832df142f292649035d80b421f60a9e1c027802e5a0da2b04e8" | ||
8 | |||
9 | inherit pypi python_hatchling ptest | ||
10 | |||
11 | PYPI_PACKAGE = "fsspec" | ||
12 | |||
13 | RDEPENDS:${PN}-ptest += "\ | ||
14 | python3-pytest \ | ||
15 | python3-pytest-mock \ | ||
16 | python3-pytest-asyncio \ | ||
17 | python3-pytest-cov \ | ||
18 | python3-pytest-benchmark \ | ||
19 | python3-aiohttp \ | ||
20 | python3-numpy \ | ||
21 | python3-requests \ | ||
22 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-gast_0.5.4.bb b/meta-python/recipes-devtools/python/python3-gast_0.6.0.bb index 9c750ea3b..af46c3feb 100644 --- a/meta-python/recipes-devtools/python/python3-gast_0.5.4.bb +++ b/meta-python/recipes-devtools/python/python3-gast_0.6.0.bb | |||
@@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a3ad9b6802e713fc5e307e1230f1ea90" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a3ad9b6802e713fc5e307e1230f1ea90" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "9c270fe5f4b130969b54174de7db4e764b09b4f7f67ccfc32480e29f78348d97" | 7 | SRC_URI[sha256sum] = "88fc5300d32c7ac6ca7b515310862f71e6fdf2c029bbec7c66c0f5dd47b6b1fb" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb b/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb index ceba10b65..733948437 100644 --- a/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb | |||
@@ -6,13 +6,9 @@ LICENSE = "Apache-2.0" | |||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" |
7 | SRCNAME = "geomet" | 7 | SRCNAME = "geomet" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "cb52411978ee01ff104ab48f108d7333b14423ae7a15a65fee25b7d29bda2e1b" | 9 | SRC_URI[sha256sum] = "51e92231a0ef6aaa63ac20c443377ba78a303fd2ecd179dc3567de79f3c11605" |
10 | 10 | ||
11 | S = "${WORKDIR}/git" | 11 | inherit pypi python_setuptools_build_meta |
12 | SRC_URI = "git://github.com/geomet/geomet.git;protocol=https;branch=master" | ||
13 | SRCREV = "6ac73c312b52aca328db2e61d90c5e363b62639f" | ||
14 | |||
15 | inherit setuptools3 | ||
16 | 12 | ||
17 | RDEPENDS:${PN} += "\ | 13 | RDEPENDS:${PN} += "\ |
18 | python3-click \ | 14 | python3-click \ |
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 0a74f5282..e44972178 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 | |||
@@ -4,7 +4,7 @@ a high-level synchronous API on top of the libevent event loop." | |||
4 | HOMEPAGE = "http://www.gevent.org" | 4 | HOMEPAGE = "http://www.gevent.org" |
5 | LICENSE = "MIT & Python-2.0" | 5 | LICENSE = "MIT & Python-2.0" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65" |
7 | DEPENDS += "python3-greenlet libev libuv c-ares python3-cython-native" | 7 | DEPENDS += "python3-greenlet-native python3-greenlet libev libuv python3-cython-native python3-cffi-native" |
8 | 8 | ||
9 | RDEPENDS:${PN} = "python3-greenlet \ | 9 | RDEPENDS:${PN} = "python3-greenlet \ |
10 | python3-mime \ | 10 | python3-mime \ |
@@ -18,7 +18,7 @@ SRC_URI += "file://0001-_setuputils.py-Do-not-add-sys_inc_dir.patch \ | |||
18 | 18 | ||
19 | SRC_URI[sha256sum] = "432fc76f680acf7cf188c2ee0f5d3ab73b63c1f03114c7cd8a34cebbe5aa2056" | 19 | SRC_URI[sha256sum] = "432fc76f680acf7cf188c2ee0f5d3ab73b63c1f03114c7cd8a34cebbe5aa2056" |
20 | 20 | ||
21 | inherit pypi setuptools3 | 21 | inherit pypi python_setuptools_build_meta |
22 | 22 | ||
23 | # Don't embed libraries, link to the system provided libs instead | 23 | # Don't embed libraries, link to the system provided libs instead |
24 | export GEVENTSETUP_EMBED_CARES = "0" | 24 | export GEVENTSETUP_EMBED_CARES = "0" |
@@ -36,3 +36,8 @@ do_configure:append() { | |||
36 | do_compile:append() { | 36 | do_compile:append() { |
37 | sed -i -e 's#${WORKDIR}##g' ${S}/src/gevent/*.c ${S}/src/gevent/libev/*.c ${S}/src/gevent/resolver/*.c | 37 | sed -i -e 's#${WORKDIR}##g' ${S}/src/gevent/*.c ${S}/src/gevent/libev/*.c ${S}/src/gevent/resolver/*.c |
38 | } | 38 | } |
39 | |||
40 | # http://errors.yoctoproject.org/Errors/Details/766918/ | ||
41 | # 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] | ||
42 | # 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] | ||
43 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-python/recipes-devtools/python/python3-google-api-core_2.19.0.bb b/meta-python/recipes-devtools/python/python3-google-api-core_2.19.1.bb index d177fcde5..f21b41aab 100644 --- a/meta-python/recipes-devtools/python/python3-google-api-core_2.19.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-api-core_2.19.1.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
5 | 5 | ||
6 | inherit pypi setuptools3 | 6 | inherit pypi setuptools3 |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "cf1b7c2694047886d2af1128a03ae99e391108a08804f87cfd35970e49c9cd10" | 8 | SRC_URI[sha256sum] = "f4695f1e3650b316a795108a76a1c416e6afb036199d1c1f1f110916df479ffd" |
9 | 9 | ||
10 | RDEPENDS:${PN} += "\ | 10 | RDEPENDS:${PN} += "\ |
11 | python3-asyncio \ | 11 | python3-asyncio \ |
diff --git a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.131.0.bb b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.135.0.bb index 91889fa4e..2b4845603 100644 --- a/meta-python/recipes-devtools/python/python3-google-api-python-client_2.131.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-api-python-client_2.135.0.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" | |||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "1c03e24af62238a8817ecc24e9d4c32ddd4cb1f323b08413652d9a9a592fc00d" | 7 | SRC_URI[sha256sum] = "b552a28123ed95493035698db80e8ed78c9106a8b422e63a175150b9b55b704e" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-google-auth_2.29.0.bb b/meta-python/recipes-devtools/python/python3-google-auth_2.30.0.bb index e8d438df0..c51be1650 100644 --- a/meta-python/recipes-devtools/python/python3-google-auth_2.29.0.bb +++ b/meta-python/recipes-devtools/python/python3-google-auth_2.30.0.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | |||
5 | 5 | ||
6 | inherit pypi setuptools3 ptest | 6 | inherit pypi setuptools3 ptest |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "672dff332d073227550ffc7457868ac4218d6c500b155fe6cc17d2b13602c360" | 8 | SRC_URI[sha256sum] = "ab630a1320f6720909ad76a7dbdb6841cdf5c66b328d690027e4867bdfb16688" |
9 | 9 | ||
10 | SRC_URI += " \ | 10 | SRC_URI += " \ |
11 | file://run-ptest \ | 11 | file://run-ptest \ |
diff --git a/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.63.0.bb b/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.63.2.bb index aee233726..5539d19f6 100644 --- a/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.63.0.bb +++ b/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.63.2.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | DESCRIPTION = "Common protobufs used in Google APIs" | 1 | DESCRIPTION = "Common protobufs used in Google APIs" |
2 | HOMEPAGE = "https://github.com/googleapis/python-api-common-protos" | 2 | HOMEPAGE = "https://github.com/googleapis/python-api-common-protos" |
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
5 | 5 | ||
6 | inherit pypi setuptools3 | 6 | inherit pypi setuptools3 |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "17ad01b11d5f1d0171c06d3ba5c04c54474e883b66b949722b4938ee2694ef4e" | 8 | SRC_URI[sha256sum] = "27c5abdffc4911f28101e635de1533fb4cfd2c37fbaa9174587c799fac90aa87" |
9 | 9 | ||
10 | RDEPENDS:${PN} += "\ | 10 | RDEPENDS:${PN} += "\ |
11 | python3-grpcio \ | 11 | python3-grpcio \ |
diff --git a/meta-python/recipes-devtools/python/python3-gpiod_2.2.0.bb b/meta-python/recipes-devtools/python/python3-gpiod_2.2.1.bb index c89fc7e92..8e1cbf849 100644 --- a/meta-python/recipes-devtools/python/python3-gpiod_2.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-gpiod_2.2.1.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://setup.py;beginline=237;endline=237;md5=f5ddb56912b7f2 | |||
7 | 7 | ||
8 | SRC_URI += "file://run-ptest" | 8 | SRC_URI += "file://run-ptest" |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "4447f05ab42a9ea596e548a9a65389aa84bf61c95dc7a78074bb9c5f8f6a6b35" | 10 | SRC_URI[sha256sum] = "802dad3a89016339a231c462c6da2d56c820f5fb11519728ff86cdff0a16da96" |
11 | 11 | ||
12 | inherit setuptools3-base python_pep517 ptest pypi | 12 | inherit setuptools3-base python_pep517 ptest pypi |
13 | 13 | ||
diff --git a/meta-python/recipes-devtools/python/python3-greenlet_3.0.3.bb b/meta-python/recipes-devtools/python/python3-greenlet_3.1.0.bb index abd6c49ca..11e8a76c8 100644 --- a/meta-python/recipes-devtools/python/python3-greenlet_3.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-greenlet_3.1.0.bb | |||
@@ -4,6 +4,8 @@ LICENSE = "MIT & PSF-2.0" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ |
5 | file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" | 5 | file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491" | 7 | SRC_URI[sha256sum] = "b395121e9bbe8d02a750886f108d540abe66075e61e22f7353d9acb0b81be0f0" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi python_setuptools_build_meta |
10 | |||
11 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.62.2.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.66.1.bb index 59bfbf553..fb91f345b 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.62.2.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.66.1.bb | |||
@@ -13,7 +13,7 @@ SRC_URI += "file://0001-Include-missing-cstdint-header.patch \ | |||
13 | file://0001-target.h-define-proper-macro-for-ppc-ppc64.patch \ | 13 | file://0001-target.h-define-proper-macro-for-ppc-ppc64.patch \ |
14 | file://0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \ | 14 | file://0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \ |
15 | " | 15 | " |
16 | SRC_URI[sha256sum] = "c77618071d96b7a8be2c10701a98537823b9c65ba256c0b9067e0594cdbd954d" | 16 | SRC_URI[sha256sum] = "35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2" |
17 | 17 | ||
18 | RDEPENDS:${PN} = "python3-protobuf" | 18 | RDEPENDS:${PN} = "python3-protobuf" |
19 | 19 | ||
diff --git a/meta-python/recipes-devtools/python/python3-gunicorn_22.0.0.bb b/meta-python/recipes-devtools/python/python3-gunicorn_23.0.0.bb index e9ad084d4..3c819a934 100644 --- a/meta-python/recipes-devtools/python/python3-gunicorn_22.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-gunicorn_23.0.0.bb | |||
@@ -3,7 +3,7 @@ SUMMARY = "WSGI HTTP Server for UNIX" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5b70a8b30792a916f50dc96123e61ddf" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5b70a8b30792a916f50dc96123e61ddf" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "4a0b436239ff76fb33f11c07a16482c521a7e09c1ce3cc293c2330afe01bec63" | 6 | SRC_URI[sha256sum] = "f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec" |
7 | 7 | ||
8 | inherit pypi python_setuptools_build_meta ptest | 8 | inherit pypi python_setuptools_build_meta ptest |
9 | 9 | ||
@@ -11,9 +11,11 @@ SRC_URI += " \ | |||
11 | file://run-ptest \ | 11 | file://run-ptest \ |
12 | " | 12 | " |
13 | 13 | ||
14 | # python-misc for wsgiref | ||
14 | RDEPENDS:${PN}-ptest += " \ | 15 | RDEPENDS:${PN}-ptest += " \ |
15 | python3-eventlet \ | 16 | python3-eventlet \ |
16 | python3-gevent \ | 17 | python3-gevent \ |
18 | python3-misc \ | ||
17 | python3-pytest \ | 19 | python3-pytest \ |
18 | python3-unittest-automake-output \ | 20 | python3-unittest-automake-output \ |
19 | " | 21 | " |
diff --git a/meta-python/recipes-devtools/python/python3-hatch-requirements-txt_0.4.1.bb b/meta-python/recipes-devtools/python/python3-hatch-requirements-txt_0.4.1.bb new file mode 100644 index 000000000..8b3218790 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-hatch-requirements-txt_0.4.1.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | SUMMARY = "Hatchling plugin to read project dependencies from requirements.txt" | ||
2 | HOMEPAGE = "https://github.com/repo-helper/hatch-requirements-txt" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=58206c261591d2c13b00ab61cec32abe" | ||
5 | |||
6 | SRC_URI[sha256sum] = "2c686e5758fd05bb55fa7d0c198fdd481f8d3aaa3c693260f5c0d74ce3547d20" | ||
7 | |||
8 | PYPI_PACKAGE = "hatch_requirements_txt" | ||
9 | |||
10 | inherit pypi python_hatchling | ||
11 | |||
12 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-haversine_2.8.1.bb b/meta-python/recipes-devtools/python/python3-haversine_2.8.1.bb index e45ae7986..5fd5ddd71 100644 --- a/meta-python/recipes-devtools/python/python3-haversine_2.8.1.bb +++ b/meta-python/recipes-devtools/python/python3-haversine_2.8.1.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | SUMMARY = "Calculate the distance between 2 points on Earth" | 1 | SUMMARY = "Calculate the distance between 2 points on Earth" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=20a52d2c688975e989fcbee3e6c8d1a1" |
4 | 4 | ||
5 | SRC_URI[sha256sum] = "ab750caa0c8f2168bd7b00a429757a83a8393be1aa30f91c2becf6b523189e2a" | 5 | SRC_URI[sha256sum] = "ab750caa0c8f2168bd7b00a429757a83a8393be1aa30f91c2becf6b523189e2a" |
6 | 6 | ||
diff --git a/meta-python/recipes-devtools/python/python3-httpx_0.27.0.bb b/meta-python/recipes-devtools/python/python3-httpx_0.27.2.bb index e4d3cbeee..e4e1eeea7 100644 --- a/meta-python/recipes-devtools/python/python3-httpx_0.27.0.bb +++ b/meta-python/recipes-devtools/python/python3-httpx_0.27.2.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c624803bdf6fc1c4ce39f5ae11d7bd05" | |||
5 | 5 | ||
6 | inherit pypi python_hatchling | 6 | inherit pypi python_hatchling |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5" | 8 | SRC_URI[sha256sum] = "f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2" |
9 | 9 | ||
10 | DEPENDS += "\ | 10 | DEPENDS += "\ |
11 | python3-hatch-fancy-pypi-readme-native \ | 11 | python3-hatch-fancy-pypi-readme-native \ |
diff --git a/meta-python/recipes-devtools/python/python3-huey_2.5.0.bb b/meta-python/recipes-devtools/python/python3-huey_2.5.1.bb index c6e560609..471fd6cc2 100644 --- a/meta-python/recipes-devtools/python/python3-huey_2.5.0.bb +++ b/meta-python/recipes-devtools/python/python3-huey_2.5.1.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4" | |||
5 | 5 | ||
6 | PYPI_PACKAGE = "huey" | 6 | PYPI_PACKAGE = "huey" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "2ffb52fb5c46a1b0d53c79d59df3622312b27e2ab68d81a580985a8ea4ca3480" | 8 | SRC_URI[sha256sum] = "8a323783ab434a095a4e72b8c48c5b8f957f9031fa860474a390a0927e957112" |
9 | 9 | ||
10 | RDEPENDS:${PN} += " \ | 10 | RDEPENDS:${PN} += " \ |
11 | python3-datetime \ | 11 | python3-datetime \ |
diff --git a/meta-python/recipes-devtools/python/python3-humanize_4.9.0.bb b/meta-python/recipes-devtools/python/python3-humanize_4.10.0.bb index da1eea4cf..a8668e148 100644 --- a/meta-python/recipes-devtools/python/python3-humanize_4.9.0.bb +++ b/meta-python/recipes-devtools/python/python3-humanize_4.10.0.bb | |||
@@ -5,7 +5,7 @@ SECTION = "devel/python" | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" | 6 | LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "582a265c931c683a7e9b8ed9559089dea7edcf6cc95be39a3cbc2c5d5ac2bcfa" | 8 | SRC_URI[sha256sum] = "06b6eb0293e4b85e8d385397c5868926820db32b9b654b932f57fa41c23c9978" |
9 | 9 | ||
10 | inherit pypi python_hatchling | 10 | inherit pypi python_hatchling |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-imageio_2.34.1.bb b/meta-python/recipes-devtools/python/python3-imageio_2.35.1.bb index 45772ef8e..6142884e7 100644 --- a/meta-python/recipes-devtools/python/python3-imageio_2.34.1.bb +++ b/meta-python/recipes-devtools/python/python3-imageio_2.35.1.bb | |||
@@ -5,7 +5,7 @@ SECTION = "devel/python" | |||
5 | LICENSE = "BSD-2-Clause" | 5 | LICENSE = "BSD-2-Clause" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "f13eb76e4922f936ac4a7fec77ce8a783e63b93543d4ea3e40793a6cabd9ac7d" | 8 | SRC_URI[sha256sum] = "4952dfeef3c3947957f6d5dedb1f4ca31c6e509a476891062396834048aeed2a" |
9 | 9 | ||
10 | inherit pypi setuptools3 | 10 | inherit pypi setuptools3 |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-importlib-metadata_8.4.0.bb b/meta-python/recipes-devtools/python/python3-importlib-metadata_8.4.0.bb new file mode 100644 index 000000000..b81d17383 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-importlib-metadata_8.4.0.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "Read metadata from Python packages" | ||
2 | HOMEPAGE = "https://pypi.org/project/importlib-metadata/" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | ||
5 | |||
6 | inherit pypi python_setuptools_build_meta | ||
7 | |||
8 | PYPI_PACKAGE = "importlib_metadata" | ||
9 | UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" | ||
10 | |||
11 | SRC_URI[sha256sum] = "9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5" | ||
12 | |||
13 | S = "${WORKDIR}/importlib_metadata-${PV}" | ||
14 | |||
15 | DEPENDS += "python3-setuptools-scm-native" | ||
16 | RDEPENDS:${PN} += "python3-zipp" | ||
17 | RDEPENDS:${PN}:append:class-target = " python3-misc" | ||
18 | RDEPENDS:${PN}:append:class-nativesdk = " python3-misc" | ||
19 | |||
20 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb b/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb deleted file mode 100644 index 503ef35a9..000000000 --- a/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | DESCRIPTION = "Incremental is a small library that versions your Python projects" | ||
2 | HOMEPAGE = "https://github.com/twisted/incremental" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6ca9b07f08e2c72d48c74d363d1e0e15" | ||
5 | |||
6 | SRC_URI[sha256sum] = "912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0" | ||
7 | |||
8 | inherit pypi python_setuptools_build_meta | ||
9 | |||
10 | RDEPENDS:${PN} += " \ | ||
11 | python3-twisted-core \ | ||
12 | python3-click \ | ||
13 | " | ||
14 | |||
15 | # -native is needed to build python[3]-twisted, however, we need to take steps to | ||
16 | # prevent a circular dependency. The build apparently does not use the part of | ||
17 | # python-incremental which uses python-twisted, so this hack is OK. | ||
18 | RDEPENDS:python3-incremental-native:remove = "python3-twisted-core-native" | ||
19 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-python/recipes-devtools/python/python3-incremental_24.7.2.bb b/meta-python/recipes-devtools/python/python3-incremental_24.7.2.bb new file mode 100644 index 000000000..dc8ecb330 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-incremental_24.7.2.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | DESCRIPTION = "Incremental is a small library that versions your Python projects" | ||
2 | HOMEPAGE = "https://github.com/twisted/incremental" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6ca9b07f08e2c72d48c74d363d1e0e15" | ||
5 | |||
6 | SRC_URI[sha256sum] = "fb4f1d47ee60efe87d4f6f0ebb5f70b9760db2b2574c59c8e8912be4ebd464c9" | ||
7 | |||
8 | inherit pypi python_setuptools_build_meta | ||
9 | |||
10 | PACKAGE_BEFORE_PN = "\ | ||
11 | ${PN}-scripts \ | ||
12 | ${PN}-tests \ | ||
13 | " | ||
14 | |||
15 | FILES:${PN}-scripts = "\ | ||
16 | ${PYTHON_SITEPACKAGES_DIR}/incremental/update.py \ | ||
17 | ${PYTHON_SITEPACKAGES_DIR}/incremental/__pycache__/update*.pyc \ | ||
18 | " | ||
19 | |||
20 | RDEPENDS:${PN}-scripts = "\ | ||
21 | python3-click \ | ||
22 | " | ||
23 | |||
24 | FILES:${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/incremental/tests" | ||
25 | |||
26 | # The tests require unit testing tool 'trial' from the twisted package | ||
27 | RDEPENDS:${PN}-tests = "\ | ||
28 | ${PN}-scripts \ | ||
29 | python3-twisted \ | ||
30 | " | ||
31 | |||
32 | BBCLASSEXTEND = "native" | ||
33 | |||
diff --git a/meta-python/recipes-devtools/python/python3-inflate64/0001-Do-not-override-const-qualifier.patch b/meta-python/recipes-devtools/python/python3-inflate64/0001-Do-not-override-const-qualifier.patch new file mode 100644 index 000000000..5391a11da --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-inflate64/0001-Do-not-override-const-qualifier.patch | |||
@@ -0,0 +1,83 @@ | |||
1 | From 7e3a795cbeea94b3324aa926f2b11904cb169acc Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 2 Jul 2024 22:02:38 -0700 | ||
4 | Subject: [PATCH] Do not override 'const' qualifier | ||
5 | |||
6 | This has worked so far but with fortified system headers from | ||
7 | Glibc 2.40+ and clang compiler it ends up in compile errors | ||
8 | |||
9 | | In file included from /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/string.h:548: | ||
10 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:77:66: error: pass_object_size attribute only applies to constant pointer arguments | ||
11 | | 77 | __NTH (strcpy (__fortify_clang_overload_arg (char *, __restrict, __dest), | ||
12 | | | ^ | ||
13 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:86:66: error: pass_object_size attribute only applies to constant pointer arguments | ||
14 | | 86 | __NTH (stpcpy (__fortify_clang_overload_arg (char *, __restrict, __dest), | ||
15 | | | ^ | ||
16 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:96:67: error: pass_object_size attribute only applies to constant pointer arguments | ||
17 | | 96 | __NTH (strncpy (__fortify_clang_overload_arg (char *, __restrict, __dest), | ||
18 | | | ^ | ||
19 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:107:56: error: pass_object_size attribute only applies to constant pointer arguments | ||
20 | | 107 | __NTH (stpncpy (__fortify_clang_overload_arg (char *, ,__dest), | ||
21 | | | ^ | ||
22 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:136:66: error: pass_object_size attribute only applies to constant pointer arguments | ||
23 | | 136 | __NTH (strcat (__fortify_clang_overload_arg (char *, __restrict, __dest), | ||
24 | | | ^ | ||
25 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:145:67: error: pass_object_size attribute only applies to constant pointer arguments | ||
26 | | 145 | __NTH (strncat (__fortify_clang_overload_arg (char *, __restrict, __dest), | ||
27 | | | ^ | ||
28 | | /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:161:67: error: pass_object_size attribute only applies to constant pointer arguments | ||
29 | | 161 | __NTH (strlcpy (__fortify_clang_overload_arg (char *, __restrict, __dest), | ||
30 | |||
31 | Therefore adjust needed places to use const qualifier | ||
32 | |||
33 | Upstream-Status: Submitted [https://codeberg.org/miurahr/inflate64/pulls/13] | ||
34 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
35 | --- | ||
36 | src/lib/deflate.h | 2 +- | ||
37 | src/lib/deflate_tree.c | 4 ++-- | ||
38 | src/lib/inflate64_config.h | 3 --- | ||
39 | 3 files changed, 3 insertions(+), 6 deletions(-) | ||
40 | |||
41 | diff --git a/src/lib/deflate.h b/src/lib/deflate.h | ||
42 | index 72a324f..c780be9 100644 | ||
43 | --- a/src/lib/deflate.h | ||
44 | +++ b/src/lib/deflate.h | ||
45 | @@ -288,6 +288,6 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, char FAR *buf, | ||
46 | extern const unsigned char ZLIB_INTERNAL _dist_code[]; | ||
47 | #endif | ||
48 | #endif | ||
49 | -extern uch ZLIB_INTERNAL length_code[]; | ||
50 | +extern const uch ZLIB_INTERNAL length_code[]; | ||
51 | |||
52 | #endif /* DEFLATE_H */ | ||
53 | diff --git a/src/lib/deflate_tree.c b/src/lib/deflate_tree.c | ||
54 | index 5a66139..cdee934 100644 | ||
55 | --- a/src/lib/deflate_tree.c | ||
56 | +++ b/src/lib/deflate_tree.c | ||
57 | @@ -78,10 +78,10 @@ local const uch bl_order[BL_CODES] | ||
58 | |||
59 | #define DIST_CODE_LEN 768 /* see definition of array dist_code below */ | ||
60 | |||
61 | -local int base_length[LENGTH_CODES]; | ||
62 | +local const int base_length[LENGTH_CODES]; | ||
63 | /* First normalized length for each code (0 = MIN_MATCH) */ | ||
64 | |||
65 | -uch length_code[BASE_MATCH-MIN_MATCH+1]; | ||
66 | +const uch length_code[BASE_MATCH-MIN_MATCH+1]; | ||
67 | /* length code for each normalized match length (0 == MIN_MATCH) */ | ||
68 | |||
69 | #if defined(GEN_TREES_H) || !defined(STDC) | ||
70 | diff --git a/src/lib/inflate64_config.h b/src/lib/inflate64_config.h | ||
71 | index 16cfd12..ade7300 100644 | ||
72 | --- a/src/lib/inflate64_config.h | ||
73 | +++ b/src/lib/inflate64_config.h | ||
74 | @@ -53,9 +53,6 @@ | ||
75 | # define FAR | ||
76 | #endif | ||
77 | |||
78 | -#ifndef const | ||
79 | -# define const | ||
80 | -#endif | ||
81 | #define z_const const | ||
82 | |||
83 | typedef unsigned char uch; | ||
diff --git a/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb b/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb index 2ccc98e36..9fbd5157a 100644 --- a/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb | |||
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
6 | 6 | ||
7 | inherit setuptools3 pypi | 7 | inherit setuptools3 pypi |
8 | 8 | ||
9 | SRC_URI += "file://0001-Do-not-override-const-qualifier.patch" | ||
9 | SRC_URI[sha256sum] = "3278827b803cf006a1df251f3e13374c7d26db779e5a33329cc11789b804bc2d" | 10 | SRC_URI[sha256sum] = "3278827b803cf006a1df251f3e13374c7d26db779e5a33329cc11789b804bc2d" |
10 | 11 | ||
11 | PYPI_PACKAGE = "inflate64" | 12 | PYPI_PACKAGE = "inflate64" |
diff --git a/meta-python/recipes-devtools/python/python3-ipython_8.25.0.bb b/meta-python/recipes-devtools/python/python3-ipython_8.27.0.bb index 2e2d0e1c5..94e731b88 100644 --- a/meta-python/recipes-devtools/python/python3-ipython_8.25.0.bb +++ b/meta-python/recipes-devtools/python/python3-ipython_8.27.0.bb | |||
@@ -3,9 +3,7 @@ HOMEPAGE = "https://ipython.org" | |||
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" | 4 | LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" |
5 | 5 | ||
6 | PYPI_PACKAGE = "ipython" | 6 | SRC_URI[sha256sum] = "0b99a2dc9f15fd68692e898e5568725c6d49c527d36a9fb5960ffbdeaa82ff7e" |
7 | |||
8 | SRC_URI[sha256sum] = "c6ed726a140b6e725b911528f80439c534fac915246af3efc39440a6b0f9d716" | ||
9 | 7 | ||
10 | RDEPENDS:${PN} = "\ | 8 | RDEPENDS:${PN} = "\ |
11 | python3-setuptools \ | 9 | python3-setuptools \ |
@@ -25,4 +23,4 @@ RDEPENDS:${PN} = "\ | |||
25 | python3-stack-data \ | 23 | python3-stack-data \ |
26 | " | 24 | " |
27 | 25 | ||
28 | inherit setuptools3 pypi | 26 | inherit python_setuptools_build_meta pypi |
diff --git a/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb b/meta-python/recipes-devtools/python/python3-itsdangerous_2.2.0.bb index 5af1d594b..f4d8d5296 100644 --- a/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-itsdangerous_2.2.0.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | SUMMARY = "Various helpers to pass trusted data to untrusted environments and back." | 1 | SUMMARY = "Various helpers to pass trusted data to untrusted environments and back." |
2 | HOMEPAGE = "http://github.com/mitsuhiko/itsdangerous" | 2 | HOMEPAGE = "http://github.com/mitsuhiko/itsdangerous" |
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=4cda9a0ebd516714f360b0e9418cfb37" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4cda9a0ebd516714f360b0e9418cfb37" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a" | 6 | SRC_URI[sha256sum] = "e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
10 | CLEANBROKEN = "1" | 10 | CLEANBROKEN = "1" |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-joblib_1.4.2.bb b/meta-python/recipes-devtools/python/python3-joblib_1.4.2.bb index 13d2a448d..399ccd22e 100644 --- a/meta-python/recipes-devtools/python/python3-joblib_1.4.2.bb +++ b/meta-python/recipes-devtools/python/python3-joblib_1.4.2.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Joblib is a set of tools to provide lightweight pipelining in Python. | |||
2 | LICENSE = "BSD-3-Clause" | 2 | LICENSE = "BSD-3-Clause" |
3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2e481820abf0a70a18011a30153df066" | 3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2e481820abf0a70a18011a30153df066" |
4 | 4 | ||
5 | inherit setuptools3 pypi | 5 | inherit python_setuptools_build_meta pypi |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "2382c5816b2636fbd20a09e0f4e9dad4736765fdfb7dca582943b9c1366b3f0e" | 7 | SRC_URI[sha256sum] = "2382c5816b2636fbd20a09e0f4e9dad4736765fdfb7dca582943b9c1366b3f0e" |
8 | 8 | ||
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 991aa0f7d..045ac2310 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,15 @@ RDEPENDS:${PN} = " \ | |||
70 | python3-pillow \ | 70 | python3-pillow \ |
71 | python3-pygments \ | 71 | python3-pygments \ |
72 | " | 72 | " |
73 | |||
74 | # http://errors.yoctoproject.org/Errors/Details/766917/ | ||
75 | # 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] | ||
76 | # 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] | ||
77 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
78 | |||
79 | do_compile:append() { | ||
80 | for f in `find ${B} -name *.c` | ||
81 | do | ||
82 | sed -i -e "/BEGIN: Cython Metadata/,/END: Cython Metadata/d" $f | ||
83 | done | ||
84 | } | ||
diff --git a/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.5.bb b/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.7.bb index a1949b113..9c422490e 100644 --- a/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.5.bb +++ b/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.7.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | SUMMARY = "A fast implementation of the Cassowary constraint solver" | 1 | SUMMARY = "A fast implementation of the Cassowary constraint solver" |
2 | HOMEPAGE = "https://github.com/nucleic/kiwi" | 2 | HOMEPAGE = "https://github.com/nucleic/kiwi" |
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f137eeae9cf8004d06830f6ab25b2d52" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5f7ce5ba663b186ce35b78df96a2eb0a" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec" | 6 | SRC_URI[sha256sum] = "9893ff81bd7107f7b685d3017cc6583daadb4fc26e4a888350df530e41980a60" |
7 | 7 | ||
8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-langtable_0.0.66.bb b/meta-python/recipes-devtools/python/python3-langtable_0.0.68.bb index 26a4f1921..64eb57dd3 100644 --- a/meta-python/recipes-devtools/python/python3-langtable_0.0.66.bb +++ b/meta-python/recipes-devtools/python/python3-langtable_0.0.68.bb | |||
@@ -6,7 +6,7 @@ SECTION = "devel/python" | |||
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "0679e9014aa25916a8184c7bb5082fe983a661ab958d37f5fb75461abf5fb342" | 9 | SRC_URI[sha256sum] = "3965a4d57a066a595ea8a87f6a5295412e65a7f39dbaad95c7327d48b11799fe" |
10 | 10 | ||
11 | inherit pypi setuptools3 python3native | 11 | inherit pypi setuptools3 python3native |
12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb b/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb index 263c46869..195f94705 100644 --- a/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb +++ b/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb | |||
@@ -4,8 +4,8 @@ LICENSE = "BSD-2-Clause" | |||
4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d606e94f56c21c8e0cdde0b622dcdf57" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d606e94f56c21c8e0cdde0b622dcdf57" |
6 | 6 | ||
7 | DEPENDS += "python3-setuptools-scm-native python3-pip-native" | 7 | DEPENDS += "python3-setuptools-scm-native" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "78247b6d45f43a52ef35c25b5581459e85117225408a4128a3daf8bf9648ac69" | 9 | SRC_URI[sha256sum] = "78247b6d45f43a52ef35c25b5581459e85117225408a4128a3daf8bf9648ac69" |
10 | 10 | ||
11 | inherit pypi setuptools3 | 11 | inherit pypi python_setuptools_build_meta |
diff --git a/meta-python/recipes-devtools/python/python3-lazy_1.6.bb b/meta-python/recipes-devtools/python/python3-lazy_1.6.bb index 97517f89a..222489302 100644 --- a/meta-python/recipes-devtools/python/python3-lazy_1.6.bb +++ b/meta-python/recipes-devtools/python/python3-lazy_1.6.bb | |||
@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7df3865e8640604acfa474235d2db76b" | |||
5 | 5 | ||
6 | SRC_URI[sha256sum] = "7127324ec709e8324f08cb4611c1abe01776bda53bb9ce68dc5dfa46ca0ed3e9" | 6 | SRC_URI[sha256sum] = "7127324ec709e8324f08cb4611c1abe01776bda53bb9ce68dc5dfa46ca0ed3e9" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
diff --git a/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb b/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb index 27e336710..5ad2a5995 100644 --- a/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb +++ b/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://gitlab.freedesktop.org/libevdev/python-libevdev" | |||
3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
4 | 4 | ||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d94c10c546b419eddc6296157ec40747" |
7 | 7 | ||
8 | SRC_URI[md5sum] = "34b48098c1fba26de79a0d67a17a588a" | 8 | SRC_URI[md5sum] = "34b48098c1fba26de79a0d67a17a588a" |
9 | SRC_URI[sha256sum] = "e9ca006a4df2488a60bd9a740011ee948d81904be2364f017e560169508f560f" | 9 | SRC_URI[sha256sum] = "e9ca006a4df2488a60bd9a740011ee948d81904be2364f017e560169508f560f" |
diff --git a/meta-python/recipes-devtools/python/python3-lru-dict_1.3.0.bb b/meta-python/recipes-devtools/python/python3-lru-dict_1.3.0.bb index e9535fa6f..236daca49 100644 --- a/meta-python/recipes-devtools/python/python3-lru-dict_1.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-lru-dict_1.3.0.bb | |||
@@ -1,11 +1,9 @@ | |||
1 | SUMMARY = "A fixed size dict like container which evicts Least Recently Used (LRU) items once size limit is exceeded." | 1 | DESCRIPTION = "A fixed size dict like container which evicts Least Recently Used (LRU) items once size limit is exceeded." |
2 | HOMEPAGE = "https://github.com/amitdev/lru-dict" | 2 | HOMEPAGE = "https://github.com/amitdev/lru-dict" |
3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9d10a486ee04034fdef5162fd791f153" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9d10a486ee04034fdef5162fd791f153" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "54fd1966d6bd1fcde781596cb86068214edeebff1db13a2cea11079e3fd07b6b" | 7 | SRC_URI[sha256sum] = "54fd1966d6bd1fcde781596cb86068214edeebff1db13a2cea11079e3fd07b6b" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi python_setuptools_build_meta |
10 | |||
11 | SRC_URI += "${PYPI_SRC_URI}" | ||
diff --git a/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb b/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb index 95f066aff..74b9be502 100644 --- a/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb +++ b/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/rm-hull/luma.oled" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5ec447eb69733e20a55838de7e8cb991" | 7 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5ec447eb69733e20a55838de7e8cb991" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "7e2a0d6a4c968c64980255d681ec27914d9abd5a66a9019b289bf3ad050c2125" | 11 | SRC_URI[sha256sum] = "7e2a0d6a4c968c64980255d681ec27914d9abd5a66a9019b289bf3ad050c2125" |
12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-marshmallow_3.21.2.bb b/meta-python/recipes-devtools/python/python3-marshmallow_3.22.0.bb index 11351230c..269522dce 100644 --- a/meta-python/recipes-devtools/python/python3-marshmallow_3.21.2.bb +++ b/meta-python/recipes-devtools/python/python3-marshmallow_3.22.0.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "\ | |||
6 | file://LICENSE;md5=27586b20700d7544c06933afe56f7df4 \ | 6 | file://LICENSE;md5=27586b20700d7544c06933afe56f7df4 \ |
7 | file://docs/license.rst;md5=13da439ad060419fb7cf364523017cfb" | 7 | file://docs/license.rst;md5=13da439ad060419fb7cf364523017cfb" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "82408deadd8b33d56338d2182d455db632c6313aa2af61916672146bb32edc56" | 9 | SRC_URI[sha256sum] = "4972f529104a220bb8637d595aa4c9762afbe7f7a77d82dc58c1615d70c5823e" |
10 | 10 | ||
11 | inherit python_flit_core pypi ptest | 11 | inherit python_flit_core pypi ptest |
12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.6.bb b/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.7.bb index 13210b906..335565643 100644 --- a/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.6.bb +++ b/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.7.bb | |||
@@ -3,6 +3,9 @@ HOMEPAGE = "https://pypi.org/project/matplotlib-inline/" | |||
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d4692a0eb42ca54892399db2cb35e61e" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d4692a0eb42ca54892399db2cb35e61e" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304" | 6 | SRC_URI[sha256sum] = "8423b23ec666be3d16e16b60bdd8ac4e86e840ebd1dd11a30b9f117f2fa0ab90" |
7 | 7 | ||
8 | inherit pypi | 8 | PYPI_PACKAGE = "matplotlib_inline" |
9 | inherit pypi python_setuptools_build_meta | ||
10 | |||
11 | RDEPENDS:${PN} = "python3-traitlets" | ||
diff --git a/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb b/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb index d9ecb9d4c..1b89260e1 100644 --- a/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | DESCRIPTION = "A Python Mocking and Patching Library for Testing" | 1 | DESCRIPTION = "A Python Mocking and Patching Library for Testing" |
2 | HOMEPAGE = "https://pypi.python.org/pypi/mock" | 2 | HOMEPAGE = "https://pypi.python.org/pypi/mock" |
3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "BSD-2-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" |
6 | 6 | ||
7 | inherit pypi setuptools3 | 7 | inherit pypi setuptools3 |
diff --git a/meta-python/recipes-devtools/python/python3-moteus_0.3.71.bb b/meta-python/recipes-devtools/python/python3-moteus_0.3.72.bb index 54c53afe4..be560c718 100644 --- a/meta-python/recipes-devtools/python/python3-moteus_0.3.71.bb +++ b/meta-python/recipes-devtools/python/python3-moteus_0.3.72.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=9;md5=24025d3c660abfc62a | |||
5 | 5 | ||
6 | inherit pypi setuptools3 | 6 | inherit pypi setuptools3 |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "7caa994ad7ed2b0a219b20e4a2e83b6bad01e549402c38a264f0d83d560d7908" | 8 | SRC_URI[sha256sum] = "3aa30eea9ab9bc7209ab7c6f382650265ab648663edead5c54d69d9f0a3fd36e" |
9 | 9 | ||
10 | S = "${WORKDIR}/moteus-${PV}" | 10 | S = "${WORKDIR}/moteus-${PV}" |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-msgpack_1.0.8.bb b/meta-python/recipes-devtools/python/python3-msgpack_1.1.0.bb index a000737f4..eb04dc2e0 100644 --- a/meta-python/recipes-devtools/python/python3-msgpack_1.0.8.bb +++ b/meta-python/recipes-devtools/python/python3-msgpack_1.1.0.bb | |||
@@ -2,9 +2,9 @@ SUMMARY = "MessagePack (de)serializer" | |||
2 | LICENSE = "Apache-2.0" | 2 | LICENSE = "Apache-2.0" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" |
4 | 4 | ||
5 | inherit pypi setuptools3 ptest | 5 | inherit pypi python_setuptools_build_meta ptest |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3" | 7 | SRC_URI[sha256sum] = "dd432ccc2c72b914e4cb77afce64aab761c1137cc698be3984eee260bcb2896e" |
8 | 8 | ||
9 | RDEPENDS:${PN}:class-target += "\ | 9 | RDEPENDS:${PN}:class-target += "\ |
10 | python3-io \ | 10 | python3-io \ |
diff --git a/meta-python/recipes-devtools/python/python3-multidict_6.0.5.bb b/meta-python/recipes-devtools/python/python3-multidict_6.0.5.bb index b12e180d0..6346152ae 100644 --- a/meta-python/recipes-devtools/python/python3-multidict_6.0.5.bb +++ b/meta-python/recipes-devtools/python/python3-multidict_6.0.5.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/multidict/" | |||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b4fef6e4b0828c2401fb983363985b39" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b4fef6e4b0828c2401fb983363985b39" |
6 | 6 | ||
7 | inherit pypi setuptools3 ptest | 7 | inherit pypi python_setuptools_build_meta ptest |
8 | 8 | ||
9 | PV .= "+git" | 9 | PV .= "+git" |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-nmap_1.6.0.bb b/meta-python/recipes-devtools/python/python3-nmap_1.9.1.bb index 5fe9ab4e3..25e382088 100644 --- a/meta-python/recipes-devtools/python/python3-nmap_1.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-nmap_1.9.1.bb | |||
@@ -1,14 +1,14 @@ | |||
1 | DESCRIPTION = "python-nmap is a python library which helps in using nmap port scanner" | 1 | DESCRIPTION = "python-nmap is a python library which helps in using nmap port scanner" |
2 | HOMEPAGE = "https://www.nmmapper.com/" | 2 | HOMEPAGE = "https://www.nmmapper.com/" |
3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
4 | LICENSE = "MIT" | 4 | LICENSE = "GPL-3.0-only" |
5 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" |
6 | 6 | ||
7 | DEPENDS += "python3-wheel-native" | 7 | DEPENDS += "python3-wheel-native" |
8 | 8 | ||
9 | PYPI_PACKAGE = "python3-nmap" | 9 | PYPI_PACKAGE = "python3-nmap" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "892b5091cde429fabfb8ba63382b2db8fd795193ba147558d0a7d5534c956255" | 11 | SRC_URI[sha256sum] = "8465cfb013f5cdfa8a1050c40cdae600b581ee32f1864ec404927aee49b4262c" |
12 | 12 | ||
13 | inherit pypi setuptools3 | 13 | inherit pypi setuptools3 |
14 | 14 | ||
diff --git a/meta-python/recipes-devtools/python/python3-nocasedict_2.0.3.bb b/meta-python/recipes-devtools/python/python3-nocasedict_2.0.4.bb index 105c20b5a..31bd15f8b 100644 --- a/meta-python/recipes-devtools/python/python3-nocasedict_2.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-nocasedict_2.0.4.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pywbem/nocasedict" | |||
3 | LICENSE = "LGPL-2.1-only" | 3 | LICENSE = "LGPL-2.1-only" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "1c9226c7f5a8a97ad51dcb0ae3157a720e3f7cb9c4568d22ea3a05e3f85658a9" | 6 | SRC_URI[sha256sum] = "4ca934f65df57b10d0fcab5f0c39e9dccb93577ff9f22bef98265ddbf12f8af1" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-nocaselist_2.0.2.bb b/meta-python/recipes-devtools/python/python3-nocaselist_2.0.3.bb index 913b8ac5e..a86945387 100644 --- a/meta-python/recipes-devtools/python/python3-nocaselist_2.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-nocaselist_2.0.3.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "32708b700a1a53133e6bb5cc53332c9775b0c7c959a5f9725793171fd2f4c8a5" | 6 | SRC_URI[sha256sum] = "55714da8433fb4843ce797404977e4385d5e3df9e4aa00f7dde983fd87410fef" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-oletools_0.60.1.bb b/meta-python/recipes-devtools/python/python3-oletools_0.60.2.bb index fbb7955d6..162ebcab2 100644 --- a/meta-python/recipes-devtools/python/python3-oletools_0.60.1.bb +++ b/meta-python/recipes-devtools/python/python3-oletools_0.60.2.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | SUMMARY = "Python tools to analyze security characteristics of MS Office and OLE files" | 1 | SUMMARY = "Python tools to analyze security characteristics of MS Office and OLE files" |
2 | HOMEPAGE = "https://github.com/decalage2/olefile" | 2 | HOMEPAGE = "https://github.com/decalage2/olefile" |
3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-2-Clause" |
4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=d7dd4b0d1f7153322a546e89b5a0a632" | 4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=181754d317256f1b037529d3e994e1b4" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "67a796da4c4b8e2feb9a6b2495bef8798a3323a75512de4e5669d9dc9d1fae31" | 6 | SRC_URI[sha256sum] = "ad452099f4695ffd8855113f453348200d195ee9fa341a09e197d66ee7e0b2c3" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-openpyxl_3.1.3.bb b/meta-python/recipes-devtools/python/python3-openpyxl_3.1.5.bb index 934bf319b..990d3cf33 100644 --- a/meta-python/recipes-devtools/python/python3-openpyxl_3.1.3.bb +++ b/meta-python/recipes-devtools/python/python3-openpyxl_3.1.5.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148 | |||
9 | 9 | ||
10 | inherit pypi setuptools3 | 10 | inherit pypi setuptools3 |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "8dd482e5350125b2388070bb2477927be2e8ebc27df61178709bc8c8751da2f9" | 12 | SRC_URI[sha256sum] = "cf0e3cf56142039133628b5acffe8ef0c12bc902d2aadd3e0fe5878dc08d1050" |
13 | 13 | ||
14 | RDEPENDS:${PN} += "\ | 14 | RDEPENDS:${PN} += "\ |
15 | python3-compression \ | 15 | python3-compression \ |
diff --git a/meta-python/recipes-devtools/python/python3-outcome_1.3.0.post0.bb b/meta-python/recipes-devtools/python/python3-outcome_1.3.0.post0.bb new file mode 100644 index 000000000..89c0da470 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-outcome_1.3.0.post0.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | SUMMARY = "Capture the outcome of Python function calls." | ||
2 | HOMEPAGE = "https://github.com/python-trio/outcome" | ||
3 | LICENSE = "Apache-2.0 & MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fa7b86389e58dd4087a8d2b833e5fe96 \ | ||
5 | file://LICENSE.APACHE2;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
6 | file://LICENSE.MIT;md5=e62ba5042d5983462ad229f5aec1576c" | ||
7 | |||
8 | SRC_URI[sha256sum] = "9dcf02e65f2971b80047b377468e72a268e15c0af3cf1238e6ff14f7f91143b8" | ||
9 | |||
10 | inherit pypi setuptools3 | ||
11 | |||
12 | RDEPENDS:${PN} += "python3-attrs" | ||
13 | |||
14 | RDEPENDS:${PN} += "python3-asyncio python3-core python3-pytest python3-typing-extensions" | ||
15 | |||
16 | PYPI_PACKAGE = "outcome" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch new file mode 100644 index 000000000..b0ef8ce00 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From d81d95274d84ac51fc02e0fa91affc7f3cbefccb Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 24 Aug 2024 10:21:43 -0700 | ||
4 | Subject: [PATCH] pyproject.toml: Downgrade numpy version needs to 1.x | ||
5 | |||
6 | Drop it when numpy is upgraded to 2.x or newer in core | ||
7 | |||
8 | Upstream-Status: Inappropriate [OE workaround] | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | pyproject.toml | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/pyproject.toml b/pyproject.toml | ||
16 | index 5158d60..d3daa78 100644 | ||
17 | --- a/pyproject.toml | ||
18 | +++ b/pyproject.toml | ||
19 | @@ -8,7 +8,7 @@ requires = [ | ||
20 | "Cython>=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json | ||
21 | # Force numpy higher than 2.0rc1, so that built wheels are compatible | ||
22 | # with both numpy 1 and 2 | ||
23 | - "numpy>=2.0.0rc1", | ||
24 | + "numpy>=1.24.0", | ||
25 | "versioneer[toml]" | ||
26 | ] | ||
27 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch new file mode 100644 index 000000000..f60f43a5b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From d46b8720a6bccb345f6bdd7ee2f5c357e7eb227b Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
3 | Date: Mon, 12 Aug 2024 11:27:36 -0400 | ||
4 | Subject: [PATCH] pyproject.toml: don't pin dependency versions | ||
5 | |||
6 | Pandas will fail to build if the exact versions aren't found, but newer | ||
7 | ones actually work. Since newer versions of pandas are adjusting the | ||
8 | requires section of pyproject toml further, just patch it for us. | ||
9 | |||
10 | Upstream-Status: Inappropriate [OE-Specific] | ||
11 | |||
12 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
13 | --- | ||
14 | pyproject.toml | 6 +++--- | ||
15 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/pyproject.toml b/pyproject.toml | ||
18 | index db9f055799..5158d60f59 100644 | ||
19 | --- a/pyproject.toml | ||
20 | +++ b/pyproject.toml | ||
21 | @@ -2,10 +2,10 @@ | ||
22 | # Minimum requirements for the build system to execute. | ||
23 | # See https://github.com/scipy/scipy/pull/12940 for the AIX issue. | ||
24 | requires = [ | ||
25 | - "meson-python==0.13.1", | ||
26 | - "meson==1.2.1", | ||
27 | + "meson-python>=0.13.1", | ||
28 | + "meson>=1.2.1", | ||
29 | "wheel", | ||
30 | - "Cython==3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json | ||
31 | + "Cython>=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json | ||
32 | # Force numpy higher than 2.0rc1, so that built wheels are compatible | ||
33 | # with both numpy 1 and 2 | ||
34 | "numpy>=2.0.0rc1", | ||
35 | -- | ||
36 | 2.39.2 | ||
37 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb b/meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb index 91e76d991..25b03c8e3 100644 --- a/meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb | |||
@@ -6,9 +6,14 @@ HOMEPAGE = "http://pandas.pydata.org/" | |||
6 | LICENSE = "BSD-3-Clause" | 6 | LICENSE = "BSD-3-Clause" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cb819092901ddb13a7d0a4f5e05f098a" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cb819092901ddb13a7d0a4f5e05f098a" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "c02f372a88e0d17f36d3093a644c73cfc1788e876a7c4bcb4020a77512e2043c" | 9 | SRC_URI += " \ |
10 | file://0001-pyproject.toml-don-t-pin-dependency-versions.patch \ | ||
11 | file://0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch \ | ||
12 | " | ||
10 | 13 | ||
11 | inherit pypi setuptools3 | 14 | SRC_URI[sha256sum] = "9e79019aba43cb4fda9e4d983f8e88ca0373adbb697ae9c6c43093218de28b54" |
15 | |||
16 | inherit pypi python_mesonpy | ||
12 | 17 | ||
13 | DEPENDS += " \ | 18 | DEPENDS += " \ |
14 | python3-cython-native \ | 19 | python3-cython-native \ |
diff --git a/meta-python/recipes-devtools/python/python3-paramiko_3.4.0.bb b/meta-python/recipes-devtools/python/python3-paramiko_3.5.0.bb index 0d32d361c..8ccf939f7 100644 --- a/meta-python/recipes-devtools/python/python3-paramiko_3.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-paramiko_3.5.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/paramiko/paramiko/" | |||
3 | LICENSE = "LGPL-2.1-only" | 3 | LICENSE = "LGPL-2.1-only" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "aac08f26a31dc4dffd92821527d1682d99d52f9ef6851968114a8728f3c274d3" | 6 | SRC_URI[sha256sum] = "ad11e540da4f55cedda52931f1a3f812a8238a7af7f62a60de538cd80bb28124" |
7 | 7 | ||
8 | PYPI_PACKAGE = "paramiko" | 8 | PYPI_PACKAGE = "paramiko" |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb b/meta-python/recipes-devtools/python/python3-parse-type_0.6.3.bb index a7d8cd86c..06843c03c 100644 --- a/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb +++ b/meta-python/recipes-devtools/python/python3-parse-type_0.6.3.bb | |||
@@ -1,25 +1,25 @@ | |||
1 | SUMMARY = "Simplifies building parse types based on the parse module" | 1 | SUMMARY = "Simplifies building parse types based on the parse module" |
2 | HOMEPAGE = "https://github.com/jenisys/parse_type" | 2 | HOMEPAGE = "https://github.com/jenisys/parse_type" |
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2e469278ace89c246d52505acc39c3da" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2e469278ace89c246d52505acc39c3da" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "79b1f2497060d0928bc46016793f1fca1057c4aacdf15ef876aa48d75a73a355" | 6 | SRC_URI[sha256sum] = "8e99d2f52fab2f0f1f3d68ba9d026060140bf0e53680aada0111fb27b2f0e93a" |
7 | SRC_URI += " \ | ||
8 | file://run-ptest \ | ||
9 | " | ||
7 | 10 | ||
8 | PYPI_PACKAGE = "parse_type" | 11 | PYPI_PACKAGE = "parse_type" |
9 | inherit pypi ptest setuptools3 | ||
10 | 12 | ||
11 | RDEPENDS:${PN} += "python3-parse" | 13 | inherit pypi ptest python_setuptools_build_meta |
12 | 14 | ||
13 | SRC_URI += " \ | 15 | do_install_ptest() { |
14 | file://run-ptest \ | 16 | install -d ${D}${PTEST_PATH}/tests |
15 | " | 17 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ |
18 | } | ||
16 | 19 | ||
20 | RDEPENDS:${PN} += "python3-parse" | ||
17 | RDEPENDS:${PN}-ptest += " \ | 21 | RDEPENDS:${PN}-ptest += " \ |
18 | python3-pytest \ | 22 | python3-pytest \ |
23 | python3-six \ | ||
19 | python3-unittest-automake-output \ | 24 | python3-unittest-automake-output \ |
20 | " | 25 | " |
21 | |||
22 | do_install_ptest() { | ||
23 | install -d ${D}${PTEST_PATH}/tests | ||
24 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
25 | } | ||
diff --git a/meta-python/recipes-devtools/python/python3-parse_1.20.1.bb b/meta-python/recipes-devtools/python/python3-parse_1.20.2.bb index d2b91b3f3..6e7139bfb 100644 --- a/meta-python/recipes-devtools/python/python3-parse_1.20.1.bb +++ b/meta-python/recipes-devtools/python/python3-parse_1.20.2.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/r1chardj0n3s/parse" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "09002ca350ad42e76629995f71f7b518670bcf93548bdde3684fd55d2be51975" | 6 | SRC_URI[sha256sum] = "b41d604d16503c79d81af5165155c0b20f6c8d6c559efa66b4b695c3e5a0a0ce" |
7 | 7 | ||
8 | SRC_URI += " \ | 8 | SRC_URI += " \ |
9 | file://run-ptest \ | 9 | file://run-ptest \ |
diff --git a/meta-python/recipes-devtools/python/python3-path_16.14.0.bb b/meta-python/recipes-devtools/python/python3-path_17.0.0.bb index b4d290a23..e80995207 100644 --- a/meta-python/recipes-devtools/python/python3-path_16.14.0.bb +++ b/meta-python/recipes-devtools/python/python3-path_17.0.0.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "A module wrapper for os.path" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" |
4 | 4 | ||
5 | SRC_URI[sha256sum] = "dbaaa7efd4602fd6ba8d82890dc7823d69e5de740a6e842d9919b0faaf2b6a8e" | 5 | SRC_URI[sha256sum] = "e1540261d22df1416fb1b498b3b1ed5353a371a48fe197d66611bb01e7fab2d5" |
6 | 6 | ||
7 | SRC_URI += "\ | 7 | SRC_URI += "\ |
8 | file://run-ptest \ | 8 | file://run-ptest \ |
@@ -28,7 +28,7 @@ BBCLASSEXTEND = "nativesdk native" | |||
28 | 28 | ||
29 | do_install_ptest() { | 29 | do_install_ptest() { |
30 | install -d ${D}${PTEST_PATH}/test | 30 | install -d ${D}${PTEST_PATH}/test |
31 | cp -rf ${S}/test_* ${D}${PTEST_PATH}/test/ | 31 | cp -rf ${S}/tests/test_* ${D}${PTEST_PATH}/test/ |
32 | install -d ${D}${PTEST_PATH}/path | 32 | install -d ${D}${PTEST_PATH}/path |
33 | cp -rf ${S}/path/* ${D}${PTEST_PATH}/path/ | 33 | cp -rf ${S}/path/* ${D}${PTEST_PATH}/path/ |
34 | } | 34 | } |
diff --git a/meta-python/recipes-devtools/python/python3-pathlib2_2.3.7.bb b/meta-python/recipes-devtools/python/python3-pathlib2_2.3.7.bb new file mode 100644 index 000000000..d4de40893 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pathlib2_2.3.7.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | SUMMARY = "Object-oriented filesystem paths" | ||
2 | HOMEPAGE = "https://github.com/mcmtroffaes/pathlib2" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2dc08586cce3ab91bfa091b655c0e440" | ||
5 | |||
6 | SRC_URI[sha256sum] = "7a4329d67beff9a712e1d3ae147e4e3e108b0bfd284ffdea03a635126c76b3c0" | ||
7 | |||
8 | inherit pypi setuptools3 | ||
9 | |||
10 | RDEPENDS:${PN} += "python3-six python3-ctypes" | ||
11 | |||
12 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pdm-backend_2.3.0.bb b/meta-python/recipes-devtools/python/python3-pdm-backend_2.4.1.bb index 4185f7858..f2175150e 100644 --- a/meta-python/recipes-devtools/python/python3-pdm-backend_2.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-pdm-backend_2.4.1.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4a564297b3c5b629a528b92fd8ff61ea" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4a564297b3c5b629a528b92fd8ff61ea" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "e39ed2da206d90d4a6e9eb62f6dce54ed4fa65ddf172a7d5700960d0f8a09e09" | 7 | SRC_URI[sha256sum] = "d6404e94a612459c5213cc63df035711244173c57441b8312a2a6f4a8c110934" |
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb b/meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb new file mode 100644 index 000000000..f20f11ff4 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | SUMMARY = "pdm plugin to publish locked dependencies as optional-dependencies" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=19382cdf9c143df4f00b9caa0b60c75a" | ||
4 | |||
5 | SRC_URI[sha256sum] = "b784135abf62b93ce0a11332ee24723a2699b7f266fddb7950a5b70c93df6214" | ||
6 | |||
7 | inherit pypi python_setuptools_build_meta | ||
8 | |||
9 | DEPENDS += " python3-pdm-backend-native" | ||
10 | |||
11 | PYPI_PACKAGE = "pdm_build_locked" | ||
12 | |||
13 | BBCLASSEXTEND += "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pdm_2.15.4.bb b/meta-python/recipes-devtools/python/python3-pdm_2.19.1.bb index 364c7c81e..245e76014 100644 --- a/meta-python/recipes-devtools/python/python3-pdm_2.15.4.bb +++ b/meta-python/recipes-devtools/python/python3-pdm_2.19.1.bb | |||
@@ -4,12 +4,13 @@ LICENSE = "MIT" | |||
4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2eb31a2cc1a758c34b499f287dd04ef2" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2eb31a2cc1a758c34b499f287dd04ef2" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "58e225850567dcadce42418db4638996df2b1378cd0830cd48afda1b455d9c72" | 7 | SRC_URI[sha256sum] = "7fe235a9cb27b7ec17b762dc85bc9ae71e0776e4b7a8b6f64203f24bb915aa2c" |
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
11 | DEPENDS += " \ | 11 | DEPENDS += " \ |
12 | python3-pdm-backend-native \ | 12 | python3-pdm-backend-native \ |
13 | python3-pdm-build-locked-native \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | BBCLASSEXTEND = "native nativesdk" | 16 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch b/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch index e4ba35b88..220c4edc3 100644 --- a/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch +++ b/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cd09b6f68aa49c72e9a9bb0765e8c666238a7b7e Mon Sep 17 00:00:00 2001 | 1 | From 5b28d19d6513cc3eb3105d3f917df352283f3c5e Mon Sep 17 00:00:00 2001 |
2 | From: Leon Anavi <leon.anavi@konsulko.com> | 2 | From: Leon Anavi <leon.anavi@konsulko.com> |
3 | Date: Mon, 11 Jan 2021 13:25:12 +0000 | 3 | Date: Mon, 11 Jan 2021 13:25:12 +0000 |
4 | Subject: [PATCH] support cross compiling | 4 | Subject: [PATCH] support cross compiling |
@@ -12,10 +12,10 @@ Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | |||
12 | 1 file changed, 3 insertions(+), 3 deletions(-) | 12 | 1 file changed, 3 insertions(+), 3 deletions(-) |
13 | 13 | ||
14 | diff --git a/setup.py b/setup.py | 14 | diff --git a/setup.py b/setup.py |
15 | index cbc2641c..302bc6e7 100755 | 15 | index 0abfaaddc..557420a6b 100644 |
16 | --- a/setup.py | 16 | --- a/setup.py |
17 | +++ b/setup.py | 17 | +++ b/setup.py |
18 | @@ -123,7 +123,7 @@ _LIB_IMAGING = ( | 18 | @@ -129,7 +129,7 @@ _LIB_IMAGING = ( |
19 | "codec_fd", | 19 | "codec_fd", |
20 | ) | 20 | ) |
21 | 21 | ||
@@ -24,7 +24,7 @@ index cbc2641c..302bc6e7 100755 | |||
24 | 24 | ||
25 | 25 | ||
26 | class DependencyException(Exception): | 26 | class DependencyException(Exception): |
27 | @@ -408,12 +408,12 @@ class pil_build_ext(build_ext): | 27 | @@ -508,12 +508,12 @@ class pil_build_ext(build_ext): |
28 | _add_directory(library_dirs, match.group(1)) | 28 | _add_directory(library_dirs, match.group(1)) |
29 | 29 | ||
30 | # include, rpath, if set as environment variables: | 30 | # include, rpath, if set as environment variables: |
@@ -39,6 +39,3 @@ index cbc2641c..302bc6e7 100755 | |||
39 | if k in os.environ: | 39 | if k in os.environ: |
40 | for d in os.environ[k].split(os.path.pathsep): | 40 | for d in os.environ[k].split(os.path.pathsep): |
41 | _add_directory(library_dirs, d) | 41 | _add_directory(library_dirs, d) |
42 | -- | ||
43 | 2.17.1 | ||
44 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pillow_10.3.0.bb b/meta-python/recipes-devtools/python/python3-pillow_10.4.0.bb index debf48815..a9cb903ac 100644 --- a/meta-python/recipes-devtools/python/python3-pillow_10.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-pillow_10.4.0.bb | |||
@@ -1,15 +1,15 @@ | |||
1 | SUMMARY = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \ | 1 | DESCRIPTION = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \ |
2 | Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \ | 2 | Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \ |
3 | Contributors." | 3 | Contributors." |
4 | HOMEPAGE = "https://pillow.readthedocs.io" | 4 | HOMEPAGE = "https://pillow.readthedocs.io" |
5 | LICENSE = "MIT" | 5 | LICENSE = "HPND" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c349a4b4b9ec2377a8fd6a7df87dbffe" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c349a4b4b9ec2377a8fd6a7df87dbffe" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=main;protocol=https \ | 8 | SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=main;protocol=https \ |
9 | file://0001-support-cross-compiling.patch \ | 9 | file://0001-support-cross-compiling.patch \ |
10 | file://run-ptest \ | 10 | file://run-ptest \ |
11 | " | 11 | " |
12 | SRCREV = "5c89d88eee199ba53f64581ea39b6a1bc52feb1a" | 12 | SRCREV = "9b4fae77178e827ab17118fbc89c739ffd6a0fab" |
13 | 13 | ||
14 | inherit python_setuptools_build_meta ptest | 14 | inherit python_setuptools_build_meta ptest |
15 | 15 | ||
@@ -41,12 +41,13 @@ RDEPENDS:${PN} += " \ | |||
41 | python3-numbers \ | 41 | python3-numbers \ |
42 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb', '', d)} \ | 42 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb', '', d)} \ |
43 | " | 43 | " |
44 | 44 | # python3-compile for filecmp module | |
45 | RDEPENDS:${PN}-ptest += " \ | 45 | RDEPENDS:${PN}-ptest += " \ |
46 | bash \ | 46 | bash \ |
47 | ghostscript \ | 47 | ghostscript \ |
48 | jpeg-tools \ | 48 | jpeg-tools \ |
49 | libwebp \ | 49 | libwebp \ |
50 | python3-compile \ | ||
50 | python3-core \ | 51 | python3-core \ |
51 | python3-image \ | 52 | python3-image \ |
52 | python3-mmap \ | 53 | python3-mmap \ |
diff --git a/meta-python/recipes-devtools/python/python3-pint/run-ptest b/meta-python/recipes-devtools/python/python3-pint/run-ptest index 5cec71169..8d2017d39 100644 --- a/meta-python/recipes-devtools/python/python3-pint/run-ptest +++ b/meta-python/recipes-devtools/python/python3-pint/run-ptest | |||
@@ -1,3 +1,3 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | pytest | 3 | pytest --automake |
diff --git a/meta-python/recipes-devtools/python/python3-pint_0.23.bb b/meta-python/recipes-devtools/python/python3-pint_0.24.3.bb index 370cd7017..23e9fdb0e 100644 --- a/meta-python/recipes-devtools/python/python3-pint_0.23.bb +++ b/meta-python/recipes-devtools/python/python3-pint_0.24.3.bb | |||
@@ -6,14 +6,11 @@ SECTION = "devel/python" | |||
6 | LICENSE = "BSD-3-Clause" | 6 | LICENSE = "BSD-3-Clause" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bccf824202692270a1e0829a62e3f47b" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bccf824202692270a1e0829a62e3f47b" |
8 | 8 | ||
9 | PYPI_PACKAGE := "Pint" | 9 | PYPI_PACKAGE = "pint" |
10 | 10 | ||
11 | inherit ptest python_setuptools_build_meta | 11 | inherit pypi ptest python_setuptools_build_meta |
12 | 12 | ||
13 | SRCREV = "f2e4081aee38f850938048beac7fb69c4908bc5e" | 13 | SRC_URI[sha256sum] = "d54771093e8b94c4e0a35ac638c2444ddf3ef685652bab7675ffecfa0c5c5cdf" |
14 | SRC_URI = "git://github.com/hgrecco/pint;protocol=https;branch=master" | ||
15 | S = "${WORKDIR}/git" | ||
16 | #SRC_URI[sha256sum] = "e1509b91606dbc52527c600a4ef74ffac12fff70688aff20e9072409346ec9b4" | ||
17 | 14 | ||
18 | DEPENDS += "python3-setuptools-scm-native" | 15 | DEPENDS += "python3-setuptools-scm-native" |
19 | 16 | ||
@@ -27,12 +24,18 @@ RDEPENDS:${PN} += " \ | |||
27 | python3-setuptools \ | 24 | python3-setuptools \ |
28 | python3-packaging \ | 25 | python3-packaging \ |
29 | " | 26 | " |
30 | 27 | # python3-misc for timeit.py | |
31 | RDEPENDS:${PN}-ptest += " \ | 28 | RDEPENDS:${PN}-ptest += " \ |
32 | python3-appdirs \ | 29 | python3-appdirs \ |
30 | python3-attrs \ | ||
33 | python3-flexcache \ | 31 | python3-flexcache \ |
34 | python3-flexparser \ | 32 | python3-flexparser \ |
33 | python3-misc \ | ||
35 | python3-pytest \ | 34 | python3-pytest \ |
35 | python3-pytest-benchmark \ | ||
36 | python3-pytest-subtests \ | ||
37 | python3-statistics \ | ||
38 | python3-unittest-automake-output \ | ||
36 | " | 39 | " |
37 | 40 | ||
38 | do_install_ptest() { | 41 | do_install_ptest() { |
diff --git a/meta-python/recipes-devtools/python/python3-platformdirs_4.2.2.bb b/meta-python/recipes-devtools/python/python3-platformdirs_4.3.6.bb index 5821aedd4..02d8c3cec 100644 --- a/meta-python/recipes-devtools/python/python3-platformdirs_4.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-platformdirs_4.3.6.bb | |||
@@ -1,13 +1,13 @@ | |||
1 | SUMMARY = "A small Python module for determining appropriate platform-specific dirs" | 1 | SUMMARY = "A small Python module for determining appropriate platform-specific dirs" |
2 | HOMEPAGE = "https://github.com/platformdirs/platformdirs" | 2 | HOMEPAGE = "https://github.com/platformdirs/platformdirs" |
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a" |
5 | 5 | ||
6 | SRC_URI += " \ | 6 | SRC_URI += " \ |
7 | file://run-ptest \ | 7 | file://run-ptest \ |
8 | " | 8 | " |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3" | 10 | SRC_URI[sha256sum] = "357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907" |
11 | 11 | ||
12 | inherit pypi python_hatchling ptest | 12 | inherit pypi python_hatchling ptest |
13 | 13 | ||
diff --git a/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb b/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb index 3af94b48f..a5e26f302 100644 --- a/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb +++ b/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb | |||
@@ -5,7 +5,7 @@ SECTION = "devel/python" | |||
5 | LICENSE = "LGPL-3.0-only" | 5 | LICENSE = "LGPL-3.0-only" |
6 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab" | 6 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "5289b40d98959b16b3f6927781678935d3df1b7c14947f5d7778e5e04dd9a065" | 10 | SRC_URI[sha256sum] = "5289b40d98959b16b3f6927781678935d3df1b7c14947f5d7778e5e04dd9a065" |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-prettytable_3.10.0.bb b/meta-python/recipes-devtools/python/python3-prettytable_3.11.0.bb index 35e9ab179..df11141a5 100644 --- a/meta-python/recipes-devtools/python/python3-prettytable_3.10.0.bb +++ b/meta-python/recipes-devtools/python/python3-prettytable_3.11.0.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c9a6829fcd174d9535b46211917c7671" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c9a6829fcd174d9535b46211917c7671" |
5 | 5 | ||
6 | 6 | ||
7 | SRC_URI[sha256sum] = "9665594d137fb08a1117518c25551e0ede1687197cf353a4fdc78d27e1073568" | 7 | SRC_URI[sha256sum] = "7e23ca1e68bbfd06ba8de98bf553bf3493264c96d5e8a615c0471025deeba722" |
8 | SRC_URI += " \ | 8 | SRC_URI += " \ |
9 | file://run-ptest \ | 9 | file://run-ptest \ |
10 | " | 10 | " |
diff --git a/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.45.bb b/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.47.bb index e02aafdb9..9997785dc 100644 --- a/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.45.bb +++ b/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.47.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" | |||
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "07c60ee4ab7b7e90824b61afa840c8f5aad2d46b3e2e10acc33d8ecc94a49089" | 6 | SRC_URI[sha256sum] = "1e1b29cb58080b1e69f207c893a1a7bf16d127a5c30c9d17a25a5d77792e5360" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb b/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb index 9695880d0..c7e1f3c3f 100644 --- a/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb +++ b/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb | |||
@@ -36,3 +36,11 @@ DISTUTILS_INSTALL_ARGS += "--cpp_implementation" | |||
36 | do_compile:prepend:class-native () { | 36 | do_compile:prepend:class-native () { |
37 | export KOKORO_BUILD_NUMBER="1" | 37 | export KOKORO_BUILD_NUMBER="1" |
38 | } | 38 | } |
39 | |||
40 | do_install:append () { | ||
41 | # Remove useless and problematic .pth file. python3-protobuf is installed in the standard | ||
42 | # location of site packages. No need for such .pth file. | ||
43 | # NOTE: do not drop this removal until the following issue in upstream cpython is resolved: | ||
44 | # https://github.com/python/cpython/issues/122220 | ||
45 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/protobuf-*-nspkg.pth | ||
46 | } | ||
diff --git a/meta-python/recipes-devtools/python/python3-pulsectl_24.4.0.bb b/meta-python/recipes-devtools/python/python3-pulsectl_24.8.0.bb index 3bc15bb08..580d41d0c 100644 --- a/meta-python/recipes-devtools/python/python3-pulsectl_24.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-pulsectl_24.8.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/mk-fg/python-pulse-control" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=f1d10048469ff90123263eb5e214061d" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=f1d10048469ff90123263eb5e214061d" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "697ed50e7d452e78678ae38e2ab935843008bec448955283cd0fb362867e3165" | 6 | SRC_URI[sha256sum] = "b051506d0d73d3cc4357cefd3de17bb859d7ecf004e994b0f7cfa87851bc7156" |
7 | 7 | ||
8 | RDEPENDS:${PN} += " \ | 8 | RDEPENDS:${PN} += " \ |
9 | libpulse \ | 9 | libpulse \ |
diff --git a/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb b/meta-python/recipes-devtools/python/python3-pure-eval_0.2.3.bb index 66e4673a7..f52b235e8 100644 --- a/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-pure-eval_0.2.3.bb | |||
@@ -8,7 +8,7 @@ PYPI_PACKAGE = "pure_eval" | |||
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3" | 11 | SRC_URI[sha256sum] = "5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42" |
12 | 12 | ||
13 | RDEPENDS:${PN} += " \ | 13 | RDEPENDS:${PN} += " \ |
14 | python3-datetime \ | 14 | python3-datetime \ |
diff --git a/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb b/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb index 857afd1db..2d59a99b1 100644 --- a/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2379ecb0d7a8299101b1e4c160cd1f7" | |||
8 | 8 | ||
9 | SRC_URI[sha256sum] = "3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3f49690" | 9 | SRC_URI[sha256sum] = "3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3f49690" |
10 | 10 | ||
11 | inherit ptest pypi setuptools3 | 11 | inherit ptest pypi python_setuptools_build_meta |
12 | 12 | ||
13 | SRC_URI += "file://run-ptest \ | 13 | SRC_URI += "file://run-ptest \ |
14 | file://0001-test_cli.py-disable.patch \ | 14 | file://0001-test_cli.py-disable.patch \ |
@@ -27,6 +27,7 @@ do_install_ptest() { | |||
27 | } | 27 | } |
28 | 28 | ||
29 | RDEPENDS:${PN}-ptest += "\ | 29 | RDEPENDS:${PN}-ptest += "\ |
30 | python3-compile \ | ||
30 | python3-pytest \ | 31 | python3-pytest \ |
31 | python3-unittest-automake-output \ | 32 | python3-unittest-automake-output \ |
32 | " | 33 | " |
diff --git a/meta-python/recipes-devtools/python/python3-py7zr_0.21.0.bb b/meta-python/recipes-devtools/python/python3-py7zr_0.22.0.bb index cb405a535..c5cf1e836 100644 --- a/meta-python/recipes-devtools/python/python3-py7zr_0.21.0.bb +++ b/meta-python/recipes-devtools/python/python3-py7zr_0.22.0.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "LGPL-2.1-or-later" | |||
4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "213a9cc46940fb8f63b4163643a8f5b36bbc798134746c3992d3bc6b14edab87" | 7 | SRC_URI[sha256sum] = "c6c7aea5913535184003b73938490f9a4d8418598e533f9ca991d3b8e45a139e" |
8 | 8 | ||
9 | inherit pypi python_setuptools_build_meta | 9 | inherit pypi python_setuptools_build_meta |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-py_1.11.0.bb b/meta-python/recipes-devtools/python/python3-py_1.11.0.bb new file mode 100644 index 000000000..31d5a377a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-py_1.11.0.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "Library with cross-python path, ini-parsing, io, code, log facilities" | ||
2 | HOMEPAGE = "http://py.readthedocs.io/" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" | ||
5 | |||
6 | SRC_URI[sha256sum] = "51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719" | ||
7 | |||
8 | DEPENDS += "python3-setuptools-scm-native" | ||
9 | |||
10 | inherit pypi python_setuptools_build_meta | ||
11 | |||
12 | BBCLASSEXTEND = "native nativesdk" | ||
13 | |||
14 | RDEPENDS:${PN} += "python3-netclient" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.0.bb b/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.1.bb index 34f3639e5..e8c0f960a 100644 --- a/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.1.bb | |||
@@ -6,11 +6,11 @@ HOMEPAGE = "https://github.com/etingof/pyasn1-modules" | |||
6 | LICENSE = "BSD-2-Clause" | 6 | LICENSE = "BSD-2-Clause" |
7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=190f79253908c986e6cacf380c3a5f6d" | 7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=190f79253908c986e6cacf380c3a5f6d" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6" | 9 | SRC_URI[sha256sum] = "c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c" |
10 | 10 | ||
11 | PYPI_PACKAGE = "pyasn1_modules" | 11 | PYPI_PACKAGE = "pyasn1_modules" |
12 | 12 | ||
13 | inherit pypi ptest setuptools3 | 13 | inherit pypi ptest python_setuptools_build_meta |
14 | 14 | ||
15 | RDEPENDS:${PN} = "python3-pyasn1" | 15 | RDEPENDS:${PN} = "python3-pyasn1" |
16 | 16 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyaudio_0.2.14.bb b/meta-python/recipes-devtools/python/python3-pyaudio_0.2.14.bb index 1599ea834..6a325dbe8 100644 --- a/meta-python/recipes-devtools/python/python3-pyaudio_0.2.14.bb +++ b/meta-python/recipes-devtools/python/python3-pyaudio_0.2.14.bb | |||
@@ -7,7 +7,7 @@ PYPI_PACKAGE = "PyAudio" | |||
7 | 7 | ||
8 | SRC_URI[sha256sum] = "78dfff3879b4994d1f4fc6485646a57755c6ee3c19647a491f790a0895bd2f87" | 8 | SRC_URI[sha256sum] = "78dfff3879b4994d1f4fc6485646a57755c6ee3c19647a491f790a0895bd2f87" |
9 | 9 | ||
10 | inherit pypi setuptools3 | 10 | inherit pypi python_setuptools_build_meta |
11 | 11 | ||
12 | SRC_URI += "file://0001-Remove-absolute-paths-into-build-machine-system-dirs.patch" | 12 | SRC_URI += "file://0001-Remove-absolute-paths-into-build-machine-system-dirs.patch" |
13 | 13 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch b/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch deleted file mode 100644 index 91575d271..000000000 --- a/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From debd676cd94f92a30b3be45f1245aa13d8c398c0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Balister <philip@balister.org> | ||
3 | Date: Wed, 8 Jul 2020 09:41:43 -0400 | ||
4 | Subject: [PATCH] Do not strip binaries. | ||
5 | |||
6 | * OpenEmbedded strips them after creating debug packages. | ||
7 | |||
8 | Signed-off-by: Philip Balister <philip@balister.org> | ||
9 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | --- | ||
13 | tools/pybind11NewTools.cmake | 7 ------- | ||
14 | tools/pybind11Tools.cmake | 6 ------ | ||
15 | 2 files changed, 13 deletions(-) | ||
16 | |||
17 | diff --git a/tools/pybind11NewTools.cmake b/tools/pybind11NewTools.cmake | ||
18 | index 7d7424a7..accd90c4 100644 | ||
19 | --- a/tools/pybind11NewTools.cmake | ||
20 | +++ b/tools/pybind11NewTools.cmake | ||
21 | @@ -233,13 +233,6 @@ function(pybind11_add_module target_name) | ||
22 | endif() | ||
23 | endif() | ||
24 | |||
25 | - # Use case-insensitive comparison to match the result of $<CONFIG:cfgs> | ||
26 | - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) | ||
27 | - if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO) | ||
28 | - # Strip unnecessary sections of the binary on Linux/macOS | ||
29 | - pybind11_strip(${target_name}) | ||
30 | - endif() | ||
31 | - | ||
32 | if(MSVC) | ||
33 | target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) | ||
34 | endif() | ||
35 | diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake | ||
36 | index 66ad00a4..855ede41 100644 | ||
37 | --- a/tools/pybind11Tools.cmake | ||
38 | +++ b/tools/pybind11Tools.cmake | ||
39 | @@ -212,12 +212,6 @@ function(pybind11_add_module target_name) | ||
40 | endif() | ||
41 | endif() | ||
42 | |||
43 | - # Use case-insensitive comparison to match the result of $<CONFIG:cfgs> | ||
44 | - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) | ||
45 | - if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO) | ||
46 | - pybind11_strip(${target_name}) | ||
47 | - endif() | ||
48 | - | ||
49 | if(MSVC) | ||
50 | target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) | ||
51 | endif() | ||
52 | -- | ||
53 | 2.39.2 | ||
54 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb b/meta-python/recipes-devtools/python/python3-pybind11_2.12.0.bb index 78662fe3c..0403e406a 100644 --- a/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb +++ b/meta-python/recipes-devtools/python/python3-pybind11_2.12.0.bb | |||
@@ -7,10 +7,9 @@ DEPENDS = "\ | |||
7 | python3-ninja-native \ | 7 | python3-ninja-native \ |
8 | " | 8 | " |
9 | 9 | ||
10 | SRCREV = "8a099e44b3d5f85b20f05828d919d2332a8de841" | 10 | SRCREV = "3e9dfa2866941655c56877882565e7577de6fc7b" |
11 | SRC_URI = "\ | 11 | SRC_URI = "\ |
12 | git://github.com/pybind/pybind11.git;branch=stable;protocol=https \ | 12 | git://github.com/pybind/pybind11.git;branch=stable;protocol=https \ |
13 | file://0001-Do-not-strip-binaries.patch \ | ||
14 | " | 13 | " |
15 | 14 | ||
16 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
diff --git a/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb b/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb index b6b0de880..13ccaf99f 100644 --- a/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb | |||
@@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "f47579d508f2f56eddd16ce72045782ad3b1b3b678098699e2b6a1b307 | |||
10 | 10 | ||
11 | PYPI_PACKAGE = "pycares" | 11 | PYPI_PACKAGE = "pycares" |
12 | 12 | ||
13 | inherit pypi setuptools3 | 13 | inherit pypi python_setuptools_build_meta |
14 | 14 | ||
15 | DEPENDS += "python3-cffi-native" | 15 | DEPENDS += "python3-cffi-native" |
16 | 16 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pycocotools/0001-downgrade-numpy-version-to-1.26.4.patch b/meta-python/recipes-devtools/python/python3-pycocotools/0001-downgrade-numpy-version-to-1.26.4.patch new file mode 100644 index 000000000..cd3e462dd --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pycocotools/0001-downgrade-numpy-version-to-1.26.4.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 7222a8b9b6e05b89116ca14644aa8db79eecd3c6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 24 Aug 2024 00:19:23 -0700 | ||
4 | Subject: [PATCH] downgrade numpy version to 1.26.4+ | ||
5 | |||
6 | We can drop it when OE-core upgrades numpy to 2.x | ||
7 | |||
8 | Upstream-Status: Inappropriate [OE workaround] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | pyproject.toml | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/pyproject.toml b/pyproject.toml | ||
15 | index 1bfbd91..cbee520 100644 | ||
16 | --- a/pyproject.toml | ||
17 | +++ b/pyproject.toml | ||
18 | @@ -1,7 +1,7 @@ | ||
19 | [build-system] | ||
20 | requires = [ | ||
21 | "cython>=0.27.3", | ||
22 | - "numpy>=2.0.0rc1", | ||
23 | + "numpy>=1.26.4", | ||
24 | "setuptools>=43.0.0", | ||
25 | "wheel", | ||
26 | ] | ||
diff --git a/meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb b/meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb index c9968ae37..4d4251316 100644 --- a/meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb +++ b/meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb | |||
@@ -3,9 +3,15 @@ SUMMARY = "COCO is a large image dataset designed for object detection, segmenta | |||
3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-2-Clause" |
4 | LIC_FILES_CHKSUM = "file://pycocotools/coco.py;beginline=45;endline=45;md5=12cb539683cf245df8b6ce782d78f647" | 4 | LIC_FILES_CHKSUM = "file://pycocotools/coco.py;beginline=45;endline=45;md5=12cb539683cf245df8b6ce782d78f647" |
5 | 5 | ||
6 | inherit setuptools3 pypi | 6 | inherit pypi python_setuptools_build_meta |
7 | |||
8 | SRC_URI += "file://0001-downgrade-numpy-version-to-1.26.4.patch" | ||
7 | 9 | ||
8 | SRC_URI[sha256sum] = "8f2bcedb786ba26c367a3680f9c4eb5b2ad9dccb2b34eaeb205e0a021e1dfb8d" | 10 | SRC_URI[sha256sum] = "8f2bcedb786ba26c367a3680f9c4eb5b2ad9dccb2b34eaeb205e0a021e1dfb8d" |
9 | 11 | ||
10 | DEPENDS = "python3-cython-native python3-numpy-native virtual/crypt" | 12 | DEPENDS = "python3-cython-native python3-numpy-native virtual/crypt" |
11 | RDEPENDS:${PN} = "python3-matplotlib python3-pillow python3-profile" | 13 | RDEPENDS:${PN} = "python3-matplotlib python3-pillow python3-profile" |
14 | |||
15 | do_compile:append() { | ||
16 | sed -i -e "/BEGIN: Cython Metadata/,/END: Cython Metadata/d" ${B}/pycocotools/_mask.c | ||
17 | } | ||
diff --git a/meta-python/recipes-devtools/python/python3-pycodestyle_2.11.1.bb b/meta-python/recipes-devtools/python/python3-pycodestyle_2.12.1.bb index a282afb46..9572d21f3 100644 --- a/meta-python/recipes-devtools/python/python3-pycodestyle_2.11.1.bb +++ b/meta-python/recipes-devtools/python/python3-pycodestyle_2.12.1.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a8546d0e77f416fb05a26acd89c8b3bd" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a8546d0e77f416fb05a26acd89c8b3bd" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f" | 7 | SRC_URI[sha256sum] = "6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pycurl_7.45.3.bb b/meta-python/recipes-devtools/python/python3-pycurl_7.45.3.bb index 774c1343c..8dcc2dff1 100644 --- a/meta-python/recipes-devtools/python/python3-pycurl_7.45.3.bb +++ b/meta-python/recipes-devtools/python/python3-pycurl_7.45.3.bb | |||
@@ -7,7 +7,7 @@ be used to fetch objects identified by a URL from a Python program \ | |||
7 | SECTION = "devel/python" | 7 | SECTION = "devel/python" |
8 | HOMEPAGE = "http://pycurl.io/" | 8 | HOMEPAGE = "http://pycurl.io/" |
9 | 9 | ||
10 | LICENSE = "LGPL-2.0-only | MIT" | 10 | LICENSE = "LGPL-2.1-only | MIT" |
11 | LIC_FILES_CHKSUM = "file://COPYING-LGPL;md5=4fbd65380cdd255951079008b364516c \ | 11 | LIC_FILES_CHKSUM = "file://COPYING-LGPL;md5=4fbd65380cdd255951079008b364516c \ |
12 | file://COPYING-MIT;md5=be42e1b1e58c8d59c2901fd747bfc55d \ | 12 | file://COPYING-MIT;md5=be42e1b1e58c8d59c2901fd747bfc55d \ |
13 | " | 13 | " |
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc b/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc index dd2027948..531632f32 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc +++ b/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc | |||
@@ -2,169 +2,197 @@ | |||
2 | 2 | ||
3 | # from Cargo.lock | 3 | # from Cargo.lock |
4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
5 | crate://crates.io/ahash/0.8.7 \ | 5 | crate://crates.io/ahash/0.8.11 \ |
6 | crate://crates.io/aho-corasick/1.0.2 \ | 6 | crate://crates.io/aho-corasick/1.1.3 \ |
7 | crate://crates.io/allocator-api2/0.2.16 \ | 7 | crate://crates.io/autocfg/1.3.0 \ |
8 | crate://crates.io/autocfg/1.1.0 \ | 8 | crate://crates.io/base64/0.22.1 \ |
9 | crate://crates.io/base64/0.21.7 \ | 9 | crate://crates.io/bitvec/1.0.1 \ |
10 | crate://crates.io/bitflags/1.3.2 \ | 10 | crate://crates.io/cc/1.0.101 \ |
11 | crate://crates.io/cc/1.0.79 \ | ||
12 | crate://crates.io/cfg-if/1.0.0 \ | 11 | crate://crates.io/cfg-if/1.0.0 \ |
13 | crate://crates.io/enum_dispatch/0.3.12 \ | 12 | crate://crates.io/displaydoc/0.2.5 \ |
13 | crate://crates.io/enum_dispatch/0.3.13 \ | ||
14 | crate://crates.io/equivalent/1.0.1 \ | 14 | crate://crates.io/equivalent/1.0.1 \ |
15 | crate://crates.io/form_urlencoded/1.2.1 \ | 15 | crate://crates.io/form_urlencoded/1.2.1 \ |
16 | crate://crates.io/getrandom/0.2.10 \ | 16 | crate://crates.io/funty/2.0.0 \ |
17 | crate://crates.io/hashbrown/0.14.3 \ | 17 | crate://crates.io/getrandom/0.2.15 \ |
18 | crate://crates.io/heck/0.4.1 \ | 18 | crate://crates.io/hashbrown/0.14.5 \ |
19 | crate://crates.io/heck/0.5.0 \ | ||
20 | crate://crates.io/hex/0.4.3 \ | ||
21 | crate://crates.io/icu_collections/1.5.0 \ | ||
22 | crate://crates.io/icu_locid/1.5.0 \ | ||
23 | crate://crates.io/icu_locid_transform/1.5.0 \ | ||
24 | crate://crates.io/icu_locid_transform_data/1.5.0 \ | ||
25 | crate://crates.io/icu_normalizer/1.5.0 \ | ||
26 | crate://crates.io/icu_normalizer_data/1.5.0 \ | ||
27 | crate://crates.io/icu_properties/1.5.1 \ | ||
28 | crate://crates.io/icu_properties_data/1.5.0 \ | ||
29 | crate://crates.io/icu_provider/1.5.0 \ | ||
30 | crate://crates.io/icu_provider_macros/1.5.0 \ | ||
19 | crate://crates.io/idna/0.5.0 \ | 31 | crate://crates.io/idna/0.5.0 \ |
20 | crate://crates.io/indexmap/2.0.0 \ | 32 | crate://crates.io/idna/1.0.1 \ |
21 | crate://crates.io/indoc/2.0.4 \ | 33 | crate://crates.io/indexmap/2.2.6 \ |
22 | crate://crates.io/itoa/1.0.8 \ | 34 | crate://crates.io/indoc/2.0.5 \ |
23 | crate://crates.io/jiter/0.0.6 \ | 35 | crate://crates.io/itoa/1.0.11 \ |
24 | crate://crates.io/lexical-core/0.8.5 \ | 36 | crate://crates.io/jiter/0.5.0 \ |
25 | crate://crates.io/lexical-parse-float/0.8.5 \ | 37 | crate://crates.io/lexical-parse-float/0.8.5 \ |
26 | crate://crates.io/lexical-parse-integer/0.8.6 \ | 38 | crate://crates.io/lexical-parse-integer/0.8.6 \ |
27 | crate://crates.io/lexical-util/0.8.5 \ | 39 | crate://crates.io/lexical-util/0.8.5 \ |
28 | crate://crates.io/lexical-write-float/0.8.5 \ | 40 | crate://crates.io/libc/0.2.155 \ |
29 | crate://crates.io/lexical-write-integer/0.8.5 \ | 41 | crate://crates.io/litemap/0.7.3 \ |
30 | crate://crates.io/libc/0.2.147 \ | 42 | crate://crates.io/memchr/2.7.4 \ |
31 | crate://crates.io/lock_api/0.4.10 \ | 43 | crate://crates.io/memoffset/0.9.1 \ |
32 | crate://crates.io/memchr/2.6.3 \ | 44 | crate://crates.io/num-bigint/0.4.6 \ |
33 | crate://crates.io/memoffset/0.9.0 \ | 45 | crate://crates.io/num-integer/0.1.46 \ |
34 | crate://crates.io/num-bigint/0.4.4 \ | 46 | crate://crates.io/num-traits/0.2.19 \ |
35 | crate://crates.io/num-integer/0.1.45 \ | 47 | crate://crates.io/once_cell/1.19.0 \ |
36 | crate://crates.io/num-traits/0.2.16 \ | ||
37 | crate://crates.io/once_cell/1.18.0 \ | ||
38 | crate://crates.io/parking_lot/0.12.1 \ | ||
39 | crate://crates.io/parking_lot_core/0.9.8 \ | ||
40 | crate://crates.io/percent-encoding/2.3.1 \ | 48 | crate://crates.io/percent-encoding/2.3.1 \ |
41 | crate://crates.io/portable-atomic/1.6.0 \ | 49 | crate://crates.io/portable-atomic/1.6.0 \ |
42 | crate://crates.io/proc-macro2/1.0.76 \ | 50 | crate://crates.io/proc-macro2/1.0.86 \ |
43 | crate://crates.io/pyo3/0.20.3 \ | 51 | crate://crates.io/pyo3/0.22.2 \ |
44 | crate://crates.io/pyo3-build-config/0.20.3 \ | 52 | crate://crates.io/pyo3-build-config/0.22.2 \ |
45 | crate://crates.io/pyo3-ffi/0.20.3 \ | 53 | crate://crates.io/pyo3-ffi/0.22.2 \ |
46 | crate://crates.io/pyo3-macros/0.20.3 \ | 54 | crate://crates.io/pyo3-macros/0.22.2 \ |
47 | crate://crates.io/pyo3-macros-backend/0.20.3 \ | 55 | crate://crates.io/pyo3-macros-backend/0.22.2 \ |
48 | crate://crates.io/python3-dll-a/0.2.9 \ | 56 | crate://crates.io/python3-dll-a/0.2.10 \ |
49 | crate://crates.io/quote/1.0.35 \ | 57 | crate://crates.io/quote/1.0.36 \ |
50 | crate://crates.io/redox_syscall/0.3.5 \ | 58 | crate://crates.io/radium/0.7.0 \ |
51 | crate://crates.io/regex/1.10.2 \ | 59 | crate://crates.io/regex/1.10.5 \ |
52 | crate://crates.io/regex-automata/0.4.3 \ | 60 | crate://crates.io/regex-automata/0.4.7 \ |
53 | crate://crates.io/regex-syntax/0.8.2 \ | 61 | crate://crates.io/regex-syntax/0.8.4 \ |
54 | crate://crates.io/rustversion/1.0.13 \ | 62 | crate://crates.io/rustversion/1.0.17 \ |
55 | crate://crates.io/ryu/1.0.14 \ | 63 | crate://crates.io/ryu/1.0.18 \ |
56 | crate://crates.io/scopeguard/1.1.0 \ | 64 | crate://crates.io/serde/1.0.204 \ |
57 | crate://crates.io/serde/1.0.195 \ | 65 | crate://crates.io/serde_derive/1.0.204 \ |
58 | crate://crates.io/serde_derive/1.0.195 \ | 66 | crate://crates.io/serde_json/1.0.121 \ |
59 | crate://crates.io/serde_json/1.0.109 \ | 67 | crate://crates.io/smallvec/1.13.2 \ |
60 | crate://crates.io/smallvec/1.11.2 \ | 68 | crate://crates.io/speedate/0.14.4 \ |
61 | crate://crates.io/speedate/0.13.0 \ | 69 | crate://crates.io/stable_deref_trait/1.2.0 \ |
62 | crate://crates.io/static_assertions/1.1.0 \ | 70 | crate://crates.io/static_assertions/1.1.0 \ |
63 | crate://crates.io/strum/0.25.0 \ | 71 | crate://crates.io/strum/0.26.3 \ |
64 | crate://crates.io/strum_macros/0.25.3 \ | 72 | crate://crates.io/strum_macros/0.26.4 \ |
65 | crate://crates.io/syn/2.0.48 \ | 73 | crate://crates.io/syn/2.0.68 \ |
66 | crate://crates.io/target-lexicon/0.12.9 \ | 74 | crate://crates.io/synstructure/0.13.1 \ |
67 | crate://crates.io/tinyvec/1.6.0 \ | 75 | crate://crates.io/tap/1.0.1 \ |
76 | crate://crates.io/target-lexicon/0.12.14 \ | ||
77 | crate://crates.io/tinystr/0.7.6 \ | ||
78 | crate://crates.io/tinyvec/1.6.1 \ | ||
68 | crate://crates.io/tinyvec_macros/0.1.1 \ | 79 | crate://crates.io/tinyvec_macros/0.1.1 \ |
69 | crate://crates.io/unicode-bidi/0.3.13 \ | 80 | crate://crates.io/unicode-bidi/0.3.15 \ |
70 | crate://crates.io/unicode-ident/1.0.10 \ | 81 | crate://crates.io/unicode-ident/1.0.12 \ |
71 | crate://crates.io/unicode-normalization/0.1.22 \ | 82 | crate://crates.io/unicode-normalization/0.1.23 \ |
72 | crate://crates.io/unindent/0.2.3 \ | 83 | crate://crates.io/unindent/0.2.3 \ |
73 | crate://crates.io/url/2.5.0 \ | 84 | crate://crates.io/url/2.5.2 \ |
74 | crate://crates.io/uuid/1.6.1 \ | 85 | crate://crates.io/utf16_iter/1.0.5 \ |
75 | crate://crates.io/version_check/0.9.4 \ | 86 | crate://crates.io/utf8_iter/1.0.4 \ |
87 | crate://crates.io/uuid/1.9.1 \ | ||
88 | crate://crates.io/version_check/0.9.5 \ | ||
76 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ | 89 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ |
77 | crate://crates.io/windows-targets/0.48.1 \ | 90 | crate://crates.io/write16/1.0.0 \ |
78 | crate://crates.io/windows_aarch64_gnullvm/0.48.0 \ | 91 | crate://crates.io/writeable/0.5.5 \ |
79 | crate://crates.io/windows_aarch64_msvc/0.48.0 \ | 92 | crate://crates.io/wyz/0.5.1 \ |
80 | crate://crates.io/windows_i686_gnu/0.48.0 \ | 93 | crate://crates.io/yoke/0.7.4 \ |
81 | crate://crates.io/windows_i686_msvc/0.48.0 \ | 94 | crate://crates.io/yoke-derive/0.7.4 \ |
82 | crate://crates.io/windows_x86_64_gnu/0.48.0 \ | 95 | crate://crates.io/zerocopy/0.7.34 \ |
83 | crate://crates.io/windows_x86_64_gnullvm/0.48.0 \ | 96 | crate://crates.io/zerocopy-derive/0.7.34 \ |
84 | crate://crates.io/windows_x86_64_msvc/0.48.0 \ | 97 | crate://crates.io/zerofrom/0.1.4 \ |
85 | crate://crates.io/zerocopy/0.7.32 \ | 98 | crate://crates.io/zerofrom-derive/0.1.4 \ |
86 | crate://crates.io/zerocopy-derive/0.7.32 \ | 99 | crate://crates.io/zerovec/0.10.4 \ |
100 | crate://crates.io/zerovec-derive/0.10.3 \ | ||
87 | " | 101 | " |
88 | 102 | ||
89 | SRC_URI[ahash-0.8.7.sha256sum] = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" | 103 | SRC_URI[ahash-0.8.11.sha256sum] = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" |
90 | SRC_URI[aho-corasick-1.0.2.sha256sum] = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" | 104 | SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" |
91 | SRC_URI[allocator-api2-0.2.16.sha256sum] = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" | 105 | SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" |
92 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" | 106 | SRC_URI[base64-0.22.1.sha256sum] = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" |
93 | SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" | 107 | SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" |
94 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | 108 | SRC_URI[cc-1.0.101.sha256sum] = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" |
95 | SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" | ||
96 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | 109 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" |
97 | SRC_URI[enum_dispatch-0.3.12.sha256sum] = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" | 110 | SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" |
111 | SRC_URI[enum_dispatch-0.3.13.sha256sum] = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" | ||
98 | SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" | 112 | SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" |
99 | SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" | 113 | SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" |
100 | SRC_URI[getrandom-0.2.10.sha256sum] = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" | 114 | SRC_URI[funty-2.0.0.sha256sum] = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" |
101 | SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" | 115 | SRC_URI[getrandom-0.2.15.sha256sum] = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" |
102 | SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" | 116 | SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" |
117 | SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" | ||
118 | SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" | ||
119 | SRC_URI[icu_collections-1.5.0.sha256sum] = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" | ||
120 | SRC_URI[icu_locid-1.5.0.sha256sum] = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" | ||
121 | SRC_URI[icu_locid_transform-1.5.0.sha256sum] = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" | ||
122 | SRC_URI[icu_locid_transform_data-1.5.0.sha256sum] = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" | ||
123 | SRC_URI[icu_normalizer-1.5.0.sha256sum] = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" | ||
124 | SRC_URI[icu_normalizer_data-1.5.0.sha256sum] = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" | ||
125 | SRC_URI[icu_properties-1.5.1.sha256sum] = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" | ||
126 | SRC_URI[icu_properties_data-1.5.0.sha256sum] = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" | ||
127 | SRC_URI[icu_provider-1.5.0.sha256sum] = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" | ||
128 | SRC_URI[icu_provider_macros-1.5.0.sha256sum] = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" | ||
103 | SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" | 129 | SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" |
104 | SRC_URI[indexmap-2.0.0.sha256sum] = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" | 130 | SRC_URI[idna-1.0.1.sha256sum] = "44a986806a1cc899952ba462bc1f28afbfd5850ab6cb030ccb20dd02cc527a24" |
105 | SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" | 131 | SRC_URI[indexmap-2.2.6.sha256sum] = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" |
106 | SRC_URI[itoa-1.0.8.sha256sum] = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" | 132 | SRC_URI[indoc-2.0.5.sha256sum] = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" |
107 | SRC_URI[jiter-0.0.6.sha256sum] = "87db066a99f69382be06d02313f8ce989996b53a04a8a70cfd1a6483a56227f7" | 133 | SRC_URI[itoa-1.0.11.sha256sum] = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" |
108 | SRC_URI[lexical-core-0.8.5.sha256sum] = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" | 134 | SRC_URI[jiter-0.5.0.sha256sum] = "02e23549143ef50eddffd46ba8cd0229b0a4500aef7518cf2eb0f41c9a09d22b" |
109 | SRC_URI[lexical-parse-float-0.8.5.sha256sum] = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" | 135 | SRC_URI[lexical-parse-float-0.8.5.sha256sum] = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" |
110 | SRC_URI[lexical-parse-integer-0.8.6.sha256sum] = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" | 136 | SRC_URI[lexical-parse-integer-0.8.6.sha256sum] = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" |
111 | SRC_URI[lexical-util-0.8.5.sha256sum] = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" | 137 | SRC_URI[lexical-util-0.8.5.sha256sum] = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" |
112 | SRC_URI[lexical-write-float-0.8.5.sha256sum] = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" | 138 | SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" |
113 | SRC_URI[lexical-write-integer-0.8.5.sha256sum] = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" | 139 | SRC_URI[litemap-0.7.3.sha256sum] = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" |
114 | SRC_URI[libc-0.2.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" | 140 | SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" |
115 | SRC_URI[lock_api-0.4.10.sha256sum] = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" | 141 | SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" |
116 | SRC_URI[memchr-2.6.3.sha256sum] = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" | 142 | SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" |
117 | SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" | 143 | SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" |
118 | SRC_URI[num-bigint-0.4.4.sha256sum] = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" | 144 | SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" |
119 | SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" | 145 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" |
120 | SRC_URI[num-traits-0.2.16.sha256sum] = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" | ||
121 | SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" | ||
122 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" | ||
123 | SRC_URI[parking_lot_core-0.9.8.sha256sum] = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" | ||
124 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" | 146 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" |
125 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" | 147 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" |
126 | SRC_URI[proc-macro2-1.0.76.sha256sum] = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" | 148 | SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" |
127 | SRC_URI[pyo3-0.20.3.sha256sum] = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" | 149 | SRC_URI[pyo3-0.22.2.sha256sum] = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" |
128 | SRC_URI[pyo3-build-config-0.20.3.sha256sum] = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" | 150 | SRC_URI[pyo3-build-config-0.22.2.sha256sum] = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" |
129 | SRC_URI[pyo3-ffi-0.20.3.sha256sum] = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" | 151 | SRC_URI[pyo3-ffi-0.22.2.sha256sum] = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" |
130 | SRC_URI[pyo3-macros-0.20.3.sha256sum] = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" | 152 | SRC_URI[pyo3-macros-0.22.2.sha256sum] = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" |
131 | SRC_URI[pyo3-macros-backend-0.20.3.sha256sum] = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" | 153 | SRC_URI[pyo3-macros-backend-0.22.2.sha256sum] = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" |
132 | SRC_URI[python3-dll-a-0.2.9.sha256sum] = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" | 154 | SRC_URI[python3-dll-a-0.2.10.sha256sum] = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b" |
133 | SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" | 155 | SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" |
134 | SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" | 156 | SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" |
135 | SRC_URI[regex-1.10.2.sha256sum] = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" | 157 | SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" |
136 | SRC_URI[regex-automata-0.4.3.sha256sum] = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" | 158 | SRC_URI[regex-automata-0.4.7.sha256sum] = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" |
137 | SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" | 159 | SRC_URI[regex-syntax-0.8.4.sha256sum] = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" |
138 | SRC_URI[rustversion-1.0.13.sha256sum] = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" | 160 | SRC_URI[rustversion-1.0.17.sha256sum] = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" |
139 | SRC_URI[ryu-1.0.14.sha256sum] = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" | 161 | SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" |
140 | SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" | 162 | SRC_URI[serde-1.0.204.sha256sum] = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" |
141 | SRC_URI[serde-1.0.195.sha256sum] = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" | 163 | SRC_URI[serde_derive-1.0.204.sha256sum] = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" |
142 | SRC_URI[serde_derive-1.0.195.sha256sum] = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" | 164 | SRC_URI[serde_json-1.0.121.sha256sum] = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" |
143 | SRC_URI[serde_json-1.0.109.sha256sum] = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" | 165 | SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" |
144 | SRC_URI[smallvec-1.11.2.sha256sum] = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" | 166 | SRC_URI[speedate-0.14.4.sha256sum] = "08a20480dbd4c693f0b0f3210f2cee5bfa21a176c1fa4df0e65cc0474e7fa557" |
145 | SRC_URI[speedate-0.13.0.sha256sum] = "242f76c50fd18cbf098607090ade73a08d39cfd84ea835f3796a2c855223b19b" | 167 | SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" |
146 | SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" | 168 | SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" |
147 | SRC_URI[strum-0.25.0.sha256sum] = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" | 169 | SRC_URI[strum-0.26.3.sha256sum] = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" |
148 | SRC_URI[strum_macros-0.25.3.sha256sum] = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" | 170 | SRC_URI[strum_macros-0.26.4.sha256sum] = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" |
149 | SRC_URI[syn-2.0.48.sha256sum] = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" | 171 | SRC_URI[syn-2.0.68.sha256sum] = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" |
150 | SRC_URI[target-lexicon-0.12.9.sha256sum] = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" | 172 | SRC_URI[synstructure-0.13.1.sha256sum] = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" |
151 | SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" | 173 | SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" |
174 | SRC_URI[target-lexicon-0.12.14.sha256sum] = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" | ||
175 | SRC_URI[tinystr-0.7.6.sha256sum] = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" | ||
176 | SRC_URI[tinyvec-1.6.1.sha256sum] = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" | ||
152 | SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" | 177 | SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" |
153 | SRC_URI[unicode-bidi-0.3.13.sha256sum] = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" | 178 | SRC_URI[unicode-bidi-0.3.15.sha256sum] = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" |
154 | SRC_URI[unicode-ident-1.0.10.sha256sum] = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" | 179 | SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" |
155 | SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" | 180 | SRC_URI[unicode-normalization-0.1.23.sha256sum] = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" |
156 | SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" | 181 | SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" |
157 | SRC_URI[url-2.5.0.sha256sum] = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" | 182 | SRC_URI[url-2.5.2.sha256sum] = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" |
158 | SRC_URI[uuid-1.6.1.sha256sum] = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" | 183 | SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" |
159 | SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" | 184 | SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" |
185 | SRC_URI[uuid-1.9.1.sha256sum] = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" | ||
186 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" | ||
160 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" | 187 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" |
161 | SRC_URI[windows-targets-0.48.1.sha256sum] = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" | 188 | SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" |
162 | SRC_URI[windows_aarch64_gnullvm-0.48.0.sha256sum] = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" | 189 | SRC_URI[writeable-0.5.5.sha256sum] = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" |
163 | SRC_URI[windows_aarch64_msvc-0.48.0.sha256sum] = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" | 190 | SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" |
164 | SRC_URI[windows_i686_gnu-0.48.0.sha256sum] = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" | 191 | SRC_URI[yoke-0.7.4.sha256sum] = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" |
165 | SRC_URI[windows_i686_msvc-0.48.0.sha256sum] = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" | 192 | SRC_URI[yoke-derive-0.7.4.sha256sum] = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" |
166 | SRC_URI[windows_x86_64_gnu-0.48.0.sha256sum] = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" | 193 | SRC_URI[zerocopy-0.7.34.sha256sum] = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" |
167 | SRC_URI[windows_x86_64_gnullvm-0.48.0.sha256sum] = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" | 194 | SRC_URI[zerocopy-derive-0.7.34.sha256sum] = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" |
168 | SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" | 195 | SRC_URI[zerofrom-0.1.4.sha256sum] = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" |
169 | SRC_URI[zerocopy-0.7.32.sha256sum] = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" | 196 | SRC_URI[zerofrom-derive-0.1.4.sha256sum] = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" |
170 | SRC_URI[zerocopy-derive-0.7.32.sha256sum] = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" | 197 | SRC_URI[zerovec-0.10.4.sha256sum] = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" |
198 | SRC_URI[zerovec-derive-0.10.3.sha256sum] = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch deleted file mode 100644 index 32777e1d0..000000000 --- a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch +++ /dev/null | |||
@@ -1,126 +0,0 @@ | |||
1 | From a5690f973384bf8cbf4deb3b83d822b7aaefbdd8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 27 Feb 2024 11:00:46 -0800 | ||
4 | Subject: [PATCH] Bumps [pyo3](https://github.com/pyo3/pyo3) from 0.20.2 to | ||
5 | 0.20.3. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Cargo.lock | 26 +++++++++++++++++--------- | ||
11 | Cargo.toml | 2 +- | ||
12 | 2 files changed, 18 insertions(+), 10 deletions(-) | ||
13 | |||
14 | --- a/Cargo.lock | ||
15 | +++ b/Cargo.lock | ||
16 | @@ -322,6 +322,12 @@ source = "registry+https://github.com/ru | ||
17 | checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" | ||
18 | |||
19 | [[package]] | ||
20 | +name = "portable-atomic" | ||
21 | +version = "1.6.0" | ||
22 | +source = "registry+https://github.com/rust-lang/crates.io-index" | ||
23 | +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" | ||
24 | + | ||
25 | +[[package]] | ||
26 | name = "proc-macro2" | ||
27 | version = "1.0.76" | ||
28 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
29 | @@ -357,9 +363,9 @@ dependencies = [ | ||
30 | |||
31 | [[package]] | ||
32 | name = "pyo3" | ||
33 | -version = "0.20.2" | ||
34 | +version = "0.20.3" | ||
35 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
36 | -checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" | ||
37 | +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" | ||
38 | dependencies = [ | ||
39 | "cfg-if", | ||
40 | "indoc", | ||
41 | @@ -367,6 +373,7 @@ dependencies = [ | ||
42 | "memoffset", | ||
43 | "num-bigint", | ||
44 | "parking_lot", | ||
45 | + "portable-atomic", | ||
46 | "pyo3-build-config", | ||
47 | "pyo3-ffi", | ||
48 | "pyo3-macros", | ||
49 | @@ -375,9 +382,9 @@ dependencies = [ | ||
50 | |||
51 | [[package]] | ||
52 | name = "pyo3-build-config" | ||
53 | -version = "0.20.2" | ||
54 | +version = "0.20.3" | ||
55 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
56 | -checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" | ||
57 | +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" | ||
58 | dependencies = [ | ||
59 | "once_cell", | ||
60 | "python3-dll-a", | ||
61 | @@ -386,9 +393,9 @@ dependencies = [ | ||
62 | |||
63 | [[package]] | ||
64 | name = "pyo3-ffi" | ||
65 | -version = "0.20.2" | ||
66 | +version = "0.20.3" | ||
67 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
68 | -checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" | ||
69 | +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" | ||
70 | dependencies = [ | ||
71 | "libc", | ||
72 | "pyo3-build-config", | ||
73 | @@ -396,9 +403,9 @@ dependencies = [ | ||
74 | |||
75 | [[package]] | ||
76 | name = "pyo3-macros" | ||
77 | -version = "0.20.2" | ||
78 | +version = "0.20.3" | ||
79 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
80 | -checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" | ||
81 | +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" | ||
82 | dependencies = [ | ||
83 | "proc-macro2", | ||
84 | "pyo3-macros-backend", | ||
85 | @@ -408,12 +415,13 @@ dependencies = [ | ||
86 | |||
87 | [[package]] | ||
88 | name = "pyo3-macros-backend" | ||
89 | -version = "0.20.2" | ||
90 | +version = "0.20.3" | ||
91 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
92 | -checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" | ||
93 | +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" | ||
94 | dependencies = [ | ||
95 | "heck", | ||
96 | "proc-macro2", | ||
97 | + "pyo3-build-config", | ||
98 | "quote", | ||
99 | "syn", | ||
100 | ] | ||
101 | --- a/Cargo.toml | ||
102 | +++ b/Cargo.toml | ||
103 | @@ -26,7 +26,7 @@ include = [ | ||
104 | ] | ||
105 | |||
106 | [dependencies] | ||
107 | -pyo3 = { version = "0.20.2", features = ["generate-import-lib", "num-bigint"] } | ||
108 | +pyo3 = { version = "0.20.3", features = ["generate-import-lib", "num-bigint"] } | ||
109 | regex = "1.10.2" | ||
110 | strum = { version = "0.25.0", features = ["derive"] } | ||
111 | strum_macros = "0.25.3" | ||
112 | @@ -70,12 +70,12 @@ debug = true | ||
113 | strip = false | ||
114 | |||
115 | [dev-dependencies] | ||
116 | -pyo3 = { version = "0.20.2", features = ["auto-initialize"] } | ||
117 | +pyo3 = { version = "0.20.3", features = ["auto-initialize"] } | ||
118 | |||
119 | [build-dependencies] | ||
120 | version_check = "0.9.4" | ||
121 | # used where logic has to be version/distribution specific, e.g. pypy | ||
122 | -pyo3-build-config = { version = "0.20.2" } | ||
123 | +pyo3-build-config = { version = "0.20.3" } | ||
124 | |||
125 | [lints.clippy] | ||
126 | dbg_macro = "warn" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patch b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patch deleted file mode 100644 index f6aa18e30..000000000 --- a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 0dcca2ed6a83ebbc944ec8cbd2f67ffec8043461 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jelle Zijlstra <jelle.zijlstra@gmail.com> | ||
3 | Date: Wed, 22 May 2024 07:44:10 -0700 | ||
4 | Subject: [PATCH] Fix generate_self_schema for Python 3.12+ (#1299) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/pydantic/pydantic-core/commit/a7620419383a69bd2b28ab953c9a17f6ed35bb9a] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | generate_self_schema.py | 7 ++++++- | ||
10 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/generate_self_schema.py b/generate_self_schema.py | ||
13 | index 8d27247..109fca0 100644 | ||
14 | --- a/generate_self_schema.py | ||
15 | +++ b/generate_self_schema.py | ||
16 | @@ -189,7 +189,12 @@ def all_literal_values(type_: type[core_schema.Literal]) -> list[any]: | ||
17 | |||
18 | def eval_forward_ref(type_: Any) -> Any: | ||
19 | try: | ||
20 | - return type_._evaluate(core_schema.__dict__, None, set()) | ||
21 | + try: | ||
22 | + # Python 3.12+ | ||
23 | + return type_._evaluate(core_schema.__dict__, None, type_params=set(), recursive_guard=set()) | ||
24 | + except TypeError: | ||
25 | + # Python 3.9+ | ||
26 | + return type_._evaluate(core_schema.__dict__, None, set()) | ||
27 | except TypeError: | ||
28 | # for Python 3.8 | ||
29 | return type_._evaluate(core_schema.__dict__, None) | ||
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch new file mode 100644 index 000000000..5d732d5be --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | From e07c41b3bad75948201a2201387225694c2fb501 Mon Sep 17 00:00:00 2001 | ||
2 | From: Boxy <rust@boxyuwu.dev> | ||
3 | Date: Wed, 7 Aug 2024 17:11:02 +0100 | ||
4 | Subject: [PATCH] dont embed `RUSTFLAGS` in final binary (#1396) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/pydantic/pydantic-core/pull/1396] | ||
7 | |||
8 | See discussion upstream in: | ||
9 | https://github.com/pydantic/pydantic-core/issues/1365 | ||
10 | |||
11 | Backport fix from: | ||
12 | https://github.com/pydantic/pydantic-core/commit/e07c41b3bad75948201a2201387225694c2fb501 | ||
13 | |||
14 | Signed-off-by: Tim Orling <tim.orling@konsulko.com> | ||
15 | --- | ||
16 | build.rs | 9 +++++++++ | ||
17 | src/lib.rs | 5 ++++- | ||
18 | 2 files changed, 13 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/build.rs b/build.rs | ||
21 | index d1093c74..f8f66901 100644 | ||
22 | --- a/build.rs | ||
23 | +++ b/build.rs | ||
24 | @@ -36,6 +36,15 @@ fn main() { | ||
25 | println!("cargo:rustc-cfg=has_coverage_attribute"); | ||
26 | } | ||
27 | println!("cargo:rustc-check-cfg=cfg(has_coverage_attribute)"); | ||
28 | + | ||
29 | + if std::env::var("RUSTFLAGS") | ||
30 | + .unwrap_or_default() | ||
31 | + .contains("-Cprofile-use=") | ||
32 | + { | ||
33 | + println!("cargo:rustc-cfg=specified_profile_use"); | ||
34 | + } | ||
35 | + println!("cargo:rustc-check-cfg=cfg(specified_profile_use)"); | ||
36 | + | ||
37 | generate_self_schema(); | ||
38 | println!("cargo:rustc-env=PROFILE={}", std::env::var("PROFILE").unwrap()); | ||
39 | } | ||
40 | diff --git a/src/lib.rs b/src/lib.rs | ||
41 | index eb598424..eb486da6 100644 | ||
42 | --- a/src/lib.rs | ||
43 | +++ b/src/lib.rs | ||
44 | @@ -98,7 +98,10 @@ pub fn build_info() -> String { | ||
45 | format!( | ||
46 | "profile={} pgo={}", | ||
47 | env!("PROFILE"), | ||
48 | - option_env!("RUSTFLAGS").unwrap_or("").contains("-Cprofile-use="), | ||
49 | + // We use a `cfg!` here not `env!`/`option_env!` as those would | ||
50 | + // embed `RUSTFLAGS` into the generated binary which causes problems | ||
51 | + // with reproducable builds. | ||
52 | + cfg!(specified_profile_use), | ||
53 | ) | ||
54 | } | ||
55 | |||
56 | -- | ||
57 | 2.46.0 | ||
58 | |||
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.21.0.bb index c5ce1ff11..b24e141f6 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb +++ b/meta-python/recipes-devtools/python/python3-pydantic-core_2.21.0.bb | |||
@@ -8,32 +8,41 @@ HOMEPAGE = "https://github.com/pydantic/pydantic-core" | |||
8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" |
10 | 10 | ||
11 | SRC_URI += "file://0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch \ | 11 | require ${BPN}-crates.inc |
12 | file://0001-Fix-generate_self_schema-for-Python-3.12-1299.patch" | ||
13 | SRC_URI[sha256sum] = "1cac689f80a3abab2d3c0048b29eea5751114054f032a941a32de4c852c59cad" | ||
14 | 12 | ||
15 | DEPENDS = "python3-maturin-native python3-typing-extensions" | 13 | SRC_URI += "file://run-ptest" |
14 | SRC_URI += "file://0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch" | ||
16 | 15 | ||
17 | require ${BPN}-crates.inc | 16 | SRC_URI[sha256sum] = "79c747f9916e5b6cb588dfd994d9ac15a93e43eb07467d9e6f24d892c176bbf5" |
17 | |||
18 | DEPENDS = "python3-maturin-native python3-typing-extensions" | ||
18 | 19 | ||
19 | inherit pypi cargo-update-recipe-crates python_maturin | 20 | inherit pypi cargo-update-recipe-crates python_maturin |
20 | 21 | ||
21 | PYPI_PACKAGE = "pydantic_core" | 22 | PYPI_PACKAGE = "pydantic_core" |
22 | 23 | ||
23 | RDEPENDS:${PN} += "python3-typing-extensions" | 24 | RDEPENDS:${PN} += " \ |
25 | python3-compression \ | ||
26 | python3-typing-extensions \ | ||
27 | " | ||
24 | 28 | ||
25 | INSANE_SKIP:${PN} = "already-stripped" | 29 | INSANE_SKIP:${PN} = "already-stripped" |
30 | INSANE_SKIP:${PN} += "buildpaths" | ||
26 | 31 | ||
32 | # python3-misc is for Lib/timeit.py which is not split out elsewhere | ||
27 | inherit ptest | 33 | inherit ptest |
28 | SRC_URI += "file://run-ptest" | ||
29 | RDEPENDS:${PN}-ptest += "\ | 34 | RDEPENDS:${PN}-ptest += "\ |
35 | python3-dateutil \ | ||
30 | python3-dirty-equals \ | 36 | python3-dirty-equals \ |
31 | python3-hypothesis \ | 37 | python3-hypothesis \ |
38 | python3-misc \ | ||
32 | python3-pytest \ | 39 | python3-pytest \ |
33 | python3-pytest-mock \ | 40 | python3-pytest-mock \ |
34 | python3-pytest-timeout \ | 41 | python3-pytest-timeout \ |
35 | python3-pytest-benchmark \ | 42 | python3-pytest-benchmark \ |
43 | python3-tzdata \ | ||
36 | python3-unittest-automake-output \ | 44 | python3-unittest-automake-output \ |
45 | python3-zoneinfo \ | ||
37 | " | 46 | " |
38 | 47 | ||
39 | do_install_ptest() { | 48 | do_install_ptest() { |
diff --git a/meta-python/recipes-devtools/python/python3-pydantic_2.7.3.bb b/meta-python/recipes-devtools/python/python3-pydantic_2.8.2.bb index 423fe7673..de610d781 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic_2.7.3.bb +++ b/meta-python/recipes-devtools/python/python3-pydantic_2.8.2.bb | |||
@@ -11,10 +11,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=09280955509d1c4ca14bae02f21d49a6" | |||
11 | 11 | ||
12 | inherit pypi python_hatchling | 12 | inherit pypi python_hatchling |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "c46c76a40bb1296728d7a8b99aa73dd70a48c3510111ff290034f860c99c419e" | 14 | SRC_URI[sha256sum] = "6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a" |
15 | 15 | ||
16 | DEPENDS += "python3-hatch-fancy-pypi-readme-native" | 16 | DEPENDS += "python3-hatch-fancy-pypi-readme-native" |
17 | 17 | ||
18 | RECIPE_NO_UPDATE_REASON = "Must be updated in sync with python3-pydantic-core." | ||
19 | |||
18 | RDEPENDS:${PN} += "\ | 20 | RDEPENDS:${PN} += "\ |
19 | python3-annotated-types \ | 21 | python3-annotated-types \ |
20 | python3-core \ | 22 | python3-core \ |
@@ -35,9 +37,13 @@ SRC_URI += "file://run-ptest" | |||
35 | RDEPENDS:${PN}-ptest += "\ | 37 | RDEPENDS:${PN}-ptest += "\ |
36 | python3-cloudpickle \ | 38 | python3-cloudpickle \ |
37 | python3-dirty-equals \ | 39 | python3-dirty-equals \ |
40 | python3-email-validator \ | ||
41 | python3-pydoc \ | ||
38 | python3-pytest \ | 42 | python3-pytest \ |
39 | python3-pytest-mock \ | 43 | python3-pytest-mock \ |
44 | python3-rich \ | ||
40 | python3-unittest-automake-output \ | 45 | python3-unittest-automake-output \ |
46 | python3-unixadmin \ | ||
41 | " | 47 | " |
42 | 48 | ||
43 | do_install_ptest() { | 49 | do_install_ptest() { |
diff --git a/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb b/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb index 5754fd2ad..cfdacf53b 100644 --- a/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb +++ b/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb | |||
@@ -20,7 +20,7 @@ RDEPENDS:${PN} = "python3-pygobject \ | |||
20 | python3-io \ | 20 | python3-io \ |
21 | python3-logging" | 21 | python3-logging" |
22 | 22 | ||
23 | RDEPENDS:${PN}-ptest += "bash" | 23 | RDEPENDS:${PN}-ptest += "bash python3-xml" |
24 | 24 | ||
25 | do_install_ptest() { | 25 | do_install_ptest() { |
26 | install -d ${D}${PTEST_PATH}/tests | 26 | install -d ${D}${PTEST_PATH}/tests |
diff --git a/meta-python/recipes-devtools/python/python3-pyfanotify_0.2.2.bb b/meta-python/recipes-devtools/python/python3-pyfanotify_0.3.0.bb index 292ceab2e..214e80635 100644 --- a/meta-python/recipes-devtools/python/python3-pyfanotify_0.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-pyfanotify_0.3.0.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "MIT" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=636a36c9df04efcfacf839b8866d9a37" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=636a36c9df04efcfacf839b8866d9a37" |
6 | 6 | ||
7 | SRC_URI += "file://0001-ext-define-FNM_EXTMATCH-if-not-already-defined.patch" | 7 | SRC_URI += "file://0001-ext-define-FNM_EXTMATCH-if-not-already-defined.patch" |
8 | SRC_URI[sha256sum] = "90219aa9f8b78fa732f24aa7b21c7bb6ac97a6eb47f1763c899b8194e23af1df" | 8 | SRC_URI[sha256sum] = "95ee17caec25436e10d59d5d45e28d2dc659819cc6de55f29fcbdcd5ee2fa8d3" |
9 | 9 | ||
10 | inherit pypi setuptools3 | 10 | inherit pypi setuptools3 |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyjwt_2.8.0.bb b/meta-python/recipes-devtools/python/python3-pyjwt_2.9.0.bb index 92a8f44c6..7bc3cffdd 100644 --- a/meta-python/recipes-devtools/python/python3-pyjwt_2.8.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyjwt_2.9.0.bb | |||
@@ -5,14 +5,14 @@ HOMEPAGE = "http://github.com/jpadilla/pyjwt" | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e4b56d2c9973d8cf54655555be06e551" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e4b56d2c9973d8cf54655555be06e551" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de" | 8 | SRC_URI[sha256sum] = "7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c" |
9 | 9 | ||
10 | PYPI_PACKAGE = "PyJWT" | 10 | PYPI_PACKAGE = "pyjwt" |
11 | inherit pypi setuptools3 | 11 | inherit pypi python_setuptools_build_meta |
12 | 12 | ||
13 | RDEPENDS:${PN} = " \ | 13 | RDEPENDS:${PN} = "\ |
14 | python3-json \ | ||
15 | python3-cryptography \ | 14 | python3-cryptography \ |
15 | python3-json \ | ||
16 | " | 16 | " |
17 | 17 | ||
18 | BBCLASSEXTEND = "native nativesdk" | 18 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb b/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb index 0de1576af..eae30dfbf 100644 --- a/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb | |||
@@ -25,10 +25,11 @@ RDEPENDS:${PN} += "\ | |||
25 | python3-shell \ | 25 | python3-shell \ |
26 | python3-tomlkit \ | 26 | python3-tomlkit \ |
27 | " | 27 | " |
28 | 28 | # python3-misc for timeit.py | |
29 | RDEPENDS:${PN}-ptest += " \ | 29 | RDEPENDS:${PN}-ptest += " \ |
30 | python3-core \ | 30 | python3-core \ |
31 | python3-git \ | 31 | python3-git \ |
32 | python3-misc \ | ||
32 | python3-py \ | 33 | python3-py \ |
33 | python3-pytest \ | 34 | python3-pytest \ |
34 | python3-pytest-benchmark \ | 35 | python3-pytest-benchmark \ |
diff --git a/meta-python/recipes-devtools/python/python3-pymetno_0.12.0.bb b/meta-python/recipes-devtools/python/python3-pymetno_0.13.0.bb index 5be6e6319..193760664 100644 --- a/meta-python/recipes-devtools/python/python3-pymetno_0.12.0.bb +++ b/meta-python/recipes-devtools/python/python3-pymetno_0.13.0.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "MIT" | |||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5d503272f52c35147ec960cb56a03bf4" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=5d503272f52c35147ec960cb56a03bf4" |
5 | 5 | ||
6 | SRC_URI = "git://github.com/Danielhiversen/pyMetno.git;protocol=https;branch=master" | 6 | SRC_URI = "git://github.com/Danielhiversen/pyMetno.git;protocol=https;branch=master" |
7 | SRCREV = "50f427aad264a4793abb94a3c8cbf987fadcd4ae" | 7 | SRCREV = "921812ddad3f147489916c3c7ab7fb7a80d8c646" |
8 | S = "${WORKDIR}/git" | 8 | S = "${WORKDIR}/git" |
9 | 9 | ||
10 | inherit setuptools3 | 10 | inherit setuptools3 |
diff --git a/meta-python/recipes-devtools/python/python3-pymisp_2.4.190.bb b/meta-python/recipes-devtools/python/python3-pymisp_2.4.198.bb index c1389982d..b902061c0 100644 --- a/meta-python/recipes-devtools/python/python3-pymisp_2.4.190.bb +++ b/meta-python/recipes-devtools/python/python3-pymisp_2.4.198.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" | |||
3 | LICENSE = "BSD-2-Clause" | 3 | LICENSE = "BSD-2-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "e7374295bfd8c7d25f56867e4395a029433360d95420e39b7f78eb1d4f8b48b4" | 6 | SRC_URI[sha256sum] = "f5583263c2fcd380570c084b21c4e4812a01c32daa7baafcdc3f87153edc9303" |
7 | 7 | ||
8 | inherit python_poetry_core pypi | 8 | inherit python_poetry_core pypi |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pymodbus_3.6.8.bb b/meta-python/recipes-devtools/python/python3-pymodbus_3.7.2.bb index b94504f14..b240837d4 100644 --- a/meta-python/recipes-devtools/python/python3-pymodbus_3.6.8.bb +++ b/meta-python/recipes-devtools/python/python3-pymodbus_3.7.2.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/riptideio/pymodbus/" | |||
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eba8057aa82c058d2042b4b0a0e9cc63" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eba8057aa82c058d2042b4b0a0e9cc63" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "abb214716b56fc62bc0d5d9d964e2249439341746287e918d175f0e3ee241407" | 6 | SRC_URI[sha256sum] = "6cc63a14c8cca83f5b6d9dae3319565061bd49503ee7282df681201c16357eef" |
7 | 7 | ||
8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pymongo_4.7.2.bb b/meta-python/recipes-devtools/python/python3-pymongo_4.8.0.bb index 2951f8f85..fcce456d8 100644 --- a/meta-python/recipes-devtools/python/python3-pymongo_4.7.2.bb +++ b/meta-python/recipes-devtools/python/python3-pymongo_4.8.0.bb | |||
@@ -8,14 +8,18 @@ HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" | |||
8 | LICENSE = "Apache-2.0" | 8 | LICENSE = "Apache-2.0" |
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "9024e1661c6e40acf468177bf90ce924d1bc681d2b244adda3ed7b2f4c4d17d7" | 11 | SRC_URI[sha256sum] = "454f2295875744dc70f1881e4b2eb99cdad008a33574bc8aaf120530f66c0cde" |
12 | 12 | ||
13 | inherit pypi setuptools3 | 13 | inherit pypi python_setuptools_build_meta python_hatchling |
14 | 14 | ||
15 | PACKAGES =+ "python3-bson" | 15 | PACKAGES =+ "python3-bson" |
16 | 16 | ||
17 | FILES:python3-bson = "${PYTHON_SITEPACKAGES_DIR}/bson/*" | 17 | FILES:python3-bson = "${PYTHON_SITEPACKAGES_DIR}/bson/*" |
18 | 18 | ||
19 | DEPENDS += " \ | ||
20 | python3-hatch-requirements-txt-native \ | ||
21 | " | ||
22 | |||
19 | RDEPENDS:python3-bson += " \ | 23 | RDEPENDS:python3-bson += " \ |
20 | python3-datetime \ | 24 | python3-datetime \ |
21 | python3-json \ | 25 | python3-json \ |
@@ -27,4 +31,6 @@ RDEPENDS:python3-bson += " \ | |||
27 | RDEPENDS:${PN} += " \ | 31 | RDEPENDS:${PN} += " \ |
28 | python3-bson \ | 32 | python3-bson \ |
29 | python3-pprint \ | 33 | python3-pprint \ |
34 | python3-difflib \ | ||
35 | python3-logging \ | ||
30 | " | 36 | " |
diff --git a/meta-python/recipes-devtools/python/python3-pyproj/rpath.patch b/meta-python/recipes-devtools/python/python3-pyproj/rpath.patch new file mode 100644 index 000000000..347996a80 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyproj/rpath.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Description: Don't set RPATH in libraries. | ||
2 | Author: Bas Couwenberg <sebastic@debian.org> | ||
3 | Forwarded: not-needed | ||
4 | |||
5 | Upstream-Status: Inappropriate [OE-Specific] | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- a/setup.py | ||
8 | +++ b/setup.py | ||
9 | @@ -194,9 +194,6 @@ def get_extension_modules(): | ||
10 | ext_options = { | ||
11 | "include_dirs": include_dirs, | ||
12 | "library_dirs": library_dirs, | ||
13 | - "runtime_library_dirs": ( | ||
14 | - library_dirs if os.name != "nt" and sys.platform != "cygwin" else None | ||
15 | - ), | ||
16 | "libraries": get_libraries(library_dirs), | ||
17 | } | ||
18 | # setup cythonized modules | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb b/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb index a4121c393..cad9464cc 100644 --- a/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb | |||
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=873757af01d2d221eedb422c4c1dd163" | |||
4 | DEPENDS = "python3-cython proj" | 4 | DEPENDS = "python3-cython proj" |
5 | DEPENDS:append:class-target = " python3-cython-native proj-native" | 5 | DEPENDS:append:class-target = " python3-cython-native proj-native" |
6 | 6 | ||
7 | PYPI_PACKAGE = "pyproj" | 7 | inherit pypi python_setuptools_build_meta |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | SRC_URI += "file://rpath.patch" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf" | 11 | SRC_URI[sha256sum] = "44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf" |
12 | 12 | ||
@@ -21,3 +21,11 @@ RDEPENDS:${PN} = " \ | |||
21 | export PROJ_INCDIR = "${STAGING_INCDIR}" | 21 | export PROJ_INCDIR = "${STAGING_INCDIR}" |
22 | export PROJ_LIBDIR = "${STAGING_LIBDIR}" | 22 | export PROJ_LIBDIR = "${STAGING_LIBDIR}" |
23 | export PROJ_DIR = "${STAGING_BINDIR_NATIVE}/.." | 23 | export PROJ_DIR = "${STAGING_BINDIR_NATIVE}/.." |
24 | |||
25 | do_compile:append() { | ||
26 | for f in `find ${B} -name *.c` | ||
27 | do | ||
28 | sed -i -e "/BEGIN: Cython Metadata/,/END: Cython Metadata/d" $f | ||
29 | done | ||
30 | python_pep517_do_compile | ||
31 | } | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb b/meta-python/recipes-devtools/python/python3-pyproject-api_1.7.2.bb index aec19949d..ee8949add 100644 --- a/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyproject-api_1.7.2.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "https://pyproject-api.readthedocs.io" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "1817dc018adc0d1ff9ca1ed8c60e1623d5aaca40814b953af14a9cf9a5cae538" | 9 | SRC_URI[sha256sum] = "dc5b0e0f6e291a4f22b46e182c9c6d4915c62b1f089b8de1b73f2d06ae453593" |
10 | 10 | ||
11 | PYPI_PACKAGE = "pyproject_api" | 11 | PYPI_PACKAGE = "pyproject_api" |
12 | 12 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb b/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb index 3ea980f44..cf9885df7 100644 --- a/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb +++ b/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dccbff78d7d79ae7e53953d43445c6e6 \ | |||
6 | 6 | ||
7 | SRC_URI[sha256sum] = "54d226fc3ff2732f49bac9b26853c50c9d05be05a4d9daf09c7cf6d77301eff3" | 7 | SRC_URI[sha256sum] = "54d226fc3ff2732f49bac9b26853c50c9d05be05a4d9daf09c7cf6d77301eff3" |
8 | 8 | ||
9 | inherit setuptools3 pypi ptest | 9 | inherit python_setuptools_build_meta pypi ptest |
10 | 10 | ||
11 | RDEPENDS:${PN} += " \ | 11 | RDEPENDS:${PN} += " \ |
12 | python3-ctypes \ | 12 | python3-ctypes \ |
diff --git a/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.7.bb b/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.1.1.bb index f5e6dbfcd..bd6d81aec 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.7.bb +++ b/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.1.1.bb | |||
@@ -12,7 +12,7 @@ HOMEPAGE = "https://github.com/dev-petrov/pytest-lazy-fixtures" | |||
12 | LICENSE = "MIT" | 12 | LICENSE = "MIT" |
13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4475e66fcfabe27395e6764c8f69c876" | 13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4475e66fcfabe27395e6764c8f69c876" |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "87ef7424dc0229ff9cb72d482f49b7806535c3500641f612c13ddf243c9adacb" | 15 | SRC_URI[sha256sum] = "0c561f0d29eea5b55cf29b9264a3241999ffdb74c6b6e8c4ccc0bd2c934d01ed" |
16 | 16 | ||
17 | inherit pypi python_poetry_core | 17 | inherit pypi python_poetry_core |
18 | 18 | ||
diff --git a/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb b/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb index 163a363f8..9243f6646 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb +++ b/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb | |||
@@ -6,9 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" | |||
6 | 6 | ||
7 | SRC_URI[sha256sum] = "fcd2f416f15be295943527b3c8ba16a44ae5a7141939c90c3dc5ce9d167cf2a5" | 7 | SRC_URI[sha256sum] = "fcd2f416f15be295943527b3c8ba16a44ae5a7141939c90c3dc5ce9d167cf2a5" |
8 | 8 | ||
9 | PYPI_PACKAGE = "pytest-metadata" | 9 | inherit pypi python_poetry_core |
10 | |||
11 | inherit pypi setuptools3 | ||
12 | 10 | ||
13 | RDEPENDS:${PN} = " \ | 11 | RDEPENDS:${PN} = " \ |
14 | python3-pytest \ | 12 | python3-pytest \ |
diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch b/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch deleted file mode 100644 index f024e79d9..000000000 --- a/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From e184fb950ad3b52c5c16438d39fe4d516c784e30 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | ||
3 | Date: Thu, 12 Oct 2023 17:32:40 -0400 | ||
4 | Subject: [PATCH] test_pytest_mock: skip args introspection tests | ||
5 | |||
6 | Disable these two tests for now so that python3-pytest-mock can have | ||
7 | successful ptest runs. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE-Specific] | ||
10 | |||
11 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
12 | --- | ||
13 | tests/test_pytest_mock.py | 2 ++ | ||
14 | 1 file changed, 2 insertions(+) | ||
15 | |||
16 | diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py | ||
17 | index 3d53241..157b6c3 100644 | ||
18 | --- a/tests/test_pytest_mock.py | ||
19 | +++ b/tests/test_pytest_mock.py | ||
20 | @@ -581,6 +581,7 @@ def test_assert_called_wrapper(mocker: MockerFixture) -> None: | ||
21 | stub.assert_called() | ||
22 | |||
23 | |||
24 | +@pytest.mark.skip("Async not correctly detected, skip for now") | ||
25 | @pytest.mark.usefixtures("needs_assert_rewrite") | ||
26 | def test_assert_called_args_with_introspection(mocker: MockerFixture) -> None: | ||
27 | stub = mocker.stub() | ||
28 | @@ -597,6 +598,7 @@ def test_assert_called_args_with_introspection(mocker: MockerFixture) -> None: | ||
29 | stub.assert_called_once_with(*wrong_args) | ||
30 | |||
31 | |||
32 | +@pytest.mark.skip("Async not correctly detected, skip for now") | ||
33 | @pytest.mark.usefixtures("needs_assert_rewrite") | ||
34 | def test_assert_called_kwargs_with_introspection(mocker: MockerFixture) -> None: | ||
35 | stub = mocker.stub() | ||
36 | -- | ||
37 | 2.41.0 | ||
38 | |||
diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock/403.patch b/meta-python/recipes-devtools/python/python3-pytest-mock/403.patch deleted file mode 100644 index 6787c2a3d..000000000 --- a/meta-python/recipes-devtools/python/python3-pytest-mock/403.patch +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | From 8480bb6d0500f933be039cfec65e04157e6ecffe Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruno Oliveira <nicoddemus@gmail.com> | ||
3 | Date: Tue, 19 Dec 2023 08:24:23 -0300 | ||
4 | Subject: [PATCH 1/3] Fix tests for Python 3.11 and 3.12 | ||
5 | |||
6 | Fixes #401. | ||
7 | Upstream-Status: Backport [https://github.com/pytest-dev/pytest-mock/pull/403] | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | tests/test_pytest_mock.py | 3 +-- | ||
11 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py | ||
14 | index 3ee00da..7acb361 100644 | ||
15 | --- a/tests/test_pytest_mock.py | ||
16 | +++ b/tests/test_pytest_mock.py | ||
17 | @@ -246,9 +246,8 @@ def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None: | ||
18 | msg = "Expected call: {0}()\nNot called" | ||
19 | expected_message = msg.format(expected_name) | ||
20 | stub = mocker.stub(**kwargs) | ||
21 | - with pytest.raises(AssertionError) as exc_info: | ||
22 | + with pytest.raises(AssertionError, match=re.escape(expected_message)) as exc_info: | ||
23 | stub.assert_called_with() | ||
24 | - assert str(exc_info.value) == expected_message | ||
25 | |||
26 | def test_failure_message_with_no_name(self, mocker: MagicMock) -> None: | ||
27 | self.__test_failure_message(mocker) | ||
28 | |||
29 | From c596504e062be06475b03122c9c0cc732ae87840 Mon Sep 17 00:00:00 2001 | ||
30 | From: "pre-commit-ci[bot]" | ||
31 | <66853113+pre-commit-ci[bot]@users.noreply.github.com> | ||
32 | Date: Tue, 19 Dec 2023 11:24:38 +0000 | ||
33 | Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks | ||
34 | |||
35 | for more information, see https://pre-commit.ci | ||
36 | --- | ||
37 | tests/test_pytest_mock.py | 4 +++- | ||
38 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
39 | |||
40 | diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py | ||
41 | index 7acb361..c185f2a 100644 | ||
42 | --- a/tests/test_pytest_mock.py | ||
43 | +++ b/tests/test_pytest_mock.py | ||
44 | @@ -246,7 +246,9 @@ def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None: | ||
45 | msg = "Expected call: {0}()\nNot called" | ||
46 | expected_message = msg.format(expected_name) | ||
47 | stub = mocker.stub(**kwargs) | ||
48 | - with pytest.raises(AssertionError, match=re.escape(expected_message)) as exc_info: | ||
49 | + with pytest.raises( | ||
50 | + AssertionError, match=re.escape(expected_message) | ||
51 | + ) as exc_info: | ||
52 | stub.assert_called_with() | ||
53 | |||
54 | def test_failure_message_with_no_name(self, mocker: MagicMock) -> None: | ||
55 | |||
56 | From 6da5b0506d6378a8dbe5ae314d5134e6868aeabd Mon Sep 17 00:00:00 2001 | ||
57 | From: danigm <daniel.garcia@suse.com> | ||
58 | Date: Wed, 20 Dec 2023 16:02:13 +0100 | ||
59 | Subject: [PATCH 3/3] Update expected message to match python 3.11.7 (#404) | ||
60 | |||
61 | https://github.com/python/cpython/issues/111019 | ||
62 | |||
63 | Fixes #401. | ||
64 | Closes #403. | ||
65 | --- | ||
66 | tests/test_pytest_mock.py | 6 +++++- | ||
67 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
68 | |||
69 | diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py | ||
70 | index c185f2a..01534a4 100644 | ||
71 | --- a/tests/test_pytest_mock.py | ||
72 | +++ b/tests/test_pytest_mock.py | ||
73 | @@ -25,6 +25,8 @@ | ||
74 | |||
75 | # Python 3.8 changed the output formatting (bpo-35500), which has been ported to mock 3.0 | ||
76 | NEW_FORMATTING = sys.version_info >= (3, 8) | ||
77 | +# Python 3.11.7 changed the output formatting, https://github.com/python/cpython/issues/111019 | ||
78 | +NEWEST_FORMATTING = sys.version_info >= (3, 11, 7) | ||
79 | |||
80 | if sys.version_info[:2] >= (3, 8): | ||
81 | from unittest.mock import AsyncMock | ||
82 | @@ -240,7 +242,9 @@ def test_repr_with_name(self, mocker: MockerFixture) -> None: | ||
83 | |||
84 | def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None: | ||
85 | expected_name = kwargs.get("name") or "mock" | ||
86 | - if NEW_FORMATTING: | ||
87 | + if NEWEST_FORMATTING: | ||
88 | + msg = "expected call not found.\nExpected: {0}()\n Actual: not called." | ||
89 | + elif NEW_FORMATTING: | ||
90 | msg = "expected call not found.\nExpected: {0}()\nActual: not called." | ||
91 | else: | ||
92 | msg = "Expected call: {0}()\nNot called" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest b/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest index 8d2017d39..51ae892b0 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest +++ b/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest | |||
@@ -1,3 +1,3 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | # see https://github.com/pytest-dev/pytest-mock/issues/102 for reasons to use plain asserts | |
3 | pytest --automake | 3 | pytest --automake --assert=plain |
diff --git a/meta-python/recipes-devtools/python/python3-pytest-mock_3.12.0.bb b/meta-python/recipes-devtools/python/python3-pytest-mock_3.14.0.bb index e9a9a4fbc..b968cf1cd 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-mock_3.12.0.bb +++ b/meta-python/recipes-devtools/python/python3-pytest-mock_3.14.0.bb | |||
@@ -5,28 +5,27 @@ LIC_FILES_CHKSUM = " \ | |||
5 | file://LICENSE;md5=b2ddb1e69238461b7e4ef2a84d874109 \ | 5 | file://LICENSE;md5=b2ddb1e69238461b7e4ef2a84d874109 \ |
6 | " | 6 | " |
7 | 7 | ||
8 | SRC_URI = " \ | 8 | SRC_URI += " \ |
9 | git://github.com/pytest-dev/pytest-mock;branch=main;protocol=https \ | ||
10 | file://run-ptest \ | 9 | file://run-ptest \ |
11 | file://0001-test_pytest_mock-skip-args-introspection-tests.patch \ | ||
12 | file://403.patch \ | ||
13 | " | 10 | " |
14 | SRCREV = "69adc6f76c1a7baf4e7a728da9eec38741d5783e" | 11 | SRC_URI[sha256sum] = "2719255a1efeceadbc056d6bf3df3d1c5015530fb40cf347c0f9afac88410bd0" |
15 | 12 | ||
16 | inherit setuptools3 ptest | 13 | inherit pypi python_setuptools_build_meta ptest |
14 | |||
15 | PYPI_PACKAGE = "pytest-mock" | ||
17 | 16 | ||
18 | DEPENDS += "python3-setuptools-scm-native" | 17 | DEPENDS += "python3-setuptools-scm-native" |
19 | 18 | ||
20 | RDEPENDS:${PN} += " \ | 19 | RDEPENDS:${PN}-ptest += " \ |
21 | python3-asyncio \ | 20 | python3-misc \ |
21 | python3-mock \ | ||
22 | python3-pytest \ | 22 | python3-pytest \ |
23 | python3-pytest-asyncio \ | 23 | python3-pytest-asyncio \ |
24 | python3-unittest \ | 24 | python3-threading \ |
25 | python3-tox \ | ||
25 | python3-unittest-automake-output \ | 26 | python3-unittest-automake-output \ |
26 | " | 27 | " |
27 | 28 | ||
28 | S = "${WORKDIR}/git" | ||
29 | |||
30 | do_install_ptest() { | 29 | do_install_ptest() { |
31 | install -d ${D}${PTEST_PATH}/tests | 30 | install -d ${D}${PTEST_PATH}/tests |
32 | cp -rf ${S}/tests ${D}${PTEST_PATH}/ | 31 | cp -rf ${S}/tests ${D}${PTEST_PATH}/ |
diff --git a/meta-python/recipes-devtools/python/python3-pytest-runner_6.0.1.bb b/meta-python/recipes-devtools/python/python3-pytest-runner_6.0.1.bb new file mode 100644 index 000000000..e5e5e048b --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pytest-runner_6.0.1.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | SUMMARY = "Invoke py.test as distutils command with dependency resolution" | ||
2 | HOMEPAGE = "https://pypi.org/project/pytest-runner/" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" | ||
5 | |||
6 | SRC_URI[sha256sum] = "70d4739585a7008f37bf4933c013fdb327b8878a5a69fcbb3316c88882f0f49b" | ||
7 | |||
8 | inherit pypi python_setuptools_build_meta | ||
9 | |||
10 | DEPENDS += " \ | ||
11 | python3-setuptools-scm-native" | ||
12 | |||
13 | RDEPENDS:${PN} = "python3-setuptools python3-debugger python3-json python3-io" | ||
14 | |||
15 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pytest-timeout_2.3.1.bb b/meta-python/recipes-devtools/python/python3-pytest-timeout_2.3.1.bb index b56c26aad..fe9d814c0 100644 --- a/meta-python/recipes-devtools/python/python3-pytest-timeout_2.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-pytest-timeout_2.3.1.bb | |||
@@ -3,10 +3,8 @@ HOMEPAGE = "https://github.com/pytest-dev/pytest-timeout/" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d8048cd156eda3df2e7f111b0ae9ceff" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d8048cd156eda3df2e7f111b0ae9ceff" |
5 | 5 | ||
6 | PYPI_PACKAGE = "pytest-timeout" | ||
7 | |||
8 | SRC_URI[sha256sum] = "12397729125c6ecbdaca01035b9e5239d4db97352320af155b3f5de1ba5165d9" | 6 | SRC_URI[sha256sum] = "12397729125c6ecbdaca01035b9e5239d4db97352320af155b3f5de1ba5165d9" |
9 | 7 | ||
10 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
11 | 9 | ||
12 | RDEPENDS:${PN} = "python3-pytest" | 10 | RDEPENDS:${PN} = "python3-pytest" |
diff --git a/meta-python/recipes-devtools/python/python3-python-multipart_0.0.10.bb b/meta-python/recipes-devtools/python/python3-python-multipart_0.0.10.bb new file mode 100644 index 000000000..df52f7a35 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-python-multipart_0.0.10.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | SUMMARY = "A streaming multipart parser for Python" | ||
2 | LICENSE = "Apache-2.0" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3d98f0d58b28321924a89ab60c82410e" | ||
4 | |||
5 | SRC_URI[sha256sum] = "46eb3c6ce6fdda5fb1a03c7e11d490e407c6930a2703fe7aef4da71c374688fa" | ||
6 | |||
7 | inherit pypi python_hatchling | ||
8 | |||
9 | PYPI_PACKAGE = "python_multipart" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb b/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb index 0911b63ed..a44fdad3f 100644 --- a/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb +++ b/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | |||
5 | 5 | ||
6 | SRC_URI[sha256sum] = "2e945427a21674893bb97632401db62139d91cea1ee96137cc7b07ad22198fc7" | 6 | SRC_URI[sha256sum] = "2e945427a21674893bb97632401db62139d91cea1ee96137cc7b07ad22198fc7" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
10 | do_configure:prepend() { | 10 | do_configure:prepend() { |
11 | sed -i "/import pyudev/d" ${S}/setup.py | 11 | sed -i "/import pyudev/d" ${S}/setup.py |
diff --git a/meta-python/recipes-devtools/python/python3-pyunormalize_15.1.0.bb b/meta-python/recipes-devtools/python/python3-pyunormalize_16.0.0.bb index 6992ca24c..19463bc22 100644 --- a/meta-python/recipes-devtools/python/python3-pyunormalize_15.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyunormalize_16.0.0.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | SUMMARY = "Unicode normalization forms (NFC, NFKC, NFD, NFKD). A library independent from the Python core Unicode database." | 1 | SUMMARY = "Unicode normalization forms (NFC, NFKC, NFD, NFKD). A library independent from the Python core Unicode database." |
2 | HOMEPAGE = "https://github.com/mlodewijck/pyunormalize" | 2 | HOMEPAGE = "https://github.com/mlodewijck/pyunormalize" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dc15b678c3bac1f5b2c873591a330eae" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c2ee871081d4e4c24f32e37c413c73" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "cf4a87451a0f1cb76911aa97f432f4579e1f564a2f0c84ce488c73a73901b6c1" | 6 | SRC_URI[sha256sum] = "2e1dfbb4a118154ae26f70710426a52a364b926c9191f764601f5a8cb12761f7" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
diff --git a/meta-python/recipes-devtools/python/python3-pyyaml-include_2.1.bb b/meta-python/recipes-devtools/python/python3-pyyaml-include_2.1.bb index 30dde5907..058699fdf 100644 --- a/meta-python/recipes-devtools/python/python3-pyyaml-include_2.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyyaml-include_2.1.bb | |||
@@ -23,6 +23,9 @@ RDEPENDS:${PN} += " \ | |||
23 | python3-pyyaml \ | 23 | python3-pyyaml \ |
24 | " | 24 | " |
25 | RDEPENDS:${PN}-ptest += " \ | 25 | RDEPENDS:${PN}-ptest += " \ |
26 | python3-fsspec \ | ||
27 | python3-aiohttp \ | ||
28 | python3-requests \ | ||
26 | python3-pytest \ | 29 | python3-pytest \ |
27 | python3-unittest-automake-output \ | 30 | python3-unittest-automake-output \ |
28 | " | 31 | " |
diff --git a/meta-python/recipes-devtools/python/python3-pyzstd_0.16.0.bb b/meta-python/recipes-devtools/python/python3-pyzstd_0.16.1.bb index 77459c1c5..a4aae4aca 100644 --- a/meta-python/recipes-devtools/python/python3-pyzstd_0.16.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyzstd_0.16.1.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aedb5a2679cd1552fb61c181ef974b9e" | |||
8 | 8 | ||
9 | PYPI_PACKAGE = "pyzstd" | 9 | PYPI_PACKAGE = "pyzstd" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "fd43a0ae38ae15223fb1057729001829c3336e90f4acf04cf12ebdec33346658" | 11 | SRC_URI[sha256sum] = "ed50c08233878c155c73ab2622e115cd9e46c0f1c2e2ddd76f2e7ca24933f195" |
12 | 12 | ||
13 | inherit pypi setuptools3 | 13 | inherit pypi setuptools3 |
14 | 14 | ||
diff --git a/meta-python/recipes-devtools/python/python3-qface_2.0.8.bb b/meta-python/recipes-devtools/python/python3-qface_2.0.11.bb index 8ad61ab12..9ecaf5698 100644 --- a/meta-python/recipes-devtools/python/python3-qface_2.0.8.bb +++ b/meta-python/recipes-devtools/python/python3-qface_2.0.11.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "A generator framework based on a common modern IDL" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5" |
4 | 4 | ||
5 | SRC_URI[sha256sum] = "eccee7dbc4290c5a4e394df8d527f39148e0de0ff22c6b260f48c48f12b3beb4" | 5 | SRC_URI[sha256sum] = "b55c239f3ae7e23c5c8434f38901c5bcacb6afd17e88e37934b46e44558df295" |
6 | 6 | ||
7 | inherit pypi setuptools3 | 7 | inherit pypi setuptools3 |
8 | 8 | ||
diff --git a/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb b/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb index 204f4ecee..49cf62860 100644 --- a/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb +++ b/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb | |||
@@ -3,10 +3,9 @@ SECTION = "devel/python" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4b802d2a65df4626623c79757f486af9" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4b802d2a65df4626623c79757f486af9" |
5 | 5 | ||
6 | PYPI_PACKAGE = "qrcode" | ||
7 | SRC_URI[sha256sum] = "9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b30f5845" | 6 | SRC_URI[sha256sum] = "9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b30f5845" |
8 | 7 | ||
9 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
10 | 9 | ||
11 | RDEPENDS:${PN} = " \ | 10 | RDEPENDS:${PN} = " \ |
12 | python3-six \ | 11 | python3-six \ |
diff --git a/meta-python/recipes-devtools/python/python3-rapidjson_1.17.bb b/meta-python/recipes-devtools/python/python3-rapidjson_1.19.bb index d7a56b051..bfc05a735 100644 --- a/meta-python/recipes-devtools/python/python3-rapidjson_1.17.bb +++ b/meta-python/recipes-devtools/python/python3-rapidjson_1.19.bb | |||
@@ -2,9 +2,9 @@ SUMMARY = "Python wrapper around rapidjson" | |||
2 | HOMEPAGE = "https://github.com/python-rapidjson/python-rapidjson" | 2 | HOMEPAGE = "https://github.com/python-rapidjson/python-rapidjson" |
3 | 3 | ||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4daf3929156304df67003c33274a98bd" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6fe0b2465366662d7cfa6793ccbab563" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "95a111da29d996af8549f8b32ec701dab3af2ab7c6cd9c79540391ecb05f20c8" | 7 | SRC_URI[sha256sum] = "81e7260f6297cad564389b700783c0a33de71310b9eb01fd013faec5e7ed4eff" |
8 | 8 | ||
9 | # Inheriting ptest provides functionality for packaging and installing runtime tests for this recipe | 9 | # Inheriting ptest provides functionality for packaging and installing runtime tests for this recipe |
10 | inherit setuptools3 pypi ptest | 10 | inherit setuptools3 pypi ptest |
diff --git a/meta-python/recipes-devtools/python/python3-redis_5.0.4.bb b/meta-python/recipes-devtools/python/python3-redis_5.0.8.bb index 506e3bc1a..1dddd04bc 100644 --- a/meta-python/recipes-devtools/python/python3-redis_5.0.4.bb +++ b/meta-python/recipes-devtools/python/python3-redis_5.0.8.bb | |||
@@ -4,7 +4,10 @@ HOMEPAGE = "http://github.com/andymccurdy/redis-py" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=609ded3add9111c4c6e102f1d421d3f8" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=609ded3add9111c4c6e102f1d421d3f8" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "ec31f2ed9675cc54c21ba854cfe0462e6faf1d83c8ce5944709db8a4700b9c61" | 7 | # Prefix archive to avoid clashing with the main redis archives |
8 | PYPI_ARCHIVE_NAME_PREFIX="pypi-" | ||
9 | |||
10 | SRC_URI[sha256sum] = "0c5b10d387568dfe0698c6fad6615750c24170e548ca2deac10c649d463e9870" | ||
8 | 11 | ||
9 | inherit pypi setuptools3 | 12 | inherit pypi setuptools3 |
10 | 13 | ||
diff --git a/meta-python/recipes-devtools/python/python3-regex_2024.5.15.bb b/meta-python/recipes-devtools/python/python3-regex_2024.9.11.bb index 9d356553b..8fbae0cdc 100644 --- a/meta-python/recipes-devtools/python/python3-regex_2024.5.15.bb +++ b/meta-python/recipes-devtools/python/python3-regex_2024.9.11.bb | |||
@@ -3,9 +3,9 @@ HOMEPAGE = "https://bitbucket.org/mrabarnett/mrab-regex/src" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" |
5 | 5 | ||
6 | inherit pypi setuptools3 | 6 | inherit pypi python_setuptools_build_meta |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "d3ee02d9e5f482cc8309134a91eeaacbdd2261ba111b0fef3748eeb4913e6a2c" | 8 | SRC_URI[sha256sum] = "6c188c307e8433bcb63dc1915022deb553b4203a70722fc542c363bf120a01fd" |
9 | 9 | ||
10 | RDEPENDS:${PN} += " \ | 10 | RDEPENDS:${PN} += " \ |
11 | python3-stringold \ | 11 | python3-stringold \ |
diff --git a/meta-python/recipes-devtools/python/python3-responses_0.25.0.bb b/meta-python/recipes-devtools/python/python3-responses_0.25.3.bb index f4b59c750..50835883d 100644 --- a/meta-python/recipes-devtools/python/python3-responses_0.25.0.bb +++ b/meta-python/recipes-devtools/python/python3-responses_0.25.3.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e601511a8517f4daf688a8eb95be7a2" | |||
5 | 5 | ||
6 | inherit pypi setuptools3 | 6 | inherit pypi setuptools3 |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "01ae6a02b4f34e39bffceb0fc6786b67a25eae919c6368d05eabc8d9576c2a66" | 8 | SRC_URI[sha256sum] = "617b9247abd9ae28313d57a75880422d55ec63c29d33d629697590a034358dba" |
9 | 9 | ||
10 | RDEPENDS:${PN} += " \ | 10 | RDEPENDS:${PN} += " \ |
11 | python3-mock \ | 11 | python3-mock \ |
diff --git a/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb b/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb new file mode 100644 index 000000000..e374979cb --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb | |||
@@ -0,0 +1,24 @@ | |||
1 | SUMMARY = "Pure python rfc3986 validator" | ||
2 | HOMEPAGE = "https://github.com/naimetti/rfc3986-validator" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a21b13b5a996f08f7e0b088aa38ce9c6" | ||
5 | |||
6 | FILESEXTRAPATHS:prepend := "${THISDIR}/python-rfc3986-validator:" | ||
7 | |||
8 | SRC_URI[md5sum] = "47f7657b790aaf6011a1ab3d86c6be95" | ||
9 | SRC_URI[sha256sum] = "3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055" | ||
10 | |||
11 | PYPI_PACKAGE = "rfc3986_validator" | ||
12 | UPSTREAM_CHECK_REGEX = "/rfc3986-validator/(?P<pver>(\d+[\.\-_]*)+)/" | ||
13 | |||
14 | inherit pypi setuptools3 | ||
15 | |||
16 | SRC_URI += "\ | ||
17 | file://0001-setup.py-move-pytest-runner-to-test_requirements.patch \ | ||
18 | " | ||
19 | |||
20 | RDEPENDS:${PN} += "\ | ||
21 | python3-core \ | ||
22 | " | ||
23 | |||
24 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python/python3-robotframework_7.0.bb b/meta-python/recipes-devtools/python/python3-robotframework_7.1.bb index beb71e6a1..979aba681 100644 --- a/meta-python/recipes-devtools/python/python3-robotframework_7.0.bb +++ b/meta-python/recipes-devtools/python/python3-robotframework_7.1.bb | |||
@@ -13,7 +13,7 @@ inherit pypi setuptools3 | |||
13 | 13 | ||
14 | PYPI_PACKAGE_EXT = "zip" | 14 | PYPI_PACKAGE_EXT = "zip" |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "04623f758346c917db182e17591ffa474090560c02ed5a64343902e72b7b4bd5" | 16 | SRC_URI[sha256sum] = "34796d387e182b36f05d82f3bbc802bd6a30192ebf1e03c76d2086d0d04faaff" |
17 | 17 | ||
18 | RDEPENDS:${PN} += " \ | 18 | RDEPENDS:${PN} += " \ |
19 | python3-shell \ | 19 | python3-shell \ |
diff --git a/meta-python/recipes-devtools/python/python3-scikit-build_0.17.6.bb b/meta-python/recipes-devtools/python/python3-scikit-build_0.18.1.bb index dde0941ef..eacd67a05 100644 --- a/meta-python/recipes-devtools/python/python3-scikit-build_0.17.6.bb +++ b/meta-python/recipes-devtools/python/python3-scikit-build_0.18.1.bb | |||
@@ -8,7 +8,7 @@ PYPI_PACKAGE = "scikit_build" | |||
8 | 8 | ||
9 | inherit pypi python_hatchling | 9 | inherit pypi python_hatchling |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "b51a51a36b37c42650994b5047912f59b22e3210b23e321f287611f9ef6e5c9d" | 11 | SRC_URI[sha256sum] = "a4152ac5a084d499c28a7797be0628d8366c336e2fb0e1a063eb32e55efcb8e7" |
12 | 12 | ||
13 | RDEPENDS:${PN} = " \ | 13 | RDEPENDS:${PN} = " \ |
14 | python3-distro \ | 14 | python3-distro \ |
diff --git a/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb b/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb index 19ac3f67f..a7a20707e 100644 --- a/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb +++ b/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb | |||
@@ -4,11 +4,9 @@ SECTION = "devel/python" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a23813181e06852d377bc25ae5563a97" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a23813181e06852d377bc25ae5563a97" |
6 | 6 | ||
7 | PYPI_PACKAGE = "screeninfo" | ||
8 | |||
9 | SRC_URI[sha256sum] = "9983076bcc7e34402a1a9e4d7dabf3729411fd2abb3f3b4be7eba73519cd2ed1" | 7 | SRC_URI[sha256sum] = "9983076bcc7e34402a1a9e4d7dabf3729411fd2abb3f3b4be7eba73519cd2ed1" |
10 | 8 | ||
11 | inherit pypi setuptools3 | 9 | inherit pypi python_poetry_core |
12 | 10 | ||
13 | RDEPENDS:${PN} += "\ | 11 | RDEPENDS:${PN} += "\ |
14 | python3-core \ | 12 | python3-core \ |
diff --git a/meta-python/recipes-devtools/python/python3-serpent_1.41.bb b/meta-python/recipes-devtools/python/python3-serpent_1.41.bb index 941b5ee0f..9265081fd 100644 --- a/meta-python/recipes-devtools/python/python3-serpent_1.41.bb +++ b/meta-python/recipes-devtools/python/python3-serpent_1.41.bb | |||
@@ -9,8 +9,10 @@ inherit pypi ptest setuptools3 | |||
9 | SRC_URI += " \ | 9 | SRC_URI += " \ |
10 | file://run-ptest \ | 10 | file://run-ptest \ |
11 | " | 11 | " |
12 | 12 | # python3-misc for timeit.py | |
13 | RDEPENDS:${PN}-ptest += " \ | 13 | RDEPENDS:${PN}-ptest += " \ |
14 | python3-attrs \ | ||
15 | python3-misc \ | ||
14 | python3-pytest \ | 16 | python3-pytest \ |
15 | python3-pytz \ | 17 | python3-pytz \ |
16 | python3-unittest-automake-output \ | 18 | python3-unittest-automake-output \ |
diff --git a/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb b/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb index 006fae290..a1d6a3c0d 100644 --- a/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8a0f079f4e6a215d6bd6f9d97cab4d5f" | |||
7 | SRC_URI[md5sum] = "5e5c195d8fcedc72f9068be2ad9b5a13" | 7 | SRC_URI[md5sum] = "5e5c195d8fcedc72f9068be2ad9b5a13" |
8 | SRC_URI[sha256sum] = "6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34" | 8 | SRC_URI[sha256sum] = "6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34" |
9 | 9 | ||
10 | inherit pypi setuptools3 ptest | 10 | inherit pypi python_setuptools_build_meta ptest |
11 | 11 | ||
12 | SRC_URI += " \ | 12 | SRC_URI += " \ |
13 | file://run-ptest \ | 13 | file://run-ptest \ |
@@ -20,7 +20,9 @@ RDEPENDS:${PN} += " \ | |||
20 | " | 20 | " |
21 | 21 | ||
22 | RDEPENDS:${PN}-ptest += " \ | 22 | RDEPENDS:${PN}-ptest += " \ |
23 | python3-attrs \ | ||
23 | python3-pytest \ | 24 | python3-pytest \ |
25 | python3-six \ | ||
24 | python3-unittest-automake-output \ | 26 | python3-unittest-automake-output \ |
25 | python3-pyopenssl \ | 27 | python3-pyopenssl \ |
26 | " | 28 | " |
diff --git a/meta-python/recipes-devtools/python/python3-setproctitle/run-ptest b/meta-python/recipes-devtools/python/python3-setproctitle/run-ptest new file mode 100644 index 000000000..e29e57ee3 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-setproctitle/run-ptest | |||
@@ -0,0 +1,4 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # https://github.com/dvarrazzo/py-setproctitle/issues/141 | ||
4 | pytest --automake -k 'not test_unicode' | ||
diff --git a/meta-python/recipes-devtools/python/python3-setproctitle_1.3.3.bb b/meta-python/recipes-devtools/python/python3-setproctitle_1.3.3.bb new file mode 100644 index 000000000..d0373b46d --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-setproctitle_1.3.3.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | SUMMARY = "A Python module to customize the process title" | ||
2 | DESCRIPTION = "The setproctitle module allows a process to change its \ | ||
3 | title (as displayed by system tools such as ps, top or MacOS Activity \ | ||
4 | Monitor)." | ||
5 | HOMEPAGE = "https://github.com/dvarrazzo/py-setproctitle" | ||
6 | BUGTRACKER = "https://github.com/dvarrazzo/py-setproctitle/issues" | ||
7 | LICENSE = "BSD-3-Clause" | ||
8 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=86d2d41b5f4f023f43466f8cb7adebaa" | ||
9 | |||
10 | inherit pypi setuptools3 ptest | ||
11 | |||
12 | SRC_URI[sha256sum] = "c913e151e7ea01567837ff037a23ca8740192880198b7fbb90b16d181607caae" | ||
13 | |||
14 | SRC_URI += " \ | ||
15 | file://run-ptest \ | ||
16 | " | ||
17 | |||
18 | RDEPENDS:${PN}-ptest += "\ | ||
19 | packagegroup-core-buildessential \ | ||
20 | procps-ps \ | ||
21 | python3-dev \ | ||
22 | python3-multiprocessing \ | ||
23 | python3-pytest \ | ||
24 | python3-unittest-automake-output \ | ||
25 | " | ||
26 | |||
27 | do_install_ptest() { | ||
28 | install -d ${D}${PTEST_PATH}/tests | ||
29 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
30 | } | ||
31 | |||
32 | BBCLASSEXTEND = "native nativesdk" | ||
33 | |||
34 | INSANE_SKIP:${PN}-ptest = "dev-deps" | ||
diff --git a/meta-python/recipes-devtools/python/python3-simplejson_3.19.2.bb b/meta-python/recipes-devtools/python/python3-simplejson_3.19.3.bb index cc5b1bc90..094efcd8a 100644 --- a/meta-python/recipes-devtools/python/python3-simplejson_3.19.2.bb +++ b/meta-python/recipes-devtools/python/python3-simplejson_3.19.3.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c6338d7abd321c0b50a2a547e441c52e" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c6338d7abd321c0b50a2a547e441c52e" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "9eb442a2442ce417801c912df68e1f6ccfcd41577ae7274953ab3ad24ef7d82c" | 7 | SRC_URI[sha256sum] = "8e086896c36210ab6050f2f9f095a5f1e03c83fa0e7f296d6cba425411364680" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb b/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb index b54cdb005..779562d04 100644 --- a/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb +++ b/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Drop-in replacement for smbus-cffi/smbus-python in pure Python" | |||
2 | DESCRIPTION = "smbus2 is a drop-in replacement for smbus-cffi/smbus-python in pure Python" | 2 | DESCRIPTION = "smbus2 is a drop-in replacement for smbus-cffi/smbus-python in pure Python" |
3 | HOMEPAGE = "https://github.com/kplindegaard/smbus2" | 3 | HOMEPAGE = "https://github.com/kplindegaard/smbus2" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2a3eca2de44816126b3c6f33811a9fba" |
6 | 6 | ||
7 | inherit pypi setuptools3 | 7 | inherit pypi setuptools3 |
8 | 8 | ||
diff --git a/meta-python/recipes-devtools/python/python3-sniffio_1.3.0.bb b/meta-python/recipes-devtools/python/python3-sniffio_1.3.1.bb index 448ac34f5..82c457c39 100644 --- a/meta-python/recipes-devtools/python/python3-sniffio_1.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-sniffio_1.3.1.bb | |||
@@ -7,6 +7,15 @@ LIC_FILES_CHKSUM = "\ | |||
7 | file://LICENSE.APACHE2;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 7 | file://LICENSE.APACHE2;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
8 | " | 8 | " |
9 | 9 | ||
10 | inherit pypi setuptools3 | 10 | inherit pypi python_setuptools_build_meta |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101" | 12 | SRC_URI[sha256sum] = "f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc" |
13 | |||
14 | DEPENDS += "\ | ||
15 | python3-setuptools-scm-native \ | ||
16 | " | ||
17 | |||
18 | RDEPENDS:${PN} += " \ | ||
19 | python3-numbers \ | ||
20 | python3-core \ | ||
21 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-soupsieve_2.5.bb b/meta-python/recipes-devtools/python/python3-soupsieve_2.6.bb index d26a13dfb..6572a6845 100644 --- a/meta-python/recipes-devtools/python/python3-soupsieve_2.5.bb +++ b/meta-python/recipes-devtools/python/python3-soupsieve_2.6.bb | |||
@@ -2,15 +2,20 @@ SUMMARY = "CSS selector library for python-beautifulsoup4" | |||
2 | HOMEPAGE = "https://github.com/facelessuser/soupsieve" | 2 | HOMEPAGE = "https://github.com/facelessuser/soupsieve" |
3 | 3 | ||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=520586fa71ed2cbda50b4a8c89621e09" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bdfa4c8e8b6830bcf8e78cba1669e4d" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690" | 7 | SRC_URI[sha256sum] = "e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb" |
8 | 8 | ||
9 | inherit pypi python_hatchling python_setuptools_build_meta ptest | 9 | inherit pypi python_hatchling python_setuptools_build_meta ptest |
10 | 10 | ||
11 | SRC_URI += " \ | 11 | SRC_URI += " \ |
12 | file://run-ptest \ | 12 | file://run-ptest \ |
13 | " | 13 | " |
14 | RDEPENDS:${PN} += " \ | ||
15 | python3-core \ | ||
16 | python3-datetime \ | ||
17 | python3-beautifulsoup4 \ | ||
18 | " | ||
14 | 19 | ||
15 | RDEPENDS:${PN}-ptest += " \ | 20 | RDEPENDS:${PN}-ptest += " \ |
16 | python3-beautifulsoup4 \ | 21 | python3-beautifulsoup4 \ |
diff --git a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.30.bb b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.32.bb index 1a42aa1b4..bb319d566 100644 --- a/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.30.bb +++ b/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.32.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c78b979ae6c20775a28a287d32092cbb" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c78b979ae6c20775a28a287d32092cbb" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "2b1708916730f4830bc69d6f49d37f7698b5bd7530aca7f04f785f8849e95255" | 7 | SRC_URI[sha256sum] = "c1b88cc8b02b6a5f0efb0345a03672d4c897dc7d92585176f88c67346f565ea8" |
8 | 8 | ||
9 | PYPI_PACKAGE = "SQLAlchemy" | 9 | PYPI_PACKAGE = "SQLAlchemy" |
10 | inherit pypi setuptools3 | 10 | inherit pypi setuptools3 |
diff --git a/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch b/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch deleted file mode 100644 index 0c9f29a6b..000000000 --- a/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From f236a30dc8528b6f114201580f1efdcc1c447d43 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Mon, 9 Mar 2020 13:10:37 +0800 | ||
4 | Subject: [PATCH] sqlparse: change shebang to python3 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Don't send upstream since upstream still support python2, | ||
9 | we can only make this change after python2 is offcially | ||
10 | dropped. | ||
11 | |||
12 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
13 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
14 | --- | ||
15 | sqlparse/__main__.py | 2 +- | ||
16 | sqlparse/cli.py | 2 +- | ||
17 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/sqlparse/__main__.py b/sqlparse/__main__.py | ||
20 | index 2bf2513..6a3a115 100644 | ||
21 | --- a/sqlparse/__main__.py | ||
22 | +++ b/sqlparse/__main__.py | ||
23 | @@ -1,4 +1,4 @@ | ||
24 | -#!/usr/bin/env python | ||
25 | +#!/usr/bin/env python3 | ||
26 | # | ||
27 | # Copyright (C) 2009-2020 the sqlparse authors and contributors | ||
28 | # <see AUTHORS file> | ||
29 | diff --git a/sqlparse/cli.py b/sqlparse/cli.py | ||
30 | index 7a8aacb..9c727e8 100755 | ||
31 | --- a/sqlparse/cli.py | ||
32 | +++ b/sqlparse/cli.py | ||
33 | @@ -1,4 +1,4 @@ | ||
34 | -#!/usr/bin/env python | ||
35 | +#!/usr/bin/env python3 | ||
36 | # | ||
37 | # Copyright (C) 2009-2020 the sqlparse authors and contributors | ||
38 | # <see AUTHORS file> | ||
39 | -- | ||
40 | 2.41.0 | ||
41 | |||
diff --git a/meta-python/recipes-devtools/python/python3-sqlparse_0.4.4.bb b/meta-python/recipes-devtools/python/python3-sqlparse_0.5.1.bb index c04971ee8..daf67607f 100644 --- a/meta-python/recipes-devtools/python/python3-sqlparse_0.4.4.bb +++ b/meta-python/recipes-devtools/python/python3-sqlparse_0.5.1.bb | |||
@@ -4,18 +4,19 @@ SECTION = "devel/python" | |||
4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" |
6 | 6 | ||
7 | SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch \ | 7 | SRC_URI:append = " \ |
8 | file://run-ptest \ | 8 | file://run-ptest \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c" | 11 | SRC_URI[sha256sum] = "bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e" |
12 | 12 | ||
13 | export BUILD_SYS | 13 | export BUILD_SYS |
14 | export HOST_SYS | 14 | export HOST_SYS |
15 | 15 | ||
16 | inherit pypi ptest python_flit_core | 16 | inherit pypi ptest python_hatchling |
17 | 17 | ||
18 | RDEPENDS:${PN}-ptest += " \ | 18 | RDEPENDS:${PN}-ptest += "\ |
19 | python3-mypy \ | ||
19 | python3-pytest \ | 20 | python3-pytest \ |
20 | python3-unittest-automake-output \ | 21 | python3-unittest-automake-output \ |
21 | python3-unixadmin \ | 22 | python3-unixadmin \ |
diff --git a/meta-python/recipes-devtools/python/python3-starlette/run-ptest b/meta-python/recipes-devtools/python/python3-starlette/run-ptest new file mode 100644 index 000000000..09bdf7ced --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-starlette/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | pytest --automake --forked --deselect tests/test_staticfiles.py::test_staticfiles_with_invalid_dir_permissions_returns_401 | ||
diff --git a/meta-python/recipes-devtools/python/python3-starlette_0.39.0.bb b/meta-python/recipes-devtools/python/python3-starlette_0.39.0.bb new file mode 100644 index 000000000..c4b3d9916 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-starlette_0.39.0.bb | |||
@@ -0,0 +1,41 @@ | |||
1 | SUMMARY = "Starlette is a lightweight ASGI framework/toolkit, which is ideal for building async web services in Python" | ||
2 | LICENSE = "BSD-3-Clause" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=11e8c8dbfd5fa373c703de492140ff7a" | ||
4 | |||
5 | SRC_URI[sha256sum] = "b35acedae74e95967dd9c0a47b45f5803dcd8973d0d95c18c1abb184845ba42c" | ||
6 | |||
7 | inherit pypi python_hatchling ptest | ||
8 | |||
9 | PYPI_PACKAGE = "starlette" | ||
10 | |||
11 | SRC_URI += " \ | ||
12 | file://run-ptest \ | ||
13 | " | ||
14 | |||
15 | RDEPENDS:${PN}-ptest += " \ | ||
16 | python3-attrs \ | ||
17 | python3-ctypes \ | ||
18 | python3-httpx \ | ||
19 | python3-itsdangerous \ | ||
20 | python3-jinja2 \ | ||
21 | python3-outcome \ | ||
22 | python3-pytest \ | ||
23 | python3-pytest-asyncio \ | ||
24 | python3-pytest-forked \ | ||
25 | python3-python-multipart \ | ||
26 | python3-sortedcontainers \ | ||
27 | python3-terminal \ | ||
28 | python3-trio \ | ||
29 | python3-typing-extensions \ | ||
30 | python3-unittest-automake-output \ | ||
31 | python3-pyyaml \ | ||
32 | " | ||
33 | |||
34 | do_install_ptest() { | ||
35 | install -d ${D}${PTEST_PATH}/tests | ||
36 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
37 | } | ||
38 | |||
39 | RDEPENDS:${PN} += " \ | ||
40 | python3-anyio \ | ||
41 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-sympy_1.12.1.bb b/meta-python/recipes-devtools/python/python3-sympy_1.13.2.bb index 2bdaf8ed2..02577964c 100644 --- a/meta-python/recipes-devtools/python/python3-sympy_1.12.1.bb +++ b/meta-python/recipes-devtools/python/python3-sympy_1.13.2.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/sympy/" | |||
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ea48085d7dff75b49271b25447e8cdca" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ea48085d7dff75b49271b25447e8cdca" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "2877b03f998cd8c08f07cd0de5b767119cd3ef40d09f41c30d722f6686b0fb88" | 6 | SRC_URI[sha256sum] = "401449d84d07be9d0c7a46a64bd54fe097667d5e7181bfe67ec777be9e01cb13" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-term_2.5.bb b/meta-python/recipes-devtools/python/python3-term_2.5.bb index 7d508ad80..fe0aabf0f 100644 --- a/meta-python/recipes-devtools/python/python3-term_2.5.bb +++ b/meta-python/recipes-devtools/python/python3-term_2.5.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d90e2d280a4836c607520383d1639be1" | |||
5 | 5 | ||
6 | SRC_URI[sha256sum] = "846fda941dbb8a7c9f246e99bf5ee731910fc4a4cc54b7e36457c133c9f6b78b" | 6 | SRC_URI[sha256sum] = "846fda941dbb8a7c9f246e99bf5ee731910fc4a4cc54b7e36457c133c9f6b78b" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
10 | RDEPENDS:${PN} = "\ | 10 | RDEPENDS:${PN} = "\ |
11 | python3-io \ | 11 | python3-io \ |
diff --git a/meta-python/recipes-devtools/python/python3-toml_0.10.2.bb b/meta-python/recipes-devtools/python/python3-toml_0.10.2.bb new file mode 100644 index 000000000..649464b96 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-toml_0.10.2.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | SUMMARY = "Python Library for Tom's Obvious, Minimal Language" | ||
2 | HOMEPAGE = "https://github.com/uiri/toml" | ||
3 | LICENSE = "MIT" | ||
4 | SECTION = "devel/python" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=16c77b2b1050d2f03cb9c2ed0edaf4f0" | ||
6 | |||
7 | SRC_URI[sha256sum] = "b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" | ||
8 | |||
9 | inherit pypi setuptools3 | ||
10 | |||
11 | BBCLASSEXTEND = "native nativesdk" | ||
12 | |||
13 | RDEPENDS:${PN} += " \ | ||
14 | python3-misc \ | ||
15 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-tomli_2.0.1.bb b/meta-python/recipes-devtools/python/python3-tomli_2.0.1.bb new file mode 100644 index 000000000..9401ed897 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-tomli_2.0.1.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "A lil' TOML parser" | ||
2 | DESCRIPTION = "Tomli is a Python library for parsing TOML. Tomli is fully \ | ||
3 | compatible with TOML v1.0.0." | ||
4 | HOMEPAGE = "https://github.com/hukkin/tomli" | ||
5 | BUGTRACKER = "https://github.com/hukkin/tomli/issues" | ||
6 | LICENSE = "MIT" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5" | ||
8 | |||
9 | inherit pypi python_flit_core | ||
10 | |||
11 | SRC_URI[sha256sum] = "de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" | ||
12 | |||
13 | BBCLASSEXTEND = "native nativesdk" | ||
14 | |||
15 | RDEPENDS:${PN} += " \ | ||
16 | python3-datetime \ | ||
17 | python3-stringold \ | ||
18 | " | ||
diff --git a/meta-python/recipes-devtools/python/python3-tomlkit_0.12.5.bb b/meta-python/recipes-devtools/python/python3-tomlkit_0.13.2.bb index f5612a18d..9fca14540 100644 --- a/meta-python/recipes-devtools/python/python3-tomlkit_0.12.5.bb +++ b/meta-python/recipes-devtools/python/python3-tomlkit_0.13.2.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/tomlkit/" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "eef34fba39834d4d6b73c9ba7f3e4d1c417a4e56f89a7e96e090dd0d24b8fb3c" | 6 | SRC_URI[sha256sum] = "fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79" |
7 | 7 | ||
8 | inherit pypi python_poetry_core ptest | 8 | inherit pypi python_poetry_core ptest |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-tox_4.15.0.bb b/meta-python/recipes-devtools/python/python3-tox_4.15.1.bb index 4296738ec..367fafab4 100644 --- a/meta-python/recipes-devtools/python/python3-tox_4.15.0.bb +++ b/meta-python/recipes-devtools/python/python3-tox_4.15.1.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "http://tox.readthedocs.org/" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "7a0beeef166fbe566f54f795b4906c31b428eddafc0102ac00d20998dd1933f6" | 9 | SRC_URI[sha256sum] = "53a092527d65e873e39213ebd4bd027a64623320b6b0326136384213f95b7076" |
10 | 10 | ||
11 | BBCLASSEXTEND = "native nativesdk" | 11 | BBCLASSEXTEND = "native nativesdk" |
12 | inherit pypi python_hatchling | 12 | inherit pypi python_hatchling |
diff --git a/meta-python/recipes-devtools/python/python3-tqdm_4.66.4.bb b/meta-python/recipes-devtools/python/python3-tqdm_4.66.5.bb index 485d24f52..409936d5c 100644 --- a/meta-python/recipes-devtools/python/python3-tqdm_4.66.4.bb +++ b/meta-python/recipes-devtools/python/python3-tqdm_4.66.5.bb | |||
@@ -5,7 +5,7 @@ SECTION = "devel/python" | |||
5 | LICENSE = "MIT & MPL-2.0" | 5 | LICENSE = "MIT & MPL-2.0" |
6 | LIC_FILES_CHKSUM = "file://LICENCE;md5=42dfa9e8c616dbc295df3f58d756b2a1" | 6 | LIC_FILES_CHKSUM = "file://LICENCE;md5=42dfa9e8c616dbc295df3f58d756b2a1" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "e4d936c9de8727928f3be6079590e97d9abfe8d39a590be678eb5919ffc186bb" | 8 | SRC_URI[sha256sum] = "e1020aef2e5096702d8a025ac7d16b1577279c9d63f8375b63083e9a5f0fcbad" |
9 | 9 | ||
10 | inherit pypi python_setuptools_build_meta | 10 | inherit pypi python_setuptools_build_meta |
11 | 11 | ||
diff --git a/meta-python/recipes-devtools/python/python3-transitions_0.9.1.bb b/meta-python/recipes-devtools/python/python3-transitions_0.9.2.bb index 5f1e3d9e2..3a27b666c 100644 --- a/meta-python/recipes-devtools/python/python3-transitions_0.9.1.bb +++ b/meta-python/recipes-devtools/python/python3-transitions_0.9.2.bb | |||
@@ -4,6 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=de0a0876a688a4483bfafa764773ab39" | |||
4 | 4 | ||
5 | inherit pypi setuptools3 | 5 | inherit pypi setuptools3 |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "3542c37108e93e2ae5f215208ec5732c94a772937854a102cd7345b967fee61b" | 7 | SRC_URI[sha256sum] = "2f8490dbdbd419366cef1516032ab06d07ccb5839ef54905e842a472692d4204" |
8 | 8 | ||
9 | RDEPENDS:${PN} += "python3-six python3-logging" | 9 | RDEPENDS:${PN} += "python3-six python3-logging" |
diff --git a/meta-python/recipes-devtools/python/python3-trio_0.26.2.bb b/meta-python/recipes-devtools/python/python3-trio_0.26.2.bb new file mode 100644 index 000000000..1272606f6 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-trio_0.26.2.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | SUMMARY = "A friendly Python library for async concurrency and I/O" | ||
2 | HOMEPAGE = "https://github.com/python-trio/trio" | ||
3 | LICENSE = "Apache-2.0 & MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=447ea202d14d2aee40d8a2c26c865da9 \ | ||
5 | file://LICENSE.APACHE2;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
6 | file://LICENSE.MIT;md5=5f229c828e5a6f0a2ce90c7d3c054721" | ||
7 | |||
8 | SRC_URI[sha256sum] = "0346c3852c15e5c7d40ea15972c4805689ef2cb8b5206f794c9c19450119f3a4" | ||
9 | |||
10 | inherit pypi python_setuptools_build_meta | ||
11 | |||
12 | PYPI_PACKAGE = "trio" | ||
13 | RDEPENDS:${PN} = "python3-idna python3-sniffio" | ||
diff --git a/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb b/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb index 21161a0e0..dab18f28b 100644 --- a/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb | |||
@@ -20,10 +20,12 @@ RDEPENDS:${PN} += " \ | |||
20 | " | 20 | " |
21 | 21 | ||
22 | RDEPENDS:${PN}-ptest += " \ | 22 | RDEPENDS:${PN}-ptest += " \ |
23 | python3-attrs \ | ||
23 | python3-pyopenssl \ | 24 | python3-pyopenssl \ |
24 | python3-pyasn1-modules \ | 25 | python3-pyasn1-modules \ |
25 | python3-pytest \ | 26 | python3-pytest \ |
26 | python3-service-identity \ | 27 | python3-service-identity \ |
28 | python3-six \ | ||
27 | python3-unittest-automake-output \ | 29 | python3-unittest-automake-output \ |
28 | " | 30 | " |
29 | 31 | ||
diff --git a/meta-python/recipes-devtools/python/python3-twine_5.1.0.bb b/meta-python/recipes-devtools/python/python3-twine_5.1.1.bb index 6a79d45d4..13ddc08cd 100644 --- a/meta-python/recipes-devtools/python/python3-twine_5.1.0.bb +++ b/meta-python/recipes-devtools/python/python3-twine_5.1.1.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://twine.readthedocs.io/" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "4d74770c88c4fcaf8134d2a6a9d863e40f08255ff7d8e2acb3cbbd57d25f6e9d" | 6 | SRC_URI[sha256sum] = "9aa0825139c02b3434d913545c7b847a21c835e11597f5255842d457da2322db" |
7 | 7 | ||
8 | inherit pypi python_setuptools_build_meta | 8 | inherit pypi python_setuptools_build_meta |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb b/meta-python/recipes-devtools/python/python3-twisted_24.7.0.bb index 336c17389..e0472d1d8 100644 --- a/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-twisted_24.7.0.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "https://twisted.org" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c5d2c2493b848f83864bdedd67bbf5" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c5d2c2493b848f83864bdedd67bbf5" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "6b38b6ece7296b5e122c9eb17da2eeab3d98a198f50ca9efd00fb03e5b4fd4ae" | 9 | SRC_URI[sha256sum] = "5a60147f044187a127ec7da96d170d49bcce50c6fd36f594e60f4587eff4d394" |
10 | 10 | ||
11 | inherit pypi python_hatchling | 11 | inherit pypi python_hatchling |
12 | 12 | ||
@@ -49,6 +49,7 @@ RDEPENDS:${PN} = "\ | |||
49 | 49 | ||
50 | RDEPENDS:${PN}-core = "python3-appdirs \ | 50 | RDEPENDS:${PN}-core = "python3-appdirs \ |
51 | python3-asyncio \ | 51 | python3-asyncio \ |
52 | python3-attrs \ | ||
52 | python3-automat \ | 53 | python3-automat \ |
53 | python3-constantly \ | 54 | python3-constantly \ |
54 | python3-core \ | 55 | python3-core \ |
diff --git a/meta-python/recipes-devtools/python/python3-typer/run-ptest b/meta-python/recipes-devtools/python/python3-typer/run-ptest index 94b40789b..94b6c0fc2 100644 --- a/meta-python/recipes-devtools/python/python3-typer/run-ptest +++ b/meta-python/recipes-devtools/python/python3-typer/run-ptest | |||
@@ -3,4 +3,5 @@ | |||
3 | # Ignore the test_tutorial and test_completion. | 3 | # Ignore the test_tutorial and test_completion. |
4 | # Because it needs the docs_src package what is not in Yocto. | 4 | # Because it needs the docs_src package what is not in Yocto. |
5 | # And the tests are not that useful for Yocto. | 5 | # And the tests are not that useful for Yocto. |
6 | pytest --automake --ignore tests/test_tutorial --ignore tests/test_completion | 6 | # for test_rich_markup_mode.py see https://github.com/fastapi/typer/pull/859/files/2cfd641d86a591a0d8582dec9292c03e6322a21a |
7 | pytest --automake --ignore tests/test_tutorial --ignore tests/test_completion --deselect tests/test_rich_markup_mode.py::test_rich_markup_mode_rich | ||
diff --git a/meta-python/recipes-devtools/python/python3-typer_0.12.3.bb b/meta-python/recipes-devtools/python/python3-typer_0.12.5.bb index cc8669c37..e175b5420 100644 --- a/meta-python/recipes-devtools/python/python3-typer_0.12.3.bb +++ b/meta-python/recipes-devtools/python/python3-typer_0.12.5.bb | |||
@@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/tiangolo/typer" | |||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=173d405eb704b1499218013178722617" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=173d405eb704b1499218013178722617" |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "49e73131481d804288ef62598d97a1ceef3058905aa536a1134f90891ba35482" | 10 | SRC_URI[sha256sum] = "f592f089bedcc8ec1b974125d64851029c3b1af145f04aca64d69410f0c9b722" |
11 | 11 | ||
12 | inherit pypi python_setuptools_build_meta ptest | 12 | inherit pypi python_setuptools_build_meta ptest |
13 | 13 | ||
diff --git a/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240516.bb b/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240516.bb deleted file mode 100644 index d0684ba93..000000000 --- a/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240516.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | SUMMARY = "Typing stubs for psutil" | ||
2 | HOMEPAGE = "https://github.com/python/typeshed" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1608a4a9c7b578e" | ||
5 | |||
6 | inherit pypi setuptools3 | ||
7 | |||
8 | SRC_URI[sha256sum] = "bb296f59fc56458891d0feb1994717e548a1bcf89936a2877df8792b822b4696" | ||
9 | |||
10 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-python/recipes-devtools/python/python3-types-psutil_6.0.0.20240901.bb b/meta-python/recipes-devtools/python/python3-types-psutil_6.0.0.20240901.bb new file mode 100644 index 000000000..331756e46 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-types-psutil_6.0.0.20240901.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | SUMMARY = "Typing stubs for psutil" | ||
2 | HOMEPAGE = "https://github.com/python/typeshed" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=c2d9643b4523fdf462545aeb1356ad23" | ||
5 | |||
6 | inherit pypi setuptools3 | ||
7 | |||
8 | SRC_URI[sha256sum] = "437affa76670363db9ffecfa4f153cc6900bf8a7072b3420f3bc07a593f92226" | ||
9 | |||
10 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240316.bb b/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240316.bb deleted file mode 100644 index 4b786066f..000000000 --- a/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240316.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | SUMMARY = "Typing stubs for python-dateutil" | ||
2 | HOMEPAGE = "https://github.com/python/typeshed" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1608a4a9c7b578e" | ||
5 | |||
6 | SRC_URI[sha256sum] = "5d2f2e240b86905e40944dd787db6da9263f0deabef1076ddaed797351ec0202" | ||
7 | |||
8 | inherit pypi setuptools3 | ||
diff --git a/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240906.bb b/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240906.bb new file mode 100644 index 000000000..5c3a47743 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240906.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | SUMMARY = "Typing stubs for python-dateutil" | ||
2 | HOMEPAGE = "https://github.com/python/typeshed" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=c2d9643b4523fdf462545aeb1356ad23" | ||
5 | |||
6 | SRC_URI[sha256sum] = "9706c3b68284c25adffc47319ecc7947e5bb86b3773f843c73906fd598bc176e" | ||
7 | |||
8 | inherit pypi setuptools3 | ||
diff --git a/meta-python/recipes-devtools/python/python3-types-setuptools_70.0.0.20240524.bb b/meta-python/recipes-devtools/python/python3-types-setuptools_70.0.0.20240524.bb deleted file mode 100644 index 781d3b5bb..000000000 --- a/meta-python/recipes-devtools/python/python3-types-setuptools_70.0.0.20240524.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | SUMMARY = "Typing stubs for setuptools" | ||
2 | HOMEPAGE = "https://github.com/python/typeshed" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1608a4a9c7b578e" | ||
5 | |||
6 | inherit pypi setuptools3 | ||
7 | |||
8 | SRC_URI[sha256sum] = "e31fee7b9d15ef53980526579ac6089b3ae51a005a281acf97178e90ac71aff6" | ||
9 | |||
10 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-python/recipes-devtools/python/python3-types-setuptools_73.0.0.20240822.bb b/meta-python/recipes-devtools/python/python3-types-setuptools_73.0.0.20240822.bb new file mode 100644 index 000000000..2eaa2d136 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-types-setuptools_73.0.0.20240822.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | SUMMARY = "Typing stubs for setuptools" | ||
2 | HOMEPAGE = "https://github.com/python/typeshed" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=c2d9643b4523fdf462545aeb1356ad23" | ||
5 | |||
6 | inherit pypi setuptools3 | ||
7 | |||
8 | SRC_URI[sha256sum] = "3a060681098eb3fbc2fea0a86f7f6af6aa1ca71906039d88d891ea2cecdd4dbf" | ||
9 | |||
10 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-python/recipes-devtools/python/python3-tzdata/run-ptest b/meta-python/recipes-devtools/python/python3-tzdata/run-ptest new file mode 100644 index 000000000..8d2017d39 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-tzdata/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | pytest --automake | ||
diff --git a/meta-python/recipes-devtools/python/python3-tzdata_2024.1.bb b/meta-python/recipes-devtools/python/python3-tzdata_2024.1.bb new file mode 100644 index 000000000..d81ded430 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-tzdata_2024.1.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | SUMMARY = "Provider of IANA time zone data" | ||
2 | HOMEPAGE = "https://github.com/python/tzdata" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fca9fd5c15a28eb874ba38577a585d48 \ | ||
5 | file://licenses/LICENSE_APACHE;md5=86d3f3a95c324c9479bd8986968f4327" | ||
6 | |||
7 | SRC_URI[sha256sum] = "2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd" | ||
8 | |||
9 | inherit pypi python_setuptools_build_meta | ||
10 | |||
11 | inherit ptest | ||
12 | |||
13 | SRC_URI += "file://run-ptest" | ||
14 | |||
15 | RDEPENDS:${PN}-ptest += "\ | ||
16 | python3-attrs \ | ||
17 | python3-pytest \ | ||
18 | python3-pytest-subtests \ | ||
19 | python3-unittest-automake-output \ | ||
20 | " | ||
21 | |||
22 | do_install_ptest() { | ||
23 | cp -rf ${S}/tests/ ${D}${PTEST_PATH}/ | ||
24 | install ${S}/VERSION ${D}${PTEST_PATH}/ | ||
25 | } | ||
diff --git a/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch b/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch deleted file mode 100644 index 8ba8ada55..000000000 --- a/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From aec3b64b0aaea0178b44ea65a204d76696e6a45e Mon Sep 17 00:00:00 2001 | ||
2 | From: Leon Anavi <leon.anavi@konsulko.com> | ||
3 | Date: Mon, 10 Jan 2022 14:04:28 +0200 | ||
4 | Subject: [PATCH] setup.py: Do not strip debugging symbols | ||
5 | |||
6 | Do not strip debugging symbols from Linux binaries to avoid | ||
7 | bitbake build errors related to already-stripped. | ||
8 | |||
9 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
10 | --- | ||
11 | Upstream-Status: Pending | ||
12 | |||
13 | setup.py | 8 +------- | ||
14 | 1 file changed, 1 insertion(+), 7 deletions(-) | ||
15 | |||
16 | diff --git a/setup.py b/setup.py | ||
17 | index b98963b..d42f07a 100644 | ||
18 | --- a/setup.py | ||
19 | +++ b/setup.py | ||
20 | @@ -19,13 +19,7 @@ if not dconv_libs: | ||
21 | dconv_source_files.extend(glob("./deps/double-conversion/double-conversion/*.cc")) | ||
22 | dconv_source_files.append("./lib/dconv_wrapper.cc") | ||
23 | |||
24 | -if platform.system() == "Linux" and environ.get("UJSON_BUILD_NO_STRIP", "0") not in ( | ||
25 | - "1", | ||
26 | - "True", | ||
27 | -): | ||
28 | - strip_flags = ["-Wl,--strip-all"] | ||
29 | -else: | ||
30 | - strip_flags = [] | ||
31 | +strip_flags = [] | ||
32 | |||
33 | module1 = Extension( | ||
34 | "ujson", | ||
35 | -- | ||
36 | 2.25.1 | ||
37 | |||
diff --git a/meta-python/recipes-devtools/python/python3-ujson/run-ptest b/meta-python/recipes-devtools/python/python3-ujson/run-ptest index 8d2017d39..4863c5e5a 100644 --- a/meta-python/recipes-devtools/python/python3-ujson/run-ptest +++ b/meta-python/recipes-devtools/python/python3-ujson/run-ptest | |||
@@ -1,3 +1,3 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | pytest --automake | 3 | FORCE_COLOR=1 pytest --automake --capture=no |
diff --git a/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb b/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb index c64c80062..5f4439c4c 100644 --- a/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb +++ b/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb | |||
@@ -6,15 +6,17 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e0039a83d8a99726b5 | |||
6 | 6 | ||
7 | SRC_URI[sha256sum] = "b3cd8f3c5d8c7738257f1018880444f7b7d9b66232c64649f562d7ba86ad4bc1" | 7 | SRC_URI[sha256sum] = "b3cd8f3c5d8c7738257f1018880444f7b7d9b66232c64649f562d7ba86ad4bc1" |
8 | 8 | ||
9 | inherit pypi ptest setuptools3 | 9 | inherit pypi ptest python_setuptools_build_meta |
10 | |||
11 | # let OE do the strip operation | ||
12 | export UJSON_BUILD_NO_STRIP = "1" | ||
13 | |||
14 | DEPENDS += "python3-setuptools-scm-native" | ||
10 | 15 | ||
11 | SRC_URI += " \ | 16 | SRC_URI += " \ |
12 | file://run-ptest \ | 17 | file://run-ptest \ |
13 | file://0001-setup.py-Do-not-strip-debugging-symbols.patch \ | ||
14 | " | 18 | " |
15 | 19 | ||
16 | DEPENDS += "python3-setuptools-scm-native" | ||
17 | |||
18 | RDEPENDS:${PN} += "\ | 20 | RDEPENDS:${PN} += "\ |
19 | python3-datetime \ | 21 | python3-datetime \ |
20 | python3-numbers \ | 22 | python3-numbers \ |
@@ -22,6 +24,7 @@ RDEPENDS:${PN} += "\ | |||
22 | 24 | ||
23 | RDEPENDS:${PN}-ptest += " \ | 25 | RDEPENDS:${PN}-ptest += " \ |
24 | python3-json \ | 26 | python3-json \ |
27 | python3-misc \ | ||
25 | python3-pytest \ | 28 | python3-pytest \ |
26 | python3-pytz \ | 29 | python3-pytz \ |
27 | python3-unittest-automake-output \ | 30 | python3-unittest-automake-output \ |
diff --git a/meta-python/recipes-devtools/python/python3-validators_0.28.3.bb b/meta-python/recipes-devtools/python/python3-validators_0.34.0.bb index a132d74eb..41ead5c05 100644 --- a/meta-python/recipes-devtools/python/python3-validators_0.28.3.bb +++ b/meta-python/recipes-devtools/python/python3-validators_0.34.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://python-validators.github.io/validators" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3fb4b9e6db86c69a33d5e3ee013ab59" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3fb4b9e6db86c69a33d5e3ee013ab59" |
6 | SRC_URI[sha256sum] = "c6c79840bcde9ba77b19f6218f7738188115e27830cbaff43264bc4ed24c429d" | 6 | SRC_URI[sha256sum] = "647fe407b45af9a74d245b943b18e6a816acf4926974278f6dd617778e1e781f" |
7 | 7 | ||
8 | inherit pypi python_setuptools_build_meta ptest | 8 | inherit pypi python_setuptools_build_meta ptest |
9 | 9 | ||
@@ -12,6 +12,10 @@ SRC_URI += " \ | |||
12 | " | 12 | " |
13 | 13 | ||
14 | RDEPENDS:${PN}-ptest += " \ | 14 | RDEPENDS:${PN}-ptest += " \ |
15 | python3-decorator \ | ||
16 | python3-eth-hash \ | ||
17 | python3-isort \ | ||
18 | python3-pycryptodome \ | ||
15 | python3-pytest \ | 19 | python3-pytest \ |
16 | python3-unittest-automake-output \ | 20 | python3-unittest-automake-output \ |
17 | " | 21 | " |
diff --git a/meta-python/recipes-devtools/python/python3-virtualenv_20.26.2.bb b/meta-python/recipes-devtools/python/python3-virtualenv_20.26.5.bb index c7c7d4898..82d60aeaa 100644 --- a/meta-python/recipes-devtools/python/python3-virtualenv_20.26.2.bb +++ b/meta-python/recipes-devtools/python/python3-virtualenv_20.26.5.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/pypa/virtualenv" | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "82bf0f4eebbb78d36ddaee0283d43fe5736b53880b8a8cdcd37390a07ac3741c" | 9 | SRC_URI[sha256sum] = "ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4" |
10 | 10 | ||
11 | BBCLASSEXTEND = "native nativesdk" | 11 | BBCLASSEXTEND = "native nativesdk" |
12 | inherit pypi python_hatchling | 12 | inherit pypi python_hatchling |
@@ -16,7 +16,11 @@ DEPENDS += "\ | |||
16 | " | 16 | " |
17 | 17 | ||
18 | RDEPENDS:${PN} += " \ | 18 | RDEPENDS:${PN} += " \ |
19 | python3-compression \ | ||
19 | python3-distlib \ | 20 | python3-distlib \ |
20 | python3-filelock \ | 21 | python3-filelock \ |
22 | python3-json \ | ||
23 | python3-misc \ | ||
24 | python3-modules \ | ||
21 | python3-platformdirs \ | 25 | python3-platformdirs \ |
22 | " | 26 | " |
diff --git a/meta-python/recipes-devtools/python/python3-watchdog_4.0.1.bb b/meta-python/recipes-devtools/python/python3-watchdog_5.0.2.bb index 4d0a626c4..ad66523de 100644 --- a/meta-python/recipes-devtools/python/python3-watchdog_4.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-watchdog_5.0.2.bb | |||
@@ -4,7 +4,7 @@ DEPENDS = "python3-argh" | |||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "eebaacf674fa25511e8867028d281e602ee6500045b57f43b08778082f7f8b44" | 7 | SRC_URI[sha256sum] = "dcebf7e475001d2cdeb020be630dc5b687e9acdd60d16fea6bb4508e7b94cf76" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-web3_6.19.0.bb b/meta-python/recipes-devtools/python/python3-web3_6.20.1.bb index 7f06ca500..b3487b6d8 100644 --- a/meta-python/recipes-devtools/python/python3-web3_6.19.0.bb +++ b/meta-python/recipes-devtools/python/python3-web3_6.20.1.bb | |||
@@ -4,7 +4,7 @@ SECTION = "devel/python" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=373fede350846fdffd23648fba504635" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=373fede350846fdffd23648fba504635" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "d27fbd4ac5aa70d0e0c516bd3e3b802fbe74bc159b407c34052d9301b400f757" | 7 | SRC_URI[sha256sum] = "a29bc1863734e1c05f128ddbc56878f299ea71776806e667b581a83b5d5be0ed" |
8 | 8 | ||
9 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
10 | 10 | ||
diff --git a/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb b/meta-python/recipes-devtools/python/python3-werkzeug_3.0.3.bb index 448abe189..a5e343bf2 100644 --- a/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-werkzeug_3.0.3.bb | |||
@@ -8,9 +8,9 @@ cookie handling, file uploads, a powerful URL routing system and a bunch \ | |||
8 | of community contributed addon modules." | 8 | of community contributed addon modules." |
9 | HOMEPAGE = "https://werkzeug.palletsprojects.com" | 9 | HOMEPAGE = "https://werkzeug.palletsprojects.com" |
10 | LICENSE = "BSD-3-Clause" | 10 | LICENSE = "BSD-3-Clause" |
11 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462" |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "507e811ecea72b18a404947aded4b3390e1db8f826b494d76550ef45bb3b1dcc" | 13 | SRC_URI[sha256sum] = "097e5bfda9f0aba8da6b8545146def481d06aa7d3266e7448e2cccf67dd8bd18" |
14 | 14 | ||
15 | inherit pypi python_flit_core | 15 | inherit pypi python_flit_core |
16 | 16 | ||
diff --git a/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb b/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb index 056323cd3..398d2fa6b 100644 --- a/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb +++ b/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb | |||
@@ -12,7 +12,9 @@ SRC_URI += " \ | |||
12 | file://run-ptest \ | 12 | file://run-ptest \ |
13 | " | 13 | " |
14 | 14 | ||
15 | # python3-misc for 'this' module | ||
15 | RDEPENDS:${PN}-ptest += " \ | 16 | RDEPENDS:${PN}-ptest += " \ |
17 | python3-misc \ | ||
16 | python3-pytest \ | 18 | python3-pytest \ |
17 | python3-unittest-automake-output \ | 19 | python3-unittest-automake-output \ |
18 | " | 20 | " |
diff --git a/meta-python/recipes-devtools/python/python3-xlsxwriter_3.2.0.bb b/meta-python/recipes-devtools/python/python3-xlsxwriter_3.2.0.bb index 93ca5525b..6e8f1b24d 100644 --- a/meta-python/recipes-devtools/python/python3-xlsxwriter_3.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-xlsxwriter_3.2.0.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | SUMMARY = "Python 2 and 3 compatibility library" | 1 | SUMMARY = "Python 2 and 3 compatibility library" |
2 | HOMEPAGE = "https://xlsxwriter.readthedocs.io" | 2 | HOMEPAGE = "https://xlsxwriter.readthedocs.io" |
3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
4 | LICENSE = "MIT" | 4 | LICENSE = "BSD-2-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a4bab8df34a9a138b4e0ca56b8559a05" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a4bab8df34a9a138b4e0ca56b8559a05" |
6 | 6 | ||
7 | inherit pypi setuptools3 | 7 | inherit pypi setuptools3 |
diff --git a/meta-python/recipes-devtools/python/python3-xmlschema_3.3.1.bb b/meta-python/recipes-devtools/python/python3-xmlschema_3.4.1.bb index a80f6c2db..845735c9b 100644 --- a/meta-python/recipes-devtools/python/python3-xmlschema_3.3.1.bb +++ b/meta-python/recipes-devtools/python/python3-xmlschema_3.4.1.bb | |||
@@ -3,14 +3,9 @@ HOMEPAGE = "https://github.com/sissaschool/xmlschema" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=26aa26eda991a3a2b61c11b62d3fda65" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=26aa26eda991a3a2b61c11b62d3fda65" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "2066ecbc9728112073f6f44d17c5c16723aff1c7d22a7c4c6421e2d68ec5f0ea" | 6 | SRC_URI[sha256sum] = "4f69eca6f2c446b06c74acd958e7d6613487c253d959a3b75078dfcc880b80ff" |
7 | 7 | ||
8 | PYPI_PACKAGE = "xmlschema" | 8 | inherit pypi python_setuptools_build_meta |
9 | inherit pypi setuptools3 | ||
10 | |||
11 | DEPENDS += "\ | ||
12 | python3-elementpath-native \ | ||
13 | " | ||
14 | 9 | ||
15 | RDEPENDS:${PN} += "\ | 10 | RDEPENDS:${PN} += "\ |
16 | python3-elementpath \ | 11 | python3-elementpath \ |
diff --git a/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb b/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb index 482f0c641..e41afb56c 100644 --- a/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb +++ b/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | DESCRIPTION = "XMODEM protocol implementation" | 1 | DESCRIPTION = "XMODEM protocol implementation" |
2 | 2 | ||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=90bc9522130d68de0dcbf33707bbf124" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "2f1068aa8676f0d1d112498b5786c4f8ea4f89d8f25d07d3a0f293cd21db1c35" | 6 | SRC_URI[sha256sum] = "2f1068aa8676f0d1d112498b5786c4f8ea4f89d8f25d07d3a0f293cd21db1c35" |
7 | 7 | ||
@@ -9,8 +9,8 @@ inherit pypi setuptools3 | |||
9 | 9 | ||
10 | do_install:append() { | 10 | do_install:append() { |
11 | install -d ${D}${docdir}/${PN} | 11 | install -d ${D}${docdir}/${PN} |
12 | mv ${D}/usr/doc/* ${D}${docdir}/${PN}/ | 12 | mv ${D}${prefix}/doc/* ${D}${docdir}/${PN}/ |
13 | rmdir ${D}/usr/doc | 13 | rmdir ${D}${prefix}/doc |
14 | } | 14 | } |
15 | 15 | ||
16 | RDEPENDS:${PN} += " \ | 16 | RDEPENDS:${PN} += " \ |
diff --git a/meta-python/recipes-devtools/python/python3-xxhash_3.4.1.bb b/meta-python/recipes-devtools/python/python3-xxhash_3.5.0.bb index be9ce005e..bfa14012d 100644 --- a/meta-python/recipes-devtools/python/python3-xxhash_3.4.1.bb +++ b/meta-python/recipes-devtools/python/python3-xxhash_3.5.0.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3a9dab7f159514231249aa3e108ab26b" | |||
5 | 5 | ||
6 | DEPENDS += "python3-setuptools-scm-native" | 6 | DEPENDS += "python3-setuptools-scm-native" |
7 | 7 | ||
8 | SRC_URI[sha256sum] = "0379d6cf1ff987cd421609a264ce025e74f346e3e145dd106c0cc2e3ec3f99a9" | 8 | SRC_URI[sha256sum] = "84f2caddf951c9cbf8dc2e22a89d4ccf5d86391ac6418fe81e3c67d0cf60b45f" |
9 | 9 | ||
10 | SRC_URI += " \ | 10 | SRC_URI += " \ |
11 | file://run-ptest \ | 11 | file://run-ptest \ |
diff --git a/meta-python/recipes-devtools/python/python3-yarl_1.9.4.bb b/meta-python/recipes-devtools/python/python3-yarl_1.11.1.bb index 29897b7f1..37d77b718 100644 --- a/meta-python/recipes-devtools/python/python3-yarl_1.9.4.bb +++ b/meta-python/recipes-devtools/python/python3-yarl_1.11.1.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/aio-libs/yarl/" | |||
3 | LICENSE = "Apache-2.0" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "566db86717cf8080b99b58b083b773a908ae40f06681e87e589a976faf8246bf" | 6 | SRC_URI[sha256sum] = "1bb2d9e212fb7449b8fb73bc461b51eaa17cc8430b4a87d87be7b25052d92f53" |
7 | 7 | ||
8 | SRC_URI += "file://run-ptest" | 8 | SRC_URI += "file://run-ptest" |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-zeroconf_0.132.2.bb b/meta-python/recipes-devtools/python/python3-zeroconf_0.134.0.bb index 421bd3b6c..b1b1a2e4c 100644 --- a/meta-python/recipes-devtools/python/python3-zeroconf_0.132.2.bb +++ b/meta-python/recipes-devtools/python/python3-zeroconf_0.134.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" | |||
3 | LICENSE = "LGPL-2.1-only" | 3 | LICENSE = "LGPL-2.1-only" |
4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=6517bdc8f2416f27ab725d4702f7aac3" | 4 | LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=6517bdc8f2416f27ab725d4702f7aac3" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "9ad8bc6e3f168fe8c164634c762d3265c775643defff10e26273623a12d73ae1" | 6 | SRC_URI[sha256sum] = "5be2c3a61cc81eb1bd4684bbdee19d708522d94bc8ac60dfe001a0fde4421092" |
7 | 7 | ||
8 | DEPENDS += "python3-cython-native" | 8 | DEPENDS += "python3-cython-native" |
9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.0.13.bb b/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.1.0b1.bb index bb5b973d8..bd2b59d36 100644 --- a/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.0.13.bb +++ b/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.1.0b1.bb | |||
@@ -3,8 +3,9 @@ HOMEPAGE = "https://github.com/tomerfiliba/reedsolomon" | |||
3 | LICENSE = "MIT-0 | Unlicense" | 3 | LICENSE = "MIT-0 | Unlicense" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ffde61aeb8917e70e0257e0a4b6d103c" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=ffde61aeb8917e70e0257e0a4b6d103c" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "71b4121c6860a55899435c552051a19d5f023c50358be4b1c0fa0c6e2f4ac717" | 6 | SRC_URI[sha256sum] = "e11528d63e75461d45b86c23f9db8260303d6ab6cae075fa9eddb44527ad8ece" |
7 | 7 | ||
8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
9 | 9 | ||
10 | DEPENDS += "python3-cython-native" | ||
10 | RDEPENDS:${PN} += "python3-core" | 11 | RDEPENDS:${PN} += "python3-core" |
diff --git a/meta-python/recipes-extended/python-meh/python3-meh_0.51.bb b/meta-python/recipes-extended/python-meh/python3-meh_0.52.bb index e83514af1..266b94c9d 100644 --- a/meta-python/recipes-extended/python-meh/python3-meh_0.51.bb +++ b/meta-python/recipes-extended/python-meh/python3-meh_0.52.bb | |||
@@ -11,6 +11,6 @@ S = "${WORKDIR}/git" | |||
11 | 11 | ||
12 | SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master" | 12 | SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master" |
13 | 13 | ||
14 | SRCREV = "eb5d4adc3b838704b6a68f0f77ada2063a11ab1b" | 14 | SRCREV = "f0fcc3ce1943dce9cf958f4a2f7398daff619c9f" |
15 | 15 | ||
16 | FILES:${PN} += "${datadir}/python-meh" | 16 | FILES:${PN} += "${datadir}/python-meh" |
diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb index 953068f7c..a7bd8ae43 100644 --- a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb +++ b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb | |||
@@ -5,13 +5,13 @@ LICENSE = "GPL-2.0-or-later" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" |
6 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | 6 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" |
7 | 7 | ||
8 | DEPENDS = "python3" | 8 | inherit python_setuptools_build_meta |
9 | |||
9 | RDEPENDS:${PN} = "python3 \ | 10 | RDEPENDS:${PN} = "python3 \ |
10 | python3-requests \ | 11 | python3-requests \ |
11 | python3-six \ | 12 | python3-six \ |
12 | " | 13 | " |
13 | 14 | ||
14 | S = "${WORKDIR}/git" | ||
15 | SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=master \ | 15 | SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=master \ |
16 | file://0001-support-authentication-for-kickstart.patch \ | 16 | file://0001-support-authentication-for-kickstart.patch \ |
17 | file://0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch \ | 17 | file://0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch \ |
@@ -22,4 +22,4 @@ SRCREV = "fa6c80c0e5c6bee29d089899a10d26e6f7f8afd8" | |||
22 | 22 | ||
23 | UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" | 23 | UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" |
24 | 24 | ||
25 | inherit setuptools3 | 25 | S = "${WORKDIR}/git" |
diff --git a/meta-python/recipes-extended/python-rich/python3-rich_13.7.1.bb b/meta-python/recipes-extended/python-rich/python3-rich_13.8.1.bb index 27bc95428..10ce1987b 100644 --- a/meta-python/recipes-extended/python-rich/python3-rich_13.7.1.bb +++ b/meta-python/recipes-extended/python-rich/python3-rich_13.8.1.bb | |||
@@ -8,7 +8,7 @@ LICENSE = "MIT" | |||
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432" | 11 | SRC_URI[sha256sum] = "8260cda28e3db6bf04d2d1ef4dbc03ba80a824c88b0e7668a0f23126a424844a" |
12 | 12 | ||
13 | inherit pypi python_poetry_core | 13 | inherit pypi python_poetry_core |
14 | 14 | ||
diff --git a/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.8.2.bb b/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.10.1.bb index c45a3fcda..8c03398ed 100644 --- a/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.8.2.bb +++ b/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.10.1.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" | |||
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=152634da660a374ca18c0734ed07c63c" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=152634da660a374ca18c0734ed07c63c" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "2b035aa7828e46c58e9b31390ee1f169b98e1066ab10b9a6a861fe7e25ee4f33" | 7 | SRC_URI[sha256sum] = "ef1bf844e878ab08aee7e40184156e1151f228f103aa5c6bd0724cc330960f8f" |
8 | 8 | ||
9 | DEPENDS += "python3-setuptools-scm-native" | 9 | DEPENDS += "python3-setuptools-scm-native" |
10 | 10 | ||
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch b/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch index bbe8b325b..64edeb593 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5074ab3425e5f1e01fd9cfa2d9b7300ea1b3f38f Mon Sep 17 00:00:00 2001 | 1 | From d1f0389e699e64f3e329c0ce509f79d969a76114 Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | 2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> |
3 | Date: Tue, 17 Jul 2012 11:27:39 +0100 | 3 | Date: Tue, 17 Jul 2012 11:27:39 +0100 |
4 | Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory is | 4 | Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory is |
@@ -16,10 +16,10 @@ Note: upstreaming was discussed but there are competing desires; | |||
16 | 1 file changed, 19 insertions(+) | 16 | 1 file changed, 19 insertions(+) |
17 | 17 | ||
18 | diff --git a/server/core.c b/server/core.c | 18 | diff --git a/server/core.c b/server/core.c |
19 | index 090e397..3020090 100644 | 19 | index 843b973..3b50100 100644 |
20 | --- a/server/core.c | 20 | --- a/server/core.c |
21 | +++ b/server/core.c | 21 | +++ b/server/core.c |
22 | @@ -5107,6 +5107,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte | 22 | @@ -5143,6 +5143,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte |
23 | } | 23 | } |
24 | apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper, | 24 | apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper, |
25 | apr_pool_cleanup_null); | 25 | apr_pool_cleanup_null); |
@@ -45,6 +45,3 @@ index 090e397..3020090 100644 | |||
45 | return OK; | 45 | return OK; |
46 | } | 46 | } |
47 | 47 | ||
48 | -- | ||
49 | 2.25.1 | ||
50 | |||
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch b/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch index 1abbe0c41..f8fbc4f3c 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e47cc405eadcbe37a579c375e824e20a5c53bfad Mon Sep 17 00:00:00 2001 | 1 | From b31cf12566e806e9e9c3aa01029f6bae3ada0729 Mon Sep 17 00:00:00 2001 |
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | 2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> |
3 | Date: Tue, 17 Jul 2012 11:27:39 +0100 | 3 | Date: Tue, 17 Jul 2012 11:27:39 +0100 |
4 | Subject: [PATCH] Log the SELinux context at startup. | 4 | Subject: [PATCH] Log the SELinux context at startup. |
@@ -14,7 +14,7 @@ Note: unlikely to be any interest in this upstream | |||
14 | 2 files changed, 31 insertions(+) | 14 | 2 files changed, 31 insertions(+) |
15 | 15 | ||
16 | diff --git a/configure.in b/configure.in | 16 | diff --git a/configure.in b/configure.in |
17 | index 352711a..f58620f 100644 | 17 | index 6319903..bffd8a1 100644 |
18 | --- a/configure.in | 18 | --- a/configure.in |
19 | +++ b/configure.in | 19 | +++ b/configure.in |
20 | @@ -514,6 +514,11 @@ gettid | 20 | @@ -514,6 +514,11 @@ gettid |
@@ -30,7 +30,7 @@ index 352711a..f58620f 100644 | |||
30 | # On Linux before glibc 2.30, gettid() is only usable via syscall() | 30 | # On Linux before glibc 2.30, gettid() is only usable via syscall() |
31 | AC_CACHE_CHECK([for gettid() via syscall], ap_cv_gettid, | 31 | AC_CACHE_CHECK([for gettid() via syscall], ap_cv_gettid, |
32 | diff --git a/server/core.c b/server/core.c | 32 | diff --git a/server/core.c b/server/core.c |
33 | index 30b317e..81f145f 100644 | 33 | index 3b50100..e0c7c7f 100644 |
34 | --- a/server/core.c | 34 | --- a/server/core.c |
35 | +++ b/server/core.c | 35 | +++ b/server/core.c |
36 | @@ -65,6 +65,10 @@ | 36 | @@ -65,6 +65,10 @@ |
@@ -44,7 +44,7 @@ index 30b317e..81f145f 100644 | |||
44 | /* LimitRequestBody handling */ | 44 | /* LimitRequestBody handling */ |
45 | #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) | 45 | #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) |
46 | #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */ | 46 | #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */ |
47 | @@ -5139,6 +5143,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte | 47 | @@ -5162,6 +5166,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte |
48 | } | 48 | } |
49 | #endif | 49 | #endif |
50 | 50 | ||
@@ -73,5 +73,3 @@ index 30b317e..81f145f 100644 | |||
73 | return OK; | 73 | return OK; |
74 | } | 74 | } |
75 | 75 | ||
76 | -- | ||
77 | 2.40.0 | ||
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch b/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch index dc5b5c88f..4bc2ad6d3 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch +++ b/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 443d15b91d4e4979d92405610303797663f31102 Mon Sep 17 00:00:00 2001 | 1 | From 980eadecc128bbbe1233e5d89268be24d14e1873 Mon Sep 17 00:00:00 2001 |
2 | From: echo <fei.geng@windriver.com> | 2 | From: echo <fei.geng@windriver.com> |
3 | Date: Tue, 28 Apr 2009 03:11:06 +0000 | 3 | Date: Tue, 28 Apr 2009 03:11:06 +0000 |
4 | Subject: [PATCH] Fix perl install directory to /usr/bin | 4 | Subject: [PATCH] Fix perl install directory to /usr/bin |
@@ -16,10 +16,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
16 | 1 file changed, 1 insertion(+), 4 deletions(-) | 16 | 1 file changed, 1 insertion(+), 4 deletions(-) |
17 | 17 | ||
18 | diff --git a/configure.in b/configure.in | 18 | diff --git a/configure.in b/configure.in |
19 | index 4df3ff3..4eeb609 100644 | 19 | index 4ce0fee..0362f52 100644 |
20 | --- a/configure.in | 20 | --- a/configure.in |
21 | +++ b/configure.in | 21 | +++ b/configure.in |
22 | @@ -903,10 +903,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", | 22 | @@ -936,10 +936,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", |
23 | AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", | 23 | AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", |
24 | [Location of the MIME types config file, relative to the Apache root directory]) | 24 | [Location of the MIME types config file, relative to the Apache root directory]) |
25 | 25 | ||
@@ -31,6 +31,3 @@ index 4df3ff3..4eeb609 100644 | |||
31 | AC_SUBST(perlbin) | 31 | AC_SUBST(perlbin) |
32 | 32 | ||
33 | dnl If we are running on BSD/OS, we need to use the BSD .include syntax. | 33 | dnl If we are running on BSD/OS, we need to use the BSD .include syntax. |
34 | -- | ||
35 | 2.25.1 | ||
36 | |||
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb index 1632c6ccb..364b4c674 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb | |||
@@ -27,7 +27,7 @@ SRC_URI:append:class-target = " \ | |||
27 | " | 27 | " |
28 | 28 | ||
29 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" | 29 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" |
30 | SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323" | 30 | SRC_URI[sha256sum] = "674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec" |
31 | 31 | ||
32 | S = "${WORKDIR}/httpd-${PV}" | 32 | S = "${WORKDIR}/httpd-${PV}" |
33 | 33 | ||
@@ -37,6 +37,14 @@ DEPENDS = "openssl expat pcre apr apr-util apache2-native " | |||
37 | 37 | ||
38 | CVE_PRODUCT = "apache:http_server" | 38 | CVE_PRODUCT = "apache:http_server" |
39 | 39 | ||
40 | CVE_STATUS[CVE-1999-0289] = "not-applicable-platform: The current version (2.4.6) is not affected. It only applies for Windows" | ||
41 | CVE_STATUS[CVE-2007-0450] = "not-applicable-platform: The current version (2.4.6) is not affected. It only applies for Windows." | ||
42 | CVE_STATUS[CVE-2007-6421] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions from 2.2 (incl.) to 2.2.8 (excl.)" | ||
43 | CVE_STATUS[CVE-2007-6422] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions from 2.2 (incl.) to 2.2.8 (excl.)" | ||
44 | CVE_STATUS[CVE-2007-6423] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions from 2.2.x to 2.2.7-dev" | ||
45 | CVE_STATUS[CVE-2008-2168] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions up to 2.2.6 (excl.)" | ||
46 | CVE_STATUS[CVE-2010-0425] = "not-applicable-platform: The current version (2.4.6) is not affected. It only applies for Windows." | ||
47 | |||
40 | SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice" | 48 | SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice" |
41 | 49 | ||
42 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" | 50 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" |
@@ -182,6 +190,10 @@ INITSCRIPT_PARAMS = "defaults 91 20" | |||
182 | SYSTEMD_SERVICE:${PN} = "apache2.service" | 190 | SYSTEMD_SERVICE:${PN} = "apache2.service" |
183 | SYSTEMD_AUTO_ENABLE:${PN} = "enable" | 191 | SYSTEMD_AUTO_ENABLE:${PN} = "enable" |
184 | 192 | ||
193 | ALTERNATIVE:${PN} = "httpd" | ||
194 | ALTERNATIVE_LINK_NAME[httpd] = "${sbindir}/httpd" | ||
195 | ALTERNATIVE_PRIORITY[httpd] = "60" | ||
196 | |||
185 | ALTERNATIVE:${PN}-doc = "htpasswd.1" | 197 | ALTERNATIVE:${PN}-doc = "htpasswd.1" |
186 | ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" | 198 | ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" |
187 | 199 | ||
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 5bf6373a8..f10262366 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb | |||
@@ -90,3 +90,4 @@ CONFFILES:${PN} = "${sysconfdir}/monkey/monkey.conf \ | |||
90 | ${sysconfdir}/monkey/plugins/auth/monkey.users \ | 90 | ${sysconfdir}/monkey/plugins/auth/monkey.users \ |
91 | " | 91 | " |
92 | 92 | ||
93 | CVE_STATUS[CVE-2013-2183] = "cpe-incorrect: Current version (1.6.9) is not affected. Issue was addressed in version 1.3.0" | ||
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 2714c3d22..bcc384bd8 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc | |||
@@ -38,7 +38,7 @@ NGINX_USER ?= "www" | |||
38 | EXTRA_OECONF = "" | 38 | EXTRA_OECONF = "" |
39 | DISABLE_STATIC = "" | 39 | DISABLE_STATIC = "" |
40 | 40 | ||
41 | PACKAGECONFIG ??= "ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | 41 | PACKAGECONFIG ??= "ssl fastcgi scgi uwsgi ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" |
42 | 42 | ||
43 | PACKAGECONFIG[gunzip] = "--with-http_gunzip_module,," | 43 | PACKAGECONFIG[gunzip] = "--with-http_gunzip_module,," |
44 | PACKAGECONFIG[http2] = "--with-http_v2_module,," | 44 | PACKAGECONFIG[http2] = "--with-http_v2_module,," |
@@ -48,7 +48,9 @@ PACKAGECONFIG[ipv6] = "--with-ipv6,," | |||
48 | PACKAGECONFIG[webdav] = "--with-http_dav_module,," | 48 | PACKAGECONFIG[webdav] = "--with-http_dav_module,," |
49 | PACKAGECONFIG[stream] = "--with-stream,," | 49 | PACKAGECONFIG[stream] = "--with-stream,," |
50 | PACKAGECONFIG[http-sub-module] = "--with-http_sub_module,," | 50 | PACKAGECONFIG[http-sub-module] = "--with-http_sub_module,," |
51 | 51 | PACKAGECONFIG[fastcgi] = ",--without-http_fastcgi_module," | |
52 | PACKAGECONFIG[scgi] = ",--without-http_scgi_module," | ||
53 | PACKAGECONFIG[uwsgi] = ",--without-http_uwsgi_module," | ||
52 | PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt" | 54 | PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt" |
53 | 55 | ||
54 | do_configure () { | 56 | do_configure () { |
@@ -81,9 +83,9 @@ do_configure () { | |||
81 | --error-log-path=${localstatedir}/log/nginx/error.log \ | 83 | --error-log-path=${localstatedir}/log/nginx/error.log \ |
82 | --http-client-body-temp-path=/run/nginx/client_body_temp \ | 84 | --http-client-body-temp-path=/run/nginx/client_body_temp \ |
83 | --http-proxy-temp-path=/run/nginx/proxy_temp \ | 85 | --http-proxy-temp-path=/run/nginx/proxy_temp \ |
84 | --http-fastcgi-temp-path=/run/nginx/fastcgi_temp \ | 86 | ${@bb.utils.contains('PACKAGECONFIG', 'fastcgi', '--http-fastcgi-temp-path=/run/nginx/fastcgi_temp', '', d)} \ |
85 | --http-uwsgi-temp-path=/run/nginx/uwsgi_temp \ | 87 | ${@bb.utils.contains('PACKAGECONFIG', 'scgi', '--http-scgi-temp-path=/run/nginx/scgi_temp', '', d)} \ |
86 | --http-scgi-temp-path=/run/nginx/scgi_temp \ | 88 | ${@bb.utils.contains('PACKAGECONFIG', 'uwsgi', '--http-uwsgi-temp-path=/run/nginx/uwsgi_temp', '', d)} \ |
87 | --pid-path=/run/nginx/nginx.pid \ | 89 | --pid-path=/run/nginx/nginx.pid \ |
88 | --prefix=${prefix} \ | 90 | --prefix=${prefix} \ |
89 | --with-threads \ | 91 | --with-threads \ |
@@ -132,6 +134,18 @@ do_install () { | |||
132 | # cleanup configuration folder | 134 | # cleanup configuration folder |
133 | rm ${D}${sysconfdir}/nginx/*.default | 135 | rm ${D}${sysconfdir}/nginx/*.default |
134 | 136 | ||
137 | # remove config files based on packageconfig | ||
138 | if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'fastcgi', d)}" ]; then | ||
139 | rm -f ${D}${sysconfdir}/nginx/fastcgi.conf | ||
140 | rm -f ${D}${sysconfdir}/nginx/fastcgi_params | ||
141 | fi | ||
142 | if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'scgi', d)}" ]; then | ||
143 | rm -f ${D}${sysconfdir}/nginx/scgi_params | ||
144 | fi | ||
145 | if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'uwsgi', d)}" ]; then | ||
146 | rm -f ${D}${sysconfdir}/nginx/uwsgi_params | ||
147 | fi | ||
148 | |||
135 | # add additional configuration folders | 149 | # add additional configuration folders |
136 | install -d ${D}${sysconfdir}/nginx/modules-available | 150 | install -d ${D}${sysconfdir}/nginx/modules-available |
137 | install -d ${D}${sysconfdir}/nginx/modules-enabled | 151 | install -d ${D}${sysconfdir}/nginx/modules-enabled |
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb deleted file mode 100644 index d0371dd3c..000000000 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require nginx.inc | ||
2 | |||
3 | # 1.24.x branch is the current stable branch, the recommended default | ||
4 | # 1.25.x is the current mainline branches containing all new features | ||
5 | DEFAULT_PREFERENCE = "-1" | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d" | ||
8 | |||
9 | SRC_URI[sha256sum] = "64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86" | ||
10 | |||
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.26.2.bb index 0ce940d42..a279a3cf9 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.26.2.bb | |||
@@ -2,5 +2,5 @@ require nginx.inc | |||
2 | 2 | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a6547d7e5628787ee2a9c5a3480eb628" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a6547d7e5628787ee2a9c5a3480eb628" |
4 | 4 | ||
5 | SRC_URI[sha256sum] = "d2e6c8439d6c6db5015d8eaab2470ab52aef85a7bf363182879977e084370497" | 5 | SRC_URI[sha256sum] = "627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738" |
6 | 6 | ||
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.27.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.27.1.bb new file mode 100644 index 000000000..5927ecab0 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.27.1.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | require nginx.inc | ||
2 | |||
3 | # 1.26.x branch is the current stable branch, the recommended default | ||
4 | # 1.27.x is the current mainline branches containing all new features | ||
5 | DEFAULT_PREFERENCE = "-1" | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=a6547d7e5628787ee2a9c5a3480eb628" | ||
8 | |||
9 | SRC_URI[sha256sum] = "bd7ba68a6ce1ea3768b771c7e2ab4955a59fb1b1ae8d554fedb6c2304104bdfc" | ||
10 | |||
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch new file mode 100644 index 000000000..d8ad69cec --- /dev/null +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 1e8fbb6da4e5ee44fe24c078aae1930d759f0ba3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 17 Sep 2024 05:29:13 +0000 | ||
4 | Subject: [PATCH] cmake: Add check for 64bit builtin atomics | ||
5 | |||
6 | Compilers for some architectures e.g. RISCV32 do not have 64bit atomics | ||
7 | therefore, its important to deduce that and use it to pass right flags to | ||
8 | compiler to use them, e.g. h2o module | ||
9 | |||
10 | Fixes | ||
11 | nection.c.o): in function `h2o_create_connection': | ||
12 | | /usr/src/debug/netdata/1.47.1/src/web/server/h2o/libh2o/include/h2o.h:1917:(.text.create_conn+0x5e): undefined reference to `__sync_add_and_fetch_8' | ||
13 | | collect2: error: ld returned 1 exit status | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/netdata/netdata/pull/18565] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | CMakeLists.txt | 13 +++++++++++++ | ||
19 | 1 file changed, 13 insertions(+) | ||
20 | |||
21 | Index: netdata-v1.47.1/CMakeLists.txt | ||
22 | =================================================================== | ||
23 | --- netdata-v1.47.1.orig/CMakeLists.txt | ||
24 | +++ netdata-v1.47.1/CMakeLists.txt | ||
25 | @@ -448,6 +448,15 @@ int main() { | ||
26 | } | ||
27 | " HAVE_BUILTIN_ATOMICS) | ||
28 | |||
29 | +check_cxx_source_compiles(" | ||
30 | +#include <stdint.h> | ||
31 | +int main(void) { | ||
32 | + uint64_t a; | ||
33 | + __sync_add_and_fetch(&a, 1); | ||
34 | + return 0; | ||
35 | +} | ||
36 | +" ARCH_SUPPORTS_64BIT_ATOMICS) | ||
37 | + | ||
38 | check_c_source_compiles(" | ||
39 | void my_printf(char const *s, ...) __attribute__((format(gnu_printf, 1, 2))); | ||
40 | int main() { return 0; } | ||
41 | @@ -523,6 +532,10 @@ if(OS_FREEBSD OR OS_MACOS) | ||
42 | set(HAVE_BUILTIN_ATOMICS True) | ||
43 | endif() | ||
44 | |||
45 | +if (ENABLE_H2O AND NOT ARCH_SUPPORTS_64BIT_ATOMICS) | ||
46 | + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DH2O_NO_64BIT_ATOMICS") | ||
47 | +endif (NOT ARCH_SUPPORTS_64BIT_ATOMICS) | ||
48 | + | ||
49 | # openssl/crypto | ||
50 | set(ENABLE_OPENSSL True) | ||
51 | pkg_check_modules(TLS IMPORTED_TARGET openssl) | ||
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf b/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf new file mode 100644 index 000000000..f34254207 --- /dev/null +++ b/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf | |||
@@ -0,0 +1,5 @@ | |||
1 | d /run/netdata 0755 netdata netdata - | ||
2 | d /var/cache/netdata 0755 netdata netdata - | ||
3 | d /var/lib/netdata/cloud.d 0755 netdata netdata - | ||
4 | d /var/lib/netdata/registry 0755 netdata netdata - | ||
5 | d /var/log/netdata 0755 netdata netdata - | ||
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb index b06a5df31..5b38d401c 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb | |||
@@ -5,15 +5,16 @@ HOMEPAGE = "https://github.com/netdata/netdata/" | |||
5 | LICENSE = "GPL-3.0-only" | 5 | LICENSE = "GPL-3.0-only" |
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" |
7 | 7 | ||
8 | DEPENDS += "json-c libuv libyaml util-linux zlib " | 8 | DEPENDS += "json-c libuv libyaml util-linux zlib lz4" |
9 | 9 | ||
10 | SRC_URI = "\ | 10 | SRC_URI = "\ |
11 | https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ | 11 | https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ |
12 | file://0001-cmake-Add-check-for-64bit-builtin-atomics.patch \ | ||
12 | file://netdata.conf \ | 13 | file://netdata.conf \ |
13 | file://netdata.service \ | 14 | file://netdata.service \ |
15 | file://netdata-volatiles.conf \ | ||
14 | " | 16 | " |
15 | 17 | SRC_URI[sha256sum] = "fb970a4b571ffd542b7d24220ef806a4c1b56c535e0f549a9978860a9f1dcc9c" | |
16 | SRC_URI[sha256sum] = "50df30a9aaf60d550eb8e607230d982827e04194f7df3eba0e83ff7919270ad2" | ||
17 | 18 | ||
18 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags" | 19 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags" |
19 | UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)" | 20 | UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)" |
@@ -23,7 +24,9 @@ S = "${WORKDIR}/${BPN}-v${PV}" | |||
23 | # Stop sending anonymous statistics to Google Analytics | 24 | # Stop sending anonymous statistics to Google Analytics |
24 | NETDATA_ANONYMOUS ??= "enabled" | 25 | NETDATA_ANONYMOUS ??= "enabled" |
25 | 26 | ||
26 | inherit pkgconfig autotools-brokensep useradd systemd | 27 | inherit pkgconfig cmake useradd systemd |
28 | |||
29 | TARGET_CC_ARCH:append:libc-musl = " -D_LARGEFILE64_SOURCE" | ||
27 | 30 | ||
28 | LIBS:toolchain-clang:x86 = "-latomic" | 31 | LIBS:toolchain-clang:x86 = "-latomic" |
29 | LIBS:riscv64 = "-latomic" | 32 | LIBS:riscv64 = "-latomic" |
@@ -40,23 +43,32 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" | |||
40 | USERADD_PACKAGES = "${PN}" | 43 | USERADD_PACKAGES = "${PN}" |
41 | USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" | 44 | USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" |
42 | 45 | ||
43 | PACKAGECONFIG ??= "openssl" | 46 | PACKAGECONFIG ??= "openssl freeipmi ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
44 | PACKAGECONFIG[cloud] = "--enable-cloud, --disable-cloud," | 47 | PACKAGECONFIG[brotli] = ",,brotli" |
45 | PACKAGECONFIG[lz4] = "--enable-lz4, --disable-lz4, lz4" | 48 | PACKAGECONFIG[cloud] = "-DENABLE_CLOUD=ON,-DENABLE_CLOUD=OFF," |
46 | PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl" | 49 | PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" |
50 | PACKAGECONFIG[freeipmi] = "-DENABLE_PLUGIN_FREEIPMI=ON,-DENABLE_PLUGIN_FREEIPMI=OFF,freeipmi" | ||
51 | PACKAGECONFIG[nfacct] = "-DENABLE_PLUGIN_NFACCT=ON,-DENABLE_PLUGIN_NFACCT=OFF,libmnl" | ||
52 | # needs meta-virtualization | ||
53 | PACKAGECONFIG[xenstat] = "-DENABLE_PLUGIN_XENSTAT=ON,-DENABLE_PLUGIN_XENSTAT=OFF,xen-tools" | ||
54 | PACKAGECONFIG[cups] = "-DENABLE_PLUGIN_CUPS=ON,-DENABLE_PLUGIN_CUPS=OFF,cups" | ||
55 | PACKAGECONFIG[systemd] = "-DENABLE_PLUGIN_SYSTEMD_JOURNAL=ON,-DENABLE_PLUGIN_SYSTEMD_JOURNAL=OFF,systemd" | ||
47 | 56 | ||
48 | # ebpf doesn't compile (or detect) the cross compilation well | 57 | # ebpf doesn't compile (or detect) the cross compilation well |
49 | EXTRA_OECONF += "--disable-ebpf" | 58 | EXTRA_OECMAKE += "-DENABLE_PLUGIN_EBPF=OFF -DENABLE_PLUGIN_GO=OFF \ |
59 | -DENABLE_ACLK=OFF -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=OFF -DCMAKE_INSTALL_PREFIX='${base_prefix}'" | ||
50 | 60 | ||
51 | do_install:append() { | 61 | do_install:append() { |
52 | #set S UID for plugins | 62 | #set S UID for plugins |
53 | chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin | 63 | chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin |
64 | rm -rf ${D}/${localstatedir}/ | ||
54 | 65 | ||
55 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 66 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
56 | # Install systemd unit files | 67 | # Install systemd unit files |
57 | install -d ${D}${systemd_unitdir}/system | 68 | install -d ${D}${systemd_unitdir}/system |
58 | install -m 0644 ${UNPACKDIR}/netdata.service ${D}${systemd_unitdir}/system | 69 | install -m 0644 ${UNPACKDIR}/netdata.service ${D}${systemd_unitdir}/system |
59 | sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service | 70 | sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service |
71 | install -Dm 0644 ${UNPACKDIR}/netdata-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/netdata.conf | ||
60 | fi | 72 | fi |
61 | 73 | ||
62 | # Install default netdata.conf | 74 | # Install default netdata.conf |
diff --git a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch index 1ca26ca0d..46b1f7c7b 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch | |||
@@ -7,58 +7,44 @@ Upstream-Status: Inappropriate | |||
7 | 7 | ||
8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
9 | 9 | ||
10 | Index: webmin-1.850/webmin/webmin-lib.pl | 10 | --- a/webmin/webmin-lib.pl |
11 | =================================================================== | 11 | +++ b/webmin/webmin-lib.pl |
12 | --- webmin-1.850.orig/webmin/webmin-lib.pl | 12 | @@ -1170,38 +1170,6 @@ my %miniserv; |
13 | +++ webmin-1.850/webmin/webmin-lib.pl | 13 | &get_miniserv_config(\%miniserv); |
14 | @@ -1112,28 +1112,28 @@ my %miniserv; | ||
15 | &load_theme_library(); # So that UI functions work | 14 | &load_theme_library(); # So that UI functions work |
16 | 15 | ||
17 | # Need OS upgrade | 16 | -# Need OS upgrade, but only once per day or if the system was rebooted |
18 | -my %realos = &detect_operating_system(undef, 1); | 17 | -my $now = time(); |
19 | -if (($realos{'os_version'} ne $gconfig{'os_version'} || | 18 | -my $uptime = &get_system_uptime(); |
20 | - $realos{'os_type'} ne $gconfig{'os_type'}) && | 19 | -if (&foreign_available("webmin")) { |
21 | - $realos{'os_version'} && $realos{'os_type'} && | 20 | - my %realos; |
22 | - &foreign_available("webmin")) { | 21 | - my @st = stat($realos_cache_file); |
23 | - my ($realminor) = split(/\./, $realos{'os_version'}); | 22 | - if (!@st || $now - $st[9] > 24*60*60 || |
24 | - my ($minor) = split(/\./, $gconfig{'os_version'}); | 23 | - $uptime && $now - $st[9] > $uptime) { |
25 | - if ($realos{'os_type'} eq $gconfig{'os_type'} && | 24 | - %realos = &detect_operating_system(undef, 1); |
26 | - $realminor == $minor) { | 25 | - &write_file($realos_cache_file, \%realos); |
27 | - # Only the minor version number changed - no need to apply | ||
28 | - &apply_new_os_version(\%realos); | ||
29 | - } | 26 | - } |
30 | - else { | 27 | - else { |
31 | - # Large enough change to tell the user | 28 | - &read_file($realos_cache_file, \%realos); |
32 | - push(@notifs, | 29 | - } |
33 | - &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). | 30 | - if (($realos{'os_version'} ne $gconfig{'os_version'} || |
34 | - &text('os_incorrect', $realos{'real_os_type'}, | 31 | - $realos{'real_os_version'} ne $gconfig{'real_os_version'} || |
35 | - $realos{'real_os_version'})."<p>\n". | 32 | - $realos{'os_type'} ne $gconfig{'os_type'}) && |
33 | - $realos{'os_version'} && $realos{'os_type'} && | ||
34 | - &foreign_available("webmin")) { | ||
35 | - # Tell the user that OS version was updated | ||
36 | - push(@notifs, | ||
37 | - &ui_form_start("@{[&get_webprefix()]}/webmin/fix_os.cgi"). | ||
38 | - &text('os_incorrect', | ||
39 | - $realos{'real_os_type'}, | ||
40 | - $realos{'real_os_version'}). | ||
41 | - &show_os_release_notes($realos{'real_os_version'}). | ||
42 | - "<p>\n". | ||
36 | - &ui_form_end([ [ undef, $text{'os_fix'} ] ]) | 43 | - &ui_form_end([ [ undef, $text{'os_fix'} ] ]) |
37 | - ); | 44 | - ); |
38 | - } | 45 | - } |
39 | - } | 46 | - } |
40 | +#my %realos = &detect_operating_system(undef, 1); | 47 | - |
41 | +#if (($realos{'os_version'} ne $gconfig{'os_version'} || | ||
42 | +# $realos{'os_type'} ne $gconfig{'os_type'}) && | ||
43 | +# $realos{'os_version'} && $realos{'os_type'} && | ||
44 | +# &foreign_available("webmin")) { | ||
45 | +# my ($realminor) = split(/\./, $realos{'os_version'}); | ||
46 | +# my ($minor) = split(/\./, $gconfig{'os_version'}); | ||
47 | +# if ($realos{'os_type'} eq $gconfig{'os_type'} && | ||
48 | +# $realminor == $minor) { | ||
49 | +# # Only the minor version number changed - no need to apply | ||
50 | +# &apply_new_os_version(\%realos); | ||
51 | +# } | ||
52 | +# else { | ||
53 | +# # Large enough change to tell the user | ||
54 | +# push(@notifs, | ||
55 | +# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). | ||
56 | +# &text('os_incorrect', $realos{'real_os_type'}, | ||
57 | +# $realos{'real_os_version'})."<p>\n". | ||
58 | +# &ui_form_end([ [ undef, $text{'os_fix'} ] ]) | ||
59 | +# ); | ||
60 | +# } | ||
61 | +# } | ||
62 | |||
63 | # Password close to expiry | 48 | # Password close to expiry |
64 | my $warn_days = $config{'warn_days'}; | 49 | my $warn_days = $config{'warn_days'}; |
50 | if (&foreign_check("acl")) { | ||
diff --git a/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch b/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch index 787bd8c69..7d6a2275f 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch | |||
@@ -8,9 +8,9 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | |||
8 | 8 | ||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
10 | 10 | ||
11 | --- webmin-1.570.orig/mount/index.cgi | 11 | --- a/mount/index.cgi |
12 | +++ webmin-1.570/mount/index.cgi | 12 | +++ b/mount/index.cgi |
13 | @@ -33,10 +33,12 @@ elsif ($config{'sort_mode'} == 1) { | 13 | @@ -34,9 +34,11 @@ elsif ($config{'sort_mode'} == 1) { |
14 | } | 14 | } |
15 | 15 | ||
16 | # Build visible filesystems list | 16 | # Build visible filesystems list |
@@ -18,7 +18,6 @@ Upstream-Status: Pending | |||
18 | foreach $m (@all) { | 18 | foreach $m (@all) { |
19 | @minfo = @$m; | 19 | @minfo = @$m; |
20 | $p = &simplify_mount_path($minfo[0], $minfo[2]); | 20 | $p = &simplify_mount_path($minfo[0], $minfo[2]); |
21 | next if ($ignore{$minfo[2]}); | ||
22 | + next if (grep {$_ eq $minfo[2]} @excludefs); | 21 | + next if (grep {$_ eq $minfo[2]} @excludefs); |
23 | @mmodes = &mount_modes($minfo[2], $minfo[0], $minfo[1]); | 22 | @mmodes = &mount_modes($minfo[2], $minfo[0], $minfo[1]); |
24 | $canedit = $can_edit{$minfo[2]} && !$mmodes[4] && | 23 | $canedit = $can_edit{$minfo[2]} && !$mmodes[4] && |
diff --git a/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch b/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch index c6c1f0df7..d62353592 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch | |||
@@ -10,8 +10,6 @@ Signed-off-by: Diego Rondini <diego.ml@zoho.com> | |||
10 | mysql/config | 18 +++++++++--------- | 10 | mysql/config | 18 +++++++++--------- |
11 | 1 file changed, 9 insertions(+), 9 deletions(-) | 11 | 1 file changed, 9 insertions(+), 9 deletions(-) |
12 | 12 | ||
13 | diff --git a/mysql/config b/mysql/config | ||
14 | index e5b6fb3..77bfe69 100644 | ||
15 | --- a/mysql/config | 13 | --- a/mysql/config |
16 | +++ b/mysql/config | 14 | +++ b/mysql/config |
17 | @@ -1,13 +1,13 @@ | 15 | @@ -1,13 +1,13 @@ |
@@ -33,7 +31,7 @@ index e5b6fb3..77bfe69 100644 | |||
33 | -mysqladmin=/usr/local/mysql/bin/mysqladmin | 31 | -mysqladmin=/usr/local/mysql/bin/mysqladmin |
34 | +mysql_libs=/usr/lib | 32 | +mysql_libs=/usr/lib |
35 | +mysqladmin=/usr/bin/mysqladmin | 33 | +mysqladmin=/usr/bin/mysqladmin |
36 | style=0 | 34 | style=1 |
37 | add_mode=1 | 35 | add_mode=1 |
38 | nodbi=0 | 36 | nodbi=0 |
39 | @@ -15,7 +15,7 @@ access=*: * | 37 | @@ -15,7 +15,7 @@ access=*: * |
@@ -45,6 +43,3 @@ index e5b6fb3..77bfe69 100644 | |||
45 | max_dbs=50 | 43 | max_dbs=50 |
46 | my_cnf=/etc/my.cnf | 44 | my_cnf=/etc/my.cnf |
47 | max_text=1000 | 45 | max_text=1000 |
48 | -- | ||
49 | 2.5.0 | ||
50 | |||
diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch index 6ae3dced7..f1965a788 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch | |||
@@ -3,23 +3,19 @@ Add support for configuring network interfaces on a generic linux system | |||
3 | Upstream-Status: Inappropriate [config] | 3 | Upstream-Status: Inappropriate [config] |
4 | 4 | ||
5 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 5 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
6 | Index: webmin-1.850/net/module.info | 6 | --- a/net/module.info |
7 | =================================================================== | 7 | +++ b/net/module.info |
8 | --- webmin-1.850.orig/net/module.info | 8 | @@ -1,7 +1,7 @@ |
9 | +++ webmin-1.850/net/module.info | 9 | version=2.202 |
10 | @@ -14,7 +14,7 @@ desc_ko_KR.UTF-8=네트워크 구성 | 10 | longdesc=Configure boot time and active interfaces, DNS, routing and /etc/hosts. |
11 | name=Networking | 11 | name=Networking |
12 | desc_tr=A Yaplandrmas | ||
13 | desc_de=Netzwerkkonfiguration | ||
14 | -os_support=solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux | 12 | -os_support=solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux |
15 | +os_support=generic-linux solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux | 13 | +os_support=generic-linux solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux |
16 | desc_sk=Konfigurcia siete | 14 | readonly=1 |
17 | desc_zh_CN= | 15 | desc=Network Configuration |
18 | risk=low medium high | 16 | category=net |
19 | Index: webmin-1.850/net/generic-linux-lib.pl | ||
20 | =================================================================== | ||
21 | --- /dev/null | 17 | --- /dev/null |
22 | +++ webmin-1.850/net/generic-linux-lib.pl | 18 | +++ b/net/generic-linux-lib.pl |
23 | @@ -0,0 +1,2 @@ | 19 | @@ -0,0 +1,2 @@ |
24 | +do 'linux-lib.pl'; | 20 | +do 'linux-lib.pl'; |
25 | + | 21 | + |
diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch b/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch index bdba5e73f..949525dfd 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch | |||
@@ -4,16 +4,14 @@ XXX: need to work out a better fix. | |||
4 | 4 | ||
5 | Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> | 5 | Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> |
6 | 6 | ||
7 | diff -Nru webmin-1.570.orig//net/net-lib.pl webmin-1.570/net/net-lib.pl | 7 | --- a/net/net-lib.pl |
8 | --- webmin-1.570.orig//net/net-lib.pl 2011-10-03 09:01:48.000000000 +0800 | 8 | +++ b/net/net-lib.pl |
9 | +++ webmin-1.570/net/net-lib.pl 2011-10-28 13:52:56.138873664 +0800 | 9 | @@ -38,7 +38,7 @@ elsif ($gconfig{'os_type'} eq 'debian-li |
10 | @@ -21,7 +21,8 @@ | 10 | $net_mode = "netplan"; |
11 | do "$gconfig{'os_type'}-9.1-ALL-lib.pl"; | ||
12 | } | 11 | } |
13 | else { | 12 | else { |
14 | - do "$gconfig{'os_type'}-lib.pl"; | 13 | - do "$gconfig{'os_type'}-lib.pl"; |
15 | + #do "$gconfig{'os_type'}-lib.pl"; | ||
16 | + do "debian-linux-lib.pl"; | 14 | + do "debian-linux-lib.pl"; |
15 | $net_mode = $gconfig{'os_type'}; | ||
17 | } | 16 | } |
18 | 17 | ||
19 | # list_hosts() | ||
diff --git a/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch b/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch deleted file mode 100644 index 75e5bd1ea..000000000 --- a/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 6f04699d5d417122b67e8118fd1955c769f17e76 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Tue, 2 Sep 2014 00:11:05 -0700 | ||
4 | Subject: [PATCH] ajaxterm/ajaxterm/qweb.py: fix hardcode of python2.3 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
9 | --- | ||
10 | ajaxterm/ajaxterm/qweb.py | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/ajaxterm/ajaxterm/qweb.py b/ajaxterm/ajaxterm/qweb.py | ||
14 | index 20c5092..c658a6b 100644 | ||
15 | --- a/ajaxterm/ajaxterm/qweb.py | ||
16 | +++ b/ajaxterm/ajaxterm/qweb.py | ||
17 | @@ -1,4 +1,4 @@ | ||
18 | -#!/usr/bin/python2.3 | ||
19 | +#!/usr/bin/env python | ||
20 | # | ||
21 | # vim:set et ts=4 fdc=0 fdn=2 fdl=0: | ||
22 | # | ||
23 | -- | ||
24 | 1.7.9.5 | ||
25 | |||
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-webserver/recipes-webadmin/webmin/webmin_2.202.bb index bbc59443c..18082149b 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_2.202.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | SUMMARY = "Web-based administration interface" | 1 | SUMMARY = "Web-based administration interface" |
2 | HOMEPAGE = "http://www.webmin.com" | 2 | HOMEPAGE = "http://www.webmin.com" |
3 | LICENSE = "BSD-3-Clause" | 3 | LICENSE = "BSD-3-Clause" |
4 | LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c" | 4 | LIC_FILES_CHKSUM = "file://LICENCE;md5=0a6446108c96d0819d21e40b48109507" |
5 | 5 | ||
6 | SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ | 6 | SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ |
7 | file://setup.sh \ | 7 | file://setup.sh \ |
@@ -16,14 +16,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ | |||
16 | file://proftpd-config-fix.patch \ | 16 | file://proftpd-config-fix.patch \ |
17 | file://net-lib.pl.patch \ | 17 | file://net-lib.pl.patch \ |
18 | file://media-tomb.patch \ | 18 | file://media-tomb.patch \ |
19 | file://remove-python2.3.patch \ | ||
20 | file://mysql-config-fix.patch \ | 19 | file://mysql-config-fix.patch \ |
21 | file://webmin.service \ | 20 | file://webmin.service \ |
22 | " | 21 | " |
23 | 22 | SRC_URI[sha256sum] = "4f1c467aeda0ded546e69f332c768665b6a0537d6a69e609221f9465121f775e" | |
24 | SRC_URI[md5sum] = "cd6ee98f73f9418562197675b952d81b" | ||
25 | SRC_URI[sha256sum] = "c66caa9e4cb50d5447bc8aceb7989d2284dde060278f404b13e171c7ce1690e1" | ||
26 | |||
27 | UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html" | 23 | UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html" |
28 | UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz" | 24 | UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz" |
29 | 25 | ||
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index f2e04f793..500719a8f 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | |||
@@ -49,7 +49,7 @@ RRECOMMENDS:${PN} = " \ | |||
49 | xfce4-verve-plugin \ | 49 | xfce4-verve-plugin \ |
50 | \ | 50 | \ |
51 | ${@bb.utils.contains('DISTRO_FEATURES','polkit','xfce-polkit','',d)} \ | 51 | ${@bb.utils.contains('DISTRO_FEATURES','polkit','xfce-polkit','',d)} \ |
52 | ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth gobject-introspection", "blueman", "", d)} \ | 52 | ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth gobject-introspection-data", "blueman", "", d)} \ |
53 | \ | 53 | \ |
54 | thunar-media-tags-plugin \ | 54 | thunar-media-tags-plugin \ |
55 | thunar-archive-plugin \ | 55 | thunar-archive-plugin \ |
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.4.bb index 7e7075443..c9fb65477 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.4.bb | |||
@@ -14,7 +14,7 @@ SRC_URI += " \ | |||
14 | file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ | 14 | file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ |
15 | file://0002-use-lxdm-to-replace-dm-tool.patch \ | 15 | file://0002-use-lxdm-to-replace-dm-tool.patch \ |
16 | " | 16 | " |
17 | SRC_URI[sha256sum] = "4ae0b8615c9811194bbda0172a63567ed7fdb5519ea48f7a4637f4e6e5365e1b" | 17 | SRC_URI[sha256sum] = "32304f82094ea3779741f968dc851032d8790eb78f3aa01676520b96cfacfb54" |
18 | 18 | ||
19 | EXTRA_OECONF += "--disable-vala" | 19 | EXTRA_OECONF += "--disable-vala" |
20 | 20 | ||