diff options
Diffstat (limited to 'meta-oe/recipes-support')
113 files changed, 1517 insertions, 679 deletions
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 bb1f53624..4b0e74227 100644 --- a/meta-oe/recipes-support/atop/atop_2.4.0.bb +++ b/meta-oe/recipes-support/atop/atop_2.4.0.bb | |||
@@ -35,12 +35,12 @@ do_install() { | |||
35 | make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \ | 35 | make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \ |
36 | PMPATHD=${systemd_unitdir}/system-sleep systemdinstall | 36 | PMPATHD=${systemd_unitdir}/system-sleep systemdinstall |
37 | install -d ${D}${sysconfdir}/tmpfiles.d | 37 | install -d ${D}${sysconfdir}/tmpfiles.d |
38 | install -m 644 ${WORKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf | 38 | install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf |
39 | rm -f ${D}${systemd_system_unitdir}/atopacct.service | 39 | rm -f ${D}${systemd_system_unitdir}/atopacct.service |
40 | else | 40 | else |
41 | make DESTDIR=${D} VERS=${PV} sysvinstall | 41 | make DESTDIR=${D} VERS=${PV} sysvinstall |
42 | install -d ${D}${sysconfdir}/default/volatiles | 42 | install -d ${D}${sysconfdir}/default/volatiles |
43 | install -m 644 ${WORKDIR}/volatiles.99_atop ${D}${sysconfdir}/default/volatiles/99_atop | 43 | install -m 644 ${UNPACKDIR}/volatiles.99_atop ${D}${sysconfdir}/default/volatiles/99_atop |
44 | rm -f ${D}${sysconfdir}/init.d/atopacct | 44 | rm -f ${D}${sysconfdir}/init.d/atopacct |
45 | fi | 45 | fi |
46 | 46 | ||
diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb index 2d91ac173..ddd081e11 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb | |||
@@ -5,7 +5,7 @@ SECTION = "libs" | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" | 6 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" |
7 | 7 | ||
8 | SRC_URI = "https://c-ares.org/download/${BPN}-${PV}.tar.gz \ | 8 | SRC_URI = "https://github.com/c-ares/c-ares/releases/download/cares-1_27_0/${BPN}-${PV}.tar.gz \ |
9 | file://run-ptest" | 9 | file://run-ptest" |
10 | SRC_URI[sha256sum] = "0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b" | 10 | SRC_URI[sha256sum] = "0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b" |
11 | 11 | ||
@@ -20,7 +20,7 @@ EXTRA_OECMAKE = "-DCARES_STATIC=${@ 'ON' if d.getVar('DISABLE_STATIC') == '' els | |||
20 | do_install_ptest () { | 20 | do_install_ptest () { |
21 | install -d ${D}${PTEST_PATH} | 21 | install -d ${D}${PTEST_PATH} |
22 | install -m 0755 ${B}/bin/arestest ${D}${PTEST_PATH} | 22 | install -m 0755 ${B}/bin/arestest ${D}${PTEST_PATH} |
23 | install -m 0755 ${WORKDIR}/run-ptest ${D}${PTEST_PATH} | 23 | install -m 0755 ${UNPACKDIR}/run-ptest ${D}${PTEST_PATH} |
24 | } | 24 | } |
25 | 25 | ||
26 | PACKAGE_BEFORE_PN = "${PN}-utils" | 26 | PACKAGE_BEFORE_PN = "${PN}-utils" |
diff --git a/meta-oe/recipes-support/cabextract/cabextract/fix-fnmatch.patch b/meta-oe/recipes-support/cabextract/cabextract/fix-fnmatch.patch new file mode 100644 index 000000000..bd486283b --- /dev/null +++ b/meta-oe/recipes-support/cabextract/cabextract/fix-fnmatch.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From - Mon Jun 11 00:00:00 2024 | ||
2 | From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
3 | Subject: [PATCH] Don't play with fnmatch.c replacement | ||
4 | |||
5 | Currently fnmatch.c, even if it is selected, conditionally disables compilation | ||
6 | of fnmatch() funciton even though the rest of the code expects to get it (e.g. | ||
7 | because Autoconf didn't detect the working implementation and enabled fnmatch.c | ||
8 | to replace it). Drop the extra conditionals, to fix Autoconf magic. | ||
9 | |||
10 | Observed error: | ||
11 | |||
12 | ld: src/cabextract.o: in function `process_cabinet': | ||
13 | /usr/src/debug/cabextract/1.11/src/cabextract.c:499:(.text.startup+0xf1c): undefined reference to `rpl_fnmatch' | ||
14 | collect2: error: ld returned 1 exit status | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/kyz/libmspack/pull/51] | ||
17 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
18 | |||
19 | Index: cabextract-1.11/fnmatch.c | ||
20 | =================================================================== | ||
21 | --- cabextract-1.11.orig/fnmatch.c | ||
22 | +++ cabextract-1.11/fnmatch.c | ||
23 | @@ -49,11 +49,6 @@ static const char rcsid[] = | ||
24 | it is simpler to just do this in the source for each such file. | ||
25 | */ | ||
26 | |||
27 | -#if defined (_LIBC) || !defined (__GNU_LIBRARY__) | ||
28 | - | ||
29 | -#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS) | ||
30 | -#endif | ||
31 | - | ||
32 | /* Match STRING against the filename pattern PATTERN, returning zero if | ||
33 | it matches, nonzero if not. */ | ||
34 | int | ||
35 | @@ -216,5 +211,3 @@ int flags; | ||
36 | |||
37 | return FNM_NOMATCH; | ||
38 | } | ||
39 | - | ||
40 | -#endif /* _LIBC or not __GNU_LIBRARY__. */ | ||
diff --git a/meta-oe/recipes-support/cabextract/cabextract_1.11.bb b/meta-oe/recipes-support/cabextract/cabextract_1.11.bb new file mode 100644 index 000000000..0f06489ca --- /dev/null +++ b/meta-oe/recipes-support/cabextract/cabextract_1.11.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "Software for extracting Microsoft cabinet files" | ||
2 | DESCRIPTION = "tool for extracting Microsoft cabinet files" | ||
3 | HOMEPAGE = "http://www.cabextract.org.uk/" | ||
4 | SECTION = "console/utils" | ||
5 | |||
6 | LICENSE = "GPL-3.0-or-later" | ||
7 | LIC_FILES_CHKSUM = "file://src/cabextract.c;beginline=4;endline=11;md5=b0a10c6d3843f262114e7ecf91fc7e78" | ||
8 | |||
9 | SRC_URI = "\ | ||
10 | https://www.cabextract.org.uk/cabextract-${PV}.tar.gz \ | ||
11 | file://fix-fnmatch.patch \ | ||
12 | " | ||
13 | |||
14 | SRC_URI[sha256sum] = "b5546db1155e4c718ff3d4b278573604f30dd64c3c5bfd4657cd089b823a3ac6" | ||
15 | |||
16 | DEPENDS = "libmspack" | ||
17 | |||
18 | EXTRA_OECONF = "--with-external-libmspack" | ||
19 | |||
20 | inherit autotools pkgconfig | ||
21 | |||
22 | BBCLASSEXTEND += "native nativesdk" | ||
diff --git a/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb b/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb new file mode 100644 index 000000000..169a5f271 --- /dev/null +++ b/meta-oe/recipes-support/cabextract/libmspack_0.11alpha.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | SUMMARY = "A library for Microsoft compression formats" | ||
2 | DESCRIPTION = "The library provides compressors and decompressors,\ | ||
3 | archivers and dearchivers for Microsoft compression formats: CAB, CHM, WIM,\ | ||
4 | LIT, HLP, KWAJ and SZDD." | ||
5 | HOMEPAGE = "http://www.cabextract.org.uk/libmspack/" | ||
6 | SECTION = "lib" | ||
7 | LICENSE = "LGPL-2.1-only" | ||
8 | |||
9 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" | ||
10 | |||
11 | SRC_URI = "https://www.cabextract.org.uk/libmspack/libmspack-${PV}.tar.gz" | ||
12 | SRC_URI[sha256sum] = "70dd1fb2f0aecc36791b71a1e1840e62173079eadaa081192d1c323a0eeea21b" | ||
13 | |||
14 | inherit autotools | ||
15 | |||
16 | BBCLASSEXTEND += "native nativesdk" | ||
diff --git a/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-oe/recipes-support/ckermit/ckermit_302.bb index 53f2b9d2c..1ee776cef 100644 --- a/meta-oe/recipes-support/ckermit/ckermit_302.bb +++ b/meta-oe/recipes-support/ckermit/ckermit_302.bb | |||
@@ -45,7 +45,7 @@ do_compile () { | |||
45 | -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ | 45 | -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ |
46 | -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ | 46 | -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ |
47 | -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ | 47 | -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ |
48 | -DNOARROWKEYS" | 48 | -DNOARROWKEYS -DMAINTYPE=int" |
49 | } | 49 | } |
50 | 50 | ||
51 | do_install () { | 51 | do_install () { |
diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch index aae2be8c1..a120b7311 100644 --- a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch +++ b/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cbb8f5c05fce1d56ae2e5fa9f57fc49c47bed5ab Mon Sep 17 00:00:00 2001 | 1 | From d16aed3118bee1e0a7d0bc9e0f34c427a405a6d8 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: Sun, 12 May 2019 21:58:02 +0200 | 3 | Date: Sun, 12 May 2019 21:58:02 +0200 |
4 | Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev | 4 | Subject: [PATCH] Move the function cd_icc_create_from_edid to avoid udev |
@@ -89,10 +89,10 @@ index a5e2328..dec509a 100644 | |||
89 | +} | 89 | +} |
90 | + | 90 | + |
91 | diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c | 91 | diff --git a/lib/colord/cd-icc.c b/lib/colord/cd-icc.c |
92 | index 8beec43..398ff7a 100644 | 92 | index 3937d8a..daf6f4d 100644 |
93 | --- a/lib/colord/cd-icc.c | 93 | --- a/lib/colord/cd-icc.c |
94 | +++ b/lib/colord/cd-icc.c | 94 | +++ b/lib/colord/cd-icc.c |
95 | @@ -3114,68 +3114,6 @@ cd_icc_create_default (CdIcc *icc, GError **error) | 95 | @@ -3117,68 +3117,6 @@ cd_icc_create_default (CdIcc *icc, GError **error) |
96 | return cd_icc_create_default_full (icc, CD_ICC_LOAD_FLAGS_NONE, error); | 96 | return cd_icc_create_default_full (icc, CD_ICC_LOAD_FLAGS_NONE, error); |
97 | } | 97 | } |
98 | 98 | ||
@@ -161,6 +161,3 @@ index 8beec43..398ff7a 100644 | |||
161 | /** | 161 | /** |
162 | * cd_icc_create_from_edid: | 162 | * cd_icc_create_from_edid: |
163 | * @icc: A valid #CdIcc | 163 | * @icc: A valid #CdIcc |
164 | -- | ||
165 | 2.20.1 | ||
166 | |||
diff --git a/meta-oe/recipes-support/colord/colord.inc b/meta-oe/recipes-support/colord/colord.inc index 0ae1a30fe..cafbaaa69 100644 --- a/meta-oe/recipes-support/colord/colord.inc +++ b/meta-oe/recipes-support/colord/colord.inc | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ | |||
6 | file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ | 6 | file://meson.build;beginline=3;endline=3;md5=f42198707d793be58b274d34fd5238c3 \ |
7 | " | 7 | " |
8 | 8 | ||
9 | PV = "1.4.6" | 9 | PV = "1.4.7" |
10 | SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" | 10 | SRC_URI = "https://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" |
11 | SRC_URI[sha256sum] = "7407631a27bfe5d1b672e7ae42777001c105d860b7b7392283c8c6300de88e6f" | 11 | SRC_URI[sha256sum] = "de02d9910634ae159547585cec414e450f711c27235453b4f9b38a9f2361a653" |
12 | 12 | ||
diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.4.bb b/meta-oe/recipes-support/composefs/composefs_1.0.4.bb new file mode 100644 index 000000000..aaf33b40e --- /dev/null +++ b/meta-oe/recipes-support/composefs/composefs_1.0.4.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | SUMMARY = "Tools to handle creating and mounting composefs images" | ||
2 | DESCRIPTION = "The composefs project combines several underlying Linux \ | ||
3 | features to provide a very flexible mechanism to support read-only mountable \ | ||
4 | filesystem trees, stacking on top of an underlying "lower" Linux filesystem." | ||
5 | HOMEPAGE = "https://github.com/containers/composefs" | ||
6 | LICENSE = "GPL-3.0-or-later & LGPL-2.0-or-later & Apache-2.0" | ||
7 | LIC_FILES_CHKSUM = "\ | ||
8 | file://BSD-2-Clause.txt;md5=121c8a0a8fa5961a26b7863034ebcce8 \ | ||
9 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
10 | file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ | ||
11 | file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ | ||
12 | file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ | ||
13 | file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
14 | " | ||
15 | |||
16 | PV .= "+git${SRCPV}" | ||
17 | SRCREV = "7623e4dc89f62ada5724d4e41d0a16d2671312f5" | ||
18 | SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" | ||
19 | |||
20 | S = "${WORKDIR}/git" | ||
21 | |||
22 | inherit autotools pkgconfig | ||
23 | |||
24 | DEPENDS = "openssl" | ||
25 | |||
26 | EXTRA_OECONF += " \ | ||
27 | --disable-man \ | ||
28 | --without-fuse \ | ||
29 | " | ||
30 | |||
31 | LDFLAGS:append:class-native = " -pthread" | ||
32 | |||
33 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb index d53e1a276..4247263b5 100644 --- a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb +++ b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "BSD-3-Clause" | |||
3 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116" | 3 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116" |
4 | 4 | ||
5 | GO_IMPORT = "github.com/usbarmory/crucible" | 5 | GO_IMPORT = "github.com/usbarmory/crucible" |
6 | SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master" | 6 | SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX}" |
7 | 7 | ||
8 | GO_INSTALL = "\ | 8 | GO_INSTALL = "\ |
9 | ${GO_IMPORT}/cmd/crucible \ | 9 | ${GO_IMPORT}/cmd/crucible \ |
diff --git a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb index 0e994d8b0..90db08544 100644 --- a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb +++ b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb | |||
@@ -2,15 +2,15 @@ SUMMARY = "Common files and packaging infrastructure for CT-API modules" | |||
2 | HOMEPAGE = "http://fedoraproject.org/" | 2 | HOMEPAGE = "http://fedoraproject.org/" |
3 | SECTION = "System Environment/Libraries" | 3 | SECTION = "System Environment/Libraries" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://../ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" | 5 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ctapi-common.LICENSE;md5=8744cd52545ecb45befebd0da6f70f0a" |
6 | 6 | ||
7 | SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ | 7 | SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.LICENSE \ |
8 | https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" | 8 | https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" |
9 | SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91" | 9 | SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91" |
10 | 10 | ||
11 | do_compile() { | 11 | do_compile() { |
12 | install -pm 644 ${WORKDIR}/ctapi-common.LICENSE LICENSE | 12 | install -pm 644 ${UNPACKDIR}/ctapi-common.LICENSE LICENSE |
13 | install -pm 644 ${WORKDIR}/ctapi-common.README README | 13 | install -pm 644 ${UNPACKDIR}/ctapi-common.README README |
14 | echo ${libdir}/ctapi > ctapi.conf | 14 | echo ${libdir}/ctapi > ctapi.conf |
15 | } | 15 | } |
16 | 16 | ||
diff --git a/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb b/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb index 17547ca83..23913e31f 100644 --- a/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb +++ b/meta-oe/recipes-support/dfu-util/dfu-util_0.11.bb | |||
@@ -9,3 +9,5 @@ SRC_URI = "http://dfu-util.sourceforge.net/releases/${BP}.tar.gz" | |||
9 | SRC_URI[sha256sum] = "b4b53ba21a82ef7e3d4c47df2952adf5fa494f499b6b0b57c58c5d04ae8ff19e" | 9 | SRC_URI[sha256sum] = "b4b53ba21a82ef7e3d4c47df2952adf5fa494f499b6b0b57c58c5d04ae8ff19e" |
10 | 10 | ||
11 | inherit autotools pkgconfig | 11 | inherit autotools pkgconfig |
12 | |||
13 | BBCLASSEXTEND = "nativesdk" | ||
diff --git a/meta-oe/recipes-support/dool/dool_1.3.1.bb b/meta-oe/recipes-support/dool/dool_1.3.2.bb index b20f8b401..f7e403018 100644 --- a/meta-oe/recipes-support/dool/dool_1.3.1.bb +++ b/meta-oe/recipes-support/dool/dool_1.3.2.bb | |||
@@ -12,7 +12,7 @@ RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell pyth | |||
12 | SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \ | 12 | SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRCREV = "30847c748483bc088549486292232d805b086b1f" | 15 | SRCREV = "b2862905be841232c9e36ce1e059d3fe34ef0cdf" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
diff --git a/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-oe/recipes-support/fbset/fbset-modes.bb index aa5f631c3..fcaf31795 100644 --- a/meta-oe/recipes-support/fbset/fbset-modes.bb +++ b/meta-oe/recipes-support/fbset/fbset-modes.bb | |||
@@ -6,11 +6,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 | |||
6 | PV = "0.1.0" | 6 | PV = "0.1.0" |
7 | 7 | ||
8 | SRC_URI = "file://fb.modes" | 8 | SRC_URI = "file://fb.modes" |
9 | S = "${WORKDIR}" | 9 | |
10 | S = "${WORKDIR}/sources" | ||
11 | UNPACKDIR = "${S}" | ||
10 | 12 | ||
11 | do_install() { | 13 | do_install() { |
12 | install -d ${D}${sysconfdir} | 14 | install -d ${D}${sysconfdir} |
13 | install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir} | 15 | install -m 0644 ${UNPACKDIR}/fb.modes ${D}${sysconfdir} |
14 | } | 16 | } |
15 | 17 | ||
16 | # fb.modes file is MACHINE_ARCH, base.bbclass correctly changes it to MACHINE_ARCH, but too late for allarch.bbclass | 18 | # fb.modes file is MACHINE_ARCH, base.bbclass correctly changes it to MACHINE_ARCH, but too late for allarch.bbclass |
diff --git a/meta-oe/recipes-support/fmt/fmt_10.2.1.bb b/meta-oe/recipes-support/fmt/fmt_10.2.1.bb deleted file mode 100644 index 1437eb480..000000000 --- a/meta-oe/recipes-support/fmt/fmt_10.2.1.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | SUMMARY = "open-source formatting library for C++" | ||
2 | DESCRIPTION = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams." | ||
3 | HOMEPAGE = "https://fmt.dev" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" | ||
6 | |||
7 | SRC_URI = "git://github.com/fmtlib/fmt;branch=10.x;protocol=https" | ||
8 | SRCREV = "e69e5f977d458f2650bb346dadf2ad30c5320281" | ||
9 | |||
10 | S = "${WORKDIR}/git" | ||
11 | |||
12 | inherit cmake | ||
13 | |||
14 | EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" | ||
15 | |||
16 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch new file mode 100644 index 000000000..62600cdda --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings-in-ainput-channel.patch | |||
@@ -0,0 +1,72 @@ | |||
1 | From 130094de3244d5039e463e1142e1ec487c1104ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Armin Novak <armin.novak@thincast.com> | ||
3 | Date: Tue, 22 Feb 2022 12:05:08 +0100 | ||
4 | Subject: [PATCH] Fixed compilation warnings in ainput channel | ||
5 | |||
6 | Upstream-Status: Backport [130094de3 Fixed compilation warnings in ainput channel] | ||
7 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
8 | --- | ||
9 | channels/ainput/server/ainput_main.c | 18 ++++++++++++------ | ||
10 | 1 file changed, 12 insertions(+), 6 deletions(-) | ||
11 | |||
12 | diff --git a/channels/ainput/server/ainput_main.c b/channels/ainput/server/ainput_main.c | ||
13 | index bc1737ee1..17d2ec681 100644 | ||
14 | --- a/channels/ainput/server/ainput_main.c | ||
15 | +++ b/channels/ainput/server/ainput_main.c | ||
16 | @@ -192,7 +192,7 @@ static UINT ainput_server_recv_mouse_event(ainput_server* ainput, wStream* s) | ||
17 | |||
18 | static HANDLE ainput_server_get_channel_handle(ainput_server* ainput) | ||
19 | { | ||
20 | - BYTE* buffer = NULL; | ||
21 | + void* buffer = NULL; | ||
22 | DWORD BytesReturned = 0; | ||
23 | HANDLE ChannelEvent = NULL; | ||
24 | |||
25 | @@ -389,7 +389,7 @@ ainput_server_context* ainput_server_context_new(HANDLE vcm) | ||
26 | goto fail; | ||
27 | return &ainput->context; | ||
28 | fail: | ||
29 | - ainput_server_context_free(ainput); | ||
30 | + ainput_server_context_free(&ainput->context); | ||
31 | return NULL; | ||
32 | } | ||
33 | |||
34 | @@ -496,17 +496,23 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) | ||
35 | break; | ||
36 | case AINPUT_OPENED: | ||
37 | { | ||
38 | - BYTE* buffer = NULL; | ||
39 | + union | ||
40 | + { | ||
41 | + BYTE* pb; | ||
42 | + void* pv; | ||
43 | + } buffer; | ||
44 | DWORD BytesReturned = 0; | ||
45 | |||
46 | - if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer, | ||
47 | + buffer.pv = NULL; | ||
48 | + | ||
49 | + if (WTSVirtualChannelQuery(ainput->ainput_channel, WTSVirtualChannelReady, &buffer.pv, | ||
50 | &BytesReturned) != TRUE) | ||
51 | { | ||
52 | WLog_ERR(TAG, "WTSVirtualChannelReady failed,"); | ||
53 | } | ||
54 | else | ||
55 | { | ||
56 | - if (*buffer != 0) | ||
57 | + if (*buffer.pb != 0) | ||
58 | { | ||
59 | error = ainput_server_send_version(ainput); | ||
60 | if (error) | ||
61 | @@ -518,7 +524,7 @@ UINT ainput_server_context_poll_int(ainput_server_context* context) | ||
62 | else | ||
63 | error = CHANNEL_RC_OK; | ||
64 | } | ||
65 | - WTSFreeMemory(buffer); | ||
66 | + WTSFreeMemory(buffer.pv); | ||
67 | } | ||
68 | break; | ||
69 | case AINPUT_VERSION_SENT: | ||
70 | -- | ||
71 | 2.43.0 | ||
72 | |||
diff --git a/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch new file mode 100644 index 000000000..7fae2703f --- /dev/null +++ b/meta-oe/recipes-support/freerdp/freerdp/0001-Fixed-compilation-warnings.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 75fa1fa5bd5ef2350390564245fd0984209ac092 Mon Sep 17 00:00:00 2001 | ||
2 | From: akallabeth <akallabeth@posteo.net> | ||
3 | Date: Mon, 4 Jul 2022 14:34:46 +0200 | ||
4 | Subject: [PATCH] Fixed compilation warnings | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/2da280b8a1748052b70b3f5a1ef0d8e932c33adc] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | client/X11/xf_graphics.c | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c | ||
13 | index 5aa1fd48b..fe81e0ed9 100644 | ||
14 | --- a/client/X11/xf_graphics.c | ||
15 | +++ b/client/X11/xf_graphics.c | ||
16 | @@ -438,7 +438,7 @@ static BOOL xf_Pointer_New(rdpContext* context, rdpPointer* pointer) | ||
17 | |||
18 | #endif | ||
19 | fail: | ||
20 | - WLog_DBG(TAG, "%s: %ld", __func__, rc ? pointer : -1); | ||
21 | + WLog_DBG(TAG, "%s: %p", __func__, rc ? pointer : NULL); | ||
22 | return rc; | ||
23 | } | ||
24 | |||
25 | -- | ||
26 | 2.45.0 | ||
27 | |||
diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb index 537d19263..b6974af73 100644 --- a/meta-oe/recipes-support/freerdp/freerdp3_3.4.0.bb +++ b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb | |||
@@ -7,7 +7,7 @@ DEPENDS = "openssl libusb1 uriparser cairo icu pkcs11-helper zlib jpeg" | |||
7 | 7 | ||
8 | inherit pkgconfig cmake | 8 | inherit pkgconfig cmake |
9 | 9 | ||
10 | SRCREV = "708f3764897e06297469a7b0507b3c9ecc041ad7" | 10 | SRCREV = "eda5c99686e15327f2f37b9cadf307e852b96adf" |
11 | SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https" | 11 | SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https" |
12 | 12 | ||
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb index 8de0e39ad..ee4d4530d 100644 --- a/meta-oe/recipes-support/freerdp/freerdp_2.11.2.bb +++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb | |||
@@ -13,11 +13,13 @@ inherit pkgconfig cmake gitpkgv | |||
13 | PE = "1" | 13 | PE = "1" |
14 | PKGV = "${GITPKGVTAG}" | 14 | PKGV = "${GITPKGVTAG}" |
15 | 15 | ||
16 | SRCREV = "a38c1be9eee39a9bc22b511fffe96e63fdf8ebe7" | 16 | SRCREV = "efa899d3deb8595a29fabb2a2251722f9d7e0d7f" |
17 | SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ | 17 | SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https \ |
18 | file://winpr-makecert-Build-with-install-RPATH.patch \ | 18 | file://winpr-makecert-Build-with-install-RPATH.patch \ |
19 | file://0001-Fixed-compilation-warnings.patch \ | ||
19 | file://0001-Fix-const-qualifier-error.patch \ | 20 | file://0001-Fix-const-qualifier-error.patch \ |
20 | file://0002-Do-not-install-tools-a-CMake-targets.patch \ | 21 | file://0002-Do-not-install-tools-a-CMake-targets.patch \ |
22 | file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \ | ||
21 | " | 23 | " |
22 | 24 | ||
23 | S = "${WORKDIR}/git" | 25 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-support/fuse/fuse3/fuse3.conf b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf new file mode 100644 index 000000000..a517c488f --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse3/fuse3.conf | |||
@@ -0,0 +1 @@ | |||
fuse | |||
diff --git a/meta-oe/recipes-support/fuse/fuse3/run-ptest b/meta-oe/recipes-support/fuse/fuse3/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse3/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' | ||
diff --git a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb new file mode 100644 index 000000000..47b070557 --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb | |||
@@ -0,0 +1,98 @@ | |||
1 | SUMMARY = "Implementation of a fully functional filesystem in a userspace program" | ||
2 | DESCRIPTION = "FUSE (Filesystem in Userspace) is a simple interface for userspace \ | ||
3 | programs to export a virtual filesystem to the Linux kernel. FUSE \ | ||
4 | also aims to provide a secure method for non privileged users to \ | ||
5 | create and mount their own filesystem implementations. \ | ||
6 | " | ||
7 | HOMEPAGE = "https://github.com/libfuse/libfuse" | ||
8 | SECTION = "libs" | ||
9 | LICENSE = "GPL-2.0-only & LGPL-2.0-only" | ||
10 | LIC_FILES_CHKSUM = " \ | ||
11 | file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
12 | file://LGPL2.txt;md5=4fbd65380cdd255951079008b364516c \ | ||
13 | file://LICENSE;md5=a55c12a2d7d742ecb41ca9ae0a6ddc66 \ | ||
14 | " | ||
15 | |||
16 | SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz" | ||
17 | SRC_URI[sha256sum] = "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87" | ||
18 | |||
19 | S = "${WORKDIR}/fuse-${PV}" | ||
20 | |||
21 | UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" | ||
22 | UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>3(\.\d+)+).tar.xz" | ||
23 | |||
24 | CVE_PRODUCT = "fuse_project:fuse" | ||
25 | |||
26 | inherit meson pkgconfig ptest | ||
27 | |||
28 | SRC_URI += " \ | ||
29 | file://run-ptest \ | ||
30 | file://fuse3.conf \ | ||
31 | " | ||
32 | |||
33 | RDEPENDS:${PN}-ptest += " \ | ||
34 | python3-pytest \ | ||
35 | python3-looseversion \ | ||
36 | bash \ | ||
37 | " | ||
38 | RRECOMMENDS:${PN}-ptest += " kernel-module-cuse" | ||
39 | |||
40 | do_install_ptest() { | ||
41 | install -d ${D}${PTEST_PATH}/test | ||
42 | install -d ${D}${PTEST_PATH}/example | ||
43 | install -d ${D}${PTEST_PATH}/util | ||
44 | cp -rf ${S}/test/* ${D}${PTEST_PATH}/test/ | ||
45 | |||
46 | example_excutables=`find ${B}/example -type f -executable` | ||
47 | util_excutables=`find ${B}/util -type f -executable` | ||
48 | test_excutables=`find ${B}/test -type f -executable` | ||
49 | |||
50 | for e in $example_excutables | ||
51 | do | ||
52 | cp -rf $e ${D}${PTEST_PATH}/example/ | ||
53 | done | ||
54 | |||
55 | for e in $util_excutables | ||
56 | do | ||
57 | cp -rf $e ${D}${PTEST_PATH}/util/ | ||
58 | done | ||
59 | |||
60 | for e in $test_excutables | ||
61 | do | ||
62 | cp -rf $e ${D}${PTEST_PATH}/test | ||
63 | done | ||
64 | } | ||
65 | |||
66 | DEPENDS = "udev" | ||
67 | |||
68 | PACKAGES =+ "fuse3-utils" | ||
69 | |||
70 | RPROVIDES:${PN}-dbg += "fuse3-utils-dbg" | ||
71 | |||
72 | RRECOMMENDS:${PN}:class-target = "kernel-module-fuse fuse3-utils" | ||
73 | |||
74 | FILES:${PN} += "${libdir}/libfuse3.so.*" | ||
75 | FILES:${PN}-dev += "${libdir}/libfuse3*.la" | ||
76 | |||
77 | # Forbid auto-renaming to libfuse3-utils | ||
78 | FILES:fuse3-utils = "${bindir} ${base_sbindir}" | ||
79 | DEBIAN_NOAUTONAME:fuse3-utils = "1" | ||
80 | DEBIAN_NOAUTONAME:${PN}-dbg = "1" | ||
81 | |||
82 | SYSTEMD_SERVICE:${PN} = "" | ||
83 | |||
84 | do_install:append() { | ||
85 | rm -rf ${D}${base_prefix}/dev | ||
86 | |||
87 | # systemd class remove the sysv_initddir only if systemd_system_unitdir | ||
88 | # contains anything, but it's not needed if sysvinit is not in DISTRO_FEATURES | ||
89 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then | ||
90 | rm -rf ${D}${sysconfdir}/init.d/ | ||
91 | fi | ||
92 | |||
93 | # Install systemd related configuration file | ||
94 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | ||
95 | install -d ${D}${sysconfdir}/modules-load.d | ||
96 | install -m 0644 ${UNPACKDIR}/fuse3.conf ${D}${sysconfdir}/modules-load.d | ||
97 | fi | ||
98 | } | ||
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch new file mode 100644 index 000000000..3017314ab --- /dev/null +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 7f0e99af540a333108b92d792923ec7fc9e9fad9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 28 May 2024 20:14:54 -0700 | ||
4 | Subject: [PATCH] cycleclock: Fix type conversion to match function return type | ||
5 | (#1794) | ||
6 | |||
7 | fixes build with clang19 | ||
8 | |||
9 | src/cycleclock.h:208:52: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long long') to 'int64_t' (aka 'long long') [-Werror,-Wsign-conversion] | ||
10 | 208 | return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo; | ||
11 | | ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~ | ||
12 | 1 error generated. | ||
13 | |||
14 | Upstream-Status: Backport [https://github.com/google/benchmark/commit/7f0e99af540a333108b92d792923ec7fc9e9fad9] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | src/cycleclock.h | 3 ++- | ||
18 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/src/cycleclock.h b/src/cycleclock.h | ||
21 | index a25843760..c657414e5 100644 | ||
22 | --- a/src/cycleclock.h | ||
23 | +++ b/src/cycleclock.h | ||
24 | @@ -205,7 +205,8 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { | ||
25 | "sub %0, zero, %0\n" | ||
26 | "and %1, %1, %0\n" | ||
27 | : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1)); | ||
28 | - return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo; | ||
29 | + return static_cast<int64_t>((static_cast<uint64_t>(cycles_hi1) << 32) | | ||
30 | + cycles_lo); | ||
31 | #else | ||
32 | uint64_t cycles; | ||
33 | asm volatile("rdtime %0" : "=r"(cycles)); | ||
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch new file mode 100644 index 000000000..cc22a7e8a --- /dev/null +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 54bca09aca6ccec41f852cb1f834463bc51290d0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 10 Jun 2024 21:45:22 -0700 | ||
4 | Subject: [PATCH] cycleclock: Fix type conversion to match function return type | ||
5 | on riscv64 | ||
6 | |||
7 | Fixes builds with clang | ||
8 | |||
9 | src/cycleclock.h:213:10: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long') to 'int64_t' (aka 'long') [-Werror,-Wsign-conversion] | ||
10 | 213 | return cycles; | ||
11 | | ~~~~~~ ^~~~~~ | ||
12 | 1 error generated. | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/google/benchmark/pull/1802] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | src/cycleclock.h | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/src/cycleclock.h b/src/cycleclock.h | ||
21 | index c657414..bd62f5d 100644 | ||
22 | --- a/src/cycleclock.h | ||
23 | +++ b/src/cycleclock.h | ||
24 | @@ -210,7 +210,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { | ||
25 | #else | ||
26 | uint64_t cycles; | ||
27 | asm volatile("rdtime %0" : "=r"(cycles)); | ||
28 | - return cycles; | ||
29 | + return static_cast<int64_t>(cycles); | ||
30 | #endif | ||
31 | #elif defined(__e2k__) || defined(__elbrus__) | ||
32 | struct timeval tv; | ||
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.3.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb index f945a30f3..706862f24 100644 --- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.3.bb +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb | |||
@@ -4,8 +4,10 @@ SECTION = "libs" | |||
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 = "git://github.com/google/benchmark.git;protocol=https;branch=main" | 7 | SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main \ |
8 | SRCREV = "344117638c8ff7e239044fd0fa7085839fc03021" | 8 | file://0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch \ |
9 | file://0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch" | ||
10 | SRCREV = "a4cf155615c63e019ae549e31703bf367df5b471" | ||
9 | 11 | ||
10 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
11 | 13 | ||
diff --git a/meta-oe/recipes-support/gosu/gosu_1.17.bb b/meta-oe/recipes-support/gosu/gosu_1.17.bb index a29d6bce4..6a4441fc2 100644 --- a/meta-oe/recipes-support/gosu/gosu_1.17.bb +++ b/meta-oe/recipes-support/gosu/gosu_1.17.bb | |||
@@ -5,9 +5,9 @@ LICENSE = "Apache-2.0 " | |||
5 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 5 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
6 | 6 | ||
7 | GO_IMPORT = "github.com/tianon/gosu" | 7 | GO_IMPORT = "github.com/tianon/gosu" |
8 | SRC_URI = "git://${GO_IMPORT}.git;branch=master;protocol=https \ | 8 | SRC_URI = "git://${GO_IMPORT}.git;destsuffix=src/${GO_IMPORT};branch=master;protocol=https \ |
9 | git://github.com/moby/sys;name=user;destsuffix=${S}/src/github.com/moby/sys;branch=main;protocol=https \ | 9 | git://github.com/moby/sys;name=user;destsuffix=src/github.com/moby/sys;branch=main;protocol=https \ |
10 | git://github.com/golang/sys;name=sys;destsuffix=${S}/src/golang.org/x/sys;branch=master;protocol=https \ | 10 | git://github.com/golang/sys;name=sys;destsuffix=src/golang.org/x/sys;branch=master;protocol=https \ |
11 | " | 11 | " |
12 | SRCREV = "0d1847490b448a17eb347e5e357f2c0478df87ad" | 12 | SRCREV = "0d1847490b448a17eb347e5e357f2c0478df87ad" |
13 | #v0.1.0 | 13 | #v0.1.0 |
@@ -17,6 +17,7 @@ SRCREV_sys = "95e765b1cc43ac521bd4fd501e00774e34401449" | |||
17 | 17 | ||
18 | SRCREV_FORMAT .= "_user_sys" | 18 | SRCREV_FORMAT .= "_user_sys" |
19 | 19 | ||
20 | S = "${UNPACKDIR}" | ||
20 | inherit go | 21 | inherit go |
21 | 22 | ||
22 | CGO_ENABLED = "1" | 23 | CGO_ENABLED = "1" |
diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb index 31503e9c6..25e5414a3 100644 --- a/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-oe/recipes-support/gpm/gpm_git.bb | |||
@@ -30,8 +30,8 @@ do_configure:prepend() { | |||
30 | 30 | ||
31 | do_install:append () { | 31 | do_install:append () { |
32 | install -d ${D}${systemd_system_unitdir} | 32 | install -d ${D}${systemd_system_unitdir} |
33 | sed 's:@bindir@:${sbindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service | 33 | sed 's:@bindir@:${sbindir}:' < ${UNPACKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service |
34 | install -D -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/gpm | 34 | install -D -m 0755 ${UNPACKDIR}/init ${D}${INIT_D_DIR}/gpm |
35 | ln -s libgpm.so.2 ${D}${libdir}/libgpm.so | 35 | ln -s libgpm.so.2 ${D}${libdir}/libgpm.so |
36 | } | 36 | } |
37 | 37 | ||
diff --git a/meta-oe/recipes-support/gsl/gsl_2.7.1.bb b/meta-oe/recipes-support/gsl/gsl_2.7.1.bb deleted file mode 100644 index a4dc1437e..000000000 --- a/meta-oe/recipes-support/gsl/gsl_2.7.1.bb +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | include gsl.inc | ||
2 | |||
3 | SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" | ||
4 | SRC_URI[sha256sum] = "dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b" | ||
diff --git a/meta-oe/recipes-support/gsl/gsl_2.8.bb b/meta-oe/recipes-support/gsl/gsl_2.8.bb new file mode 100644 index 000000000..45c776112 --- /dev/null +++ b/meta-oe/recipes-support/gsl/gsl_2.8.bb | |||
@@ -0,0 +1,4 @@ | |||
1 | include gsl.inc | ||
2 | |||
3 | SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" | ||
4 | SRC_URI[sha256sum] = "6a99eeed15632c6354895b1dd542ed5a855c0f15d9ad1326c6fe2b2c9e423190" | ||
diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch new file mode 100644 index 000000000..df27a59ee --- /dev/null +++ b/meta-oe/recipes-support/gsoap/gsoap/0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch | |||
@@ -0,0 +1,85 @@ | |||
1 | From 2b7a51556185539a0f9baef0f109e0814933d6b3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 19 May 2024 17:11:20 -0700 | ||
4 | Subject: [PATCH] Provide strtod_l signature on non-glibc linux ( musl ) | ||
5 | systems | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | gsoap/stdsoap2.c | 5 +++++ | ||
11 | 1 file changed, 5 insertions(+) | ||
12 | |||
13 | --- a/gsoap/stdsoap2.cpp | ||
14 | +++ b/gsoap/stdsoap2.cpp | ||
15 | @@ -74,6 +74,11 @@ A commercial use license is available fr | ||
16 | |||
17 | #include "stdsoap2.h" | ||
18 | |||
19 | +#if defined(__linux__) && !defined(__GLIBC__) | ||
20 | +struct __locale_struct; | ||
21 | +double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); | ||
22 | +#endif | ||
23 | + | ||
24 | #if GSOAP_VERSION != GSOAP_LIB_VERSION | ||
25 | # error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE" | ||
26 | #endif | ||
27 | @@ -5457,7 +5462,7 @@ tcp_gethostbyname(struct soap *soap, con | ||
28 | { | ||
29 | #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) | ||
30 | struct hostent_data ht_data; | ||
31 | -#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) | ||
32 | +#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) | ||
33 | int r; | ||
34 | char *tmpbuf = soap->tmpbuf; | ||
35 | size_t tmplen = sizeof(soap->tmpbuf); | ||
36 | @@ -5490,7 +5495,7 @@ tcp_gethostbyname(struct soap *soap, con | ||
37 | hostent = NULL; | ||
38 | soap->errnum = h_errno; | ||
39 | } | ||
40 | -#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) | ||
41 | +#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) | ||
42 | while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) | ||
43 | { | ||
44 | if (tmpbuf != soap->tmpbuf) | ||
45 | @@ -23192,7 +23197,7 @@ soap_strerror(struct soap *soap) | ||
46 | { | ||
47 | #ifndef WIN32 | ||
48 | # ifdef HAVE_STRERROR_R | ||
49 | -# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) | ||
50 | +# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) | ||
51 | err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ | ||
52 | if (err != 0) | ||
53 | soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); | ||
54 | --- a/gsoap/stdsoap2.c | ||
55 | +++ b/gsoap/stdsoap2.c | ||
56 | @@ -74,6 +74,11 @@ A commercial use license is available fr | ||
57 | |||
58 | #include "stdsoap2.h" | ||
59 | |||
60 | +#if defined(__linux__) && !defined(__GLIBC__) | ||
61 | +struct __locale_struct; | ||
62 | +double strtod_l(const char *__restrict, char **__restrict, struct __locale_struct *); | ||
63 | +#endif | ||
64 | + | ||
65 | #if GSOAP_VERSION != GSOAP_LIB_VERSION | ||
66 | # error "GSOAP VERSION MISMATCH IN LIBRARY: PLEASE REINSTALL PACKAGE" | ||
67 | #endif | ||
68 | @@ -5490,7 +5495,7 @@ tcp_gethostbyname(struct soap *soap, con | ||
69 | hostent = NULL; | ||
70 | soap->errnum = h_errno; | ||
71 | } | ||
72 | -#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) | ||
73 | +#elif (!defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && !defined(__QNX__) && !defined(QNX) && defined(HAVE_GETHOSTBYNAME_R) | ||
74 | while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) | ||
75 | { | ||
76 | if (tmpbuf != soap->tmpbuf) | ||
77 | @@ -23192,7 +23197,7 @@ soap_strerror(struct soap *soap) | ||
78 | { | ||
79 | #ifndef WIN32 | ||
80 | # ifdef HAVE_STRERROR_R | ||
81 | -# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) | ||
82 | +# if !defined(__GLIBC__) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) | ||
83 | err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ | ||
84 | if (err != 0) | ||
85 | soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); | ||
diff --git a/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch b/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch deleted file mode 100644 index 6ae02deb2..000000000 --- a/meta-oe/recipes-support/gsoap/gsoap/0001-Simplify-check-for-gethostbyname_r.patch +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | From fa923a50790c907725c822b2fc7d63b2da62b4ad Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 12 Mar 2023 13:34:55 -0700 | ||
4 | Subject: [PATCH] Simplify check for gethostbyname_r() | ||
5 | |||
6 | This helps build fix with musl. | ||
7 | |||
8 | Imported from Alpine: https://git.alpinelinux.org/aports/tree/community/gsoap/musl-fixes.patch | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | Upstream-Status: Pending | ||
13 | |||
14 | gsoap/stdsoap2.c | 6 ++---- | ||
15 | gsoap/stdsoap2.cpp | 10 ++-------- | ||
16 | 2 files changed, 4 insertions(+), 12 deletions(-) | ||
17 | |||
18 | diff --git a/gsoap/stdsoap2.c b/gsoap/stdsoap2.c | ||
19 | index 654a1e1..fa31d02 100644 | ||
20 | --- a/gsoap/stdsoap2.c | ||
21 | +++ b/gsoap/stdsoap2.c | ||
22 | @@ -5463,7 +5463,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, | ||
23 | hostent = NULL; | ||
24 | soap->errnum = h_errno; | ||
25 | } | ||
26 | -#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && defined(HAVE_GETHOSTBYNAME_R) | ||
27 | +#elif defined(HAVE_GETHOSTBYNAME_R) | ||
28 | while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) | ||
29 | { | ||
30 | if (tmpbuf != soap->tmpbuf) | ||
31 | @@ -5478,8 +5478,6 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, | ||
32 | if (!tmpbuf) | ||
33 | break; | ||
34 | } | ||
35 | -#elif defined(HAVE_GETHOSTBYNAME_R) | ||
36 | - hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); | ||
37 | #elif defined(VXWORKS) | ||
38 | /* vxWorks compatible */ | ||
39 | /* If the DNS resolver library resolvLib has been configured in the vxWorks | ||
40 | @@ -23112,7 +23110,7 @@ soap_strerror(struct soap *soap) | ||
41 | { | ||
42 | #ifndef WIN32 | ||
43 | # ifdef HAVE_STRERROR_R | ||
44 | -# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) | ||
45 | +# if 1 | ||
46 | err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ | ||
47 | if (err != 0) | ||
48 | soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); | ||
49 | diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp | ||
50 | index 654a1e1..5fd5fd6 100644 | ||
51 | --- a/gsoap/stdsoap2.cpp | ||
52 | +++ b/gsoap/stdsoap2.cpp | ||
53 | @@ -5430,7 +5430,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, | ||
54 | { | ||
55 | #if (defined(_AIX43) || defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R) | ||
56 | struct hostent_data ht_data; | ||
57 | -#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && defined(HAVE_GETHOSTBYNAME_R) | ||
58 | +#elif defined(HAVE_GETHOSTBYNAME_R) | ||
59 | int r; | ||
60 | char *tmpbuf = soap->tmpbuf; | ||
61 | size_t tmplen = sizeof(soap->tmpbuf); | ||
62 | @@ -5463,7 +5463,7 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, | ||
63 | hostent = NULL; | ||
64 | soap->errnum = h_errno; | ||
65 | } | ||
66 | -#elif (!defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && !defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 || defined(__ANDROID__) || defined(FREEBSD) || defined(__FreeBSD__)) && !defined(SUN_OS) && defined(HAVE_GETHOSTBYNAME_R) | ||
67 | +#elif defined(HAVE_GETHOSTBYNAME_R) | ||
68 | while ((r = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &hostent, &soap->errnum)) < 0) | ||
69 | { | ||
70 | if (tmpbuf != soap->tmpbuf) | ||
71 | @@ -5478,8 +5478,6 @@ tcp_gethostbyname(struct soap *soap, const char *addr, struct hostent *hostent, | ||
72 | if (!tmpbuf) | ||
73 | break; | ||
74 | } | ||
75 | -#elif defined(HAVE_GETHOSTBYNAME_R) | ||
76 | - hostent = gethostbyname_r(addr, hostent, tmpbuf, tmplen, &soap->errnum); | ||
77 | #elif defined(VXWORKS) | ||
78 | /* vxWorks compatible */ | ||
79 | /* If the DNS resolver library resolvLib has been configured in the vxWorks | ||
80 | @@ -23112,13 +23110,9 @@ soap_strerror(struct soap *soap) | ||
81 | { | ||
82 | #ifndef WIN32 | ||
83 | # ifdef HAVE_STRERROR_R | ||
84 | -# if !defined(_GNU_SOURCE) || (!(~_GNU_SOURCE+1) && ((!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600))) | ||
85 | err = strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* XSI-compliant */ | ||
86 | if (err != 0) | ||
87 | soap_strcpy(soap->msgbuf, sizeof(soap->msgbuf), "unknown error"); | ||
88 | -# else | ||
89 | - return strerror_r(err, soap->msgbuf, sizeof(soap->msgbuf)); /* GNU-specific */ | ||
90 | -# endif | ||
91 | # else | ||
92 | return strerror(err); | ||
93 | # endif | ||
94 | -- | ||
95 | 2.39.2 | ||
96 | |||
diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb index 6d8b53d30..5528e87e6 100644 --- a/meta-oe/recipes-support/gsoap/gsoap_2.8.126.bb +++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb | |||
@@ -5,9 +5,9 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception" | |||
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4f40a941379143186f9602242c3fb729 \ |
6 | file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" | 6 | file://GPLv2_license.txt;md5=a33672dbe491b6517750a0389063508b" |
7 | 7 | ||
8 | SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip" | 8 | SRC_URI = "https://prdownloads.sourceforge.net/${BPN}2/${BPN}_${PV}.zip \ |
9 | SRC_URI:append:libc-musl = " file://0001-Simplify-check-for-gethostbyname_r.patch" | 9 | file://0001-Provide-strtod_l-signature-on-non-glibc-linux-musl-s.patch" |
10 | SRC_URI[sha256sum] = "b65190ebf8c2517d6fafbdc2000bc7bc650d921a02f4aa53eb1e3df267592c4a" | 10 | SRC_URI[sha256sum] = "63478e555c0ccde0164f055ff605b02805db0abc6712a04bcb14cb617b047218" |
11 | 11 | ||
12 | inherit autotools | 12 | inherit autotools |
13 | 13 | ||
diff --git a/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch b/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch new file mode 100644 index 000000000..38f5c8899 --- /dev/null +++ b/meta-oe/recipes-support/hddtemp/hddtemp/0001-po-force-Language-header-for-fr-and-de-locals.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 04149f9ec9b37b5bb4c2b6c38d4560b2c122c483 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yoann Congal <yoann.congal@smile.fr> | ||
3 | Date: Thu, 23 May 2024 23:28:42 +0200 | ||
4 | Subject: [PATCH] po: force Language: header for "fr" and "de" locals | ||
5 | |||
6 | Language: header is "new" and used to be derived from Language-Team | ||
7 | header. But, for fr.po and de.po, Language can't be derived. | ||
8 | |||
9 | Force "Language" header to avoid having a default Language header. | ||
10 | |||
11 | Upstream-Status: Inactive-Upstream [lastrelease: 26-Apr-2006] | ||
12 | See: http://download.savannah.nongnu.org/releases/hddtemp/?C=M&O=D | ||
13 | |||
14 | Signed-off-by: Yoann Congal <yoann.congal@smile.fr> | ||
15 | --- | ||
16 | po/de.po | 1 + | ||
17 | po/fr.po | 1 + | ||
18 | 2 files changed, 2 insertions(+) | ||
19 | |||
20 | diff --git a/po/de.po b/po/de.po | ||
21 | index 3b79e08..d04976b 100644 | ||
22 | --- a/po/de.po | ||
23 | +++ b/po/de.po | ||
24 | @@ -13,6 +13,7 @@ msgstr "" | ||
25 | "PO-Revision-Date: 2011-08-30 16:40+0200\n" | ||
26 | "Last-Translator: Vinzenz Vietzke <vinz@v1nz.org>\n" | ||
27 | "Language-Team: <debian-l10n-german@lists.debian.org>\n" | ||
28 | +"Language: de\n" | ||
29 | "MIME-Version: 1.0\n" | ||
30 | "Content-Type: text/plain; charset=UTF-8\n" | ||
31 | "Content-Transfer-Encoding: 8bit" | ||
32 | diff --git a/po/fr.po b/po/fr.po | ||
33 | index 2fd97c5..0b3bf19 100644 | ||
34 | --- a/po/fr.po | ||
35 | +++ b/po/fr.po | ||
36 | @@ -12,6 +12,7 @@ msgstr "" | ||
37 | "PO-Revision-Date: 2011-08-30 16:38+0200\n" | ||
38 | "Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n" | ||
39 | "Language-Team: FRANCAIS <fr@li.org>\n" | ||
40 | +"Language: fr\n" | ||
41 | "MIME-Version: 1.0\n" | ||
42 | "Content-Type: text/plain; charset=ISO-8859-1\n" | ||
43 | "Content-Transfer-Encoding: 8bit\n" | ||
44 | -- | ||
45 | 2.39.2 | ||
46 | |||
diff --git a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb index b204ea4dd..75feccb87 100644 --- a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb +++ b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb | |||
@@ -10,6 +10,7 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/hddtemp/hddtemp-0.3-beta15.tar.bz2 \ | |||
10 | file://0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch \ | 10 | file://0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch \ |
11 | file://0001-configure.ac-Rename-to-configure.ac-and-use-external.patch \ | 11 | file://0001-configure.ac-Rename-to-configure.ac-and-use-external.patch \ |
12 | file://0001-sata.c-Declare-ata_get_powermode-prototype.patch \ | 12 | file://0001-sata.c-Declare-ata_get_powermode-prototype.patch \ |
13 | file://0001-po-force-Language-header-for-fr-and-de-locals.patch \ | ||
13 | file://hddtemp.db \ | 14 | file://hddtemp.db \ |
14 | file://init \ | 15 | file://init \ |
15 | " | 16 | " |
@@ -25,9 +26,9 @@ FILES:${PN} += "/usr/share/misc/hddtemp.db" | |||
25 | 26 | ||
26 | do_install:append() { | 27 | do_install:append() { |
27 | install -d ${D}/usr/share/misc/ | 28 | install -d ${D}/usr/share/misc/ |
28 | install -m 0644 ${WORKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db | 29 | install -m 0644 ${UNPACKDIR}/hddtemp.db ${D}/usr/share/misc/hddtemp.db |
29 | install -d ${D}${sysconfdir}/init.d | 30 | install -d ${D}${sysconfdir}/init.d |
30 | install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hddtemp | 31 | install -m 0644 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/hddtemp |
31 | } | 32 | } |
32 | 33 | ||
33 | INITSCRIPT_NAME = "hddtemp" | 34 | INITSCRIPT_NAME = "hddtemp" |
diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.381.bb b/meta-oe/recipes-support/hwdata/hwdata_0.383.bb index 291b27372..cfa6ae0e4 100644 --- a/meta-oe/recipes-support/hwdata/hwdata_0.381.bb +++ b/meta-oe/recipes-support/hwdata/hwdata_0.383.bb | |||
@@ -5,7 +5,7 @@ SECTION = "System/Base" | |||
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 = "4463530857af32d9dbfcfa9939c2304b51e5e58d" | 8 | SRCREV = "229069b51b488bc776602d82315188cd1fbf4887" |
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/imagemagick/imagemagick_7.1.1.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index 6ab8a61b9..61dc1b795 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb | |||
@@ -99,3 +99,23 @@ ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1" | |||
99 | ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1" | 99 | 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 | |||
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-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-9807] = "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" | ||
107 | CVE_STATUS[CVE-2014-9808] = "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" | ||
108 | CVE_STATUS[CVE-2014-9809] = "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" | ||
109 | CVE_STATUS[CVE-2014-9810] = "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" | ||
110 | CVE_STATUS[CVE-2014-9811] = "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" | ||
111 | CVE_STATUS[CVE-2014-9812] = "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" | ||
112 | CVE_STATUS[CVE-2014-9813] = "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" | ||
113 | CVE_STATUS[CVE-2014-9814] = "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" | ||
114 | CVE_STATUS[CVE-2014-9815] = "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" | ||
115 | CVE_STATUS[CVE-2014-9816] = "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" | ||
116 | CVE_STATUS[CVE-2014-9817] = "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" | ||
117 | CVE_STATUS[CVE-2014-9818] = "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 | 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-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-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" | ||
diff --git a/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch b/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch deleted file mode 100644 index 4824344f0..000000000 --- a/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From 1761298b73c759c07e4652ada307f68512a75ff1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 25 Mar 2022 20:44:41 -0700 | ||
4 | Subject: [PATCH] iniparser.pc: Make libpath a variable | ||
5 | |||
6 | Will set according to baselib that yocto exports. | ||
7 | |||
8 | Upstream-Status: Inappropriate [OE-specific] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | iniparser.pc | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | --- a/iniparser.pc | ||
15 | +++ b/iniparser.pc | ||
16 | @@ -1,6 +1,6 @@ | ||
17 | prefix=/usr | ||
18 | exec_prefix=/usr | ||
19 | -libdir=${exec_prefix}/lib | ||
20 | +libdir=${exec_prefix}/@baselib@ | ||
21 | includedir=${prefix}/include | ||
22 | datarootdir=${prefix}/share | ||
23 | datadir=${datarootdir} | ||
diff --git a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch b/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch deleted file mode 100644 index 46c1b0f7a..000000000 --- a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | Origin: Debian packaging | ||
2 | From: Klee Dienes <klee@mit.edu> | ||
3 | Date: Thu, 13 Feb 2014 07:03:26 -0500 | ||
4 | Subject: Add CMake support. | ||
5 | |||
6 | --- | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ | ||
10 | 1 file changed, 44 insertions(+) | ||
11 | create mode 100644 CMakeLists.txt | ||
12 | |||
13 | --- /dev/null | ||
14 | +++ b/CMakeLists.txt | ||
15 | @@ -0,0 +1,50 @@ | ||
16 | +cmake_minimum_required (VERSION 2.8.8) | ||
17 | + | ||
18 | +project (iniparser) | ||
19 | +include (GNUInstallDirs) | ||
20 | + | ||
21 | +include_directories (src) | ||
22 | + | ||
23 | +set(INIPARSER_SRCS src/dictionary.c src/iniparser.c) | ||
24 | +set(INIPARSER_HDRS src/dictionary.h src/iniparser.h) | ||
25 | + | ||
26 | +add_library(iniparser-shared SHARED ${INIPARSER_SRCS} ${INIPARSER_HDRS}) | ||
27 | +add_library(iniparser-static STATIC ${INIPARSER_SRCS} ${INIPARSER_HDRS}) | ||
28 | + | ||
29 | +set_target_properties(iniparser-shared PROPERTIES SOVERSION 1) | ||
30 | +set_target_properties(iniparser-shared PROPERTIES OUTPUT_NAME iniparser) | ||
31 | +set_target_properties(iniparser-static PROPERTIES OUTPUT_NAME iniparser) | ||
32 | + | ||
33 | +install (TARGETS iniparser-shared | ||
34 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
35 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
36 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
37 | + | ||
38 | +install (TARGETS iniparser-static | ||
39 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
40 | + DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
41 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
42 | + | ||
43 | +find_package(Doxygen) | ||
44 | +if (NOT DOXYGEN_FOUND) | ||
45 | +message(FATAL_ERROR "Doxygen is needed to build the documentation. Please install it correctly") | ||
46 | +endif() | ||
47 | + | ||
48 | +file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/iniparser.dox | ||
49 | + "@INCLUDE = ${CMAKE_CURRENT_SOURCE_DIR}/doc/iniparser.dox\n" | ||
50 | + "OUTPUT_DIRECTORY = ${CMAKE_CURRENT_BINARY_DIR}\n" | ||
51 | + ) | ||
52 | + | ||
53 | +add_custom_target (doc ALL | ||
54 | + COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/iniparser.dox | ||
55 | + SOURCES doc/iniparser.dox) | ||
56 | + | ||
57 | +enable_testing() | ||
58 | + | ||
59 | +add_test(NAME testsuite | ||
60 | + COMMAND make | ||
61 | + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test) | ||
62 | + | ||
63 | +install (FILES ${INIPARSER_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iniparser) | ||
64 | + | ||
65 | +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_DOCDIR}) | ||
diff --git a/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch b/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch deleted file mode 100644 index db5fb06aa..000000000 --- a/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | CVE: CVE-2023-33461 | ||
2 | Upstream-Status: Backport [https://github.com/ndevilla/iniparser/pull/146/commits/ace9871f65d11b5d73f0b9ee8cf5d2807439442d] | ||
3 | Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> | ||
4 | |||
5 | |||
6 | From ace9871f65d11b5d73f0b9ee8cf5d2807439442d Mon Sep 17 00:00:00 2001 | ||
7 | From: Antonio <antoniolrt@gmail.com> | ||
8 | Date: Fri, 2 Jun 2023 15:03:10 -0300 | ||
9 | Subject: [PATCH] Handle null return from iniparser_getstring | ||
10 | |||
11 | Fix handling of NULL returns from iniparser_getstring in | ||
12 | iniparser_getboolean, iniparser_getlongint and iniparser_getdouble, | ||
13 | avoiding a crash. | ||
14 | --- | ||
15 | src/iniparser.c | 6 +++--- | ||
16 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/src/iniparser.c b/src/iniparser.c | ||
19 | index f1d1658..dbceb20 100644 | ||
20 | --- a/src/iniparser.c | ||
21 | +++ b/src/iniparser.c | ||
22 | @@ -456,7 +456,7 @@ long int iniparser_getlongint(const dictionary * d, const char * key, long int n | ||
23 | const char * str ; | ||
24 | |||
25 | str = iniparser_getstring(d, key, INI_INVALID_KEY); | ||
26 | - if (str==INI_INVALID_KEY) return notfound ; | ||
27 | + if (str==NULL || str==INI_INVALID_KEY) return notfound ; | ||
28 | return strtol(str, NULL, 0); | ||
29 | } | ||
30 | |||
31 | @@ -511,7 +511,7 @@ double iniparser_getdouble(const dictionary * d, const char * key, double notfou | ||
32 | const char * str ; | ||
33 | |||
34 | str = iniparser_getstring(d, key, INI_INVALID_KEY); | ||
35 | - if (str==INI_INVALID_KEY) return notfound ; | ||
36 | + if (str==NULL || str==INI_INVALID_KEY) return notfound ; | ||
37 | return atof(str); | ||
38 | } | ||
39 | |||
40 | @@ -553,7 +553,7 @@ int iniparser_getboolean(const dictionary * d, const char * key, int notfound) | ||
41 | const char * c ; | ||
42 | |||
43 | c = iniparser_getstring(d, key, INI_INVALID_KEY); | ||
44 | - if (c==INI_INVALID_KEY) return notfound ; | ||
45 | + if (c==NULL || c==INI_INVALID_KEY) return notfound ; | ||
46 | if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') { | ||
47 | ret = 1 ; | ||
48 | } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') { | ||
diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb b/meta-oe/recipes-support/iniparser/iniparser_4.1.bb deleted file mode 100644 index c80668d27..000000000 --- a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | SUMMARY = "The iniParser library is a simple C library offering INI file parsing services (both reading and writing)." | ||
2 | SECTION = "libs" | ||
3 | HOMEPAGE = "https://github.com/ndevilla/iniparser" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e02baf71c76e0650e667d7da133379ac" | ||
6 | |||
7 | DEPENDS = "doxygen-native" | ||
8 | |||
9 | PV .= "+git" | ||
10 | |||
11 | SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https;branch=master \ | ||
12 | file://0001-iniparser.pc-Make-libpath-a-variable.patch \ | ||
13 | file://Add-CMake-support.patch \ | ||
14 | file://CVE-2023-33461.patch \ | ||
15 | " | ||
16 | |||
17 | SRCREV= "deb85ad4936d4ca32cc2260ce43323d47936410d" | ||
18 | |||
19 | S = "${WORKDIR}/git" | ||
20 | |||
21 | inherit cmake | ||
22 | |||
23 | do_install:append() { | ||
24 | install -Dm 0644 ${S}/iniparser.pc ${D}${libdir}/pkgconfig/iniparser.pc | ||
25 | sed -i -e 's,@baselib@,${baselib},g' ${D}${libdir}/pkgconfig/iniparser.pc | ||
26 | } | ||
27 | |||
28 | BBCLASSEXTEND += "native" | ||
diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb b/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb new file mode 100644 index 000000000..8c6c60a79 --- /dev/null +++ b/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "The iniParser library is a simple C library offering INI file parsing services (both reading and writing)." | ||
2 | SECTION = "libs" | ||
3 | HOMEPAGE = "https://gitlab.com/iniparser/iniparser" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" | ||
6 | SRCBRANCH = "main" | ||
7 | SRCREV = "762715ca6cdba9dcf31a5af9297b444f3b5b8c00" | ||
8 | |||
9 | SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}" | ||
10 | S = "${WORKDIR}/git" | ||
11 | |||
12 | inherit cmake | ||
13 | |||
14 | EXTRA_OECMAKE = " \ | ||
15 | -DBUILD_DOCS=OFF \ | ||
16 | " | ||
17 | |||
18 | FILES_${PN}-staticdev += "${libdir}/cmake/iniparser/iniparser-staticTargets*.cmake" | ||
diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc index 16fe557f7..592109b95 100644 --- a/meta-oe/recipes-support/libee/libee.inc +++ b/meta-oe/recipes-support/libee/libee.inc | |||
@@ -35,5 +35,5 @@ do_install_ptest() { | |||
35 | install -d ${D}${PTEST_PATH} | 35 | install -d ${D}${PTEST_PATH} |
36 | install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} | 36 | install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} |
37 | install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} | 37 | install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} |
38 | install -m 0755 ${WORKDIR}/ezapi1.sh ${D}${PTEST_PATH} | 38 | install -m 0755 ${UNPACKDIR}/ezapi1.sh ${D}${PTEST_PATH} |
39 | } | 39 | } |
diff --git a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb b/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb index 08d3f4e84..d453d0ab9 100644 --- a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb +++ b/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb | |||
@@ -21,5 +21,3 @@ EXTRA_OECMAKE = "-DUDEV_RULES_DIR=${nonarch_base_libdir}/udev/rules.d -DBUILD_EX | |||
21 | PACKAGE_BEFORE_PN = "${PN}-tools" | 21 | PACKAGE_BEFORE_PN = "${PN}-tools" |
22 | 22 | ||
23 | FILES:${PN}-tools = "${bindir}/fido2-*" | 23 | FILES:${PN}-tools = "${bindir}/fido2-*" |
24 | |||
25 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-bindings-cxx-disable-tests.patch b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-bindings-cxx-disable-tests.patch new file mode 100644 index 000000000..0b850ba13 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/0001-bindings-cxx-disable-tests.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 8293f0b8a329beed542f5c8a2efa4641759fccf4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | ||
3 | Date: Tue, 11 Jun 2024 10:34:14 +0200 | ||
4 | Subject: [PATCH] bindings: cxx: disable tests | ||
5 | |||
6 | Meta-openembedded is moving to catch2 v3 which will make the C++ tests | ||
7 | incompatible with the testing library. As this is an older version of | ||
8 | the project, just disable C++ tests entirely. | ||
9 | |||
10 | Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | ||
11 | --- | ||
12 | Upstream-Status: Inappropriate [upstream continues to use Catch2 v2] | ||
13 | |||
14 | bindings/cxx/Makefile.am | 6 ------ | ||
15 | 1 file changed, 6 deletions(-) | ||
16 | |||
17 | diff --git a/bindings/cxx/Makefile.am b/bindings/cxx/Makefile.am | ||
18 | index 5c40ceb..d901836 100644 | ||
19 | --- a/bindings/cxx/Makefile.am | ||
20 | +++ b/bindings/cxx/Makefile.am | ||
21 | @@ -19,9 +19,3 @@ pkgconfigdir = $(libdir)/pkgconfig | ||
22 | pkgconfig_DATA = libgpiodcxx.pc | ||
23 | |||
24 | SUBDIRS = . examples | ||
25 | - | ||
26 | -if WITH_TESTS | ||
27 | - | ||
28 | -SUBDIRS += tests | ||
29 | - | ||
30 | -endif | ||
31 | -- | ||
32 | 2.40.1 | ||
33 | |||
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest index 61b9b69fc..a56c2bb68 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest +++ b/meta-oe/recipes-support/libgpiod/libgpiod-1.x/run-ptest | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | testbins="gpiod-test gpio-tools-test gpiod-cxx-test gpiod_py_test.py" | 3 | testbins="gpiod-test gpio-tools-test gpiod_py_test.py" |
4 | 4 | ||
5 | ptestdir=$(dirname "$(readlink -f "$0")") | 5 | ptestdir=$(dirname "$(readlink -f "$0")") |
6 | cd $ptestdir/tests | 6 | cd $ptestdir/tests |
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch new file mode 100644 index 000000000..ac1eff510 --- /dev/null +++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch | |||
@@ -0,0 +1,530 @@ | |||
1 | From 0d3e1b3923a1fac80e9d75d8b5e33cd36f4fe659 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 31 May 2024 09:03:22 -0700 | ||
4 | Subject: [PATCH] bindings: cxx: Migrate C++ tests to use Catch2 v3 | ||
5 | |||
6 | Catch2 v3.x has API changes which needs to be addressed | ||
7 | in the tests themselves, hence this changeset is to fix | ||
8 | those. | ||
9 | |||
10 | Upstream-Status: Submitted [https://lore.kernel.org/linux-gpio/20240531184223.3949069-1-raj.khem@gmail.com/T/#u] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | ||
13 | --- | ||
14 | bindings/cxx/tests/Makefile.am | 2 +- | ||
15 | bindings/cxx/tests/gpiod-cxx-test-main.cpp | 3 +-- | ||
16 | bindings/cxx/tests/helpers.hpp | 8 +++--- | ||
17 | bindings/cxx/tests/tests-chip-info.cpp | 30 ++++++++++----------- | ||
18 | bindings/cxx/tests/tests-chip.cpp | 14 +++++----- | ||
19 | bindings/cxx/tests/tests-edge-event.cpp | 2 +- | ||
20 | bindings/cxx/tests/tests-info-event.cpp | 2 +- | ||
21 | bindings/cxx/tests/tests-line-config.cpp | 2 +- | ||
22 | bindings/cxx/tests/tests-line-info.cpp | 22 +++++++-------- | ||
23 | bindings/cxx/tests/tests-line-request.cpp | 16 +++++------ | ||
24 | bindings/cxx/tests/tests-line-settings.cpp | 2 +- | ||
25 | bindings/cxx/tests/tests-line.cpp | 2 +- | ||
26 | bindings/cxx/tests/tests-misc.cpp | 2 +- | ||
27 | bindings/cxx/tests/tests-request-config.cpp | 10 +++---- | ||
28 | configure.ac | 4 +-- | ||
29 | 15 files changed, 60 insertions(+), 61 deletions(-) | ||
30 | |||
31 | diff --git a/bindings/cxx/tests/Makefile.am b/bindings/cxx/tests/Makefile.am | ||
32 | index fbf80a1..d9284da 100644 | ||
33 | --- a/bindings/cxx/tests/Makefile.am | ||
34 | +++ b/bindings/cxx/tests/Makefile.am | ||
35 | @@ -4,7 +4,7 @@ | ||
36 | AM_CXXFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include | ||
37 | AM_CXXFLAGS += -I$(top_srcdir)/tests/gpiosim/ | ||
38 | AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17 $(CATCH2_CFLAGS) | ||
39 | -AM_LDFLAGS = -pthread | ||
40 | +AM_LDFLAGS = -pthread $(CATCH2_LIBS) | ||
41 | LDADD = $(top_builddir)/bindings/cxx/libgpiodcxx.la | ||
42 | LDADD += $(top_builddir)/tests/gpiosim/libgpiosim.la | ||
43 | |||
44 | diff --git a/bindings/cxx/tests/gpiod-cxx-test-main.cpp b/bindings/cxx/tests/gpiod-cxx-test-main.cpp | ||
45 | index 11bf8e5..ec48286 100644 | ||
46 | --- a/bindings/cxx/tests/gpiod-cxx-test-main.cpp | ||
47 | +++ b/bindings/cxx/tests/gpiod-cxx-test-main.cpp | ||
48 | @@ -1,5 +1,4 @@ | ||
49 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
50 | // SPDX-FileCopyrightText: 2017-2021 Bartosz Golaszewski <bartekgola@gmail.com> | ||
51 | |||
52 | -#define CATCH_CONFIG_MAIN | ||
53 | -#include <catch2/catch.hpp> | ||
54 | +#include <catch2/catch_all.hpp> | ||
55 | diff --git a/bindings/cxx/tests/helpers.hpp b/bindings/cxx/tests/helpers.hpp | ||
56 | index 62d9827..62bbdf5 100644 | ||
57 | --- a/bindings/cxx/tests/helpers.hpp | ||
58 | +++ b/bindings/cxx/tests/helpers.hpp | ||
59 | @@ -4,13 +4,13 @@ | ||
60 | #ifndef __GPIOD_CXX_TEST_HELPERS_HPP__ | ||
61 | #define __GPIOD_CXX_TEST_HELPERS_HPP__ | ||
62 | |||
63 | -#include <catch2/catch.hpp> | ||
64 | +#include <catch2/catch_all.hpp> | ||
65 | #include <regex> | ||
66 | #include <string> | ||
67 | #include <sstream> | ||
68 | #include <system_error> | ||
69 | |||
70 | -class system_error_matcher : public Catch::MatcherBase<::std::system_error> | ||
71 | +class system_error_matcher : public Catch::Matchers::MatcherBase<::std::system_error> | ||
72 | { | ||
73 | public: | ||
74 | explicit system_error_matcher(int expected_errno); | ||
75 | @@ -21,7 +21,7 @@ private: | ||
76 | ::std::error_condition _m_cond; | ||
77 | }; | ||
78 | |||
79 | -class regex_matcher : public Catch::MatcherBase<::std::string> | ||
80 | +class regex_matcher : public Catch::Matchers::MatcherBase<::std::string> | ||
81 | { | ||
82 | public: | ||
83 | explicit regex_matcher(const ::std::string& pattern); | ||
84 | @@ -33,7 +33,7 @@ private: | ||
85 | ::std::string _m_repr; | ||
86 | }; | ||
87 | |||
88 | -template<class T> class stringify_matcher : public Catch::MatcherBase<T> | ||
89 | +template<class T> class stringify_matcher : public Catch::Matchers::MatcherBase<T> | ||
90 | { | ||
91 | public: | ||
92 | explicit stringify_matcher(const ::std::string& expected) : _m_expected(expected) | ||
93 | diff --git a/bindings/cxx/tests/tests-chip-info.cpp b/bindings/cxx/tests/tests-chip-info.cpp | ||
94 | index 717c387..2c54f53 100644 | ||
95 | --- a/bindings/cxx/tests/tests-chip-info.cpp | ||
96 | +++ b/bindings/cxx/tests/tests-chip-info.cpp | ||
97 | @@ -1,7 +1,7 @@ | ||
98 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
99 | // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
100 | |||
101 | -#include <catch2/catch.hpp> | ||
102 | +#include <catch2/catch_all.hpp> | ||
103 | #include <gpiod.hpp> | ||
104 | #include <sstream> | ||
105 | |||
106 | @@ -24,12 +24,12 @@ TEST_CASE("chip_info properties can be read", "[chip-info][chip]") | ||
107 | |||
108 | SECTION("get chip name") | ||
109 | { | ||
110 | - REQUIRE_THAT(info.name(), Catch::Equals(sim.name())); | ||
111 | + REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name())); | ||
112 | } | ||
113 | |||
114 | SECTION("get chip label") | ||
115 | { | ||
116 | - REQUIRE_THAT(info.label(), Catch::Equals("foobar")); | ||
117 | + REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar")); | ||
118 | } | ||
119 | |||
120 | SECTION("get num_lines") | ||
121 | @@ -52,12 +52,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") | ||
122 | { | ||
123 | auto copy(info); | ||
124 | |||
125 | - REQUIRE_THAT(copy.name(), Catch::Equals(sim.name())); | ||
126 | - REQUIRE_THAT(copy.label(), Catch::Equals("foobar")); | ||
127 | + REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name())); | ||
128 | + REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar")); | ||
129 | REQUIRE(copy.num_lines() == 4); | ||
130 | |||
131 | - REQUIRE_THAT(info.name(), Catch::Equals(sim.name())); | ||
132 | - REQUIRE_THAT(info.label(), Catch::Equals("foobar")); | ||
133 | + REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name())); | ||
134 | + REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar")); | ||
135 | REQUIRE(info.num_lines() == 4); | ||
136 | } | ||
137 | |||
138 | @@ -67,12 +67,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") | ||
139 | |||
140 | copy = info; | ||
141 | |||
142 | - REQUIRE_THAT(copy.name(), Catch::Equals(sim.name())); | ||
143 | - REQUIRE_THAT(copy.label(), Catch::Equals("foobar")); | ||
144 | + REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name())); | ||
145 | + REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar")); | ||
146 | REQUIRE(copy.num_lines() == 4); | ||
147 | |||
148 | - REQUIRE_THAT(info.name(), Catch::Equals(sim.name())); | ||
149 | - REQUIRE_THAT(info.label(), Catch::Equals("foobar")); | ||
150 | + REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name())); | ||
151 | + REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar")); | ||
152 | REQUIRE(info.num_lines() == 4); | ||
153 | } | ||
154 | |||
155 | @@ -80,8 +80,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") | ||
156 | { | ||
157 | auto moved(std::move(info)); | ||
158 | |||
159 | - REQUIRE_THAT(moved.name(), Catch::Equals(sim.name())); | ||
160 | - REQUIRE_THAT(moved.label(), Catch::Equals("foobar")); | ||
161 | + REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name())); | ||
162 | + REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar")); | ||
163 | REQUIRE(moved.num_lines() == 4); | ||
164 | } | ||
165 | |||
166 | @@ -91,8 +91,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]") | ||
167 | |||
168 | moved = ::std::move(info); | ||
169 | |||
170 | - REQUIRE_THAT(moved.name(), Catch::Equals(sim.name())); | ||
171 | - REQUIRE_THAT(moved.label(), Catch::Equals("foobar")); | ||
172 | + REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name())); | ||
173 | + REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar")); | ||
174 | REQUIRE(moved.num_lines() == 4); | ||
175 | } | ||
176 | } | ||
177 | diff --git a/bindings/cxx/tests/tests-chip.cpp b/bindings/cxx/tests/tests-chip.cpp | ||
178 | index c5ec19b..1ab7add 100644 | ||
179 | --- a/bindings/cxx/tests/tests-chip.cpp | ||
180 | +++ b/bindings/cxx/tests/tests-chip.cpp | ||
181 | @@ -1,7 +1,7 @@ | ||
182 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
183 | // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
184 | |||
185 | -#include <catch2/catch.hpp> | ||
186 | +#include <catch2/catch_all.hpp> | ||
187 | #include <gpiod.hpp> | ||
188 | #include <sstream> | ||
189 | #include <system_error> | ||
190 | @@ -48,9 +48,9 @@ TEST_CASE("chip constructor works", "[chip]") | ||
191 | .build(); | ||
192 | |||
193 | ::gpiod::chip first(sim.dev_path()); | ||
194 | - REQUIRE_THAT(first.get_info().label(), Catch::Equals("foobar")); | ||
195 | + REQUIRE_THAT(first.get_info().label(), Catch::Matchers::Equals("foobar")); | ||
196 | ::gpiod::chip second(::std::move(first)); | ||
197 | - REQUIRE_THAT(second.get_info().label(), Catch::Equals("foobar")); | ||
198 | + REQUIRE_THAT(second.get_info().label(), Catch::Matchers::Equals("foobar")); | ||
199 | } | ||
200 | } | ||
201 | |||
202 | @@ -70,9 +70,9 @@ TEST_CASE("chip operators work", "[chip]") | ||
203 | |||
204 | ::gpiod::chip moved_chip(moved_sim.dev_path()); | ||
205 | |||
206 | - REQUIRE_THAT(chip.get_info().label(), Catch::Equals("foobar")); | ||
207 | + REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("foobar")); | ||
208 | chip = ::std::move(moved_chip); | ||
209 | - REQUIRE_THAT(chip.get_info().label(), Catch::Equals("moved")); | ||
210 | + REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("moved")); | ||
211 | } | ||
212 | |||
213 | SECTION("boolean operator") | ||
214 | @@ -94,7 +94,7 @@ TEST_CASE("chip properties can be read", "[chip]") | ||
215 | |||
216 | SECTION("get device path") | ||
217 | { | ||
218 | - REQUIRE_THAT(chip.path(), Catch::Equals(sim.dev_path())); | ||
219 | + REQUIRE_THAT(chip.path(), Catch::Matchers::Equals(sim.dev_path())); | ||
220 | } | ||
221 | |||
222 | SECTION("get file descriptor") | ||
223 | @@ -169,7 +169,7 @@ TEST_CASE("stream insertion operator works for chip", "[chip]") | ||
224 | "\", label=\"foobar\", num_lines=4))"; | ||
225 | |||
226 | buf << chip; | ||
227 | - REQUIRE_THAT(buf.str(), Catch::Equals(expected.str())); | ||
228 | + REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str())); | ||
229 | } | ||
230 | |||
231 | SECTION("closed chip") | ||
232 | diff --git a/bindings/cxx/tests/tests-edge-event.cpp b/bindings/cxx/tests/tests-edge-event.cpp | ||
233 | index 19a6ab3..db387be 100644 | ||
234 | --- a/bindings/cxx/tests/tests-edge-event.cpp | ||
235 | +++ b/bindings/cxx/tests/tests-edge-event.cpp | ||
236 | @@ -1,7 +1,7 @@ | ||
237 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
238 | // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
239 | |||
240 | -#include <catch2/catch.hpp> | ||
241 | +#include <catch2/catch_all.hpp> | ||
242 | #include <chrono> | ||
243 | #include <gpiod.hpp> | ||
244 | #include <sstream> | ||
245 | diff --git a/bindings/cxx/tests/tests-info-event.cpp b/bindings/cxx/tests/tests-info-event.cpp | ||
246 | index 21c0ef0..f7ae309 100644 | ||
247 | --- a/bindings/cxx/tests/tests-info-event.cpp | ||
248 | +++ b/bindings/cxx/tests/tests-info-event.cpp | ||
249 | @@ -1,7 +1,7 @@ | ||
250 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
251 | // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
252 | |||
253 | -#include <catch2/catch.hpp> | ||
254 | +#include <catch2/catch_all.hpp> | ||
255 | #include <chrono> | ||
256 | #include <filesystem> | ||
257 | #include <gpiod.hpp> | ||
258 | diff --git a/bindings/cxx/tests/tests-line-config.cpp b/bindings/cxx/tests/tests-line-config.cpp | ||
259 | index 5e439a1..2f510fb 100644 | ||
260 | --- a/bindings/cxx/tests/tests-line-config.cpp | ||
261 | +++ b/bindings/cxx/tests/tests-line-config.cpp | ||
262 | @@ -1,7 +1,7 @@ | ||
263 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
264 | // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
265 | |||
266 | -#include <catch2/catch.hpp> | ||
267 | +#include <catch2/catch_all.hpp> | ||
268 | #include <gpiod.hpp> | ||
269 | |||
270 | #include "gpiosim.hpp" | ||
271 | diff --git a/bindings/cxx/tests/tests-line-info.cpp b/bindings/cxx/tests/tests-line-info.cpp | ||
272 | index 21211f2..8589da3 100644 | ||
273 | --- a/bindings/cxx/tests/tests-line-info.cpp | ||
274 | +++ b/bindings/cxx/tests/tests-line-info.cpp | ||
275 | @@ -1,7 +1,7 @@ | ||
276 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
277 | // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
278 | |||
279 | -#include <catch2/catch.hpp> | ||
280 | +#include <catch2/catch_all.hpp> | ||
281 | #include <gpiod.hpp> | ||
282 | #include <string> | ||
283 | |||
284 | @@ -35,9 +35,9 @@ TEST_CASE("get_line_info() works", "[chip][line-info]") | ||
285 | auto info = chip.get_line_info(0); | ||
286 | |||
287 | REQUIRE(info.offset() == 0); | ||
288 | - REQUIRE_THAT(info.name(), Catch::Equals("foobar")); | ||
289 | + REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar")); | ||
290 | REQUIRE(info.used()); | ||
291 | - REQUIRE_THAT(info.consumer(), Catch::Equals("hog")); | ||
292 | + REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("hog")); | ||
293 | REQUIRE(info.direction() == ::gpiod::line::direction::OUTPUT); | ||
294 | REQUIRE_FALSE(info.active_low()); | ||
295 | REQUIRE(info.bias() == ::gpiod::line::bias::UNKNOWN); | ||
296 | @@ -74,9 +74,9 @@ TEST_CASE("line properties can be retrieved", "[line-info]") | ||
297 | auto info6 = chip.get_line_info(6); | ||
298 | |||
299 | REQUIRE(info4.offset() == 4); | ||
300 | - REQUIRE_THAT(info4.name(), Catch::Equals("baz")); | ||
301 | + REQUIRE_THAT(info4.name(), Catch::Matchers::Equals("baz")); | ||
302 | REQUIRE(info4.used()); | ||
303 | - REQUIRE_THAT(info4.consumer(), Catch::Equals("hog4")); | ||
304 | + REQUIRE_THAT(info4.consumer(), Catch::Matchers::Equals("hog4")); | ||
305 | REQUIRE(info4.direction() == direction::OUTPUT); | ||
306 | REQUIRE(info4.edge_detection() == edge::NONE); | ||
307 | REQUIRE_FALSE(info4.active_low()); | ||
308 | @@ -102,10 +102,10 @@ TEST_CASE("line_info can be copied and moved") | ||
309 | { | ||
310 | auto copy(info); | ||
311 | REQUIRE(copy.offset() == 2); | ||
312 | - REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); | ||
313 | + REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); | ||
314 | /* info can still be used */ | ||
315 | REQUIRE(info.offset() == 2); | ||
316 | - REQUIRE_THAT(info.name(), Catch::Equals("foobar")); | ||
317 | + REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar")); | ||
318 | } | ||
319 | |||
320 | SECTION("assignment operator works") | ||
321 | @@ -113,17 +113,17 @@ TEST_CASE("line_info can be copied and moved") | ||
322 | auto copy = chip.get_line_info(0); | ||
323 | copy = info; | ||
324 | REQUIRE(copy.offset() == 2); | ||
325 | - REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); | ||
326 | + REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); | ||
327 | /* info can still be used */ | ||
328 | REQUIRE(info.offset() == 2); | ||
329 | - REQUIRE_THAT(info.name(), Catch::Equals("foobar")); | ||
330 | + REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar")); | ||
331 | } | ||
332 | |||
333 | SECTION("move constructor works") | ||
334 | { | ||
335 | auto copy(::std::move(info)); | ||
336 | REQUIRE(copy.offset() == 2); | ||
337 | - REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); | ||
338 | + REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); | ||
339 | } | ||
340 | |||
341 | SECTION("move assignment operator works") | ||
342 | @@ -131,7 +131,7 @@ TEST_CASE("line_info can be copied and moved") | ||
343 | auto copy = chip.get_line_info(0); | ||
344 | copy = ::std::move(info); | ||
345 | REQUIRE(copy.offset() == 2); | ||
346 | - REQUIRE_THAT(copy.name(), Catch::Equals("foobar")); | ||
347 | + REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar")); | ||
348 | } | ||
349 | } | ||
350 | |||
351 | diff --git a/bindings/cxx/tests/tests-line-request.cpp b/bindings/cxx/tests/tests-line-request.cpp | ||
352 | index 9632ae0..af8b979 100644 | ||
353 | --- a/bindings/cxx/tests/tests-line-request.cpp | ||
354 | +++ b/bindings/cxx/tests/tests-line-request.cpp | ||
355 | @@ -1,7 +1,7 @@ | ||
356 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
357 | // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
358 | |||
359 | -#include <catch2/catch.hpp> | ||
360 | +#include <catch2/catch_all.hpp> | ||
361 | #include <gpiod.hpp> | ||
362 | #include <sstream> | ||
363 | #include <stdexcept> | ||
364 | @@ -20,7 +20,7 @@ using pull = ::gpiosim::chip::pull; | ||
365 | |||
366 | namespace { | ||
367 | |||
368 | -class value_matcher : public Catch::MatcherBase<value> | ||
369 | +class value_matcher : public Catch::Matchers::MatcherBase<value> | ||
370 | { | ||
371 | public: | ||
372 | value_matcher(pull pull, bool active_low = false) | ||
373 | @@ -117,7 +117,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]") | ||
374 | auto info = chip.get_line_info(2); | ||
375 | |||
376 | REQUIRE(info.used()); | ||
377 | - REQUIRE_THAT(info.consumer(), Catch::Equals("foobar")); | ||
378 | + REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("foobar")); | ||
379 | } | ||
380 | |||
381 | SECTION("empty consumer") | ||
382 | @@ -130,7 +130,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]") | ||
383 | auto info = chip.get_line_info(2); | ||
384 | |||
385 | REQUIRE(info.used()); | ||
386 | - REQUIRE_THAT(info.consumer(), Catch::Equals("?")); | ||
387 | + REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("?")); | ||
388 | } | ||
389 | } | ||
390 | |||
391 | @@ -380,7 +380,7 @@ TEST_CASE("line_request can be moved", "[line-request]") | ||
392 | auto moved(::std::move(request)); | ||
393 | |||
394 | REQUIRE(moved.fd() == fd); | ||
395 | - REQUIRE_THAT(moved.offsets(), Catch::Equals(offs)); | ||
396 | + REQUIRE_THAT(moved.offsets(), Catch::Matchers::Equals(offs)); | ||
397 | } | ||
398 | |||
399 | SECTION("move assignment operator works") | ||
400 | @@ -388,7 +388,7 @@ TEST_CASE("line_request can be moved", "[line-request]") | ||
401 | another = ::std::move(request); | ||
402 | |||
403 | REQUIRE(another.fd() == fd); | ||
404 | - REQUIRE_THAT(another.offsets(), Catch::Equals(offs)); | ||
405 | + REQUIRE_THAT(another.offsets(), Catch::Matchers::Equals(offs)); | ||
406 | } | ||
407 | } | ||
408 | |||
409 | @@ -484,7 +484,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]") | ||
410 | { | ||
411 | buf << request; | ||
412 | |||
413 | - REQUIRE_THAT(buf.str(), Catch::Equals(expected.str())); | ||
414 | + REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str())); | ||
415 | } | ||
416 | |||
417 | SECTION("request released") | ||
418 | @@ -493,7 +493,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]") | ||
419 | |||
420 | buf << request; | ||
421 | |||
422 | - REQUIRE_THAT(buf.str(), Catch::Equals("gpiod::line_request(released)")); | ||
423 | + REQUIRE_THAT(buf.str(), Catch::Matchers::Equals("gpiod::line_request(released)")); | ||
424 | } | ||
425 | } | ||
426 | |||
427 | diff --git a/bindings/cxx/tests/tests-line-settings.cpp b/bindings/cxx/tests/tests-line-settings.cpp | ||
428 | index dc821bb..2690331 100644 | ||
429 | --- a/bindings/cxx/tests/tests-line-settings.cpp | ||
430 | +++ b/bindings/cxx/tests/tests-line-settings.cpp | ||
431 | @@ -1,7 +1,7 @@ | ||
432 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
433 | // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
434 | |||
435 | -#include <catch2/catch.hpp> | ||
436 | +#include <catch2/catch_all.hpp> | ||
437 | #include <gpiod.hpp> | ||
438 | |||
439 | #include "helpers.hpp" | ||
440 | diff --git a/bindings/cxx/tests/tests-line.cpp b/bindings/cxx/tests/tests-line.cpp | ||
441 | index 319012a..abd0e08 100644 | ||
442 | --- a/bindings/cxx/tests/tests-line.cpp | ||
443 | +++ b/bindings/cxx/tests/tests-line.cpp | ||
444 | @@ -1,7 +1,7 @@ | ||
445 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
446 | // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
447 | |||
448 | -#include <catch2/catch.hpp> | ||
449 | +#include <catch2/catch_all.hpp> | ||
450 | #include <gpiod.hpp> | ||
451 | |||
452 | #include "helpers.hpp" | ||
453 | diff --git a/bindings/cxx/tests/tests-misc.cpp b/bindings/cxx/tests/tests-misc.cpp | ||
454 | index f06dc39..33fc3fa 100644 | ||
455 | --- a/bindings/cxx/tests/tests-misc.cpp | ||
456 | +++ b/bindings/cxx/tests/tests-misc.cpp | ||
457 | @@ -1,7 +1,7 @@ | ||
458 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
459 | // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
460 | |||
461 | -#include <catch2/catch.hpp> | ||
462 | +#include <catch2/catch_all.hpp> | ||
463 | #include <filesystem> | ||
464 | #include <gpiod.hpp> | ||
465 | #include <string> | ||
466 | diff --git a/bindings/cxx/tests/tests-request-config.cpp b/bindings/cxx/tests/tests-request-config.cpp | ||
467 | index 66eb748..d71e91b 100644 | ||
468 | --- a/bindings/cxx/tests/tests-request-config.cpp | ||
469 | +++ b/bindings/cxx/tests/tests-request-config.cpp | ||
470 | @@ -1,7 +1,7 @@ | ||
471 | // SPDX-License-Identifier: GPL-2.0-or-later | ||
472 | // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl> | ||
473 | |||
474 | -#include <catch2/catch.hpp> | ||
475 | +#include <catch2/catch_all.hpp> | ||
476 | #include <cstddef> | ||
477 | #include <gpiod.hpp> | ||
478 | #include <string> | ||
479 | @@ -33,7 +33,7 @@ TEST_CASE("request_config can be moved", "[request-config]") | ||
480 | SECTION("move constructor works") | ||
481 | { | ||
482 | auto moved(::std::move(cfg)); | ||
483 | - REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar")); | ||
484 | + REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar")); | ||
485 | REQUIRE(moved.event_buffer_size() == 64); | ||
486 | } | ||
487 | |||
488 | @@ -43,7 +43,7 @@ TEST_CASE("request_config can be moved", "[request-config]") | ||
489 | |||
490 | moved = ::std::move(cfg); | ||
491 | |||
492 | - REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar")); | ||
493 | + REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar")); | ||
494 | REQUIRE(moved.event_buffer_size() == 64); | ||
495 | } | ||
496 | } | ||
497 | @@ -55,7 +55,7 @@ TEST_CASE("request_config mutators work", "[request-config]") | ||
498 | SECTION("set consumer") | ||
499 | { | ||
500 | cfg.set_consumer("foobar"); | ||
501 | - REQUIRE_THAT(cfg.consumer(), Catch::Equals("foobar")); | ||
502 | + REQUIRE_THAT(cfg.consumer(), Catch::Matchers::Equals("foobar")); | ||
503 | } | ||
504 | |||
505 | SECTION("set event_buffer_size") | ||
506 | @@ -77,7 +77,7 @@ TEST_CASE("request_config stream insertion operator works", "[request-config]") | ||
507 | |||
508 | ::std::string expected("gpiod::request_config(consumer='foobar', event_buffer_size=32)"); | ||
509 | |||
510 | - REQUIRE_THAT(buf.str(), Catch::Equals(expected)); | ||
511 | + REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected)); | ||
512 | } | ||
513 | |||
514 | } /* namespace */ | ||
515 | diff --git a/configure.ac b/configure.ac | ||
516 | index a2370c5..216007e 100644 | ||
517 | --- a/configure.ac | ||
518 | +++ b/configure.ac | ||
519 | @@ -206,9 +206,9 @@ then | ||
520 | |||
521 | if test "x$with_tests" = xtrue | ||
522 | then | ||
523 | - PKG_CHECK_MODULES([CATCH2], [catch2],, [ | ||
524 | + PKG_CHECK_MODULES([CATCH2], [catch2-with-main],, [ | ||
525 | AC_LANG_PUSH([C++]) | ||
526 | - AC_CHECK_HEADERS([catch2/catch.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch.hpp])]) | ||
527 | + AC_CHECK_HEADERS([catch2/catch_all.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch_all.hpp])]) | ||
528 | AC_LANG_POP([C++]) | ||
529 | ]) | ||
530 | fi | ||
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-oe/recipes-support/libgpiod/libgpiod.inc index dc1fb4fe9..7b68f77d2 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod.inc +++ b/meta-oe/recipes-support/libgpiod/libgpiod.inc | |||
@@ -52,9 +52,5 @@ do_install_ptest() { | |||
52 | for tool in ${FILES:${PN}-tools}; do | 52 | for tool in ${FILES:${PN}-tools}; do |
53 | install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ | 53 | install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ |
54 | done | 54 | done |
55 | |||
56 | if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then | ||
57 | install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/ | ||
58 | fi | ||
59 | } | 55 | } |
60 | 56 | ||
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb index 111a5727b..079583949 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb | |||
@@ -3,7 +3,9 @@ require libgpiod.inc | |||
3 | LICENSE = "LGPL-2.1-or-later" | 3 | LICENSE = "LGPL-2.1-or-later" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "7b146e12f28fbca3df7557f176eb778c5ccf952ca464698dba8a61b2e1e3f9b5" | 6 | SRC_URI += "file://0001-bindings-cxx-disable-tests.patch" |
7 | |||
8 | SRC_URI[sha256sum] = "ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc" | ||
7 | 9 | ||
8 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:" | 10 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:" |
9 | 11 | ||
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.1.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb index 4c13d67eb..b4665c156 100644 --- a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.1.bb +++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb | |||
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" | 10 | FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" |
11 | 11 | ||
12 | SRC_URI[sha256sum] = "b21913f469d3135680d5516f00fdf9f81d5e564e19ffb690927ea7f1d7e312cb" | 12 | SRC_URI += "file://0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch" |
13 | SRC_URI[sha256sum] = "7a148a5a7d1c97a1abb40474b9a392b6edd7a42fe077dfd7ff42cfba24308548" | ||
13 | 14 | ||
14 | # Enable all project features for ptest | 15 | # Enable all project features for ptest |
15 | 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" |
@@ -26,6 +27,7 @@ RDEPENDS:${PN}-ptest += " \ | |||
26 | RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs" | 27 | RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs" |
27 | 28 | ||
28 | do_install_ptest:append() { | 29 | do_install_ptest:append() { |
30 | install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/ | ||
29 | install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/ | 31 | install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/ |
30 | install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h | 32 | install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h |
31 | } | 33 | } |
diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb index 31c3534b8..63dfc6fa7 100644 --- a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb +++ b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb | |||
@@ -3,7 +3,7 @@ SECTION = "console/network" | |||
3 | HOMEPAGE = "http://fronteed.com/iCheck" | 3 | HOMEPAGE = "http://fronteed.com/iCheck" |
4 | 4 | ||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://icheck.js;start_line=1;end_line=8;md5=404078d7de9f05ed64d364274f790055" | 6 | LIC_FILES_CHKSUM = "file://icheck.js;beginline=6;endline=7;md5=ea25eee37fc3b14403e215bfe13564bc" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV}" | 8 | SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV}" |
9 | 9 | ||
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 9130b110a..4f0d8e554 100644 --- a/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb +++ b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb | |||
@@ -10,7 +10,8 @@ SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a5 | |||
10 | JQUERYDIR = "${datadir}/javascript/jquery" | 10 | JQUERYDIR = "${datadir}/javascript/jquery" |
11 | JQUERYDOCDIR = "${docdir}/libjs-jquery" | 11 | JQUERYDOCDIR = "${docdir}/libjs-jquery" |
12 | 12 | ||
13 | S = "${WORKDIR}" | 13 | S = "${WORKDIR}/sources" |
14 | UNPACKDIR = "${S}" | ||
14 | 15 | ||
15 | do_install() { | 16 | do_install() { |
16 | install -d -m 0755 ${D}${JQUERYDIR} | 17 | install -d -m 0755 ${D}${JQUERYDIR} |
diff --git a/meta-oe/recipes-support/libmxml/libmxml_3.3.1.bb b/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb index 38e270c03..54582e704 100644 --- a/meta-oe/recipes-support/libmxml/libmxml_3.3.1.bb +++ b/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb | |||
@@ -5,7 +5,7 @@ HOMEPAGE = "https://www.msweet.org/mxml/" | |||
5 | BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" | 5 | BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/michaelrsweet/mxml.git;branch=master;protocol=https" | 7 | SRC_URI = "git://github.com/michaelrsweet/mxml.git;branch=master;protocol=https" |
8 | SRCREV = "fd47c7d115191c8a6bce2c781ffee41e179530f2" | 8 | SRCREV = "804c4f4d922e4ca240ce2cad3ec7bc5d00c08691" |
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | 10 | ||
11 | # Package does not support out of tree builds. | 11 | # Package does not support out of tree builds. |
diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.8.bb b/meta-oe/recipes-support/libnvme/libnvme_1.9.bb index 3894facec..1e03b4e7a 100644 --- a/meta-oe/recipes-support/libnvme/libnvme_1.8.bb +++ b/meta-oe/recipes-support/libnvme/libnvme_1.9.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | |||
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 = "bff7dda7e2a0f883d0b89e23fed725c916de3e61" | 14 | SRCREV = "80c5cf2aa45f4afc7571dc48850fae3fd62828af" |
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/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 822b7ffc2..1f7442af0 100644 --- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb | |||
@@ -18,15 +18,18 @@ DEPENDS += "bison-native flex-native wget-native gawk-native" | |||
18 | 18 | ||
19 | inherit autotools-brokensep update-alternatives | 19 | inherit autotools-brokensep update-alternatives |
20 | ALTERNATIVE_PRIORITY = "50" | 20 | ALTERNATIVE_PRIORITY = "50" |
21 | ALTERNATIVE:${PN}-yang = "ietf-interfaces " | 21 | ALTERNATIVE:${PN}-yang = " ietf-interfaces ietf-netconf-acm ietf-netconf-with-defaults ietf-netconf" |
22 | ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" | 22 | ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" |
23 | ALTERNATIVE_LINK_NAME[ietf-netconf-acm] = "${datadir}/yang/ietf-netconf-acm.yang" | ||
24 | ALTERNATIVE_LINK_NAME[ietf-netconf-with-defaults] = "${datadir}/yang/ietf-netconf-with-defaults.yang" | ||
25 | ALTERNATIVE_LINK_NAME[ietf-netconf] = "${datadir}/yang/ietf-netconf.yang" | ||
23 | 26 | ||
24 | EXTRA_OECONF:class-native = "ac_cv_path_SH=/bin/sh" | 27 | EXTRA_OECONF:class-native = "ac_cv_path_SH=/bin/sh" |
25 | EXTRA_OECONF:class-target = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk" | 28 | EXTRA_OECONF:class-target = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk" |
26 | 29 | ||
27 | do_install:append () { | 30 | do_install:append () { |
28 | install -d ${D}${sysconfdir} | 31 | install -d ${D}${sysconfdir} |
29 | install -m 0644 ${WORKDIR}/smi.conf ${D}${sysconfdir}/smi.conf | 32 | install -m 0644 ${UNPACKDIR}/smi.conf ${D}${sysconfdir}/smi.conf |
30 | } | 33 | } |
31 | 34 | ||
32 | PACKAGES += "${PN}-mibs ${PN}-pibs ${PN}-yang" | 35 | PACKAGES += "${PN}-mibs ${PN}-pibs ${PN}-yang" |
diff --git a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch deleted file mode 100644 index f0bd53ee8..000000000 --- a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 0ab69dc18a2057ff5bf41abcdf2b983b72d5a903 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 12 Jul 2017 15:34:49 -0700 | ||
4 | Subject: [PATCH 1/2] include sys/select.h for fd_set definition | ||
5 | |||
6 | Fixes | ||
7 | teamnl.c:160:2: error: unknown type name 'fd_set'; did you mean 'fpos_t'? | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Upstream-Status: Pending | ||
12 | |||
13 | utils/teamnl.c | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
16 | diff --git a/utils/teamnl.c b/utils/teamnl.c | ||
17 | index e8de7e2..25129e8 100644 | ||
18 | --- a/utils/teamnl.c | ||
19 | +++ b/utils/teamnl.c | ||
20 | @@ -24,6 +24,7 @@ | ||
21 | #include <getopt.h> | ||
22 | #include <errno.h> | ||
23 | #include <sys/signalfd.h> | ||
24 | +#include <sys/select.h> | ||
25 | #include <signal.h> | ||
26 | #include <unistd.h> | ||
27 | #include <team.h> | ||
28 | -- | ||
29 | 2.13.2 | ||
30 | |||
diff --git a/meta-oe/recipes-support/libteam/libteam/0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch deleted file mode 100644 index 5f8e56177..000000000 --- a/meta-oe/recipes-support/libteam/libteam/0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 49693cac37ee35ff673240c8060201efe0d999c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 24 Aug 2022 22:27:03 -0700 | ||
4 | Subject: [PATCH] teamd: Include missing headers for strrchr and memcmp | ||
5 | |||
6 | Compiler does not see the prototype for these functions otherwise and | ||
7 | build fails e.g. | ||
8 | |||
9 | | ../../git/teamd/teamd_phys_port_check.c:52:10: error: call to undeclared library function 'strrchr' with type 'char *(const char *, int)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] | ||
10 | | start = strrchr(link, '/'); | ||
11 | | ^ | ||
12 | |||
13 | Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/68] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | teamd/teamd_phys_port_check.c | 1 + | ||
17 | teamd/teamd_runner_loadbalance.c | 1 + | ||
18 | 2 files changed, 2 insertions(+) | ||
19 | |||
20 | diff --git a/teamd/teamd_phys_port_check.c b/teamd/teamd_phys_port_check.c | ||
21 | index 1eec129..c2454ab 100644 | ||
22 | --- a/teamd/teamd_phys_port_check.c | ||
23 | +++ b/teamd/teamd_phys_port_check.c | ||
24 | @@ -19,6 +19,7 @@ | ||
25 | |||
26 | #include <stdio.h> | ||
27 | #include <errno.h> | ||
28 | +#include <string.h> | ||
29 | #include <sys/types.h> | ||
30 | #include <sys/stat.h> | ||
31 | #include <unistd.h> | ||
32 | diff --git a/teamd/teamd_runner_loadbalance.c b/teamd/teamd_runner_loadbalance.c | ||
33 | index a581472..421a7c6 100644 | ||
34 | --- a/teamd/teamd_runner_loadbalance.c | ||
35 | +++ b/teamd/teamd_runner_loadbalance.c | ||
36 | @@ -17,6 +17,7 @@ | ||
37 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
38 | */ | ||
39 | |||
40 | +#include <string.h> | ||
41 | #include <sys/socket.h> | ||
42 | #include <linux/netdevice.h> | ||
43 | #include <team.h> | ||
44 | -- | ||
45 | 2.37.2 | ||
46 | |||
diff --git a/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch new file mode 100644 index 000000000..074060119 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-teamd-Pass-correct-parameter-type-to-accept-API.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From e6ba4c16da808e47891241452a927b7f558a6420 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 11 May 2024 23:11:22 -0700 | ||
4 | Subject: [patch libteam] teamd: Pass correct parameter type to accept API | ||
5 | |||
6 | accept() expects sockaddr as second parameter | ||
7 | |||
8 | int accept (int, struct sockaddr *__restrict, socklen_t *__restrict); | ||
9 | |||
10 | Fixes build with gcc-16 on musl systems | ||
11 | | ../../git/teamd/teamd_usock.c: In function 'callback_usock': | ||
12 | | ../../git/teamd/teamd_usock.c:280:40: error: passing argument 2 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] | ||
13 | | 280 | sock = accept(ctx->usock.sock, &addr, &alen); | ||
14 | | | ^~~~~ | ||
15 | | | | | ||
16 | | | struct sockaddr_un * | ||
17 | |||
18 | Upstream-Status: Submitted [https://lists.fedorahosted.org/archives/list/libteam@lists.fedorahosted.org/2024/5/] | ||
19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
20 | --- | ||
21 | teamd/teamd_usock.c | 2 +- | ||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/teamd/teamd_usock.c b/teamd/teamd_usock.c | ||
25 | index 1adfdf8..5895124 100644 | ||
26 | --- a/teamd/teamd_usock.c | ||
27 | +++ b/teamd/teamd_usock.c | ||
28 | @@ -277,7 +277,7 @@ static int callback_usock(struct teamd_context *ctx, int events, void *priv) | ||
29 | int err; | ||
30 | |||
31 | alen = sizeof(addr); | ||
32 | - sock = accept(ctx->usock.sock, &addr, &alen); | ||
33 | + sock = accept(ctx->usock.sock, (struct sockaddr *)&addr, &alen); | ||
34 | if (sock == -1) { | ||
35 | teamd_log_err("usock: Failed to accept connection."); | ||
36 | return -errno; | ||
37 | -- | ||
38 | 2.45.0 | ||
39 | |||
diff --git a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch index ed877a721..030140ad4 100644 --- a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch +++ b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch | |||
@@ -17,19 +17,15 @@ Upstream-Status: Pending | |||
17 | teamd/teamd_runner_lacp.c | 2 +- | 17 | teamd/teamd_runner_lacp.c | 2 +- |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c | ||
21 | index 9c77fae..8800854 100644 | ||
22 | --- a/teamd/teamd_runner_lacp.c | 20 | --- a/teamd/teamd_runner_lacp.c |
23 | +++ b/teamd/teamd_runner_lacp.c | 21 | +++ b/teamd/teamd_runner_lacp.c |
24 | @@ -23,6 +23,7 @@ | 22 | @@ -23,12 +23,12 @@ |
25 | #include <unistd.h> | 23 | #include <unistd.h> |
26 | #include <limits.h> | 24 | #include <limits.h> |
27 | #include <sys/ioctl.h> | 25 | #include <sys/ioctl.h> |
28 | +#include <net/ethernet.h> | 26 | +#include <net/ethernet.h> |
29 | #include <linux/if_ether.h> | ||
30 | #include <sys/socket.h> | 27 | #include <sys/socket.h> |
31 | #include <linux/netdevice.h> | 28 | #include <netinet/in.h> |
32 | @@ -30,7 +31,6 @@ | ||
33 | #include <errno.h> | 29 | #include <errno.h> |
34 | #include <team.h> | 30 | #include <team.h> |
35 | #include <private/misc.h> | 31 | #include <private/misc.h> |
@@ -37,6 +33,3 @@ index 9c77fae..8800854 100644 | |||
37 | 33 | ||
38 | #include "teamd.h" | 34 | #include "teamd.h" |
39 | #include "teamd_config.h" | 35 | #include "teamd_config.h" |
40 | -- | ||
41 | 2.13.2 | ||
42 | |||
diff --git a/meta-oe/recipes-support/libteam/libteam_1.31.bb b/meta-oe/recipes-support/libteam/libteam_1.32.bb index 6fe10abe0..508cbb13b 100644 --- a/meta-oe/recipes-support/libteam/libteam_1.31.bb +++ b/meta-oe/recipes-support/libteam/libteam_1.32.bb | |||
@@ -8,15 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
8 | DEPENDS = "libnl libdaemon jansson" | 8 | DEPENDS = "libnl libdaemon jansson" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \ | 10 | SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \ |
11 | file://0001-include-sys-select.h-for-fd_set-definition.patch \ | ||
12 | file://0002-teamd-Re-adjust-include-header-order.patch \ | 11 | file://0002-teamd-Re-adjust-include-header-order.patch \ |
13 | file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ | 12 | file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ |
14 | file://0001-team_basic_test.py-switch-to-python3.patch \ | 13 | file://0001-team_basic_test.py-switch-to-python3.patch \ |
15 | file://0001-team_basic_test.py-check-the-return-value.patch \ | 14 | file://0001-team_basic_test.py-check-the-return-value.patch \ |
16 | file://0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch \ | 15 | file://0001-teamd-Pass-correct-parameter-type-to-accept-API.patch \ |
17 | file://run-ptest \ | 16 | file://run-ptest \ |
18 | " | 17 | " |
19 | SRCREV = "3ee12c6d569977cf1cd30d0da77807a07aa77158" | 18 | SRCREV = "8b843e93cee1dab61fb79b01791201cdad45e1d1" |
20 | 19 | ||
21 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
22 | 21 | ||
diff --git a/meta-oe/recipes-support/liburing/liburing_2.5.bb b/meta-oe/recipes-support/liburing/liburing_2.6.bb index 440259ffb..fc3fe1cac 100644 --- a/meta-oe/recipes-support/liburing/liburing_2.5.bb +++ b/meta-oe/recipes-support/liburing/liburing_2.6.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1-only | MIT" | |||
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 = "f4e42a515cd78c8c9cac2be14222834be5f8df2b" | 13 | SRCREV = "f7dcc1ea60819475dffd3a45059e16f04381bee7" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
@@ -18,9 +18,14 @@ DEPENDS:append:libc-musl = " libucontext" | |||
18 | XCFLAGS = "-pthread" | 18 | XCFLAGS = "-pthread" |
19 | XCFLAGS:append:libc-musl = " -lucontext" | 19 | XCFLAGS:append:libc-musl = " -lucontext" |
20 | 20 | ||
21 | USELIBC = "" | ||
22 | # 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 | ||
24 | # -fno-builtin-memset does not help | ||
25 | USELIBC:riscv64:toolchain-clang = "--use-libc" | ||
21 | EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" | 26 | EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" |
22 | do_configure() { | 27 | do_configure() { |
23 | ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} | 28 | ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC} |
24 | } | 29 | } |
25 | do_install () { | 30 | do_install () { |
26 | oe_runmake install DESTDIR=${D} | 31 | oe_runmake install DESTDIR=${D} |
diff --git a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb index b269e33c4..4e9e6bcdf 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb | |||
@@ -8,5 +8,5 @@ do_configure[noexec] = "1" | |||
8 | do_compile[noexec] = "1" | 8 | do_compile[noexec] = "1" |
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | install -Dm 0644 ${WORKDIR}/usbgx.default ${D}${sysconfdir}/default/usbgx | 11 | install -Dm 0644 ${UNPACKDIR}/usbgx.default ${D}${sysconfdir}/default/usbgx |
12 | } | 12 | } |
diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index a20ff4eea..bc40f029c 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb | |||
@@ -38,17 +38,17 @@ INITSCRIPT_PARAMS = "defaults" | |||
38 | INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '1', '0', d)}" | 38 | INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '1', '0', d)}" |
39 | 39 | ||
40 | do_install:append() { | 40 | do_install:append() { |
41 | install -Dm 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-start | 41 | install -Dm 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-start |
42 | sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start | 42 | sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start |
43 | install -m 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-stop | 43 | install -m 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-stop |
44 | sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop | 44 | sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop |
45 | 45 | ||
46 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 46 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
47 | install -Dm 0644 ${WORKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service | 47 | install -Dm 0644 ${UNPACKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service |
48 | fi | 48 | fi |
49 | 49 | ||
50 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 50 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
51 | install -Dm 0755 ${WORKDIR}/usbgx.initd ${D}${sysconfdir}/init.d/usbgx | 51 | install -Dm 0755 ${UNPACKDIR}/usbgx.initd ${D}${sysconfdir}/init.d/usbgx |
52 | fi | 52 | fi |
53 | } | 53 | } |
54 | 54 | ||
diff --git a/meta-oe/recipes-support/links/links-x11_2.26.bb b/meta-oe/recipes-support/links/links-x11_2.26.bb index 4c8d935cc..713919bca 100644 --- a/meta-oe/recipes-support/links/links-x11_2.26.bb +++ b/meta-oe/recipes-support/links/links-x11_2.26.bb | |||
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--enable-graphics \ | |||
23 | 23 | ||
24 | do_install:append() { | 24 | do_install:append() { |
25 | install -d ${D}/${datadir}/applications | 25 | install -d ${D}/${datadir}/applications |
26 | install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications | 26 | install -m 0644 ${UNPACKDIR}/links2.desktop ${D}/${datadir}/applications |
27 | install -d ${D}/${datadir}/pixmaps | 27 | install -d ${D}/${datadir}/pixmaps |
28 | install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps | 28 | install -m 0644 ${UNPACKDIR}/links2.png ${D}/${datadir}/pixmaps |
29 | } | 29 | } |
diff --git a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch index 3c4a3a151..fb58793a1 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001 | 1 | From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001 |
2 | From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2 | From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
3 | Date: Mon, 26 Nov 2018 14:53:09 +0800 | 3 | Date: Mon, 26 Nov 2018 14:53:09 +0800 |
4 | Subject: [PATCH 1/3] Avoid bashisms in init scripts | 4 | Subject: [PATCH] Avoid bashisms in init scripts |
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
@@ -19,7 +19,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
19 | 5 files changed, 10 insertions(+), 10 deletions(-) | 19 | 5 files changed, 10 insertions(+), 10 deletions(-) |
20 | 20 | ||
21 | diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in | 21 | diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in |
22 | index 347c395..b2e9cf9 100644 | 22 | index 347c39574..b2e9cf932 100644 |
23 | --- a/scripts/blk_availability_init_red_hat.in | 23 | --- a/scripts/blk_availability_init_red_hat.in |
24 | +++ b/scripts/blk_availability_init_red_hat.in | 24 | +++ b/scripts/blk_availability_init_red_hat.in |
25 | @@ -1,4 +1,4 @@ | 25 | @@ -1,4 +1,4 @@ |
@@ -37,7 +37,7 @@ index 347c395..b2e9cf9 100644 | |||
37 | ;; | 37 | ;; |
38 | esac | 38 | esac |
39 | diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in | 39 | diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in |
40 | index c82f8f5..a3a321d 100755 | 40 | index c82f8f547..a3a321d9c 100755 |
41 | --- a/scripts/cmirrord_init_red_hat.in | 41 | --- a/scripts/cmirrord_init_red_hat.in |
42 | +++ b/scripts/cmirrord_init_red_hat.in | 42 | +++ b/scripts/cmirrord_init_red_hat.in |
43 | @@ -1,4 +1,4 @@ | 43 | @@ -1,4 +1,4 @@ |
@@ -56,7 +56,7 @@ index c82f8f5..a3a321d 100755 | |||
56 | esac | 56 | esac |
57 | 57 | ||
58 | diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in | 58 | diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in |
59 | index 176ff5d..825f6ad 100644 | 59 | index 176ff5dcb..825f6ad84 100644 |
60 | --- a/scripts/lvm2_lvmpolld_init_red_hat.in | 60 | --- a/scripts/lvm2_lvmpolld_init_red_hat.in |
61 | +++ b/scripts/lvm2_lvmpolld_init_red_hat.in | 61 | +++ b/scripts/lvm2_lvmpolld_init_red_hat.in |
62 | @@ -1,4 +1,4 @@ | 62 | @@ -1,4 +1,4 @@ |
@@ -75,7 +75,7 @@ index 176ff5d..825f6ad 100644 | |||
75 | esac | 75 | esac |
76 | 76 | ||
77 | diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in | 77 | diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in |
78 | index 95e4125..dff89cd 100644 | 78 | index 95e4125a0..dff89cd38 100644 |
79 | --- a/scripts/lvm2_monitoring_init_red_hat.in | 79 | --- a/scripts/lvm2_monitoring_init_red_hat.in |
80 | +++ b/scripts/lvm2_monitoring_init_red_hat.in | 80 | +++ b/scripts/lvm2_monitoring_init_red_hat.in |
81 | @@ -1,4 +1,4 @@ | 81 | @@ -1,4 +1,4 @@ |
@@ -94,7 +94,7 @@ index 95e4125..dff89cd 100644 | |||
94 | esac | 94 | esac |
95 | 95 | ||
96 | diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 | 96 | diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 |
97 | index 8eb06c5..2e8d0f7 100644 | 97 | index 8eb06c509..2e8d0f71e 100644 |
98 | --- a/scripts/lvm2_monitoring_init_rhel4 | 98 | --- a/scripts/lvm2_monitoring_init_rhel4 |
99 | +++ b/scripts/lvm2_monitoring_init_rhel4 | 99 | +++ b/scripts/lvm2_monitoring_init_rhel4 |
100 | @@ -1,4 +1,4 @@ | 100 | @@ -1,4 +1,4 @@ |
@@ -112,6 +112,3 @@ index 8eb06c5..2e8d0f7 100644 | |||
112 | ;; | 112 | ;; |
113 | esac | 113 | esac |
114 | 114 | ||
115 | -- | ||
116 | 2.7.4 | ||
117 | |||
diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch index 474c2f8ac..f4b0f913d 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | configure.ac: check egrep | 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 | ||
2 | 5 | ||
3 | The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed | 6 | The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed |
4 | from configure.ac, then it fails to substitute '@EGREP@': | 7 | from configure.ac, then it fails to substitute '@EGREP@': |
@@ -17,10 +20,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
17 | 1 file changed, 1 insertion(+) | 20 | 1 file changed, 1 insertion(+) |
18 | 21 | ||
19 | diff --git a/configure.ac b/configure.ac | 22 | diff --git a/configure.ac b/configure.ac |
20 | index 2e52498f9..d9462e22c 100644 | 23 | index c2dbf3c9f..d9e7964c3 100644 |
21 | --- a/configure.ac | 24 | --- a/configure.ac |
22 | +++ b/configure.ac | 25 | +++ b/configure.ac |
23 | @@ -78,6 +78,7 @@ AC_PROG_LN_S | 26 | @@ -88,6 +88,7 @@ AC_PROG_EGREP |
24 | AC_PROG_MAKE_SET | 27 | AC_PROG_MAKE_SET |
25 | AC_PROG_MKDIR_P | 28 | AC_PROG_MKDIR_P |
26 | AC_PROG_RANLIB | 29 | AC_PROG_RANLIB |
@@ -28,6 +31,3 @@ index 2e52498f9..d9462e22c 100644 | |||
28 | AC_CHECK_TOOL([READELF], [readelf]) | 31 | AC_CHECK_TOOL([READELF], [readelf]) |
29 | AC_CHECK_TOOL(AR, ar) | 32 | AC_CHECK_TOOL(AR, ar) |
30 | AC_PATH_TOOL(CFLOW_CMD, cflow) | 33 | AC_PATH_TOOL(CFLOW_CMD, cflow) |
31 | -- | ||
32 | 2.34.1 | ||
33 | |||
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 f46d7f701..e11ac5ac0 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 e3103459416616d3b8508e7176e897b0ae6c90f2 Mon Sep 17 00:00:00 2001 | 1 | From a86919ed5468f3c152114446c189b00f5f656d59 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 |
@@ -14,18 +14,17 @@ http://git.alpinelinux.org/cgit/aports/tree/main/lvm2/fix-stdio-usage.patch | |||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
15 | Signed-off-by: Dengke Du <dengke.du@windriver.com> | 15 | Signed-off-by: Dengke Du <dengke.du@windriver.com> |
16 | 16 | ||
17 | --- | ||
18 | Upstream-Status: Pending | 17 | Upstream-Status: Pending |
19 | 18 | --- | |
20 | lib/log/log.c | 6 ++++++ | 19 | lib/log/log.c | 6 ++++++ |
21 | tools/lvmcmdline.c | 6 +++--- | 20 | tools/lvmcmdline.c | 6 +++--- |
22 | 2 files changed, 9 insertions(+), 3 deletions(-) | 21 | 2 files changed, 9 insertions(+), 3 deletions(-) |
23 | 22 | ||
24 | Index: LVM2.2.02.177/lib/log/log.c | 23 | diff --git a/lib/log/log.c b/lib/log/log.c |
25 | =================================================================== | 24 | index 7b88252f0..e1720098a 100644 |
26 | --- LVM2.2.02.177.orig/lib/log/log.c | 25 | --- a/lib/log/log.c |
27 | +++ LVM2.2.02.177/lib/log/log.c | 26 | +++ b/lib/log/log.c |
28 | @@ -161,6 +161,7 @@ static void _check_and_replace_standard_ | 27 | @@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ |
29 | * Close and reopen standard stream on file descriptor fd. | 28 | * Close and reopen standard stream on file descriptor fd. |
30 | */ | 29 | */ |
31 | int reopen_standard_stream(FILE **stream, const char *mode) | 30 | int reopen_standard_stream(FILE **stream, const char *mode) |
@@ -33,7 +32,7 @@ Index: LVM2.2.02.177/lib/log/log.c | |||
33 | { | 32 | { |
34 | int fd, fd_copy, new_fd; | 33 | int fd, fd_copy, new_fd; |
35 | const char *name; | 34 | const char *name; |
36 | @@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream | 35 | @@ -211,6 +212,11 @@ int reopen_standard_stream(FILE **stream, const char *mode) |
37 | *stream = new_stream; | 36 | *stream = new_stream; |
38 | return 1; | 37 | return 1; |
39 | } | 38 | } |
@@ -45,11 +44,11 @@ Index: LVM2.2.02.177/lib/log/log.c | |||
45 | 44 | ||
46 | void init_log_fn(lvm2_log_fn_t log_fn) | 45 | void init_log_fn(lvm2_log_fn_t log_fn) |
47 | { | 46 | { |
48 | Index: LVM2.2.02.177/tools/lvmcmdline.c | 47 | diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c |
49 | =================================================================== | 48 | index 3fd23a521..c2ee39905 100644 |
50 | --- LVM2.2.02.177.orig/tools/lvmcmdline.c | 49 | --- a/tools/lvmcmdline.c |
51 | +++ LVM2.2.02.177/tools/lvmcmdline.c | 50 | +++ b/tools/lvmcmdline.c |
52 | @@ -3095,7 +3095,7 @@ static int _check_standard_fds(void) | 51 | @@ -3380,7 +3380,7 @@ static int _check_standard_fds(void) |
53 | int err = is_valid_fd(STDERR_FILENO); | 52 | int err = is_valid_fd(STDERR_FILENO); |
54 | 53 | ||
55 | if (!is_valid_fd(STDIN_FILENO) && | 54 | if (!is_valid_fd(STDIN_FILENO) && |
@@ -58,7 +57,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c | |||
58 | if (err) | 57 | if (err) |
59 | perror("stdin stream open"); | 58 | perror("stdin stream open"); |
60 | else | 59 | else |
61 | @@ -3105,7 +3105,7 @@ static int _check_standard_fds(void) | 60 | @@ -3390,7 +3390,7 @@ static int _check_standard_fds(void) |
62 | } | 61 | } |
63 | 62 | ||
64 | if (!is_valid_fd(STDOUT_FILENO) && | 63 | if (!is_valid_fd(STDOUT_FILENO) && |
@@ -67,7 +66,7 @@ Index: LVM2.2.02.177/tools/lvmcmdline.c | |||
67 | if (err) | 66 | if (err) |
68 | perror("stdout stream open"); | 67 | perror("stdout stream open"); |
69 | /* else no stdout */ | 68 | /* else no stdout */ |
70 | @@ -3113,7 +3113,7 @@ static int _check_standard_fds(void) | 69 | @@ -3398,7 +3398,7 @@ static int _check_standard_fds(void) |
71 | } | 70 | } |
72 | 71 | ||
73 | 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 7add3a7bb..83a7f936b 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 1b9677f40ac547ba19d1cdbfd700901eab0a0d0b Mon Sep 17 00:00:00 2001 | 1 | From 4e7f4ea0bf89726255612a2a382c064e5923fbcd 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,10 +16,10 @@ 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 1422f5d05..8215811bd 100644 | 19 | index 2b183810a..53467cbbb 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 | @@ -25,6 +25,7 @@ | 22 | @@ -26,6 +26,7 @@ |
23 | #include "lib/datastruct/str_list.h" | 23 | #include "lib/datastruct/str_list.h" |
24 | #include "lib/metadata/metadata-exported.h" | 24 | #include "lib/metadata/metadata-exported.h" |
25 | 25 | ||
@@ -27,6 +27,3 @@ index 1422f5d05..8215811bd 100644 | |||
27 | #include <sys/stat.h> | 27 | #include <sys/stat.h> |
28 | #include <fcntl.h> | 28 | #include <fcntl.h> |
29 | #include <unistd.h> | 29 | #include <unistd.h> |
30 | -- | ||
31 | 2.44.0 | ||
32 | |||
diff --git a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch index ed9972a5f..6435c3fd9 100644 --- a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch +++ b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3bba45890985b877b823836e78a1c8ac3c878856 Mon Sep 17 00:00:00 2001 | 1 | From b30f842d5d200a8217a47465d6cdd99d3805ba76 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: Tue, 31 Jul 2018 15:04:29 +0800 | 3 | Date: Tue, 31 Jul 2018 15:04:29 +0800 |
4 | Subject: [PATCH 4/4] tweak MODPROBE_CMD for cross compile | 4 | Subject: [PATCH] tweak MODPROBE_CMD for cross compile |
5 | 5 | ||
6 | Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe | 6 | Lvm uses variable MODPROBE_CMD at runtime, so build time detection of modprobe |
7 | is incorrect. | 7 | is incorrect. |
@@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
21 | 1 file changed, 2 deletions(-) | 21 | 1 file changed, 2 deletions(-) |
22 | 22 | ||
23 | diff --git a/configure.ac b/configure.ac | 23 | diff --git a/configure.ac b/configure.ac |
24 | index b43d8b9be..efe3062c1 100644 | 24 | index c8d81e16c..7c1c04627 100644 |
25 | --- a/configure.ac | 25 | --- a/configure.ac |
26 | +++ b/configure.ac | 26 | +++ b/configure.ac |
27 | @@ -1646,8 +1646,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ | 27 | @@ -1689,8 +1689,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ |
28 | ]) | 28 | ]) |
29 | 29 | ||
30 | ################################################################################ | 30 | ################################################################################ |
@@ -33,6 +33,3 @@ index b43d8b9be..efe3062c1 100644 | |||
33 | AS_IF([test -n "$MODPROBE_CMD"], [ | 33 | AS_IF([test -n "$MODPROBE_CMD"], [ |
34 | AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) | 34 | AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.]) |
35 | ]) | 35 | ]) |
36 | -- | ||
37 | 2.7.4 | ||
38 | |||
diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch index 7979efbef..e7aaad4d0 100644 --- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch +++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001 | 1 | From e0e06b77e067da6a01dd9b0d5582a0a1709c655d 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: Mon, 26 Nov 2018 14:59:55 +0800 | 3 | Date: Mon, 26 Nov 2018 14:59:55 +0800 |
4 | Subject: [PATCH 2/3] do not build manual | 4 | Subject: [PATCH] do not build manual |
5 | 5 | ||
6 | On some host (ubuntu 1404), build manual failed. | 6 | On some host (ubuntu 1404), build manual failed. |
7 | ... | 7 | ... |
@@ -26,7 +26,7 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | |||
26 | 2 files changed, 3 insertions(+), 4 deletions(-) | 26 | 2 files changed, 3 insertions(+), 4 deletions(-) |
27 | 27 | ||
28 | diff --git a/Makefile.in b/Makefile.in | 28 | diff --git a/Makefile.in b/Makefile.in |
29 | index 3b7e0ec..37f14eb 100644 | 29 | index 06c4b1823..90df7b09c 100644 |
30 | --- a/Makefile.in | 30 | --- a/Makefile.in |
31 | +++ b/Makefile.in | 31 | +++ b/Makefile.in |
32 | @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ | 32 | @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ |
@@ -47,7 +47,7 @@ index 3b7e0ec..37f14eb 100644 | |||
47 | libdaemon lib tools daemons libdm \ | 47 | libdaemon lib tools daemons libdm \ |
48 | udev po | 48 | udev po |
49 | tools.distclean: test.distclean | 49 | tools.distclean: test.distclean |
50 | @@ -59,7 +59,7 @@ unit-test run-unit-test: test | 50 | @@ -59,7 +59,7 @@ unit-test run-unit-test: test libdm |
51 | 51 | ||
52 | daemons.device-mapper: libdm.device-mapper | 52 | daemons.device-mapper: libdm.device-mapper |
53 | tools.device-mapper: libdm.device-mapper | 53 | tools.device-mapper: libdm.device-mapper |
@@ -57,10 +57,10 @@ index 3b7e0ec..37f14eb 100644 | |||
57 | 57 | ||
58 | ifeq ("@INTL@", "yes") | 58 | ifeq ("@INTL@", "yes") |
59 | diff --git a/configure.ac b/configure.ac | 59 | diff --git a/configure.ac b/configure.ac |
60 | index 6def519..18a5c97 100644 | 60 | index 7c1c04627..5364dd68e 100644 |
61 | --- a/configure.ac | 61 | --- a/configure.ac |
62 | +++ b/configure.ac | 62 | +++ b/configure.ac |
63 | @@ -2018,7 +2018,6 @@ libdaemon/server/Makefile | 63 | @@ -2022,7 +2022,6 @@ libdaemon/server/Makefile |
64 | libdm/Makefile | 64 | libdm/Makefile |
65 | libdm/dm-tools/Makefile | 65 | libdm/dm-tools/Makefile |
66 | libdm/libdevmapper.pc | 66 | libdm/libdevmapper.pc |
@@ -68,6 +68,3 @@ index 6def519..18a5c97 100644 | |||
68 | po/Makefile | 68 | po/Makefile |
69 | scripts/lvm2-pvscan.service | 69 | scripts/lvm2-pvscan.service |
70 | scripts/blkdeactivate.sh | 70 | scripts/blkdeactivate.sh |
71 | -- | ||
72 | 2.25.1 | ||
73 | |||
diff --git a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch index 5b9b2d574..2d4982005 100644 --- a/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch +++ b/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e213ed33a28704f6f538df41a91b7ce95594a4f8 Mon Sep 17 00:00:00 2001 | 1 | From 20a110ade91c73f4cb3883a3a9676708a93ca786 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: Tue, 15 Oct 2019 18:12:54 +0800 | 3 | Date: Tue, 15 Oct 2019 18:12:54 +0800 |
4 | Subject: [PATCH] start lvm2-monitor.service after tmp.mount | 4 | Subject: [PATCH] start lvm2-monitor.service after tmp.mount |
@@ -19,7 +19,7 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | |||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in | 21 | diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in |
22 | index c0c96e3..2a99a37 100644 | 22 | index c0c96e316..2a99a379d 100644 |
23 | --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in | 23 | --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in |
24 | +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in | 24 | +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in |
25 | @@ -2,7 +2,7 @@ | 25 | @@ -2,7 +2,7 @@ |
@@ -31,6 +31,3 @@ index c0c96e3..2a99a37 100644 | |||
31 | Before=local-fs-pre.target shutdown.target | 31 | Before=local-fs-pre.target shutdown.target |
32 | DefaultDependencies=no | 32 | DefaultDependencies=no |
33 | Conflicts=shutdown.target | 33 | Conflicts=shutdown.target |
34 | -- | ||
35 | 2.25.1 | ||
36 | |||
diff --git a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch index 3f53db9e5..ca632d213 100644 --- a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch +++ b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch | |||
@@ -1,14 +1,21 @@ | |||
1 | configure.ac: override CONFIGURE_LINE | 1 | From f5c6fabbdf2e7bfa105658b9dfe45d2ab86f34bb Mon Sep 17 00:00:00 2001 |
2 | From: Joe Slater <joe.slater@windriver.com> | ||
3 | Date: Fri, 17 Jul 2020 13:59:56 -0700 | ||
4 | Subject: [PATCH] configure.ac: override CONFIGURE_LINE | ||
2 | 5 | ||
3 | For reproducible binaries, we need to report a constant CONFIGURE_LINE. | 6 | For reproducible binaries, we need to report a constant CONFIGURE_LINE. |
4 | 7 | ||
5 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
6 | 9 | ||
7 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 10 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
11 | --- | ||
12 | configure.ac | 10 +++++++++- | ||
13 | 1 file changed, 9 insertions(+), 1 deletion(-) | ||
8 | 14 | ||
9 | 15 | diff --git a/configure.ac b/configure.ac | |
10 | --- git.orig/configure.ac | 16 | index 5364dd68e..c2dbf3c9f 100644 |
11 | +++ git/configure.ac | 17 | --- a/configure.ac |
18 | +++ b/configure.ac | ||
12 | @@ -15,7 +15,15 @@ AC_PREREQ(2.69) | 19 | @@ -15,7 +15,15 @@ AC_PREREQ(2.69) |
13 | ################################################################################ | 20 | ################################################################################ |
14 | dnl -- Process this file with autoconf to produce a configure script. | 21 | dnl -- Process this file with autoconf to produce a configure script. |
diff --git a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.22.bb b/meta-oe/recipes-support/lvm2/libdevmapper.bb index be558ce1d..be558ce1d 100644 --- a/meta-oe/recipes-support/lvm2/libdevmapper_2.03.22.bb +++ b/meta-oe/recipes-support/lvm2/libdevmapper.bb | |||
diff --git a/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb b/meta-oe/recipes-support/lvm2/lvm2.bb index c675d3ded..868f5a249 100644 --- a/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb +++ b/meta-oe/recipes-support/lvm2/lvm2.bb | |||
@@ -3,7 +3,6 @@ require lvm2.inc | |||
3 | SRC_URI += " \ | 3 | SRC_URI += " \ |
4 | file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ | 4 | file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \ |
5 | file://tweak-for-lvmdbusd.patch \ | 5 | file://tweak-for-lvmdbusd.patch \ |
6 | file://0001-lvmdbusd-create-dirs-for-lock-file.patch \ | ||
7 | " | 6 | " |
8 | 7 | ||
9 | DEPENDS += "autoconf-archive-native" | 8 | DEPENDS += "autoconf-archive-native" |
@@ -17,7 +16,7 @@ CACHED_CONFIGUREVARS += "MODPROBE_CMD=${base_sbindir}/modprobe" | |||
17 | do_install:append() { | 16 | do_install:append() { |
18 | # Install machine specific configuration file | 17 | # Install machine specific configuration file |
19 | install -d ${D}${sysconfdir}/lvm | 18 | install -d ${D}${sysconfdir}/lvm |
20 | install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf | 19 | install -m 0644 ${UNPACKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf |
21 | sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf | 20 | sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf |
22 | # We don't want init scripts/systemd units for native SDK utilities | 21 | # We don't want init scripts/systemd units for native SDK utilities |
23 | if [ "${PN}" != "nativesdk-lvm2" ]; then | 22 | if [ "${PN}" != "nativesdk-lvm2" ]; then |
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc index d95366f97..29cc7425b 100644 --- a/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-oe/recipes-support/lvm2/lvm2.inc | |||
@@ -19,8 +19,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ | |||
19 | file://0001-include-libgen.h-for-basename.patch \ | 19 | file://0001-include-libgen.h-for-basename.patch \ |
20 | " | 20 | " |
21 | 21 | ||
22 | SRCREV = "016e469caf856f1eb8dde39df0d1aa2e74225aed" | 22 | SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f" |
23 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
24 | PV = "2.03.24" | ||
24 | 25 | ||
25 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" | 26 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" |
26 | 27 | ||
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch index c0cf836ce..96a3d64fd 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ddf36613f3408ce42f15b03b4e9c6ad8478b97f8 Mon Sep 17 00:00:00 2001 | 1 | From 2ff2a867db8d3e1c660d191a1805f9e355169c80 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: Tue, 2 Mar 2021 01:33:05 -0800 | 3 | Date: Tue, 2 Mar 2021 01:33:05 -0800 |
4 | Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found | 4 | Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found |
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
15 | 2 files changed, 7 insertions(+), 3 deletions(-) | 15 | 2 files changed, 7 insertions(+), 3 deletions(-) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
18 | index 991a0cf85..e59c82472 100644 | 18 | index d9e7964c3..9dfdcfe01 100644 |
19 | --- a/configure.ac | 19 | --- a/configure.ac |
20 | +++ b/configure.ac | 20 | +++ b/configure.ac |
21 | @@ -1660,6 +1660,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [ | 21 | @@ -1704,6 +1704,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [ |
22 | 22 | ||
23 | SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" | 23 | SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))" |
24 | 24 | ||
@@ -27,7 +27,7 @@ index 991a0cf85..e59c82472 100644 | |||
27 | SBINDIR="$(eval echo $(eval echo $sbindir))" | 27 | SBINDIR="$(eval echo $(eval echo $sbindir))" |
28 | LVM_PATH="$SBINDIR/lvm" | 28 | LVM_PATH="$SBINDIR/lvm" |
29 | AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) | 29 | AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.]) |
30 | @@ -1886,6 +1888,7 @@ AC_SUBST(PYTHON2DIR) | 30 | @@ -1944,6 +1946,7 @@ AC_SUBST(PYTHON2DIR) |
31 | AC_SUBST(PYTHON3) | 31 | AC_SUBST(PYTHON3) |
32 | AC_SUBST(PYTHON3DIR) | 32 | AC_SUBST(PYTHON3DIR) |
33 | AC_SUBST(RT_LIBS) | 33 | AC_SUBST(RT_LIBS) |
@@ -68,6 +68,3 @@ index 7c517b87b..7ef1bb766 100644 | |||
68 | 68 | ||
69 | # Do not show tool errors by default (only done/skipping summary | 69 | # Do not show tool errors by default (only done/skipping summary |
70 | # message provided by this script) and no verbose mode by default. | 70 | # message provided by this script) and no verbose mode by default. |
71 | -- | ||
72 | 2.29.2 | ||
73 | |||
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch deleted file mode 100644 index f6b293553..000000000 --- a/meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | lvmdbusd: create dirs for lock file | ||
2 | |||
3 | Create leading dirs for lvmdbusd lock file, otherwise it fails to start: | ||
4 | |||
5 | | systemd[1]: Starting LVM2 D-Bus service... | ||
6 | | lvmdbusd[1602]: [1602]: Error during creation of lock file(/var/lock/lvm/lvmdbusd): errno(2), exiting! | ||
7 | |||
8 | Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/7] | ||
9 | |||
10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
11 | --- | ||
12 | daemons/lvmdbusd/utils.py | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py | ||
16 | index d479175f6..830648659 100644 | ||
17 | --- a/daemons/lvmdbusd/utils.py | ||
18 | +++ b/daemons/lvmdbusd/utils.py | ||
19 | @@ -778,6 +778,7 @@ class LockFile(object): | ||
20 | |||
21 | def __enter__(self): | ||
22 | try: | ||
23 | + os.makedirs(os.path.dirname(self.lock_file)) | ||
24 | self.fd = os.open(self.lock_file, os.O_CREAT | os.O_RDWR, stat.S_IRUSR | stat.S_IWUSR) | ||
25 | |||
26 | # Get and set the close on exec and lock the file | ||
27 | -- | ||
28 | 2.34.1 | ||
29 | |||
diff --git a/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch index 3b85a17b6..200f2f044 100644 --- a/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch +++ b/meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From 34f5a21afae759d48fa11e77b622ca35a4feabaa 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] lvm2: 2.03.16 -> 2.03.22 | ||
5 | |||
1 | Not check python modules pyudev and dbus during configure that they are runtime | 6 | Not check python modules pyudev and dbus during configure that they are runtime |
2 | dependencies. Deal with them in the package config setting in the recipe. | 7 | dependencies. Deal with them in the package config setting in the recipe. |
3 | 8 | ||
@@ -13,10 +18,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> | |||
13 | 2 files changed, 4 insertions(+), 6 deletions(-) | 18 | 2 files changed, 4 insertions(+), 6 deletions(-) |
14 | 19 | ||
15 | diff --git a/configure.ac b/configure.ac | 20 | diff --git a/configure.ac b/configure.ac |
16 | index ee088b3f5..b94ef4e56 100644 | 21 | index 9dfdcfe01..fcf5c8b78 100644 |
17 | --- a/configure.ac | 22 | --- a/configure.ac |
18 | +++ b/configure.ac | 23 | +++ b/configure.ac |
19 | @@ -1262,8 +1262,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [ | 24 | @@ -1282,8 +1282,8 @@ AS_IF([test "$BUILD_LVMDBUSD" = "yes"], [ |
20 | AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"]) | 25 | AS_IF([test "$PYTHON3_BINDINGS" = "yes"], [PYTHON_BINDINGS="yes"]) |
21 | 26 | ||
22 | # To get this macro, install autoconf-archive package then run autoreconf | 27 | # To get this macro, install autoconf-archive package then run autoreconf |
@@ -28,7 +33,7 @@ index ee088b3f5..b94ef4e56 100644 | |||
28 | 33 | ||
29 | ################################################################################ | 34 | ################################################################################ |
30 | diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in | 35 | diff --git a/daemons/lvmdbusd/Makefile.in b/daemons/lvmdbusd/Makefile.in |
31 | index 9c2629279..a79daabf7 100644 | 36 | index 08b061fb2..e2b1c3209 100644 |
32 | --- a/daemons/lvmdbusd/Makefile.in | 37 | --- a/daemons/lvmdbusd/Makefile.in |
33 | +++ b/daemons/lvmdbusd/Makefile.in | 38 | +++ b/daemons/lvmdbusd/Makefile.in |
34 | @@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ | 39 | @@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@ |
@@ -41,7 +46,7 @@ index 9c2629279..a79daabf7 100644 | |||
41 | LVMDBUS_SRCDIR_FILES = \ | 46 | LVMDBUS_SRCDIR_FILES = \ |
42 | automatedproperties.py \ | 47 | automatedproperties.py \ |
43 | @@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD) | 48 | @@ -55,11 +55,9 @@ install_lvmdbusd: $(LVMDBUSD) |
44 | @echo " [INSTALL] $<" | 49 | $(SHOW) " [INSTALL] $<" |
45 | $(Q) $(INSTALL_DIR) $(sbindir) | 50 | $(Q) $(INSTALL_DIR) $(sbindir) |
46 | $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) | 51 | $(Q) $(INSTALL_SCRIPT) $(LVMDBUSD) $(sbindir) |
47 | - $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__ | 52 | - $(Q) $(INSTALL_DIR) $(lvmdbusdir) $(lvmdbusdir)/__pycache__ |
diff --git a/meta-oe/recipes-support/mcelog/mcelog_198.bb b/meta-oe/recipes-support/mcelog/mcelog_199.bb index e302f4175..0a48fc48c 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_198.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_199.bb | |||
@@ -5,13 +5,12 @@ and should run on all Linux systems that need error handling." | |||
5 | HOMEPAGE = "https://mcelog.org/" | 5 | HOMEPAGE = "https://mcelog.org/" |
6 | SECTION = "System Environment/Base" | 6 | SECTION = "System Environment/Base" |
7 | 7 | ||
8 | SRC_URI = "\ | 8 | SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ |
9 | git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \ | 9 | file://0001-client-Include-string.h-form-mem-function-prototypes.patch \ |
10 | file://0001-client-Include-string.h-form-mem-function-prototypes.patch \ | 10 | file://run-ptest \ |
11 | file://run-ptest \ | 11 | " |
12 | " | ||
13 | 12 | ||
14 | SRCREV = "ab58f07b9b1a4456fca0f5f41639d5cbecc80e36" | 13 | SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf" |
15 | 14 | ||
16 | LICENSE = "GPL-2.0-only" | 15 | LICENSE = "GPL-2.0-only" |
17 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
diff --git a/meta-oe/recipes-support/monit/monit_5.33.0.bb b/meta-oe/recipes-support/monit/monit_5.34.0.bb index 66d4079a9..7c3869789 100644 --- a/meta-oe/recipes-support/monit/monit_5.33.0.bb +++ b/meta-oe/recipes-support/monit/monit_5.34.0.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = " \ | |||
15 | file://monitrc \ | 15 | file://monitrc \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRC_URI[sha256sum] = "1ace889c0183473a9d70160df6533bb6e1338dc1354f5928507803e1e2a863b5" | 18 | SRC_URI[sha256sum] = "37f514cd8973bbce104cb8517ff3fc504052a083703eee0d0e873db26b919820" |
19 | 19 | ||
20 | DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" | 20 | DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" |
21 | 21 | ||
@@ -45,12 +45,12 @@ do_configure:prepend() { | |||
45 | do_install:append() { | 45 | do_install:append() { |
46 | 46 | ||
47 | # Configuration file | 47 | # Configuration file |
48 | install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc | 48 | install -Dm 0600 ${UNPACKDIR}/monitrc ${D}${sysconfdir}/monitrc |
49 | 49 | ||
50 | # SystemD | 50 | # SystemD |
51 | install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service | 51 | install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service |
52 | sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service | 52 | sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service |
53 | 53 | ||
54 | # SysV | 54 | # SysV |
55 | install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit | 55 | install -Dm 0755 ${UNPACKDIR}/monit ${D}${sysconfdir}/init.d/monit |
56 | } | 56 | } |
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb index e9f01bd1f..374cda3b4 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb | |||
@@ -91,14 +91,14 @@ do_install() { | |||
91 | # | 91 | # |
92 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)};then | 92 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)};then |
93 | install -d ${D}${sysconfdir}/init.d | 93 | install -d ${D}${sysconfdir}/init.d |
94 | cp ${WORKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd | 94 | cp ${UNPACKDIR}/multipathd.oe ${D}${sysconfdir}/init.d/multipathd |
95 | fi | 95 | fi |
96 | 96 | ||
97 | sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \ | 97 | sed -i "s:/usr/lib/udev/kpartx_id:${nonarch_base_libdir}/udev/kpartx_id:g" \ |
98 | ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules | 98 | ${D}${nonarch_base_libdir}/udev/rules.d/11-dm-mpath.rules |
99 | 99 | ||
100 | install -d ${D}${sysconfdir} | 100 | install -d ${D}${sysconfdir} |
101 | install -m 0644 ${WORKDIR}/multipath.conf.example \ | 101 | install -m 0644 ${UNPACKDIR}/multipath.conf.example \ |
102 | ${D}${sysconfdir}/multipath.conf.example | 102 | ${D}${sysconfdir}/multipath.conf.example |
103 | } | 103 | } |
104 | 104 | ||
diff --git a/meta-oe/recipes-support/nano/nano_7.2.bb b/meta-oe/recipes-support/nano/nano_8.0.bb index 0642287c9..56aa47f64 100644 --- a/meta-oe/recipes-support/nano/nano_7.2.bb +++ b/meta-oe/recipes-support/nano/nano_8.0.bb | |||
@@ -13,7 +13,7 @@ RDEPENDS:${PN} = "ncurses-terminfo-base" | |||
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] = "86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526" | 16 | SRC_URI[sha256sum] = "c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4" |
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 d4a357cea..1779dd227 100644 --- a/meta-oe/recipes-support/nmon/nmon_16m.bb +++ b/meta-oe/recipes-support/nmon/nmon_16m.bb | |||
@@ -18,7 +18,8 @@ CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" | |||
18 | LDFLAGS += "-ltinfo -lncursesw -lm" | 18 | LDFLAGS += "-ltinfo -lncursesw -lm" |
19 | ASNEEDED:pn-nmon = "" | 19 | ASNEEDED:pn-nmon = "" |
20 | 20 | ||
21 | S = "${WORKDIR}" | 21 | S = "${WORKDIR}/sources" |
22 | UNPACKDIR = "${S}" | ||
22 | 23 | ||
23 | do_compile() { | 24 | do_compile() { |
24 | ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon | 25 | ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon |
diff --git a/meta-oe/recipes-support/nspr/nspr_4.35.bb b/meta-oe/recipes-support/nspr/nspr_4.35.bb index f8d329398..abd750b13 100644 --- a/meta-oe/recipes-support/nspr/nspr_4.35.bb +++ b/meta-oe/recipes-support/nspr/nspr_4.35.bb | |||
@@ -171,7 +171,7 @@ do_compile:append() { | |||
171 | } | 171 | } |
172 | 172 | ||
173 | do_install:append() { | 173 | do_install:append() { |
174 | install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc | 174 | install -D ${UNPACKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc |
175 | sed -i \ | 175 | sed -i \ |
176 | -e 's:NSPRVERSION:${PV}:g' \ | 176 | -e 's:NSPRVERSION:${PV}:g' \ |
177 | -e 's:OEPREFIX:${prefix}:g' \ | 177 | -e 's:OEPREFIX:${prefix}:g' \ |
diff --git a/meta-oe/recipes-support/nss/nss_3.98.bb b/meta-oe/recipes-support/nss/nss_3.101.bb index 01501362e..5a01efb7e 100644 --- a/meta-oe/recipes-support/nss/nss_3.98.bb +++ b/meta-oe/recipes-support/nss/nss_3.101.bb | |||
@@ -33,7 +33,7 @@ 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] = "f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce" | 36 | SRC_URI[sha256sum] = "859748f0b4b7bb51e7e600ae5a88ef4d71f93e6964b1beed2727784dd9ed85e7" |
37 | 37 | ||
38 | UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" | 38 | UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" |
39 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" | 39 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" |
@@ -224,7 +224,7 @@ do_install:append() { | |||
224 | done | 224 | done |
225 | 225 | ||
226 | install -d ${D}${libdir}/pkgconfig/ | 226 | install -d ${D}${libdir}/pkgconfig/ |
227 | sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc | 227 | sed 's/%NSS_VERSION%/${PV}/' ${UNPACKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc |
228 | sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc | 228 | sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc |
229 | sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc | 229 | sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc |
230 | sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc | 230 | sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc |
@@ -239,9 +239,9 @@ do_install:append:class-target() { | |||
239 | # databases by: | 239 | # databases by: |
240 | # certutil -N -d sql:/database/path/ --empty-password | 240 | # certutil -N -d sql:/database/path/ --empty-password |
241 | install -d ${D}${sysconfdir}/pki/nssdb/ | 241 | install -d ${D}${sysconfdir}/pki/nssdb/ |
242 | install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db | 242 | install -m 0644 ${UNPACKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db |
243 | install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db | 243 | install -m 0644 ${UNPACKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db |
244 | install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt | 244 | install -m 0644 ${UNPACKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt |
245 | } | 245 | } |
246 | 246 | ||
247 | PACKAGE_WRITE_DEPS += "nss-native" | 247 | PACKAGE_WRITE_DEPS += "nss-native" |
diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb index 4a1a0f568..e4b99089f 100644 --- a/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb | |||
@@ -62,7 +62,7 @@ do_install () { | |||
62 | install -d ${D}${sysconfdir} | 62 | install -d ${D}${sysconfdir} |
63 | # fix up hardcoded paths | 63 | # fix up hardcoded paths |
64 | sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ | 64 | sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \ |
65 | ${WORKDIR}/openct.service ${WORKDIR}/openct.init | 65 | ${UNPACKDIR}/openct.service ${UNPACKDIR}/openct.init |
66 | 66 | ||
67 | oe_runmake install DESTDIR=${D} | 67 | oe_runmake install DESTDIR=${D} |
68 | install -dm 755 ${D}${libdir}/ctapi/ | 68 | install -dm 755 ${D}${libdir}/ctapi/ |
@@ -70,11 +70,11 @@ do_install () { | |||
70 | install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules | 70 | install -Dpm 644 etc/openct.udev ${D}${nonarch_libdir}/udev/rules.d/60-openct.rules |
71 | install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf | 71 | install -pm 644 etc/openct.conf ${D}${sysconfdir}/openct.conf |
72 | 72 | ||
73 | install -Dpm 755 ${WORKDIR}/openct.init ${D}${sysconfdir}/init.d/openct | 73 | install -Dpm 755 ${UNPACKDIR}/openct.init ${D}${sysconfdir}/init.d/openct |
74 | install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct | 74 | install -Dpm 644 ${UNPACKDIR}/openct.sysconfig ${D}${sysconfdir}/sysconfig/openct |
75 | 75 | ||
76 | install -d ${D}${systemd_unitdir}/system | 76 | install -d ${D}${systemd_unitdir}/system |
77 | install -m 644 ${WORKDIR}/openct.service ${D}${systemd_unitdir}/system | 77 | install -m 644 ${UNPACKDIR}/openct.service ${D}${systemd_unitdir}/system |
78 | 78 | ||
79 | so=$(find ${D} -name \*.so | sed "s|^${D}||") | 79 | so=$(find ${D} -name \*.so | sed "s|^${D}||") |
80 | sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf | 80 | sed -i -e 's|\\(LIBPATH\\s*\\).*|\\1$so|' etc/reader.conf |
diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb b/meta-oe/recipes-support/openldap/openldap_2.6.7.bb index e807fdef1..c229667d6 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.6.7.bb | |||
@@ -160,7 +160,7 @@ FILES:${PN}-dbg += "${libexecdir}/openldap/.debug" | |||
160 | 160 | ||
161 | do_install:append() { | 161 | do_install:append() { |
162 | install -d ${D}${sysconfdir}/init.d | 162 | install -d ${D}${sysconfdir}/init.d |
163 | cat ${WORKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap | 163 | cat ${UNPACKDIR}/initscript > ${D}${sysconfdir}/init.d/openldap |
164 | chmod 755 ${D}${sysconfdir}/init.d/openldap | 164 | chmod 755 ${D}${sysconfdir}/init.d/openldap |
165 | # This is duplicated in /etc/openldap and is for slapd | 165 | # This is duplicated in /etc/openldap and is for slapd |
166 | rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example | 166 | rm -f ${D}${localstatedir}/openldap-data/DB_CONFIG.example |
@@ -177,7 +177,7 @@ do_install:append() { | |||
177 | rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" | 177 | rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" |
178 | 178 | ||
179 | install -d ${D}${systemd_unitdir}/system/ | 179 | install -d ${D}${systemd_unitdir}/system/ |
180 | install -m 0644 ${WORKDIR}/slapd.service ${D}${systemd_unitdir}/system/ | 180 | install -m 0644 ${UNPACKDIR}/slapd.service ${D}${systemd_unitdir}/system/ |
181 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service | 181 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/*.service |
182 | 182 | ||
183 | # Uses mdm as the database | 183 | # Uses mdm as the database |
diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb new file mode 100644 index 000000000..88033e58c --- /dev/null +++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "Open Telemetry Library" | ||
2 | DESCRIPTION = "An Observability framework to create and manage telemetry data \ | ||
3 | such as traces, metrics, and logs." | ||
4 | HOMEPAGE = "https://github.com/open-telemetry/opentelemetry-cpp" | ||
5 | SECTION = "libs" | ||
6 | LICENSE = "Apache-2.0" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | ||
8 | |||
9 | DEPENDS = "nlohmann-json" | ||
10 | |||
11 | SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;" | ||
12 | SRCREV = "054b0dc207c1f58e290d78cdaac5f314bc328b31" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | inherit cmake pkgconfig lib_package | ||
16 | |||
17 | PACKAGECONFIG ?= "opentelemety_install otlp_api" | ||
18 | |||
19 | PACKAGECONFIG[opentelemety_install]="-DOPENTELEMETRY_INSTALL=ON,-DOPENTELEMETRY_INSTALL=OFF" | ||
20 | PACKAGECONFIG[build_package]="-DBUILD_PACKAGE=ON,-DBUILD_PACKAGE=OFF" | ||
21 | PACKAGECONFIG[otlp_api]="-DWITH_OTLP_API=ON,-DWITH_OTLP_API=OFF" | ||
22 | PACKAGECONFIG[otlp_grpc]="-DWITH_OTLP_GRPC=ON,-DWITH_OTLP_GRPC=OFF" | ||
23 | PACKAGECONFIG[otlp_http]="-DWITH_OTLP_HTTP=ON,-DWITH_OTLP_HTTP=OFF" | ||
24 | PACKAGECONFIG[otlp_prometheus]="-DWITH_PROMETHEUS=ON,-DWITH_PROMETHEUS=OFF" | ||
25 | PACKAGECONFIG[benchmark]="-DWITH_BENCHMARK=ON,-DWITH_BENCHMARK=OFF" | ||
26 | PACKAGECONFIG[testing]="-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF" | ||
diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb index 6a93b2ec9..10545b65e 100644 --- a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb +++ b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb | |||
@@ -52,7 +52,7 @@ RDEPENDS:${PN}-testsuite += "${PN} bash perl" | |||
52 | RDEPENDS:python3-${PN} += "${PN} python3" | 52 | RDEPENDS:python3-${PN} += "${PN} python3" |
53 | 53 | ||
54 | do_configure:prepend () { | 54 | do_configure:prepend () { |
55 | cp ${WORKDIR}/config.linux ${B} | 55 | cp ${UNPACKDIR}/config.linux ${B} |
56 | rm -rf ${S}/include/pcp/configsz.h | 56 | rm -rf ${S}/include/pcp/configsz.h |
57 | rm -rf ${S}/include/pcp/platformsz.h | 57 | rm -rf ${S}/include/pcp/platformsz.h |
58 | export SED=${TMPDIR}/hosttools/sed | 58 | export SED=${TMPDIR}/hosttools/sed |
diff --git a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch index f70e8bcc7..d172c8dbf 100644 --- a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch +++ b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 879ddb725823c78c9510cfd39786adb16f3726c8 Mon Sep 17 00:00:00 2001 | 1 | From 6b1123b313e439d8bfae3570a3e541b3aa26f3ad 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, 16 Sep 2023 19:52:56 -0700 | 3 | Date: Sat, 16 Sep 2023 19:52:56 -0700 |
4 | Subject: [PATCH] cppignore.lnx: Ignore PKCS12 and testLaunch test | 4 | Subject: [PATCH] cppignore.lnx: Ignore PKCS12 and testLaunch test |
@@ -48,10 +48,10 @@ Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com> | |||
48 | 1 file changed, 9 insertions(+) | 48 | 1 file changed, 9 insertions(+) |
49 | 49 | ||
50 | diff --git a/cppignore.lnx b/cppignore.lnx | 50 | diff --git a/cppignore.lnx b/cppignore.lnx |
51 | index 2c2376526..65df4af08 100644 | 51 | index b3288d474..9aad48ca5 100644 |
52 | --- a/cppignore.lnx | 52 | --- a/cppignore.lnx |
53 | +++ b/cppignore.lnx | 53 | +++ b/cppignore.lnx |
54 | @@ -28,3 +28,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy | 54 | @@ -30,3 +30,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy |
55 | CppUnit::TestCaller<HTTPSStreamFactoryTest>.testProxy | 55 | CppUnit::TestCaller<HTTPSStreamFactoryTest>.testProxy |
56 | CppUnit::TestCaller<DNSTest>.testHostByAddress | 56 | CppUnit::TestCaller<DNSTest>.testHostByAddress |
57 | CppUnit::TestCaller<DNSTest>.testHostByName | 57 | CppUnit::TestCaller<DNSTest>.testHostByName |
diff --git a/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch b/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch deleted file mode 100644 index 427cb9723..000000000 --- a/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From e54478c936493c0ed87e875f04127bd13642de44 Mon Sep 17 00:00:00 2001 | ||
2 | From: tyler92 <tyler92@inbox.ru> | ||
3 | Date: Tue, 21 Nov 2023 05:07:24 +0300 | ||
4 | Subject: [PATCH] fix(build): Install cmake files with resolved ENABLE_JSON and | ||
5 | ENABLE_XML (#4227) | ||
6 | |||
7 | Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/4227] | ||
8 | Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> | ||
9 | |||
10 | --- | ||
11 | Util/cmake/PocoUtilConfig.cmake | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/Util/cmake/PocoUtilConfig.cmake b/Util/cmake/PocoUtilConfig.cmake | ||
15 | index 90c1eab1c..8186435e1 100644 | ||
16 | --- a/Util/cmake/PocoUtilConfig.cmake | ||
17 | +++ b/Util/cmake/PocoUtilConfig.cmake | ||
18 | @@ -1,9 +1,9 @@ | ||
19 | include(CMakeFindDependencyMacro) | ||
20 | find_dependency(PocoFoundation) | ||
21 | -if(ENABLE_XML) | ||
22 | +if(@ENABLE_XML@) | ||
23 | find_dependency(PocoXML) | ||
24 | endif() | ||
25 | -if(ENABLE_JSON) | ||
26 | +if(@ENABLE_JSON@) | ||
27 | find_dependency(PocoJSON) | ||
28 | endif() | ||
29 | include("${CMAKE_CURRENT_LIST_DIR}/PocoUtilTargets.cmake") | ||
30 | -- | ||
31 | 2.43.0 | ||
32 | |||
diff --git a/meta-oe/recipes-support/poco/poco_1.12.5p2.bb b/meta-oe/recipes-support/poco/poco_1.13.3.bb index a0bb0b5d9..6ad577b37 100644 --- a/meta-oe/recipes-support/poco/poco_1.12.5p2.bb +++ b/meta-oe/recipes-support/poco/poco_1.13.3.bb | |||
@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" | |||
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;protocol=https \ | 11 | SRC_URI = "git://github.com/pocoproject/poco.git;branch=master-unused;protocol=https \ |
12 | file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ | 12 | file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ |
13 | file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ | 13 | file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ |
14 | file://run-ptest \ | 14 | file://run-ptest \ |
15 | file://0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch \ | ||
16 | " | 15 | " |
17 | SRCREV = "1d6fb3e1383e559cacbada5e3f861c0dafaf5d30" | 16 | SRCREV = "d6bd48a94c5f03e3c69cac1b024fdad5120e3a7b" |
18 | 17 | ||
19 | UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" | 18 | UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" |
20 | 19 | ||
diff --git a/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb index eed21ad54..5433659af 100644 --- a/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb +++ b/meta-oe/recipes-support/poppler/poppler-data_0.4.12.bb | |||
@@ -30,7 +30,7 @@ do_compile() { | |||
30 | do_install() { | 30 | do_install() { |
31 | oe_runmake install DESTDIR=${D} prefix=${prefix} datadir=${datadir} | 31 | oe_runmake install DESTDIR=${D} prefix=${prefix} datadir=${datadir} |
32 | install -d ${D}${datadir}/poppler/cMap | 32 | install -d ${D}${datadir}/poppler/cMap |
33 | install -m644 ${WORKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ | 33 | install -m644 ${UNPACKDIR}/Identity-* ${D}${datadir}/poppler/cMap/ |
34 | } | 34 | } |
35 | 35 | ||
36 | FILES:${PN} += "${datadir}" | 36 | FILES:${PN} += "${datadir}" |
diff --git a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb index b61fb026c..09534c44f 100644 --- a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb +++ b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb | |||
@@ -9,7 +9,8 @@ SRC_URI = "file://pxaregs.c \ | |||
9 | file://serial.patch \ | 9 | file://serial.patch \ |
10 | file://usb.patch " | 10 | file://usb.patch " |
11 | 11 | ||
12 | S = "${WORKDIR}" | 12 | S = "${WORKDIR}/sources" |
13 | UNPACKDIR = "${S}" | ||
13 | 14 | ||
14 | do_compile() { | 15 | do_compile() { |
15 | ${CC} pxaregs.c -o pxaregs ${CFLAGS} ${LDFLAGS} | 16 | ${CC} pxaregs.c -o pxaregs ${CFLAGS} ${LDFLAGS} |
diff --git a/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb b/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb new file mode 100644 index 000000000..323ddb415 --- /dev/null +++ b/meta-oe/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | # Copyright (C) 2024 Khem Raj <raj.khem@gmail.com> | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | SUMMARY = "Version numbering for anarchists and software realists" | ||
5 | HOMEPAGE = "https://github.com/effigies/looseversion" | ||
6 | LICENSE = "PSF-2.0" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d5605fc335ce1bab614032468d0a1e00" | ||
8 | |||
9 | DEPENDS = "python3-hatchling-native" | ||
10 | SRC_URI[sha256sum] = "ebde65f3f6bb9531a81016c6fef3eb95a61181adc47b7f949e9c0ea47911669e" | ||
11 | |||
12 | inherit pypi python_hatchling | ||
13 | |||
14 | PYPI_PACKAGE = "looseversion" | ||
diff --git a/meta-oe/recipes-support/re2/re2_2024.03.01.bb b/meta-oe/recipes-support/re2/re2_2024.03.01.bb index 192fe265f..76d6f0c7a 100644 --- a/meta-oe/recipes-support/re2/re2_2024.03.01.bb +++ b/meta-oe/recipes-support/re2/re2_2024.03.01.bb | |||
@@ -16,9 +16,6 @@ DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebe | |||
16 | 16 | ||
17 | inherit cmake ptest | 17 | inherit cmake ptest |
18 | RDEPENDS:${PN}-ptest += "cmake sed" | 18 | RDEPENDS:${PN}-ptest += "cmake sed" |
19 | RDEPENDS:${PN} += "abseil-cpp-dev" | ||
20 | |||
21 | INSANE_SKIP:${PN} += "dev-deps" | ||
22 | 19 | ||
23 | EXTRA_OECMAKE += " \ | 20 | EXTRA_OECMAKE += " \ |
24 | -DBUILD_SHARED_LIBS=ON \ | 21 | -DBUILD_SHARED_LIBS=ON \ |
@@ -35,10 +32,11 @@ do_install_ptest () { | |||
35 | } | 32 | } |
36 | 33 | ||
37 | # ignore .so in /usr/lib64 | 34 | # ignore .so in /usr/lib64 |
38 | FILES:${PN} = "${libdir}" | 35 | SOLIBS = ".so*" |
36 | FILES_SOLIBSDEV = "" | ||
39 | INSANE_SKIP:${PN} += "dev-so" | 37 | INSANE_SKIP:${PN} += "dev-so" |
40 | 38 | ||
41 | # Don't include so files in dev package | 39 | # Don't include so files in dev package |
42 | FILES:${PN}-dev = "${includedir} ${libdir}/cmake" | 40 | FILES:${PN}-dev = "${includedir} ${libdir}/cmake ${libdir}/pkgconfig" |
43 | 41 | ||
44 | BBCLASSEXTEND = "native nativesdk" | 42 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.34.bb b/meta-oe/recipes-support/remmina/remmina_1.4.35.bb index 921d34d9f..0cad52df3 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.4.34.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.4.35.bb | |||
@@ -25,7 +25,7 @@ DEPENDS = " \ | |||
25 | DEPENDS:append:libc-musl = " libexecinfo" | 25 | DEPENDS:append:libc-musl = " libexecinfo" |
26 | LDFLAGS:append:libc-musl = " -lexecinfo" | 26 | LDFLAGS:append:libc-musl = " -lexecinfo" |
27 | 27 | ||
28 | SRCREV = "75a0bdb795d99e052690178ae0d81ebdbd2cbdd3" | 28 | SRCREV = "2a455eadd6462457d08c2d066c5c245e0dee3bf9" |
29 | SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" | 29 | SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" |
30 | S = "${WORKDIR}/git" | 30 | S = "${WORKDIR}/git" |
31 | 31 | ||
diff --git a/meta-oe/recipes-support/sdmon/sdmon_git.bb b/meta-oe/recipes-support/sdmon/sdmon_git.bb index 522539a67..81c8033c1 100644 --- a/meta-oe/recipes-support/sdmon/sdmon_git.bb +++ b/meta-oe/recipes-support/sdmon/sdmon_git.bb | |||
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
6 | 6 | ||
7 | SRC_URI = "git://github.com/Ognian/sdmon;protocol=https;branch=master" | 7 | SRC_URI = "git://github.com/Ognian/sdmon;protocol=https;branch=master" |
8 | 8 | ||
9 | PV = "0.8.1+git" | 9 | PV = "0.9.0" |
10 | SRCREV = "ef1aec457f04a50721f0259651cca9c946f11390" | 10 | SRCREV = "4dff9b690e8d4454fada6abfbb6b32fcb794968c" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
diff --git a/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch b/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch new file mode 100644 index 000000000..5f4a81a72 --- /dev/null +++ b/meta-oe/recipes-support/serial/serial/0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 23ae981ba46f6d5af03b12083ad32de9c1f148b2 Mon Sep 17 00:00:00 2001 | ||
2 | From: magicWenli <48174882+magicwenli@users.noreply.github.com> | ||
3 | Date: Fri, 12 Apr 2024 07:52:53 +0000 | ||
4 | Subject: [PATCH] Add SOVERSION for shared lib, and comment example by default | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | --- | ||
8 | CMakeLists.txt | 14 ++++++++++---- | ||
9 | 1 file changed, 10 insertions(+), 4 deletions(-) | ||
10 | |||
11 | --- a/CMakeLists.txt | ||
12 | +++ b/CMakeLists.txt | ||
13 | @@ -1,5 +1,8 @@ | ||
14 | cmake_minimum_required(VERSION 2.8.3) | ||
15 | project(serial) | ||
16 | +set (SERIAL_VERSION_MAJOR 1) | ||
17 | +set (SERIAL_VERSION_MINOR 2) | ||
18 | +set (SERIAL_VERSION_PATCH 1) | ||
19 | |||
20 | # Find catkin | ||
21 | find_package(catkin REQUIRED) | ||
22 | @@ -45,7 +48,7 @@ else() | ||
23 | endif() | ||
24 | |||
25 | ## Add serial library | ||
26 | -add_library(${PROJECT_NAME} ${serial_SRCS}) | ||
27 | +add_library(${PROJECT_NAME} SHARED ${serial_SRCS}) | ||
28 | if(APPLE) | ||
29 | target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY}) | ||
30 | elseif(UNIX) | ||
31 | @@ -55,9 +58,12 @@ else() | ||
32 | endif() | ||
33 | |||
34 | ## Uncomment for example | ||
35 | -add_executable(serial_example examples/serial_example.cc) | ||
36 | -add_dependencies(serial_example ${PROJECT_NAME}) | ||
37 | -target_link_libraries(serial_example ${PROJECT_NAME}) | ||
38 | +# add_executable(serial_example examples/serial_example.cc) | ||
39 | +# add_dependencies(serial_example ${PROJECT_NAME}) | ||
40 | +# target_link_libraries(serial_example ${PROJECT_NAME}) | ||
41 | + | ||
42 | +set (SERIAL_VERSION_STRING ${SERIAL_VERSION_MAJOR}.${SERIAL_VERSION_MINOR}.${SERIAL_VERSION_PATCH}) | ||
43 | +set_target_properties (${PROJECT_NAME} PROPERTIES VERSION ${SERIAL_VERSION_STRING} SOVERSION ${SERIAL_VERSION_MAJOR}) | ||
44 | |||
45 | ## Include headers | ||
46 | include_directories(include) | ||
diff --git a/meta-oe/recipes-support/serial/serial_1.2.1.bb b/meta-oe/recipes-support/serial/serial_1.2.1.bb index 8c1fb063b..c3f13d1af 100644 --- a/meta-oe/recipes-support/serial/serial_1.2.1.bb +++ b/meta-oe/recipes-support/serial/serial_1.2.1.bb | |||
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://README.md;beginline=53;endline=62;md5=049c68d559533f9 | |||
6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
7 | git://github.com/wjwwood/${BPN}.git;protocol=https;branch=main \ | 7 | git://github.com/wjwwood/${BPN}.git;protocol=https;branch=main \ |
8 | file://Findcatkin.cmake \ | 8 | file://Findcatkin.cmake \ |
9 | file://0001-Add-SOVERSION-for-shared-lib-and-comment-example.patch \ | ||
9 | " | 10 | " |
10 | SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f" | 11 | SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f" |
11 | SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96" | 12 | SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96" |
@@ -16,7 +17,7 @@ inherit cmake | |||
16 | 17 | ||
17 | # Work-around for https://github.com/wjwwood/serial/issues/135 | 18 | # Work-around for https://github.com/wjwwood/serial/issues/135 |
18 | EXTRA_OECMAKE = " \ | 19 | EXTRA_OECMAKE = " \ |
19 | -DCMAKE_MODULE_PATH=${WORKDIR} \ | 20 | -DCMAKE_MODULE_PATH=${UNPACKDIR} \ |
20 | -DCATKIN_PACKAGE_LIB_DESTINATION=${libdir} \ | 21 | -DCATKIN_PACKAGE_LIB_DESTINATION=${libdir} \ |
21 | -DCATKIN_PACKAGE_BIN_DESTINATION=${bindir} \ | 22 | -DCATKIN_PACKAGE_BIN_DESTINATION=${bindir} \ |
22 | -DCATKIN_GLOBAL_INCLUDE_DESTINATION=${includedir} \ | 23 | -DCATKIN_GLOBAL_INCLUDE_DESTINATION=${includedir} \ |
diff --git a/meta-oe/recipes-support/smarty/smarty_4.4.1.bb b/meta-oe/recipes-support/smarty/smarty_4.4.1.bb index 1caa4cd1b..e0979bb5a 100644 --- a/meta-oe/recipes-support/smarty/smarty_4.4.1.bb +++ b/meta-oe/recipes-support/smarty/smarty_4.4.1.bb | |||
@@ -24,3 +24,5 @@ do_install() { | |||
24 | install -m 0644 ${S}/libs/sysplugins/*.php ${D}${datadir}/php/smarty3/libs/sysplugins/ | 24 | install -m 0644 ${S}/libs/sysplugins/*.php ${D}${datadir}/php/smarty3/libs/sysplugins/ |
25 | } | 25 | } |
26 | FILES:${PN} = "${datadir}/php/smarty3/" | 26 | FILES:${PN} = "${datadir}/php/smarty3/" |
27 | |||
28 | CVE_STATUS[CVE-2020-10375] = "cpe-incorrect: The recipe used in the meta-openembedded is a different smarty package compared to the one which has the CVE issue." | ||
diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.13.0.bb b/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb index c6a0881db..19bac0be8 100644 --- a/meta-oe/recipes-support/spdlog/spdlog_1.13.0.bb +++ b/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" |
5 | 5 | ||
6 | SRCREV = "7c02e204c92545f869e2f04edaab1f19fe8b19fd" | 6 | SRCREV = "27cb4c76708608465c413f6d0e6b8d99a4d84302" |
7 | SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" | 7 | SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" |
8 | 8 | ||
9 | DEPENDS = "fmt" | 9 | DEPENDS = "fmt" |
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb index 458494415..ab4a8d182 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb | |||
@@ -77,12 +77,12 @@ do_configure:prepend() { | |||
77 | do_install:append() { | 77 | do_install:append() { |
78 | install -d ${D}${sysconfdir}/${BPN} | 78 | install -d ${D}${sysconfdir}/${BPN} |
79 | install -d ${D}${sysconfdir}/init.d | 79 | install -d ${D}${sysconfdir}/init.d |
80 | install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog | 80 | install -m 755 ${UNPACKDIR}/initscript ${D}${sysconfdir}/init.d/syslog |
81 | 81 | ||
82 | install -d ${D}${sysconfdir}/default/volatiles/ | 82 | install -d ${D}${sysconfdir}/default/volatiles/ |
83 | install -m 644 ${WORKDIR}/volatiles.03_syslog-ng ${D}${sysconfdir}/default/volatiles/03_syslog-ng | 83 | install -m 644 ${UNPACKDIR}/volatiles.03_syslog-ng ${D}${sysconfdir}/default/volatiles/03_syslog-ng |
84 | install -d ${D}${sysconfdir}/tmpfiles.d/ | 84 | install -d ${D}${sysconfdir}/tmpfiles.d/ |
85 | install -m 644 ${WORKDIR}/syslog-ng-tmp.conf ${D}${sysconfdir}/tmpfiles.d/syslog-ng.conf | 85 | install -m 644 ${UNPACKDIR}/syslog-ng-tmp.conf ${D}${sysconfdir}/tmpfiles.d/syslog-ng.conf |
86 | 86 | ||
87 | install -d ${D}${localstatedir}/lib/${BPN} | 87 | install -d ${D}${localstatedir}/lib/${BPN} |
88 | # Remove /var/run as it is created on startup | 88 | # Remove /var/run as it is created on startup |
@@ -94,7 +94,7 @@ do_install:append() { | |||
94 | 94 | ||
95 | # support for systemd | 95 | # support for systemd |
96 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 96 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
97 | install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf | 97 | install -m 644 ${UNPACKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf |
98 | 98 | ||
99 | install -d ${D}${systemd_unitdir}/system/ | 99 | install -d ${D}${systemd_unitdir}/system/ |
100 | install -m 644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service | 100 | install -m 644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service |
@@ -107,7 +107,7 @@ do_install:append() { | |||
107 | install -d ${D}${systemd_unitdir}/system/multi-user.target.wants | 107 | install -d ${D}${systemd_unitdir}/system/multi-user.target.wants |
108 | ln -sf ../${BPN}@.service ${D}${systemd_unitdir}/system/multi-user.target.wants/${BPN}@default.service | 108 | ln -sf ../${BPN}@.service ${D}${systemd_unitdir}/system/multi-user.target.wants/${BPN}@default.service |
109 | else | 109 | else |
110 | install -m 644 ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf | 110 | install -m 644 ${UNPACKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf |
111 | fi | 111 | fi |
112 | 112 | ||
113 | oe_multilib_header syslog-ng/syslog-ng-config.h | 113 | oe_multilib_header syslog-ng/syslog-ng-config.h |
@@ -147,3 +147,11 @@ SYSTEMD_SERVICE:${PN} = "${BPN}@.service" | |||
147 | 147 | ||
148 | INITSCRIPT_NAME = "syslog" | 148 | INITSCRIPT_NAME = "syslog" |
149 | INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 90 0 1 6 ." | 149 | INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 90 0 1 6 ." |
150 | |||
151 | # Fails only with 32bit MACHINEs | ||
152 | # http://errors.yoctoproject.org/Errors/Details/766956/ | ||
153 | # syslog-ng-4.6.0/modules/secure-logging/slog.c:937:63: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] | ||
154 | # syslog-ng-4.6.0/modules/secure-logging/slog.c:955:99: error: passing argument 5 of 'cmac' from incompatible pointer type [-Wincompatible-pointer-types] | ||
155 | # syslog-ng-4.6.0/modules/secure-logging/slog.c:959:74: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] | ||
156 | # syslog-ng-4.6.0/modules/secure-logging/slog.c:975:107: error: passing argument 4 of 'g_io_channel_write_chars' from incompatible pointer type [-Wincompatible-pointer-types] | ||
157 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch b/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch deleted file mode 100644 index 34a1ea0fa..000000000 --- a/meta-oe/recipes-support/uim/uim/0001-Fix-to-set-libedit-path-from-configure-option-proper.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From f828a89cc1e956d56498422ec158d284fc97de3f Mon Sep 17 00:00:00 2001 | ||
2 | From: OBATA Akio <obache@outlook.com> | ||
3 | Date: Fri, 10 Aug 2018 18:38:18 +0900 | ||
4 | Subject: [PATCH] Fix to set libedit path from configure option properly | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/uim/uim/pull/134] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | --- | ||
10 | configure.ac | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 00d1b02..9c0a5ec 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -1311,8 +1311,8 @@ if test "x$with_libedit" != xno; then | ||
18 | if test "x$with_libedit" = xyes; then | ||
19 | libedit_path=/usr | ||
20 | else | ||
21 | - with_libedit=yes | ||
22 | libedit_path="$with_libedit" | ||
23 | + with_libedit=yes | ||
24 | fi | ||
25 | |||
26 | saved_CPPFLAGS=$CPPFLAGS | ||
27 | -- | ||
28 | 2.23.0 | ||
29 | |||
diff --git a/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch b/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch deleted file mode 100644 index adb9c4b06..000000000 --- a/meta-oe/recipes-support/uim/uim/JMP_BUF_GC_jmp_buf.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Fix error pointed out by gcc10 | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | --- a/sigscheme/libgcroots/include/private/gc_priv.h | ||
6 | +++ b/sigscheme/libgcroots/include/private/gc_priv.h | ||
7 | @@ -2026,7 +2026,7 @@ void GC_err_puts(const char *s); | ||
8 | |||
9 | # if defined(NEED_FIND_LIMIT) || \ | ||
10 | defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS) | ||
11 | -JMP_BUF GC_jmp_buf; | ||
12 | +extern JMP_BUF GC_jmp_buf; | ||
13 | |||
14 | /* Set up a handler for address faults which will longjmp to */ | ||
15 | /* GC_jmp_buf; */ | ||
diff --git a/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-oe/recipes-support/uim/uim_1.8.9.bb index e0d9d05dc..f78c82f18 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.9.bb | |||
@@ -4,15 +4,11 @@ LICENSE = "BSD-3-Clause & LGPL-2.0-or-later" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" |
5 | SECTION = "inputmethods" | 5 | SECTION = "inputmethods" |
6 | 6 | ||
7 | SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2 \ | 7 | SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2" |
8 | file://0001-Fix-to-set-libedit-path-from-configure-option-proper.patch \ | ||
9 | file://JMP_BUF_GC_jmp_buf.patch \ | ||
10 | " | ||
11 | SRC_URI:append:class-target = "\ | 8 | SRC_URI:append:class-target = "\ |
12 | file://uim-module-manager.patch \ | 9 | file://uim-module-manager.patch \ |
13 | " | 10 | " |
14 | SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" | 11 | SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4" |
15 | SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc" | ||
16 | 12 | ||
17 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 13 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
18 | 14 | ||
diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb index 7970cd953..026d4ffe0 100644 --- a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb +++ b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | SUMMARY = "Unicode Character Database" | 1 | SUMMARY = "Unicode Character Database" |
2 | HOMEPAGE = "https://unicode.org/ucd/" | 2 | HOMEPAGE = "https://unicode.org/ucd/" |
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${WORKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f" | 4 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f" |
5 | 5 | ||
6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
7 | https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ | 7 | https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ |
@@ -12,11 +12,14 @@ SRC_URI[ucd-license.sha256sum] = "f7830d126f59d83842565d3dddedc79db4ca978ed52aee | |||
12 | 12 | ||
13 | inherit allarch | 13 | inherit allarch |
14 | 14 | ||
15 | S = "${WORKDIR}/sources" | ||
16 | UNPACKDIR = "${S}" | ||
17 | |||
15 | do_configure[noexec] = "1" | 18 | do_configure[noexec] = "1" |
16 | 19 | ||
17 | do_install() { | 20 | do_install() { |
18 | install -d ${D}${datadir}/unicode | 21 | install -d ${D}${datadir}/unicode |
19 | cp -rf ${WORKDIR}/ucd ${D}${datadir}/unicode | 22 | cp -rf ${UNPACKDIR}/ucd ${D}${datadir}/unicode |
20 | } | 23 | } |
21 | 24 | ||
22 | FILES:${PN} = "${datadir}/unicode/ucd" | 25 | FILES:${PN} = "${datadir}/unicode/ucd" |
diff --git a/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch b/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch new file mode 100644 index 000000000..688446545 --- /dev/null +++ b/meta-oe/recipes-support/unixodbc/files/CVE-2024-1013.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From 76beb0938ef14276123996bfd99df23b0c7f0982 Mon Sep 17 00:00:00 2001 | ||
2 | From: Soumya Sambu <soumya.sambu@windriver.com> | ||
3 | Date: Fri, 7 Jun 2024 11:10:46 +0000 | ||
4 | Subject: [PATCH] PostgreSQL driver: Fix incompatible pointer-to-integer types | ||
5 | |||
6 | These result in out-of-bounds stack writes on 64-bit architectures | ||
7 | (caller has 4 bytes, callee writes 8 bytes), and seem to have gone | ||
8 | unnoticed on little-endian architectures (although big-endian | ||
9 | architectures must be broken). | ||
10 | |||
11 | This change is required to avoid a build failure with GCC 14. | ||
12 | |||
13 | CVE: CVE-2024-1013 | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/lurcher/unixODBC/commit/45f501e1be2db6b017cc242c79bfb9de32b332a1] | ||
16 | |||
17 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> | ||
18 | --- | ||
19 | Drivers/Postgre7.1/info.c | 6 +++--- | ||
20 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
21 | |||
22 | diff --git a/Drivers/Postgre7.1/info.c b/Drivers/Postgre7.1/info.c | ||
23 | index 63ac91f..2216ecd 100644 | ||
24 | --- a/Drivers/Postgre7.1/info.c | ||
25 | +++ b/Drivers/Postgre7.1/info.c | ||
26 | @@ -1779,14 +1779,14 @@ char *table_name; | ||
27 | char index_name[MAX_INFO_STRING]; | ||
28 | short fields_vector[8]; | ||
29 | char isunique[10], isclustered[10]; | ||
30 | -SDWORD index_name_len, fields_vector_len; | ||
31 | +SQLLEN index_name_len, fields_vector_len; | ||
32 | TupleNode *row; | ||
33 | int i; | ||
34 | HSTMT hcol_stmt; | ||
35 | StatementClass *col_stmt, *indx_stmt; | ||
36 | char column_name[MAX_INFO_STRING], relhasrules[MAX_INFO_STRING]; | ||
37 | char **column_names = 0; | ||
38 | -Int4 column_name_len; | ||
39 | +SQLLEN column_name_len; | ||
40 | int total_columns = 0; | ||
41 | char error = TRUE; | ||
42 | ConnInfo *ci; | ||
43 | @@ -2136,7 +2136,7 @@ HSTMT htbl_stmt; | ||
44 | StatementClass *tbl_stmt; | ||
45 | char tables_query[STD_STATEMENT_LEN]; | ||
46 | char attname[MAX_INFO_STRING]; | ||
47 | -SDWORD attname_len; | ||
48 | +SQLLEN attname_len; | ||
49 | char pktab[MAX_TABLE_LEN + 1]; | ||
50 | Int2 result_cols; | ||
51 | |||
52 | -- | ||
53 | 2.40.0 | ||
diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb index 7819387c3..dfad833e0 100644 --- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb +++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb | |||
@@ -11,6 +11,7 @@ DEPENDS = "libtool readline" | |||
11 | SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ | 11 | SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ |
12 | file://do-not-use-libltdl-source-directory.patch \ | 12 | file://do-not-use-libltdl-source-directory.patch \ |
13 | file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ | 13 | file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ |
14 | file://CVE-2024-1013.patch \ | ||
14 | " | 15 | " |
15 | SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" | 16 | SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" |
16 | 17 | ||
diff --git a/meta-oe/recipes-support/uriparser/uriparser_0.9.7.bb b/meta-oe/recipes-support/uriparser/uriparser_0.9.8.bb index 421263e62..3d76190d3 100644 --- a/meta-oe/recipes-support/uriparser/uriparser_0.9.7.bb +++ b/meta-oe/recipes-support/uriparser/uriparser_0.9.8.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "BSD-3-Clause" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=fcc5a53146c2401f4b4f6a3bdf3f0168" |
6 | 6 | ||
7 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" | 7 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${BP}/${BP}.tar.gz" |
8 | SRC_URI[sha256sum] = "11553b2abd2b5728a6c88e35ab08e807d0a0f23c44920df937778ce8cc4d40ff" | 8 | SRC_URI[sha256sum] = "4cd0e4f93b477272fabceeb0202f269169fe6ec3044e10fac6acbcdf354bb080" |
9 | 9 | ||
10 | inherit cmake github-releases | 10 | inherit cmake github-releases |
11 | 11 | ||
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb index 208b1bb6e..47f616e99 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.14.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb | |||
@@ -1,7 +1,7 @@ | |||
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://${WORKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e" | 4 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e" |
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] = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9" | 18 | SRC_URI[sha256sum] = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5" |
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}" |
@@ -33,14 +33,14 @@ do_export_sources[depends] += "virtual/kernel:do_shared_workdir" | |||
33 | 33 | ||
34 | do_export_sources() { | 34 | do_export_sources() { |
35 | mkdir -p "${S}" | 35 | mkdir -p "${S}" |
36 | ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz | 36 | ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz |
37 | tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz | 37 | tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz |
38 | 38 | ||
39 | # add a mount utility to use shared folder from VBox Addition Source Code | 39 | # add a mount utility to use shared folder from VBox Addition Source Code |
40 | mkdir -p "${S}/utils" | 40 | mkdir -p "${S}/utils" |
41 | install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils | 41 | install ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils |
42 | install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils | 42 | install ${UNPACKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils |
43 | install ${S}/../Makefile.utils ${S}/utils/Makefile | 43 | install ${UNPACKDIR}/Makefile.utils ${S}/utils/Makefile |
44 | 44 | ||
45 | # some kernel versions have issues with stdarg.h and compatibility with | 45 | # some kernel versions have issues with stdarg.h and compatibility with |
46 | # the sysroot and libc-headers/uapi. If we include the file directly from | 46 | # the sysroot and libc-headers/uapi. If we include the file directly from |
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.1.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb index fc96d5dc3..31480b8d8 100644 --- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.1.bb +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb | |||
@@ -16,7 +16,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ | |||
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 | " | 18 | " |
19 | SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561" | 19 | SRC_URI[sha256sum] = "523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b" |
20 | 20 | ||
21 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | 21 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen |
22 | 22 | ||
diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb index 0aa872428..87e8f1f5e 100644 --- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb +++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb | |||
@@ -22,17 +22,17 @@ PORTAL_BACKENDS ?= " \ | |||
22 | ${@bb.utils.contains('DISTRO_FEATURES', 'gtk4', 'xdg-desktop-portal-gtk', '', d)} \ | 22 | ${@bb.utils.contains('DISTRO_FEATURES', 'gtk4', 'xdg-desktop-portal-gtk', '', d)} \ |
23 | " | 23 | " |
24 | 24 | ||
25 | RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS}" | 25 | RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS} fuse3-utils" |
26 | 26 | ||
27 | inherit meson pkgconfig python3native features_check | 27 | inherit meson pkgconfig python3native features_check |
28 | 28 | ||
29 | SRC_URI = " \ | 29 | SRC_URI = " \ |
30 | git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=main \ | 30 | git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=xdg-desktop-portal-1.18 \ |
31 | file://0001-meson.build-add-a-hack-for-crosscompile.patch \ | 31 | file://0001-meson.build-add-a-hack-for-crosscompile.patch \ |
32 | " | 32 | " |
33 | 33 | ||
34 | S = "${WORKDIR}/git" | 34 | S = "${WORKDIR}/git" |
35 | SRCREV = "37a6f7c8b8e08b9861f05e172cd4e0d07a832c4d" | 35 | SRCREV = "11c8a96b147aeae70e3f770313f93b367d53fedd" |
36 | 36 | ||
37 | FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" | 37 | FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" |
38 | 38 | ||
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 b839a6829..c1b75e613 100644 --- a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb +++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb | |||
@@ -66,7 +66,7 @@ do_install:append() { | |||
66 | install -d ${D}${sysconfdir}/sysconfig/xrdp | 66 | install -d ${D}${sysconfdir}/sysconfig/xrdp |
67 | install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ | 67 | install -m 0644 ${S}/instfiles/*.ini ${D}${sysconfdir}/xrdp/ |
68 | install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ | 68 | install -m 0644 ${S}/keygen/openssl.conf ${D}${sysconfdir}/xrdp/ |
69 | install -m 0644 ${WORKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ | 69 | install -m 0644 ${UNPACKDIR}/xrdp.sysconfig ${D}${sysconfdir}/sysconfig/xrdp/ |
70 | chown xrdp:xrdp ${D}${sysconfdir}/xrdp | 70 | chown xrdp:xrdp ${D}${sysconfdir}/xrdp |
71 | } | 71 | } |
72 | 72 | ||