diff options
Diffstat (limited to 'meta-oe')
362 files changed, 5505 insertions, 1980 deletions
diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index a29408a82..eaa86c411 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc | |||
@@ -36,6 +36,7 @@ PTESTS_FAST_META_OE = "\ | |||
36 | oprofile \ | 36 | oprofile \ |
37 | protobuf \ | 37 | protobuf \ |
38 | pv \ | 38 | pv \ |
39 | python3-pefile \ | ||
39 | sdbus-c++ \ | 40 | sdbus-c++ \ |
40 | uthash \ | 41 | uthash \ |
41 | xmlsec1 \ | 42 | xmlsec1 \ |
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index d8f0f5339..a254990ec 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf | |||
@@ -44,7 +44,7 @@ LAYERVERSION_openembedded-layer = "1" | |||
44 | 44 | ||
45 | LAYERDEPENDS_openembedded-layer = "core" | 45 | LAYERDEPENDS_openembedded-layer = "core" |
46 | 46 | ||
47 | LAYERSERIES_COMPAT_openembedded-layer = "scarthgap styhead" | 47 | LAYERSERIES_COMPAT_openembedded-layer = "styhead" |
48 | 48 | ||
49 | LICENSE_PATH += "${LAYERDIR}/licenses" | 49 | LICENSE_PATH += "${LAYERDIR}/licenses" |
50 | 50 | ||
@@ -115,3 +115,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
115 | DEFAULT_TEST_SUITES:pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}" | 115 | DEFAULT_TEST_SUITES:pn-meta-oe-ptest-image = " ${PTESTTESTSUITE}" |
116 | 116 | ||
117 | NON_MULTILIB_RECIPES:append = " crash pahole libbpf" | 117 | NON_MULTILIB_RECIPES:append = " crash pahole libbpf" |
118 | |||
119 | NON_MULTILIB_RECIPES:remove:x86 = "libbpf" | ||
120 | NON_MULTILIB_RECIPES:remove:x86-64 = "libbpf" | ||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb index d348ef8be..17a1d3c94 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.2.bb | |||
@@ -70,13 +70,13 @@ do_install:append() { | |||
70 | 70 | ||
71 | install -m 0755 -d ${D}${sysconfdir} | 71 | install -m 0755 -d ${D}${sysconfdir} |
72 | install -m 0755 -d ${D}${sysconfdir}/lirc | 72 | install -m 0755 -d ${D}${sysconfdir}/lirc |
73 | install -m 0644 ${WORKDIR}/lircd.conf ${D}${sysconfdir}/lirc/ | 73 | install -m 0644 ${UNPACKDIR}/lircd.conf ${D}${sysconfdir}/lirc/ |
74 | install -m 0644 ${WORKDIR}/lirc_options.conf ${D}${sysconfdir}/lirc/ | 74 | install -m 0644 ${UNPACKDIR}/lirc_options.conf ${D}${sysconfdir}/lirc/ |
75 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 75 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
76 | install -m 0755 -d ${D}${systemd_unitdir}/system ${D}${libdir}/tmpfiles.d | 76 | install -m 0755 -d ${D}${systemd_unitdir}/system ${D}${libdir}/tmpfiles.d |
77 | install -m 0644 ${WORKDIR}/lircd.service ${D}${systemd_unitdir}/system/ | 77 | install -m 0644 ${UNPACKDIR}/lircd.service ${D}${systemd_unitdir}/system/ |
78 | install -m 0755 ${WORKDIR}/lircexec.init ${D}${systemd_unitdir}/system/ | 78 | install -m 0755 ${UNPACKDIR}/lircexec.init ${D}${systemd_unitdir}/system/ |
79 | install -m 0644 ${WORKDIR}/lirc.tmpfiles ${D}${libdir}/tmpfiles.d/lirc.conf | 79 | install -m 0644 ${UNPACKDIR}/lirc.tmpfiles ${D}${libdir}/tmpfiles.d/lirc.conf |
80 | else | 80 | else |
81 | rm -rf ${D}/lib | 81 | rm -rf ${D}/lib |
82 | fi | 82 | fi |
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.6.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb index 0d0f6fea4..2c749eeba 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.4.6.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb | |||
@@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" | |||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" | 8 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" |
9 | 9 | ||
10 | SRC_URI[sha256sum] = "fc24bb674308f05d963a1dbed8d0b38ead77424ad7cf032a2652732af48f1336" | 10 | SRC_URI[sha256sum] = "6505d94d3173e2469950b03d5b99dac4210af7b659a3a1a3b58da35b2a984da6" |
11 | 11 | ||
12 | inherit pypi setuptools3 | 12 | inherit pypi setuptools3 |
13 | 13 | ||
@@ -55,13 +55,13 @@ do_install:append(){ | |||
55 | 55 | ||
56 | install -d ${D}${sysconfdir}/thingsboard-gateway/config | 56 | install -d ${D}${sysconfdir}/thingsboard-gateway/config |
57 | 57 | ||
58 | for file in $(find ${WORKDIR} -maxdepth 1 -type f -name *.json); do | 58 | for file in $(find ${UNPACKDIR} -maxdepth 1 -type f -name *.json); do |
59 | install -m 0644 "$file" ${D}${sysconfdir}/thingsboard-gateway/config | 59 | install -m 0644 "$file" ${D}${sysconfdir}/thingsboard-gateway/config |
60 | done | 60 | done |
61 | 61 | ||
62 | install -m 0644 ${WORKDIR}/tb_gateway.yaml ${D}${sysconfdir}/thingsboard-gateway/config | 62 | install -m 0644 ${UNPACKDIR}/tb_gateway.yaml ${D}${sysconfdir}/thingsboard-gateway/config |
63 | install -m 0644 ${WORKDIR}/logs.conf ${D}${sysconfdir}/thingsboard-gateway/config | 63 | install -m 0644 ${UNPACKDIR}/logs.conf ${D}${sysconfdir}/thingsboard-gateway/config |
64 | 64 | ||
65 | install -d ${D}${systemd_unitdir}/system/ | 65 | install -d ${D}${systemd_unitdir}/system/ |
66 | install -m 0644 ${WORKDIR}/thingsboard-gateway.service ${D}${systemd_system_unitdir}/thingsboard-gateway.service | 66 | install -m 0644 ${UNPACKDIR}/thingsboard-gateway.service ${D}${systemd_system_unitdir}/thingsboard-gateway.service |
67 | } | 67 | } |
diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb index c083a3a37..a7a3bf12c 100644 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb +++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.8.0.bb | |||
@@ -34,9 +34,9 @@ LDFLAGS:append:libc-musl = " -largp" | |||
34 | 34 | ||
35 | do_install:append() { | 35 | do_install:append() { |
36 | install -d ${D}${sysconfdir}/init.d | 36 | install -d ${D}${sysconfdir}/init.d |
37 | install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon | 37 | install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon |
38 | install -d ${D}${systemd_unitdir}/system | 38 | install -d ${D}${systemd_unitdir}/system |
39 | install -m 0644 ${WORKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system | 39 | install -m 0644 ${UNPACKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system |
40 | } | 40 | } |
41 | 41 | ||
42 | FILES:${PN} += "${sbindir}/rasdaemon \ | 42 | FILES:${PN} += "${sbindir}/rasdaemon \ |
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb index 1c26c7207..86b0ce077 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf-configfs_1.0.bb | |||
@@ -3,6 +3,9 @@ SECTION = "console/utils" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
5 | 5 | ||
6 | S = "${WORKDIR}/sources" | ||
7 | UNPACKDIR = "${S}" | ||
8 | |||
6 | SRC_URI = " \ | 9 | SRC_URI = " \ |
7 | file://android-gadget-setup \ | 10 | file://android-gadget-setup \ |
8 | file://android-gadget-start \ | 11 | file://android-gadget-start \ |
@@ -14,17 +17,17 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
14 | 17 | ||
15 | do_install() { | 18 | do_install() { |
16 | install -d ${D}${bindir} | 19 | install -d ${D}${bindir} |
17 | install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} | 20 | install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} |
18 | install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir} | 21 | install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir} |
19 | install -m 0755 ${WORKDIR}/android-gadget-cleanup ${D}${bindir} | 22 | install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir} |
20 | 23 | ||
21 | if [ -r ${WORKDIR}/android-gadget-setup.machine ] ; then | 24 | if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then |
22 | install -d ${D}${sysconfdir} | 25 | install -d ${D}${sysconfdir} |
23 | install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${D}${sysconfdir} | 26 | install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir} |
24 | fi | 27 | fi |
25 | 28 | ||
26 | install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d | 29 | install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d |
27 | install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d | 30 | install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d |
28 | } | 31 | } |
29 | 32 | ||
30 | FILES:${PN} += " \ | 33 | FILES:${PN} += " \ |
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb index b63ccbb08..cb2ff672e 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb | |||
@@ -7,7 +7,7 @@ SRC_URI = "file://android-gadget-setup" | |||
7 | 7 | ||
8 | do_install() { | 8 | do_install() { |
9 | install -d ${D}${bindir} | 9 | install -d ${D}${bindir} |
10 | install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} | 10 | install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} |
11 | } | 11 | } |
12 | 12 | ||
13 | python () { | 13 | python () { |
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-liblp-fix-building-with-GCC-14.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-liblp-fix-building-with-GCC-14.patch new file mode 100644 index 000000000..ccd289c81 --- /dev/null +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/0001-liblp-fix-building-with-GCC-14.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 9f4d839847666019cadf57aa34fd366801c11a44 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
3 | Date: Fri, 24 May 2024 14:13:35 +0300 | ||
4 | Subject: [PATCH] liblp: fix building with GCC 14 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
8 | --- | ||
9 | system/core/fs_mgr/liblp/utility.cpp | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | diff --git a/system/core/fs_mgr/liblp/utility.cpp b/system/core/fs_mgr/liblp/utility.cpp | ||
13 | index 48c5c8318d99..0aa8023aa87d 100644 | ||
14 | --- a/system/core/fs_mgr/liblp/utility.cpp | ||
15 | +++ b/system/core/fs_mgr/liblp/utility.cpp | ||
16 | @@ -24,6 +24,7 @@ | ||
17 | #include <sys/ioctl.h> | ||
18 | #endif | ||
19 | |||
20 | +#include <algorithm> | ||
21 | #include <map> | ||
22 | #include <string> | ||
23 | #include <vector> | ||
24 | -- | ||
25 | 2.39.2 | ||
26 | |||
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb index fbad5e136..456c7400e 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb | |||
@@ -52,6 +52,7 @@ SRC_URI += " \ | |||
52 | file://0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch \ | 52 | file://0003-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch \ |
53 | file://0004-adb-Fix-build-on-big-endian-systems.patch \ | 53 | file://0004-adb-Fix-build-on-big-endian-systems.patch \ |
54 | file://0005-adb-Allow-adbd-to-be-run-as-root.patch \ | 54 | file://0005-adb-Allow-adbd-to-be-run-as-root.patch \ |
55 | file://0001-liblp-fix-building-with-GCC-14.patch \ | ||
55 | " | 56 | " |
56 | 57 | ||
57 | S = "${WORKDIR}/git" | 58 | S = "${WORKDIR}/git" |
@@ -138,7 +139,7 @@ do_compile() { | |||
138 | 139 | ||
139 | do_install() { | 140 | do_install() { |
140 | install -d ${D}${base_sbindir} | 141 | install -d ${D}${base_sbindir} |
141 | install -m 0755 ${S}/../remount -D ${D}${base_sbindir}/remount | 142 | install -m 0755 ${UNPACKDIR}/remount -D ${D}${base_sbindir}/remount |
142 | 143 | ||
143 | for tool in img2simg simg2img fastboot adbd; do | 144 | for tool in img2simg simg2img fastboot adbd; do |
144 | if echo ${TOOLS_TO_BUILD} | grep -q "$tool" ; then | 145 | if echo ${TOOLS_TO_BUILD} | grep -q "$tool" ; then |
@@ -153,7 +154,7 @@ do_install() { | |||
153 | fi | 154 | fi |
154 | 155 | ||
155 | # Outside the if statement to avoid errors during do_package | 156 | # Outside the if statement to avoid errors during do_package |
156 | install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ | 157 | install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \ |
157 | ${D}${systemd_unitdir}/system/android-tools-adbd.service | 158 | ${D}${systemd_unitdir}/system/android-tools-adbd.service |
158 | 159 | ||
159 | install -d ${D}${libdir}/android/ | 160 | install -d ${D}${libdir}/android/ |
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone-c89.patch b/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone-c89.patch new file mode 100644 index 000000000..faf710fe1 --- /dev/null +++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone-c89.patch | |||
@@ -0,0 +1,242 @@ | |||
1 | dhrystone: make it speak C89 | ||
2 | |||
3 | Update Dhrystone sources to stop using K&R C and use something close to C89. | ||
4 | This fixes compilation errors reported by the GCC 14. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
8 | |||
9 | Index: dhrystone-2.1/dhry.h | ||
10 | =================================================================== | ||
11 | --- dhrystone-2.1.orig/dhry.h | ||
12 | +++ dhrystone-2.1/dhry.h | ||
13 | @@ -423,3 +423,13 @@ typedef struct record | ||
14 | #ifndef HZ | ||
15 | extern long HZ; | ||
16 | #endif | ||
17 | + | ||
18 | +void Proc_2 (One_Fifty *Int_Par_Ref); | ||
19 | +void Proc_3 (Rec_Pointer *Ptr_Ref_Par); | ||
20 | +void Proc_4(); | ||
21 | +void Proc_5(); | ||
22 | +void Proc_6 (Enumeration Enum_Val_Par, Enumeration *Enum_Ref_Par); | ||
23 | +void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref); | ||
24 | +void Proc_8 (Arr_1_Dim Arr_1_Par_Ref, Arr_2_Dim Arr_2_Par_Ref, int Int_1_Par_Val, int Int_2_Par_Val); | ||
25 | + | ||
26 | +Boolean Func_2 (Str_30 Str_1_Par_Ref, Str_30 Str_2_Par_Ref); | ||
27 | Index: dhrystone-2.1/dhry_1.c | ||
28 | =================================================================== | ||
29 | --- dhrystone-2.1.orig/dhry_1.c | ||
30 | +++ dhrystone-2.1/dhry_1.c | ||
31 | @@ -14,6 +14,8 @@ | ||
32 | * | ||
33 | **************************************************************************** | ||
34 | */ | ||
35 | +#include <stdlib.h> | ||
36 | +#include <string.h> | ||
37 | |||
38 | #include "dhry.h" | ||
39 | |||
40 | @@ -28,7 +30,6 @@ char Ch_1_Glob, | ||
41 | int Arr_1_Glob [50]; | ||
42 | int Arr_2_Glob [50] [50]; | ||
43 | |||
44 | -extern char *malloc (); | ||
45 | Enumeration Func_1 (); | ||
46 | /* forward declaration necessary since Enumeration may not simply be int */ | ||
47 | |||
48 | @@ -41,6 +42,8 @@ Enumeration Func_1 (); | ||
49 | Boolean Reg = true; | ||
50 | #endif | ||
51 | |||
52 | +void Proc_1 (REG Rec_Pointer Ptr_Val_Par); | ||
53 | + | ||
54 | /* variables for time measurement: */ | ||
55 | |||
56 | #ifdef TIMES | ||
57 | @@ -70,7 +73,7 @@ float Microseconds, | ||
58 | /* end of variables for time measurement */ | ||
59 | |||
60 | |||
61 | -main () | ||
62 | +int main (void) | ||
63 | /*****/ | ||
64 | |||
65 | /* main program, corresponds to procedures */ | ||
66 | @@ -218,7 +221,7 @@ main () | ||
67 | printf ("Arr_2_Glob[8][7]: %d\n", Arr_2_Glob[8][7]); | ||
68 | printf (" should be: Number_Of_Runs + 10\n"); | ||
69 | printf ("Ptr_Glob->\n"); | ||
70 | - printf (" Ptr_Comp: %d\n", (int) Ptr_Glob->Ptr_Comp); | ||
71 | + printf (" Ptr_Comp: %lu\n", (unsigned long) Ptr_Glob->Ptr_Comp); | ||
72 | printf (" should be: (implementation-dependent)\n"); | ||
73 | printf (" Discr: %d\n", Ptr_Glob->Discr); | ||
74 | printf (" should be: %d\n", 0); | ||
75 | @@ -229,7 +232,7 @@ main () | ||
76 | printf (" Str_Comp: %s\n", Ptr_Glob->variant.var_1.Str_Comp); | ||
77 | printf (" should be: DHRYSTONE PROGRAM, SOME STRING\n"); | ||
78 | printf ("Next_Ptr_Glob->\n"); | ||
79 | - printf (" Ptr_Comp: %d\n", (int) Next_Ptr_Glob->Ptr_Comp); | ||
80 | + printf (" Ptr_Comp: %lu\n", (unsigned long) Next_Ptr_Glob->Ptr_Comp); | ||
81 | printf (" should be: (implementation-dependent), same as above\n"); | ||
82 | printf (" Discr: %d\n", Next_Ptr_Glob->Discr); | ||
83 | printf (" should be: %d\n", 0); | ||
84 | @@ -280,14 +283,13 @@ main () | ||
85 | printf ("%6.1f \n", Dhrystones_Per_Second); | ||
86 | printf ("\n"); | ||
87 | } | ||
88 | - | ||
89 | + return 0; | ||
90 | } | ||
91 | |||
92 | |||
93 | -Proc_1 (Ptr_Val_Par) | ||
94 | +void Proc_1 (REG Rec_Pointer Ptr_Val_Par) | ||
95 | /******************/ | ||
96 | |||
97 | -REG Rec_Pointer Ptr_Val_Par; | ||
98 | /* executed once */ | ||
99 | { | ||
100 | REG Rec_Pointer Next_Record = Ptr_Val_Par->Ptr_Comp; | ||
101 | @@ -318,12 +320,10 @@ REG Rec_Pointer Ptr_Val_Par; | ||
102 | } /* Proc_1 */ | ||
103 | |||
104 | |||
105 | -Proc_2 (Int_Par_Ref) | ||
106 | +void Proc_2 (One_Fifty *Int_Par_Ref) | ||
107 | /******************/ | ||
108 | /* executed once */ | ||
109 | /* *Int_Par_Ref == 1, becomes 4 */ | ||
110 | - | ||
111 | -One_Fifty *Int_Par_Ref; | ||
112 | { | ||
113 | One_Fifty Int_Loc; | ||
114 | Enumeration Enum_Loc; | ||
115 | @@ -341,13 +341,10 @@ One_Fifty *Int_Par_Ref; | ||
116 | } /* Proc_2 */ | ||
117 | |||
118 | |||
119 | -Proc_3 (Ptr_Ref_Par) | ||
120 | +void Proc_3 (Rec_Pointer *Ptr_Ref_Par) | ||
121 | /******************/ | ||
122 | /* executed once */ | ||
123 | /* Ptr_Ref_Par becomes Ptr_Glob */ | ||
124 | - | ||
125 | -Rec_Pointer *Ptr_Ref_Par; | ||
126 | - | ||
127 | { | ||
128 | if (Ptr_Glob != Null) | ||
129 | /* then, executed */ | ||
130 | @@ -356,7 +353,7 @@ Rec_Pointer *Ptr_Ref_Par; | ||
131 | } /* Proc_3 */ | ||
132 | |||
133 | |||
134 | -Proc_4 () /* without parameters */ | ||
135 | +void Proc_4 () /* without parameters */ | ||
136 | /*******/ | ||
137 | /* executed once */ | ||
138 | { | ||
139 | @@ -368,7 +365,7 @@ Proc_4 () /* without parameters */ | ||
140 | } /* Proc_4 */ | ||
141 | |||
142 | |||
143 | -Proc_5 () /* without parameters */ | ||
144 | +void Proc_5 () /* without parameters */ | ||
145 | /*******/ | ||
146 | /* executed once */ | ||
147 | { | ||
148 | Index: dhrystone-2.1/dhry_2.c | ||
149 | =================================================================== | ||
150 | --- dhrystone-2.1.orig/dhry_2.c | ||
151 | +++ dhrystone-2.1/dhry_2.c | ||
152 | @@ -14,6 +14,7 @@ | ||
153 | * | ||
154 | **************************************************************************** | ||
155 | */ | ||
156 | +#include <string.h> | ||
157 | |||
158 | #include "dhry.h" | ||
159 | |||
160 | @@ -26,14 +27,14 @@ | ||
161 | extern int Int_Glob; | ||
162 | extern char Ch_1_Glob; | ||
163 | |||
164 | +Boolean Func_3 (Enumeration Enum_Par_Val); | ||
165 | |||
166 | -Proc_6 (Enum_Val_Par, Enum_Ref_Par) | ||
167 | + | ||
168 | +void Proc_6 (Enumeration Enum_Val_Par, Enumeration *Enum_Ref_Par) | ||
169 | /*********************************/ | ||
170 | /* executed once */ | ||
171 | /* Enum_Val_Par == Ident_3, Enum_Ref_Par becomes Ident_2 */ | ||
172 | |||
173 | -Enumeration Enum_Val_Par; | ||
174 | -Enumeration *Enum_Ref_Par; | ||
175 | { | ||
176 | *Enum_Ref_Par = Enum_Val_Par; | ||
177 | if (! Func_3 (Enum_Val_Par)) | ||
178 | @@ -61,7 +62,7 @@ Enumeration *Enum_Ref_Par; | ||
179 | } /* Proc_6 */ | ||
180 | |||
181 | |||
182 | -Proc_7 (Int_1_Par_Val, Int_2_Par_Val, Int_Par_Ref) | ||
183 | +void Proc_7 (One_Fifty Int_1_Par_Val, One_Fifty Int_2_Par_Val, One_Fifty *Int_Par_Ref) | ||
184 | /**********************************************/ | ||
185 | /* executed three times */ | ||
186 | /* first call: Int_1_Par_Val == 2, Int_2_Par_Val == 3, */ | ||
187 | @@ -70,9 +71,6 @@ Proc_7 (Int_1_Par_Val, Int_2_Par_Val, In | ||
188 | /* Int_Par_Ref becomes 17 */ | ||
189 | /* third call: Int_1_Par_Val == 6, Int_2_Par_Val == 10, */ | ||
190 | /* Int_Par_Ref becomes 18 */ | ||
191 | -One_Fifty Int_1_Par_Val; | ||
192 | -One_Fifty Int_2_Par_Val; | ||
193 | -One_Fifty *Int_Par_Ref; | ||
194 | { | ||
195 | One_Fifty Int_Loc; | ||
196 | |||
197 | @@ -81,15 +79,11 @@ One_Fifty *Int_Par_Ref; | ||
198 | } /* Proc_7 */ | ||
199 | |||
200 | |||
201 | -Proc_8 (Arr_1_Par_Ref, Arr_2_Par_Ref, Int_1_Par_Val, Int_2_Par_Val) | ||
202 | +void Proc_8 (Arr_1_Dim Arr_1_Par_Ref, Arr_2_Dim Arr_2_Par_Ref, int Int_1_Par_Val, int Int_2_Par_Val) | ||
203 | /*********************************************************************/ | ||
204 | /* executed once */ | ||
205 | /* Int_Par_Val_1 == 3 */ | ||
206 | /* Int_Par_Val_2 == 7 */ | ||
207 | -Arr_1_Dim Arr_1_Par_Ref; | ||
208 | -Arr_2_Dim Arr_2_Par_Ref; | ||
209 | -int Int_1_Par_Val; | ||
210 | -int Int_2_Par_Val; | ||
211 | { | ||
212 | REG One_Fifty Int_Index; | ||
213 | REG One_Fifty Int_Loc; | ||
214 | @@ -132,14 +126,11 @@ Capital_Letter Ch_2_Par_Val; | ||
215 | } /* Func_1 */ | ||
216 | |||
217 | |||
218 | -Boolean Func_2 (Str_1_Par_Ref, Str_2_Par_Ref) | ||
219 | +Boolean Func_2 (Str_30 Str_1_Par_Ref, Str_30 Str_2_Par_Ref) | ||
220 | /*************************************************/ | ||
221 | /* executed once */ | ||
222 | /* Str_1_Par_Ref == "DHRYSTONE PROGRAM, 1'ST STRING" */ | ||
223 | /* Str_2_Par_Ref == "DHRYSTONE PROGRAM, 2'ND STRING" */ | ||
224 | - | ||
225 | -Str_30 Str_1_Par_Ref; | ||
226 | -Str_30 Str_2_Par_Ref; | ||
227 | { | ||
228 | REG One_Thirty Int_Loc; | ||
229 | Capital_Letter Ch_Loc; | ||
230 | @@ -174,11 +165,10 @@ Str_30 Str_2_Par_Ref; | ||
231 | } /* Func_2 */ | ||
232 | |||
233 | |||
234 | -Boolean Func_3 (Enum_Par_Val) | ||
235 | +Boolean Func_3 (Enumeration Enum_Par_Val) | ||
236 | /***************************/ | ||
237 | /* executed once */ | ||
238 | /* Enum_Par_Val == Ident_3 */ | ||
239 | -Enumeration Enum_Par_Val; | ||
240 | { | ||
241 | Enumeration Enum_Loc; | ||
242 | |||
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb index d809a564e..5d27acbdc 100644 --- a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb +++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb | |||
@@ -3,7 +3,9 @@ LICENSE = "PD" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851" |
4 | 4 | ||
5 | SRC_URI = "http://www.netlib.org/benchmark/dhry-c;downloadfilename=dhry-c.shar \ | 5 | SRC_URI = "http://www.netlib.org/benchmark/dhry-c;downloadfilename=dhry-c.shar \ |
6 | file://dhrystone.patch" | 6 | file://dhrystone.patch \ |
7 | file://dhrystone-c89.patch \ | ||
8 | " | ||
7 | SRC_URI[md5sum] = "75aa5909c174eed98c134be2f56307da" | 9 | SRC_URI[md5sum] = "75aa5909c174eed98c134be2f56307da" |
8 | SRC_URI[sha256sum] = "038a7e9169787125c3451a6c941f3aca5db2d2f3863871afcdce154ef17f4e3e" | 10 | SRC_URI[sha256sum] = "038a7e9169787125c3451a6c941f3aca5db2d2f3863871afcdce154ef17f4e3e" |
9 | 11 | ||
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb index 5a1306b6f..6ab1121ef 100644 --- a/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb +++ b/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb | |||
@@ -37,8 +37,8 @@ do_install() { | |||
37 | 37 | ||
38 | install -m 0755 ${S}/iozone ${D}${bindir} | 38 | install -m 0755 ${S}/iozone ${D}${bindir} |
39 | install -m 0755 ${S}/fileop ${D}${bindir} | 39 | install -m 0755 ${S}/fileop ${D}${bindir} |
40 | install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/ | 40 | install -m 0644 ${S}/../../docs/iozone.1 ${D}${mandir}/man1/ |
41 | install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/ | 41 | install -m 0644 ${UNPACKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/ |
42 | 42 | ||
43 | install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${BPN}/examples | 43 | install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${BPN}/examples |
44 | install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples | 44 | install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples |
@@ -48,9 +48,9 @@ do_install() { | |||
48 | install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${BPN}/examples | 48 | install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${BPN}/examples |
49 | install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${BPN}/examples | 49 | install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${BPN}/examples |
50 | 50 | ||
51 | install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/ | 51 | install -m 0644 ${S}/../../docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/ |
52 | install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/ | 52 | install -m 0644 ${S}/../../docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/ |
53 | install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/ | 53 | install -m 0644 ${S}/../../docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/ |
54 | } | 54 | } |
55 | 55 | ||
56 | FILES:${PN} += "${datadir}/doc/${PN}/copyright.txt" | 56 | FILES:${PN} += "${datadir}/doc/${PN}/copyright.txt" |
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.16.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.17.1.bb index 5cec4c687..44fae0255 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.16.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.17.1.bb | |||
@@ -10,14 +10,14 @@ SECTION = "console/network" | |||
10 | BUGTRACKER = "https://github.com/esnet/iperf/issues" | 10 | BUGTRACKER = "https://github.com/esnet/iperf/issues" |
11 | 11 | ||
12 | LICENSE = "BSD-3-Clause" | 12 | LICENSE = "BSD-3-Clause" |
13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dc6301c8256ceb8f71c9e3c2ae9096b9" | 13 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f9873a72f714e240530e759e103ac7b2" |
14 | 14 | ||
15 | SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ | 15 | SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ |
16 | file://0002-Remove-pg-from-profile_CFLAGS.patch \ | 16 | file://0002-Remove-pg-from-profile_CFLAGS.patch \ |
17 | file://0001-configure.ac-check-for-CPP-prog.patch \ | 17 | file://0001-configure.ac-check-for-CPP-prog.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "f9481e1cd35159929458513692e4a8f9fdd1bd6f" | 20 | SRCREV = "2acfcfe94e928e74542c9f107e02aa6dd4748a79" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
diff --git a/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb b/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb index 603004ddd..a0327ee15 100644 --- a/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb +++ b/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb | |||
@@ -2,7 +2,7 @@ DESCRIPTION = "LINPACK Benchmarks are a measure of a system's floating point com | |||
2 | SUMMARY = "LINPACK is a software library for performing numerical linear algebra on digital computers" | 2 | SUMMARY = "LINPACK is a software library for performing numerical linear algebra on digital computers" |
3 | 3 | ||
4 | LICENSE = "PD" | 4 | LICENSE = "PD" |
5 | LIC_FILES_CHKSUM ="file://${WORKDIR}/linpacknew.c;beginline=1;endline=23;md5=aa025e3bc44190c71e4c5e3b084fed87" | 5 | LIC_FILES_CHKSUM ="file://${UNPACKDIR}/linpacknew.c;beginline=1;endline=23;md5=aa025e3bc44190c71e4c5e3b084fed87" |
6 | 6 | ||
7 | SRC_URI = "http://www.netlib.org/benchmark/linpackc.new;downloadfilename=linpacknew.c \ | 7 | SRC_URI = "http://www.netlib.org/benchmark/linpackc.new;downloadfilename=linpacknew.c \ |
8 | file://0001-linpack-Define-DP-only-when-SP-is-not-defined.patch \ | 8 | file://0001-linpack-Define-DP-only-when-SP-is-not-defined.patch \ |
@@ -10,7 +10,8 @@ SRC_URI = "http://www.netlib.org/benchmark/linpackc.new;downloadfilename=linpack | |||
10 | SRC_URI[md5sum] = "1c5d0b6a31264685d2e651c920e3cdf4" | 10 | SRC_URI[md5sum] = "1c5d0b6a31264685d2e651c920e3cdf4" |
11 | SRC_URI[sha256sum] = "a63f2ec86512959f1fd926bfafb85905b2d7b7402942ffae3af374d48745e97e" | 11 | SRC_URI[sha256sum] = "a63f2ec86512959f1fd926bfafb85905b2d7b7402942ffae3af374d48745e97e" |
12 | 12 | ||
13 | S = "${WORKDIR}" | 13 | S = "${WORKDIR}/sources" |
14 | UNPACKDIR = "${S}" | ||
14 | 15 | ||
15 | do_compile () { | 16 | do_compile () { |
16 | ${CC} ${CFLAGS} ${LDFLAGS} -DDP -o linpack_dp linpacknew.c -lm | 17 | ${CC} ${CFLAGS} ${LDFLAGS} -DDP -o linpack_dp linpacknew.c -lm |
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 57f73eedc..6729e81fa 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | |||
@@ -75,7 +75,7 @@ do_install () { | |||
75 | DESTDIR="${D}" \ | 75 | DESTDIR="${D}" \ |
76 | -C src install | 76 | -C src install |
77 | mv ${D}${bindir}/line ${D}${bindir}/lm_line | 77 | mv ${D}${bindir}/line ${D}${bindir}/lm_line |
78 | install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ | 78 | install -m 0755 ${UNPACKDIR}/lmbench-run ${D}${bindir}/ |
79 | install -m 0755 ${S}/bin/${TARGET_SYS}/cache ${D}${bindir}/ | 79 | install -m 0755 ${S}/bin/${TARGET_SYS}/cache ${D}${bindir}/ |
80 | sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \ | 80 | sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \ |
81 | -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \ | 81 | -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \ |
diff --git a/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb b/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb index 8fad04e36..ce28fc732 100644 --- a/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb +++ b/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb | |||
@@ -2,13 +2,14 @@ DESCRIPTION = "Whetstone benchmark is a synthetic benchmark for evaluating the p | |||
2 | SUMMARY = "CPU benchmark to measure floating point performance" | 2 | SUMMARY = "CPU benchmark to measure floating point performance" |
3 | 3 | ||
4 | LICENSE = "PD" | 4 | LICENSE = "PD" |
5 | LIC_FILES_CHKSUM ="file://${WORKDIR}/whetstone.c;beginline=1;endline=52;md5=c795edc15e7e1d92ca8f88ad718449f5" | 5 | LIC_FILES_CHKSUM ="file://${UNPACKDIR}/whetstone.c;beginline=1;endline=52;md5=c795edc15e7e1d92ca8f88ad718449f5" |
6 | 6 | ||
7 | SRC_URI = "http://www.netlib.org/benchmark/whetstone.c" | 7 | SRC_URI = "http://www.netlib.org/benchmark/whetstone.c" |
8 | SRC_URI[md5sum] = "d8eb2cd7104bb5a12d614ac6d3f1f9fb" | 8 | SRC_URI[md5sum] = "d8eb2cd7104bb5a12d614ac6d3f1f9fb" |
9 | SRC_URI[sha256sum] = "333e4ceca042c146f63eec605573d16ae8b07166cbc44a17bec1ea97c6f1efbf" | 9 | SRC_URI[sha256sum] = "333e4ceca042c146f63eec605573d16ae8b07166cbc44a17bec1ea97c6f1efbf" |
10 | 10 | ||
11 | S = "${WORKDIR}" | 11 | S = "${WORKDIR}/sources" |
12 | UNPACKDIR = "${S}" | ||
12 | 13 | ||
13 | do_compile () { | 14 | do_compile () { |
14 | ${CC} ${CFLAGS} ${LDFLAGS} -Ofast -o whetstone whetstone.c -lm | 15 | ${CC} ${CFLAGS} ${LDFLAGS} -Ofast -o whetstone whetstone.c -lm |
diff --git a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index 03076cbc6..6c80f4c81 100644 --- a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb | |||
@@ -48,7 +48,7 @@ RDEPENDS:${PN}:append = " \ | |||
48 | 48 | ||
49 | do_install:append() { | 49 | do_install:append() { |
50 | install -d ${D}${systemd_unitdir}/system | 50 | install -d ${D}${systemd_unitdir}/system |
51 | install -m 644 ${WORKDIR}/edac.service ${D}/${systemd_unitdir}/system | 51 | install -m 644 ${UNPACKDIR}/edac.service ${D}/${systemd_unitdir}/system |
52 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}/${systemd_unitdir}/system/edac.service | 52 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}/${systemd_unitdir}/system/edac.service |
53 | } | 53 | } |
54 | 54 | ||
diff --git a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb index 0a041835e..f3760a40e 100644 --- a/meta-oe/recipes-bsp/firmwared/firmwared_git.bb +++ b/meta-oe/recipes-bsp/firmwared/firmwared_git.bb | |||
@@ -29,6 +29,6 @@ do_configure:prepend() { | |||
29 | 29 | ||
30 | do_install:append() { | 30 | do_install:append() { |
31 | install -d ${D}${systemd_system_unitdir} | 31 | install -d ${D}${systemd_system_unitdir} |
32 | install -m 0644 ${WORKDIR}/firmwared.service ${D}${systemd_system_unitdir} | 32 | install -m 0644 ${UNPACKDIR}/firmwared.service ${D}${systemd_system_unitdir} |
33 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/firmwared.service | 33 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/firmwared.service |
34 | } | 34 | } |
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch b/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch new file mode 100644 index 000000000..c36268142 --- /dev/null +++ b/meta-oe/recipes-bsp/fwupd/fwupd-efi/0001-efi-generate_binary.py-Use-env-to-detect-python3.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From 4c8f95fedecbc590eb7cd98aaf97912fa36b8f2e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jun 2024 23:58:36 -0700 | ||
4 | Subject: [PATCH] efi/generate_binary.py: Use env to detect python3 | ||
5 | |||
6 | This enables python3 from native sysroot correctly | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | efi/generate_binary.py | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/efi/generate_binary.py b/efi/generate_binary.py | ||
15 | index 443472a..a4611bb 100755 | ||
16 | --- a/efi/generate_binary.py | ||
17 | +++ b/efi/generate_binary.py | ||
18 | @@ -1,4 +1,4 @@ | ||
19 | -#!/usr/bin/python3 | ||
20 | +#!/usr/bin/env python3 | ||
21 | # | ||
22 | # Copyright (C) 2021 Javier Martinez Canillas <javierm@redhat.com> | ||
23 | # Copyright (C) 2021 Richard Hughes <richard@hughsie.com> | ||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch b/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch deleted file mode 100644 index 6fd2eca94..000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd-efi/cc.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | Change the efi-cc argument to take an array, so that we can pass compiler flags | ||
2 | such as --sysroot. | ||
3 | |||
4 | In the long term changing the fwupd-efi build to use the standard Meson | ||
5 | CC/LD/etc would be the preferred fix. | ||
6 | |||
7 | Upstream-Status: Inappropriate [better fix in progress] | ||
8 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
9 | |||
10 | diff --git a/efi/generate_sbat.py b/efi/generate_sbat.py | ||
11 | index e42b365..4831a48 100755 | ||
12 | --- a/efi/generate_sbat.py | ||
13 | +++ b/efi/generate_sbat.py | ||
14 | @@ -7,6 +7,7 @@ | ||
15 | # | ||
16 | # pylint: disable=missing-docstring, invalid-name | ||
17 | |||
18 | +import shlex | ||
19 | import subprocess | ||
20 | import sys | ||
21 | import argparse | ||
22 | @@ -19,7 +20,7 @@ def _generate_sbat(args): | ||
23 | FWUPD_URL = "https://github.com/fwupd/fwupd-efi" | ||
24 | |||
25 | subprocess.run( | ||
26 | - [args.cc, "-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True | ||
27 | + shlex.split(args.cc) + ["-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True | ||
28 | ) | ||
29 | |||
30 | # not specified | ||
31 | diff --git a/efi/meson.build b/efi/meson.build | ||
32 | index 68ea4aa..dcf0d43 100644 | ||
33 | --- a/efi/meson.build | ||
34 | +++ b/efi/meson.build | ||
35 | @@ -187,7 +187,7 @@ o_file5 = custom_target('fwup-sbat.o', | ||
36 | command : [ | ||
37 | generate_sbat, | ||
38 | '@OUTPUT@', | ||
39 | - '--cc', efi_cc, | ||
40 | + '--cc', ' '.join(efi_cc), | ||
41 | '--objcopy', objcopy, | ||
42 | '--project-name', meson.project_name(), | ||
43 | '--project-version', meson.project_version(), | ||
44 | diff --git a/meson_options.txt b/meson_options.txt | ||
45 | index d869cd2..17ef7fb 100644 | ||
46 | --- a/meson_options.txt | ||
47 | +++ b/meson_options.txt | ||
48 | @@ -1,4 +1,4 @@ | ||
49 | -option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules') | ||
50 | +option('efi-cc', type : 'array', value : ['gcc'], description : 'the compiler to use for EFI modules') | ||
51 | option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules') | ||
52 | option('efi-libdir', type : 'string', description : 'path to the EFI lib directory') | ||
53 | option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory') | ||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.3.bb b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb index b53cabeae..d72f2d9c5 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.3.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd-efi_1.6.bb | |||
@@ -3,23 +3,23 @@ LICENSE = "LGPL-2.1-or-later" | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
4 | 4 | ||
5 | SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \ | 5 | SRC_URI = "git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \ |
6 | file://cc.patch" | 6 | file://0001-efi-generate_binary.py-Use-env-to-detect-python3.patch" |
7 | SRCREV = "36ce593f58e391cca43fd388824496ff98d83480" | 7 | |
8 | SRCREV = "58a2928f778278ab1f7f8fcddbab81ba587a8962" | ||
8 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
9 | 10 | ||
10 | DEPENDS = "gnu-efi" | 11 | DEPENDS = "gnu-efi python3-pefile-native" |
11 | 12 | ||
12 | COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" | 13 | COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" |
13 | 14 | ||
14 | inherit meson | 15 | inherit meson pkgconfig python3native |
15 | 16 | ||
16 | # These should be configured as needed | 17 | # These should be configured as needed |
17 | SBAT_DISTRO_ID ?= "${DISTRO}" | 18 | SBAT_DISTRO_ID ?= "${DISTRO}" |
18 | SBAT_DISTRO_SUMMARY ?= "${DISTRO_NAME}" | 19 | SBAT_DISTRO_SUMMARY ?= "${DISTRO_NAME}" |
19 | SBAT_DISTRO_URL ?= "" | 20 | SBAT_DISTRO_URL ?= "" |
20 | 21 | ||
21 | EXTRA_OEMESON += "-Defi-cc="${@meson_array('CC', d)}" \ | 22 | EXTRA_OEMESON += "\ |
22 | -Defi-ld='${HOST_PREFIX}ld' \ | ||
23 | -Defi-includedir=${STAGING_INCDIR}/efi \ | 23 | -Defi-includedir=${STAGING_INCDIR}/efi \ |
24 | -Defi-libdir=${STAGING_LIBDIR} \ | 24 | -Defi-libdir=${STAGING_LIBDIR} \ |
25 | -Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \ | 25 | -Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \ |
@@ -31,3 +31,9 @@ EXTRA_OEMESON += "-Defi-cc="${@meson_array('CC', d)}" \ | |||
31 | 31 | ||
32 | # The compile assumes GCC at present | 32 | # The compile assumes GCC at present |
33 | TOOLCHAIN = "gcc" | 33 | TOOLCHAIN = "gcc" |
34 | |||
35 | # Multiple errors like below with gcc14 | ||
36 | #| ../git/efi/fwupdate.c:611:20: error: passing argument 5 of 'fwup_log' from incompatible pointer type [-Wincompatible-pointer-types] | ||
37 | #| 611 | fwup_debug(L"n_updates: %d", n_updates); | ||
38 | #| | ^~~~~~~~~~~~~~~~ | ||
39 | TOOLCHAIN_OPTIONS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb index d20d5ed2a..e6c276ba4 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb | |||
@@ -104,7 +104,7 @@ PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=enabled,-Dplugin_s | |||
104 | PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=enabled,-Dplugin_synaptics_rmi=disabled" | 104 | PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=enabled,-Dplugin_synaptics_rmi=disabled" |
105 | PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=enabled,-Dplugin_tpm=disabled,tpm2-tss" | 105 | PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=enabled,-Dplugin_tpm=disabled,tpm2-tss" |
106 | # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported | 106 | # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported |
107 | PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=disabled,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi" | 107 | PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi" |
108 | PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=enabled,-Dplugin_uefi_pk=disabled" | 108 | PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=enabled,-Dplugin_uefi_pk=disabled" |
109 | PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=enabled,-Dplugin_uf2=disabled" | 109 | PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=enabled,-Dplugin_uf2=disabled" |
110 | PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=enabled,-Dplugin_upower=disabled" | 110 | PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=enabled,-Dplugin_upower=disabled" |
diff --git a/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb b/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb index fa1bb928c..22bb30a50 100644 --- a/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb +++ b/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb | |||
@@ -60,5 +60,5 @@ do_install () { | |||
60 | done | 60 | done |
61 | 61 | ||
62 | install -d ${D}${sysconfdir}/init.d | 62 | install -d ${D}${sysconfdir}/init.d |
63 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} | 63 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} |
64 | } | 64 | } |
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb index 25ab44f75..6fad255c8 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb | |||
@@ -12,7 +12,8 @@ SRC_URI = "file://fancontrol \ | |||
12 | file://sensors.conf \ | 12 | file://sensors.conf \ |
13 | file://sensord \ | 13 | file://sensord \ |
14 | " | 14 | " |
15 | S = "${WORKDIR}" | 15 | S = "${WORKDIR}/sources" |
16 | UNPACKDIR = "${S}" | ||
16 | 17 | ||
17 | PACKAGECONFIG ??= "sensord" | 18 | PACKAGECONFIG ??= "sensord" |
18 | PACKAGECONFIG[sensord] = ",," | 19 | PACKAGECONFIG[sensord] = ",," |
@@ -22,20 +23,20 @@ RDEPENDS:${PN}-dev = "" | |||
22 | do_install() { | 23 | do_install() { |
23 | # Install fancontrol configuration file | 24 | # Install fancontrol configuration file |
24 | install -d ${D}${sysconfdir}/sysconfig | 25 | install -d ${D}${sysconfdir}/sysconfig |
25 | install -m 0644 ${WORKDIR}/fancontrol ${D}${sysconfdir} | 26 | install -m 0644 ${UNPACKDIR}/fancontrol ${D}${sysconfdir} |
26 | install -m 0644 ${WORKDIR}/sensord ${D}${sysconfdir}/sysconfig | 27 | install -m 0644 ${UNPACKDIR}/sensord ${D}${sysconfdir}/sysconfig |
27 | # Install libsensors configuration file | 28 | # Install libsensors configuration file |
28 | install -d ${D}${sysconfdir}/sensors.d | 29 | install -d ${D}${sysconfdir}/sensors.d |
29 | install -m 0644 ${WORKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d | 30 | install -m 0644 ${UNPACKDIR}/sensors.conf ${D}${sysconfdir}/sensors.d |
30 | 31 | ||
31 | if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then | 32 | if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then |
32 | # Install sensord configuration file | 33 | # Install sensord configuration file |
33 | install -m 0644 ${WORKDIR}/sensord.conf ${D}${sysconfdir} | 34 | install -m 0644 ${UNPACKDIR}/sensord.conf ${D}${sysconfdir} |
34 | 35 | ||
35 | # Install sensord.cgi script and create world-writable | 36 | # Install sensord.cgi script and create world-writable |
36 | # web-accessible sensord directory | 37 | # web-accessible sensord directory |
37 | install -d ${D}/www/pages/cgi-bin | 38 | install -d ${D}/www/pages/cgi-bin |
38 | install -m 0755 ${WORKDIR}/sensord.cgi ${D}/www/pages/cgi-bin | 39 | install -m 0755 ${UNPACKDIR}/sensord.cgi ${D}/www/pages/cgi-bin |
39 | install -d -m a=rwxs ${D}/www/pages/sensord | 40 | install -d -m a=rwxs ${D}/www/pages/sensord |
40 | fi | 41 | fi |
41 | } | 42 | } |
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch new file mode 100644 index 000000000..0ff8b3801 --- /dev/null +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-Fix-building-with-GCC-14.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From fd49cbcb7f3402e1a4a99b71b901a564060039b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
3 | Date: Fri, 24 May 2024 14:16:21 +0300 | ||
4 | Subject: [PATCH] Fix building with GCC 14 | ||
5 | |||
6 | Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
7 | Upstream-Status: Submitted [https://github.com/lm-sensors/lm-sensors/pull/497] | ||
8 | --- | ||
9 | prog/sensord/rrd.c | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/prog/sensord/rrd.c b/prog/sensord/rrd.c | ||
13 | index a531362bddd5..36d685fce514 100644 | ||
14 | --- a/prog/sensord/rrd.c | ||
15 | +++ b/prog/sensord/rrd.c | ||
16 | @@ -299,7 +299,7 @@ int rrdInit(void) | ||
17 | argv[argc++] = rraBuff; | ||
18 | argv[argc] = NULL; | ||
19 | |||
20 | - ret = rrd_create(argc, (char**) argv); | ||
21 | + ret = rrd_create(argc, (const char**) argv); | ||
22 | if (ret == -1) { | ||
23 | sensorLog(LOG_ERR, "Error creating RRD file: %s: %s", | ||
24 | sensord_args.rrdFile, rrd_get_error()); | ||
25 | @@ -455,7 +455,7 @@ int rrdUpdate(void) | ||
26 | const char *argv[] = { | ||
27 | "sensord", sensord_args.rrdFile, rrdBuff, NULL | ||
28 | }; | ||
29 | - if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) { | ||
30 | + if ((ret = rrd_update(3, (const char **) /* WEAK */ argv))) { | ||
31 | sensorLog(LOG_ERR, "Error updating RRD file: %s: %s", | ||
32 | sensord_args.rrdFile, rrd_get_error()); | ||
33 | } | ||
34 | -- | ||
35 | 2.39.2 | ||
36 | |||
diff --git a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index aba5ab587..07027225c 100644 --- a/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/lm-sensors/lm-sensors.git;protocol=https;branch=mast | |||
14 | file://fancontrol.init \ | 14 | file://fancontrol.init \ |
15 | file://sensord.init \ | 15 | file://sensord.init \ |
16 | file://0001-Change-PIDFile-path-from-var-run-to-run.patch \ | 16 | file://0001-Change-PIDFile-path-from-var-run-to-run.patch \ |
17 | file://0001-Fix-building-with-GCC-14.patch \ | ||
17 | " | 18 | " |
18 | SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" | 19 | SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" |
19 | 20 | ||
@@ -70,11 +71,11 @@ do_install() { | |||
70 | install -d ${D}${INIT_D_DIR} | 71 | install -d ${D}${INIT_D_DIR} |
71 | 72 | ||
72 | # Install fancontrol init script | 73 | # Install fancontrol init script |
73 | install -m 0755 ${WORKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol | 74 | install -m 0755 ${UNPACKDIR}/fancontrol.init ${D}${INIT_D_DIR}/fancontrol |
74 | 75 | ||
75 | if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then | 76 | if ${@bb.utils.contains('PACKAGECONFIG', 'sensord', 'true', 'false', d)}; then |
76 | # Install sensord init script | 77 | # Install sensord init script |
77 | install -m 0755 ${WORKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord | 78 | install -m 0755 ${UNPACKDIR}/sensord.init ${D}${INIT_D_DIR}/sensord |
78 | fi | 79 | fi |
79 | 80 | ||
80 | # Insall sensord service script | 81 | # Insall sensord service script |
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch new file mode 100644 index 000000000..be1452af5 --- /dev/null +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch | |||
@@ -0,0 +1,88 @@ | |||
1 | From ac2ff1dbe0b44953de636c50c7d7f8c1e9f1e458 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sam James <sam@gentoo.org> | ||
3 | Date: Sat, 4 May 2024 09:13:06 +0100 | ||
4 | Subject: [PATCH] nvme: Use C99 types for uint32_t | ||
5 | |||
6 | <stdint.h> provides `uint32_t`, while `u_int_32` is an unofficial/internal | ||
7 | typedef that glibc happens to provide. This fixes the build on musl. | ||
8 | |||
9 | Bug: https://bugs.gentoo.org/931194 | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/ac2ff1dbe0b44953de636c50c7d7f8c1e9f1e458] | ||
12 | Signed-off-by: Sam James <sam@gentoo.org> | ||
13 | --- | ||
14 | nvme.c | 13 +++++++------ | ||
15 | util/base64.c | 5 +++-- | ||
16 | 2 files changed, 10 insertions(+), 8 deletions(-) | ||
17 | |||
18 | diff --git a/nvme.c b/nvme.c | ||
19 | index 46a2399a..5409ddf2 100644 | ||
20 | --- a/nvme.c | ||
21 | +++ b/nvme.c | ||
22 | @@ -34,6 +34,7 @@ | ||
23 | #include <inttypes.h> | ||
24 | #include <locale.h> | ||
25 | #include <stdio.h> | ||
26 | +#include <stdint.h> | ||
27 | #include <stdlib.h> | ||
28 | #include <string.h> | ||
29 | #include <unistd.h> | ||
30 | @@ -9081,8 +9082,8 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru | ||
31 | |||
32 | unsigned char decoded_key[128]; | ||
33 | unsigned int decoded_len; | ||
34 | - u_int32_t crc = crc32(0L, NULL, 0); | ||
35 | - u_int32_t key_crc; | ||
36 | + uint32_t crc = crc32(0L, NULL, 0); | ||
37 | + uint32_t key_crc; | ||
38 | int err = 0, hmac; | ||
39 | struct config { | ||
40 | char *key; | ||
41 | @@ -9150,10 +9151,10 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru | ||
42 | return -EINVAL; | ||
43 | } | ||
44 | crc = crc32(crc, decoded_key, decoded_len); | ||
45 | - key_crc = ((u_int32_t)decoded_key[decoded_len]) | | ||
46 | - ((u_int32_t)decoded_key[decoded_len + 1] << 8) | | ||
47 | - ((u_int32_t)decoded_key[decoded_len + 2] << 16) | | ||
48 | - ((u_int32_t)decoded_key[decoded_len + 3] << 24); | ||
49 | + key_crc = ((uint32_t)decoded_key[decoded_len]) | | ||
50 | + ((uint32_t)decoded_key[decoded_len + 1] << 8) | | ||
51 | + ((uint32_t)decoded_key[decoded_len + 2] << 16) | | ||
52 | + ((uint32_t)decoded_key[decoded_len + 3] << 24); | ||
53 | if (key_crc != crc) { | ||
54 | nvme_show_error("CRC mismatch (key %08x, crc %08x)", key_crc, crc); | ||
55 | return -EINVAL; | ||
56 | diff --git a/util/base64.c b/util/base64.c | ||
57 | index 7f47cda6..0e89f2e9 100644 | ||
58 | --- a/util/base64.c | ||
59 | +++ b/util/base64.c | ||
60 | @@ -20,6 +20,7 @@ | ||
61 | * MA 02110-1301, USA. | ||
62 | */ | ||
63 | |||
64 | +#include <stdint.h> | ||
65 | #include <stdlib.h> | ||
66 | #include <string.h> | ||
67 | #include <errno.h> | ||
68 | @@ -42,7 +43,7 @@ static const char base64_table[65] = | ||
69 | int base64_encode(const unsigned char *src, int srclen, char *dst) | ||
70 | { | ||
71 | int i, bits = 0; | ||
72 | - u_int32_t ac = 0; | ||
73 | + uint32_t ac = 0; | ||
74 | char *cp = dst; | ||
75 | |||
76 | for (i = 0; i < srclen; i++) { | ||
77 | @@ -77,7 +78,7 @@ int base64_encode(const unsigned char *src, int srclen, char *dst) | ||
78 | */ | ||
79 | int base64_decode(const char *src, int srclen, unsigned char *dst) | ||
80 | { | ||
81 | - u_int32_t ac = 0; | ||
82 | + uint32_t ac = 0; | ||
83 | int i, bits = 0; | ||
84 | unsigned char *bp = dst; | ||
85 | |||
86 | -- | ||
87 | 2.45.1 | ||
88 | |||
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch new file mode 100644 index 000000000..1881b18aa --- /dev/null +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 47d33d8da7a5b7310a2c2f4328115b439039e46c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 21 May 2024 14:09:32 -0700 | ||
4 | Subject: [PATCH] plugins/ssstc: Replace __uint16_t with uint16_t | ||
5 | |||
6 | uint16_t is ISO defined and comes from stdint.h, makes it | ||
7 | portable across glibc and musl on linux. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/linux-nvme/nvme-cli/pull/2351] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | plugins/ssstc/ssstc-nvme.c | 6 +++--- | ||
13 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/plugins/ssstc/ssstc-nvme.c b/plugins/ssstc/ssstc-nvme.c | ||
16 | index 03e4fe3f..302df988 100644 | ||
17 | --- a/plugins/ssstc/ssstc-nvme.c | ||
18 | +++ b/plugins/ssstc/ssstc-nvme.c | ||
19 | @@ -64,9 +64,9 @@ void show_ssstc_add_smart_log_jsn(struct nvme_additional_smart_log *smart, | ||
20 | unsigned int nsid, const char *devname) | ||
21 | { | ||
22 | struct json_object *root, *entry_stats, *dev_stats, *multi; | ||
23 | - __uint16_t wear_level_min = 0; | ||
24 | - __uint16_t wear_level_max = 0; | ||
25 | - __uint16_t wear_level_avg = 0; | ||
26 | + uint16_t wear_level_min = 0; | ||
27 | + uint16_t wear_level_max = 0; | ||
28 | + uint16_t wear_level_avg = 0; | ||
29 | uint64_t raw_val = 0; | ||
30 | |||
31 | root = json_create_object(); | ||
32 | -- | ||
33 | 2.45.1 | ||
34 | |||
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.9.1.bb index 81b30c283..842403c31 100644 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.bb +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.9.1.bb | |||
@@ -6,9 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ | |||
6 | file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ | 6 | file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ |
7 | file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" | 7 | file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" |
8 | DEPENDS = "json-c libnvme" | 8 | DEPENDS = "json-c libnvme" |
9 | SRCREV = "43b716b982da3df1cf8c4658f7c31b0fe28d377b" | 9 | SRCREV = "b340fd7dcf1aef76f8d46ab28bef3c170d310887" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" | 11 | SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https \ |
12 | file://0001-nvme-Use-C99-types-for-uint32_t.patch \ | ||
13 | file://0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch \ | ||
14 | " | ||
12 | 15 | ||
13 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
14 | 17 | ||
diff --git a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb index 61be5b2dc..20e870ccb 100644 --- a/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb +++ b/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb | |||
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b5fcfc87fb615860d398b5e38685edf" | |||
6 | SRC_URI = "file://pointercal \ | 6 | SRC_URI = "file://pointercal \ |
7 | file://COPYING" | 7 | file://COPYING" |
8 | 8 | ||
9 | S = "${WORKDIR}" | 9 | S = "${WORKDIR}/sources" |
10 | UNPACKDIR = "${S}" | ||
10 | 11 | ||
11 | do_install() { | 12 | do_install() { |
12 | # Only install file if it has a contents | 13 | # Only install file if it has a contents |
diff --git a/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb b/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb index aa52f6257..e6ec9c357 100644 --- a/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb +++ b/meta-oe/recipes-connectivity/gammu/gammu_1.42.0.bb | |||
@@ -22,8 +22,8 @@ do_install:append() { | |||
22 | rm -rf ${D}/usr/share/gammu | 22 | rm -rf ${D}/usr/share/gammu |
23 | #install default configuration files | 23 | #install default configuration files |
24 | install -d ${D}${sysconfdir} | 24 | install -d ${D}${sysconfdir} |
25 | install -m 0644 ${WORKDIR}/gammurc ${D}${sysconfdir}/gammurc | 25 | install -m 0644 ${UNPACKDIR}/gammurc ${D}${sysconfdir}/gammurc |
26 | install -m 0644 ${WORKDIR}/gammu-smsdrc ${D}${sysconfdir}/gammu-smsdrc | 26 | install -m 0644 ${UNPACKDIR}/gammu-smsdrc ${D}${sysconfdir}/gammu-smsdrc |
27 | } | 27 | } |
28 | 28 | ||
29 | EXTRA_OECONF = " \ | 29 | EXTRA_OECONF = " \ |
diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb index dbdc5c1bd..44683bf73 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "User space daemon for extended IEEE 802.11 management" | |||
2 | HOMEPAGE = "http://w1.fi/hostapd/" | 2 | HOMEPAGE = "http://w1.fi/hostapd/" |
3 | SECTION = "kernel/userland" | 3 | SECTION = "kernel/userland" |
4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
5 | LIC_FILES_CHKSUM = "file://hostapd/README;md5=c905478466c90f1cefc0df987c40e172" | 5 | LIC_FILES_CHKSUM = "file://hostapd/README;beginline=5;endline=47;md5=aa03b8bd6216d1a7ca01fd4b89863073" |
6 | 6 | ||
7 | DEPENDS = "libnl openssl" | 7 | DEPENDS = "libnl openssl" |
8 | 8 | ||
@@ -16,9 +16,6 @@ SRC_URI = " \ | |||
16 | 16 | ||
17 | SRC_URI[sha256sum] = "206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d" | 17 | SRC_URI[sha256sum] = "206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d" |
18 | 18 | ||
19 | S = "${WORKDIR}/hostapd-${PV}" | ||
20 | B = "${WORKDIR}/hostapd-${PV}/hostapd" | ||
21 | |||
22 | inherit update-rc.d systemd pkgconfig features_check | 19 | inherit update-rc.d systemd pkgconfig features_check |
23 | 20 | ||
24 | CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" | 21 | CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" |
@@ -29,22 +26,22 @@ SYSTEMD_SERVICE:${PN} = "hostapd.service" | |||
29 | SYSTEMD_AUTO_ENABLE:${PN} = "disable" | 26 | SYSTEMD_AUTO_ENABLE:${PN} = "disable" |
30 | 27 | ||
31 | do_configure:append() { | 28 | do_configure:append() { |
32 | install -m 0644 ${WORKDIR}/defconfig ${B}/.config | 29 | install -m 0644 ${UNPACKDIR}/defconfig ${B}/hostapd/.config |
33 | } | 30 | } |
34 | 31 | ||
35 | do_compile() { | 32 | do_compile() { |
36 | export CFLAGS="-MMD -O2 -Wall -g" | 33 | export CFLAGS="-MMD -O2 -Wall -g" |
37 | export EXTRA_CFLAGS="${CFLAGS}" | 34 | export EXTRA_CFLAGS="${CFLAGS}" |
38 | make V=1 | 35 | make -C hostapd V=1 |
39 | } | 36 | } |
40 | 37 | ||
41 | do_install() { | 38 | do_install() { |
42 | install -d ${D}${sbindir} ${D}${sysconfdir}/init.d ${D}${systemd_unitdir}/system/ | 39 | install -d ${D}${sbindir} ${D}${sysconfdir}/init.d ${D}${systemd_unitdir}/system/ |
43 | install -m 0644 ${B}/hostapd.conf ${D}${sysconfdir} | 40 | install -m 0644 ${B}/hostapd/hostapd.conf ${D}${sysconfdir} |
44 | install -m 0755 ${B}/hostapd ${D}${sbindir} | 41 | install -m 0755 ${B}/hostapd/hostapd ${D}${sbindir} |
45 | install -m 0755 ${B}/hostapd_cli ${D}${sbindir} | 42 | install -m 0755 ${B}/hostapd/hostapd_cli ${D}${sbindir} |
46 | install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd | 43 | install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/hostapd |
47 | install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system/ | 44 | install -m 0644 ${UNPACKDIR}/hostapd.service ${D}${systemd_unitdir}/system/ |
48 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service | 45 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service |
49 | } | 46 | } |
50 | 47 | ||
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_2.16.bb b/meta-oe/recipes-connectivity/iwd/iwd_2.18.bb index a6bb7085e..4d993031d 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_2.16.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_2.18.bb | |||
@@ -8,7 +8,7 @@ DEPENDS = "ell" | |||
8 | SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ | 8 | SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ |
9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ | 9 | file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ |
10 | " | 10 | " |
11 | SRC_URI[sha256sum] = "c1a82032e994861e794cf3b5a16d07ae1aa03a6674f716c73408ffeae2a233ba" | 11 | SRC_URI[sha256sum] = "100d029171d161411f6cd8e1f95708e3a4351fb19e6847ba04819377b5fed13e" |
12 | 12 | ||
13 | inherit autotools manpages pkgconfig python3native systemd | 13 | inherit autotools manpages pkgconfig python3native systemd |
14 | 14 | ||
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb index 7af33e4e7..ed12fee94 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb | |||
@@ -74,8 +74,8 @@ do_install:append() { | |||
74 | 74 | ||
75 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 75 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
76 | mkdir -p ${D}/${sysconfdir}/init.d ${D}/${sysconfdir}/default | 76 | mkdir -p ${D}/${sysconfdir}/init.d ${D}/${sysconfdir}/default |
77 | install -m 0755 ${WORKDIR}/etc/init.d/* ${D}/${sysconfdir}/init.d | 77 | install -m 0755 ${UNPACKDIR}/etc/init.d/* ${D}/${sysconfdir}/init.d |
78 | install -m 0644 ${WORKDIR}/etc/default/* ${D}/${sysconfdir}/default | 78 | install -m 0644 ${UNPACKDIR}/etc/default/* ${D}/${sysconfdir}/default |
79 | 79 | ||
80 | mkdir -p ${D}/${sysconfdir}/default/volatiles | 80 | mkdir -p ${D}/${sysconfdir}/default/volatiles |
81 | echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \ | 81 | echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \ |
@@ -90,11 +90,11 @@ do_install:append() { | |||
90 | > ${D}${sysconfdir}/tmpfiles.d/krb5.conf | 90 | > ${D}${sysconfdir}/tmpfiles.d/krb5.conf |
91 | 91 | ||
92 | mkdir -p ${D}/${sysconfdir}/default | 92 | mkdir -p ${D}/${sysconfdir}/default |
93 | install -m 0644 ${WORKDIR}/etc/default/* ${D}/${sysconfdir}/default | 93 | install -m 0644 ${UNPACKDIR}/etc/default/* ${D}/${sysconfdir}/default |
94 | 94 | ||
95 | install -d ${D}${systemd_system_unitdir} | 95 | install -d ${D}${systemd_system_unitdir} |
96 | install -m 0644 ${WORKDIR}/krb5-admin-server.service ${D}${systemd_system_unitdir} | 96 | install -m 0644 ${UNPACKDIR}/krb5-admin-server.service ${D}${systemd_system_unitdir} |
97 | install -m 0644 ${WORKDIR}/krb5-kdc.service ${D}${systemd_system_unitdir} | 97 | install -m 0644 ${UNPACKDIR}/krb5-kdc.service ${D}${systemd_system_unitdir} |
98 | fi | 98 | fi |
99 | 99 | ||
100 | sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ | 100 | sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ |
diff --git a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.2.0.bb index d37c547c9..c9e9c90d7 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.2.0.bb | |||
@@ -8,9 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" | |||
8 | 8 | ||
9 | DEPENDS = "libplist" | 9 | DEPENDS = "libplist" |
10 | 10 | ||
11 | PV = "1.0.0+git" | 11 | SRCREV = "fde8946a3988790fd5d3f01fc0a1fd43609ab1d1" |
12 | |||
13 | SRCREV = "114098d30e783fbb3def5c9b49427a86621cfcb1" | ||
14 | SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" | 12 | SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" |
15 | 13 | ||
16 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb b/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.0.bb index 240019597..29f67d39d 100644 --- a/meta-oe/recipes-connectivity/libirecovery/libirecovery_git.bb +++ b/meta-oe/recipes-connectivity/libirecovery/libirecovery_1.2.0.bb | |||
@@ -8,9 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" | |||
8 | 8 | ||
9 | DEPENDS = "libimobiledevice-glue libusb1 readline" | 9 | DEPENDS = "libimobiledevice-glue libusb1 readline" |
10 | 10 | ||
11 | PV = "1.1.0" | 11 | SRCREV = "2254dab893ec439f9a73235ea07194afa77399db" |
12 | |||
13 | SRCREV = "98c9f7055ec1f2e09fac69ef1413a8757113b838" | ||
14 | SRC_URI = "git://github.com/libimobiledevice/libirecovery;protocol=https;branch=master" | 12 | SRC_URI = "git://github.com/libimobiledevice/libirecovery;protocol=https;branch=master" |
15 | 13 | ||
16 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-connectivity/libndp/libndp/0001-libndp-Fix-signature-of-sendto-API.patch b/meta-oe/recipes-connectivity/libndp/libndp/0001-libndp-Fix-signature-of-sendto-API.patch new file mode 100644 index 000000000..f625416ac --- /dev/null +++ b/meta-oe/recipes-connectivity/libndp/libndp/0001-libndp-Fix-signature-of-sendto-API.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 14e036b5daf6b72483a1a21054b5133acabceabe Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 17 May 2024 18:14:04 -0700 | ||
4 | Subject: [PATCH] libndp: Fix signature of sendto API | ||
5 | |||
6 | This fixes build with musl/gcc-14 | ||
7 | |||
8 | | ../../git/libndp/libndp.c: In function 'mysendto6': | ||
9 | | ../../git/libndp/libndp.c:212:50: error: passing argument 5 of 'sendto' from incompatible pointer type [-Wincompatible-pointer-types] | ||
10 | | 212 | ret = sendto(sockfd, buf, buflen, flags, &sin6, sizeof(sin6)); | ||
11 | | | ^~~~~ | ||
12 | | | | | ||
13 | | | struct sockaddr_in6 * | ||
14 | | In file included from ../../git/libndp/libndp.c:27: | ||
15 | | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libndp/1.8/recipe-sysroot/usr/include/sys/socket.h:396:49: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_in6 *' | ||
16 | | 396 | ssize_t sendto (int, const void *, size_t, int, const struct sockaddr *, socklen_t); | ||
17 | | | ^~~~~~~~~~~~~~~~~~~~~~~ | ||
18 | |||
19 | Upstream-Status: Submitted [Sent to maintainer] | ||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
21 | --- | ||
22 | libndp/libndp.c | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/libndp/libndp.c b/libndp/libndp.c | ||
26 | index 6314717..056df0f 100644 | ||
27 | --- a/libndp/libndp.c | ||
28 | +++ b/libndp/libndp.c | ||
29 | @@ -209,7 +209,7 @@ static int mysendto6(int sockfd, void *buf, size_t buflen, int flags, | ||
30 | memcpy(&sin6.sin6_addr, addr, sizeof(sin6.sin6_addr)); | ||
31 | sin6.sin6_scope_id = ifindex; | ||
32 | resend: | ||
33 | - ret = sendto(sockfd, buf, buflen, flags, &sin6, sizeof(sin6)); | ||
34 | + ret = sendto(sockfd, buf, buflen, flags, (struct sockaddr*)&sin6, sizeof(sin6)); | ||
35 | if (ret == -1) { | ||
36 | switch(errno) { | ||
37 | case EINTR: | ||
38 | -- | ||
39 | 2.45.1 | ||
40 | |||
diff --git a/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb b/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb index 4d4d3e51c..80946317e 100644 --- a/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb +++ b/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb | |||
@@ -4,6 +4,7 @@ LICENSE = "LGPL-2.1-only" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
5 | 5 | ||
6 | SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ | 6 | SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ |
7 | file://0001-libndp-Fix-signature-of-sendto-API.patch \ | ||
7 | " | 8 | " |
8 | # tag for v1.8 | 9 | # tag for v1.8 |
9 | SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c" | 10 | SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c" |
diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb index 4518e2faa..3170d37f5 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb | |||
@@ -42,6 +42,8 @@ do_install:append() { | |||
42 | sed -i -e 's|${STAGING_LIBDIR}/libuv.so|uv|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake | 42 | sed -i -e 's|${STAGING_LIBDIR}/libuv.so|uv|g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake |
43 | sed -i -e 's|${STAGING_INCDIR}||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ | 43 | sed -i -e 's|${STAGING_INCDIR}||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ |
44 | ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake | 44 | ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake |
45 | sed -i -e 's|${STAGING_LIBDIR}/||g' ${D}${libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake \ | ||
46 | ${D}${libdir}/cmake/libwebsockets/libwebsockets-config.cmake | ||
45 | } | 47 | } |
46 | 48 | ||
47 | PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev ${PN}-evlib-sd" | 49 | PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev ${PN}-evlib-sd" |
diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb index 9a5c9b520..d1a73841a 100644 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_4.1.bb | |||
@@ -46,10 +46,10 @@ do_install() { | |||
46 | install -d ${D}/${systemd_unitdir}/system/ | 46 | install -d ${D}/${systemd_unitdir}/system/ |
47 | for service in ${LINUXPTP_SYSTEMD_SERVICES}; do | 47 | for service in ${LINUXPTP_SYSTEMD_SERVICES}; do |
48 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | 48 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ |
49 | ${WORKDIR}/systemd/$service.in | 49 | ${UNPACKDIR}/systemd/$service.in |
50 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 50 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
51 | ${WORKDIR}/systemd/$service.in | 51 | ${UNPACKDIR}/systemd/$service.in |
52 | install -m 644 ${WORKDIR}/systemd/$service.in \ | 52 | install -m 644 ${UNPACKDIR}/systemd/$service.in \ |
53 | ${D}/${systemd_unitdir}/system/$service | 53 | ${D}/${systemd_unitdir}/system/$service |
54 | done | 54 | done |
55 | } | 55 | } |
diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch new file mode 100644 index 000000000..f2e210fc6 --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-initialize-timespec-variable.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 298dec6f87061914c85049faca3d0ff3310d1794 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 6 May 2024 12:15:30 -0700 | ||
4 | Subject: [PATCH] initialize timespec variable | ||
5 | |||
6 | Fixes build warnings with GCC14 | ||
7 | |||
8 | /mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp: In constructor 'pcpp::RawPacket::RawPacket(const uint8_t*, int, timeval, bool, pcpp::LinkLayerType)': | ||
9 | /mnt/b/yoe/master/build/tmp/work/core2-32-yoe-linux/pcapplusplus/23.09/git/Packet++/src/RawPacket.cpp:23:18: error: 'nsec_time.timespec::<anonymous>' is used uninitialized [-Werror=uninitialized] | ||
10 | 23 | timespec nsec_time; | ||
11 | | ^~~~~~~~~ | ||
12 | cc1plus: all warnings being treated as errors | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1389] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | Packet++/src/RawPacket.cpp | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/Packet++/src/RawPacket.cpp b/Packet++/src/RawPacket.cpp | ||
21 | index 8ad52d52..07dbbbe2 100644 | ||
22 | --- a/Packet++/src/RawPacket.cpp | ||
23 | +++ b/Packet++/src/RawPacket.cpp | ||
24 | @@ -20,7 +20,7 @@ void RawPacket::init(bool deleteRawDataAtDestructor) | ||
25 | |||
26 | RawPacket::RawPacket(const uint8_t* pRawData, int rawDataLen, timeval timestamp, bool deleteRawDataAtDestructor, LinkLayerType layerType) | ||
27 | { | ||
28 | - timespec nsec_time; | ||
29 | + timespec nsec_time = {}; | ||
30 | TIMEVAL_TO_TIMESPEC(×tamp, &nsec_time); | ||
31 | init(deleteRawDataAtDestructor); | ||
32 | setRawData(pRawData, rawDataLen, nsec_time, layerType); | ||
33 | -- | ||
34 | 2.45.0 | ||
35 | |||
diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch new file mode 100644 index 000000000..b6389e0e3 --- /dev/null +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus/0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 742f564ee80749e9f1f3363092775545e37c0f87 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 9 May 2024 17:02:09 -0700 | ||
4 | Subject: [PATCH] packet++: Initialize m_ExternalRawData in IDnsResource | ||
5 | constructor | ||
6 | |||
7 | Fixes following warning with GCC-14 | ||
8 | |||
9 | Packet++/src/DnsResource.cpp:29:24: error: '*this.pcpp::IDnsResource::m_ExternalRawData' may be used uninitialized [-Werror=maybe-uninitialized] | ||
10 | 29 | return m_ExternalRawData; | ||
11 | | ^~~~~~~~~~~~~~~~~ | ||
12 | |||
13 | Upstream-Status: Submitted [https://github.com/seladb/PcapPlusPlus/pull/1391] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | Packet++/src/DnsResource.cpp | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/Packet++/src/DnsResource.cpp b/Packet++/src/DnsResource.cpp | ||
20 | index fec1bf05..c1f97041 100644 | ||
21 | --- a/Packet++/src/DnsResource.cpp | ||
22 | +++ b/Packet++/src/DnsResource.cpp | ||
23 | @@ -10,7 +10,7 @@ namespace pcpp | ||
24 | { | ||
25 | |||
26 | IDnsResource::IDnsResource(DnsLayer* dnsLayer, size_t offsetInLayer) | ||
27 | - : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr) | ||
28 | + : m_DnsLayer(dnsLayer), m_OffsetInLayer(offsetInLayer), m_NextResource(nullptr), m_ExternalRawData(nullptr) | ||
29 | { | ||
30 | char decodedName[4096]; | ||
31 | m_NameLength = decodeName((const char*)getRawData(), decodedName); | ||
32 | -- | ||
33 | 2.45.0 | ||
34 | |||
diff --git a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb index 39c6942c8..9db022217 100644 --- a/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb +++ b/meta-oe/recipes-connectivity/pcapplusplus/pcapplusplus_23.09.bb | |||
@@ -7,7 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" | |||
7 | 7 | ||
8 | DEPENDS = "libpcap" | 8 | DEPENDS = "libpcap" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master" | 10 | SRC_URI = "git://github.com/seladb/PcapPlusPlus.git;protocol=https;branch=master \ |
11 | file://0001-packet-Initialize-m_ExternalRawData-in-IDnsResource-.patch \ | ||
12 | file://0001-initialize-timespec-variable.patch" | ||
13 | |||
11 | SRCREV = "4cf8ed44f9dd145f874dc1dd747dfefcfcab75be" | 14 | SRCREV = "4cf8ed44f9dd145f874dc1dd747dfefcfcab75be" |
12 | 15 | ||
13 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.1.bb b/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.2.bb index e5ebafa54..f23692816 100644 --- a/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.1.bb +++ b/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.2.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz \ | |||
11 | file://ser2net.service \ | 11 | file://ser2net.service \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "78ffee19d9b97e93ae65b5cec072da2b7b947fc484e9ccb3f535702f36f6ed19" | 14 | SRC_URI[sha256sum] = "63bafcd65bb9270a93b7d5cdde58ccf4d279603ff6d044ac4b484a257cda82ce" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" | 16 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" |
17 | 17 | ||
@@ -24,7 +24,7 @@ CONFFILES:${PN} += "${sysconfdir}/ser2net/ser2net.yaml" | |||
24 | do_install:append() { | 24 | do_install:append() { |
25 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 25 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
26 | install -d ${D}${systemd_unitdir}/system | 26 | install -d ${D}${systemd_unitdir}/system |
27 | install -m 0644 ${WORKDIR}/ser2net.service ${D}${systemd_unitdir}/system/ | 27 | install -m 0644 ${UNPACKDIR}/ser2net.service ${D}${systemd_unitdir}/system/ |
28 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/ser2net.service | 28 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/ser2net.service |
29 | fi | 29 | fi |
30 | } | 30 | } |
diff --git a/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb index 735db1441..b9ed3d925 100644 --- a/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb | |||
@@ -1,55 +1,40 @@ | |||
1 | DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client" | 1 | DESCRIPTION = "Transmission is a fast, easy, and free BitTorrent client" |
2 | SECTION = "network" | 2 | SECTION = "network" |
3 | HOMEPAGE = "https://transmissionbt.com/" | 3 | HOMEPAGE = "https://transmissionbt.com/" |
4 | LICENSE = "GPL-2.0-only" | 4 | LICENSE = "MIT & GPL-2.0-only" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=73f535ddffcf2a0d3af4f381f84f9b33" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=ba8199e739948e198310093de27175fa" |
6 | 6 | ||
7 | DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" | 7 | DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" |
8 | RDEPENDS:${PN}-web = "${PN}" | 8 | RDEPENDS:${PN}-web = "${PN}" |
9 | 9 | ||
10 | SRC_URI = " \ | 10 | SRC_URI = " \ |
11 | gitsm://github.com/transmission/transmission;branch=master;protocol=https \ | 11 | gitsm://github.com/transmission/transmission;branch=4.0.x;protocol=https \ |
12 | file://transmission-daemon \ | 12 | file://transmission-daemon \ |
13 | " | 13 | " |
14 | 14 | ||
15 | # Transmission release 3.00 | 15 | # Transmission release 4.0.5 |
16 | SRCREV = "bb6b5a062ee594dfd4b7a12a6b6e860c43849bfd" | 16 | SRCREV = "a6fe2a64aa7eca089f96006cf082a12f0cde937f" |
17 | PV = "3.00" | ||
18 | 17 | ||
19 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
20 | 19 | ||
21 | inherit autotools-brokensep gettext update-rc.d pkgconfig systemd mime-xdg | 20 | inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg |
22 | 21 | ||
23 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ | 22 | PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ |
24 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" | 23 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" |
25 | 24 | ||
26 | PACKAGECONFIG[gtk] = " --with-gtk,--without-gtk,gtk+3," | 25 | PACKAGECONFIG[gtk] = "-DENABLE_GTK=ON,-DENABLE_GTK=OFF,gtk4 gtkmm4," |
27 | PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd," | 26 | PACKAGECONFIG[systemd] = "-DWITH_SYSTEMD=ON,-DWITH_SYSTEMD=OFF,systemd," |
28 | 27 | ||
29 | # Weak default values for transmission user and group | 28 | # Weak default values for transmission user and group |
30 | # Change them in bbappend if needed | 29 | # Change them in bbappend if needed |
31 | TRANSMISSION_USER ??= "root" | 30 | TRANSMISSION_USER ??= "root" |
32 | TRANSMISSION_GROUP ??= "root" | 31 | TRANSMISSION_GROUP ??= "root" |
33 | 32 | ||
34 | # Configure aborts with: | ||
35 | # config.status: error: po/Makefile.in.in was not created by intltoolize. | ||
36 | do_configure() { | ||
37 | sed -i /AM_GLIB_GNU_GETTEXT/d ${S}/configure.ac | ||
38 | cd ${S} | ||
39 | ./update-version-h.sh | ||
40 | intltoolize --copy --force --automake | ||
41 | aclocal | ||
42 | libtoolize --automake --copy --force | ||
43 | autoconf | ||
44 | automake -a | ||
45 | oe_runconf | ||
46 | } | ||
47 | |||
48 | do_install:append() { | 33 | do_install:append() { |
49 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 34 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
50 | sed -i '/USERNAME=/c\USERNAME=${TRANSMISSION_USER}' ${WORKDIR}/transmission-daemon | 35 | sed -i '/USERNAME=/c\USERNAME=${TRANSMISSION_USER}' ${UNPACKDIR}/transmission-daemon |
51 | install -d ${D}${sysconfdir}/init.d | 36 | install -d ${D}${sysconfdir}/init.d |
52 | install -m 0744 ${WORKDIR}/transmission-daemon ${D}${sysconfdir}/init.d/ | 37 | install -m 0744 ${UNPACKDIR}/transmission-daemon ${D}${sysconfdir}/init.d/ |
53 | chown ${TRANSMISSION_USER}:${TRANSMISSION_GROUP} ${D}${sysconfdir}/init.d/transmission-daemon | 38 | chown ${TRANSMISSION_USER}:${TRANSMISSION_GROUP} ${D}${sysconfdir}/init.d/transmission-daemon |
54 | fi | 39 | fi |
55 | 40 | ||
@@ -63,8 +48,8 @@ do_install:append() { | |||
63 | PACKAGES += "${PN}-gtk ${PN}-client ${PN}-web" | 48 | PACKAGES += "${PN}-gtk ${PN}-client ${PN}-web" |
64 | 49 | ||
65 | FILES:${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" | 50 | FILES:${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" |
66 | FILES:${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" | 51 | FILES:${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps ${datadir}/metainfo" |
67 | FILES:${PN}-web = "${datadir}/transmission/web" | 52 | FILES:${PN}-web = "${datadir}/transmission/web ${datadir}/transmission/public_html" |
68 | FILES:${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon ${datadir}/appdata" | 53 | FILES:${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon ${datadir}/appdata" |
69 | 54 | ||
70 | SYSTEMD_SERVICE:${PN} = "transmission-daemon.service" | 55 | SYSTEMD_SERVICE:${PN} = "transmission-daemon.service" |
diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb index 8708852ce..46c09a02a 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_6.2.7.bb | |||
@@ -68,7 +68,7 @@ do_configure:prepend() { | |||
68 | do_install:append() { | 68 | do_install:append() { |
69 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 69 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
70 | install -d ${D}${systemd_unitdir}/system | 70 | install -d ${D}${systemd_unitdir}/system |
71 | install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ | 71 | install -m 0644 ${UNPACKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ |
72 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service | 72 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service |
73 | fi | 73 | fi |
74 | } | 74 | } |
diff --git a/meta-oe/recipes-core/emlog/emlog_git.bb b/meta-oe/recipes-core/emlog/emlog_git.bb index 6331f618f..3f3b5bc92 100644 --- a/meta-oe/recipes-core/emlog/emlog_git.bb +++ b/meta-oe/recipes-core/emlog/emlog_git.bb | |||
@@ -18,7 +18,7 @@ do_compile() { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | do_install() { | 20 | do_install() { |
21 | install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/${BPN} | 21 | install -Dm 0755 ${UNPACKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/${BPN} |
22 | install -Dm 0755 ${S}/nbcat ${D}${bindir}/nbcat | 22 | install -Dm 0755 ${S}/nbcat ${D}${bindir}/nbcat |
23 | install -Dm 0755 ${S}/mkemlog ${D}${bindir}/mkemlog | 23 | install -Dm 0755 ${S}/mkemlog ${D}${bindir}/mkemlog |
24 | } | 24 | } |
diff --git a/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb b/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb new file mode 100644 index 000000000..ebcc2b267 --- /dev/null +++ b/meta-oe/recipes-core/glib-2.0/glib-testing_0.1.1.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "libglib-testing provides test harnesses and mock classes to complement GLib classes" | ||
2 | HOMEPAGE = "https://gitlab.gnome.org/pwithnall/libglib-testing" | ||
3 | LICENSE = "LGPL-2.1-only" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
5 | |||
6 | SRC_URI = "git://gitlab.gnome.org/pwithnall/libglib-testing.git;protocol=https;branch=main" | ||
7 | |||
8 | PV = "0.1.1" | ||
9 | S = "${WORKDIR}/git" | ||
10 | SRCREV = "e326f73a7139c5e54fcf926896ae6e4cc899a1a7" | ||
11 | |||
12 | inherit meson pkgconfig | ||
13 | |||
14 | DEPENDS = "glib-2.0 gtk-doc-native libxslt-native docbook-xsl-stylesheets-native python3-pygments-native" | ||
diff --git a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.78.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb index f40a8144d..a45d31edc 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.78.0.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm-2.68_2.80.0.bb | |||
@@ -12,7 +12,7 @@ inherit gnomebase | |||
12 | 12 | ||
13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 13 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
14 | 14 | ||
15 | SRC_URI[archive.sha256sum] = "5d2e872564996f02a06d8bbac3677e7c394af8b00dd1526aebd47af842a3ef50" | 15 | SRC_URI[archive.sha256sum] = "539b0a29e15a96676c4f0594541250566c5ca44da5d4d87a3732fa2d07909e4a" |
16 | 16 | ||
17 | S = "${WORKDIR}/${GNOMEBN}-${PV}" | 17 | S = "${WORKDIR}/${GNOMEBN}-${PV}" |
18 | 18 | ||
diff --git a/meta-oe/recipes-core/ndctl/ndctl_v78.bb b/meta-oe/recipes-core/ndctl/ndctl_v79.bb index 907c02c7c..9a4bc49d1 100644 --- a/meta-oe/recipes-core/ndctl/ndctl_v78.bb +++ b/meta-oe/recipes-core/ndctl/ndctl_v79.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74a614eac8b2657a4b8e6607421a0883" | |||
10 | 10 | ||
11 | inherit meson pkgconfig bash-completion systemd | 11 | inherit meson pkgconfig bash-completion systemd |
12 | 12 | ||
13 | SRCREV = "a871e6153b11fe63780b37cdcb1eb347b296095c" | 13 | SRCREV = "16f45755f991f4fb6d76fec70a42992426c84234" |
14 | SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \ | 14 | SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \ |
15 | file://0001-include-libgen.h-for-basename.patch" | 15 | file://0001-include-libgen.h-for-basename.patch" |
16 | 16 | ||
diff --git a/meta-oe/recipes-core/opencl/opencl-headers_2023.12.14.bb b/meta-oe/recipes-core/opencl/opencl-headers_2024.05.08.bb index 8b1c79566..01e83c812 100644 --- a/meta-oe/recipes-core/opencl/opencl-headers_2023.12.14.bb +++ b/meta-oe/recipes-core/opencl/opencl-headers_2024.05.08.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
5 | SECTION = "base" | 5 | SECTION = "base" |
6 | 6 | ||
7 | S = "${WORKDIR}/git" | 7 | S = "${WORKDIR}/git" |
8 | SRCREV = "2368105c0531069fe927989505de7d125ec58c55" | 8 | SRCREV = "8275634cf9ec31b6484c2e6be756237cb583999d" |
9 | SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https" | 9 | SRC_URI = "git://github.com/KhronosGroup/OpenCL-Headers.git;branch=main;protocol=https" |
10 | 10 | ||
11 | do_configure[noexec] = "1" | 11 | do_configure[noexec] = "1" |
diff --git a/meta-oe/recipes-core/opencl/opencl-icd-loader_2023.12.14.bb b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb index 146ec6e47..38db7a245 100644 --- a/meta-oe/recipes-core/opencl/opencl-icd-loader_2023.12.14.bb +++ b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb | |||
@@ -13,7 +13,7 @@ RPROVIDES:${PN} = "virtual-opencl-icd" | |||
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
16 | SRCREV = "229410f86a8c8c9e0f86f195409e5481a2bae067" | 16 | SRCREV = "861b68b290e76d08e7241608479c16431f529945" |
17 | SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https" | 17 | SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https" |
18 | 18 | ||
19 | EXTRA_OECMAKE:append = " \ | 19 | EXTRA_OECMAKE:append = " \ |
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 7544a9fbf..19242ba54 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
@@ -511,7 +511,7 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ | |||
511 | libsdl2-net \ | 511 | libsdl2-net \ |
512 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \ | 512 | ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libsdl2-ttf", "", d)} \ |
513 | libsdl \ | 513 | libsdl \ |
514 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "lv-drivers lvgl lv-lib-png", "", d)} \ | 514 | lvgl \ |
515 | ttf-arphic-uming \ | 515 | ttf-arphic-uming \ |
516 | ttf-droid-sans ttf-droid-sans-mono ttf-droid-sans-fallback ttf-droid-sans-japanese ttf-droid-serif \ | 516 | ttf-droid-sans ttf-droid-sans-mono ttf-droid-sans-fallback ttf-droid-sans-japanese ttf-droid-serif \ |
517 | ttf-abyssinica \ | 517 | ttf-abyssinica \ |
@@ -688,7 +688,6 @@ RDEPENDS:packagegroup-meta-oe-multimedia ="\ | |||
688 | RDEPENDS:packagegroup-meta-oe-navigation ="\ | 688 | RDEPENDS:packagegroup-meta-oe-navigation ="\ |
689 | geos \ | 689 | geos \ |
690 | ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \ | 690 | ${@bb.utils.contains("DISTRO_FEATURES", "bluz4", "gpsd-machine-conf gpsd", "", d)} \ |
691 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "orrery", "", d)} \ | ||
692 | geoclue \ | 691 | geoclue \ |
693 | libspatialite \ | 692 | libspatialite \ |
694 | proj \ | 693 | proj \ |
diff --git a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb index 247cc4266..86a2331bd 100644 --- a/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb +++ b/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Proxy libintl" | |||
2 | HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" | 2 | HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" |
3 | SECTION = "libs" | 3 | SECTION = "libs" |
4 | LICENSE = "LGPL-2.0-only" | 4 | LICENSE = "LGPL-2.0-only" |
5 | LIC_FILES_CHKSUM = "file://src/proxy-libintl/COPYING.LIB.txt;md5=bc400bc21422f9a92e76ec2c5167ca2e" | 5 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/src/proxy-libintl/COPYING.LIB.txt;md5=bc400bc21422f9a92e76ec2c5167ca2e" |
6 | 6 | ||
7 | PROVIDES = "virtual/libintl" | 7 | PROVIDES = "virtual/libintl" |
8 | 8 | ||
@@ -12,7 +12,6 @@ SRC_URI = " \ | |||
12 | SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e" | 12 | SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e" |
13 | SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91" | 13 | SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91" |
14 | 14 | ||
15 | S = "${WORKDIR}" | ||
16 | PACKAGES = "${PN} ${PN}-dev" | 15 | PACKAGES = "${PN} ${PN}-dev" |
17 | FILES:${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" | 16 | FILES:${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" |
18 | INSANE_SKIP:${PN}-dev = "staticdev" | 17 | INSANE_SKIP:${PN}-dev = "staticdev" |
@@ -21,13 +20,13 @@ CFLAGS:append = " -fPIC -Wall -I ../../include ${@['-DSTUB_ONLY', ''][d.getVar(' | |||
21 | TARGET_CC_ARCH += "${LDFLAGS}" | 20 | TARGET_CC_ARCH += "${LDFLAGS}" |
22 | 21 | ||
23 | do_compile() { | 22 | do_compile() { |
24 | cd ${WORKDIR}/src/proxy-libintl | 23 | cd ${UNPACKDIR}/src/proxy-libintl |
25 | oe_runmake ../../lib/libintl.a | 24 | oe_runmake ../../lib/libintl.a |
26 | } | 25 | } |
27 | 26 | ||
28 | do_install() { | 27 | do_install() { |
29 | install -d ${D}/${includedir} | 28 | install -d ${D}/${includedir} |
30 | install -d ${D}/${libdir} | 29 | install -d ${D}/${libdir} |
31 | install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir} | 30 | install -m 0644 ${UNPACKDIR}/include/libintl.h ${D}/${includedir} |
32 | install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir} | 31 | install -m 0644 ${UNPACKDIR}/lib/libintl.a ${D}/${libdir} |
33 | } | 32 | } |
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch index 66be79077..c23d9b755 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0012-do-not-disable-buffer-in-writing-files.patch | |||
@@ -46,11 +46,9 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
46 | src/vconsole/vconsole-setup.c | 2 +- | 46 | src/vconsole/vconsole-setup.c | 2 +- |
47 | 22 files changed, 50 insertions(+), 51 deletions(-) | 47 | 22 files changed, 50 insertions(+), 51 deletions(-) |
48 | 48 | ||
49 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | ||
50 | index d2be79622f..e65fecb68d 100644 | ||
51 | --- a/src/basic/cgroup-util.c | 49 | --- a/src/basic/cgroup-util.c |
52 | +++ b/src/basic/cgroup-util.c | 50 | +++ b/src/basic/cgroup-util.c |
53 | @@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *path) { | 51 | @@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *p |
54 | if (r < 0) | 52 | if (r < 0) |
55 | return r; | 53 | return r; |
56 | 54 | ||
@@ -59,7 +57,7 @@ index d2be79622f..e65fecb68d 100644 | |||
59 | if (r < 0) | 57 | if (r < 0) |
60 | return r; | 58 | return r; |
61 | 59 | ||
62 | @@ -843,7 +843,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { | 60 | @@ -843,7 +843,7 @@ int cg_install_release_agent(const char |
63 | 61 | ||
64 | sc = strstrip(contents); | 62 | sc = strstrip(contents); |
65 | if (isempty(sc)) { | 63 | if (isempty(sc)) { |
@@ -68,7 +66,7 @@ index d2be79622f..e65fecb68d 100644 | |||
68 | if (r < 0) | 66 | if (r < 0) |
69 | return r; | 67 | return r; |
70 | } else if (!path_equal(sc, agent)) | 68 | } else if (!path_equal(sc, agent)) |
71 | @@ -861,7 +861,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { | 69 | @@ -861,7 +861,7 @@ int cg_install_release_agent(const char |
72 | 70 | ||
73 | sc = strstrip(contents); | 71 | sc = strstrip(contents); |
74 | if (streq(sc, "0")) { | 72 | if (streq(sc, "0")) { |
@@ -77,7 +75,7 @@ index d2be79622f..e65fecb68d 100644 | |||
77 | if (r < 0) | 75 | if (r < 0) |
78 | return r; | 76 | return r; |
79 | 77 | ||
80 | @@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const char *controller) { | 78 | @@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const cha |
81 | if (r < 0) | 79 | if (r < 0) |
82 | return r; | 80 | return r; |
83 | 81 | ||
@@ -86,7 +84,7 @@ index d2be79622f..e65fecb68d 100644 | |||
86 | if (r < 0) | 84 | if (r < 0) |
87 | return r; | 85 | return r; |
88 | 86 | ||
89 | @@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const char *controller) { | 87 | @@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const cha |
90 | if (r < 0) | 88 | if (r < 0) |
91 | return r; | 89 | return r; |
92 | 90 | ||
@@ -95,7 +93,7 @@ index d2be79622f..e65fecb68d 100644 | |||
95 | if (r < 0) | 93 | if (r < 0) |
96 | return r; | 94 | return r; |
97 | 95 | ||
98 | @@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri | 96 | @@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *control |
99 | if (r < 0) | 97 | if (r < 0) |
100 | return r; | 98 | return r; |
101 | 99 | ||
@@ -104,11 +102,9 @@ index d2be79622f..e65fecb68d 100644 | |||
104 | } | 102 | } |
105 | 103 | ||
106 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { | 104 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { |
107 | diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c | ||
108 | index 2101f617ad..63817bae17 100644 | ||
109 | --- a/src/basic/namespace-util.c | 105 | --- a/src/basic/namespace-util.c |
110 | +++ b/src/basic/namespace-util.c | 106 | +++ b/src/basic/namespace-util.c |
111 | @@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) { | 107 | @@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, |
112 | freeze(); | 108 | freeze(); |
113 | 109 | ||
114 | xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); | 110 | xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); |
@@ -123,11 +119,9 @@ index 2101f617ad..63817bae17 100644 | |||
123 | if (r < 0) | 119 | if (r < 0) |
124 | return log_error_errno(r, "Failed to write GID map: %m"); | 120 | return log_error_errno(r, "Failed to write GID map: %m"); |
125 | 121 | ||
126 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | ||
127 | index 6cb0ddf575..247cf9e1d1 100644 | ||
128 | --- a/src/basic/procfs-util.c | 122 | --- a/src/basic/procfs-util.c |
129 | +++ b/src/basic/procfs-util.c | 123 | +++ b/src/basic/procfs-util.c |
130 | @@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limit) { | 124 | @@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limi |
131 | * decrease it, as threads-max is the much more relevant sysctl. */ | 125 | * decrease it, as threads-max is the much more relevant sysctl. */ |
132 | if (limit > pid_max-1) { | 126 | if (limit > pid_max-1) { |
133 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ | 127 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ |
@@ -143,11 +137,9 @@ index 6cb0ddf575..247cf9e1d1 100644 | |||
143 | if (r < 0) { | 137 | if (r < 0) { |
144 | uint64_t threads_max; | 138 | uint64_t threads_max; |
145 | 139 | ||
146 | diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c | ||
147 | index b66a6622ae..8d1c93008a 100644 | ||
148 | --- a/src/basic/sysctl-util.c | 140 | --- a/src/basic/sysctl-util.c |
149 | +++ b/src/basic/sysctl-util.c | 141 | +++ b/src/basic/sysctl-util.c |
150 | @@ -58,7 +58,7 @@ int sysctl_write(const char *property, const char *value) { | 142 | @@ -58,7 +58,7 @@ int sysctl_write(const char *property, c |
151 | 143 | ||
152 | log_debug("Setting '%s' to '%s'", p, value); | 144 | log_debug("Setting '%s' to '%s'", p, value); |
153 | 145 | ||
@@ -156,8 +148,6 @@ index b66a6622ae..8d1c93008a 100644 | |||
156 | } | 148 | } |
157 | 149 | ||
158 | int sysctl_writef(const char *property, const char *format, ...) { | 150 | int sysctl_writef(const char *property, const char *format, ...) { |
159 | diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c | ||
160 | index d21f3f79ff..258607cc7e 100644 | ||
161 | --- a/src/binfmt/binfmt.c | 151 | --- a/src/binfmt/binfmt.c |
162 | +++ b/src/binfmt/binfmt.c | 152 | +++ b/src/binfmt/binfmt.c |
163 | @@ -30,7 +30,7 @@ static bool arg_unregister = false; | 153 | @@ -30,7 +30,7 @@ static bool arg_unregister = false; |
@@ -169,7 +159,7 @@ index d21f3f79ff..258607cc7e 100644 | |||
169 | } | 159 | } |
170 | 160 | ||
171 | static int apply_rule(const char *filename, unsigned line, const char *rule) { | 161 | static int apply_rule(const char *filename, unsigned line, const char *rule) { |
172 | @@ -58,7 +58,7 @@ static int apply_rule(const char *filename, unsigned line, const char *rule) { | 162 | @@ -58,7 +58,7 @@ static int apply_rule(const char *filena |
173 | if (r >= 0) | 163 | if (r >= 0) |
174 | log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); | 164 | log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); |
175 | 165 | ||
@@ -187,11 +177,9 @@ index d21f3f79ff..258607cc7e 100644 | |||
187 | if (r < 0) | 177 | if (r < 0) |
188 | log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); | 178 | log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); |
189 | else | 179 | else |
190 | diff --git a/src/core/cgroup.c b/src/core/cgroup.c | ||
191 | index 61ac4df1a6..ea18970196 100644 | ||
192 | --- a/src/core/cgroup.c | 180 | --- a/src/core/cgroup.c |
193 | +++ b/src/core/cgroup.c | 181 | +++ b/src/core/cgroup.c |
194 | @@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) { | 182 | @@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u, |
195 | u->freezer_state = FREEZER_THAWING; | 183 | u->freezer_state = FREEZER_THAWING; |
196 | } | 184 | } |
197 | 185 | ||
@@ -200,11 +188,9 @@ index 61ac4df1a6..ea18970196 100644 | |||
200 | if (r < 0) | 188 | if (r < 0) |
201 | return r; | 189 | return r; |
202 | 190 | ||
203 | diff --git a/src/core/main.c b/src/core/main.c | ||
204 | index 3f71cc0947..0e5aec3e9e 100644 | ||
205 | --- a/src/core/main.c | 191 | --- a/src/core/main.c |
206 | +++ b/src/core/main.c | 192 | +++ b/src/core/main.c |
207 | @@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { | 193 | @@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool |
208 | if (getpid_cached() != 1) | 194 | if (getpid_cached() != 1) |
209 | return; | 195 | return; |
210 | 196 | ||
@@ -213,11 +199,9 @@ index 3f71cc0947..0e5aec3e9e 100644 | |||
213 | if (r < 0) | 199 | if (r < 0) |
214 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", | 200 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", |
215 | arg_early_core_pattern); | 201 | arg_early_core_pattern); |
216 | diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c | ||
217 | index 7ea902b6f9..1aef2988d0 100644 | ||
218 | --- a/src/core/smack-setup.c | 202 | --- a/src/core/smack-setup.c |
219 | +++ b/src/core/smack-setup.c | 203 | +++ b/src/core/smack-setup.c |
220 | @@ -321,17 +321,17 @@ int mac_smack_setup(bool *loaded_policy) { | 204 | @@ -321,17 +321,17 @@ int mac_smack_setup(bool *loaded_policy) |
221 | } | 205 | } |
222 | 206 | ||
223 | #if HAVE_SMACK_RUN_LABEL | 207 | #if HAVE_SMACK_RUN_LABEL |
@@ -239,8 +223,6 @@ index 7ea902b6f9..1aef2988d0 100644 | |||
239 | if (r < 0) | 223 | if (r < 0) |
240 | log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); | 224 | log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); |
241 | #endif | 225 | #endif |
242 | diff --git a/src/home/homework.c b/src/home/homework.c | ||
243 | index 066483e342..5f92dd7064 100644 | ||
244 | --- a/src/home/homework.c | 226 | --- a/src/home/homework.c |
245 | +++ b/src/home/homework.c | 227 | +++ b/src/home/homework.c |
246 | @@ -278,7 +278,7 @@ static void drop_caches_now(void) { | 228 | @@ -278,7 +278,7 @@ static void drop_caches_now(void) { |
@@ -252,11 +234,9 @@ index 066483e342..5f92dd7064 100644 | |||
252 | if (r < 0) | 234 | if (r < 0) |
253 | log_warning_errno(r, "Failed to drop caches, ignoring: %m"); | 235 | log_warning_errno(r, "Failed to drop caches, ignoring: %m"); |
254 | else | 236 | else |
255 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c | ||
256 | index 2fbc619a34..09d9591e37 100644 | ||
257 | --- a/src/libsystemd/sd-device/sd-device.c | 237 | --- a/src/libsystemd/sd-device/sd-device.c |
258 | +++ b/src/libsystemd/sd-device/sd-device.c | 238 | +++ b/src/libsystemd/sd-device/sd-device.c |
259 | @@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, | 239 | @@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value |
260 | if (!value) | 240 | if (!value) |
261 | return -ENOMEM; | 241 | return -ENOMEM; |
262 | 242 | ||
@@ -265,11 +245,9 @@ index 2fbc619a34..09d9591e37 100644 | |||
265 | if (r < 0) { | 245 | if (r < 0) { |
266 | /* On failure, clear cache entry, as we do not know how it fails. */ | 246 | /* On failure, clear cache entry, as we do not know how it fails. */ |
267 | device_remove_cached_sysattr_value(device, sysattr); | 247 | device_remove_cached_sysattr_value(device, sysattr); |
268 | diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c | ||
269 | index a5002437c6..b12e6cd9c9 100644 | ||
270 | --- a/src/nspawn/nspawn-cgroup.c | 248 | --- a/src/nspawn/nspawn-cgroup.c |
271 | +++ b/src/nspawn/nspawn-cgroup.c | 249 | +++ b/src/nspawn/nspawn-cgroup.c |
272 | @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { | 250 | @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified |
273 | fn = strjoina(tree, cgroup, "/cgroup.procs"); | 251 | fn = strjoina(tree, cgroup, "/cgroup.procs"); |
274 | 252 | ||
275 | sprintf(pid_string, PID_FMT, pid); | 253 | sprintf(pid_string, PID_FMT, pid); |
@@ -278,11 +256,9 @@ index a5002437c6..b12e6cd9c9 100644 | |||
278 | if (r < 0) { | 256 | if (r < 0) { |
279 | log_error_errno(r, "Failed to move process: %m"); | 257 | log_error_errno(r, "Failed to move process: %m"); |
280 | goto finish; | 258 | goto finish; |
281 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | ||
282 | index 6ab604d3dc..bbec6b686c 100644 | ||
283 | --- a/src/nspawn/nspawn.c | 259 | --- a/src/nspawn/nspawn.c |
284 | +++ b/src/nspawn/nspawn.c | 260 | +++ b/src/nspawn/nspawn.c |
285 | @@ -2688,7 +2688,7 @@ static int reset_audit_loginuid(void) { | 261 | @@ -2690,7 +2690,7 @@ static int reset_audit_loginuid(void) { |
286 | if (streq(p, "4294967295")) | 262 | if (streq(p, "4294967295")) |
287 | return 0; | 263 | return 0; |
288 | 264 | ||
@@ -291,7 +267,7 @@ index 6ab604d3dc..bbec6b686c 100644 | |||
291 | if (r < 0) { | 267 | if (r < 0) { |
292 | log_error_errno(r, | 268 | log_error_errno(r, |
293 | "Failed to reset audit login UID. This probably means that your kernel is too\n" | 269 | "Failed to reset audit login UID. This probably means that your kernel is too\n" |
294 | @@ -4141,7 +4141,7 @@ static int setup_uid_map( | 270 | @@ -4143,7 +4143,7 @@ static int setup_uid_map( |
295 | return log_oom(); | 271 | return log_oom(); |
296 | 272 | ||
297 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); | 273 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
@@ -300,7 +276,7 @@ index 6ab604d3dc..bbec6b686c 100644 | |||
300 | if (r < 0) | 276 | if (r < 0) |
301 | return log_error_errno(r, "Failed to write UID map: %m"); | 277 | return log_error_errno(r, "Failed to write UID map: %m"); |
302 | 278 | ||
303 | @@ -4151,7 +4151,7 @@ static int setup_uid_map( | 279 | @@ -4153,7 +4153,7 @@ static int setup_uid_map( |
304 | return log_oom(); | 280 | return log_oom(); |
305 | 281 | ||
306 | xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); | 282 | xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); |
@@ -309,8 +285,6 @@ index 6ab604d3dc..bbec6b686c 100644 | |||
309 | if (r < 0) | 285 | if (r < 0) |
310 | return log_error_errno(r, "Failed to write GID map: %m"); | 286 | return log_error_errno(r, "Failed to write GID map: %m"); |
311 | 287 | ||
312 | diff --git a/src/shared/binfmt-util.c b/src/shared/binfmt-util.c | ||
313 | index a26175474b..1413a9c72c 100644 | ||
314 | --- a/src/shared/binfmt-util.c | 288 | --- a/src/shared/binfmt-util.c |
315 | +++ b/src/shared/binfmt-util.c | 289 | +++ b/src/shared/binfmt-util.c |
316 | @@ -46,7 +46,7 @@ int disable_binfmt(void) { | 290 | @@ -46,7 +46,7 @@ int disable_binfmt(void) { |
@@ -322,11 +296,9 @@ index a26175474b..1413a9c72c 100644 | |||
322 | if (r < 0) | 296 | if (r < 0) |
323 | return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); | 297 | return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); |
324 | 298 | ||
325 | diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c | ||
326 | index 934a16eaf3..c921ced861 100644 | ||
327 | --- a/src/shared/cgroup-setup.c | 299 | --- a/src/shared/cgroup-setup.c |
328 | +++ b/src/shared/cgroup-setup.c | 300 | +++ b/src/shared/cgroup-setup.c |
329 | @@ -351,7 +351,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { | 301 | @@ -351,7 +351,7 @@ int cg_attach(const char *controller, co |
330 | 302 | ||
331 | xsprintf(c, PID_FMT "\n", pid); | 303 | xsprintf(c, PID_FMT "\n", pid); |
332 | 304 | ||
@@ -344,11 +316,9 @@ index 934a16eaf3..c921ced861 100644 | |||
344 | if (r < 0) { | 316 | if (r < 0) { |
345 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", | 317 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", |
346 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); | 318 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); |
347 | diff --git a/src/shared/coredump-util.c b/src/shared/coredump-util.c | ||
348 | index 805503f366..01a7ccb291 100644 | ||
349 | --- a/src/shared/coredump-util.c | 319 | --- a/src/shared/coredump-util.c |
350 | +++ b/src/shared/coredump-util.c | 320 | +++ b/src/shared/coredump-util.c |
351 | @@ -163,7 +163,7 @@ int set_coredump_filter(uint64_t value) { | 321 | @@ -163,7 +163,7 @@ int set_coredump_filter(uint64_t value) |
352 | xsprintf(t, "0x%"PRIx64, value); | 322 | xsprintf(t, "0x%"PRIx64, value); |
353 | 323 | ||
354 | return write_string_file("/proc/self/coredump_filter", t, | 324 | return write_string_file("/proc/self/coredump_filter", t, |
@@ -366,11 +336,9 @@ index 805503f366..01a7ccb291 100644 | |||
366 | if (r < 0) | 336 | if (r < 0) |
367 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); | 337 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); |
368 | } | 338 | } |
369 | diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c | ||
370 | index 3eb13d48f6..d09b901be1 100644 | ||
371 | --- a/src/shared/hibernate-util.c | 339 | --- a/src/shared/hibernate-util.c |
372 | +++ b/src/shared/hibernate-util.c | 340 | +++ b/src/shared/hibernate-util.c |
373 | @@ -481,7 +481,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { | 341 | @@ -501,7 +501,7 @@ int write_resume_config(dev_t devno, uin |
374 | 342 | ||
375 | /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so | 343 | /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so |
376 | * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ | 344 | * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ |
@@ -379,7 +347,7 @@ index 3eb13d48f6..d09b901be1 100644 | |||
379 | if (r == -ENOENT) { | 347 | if (r == -ENOENT) { |
380 | if (offset != 0) | 348 | if (offset != 0) |
381 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), | 349 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), |
382 | @@ -497,7 +497,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { | 350 | @@ -517,7 +517,7 @@ int write_resume_config(dev_t devno, uin |
383 | log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", | 351 | log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", |
384 | offset_str, device); | 352 | offset_str, device); |
385 | 353 | ||
@@ -388,11 +356,9 @@ index 3eb13d48f6..d09b901be1 100644 | |||
388 | if (r < 0) | 356 | if (r < 0) |
389 | return log_error_errno(r, | 357 | return log_error_errno(r, |
390 | "Failed to write device '%s' (%s) to /sys/power/resume: %m", | 358 | "Failed to write device '%s' (%s) to /sys/power/resume: %m", |
391 | diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c | ||
392 | index 1f88e724d0..feb18b320a 100644 | ||
393 | --- a/src/shared/smack-util.c | 359 | --- a/src/shared/smack-util.c |
394 | +++ b/src/shared/smack-util.c | 360 | +++ b/src/shared/smack-util.c |
395 | @@ -113,7 +113,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { | 361 | @@ -113,7 +113,7 @@ int mac_smack_apply_pid(pid_t pid, const |
396 | return 0; | 362 | return 0; |
397 | 363 | ||
398 | p = procfs_file_alloca(pid, "attr/current"); | 364 | p = procfs_file_alloca(pid, "attr/current"); |
@@ -401,24 +367,20 @@ index 1f88e724d0..feb18b320a 100644 | |||
401 | if (r < 0) | 367 | if (r < 0) |
402 | return r; | 368 | return r; |
403 | 369 | ||
404 | diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c | ||
405 | index 4c1a968718..6faf6806a5 100644 | ||
406 | --- a/src/shared/watchdog.c | 370 | --- a/src/shared/watchdog.c |
407 | +++ b/src/shared/watchdog.c | 371 | +++ b/src/shared/watchdog.c |
408 | @@ -93,7 +93,7 @@ static int set_pretimeout_governor(const char *governor) { | 372 | @@ -93,7 +93,7 @@ static int set_pretimeout_governor(const |
409 | 373 | ||
410 | r = write_string_file(sys_fn, | 374 | r = write_string_file(sys_fn, |
411 | governor, | 375 | governor, |
412 | - WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | 376 | - WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); |
413 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | 377 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); |
414 | if (r < 0) | 378 | if (r < 0) |
415 | return log_error_errno(r, "Failed to set pretimeout_governor to '%s': %m", governor); | 379 | return log_error_errno(r, "Failed to set watchdog pretimeout_governor to '%s': %m", governor); |
416 | 380 | ||
417 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c | ||
418 | index 21af3e9e52..6d4b84b5d5 100644 | ||
419 | --- a/src/sleep/sleep.c | 381 | --- a/src/sleep/sleep.c |
420 | +++ b/src/sleep/sleep.c | 382 | +++ b/src/sleep/sleep.c |
421 | @@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) { | 383 | @@ -137,7 +137,7 @@ static int write_state(int fd, char * co |
422 | if (k < 0) | 384 | if (k < 0) |
423 | return RET_GATHER(r, k); | 385 | return RET_GATHER(r, k); |
424 | 386 | ||
@@ -427,7 +389,7 @@ index 21af3e9e52..6d4b84b5d5 100644 | |||
427 | if (k >= 0) { | 389 | if (k >= 0) { |
428 | log_debug("Using sleep state '%s'.", *state); | 390 | log_debug("Using sleep state '%s'.", *state); |
429 | return 0; | 391 | return 0; |
430 | @@ -155,7 +155,7 @@ static int write_mode(char * const *modes) { | 392 | @@ -155,7 +155,7 @@ static int write_mode(char * const *mode |
431 | STRV_FOREACH(mode, modes) { | 393 | STRV_FOREACH(mode, modes) { |
432 | int k; | 394 | int k; |
433 | 395 | ||
@@ -436,11 +398,9 @@ index 21af3e9e52..6d4b84b5d5 100644 | |||
436 | if (k >= 0) { | 398 | if (k >= 0) { |
437 | log_debug("Using sleep disk mode '%s'.", *mode); | 399 | log_debug("Using sleep disk mode '%s'.", *mode); |
438 | return 0; | 400 | return 0; |
439 | diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c | ||
440 | index ae63baaf79..82eeca479a 100644 | ||
441 | --- a/src/storagetm/storagetm.c | 401 | --- a/src/storagetm/storagetm.c |
442 | +++ b/src/storagetm/storagetm.c | 402 | +++ b/src/storagetm/storagetm.c |
443 | @@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSubsystem *s) { | 403 | @@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSub |
444 | if (!enable_fn) | 404 | if (!enable_fn) |
445 | return log_oom(); | 405 | return log_oom(); |
446 | 406 | ||
@@ -449,7 +409,7 @@ index ae63baaf79..82eeca479a 100644 | |||
449 | if (r < 0) | 409 | if (r < 0) |
450 | log_warning_errno(r, "Failed to disable namespace '%s' of NVME subsystem '%s', ignoring: %m", e->d_name, s->name); | 410 | log_warning_errno(r, "Failed to disable namespace '%s' of NVME subsystem '%s', ignoring: %m", e->d_name, s->name); |
451 | 411 | ||
452 | @@ -254,7 +254,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { | 412 | @@ -254,7 +254,7 @@ static int nvme_subsystem_write_metadata |
453 | _cleanup_free_ char *truncated = strndup(w, 40); /* kernel refuses more than 40 chars (as per nvme spec) */ | 413 | _cleanup_free_ char *truncated = strndup(w, 40); /* kernel refuses more than 40 chars (as per nvme spec) */ |
454 | 414 | ||
455 | /* The default string stored in 'attr_model' is "Linux" btw. */ | 415 | /* The default string stored in 'attr_model' is "Linux" btw. */ |
@@ -458,7 +418,7 @@ index ae63baaf79..82eeca479a 100644 | |||
458 | if (r < 0) | 418 | if (r < 0) |
459 | log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", w); | 419 | log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", w); |
460 | } | 420 | } |
461 | @@ -268,7 +268,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { | 421 | @@ -268,7 +268,7 @@ static int nvme_subsystem_write_metadata |
462 | return log_oom(); | 422 | return log_oom(); |
463 | 423 | ||
464 | /* The default string stored in 'attr_firmware' is `uname -r` btw, but truncated to 8 chars. */ | 424 | /* The default string stored in 'attr_firmware' is `uname -r` btw, but truncated to 8 chars. */ |
@@ -467,7 +427,7 @@ index ae63baaf79..82eeca479a 100644 | |||
467 | if (r < 0) | 427 | if (r < 0) |
468 | log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", truncated); | 428 | log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", truncated); |
469 | } | 429 | } |
470 | @@ -295,7 +295,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { | 430 | @@ -295,7 +295,7 @@ static int nvme_subsystem_write_metadata |
471 | if (!truncated) | 431 | if (!truncated) |
472 | return log_oom(); | 432 | return log_oom(); |
473 | 433 | ||
@@ -476,7 +436,7 @@ index ae63baaf79..82eeca479a 100644 | |||
476 | if (r < 0) | 436 | if (r < 0) |
477 | log_warning_errno(r, "Failed to set serial of subsystem to '%s', ignoring: %m", truncated); | 437 | log_warning_errno(r, "Failed to set serial of subsystem to '%s', ignoring: %m", truncated); |
478 | } | 438 | } |
479 | @@ -345,7 +345,7 @@ static int nvme_namespace_write_metadata(int namespace_fd, sd_device *device, co | 439 | @@ -345,7 +345,7 @@ static int nvme_namespace_write_metadata |
480 | id = id128_digest(j, l); | 440 | id = id128_digest(j, l); |
481 | } | 441 | } |
482 | 442 | ||
@@ -485,7 +445,7 @@ index ae63baaf79..82eeca479a 100644 | |||
485 | if (r < 0) | 445 | if (r < 0) |
486 | log_warning_errno(r, "Failed to set uuid of namespace to '%s', ignoring: %m", SD_ID128_TO_UUID_STRING(id)); | 446 | log_warning_errno(r, "Failed to set uuid of namespace to '%s', ignoring: %m", SD_ID128_TO_UUID_STRING(id)); |
487 | 447 | ||
488 | @@ -408,7 +408,7 @@ static int nvme_subsystem_add(const char *node, int consumed_fd, sd_device *devi | 448 | @@ -408,7 +408,7 @@ static int nvme_subsystem_add(const char |
489 | if (subsystem_fd < 0) | 449 | if (subsystem_fd < 0) |
490 | return log_error_errno(subsystem_fd, "Failed to create NVME subsystem '%s': %m", j); | 450 | return log_error_errno(subsystem_fd, "Failed to create NVME subsystem '%s': %m", j); |
491 | 451 | ||
@@ -494,7 +454,7 @@ index ae63baaf79..82eeca479a 100644 | |||
494 | if (r < 0) | 454 | if (r < 0) |
495 | return log_error_errno(r, "Failed to set 'attr_allow_any_host' flag: %m"); | 455 | return log_error_errno(r, "Failed to set 'attr_allow_any_host' flag: %m"); |
496 | 456 | ||
497 | @@ -423,11 +423,11 @@ static int nvme_subsystem_add(const char *node, int consumed_fd, sd_device *devi | 457 | @@ -423,11 +423,11 @@ static int nvme_subsystem_add(const char |
498 | 458 | ||
499 | /* We use /proc/$PID/fd/$FD rather than /proc/self/fd/$FD, because this string is visible to others | 459 | /* We use /proc/$PID/fd/$FD rather than /proc/self/fd/$FD, because this string is visible to others |
500 | * via configfs, and by including the PID it's clear to who the stuff belongs. */ | 460 | * via configfs, and by including the PID it's clear to who the stuff belongs. */ |
@@ -532,11 +492,9 @@ index ae63baaf79..82eeca479a 100644 | |||
532 | if (r < 0) | 492 | if (r < 0) |
533 | return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr); | 493 | return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr); |
534 | 494 | ||
535 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | ||
536 | index febe345b4c..a90b610ba1 100644 | ||
537 | --- a/src/udev/udev-rules.c | 495 | --- a/src/udev/udev-rules.c |
538 | +++ b/src/udev/udev-rules.c | 496 | +++ b/src/udev/udev-rules.c |
539 | @@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_event( | 497 | @@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_even |
540 | log_event_debug(dev, token, "ATTR '%s' writing '%s'", buf, value); | 498 | log_event_debug(dev, token, "ATTR '%s' writing '%s'", buf, value); |
541 | r = write_string_file(buf, value, | 499 | r = write_string_file(buf, value, |
542 | WRITE_STRING_FILE_VERIFY_ON_FAILURE | | 500 | WRITE_STRING_FILE_VERIFY_ON_FAILURE | |
@@ -544,11 +502,9 @@ index febe345b4c..a90b610ba1 100644 | |||
544 | WRITE_STRING_FILE_AVOID_NEWLINE | | 502 | WRITE_STRING_FILE_AVOID_NEWLINE | |
545 | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | 503 | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); |
546 | if (r < 0) | 504 | if (r < 0) |
547 | diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c | ||
548 | index 4d82c65f0a..3a3d861b83 100644 | ||
549 | --- a/src/vconsole/vconsole-setup.c | 505 | --- a/src/vconsole/vconsole-setup.c |
550 | +++ b/src/vconsole/vconsole-setup.c | 506 | +++ b/src/vconsole/vconsole-setup.c |
551 | @@ -261,7 +261,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { | 507 | @@ -261,7 +261,7 @@ static int toggle_utf8_vc(const char *na |
552 | static int toggle_utf8_sysfs(bool utf8) { | 508 | static int toggle_utf8_sysfs(bool utf8) { |
553 | int r; | 509 | int r; |
554 | 510 | ||
@@ -557,6 +513,3 @@ index 4d82c65f0a..3a3d861b83 100644 | |||
557 | if (r < 0) | 513 | if (r < 0) |
558 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); | 514 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); |
559 | 515 | ||
560 | -- | ||
561 | 2.34.1 | ||
562 | |||
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch index 24f3bf74a..56755ac55 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd/0022-avoid-missing-LOCK_EX-declaration.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From fd52f1764647e03a35e8f0ed0ef952049073ccbd Mon Sep 17 00:00:00 2001 | 1 | From 97d3ed7834bd86615ba4acdbef984c677b7e7791 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Tue, 2 Jan 2024 11:03:27 +0800 | 3 | Date: Tue, 2 Jan 2024 11:03:27 +0800 |
4 | Subject: [PATCH 22/22] avoid missing LOCK_EX declaration | 4 | Subject: [PATCH] avoid missing LOCK_EX declaration |
5 | 5 | ||
6 | This only happens on MUSL. Include sys/file.h to avoid compilation | 6 | This only happens on MUSL. Include sys/file.h to avoid compilation |
7 | error about missing LOCK_EX declaration. | 7 | error about missing LOCK_EX declaration. |
@@ -14,8 +14,6 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
14 | src/shared/dev-setup.h | 1 + | 14 | src/shared/dev-setup.h | 1 + |
15 | 2 files changed, 2 insertions(+) | 15 | 2 files changed, 2 insertions(+) |
16 | 16 | ||
17 | diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c | ||
18 | index 70d963e269..7084811439 100644 | ||
19 | --- a/src/core/exec-invoke.c | 17 | --- a/src/core/exec-invoke.c |
20 | +++ b/src/core/exec-invoke.c | 18 | +++ b/src/core/exec-invoke.c |
21 | @@ -4,6 +4,7 @@ | 19 | @@ -4,6 +4,7 @@ |
@@ -26,8 +24,6 @@ index 70d963e269..7084811439 100644 | |||
26 | 24 | ||
27 | #if HAVE_PAM | 25 | #if HAVE_PAM |
28 | #include <security/pam_appl.h> | 26 | #include <security/pam_appl.h> |
29 | diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h | ||
30 | index 5339bc4e5e..0697495f23 100644 | ||
31 | --- a/src/shared/dev-setup.h | 27 | --- a/src/shared/dev-setup.h |
32 | +++ b/src/shared/dev-setup.h | 28 | +++ b/src/shared/dev-setup.h |
33 | @@ -2,6 +2,7 @@ | 29 | @@ -2,6 +2,7 @@ |
@@ -38,6 +34,3 @@ index 5339bc4e5e..0697495f23 100644 | |||
38 | 34 | ||
39 | int lock_dev_console(void); | 35 | int lock_dev_console(void); |
40 | 36 | ||
41 | -- | ||
42 | 2.34.1 | ||
43 | |||
diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.4.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb index 3b44e0237..ceb422325 100644 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.4.bb +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_255.6.bb | |||
@@ -10,7 +10,7 @@ inherit meson pkgconfig | |||
10 | 10 | ||
11 | DEPENDS += "gperf-native gettext-native util-linux libcap util-linux python3-jinja2-native" | 11 | DEPENDS += "gperf-native gettext-native util-linux libcap util-linux python3-jinja2-native" |
12 | 12 | ||
13 | SRCREV = "387a14a7b67b8b76adaed4175e14bb7e39b2f738" | 13 | SRCREV = "5810c25792d4268282dd3892af1a253b690423c9" |
14 | SRCBRANCH = "v255-stable" | 14 | SRCBRANCH = "v255-stable" |
15 | SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ | 15 | SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ |
16 | file://static-libsystemd-pkgconfig.patch \ | 16 | file://static-libsystemd-pkgconfig.patch \ |
diff --git a/meta-oe/recipes-core/usleep/files/usleep.c b/meta-oe/recipes-core/usleep/files/usleep.c index a5e7d9d71..dfa52ec19 100644 --- a/meta-oe/recipes-core/usleep/files/usleep.c +++ b/meta-oe/recipes-core/usleep/files/usleep.c | |||
@@ -34,7 +34,7 @@ int main(int argc, char **argv) { | |||
34 | int showVersion = 0; | 34 | int showVersion = 0; |
35 | int showOot = 0; | 35 | int showOot = 0; |
36 | int rc; | 36 | int rc; |
37 | char * countStr = NULL; | 37 | const char * countStr = NULL; |
38 | struct poptOption options[] = { | 38 | struct poptOption options[] = { |
39 | { "version", 'v', POPT_ARG_NONE, &showVersion, 0, | 39 | { "version", 'v', POPT_ARG_NONE, &showVersion, 0, |
40 | "Display the version of this program, and exit" }, | 40 | "Display the version of this program, and exit" }, |
@@ -44,7 +44,7 @@ int main(int argc, char **argv) { | |||
44 | { 0, 0, 0, 0, 0 } | 44 | { 0, 0, 0, 0, 0 } |
45 | }; | 45 | }; |
46 | 46 | ||
47 | optCon = poptGetContext("usleep", argc, argv, options,0); | 47 | optCon = poptGetContext("usleep", argc, (const char **)argv, options,0); |
48 | /*poptReadDefaultConfig(optCon, 1);*/ | 48 | /*poptReadDefaultConfig(optCon, 1);*/ |
49 | poptSetOtherOptionHelp(optCon, "[microseconds]"); | 49 | poptSetOtherOptionHelp(optCon, "[microseconds]"); |
50 | 50 | ||
diff --git a/meta-oe/recipes-core/usleep/usleep_1.2.bb b/meta-oe/recipes-core/usleep/usleep_1.2.bb index a529032aa..882ac2c2f 100644 --- a/meta-oe/recipes-core/usleep/usleep_1.2.bb +++ b/meta-oe/recipes-core/usleep/usleep_1.2.bb | |||
@@ -3,7 +3,8 @@ SECTION = "base" | |||
3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
5 | 5 | ||
6 | S = "${WORKDIR}" | 6 | S = "${WORKDIR}/sources" |
7 | UNPACKDIR = "${S}" | ||
7 | DEPENDS = "popt" | 8 | DEPENDS = "popt" |
8 | 9 | ||
9 | SRC_URI = "file://usleep.c \ | 10 | SRC_URI = "file://usleep.c \ |
@@ -19,8 +20,8 @@ do_install() { | |||
19 | install -d ${D}${base_bindir} | 20 | install -d ${D}${base_bindir} |
20 | install -d ${D}${mandir}/man1 | 21 | install -d ${D}${mandir}/man1 |
21 | 22 | ||
22 | install -m 0755 ${WORKDIR}/usleep ${D}${base_bindir} | 23 | install -m 0755 ${UNPACKDIR}/usleep ${D}${base_bindir} |
23 | install -m 0644 ${WORKDIR}/usleep.1 ${D}${mandir}/man1 | 24 | install -m 0644 ${UNPACKDIR}/usleep.1 ${D}${mandir}/man1 |
24 | } | 25 | } |
25 | 26 | ||
26 | inherit update-alternatives | 27 | inherit update-alternatives |
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc index 58d832562..3a5bee7ce 100644 --- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc +++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc | |||
@@ -3,6 +3,7 @@ | |||
3 | # from Cargo.lock | 3 | # from Cargo.lock |
4 | SRC_URI += " \ | 4 | SRC_URI += " \ |
5 | crate://crates.io/adler/1.0.2 \ | 5 | crate://crates.io/adler/1.0.2 \ |
6 | crate://crates.io/ahash/0.7.8 \ | ||
6 | crate://crates.io/aho-corasick/1.0.4 \ | 7 | crate://crates.io/aho-corasick/1.0.4 \ |
7 | crate://crates.io/android-tzdata/0.1.1 \ | 8 | crate://crates.io/android-tzdata/0.1.1 \ |
8 | crate://crates.io/android_system_properties/0.1.5 \ | 9 | crate://crates.io/android_system_properties/0.1.5 \ |
@@ -11,6 +12,7 @@ SRC_URI += " \ | |||
11 | crate://crates.io/anstyle-parse/0.2.0 \ | 12 | crate://crates.io/anstyle-parse/0.2.0 \ |
12 | crate://crates.io/anstyle-query/1.0.0 \ | 13 | crate://crates.io/anstyle-query/1.0.0 \ |
13 | crate://crates.io/anstyle-wincon/2.1.0 \ | 14 | crate://crates.io/anstyle-wincon/2.1.0 \ |
15 | crate://crates.io/arbitrary/1.3.2 \ | ||
14 | crate://crates.io/arrayref/0.3.6 \ | 16 | crate://crates.io/arrayref/0.3.6 \ |
15 | crate://crates.io/arrayvec/0.7.4 \ | 17 | crate://crates.io/arrayvec/0.7.4 \ |
16 | crate://crates.io/autocfg/1.1.0 \ | 18 | crate://crates.io/autocfg/1.1.0 \ |
@@ -19,18 +21,19 @@ SRC_URI += " \ | |||
19 | crate://crates.io/bindgen/0.63.0 \ | 21 | crate://crates.io/bindgen/0.63.0 \ |
20 | crate://crates.io/bitflags/1.3.2 \ | 22 | crate://crates.io/bitflags/1.3.2 \ |
21 | crate://crates.io/bitflags/2.4.2 \ | 23 | crate://crates.io/bitflags/2.4.2 \ |
24 | crate://crates.io/bitvec/1.0.1 \ | ||
22 | crate://crates.io/blake2b_simd/1.0.2 \ | 25 | crate://crates.io/blake2b_simd/1.0.2 \ |
23 | crate://crates.io/blake3/1.5.1 \ | 26 | crate://crates.io/blake3/1.5.1 \ |
24 | crate://crates.io/block-buffer/0.10.3 \ | 27 | crate://crates.io/block-buffer/0.10.3 \ |
25 | crate://crates.io/bstr/1.9.1 \ | 28 | crate://crates.io/bstr/1.9.1 \ |
26 | crate://crates.io/bumpalo/3.11.1 \ | 29 | crate://crates.io/bumpalo/3.11.1 \ |
27 | crate://crates.io/bytecount/0.6.7 \ | 30 | crate://crates.io/bytecount/0.6.8 \ |
28 | crate://crates.io/byteorder/1.5.0 \ | 31 | crate://crates.io/byteorder/1.5.0 \ |
29 | crate://crates.io/cc/1.0.79 \ | 32 | crate://crates.io/cc/1.0.79 \ |
30 | crate://crates.io/cexpr/0.6.0 \ | 33 | crate://crates.io/cexpr/0.6.0 \ |
31 | crate://crates.io/cfg-if/1.0.0 \ | 34 | crate://crates.io/cfg-if/1.0.0 \ |
32 | crate://crates.io/cfg_aliases/0.1.1 \ | 35 | crate://crates.io/cfg_aliases/0.1.1 \ |
33 | crate://crates.io/chrono/0.4.35 \ | 36 | crate://crates.io/chrono/0.4.38 \ |
34 | crate://crates.io/clang-sys/1.4.0 \ | 37 | crate://crates.io/clang-sys/1.4.0 \ |
35 | crate://crates.io/clap/4.4.2 \ | 38 | crate://crates.io/clap/4.4.2 \ |
36 | crate://crates.io/clap_builder/4.4.2 \ | 39 | crate://crates.io/clap_builder/4.4.2 \ |
@@ -43,7 +46,6 @@ SRC_URI += " \ | |||
43 | crate://crates.io/const-random/0.1.16 \ | 46 | crate://crates.io/const-random/0.1.16 \ |
44 | crate://crates.io/const-random-macro/0.1.16 \ | 47 | crate://crates.io/const-random-macro/0.1.16 \ |
45 | crate://crates.io/constant_time_eq/0.3.0 \ | 48 | crate://crates.io/constant_time_eq/0.3.0 \ |
46 | crate://crates.io/conv/0.3.3 \ | ||
47 | crate://crates.io/core-foundation-sys/0.8.3 \ | 49 | crate://crates.io/core-foundation-sys/0.8.3 \ |
48 | crate://crates.io/coz/0.1.3 \ | 50 | crate://crates.io/coz/0.1.3 \ |
49 | crate://crates.io/cpp/0.5.9 \ | 51 | crate://crates.io/cpp/0.5.9 \ |
@@ -51,20 +53,20 @@ SRC_URI += " \ | |||
51 | crate://crates.io/cpp_common/0.5.9 \ | 53 | crate://crates.io/cpp_common/0.5.9 \ |
52 | crate://crates.io/cpp_macros/0.5.9 \ | 54 | crate://crates.io/cpp_macros/0.5.9 \ |
53 | crate://crates.io/cpufeatures/0.2.5 \ | 55 | crate://crates.io/cpufeatures/0.2.5 \ |
54 | crate://crates.io/crc32fast/1.3.2 \ | 56 | crate://crates.io/crc32fast/1.4.0 \ |
55 | crate://crates.io/crossbeam-channel/0.5.10 \ | 57 | crate://crates.io/crossbeam-channel/0.5.10 \ |
56 | crate://crates.io/crossbeam-deque/0.8.4 \ | 58 | crate://crates.io/crossbeam-deque/0.8.4 \ |
57 | crate://crates.io/crossbeam-epoch/0.9.17 \ | 59 | crate://crates.io/crossbeam-epoch/0.9.17 \ |
58 | crate://crates.io/crossbeam-utils/0.8.18 \ | 60 | crate://crates.io/crossbeam-utils/0.8.19 \ |
59 | crate://crates.io/crossterm/0.27.0 \ | 61 | crate://crates.io/crossterm/0.27.0 \ |
60 | crate://crates.io/crossterm_winapi/0.9.1 \ | 62 | crate://crates.io/crossterm_winapi/0.9.1 \ |
61 | crate://crates.io/crunchy/0.2.2 \ | 63 | crate://crates.io/crunchy/0.2.2 \ |
62 | crate://crates.io/crypto-common/0.1.6 \ | 64 | crate://crates.io/crypto-common/0.1.6 \ |
63 | crate://crates.io/ctrlc/3.4.4 \ | 65 | crate://crates.io/ctrlc/3.4.4 \ |
64 | crate://crates.io/custom_derive/0.1.7 \ | ||
65 | crate://crates.io/data-encoding/2.5.0 \ | 66 | crate://crates.io/data-encoding/2.5.0 \ |
66 | crate://crates.io/data-encoding-macro/0.1.14 \ | 67 | crate://crates.io/data-encoding-macro/0.1.14 \ |
67 | crate://crates.io/data-encoding-macro-internal/0.1.12 \ | 68 | crate://crates.io/data-encoding-macro-internal/0.1.12 \ |
69 | crate://crates.io/derive_arbitrary/1.3.2 \ | ||
68 | crate://crates.io/diff/0.1.13 \ | 70 | crate://crates.io/diff/0.1.13 \ |
69 | crate://crates.io/digest/0.10.7 \ | 71 | crate://crates.io/digest/0.10.7 \ |
70 | crate://crates.io/dlv-list/0.5.0 \ | 72 | crate://crates.io/dlv-list/0.5.0 \ |
@@ -77,14 +79,16 @@ SRC_URI += " \ | |||
77 | crate://crates.io/exacl/0.12.0 \ | 79 | crate://crates.io/exacl/0.12.0 \ |
78 | crate://crates.io/fastrand/2.0.1 \ | 80 | crate://crates.io/fastrand/2.0.1 \ |
79 | crate://crates.io/file_diff/1.0.0 \ | 81 | crate://crates.io/file_diff/1.0.0 \ |
82 | crate://crates.io/filedescriptor/0.8.2 \ | ||
80 | crate://crates.io/filetime/0.2.23 \ | 83 | crate://crates.io/filetime/0.2.23 \ |
81 | crate://crates.io/flate2/1.0.24 \ | 84 | crate://crates.io/flate2/1.0.28 \ |
82 | crate://crates.io/fnv/1.0.7 \ | 85 | crate://crates.io/fnv/1.0.7 \ |
83 | crate://crates.io/fs_extra/1.3.0 \ | 86 | crate://crates.io/fs_extra/1.3.0 \ |
84 | crate://crates.io/fsevent-sys/4.1.0 \ | 87 | crate://crates.io/fsevent-sys/4.1.0 \ |
85 | crate://crates.io/fts-sys/0.2.4 \ | 88 | crate://crates.io/fts-sys/0.2.4 \ |
86 | crate://crates.io/fundu/2.0.0 \ | 89 | crate://crates.io/fundu/2.0.0 \ |
87 | crate://crates.io/fundu-core/0.3.0 \ | 90 | crate://crates.io/fundu-core/0.3.0 \ |
91 | crate://crates.io/funty/2.0.0 \ | ||
88 | crate://crates.io/futures/0.3.28 \ | 92 | crate://crates.io/futures/0.3.28 \ |
89 | crate://crates.io/futures-channel/0.3.28 \ | 93 | crate://crates.io/futures-channel/0.3.28 \ |
90 | crate://crates.io/futures-core/0.3.28 \ | 94 | crate://crates.io/futures-core/0.3.28 \ |
@@ -100,11 +104,12 @@ SRC_URI += " \ | |||
100 | crate://crates.io/getrandom/0.2.9 \ | 104 | crate://crates.io/getrandom/0.2.9 \ |
101 | crate://crates.io/glob/0.3.1 \ | 105 | crate://crates.io/glob/0.3.1 \ |
102 | crate://crates.io/half/2.4.0 \ | 106 | crate://crates.io/half/2.4.0 \ |
103 | crate://crates.io/hashbrown/0.13.2 \ | 107 | crate://crates.io/hashbrown/0.12.3 \ |
108 | crate://crates.io/hashbrown/0.14.3 \ | ||
104 | crate://crates.io/hermit-abi/0.3.2 \ | 109 | crate://crates.io/hermit-abi/0.3.2 \ |
105 | crate://crates.io/hex/0.4.3 \ | 110 | crate://crates.io/hex/0.4.3 \ |
106 | crate://crates.io/hex-literal/0.4.1 \ | 111 | crate://crates.io/hex-literal/0.4.1 \ |
107 | crate://crates.io/hostname/0.3.1 \ | 112 | crate://crates.io/hostname/0.4.0 \ |
108 | crate://crates.io/iana-time-zone/0.1.53 \ | 113 | crate://crates.io/iana-time-zone/0.1.53 \ |
109 | crate://crates.io/iana-time-zone-haiku/0.1.2 \ | 114 | crate://crates.io/iana-time-zone-haiku/0.1.2 \ |
110 | crate://crates.io/indicatif/0.17.3 \ | 115 | crate://crates.io/indicatif/0.17.3 \ |
@@ -126,13 +131,13 @@ SRC_URI += " \ | |||
126 | crate://crates.io/linux-raw-sys/0.4.12 \ | 131 | crate://crates.io/linux-raw-sys/0.4.12 \ |
127 | crate://crates.io/lock_api/0.4.9 \ | 132 | crate://crates.io/lock_api/0.4.9 \ |
128 | crate://crates.io/log/0.4.20 \ | 133 | crate://crates.io/log/0.4.20 \ |
134 | crate://crates.io/lru/0.7.8 \ | ||
129 | crate://crates.io/lscolors/0.16.0 \ | 135 | crate://crates.io/lscolors/0.16.0 \ |
130 | crate://crates.io/match_cfg/0.1.0 \ | ||
131 | crate://crates.io/md-5/0.10.6 \ | 136 | crate://crates.io/md-5/0.10.6 \ |
132 | crate://crates.io/memchr/2.7.1 \ | 137 | crate://crates.io/memchr/2.7.1 \ |
133 | crate://crates.io/memmap2/0.9.0 \ | 138 | crate://crates.io/memmap2/0.9.0 \ |
134 | crate://crates.io/minimal-lexical/0.2.1 \ | 139 | crate://crates.io/minimal-lexical/0.2.1 \ |
135 | crate://crates.io/miniz_oxide/0.5.4 \ | 140 | crate://crates.io/miniz_oxide/0.7.2 \ |
136 | crate://crates.io/mio/0.8.11 \ | 141 | crate://crates.io/mio/0.8.11 \ |
137 | crate://crates.io/nix/0.28.0 \ | 142 | crate://crates.io/nix/0.28.0 \ |
138 | crate://crates.io/nom/7.1.3 \ | 143 | crate://crates.io/nom/7.1.3 \ |
@@ -140,13 +145,15 @@ SRC_URI += " \ | |||
140 | crate://crates.io/nu-ansi-term/0.49.0 \ | 145 | crate://crates.io/nu-ansi-term/0.49.0 \ |
141 | crate://crates.io/num-bigint/0.4.4 \ | 146 | crate://crates.io/num-bigint/0.4.4 \ |
142 | crate://crates.io/num-integer/0.1.45 \ | 147 | crate://crates.io/num-integer/0.1.45 \ |
148 | crate://crates.io/num-modular/0.5.1 \ | ||
149 | crate://crates.io/num-prime/0.4.3 \ | ||
143 | crate://crates.io/num-traits/0.2.18 \ | 150 | crate://crates.io/num-traits/0.2.18 \ |
144 | crate://crates.io/num_threads/0.1.6 \ | 151 | crate://crates.io/num_threads/0.1.6 \ |
145 | crate://crates.io/number_prefix/0.4.0 \ | 152 | crate://crates.io/number_prefix/0.4.0 \ |
146 | crate://crates.io/once_cell/1.19.0 \ | 153 | crate://crates.io/once_cell/1.19.0 \ |
147 | crate://crates.io/onig/6.4.0 \ | 154 | crate://crates.io/onig/6.4.0 \ |
148 | crate://crates.io/onig_sys/69.8.1 \ | 155 | crate://crates.io/onig_sys/69.8.1 \ |
149 | crate://crates.io/ordered-multimap/0.6.0 \ | 156 | crate://crates.io/ordered-multimap/0.7.3 \ |
150 | crate://crates.io/os_display/0.1.3 \ | 157 | crate://crates.io/os_display/0.1.3 \ |
151 | crate://crates.io/parking_lot/0.12.1 \ | 158 | crate://crates.io/parking_lot/0.12.1 \ |
152 | crate://crates.io/parking_lot_core/0.9.9 \ | 159 | crate://crates.io/parking_lot_core/0.9.9 \ |
@@ -159,7 +166,7 @@ SRC_URI += " \ | |||
159 | crate://crates.io/pin-project-lite/0.2.9 \ | 166 | crate://crates.io/pin-project-lite/0.2.9 \ |
160 | crate://crates.io/pin-utils/0.1.0 \ | 167 | crate://crates.io/pin-utils/0.1.0 \ |
161 | crate://crates.io/pkg-config/0.3.26 \ | 168 | crate://crates.io/pkg-config/0.3.26 \ |
162 | crate://crates.io/platform-info/2.0.2 \ | 169 | crate://crates.io/platform-info/2.0.3 \ |
163 | crate://crates.io/portable-atomic/0.3.15 \ | 170 | crate://crates.io/portable-atomic/0.3.15 \ |
164 | crate://crates.io/ppv-lite86/0.2.17 \ | 171 | crate://crates.io/ppv-lite86/0.2.17 \ |
165 | crate://crates.io/pretty_assertions/1.4.0 \ | 172 | crate://crates.io/pretty_assertions/1.4.0 \ |
@@ -169,11 +176,12 @@ SRC_URI += " \ | |||
169 | crate://crates.io/quick-error/2.0.1 \ | 176 | crate://crates.io/quick-error/2.0.1 \ |
170 | crate://crates.io/quickcheck/1.0.3 \ | 177 | crate://crates.io/quickcheck/1.0.3 \ |
171 | crate://crates.io/quote/1.0.29 \ | 178 | crate://crates.io/quote/1.0.29 \ |
179 | crate://crates.io/radium/0.7.0 \ | ||
172 | crate://crates.io/rand/0.8.5 \ | 180 | crate://crates.io/rand/0.8.5 \ |
173 | crate://crates.io/rand_chacha/0.3.1 \ | 181 | crate://crates.io/rand_chacha/0.3.1 \ |
174 | crate://crates.io/rand_core/0.6.4 \ | 182 | crate://crates.io/rand_core/0.6.4 \ |
175 | crate://crates.io/rand_pcg/0.3.1 \ | 183 | crate://crates.io/rand_pcg/0.3.1 \ |
176 | crate://crates.io/rayon/1.9.0 \ | 184 | crate://crates.io/rayon/1.10.0 \ |
177 | crate://crates.io/rayon-core/1.12.1 \ | 185 | crate://crates.io/rayon-core/1.12.1 \ |
178 | crate://crates.io/redox_syscall/0.4.1 \ | 186 | crate://crates.io/redox_syscall/0.4.1 \ |
179 | crate://crates.io/redox_syscall/0.5.0 \ | 187 | crate://crates.io/redox_syscall/0.5.0 \ |
@@ -184,9 +192,9 @@ SRC_URI += " \ | |||
184 | crate://crates.io/relative-path/1.8.0 \ | 192 | crate://crates.io/relative-path/1.8.0 \ |
185 | crate://crates.io/rlimit/0.10.1 \ | 193 | crate://crates.io/rlimit/0.10.1 \ |
186 | crate://crates.io/roff/0.2.1 \ | 194 | crate://crates.io/roff/0.2.1 \ |
187 | crate://crates.io/rstest/0.18.2 \ | 195 | crate://crates.io/rstest/0.19.0 \ |
188 | crate://crates.io/rstest_macros/0.18.2 \ | 196 | crate://crates.io/rstest_macros/0.19.0 \ |
189 | crate://crates.io/rust-ini/0.19.0 \ | 197 | crate://crates.io/rust-ini/0.21.0 \ |
190 | crate://crates.io/rustc-hash/1.1.0 \ | 198 | crate://crates.io/rustc-hash/1.1.0 \ |
191 | crate://crates.io/rustc_version/0.4.0 \ | 199 | crate://crates.io/rustc_version/0.4.0 \ |
192 | crate://crates.io/rustix/0.37.26 \ | 200 | crate://crates.io/rustix/0.37.26 \ |
@@ -205,7 +213,7 @@ SRC_URI += " \ | |||
205 | crate://crates.io/shlex/1.3.0 \ | 213 | crate://crates.io/shlex/1.3.0 \ |
206 | crate://crates.io/signal-hook/0.3.17 \ | 214 | crate://crates.io/signal-hook/0.3.17 \ |
207 | crate://crates.io/signal-hook-mio/0.2.3 \ | 215 | crate://crates.io/signal-hook-mio/0.2.3 \ |
208 | crate://crates.io/signal-hook-registry/1.4.0 \ | 216 | crate://crates.io/signal-hook-registry/1.4.1 \ |
209 | crate://crates.io/siphasher/0.3.10 \ | 217 | crate://crates.io/siphasher/0.3.10 \ |
210 | crate://crates.io/slab/0.4.7 \ | 218 | crate://crates.io/slab/0.4.7 \ |
211 | crate://crates.io/sm3/0.4.2 \ | 219 | crate://crates.io/sm3/0.4.2 \ |
@@ -215,6 +223,7 @@ SRC_URI += " \ | |||
215 | crate://crates.io/strsim/0.10.0 \ | 223 | crate://crates.io/strsim/0.10.0 \ |
216 | crate://crates.io/syn/1.0.109 \ | 224 | crate://crates.io/syn/1.0.109 \ |
217 | crate://crates.io/syn/2.0.32 \ | 225 | crate://crates.io/syn/2.0.32 \ |
226 | crate://crates.io/tap/1.0.1 \ | ||
218 | crate://crates.io/tempfile/3.10.1 \ | 227 | crate://crates.io/tempfile/3.10.1 \ |
219 | crate://crates.io/terminal_size/0.2.6 \ | 228 | crate://crates.io/terminal_size/0.2.6 \ |
220 | crate://crates.io/terminal_size/0.3.0 \ | 229 | crate://crates.io/terminal_size/0.3.0 \ |
@@ -225,6 +234,7 @@ SRC_URI += " \ | |||
225 | crate://crates.io/time-core/0.1.0 \ | 234 | crate://crates.io/time-core/0.1.0 \ |
226 | crate://crates.io/time-macros/0.2.8 \ | 235 | crate://crates.io/time-macros/0.2.8 \ |
227 | crate://crates.io/tiny-keccak/2.0.2 \ | 236 | crate://crates.io/tiny-keccak/2.0.2 \ |
237 | crate://crates.io/trim-in-place/0.1.7 \ | ||
228 | crate://crates.io/typenum/1.15.0 \ | 238 | crate://crates.io/typenum/1.15.0 \ |
229 | crate://crates.io/unicode-ident/1.0.5 \ | 239 | crate://crates.io/unicode-ident/1.0.5 \ |
230 | crate://crates.io/unicode-linebreak/0.1.5 \ | 240 | crate://crates.io/unicode-linebreak/0.1.5 \ |
@@ -247,8 +257,10 @@ SRC_URI += " \ | |||
247 | crate://crates.io/wild/2.2.1 \ | 257 | crate://crates.io/wild/2.2.1 \ |
248 | crate://crates.io/winapi/0.3.9 \ | 258 | crate://crates.io/winapi/0.3.9 \ |
249 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ | 259 | crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ |
250 | crate://crates.io/winapi-util/0.1.6 \ | 260 | crate://crates.io/winapi-util/0.1.8 \ |
251 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ | 261 | crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ |
262 | crate://crates.io/windows/0.52.0 \ | ||
263 | crate://crates.io/windows-core/0.52.0 \ | ||
252 | crate://crates.io/windows-sys/0.45.0 \ | 264 | crate://crates.io/windows-sys/0.45.0 \ |
253 | crate://crates.io/windows-sys/0.48.0 \ | 265 | crate://crates.io/windows-sys/0.48.0 \ |
254 | crate://crates.io/windows-sys/0.52.0 \ | 266 | crate://crates.io/windows-sys/0.52.0 \ |
@@ -276,13 +288,15 @@ SRC_URI += " \ | |||
276 | crate://crates.io/windows_x86_64_msvc/0.42.2 \ | 288 | crate://crates.io/windows_x86_64_msvc/0.42.2 \ |
277 | crate://crates.io/windows_x86_64_msvc/0.48.0 \ | 289 | crate://crates.io/windows_x86_64_msvc/0.48.0 \ |
278 | crate://crates.io/windows_x86_64_msvc/0.52.0 \ | 290 | crate://crates.io/windows_x86_64_msvc/0.52.0 \ |
291 | crate://crates.io/wyz/0.5.1 \ | ||
279 | crate://crates.io/xattr/1.3.1 \ | 292 | crate://crates.io/xattr/1.3.1 \ |
280 | crate://crates.io/yansi/0.5.1 \ | 293 | crate://crates.io/yansi/0.5.1 \ |
281 | crate://crates.io/z85/3.0.5 \ | 294 | crate://crates.io/z85/3.0.5 \ |
282 | crate://crates.io/zip/0.6.6 \ | 295 | crate://crates.io/zip/1.1.1 \ |
283 | " | 296 | " |
284 | 297 | ||
285 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" | 298 | SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" |
299 | SRC_URI[ahash-0.7.8.sha256sum] = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" | ||
286 | SRC_URI[aho-corasick-1.0.4.sha256sum] = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" | 300 | SRC_URI[aho-corasick-1.0.4.sha256sum] = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" |
287 | SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" | 301 | SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" |
288 | SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" | 302 | SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" |
@@ -291,6 +305,7 @@ SRC_URI[anstyle-1.0.0.sha256sum] = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d | |||
291 | SRC_URI[anstyle-parse-0.2.0.sha256sum] = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" | 305 | SRC_URI[anstyle-parse-0.2.0.sha256sum] = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" |
292 | SRC_URI[anstyle-query-1.0.0.sha256sum] = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" | 306 | SRC_URI[anstyle-query-1.0.0.sha256sum] = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" |
293 | SRC_URI[anstyle-wincon-2.1.0.sha256sum] = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" | 307 | SRC_URI[anstyle-wincon-2.1.0.sha256sum] = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" |
308 | SRC_URI[arbitrary-1.3.2.sha256sum] = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" | ||
294 | SRC_URI[arrayref-0.3.6.sha256sum] = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" | 309 | SRC_URI[arrayref-0.3.6.sha256sum] = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" |
295 | SRC_URI[arrayvec-0.7.4.sha256sum] = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" | 310 | SRC_URI[arrayvec-0.7.4.sha256sum] = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" |
296 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" | 311 | SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" |
@@ -299,18 +314,19 @@ SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb6027779886 | |||
299 | SRC_URI[bindgen-0.63.0.sha256sum] = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" | 314 | SRC_URI[bindgen-0.63.0.sha256sum] = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" |
300 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" | 315 | SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" |
301 | SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" | 316 | SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" |
317 | SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" | ||
302 | SRC_URI[blake2b_simd-1.0.2.sha256sum] = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" | 318 | SRC_URI[blake2b_simd-1.0.2.sha256sum] = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" |
303 | SRC_URI[blake3-1.5.1.sha256sum] = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" | 319 | SRC_URI[blake3-1.5.1.sha256sum] = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" |
304 | SRC_URI[block-buffer-0.10.3.sha256sum] = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" | 320 | SRC_URI[block-buffer-0.10.3.sha256sum] = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" |
305 | SRC_URI[bstr-1.9.1.sha256sum] = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" | 321 | SRC_URI[bstr-1.9.1.sha256sum] = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" |
306 | SRC_URI[bumpalo-3.11.1.sha256sum] = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" | 322 | SRC_URI[bumpalo-3.11.1.sha256sum] = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" |
307 | SRC_URI[bytecount-0.6.7.sha256sum] = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" | 323 | SRC_URI[bytecount-0.6.8.sha256sum] = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" |
308 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" | 324 | SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" |
309 | SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" | 325 | SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" |
310 | SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" | 326 | SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" |
311 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" | 327 | SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" |
312 | SRC_URI[cfg_aliases-0.1.1.sha256sum] = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" | 328 | SRC_URI[cfg_aliases-0.1.1.sha256sum] = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" |
313 | SRC_URI[chrono-0.4.35.sha256sum] = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" | 329 | SRC_URI[chrono-0.4.38.sha256sum] = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" |
314 | SRC_URI[clang-sys-1.4.0.sha256sum] = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" | 330 | SRC_URI[clang-sys-1.4.0.sha256sum] = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" |
315 | SRC_URI[clap-4.4.2.sha256sum] = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" | 331 | SRC_URI[clap-4.4.2.sha256sum] = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" |
316 | SRC_URI[clap_builder-4.4.2.sha256sum] = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" | 332 | SRC_URI[clap_builder-4.4.2.sha256sum] = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" |
@@ -323,7 +339,6 @@ SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d74 | |||
323 | SRC_URI[const-random-0.1.16.sha256sum] = "11df32a13d7892ec42d51d3d175faba5211ffe13ed25d4fb348ac9e9ce835593" | 339 | SRC_URI[const-random-0.1.16.sha256sum] = "11df32a13d7892ec42d51d3d175faba5211ffe13ed25d4fb348ac9e9ce835593" |
324 | SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" | 340 | SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" |
325 | SRC_URI[constant_time_eq-0.3.0.sha256sum] = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" | 341 | SRC_URI[constant_time_eq-0.3.0.sha256sum] = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" |
326 | SRC_URI[conv-0.3.3.sha256sum] = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" | ||
327 | SRC_URI[core-foundation-sys-0.8.3.sha256sum] = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" | 342 | SRC_URI[core-foundation-sys-0.8.3.sha256sum] = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" |
328 | SRC_URI[coz-0.1.3.sha256sum] = "cef55b3fe2f5477d59e12bc792e8b3c95a25bd099eadcfae006ecea136de76e2" | 343 | SRC_URI[coz-0.1.3.sha256sum] = "cef55b3fe2f5477d59e12bc792e8b3c95a25bd099eadcfae006ecea136de76e2" |
329 | SRC_URI[cpp-0.5.9.sha256sum] = "bfa65869ef853e45c60e9828aa08cdd1398cb6e13f3911d9cb2a079b144fcd64" | 344 | SRC_URI[cpp-0.5.9.sha256sum] = "bfa65869ef853e45c60e9828aa08cdd1398cb6e13f3911d9cb2a079b144fcd64" |
@@ -331,20 +346,20 @@ SRC_URI[cpp_build-0.5.9.sha256sum] = "0e361fae2caf9758164b24da3eedd7f7d7451be30d | |||
331 | SRC_URI[cpp_common-0.5.9.sha256sum] = "3e1a2532e4ed4ea13031c13bc7bc0dbca4aae32df48e9d77f0d1e743179f2ea1" | 346 | SRC_URI[cpp_common-0.5.9.sha256sum] = "3e1a2532e4ed4ea13031c13bc7bc0dbca4aae32df48e9d77f0d1e743179f2ea1" |
332 | SRC_URI[cpp_macros-0.5.9.sha256sum] = "47ec9cc90633446f779ef481a9ce5a0077107dd5b87016440448d908625a83fd" | 347 | SRC_URI[cpp_macros-0.5.9.sha256sum] = "47ec9cc90633446f779ef481a9ce5a0077107dd5b87016440448d908625a83fd" |
333 | SRC_URI[cpufeatures-0.2.5.sha256sum] = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" | 348 | SRC_URI[cpufeatures-0.2.5.sha256sum] = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" |
334 | SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" | 349 | SRC_URI[crc32fast-1.4.0.sha256sum] = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" |
335 | SRC_URI[crossbeam-channel-0.5.10.sha256sum] = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" | 350 | SRC_URI[crossbeam-channel-0.5.10.sha256sum] = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" |
336 | SRC_URI[crossbeam-deque-0.8.4.sha256sum] = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" | 351 | SRC_URI[crossbeam-deque-0.8.4.sha256sum] = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" |
337 | SRC_URI[crossbeam-epoch-0.9.17.sha256sum] = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" | 352 | SRC_URI[crossbeam-epoch-0.9.17.sha256sum] = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" |
338 | SRC_URI[crossbeam-utils-0.8.18.sha256sum] = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" | 353 | SRC_URI[crossbeam-utils-0.8.19.sha256sum] = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" |
339 | SRC_URI[crossterm-0.27.0.sha256sum] = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" | 354 | SRC_URI[crossterm-0.27.0.sha256sum] = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" |
340 | SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" | 355 | SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" |
341 | SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" | 356 | SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" |
342 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" | 357 | SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" |
343 | SRC_URI[ctrlc-3.4.4.sha256sum] = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" | 358 | SRC_URI[ctrlc-3.4.4.sha256sum] = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" |
344 | SRC_URI[custom_derive-0.1.7.sha256sum] = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" | ||
345 | SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" | 359 | SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" |
346 | SRC_URI[data-encoding-macro-0.1.14.sha256sum] = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" | 360 | SRC_URI[data-encoding-macro-0.1.14.sha256sum] = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" |
347 | SRC_URI[data-encoding-macro-internal-0.1.12.sha256sum] = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" | 361 | SRC_URI[data-encoding-macro-internal-0.1.12.sha256sum] = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" |
362 | SRC_URI[derive_arbitrary-1.3.2.sha256sum] = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" | ||
348 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" | 363 | SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" |
349 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" | 364 | SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" |
350 | SRC_URI[dlv-list-0.5.0.sha256sum] = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" | 365 | SRC_URI[dlv-list-0.5.0.sha256sum] = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" |
@@ -357,14 +372,16 @@ SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f0 | |||
357 | SRC_URI[exacl-0.12.0.sha256sum] = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" | 372 | SRC_URI[exacl-0.12.0.sha256sum] = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" |
358 | SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" | 373 | SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" |
359 | SRC_URI[file_diff-1.0.0.sha256sum] = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5" | 374 | SRC_URI[file_diff-1.0.0.sha256sum] = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5" |
375 | SRC_URI[filedescriptor-0.8.2.sha256sum] = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e" | ||
360 | SRC_URI[filetime-0.2.23.sha256sum] = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" | 376 | SRC_URI[filetime-0.2.23.sha256sum] = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" |
361 | SRC_URI[flate2-1.0.24.sha256sum] = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" | 377 | SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" |
362 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" | 378 | SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" |
363 | SRC_URI[fs_extra-1.3.0.sha256sum] = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" | 379 | SRC_URI[fs_extra-1.3.0.sha256sum] = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" |
364 | SRC_URI[fsevent-sys-4.1.0.sha256sum] = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" | 380 | SRC_URI[fsevent-sys-4.1.0.sha256sum] = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" |
365 | SRC_URI[fts-sys-0.2.4.sha256sum] = "9a66c0a21e344f20c87b4ca12643cf4f40a7018f132c98d344e989b959f49dd1" | 381 | SRC_URI[fts-sys-0.2.4.sha256sum] = "9a66c0a21e344f20c87b4ca12643cf4f40a7018f132c98d344e989b959f49dd1" |
366 | SRC_URI[fundu-2.0.0.sha256sum] = "6c04cb831a8dccadfe3774b07cba4574a1ec24974d761510e65d8a543c2d7cb4" | 382 | SRC_URI[fundu-2.0.0.sha256sum] = "6c04cb831a8dccadfe3774b07cba4574a1ec24974d761510e65d8a543c2d7cb4" |
367 | SRC_URI[fundu-core-0.3.0.sha256sum] = "76a889e633afd839fb5b04fe53adfd588cefe518e71ec8d3c929698c6daf2acd" | 383 | SRC_URI[fundu-core-0.3.0.sha256sum] = "76a889e633afd839fb5b04fe53adfd588cefe518e71ec8d3c929698c6daf2acd" |
384 | SRC_URI[funty-2.0.0.sha256sum] = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" | ||
368 | SRC_URI[futures-0.3.28.sha256sum] = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" | 385 | SRC_URI[futures-0.3.28.sha256sum] = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" |
369 | SRC_URI[futures-channel-0.3.28.sha256sum] = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" | 386 | SRC_URI[futures-channel-0.3.28.sha256sum] = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" |
370 | SRC_URI[futures-core-0.3.28.sha256sum] = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" | 387 | SRC_URI[futures-core-0.3.28.sha256sum] = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" |
@@ -380,11 +397,12 @@ SRC_URI[generic-array-0.14.6.sha256sum] = "bff49e947297f3312447abdca79f45f473809 | |||
380 | SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" | 397 | SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" |
381 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" | 398 | SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" |
382 | SRC_URI[half-2.4.0.sha256sum] = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" | 399 | SRC_URI[half-2.4.0.sha256sum] = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" |
383 | SRC_URI[hashbrown-0.13.2.sha256sum] = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" | 400 | SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" |
401 | SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" | ||
384 | SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" | 402 | SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" |
385 | SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" | 403 | SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" |
386 | SRC_URI[hex-literal-0.4.1.sha256sum] = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" | 404 | SRC_URI[hex-literal-0.4.1.sha256sum] = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" |
387 | SRC_URI[hostname-0.3.1.sha256sum] = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" | 405 | SRC_URI[hostname-0.4.0.sha256sum] = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" |
388 | SRC_URI[iana-time-zone-0.1.53.sha256sum] = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" | 406 | SRC_URI[iana-time-zone-0.1.53.sha256sum] = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" |
389 | SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" | 407 | SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" |
390 | SRC_URI[indicatif-0.17.3.sha256sum] = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" | 408 | SRC_URI[indicatif-0.17.3.sha256sum] = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" |
@@ -406,13 +424,13 @@ SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944 | |||
406 | SRC_URI[linux-raw-sys-0.4.12.sha256sum] = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" | 424 | SRC_URI[linux-raw-sys-0.4.12.sha256sum] = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" |
407 | SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" | 425 | SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" |
408 | SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" | 426 | SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" |
427 | SRC_URI[lru-0.7.8.sha256sum] = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" | ||
409 | SRC_URI[lscolors-0.16.0.sha256sum] = "ab0b209ec3976527806024406fe765474b9a1750a0ed4b8f0372364741f50e7b" | 428 | SRC_URI[lscolors-0.16.0.sha256sum] = "ab0b209ec3976527806024406fe765474b9a1750a0ed4b8f0372364741f50e7b" |
410 | SRC_URI[match_cfg-0.1.0.sha256sum] = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" | ||
411 | SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" | 429 | SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" |
412 | SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" | 430 | SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" |
413 | SRC_URI[memmap2-0.9.0.sha256sum] = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" | 431 | SRC_URI[memmap2-0.9.0.sha256sum] = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" |
414 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" | 432 | SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" |
415 | SRC_URI[miniz_oxide-0.5.4.sha256sum] = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" | 433 | SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" |
416 | SRC_URI[mio-0.8.11.sha256sum] = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" | 434 | SRC_URI[mio-0.8.11.sha256sum] = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" |
417 | SRC_URI[nix-0.28.0.sha256sum] = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" | 435 | SRC_URI[nix-0.28.0.sha256sum] = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" |
418 | SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" | 436 | SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" |
@@ -420,13 +438,15 @@ SRC_URI[notify-6.0.1.sha256sum] = "5738a2795d57ea20abec2d6d76c6081186709c0024187 | |||
420 | SRC_URI[nu-ansi-term-0.49.0.sha256sum] = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" | 438 | SRC_URI[nu-ansi-term-0.49.0.sha256sum] = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" |
421 | SRC_URI[num-bigint-0.4.4.sha256sum] = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" | 439 | SRC_URI[num-bigint-0.4.4.sha256sum] = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" |
422 | SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" | 440 | SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" |
441 | SRC_URI[num-modular-0.5.1.sha256sum] = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" | ||
442 | SRC_URI[num-prime-0.4.3.sha256sum] = "5f4e3bc495f6e95bc15a6c0c55ac00421504a5a43d09e3cc455d1fea7015581d" | ||
423 | SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" | 443 | SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" |
424 | SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" | 444 | SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" |
425 | SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" | 445 | SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" |
426 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" | 446 | SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" |
427 | SRC_URI[onig-6.4.0.sha256sum] = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" | 447 | SRC_URI[onig-6.4.0.sha256sum] = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" |
428 | SRC_URI[onig_sys-69.8.1.sha256sum] = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" | 448 | SRC_URI[onig_sys-69.8.1.sha256sum] = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" |
429 | SRC_URI[ordered-multimap-0.6.0.sha256sum] = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" | 449 | SRC_URI[ordered-multimap-0.7.3.sha256sum] = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" |
430 | SRC_URI[os_display-0.1.3.sha256sum] = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75" | 450 | SRC_URI[os_display-0.1.3.sha256sum] = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75" |
431 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" | 451 | SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" |
432 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" | 452 | SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" |
@@ -439,7 +459,7 @@ SRC_URI[phf_shared-0.11.2.sha256sum] = "90fcb95eef784c2ac79119d1dd819e162b5da872 | |||
439 | SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" | 459 | SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" |
440 | SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" | 460 | SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" |
441 | SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" | 461 | SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" |
442 | SRC_URI[platform-info-2.0.2.sha256sum] = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" | 462 | SRC_URI[platform-info-2.0.3.sha256sum] = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217" |
443 | SRC_URI[portable-atomic-0.3.15.sha256sum] = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" | 463 | SRC_URI[portable-atomic-0.3.15.sha256sum] = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" |
444 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" | 464 | SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" |
445 | SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" | 465 | SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" |
@@ -449,11 +469,12 @@ SRC_URI[procfs-core-0.16.0.sha256sum] = "2d3554923a69f4ce04c4a754260c338f505ce22 | |||
449 | SRC_URI[quick-error-2.0.1.sha256sum] = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" | 469 | SRC_URI[quick-error-2.0.1.sha256sum] = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" |
450 | SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" | 470 | SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" |
451 | SRC_URI[quote-1.0.29.sha256sum] = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" | 471 | SRC_URI[quote-1.0.29.sha256sum] = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" |
472 | SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" | ||
452 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" | 473 | SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" |
453 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" | 474 | SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" |
454 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" | 475 | SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" |
455 | SRC_URI[rand_pcg-0.3.1.sha256sum] = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" | 476 | SRC_URI[rand_pcg-0.3.1.sha256sum] = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" |
456 | SRC_URI[rayon-1.9.0.sha256sum] = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" | 477 | SRC_URI[rayon-1.10.0.sha256sum] = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" |
457 | SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" | 478 | SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" |
458 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" | 479 | SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" |
459 | SRC_URI[redox_syscall-0.5.0.sha256sum] = "13c178f952cc7eac391f3124bd9851d1ac0bdbc4c9de2d892ccd5f0d8b160e96" | 480 | SRC_URI[redox_syscall-0.5.0.sha256sum] = "13c178f952cc7eac391f3124bd9851d1ac0bdbc4c9de2d892ccd5f0d8b160e96" |
@@ -464,9 +485,9 @@ SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f487 | |||
464 | SRC_URI[relative-path-1.8.0.sha256sum] = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" | 485 | SRC_URI[relative-path-1.8.0.sha256sum] = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" |
465 | SRC_URI[rlimit-0.10.1.sha256sum] = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" | 486 | SRC_URI[rlimit-0.10.1.sha256sum] = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" |
466 | SRC_URI[roff-0.2.1.sha256sum] = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" | 487 | SRC_URI[roff-0.2.1.sha256sum] = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" |
467 | SRC_URI[rstest-0.18.2.sha256sum] = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" | 488 | SRC_URI[rstest-0.19.0.sha256sum] = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" |
468 | SRC_URI[rstest_macros-0.18.2.sha256sum] = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" | 489 | SRC_URI[rstest_macros-0.19.0.sha256sum] = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25" |
469 | SRC_URI[rust-ini-0.19.0.sha256sum] = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" | 490 | SRC_URI[rust-ini-0.21.0.sha256sum] = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" |
470 | SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" | 491 | SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" |
471 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" | 492 | SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" |
472 | SRC_URI[rustix-0.37.26.sha256sum] = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" | 493 | SRC_URI[rustix-0.37.26.sha256sum] = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" |
@@ -485,7 +506,7 @@ SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949 | |||
485 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" | 506 | SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" |
486 | SRC_URI[signal-hook-0.3.17.sha256sum] = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" | 507 | SRC_URI[signal-hook-0.3.17.sha256sum] = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" |
487 | SRC_URI[signal-hook-mio-0.2.3.sha256sum] = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" | 508 | SRC_URI[signal-hook-mio-0.2.3.sha256sum] = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" |
488 | SRC_URI[signal-hook-registry-1.4.0.sha256sum] = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" | 509 | SRC_URI[signal-hook-registry-1.4.1.sha256sum] = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" |
489 | SRC_URI[siphasher-0.3.10.sha256sum] = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" | 510 | SRC_URI[siphasher-0.3.10.sha256sum] = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" |
490 | SRC_URI[slab-0.4.7.sha256sum] = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" | 511 | SRC_URI[slab-0.4.7.sha256sum] = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" |
491 | SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" | 512 | SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" |
@@ -495,6 +516,7 @@ SRC_URI[socket2-0.5.3.sha256sum] = "2538b18701741680e0322a2302176d3253a35388e2e6 | |||
495 | SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" | 516 | SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" |
496 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" | 517 | SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" |
497 | SRC_URI[syn-2.0.32.sha256sum] = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" | 518 | SRC_URI[syn-2.0.32.sha256sum] = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" |
519 | SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" | ||
498 | SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" | 520 | SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" |
499 | SRC_URI[terminal_size-0.2.6.sha256sum] = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" | 521 | SRC_URI[terminal_size-0.2.6.sha256sum] = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" |
500 | SRC_URI[terminal_size-0.3.0.sha256sum] = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" | 522 | SRC_URI[terminal_size-0.3.0.sha256sum] = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" |
@@ -505,6 +527,7 @@ SRC_URI[time-0.3.20.sha256sum] = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b | |||
505 | SRC_URI[time-core-0.1.0.sha256sum] = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" | 527 | SRC_URI[time-core-0.1.0.sha256sum] = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" |
506 | SRC_URI[time-macros-0.2.8.sha256sum] = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" | 528 | SRC_URI[time-macros-0.2.8.sha256sum] = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" |
507 | SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" | 529 | SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" |
530 | SRC_URI[trim-in-place-0.1.7.sha256sum] = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" | ||
508 | SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" | 531 | SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" |
509 | SRC_URI[unicode-ident-1.0.5.sha256sum] = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" | 532 | SRC_URI[unicode-ident-1.0.5.sha256sum] = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" |
510 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" | 533 | SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" |
@@ -527,8 +550,10 @@ SRC_URI[which-4.3.0.sha256sum] = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621ca | |||
527 | SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" | 550 | SRC_URI[wild-2.2.1.sha256sum] = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" |
528 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" | 551 | SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" |
529 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" | 552 | SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" |
530 | SRC_URI[winapi-util-0.1.6.sha256sum] = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" | 553 | SRC_URI[winapi-util-0.1.8.sha256sum] = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" |
531 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" | 554 | SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" |
555 | SRC_URI[windows-0.52.0.sha256sum] = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" | ||
556 | SRC_URI[windows-core-0.52.0.sha256sum] = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" | ||
532 | SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" | 557 | SRC_URI[windows-sys-0.45.0.sha256sum] = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" |
533 | SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" | 558 | SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" |
534 | SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" | 559 | SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" |
@@ -556,7 +581,8 @@ SRC_URI[windows_x86_64_gnullvm-0.52.0.sha256sum] = "1a657e1e9d3f514745a572a6846d | |||
556 | SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" | 581 | SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" |
557 | SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" | 582 | SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" |
558 | SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" | 583 | SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" |
584 | SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" | ||
559 | SRC_URI[xattr-1.3.1.sha256sum] = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" | 585 | SRC_URI[xattr-1.3.1.sha256sum] = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" |
560 | SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" | 586 | SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" |
561 | SRC_URI[z85-3.0.5.sha256sum] = "2a599daf1b507819c1121f0bf87fa37eb19daac6aff3aefefd4e6e2e0f2020fc" | 587 | SRC_URI[z85-3.0.5.sha256sum] = "2a599daf1b507819c1121f0bf87fa37eb19daac6aff3aefefd4e6e2e0f2020fc" |
562 | SRC_URI[zip-0.6.6.sha256sum] = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" | 588 | SRC_URI[zip-1.1.1.sha256sum] = "f2655979068a1f8fa91cb9e8e5b9d3ee54d18e0ddc358f2f4a395afc0929a84b" |
diff --git a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.25.bb b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.26.bb index 61f2dc298..5668aaac5 100644 --- a/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.25.bb +++ b/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.26.bb | |||
@@ -13,7 +13,7 @@ SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main" | |||
13 | # so src/uucore/src/lib/features.rs disables utmpx when targetting musl. | 13 | # so src/uucore/src/lib/features.rs disables utmpx when targetting musl. |
14 | COMPATIBLE_HOST:libc-musl = "null" | 14 | COMPATIBLE_HOST:libc-musl = "null" |
15 | 15 | ||
16 | SRCREV = "68c77b4bd129bdc12d03cc74fe0f817d2df75894" | 16 | SRCREV = "f95f363096610d7e5e1556d6d0a32b5018065c4c" |
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
19 | require ${BPN}-crates.inc | 19 | require ${BPN}-crates.inc |
diff --git a/meta-oe/recipes-crypto/botan/botan_3.2.0.bb b/meta-oe/recipes-crypto/botan/botan_3.4.0.bb index 5eff2d383..8cd1aa64c 100644 --- a/meta-oe/recipes-crypto/botan/botan_3.2.0.bb +++ b/meta-oe/recipes-crypto/botan/botan_3.4.0.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=f5254d3abe90ec5bb82c5694ff751546" | |||
5 | SECTION = "libs" | 5 | SECTION = "libs" |
6 | 6 | ||
7 | SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" | 7 | SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" |
8 | SRC_URI[sha256sum] = "049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3" | 8 | SRC_URI[sha256sum] = "71843afcc0a2c585f8f33fa304f0b58ae4b9c5d8306f894667b3746044277557" |
9 | 9 | ||
10 | S = "${WORKDIR}/Botan-${PV}" | 10 | S = "${WORKDIR}/Botan-${PV}" |
11 | 11 | ||
diff --git a/meta-oe/recipes-crypto/libsodium/libsodium/0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch b/meta-oe/recipes-crypto/libsodium/libsodium/0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch deleted file mode 100644 index 7a6fae799..000000000 --- a/meta-oe/recipes-crypto/libsodium/libsodium/0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From d3253310f7c0fc0f1aad6864e3b57958ea1bb9c5 Mon Sep 17 00:00:00 2001 | ||
2 | From: tux3 <barrdetwix@gmail.com> | ||
3 | Date: Mon, 16 Oct 2023 16:42:04 +0200 | ||
4 | Subject: [PATCH] fix(aarch64): Move target #pragma after arm_neon.h include | ||
5 | |||
6 | Fix per https://github.com/android/ndk/issues/1945 | ||
7 | |||
8 | If the pragma is done before the header include, | ||
9 | in NDK 26 the attribute may apply to the functions in arm_neon.h | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/jedisct1/libsodium/pull/1321] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | .../aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c | 12 ++++++------ | ||
15 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
16 | |||
17 | diff --git a/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c b/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c | ||
18 | index 0a5a128..aa76f5c 100644 | ||
19 | --- a/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c | ||
20 | +++ b/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c | ||
21 | @@ -19,12 +19,6 @@ | ||
22 | #define __vectorcall | ||
23 | #endif | ||
24 | |||
25 | -#ifdef __clang__ | ||
26 | -#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function) | ||
27 | -#elif defined(__GNUC__) | ||
28 | -#pragma GCC target("+simd+crypto") | ||
29 | -#endif | ||
30 | - | ||
31 | #ifndef __ARM_FEATURE_CRYPTO | ||
32 | #define __ARM_FEATURE_CRYPTO 1 | ||
33 | #endif | ||
34 | @@ -34,6 +28,12 @@ | ||
35 | |||
36 | #include <arm_neon.h> | ||
37 | |||
38 | +#ifdef __clang__ | ||
39 | +#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function) | ||
40 | +#elif defined(__GNUC__) | ||
41 | +#pragma GCC target("+simd+crypto") | ||
42 | +#endif | ||
43 | + | ||
44 | #define ABYTES crypto_aead_aes256gcm_ABYTES | ||
45 | #define NPUBBYTES crypto_aead_aes256gcm_NPUBBYTES | ||
46 | #define KEYBYTES crypto_aead_aes256gcm_KEYBYTES | ||
47 | -- | ||
48 | 2.42.1 | ||
49 | |||
diff --git a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.19.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.19.bb deleted file mode 100644 index 2e678f3f0..000000000 --- a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.19.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | SUMMARY = "The Sodium crypto library" | ||
2 | HOMEPAGE = "http://libsodium.org/" | ||
3 | BUGTRACKER = "https://github.com/jedisct1/libsodium/issues" | ||
4 | LICENSE = "ISC" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=49ce3b426e6a002e23a1387248e6dbe9" | ||
6 | |||
7 | SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz \ | ||
8 | file://0001-fix-aarch64-Move-target-pragma-after-arm_neon.h-incl.patch" | ||
9 | SRC_URI[sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea" | ||
10 | |||
11 | inherit autotools | ||
12 | |||
13 | S = "${WORKDIR}/libsodium-stable" | ||
14 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb new file mode 100644 index 000000000..63d21576b --- /dev/null +++ b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | SUMMARY = "The Sodium crypto library" | ||
2 | HOMEPAGE = "http://libsodium.org/" | ||
3 | BUGTRACKER = "https://github.com/jedisct1/libsodium/issues" | ||
4 | LICENSE = "ISC" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c59be7bb29f8e431b5f2d690b6734185" | ||
6 | |||
7 | SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz" | ||
8 | SRC_URI[sha256sum] = "ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19" | ||
9 | |||
10 | inherit autotools | ||
11 | |||
12 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb index 530107151..9506d0e55 100644 --- a/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +++ b/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb | |||
@@ -38,19 +38,20 @@ USERADD_PACKAGES = "${PN}" | |||
38 | USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" | 38 | USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" |
39 | 39 | ||
40 | do_install:prepend() { | 40 | do_install:prepend() { |
41 | rm ${B}/src/${GO_IMPORT}/build.py | 41 | test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py |
42 | rm ${B}/src/${GO_IMPORT}/build.sh | 42 | test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh |
43 | rm ${B}/src/${GO_IMPORT}/Dockerfile* | 43 | rm -rf ${B}/src/${GO_IMPORT}/Dockerfile* |
44 | |||
44 | sed -i -e "s#usr/bin/sh#bin/sh#g" ${B}/src/${GO_IMPORT}/scripts/ci/run_perftest.sh | 45 | sed -i -e "s#usr/bin/sh#bin/sh#g" ${B}/src/${GO_IMPORT}/scripts/ci/run_perftest.sh |
45 | } | 46 | } |
46 | 47 | ||
47 | do_install:append() { | 48 | do_install:append() { |
48 | install -d ${D}${sysconfdir}/influxdb | 49 | install -d ${D}${sysconfdir}/influxdb |
49 | install -m 0644 ${WORKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb | 50 | install -m 0644 ${UNPACKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb |
50 | chown -R root:influxdb ${D}${sysconfdir}/influxdb | 51 | chown -R root:influxdb ${D}${sysconfdir}/influxdb |
51 | 52 | ||
52 | install -d ${D}${sysconfdir}/init.d | 53 | install -d ${D}${sysconfdir}/init.d |
53 | install -m 0755 ${WORKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb | 54 | install -m 0755 ${UNPACKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb |
54 | 55 | ||
55 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ] ; then | 56 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'sysvinit', d)}" ] ; then |
56 | install -d ${D}${sysconfdir}/logrotate.d | 57 | install -d ${D}${sysconfdir}/logrotate.d |
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 33da32fb2..4bfa1c9ca 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc | |||
@@ -31,8 +31,6 @@ SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe25811 | |||
31 | 31 | ||
32 | UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" | 32 | UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" |
33 | 33 | ||
34 | S = "${WORKDIR}/mariadb-${PV}" | ||
35 | |||
36 | BINCONFIG_GLOB = "mysql_config" | 34 | BINCONFIG_GLOB = "mysql_config" |
37 | 35 | ||
38 | inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig | 36 | inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig |
@@ -80,6 +78,7 @@ BUILD_CFLAGS += "-fuse-ld=bfd" | |||
80 | BUILD_CXXFLAGS += "-fuse-ld=bfd" | 78 | BUILD_CXXFLAGS += "-fuse-ld=bfd" |
81 | 79 | ||
82 | LDFLAGS:x86:toolchain-clang = "-latomic" | 80 | LDFLAGS:x86:toolchain-clang = "-latomic" |
81 | LDFLAGS:riscv32:toolchain-clang = "-latomic" | ||
83 | 82 | ||
84 | EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ | 83 | EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ |
85 | -DWITH_JEMALLOC=no \ | 84 | -DWITH_JEMALLOC=no \ |
@@ -163,18 +162,18 @@ do_install() { | |||
163 | oe_runmake 'DESTDIR=${D}' install | 162 | oe_runmake 'DESTDIR=${D}' install |
164 | 163 | ||
165 | install -d ${D}/${sysconfdir}/init.d | 164 | install -d ${D}/${sysconfdir}/init.d |
166 | install -m 0644 ${WORKDIR}/my.cnf ${D}/${sysconfdir}/ | 165 | install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/ |
167 | install -m 0755 ${WORKDIR}/install_db ${D}/${sysconfdir}/init.d/ | 166 | install -m 0755 ${UNPACKDIR}/install_db ${D}/${sysconfdir}/init.d/ |
168 | mv ${D}/${sysconfdir}/init.d/mysql ${D}/${sysconfdir}/init.d/mysqld | 167 | mv ${D}/${sysconfdir}/init.d/mysql ${D}/${sysconfdir}/init.d/mysqld |
169 | 168 | ||
170 | install -d ${D}${systemd_unitdir}/system | 169 | install -d ${D}${systemd_unitdir}/system |
171 | install -m 0644 ${WORKDIR}/mysqld.service ${D}${systemd_unitdir}/system | 170 | install -m 0644 ${UNPACKDIR}/mysqld.service ${D}${systemd_unitdir}/system |
172 | install -m 0644 ${WORKDIR}/install_db.service ${D}${systemd_unitdir}/system | 171 | install -m 0644 ${UNPACKDIR}/install_db.service ${D}${systemd_unitdir}/system |
173 | sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service \ | 172 | sed -i -e 's,@BINDIR@,${bindir},g' -e 's,@PREFIX@,${prefix},g' ${D}${systemd_unitdir}/system/mysqld.service \ |
174 | ${D}${systemd_unitdir}/system/install_db.service | 173 | ${D}${systemd_unitdir}/system/install_db.service |
175 | 174 | ||
176 | install -d ${D}${bindir} | 175 | install -d ${D}${bindir} |
177 | install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir} | 176 | install -m 755 ${UNPACKDIR}/mysql-systemd-start ${D}${bindir} |
178 | install -d ${D}${datadir}/doc/${PN} | 177 | install -d ${D}${datadir}/doc/${PN} |
179 | if [ -f ${D}${datadir}/doc/README ]; then | 178 | if [ -f ${D}${datadir}/doc/README ]; then |
180 | mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ | 179 | mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ |
@@ -216,7 +215,7 @@ RDEPENDS:${PN}-client = "perl perl-module-getopt-long perl-module-file-temp \ | |||
216 | RDEPENDS:${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \ | 215 | RDEPENDS:${PN}-server = "perl perl-module-getopt-long perl-module-data-dumper \ |
217 | perl-module-file-basename perl-module-file-path perl-module-sys-hostname \ | 216 | perl-module-file-basename perl-module-file-path perl-module-sys-hostname \ |
218 | perl-module-file-copy perl-module-file-temp perl-module-posix \ | 217 | perl-module-file-copy perl-module-file-temp perl-module-posix \ |
219 | ${PN}-client ${PN}-setupdb libdbi-perl libdbd-mysql-perl lzo" | 218 | ${PN}-client ${PN}-setupdb libdbi-perl dbd-mariadb lzo" |
220 | RDEPENDS:${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-module-getopt-long \ | 219 | RDEPENDS:${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-module-getopt-long \ |
221 | perl-module-posix perl-module-data-dumper perl-module-sigtrap perl-module-threads \ | 220 | perl-module-posix perl-module-data-dumper perl-module-sigtrap perl-module-threads \ |
222 | perl-module-threads-shared perl-module-io-socket perl-module-sys-hostname perl-module-file-copy \ | 221 | perl-module-threads-shared perl-module-io-socket perl-module-sys-hostname perl-module-file-copy \ |
diff --git a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch index d76d1991b..9df4d073f 100644 --- a/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch | |||
@@ -18,7 +18,7 @@ index 401ce30..27f382d 100644 | |||
18 | +++ b/configure.ac | 18 | +++ b/configure.ac |
19 | @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros | 19 | @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros |
20 | 20 | ||
21 | AC_INIT([PostgreSQL], [16.2], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) | 21 | AC_INIT([PostgreSQL], [16.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) |
22 | 22 | ||
23 | -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. | 23 | -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. |
24 | -Untested combinations of 'autoconf' and PostgreSQL versions are not | 24 | -Untested combinations of 'autoconf' and PostgreSQL versions are not |
diff --git a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch index fa46912ee..1f735f322 100644 --- a/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch +++ b/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch | |||
@@ -23,7 +23,7 @@ diff --git a/configure.ac b/configure.ac | |||
23 | index fba79ee..7170f26 100644 | 23 | index fba79ee..7170f26 100644 |
24 | --- a/configure.ac | 24 | --- a/configure.ac |
25 | +++ b/configure.ac | 25 | +++ b/configure.ac |
26 | @@ -2261,7 +2261,7 @@ Use --without-tcl to disable building PL/Tcl.]) | 26 | @@ -2297,7 +2297,7 @@ Use --without-tcl to disable building PL/Tcl.]) |
27 | fi | 27 | fi |
28 | 28 | ||
29 | # check for <perl.h> | 29 | # check for <perl.h> |
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index e29a5bef7..2dd7dd6fd 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc | |||
@@ -198,24 +198,24 @@ do_install:append() { | |||
198 | 198 | ||
199 | # install dirs and server init | 199 | # install dirs and server init |
200 | install -d ${D}${sysconfdir}/init.d | 200 | install -d ${D}${sysconfdir}/init.d |
201 | install -m 0755 ${WORKDIR}/${BPN}.init ${D}${sysconfdir}/init.d/${BPN}-server | 201 | install -m 0755 ${UNPACKDIR}/${BPN}.init ${D}${sysconfdir}/init.d/${BPN}-server |
202 | sed -i -e "s/^PGVERSION=.*$/PGVERSION=${PV}/g" ${D}${sysconfdir}/init.d/${BPN}-server | 202 | sed -i -e "s/^PGVERSION=.*$/PGVERSION=${PV}/g" ${D}${sysconfdir}/init.d/${BPN}-server |
203 | install -m 0755 ${WORKDIR}/${BPN}-setup ${D}${bindir}/${BPN}-setup | 203 | install -m 0755 ${UNPACKDIR}/${BPN}-setup ${D}${bindir}/${BPN}-setup |
204 | install -d -m 700 ${D}${localstatedir}/lib/${BPN}/data | 204 | install -d -m 700 ${D}${localstatedir}/lib/${BPN}/data |
205 | install -d -m 700 ${D}${localstatedir}/lib/${BPN}/backups | 205 | install -d -m 700 ${D}${localstatedir}/lib/${BPN}/backups |
206 | install -m 644 ${WORKDIR}/${BPN}-profile ${D}${localstatedir}/lib/${BPN}/.profile | 206 | install -m 644 ${UNPACKDIR}/${BPN}-profile ${D}${localstatedir}/lib/${BPN}/.profile |
207 | chown -R postgres:postgres ${D}${localstatedir}/lib/${BPN} | 207 | chown -R postgres:postgres ${D}${localstatedir}/lib/${BPN} |
208 | # multiple server config directory | 208 | # multiple server config directory |
209 | install -d -m 700 ${D}${sysconfdir}/default/${BPN} | 209 | install -d -m 700 ${D}${sysconfdir}/default/${BPN} |
210 | 210 | ||
211 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then | 211 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then |
212 | install -d ${D}${sysconfdir}/pam.d | 212 | install -d ${D}${sysconfdir}/pam.d |
213 | install -m 644 ${WORKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql | 213 | install -m 644 ${UNPACKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql |
214 | fi | 214 | fi |
215 | 215 | ||
216 | # Install systemd unit files | 216 | # Install systemd unit files |
217 | install -d ${D}${systemd_unitdir}/system | 217 | install -d ${D}${systemd_unitdir}/system |
218 | install -m 0644 ${WORKDIR}/postgresql.service ${D}${systemd_unitdir}/system | 218 | install -m 0644 ${UNPACKDIR}/postgresql.service ${D}${systemd_unitdir}/system |
219 | sed -i -e 's,@BINDIR@,${bindir},g' \ | 219 | sed -i -e 's,@BINDIR@,${bindir},g' \ |
220 | ${D}${systemd_unitdir}/system/postgresql.service | 220 | ${D}${systemd_unitdir}/system/postgresql.service |
221 | # Remove the build path | 221 | # Remove the build path |
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql_16.2.bb b/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb index 31f83a564..6df719cd9 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql_16.2.bb +++ b/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb | |||
@@ -11,6 +11,6 @@ SRC_URI += "\ | |||
11 | file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \ | 11 | file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "446e88294dbc2c9085ab4b7061a646fa604b4bec03521d5ea671c2e5ad9b2952" | 14 | SRC_URI[sha256sum] = "331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585" |
15 | 15 | ||
16 | CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it." | 16 | CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it." |
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch new file mode 100644 index 000000000..461df7a60 --- /dev/null +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: aurel32 <aurelien@aurel32.net> | ||
3 | Date: Fri, 22 Mar 2024 14:21:13 -0700 | ||
4 | Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support | ||
5 | |||
6 | Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644 | ||
7 | |||
8 | Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear. | ||
9 | |||
10 | The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2]. | ||
11 | |||
12 | Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units. | ||
13 | |||
14 | This fixes the testsuite on riscv64, tested on a VisionFive 2 board. | ||
15 | |||
16 | [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 | ||
17 | [2] https://github.com/abseil/abseil-cpp/pull/1631 | ||
18 | Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1 | ||
19 | |||
20 | Merging this change closes #1644 | ||
21 | |||
22 | COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71 | ||
23 | PiperOrigin-RevId: 618286262 | ||
24 | Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652 | ||
25 | |||
26 | Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/7335a36d] | ||
27 | [Adapted to apply on top of meta-oe's patch stack] | ||
28 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
29 | --- | ||
30 | absl/base/internal/unscaledcycleclock.cc | 12 ------------ | ||
31 | absl/base/internal/unscaledcycleclock_config.h | 5 ++--- | ||
32 | 2 files changed, 2 insertions(+), 15 deletions(-) | ||
33 | |||
34 | diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc | ||
35 | index f11fecb3..103b4f6a 100644 | ||
36 | --- a/absl/base/internal/unscaledcycleclock.cc | ||
37 | +++ b/absl/base/internal/unscaledcycleclock.cc | ||
38 | @@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() { | ||
39 | return aarch64_timer_frequency; | ||
40 | } | ||
41 | |||
42 | -#elif defined(__riscv) | ||
43 | - | ||
44 | -int64_t UnscaledCycleClock::Now() { | ||
45 | - int64_t virtual_timer_value; | ||
46 | - asm volatile("rdcycle %0" : "=r"(virtual_timer_value)); | ||
47 | - return virtual_timer_value; | ||
48 | -} | ||
49 | - | ||
50 | -double UnscaledCycleClock::Frequency() { | ||
51 | - return base_internal::NominalCPUFrequency(); | ||
52 | -} | ||
53 | - | ||
54 | #elif defined(_M_IX86) || defined(_M_X64) | ||
55 | |||
56 | #pragma intrinsic(__rdtsc) | ||
57 | diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h | ||
58 | index 5e232c1a..83552fc5 100644 | ||
59 | --- a/absl/base/internal/unscaledcycleclock_config.h | ||
60 | +++ b/absl/base/internal/unscaledcycleclock_config.h | ||
61 | @@ -22,7 +22,6 @@ | ||
62 | // The following platforms have an implementation of a hardware counter. | ||
63 | #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ | ||
64 | ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ | ||
65 | - defined(__riscv) || \ | ||
66 | defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) | ||
67 | #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 | ||
68 | #else | ||
69 | @@ -54,8 +53,8 @@ | ||
70 | #if ABSL_USE_UNSCALED_CYCLECLOCK | ||
71 | // This macro can be used to test if UnscaledCycleClock::Frequency() | ||
72 | // is NominalCPUFrequency() on a particular platform. | ||
73 | -#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \ | ||
74 | - defined(_M_IX86) || defined(_M_X64)) | ||
75 | +#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \ | ||
76 | + defined(_M_X64)) | ||
77 | #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY | ||
78 | #endif | ||
79 | #endif | ||
80 | -- | ||
81 | 2.44.0 | ||
82 | |||
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb index 2aef97391..87ab23931 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ | |||
14 | file://0002-Remove-maes-option-from-cross-compilation.patch \ | 14 | file://0002-Remove-maes-option-from-cross-compilation.patch \ |
15 | file://abseil-ppc-fixes.patch \ | 15 | file://abseil-ppc-fixes.patch \ |
16 | file://0003-Remove-neon-option-from-cross-compilation.patch \ | 16 | file://0003-Remove-neon-option-from-cross-compilation.patch \ |
17 | file://0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb index 3f9d49a2d..a91229f90 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb | |||
@@ -3,6 +3,9 @@ SECTION = "console/utils" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
5 | 5 | ||
6 | S = "${WORKDIR}/sources" | ||
7 | UNPACKDIR = "${S}" | ||
8 | |||
6 | SRC_URI = " \ | 9 | SRC_URI = " \ |
7 | file://android-gadget-setup \ | 10 | file://android-gadget-setup \ |
8 | file://android-gadget-start \ | 11 | file://android-gadget-start \ |
@@ -14,17 +17,17 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
14 | 17 | ||
15 | do_install() { | 18 | do_install() { |
16 | install -d ${D}${bindir} | 19 | install -d ${D}${bindir} |
17 | install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} | 20 | install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} |
18 | install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir} | 21 | install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir} |
19 | install -m 0755 ${WORKDIR}/android-gadget-cleanup ${D}${bindir} | 22 | install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir} |
20 | 23 | ||
21 | if [ -r ${WORKDIR}/android-gadget-setup.machine ] ; then | 24 | if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then |
22 | install -d ${D}${sysconfdir} | 25 | install -d ${D}${sysconfdir} |
23 | install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${D}${sysconfdir} | 26 | install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir} |
24 | fi | 27 | fi |
25 | 28 | ||
26 | install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d | 29 | install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d |
27 | install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d | 30 | install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d |
28 | } | 31 | } |
29 | 32 | ||
30 | FILES:${PN} += " \ | 33 | FILES:${PN} += " \ |
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb index 34b1a9bdd..f73be8dbb 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb | |||
@@ -9,7 +9,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | install -d ${D}${bindir} | 11 | install -d ${D}${bindir} |
12 | install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} | 12 | install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} |
13 | } | 13 | } |
14 | 14 | ||
15 | python () { | 15 | python () { |
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff index 177d69a97..ddb41ea4b 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff | |||
@@ -17,9 +17,10 @@ Upstream-Status: Pending | |||
17 | +++ b/adb/adb_auth_host.c | 17 | +++ b/adb/adb_auth_host.c |
18 | @@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, | 18 | @@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, |
19 | BIGNUM* rem = BN_new(); | 19 | BIGNUM* rem = BN_new(); |
20 | BIGNUM* n = BN_new(); | 20 | - BIGNUM* n = BN_new(); |
21 | + const BIGNUM* n; | ||
21 | BIGNUM* n0inv = BN_new(); | 22 | BIGNUM* n0inv = BN_new(); |
22 | + BIGNUM* e = BN_new(); | 23 | + const BIGNUM* e; |
23 | 24 | ||
24 | if (RSA_size(rsa) != RSANUMBYTES) { | 25 | if (RSA_size(rsa) != RSANUMBYTES) { |
25 | ret = 0; | 26 | ret = 0; |
@@ -32,7 +33,7 @@ Upstream-Status: Pending | |||
32 | BN_set_bit(r, RSANUMWORDS * 32); | 33 | BN_set_bit(r, RSANUMWORDS * 32); |
33 | BN_mod_sqr(rr, r, n, ctx); | 34 | BN_mod_sqr(rr, r, n, ctx); |
34 | BN_div(NULL, rem, n, r32, ctx); | 35 | BN_div(NULL, rem, n, r32, ctx); |
35 | @@ -96,7 +97,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, | 36 | @@ -96,11 +97,10 @@ static int RSA_to_RSAPublicKey(RSA *rsa, |
36 | BN_div(n, rem, n, r32, ctx); | 37 | BN_div(n, rem, n, r32, ctx); |
37 | pkey->n[i] = BN_get_word(rem); | 38 | pkey->n[i] = BN_get_word(rem); |
38 | } | 39 | } |
@@ -41,3 +42,7 @@ Upstream-Status: Pending | |||
41 | 42 | ||
42 | out: | 43 | out: |
43 | BN_free(n0inv); | 44 | BN_free(n0inv); |
45 | - BN_free(n); | ||
46 | BN_free(rem); | ||
47 | BN_free(r); | ||
48 | BN_free(rr); | ||
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index 1c66ea499..6343256d3 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | |||
@@ -88,7 +88,7 @@ TOOLS:class-native = "fastboot ext4_utils mkbootimg" | |||
88 | TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg" | 88 | TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg" |
89 | 89 | ||
90 | do_compile() { | 90 | do_compile() { |
91 | cp ${WORKDIR}/gitignore ${S}/.gitignore | 91 | cp ${UNPACKDIR}/gitignore ${S}/.gitignore |
92 | 92 | ||
93 | # Setting both variables below causing our makefiles to not work with | 93 | # Setting both variables below causing our makefiles to not work with |
94 | # implicit make rules | 94 | # implicit make rules |
@@ -123,7 +123,7 @@ do_compile() { | |||
123 | 123 | ||
124 | for tool in ${TOOLS}; do | 124 | for tool in ${TOOLS}; do |
125 | mkdir -p ${B}/${tool} | 125 | mkdir -p ${B}/${tool} |
126 | oe_runmake -f ${B}/${tool}.mk -C ${B}/${tool} | 126 | oe_runmake -f ${UNPACKDIR}/${BPN}/${tool}.mk -C ${B}/${tool} |
127 | done | 127 | done |
128 | } | 128 | } |
129 | 129 | ||
@@ -151,7 +151,7 @@ do_install() { | |||
151 | fi | 151 | fi |
152 | 152 | ||
153 | # Outside the if statement to avoid errors during do_package | 153 | # Outside the if statement to avoid errors during do_package |
154 | install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ | 154 | install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \ |
155 | ${D}${systemd_unitdir}/system/android-tools-adbd.service | 155 | ${D}${systemd_unitdir}/system/android-tools-adbd.service |
156 | 156 | ||
157 | if echo ${TOOLS} | grep -q "fastboot" ; then | 157 | if echo ${TOOLS} | grep -q "fastboot" ; then |
diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.17.bb b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb index 6c8934b34..5e992845a 100644 --- a/meta-oe/recipes-devtools/cjson/cjson_1.7.17.bb +++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" | |||
7 | SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \ | 7 | SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \ |
8 | file://run-ptest \ | 8 | file://run-ptest \ |
9 | " | 9 | " |
10 | SRCREV = "87d8f0961a01bf09bef98ff89bae9fdec42181ee" | 10 | SRCREV = "acc76239bee01d8e9c858ae2cab296704e52d916" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240310.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb index d4ffbb7f0..f8add448b 100644 --- a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240310.0.bb +++ b/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | |||
14 | 14 | ||
15 | inherit autotools-brokensep pkgconfig manpages | 15 | inherit autotools-brokensep pkgconfig manpages |
16 | 16 | ||
17 | SRCREV = "38fd8e39b877a79666393b90e38400fd8d7d5d14" | 17 | SRCREV = "653ca9204527fe1da7ecf97c3da4308f9ab17d2c" |
18 | SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" | 18 | SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" |
19 | 19 | ||
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb index 479b98d44..599675a34 100644 --- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb +++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb | |||
@@ -24,7 +24,7 @@ do_install:append() { | |||
24 | 24 | ||
25 | do_install:append:class-target() { | 25 | do_install:append:class-target() { |
26 | install -d ${D}${sysconfdir}/yum.repos.d | 26 | install -d ${D}${sysconfdir}/yum.repos.d |
27 | install -m 0644 ${WORKDIR}/oe-remote.repo.sample ${D}${sysconfdir}/yum.repos.d | 27 | install -m 0644 ${UNPACKDIR}/oe-remote.repo.sample ${D}${sysconfdir}/yum.repos.d |
28 | } | 28 | } |
29 | 29 | ||
30 | do_install:append:class-nativesdk() { | 30 | do_install:append:class-nativesdk() { |
diff --git a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.6.bb b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb index 976120b51..2c594d229 100644 --- a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.6.bb +++ b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb | |||
@@ -2,12 +2,12 @@ SUMMARY = "EditorConfig helps maintain consistent coding styles across various e | |||
2 | HOMEPAGE = "https://https://editorconfig.org" | 2 | HOMEPAGE = "https://https://editorconfig.org" |
3 | SECTION = "libs" | 3 | SECTION = "libs" |
4 | LICENSE = "BSD-2-Clause" | 4 | LICENSE = "BSD-2-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f515fff3ea0a2b9797eda60d83c0e5ca" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38f617473e9f7373b5e79baf437accf8" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master" | 7 | SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master" |
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | SRCREV = "b7837029494c03af5ea70ed9d265e8c2123bff53" | 10 | SRCREV = "fd8cf1e94ecf4e6e4493833f96140cf9bd17578e" |
11 | 11 | ||
12 | inherit cmake | 12 | inherit cmake |
13 | 13 | ||
diff --git a/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb b/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb index 0f6bbb4d5..f9e2c7873 100644 --- a/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb +++ b/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb | |||
@@ -42,7 +42,7 @@ do_compile() { | |||
42 | do_install() { | 42 | do_install() { |
43 | oe_runmake DESTDIR=${D} install | 43 | oe_runmake DESTDIR=${D} install |
44 | install -D -m 0644 -p ${S}/iptraf-ng-logrotate.conf ${D}${sysconfdir}/logrotate.d/iptraf-ng | 44 | install -D -m 0644 -p ${S}/iptraf-ng-logrotate.conf ${D}${sysconfdir}/logrotate.d/iptraf-ng |
45 | install -Dm 0644 ${WORKDIR}/iptraf-ng-tmpfiles.conf ${D}${libdir}/tmpfiles.d/iptraf-ng-tmpfiles.conf | 45 | install -Dm 0644 ${UNPACKDIR}/iptraf-ng-tmpfiles.conf ${D}${libdir}/tmpfiles.d/iptraf-ng-tmpfiles.conf |
46 | } | 46 | } |
47 | 47 | ||
48 | FILES:${PN} += "${libdir}/tmpfiles.d" | 48 | FILES:${PN} += "${libdir}/tmpfiles.d" |
diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb index 7e0272f89..cc21c8bea 100644 --- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb +++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb | |||
@@ -17,6 +17,8 @@ SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=dev;protocol=https \ | |||
17 | file://run-ptest \ | 17 | file://run-ptest \ |
18 | " | 18 | " |
19 | SRCREV = "630434bb0ac619f7beec927569782d924c459385" | 19 | SRCREV = "630434bb0ac619f7beec927569782d924c459385" |
20 | PV_LONG := "${PV}-171-g${SRCREV}" | ||
21 | PV .= "+git" | ||
20 | 22 | ||
21 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
22 | 24 | ||
@@ -27,7 +29,7 @@ EXTRA_AUTORECONF += "--exclude=autoheader" | |||
27 | EXTRA_OECONF:append:libc-musl = " --with-jemalloc-prefix=je_" | 29 | EXTRA_OECONF:append:libc-musl = " --with-jemalloc-prefix=je_" |
28 | # For some reason VERSION file populated only in tarball distribution. | 30 | # For some reason VERSION file populated only in tarball distribution. |
29 | # Adding jemalloc version since this recipe is using source code from git tag | 31 | # Adding jemalloc version since this recipe is using source code from git tag |
30 | EXTRA_OECONF:append = " --with-version=${PV}-0-g${SRCREV} --enable-xmalloc" | 32 | EXTRA_OECONF:append = " --with-version=${PV_LONG} --enable-xmalloc" |
31 | 33 | ||
32 | do_install:append() { | 34 | do_install:append() { |
33 | sed -i -e 's@${STAGING_DIR_HOST}@@g' \ | 35 | sed -i -e 's@${STAGING_DIR_HOST}@@g' \ |
diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb b/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb index 0ed6e8235..4f9099ff0 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb | |||
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | |||
11 | GNOMEBASEBUILDCLASS = "autotools" | 11 | GNOMEBASEBUILDCLASS = "autotools" |
12 | inherit gnomebase vala gobject-introspection | 12 | inherit gnomebase vala gobject-introspection |
13 | 13 | ||
14 | CFLAGS += "-Wno-incompatible-pointer-types" | ||
15 | |||
14 | do_configure:prepend() { | 16 | do_configure:prepend() { |
15 | MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" | 17 | MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" |
16 | for i in ${MACROS}; do | 18 | for i in ${MACROS}; do |
diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb index 2451a36be..89e6744dc 100644 --- a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb +++ b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb | |||
@@ -10,7 +10,7 @@ RDEPENDS:${PN} = "python3 python3-modules" | |||
10 | inherit python3native python3targetconfig | 10 | inherit python3native python3targetconfig |
11 | 11 | ||
12 | SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" | 12 | SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" |
13 | SRC_URI[sha256sum] = "a5603d0d395ebf67fe5d27abbb3bd37fcc01871ecf394c793672d2c1e68be7e7" | 13 | SRC_URI[sha256sum] = "f75d6a4a75823a1b7d713a4967eca2f596f466e58fc6bc06d72642932fd7e307" |
14 | 14 | ||
15 | S = "${WORKDIR}/mercurial-${PV}" | 15 | S = "${WORKDIR}/mercurial-${PV}" |
16 | 16 | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.12/oe-npm-cache b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache index f59620764..eb0f143ea 100755 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.12/oe-npm-cache +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache | |||
@@ -30,7 +30,7 @@ const xlate = { | |||
30 | time: Date.now(), | 30 | time: Date.now(), |
31 | url: key, | 31 | url: key, |
32 | reqHeaders: { | 32 | reqHeaders: { |
33 | 'accept': 'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*', | 33 | 'accept': 'application/json', |
34 | }, | 34 | }, |
35 | resHeaders: { | 35 | resHeaders: { |
36 | "content-type": "application/json", | 36 | "content-type": "application/json", |
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb index a61dd5018..d4b818f96 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.12.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb | |||
@@ -8,10 +8,13 @@ SRC_URI = "\ | |||
8 | 8 | ||
9 | inherit native | 9 | inherit native |
10 | 10 | ||
11 | S = "${WORKDIR}/sources" | ||
12 | UNPACKDIR = "${S}" | ||
13 | |||
11 | B = "${WORKDIR}/build" | 14 | B = "${WORKDIR}/build" |
12 | 15 | ||
13 | do_configure() { | 16 | do_configure() { |
14 | sed -e 's!@@libdir@@!${libdir}!g' < '${WORKDIR}/oe-npm-cache' > '${B}/oe-npm-cache' | 17 | sed -e 's!@@libdir@@!${libdir}!g' < '${UNPACKDIR}/oe-npm-cache' > '${B}/oe-npm-cache' |
15 | } | 18 | } |
16 | 19 | ||
17 | do_install() { | 20 | do_install() { |
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_20.12.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb index d86c38f2f..25b59495e 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_20.12.2.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" | 1 | DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" |
2 | HOMEPAGE = "http://nodejs.org" | 2 | HOMEPAGE = "http://nodejs.org" |
3 | LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" | 3 | LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9a7fcce64128730251dbc58aa41b4674" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=cef54676c547a5bbab44aa8be3be9ef7" |
5 | 5 | ||
6 | CVE_PRODUCT = "nodejs node.js" | 6 | CVE_PRODUCT = "nodejs node.js" |
7 | 7 | ||
@@ -36,7 +36,7 @@ SRC_URI:append:toolchain-clang:x86 = " \ | |||
36 | SRC_URI:append:toolchain-clang:powerpc64le = " \ | 36 | SRC_URI:append:toolchain-clang:powerpc64le = " \ |
37 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ | 37 | file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ |
38 | " | 38 | " |
39 | SRC_URI[sha256sum] = "d7cbcc5fbfb31e9001f3f0150bbeda59abe5dd7137aaa6273958cd59ce35ced7" | 39 | SRC_URI[sha256sum] = "11d229fcad7e6e10f450301223c602043f021cda51259ffafc7e55e484b37dc7" |
40 | 40 | ||
41 | S = "${WORKDIR}/node-v${PV}" | 41 | S = "${WORKDIR}/node-v${PV}" |
42 | 42 | ||
diff --git a/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb new file mode 100644 index 000000000..0eaf2137b --- /dev/null +++ b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | DESPCRIPTION = "DBD::MariaDB is the Perl5 Database Interface driver for MariaDB and MySQL databases." | ||
2 | HOMEPAGE = "https://metacpan.org/dist/DBD-MariaDB" | ||
3 | LICENSE = "GPL-1.0-only" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" | ||
5 | |||
6 | DEPENDS = "libdbi-perl-native libdev-checklib-perl-native libmysqlclient" | ||
7 | |||
8 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PA/PALI/DBD-MariaDB-${PV}.tar.gz" | ||
9 | SRC_URI[sha256sum] = "0d0c76c660ddd55570e48f3e2fdea8f621a69ac0ed48190e8cfcafcb5e9b859d" | ||
10 | |||
11 | RDEPENDS:${PN} = "libdbi-perl" | ||
12 | |||
13 | S = "${WORKDIR}/DBD-MariaDB-${PV}" | ||
14 | |||
15 | inherit cpan | ||
16 | |||
17 | RDEPENDS:${PN}-ptest += " \ | ||
18 | libtest-warnings-perl \ | ||
19 | perl-module-test-more \ | ||
20 | " | ||
diff --git a/meta-oe/recipes-devtools/perl/exiftool_12.72.bb b/meta-oe/recipes-devtools/perl/exiftool_12.85.bb index ba3e3fdf7..66e9a3b71 100644 --- a/meta-oe/recipes-devtools/perl/exiftool_12.72.bb +++ b/meta-oe/recipes-devtools/perl/exiftool_12.85.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff | |||
7 | 7 | ||
8 | inherit cpan | 8 | inherit cpan |
9 | 9 | ||
10 | SRCREV = "fc4f6614ff0c19bb5f332a9c464dcef7267931df" | 10 | SRCREV = "405674e0c477931b60b10a78828483ef54761385" |
11 | SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master" |
12 | 12 | ||
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb deleted file mode 100644 index fc505fe1e..000000000 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | SUMMARY = "A Perl DBI driver for MySQL" | ||
2 | DESCRIPTION = "DBD::mysql is the Perl5 Database Interface driver for \ | ||
3 | the MySQL database. In other words: DBD::mysql is an interface between \ | ||
4 | the Perl programming language and the MySQL programming API that comes \ | ||
5 | with the MySQL relational database management system. Most functions \ | ||
6 | provided by this programming API are supported. Some rarely used \ | ||
7 | functions are missing, mainly because no-one ever requested them. \ | ||
8 | " | ||
9 | HOMEPAGE = "https://github.com/perl5-dbi/DBD-mysql" | ||
10 | |||
11 | SECTION = "libs" | ||
12 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | ||
13 | DEPENDS += "libdev-checklib-perl-native libdbi-perl-native libmysqlclient" | ||
14 | |||
15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" | ||
16 | |||
17 | SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6" | ||
18 | SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https;branch=master" | ||
19 | |||
20 | S = "${WORKDIR}/git" | ||
21 | |||
22 | inherit cpan | ||
diff --git a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch index a967d6412..c74369746 100644 --- a/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch +++ b/meta-oe/recipes-devtools/php/php/0001-ext-opcache-config.m4-enable-opcache.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From ca9b419f2c146061f73ee045cb0a069c18b40cd0 Mon Sep 17 00:00:00 2001 | 1 | From 889583912ddd7abc628f2703892ec4884db6419a Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Soumya Sambu <soumya.sambu@windriver.com> |
3 | Date: Wed, 15 Dec 2021 14:00:08 +0800 | 3 | Date: Tue, 7 May 2024 08:39:16 +0000 |
4 | Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache | 4 | Subject: [PATCH 01/11] ext/opcache/config.m4: enable opcache |
5 | 5 | ||
6 | We can't use AC_TRY_RUN to run programs in a cross compile | 6 | We can't use AC_TRY_RUN to run programs in a cross compile |
@@ -20,15 +20,18 @@ Signed-off-by: Claude Bing <cbing@cybernetics.com> | |||
20 | 20 | ||
21 | update patch to version 8.1.0 | 21 | update patch to version 8.1.0 |
22 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 22 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
23 | |||
24 | update patch to version 8.2.18 | ||
25 | Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> | ||
23 | --- | 26 | --- |
24 | ext/opcache/config.m4 | 204 ++---------------------------------------- | 27 | ext/opcache/config.m4 | 204 ++---------------------------------------- |
25 | 1 file changed, 8 insertions(+), 196 deletions(-) | 28 | 1 file changed, 8 insertions(+), 196 deletions(-) |
26 | 29 | ||
27 | diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 | 30 | diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 |
28 | index 2a83fa2..9471b5d 100644 | 31 | index 6bf07ad3..5d645b86 100644 |
29 | --- a/ext/opcache/config.m4 | 32 | --- a/ext/opcache/config.m4 |
30 | +++ b/ext/opcache/config.m4 | 33 | +++ b/ext/opcache/config.m4 |
31 | @@ -108,209 +108,21 @@ if test "$PHP_OPCACHE" != "no"; then | 34 | @@ -113,209 +113,21 @@ if test "$PHP_OPCACHE" != "no"; then |
32 | AC_CHECK_FUNCS([mprotect]) | 35 | AC_CHECK_FUNCS([mprotect]) |
33 | 36 | ||
34 | AC_MSG_CHECKING(for sysvipc shared memory support) | 37 | AC_MSG_CHECKING(for sysvipc shared memory support) |
@@ -40,7 +43,7 @@ index 2a83fa2..9471b5d 100644 | |||
40 | -#include <unistd.h> | 43 | -#include <unistd.h> |
41 | -#include <string.h> | 44 | -#include <string.h> |
42 | - | 45 | - |
43 | -int main() { | 46 | -int main(void) { |
44 | - pid_t pid; | 47 | - pid_t pid; |
45 | - int status; | 48 | - int status; |
46 | - int ipc_id; | 49 | - int ipc_id; |
@@ -121,7 +124,7 @@ index 2a83fa2..9471b5d 100644 | |||
121 | -# define MAP_FAILED ((void*)-1) | 124 | -# define MAP_FAILED ((void*)-1) |
122 | -#endif | 125 | -#endif |
123 | - | 126 | - |
124 | -int main() { | 127 | -int main(void) { |
125 | - pid_t pid; | 128 | - pid_t pid; |
126 | - int status; | 129 | - int status; |
127 | - char *shm; | 130 | - char *shm; |
@@ -185,7 +188,7 @@ index 2a83fa2..9471b5d 100644 | |||
185 | -# define MAP_FAILED ((void*)-1) | 188 | -# define MAP_FAILED ((void*)-1) |
186 | -#endif | 189 | -#endif |
187 | - | 190 | - |
188 | -int main() { | 191 | -int main(void) { |
189 | - pid_t pid; | 192 | - pid_t pid; |
190 | - int status; | 193 | - int status; |
191 | - int fd; | 194 | - int fd; |
@@ -247,5 +250,5 @@ index 2a83fa2..9471b5d 100644 | |||
247 | PHP_NEW_EXTENSION(opcache, | 250 | PHP_NEW_EXTENSION(opcache, |
248 | ZendAccelerator.c \ | 251 | ZendAccelerator.c \ |
249 | -- | 252 | -- |
250 | 2.17.1 | 253 | 2.40.0 |
251 | 254 | ||
diff --git a/meta-oe/recipes-devtools/php/php_8.2.16.bb b/meta-oe/recipes-devtools/php/php_8.2.18.bb index 1cb378fb9..e662f6806 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.16.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.18.bb | |||
@@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \ | |||
34 | " | 34 | " |
35 | 35 | ||
36 | S = "${WORKDIR}/php-${PV}" | 36 | S = "${WORKDIR}/php-${PV}" |
37 | SRC_URI[sha256sum] = "2658c1b8935ab6b53a7f209354602761ab07066e66920bc472b8815fd1b43f71" | 37 | SRC_URI[sha256sum] = "ca0b07c254200320f518ac5b3df540a9cf14d866f3c93edc3013b52e06fac796" |
38 | 38 | ||
39 | CVE_STATUS_GROUPS += "CVE_STATUS_PHP" | 39 | CVE_STATUS_GROUPS += "CVE_STATUS_PHP" |
40 | CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." | 40 | CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." |
@@ -182,19 +182,19 @@ do_install:append:class-target() { | |||
182 | rm -rf ${D}/.[a-z]* | 182 | rm -rf ${D}/.[a-z]* |
183 | rm -rf ${D}/var | 183 | rm -rf ${D}/var |
184 | rm -f ${D}/${sysconfdir}/php-fpm.conf.default | 184 | rm -f ${D}/${sysconfdir}/php-fpm.conf.default |
185 | install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf | 185 | install -m 0644 ${UNPACKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf |
186 | install -d ${D}/${sysconfdir}/apache2/conf.d | 186 | install -d ${D}/${sysconfdir}/apache2/conf.d |
187 | install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf | 187 | install -m 0644 ${UNPACKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf |
188 | install -d ${D}${sysconfdir}/init.d | 188 | install -d ${D}${sysconfdir}/init.d |
189 | sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm | 189 | sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm |
190 | sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm | 190 | sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm |
191 | sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm | 191 | sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm |
192 | install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm | 192 | install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm |
193 | install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf | 193 | install -m 0644 ${UNPACKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf |
194 | 194 | ||
195 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then | 195 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then |
196 | install -d ${D}${systemd_system_unitdir} | 196 | install -d ${D}${systemd_system_unitdir} |
197 | install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_system_unitdir}/php-fpm.service | 197 | install -m 0644 ${UNPACKDIR}/php-fpm.service ${D}${systemd_system_unitdir}/php-fpm.service |
198 | sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_system_unitdir}/php-fpm.service | 198 | sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_system_unitdir}/php-fpm.service |
199 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/php-fpm.service | 199 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/php-fpm.service |
200 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/php-fpm.service | 200 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/php-fpm.service |
@@ -203,7 +203,7 @@ do_install:append:class-target() { | |||
203 | if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then | 203 | if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then |
204 | install -d ${D}${sysconfdir}/apache2/modules.d | 204 | install -d ${D}${sysconfdir}/apache2/modules.d |
205 | install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} | 205 | install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} |
206 | install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d | 206 | install -m 644 ${UNPACKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d |
207 | sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf | 207 | sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf |
208 | cat ${S}/php.ini-production | \ | 208 | cat ${S}/php.ini-production | \ |
209 | sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ | 209 | sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ |
diff --git a/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch b/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch deleted file mode 100644 index a41f985eb..000000000 --- a/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From cef3fc90f02ef4fc49515745194bac3d81a2265b Mon Sep 17 00:00:00 2001 | ||
2 | From: "Jose E. Marchesi" <jose.marchesi@oracle.com> | ||
3 | Date: Fri, 30 Apr 2021 13:17:05 +0200 | ||
4 | Subject: [PATCH] build: do not check for Tcl/Tk if --disable-gui is specified | ||
5 | |||
6 | 2021-04-30 Jose E. Marchesi <jemarch@gnu.org> | ||
7 | |||
8 | * configure.ac: Do not check for tcl/tk if --disable-gui is | ||
9 | specified at configure time. | ||
10 | |||
11 | (cherry picked from commit 280a5e154287e43c0a40d9530a9cc658a7367a9c) | ||
12 | [Romain: remove Changelog entry] | ||
13 | Signed-off-by: Romain Naour <romain.naour@gmail.com> | ||
14 | --- | ||
15 | Upstream-Status: Pending | ||
16 | |||
17 | configure.ac | 9 ++++++--- | ||
18 | 1 file changed, 6 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index c7205513..c2f0760a 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -214,12 +214,15 @@ fi | ||
25 | dnl The GUI is optional, and depends on the availability of Tcl and | ||
26 | dnl Tk. | ||
27 | |||
28 | -POKE_TCLTK | ||
29 | - | ||
30 | AC_ARG_ENABLE([gui], | ||
31 | AS_HELP_STRING([--enable-gui], | ||
32 | [Enable the GUI (default is YES)]), | ||
33 | - [gui_enabled=$enableval], [gui_enabled=$has_tcltk]) | ||
34 | + [gui_enabled=$enableval], [gui_enabled=yes]) | ||
35 | + | ||
36 | +if test "x$gui_enabled" = "xyes"; then | ||
37 | + POKE_TCLTK | ||
38 | + gui_enabled=$has_tcltk | ||
39 | +fi | ||
40 | |||
41 | AM_CONDITIONAL([GUI], [test "x$gui_enabled" = "xyes"]) | ||
42 | |||
43 | -- | ||
44 | 2.30.2 | ||
45 | |||
diff --git a/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch b/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch deleted file mode 100644 index 660b19f51..000000000 --- a/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From c37419e459bd5863534719fa50755174d0912e6d Mon Sep 17 00:00:00 2001 | ||
2 | From: Romain Naour <romain.naour@gmail.com> | ||
3 | Date: Fri, 30 Apr 2021 14:32:21 +0200 | ||
4 | Subject: [PATCH] jitter: jitter-config.in: avoit host poisoning while | ||
5 | cross-compiling | ||
6 | |||
7 | When jitter is bundled into another project (poke), jitter-config --cppflags | ||
8 | return an unsafe path "-I /usr/include". | ||
9 | |||
10 | In the context of Buildroot, such configuration script woulf be "fixed" | ||
11 | after installation. But jitter-config is not installed by poke since it's | ||
12 | build as static library and liked to poke. | ||
13 | |||
14 | For now, patch jitter-config.in instead of jitter-config.in.m4sh since | ||
15 | there is an issue while converting the M4sh m4sh script ( .in.m4sh ) | ||
16 | into a portable shell script ( .in ) ready to be processed by aclocal | ||
17 | for @-substitutions. | ||
18 | |||
19 | [1] https://git.buildroot.net/buildroot/tree/package/pkg-generic.mk?h=2021.02.1#n291 | ||
20 | |||
21 | Signed-off-by: Romain Naour <romain.naour@gmail.com> | ||
22 | --- | ||
23 | Upstream-Status: Pending | ||
24 | |||
25 | jitter/bin/jitter-config.in | 6 +----- | ||
26 | 1 file changed, 1 insertion(+), 5 deletions(-) | ||
27 | |||
28 | diff --git a/jitter/bin/jitter-config.in b/jitter/bin/jitter-config.in | ||
29 | index 5e124f0..af0ac9d 100644 | ||
30 | --- a/jitter/bin/jitter-config.in | ||
31 | +++ b/jitter/bin/jitter-config.in | ||
32 | @@ -998,11 +998,7 @@ while test "$#" != "0"; do | ||
33 | append_to_output cflags;; | ||
34 | --cppflags) | ||
35 | no_option_argument | ||
36 | - append_to_output cppflags | ||
37 | - # Append a -I argument. This is defined separately from the rest, | ||
38 | - # as the installation prefix can be decided very late, at Jitter | ||
39 | - # installation time. | ||
40 | - output="$output -I $includedir";; | ||
41 | + append_to_output cppflags;; | ||
42 | --ldadd) | ||
43 | no_option_argument | ||
44 | append_to_output ldadd;; | ||
45 | -- | ||
46 | 2.30.2 | ||
47 | |||
diff --git a/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index ad2bf764d..67384b73d 100644 --- a/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch | |||
@@ -11,18 +11,16 @@ Avoid: | |||
11 | ./../poke/poke -o ./poke.1 | 11 | ./../poke/poke -o ./poke.1 |
12 | ../run: line 51: exec: :: not found | 12 | ../run: line 51: exec: :: not found |
13 | 13 | ||
14 | Upstream-Status: Pending | ||
14 | Signed-off-by: Romain Naour <romain.naour@gmail.com> | 15 | Signed-off-by: Romain Naour <romain.naour@gmail.com> |
15 | --- | 16 | --- |
16 | Upstream-Status: Pending | ||
17 | 17 | ||
18 | configure.ac | 2 +- | 18 | configure.ac | 2 +- |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/configure.ac b/configure.ac | ||
22 | index c2f0760a..93769ef9 100644 | ||
23 | --- a/configure.ac | 21 | --- a/configure.ac |
24 | +++ b/configure.ac | 22 | +++ b/configure.ac |
25 | @@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) | 23 | @@ -148,7 +148,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) |
26 | if test $cross_compiling = no; then | 24 | if test $cross_compiling = no; then |
27 | AM_MISSING_PROG(HELP2MAN, help2man) | 25 | AM_MISSING_PROG(HELP2MAN, help2man) |
28 | else | 26 | else |
@@ -30,7 +28,4 @@ index c2f0760a..93769ef9 100644 | |||
30 | + HELP2MAN=true | 28 | + HELP2MAN=true |
31 | fi | 29 | fi |
32 | 30 | ||
33 | dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to | 31 | dnl The following Automake conditional is used in some Makefile.am files |
34 | -- | ||
35 | 2.30.2 | ||
36 | |||
diff --git a/meta-oe/recipes-devtools/poke/poke_1.2.bb b/meta-oe/recipes-devtools/poke/poke_4.1.bb index af85d2170..296368070 100644 --- a/meta-oe/recipes-devtools/poke/poke_1.2.bb +++ b/meta-oe/recipes-devtools/poke/poke_4.1.bb | |||
@@ -6,14 +6,12 @@ LICENSE = "GPL-3.0-or-later" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
7 | 7 | ||
8 | SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \ | 8 | SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \ |
9 | file://0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch \ | ||
10 | file://0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch \ | ||
11 | file://0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch \ | 9 | file://0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch \ |
12 | " | 10 | " |
13 | 11 | ||
14 | DEPENDS = "flex-native bison-native bdwgc readline" | 12 | DEPENDS = "flex-native bison-native bdwgc readline" |
15 | 13 | ||
16 | SRC_URI[sha256sum] = "f61cf8da5b64c01a1359373725aad1ca257f35c1c9269e4d50dd0664183ddf62" | 14 | SRC_URI[sha256sum] = "08ecaea41f7374acd4238e12bbf97e8cd5e572d5917e956b73b9d43026e9d740" |
17 | 15 | ||
18 | # poke does not support using out-of-tree builds | 16 | # poke does not support using out-of-tree builds |
19 | inherit autotools-brokensep gettext pkgconfig | 17 | inherit autotools-brokensep gettext pkgconfig |
@@ -29,4 +27,7 @@ EXTRA_OECONF = "--disable-gui \ | |||
29 | 27 | ||
30 | PACKAGECONFIG[mi] = "--enable-mi,--disable-mi,json-c" | 28 | PACKAGECONFIG[mi] = "--enable-mi,--disable-mi,json-c" |
31 | 29 | ||
32 | FILES:${PN} += "${datadir}/emacs/site-lisp" | 30 | PACKAGES =+ "${PN}-emacs ${PN}-vim" |
31 | |||
32 | FILES:${PN}-emacs += "${datadir}/emacs/site-lisp" | ||
33 | FILES:${PN}-vim += "${datadir}/vim/vimfiles" | ||
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb index 324134596..4f8515471 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb | |||
@@ -116,3 +116,4 @@ LDFLAGS:append:arm = " -latomic" | |||
116 | LDFLAGS:append:mips = " -latomic" | 116 | LDFLAGS:append:mips = " -latomic" |
117 | LDFLAGS:append:powerpc = " -latomic" | 117 | LDFLAGS:append:powerpc = " -latomic" |
118 | LDFLAGS:append:mipsel = " -latomic" | 118 | LDFLAGS:append:mipsel = " -latomic" |
119 | LDFLAGS:append:riscv32 = " -latomic" | ||
diff --git a/meta-oe/recipes-devtools/python/python3-pefile/run-ptest b/meta-oe/recipes-devtools/python/python3-pefile/run-ptest new file mode 100644 index 000000000..95ae72306 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python3-pefile/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | pytest --automake --ignore=./tests/pefile_test.py | ||
diff --git a/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb b/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb new file mode 100644 index 000000000..e30b36232 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | SUMMARY = "Python PE parsing module" | ||
2 | DESCRIPTION = "A multi-platform Python module to parse and work with Portable Executable (PE) files." | ||
3 | HOMEPAGE = "https://github.com/erocarrera/pefile" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38066667888b01d8118ff9cc23da1873" | ||
6 | |||
7 | inherit setuptools3 ptest | ||
8 | SRCREV = "1ab2807c4eec16041e791d7a6acc68cc23fd5266" | ||
9 | SRC_URI = "git://github.com/erocarrera/pefile;branch=master;protocol=https \ | ||
10 | file://run-ptest" | ||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | BBCLASSEXTEND = "native nativesdk" | ||
14 | |||
15 | do_install_ptest() { | ||
16 | install -d ${D}${PTEST_PATH}/tests | ||
17 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
18 | } | ||
19 | |||
20 | RDEPENDS:${PN} += " \ | ||
21 | python3-mmap \ | ||
22 | python3-netclient \ | ||
23 | python3-stringold \ | ||
24 | " | ||
25 | RDEPENDS:${PN}-ptest += "\ | ||
26 | python3-pytest \ | ||
27 | python3-unittest-automake-output \ | ||
28 | " | ||
diff --git a/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb new file mode 100644 index 000000000..1b064faf1 --- /dev/null +++ b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | SUMMARY = "sexpect is another implementation of Expect which is specifically designed for Shell scripts" | ||
2 | HOMEPAGE = "https://github.com/clarkwang/sexpect" | ||
3 | LICENSE = "GPL-3.0-only" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" | ||
5 | |||
6 | BRANCH = "master" | ||
7 | SRC_URI = "git://github.com/clarkwang/sexpect;branch=${BRANCH};protocol=https" | ||
8 | SRCREV = "532a52d36aae442b7fe1ce20a59effd1dbc6e6fe" | ||
9 | |||
10 | S = "${WORKDIR}/git" | ||
11 | |||
12 | inherit cmake | ||
diff --git a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.1.bb index 880af82bb..a542396d4 100644 --- a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb +++ b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.1.bb | |||
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=a709b68f1ce8a9f10aeea6401446c1f4 \ | |||
11 | file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8 \ | 11 | file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8 \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRCREV = "f2a3ad56e40c9711b23371238f9fa07dd24245f1" | 14 | SRCREV = "8f9966c8ea3ea8a854941d041e7fcb9eb4f772fb" |
15 | SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=master" | 15 | SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=fixes-1.3.0" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
diff --git a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb index f7160f508..3360ccf35 100644 --- a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb +++ b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb | |||
@@ -7,9 +7,10 @@ inherit nativesdk | |||
7 | 7 | ||
8 | SRC_URI = "file://systemctl" | 8 | SRC_URI = "file://systemctl" |
9 | 9 | ||
10 | S = "${WORKDIR}" | 10 | S = "${WORKDIR}/sources" |
11 | UNPACKDIR = "${S}" | ||
11 | 12 | ||
12 | do_install() { | 13 | do_install() { |
13 | install -d ${D}${bindir} | 14 | install -d ${D}${bindir} |
14 | install -m 0755 ${WORKDIR}/systemctl ${D}${bindir} | 15 | install -m 0755 ${UNPACKDIR}/systemctl ${D}${bindir} |
15 | } | 16 | } |
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.15.2.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.16.bb index 60436025a..320b5a88a 100644 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.15.2.bb +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.16.bb | |||
@@ -10,7 +10,7 @@ DEPENDS:append:libc-musl = " argp-standalone" | |||
10 | 10 | ||
11 | inherit autotools | 11 | inherit autotools |
12 | 12 | ||
13 | SRCREV = "9d8657e90b918994d7d2bcf6dd2cc7354c35a1b4" | 13 | SRCREV = "68aed9b0a20d3d1b5e1dc15e0f8aabba7e34735b" |
14 | SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \ | 14 | SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \ |
15 | file://0001-include-libgen.h-for-basename.patch" | 15 | file://0001-include-libgen.h-for-basename.patch" |
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-fix-incompatible-pointer-types.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-fix-incompatible-pointer-types.patch new file mode 100644 index 000000000..8744cdd10 --- /dev/null +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-fix-incompatible-pointer-types.patch | |||
@@ -0,0 +1,355 @@ | |||
1 | Fix compile errors when gcc option '-Wincompatible-pointer-types' set: | ||
2 | |||
3 | mx.c: In function 'mx_setdate': | ||
4 | mx.c:1286:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
5 | 1286 | utime (file,tp); /* set the times */ | ||
6 | | ^~ | ||
7 | | | | ||
8 | | time_t * {aka long int *} | ||
9 | |||
10 | Upstream-Status: Inactive-Upstream [lastrelease: 2011] | ||
11 | |||
12 | [1]: https://en.wikipedia.org/wiki/UW_IMAP | ||
13 | |||
14 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
15 | |||
16 | --- | ||
17 | src/osdep/unix/mbx.c | 12 ++++++------ | ||
18 | src/osdep/unix/mh.c | 2 +- | ||
19 | src/osdep/unix/mmdf.c | 10 +++++----- | ||
20 | src/osdep/unix/mtx.c | 16 ++++++++-------- | ||
21 | src/osdep/unix/mx.c | 2 +- | ||
22 | src/osdep/unix/tenex.c | 16 ++++++++-------- | ||
23 | src/osdep/unix/unix.c | 10 +++++----- | ||
24 | 7 files changed, 34 insertions(+), 34 deletions(-) | ||
25 | |||
26 | diff --git a/src/osdep/unix/mbx.c b/src/osdep/unix/mbx.c | ||
27 | index c8a45a5..0a587fe 100644 | ||
28 | --- a/src/osdep/unix/mbx.c | ||
29 | +++ b/src/osdep/unix/mbx.c | ||
30 | @@ -302,7 +302,7 @@ int mbx_isvalid (MAILSTREAM **stream,char *name,char *tmp,int *ld,char *lock, | ||
31 | if (sbuf.st_ctime > sbuf.st_atime) { | ||
32 | tp[0] = sbuf.st_atime; /* preserve atime and mtime */ | ||
33 | tp[1] = sbuf.st_mtime; | ||
34 | - utime (tmp,tp); /* set the times */ | ||
35 | + utime (tmp, (const struct utimbuf *)tp); /* set the times */ | ||
36 | } | ||
37 | } | ||
38 | /* in case INBOX but not mbx format */ | ||
39 | @@ -776,7 +776,7 @@ void mbx_flag (MAILSTREAM *stream,char *sequence,char *flag,long flags) | ||
40 | stream->user_flags[LOCAL->ffuserflag]) || (oldpid != LOCAL->lastpid)) | ||
41 | mbx_update_header (stream); | ||
42 | tp[0] = time (0); /* make sure read comes after all that */ | ||
43 | - utime (stream->mailbox,tp); | ||
44 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
45 | } | ||
46 | if (LOCAL->ld >= 0) { /* unlock now */ | ||
47 | unlockfd (LOCAL->ld,LOCAL->lock); | ||
48 | @@ -1075,7 +1075,7 @@ long mbx_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
49 | /* else preserve \Marked status */ | ||
50 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
51 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
52 | - utime (file,tp); /* set the times */ | ||
53 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
54 | close (fd); /* close the file */ | ||
55 | MM_NOCRITICAL (stream); /* release critical */ | ||
56 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
57 | @@ -1213,7 +1213,7 @@ long mbx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) | ||
58 | /* else preserve \Marked status */ | ||
59 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
60 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
61 | - utime (file,tp); /* set the times */ | ||
62 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
63 | fclose (df); /* close the file */ | ||
64 | MM_NOCRITICAL (dstream); /* release critical */ | ||
65 | } | ||
66 | @@ -1446,7 +1446,7 @@ long mbx_parse (MAILSTREAM *stream) | ||
67 | time_t tp[2]; | ||
68 | tp[0] = time (0); | ||
69 | tp[1] = LOCAL->filetime; | ||
70 | - utime (stream->mailbox,tp); | ||
71 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
72 | } | ||
73 | stream->silent = silent; /* can pass up events now */ | ||
74 | mail_exists (stream,nmsgs); /* notify upper level of new mailbox size */ | ||
75 | @@ -1814,7 +1814,7 @@ unsigned long mbx_rewrite (MAILSTREAM *stream,unsigned long *reclaimed, | ||
76 | fstat (LOCAL->fd,&sbuf); /* get new write time */ | ||
77 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
78 | tp[0] = time (0); /* reset atime to now */ | ||
79 | - utime (stream->mailbox,tp); | ||
80 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
81 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
82 | /* notify upper level of new mailbox size */ | ||
83 | mail_exists (stream,stream->nmsgs); | ||
84 | diff --git a/src/osdep/unix/mh.c b/src/osdep/unix/mh.c | ||
85 | index 9264624..26f3539 100644 | ||
86 | --- a/src/osdep/unix/mh.c | ||
87 | +++ b/src/osdep/unix/mh.c | ||
88 | @@ -1279,5 +1279,5 @@ void mh_setdate (char *file,MESSAGECACHE *elt) | ||
89 | time_t tp[2]; | ||
90 | tp[0] = time (0); /* atime is now */ | ||
91 | tp[1] = mail_longdate (elt); /* modification time */ | ||
92 | - utime (file,tp); /* set the times */ | ||
93 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
94 | } | ||
95 | diff --git a/src/osdep/unix/mmdf.c b/src/osdep/unix/mmdf.c | ||
96 | index e962434..c0adbee 100644 | ||
97 | --- a/src/osdep/unix/mmdf.c | ||
98 | +++ b/src/osdep/unix/mmdf.c | ||
99 | @@ -379,7 +379,7 @@ long mmdf_isvalid (char *name,char *tmp) | ||
100 | if ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) { | ||
101 | tp[0] = sbuf.st_atime; /* preserve atime and mtime */ | ||
102 | tp[1] = sbuf.st_mtime; | ||
103 | - utime (file,tp); /* set the times */ | ||
104 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
105 | } | ||
106 | } | ||
107 | } | ||
108 | @@ -1131,7 +1131,7 @@ long mmdf_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
109 | else tp[0] = /* else preserve \Marked status */ | ||
110 | ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) ? | ||
111 | sbuf.st_atime : tp[1]; | ||
112 | - utime (file,tp); /* set the times */ | ||
113 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
114 | mmdf_unlock (fd,NIL,&lock); /* unlock and close mailbox */ | ||
115 | if (tstream) { /* update last UID if we can */ | ||
116 | MMDFLOCAL *local = (MMDFLOCAL *) tstream->local; | ||
117 | @@ -1292,7 +1292,7 @@ long mmdf_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) | ||
118 | ret = NIL; /* return error */ | ||
119 | } | ||
120 | else tp[0] = tp[1] - 1; /* set atime to now-1 if successful copy */ | ||
121 | - utime (file,tp); /* set the times */ | ||
122 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
123 | fclose (sf); /* done with scratch file */ | ||
124 | /* force UIDVALIDITY assignment now */ | ||
125 | if (tstream && !tstream->uid_validity) tstream->uid_validity = time (0); | ||
126 | @@ -1550,7 +1550,7 @@ void mmdf_unlock (int fd,MAILSTREAM *stream,DOTLOCK *lock) | ||
127 | } | ||
128 | else now = 0; /* no time change needed */ | ||
129 | /* set the times, note change */ | ||
130 | - if (now && !utime (stream->mailbox,tp)) LOCAL->filetime = tp[1]; | ||
131 | + if (now && !utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1]; | ||
132 | } | ||
133 | flock (fd,LOCK_UN); /* release flock'ers */ | ||
134 | if (!stream) close (fd); /* close the file if no stream */ | ||
135 | @@ -2393,7 +2393,7 @@ long mmdf_rewrite (MAILSTREAM *stream,unsigned long *nexp,DOTLOCK *lock, | ||
136 | /* set atime to now, mtime a second earlier */ | ||
137 | tp[1] = (tp[0] = time (0)) - 1; | ||
138 | /* set the times, note change */ | ||
139 | - if (!utime (stream->mailbox,tp)) LOCAL->filetime = tp[1]; | ||
140 | + if (!utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1]; | ||
141 | close (LOCAL->fd); /* close and reopen file */ | ||
142 | if ((LOCAL->fd = open (stream->mailbox,O_RDWR, | ||
143 | (long) mail_parameters (NIL,GET_MBXPROTECTION,NIL))) | ||
144 | diff --git a/src/osdep/unix/mtx.c b/src/osdep/unix/mtx.c | ||
145 | index 8e6f76e..f64142b 100644 | ||
146 | --- a/src/osdep/unix/mtx.c | ||
147 | +++ b/src/osdep/unix/mtx.c | ||
148 | @@ -196,7 +196,7 @@ int mtx_isvalid (char *name,char *tmp) | ||
149 | if (sbuf.st_ctime > sbuf.st_atime) { | ||
150 | tp[0] = sbuf.st_atime; /* preserve atime and mtime */ | ||
151 | tp[1] = sbuf.st_mtime; | ||
152 | - utime (file,tp); /* set the times */ | ||
153 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
154 | } | ||
155 | } | ||
156 | } | ||
157 | @@ -565,7 +565,7 @@ void mtx_flag (MAILSTREAM *stream,char *sequence,char *flag,long flags) | ||
158 | fstat (LOCAL->fd,&sbuf); /* get current write time */ | ||
159 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
160 | tp[0] = time (0); /* make sure read comes after all that */ | ||
161 | - utime (stream->mailbox,tp); | ||
162 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
163 | } | ||
164 | } | ||
165 | |||
166 | @@ -834,7 +834,7 @@ long mtx_expunge (MAILSTREAM *stream,char *sequence,long options) | ||
167 | fstat (LOCAL->fd,&sbuf); /* get new write time */ | ||
168 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
169 | tp[0] = time (0); /* reset atime to now */ | ||
170 | - utime (stream->mailbox,tp); | ||
171 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
172 | MM_NOCRITICAL (stream); /* release critical */ | ||
173 | /* notify upper level of new mailbox size */ | ||
174 | mail_exists (stream,stream->nmsgs); | ||
175 | @@ -929,7 +929,7 @@ long mtx_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
176 | /* else preserve \Marked status */ | ||
177 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
178 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
179 | - utime (file,tp); /* set the times */ | ||
180 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
181 | close (fd); /* close the file */ | ||
182 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
183 | MM_NOCRITICAL (stream); /* release critical */ | ||
184 | @@ -946,7 +946,7 @@ long mtx_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
185 | fstat (LOCAL->fd,&sbuf); /* get current write time */ | ||
186 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
187 | tp[0] = time (0); /* make sure atime remains greater */ | ||
188 | - utime (stream->mailbox,tp); | ||
189 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
190 | } | ||
191 | } | ||
192 | if (ret && mail_parameters (NIL,GET_COPYUID,NIL)) | ||
193 | @@ -1062,7 +1062,7 @@ long mtx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) | ||
194 | /* else preserve \Marked status */ | ||
195 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
196 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
197 | - utime (file,tp); /* set the times */ | ||
198 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
199 | fclose (df); /* close the file */ | ||
200 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
201 | MM_NOCRITICAL (stream); /* release critical */ | ||
202 | @@ -1212,7 +1212,7 @@ long mtx_parse (MAILSTREAM *stream) | ||
203 | time_t tp[2]; | ||
204 | tp[0] = time (0); | ||
205 | tp[1] = LOCAL->filetime; | ||
206 | - utime (stream->mailbox,tp); | ||
207 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
208 | } | ||
209 | stream->silent = silent; /* can pass up events now */ | ||
210 | mail_exists (stream,nmsgs); /* notify upper level of new mailbox size */ | ||
211 | @@ -1312,7 +1312,7 @@ void mtx_update_status (MAILSTREAM *stream,unsigned long msgno,long syncflag) | ||
212 | fstat (LOCAL->fd,&sbuf); /* get new write time */ | ||
213 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
214 | tp[0] = time (0); /* make sure read is later */ | ||
215 | - utime (stream->mailbox,tp); | ||
216 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
217 | } | ||
218 | } | ||
219 | } | ||
220 | diff --git a/src/osdep/unix/mx.c b/src/osdep/unix/mx.c | ||
221 | index b5c5adf..4146409 100644 | ||
222 | --- a/src/osdep/unix/mx.c | ||
223 | +++ b/src/osdep/unix/mx.c | ||
224 | @@ -1283,5 +1283,5 @@ void mx_setdate (char *file,MESSAGECACHE *elt) | ||
225 | time_t tp[2]; | ||
226 | tp[0] = time (0); /* atime is now */ | ||
227 | tp[1] = mail_longdate (elt); /* modification time */ | ||
228 | - utime (file,tp); /* set the times */ | ||
229 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
230 | } | ||
231 | diff --git a/src/osdep/unix/tenex.c b/src/osdep/unix/tenex.c | ||
232 | index eee61fb..622da61 100644 | ||
233 | --- a/src/osdep/unix/tenex.c | ||
234 | +++ b/src/osdep/unix/tenex.c | ||
235 | @@ -203,7 +203,7 @@ int tenex_isvalid (char *name,char *tmp) | ||
236 | if (sbuf.st_ctime > sbuf.st_atime) { | ||
237 | tp[0] = sbuf.st_atime; /* preserve atime and mtime */ | ||
238 | tp[1] = sbuf.st_mtime; | ||
239 | - utime (file,tp); /* set the times */ | ||
240 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
241 | } | ||
242 | } | ||
243 | } | ||
244 | @@ -654,7 +654,7 @@ void tenex_flag (MAILSTREAM *stream,char *sequence,char *flag,long flags) | ||
245 | fstat (LOCAL->fd,&sbuf); /* get current write time */ | ||
246 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
247 | tp[0] = time (0); /* make sure read comes after all that */ | ||
248 | - utime (stream->mailbox,tp); | ||
249 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
250 | } | ||
251 | } | ||
252 | |||
253 | @@ -924,7 +924,7 @@ long tenex_expunge (MAILSTREAM *stream,char *sequence,long options) | ||
254 | fstat (LOCAL->fd,&sbuf); /* get new write time */ | ||
255 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
256 | tp[0] = time (0); /* reset atime to now */ | ||
257 | - utime (stream->mailbox,tp); | ||
258 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
259 | MM_NOCRITICAL (stream); /* release critical */ | ||
260 | /* notify upper level of new mailbox size */ | ||
261 | mail_exists (stream,stream->nmsgs); | ||
262 | @@ -1019,7 +1019,7 @@ long tenex_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
263 | /* else preserve \Marked status */ | ||
264 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
265 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
266 | - utime (file,tp); /* set the times */ | ||
267 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
268 | close (fd); /* close the file */ | ||
269 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
270 | MM_NOCRITICAL (stream); /* release critical */ | ||
271 | @@ -1036,7 +1036,7 @@ long tenex_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
272 | fstat (LOCAL->fd,&sbuf); /* get current write time */ | ||
273 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
274 | tp[0] = time (0); /* make sure atime remains greater */ | ||
275 | - utime (stream->mailbox,tp); | ||
276 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
277 | } | ||
278 | } | ||
279 | if (ret && mail_parameters (NIL,GET_COPYUID,NIL)) | ||
280 | @@ -1159,7 +1159,7 @@ long tenex_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) | ||
281 | /* else preserve \Marked status */ | ||
282 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
283 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
284 | - utime (file,tp); /* set the times */ | ||
285 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
286 | fclose (df); /* close the file */ | ||
287 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
288 | MM_NOCRITICAL (stream); /* release critical */ | ||
289 | @@ -1324,7 +1324,7 @@ long tenex_parse (MAILSTREAM *stream) | ||
290 | time_t tp[2]; | ||
291 | tp[0] = time (0); | ||
292 | tp[1] = LOCAL->filetime; | ||
293 | - utime (stream->mailbox,tp); | ||
294 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
295 | } | ||
296 | stream->silent = silent; /* can pass up events now */ | ||
297 | mail_exists (stream,nmsgs); /* notify upper level of new mailbox size */ | ||
298 | @@ -1424,7 +1424,7 @@ void tenex_update_status (MAILSTREAM *stream,unsigned long msgno,long syncflag) | ||
299 | fstat (LOCAL->fd,&sbuf); /* get new write time */ | ||
300 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
301 | tp[0] = time (0); /* make sure read is later */ | ||
302 | - utime (stream->mailbox,tp); | ||
303 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
304 | } | ||
305 | } | ||
306 | } | ||
307 | diff --git a/src/osdep/unix/unix.c b/src/osdep/unix/unix.c | ||
308 | index 86be3f9..012dc83 100644 | ||
309 | --- a/src/osdep/unix/unix.c | ||
310 | +++ b/src/osdep/unix/unix.c | ||
311 | @@ -232,7 +232,7 @@ DRIVER *unix_valid (char *name) | ||
312 | if ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) { | ||
313 | tp[0] = sbuf.st_atime; /* yes, preserve atime and mtime */ | ||
314 | tp[1] = sbuf.st_mtime; | ||
315 | - utime (file,tp); /* set the times */ | ||
316 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
317 | } | ||
318 | } | ||
319 | } | ||
320 | @@ -999,7 +999,7 @@ long unix_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
321 | else tp[0] = /* else preserve \Marked status */ | ||
322 | ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) ? | ||
323 | sbuf.st_atime : tp[1]; | ||
324 | - utime (file,tp); /* set the times */ | ||
325 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
326 | unix_unlock (fd,NIL,&lock); /* unlock and close mailbox */ | ||
327 | if (tstream) { /* update last UID if we can */ | ||
328 | UNIXLOCAL *local = (UNIXLOCAL *) tstream->local; | ||
329 | @@ -1160,7 +1160,7 @@ long unix_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) | ||
330 | ret = NIL; /* return error */ | ||
331 | } | ||
332 | else tp[0] = tp[1] - 1; /* set atime to now-1 if successful copy */ | ||
333 | - utime (file,tp); /* set the times */ | ||
334 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
335 | fclose (sf); /* done with scratch file */ | ||
336 | /* force UIDVALIDITY assignment now */ | ||
337 | if (tstream && !tstream->uid_validity) tstream->uid_validity = time (0); | ||
338 | @@ -1425,7 +1425,7 @@ void unix_unlock (int fd,MAILSTREAM *stream,DOTLOCK *lock) | ||
339 | } | ||
340 | else now = 0; /* no time change needed */ | ||
341 | /* set the times, note change */ | ||
342 | - if (now && !utime (stream->mailbox,tp)) LOCAL->filetime = tp[1]; | ||
343 | + if (now && !utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1]; | ||
344 | } | ||
345 | flock (fd,LOCK_UN); /* release flock'ers */ | ||
346 | if (!stream) close (fd); /* close the file if no stream */ | ||
347 | @@ -2251,7 +2251,7 @@ long unix_rewrite (MAILSTREAM *stream,unsigned long *nexp,DOTLOCK *lock, | ||
348 | /* set atime to now, mtime a second earlier */ | ||
349 | tp[1] = (tp[0] = time (0)) - 1; | ||
350 | /* set the times, note change */ | ||
351 | - if (!utime (stream->mailbox,tp)) LOCAL->filetime = tp[1]; | ||
352 | + if (!utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1]; | ||
353 | close (LOCAL->fd); /* close and reopen file */ | ||
354 | if ((LOCAL->fd = open (stream->mailbox,O_RDWR, | ||
355 | (long) mail_parameters (NIL,GET_MBXPROTECTION,NIL))) | ||
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-newer-tls.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-newer-tls.patch new file mode 100644 index 000000000..958abc90f --- /dev/null +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-newer-tls.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> | ||
2 | Upstream-Status: Pending | ||
3 | |||
4 | --- imap-2007f/src/osdep/unix/ssl_unix.c.old 2024-05-08 09:41:06.183450584 +0200 | ||
5 | +++ imap-2007f/src/osdep/unix/ssl_unix.c 2024-05-08 09:43:38.512931933 +0200 | ||
6 | @@ -220,7 +220,11 @@ | ||
7 | if (ssl_last_error) fs_give ((void **) &ssl_last_error); | ||
8 | ssl_last_host = host; | ||
9 | if (!(stream->context = SSL_CTX_new ((flags & NET_TLSCLIENT) ? | ||
10 | +#if OPENSSL_VERSION_NUMBER >= 0x10100000 | ||
11 | + TLS_client_method () : | ||
12 | +#else | ||
13 | TLSv1_client_method () : | ||
14 | +#endif | ||
15 | SSLv23_client_method ()))) | ||
16 | return "SSL context failed"; | ||
17 | SSL_CTX_set_options (stream->context,0); | ||
18 | @@ -703,7 +707,11 @@ | ||
19 | } | ||
20 | /* create context */ | ||
21 | if (!(stream->context = SSL_CTX_new (start_tls ? | ||
22 | +#if OPENSSL_VERSION_NUMBER >= 0x10100000 | ||
23 | + TLS_server_method () : | ||
24 | +#else | ||
25 | TLSv1_server_method () : | ||
26 | +#endif | ||
27 | SSLv23_server_method ()))) | ||
28 | syslog (LOG_ALERT,"Unable to create SSL context, host=%.80s", | ||
29 | tcp_clienthost ()); | ||
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index dcb59f4ea..7e3bddb58 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | |||
@@ -15,6 +15,8 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \ | |||
15 | file://0001-Do-not-build-mtest.patch \ | 15 | file://0001-Do-not-build-mtest.patch \ |
16 | file://0002-tmail-Include-ctype.h-for-isdigit.patch \ | 16 | file://0002-tmail-Include-ctype.h-for-isdigit.patch \ |
17 | file://0001-Fix-Wincompatible-function-pointer-types.patch \ | 17 | file://0001-Fix-Wincompatible-function-pointer-types.patch \ |
18 | file://uw-imap-newer-tls.patch \ | ||
19 | file://uw-imap-fix-incompatible-pointer-types.patch \ | ||
18 | " | 20 | " |
19 | 21 | ||
20 | SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369" | 22 | SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369" |
diff --git a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb index 5cd20c5b1..178a5eb0b 100644 --- a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb +++ b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb | |||
@@ -27,6 +27,6 @@ inherit autotools ptest | |||
27 | 27 | ||
28 | do_install_ptest() { | 28 | do_install_ptest() { |
29 | install -d ${D}${PTEST_PATH} | 29 | install -d ${D}${PTEST_PATH} |
30 | install -m 0644 ${WORKDIR}/ptest.out.expected ${D}${PTEST_PATH}/ptest.out.expected | 30 | install -m 0644 ${UNPACKDIR}/ptest.out.expected ${D}${PTEST_PATH}/ptest.out.expected |
31 | } | 31 | } |
32 | 32 | ||
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-cmpi-bindings-Fix-build-error-with-gcc14.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-cmpi-bindings-Fix-build-error-with-gcc14.patch new file mode 100644 index 000000000..750d10a5f --- /dev/null +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-cmpi-bindings-Fix-build-error-with-gcc14.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 9e4063a9a3fb2fab69d906902a8432da2544654b Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@fujitsu.com> | ||
3 | Date: Tue, 11 Jun 2024 01:38:55 +0000 | ||
4 | Subject: [PATCH] cmpi-bindings: Fix build error with gcc14. | ||
5 | |||
6 | The build error is as the following: | ||
7 | |||
8 | | build-daily-2/tmp/work/aarch64-ubinux-linux/cmpi-bindings/1.0.4/git/swig/python/../../src/target_python.c:168:21: error: passing argument 1 of 'Py_SetProgramName' from incompatible pointer type [-Wincompatible-pointer-types] | ||
9 | | 168 | Py_SetProgramName("cmpi_swig"); | ||
10 | | | ^~~~~~~~~~~ | ||
11 | | | | | ||
12 | | | char * | ||
13 | | build-daily-2/tmp/work/aarch64-ubinux-linux/cmpi-bindings/1.0.4/recipe-sysroot/usr/include/python3.12/pylifecycle.h:37:56: note: expected 'const wchar_t *' {aka 'const unsigned int *'} but argument is of type 'char *' | ||
14 | | 37 | Py_DEPRECATED(3.11) PyAPI_FUNC(void) Py_SetProgramName(const wchar_t *); | ||
15 | | | | ||
16 | |||
17 | Upstream-Status: Submitted | ||
18 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | ||
19 | --- | ||
20 | src/target_python.c | 3 ++- | ||
21 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/src/target_python.c b/src/target_python.c | ||
24 | index a8dfd30..69a2515 100644 | ||
25 | --- a/src/target_python.c | ||
26 | +++ b/src/target_python.c | ||
27 | @@ -154,6 +154,7 @@ cleanup: | ||
28 | static int | ||
29 | PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st) | ||
30 | { | ||
31 | + const wchar_t proname[] = L"cmpi_swig"; | ||
32 | /* _SBLIM_TRACE(1,("<%d/0x%x> PyGlobalInitialize() called", getpid(), pthread_self())); */ | ||
33 | |||
34 | if (_TARGET_INIT) | ||
35 | @@ -165,7 +166,7 @@ PyGlobalInitialize(const CMPIBroker* broker, CMPIStatus* st) | ||
36 | |||
37 | _SBLIM_TRACE(1,("<%d/0x%x> Python: Loading", getpid(), pthread_self())); | ||
38 | |||
39 | - Py_SetProgramName("cmpi_swig"); | ||
40 | + Py_SetProgramName(proname); | ||
41 | Py_Initialize(); | ||
42 | #if PY_MAJOR_VERSION < 3 | ||
43 | SWIGEXPORT void SWIG_init(void); | ||
44 | -- | ||
45 | 2.34.1 | ||
46 | |||
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb index 781dc83da..cc8860253 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb | |||
@@ -10,6 +10,7 @@ SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=mast | |||
10 | file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ | 10 | file://cmpi-bindings-0.4.17-no-ruby-perl.patch \ |
11 | file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ | 11 | file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \ |
12 | file://0001-Fix-error.patch \ | 12 | file://0001-Fix-error.patch \ |
13 | file://0001-cmpi-bindings-Fix-build-error-with-gcc14.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | SRCREV = "69077ee4d249816ed428155fc933dca424167e77" | 16 | SRCREV = "69077ee4d249816ed428155fc933dca424167e77" |
diff --git a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index 02f1fcb42..df36b6469 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb | |||
@@ -63,7 +63,7 @@ EXTRA_OECONF = " \ | |||
63 | 63 | ||
64 | do_install:append() { | 64 | do_install:append() { |
65 | install -d ${D}${sysconfdir}/init.d | 65 | install -d ${D}${sysconfdir}/init.d |
66 | install -m 0755 ${WORKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd | 66 | install -m 0755 ${UNPACKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd |
67 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/collectd | 67 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/collectd |
68 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/collectd | 68 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/collectd |
69 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/collectd | 69 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/collectd |
@@ -77,7 +77,7 @@ do_install:append() { | |||
77 | 77 | ||
78 | # Install systemd unit files | 78 | # Install systemd unit files |
79 | install -d ${D}${systemd_unitdir}/system | 79 | install -d ${D}${systemd_unitdir}/system |
80 | install -m 0644 ${WORKDIR}/collectd.service ${D}${systemd_unitdir}/system | 80 | install -m 0644 ${UNPACKDIR}/collectd.service ${D}${systemd_unitdir}/system |
81 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | 81 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ |
82 | ${D}${systemd_unitdir}/system/collectd.service | 82 | ${D}${systemd_unitdir}/system/collectd.service |
83 | } | 83 | } |
diff --git a/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb b/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb index 22b6c782a..ef016b868 100644 --- a/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb +++ b/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb | |||
@@ -30,11 +30,11 @@ do_install () { | |||
30 | } | 30 | } |
31 | 31 | ||
32 | do_install_ptest() { | 32 | do_install_ptest() { |
33 | install -m 0755 "${WORKDIR}/duktape-2.7.0/hello" "${D}${PTEST_PATH}" | 33 | install -m 0755 "${S}/hello" "${D}${PTEST_PATH}" |
34 | install -m 0755 "${WORKDIR}/duktape-2.7.0/eval" "${D}${PTEST_PATH}" | 34 | install -m 0755 "${S}/eval" "${D}${PTEST_PATH}" |
35 | install -m 0755 "${WORKDIR}/duktape-2.7.0/evloop" "${D}${PTEST_PATH}" | 35 | install -m 0755 "${S}/evloop" "${D}${PTEST_PATH}" |
36 | install -m 0755 "${WORKDIR}/duktape-2.7.0/examples/eventloop/timer-test.js" "${D}${PTEST_PATH}" | 36 | install -m 0755 "${S}/examples/eventloop/timer-test.js" "${D}${PTEST_PATH}" |
37 | install -m 0755 "${WORKDIR}/duktape-2.7.0/examples/eventloop/ecma_eventloop.js" "${D}${PTEST_PATH}" | 37 | install -m 0755 "${S}/examples/eventloop/ecma_eventloop.js" "${D}${PTEST_PATH}" |
38 | } | 38 | } |
39 | 39 | ||
40 | RDEPENDS:${PN}-ptest += "make" | 40 | RDEPENDS:${PN}-ptest += "make" |
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch deleted file mode 100644 index ce12d4270..000000000 --- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From cb79329010d73e36ce64830914005f1c17f8f53c Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com> | ||
3 | Date: Sat, 23 Sep 2023 11:32:18 +0200 | ||
4 | Subject: [PATCH] cmake: fix when cross compiling | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | In order to generate protobuf files CMake need to use the protoc | ||
10 | and grpc-cpp-plugin compiled for the host architecture. | ||
11 | |||
12 | Unfortunately, the protoc and grpc-cpp-plugin in the gRPC CMake | ||
13 | configuration file are the one for the target architecture. | ||
14 | |||
15 | Fix this by properly finding the correct executable when | ||
16 | CMake is cross compiling. | ||
17 | |||
18 | Signed-off-by: Clément Péron <peron.clem@gmail.com> | ||
19 | --- | ||
20 | Upstream-Status: Pending | ||
21 | |||
22 | CMakeLists.txt | 28 ++++++++++++++++++++++++++-- | ||
23 | 1 file changed, 26 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
26 | index 5aa1310..80ebad2 100644 | ||
27 | --- a/CMakeLists.txt | ||
28 | +++ b/CMakeLists.txt | ||
29 | @@ -120,10 +120,34 @@ if(Protobuf_PROTOC_EXECUTABLE) | ||
30 | endif() | ||
31 | endif() | ||
32 | |||
33 | +# When cross compiling we look for the native protoc compiler | ||
34 | +# overwrite protobuf::protoc with the proper protoc | ||
35 | +if(CMAKE_CROSSCOMPILING) | ||
36 | + find_program(Protobuf_PROTOC_EXECUTABLE REQUIRED NAMES protoc) | ||
37 | + if(NOT TARGET protobuf::protoc) | ||
38 | + add_executable(protobuf::protoc IMPORTED) | ||
39 | + endif() | ||
40 | + set_target_properties(protobuf::protoc PROPERTIES | ||
41 | + IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}") | ||
42 | +endif() | ||
43 | + | ||
44 | find_package(gRPC QUIET) | ||
45 | -if(gRPC_FOUND AND TARGET gRPC::grpc AND TARGET gRPC::grpc_cpp_plugin) | ||
46 | +if(gRPC_FOUND AND TARGET gRPC::grpc) | ||
47 | + # When cross compiling we look for the native grpc_cpp_plugin | ||
48 | + if(CMAKE_CROSSCOMPILING) | ||
49 | + find_program(GRPC_CPP_PLUGIN REQUIRED NAMES grpc_cpp_plugin) | ||
50 | + if(NOT TARGET gRPC::grpc_cpp_plugin) | ||
51 | + add_executable(gRPC::grpc_cpp_plugin IMPORTED) | ||
52 | + endif() | ||
53 | + set_target_properties(gRPC::grpc_cpp_plugin PROPERTIES | ||
54 | + IMPORTED_LOCATION "${GRPC_CPP_PLUGIN}") | ||
55 | + elseif(TARGET gRPC::grpc_cpp_plugin) | ||
56 | + get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) | ||
57 | + else() | ||
58 | + message(FATAL_ERROR "Found gRPC but no gRPC CPP plugin defined") | ||
59 | + endif() | ||
60 | + | ||
61 | set(GRPC_LIBRARIES gRPC::gpr gRPC::grpc gRPC::grpc++) | ||
62 | - get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) | ||
63 | get_target_property(GRPC_INCLUDE_DIR gRPC::grpc INTERFACE_INCLUDE_DIRECTORIES) | ||
64 | else() | ||
65 | include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGRPC.cmake) | ||
66 | -- | ||
67 | 2.39.3 (Apple Git-145) | ||
68 | |||
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch new file mode 100644 index 000000000..373e146b9 --- /dev/null +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 44f4254fe96c43437400f94a8a2800175ddf3279 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 20 May 2024 21:00:48 -0700 | ||
4 | Subject: [PATCH] include stdint.h for int64_t types | ||
5 | |||
6 | This is exposed when compiling for musl platforms where this | ||
7 | header is not included indirectly. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/pull/270] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/Value.cpp | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/src/Value.cpp b/src/Value.cpp | ||
16 | index cbda697..d6f2c9c 100644 | ||
17 | --- a/src/Value.cpp | ||
18 | +++ b/src/Value.cpp | ||
19 | @@ -1,4 +1,5 @@ | ||
20 | #include <iomanip> | ||
21 | +#include <cstdint> | ||
22 | |||
23 | #include "etcd/Value.hpp" | ||
24 | #include "etcd/v3/KeyValue.hpp" | ||
25 | -- | ||
26 | 2.45.1 | ||
27 | |||
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb index 401d53c79..88a8ba346 100644 --- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb +++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb | |||
@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" | |||
6 | 6 | ||
7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
8 | git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ | 8 | git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ |
9 | file://0001-cmake-fix-when-cross-compiling.patch \ | 9 | file://0001-include-stdint.h-for-int64_t-types.patch \ |
10 | " | 10 | " |
11 | 11 | ||
12 | SRCREV = "e31ac4d4caa55fa662e207150ba40f8151b7ad96" | 12 | SRCREV = "ba6216385fc332b23d95683966824c2b86c2474e" |
13 | 13 | ||
14 | inherit cmake | 14 | inherit cmake |
15 | 15 | ||
diff --git a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb index 0794158a5..24e111dea 100644 --- a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb +++ b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb | |||
@@ -2,12 +2,12 @@ DESCRIPTION = "etcd is a distributed key-value store for distributed systems" | |||
2 | HOMEPAGE = "https://etcd.io/" | 2 | HOMEPAGE = "https://etcd.io/" |
3 | 3 | ||
4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
5 | LIC_FILES_CHKSUM = "file://${S}/${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 5 | LIC_FILES_CHKSUM = "file://${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
6 | 6 | ||
7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
8 | git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https \ | 8 | git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ |
9 | file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=src/${GO_IMPORT} \ | 9 | file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=${GO_INSTALL} \ |
10 | file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=src/${GO_IMPORT} \ | 10 | file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=${GO_INSTALL} \ |
11 | file://etcd.service \ | 11 | file://etcd.service \ |
12 | file://etcd-existing.conf \ | 12 | file://etcd-existing.conf \ |
13 | file://etcd-new.service \ | 13 | file://etcd-new.service \ |
@@ -62,11 +62,11 @@ do_install:append() { | |||
62 | install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir} | 62 | install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir} |
63 | install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir} | 63 | install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir} |
64 | install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir} | 64 | install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir} |
65 | install -m 0644 ${WORKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d | 65 | install -m 0644 ${UNPACKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d |
66 | install -d ${D}${systemd_system_unitdir} | 66 | install -d ${D}${systemd_system_unitdir} |
67 | install -m 0644 ${WORKDIR}/etcd.service ${D}${systemd_system_unitdir}/ | 67 | install -m 0644 ${UNPACKDIR}/etcd.service ${D}${systemd_system_unitdir}/ |
68 | install -m 0644 ${WORKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/ | 68 | install -m 0644 ${UNPACKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/ |
69 | install -m 0644 ${WORKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/ | 69 | install -m 0644 ${UNPACKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/ |
70 | } | 70 | } |
71 | 71 | ||
72 | FILES:${PN}:append = " ${sysconfdir}/etcd.d/etcd-existing.conf" | 72 | FILES:${PN}:append = " ${sysconfdir}/etcd.d/etcd-existing.conf" |
diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch deleted file mode 100644 index b076a3fff..000000000 --- a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From ced2e933cf647874da4baff002e0987b9bfe5fac Mon Sep 17 00:00:00 2001 | ||
2 | From: Markus Volk <f_l_k@t-online.de> | ||
3 | Date: Sat, 18 Nov 2023 15:07:49 +0100 | ||
4 | Subject: [PATCH] meson.build: require for native wayland-scanner | ||
5 | |||
6 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5596] | ||
9 | --- | ||
10 | meson.build | 4 ++-- | ||
11 | 1 file changed, 1 insertions(+), 1 deletions(-) | ||
12 | |||
13 | diff --git a/meson.build b/meson.build | ||
14 | index f4e5b3a3..5d2f9eba 100644 | ||
15 | --- a/meson.build | ||
16 | +++ b/meson.build | ||
17 | @@ -207,7 +207,7 @@ gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc')) | ||
18 | build_gtk_doc = gtkdoc_dep.found() | ||
19 | |||
20 | wayland_client = dependency('wayland-client', required : get_option('wayland_security_context')) | ||
21 | -wayland_scanner = dependency('wayland-scanner', version : '>= 1.15', required : get_option('wayland_security_context')) | ||
22 | +wayland_scanner = dependency('wayland-scanner', version : '>= 1.15', required : get_option('wayland_security_context'), native : true) | ||
23 | wayland_protocols = dependency('wayland-protocols', version : '>= 1.32', required : get_option('wayland_security_context')) | ||
24 | build_wayland_security_context = wayland_client.found() and wayland_scanner.found() and wayland_protocols.found() | ||
25 | |||
26 | -- | ||
27 | 2.42.0 | ||
28 | |||
diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch deleted file mode 100644 index 77b60ec98..000000000 --- a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 49737b1e4a74c77a8cd7ae727974d68503da087f Mon Sep 17 00:00:00 2001 | ||
2 | From: Markus Volk <f_l_k@t-online.de> | ||
3 | Date: Fri, 12 Jan 2024 13:52:08 +0100 | ||
4 | Subject: [PATCH] meson.build: require native gtkdoc | ||
5 | |||
6 | this fixes: | ||
7 | | Run-time dependency gtk-doc found: NO (tried pkgconfig) | ||
8 | | | ||
9 | | ../git/meson.build:206:13: ERROR: Dependency "gtk-doc" not found, tried pkgconfig | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5650/commits/e5de3e46b917f830d7f81e9db6ed2a9b7d7db942] | ||
12 | |||
13 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
14 | --- | ||
15 | meson.build | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/meson.build b/meson.build | ||
19 | index f7f9372d..dccc3eb4 100644 | ||
20 | --- a/meson.build | ||
21 | +++ b/meson.build | ||
22 | @@ -203,7 +203,7 @@ appstream_dep = dependency('appstream', version : '>=0.12.0') | ||
23 | gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') | ||
24 | libseccomp_dep = dependency('libseccomp', required : get_option('seccomp')) | ||
25 | gir_dep = dependency('gobject-introspection-1.0', version : '>=1.40.0', required : get_option('gir')) | ||
26 | -gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc')) | ||
27 | +gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc'), native : true) | ||
28 | build_gtk_doc = gtkdoc_dep.found() | ||
29 | |||
30 | wayland_client = dependency('wayland-client', required : get_option('wayland_security_context')) | ||
31 | -- | ||
32 | 2.43.0 | ||
33 | |||
diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb index 97e57c13d..8351e7d65 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb | |||
@@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
7 | gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \ | 7 | gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \ |
8 | file://0001-flatpak-pc-add-pc_sysrootdir.patch \ | 8 | file://0001-flatpak-pc-add-pc_sysrootdir.patch \ |
9 | file://0001-meson.build-require-for-native-wayland-scanner.patch \ | ||
10 | file://0001-meson.build-require-native-gtkdoc.patch \ | ||
11 | " | 9 | " |
12 | 10 | ||
13 | SRCREV = "27b11b93c2a80a91c9461bc6c7f5e9a201406041" | 11 | SRCREV = "925c80f913d69e7ca424428823e1431c4ffb0deb" |
14 | 12 | ||
15 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
16 | 14 | ||
@@ -40,6 +38,7 @@ RDEPENDS:${PN} = " \ | |||
40 | ca-certificates \ | 38 | ca-certificates \ |
41 | dconf \ | 39 | dconf \ |
42 | flatpak-xdg-utils \ | 40 | flatpak-xdg-utils \ |
41 | fuse3-utils \ | ||
43 | " | 42 | " |
44 | 43 | ||
45 | GIR_MESON_OPTION = "gir" | 44 | GIR_MESON_OPTION = "gir" |
@@ -56,6 +55,7 @@ PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4" | |||
56 | PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" | 55 | PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" |
57 | PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" | 56 | PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" |
58 | PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" | 57 | PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" |
58 | PACKAGECONFIG[malcontent] = "-Dmalcontent=enabled,-Dmalcontent=disabled,malcontent" | ||
59 | PACKAGECONFIG[selinux] = "-Dselinux_module=enabled,-Dselinux_module=disabled,libselinux" | 59 | PACKAGECONFIG[selinux] = "-Dselinux_module=enabled,-Dselinux_module=disabled,libselinux" |
60 | PACKAGECONFIG[wayland-security-context] = "-Dwayland_security_context=enabled,-Dwayland_security_context=disabled,wayland wayland-native wayland-protocols" | 60 | PACKAGECONFIG[wayland-security-context] = "-Dwayland_security_context=enabled,-Dwayland_security_context=disabled,wayland wayland-native wayland-protocols" |
61 | 61 | ||
@@ -66,6 +66,8 @@ PACKAGECONFIG ?= " \ | |||
66 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \ | 66 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \ |
67 | " | 67 | " |
68 | 68 | ||
69 | EXTRA_OEMESON = "-Dsystem_fusermount=${bindir}/fusermount3" | ||
70 | |||
69 | FILES:${PN} += "${libdir} ${datadir}" | 71 | FILES:${PN} += "${libdir} ${datadir}" |
70 | 72 | ||
71 | USERADD_PACKAGES = "${PN}" | 73 | USERADD_PACKAGES = "${PN}" |
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch index f5a1716c0..0cabed963 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch | |||
@@ -15,8 +15,6 @@ Upstream-Status: Pending [https://github.com/fluent/fluent-bit/issues/5492] | |||
15 | lib/cmetrics/CMakeLists.txt | 7 +------ | 15 | lib/cmetrics/CMakeLists.txt | 7 +------ |
16 | 3 files changed, 3 insertions(+), 17 deletions(-) | 16 | 3 files changed, 3 insertions(+), 17 deletions(-) |
17 | 17 | ||
18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
19 | index 3dba5a8..d94b988 100644 | ||
20 | --- a/CMakeLists.txt | 18 | --- a/CMakeLists.txt |
21 | +++ b/CMakeLists.txt | 19 | +++ b/CMakeLists.txt |
22 | @@ -46,11 +46,7 @@ else() | 20 | @@ -46,11 +46,7 @@ else() |
@@ -32,8 +30,6 @@ index 3dba5a8..d94b988 100644 | |||
32 | 30 | ||
33 | if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l") | 31 | if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l") |
34 | set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic") | 32 | set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic") |
35 | diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt | ||
36 | index bbe1f39..809ea93 100644 | ||
37 | --- a/lib/chunkio/CMakeLists.txt | 33 | --- a/lib/chunkio/CMakeLists.txt |
38 | +++ b/lib/chunkio/CMakeLists.txt | 34 | +++ b/lib/chunkio/CMakeLists.txt |
39 | @@ -14,12 +14,7 @@ else() | 35 | @@ -14,12 +14,7 @@ else() |
@@ -50,21 +46,19 @@ index bbe1f39..809ea93 100644 | |||
50 | 46 | ||
51 | include(cmake/macros.cmake) | 47 | include(cmake/macros.cmake) |
52 | 48 | ||
53 | diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt | ||
54 | index 60e8774..e3d6149 100644 | ||
55 | --- a/lib/cmetrics/CMakeLists.txt | 49 | --- a/lib/cmetrics/CMakeLists.txt |
56 | +++ b/lib/cmetrics/CMakeLists.txt | 50 | +++ b/lib/cmetrics/CMakeLists.txt |
57 | @@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR 3) | 51 | @@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR 3) |
58 | set(CMT_VERSION_PATCH 5) | 52 | set(CMT_VERSION_PATCH 7) |
59 | set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}") | 53 | set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}") |
60 | 54 | ||
61 | -# Define __FILENAME__ consistently across Operating Systems | 55 | -# Define __CMT_FILENAME__ consistently across Operating Systems |
62 | -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") | 56 | -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") |
63 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") | 57 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'") |
64 | -else() | 58 | -else() |
65 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") | 59 | - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__") |
66 | -endif() | 60 | -endif() |
67 | +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") | 61 | +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__") |
68 | 62 | ||
69 | # Configuration options | 63 | # Configuration options |
70 | option(CMT_DEV "Enable development mode" No) | 64 | option(CMT_DEV "Enable development mode" No) |
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb index fc0609547..ef0411113 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb | |||
@@ -29,7 +29,7 @@ SRC_URI:append:libc-musl = "\ | |||
29 | file://0001-Use-posix-strerror_r-with-musl.patch \ | 29 | file://0001-Use-posix-strerror_r-with-musl.patch \ |
30 | file://0002-chunkio-Link-with-fts-library-with-musl.patch \ | 30 | file://0002-chunkio-Link-with-fts-library-with-musl.patch \ |
31 | " | 31 | " |
32 | SRC_URI[sha256sum] = "8ca2ac081d7eee717483c06608adcb5e3d5373e182ad87dba21a23f8278c6540" | 32 | SRC_URI[sha256sum] = "3f6cd4bd1894cda16b465aef6ffec7e920d54c4209b3e2320fcffe7ae345700e" |
33 | S = "${WORKDIR}/fluent-bit-${PV}" | 33 | S = "${WORKDIR}/fluent-bit-${PV}" |
34 | 34 | ||
35 | DEPENDS = "zlib bison-native flex-native openssl" | 35 | DEPENDS = "zlib bison-native flex-native openssl" |
@@ -84,6 +84,9 @@ EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic" | |||
84 | 84 | ||
85 | CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2" | 85 | CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2" |
86 | 86 | ||
87 | # Fixes build with GCC-14 | ||
88 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
89 | |||
87 | inherit cmake systemd pkgconfig | 90 | inherit cmake systemd pkgconfig |
88 | 91 | ||
89 | SYSTEMD_SERVICE:${PN} = "td-agent-bit.service" | 92 | SYSTEMD_SERVICE:${PN} = "td-agent-bit.service" |
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb index fe5e5c067..a293048a2 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb | |||
@@ -50,14 +50,14 @@ EXTRA_OECONF = " \ | |||
50 | " | 50 | " |
51 | 51 | ||
52 | do_compile:prepend() { | 52 | do_compile:prepend() { |
53 | install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ | 53 | install -m 0644 ${UNPACKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ |
54 | } | 54 | } |
55 | 55 | ||
56 | do_install:append:class-target() { | 56 | do_install:append:class-target() { |
57 | install -d ${D}${datadir}/applications/ | 57 | install -d ${D}${datadir}/applications/ |
58 | install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/ | 58 | install -m 0644 ${UNPACKDIR}/gnuplot.desktop ${D}${datadir}/applications/ |
59 | install -d ${D}${datadir}/pixmaps/ | 59 | install -d ${D}${datadir}/pixmaps/ |
60 | install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ | 60 | install -m 0644 ${UNPACKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ |
61 | } | 61 | } |
62 | 62 | ||
63 | PACKAGES =+ "${PN}-x11" | 63 | PACKAGES =+ "${PN}-x11" |
diff --git a/meta-oe/recipes-extended/highway/highway_1.1.0.bb b/meta-oe/recipes-extended/highway/highway_1.2.0.bb index 11d9e7cdd..5d7494124 100644 --- a/meta-oe/recipes-extended/highway/highway_1.1.0.bb +++ b/meta-oe/recipes-extended/highway/highway_1.2.0.bb | |||
@@ -8,7 +8,7 @@ inherit cmake | |||
8 | 8 | ||
9 | SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master" | 9 | SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master" |
10 | 10 | ||
11 | SRCREV = "58b52a717469e62b2d9b8eaa2f5dddb44d4a4cbf" | 11 | SRCREV = "457c891775a7397bdb0376bb1031e6e027af1c48" |
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release" | 14 | EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release" |
diff --git a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb index 84ed3b052..fb1aefad6 100644 --- a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb +++ b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb | |||
@@ -8,5 +8,5 @@ do_configure[noexec] = "1" | |||
8 | do_compile[noexec] = "1" | 8 | do_compile[noexec] = "1" |
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | install -Dm 0644 ${WORKDIR}/inputattach.conf ${D}${sysconfdir}/inputattach.conf | 11 | install -Dm 0644 ${UNPACKDIR}/inputattach.conf ${D}${sysconfdir}/inputattach.conf |
12 | } | 12 | } |
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb index 1ad8036d7..fb778005f 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb | |||
@@ -26,12 +26,12 @@ PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" | |||
26 | PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" | 26 | PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" |
27 | PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" | 27 | PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" |
28 | PACKAGECONFIG[parted] = "--with-part, --without-part, parted" | 28 | PACKAGECONFIG[parted] = "--with-part, --without-part, parted" |
29 | PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux" | 29 | PACKAGECONFIG[fs] = "--with-fs, --without-fs, e2fsprogs util-linux" |
30 | PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" | 30 | PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" |
31 | PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux" | 31 | PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux" |
32 | PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" | 32 | PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" |
33 | PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" | 33 | PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" |
34 | PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key" | 34 | PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup keyutils nss volume-key" |
35 | PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" | 35 | PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" |
36 | PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" | 36 | PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" |
37 | PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" | 37 | PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" |
diff --git a/meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch b/meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch new file mode 100644 index 000000000..e87972af2 --- /dev/null +++ b/meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch | |||
@@ -0,0 +1,57 @@ | |||
1 | From 684ebc7f8eb44558219d4b5be52add1250b3c0ca Mon Sep 17 00:00:00 2001 | ||
2 | From: Eric Biggers <ebiggers@google.com> | ||
3 | Date: Tue, 30 Apr 2024 11:27:55 -0700 | ||
4 | Subject: [PATCH] lib/arm: don't use explicit armv8.2-a on gcc 13.2 and later | ||
5 | |||
6 | Resolves https://github.com/ebiggers/libdeflate/issues/369 | ||
7 | --- | ||
8 | Upstream-Status: Backport [https://github.com/ebiggers/libdeflate/pull/370] | ||
9 | |||
10 | lib/arm/adler32_impl.h | 10 ++++++---- | ||
11 | lib/arm/crc32_impl.h | 10 ++++++---- | ||
12 | 2 files changed, 12 insertions(+), 8 deletions(-) | ||
13 | |||
14 | diff --git a/lib/arm/adler32_impl.h b/lib/arm/adler32_impl.h | ||
15 | index 6453b8e..6144afb 100644 | ||
16 | --- a/lib/arm/adler32_impl.h | ||
17 | +++ b/lib/arm/adler32_impl.h | ||
18 | @@ -214,11 +214,13 @@ adler32_arm_neon(u32 adler, const u8 *p, size_t len) | ||
19 | # ifdef __clang__ | ||
20 | # define ATTRIBUTES _target_attribute("dotprod") | ||
21 | /* | ||
22 | - * With gcc, arch=armv8.2-a is needed for dotprod intrinsics, unless the | ||
23 | - * default target is armv8.3-a or later in which case it must be omitted. | ||
24 | - * armv8.3-a or later can be detected by checking for __ARM_FEATURE_JCVT. | ||
25 | + * With gcc 13.1 and earlier (before gcc commit 73d3bc348190 or 9aac37ab8a7b, | ||
26 | + * "aarch64: Remove architecture dependencies from intrinsics"), | ||
27 | + * arch=armv8.2-a is needed for the dotprod intrinsics, unless the default | ||
28 | + * target is armv8.3-a or later in which case it must be omitted. armv8.3-a | ||
29 | + * or later can be detected by checking for __ARM_FEATURE_JCVT. | ||
30 | */ | ||
31 | -# elif defined(__ARM_FEATURE_JCVT) | ||
32 | +# elif GCC_PREREQ(13, 2) || defined(__ARM_FEATURE_JCVT) | ||
33 | # define ATTRIBUTES _target_attribute("+dotprod") | ||
34 | # else | ||
35 | # define ATTRIBUTES _target_attribute("arch=armv8.2-a+dotprod") | ||
36 | diff --git a/lib/arm/crc32_impl.h b/lib/arm/crc32_impl.h | ||
37 | index 3c4bec7..5363041 100644 | ||
38 | --- a/lib/arm/crc32_impl.h | ||
39 | +++ b/lib/arm/crc32_impl.h | ||
40 | @@ -551,11 +551,13 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) | ||
41 | # ifdef __clang__ | ||
42 | # define ATTRIBUTES _target_attribute("aes,crc,sha3") | ||
43 | /* | ||
44 | - * With gcc, arch=armv8.2-a is needed for the sha3 intrinsics, unless the | ||
45 | - * default target is armv8.3-a or later in which case it must be omitted. | ||
46 | - * armv8.3-a or later can be detected by checking for __ARM_FEATURE_JCVT. | ||
47 | + * With gcc 13.1 and earlier (before gcc commit 73d3bc348190 or 9aac37ab8a7b, | ||
48 | + * "aarch64: Remove architecture dependencies from intrinsics"), | ||
49 | + * arch=armv8.2-a is needed for the sha3 intrinsics, unless the default | ||
50 | + * target is armv8.3-a or later in which case it must be omitted. armv8.3-a | ||
51 | + * or later can be detected by checking for __ARM_FEATURE_JCVT. | ||
52 | */ | ||
53 | -# elif defined(__ARM_FEATURE_JCVT) | ||
54 | +# elif GCC_PREREQ(13, 2) || defined(__ARM_FEATURE_JCVT) | ||
55 | # define ATTRIBUTES _target_attribute("+crypto,+crc,+sha3") | ||
56 | # else | ||
57 | # define ATTRIBUTES _target_attribute("arch=armv8.2-a+crypto+crc+sha3") | ||
diff --git a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb index f0a966f2b..e3de8aca6 100644 --- a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb +++ b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb | |||
@@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7b6977026437092191e9da699ed9f780" | |||
6 | 6 | ||
7 | DEPENDS += "gzip zlib" | 7 | DEPENDS += "gzip zlib" |
8 | 8 | ||
9 | SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master" | 9 | SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master \ |
10 | file://0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch \ | ||
11 | " | ||
10 | 12 | ||
11 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
12 | SRCREV = "275aa5141db6eda3587214e0f1d3a134768f557d" | 14 | SRCREV = "275aa5141db6eda3587214e0f1d3a134768f557d" |
13 | 15 | ||
14 | inherit cmake pkgconfig | 16 | inherit cmake pkgconfig |
15 | |||
diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb index 5716817e9..a2a420ced 100644 --- a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb +++ b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb | |||
@@ -50,11 +50,11 @@ do_compile() { | |||
50 | do_install() { | 50 | do_install() { |
51 | oe_runmake install | 51 | oe_runmake install |
52 | 52 | ||
53 | install -Dm 0644 ${WORKDIR}/51-these-are-not-joysticks-rm.rules ${D}${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules | 53 | install -Dm 0644 ${UNPACKDIR}/51-these-are-not-joysticks-rm.rules ${D}${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules |
54 | install -Dm 0644 ${WORKDIR}/60-joystick.rules ${D}${nonarch_base_libdir}/udev/rules.d/60-joystick.rules | 54 | install -Dm 0644 ${UNPACKDIR}/60-joystick.rules ${D}${nonarch_base_libdir}/udev/rules.d/60-joystick.rules |
55 | 55 | ||
56 | install -Dm 0644 ${WORKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service | 56 | install -Dm 0644 ${UNPACKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service |
57 | install -Dm 0755 ${WORKDIR}/inputattachctl ${D}${bindir}/inputattachctl | 57 | install -Dm 0755 ${UNPACKDIR}/inputattachctl ${D}${bindir}/inputattachctl |
58 | } | 58 | } |
59 | 59 | ||
60 | PACKAGES += "inputattach joystick-jscal joystick" | 60 | PACKAGES += "inputattach joystick-jscal joystick" |
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch new file mode 100644 index 000000000..a09a17bf2 --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From cd2b5362fe2e63dff3666ce72da27979fe06a519 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 28 May 2024 22:24:52 -0700 | ||
4 | Subject: [PATCH] libminifi: Rename mutex_ to mtx_ member of ConcurrentQueue | ||
5 | |||
6 | Fixes | ||
7 | libminifi/include/utils/MinifiConcurrentQueue.h:48:75: error: no member named 'mutex_' in 'ConcurrentQueue<T>'; did you mean 'mtx_'? | ||
8 | | 48 | : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mutex_)) {} | ||
9 | | | ^~~~~~ | ||
10 | | | mtx_ | ||
11 | | libminifi/include/utils/MinifiConcurrentQueue.h:140:22: note: 'mtx_' declared here | ||
12 | | 140 | mutable std::mutex mtx_; | ||
13 | | | ^ | ||
14 | | 1 error generated. | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/apache/nifi-minifi-cpp/pull/1803] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | libminifi/include/utils/MinifiConcurrentQueue.h | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/libminifi/include/utils/MinifiConcurrentQueue.h b/libminifi/include/utils/MinifiConcurrentQueue.h | ||
23 | index 8abc0ec93..1db58080b 100644 | ||
24 | --- a/libminifi/include/utils/MinifiConcurrentQueue.h | ||
25 | +++ b/libminifi/include/utils/MinifiConcurrentQueue.h | ||
26 | @@ -45,7 +45,7 @@ class ConcurrentQueue { | ||
27 | ConcurrentQueue(const ConcurrentQueue& other) = delete; | ||
28 | ConcurrentQueue& operator=(const ConcurrentQueue& other) = delete; | ||
29 | ConcurrentQueue(ConcurrentQueue&& other) | ||
30 | - : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mutex_)) {} | ||
31 | + : ConcurrentQueue(std::move(other), std::lock_guard<std::mutex>(other.mtx_)) {} | ||
32 | |||
33 | ConcurrentQueue& operator=(ConcurrentQueue&& other) { | ||
34 | if (this != &other) { | ||
35 | -- | ||
36 | 2.45.1 | ||
37 | |||
diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb index beb247c25..fca8d9e75 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb | |||
@@ -27,6 +27,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=mai | |||
27 | file://0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch \ | 27 | file://0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch \ |
28 | file://0007-CMakeLists.txt-do-not-use-ccache.patch \ | 28 | file://0007-CMakeLists.txt-do-not-use-ccache.patch \ |
29 | file://0008-libsodium-aarch64_crypto.patch \ | 29 | file://0008-libsodium-aarch64_crypto.patch \ |
30 | file://0001-libminifi-Rename-mutex_-to-mtx_-member-of-Concurrent.patch \ | ||
30 | file://systemd-volatile.conf \ | 31 | file://systemd-volatile.conf \ |
31 | file://sysvinit-volatile.conf \ | 32 | file://sysvinit-volatile.conf \ |
32 | " | 33 | " |
@@ -47,7 +48,7 @@ SRCREV_FORMAT .= "_expected-lite_range-v3_magic-enum_cxxopts_gsl-lite_date_asio_ | |||
47 | SRC_URI[ossp-uuid.sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" | 48 | SRC_URI[ossp-uuid.sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0" |
48 | SRC_URI[libsodium.sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea" | 49 | SRC_URI[libsodium.sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea" |
49 | 50 | ||
50 | S = "${WORKDIR}/git" | 51 | S = "${UNPACKDIR}/git" |
51 | 52 | ||
52 | inherit pkgconfig cmake systemd | 53 | inherit pkgconfig cmake systemd |
53 | 54 | ||
@@ -55,6 +56,8 @@ DEPENDS = "virtual/crypt bison-native flex-native flex openssl curl zlib xz bzip | |||
55 | 56 | ||
56 | OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" | 57 | OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" |
57 | 58 | ||
59 | LDFLAGS:append:riscv32 = " -latomic" | ||
60 | |||
58 | EXTRA_OECMAKE = " \ | 61 | EXTRA_OECMAKE = " \ |
59 | -DCMAKE_BUILD_TYPE=Release \ | 62 | -DCMAKE_BUILD_TYPE=Release \ |
60 | -DHOST_SYS=${HOST_SYS} -DBUILD_SYS=${BUILD_SYS} \ | 63 | -DHOST_SYS=${HOST_SYS} -DBUILD_SYS=${BUILD_SYS} \ |
@@ -162,7 +165,7 @@ do_install() { | |||
162 | 165 | ||
163 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 166 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
164 | install -m 755 -d ${D}${sysconfdir}/tmpfiles.d | 167 | install -m 755 -d ${D}${sysconfdir}/tmpfiles.d |
165 | install -m 644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/minifi.conf | 168 | install -m 644 ${UNPACKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/minifi.conf |
166 | sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/tmpfiles.d/minifi.conf | 169 | sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/tmpfiles.d/minifi.conf |
167 | 170 | ||
168 | install -m 755 -d ${D}${systemd_system_unitdir} | 171 | install -m 755 -d ${D}${systemd_system_unitdir} |
@@ -174,7 +177,7 @@ do_install() { | |||
174 | 177 | ||
175 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 178 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
176 | install -d ${D}${sysconfdir}/default/volatiles | 179 | install -d ${D}${sysconfdir}/default/volatiles |
177 | install -m 0644 ${WORKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi | 180 | install -m 0644 ${UNPACKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi |
178 | 181 | ||
179 | sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/default/volatiles/99_minifi | 182 | sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/default/volatiles/99_minifi |
180 | fi | 183 | fi |
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115_115.8.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb index 1269795d2..b08828602 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-115_115.8.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire | |||
17 | file://0001-add-arm-to-list-of-mozinline.patch \ | 17 | file://0001-add-arm-to-list-of-mozinline.patch \ |
18 | file://armv5.patch \ | 18 | file://armv5.patch \ |
19 | " | 19 | " |
20 | SRC_URI[sha256sum] = "af8086f23efc8492d286671f6035b1a915de6f4ed5c7897e40be0e1cb6b895ea" | 20 | SRC_URI[sha256sum] = "16be46f16a356a2b8bd3541805a24c8a2acf6f077cf8a65859689685c26025e0" |
21 | 21 | ||
22 | S = "${WORKDIR}/firefox-${PV}" | 22 | S = "${WORKDIR}/firefox-${PV}" |
23 | 23 | ||
diff --git a/meta-oe/recipes-extended/nana/nana_git.bb b/meta-oe/recipes-extended/nana/nana_git.bb index 7c748bc49..d292bb882 100644 --- a/meta-oe/recipes-extended/nana/nana_git.bb +++ b/meta-oe/recipes-extended/nana/nana_git.bb | |||
@@ -42,3 +42,9 @@ do_configure:prepend:class-nativesdk() { | |||
42 | } | 42 | } |
43 | 43 | ||
44 | BBCLASSEXTEND = "native nativesdk" | 44 | BBCLASSEXTEND = "native nativesdk" |
45 | |||
46 | do_install:append() { | ||
47 | sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana-c++lg | ||
48 | sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana-clg | ||
49 | sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana | ||
50 | } | ||
diff --git a/meta-oe/recipes-extended/networking/mstpd_git.bb b/meta-oe/recipes-extended/networking/mstpd_git.bb index b2043ef06..e6e1f9a3b 100644 --- a/meta-oe/recipes-extended/networking/mstpd_git.bb +++ b/meta-oe/recipes-extended/networking/mstpd_git.bb | |||
@@ -26,8 +26,8 @@ do_install:append() { | |||
26 | rmdir ${D}${libdir} || true | 26 | rmdir ${D}${libdir} || true |
27 | 27 | ||
28 | install -d -m 0755 ${D}${sbindir} | 28 | install -d -m 0755 ${D}${sbindir} |
29 | install -m 0755 ${WORKDIR}/bridge-stp ${D}${sbindir} | 29 | install -m 0755 ${UNPACKDIR}/bridge-stp ${D}${sbindir} |
30 | 30 | ||
31 | install -d -m 0755 ${D}${systemd_system_unitdir} | 31 | install -d -m 0755 ${D}${systemd_system_unitdir} |
32 | install -m 0644 ${WORKDIR}/mstpd.service ${D}${systemd_system_unitdir} | 32 | install -m 0644 ${UNPACKDIR}/mstpd.service ${D}${systemd_system_unitdir} |
33 | } | 33 | } |
diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb index 1c68b5f43..5437ea13e 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb | |||
@@ -57,7 +57,7 @@ do_install:append() { | |||
57 | chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh | 57 | chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh |
58 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 58 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
59 | install -d ${D}/${systemd_unitdir}/system | 59 | install -d ${D}/${systemd_unitdir}/system |
60 | install -m 644 ${WORKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system | 60 | install -m 644 ${UNPACKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system |
61 | 61 | ||
62 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/openwsmand.service | 62 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/openwsmand.service |
63 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/openwsmand.service | 63 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/openwsmand.service |
diff --git a/meta-oe/recipes-extended/ostree/ostree_2024.5.bb b/meta-oe/recipes-extended/ostree/ostree_2024.6.bb index 2ea92f190..7f30dbfc5 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2024.5.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2024.6.bb | |||
@@ -22,13 +22,13 @@ GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" | |||
22 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ | 22 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ |
23 | file://run-ptest \ | 23 | file://run-ptest \ |
24 | " | 24 | " |
25 | SRC_URI[sha256sum] = "bc12d8493db64152093ee5be77cf62a29cc67a4a9e430dc987103e78aada4a6f" | 25 | SRC_URI[sha256sum] = "8b61c856697aa412f2f1724322ada40bdd7b1bf9e7783e2c594faa7a594f868f" |
26 | 26 | ||
27 | S = "${WORKDIR}/libostree-${PV}" | 27 | S = "${WORKDIR}/libostree-${PV}" |
28 | 28 | ||
29 | inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd | 29 | inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd |
30 | 30 | ||
31 | UNKNOWN_CONFIGURE_OPT_IGNORE = "--disable-introspection --enable-introspection" | 31 | UNKNOWN_CONFIGURE_OPT_IGNORE += "--disable-introspection --enable-introspection" |
32 | 32 | ||
33 | # Workaround compile failure: | 33 | # Workaround compile failure: |
34 | # |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] | 34 | # |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return] |
@@ -69,6 +69,7 @@ PACKAGECONFIG:class-nativesdk ??= " \ | |||
69 | 69 | ||
70 | PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" | 70 | PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi" |
71 | PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" | 71 | PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig" |
72 | PACKAGECONFIG[composefs] = "--with-composefs, --without-composefs, composefs" | ||
72 | PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" | 73 | PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl" |
73 | PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" | 74 | PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut" |
74 | PACKAGECONFIG[ed25519-libsodium] = "--with-ed25519-libsodium, --without-ed25519-libsodium, libsodium" | 75 | PACKAGECONFIG[ed25519-libsodium] = "--with-ed25519-libsodium, --without-ed25519-libsodium, libsodium" |
diff --git a/meta-oe/recipes-extended/pmdk/pmdk_2.0.0.bb b/meta-oe/recipes-extended/pmdk/pmdk_2.1.0.bb index aeda23690..100ff4200 100644 --- a/meta-oe/recipes-extended/pmdk/pmdk_2.0.0.bb +++ b/meta-oe/recipes-extended/pmdk/pmdk_2.1.0.bb | |||
@@ -12,7 +12,7 @@ DEPENDS:append:libc-musl = " fts" | |||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | SRC_URI = "git://github.com/pmem/pmdk.git;branch=master;protocol=https" | 14 | SRC_URI = "git://github.com/pmem/pmdk.git;branch=master;protocol=https" |
15 | SRCREV = "ba92d6b469d52d16f26279bebaf317bbdbb3822c" | 15 | SRCREV = "5705fdffa755d00b4dbb4d6c30eb49671436f961" |
16 | 16 | ||
17 | inherit autotools-brokensep pkgconfig | 17 | inherit autotools-brokensep pkgconfig |
18 | 18 | ||
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb index 8a14018a8..2159482eb 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb | |||
@@ -7,7 +7,7 @@ require polkit-group-rule.inc | |||
7 | SRC_URI = "file://50-org.freedesktop.timedate1.rules" | 7 | SRC_URI = "file://50-org.freedesktop.timedate1.rules" |
8 | 8 | ||
9 | do_install() { | 9 | do_install() { |
10 | install -m 0755 ${WORKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d | 10 | install -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d |
11 | } | 11 | } |
12 | 12 | ||
13 | USERADD_PACKAGES = "${PN}" | 13 | USERADD_PACKAGES = "${PN}" |
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb index 8266fa639..bfd3361df 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb | |||
@@ -7,7 +7,7 @@ require polkit-group-rule.inc | |||
7 | SRC_URI = "file://50-org.freedesktop.NetworkManager.rules" | 7 | SRC_URI = "file://50-org.freedesktop.NetworkManager.rules" |
8 | 8 | ||
9 | do_install() { | 9 | do_install() { |
10 | install -m 0755 ${WORKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d | 10 | install -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d |
11 | } | 11 | } |
12 | 12 | ||
13 | USERADD_PACKAGES = "${PN}" | 13 | USERADD_PACKAGES = "${PN}" |
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb index db2ed015b..8dc8c5e25 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = "file://50-org.freedesktop.udiskie.rules" | |||
10 | RDEPENDS:${PN} += "udisks2" | 10 | RDEPENDS:${PN} += "udisks2" |
11 | 11 | ||
12 | do_install() { | 12 | do_install() { |
13 | install -m 0755 ${WORKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d | 13 | install -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d |
14 | } | 14 | } |
15 | 15 | ||
16 | USERADD_PACKAGES = "${PN}" | 16 | USERADD_PACKAGES = "${PN}" |
diff --git a/meta-oe/recipes-extended/qcbor/qcbor_git.bb b/meta-oe/recipes-extended/qcbor/qcbor_1.3.bb index a87454fa9..f90e814f7 100644 --- a/meta-oe/recipes-extended/qcbor/qcbor_git.bb +++ b/meta-oe/recipes-extended/qcbor/qcbor_1.3.bb | |||
@@ -6,13 +6,11 @@ DESCRIPTION = " \ | |||
6 | HOMEPAGE = "https://github.com/laurencelundblade/QCBOR" | 6 | HOMEPAGE = "https://github.com/laurencelundblade/QCBOR" |
7 | 7 | ||
8 | LICENSE = "BSD-3-Clause" | 8 | LICENSE = "BSD-3-Clause" |
9 | LIC_FILES_CHKSUM = "file://README.md;beginline=442;endline=463;md5=b55643261d6d221dac2b7a395105af62" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=498c298542365dfcfe29948c72a5849b" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/laurencelundblade/QCBOR;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/laurencelundblade/QCBOR;protocol=https;branch=master" |
12 | 12 | ||
13 | SRCREV = "44754f738c6534a4304a83d4c6e97b3d3193d887" | 13 | SRCREV = "1eba85dbbe78fc1938f8aba2112ba1b228caed30" |
14 | |||
15 | PV = "1.2+git" | ||
16 | 14 | ||
17 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
18 | 16 | ||
diff --git a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb index 7359c1254..293431245 100644 --- a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb +++ b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb | |||
@@ -36,10 +36,10 @@ do_install() { | |||
36 | install -m 755 rarpd.init ${D}${sysconfdir}/init.d/rarpd | 36 | install -m 755 rarpd.init ${D}${sysconfdir}/init.d/rarpd |
37 | install -m 755 rarpd ${D}${sbindir}/rarpd | 37 | install -m 755 rarpd ${D}${sbindir}/rarpd |
38 | install -m 644 rarpd.8 ${D}${mandir}/man8/rarpd.8 | 38 | install -m 644 rarpd.8 ${D}${mandir}/man8/rarpd.8 |
39 | install -m 644 ${WORKDIR}/ethers.sample ${D}${sysconfdir}/ethers | 39 | install -m 644 ${UNPACKDIR}/ethers.sample ${D}${sysconfdir}/ethers |
40 | 40 | ||
41 | install -d ${D}${systemd_unitdir}/system | 41 | install -d ${D}${systemd_unitdir}/system |
42 | install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/ | 42 | install -m 0644 ${UNPACKDIR}/rarpd.service ${D}${systemd_unitdir}/system/ |
43 | } | 43 | } |
44 | 44 | ||
45 | inherit systemd | 45 | inherit systemd |
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch index 01e53e3f2..01e53e3f2 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/0001-src-Do-not-reset-FINAL_LIBS.patch | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch index 93c359526..93c359526 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/0006-Define-correct-gregs-for-RISCV32.patch | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch index 6e07c25c6..6e07c25c6 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/GNU_SOURCE-7.patch | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch index 7785acca5..7785acca5 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/hiredis-use-default-CC-if-it-is-set.patch | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server b/meta-oe/recipes-extended/redis/redis-7.2.5/init-redis-server index c5f335f57..c5f335f57 100755 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/init-redis-server | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch index 20708eda1..20708eda1 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/lua-update-Makefile-to-use-environment-build-setting.patch | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch index 7b601e02a..7b601e02a 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/oe-use-libc-malloc.patch | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf b/meta-oe/recipes-extended/redis/redis-7.2.5/redis.conf index 75037d6dc..75037d6dc 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/redis.conf | |||
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.service b/meta-oe/recipes-extended/redis/redis-7.2.5/redis.service index b7791d0df..b7791d0df 100644 --- a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.service +++ b/meta-oe/recipes-extended/redis/redis-7.2.5/redis.service | |||
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.14.bb b/meta-oe/recipes-extended/redis/redis_6.2.14.bb index fa430ce40..2433abba5 100644 --- a/meta-oe/recipes-extended/redis/redis_6.2.14.bb +++ b/meta-oe/recipes-extended/redis/redis_6.2.14.bb | |||
@@ -43,14 +43,14 @@ do_install() { | |||
43 | export PREFIX=${D}/${prefix} | 43 | export PREFIX=${D}/${prefix} |
44 | oe_runmake install | 44 | oe_runmake install |
45 | install -d ${D}/${sysconfdir}/redis | 45 | install -d ${D}/${sysconfdir}/redis |
46 | install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf | 46 | install -m 0644 ${UNPACKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf |
47 | install -d ${D}/${sysconfdir}/init.d | 47 | install -d ${D}/${sysconfdir}/init.d |
48 | install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server | 48 | install -m 0755 ${UNPACKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server |
49 | install -d ${D}/var/lib/redis/ | 49 | install -d ${D}/var/lib/redis/ |
50 | chown redis.redis ${D}/var/lib/redis/ | 50 | chown redis.redis ${D}/var/lib/redis/ |
51 | 51 | ||
52 | install -d ${D}${systemd_system_unitdir} | 52 | install -d ${D}${systemd_system_unitdir} |
53 | install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} | 53 | install -m 0644 ${UNPACKDIR}/redis.service ${D}${systemd_system_unitdir} |
54 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service | 54 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service |
55 | 55 | ||
56 | if [ "${REDIS_ON_SYSTEMD}" = true ]; then | 56 | if [ "${REDIS_ON_SYSTEMD}" = true ]; then |
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.4.bb b/meta-oe/recipes-extended/redis/redis_7.2.5.bb index 5d64e9ba7..bfb46240a 100644 --- a/meta-oe/recipes-extended/redis/redis_7.2.4.bb +++ b/meta-oe/recipes-extended/redis/redis_7.2.5.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ | |||
17 | file://GNU_SOURCE-7.patch \ | 17 | file://GNU_SOURCE-7.patch \ |
18 | file://0006-Define-correct-gregs-for-RISCV32.patch \ | 18 | file://0006-Define-correct-gregs-for-RISCV32.patch \ |
19 | " | 19 | " |
20 | SRC_URI[sha256sum] = "8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59" | 20 | SRC_URI[sha256sum] = "5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d" |
21 | 21 | ||
22 | inherit autotools-brokensep pkgconfig update-rc.d systemd useradd | 22 | inherit autotools-brokensep pkgconfig update-rc.d systemd useradd |
23 | 23 | ||
@@ -46,14 +46,14 @@ do_install() { | |||
46 | export PREFIX=${D}/${prefix} | 46 | export PREFIX=${D}/${prefix} |
47 | oe_runmake install | 47 | oe_runmake install |
48 | install -d ${D}/${sysconfdir}/redis | 48 | install -d ${D}/${sysconfdir}/redis |
49 | install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf | 49 | install -m 0644 ${UNPACKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf |
50 | install -d ${D}/${sysconfdir}/init.d | 50 | install -d ${D}/${sysconfdir}/init.d |
51 | install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server | 51 | install -m 0755 ${UNPACKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server |
52 | install -d ${D}/var/lib/redis/ | 52 | install -d ${D}/var/lib/redis/ |
53 | chown redis.redis ${D}/var/lib/redis/ | 53 | chown redis.redis ${D}/var/lib/redis/ |
54 | 54 | ||
55 | install -d ${D}${systemd_system_unitdir} | 55 | install -d ${D}${systemd_system_unitdir} |
56 | install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} | 56 | install -m 0644 ${UNPACKDIR}/redis.service ${D}${systemd_system_unitdir} |
57 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service | 57 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service |
58 | 58 | ||
59 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 59 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch new file mode 100644 index 000000000..7f54a3723 --- /dev/null +++ b/meta-oe/recipes-extended/rrdtool/rrdtool/b76e3c578f1e9f582e9c28f50d82b1f569602075.patch | |||
@@ -0,0 +1,1583 @@ | |||
1 | From b76e3c578f1e9f582e9c28f50d82b1f569602075 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Michal=20Such=C3=A1nek?= <hramrach@gmail.com> | ||
3 | Date: Fri, 5 Jan 2024 15:31:48 +0100 | ||
4 | Subject: [PATCH] Constify argv, fix warnings. (#1242) | ||
5 | |||
6 | * Fix perl warnings | ||
7 | |||
8 | - cast POPs to void to avoid unused value warning | ||
9 | - declare functions that don't set RETVAL as returning void | ||
10 | |||
11 | Signed-off-by: Michal Suchanek <msuchanek@suse.de> | ||
12 | |||
13 | * Constify argv | ||
14 | |||
15 | rrd has no business modifying the string pointed to by passed agrv, and | ||
16 | as far as gcc can see it does indeed not modify them because it compiles | ||
17 | with const argv. | ||
18 | |||
19 | This fixes warnings when passing const strings into rrd, and avoids the | ||
20 | need to duplicate all strings in the tcl bindings. | ||
21 | |||
22 | This fixes warnings like these: | ||
23 | [ 3s] prog/sensord/rrd.c: In function 'rrdInit': | ||
24 | [ 3s] prog/sensord/rrd.c:302:40: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual] | ||
25 | [ 3s] 302 | ret = rrd_create(argc, (char**) argv); | ||
26 | [ 3s] | ^ | ||
27 | [ 3s] prog/sensord/rrd.c: In function 'rrdUpdate': | ||
28 | [ 3s] prog/sensord/rrd.c:458:42: warning: cast discards 'const' qualifier from pointer target type [-Wcast-qual] | ||
29 | [ 3s] 458 | if ((ret = rrd_update(3, (char **) /* WEAK */ argv))) { | ||
30 | [ 3s] | ^ | ||
31 | |||
32 | Signed-off-by: Michal Suchanek <msuchanek@suse.de> | ||
33 | |||
34 | * tcl: Do not duplicate const strings | ||
35 | |||
36 | --------- | ||
37 | |||
38 | Signed-off-by: Michal Suchanek <msuchanek@suse.de> | ||
39 | Upstream-Status: Backport [https://github.com/oetiker/rrdtool-1.x/commit/b76e3c578f1e9f582e9c28f50d82b1f569602075] | ||
40 | --- | ||
41 | CHANGES | 3 ++ | ||
42 | bindings/lua/rrdlua.c | 25 +++++----- | ||
43 | bindings/perl-shared/RRDs.xs | 36 +++++++------- | ||
44 | bindings/python/rrdtoolmodule.c | 38 +++++++-------- | ||
45 | bindings/ruby/main.c | 10 ++-- | ||
46 | bindings/tcl/tclrrd.c | 84 ++++++++------------------------- | ||
47 | src/optparse.c | 14 +++--- | ||
48 | src/optparse.h | 6 +-- | ||
49 | src/rrd.h | 38 +++++++-------- | ||
50 | src/rrd_cgi.c | 24 +++++----- | ||
51 | src/rrd_create.c | 2 +- | ||
52 | src/rrd_daemon.c | 12 ++--- | ||
53 | src/rrd_dump.c | 4 +- | ||
54 | src/rrd_fetch.c | 2 +- | ||
55 | src/rrd_first.c | 2 +- | ||
56 | src/rrd_flushcached.c | 2 +- | ||
57 | src/rrd_graph.c | 6 +-- | ||
58 | src/rrd_graph.h | 4 +- | ||
59 | src/rrd_graph_helper.c | 2 +- | ||
60 | src/rrd_info.c | 2 +- | ||
61 | src/rrd_last.c | 2 +- | ||
62 | src/rrd_lastupdate.c | 2 +- | ||
63 | src/rrd_list.c | 6 +-- | ||
64 | src/rrd_modify.c | 2 +- | ||
65 | src/rrd_modify.h | 2 +- | ||
66 | src/rrd_resize.c | 4 +- | ||
67 | src/rrd_restore.c | 2 +- | ||
68 | src/rrd_tool.c | 26 +++++----- | ||
69 | src/rrd_tune.c | 2 +- | ||
70 | src/rrd_update.c | 4 +- | ||
71 | src/rrd_xport.c | 2 +- | ||
72 | src/rrdupdate.c | 7 +-- | ||
73 | 32 files changed, 168 insertions(+), 209 deletions(-) | ||
74 | |||
75 | diff --git a/bindings/lua/rrdlua.c b/bindings/lua/rrdlua.c | ||
76 | index d1a700641..2095c3b5b 100644 | ||
77 | --- a/bindings/lua/rrdlua.c | ||
78 | +++ b/bindings/lua/rrdlua.c | ||
79 | @@ -37,8 +37,8 @@ | ||
80 | extern void rrd_freemem(void *mem); | ||
81 | |||
82 | extern int luaopen_rrd (lua_State * L); | ||
83 | -typedef int (*RRD_FUNCTION)(int, char **); | ||
84 | -typedef rrd_info_t *(RRD_FUNCTION_V)(int, char **); | ||
85 | +typedef int (*RRD_FUNCTION)(int, const char **); | ||
86 | +typedef rrd_info_t *(RRD_FUNCTION_V)(int, const char **); | ||
87 | |||
88 | /**********************************************************/ | ||
89 | |||
90 | @@ -49,9 +49,9 @@ static void reset_rrd_state(void) | ||
91 | rrd_clear_error(); | ||
92 | } | ||
93 | |||
94 | -static char **make_argv(const char *cmd, lua_State * L) | ||
95 | +static const char **make_argv(const char *cmd, lua_State * L) | ||
96 | { | ||
97 | - char **argv; | ||
98 | + const char **argv; | ||
99 | int i; | ||
100 | int argc = lua_gettop(L) + 1; | ||
101 | |||
102 | @@ -60,13 +60,12 @@ static char **make_argv(const char *cmd, lua_State * L) | ||
103 | luaL_error(L, "Can't allocate memory for arguments array", cmd); | ||
104 | |||
105 | /* fprintf(stderr, "Args:\n"); */ | ||
106 | - argv[0] = (char *) cmd; /* Dummy arg. Cast to (char *) because rrd */ | ||
107 | - /* functions don't expect (const * char) */ | ||
108 | + argv[0] = cmd; | ||
109 | /* fprintf(stderr, "%s\n", argv[0]); */ | ||
110 | for (i=1; i<argc; i++) { | ||
111 | /* accepts string or number */ | ||
112 | if (lua_isstring(L, i) || lua_isnumber(L, i)) { | ||
113 | - if (!(argv[i] = (char *) lua_tostring (L, i))) { | ||
114 | + if (!(argv[i] = lua_tostring (L, i))) { | ||
115 | /* raise an error and never return */ | ||
116 | luaL_error(L, "%s - error duplicating string area for arg #%d", | ||
117 | cmd, i); | ||
118 | @@ -84,7 +83,7 @@ static char **make_argv(const char *cmd, lua_State * L) | ||
119 | static int | ||
120 | rrd_common_call (lua_State *L, const char *cmd, RRD_FUNCTION rrd_function) | ||
121 | { | ||
122 | - char **argv; | ||
123 | + const char **argv; | ||
124 | int argc = lua_gettop(L) + 1; | ||
125 | |||
126 | argv = make_argv(cmd, L); | ||
127 | @@ -99,7 +98,7 @@ rrd_common_call (lua_State *L, const char *cmd, RRD_FUNCTION rrd_function) | ||
128 | static int | ||
129 | lua_rrd_infocall(lua_State *L, const char *cmd, RRD_FUNCTION_V rrd_function) | ||
130 | { | ||
131 | - char **argv; | ||
132 | + const char **argv; | ||
133 | rrd_info_t *p, *data; | ||
134 | int argc = lua_gettop(L) + 1; | ||
135 | |||
136 | @@ -197,7 +196,7 @@ static int | ||
137 | lua_rrd_fetch (lua_State * L) | ||
138 | { | ||
139 | int argc = lua_gettop(L) + 1; | ||
140 | - char **argv = make_argv("fetch", L); | ||
141 | + const char **argv = make_argv("fetch", L); | ||
142 | unsigned long i, j, step, ds_cnt; | ||
143 | rrd_value_t *data, *p; | ||
144 | char **names; | ||
145 | @@ -246,7 +245,7 @@ lua_rrd_first (lua_State * L) | ||
146 | { | ||
147 | time_t first; | ||
148 | int argc = lua_gettop(L) + 1; | ||
149 | - char **argv = make_argv("first", L); | ||
150 | + const char **argv = make_argv("first", L); | ||
151 | reset_rrd_state(); | ||
152 | first = rrd_first(argc, argv); | ||
153 | free(argv); | ||
154 | @@ -260,7 +259,7 @@ lua_rrd_last (lua_State * L) | ||
155 | { | ||
156 | time_t last; | ||
157 | int argc = lua_gettop(L) + 1; | ||
158 | - char **argv = make_argv("last", L); | ||
159 | + const char **argv = make_argv("last", L); | ||
160 | reset_rrd_state(); | ||
161 | last = rrd_last(argc, argv); | ||
162 | free(argv); | ||
163 | @@ -275,7 +274,7 @@ static int | ||
164 | lua_rrd_graph (lua_State * L) | ||
165 | { | ||
166 | int argc = lua_gettop(L) + 1; | ||
167 | - char **argv = make_argv("last", L); | ||
168 | + const char **argv = make_argv("last", L); | ||
169 | char **calcpr; | ||
170 | int i, xsize, ysize; | ||
171 | double ymin, ymax; | ||
172 | diff --git a/bindings/perl-shared/RRDs.xs b/bindings/perl-shared/RRDs.xs | ||
173 | index e233b5835..edce76ec4 100644 | ||
174 | --- a/bindings/perl-shared/RRDs.xs | ||
175 | +++ b/bindings/perl-shared/RRDs.xs | ||
176 | @@ -44,11 +44,11 @@ extern "C" { | ||
177 | strcpy(argv[i+1],handle); \ | ||
178 | } \ | ||
179 | rrd_clear_error();\ | ||
180 | - RETVAL=name(items+1,argv); \ | ||
181 | + RETVAL = name(items + 1, (const char **)argv); \ | ||
182 | for (i=0; i < items; i++) {\ | ||
183 | - free(argv[i+1]);\ | ||
184 | + free((void *)argv[i+1]);\ | ||
185 | } \ | ||
186 | - free(argv);\ | ||
187 | + free((void *)argv);\ | ||
188 | \ | ||
189 | if (rrd_test_error()) XSRETURN_UNDEF; | ||
190 | |||
191 | @@ -67,11 +67,11 @@ extern "C" { | ||
192 | strcpy(argv[i+1],handle); \ | ||
193 | } \ | ||
194 | rrd_clear_error(); \ | ||
195 | - data=name(items+1, argv); \ | ||
196 | + data = name(items + 1, (const char **)argv); \ | ||
197 | for (i=0; i < items; i++) { \ | ||
198 | - free(argv[i+1]); \ | ||
199 | + free((void *)argv[i+1]); \ | ||
200 | } \ | ||
201 | - free(argv); \ | ||
202 | + free((void *)argv); \ | ||
203 | if (rrd_test_error()) XSRETURN_UNDEF; \ | ||
204 | hash = newHV(); \ | ||
205 | save=data; \ | ||
206 | @@ -175,7 +175,7 @@ static int rrd_fetch_cb_wrapper( | ||
207 | /* Check the eval first */ | ||
208 | if (SvTRUE(ERRSV)) { | ||
209 | rrd_set_error("perl callback failed: %s",SvPV_nolen(ERRSV)); | ||
210 | - POPs; /* there is undef on top of the stack when there is an error | ||
211 | + (void)POPs; /* there is undef on top of the stack when there is an error | ||
212 | and call_sv was initiated with G_EVAL|G_SCALER */ | ||
213 | goto error_out; | ||
214 | } | ||
215 | @@ -383,7 +383,7 @@ rrd_tune(...) | ||
216 | |||
217 | #ifdef HAVE_RRD_GRAPH | ||
218 | |||
219 | -SV * | ||
220 | +void | ||
221 | rrd_graph(...) | ||
222 | PROTOTYPE: @ | ||
223 | PREINIT: | ||
224 | @@ -404,7 +404,7 @@ rrd_graph(...) | ||
225 | strcpy(argv[i+1],handle); | ||
226 | } | ||
227 | rrd_clear_error(); | ||
228 | - rrd_graph(items+1,argv,&calcpr,&xsize,&ysize,NULL,&ymin,&ymax); | ||
229 | + rrd_graph(items+1,(const char **)argv,&calcpr,&xsize,&ysize,NULL,&ymin,&ymax); | ||
230 | for (i=0; i < items; i++) { | ||
231 | free(argv[i+1]); | ||
232 | } | ||
233 | @@ -433,7 +433,7 @@ rrd_graph(...) | ||
234 | |||
235 | #endif /* HAVE_RRD_GRAPH */ | ||
236 | |||
237 | -SV * | ||
238 | +void | ||
239 | rrd_fetch(...) | ||
240 | PROTOTYPE: @ | ||
241 | PREINIT: | ||
242 | @@ -455,7 +455,7 @@ rrd_fetch(...) | ||
243 | strcpy(argv[i+1],handle); | ||
244 | } | ||
245 | rrd_clear_error(); | ||
246 | - rrd_fetch(items+1,argv,&start,&end,&step,&ds_cnt,&ds_namv,&data); | ||
247 | + rrd_fetch(items+1,(const char **)argv,&start,&end,&step,&ds_cnt,&ds_namv,&data); | ||
248 | for (i=0; i < items; i++) { | ||
249 | free(argv[i+1]); | ||
250 | } | ||
251 | @@ -486,7 +486,7 @@ rrd_fetch(...) | ||
252 | PUSHs(sv_2mortal(newRV_noinc((SV*)names))); | ||
253 | PUSHs(sv_2mortal(newRV_noinc((SV*)retar))); | ||
254 | |||
255 | -SV * | ||
256 | +void | ||
257 | rrd_fetch_cb_register(cb) | ||
258 | SV * cb | ||
259 | CODE: | ||
260 | @@ -496,7 +496,7 @@ rrd_fetch_cb_register(cb) | ||
261 | SvSetSV(rrd_fetch_cb_svptr,cb); | ||
262 | rrd_fetch_cb_register(rrd_fetch_cb_wrapper); | ||
263 | |||
264 | -SV * | ||
265 | +void | ||
266 | rrd_times(start, end) | ||
267 | char *start | ||
268 | char *end | ||
269 | @@ -521,7 +521,7 @@ rrd_times(start, end) | ||
270 | PUSHs(sv_2mortal(newSVuv(start_tmp))); | ||
271 | PUSHs(sv_2mortal(newSVuv(end_tmp))); | ||
272 | |||
273 | -int | ||
274 | +void | ||
275 | rrd_xport(...) | ||
276 | PROTOTYPE: @ | ||
277 | PREINIT: | ||
278 | @@ -543,7 +543,7 @@ rrd_xport(...) | ||
279 | strcpy(argv[i+1],handle); | ||
280 | } | ||
281 | rrd_clear_error(); | ||
282 | - rrd_xport(items+1,argv,&xsize,&start,&end,&step,&col_cnt,&legend_v,&data); | ||
283 | + rrd_xport(items+1,(const char **)argv,&xsize,&start,&end,&step,&col_cnt,&legend_v,&data); | ||
284 | for (i=0; i < items; i++) { | ||
285 | free(argv[i+1]); | ||
286 | } | ||
287 | @@ -657,7 +657,7 @@ rrd_flushcached(...) | ||
288 | OUTPUT: | ||
289 | RETVAL | ||
290 | |||
291 | -SV* | ||
292 | +void | ||
293 | rrd_list(...) | ||
294 | PROTOTYPE: @ | ||
295 | PREINIT: | ||
296 | @@ -667,7 +667,7 @@ rrd_list(...) | ||
297 | char **argv; | ||
298 | AV *list; | ||
299 | PPCODE: | ||
300 | - argv = (char **) malloc((items+1)*sizeof(char *)); | ||
301 | + argv = malloc((items+1)*sizeof(char *)); | ||
302 | argv[0] = "dummy"; | ||
303 | |||
304 | for (i = 0; i < items; i++) { | ||
305 | @@ -681,7 +681,7 @@ rrd_list(...) | ||
306 | |||
307 | rrd_clear_error(); | ||
308 | |||
309 | - data = rrd_list(items+1, argv); | ||
310 | + data = rrd_list(items+1, (const char **)argv); | ||
311 | |||
312 | for (i=0; i < items; i++) { | ||
313 | free(argv[i+1]); | ||
314 | diff --git a/bindings/python/rrdtoolmodule.c b/bindings/python/rrdtoolmodule.c | ||
315 | index 1ab463584..f255e65bc 100644 | ||
316 | --- a/bindings/python/rrdtoolmodule.c | ||
317 | +++ b/bindings/python/rrdtoolmodule.c | ||
318 | @@ -123,7 +123,7 @@ PyRRD_String_FromCF(enum cf_en cf) | ||
319 | * @return Zero if the function succeeds, otherwise -1 | ||
320 | */ | ||
321 | static int | ||
322 | -convert_args(char *command, PyObject *args, char ***rrdtool_argv, int *rrdtool_argc) | ||
323 | +convert_args(char *command, PyObject *args, const char ***rrdtool_argv, int *rrdtool_argc) | ||
324 | { | ||
325 | PyObject *o, *lo; | ||
326 | int i, j, args_count, argv_count, element_count; | ||
327 | @@ -145,7 +145,7 @@ convert_args(char *command, PyObject *args, char ***rrdtool_argv, int *rrdtool_a | ||
328 | } | ||
329 | } | ||
330 | |||
331 | - *rrdtool_argv = PyMem_New(char *, element_count + 1); | ||
332 | + *rrdtool_argv = PyMem_New(const char *, element_count + 1); | ||
333 | |||
334 | if (*rrdtool_argv == NULL) | ||
335 | return -1; | ||
336 | @@ -186,7 +186,7 @@ convert_args(char *command, PyObject *args, char ***rrdtool_argv, int *rrdtool_a | ||
337 | * Destroy argument vector. | ||
338 | */ | ||
339 | static void | ||
340 | -destroy_args(char ***rrdtool_argv) | ||
341 | +destroy_args(const char ***rrdtool_argv) | ||
342 | { | ||
343 | PyMem_Del(*rrdtool_argv); | ||
344 | *rrdtool_argv = NULL; | ||
345 | @@ -267,7 +267,7 @@ static char _rrdtool_create__doc__[] = "Create a new Round Robin Database.\n\n\ | ||
346 | static PyObject * | ||
347 | _rrdtool_create(PyObject *Py_UNUSED(self), PyObject *args) | ||
348 | { | ||
349 | - char **rrdtool_argv = NULL; | ||
350 | + const char **rrdtool_argv = NULL; | ||
351 | int rrdtool_argc = 0; | ||
352 | PyObject *ret; | ||
353 | int status; | ||
354 | @@ -306,7 +306,7 @@ static char _rrdtool_dump__doc__[] = "Dump an RRD to XML.\n\n\ | ||
355 | static PyObject * | ||
356 | _rrdtool_dump(PyObject *Py_UNUSED(self), PyObject *args) | ||
357 | { | ||
358 | - char **rrdtool_argv = NULL; | ||
359 | + const char **rrdtool_argv = NULL; | ||
360 | int rrdtool_argc = 0; | ||
361 | PyObject *ret; | ||
362 | int status; | ||
363 | @@ -345,7 +345,7 @@ static char _rrdtool_update__doc__[] = "Store a new set of values into\ | ||
364 | static PyObject * | ||
365 | _rrdtool_update(PyObject *Py_UNUSED(self), PyObject *args) | ||
366 | { | ||
367 | - char **rrdtool_argv = NULL; | ||
368 | + const char **rrdtool_argv = NULL; | ||
369 | int rrdtool_argc = 0; | ||
370 | PyObject *ret; | ||
371 | int status; | ||
372 | @@ -378,7 +378,7 @@ static char _rrdtool_updatev__doc__[] = "Store a new set of values into "\ | ||
373 | static PyObject * | ||
374 | _rrdtool_updatev(PyObject *Py_UNUSED(self), PyObject *args) | ||
375 | { | ||
376 | - char **rrdtool_argv = NULL; | ||
377 | + const char **rrdtool_argv = NULL; | ||
378 | int rrdtool_argc = 0; | ||
379 | PyObject *ret; | ||
380 | rrd_info_t *data; | ||
381 | @@ -419,7 +419,7 @@ static char _rrdtool_fetch__doc__[] = "Fetch data from an RRD.\n\n\ | ||
382 | static PyObject * | ||
383 | _rrdtool_fetch(PyObject *Py_UNUSED(self), PyObject *args) | ||
384 | { | ||
385 | - char **rrdtool_argv = NULL; | ||
386 | + const char **rrdtool_argv = NULL; | ||
387 | int rrdtool_argc = 0; | ||
388 | PyObject *ret, *range_tup, *dsnam_tup, *data_list, *t; | ||
389 | rrd_value_t *data, *datai, dv; | ||
390 | @@ -497,7 +497,7 @@ static char _rrdtool_flushcached__doc__[] = "Flush RRD files from memory.\n\n\ | ||
391 | static PyObject * | ||
392 | _rrdtool_flushcached(PyObject *Py_UNUSED(self), PyObject *args) | ||
393 | { | ||
394 | - char **rrdtool_argv = NULL; | ||
395 | + const char **rrdtool_argv = NULL; | ||
396 | int rrdtool_argc = 0; | ||
397 | PyObject *ret; | ||
398 | int status; | ||
399 | @@ -592,7 +592,7 @@ static char _rrdtool_graph__doc__[] = "Create a graph based on one or more " \ | ||
400 | static PyObject * | ||
401 | _rrdtool_graph(PyObject *Py_UNUSED(self), PyObject *args) | ||
402 | { | ||
403 | - char **rrdtool_argv = NULL; | ||
404 | + const char **rrdtool_argv = NULL; | ||
405 | int rrdtool_argc = 0; | ||
406 | PyObject *ret; | ||
407 | int xsize, ysize, i, status; | ||
408 | @@ -650,7 +650,7 @@ static char _rrdtool_graphv__doc__[] = "Create a graph based on one or more " \ | ||
409 | static PyObject * | ||
410 | _rrdtool_graphv(PyObject *Py_UNUSED(self), PyObject *args) | ||
411 | { | ||
412 | - char **rrdtool_argv = NULL; | ||
413 | + const char **rrdtool_argv = NULL; | ||
414 | int rrdtool_argc = 0; | ||
415 | PyObject *ret; | ||
416 | rrd_info_t *data; | ||
417 | @@ -695,7 +695,7 @@ static char _rrdtool_xport__doc__[] = "Dictionary representation of data " \ | ||
418 | static PyObject * | ||
419 | _rrdtool_xport(PyObject *Py_UNUSED(self), PyObject *args) | ||
420 | { | ||
421 | - char **rrdtool_argv = NULL; | ||
422 | + const char **rrdtool_argv = NULL; | ||
423 | int rrdtool_argc = 0; | ||
424 | PyObject *ret; | ||
425 | int xsize, status; | ||
426 | @@ -793,7 +793,7 @@ static char _rrdtool_list__doc__[] = "List RRDs in storage.\n\n" \ | ||
427 | static PyObject * | ||
428 | _rrdtool_list(PyObject *Py_UNUSED(self), PyObject *args) | ||
429 | { | ||
430 | - char **rrdtool_argv = NULL; | ||
431 | + const char **rrdtool_argv = NULL; | ||
432 | int rrdtool_argc = 0; | ||
433 | PyObject *ret, *str; | ||
434 | char *data, *ptr, *end; | ||
435 | @@ -855,7 +855,7 @@ static char _rrdtool_tune__doc__[] = "Modify some basic properties of a " \ | ||
436 | static PyObject * | ||
437 | _rrdtool_tune(PyObject *Py_UNUSED(self), PyObject *args) | ||
438 | { | ||
439 | - char **rrdtool_argv = NULL; | ||
440 | + const char **rrdtool_argv = NULL; | ||
441 | int rrdtool_argc = 0; | ||
442 | PyObject *ret; | ||
443 | int status; | ||
444 | @@ -893,7 +893,7 @@ static char _rrdtool_first__doc__[] = "Get the first UNIX timestamp of the "\ | ||
445 | static PyObject * | ||
446 | _rrdtool_first(PyObject *Py_UNUSED(self), PyObject *args) | ||
447 | { | ||
448 | - char **rrdtool_argv = NULL; | ||
449 | + const char **rrdtool_argv = NULL; | ||
450 | int rrdtool_argc = 0; | ||
451 | PyObject *ret; | ||
452 | int ts; | ||
453 | @@ -928,7 +928,7 @@ static char _rrdtool_last__doc__[] = "Get the UNIX timestamp of the most "\ | ||
454 | static PyObject * | ||
455 | _rrdtool_last(PyObject *Py_UNUSED(self), PyObject *args) | ||
456 | { | ||
457 | - char **rrdtool_argv = NULL; | ||
458 | + const char **rrdtool_argv = NULL; | ||
459 | int rrdtool_argc = 0; | ||
460 | PyObject *ret; | ||
461 | int ts; | ||
462 | @@ -965,7 +965,7 @@ static char _rrdtool_resize__doc__[] = "Modify the number of rows in a "\ | ||
463 | static PyObject * | ||
464 | _rrdtool_resize(PyObject *Py_UNUSED(self), PyObject *args) | ||
465 | { | ||
466 | - char **rrdtool_argv = NULL; | ||
467 | + const char **rrdtool_argv = NULL; | ||
468 | int rrdtool_argc = 0; | ||
469 | PyObject *ret; | ||
470 | int status; | ||
471 | @@ -1003,7 +1003,7 @@ static char _rrdtool_info__doc__[] = "Extract header information from an "\ | ||
472 | static PyObject * | ||
473 | _rrdtool_info(PyObject *Py_UNUSED(self), PyObject *args) | ||
474 | { | ||
475 | - char **rrdtool_argv = NULL; | ||
476 | + const char **rrdtool_argv = NULL; | ||
477 | int rrdtool_argc = 0; | ||
478 | PyObject *ret; | ||
479 | rrd_info_t *data; | ||
480 | @@ -1040,7 +1040,7 @@ static char _rrdtool_lastupdate__doc__[] = "Returns datetime and value stored "\ | ||
481 | static PyObject * | ||
482 | _rrdtool_lastupdate(PyObject *Py_UNUSED(self), PyObject *args) | ||
483 | { | ||
484 | - char **rrdtool_argv = NULL; | ||
485 | + const char **rrdtool_argv = NULL; | ||
486 | int rrdtool_argc = 0; | ||
487 | PyObject *ret, *ds_dict, *lastupd; | ||
488 | int status; | ||
489 | diff --git a/bindings/ruby/main.c b/bindings/ruby/main.c | ||
490 | index e4cc6443d..a036b7fb8 100644 | ||
491 | --- a/bindings/ruby/main.c | ||
492 | +++ b/bindings/ruby/main.c | ||
493 | @@ -9,7 +9,7 @@ | ||
494 | |||
495 | typedef struct string_arr_t { | ||
496 | int len; | ||
497 | - char **strings; | ||
498 | + const char **strings; | ||
499 | } string_arr; | ||
500 | |||
501 | VALUE mRRD; | ||
502 | @@ -18,12 +18,12 @@ VALUE rb_eRRDError; | ||
503 | typedef int ( | ||
504 | *RRDFUNC) ( | ||
505 | int argc, | ||
506 | - char **argv); | ||
507 | + const char **argv); | ||
508 | |||
509 | typedef rrd_info_t *( | ||
510 | *RRDINFOFUNC) ( | ||
511 | int argc, | ||
512 | - char **argv); | ||
513 | + const char **argv); | ||
514 | |||
515 | #define RRD_CHECK_ERROR \ | ||
516 | if (rrd_test_error()) \ | ||
517 | @@ -72,10 +72,10 @@ void string_arr_delete( | ||
518 | |||
519 | /* skip dummy first entry */ | ||
520 | for (i = 1; i < a.len; i++) { | ||
521 | - free(a.strings[i]); | ||
522 | + free((void *)a.strings[i]); | ||
523 | } | ||
524 | |||
525 | - free(a.strings); | ||
526 | + free((void *)a.strings); | ||
527 | } | ||
528 | |||
529 | void reset_rrd_state( | ||
530 | diff --git a/bindings/tcl/tclrrd.c b/bindings/tcl/tclrrd.c | ||
531 | index 2927d9251..58a4cef68 100644 | ||
532 | --- a/bindings/tcl/tclrrd.c | ||
533 | +++ b/bindings/tcl/tclrrd.c | ||
534 | @@ -22,6 +22,7 @@ | ||
535 | #include <stdlib.h> | ||
536 | #include "../../src/rrd_tool.h" | ||
537 | #include "../../src/rrd_format.h" | ||
538 | +#include "../../src/unused.h" | ||
539 | |||
540 | /* support pre-8.4 tcl */ | ||
541 | |||
542 | @@ -41,47 +42,39 @@ extern int Tclrrd_SafeInit( | ||
543 | * Hence, we need to do some preparation before | ||
544 | * calling the rrd library functions. | ||
545 | */ | ||
546 | -static char **getopt_init( | ||
547 | +static const char **getopt_init( | ||
548 | int argc, | ||
549 | CONST84 char *argv[]) | ||
550 | { | ||
551 | - char **argv2; | ||
552 | + const char **argv2; | ||
553 | int i; | ||
554 | |||
555 | argv2 = calloc(argc, sizeof(char *)); | ||
556 | for (i = 0; i < argc; i++) { | ||
557 | - argv2[i] = strdup(argv[i]); | ||
558 | + argv2[i] = argv[i]; | ||
559 | } | ||
560 | return argv2; | ||
561 | } | ||
562 | |||
563 | static void getopt_cleanup( | ||
564 | - int argc, | ||
565 | - char **argv2) | ||
566 | + int UNUSED(argc), | ||
567 | + const char **argv2) | ||
568 | { | ||
569 | - int i; | ||
570 | - | ||
571 | - for (i = 0; i < argc; i++) { | ||
572 | - if (argv2[i] != NULL) { | ||
573 | - free(argv2[i]); | ||
574 | - } | ||
575 | - } | ||
576 | - free(argv2); | ||
577 | + free((void *)argv2); | ||
578 | } | ||
579 | |||
580 | static void getopt_free_element( | ||
581 | - char *argv2[], | ||
582 | + const char *argv2[], | ||
583 | int argn) | ||
584 | { | ||
585 | if (argv2[argn] != NULL) { | ||
586 | - free(argv2[argn]); | ||
587 | argv2[argn] = NULL; | ||
588 | } | ||
589 | } | ||
590 | |||
591 | static void getopt_squieeze( | ||
592 | int *argc, | ||
593 | - char *argv2[]) | ||
594 | + const char *argv2[]) | ||
595 | { | ||
596 | int i, null_i = 0, argc_tmp = *argc; | ||
597 | |||
598 | @@ -104,7 +97,7 @@ static int Rrd_Create( | ||
599 | CONST84 char *argv[]) | ||
600 | { | ||
601 | int argv_i; | ||
602 | - char **argv2; | ||
603 | + const char **argv2; | ||
604 | char *parsetime_error = NULL; | ||
605 | time_t last_up = time(NULL) - 10; | ||
606 | long int long_tmp; | ||
607 | @@ -295,7 +288,7 @@ static int Rrd_Flushcached( | ||
608 | return TCL_ERROR; | ||
609 | } | ||
610 | |||
611 | - rrd_flushcached(argc, (char**)argv); | ||
612 | + rrd_flushcached(argc, argv); | ||
613 | |||
614 | if (rrd_test_error()) { | ||
615 | Tcl_AppendResult(interp, "RRD Error: ", | ||
616 | @@ -380,7 +373,7 @@ static int Rrd_Update( | ||
617 | CONST84 char *argv[]) | ||
618 | { | ||
619 | int argv_i; | ||
620 | - char **argv2, *template = NULL; | ||
621 | + const char **argv2, *template = NULL; | ||
622 | |||
623 | argv2 = getopt_init(argc, argv); | ||
624 | |||
625 | @@ -391,16 +384,10 @@ static int Rrd_Update( | ||
626 | Tcl_AppendResult(interp, "RRD Error: option '", | ||
627 | argv2[argv_i - 1], "' needs an argument", | ||
628 | (char *) NULL); | ||
629 | - if (template != NULL) { | ||
630 | - free(template); | ||
631 | - } | ||
632 | getopt_cleanup(argc, argv2); | ||
633 | return TCL_ERROR; | ||
634 | } | ||
635 | - if (template != NULL) { | ||
636 | - free(template); | ||
637 | - } | ||
638 | - template = strdup(argv2[argv_i]); | ||
639 | + template = argv2[argv_i]; | ||
640 | getopt_free_element(argv2, argv_i - 1); | ||
641 | getopt_free_element(argv2, argv_i); | ||
642 | } else if (!strcmp(argv2[argv_i], "--")) { | ||
643 | @@ -409,9 +396,6 @@ static int Rrd_Update( | ||
644 | } else if (argv2[argv_i][0] == '-') { | ||
645 | Tcl_AppendResult(interp, "RRD Error: unknown option '", | ||
646 | argv2[argv_i], "'", (char *) NULL); | ||
647 | - if (template != NULL) { | ||
648 | - free(template); | ||
649 | - } | ||
650 | getopt_cleanup(argc, argv2); | ||
651 | return TCL_ERROR; | ||
652 | } | ||
653 | @@ -422,18 +406,12 @@ static int Rrd_Update( | ||
654 | if (argc < 2) { | ||
655 | Tcl_AppendResult(interp, "RRD Error: needs rrd filename", | ||
656 | (char *) NULL); | ||
657 | - if (template != NULL) { | ||
658 | - free(template); | ||
659 | - } | ||
660 | getopt_cleanup(argc, argv2); | ||
661 | return TCL_ERROR; | ||
662 | } | ||
663 | |||
664 | rrd_update_r(argv2[1], template, argc - 2, (const char **)argv2 + 2); | ||
665 | |||
666 | - if (template != NULL) { | ||
667 | - free(template); | ||
668 | - } | ||
669 | getopt_cleanup(argc, argv2); | ||
670 | |||
671 | if (rrd_test_error()) { | ||
672 | @@ -454,7 +432,6 @@ static int Rrd_Info( | ||
673 | { | ||
674 | int status = TCL_OK; | ||
675 | rrd_info_t *data; | ||
676 | - char **argv2; | ||
677 | |||
678 | /* TODO: support for rrdcached */ | ||
679 | if (argc != 2) { | ||
680 | @@ -463,9 +440,7 @@ static int Rrd_Info( | ||
681 | return TCL_ERROR; | ||
682 | } | ||
683 | |||
684 | - argv2 = getopt_init(argc, argv); | ||
685 | - | ||
686 | - data = rrd_info_r(argv2[1]); | ||
687 | + data = rrd_info_r(argv[1]); | ||
688 | |||
689 | if (data) { | ||
690 | Tcl_SetObjResult(interp, convert_info(data)); | ||
691 | @@ -477,7 +452,6 @@ static int Rrd_Info( | ||
692 | status = TCL_ERROR; | ||
693 | } | ||
694 | |||
695 | - getopt_cleanup(argc, argv2); | ||
696 | return status; | ||
697 | } | ||
698 | |||
699 | @@ -488,7 +462,6 @@ static int Rrd_Lastupdate( | ||
700 | CONST84 char *argv[]) | ||
701 | { | ||
702 | time_t last_update; | ||
703 | - char **argv2; | ||
704 | char **ds_namv; | ||
705 | char **last_ds; | ||
706 | char s[30]; | ||
707 | @@ -502,8 +475,7 @@ static int Rrd_Lastupdate( | ||
708 | return TCL_ERROR; | ||
709 | } | ||
710 | |||
711 | - argv2 = getopt_init(argc, argv); | ||
712 | - if (rrd_lastupdate_r(argv2[1], &last_update, | ||
713 | + if (rrd_lastupdate_r(argv[1], &last_update, | ||
714 | &ds_cnt, &ds_namv, &last_ds) == 0) { | ||
715 | listPtr = Tcl_GetObjResult(interp); | ||
716 | for (i = 0; i < ds_cnt; i++) { | ||
717 | @@ -527,7 +499,6 @@ static int Rrd_Lastupdate( | ||
718 | free(ds_namv); | ||
719 | } | ||
720 | } | ||
721 | - getopt_cleanup(argc, argv2); | ||
722 | return TCL_OK; | ||
723 | } | ||
724 | |||
725 | @@ -543,10 +514,8 @@ static int Rrd_Fetch( | ||
726 | char **ds_namv; | ||
727 | Tcl_Obj *listPtr; | ||
728 | char s[30]; | ||
729 | - char **argv2; | ||
730 | |||
731 | - argv2 = getopt_init(argc, argv); | ||
732 | - if (rrd_fetch(argc, argv2, &start, &end, &step, | ||
733 | + if (rrd_fetch(argc, argv, &start, &end, &step, | ||
734 | &ds_cnt, &ds_namv, &data) != -1) { | ||
735 | datai = data; | ||
736 | listPtr = Tcl_GetObjResult(interp); | ||
737 | @@ -562,7 +531,6 @@ static int Rrd_Fetch( | ||
738 | free(ds_namv); | ||
739 | free(data); | ||
740 | } | ||
741 | - getopt_cleanup(argc, argv2); | ||
742 | |||
743 | if (rrd_test_error()) { | ||
744 | Tcl_AppendResult(interp, "RRD Error: ", | ||
745 | @@ -590,7 +558,7 @@ static int Rrd_Graph( | ||
746 | int rc, xsize, ysize; | ||
747 | double ymin, ymax; | ||
748 | char dimensions[50]; | ||
749 | - char **argv2; | ||
750 | + const char **argv2; | ||
751 | CONST84 char *save; | ||
752 | |||
753 | /* | ||
754 | @@ -692,11 +660,7 @@ static int Rrd_Tune( | ||
755 | int argc, | ||
756 | CONST84 char *argv[]) | ||
757 | { | ||
758 | - char **argv2; | ||
759 | - | ||
760 | - argv2 = getopt_init(argc, argv); | ||
761 | - rrd_tune(argc, argv2); | ||
762 | - getopt_cleanup(argc, argv2); | ||
763 | + rrd_tune(argc, argv); | ||
764 | |||
765 | if (rrd_test_error()) { | ||
766 | Tcl_AppendResult(interp, "RRD Error: ", | ||
767 | @@ -716,11 +680,7 @@ static int Rrd_Resize( | ||
768 | int argc, | ||
769 | CONST84 char *argv[]) | ||
770 | { | ||
771 | - char **argv2; | ||
772 | - | ||
773 | - argv2 = getopt_init(argc, argv); | ||
774 | - rrd_resize(argc, argv2); | ||
775 | - getopt_cleanup(argc, argv2); | ||
776 | + rrd_resize(argc, argv); | ||
777 | |||
778 | if (rrd_test_error()) { | ||
779 | Tcl_AppendResult(interp, "RRD Error: ", | ||
780 | @@ -740,11 +700,7 @@ static int Rrd_Restore( | ||
781 | int argc, | ||
782 | CONST84 char *argv[]) | ||
783 | { | ||
784 | - char **argv2; | ||
785 | - | ||
786 | - argv2 = getopt_init(argc, argv); | ||
787 | - rrd_restore(argc, argv2); | ||
788 | - getopt_cleanup(argc, argv2); | ||
789 | + rrd_restore(argc, argv); | ||
790 | |||
791 | if (rrd_test_error()) { | ||
792 | Tcl_AppendResult(interp, "RRD Error: ", | ||
793 | diff --git a/src/optparse.c b/src/optparse.c | ||
794 | index 9040ba8b2..79a3efe11 100644 | ||
795 | --- a/src/optparse.c | ||
796 | +++ b/src/optparse.c | ||
797 | @@ -10,7 +10,7 @@ | ||
798 | #define options_argv(i) \ | ||
799 | ((i) < options->argc ? options->argv[i] : NULL) | ||
800 | |||
801 | -void optparse_init(struct optparse *options, int argc, char **argv) | ||
802 | +void optparse_init(struct optparse *options, int argc, const char **argv) | ||
803 | { | ||
804 | options->argv = argv; | ||
805 | options->argc = argc; | ||
806 | @@ -42,7 +42,7 @@ is_longopt(const char *arg) | ||
807 | static void | ||
808 | permute(struct optparse *options, int index) | ||
809 | { | ||
810 | - char *nonoption = options->argv[index]; | ||
811 | + const char *nonoption = options->argv[index]; | ||
812 | for (int i = index; i < options->optind - 1; i++) | ||
813 | options->argv[i] = options->argv[i + 1]; | ||
814 | options->argv[options->optind - 1] = nonoption; | ||
815 | @@ -67,7 +67,7 @@ int optparse(struct optparse *options, const char *optstring) | ||
816 | options->errmsg[0] = '\0'; | ||
817 | options->optopt = 0; | ||
818 | options->optarg = NULL; | ||
819 | - char *option = options_argv(options->optind); | ||
820 | + const char *option = options_argv(options->optind); | ||
821 | if (option == NULL) { | ||
822 | return -1; | ||
823 | } else if (is_dashdash(option)) { | ||
824 | @@ -88,7 +88,7 @@ int optparse(struct optparse *options, const char *optstring) | ||
825 | option += options->subopt + 1; | ||
826 | options->optopt = option[0]; | ||
827 | int type = argtype(optstring, option[0]); | ||
828 | - char *next = options_argv(options->optind + 1); | ||
829 | + const char *next = options_argv(options->optind + 1); | ||
830 | switch (type) { | ||
831 | case -1: | ||
832 | opterror(options, "invalid option -- '%c'", option[0]); | ||
833 | @@ -128,10 +128,10 @@ int optparse(struct optparse *options, const char *optstring) | ||
834 | return 0; | ||
835 | } | ||
836 | |||
837 | -char *optparse_arg(struct optparse *options) | ||
838 | +const char *optparse_arg(struct optparse *options) | ||
839 | { | ||
840 | options->subopt = 0; | ||
841 | - char *option = options->argv[options->optind]; | ||
842 | + const char *option = options->argv[options->optind]; | ||
843 | if (option != NULL) | ||
844 | options->optind++; | ||
845 | return option; | ||
846 | @@ -222,7 +222,7 @@ optparse_long(struct optparse *options, | ||
847 | int *longindex) | ||
848 | { | ||
849 | // printf("%i < %i\n",options->optind,options->argc); | ||
850 | - char *option = options_argv(options->optind); | ||
851 | + const char *option = options_argv(options->optind); | ||
852 | if (option == NULL) { | ||
853 | return -1; | ||
854 | } else if (is_dashdash(option)) { | ||
855 | diff --git a/src/optparse.h b/src/optparse.h | ||
856 | index c4b0ec19c..7a0bb3885 100644 | ||
857 | --- a/src/optparse.h | ||
858 | +++ b/src/optparse.h | ||
859 | @@ -44,7 +44,7 @@ | ||
860 | */ | ||
861 | |||
862 | struct optparse { | ||
863 | - char **argv; | ||
864 | + const char **argv; | ||
865 | int argc; | ||
866 | int permute; | ||
867 | int optind; | ||
868 | @@ -65,7 +65,7 @@ struct optparse_long { | ||
869 | /** | ||
870 | * Initializes the parser state. | ||
871 | */ | ||
872 | -void optparse_init(struct optparse *options, int argc, char **argv); | ||
873 | +void optparse_init(struct optparse *options, int argc, const char **argv); | ||
874 | |||
875 | /** | ||
876 | * Read the next option in the argv array. | ||
877 | @@ -98,6 +98,6 @@ optparse_long(struct optparse *options, | ||
878 | * subcommand returned by optparse_arg(). This function allows you to | ||
879 | * ignore the value of optind. | ||
880 | */ | ||
881 | -char *optparse_arg(struct optparse *options); | ||
882 | +const char *optparse_arg(struct optparse *options); | ||
883 | |||
884 | #endif | ||
885 | diff --git a/src/rrd.h b/src/rrd.h | ||
886 | index 184887ccc..b40f9a449 100644 | ||
887 | --- a/src/rrd.h | ||
888 | +++ b/src/rrd.h | ||
889 | @@ -155,10 +155,10 @@ extern "C" { | ||
890 | /* main function blocks */ | ||
891 | int rrd_create( | ||
892 | int, | ||
893 | - char **); | ||
894 | + const char **); | ||
895 | rrd_info_t *rrd_info( | ||
896 | int, | ||
897 | - char **); | ||
898 | + const char **); | ||
899 | rrd_info_t *rrd_info_push( | ||
900 | rrd_info_t *, | ||
901 | char *, | ||
902 | @@ -170,19 +170,19 @@ extern "C" { | ||
903 | rrd_info_t *); | ||
904 | char *rrd_list( | ||
905 | int, | ||
906 | - char **); | ||
907 | + const char **); | ||
908 | char *rrd_list_r( | ||
909 | int, | ||
910 | - char *dirname); | ||
911 | + const char *dirname); | ||
912 | int rrd_update( | ||
913 | int, | ||
914 | - char **); | ||
915 | + const char **); | ||
916 | rrd_info_t *rrd_update_v( | ||
917 | int, | ||
918 | - char **); | ||
919 | + const char **); | ||
920 | int rrd_graph( | ||
921 | int, | ||
922 | - char **, | ||
923 | + const char **, | ||
924 | char ***, | ||
925 | int *, | ||
926 | int *, | ||
927 | @@ -191,11 +191,11 @@ extern "C" { | ||
928 | double *); | ||
929 | rrd_info_t *rrd_graph_v( | ||
930 | int, | ||
931 | - char **); | ||
932 | + const char **); | ||
933 | |||
934 | int rrd_fetch( | ||
935 | int, | ||
936 | - char **, | ||
937 | + const char **, | ||
938 | time_t *, | ||
939 | time_t *, | ||
940 | unsigned long *, | ||
941 | @@ -204,32 +204,32 @@ extern "C" { | ||
942 | rrd_value_t **); | ||
943 | int rrd_restore( | ||
944 | int, | ||
945 | - char **); | ||
946 | + const char **); | ||
947 | int rrd_dump( | ||
948 | int, | ||
949 | - char **); | ||
950 | + const char **); | ||
951 | int rrd_tune( | ||
952 | int, | ||
953 | - char **); | ||
954 | + const char **); | ||
955 | time_t rrd_last( | ||
956 | int, | ||
957 | - char **); | ||
958 | + const char **); | ||
959 | int rrd_lastupdate( | ||
960 | int argc, | ||
961 | - char **argv); | ||
962 | + const char **argv); | ||
963 | time_t rrd_first( | ||
964 | int, | ||
965 | - char **); | ||
966 | + const char **); | ||
967 | int rrd_resize( | ||
968 | int, | ||
969 | - char **); | ||
970 | + const char **); | ||
971 | char *rrd_strversion( | ||
972 | void); | ||
973 | double rrd_version( | ||
974 | void); | ||
975 | int rrd_xport( | ||
976 | int, | ||
977 | - char **, | ||
978 | + const char **, | ||
979 | int *, | ||
980 | time_t *, | ||
981 | time_t *, | ||
982 | @@ -239,7 +239,7 @@ extern "C" { | ||
983 | rrd_value_t **); | ||
984 | int rrd_flushcached( | ||
985 | int argc, | ||
986 | - char **argv); | ||
987 | + const char **argv); | ||
988 | |||
989 | void rrd_freemem( | ||
990 | void *mem); | ||
991 | @@ -323,7 +323,7 @@ extern "C" { | ||
992 | const char **argv); | ||
993 | int rrd_dump_opt_r( | ||
994 | const char *filename, | ||
995 | - char *outname, | ||
996 | + const char *outname, | ||
997 | int opt_noheader); | ||
998 | int rrd_dump_r( | ||
999 | const char *filename, | ||
1000 | diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c | ||
1001 | index b82c310db..14a4f511a 100644 | ||
1002 | --- a/src/rrd_cgi.c | ||
1003 | +++ b/src/rrd_cgi.c | ||
1004 | @@ -102,7 +102,7 @@ static char *rrdstrip( | ||
1005 | static char *scanargs( | ||
1006 | char *line, | ||
1007 | int *argc, | ||
1008 | - char ***args); | ||
1009 | + const char ***args); | ||
1010 | |||
1011 | /* format at-time specified times using strftime */ | ||
1012 | static char *printstrftime( | ||
1013 | @@ -317,7 +317,7 @@ static const char *putvar( | ||
1014 | } | ||
1015 | |||
1016 | /* expand those RRD:* directives that can be used recursively */ | ||
1017 | -static char *rrd_expand_vars( | ||
1018 | +static const char *rrd_expand_vars( | ||
1019 | char *buffer) | ||
1020 | { | ||
1021 | int i; | ||
1022 | @@ -434,7 +434,7 @@ static int readfile( | ||
1023 | |||
1024 | int main( | ||
1025 | int argc, | ||
1026 | - char *argv[]) | ||
1027 | + const char *argv[]) | ||
1028 | { | ||
1029 | char *buffer; | ||
1030 | long i; | ||
1031 | @@ -926,7 +926,7 @@ static char *drawgraph( | ||
1032 | } | ||
1033 | calfree(); | ||
1034 | if (rrd_graph | ||
1035 | - (argc + 1, (char **) args - 1, &calcpr, &xsize, &ysize, NULL, &ymin, | ||
1036 | + (argc + 1, args - 1, &calcpr, &xsize, &ysize, NULL, &ymin, | ||
1037 | &ymax) != -1) { | ||
1038 | return stralloc(calcpr[0]); | ||
1039 | } else { | ||
1040 | @@ -973,7 +973,7 @@ static char *printtimelast( | ||
1041 | /* not raising argc in step with args - 1 since the last argument | ||
1042 | will be used below for strftime */ | ||
1043 | |||
1044 | - last = rrd_last(argc, (char **) args - 1); | ||
1045 | + last = rrd_last(argc, args - 1); | ||
1046 | if (rrd_test_error()) { | ||
1047 | char err[4096]; | ||
1048 | |||
1049 | @@ -1027,7 +1027,7 @@ static char *printtimenow( | ||
1050 | static char *scanargs( | ||
1051 | char *line, | ||
1052 | int *argument_count, | ||
1053 | - char ***arguments) | ||
1054 | + const char ***arguments) | ||
1055 | { | ||
1056 | char *getP; /* read cursor */ | ||
1057 | char *putP; /* write cursor */ | ||
1058 | @@ -1039,8 +1039,8 @@ static char *scanargs( | ||
1059 | |||
1060 | /* local array of arguments while parsing */ | ||
1061 | int argc = 1; | ||
1062 | - char **argv; | ||
1063 | - char **argv_tmp; /* temp variable for realloc() */ | ||
1064 | + const char **argv; | ||
1065 | + const char **argv_tmp; /* temp variable for realloc() */ | ||
1066 | |||
1067 | #ifdef DEBUG_PARSER | ||
1068 | printf("<-- scanargs(%s) -->\n", line); | ||
1069 | @@ -1051,7 +1051,7 @@ static char *scanargs( | ||
1070 | |||
1071 | /* create initial argument array of char pointers */ | ||
1072 | argsz = 32; | ||
1073 | - argv = (char **) malloc(argsz * sizeof(char *)); | ||
1074 | + argv = malloc(argsz * sizeof(char *)); | ||
1075 | if (!argv) { | ||
1076 | return NULL; | ||
1077 | } | ||
1078 | @@ -1146,7 +1146,7 @@ static char *scanargs( | ||
1079 | if (argc == argsz - 2) { | ||
1080 | /* resize argument array */ | ||
1081 | argsz *= 2; | ||
1082 | - argv_tmp = (char **) rrd_realloc(argv, argsz * sizeof(char *)); | ||
1083 | + argv_tmp = rrd_realloc(argv, argsz * sizeof(char *)); | ||
1084 | if (*argv_tmp == NULL) { | ||
1085 | return NULL; | ||
1086 | } | ||
1087 | @@ -1213,7 +1213,7 @@ static int parse( | ||
1088 | /* the name of the vairable ... */ | ||
1089 | char *val; | ||
1090 | long valln; | ||
1091 | - char **args; | ||
1092 | + const char **args; | ||
1093 | char *end; | ||
1094 | long end_offset; | ||
1095 | int argc; | ||
1096 | @@ -1264,7 +1264,7 @@ static int parse( | ||
1097 | /* make sure we do not shrink the mallocd block */ | ||
1098 | size_t newbufsize = i + strlen(end) + valln + 1; | ||
1099 | |||
1100 | - *buf = (char *) rrd_realloc(*buf, newbufsize); | ||
1101 | + *buf = rrd_realloc(*buf, newbufsize); | ||
1102 | |||
1103 | if (*buf == NULL) { | ||
1104 | perror("Realoc buf:"); | ||
1105 | diff --git a/src/rrd_create.c b/src/rrd_create.c | ||
1106 | index f9bad0866..919b4195a 100644 | ||
1107 | --- a/src/rrd_create.c | ||
1108 | +++ b/src/rrd_create.c | ||
1109 | @@ -76,7 +76,7 @@ static void parseGENERIC_DS( | ||
1110 | |||
1111 | int rrd_create( | ||
1112 | int argc, | ||
1113 | - char **argv) | ||
1114 | + const char **argv) | ||
1115 | { | ||
1116 | struct optparse_long longopts[] = { | ||
1117 | {"start", 'b', OPTPARSE_REQUIRED}, | ||
1118 | diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c | ||
1119 | index 751798aa1..21c38a11d 100644 | ||
1120 | --- a/src/rrd_daemon.c | ||
1121 | +++ b/src/rrd_daemon.c | ||
1122 | @@ -1877,7 +1877,7 @@ static int handle_request_tune( | ||
1123 | HANDLER_PROTO) | ||
1124 | { /* {{{ */ | ||
1125 | int status; | ||
1126 | - char** argv = NULL; | ||
1127 | + const char** argv = NULL; | ||
1128 | int argc, argc_tmp; | ||
1129 | char* i; | ||
1130 | int rc; | ||
1131 | @@ -1916,7 +1916,7 @@ static int handle_request_tune( | ||
1132 | goto done; | ||
1133 | } | ||
1134 | |||
1135 | - if ((argv = (char **) malloc(argc * sizeof(char*))) == NULL) { | ||
1136 | + if ((argv = malloc(argc * sizeof(char*))) == NULL) { | ||
1137 | rc = send_response(sock, RESP_ERR, "%s\n", rrd_strerror(ENOMEM)); | ||
1138 | goto done; | ||
1139 | } | ||
1140 | @@ -1927,7 +1927,7 @@ static int handle_request_tune( | ||
1141 | argc_tmp += 1; | ||
1142 | } | ||
1143 | |||
1144 | - status = rrd_tune_r(file, argc, (const char **)argv); | ||
1145 | + status = rrd_tune_r(file, argc, argv); | ||
1146 | if (status != 0) { | ||
1147 | rc = send_response(sock, RESP_ERR, "Got error %s\n", rrd_get_error()); | ||
1148 | goto done; | ||
1149 | @@ -1935,7 +1935,7 @@ static int handle_request_tune( | ||
1150 | rc = send_response(sock, RESP_OK, "Success\n"); | ||
1151 | done: | ||
1152 | free(file); | ||
1153 | - free(argv); | ||
1154 | + free((void *)argv); | ||
1155 | return rc; | ||
1156 | } | ||
1157 | |||
1158 | @@ -4505,7 +4505,7 @@ static int cleanup( | ||
1159 | |||
1160 | static int read_options( | ||
1161 | int argc, | ||
1162 | - char **argv) | ||
1163 | + const char **argv) | ||
1164 | { /* {{{ */ | ||
1165 | struct optparse_long longopts[] = { | ||
1166 | {NULL, 'a', OPTPARSE_REQUIRED}, | ||
1167 | @@ -5050,7 +5050,7 @@ static int read_options( | ||
1168 | |||
1169 | int main( | ||
1170 | int argc, | ||
1171 | - char **argv) | ||
1172 | + const char **argv) | ||
1173 | { | ||
1174 | int status; | ||
1175 | |||
1176 | diff --git a/src/rrd_dump.c b/src/rrd_dump.c | ||
1177 | index a4490d594..c58e0ee4a 100644 | ||
1178 | --- a/src/rrd_dump.c | ||
1179 | +++ b/src/rrd_dump.c | ||
1180 | @@ -497,7 +497,7 @@ static size_t rrd_dump_opt_cb_fileout( | ||
1181 | |||
1182 | int rrd_dump_opt_r( | ||
1183 | const char *filename, | ||
1184 | - char *outname, | ||
1185 | + const char *outname, | ||
1186 | int opt_noheader) | ||
1187 | { | ||
1188 | FILE *out_file; | ||
1189 | @@ -543,7 +543,7 @@ int rrd_dump_r( | ||
1190 | |||
1191 | int rrd_dump( | ||
1192 | int argc, | ||
1193 | - char **argv) | ||
1194 | + const char **argv) | ||
1195 | { | ||
1196 | int opt; | ||
1197 | struct optparse_long longopts[] = { | ||
1198 | diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c | ||
1199 | index c739bfc45..54780f19b 100644 | ||
1200 | --- a/src/rrd_fetch.c | ||
1201 | +++ b/src/rrd_fetch.c | ||
1202 | @@ -61,7 +61,7 @@ | ||
1203 | |||
1204 | int rrd_fetch( | ||
1205 | int argc, | ||
1206 | - char **argv, | ||
1207 | + const char **argv, | ||
1208 | time_t *start, | ||
1209 | time_t *end, /* which time frame do you want ? | ||
1210 | * will be changed to represent reality */ | ||
1211 | diff --git a/src/rrd_first.c b/src/rrd_first.c | ||
1212 | index a696c5c38..f3dde5404 100644 | ||
1213 | --- a/src/rrd_first.c | ||
1214 | +++ b/src/rrd_first.c | ||
1215 | @@ -13,7 +13,7 @@ | ||
1216 | |||
1217 | time_t rrd_first( | ||
1218 | int argc, | ||
1219 | - char **argv) | ||
1220 | + const char **argv) | ||
1221 | { | ||
1222 | struct optparse_long longopts[] = { | ||
1223 | {"rraindex", 129, OPTPARSE_REQUIRED}, | ||
1224 | diff --git a/src/rrd_flushcached.c b/src/rrd_flushcached.c | ||
1225 | index 090bca749..3bf6cd29d 100644 | ||
1226 | --- a/src/rrd_flushcached.c | ||
1227 | +++ b/src/rrd_flushcached.c | ||
1228 | @@ -22,7 +22,7 @@ | ||
1229 | #include "rrd_tool.h" | ||
1230 | #include "rrd_client.h" | ||
1231 | |||
1232 | -int rrd_flushcached (int argc, char **argv) | ||
1233 | +int rrd_flushcached (int argc, const char **argv) | ||
1234 | { | ||
1235 | struct optparse_long longopts[] = { | ||
1236 | {"daemon", 'd', OPTPARSE_REQUIRED}, | ||
1237 | diff --git a/src/rrd_graph.c b/src/rrd_graph.c | ||
1238 | index b32d45085..46511e9a3 100644 | ||
1239 | --- a/src/rrd_graph.c | ||
1240 | +++ b/src/rrd_graph.c | ||
1241 | @@ -4607,7 +4607,7 @@ int scan_for_col( | ||
1242 | /* Now just a wrapper around rrd_graph_v */ | ||
1243 | int rrd_graph( | ||
1244 | int argc, | ||
1245 | - char **argv, | ||
1246 | + const char **argv, | ||
1247 | char ***prdata, | ||
1248 | int *xsize, | ||
1249 | int *ysize, | ||
1250 | @@ -4690,7 +4690,7 @@ int rrd_graph( | ||
1251 | |||
1252 | rrd_info_t *rrd_graph_v( | ||
1253 | int argc, | ||
1254 | - char **argv) | ||
1255 | + const char **argv) | ||
1256 | { | ||
1257 | image_desc_t im; | ||
1258 | rrd_info_t *grinfo; | ||
1259 | @@ -4953,7 +4953,7 @@ void rrd_graph_init( | ||
1260 | |||
1261 | void rrd_graph_options( | ||
1262 | int argc, | ||
1263 | - char *argv[], | ||
1264 | + const char **argv, | ||
1265 | struct optparse *poptions, | ||
1266 | image_desc_t *im) | ||
1267 | { | ||
1268 | diff --git a/src/rrd_graph.h b/src/rrd_graph.h | ||
1269 | index 4df32ec66..083cf3800 100644 | ||
1270 | --- a/src/rrd_graph.h | ||
1271 | +++ b/src/rrd_graph.h | ||
1272 | @@ -473,12 +473,12 @@ void time_clean( | ||
1273 | |||
1274 | void rrd_graph_options( | ||
1275 | int, | ||
1276 | - char **, | ||
1277 | + const char **, | ||
1278 | struct optparse *, | ||
1279 | image_desc_t *); | ||
1280 | void rrd_graph_script( | ||
1281 | int, | ||
1282 | - char **, | ||
1283 | + const char **, | ||
1284 | image_desc_t *const, | ||
1285 | int); | ||
1286 | int rrd_graph_color( | ||
1287 | diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c | ||
1288 | index 99cdefa65..ba90e1a6c 100644 | ||
1289 | --- a/src/rrd_graph_helper.c | ||
1290 | +++ b/src/rrd_graph_helper.c | ||
1291 | @@ -1952,7 +1952,7 @@ static int parse_xport( | ||
1292 | |||
1293 | void rrd_graph_script( | ||
1294 | int argc, | ||
1295 | - char *argv[], | ||
1296 | + const char **argv, | ||
1297 | image_desc_t *const im, | ||
1298 | int optno) | ||
1299 | { | ||
1300 | diff --git a/src/rrd_info.c b/src/rrd_info.c | ||
1301 | index c0c6f68c7..eb0d4e4de 100644 | ||
1302 | --- a/src/rrd_info.c | ||
1303 | +++ b/src/rrd_info.c | ||
1304 | @@ -82,7 +82,7 @@ rrd_info_t | ||
1305 | |||
1306 | rrd_info_t *rrd_info( | ||
1307 | int argc, | ||
1308 | - char **argv) | ||
1309 | + const char **argv) | ||
1310 | { | ||
1311 | struct optparse_long longopts[] = { | ||
1312 | {"daemon", 'd', OPTPARSE_REQUIRED}, | ||
1313 | diff --git a/src/rrd_last.c b/src/rrd_last.c | ||
1314 | index 026a1e828..1aae72512 100644 | ||
1315 | --- a/src/rrd_last.c | ||
1316 | +++ b/src/rrd_last.c | ||
1317 | @@ -11,7 +11,7 @@ | ||
1318 | |||
1319 | time_t rrd_last( | ||
1320 | int argc, | ||
1321 | - char **argv) | ||
1322 | + const char **argv) | ||
1323 | { | ||
1324 | char *opt_daemon = NULL; | ||
1325 | time_t lastupdate; | ||
1326 | diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c | ||
1327 | index ab30dcf67..4f7f4770e 100644 | ||
1328 | --- a/src/rrd_lastupdate.c | ||
1329 | +++ b/src/rrd_lastupdate.c | ||
1330 | @@ -14,7 +14,7 @@ | ||
1331 | #include "rrd_client.h" | ||
1332 | #include <stdarg.h> | ||
1333 | |||
1334 | -int rrd_lastupdate (int argc, char **argv) | ||
1335 | +int rrd_lastupdate (int argc, const char **argv) | ||
1336 | { | ||
1337 | struct optparse_long longopts[] = { | ||
1338 | {"daemon", 'd', OPTPARSE_REQUIRED}, | ||
1339 | diff --git a/src/rrd_list.c b/src/rrd_list.c | ||
1340 | index e743b9b7d..6e96220ea 100644 | ||
1341 | --- a/src/rrd_list.c | ||
1342 | +++ b/src/rrd_list.c | ||
1343 | @@ -37,7 +37,7 @@ static char *move_past_prefix(const char *prefix, const char *string) | ||
1344 | return (char *)&(string[index]); | ||
1345 | } | ||
1346 | |||
1347 | -static char *rrd_list_rec(int recursive, char *root, char *dirname) | ||
1348 | +static char *rrd_list_rec(int recursive, const char *root, const char *dirname) | ||
1349 | { | ||
1350 | #define SANE_ASPRINTF2(_dest_str, _format, ...) \ | ||
1351 | if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) { \ | ||
1352 | @@ -138,7 +138,7 @@ static char *rrd_list_rec(int recursive, char *root, char *dirname) | ||
1353 | return out; | ||
1354 | } | ||
1355 | |||
1356 | -char *rrd_list_r(int recursive, char *dirname) | ||
1357 | +char *rrd_list_r(int recursive, const char *dirname) | ||
1358 | { | ||
1359 | #define SANE_ASPRINTF(_dest_str, _format, ...) \ | ||
1360 | if (asprintf(&_dest_str, _format, __VA_ARGS__) == -1) { \ | ||
1361 | @@ -240,7 +240,7 @@ char *rrd_list_r(int recursive, char *dirname) | ||
1362 | return rrd_list_rec(recursive, dirname, dirname); | ||
1363 | } | ||
1364 | |||
1365 | -char *rrd_list(int argc, char **argv) | ||
1366 | +char *rrd_list(int argc, const char **argv) | ||
1367 | { | ||
1368 | char *opt_daemon = NULL; | ||
1369 | int status; | ||
1370 | diff --git a/src/rrd_modify.c b/src/rrd_modify.c | ||
1371 | index a2b07f640..70ac9e77f 100644 | ||
1372 | --- a/src/rrd_modify.c | ||
1373 | +++ b/src/rrd_modify.c | ||
1374 | @@ -1297,7 +1297,7 @@ static int add_rras(const rrd_t *in, rrd_t *out, const int *ds_map, | ||
1375 | } | ||
1376 | |||
1377 | int handle_modify(const rrd_t *in, const char *outfilename, | ||
1378 | - int argc, char **argv, int optidx, | ||
1379 | + int argc, const char **argv, int optidx, | ||
1380 | int newstep) { | ||
1381 | // parse add/remove options | ||
1382 | int rc = -1; | ||
1383 | diff --git a/src/rrd_modify.h b/src/rrd_modify.h | ||
1384 | index 52d8789be..64a39926e 100644 | ||
1385 | --- a/src/rrd_modify.h | ||
1386 | +++ b/src/rrd_modify.h | ||
1387 | @@ -28,7 +28,7 @@ typedef struct { | ||
1388 | } rra_mod_op_t; | ||
1389 | |||
1390 | int handle_modify(const rrd_t *in, const char *outfilename, | ||
1391 | - int argc, char **argv, int optind, | ||
1392 | + int argc, const char **argv, int optind, | ||
1393 | int newstep); | ||
1394 | |||
1395 | typedef union { | ||
1396 | diff --git a/src/rrd_resize.c b/src/rrd_resize.c | ||
1397 | index fb75d81ff..742e6d141 100644 | ||
1398 | --- a/src/rrd_resize.c | ||
1399 | +++ b/src/rrd_resize.c | ||
1400 | @@ -12,9 +12,9 @@ | ||
1401 | |||
1402 | int rrd_resize( | ||
1403 | int argc, | ||
1404 | - char **argv) | ||
1405 | + const char **argv) | ||
1406 | { | ||
1407 | - char *infilename, outfilename[11] = "resize.rrd"; | ||
1408 | + const char *infilename, outfilename[11] = "resize.rrd"; | ||
1409 | rrd_t rrdold, rrdnew; | ||
1410 | rrd_value_t buffer; | ||
1411 | int version; | ||
1412 | diff --git a/src/rrd_restore.c b/src/rrd_restore.c | ||
1413 | index 85d481e0c..ebef5efe8 100644 | ||
1414 | --- a/src/rrd_restore.c | ||
1415 | +++ b/src/rrd_restore.c | ||
1416 | @@ -1378,7 +1378,7 @@ int write_file( | ||
1417 | |||
1418 | int rrd_restore( | ||
1419 | int argc, | ||
1420 | - char **argv) | ||
1421 | + const char **argv) | ||
1422 | { | ||
1423 | struct optparse_long longopts[] = { | ||
1424 | {"range-check", 'r', OPTPARSE_NONE}, | ||
1425 | diff --git a/src/rrd_tool.c b/src/rrd_tool.c | ||
1426 | index cc6119d9a..56321ee1a 100644 | ||
1427 | --- a/src/rrd_tool.c | ||
1428 | +++ b/src/rrd_tool.c | ||
1429 | @@ -22,16 +22,16 @@ | ||
1430 | |||
1431 | |||
1432 | static void PrintUsage( | ||
1433 | - char *cmd); | ||
1434 | + const char *cmd); | ||
1435 | static int CountArgs( | ||
1436 | char *aLine); | ||
1437 | static int CreateArgs( | ||
1438 | + const char *, | ||
1439 | char *, | ||
1440 | - char *, | ||
1441 | - char **); | ||
1442 | + const char **); | ||
1443 | static int HandleInputLine( | ||
1444 | int, | ||
1445 | - char **, | ||
1446 | + const char **, | ||
1447 | FILE *); | ||
1448 | int RemoteMode = 0; | ||
1449 | int ChangeRoot = 0; | ||
1450 | @@ -42,7 +42,7 @@ int ChangeRoot = 0; | ||
1451 | |||
1452 | |||
1453 | static void PrintUsage( | ||
1454 | - char *cmd) | ||
1455 | + const char *cmd) | ||
1456 | { | ||
1457 | |||
1458 | const char *help_main = | ||
1459 | @@ -443,11 +443,11 @@ static char *fgetslong( | ||
1460 | |||
1461 | int main( | ||
1462 | int argc, | ||
1463 | - char *argv[]) | ||
1464 | + const char *argv[]) | ||
1465 | { | ||
1466 | - char **myargv; | ||
1467 | + const char **myargv; | ||
1468 | char *aLine; | ||
1469 | - char *firstdir = ""; | ||
1470 | + const char *firstdir = ""; | ||
1471 | |||
1472 | #ifdef MUST_DISABLE_SIGFPE | ||
1473 | signal(SIGFPE, SIG_IGN); | ||
1474 | @@ -526,7 +526,7 @@ int main( | ||
1475 | printf("ERROR: not enough arguments\n"); | ||
1476 | continue; | ||
1477 | } | ||
1478 | - if ((myargv = (char **) malloc((argc + 1) * | ||
1479 | + if ((myargv = malloc((argc + 1) * | ||
1480 | sizeof(char *))) == NULL) { | ||
1481 | perror("malloc"); | ||
1482 | exit(1); | ||
1483 | @@ -572,7 +572,7 @@ int main( | ||
1484 | resolving them portably is not really simple. */ | ||
1485 | static int HandleInputLine( | ||
1486 | int argc, | ||
1487 | - char **argv, | ||
1488 | + const char **argv, | ||
1489 | FILE * out) | ||
1490 | { | ||
1491 | #if defined(HAVE_OPENDIR) && defined (HAVE_READDIR) | ||
1492 | @@ -887,12 +887,12 @@ static int CountArgs( | ||
1493 | * CreateArgs - take a string (aLine) and tokenize | ||
1494 | */ | ||
1495 | static int CreateArgs( | ||
1496 | - char *pName, | ||
1497 | + const char *pName, | ||
1498 | char *aLine, | ||
1499 | - char **argv) | ||
1500 | + const char **argv) | ||
1501 | { | ||
1502 | char *getP, *putP; | ||
1503 | - char **pargv = argv; | ||
1504 | + const char **pargv = argv; | ||
1505 | char Quote = 0; | ||
1506 | int inArg = 0; | ||
1507 | int len; | ||
1508 | diff --git a/src/rrd_tune.c b/src/rrd_tune.c | ||
1509 | index 198817f37..dd3f3f7cb 100644 | ||
1510 | --- a/src/rrd_tune.c | ||
1511 | +++ b/src/rrd_tune.c | ||
1512 | @@ -71,7 +71,7 @@ static int set_hwsmootharg( | ||
1513 | |||
1514 | int rrd_tune( | ||
1515 | int argc, | ||
1516 | - char **argv) | ||
1517 | + const char **argv) | ||
1518 | { | ||
1519 | char *opt_daemon = NULL; | ||
1520 | const char *in_filename = NULL; | ||
1521 | diff --git a/src/rrd_update.c b/src/rrd_update.c | ||
1522 | index fbbe2820a..bb9a0602c 100644 | ||
1523 | --- a/src/rrd_update.c | ||
1524 | +++ b/src/rrd_update.c | ||
1525 | @@ -299,7 +299,7 @@ static void initialize_time( | ||
1526 | |||
1527 | rrd_info_t *rrd_update_v( | ||
1528 | int argc, | ||
1529 | - char **argv) | ||
1530 | + const char **argv) | ||
1531 | { | ||
1532 | struct optparse_long longopts[] = { | ||
1533 | {"template", 't', OPTPARSE_REQUIRED}, | ||
1534 | @@ -674,7 +674,7 @@ static int rrd_template_update(const char *filename, /* {{{ */ | ||
1535 | |||
1536 | int rrd_update( | ||
1537 | int argc, | ||
1538 | - char **argv) | ||
1539 | + const char **argv) | ||
1540 | { | ||
1541 | struct optparse_long longopts[] = { | ||
1542 | {"template", 't', OPTPARSE_REQUIRED}, | ||
1543 | diff --git a/src/rrd_xport.c b/src/rrd_xport.c | ||
1544 | index d15d33dd9..93c02f926 100644 | ||
1545 | --- a/src/rrd_xport.c | ||
1546 | +++ b/src/rrd_xport.c | ||
1547 | @@ -73,7 +73,7 @@ static int rrd_xport_format_addprints( | ||
1548 | |||
1549 | int rrd_xport( | ||
1550 | int argc, | ||
1551 | - char **argv, | ||
1552 | + const char **argv, | ||
1553 | int UNUSED(*xsize), | ||
1554 | time_t *start, | ||
1555 | time_t *end, /* which time frame do you want ? | ||
1556 | diff --git a/src/rrdupdate.c b/src/rrdupdate.c | ||
1557 | index cbbf48cc1..e368516c8 100644 | ||
1558 | --- a/src/rrdupdate.c | ||
1559 | +++ b/src/rrdupdate.c | ||
1560 | @@ -20,19 +20,20 @@ int main( | ||
1561 | int argc, | ||
1562 | char **argv) | ||
1563 | { | ||
1564 | + const char **cargv = (const char **)argv; | ||
1565 | char *name=basename(argv[0]); | ||
1566 | rrd_info_t *info; | ||
1567 | |||
1568 | if (!strcmp(name, "rrdcreate")) { | ||
1569 | - rrd_create(argc, argv); | ||
1570 | + rrd_create(argc, cargv); | ||
1571 | } | ||
1572 | else if (!strcmp(name, "rrdinfo")) { | ||
1573 | - info=rrd_info(argc, argv); | ||
1574 | + info=rrd_info(argc, cargv); | ||
1575 | rrd_info_print(info); | ||
1576 | rrd_info_free(info); | ||
1577 | } | ||
1578 | else { | ||
1579 | - rrd_update(argc, argv); | ||
1580 | + rrd_update(argc, cargv); | ||
1581 | } | ||
1582 | |||
1583 | if (rrd_test_error()) { | ||
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb index cbe1af285..d843f82b2 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb | |||
@@ -11,6 +11,7 @@ PV = "1.8.0" | |||
11 | 11 | ||
12 | SRC_URI = "\ | 12 | SRC_URI = "\ |
13 | git://github.com/oetiker/rrdtool-1.x.git;protocol=https;branch=master \ | 13 | git://github.com/oetiker/rrdtool-1.x.git;protocol=https;branch=master \ |
14 | file://b76e3c578f1e9f582e9c28f50d82b1f569602075.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
@@ -59,7 +60,7 @@ export STAGING_LIBDIR | |||
59 | export STAGING_INCDIR | 60 | export STAGING_INCDIR |
60 | 61 | ||
61 | # emulate cpan_do_configure | 62 | # emulate cpan_do_configure |
62 | EXTRA_OEMAKE = ' PERL5LIB="${PERL_ARCHLIB}" ' | 63 | EXTRA_OEMAKE = ' CC="${CC} -Wno-incompatible-pointer-types" PERL5LIB="${PERL_ARCHLIB}" ' |
63 | # Avoid do_configure error on some hosts | 64 | # Avoid do_configure error on some hosts |
64 | 65 | ||
65 | do_configure() { | 66 | do_configure() { |
@@ -103,6 +104,11 @@ do_configure() { | |||
103 | ${B}/examples/*.pl | 104 | ${B}/examples/*.pl |
104 | } | 105 | } |
105 | 106 | ||
107 | do_install:append:class-native() { | ||
108 | # Replace the shebang line in cgi-demo.cgi | ||
109 | sed -i '1s|^.*$|#!/usr/bin/env rrdcgi|' ${D}${datadir}/rrdtool/examples/cgi-demo.cgi | ||
110 | } | ||
111 | |||
106 | PACKAGES =+ "${PN}-perl ${PN}-python" | 112 | PACKAGES =+ "${PN}-perl ${PN}-python" |
107 | PACKAGES =+ "rrdcached" | 113 | PACKAGES =+ "rrdcached" |
108 | 114 | ||
diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch new file mode 100644 index 000000000..cf4f4080a --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From baf992f82aa987c608731866876adb856847ea45 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 6 May 2024 18:03:40 -0700 | ||
4 | Subject: [PATCH] relp: fix build against upcoming `gcc-14` | ||
5 | (`-Werror=calloc-transposed-args`) | ||
6 | |||
7 | `gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It | ||
8 | detected minor infelicity in `calloc()` API usage | ||
9 | |||
10 | Fixes | ||
11 | ../../git/src/relp.c: In function 'addToEpollSet': | ||
12 | ../../git/src/relp.c:101:39: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] | ||
13 | 101 | CHKmalloc(epd = calloc(sizeof(epolld_t), 1)); | ||
14 | | ^~~~~~~~ | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/rsyslog/librelp/pull/264] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | src/relp.c | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/src/relp.c b/src/relp.c | ||
23 | index eadda36..6268f1d 100644 | ||
24 | --- a/src/relp.c | ||
25 | +++ b/src/relp.c | ||
26 | @@ -98,7 +98,7 @@ addToEpollSet(relpEngine_t *const pThis, epolld_type_t typ, void *ptr, int sock, | ||
27 | epolld_t *epd = NULL; | ||
28 | ENTER_RELPFUNC; | ||
29 | |||
30 | - CHKmalloc(epd = calloc(sizeof(epolld_t), 1)); | ||
31 | + CHKmalloc(epd = calloc(1, sizeof(epolld_t))); | ||
32 | epd->typ = typ; | ||
33 | epd->ptr = ptr; | ||
34 | epd->sock = sock; | ||
35 | -- | ||
36 | 2.45.0 | ||
37 | |||
diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb index 9d949c630..49847047a 100644 --- a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb +++ b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb | |||
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https;branch=stable \ | |||
11 | file://0001-tests-Fix-callback-prototype.patch \ | 11 | file://0001-tests-Fix-callback-prototype.patch \ |
12 | file://0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch \ | 12 | file://0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch \ |
13 | file://0001-tests-Include-missing-sys-time.h.patch \ | 13 | file://0001-tests-Include-missing-sys-time.h.patch \ |
14 | file://0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch \ | ||
14 | file://run-ptest \ | 15 | file://run-ptest \ |
15 | " | 16 | " |
16 | 17 | ||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch new file mode 100644 index 000000000..5df29e7d9 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 1e0a77d8a5ae7cd0223afadf46cdbb540119774d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 11 May 2024 23:31:46 -0700 | ||
4 | Subject: [PATCH] tests/tcpflood.c: Pass correct parameter type to sendto() | ||
5 | |||
6 | Fixes build with GCC-14 and musl | ||
7 | |||
8 | ../../rsyslog-8.2404.0/tests/tcpflood.c:811:70: error: passing argument 5 of 'sendto' from incompatible pointer type [-Wincompatible-pointer-types] | ||
9 | 811 | lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr)); | ||
10 | | ^~~~~~~~ | ||
11 | | | | ||
12 | | struct sockaddr_in * | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | tests/tcpflood.c | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/tests/tcpflood.c b/tests/tcpflood.c | ||
21 | index bd8edaf..0feda23 100644 | ||
22 | --- a/tests/tcpflood.c | ||
23 | +++ b/tests/tcpflood.c | ||
24 | @@ -808,7 +808,7 @@ int sendMessages(struct instdata *inst) | ||
25 | } | ||
26 | lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number); | ||
27 | } else if(transport == TP_UDP) { | ||
28 | - lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr)); | ||
29 | + lenSend = sendto(udpsockout, buf, lenBuf, 0, (const struct sockaddr *)&udpRcvr, sizeof(udpRcvr)); | ||
30 | error_number = errno; | ||
31 | } else if(transport == TP_TLS) { | ||
32 | if(sockArray[socknum] == -1) { | ||
33 | -- | ||
34 | 2.45.0 | ||
35 | |||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2402.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb index af46cc14d..ac1645f67 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2402.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb | |||
@@ -25,14 +25,14 @@ SRC_URI = "https://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \ | |||
25 | file://use-pkgconfig-to-check-libgcrypt.patch \ | 25 | file://use-pkgconfig-to-check-libgcrypt.patch \ |
26 | file://run-ptest \ | 26 | file://run-ptest \ |
27 | file://0001-tests-disable-the-check-for-inotify.patch \ | 27 | file://0001-tests-disable-the-check-for-inotify.patch \ |
28 | file://0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | SRC_URI:append:libc-musl = " \ | 31 | SRC_URI:append:libc-musl = " \ |
31 | file://0001-Include-sys-time-h.patch \ | 32 | file://0001-Include-sys-time-h.patch \ |
32 | file://disable-omfile-outchannel.patch \ | 33 | file://disable-omfile-outchannel.patch \ |
33 | " | 34 | " |
34 | 35 | SRC_URI[sha256sum] = "30528d140ec1b1f079224081fa37df6e06587ff42b02e3e61f2daa0526c54d33" | |
35 | SRC_URI[sha256sum] = "acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba" | ||
36 | 36 | ||
37 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" | 37 | UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" |
38 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 38 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
@@ -137,9 +137,9 @@ do_install_ptest() { | |||
137 | do_install:append() { | 137 | do_install:append() { |
138 | install -d "${D}${sysconfdir}/init.d" | 138 | install -d "${D}${sysconfdir}/init.d" |
139 | install -d "${D}${sysconfdir}/logrotate.d" | 139 | install -d "${D}${sysconfdir}/logrotate.d" |
140 | install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog | 140 | install -m 755 ${UNPACKDIR}/initscript ${D}${sysconfdir}/init.d/syslog |
141 | install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf | 141 | install -m 644 ${UNPACKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf |
142 | install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog | 142 | install -m 644 ${UNPACKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog |
143 | sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog | 143 | sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog |
144 | 144 | ||
145 | if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then | 145 | if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then |
@@ -152,7 +152,7 @@ do_install:append() { | |||
152 | fi | 152 | fi |
153 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 153 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
154 | install -d ${D}${systemd_system_unitdir} | 154 | install -d ${D}${systemd_system_unitdir} |
155 | install -m 644 ${WORKDIR}/rsyslog.service ${D}${systemd_system_unitdir} | 155 | install -m 644 ${UNPACKDIR}/rsyslog.service ${D}${systemd_system_unitdir} |
156 | sed -i -e "s,@sbindir@,${sbindir},g" ${D}${systemd_system_unitdir}/rsyslog.service | 156 | sed -i -e "s,@sbindir@,${sbindir},g" ${D}${systemd_system_unitdir}/rsyslog.service |
157 | fi | 157 | fi |
158 | } | 158 | } |
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.9.3.bb index d369af1c6..3b558cafc 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.9.3.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ | |||
17 | file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ | 17 | file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ |
18 | file://0001-add-missing-system-header-string.h.patch \ | 18 | file://0001-add-missing-system-header-string.h.patch \ |
19 | " | 19 | " |
20 | SRCREV = "e005fbec2324aa8de7e2f302e5a17483c525b1d1" | 20 | SRCREV = "79b35bba8298f4444923c15e11bed38380cb18ee" |
21 | 21 | ||
22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 2a7cf2285..508939791 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | |||
@@ -64,7 +64,7 @@ do_install() { | |||
64 | oe_runmake DESTDIR=${D} install | 64 | oe_runmake DESTDIR=${D} install |
65 | 65 | ||
66 | install -d ${D}${systemd_unitdir}/system | 66 | install -d ${D}${systemd_unitdir}/system |
67 | install -m 0644 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service | 67 | install -m 0644 ${UNPACKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service |
68 | 68 | ||
69 | install -d ${D}${sysconfdir}/init.d | 69 | install -d ${D}${sysconfdir}/init.d |
70 | mv ${D}${sysconfdir}/init.d/sfcb ${D}${sysconfdir}/init.d/sblim-sfcb | 70 | mv ${D}${sysconfdir}/init.d/sfcb ${D}${sysconfdir}/init.d/sblim-sfcb |
diff --git a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index 4fefd5169..999d2b9e9 100644 --- a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb | |||
@@ -24,7 +24,7 @@ EXTRA_OEMAKE += "CC='${CC}' CFLAGS='${CFLAGS} -D_LARGEFILE64_SOURCE=1' sbindir=$ | |||
24 | 24 | ||
25 | do_configure:append() { | 25 | do_configure:append() { |
26 | oe_runmake -C mdadm.d mdadm-1.3.0 | 26 | oe_runmake -C mdadm.d mdadm-1.3.0 |
27 | patch -p0 < ${WORKDIR}/mdadm.patch | 27 | patch -p0 < ${UNPACKDIR}/mdadm.patch |
28 | } | 28 | } |
29 | INITSCRIPT_PACKAGES = "${PN}-diskmon ${PN}-raidmon" | 29 | INITSCRIPT_PACKAGES = "${PN}-diskmon ${PN}-raidmon" |
30 | INITSCRIPT_NAME:${PN}-diskmon = "sgdisk" | 30 | INITSCRIPT_NAME:${PN}-diskmon = "sgdisk" |
diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb index f38714741..bd92b1629 100644 --- a/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb | |||
@@ -33,13 +33,13 @@ SYSTEMD_AUTO_ENABLE = "disable" | |||
33 | do_install:append () { | 33 | do_install:append () { |
34 | #install the init.d/smartd | 34 | #install the init.d/smartd |
35 | install -d ${D}${sysconfdir}/init.d | 35 | install -d ${D}${sysconfdir}/init.d |
36 | install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd | 36 | install -p -m 0755 ${UNPACKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd |
37 | install -d ${D}${sysconfdir}/default | 37 | install -d ${D}${sysconfdir}/default |
38 | install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools | 38 | install -p -m 0644 ${UNPACKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools |
39 | 39 | ||
40 | #install systemd service file | 40 | #install systemd service file |
41 | install -d ${D}${systemd_unitdir}/system | 41 | install -d ${D}${systemd_unitdir}/system |
42 | install -m 0644 ${WORKDIR}/smartd.service ${D}${systemd_unitdir}/system | 42 | install -m 0644 ${UNPACKDIR}/smartd.service ${D}${systemd_unitdir}/system |
43 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 43 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
44 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 44 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
45 | -e 's,@SBINDIR@,${sbindir},g' \ | 45 | -e 's,@SBINDIR@,${sbindir},g' \ |
diff --git a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb index 455bda1d7..1a7592227 100644 --- a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb +++ b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb | |||
@@ -50,7 +50,7 @@ do_configure () { | |||
50 | do_install:append () { | 50 | do_install:append () { |
51 | if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ]; then | 51 | if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ]; then |
52 | install -d -m 0755 ${D}/${sysconfdir}/pam.d | 52 | install -d -m 0755 ${D}/${sysconfdir}/pam.d |
53 | install -m 0644 ${WORKDIR}/vlock_pam ${D}${sysconfdir}/pam.d/vlock | 53 | install -m 0644 ${UNPACKDIR}/vlock_pam ${D}${sysconfdir}/pam.d/vlock |
54 | fi | 54 | fi |
55 | } | 55 | } |
56 | 56 | ||
diff --git a/meta-oe/recipes-extended/zram/zram_0.2.bb b/meta-oe/recipes-extended/zram/zram_0.2.bb index b4b3a27b2..800dd6b7c 100644 --- a/meta-oe/recipes-extended/zram/zram_0.2.bb +++ b/meta-oe/recipes-extended/zram/zram_0.2.bb | |||
@@ -21,17 +21,17 @@ do_install () { | |||
21 | # Install systemd related configuration file | 21 | # Install systemd related configuration file |
22 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 22 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
23 | install -d ${D}${sysconfdir}/init.d | 23 | install -d ${D}${sysconfdir}/init.d |
24 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram | 24 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/zram |
25 | fi | 25 | fi |
26 | 26 | ||
27 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 27 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
28 | install -d ${D}${libexecdir} | 28 | install -d ${D}${libexecdir} |
29 | install -m 0755 ${WORKDIR}/zram-swap-init ${D}${libexecdir} | 29 | install -m 0755 ${UNPACKDIR}/zram-swap-init ${D}${libexecdir} |
30 | install -m 0755 ${WORKDIR}/zram-swap-deinit ${D}${libexecdir} | 30 | install -m 0755 ${UNPACKDIR}/zram-swap-deinit ${D}${libexecdir} |
31 | install -d ${D}${systemd_unitdir}/system | 31 | install -d ${D}${systemd_unitdir}/system |
32 | install -m 0644 ${WORKDIR}/zram-swap.service ${D}${systemd_unitdir}/system/zram-swap.service | 32 | install -m 0644 ${UNPACKDIR}/zram-swap.service ${D}${systemd_unitdir}/system/zram-swap.service |
33 | sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/zram-swap.service | 33 | sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/zram-swap.service |
34 | install -m 0644 ${WORKDIR}/dev-zram0.swap ${D}${systemd_unitdir}/system/dev-zram0.swap | 34 | install -m 0644 ${UNPACKDIR}/dev-zram0.swap ${D}${systemd_unitdir}/system/dev-zram0.swap |
35 | fi | 35 | fi |
36 | } | 36 | } |
37 | 37 | ||
diff --git a/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.2.bb b/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb index fa47cbd48..62ca01530 100644 --- a/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.2.bb +++ b/meta-oe/recipes-gnome/atk/atkmm-2.36_2.36.3.bb | |||
@@ -13,7 +13,7 @@ inherit gnomebase features_check | |||
13 | 13 | ||
14 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 14 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
15 | 15 | ||
16 | SRC_URI[archive.sha256sum] = "6f62dd99f746985e573605937577ccfc944368f606a71ca46342d70e1cdae079" | 16 | SRC_URI[archive.sha256sum] = "6ec264eaa0c4de0adb7202c600170bde9a7fbe4d466bfbe940eaf7faaa6c5974" |
17 | 17 | ||
18 | S = "${WORKDIR}/${GNOMEBN}-${PV}" | 18 | S = "${WORKDIR}/${GNOMEBN}-${PV}" |
19 | 19 | ||
diff --git a/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb b/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb index f51451d97..54b37912b 100644 --- a/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb +++ b/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb | |||
@@ -19,5 +19,5 @@ export ac_cv_have_iconv_detect_h="yes" | |||
19 | export ac_cv_sys_file_offset_bits="64" | 19 | export ac_cv_sys_file_offset_bits="64" |
20 | 20 | ||
21 | do_configure:append () { | 21 | do_configure:append () { |
22 | cp ${WORKDIR}/iconv-detect.h ${S} | 22 | cp ${UNPACKDIR}/iconv-detect.h ${S} |
23 | } | 23 | } |
diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb index db55f2239..1cfd9c1cb 100644 --- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb +++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | |||
@@ -11,7 +11,7 @@ PROVIDES = "gnome-doc-utils" | |||
11 | 11 | ||
12 | do_install:append() { | 12 | do_install:append() { |
13 | install -d ${D}${datadir}/aclocal/ | 13 | install -d ${D}${datadir}/aclocal/ |
14 | install ${WORKDIR}/gnome-doc-utils.m4 ${D}${datadir}/aclocal/ | 14 | install ${UNPACKDIR}/gnome-doc-utils.m4 ${D}${datadir}/aclocal/ |
15 | } | 15 | } |
16 | 16 | ||
17 | FILES:${PN} += "${datadir}" | 17 | FILES:${PN} += "${datadir}" |
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb index 5eac641cf..74b053141 100644 --- a/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb +++ b/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb | |||
@@ -32,3 +32,5 @@ python populate_packages:prepend () { | |||
32 | if (d.getVar('DEBIAN_NAMES')): | 32 | if (d.getVar('DEBIAN_NAMES')): |
33 | d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-2.0') | 33 | d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-2.0') |
34 | } | 34 | } |
35 | |||
36 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb b/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb new file mode 100644 index 000000000..ca3bf081d --- /dev/null +++ b/meta-oe/recipes-gnome/malcontent/malcontent-ui.bb | |||
@@ -0,0 +1,48 @@ | |||
1 | SUMMARY = "User-Interface for malcontent." | ||
2 | HOMEPAGE = "https://gitlab.freedesktop.org/pwithnall/malcontent" | ||
3 | LICENSE = "LGPL-2.1-only" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
5 | |||
6 | require malcontent.inc | ||
7 | |||
8 | DEPENDS = " \ | ||
9 | malcontent \ | ||
10 | accountsservice \ | ||
11 | glib-2.0 \ | ||
12 | glib-testing \ | ||
13 | dbus \ | ||
14 | desktop-file-utils-native \ | ||
15 | itstool-native \ | ||
16 | libpam \ | ||
17 | polkit \ | ||
18 | appstream \ | ||
19 | flatpak \ | ||
20 | libadwaita \ | ||
21 | gtk4 \ | ||
22 | " | ||
23 | |||
24 | GIR_MESON_OPTION = "" | ||
25 | |||
26 | GTKIC_VERSION = "4" | ||
27 | inherit meson pkgconfig gtk-icon-cache gobject-introspection gettext features_check | ||
28 | |||
29 | REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" | ||
30 | |||
31 | EXTRA_OEMESON = "-Dui=enabled" | ||
32 | |||
33 | do_install() { | ||
34 | install -d ${D}${datadir}/gir-1.0 ${D}${libdir}/girepository-1.0 ${D}${bindir} | ||
35 | install -d ${D}${datadir}/polkit-1/actions ${D}${datadir}/metainfo ${D}${datadir}/applications | ||
36 | install -m 0644 ${B}/libmalcontent-ui/MalcontentUi-1.gir ${D}${datadir}/gir-1.0 | ||
37 | install -m 0644 ${B}/libmalcontent-ui/MalcontentUi-1.typelib ${D}${libdir}/girepository-1.0 | ||
38 | install -m 0644 ${B}/libmalcontent-ui/libmalcontent-ui-1.so.${PV} ${D}${libdir} | ||
39 | ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so | ||
40 | ln -sf libmalcontent-ui-1.so.${PV} ${D}${libdir}/libmalcontent-ui-1.so.1 | ||
41 | install -m 0755 ${B}/malcontent-control/malcontent-control ${D}${bindir} | ||
42 | install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.policy ${D}${datadir}/polkit-1/actions | ||
43 | install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.appdata.xml ${D}${datadir}/metainfo | ||
44 | install -m 0644 ${B}/malcontent-control/org.freedesktop.MalcontentControl.desktop ${D}${datadir}/applications | ||
45 | } | ||
46 | |||
47 | FILES:${PN} += "${bindir} ${libdir} ${datadir}" | ||
48 | |||
diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.bb b/meta-oe/recipes-gnome/malcontent/malcontent.bb new file mode 100644 index 000000000..c4bc50fa8 --- /dev/null +++ b/meta-oe/recipes-gnome/malcontent/malcontent.bb | |||
@@ -0,0 +1,44 @@ | |||
1 | SUMMARY = "malcontent implements support for restricting the type of content." | ||
2 | HOMEPAGE = "https://gitlab.freedesktop.org/pwithnall/malcontent" | ||
3 | LICENSE = "LGPL-2.1-only" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
5 | |||
6 | require malcontent.inc | ||
7 | |||
8 | DEPENDS = " \ | ||
9 | accountsservice \ | ||
10 | glib-2.0 \ | ||
11 | glib-testing \ | ||
12 | dbus \ | ||
13 | itstool-native \ | ||
14 | libpam \ | ||
15 | polkit \ | ||
16 | " | ||
17 | |||
18 | GIR_MESON_OPTION = "" | ||
19 | |||
20 | inherit meson pkgconfig gobject-introspection gettext features_check useradd | ||
21 | |||
22 | REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" | ||
23 | |||
24 | PACKAGECONFIG ?= "ui" | ||
25 | PACKAGECONFIG[ui] = ",,,malcontent-ui" | ||
26 | |||
27 | EXTRA_OEMESON = "-Dui=disabled" | ||
28 | |||
29 | USERADD_PACKAGES = "${PN}" | ||
30 | USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" | ||
31 | |||
32 | do_install:append() { | ||
33 | # Fix up permissions on polkit rules.d to work with rpm4 constraints | ||
34 | chmod 700 ${D}/${datadir}/polkit-1/rules.d | ||
35 | chown polkitd:root ${D}/${datadir}/polkit-1/rules.d | ||
36 | } | ||
37 | |||
38 | FILES:${PN} += " \ | ||
39 | ${libdir}/security/pam_malcontent.so \ | ||
40 | ${datadir}/accountsservice \ | ||
41 | ${datadir}/help \ | ||
42 | ${datadir}/dbus-1 \ | ||
43 | ${datadir}/polkit-1 \ | ||
44 | " | ||
diff --git a/meta-oe/recipes-gnome/malcontent/malcontent.inc b/meta-oe/recipes-gnome/malcontent/malcontent.inc new file mode 100644 index 000000000..d48be08bb --- /dev/null +++ b/meta-oe/recipes-gnome/malcontent/malcontent.inc | |||
@@ -0,0 +1,4 @@ | |||
1 | SRC_URI = "git://gitlab.freedesktop.org/pwithnall/malcontent.git;protocol=https;branch=main" | ||
2 | S = "${WORKDIR}/git" | ||
3 | SRCREV = "3ba80995bb25b7aeda7e21d547f9e39ff9a81736" | ||
4 | PV = "0.12.0" | ||
diff --git a/meta-oe/recipes-graphics/cglm/cglm_0.9.2.bb b/meta-oe/recipes-graphics/cglm/cglm_0.9.4.bb index b503c6ed9..6fcc07d92 100644 --- a/meta-oe/recipes-graphics/cglm/cglm_0.9.2.bb +++ b/meta-oe/recipes-graphics/cglm/cglm_0.9.4.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8dc95c4110ba741c43832734b51b7de7" | |||
10 | 10 | ||
11 | SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https" | 11 | SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https" |
12 | # Tag v0.9.1 | 12 | # Tag v0.9.1 |
13 | SRCREV = "c8781615183ce3cb4f5d72caf70f2c01d7d4d2af" | 13 | SRCREV = "1796cc5ce298235b615dc7a4750b8c3ba56a05dd" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index 4d38632e2..54aeb06aa 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc | |||
@@ -24,6 +24,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g | |||
24 | file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ | 24 | file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ |
25 | file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \ | 25 | file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \ |
26 | file://0001-include-libgen.h-for-basename.patch \ | 26 | file://0001-include-libgen.h-for-basename.patch \ |
27 | file://0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch \ | ||
27 | " | 28 | " |
28 | 29 | ||
29 | S = "${WORKDIR}/DirectFB-${PV}" | 30 | S = "${WORKDIR}/DirectFB-${PV}" |
diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch new file mode 100644 index 000000000..574bba0bc --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 18f4eca291cabf93d87e7c9051268d9c385b8f37 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 20 May 2024 18:23:06 -0700 | ||
4 | Subject: [PATCH] inputdrivers: Correct the signature of bind() call on musl | ||
5 | systems | ||
6 | |||
7 | Its flagged with GCC14 | ||
8 | |||
9 | ../../../DirectFB-1.7.7/inputdrivers/linux_input/linux_input.c:1551:27: error: passing argument 2 of 'bind' from incompatible pointer type [-Wincompatible-pointer-types] | ||
10 | 1551 | rt = bind(socket_fd, &sock_addr, | ||
11 | | ^~~~~~~~~~ | ||
12 | | | | ||
13 | | struct sockaddr_un * | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | inputdrivers/linux_input/linux_input.c | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/inputdrivers/linux_input/linux_input.c b/inputdrivers/linux_input/linux_input.c | ||
22 | index 03deebc..207f5a5 100644 | ||
23 | --- a/inputdrivers/linux_input/linux_input.c | ||
24 | +++ b/inputdrivers/linux_input/linux_input.c | ||
25 | @@ -1548,7 +1548,7 @@ udev_hotplug_EventThread(DirectThread *thread, void * hotplug_data) | ||
26 | "/org/kernel/udev/monitor", | ||
27 | sizeof(sock_addr.sun_path) - 1); | ||
28 | |||
29 | - rt = bind(socket_fd, &sock_addr, | ||
30 | + rt = bind(socket_fd, (struct sockaddr *)&sock_addr, | ||
31 | sizeof(sock_addr.sun_family)+1+strlen(&sock_addr.sun_path[1])); | ||
32 | if (rt < 0) { | ||
33 | D_PERROR( "DirectFB/linux_input: bind() failed: %s\n", | ||
34 | -- | ||
35 | 2.45.1 | ||
36 | |||
diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-oe/recipes-graphics/fbida/fbida_git.bb index 247a1fcbb..6c0674849 100644 --- a/meta-oe/recipes-graphics/fbida/fbida_git.bb +++ b/meta-oe/recipes-graphics/fbida/fbida_git.bb | |||
@@ -26,7 +26,7 @@ S = "${WORKDIR}/git" | |||
26 | inherit meson pkgconfig features_check | 26 | inherit meson pkgconfig features_check |
27 | 27 | ||
28 | # Depends on libepoxy | 28 | # Depends on libepoxy |
29 | REQUIRED_DISTRO_FEATURES = "opengl" | 29 | REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'pdf', 'opengl', '', d)}" |
30 | 30 | ||
31 | PACKAGECONFIG ??= "gif png pdf" | 31 | PACKAGECONFIG ??= "gif png pdf" |
32 | PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" | 32 | PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" |
diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0001-configure-Do-not-require-support-for-implicit-ints.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0001-configure-Do-not-require-support-for-implicit-ints.patch new file mode 100644 index 000000000..356bd73f8 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0001-configure-Do-not-require-support-for-implicit-ints.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From cbba378a23410241176d62f3bb43965c044615e3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Florian Weimer <fweimer@redhat.com> | ||
3 | Date: Thu, 24 Nov 2022 13:06:50 +0100 | ||
4 | Subject: [PATCH 1/3] configure: Do not require support for implicit ints | ||
5 | |||
6 | Implicit ints have not been part of C since 1999, and future | ||
7 | compilers will disable support for them by default. Fortunatenly, | ||
8 | only one configure check needs adjusting. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/fvwmorg/fvwm/pull/100] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | acinclude.m4 | 2 +- | ||
14 | configure.ac | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/acinclude.m4 b/acinclude.m4 | ||
18 | index 8b74ff1e..b66042f9 100644 | ||
19 | --- a/acinclude.m4 | ||
20 | +++ b/acinclude.m4 | ||
21 | @@ -30,7 +30,7 @@ if test "$ac_cv_func_select" = yes; then | ||
22 | #ifdef HAVE_SYS_SOCKET_H | ||
23 | #include <sys/socket.h> | ||
24 | #endif], | ||
25 | -[extern select ($ac_cv_type_fd_set_size_t, | ||
26 | +[extern int select ($ac_cv_type_fd_set_size_t, | ||
27 | $ac_cv_type_fd_set *, $ac_cv_type_fd_set *, $ac_cv_type_fd_set *, | ||
28 | $ac_type_timeval *);], | ||
29 | [ac_found=yes ; break 3],ac_found=no) | ||
30 | diff --git a/configure.ac b/configure.ac | ||
31 | index 97ab9e7a..c9fcede6 100644 | ||
32 | --- a/configure.ac | ||
33 | +++ b/configure.ac | ||
34 | @@ -220,7 +220,7 @@ AC_MINIX | ||
35 | |||
36 | # catch -Werror and similar options when running configure | ||
37 | AC_TRY_COMPILE([#include <stdio.h>], | ||
38 | -[int i; static j; int *p; char *c; | ||
39 | +[int i; int *p; char *c; | ||
40 | switch (*p = p = *c) { case 0: printf("%Q", c, p); } | ||
41 | *c = &i; c = p; | ||
42 | while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1)); | ||
43 | -- | ||
44 | 2.45.0 | ||
45 | |||
diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch new file mode 100644 index 000000000..50ecb20c7 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 51287fb60263530f61b14df5519e10dabe67d2ad Mon Sep 17 00:00:00 2001 | ||
2 | From: Florian Weimer <fweimer@redhat.com> | ||
3 | Date: Thu, 24 Nov 2022 13:07:56 +0100 | ||
4 | Subject: [PATCH 2/3] acinclude.m4: Add missing <unistd.h> to | ||
5 | AM_SAFETY_CHECK_MKSTEMP | ||
6 | |||
7 | Otherwise, the check fails on a compiler which does not support | ||
8 | implicit function declarations (a language feature removed in 1999). | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/fvwmorg/fvwm/pull/100] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | acinclude.m4 | 3 +++ | ||
14 | 1 file changed, 3 insertions(+) | ||
15 | |||
16 | diff --git a/acinclude.m4 b/acinclude.m4 | ||
17 | index b66042f9..4dee2abe 100644 | ||
18 | --- a/acinclude.m4 | ||
19 | +++ b/acinclude.m4 | ||
20 | @@ -1154,6 +1154,9 @@ AC_DEFUN([AM_SAFETY_CHECK_MKSTEMP],[ | ||
21 | #include <stdio.h> | ||
22 | #include <stdlib.h> | ||
23 | #include <string.h> | ||
24 | +#ifdef HAVE_UNISTD_H | ||
25 | +#include <unistd.h> | ||
26 | +#endif | ||
27 | int main(void) | ||
28 | { | ||
29 | char template[128]; | ||
30 | -- | ||
31 | 2.45.0 | ||
32 | |||
diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0003-configure-Further-defang-the-Werror-check.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0003-configure-Further-defang-the-Werror-check.patch new file mode 100644 index 000000000..e9d780ddc --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0003-configure-Further-defang-the-Werror-check.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 542c6f25327587d5a6bffb8a45b457ec85dcf8e1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Florian Weimer <fweimer@redhat.com> | ||
3 | Date: Tue, 19 Dec 2023 13:24:50 +0100 | ||
4 | Subject: [PATCH 3/3] configure: Further defang the -Werror check | ||
5 | |||
6 | Incompatible pointer types are actually errors (in the sense | ||
7 | that they are invalid C). Compilers have merely tolerated them as | ||
8 | warnings for backwards compatibility. This is changing with Clang 16 | ||
9 | and GCC 14, so relax the check a little. | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/fvwmorg/fvwm/pull/100] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | configure.ac | 5 ++--- | ||
15 | 1 file changed, 2 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index c9fcede6..2e9615b2 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -220,9 +220,8 @@ AC_MINIX | ||
22 | |||
23 | # catch -Werror and similar options when running configure | ||
24 | AC_TRY_COMPILE([#include <stdio.h>], | ||
25 | -[int i; int *p; char *c; | ||
26 | - switch (*p = p = *c) { case 0: printf("%Q", c, p); } | ||
27 | - *c = &i; c = p; | ||
28 | +[int unused; int *p; char *c; | ||
29 | + printf("%Q", c, p); | ||
30 | while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1)); | ||
31 | ], , AC_MSG_ERROR(" | ||
32 | configure is not able to compile programs with warnings. Please | ||
33 | -- | ||
34 | 2.45.0 | ||
35 | |||
diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb index 8daf38a0b..df349494a 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb +++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb | |||
@@ -34,6 +34,9 @@ DEPENDS = " \ | |||
34 | SRC_URI = " \ | 34 | SRC_URI = " \ |
35 | git://github.com/fvwmorg/fvwm.git;protocol=https;branch=master \ | 35 | git://github.com/fvwmorg/fvwm.git;protocol=https;branch=master \ |
36 | file://0001-Fix-compilation-for-disabled-gnome.patch \ | 36 | file://0001-Fix-compilation-for-disabled-gnome.patch \ |
37 | file://0001-configure-Do-not-require-support-for-implicit-ints.patch \ | ||
38 | file://0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch \ | ||
39 | file://0003-configure-Further-defang-the-Werror-check.patch \ | ||
37 | " | 40 | " |
38 | 41 | ||
39 | SRCREV = "7baf540e56fb1a3e91752acba872a88543529d46" | 42 | SRCREV = "7baf540e56fb1a3e91752acba872a88543529d46" |
diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb index dd520b245..e313d7a19 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb | |||
@@ -29,10 +29,10 @@ do_install() { | |||
29 | cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir} | 29 | cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir} |
30 | cp -R --no-dereference --preserve=mode,links ${S}/doc ${D}${docdir}/glm | 30 | cp -R --no-dereference --preserve=mode,links ${S}/doc ${D}${docdir}/glm |
31 | rm ${D}${includedir}/glm/CMakeLists.txt | 31 | rm ${D}${includedir}/glm/CMakeLists.txt |
32 | sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake | 32 | sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake |
33 | sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake | 33 | sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake |
34 | sed "s/@VERSION@/${PV}/" ${WORKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc | 34 | sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc |
35 | install -Dm644 ${WORKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake | 35 | install -Dm644 ${UNPACKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake |
36 | 36 | ||
37 | } | 37 | } |
38 | 38 | ||
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch new file mode 100644 index 000000000..0c2a8d4bd --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Marcus Meissner <marcus@jet.franken.de> | ||
3 | Date: Mon, 4 Dec 2023 13:26:08 +0100 | ||
4 | Subject: [PATCH] align outlen length with jpeg jeaders. fixes | ||
5 | https://github.com/gphoto/libgphoto2/issues/941 | ||
6 | |||
7 | --- | ||
8 | Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/721f7f8c3ec8058d504607873e4c317aac0c99c5] | ||
9 | |||
10 | camlibs/ptp2/chdk.c | 6 +++--- | ||
11 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
12 | |||
13 | diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c | ||
14 | index e1d898f378..e775ea1d4b 100644 | ||
15 | --- a/camlibs/ptp2/chdk.c | ||
16 | +++ b/camlibs/ptp2/chdk.c | ||
17 | @@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, | ||
18 | struct jpeg_error_mgr jerr; | ||
19 | JSAMPROW row_ptr[1]; | ||
20 | uint8_t *outbuf = NULL, *tmprowbuf = NULL; | ||
21 | - uint64_t outlen = 0; | ||
22 | + unsigned long outlen = 0; | ||
23 | unsigned int row_inc; | ||
24 | int sshift, dshift, xshift, skip; | ||
25 | |||
26 | @@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, | ||
27 | sshift = 6; | ||
28 | dshift = (width/height > 2) ? 6 : 12; | ||
29 | xshift = 4; | ||
30 | - /* Digic 6 cameras: 8 bit per element UYVY, | ||
31 | - * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ | ||
32 | + /* Digic 6 cameras: 8 bit per element UYVY, | ||
33 | + * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ | ||
34 | } else { | ||
35 | row_inc = buf_width*2; | ||
36 | sshift = 4; | ||
diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb index cc42b6a9c..57c9d199e 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 | |||
13 | file://40-libgphoto2.rules \ | 13 | file://40-libgphoto2.rules \ |
14 | file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ | 14 | file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ |
15 | file://0001-configure-Filter-out-buildpaths-from-CC.patch \ | 15 | file://0001-configure-Filter-out-buildpaths-from-CC.patch \ |
16 | file://fix-build-with-gcc-14.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI[libgphoto2.sha256sum] = "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b" | 18 | SRC_URI[libgphoto2.sha256sum] = "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b" |
18 | 19 | ||
@@ -38,7 +39,7 @@ do_configure:append() { | |||
38 | 39 | ||
39 | do_install:append() { | 40 | do_install:append() { |
40 | install -d ${D}${sysconfdir}/udev/rules.d/ | 41 | install -d ${D}${sysconfdir}/udev/rules.d/ |
41 | install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ | 42 | install -m 0644 ${UNPACKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ |
42 | } | 43 | } |
43 | 44 | ||
44 | PACKAGES =+ "libgphotoport libgphoto2-camlibs" | 45 | PACKAGES =+ "libgphotoport libgphoto2-camlibs" |
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb index 2700142e5..38d738310 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb | |||
@@ -67,7 +67,7 @@ do_configure:prepend() { | |||
67 | do_install:append:class-nativesdk() { | 67 | do_install:append:class-nativesdk() { |
68 | # graphviz-setup.sh must be executed at SDK installation | 68 | # graphviz-setup.sh must be executed at SDK installation |
69 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d | 69 | install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d |
70 | install -m 0755 ${WORKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d | 70 | install -m 0755 ${UNPACKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d |
71 | } | 71 | } |
72 | FILES:${PN}:class-nativesdk += "${SDKPATHNATIVE}" | 72 | FILES:${PN}:class-nativesdk += "${SDKPATHNATIVE}" |
73 | 73 | ||
diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb index a70d31fed..30964a1b9 100644 --- a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb | |||
@@ -24,7 +24,7 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
24 | 24 | ||
25 | do_configure:prepend () { | 25 | do_configure:prepend () { |
26 | rm -f ${S}/m4/init.m4 | 26 | rm -f ${S}/m4/init.m4 |
27 | cp -f ${WORKDIR}/Makevars ${S}/po/ | 27 | cp -f ${UNPACKDIR}/Makevars ${S}/po/ |
28 | } | 28 | } |
29 | 29 | ||
30 | do_install:append () { | 30 | do_install:append () { |
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch new file mode 100644 index 000000000..2007766f7 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 6c35fc94ca30a4d0662479f7ef8a704d97aa7352 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 18 May 2024 18:13:30 -0700 | ||
4 | Subject: [PATCH] stdlib: Make iconv use portable across glibc/musl | ||
5 | |||
6 | This is a backport from libsdl2 | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/libsdl-org/SDL/blob/main/src/stdlib/SDL_iconv.c#L49C1-L51C1] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | src/stdlib/SDL_iconv.c | 19 ++++--------------- | ||
12 | 1 file changed, 4 insertions(+), 15 deletions(-) | ||
13 | |||
14 | diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c | ||
15 | index fa56a99..087b6ec 100644 | ||
16 | --- a/src/stdlib/SDL_iconv.c | ||
17 | +++ b/src/stdlib/SDL_iconv.c | ||
18 | @@ -28,27 +28,16 @@ | ||
19 | |||
20 | #ifdef HAVE_ICONV | ||
21 | |||
22 | -/* Depending on which standard the iconv() was implemented with, | ||
23 | - iconv() may or may not use const char ** for the inbuf param. | ||
24 | - If we get this wrong, it's just a warning, so no big deal. | ||
25 | -*/ | ||
26 | -#if defined(_XGP6) || \ | ||
27 | - defined(__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) | ||
28 | -#define ICONV_INBUF_NONCONST | ||
29 | -#endif | ||
30 | - | ||
31 | #include <errno.h> | ||
32 | |||
33 | size_t SDL_iconv(SDL_iconv_t cd, | ||
34 | const char **inbuf, size_t *inbytesleft, | ||
35 | char **outbuf, size_t *outbytesleft) | ||
36 | { | ||
37 | - size_t retCode; | ||
38 | -#ifdef ICONV_INBUF_NONCONST | ||
39 | - retCode = iconv(cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft); | ||
40 | -#else | ||
41 | - retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft); | ||
42 | -#endif | ||
43 | + /* iconv's second parameter may or may not be `const char const *` depending on the | ||
44 | + C runtime's whims. Casting to void * seems to make everyone happy, though. */ | ||
45 | + | ||
46 | + const size_t retCode = iconv((iconv_t)((uintptr_t)cd), (void *)inbuf, inbytesleft, outbuf, outbytesleft); | ||
47 | if ( retCode == (size_t)-1 ) { | ||
48 | switch(errno) { | ||
49 | case E2BIG: | ||
50 | -- | ||
51 | 2.45.1 | ||
52 | |||
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.2.bb index 57f0f9979..267311853 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.2.bb | |||
@@ -2,13 +2,12 @@ SUMMARY = "Simple DirectMedia Layer image library v2" | |||
2 | SECTION = "libs" | 2 | SECTION = "libs" |
3 | 3 | ||
4 | LICENSE = "Zlib" | 4 | LICENSE = "Zlib" |
5 | LIC_FILES_CHKSUM = "file://COPYING.txt;md5=822edb694b20ff16ceef85b27f61c11f" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2f6d9e01c97958aa851954ed5acf82ee" |
6 | 6 | ||
7 | DEPENDS = "tiff zlib libpng jpeg libsdl2 libwebp" | 7 | DEPENDS = "tiff zlib libpng jpeg libsdl2 libwebp" |
8 | 8 | ||
9 | SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz" | 9 | SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz" |
10 | SRC_URI[md5sum] = "f26f3a153360a8f09ed5220ef7b07aea" | 10 | SRC_URI[sha256sum] = "8f486bbfbcf8464dd58c9e5d93394ab0255ce68b51c5a966a918244820a76ddc" |
11 | SRC_URI[sha256sum] = "bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0" | ||
12 | 11 | ||
13 | S = "${WORKDIR}/SDL2_image-${PV}" | 12 | S = "${WORKDIR}/SDL2_image-${PV}" |
14 | 13 | ||
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb index 4fc4679f7..1f436c6d7 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb | |||
@@ -15,6 +15,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ | |||
15 | file://libsdl-1.2.15-xdata32.patch \ | 15 | file://libsdl-1.2.15-xdata32.patch \ |
16 | file://pkgconfig.patch \ | 16 | file://pkgconfig.patch \ |
17 | file://0001-build-Pass-tag-CC-explictly-when-using-libtool.patch \ | 17 | file://0001-build-Pass-tag-CC-explictly-when-using-libtool.patch \ |
18 | file://0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch \ | ||
18 | file://CVE-2019-7577.patch \ | 19 | file://CVE-2019-7577.patch \ |
19 | file://CVE-2019-7574.patch \ | 20 | file://CVE-2019-7574.patch \ |
20 | file://CVE-2019-7572.patch \ | 21 | file://CVE-2019-7572.patch \ |
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index adf9cb597..ae4525829 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | |||
@@ -61,12 +61,12 @@ do_compile:append() { | |||
61 | 61 | ||
62 | do_install:append() { | 62 | do_install:append() { |
63 | install -d ${D}${localstatedir}/lib/lxdm | 63 | install -d ${D}${localstatedir}/lib/lxdm |
64 | install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm | 64 | install -m 644 ${UNPACKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm |
65 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then | 65 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then |
66 | # ArchLinux version of pam config has the following advantages: | 66 | # ArchLinux version of pam config has the following advantages: |
67 | # * simple setup of passwordless login | 67 | # * simple setup of passwordless login |
68 | # * in XFCE powerdown/restart enabled in logoff dialog | 68 | # * in XFCE powerdown/restart enabled in logoff dialog |
69 | install -m 644 ${WORKDIR}/${@bb.utils.contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm | 69 | install -m 644 ${UNPACKDIR}/${@bb.utils.contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm |
70 | fi | 70 | fi |
71 | } | 71 | } |
72 | 72 | ||
diff --git a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.50.1.bb b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.52.0.bb index 86787a6b7..3b0fbd3e7 100644 --- a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.50.1.bb +++ b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.52.0.bb | |||
@@ -9,7 +9,7 @@ DEPENDS = "mm-common cairomm-1.16 glibmm-2.68 pango" | |||
9 | GNOMEBN = "pangomm" | 9 | GNOMEBN = "pangomm" |
10 | inherit gnomebase features_check | 10 | inherit gnomebase features_check |
11 | 11 | ||
12 | SRC_URI[archive.sha256sum] = "ccc9923413e408c2bff637df663248327d72822f11e394b423e1c5652b7d9214" | 12 | SRC_URI[archive.sha256sum] = "34a134126a6484ff12f774358c36ecc44d0e9df094e1b83796d9774bb7d24947" |
13 | REQUIRED_DISTRO_FEATURES = "x11" | 13 | REQUIRED_DISTRO_FEATURES = "x11" |
14 | 14 | ||
15 | S = "${WORKDIR}/${GNOMEBN}-${PV}" | 15 | S = "${WORKDIR}/${GNOMEBN}-${PV}" |
diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb index e52ec5f29..58f227573 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = " \ | |||
10 | " | 10 | " |
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms vim-native" | 13 | DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms" |
14 | 14 | ||
15 | RDEPENDS:${PN} = "libxcb xcb-util-keysyms" | 15 | RDEPENDS:${PN} = "libxcb xcb-util-keysyms" |
16 | 16 | ||
diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb index 5cde7c9fb..668ca79dd 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb | |||
@@ -27,7 +27,7 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch;protocol=ht | |||
27 | XORG_PN ?= "xorg-server" | 27 | XORG_PN ?= "xorg-server" |
28 | XORG_PV ?= "1.20.6" | 28 | XORG_PV ?= "1.20.6" |
29 | SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg" | 29 | SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg" |
30 | XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}" | 30 | XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}" |
31 | SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b" | 31 | SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b" |
32 | SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" | 32 | SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" |
33 | 33 | ||
diff --git a/meta-oe/recipes-graphics/tslib/tslib_1.22.bb b/meta-oe/recipes-graphics/tslib/tslib_1.23.bb index 01da03a47..299aa2a27 100644 --- a/meta-oe/recipes-graphics/tslib/tslib_1.22.bb +++ b/meta-oe/recipes-graphics/tslib/tslib_1.23.bb | |||
@@ -16,7 +16,7 @@ SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}. | |||
16 | file://ts.conf \ | 16 | file://ts.conf \ |
17 | file://tslib.sh \ | 17 | file://tslib.sh \ |
18 | " | 18 | " |
19 | SRC_URI[sha256sum] = "aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a" | 19 | SRC_URI[sha256sum] = "9b489a54d48006201f2fe955a88c3f857535ac93b6cf8e5a16c7b166c8991dac" |
20 | 20 | ||
21 | UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" | 21 | UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" |
22 | 22 | ||
@@ -53,12 +53,12 @@ PACKAGECONFIG[one-wire-ts-input] = "--enable-one-wire-ts-input,--disable-one-wir | |||
53 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" | 53 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" |
54 | 54 | ||
55 | do_install:prepend() { | 55 | do_install:prepend() { |
56 | install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf | 56 | install -m 0644 ${UNPACKDIR}/ts.conf ${S}/etc/ts.conf |
57 | } | 57 | } |
58 | 58 | ||
59 | do_install:append() { | 59 | do_install:append() { |
60 | install -d ${D}${sysconfdir}/profile.d/ | 60 | install -d ${D}${sysconfdir}/profile.d/ |
61 | install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ | 61 | install -m 0755 ${UNPACKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ |
62 | } | 62 | } |
63 | 63 | ||
64 | RPROVIDES:tslib-conf = "libts-0.0-conf" | 64 | RPROVIDES:tslib-conf = "libts-0.0-conf" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb b/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb index 3402d0d46..e7ec00405 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb | |||
@@ -16,7 +16,7 @@ S = "${WORKDIR}/source-code-pro-2.030R-ro-1.050R-it" | |||
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
18 | install -d ${D}${sysconfdir}/fonts/conf.d/ | 18 | install -d ${D}${sysconfdir}/fonts/conf.d/ |
19 | install -m 0644 ${WORKDIR}/44-source-code-pro-fonts-fontconfig.conf ${D}${sysconfdir}/fonts/conf.d/ | 19 | install -m 0644 ${UNPACKDIR}/44-source-code-pro-fonts-fontconfig.conf ${D}${sysconfdir}/fonts/conf.d/ |
20 | 20 | ||
21 | install -d ${D}${datadir}/fonts/truetype/ | 21 | install -d ${D}${datadir}/fonts/truetype/ |
22 | find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; | 22 | find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn-fonts.conf index 6855791b4..6855791b4 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn-fonts.conf | |||
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb index b4a598527..c46952cce 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb | |||
@@ -1,34 +1,6 @@ | |||
1 | require ttf.inc | 1 | require source-han-sans-fonts.inc |
2 | 2 | ||
3 | SUMMARY = "Adobe OpenType Pan-CJK font family for Simplified Chinese" | 3 | SUMMARY = "Adobe OpenType Pan-CJK font family for Simplified Chinese" |
4 | HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" | 4 | ZIPNAME = "SourceHanSansCN" |
5 | LICENSE = "OFL-1.1" | ||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" | ||
7 | |||
8 | inherit allarch fontcache | ||
9 | |||
10 | # Download tends to break - so - or not? | ||
11 | #EXCLUDE_FROM_WORLD = "1" | ||
12 | |||
13 | SRC_URI = " \ | ||
14 | svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/CN;protocol=http;rev=82 \ | ||
15 | file://44-source-han-sans-cn.conf \ | ||
16 | " | ||
17 | SRC_URI[md5sum] = "d16abc21f6575bb08894efedbed484a2" | ||
18 | SRC_URI[sha256sum] = "0a0e1d8e52833bc352d454d8242da03b82c0efc41323fb66f7435e5b39734a4f" | ||
19 | |||
20 | S = "${WORKDIR}/SourceHanSansCN" | ||
21 | |||
22 | do_install() { | ||
23 | install -d ${D}${sysconfdir}/fonts/conf.d/ | ||
24 | install -m 0644 ${WORKDIR}/44-source-han-sans-cn.conf ${D}${sysconfdir}/fonts/conf.d/ | ||
25 | |||
26 | install -d ${D}${datadir}/fonts/truetype/ | ||
27 | find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; | ||
28 | } | ||
29 | |||
30 | FILES:${PN} = " \ | ||
31 | ${sysconfdir}/fonts \ | ||
32 | ${datadir}/fonts \ | ||
33 | " | ||
34 | 5 | ||
6 | SRC_URI[sha256sum] = "6841fc13f1c0d255cfeb33d2a2c68d24bbebd94ae2c070347a2b2b200a1db4d6" | ||
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc new file mode 100644 index 000000000..03ca4c090 --- /dev/null +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc | |||
@@ -0,0 +1,26 @@ | |||
1 | require ttf.inc | ||
2 | |||
3 | HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" | ||
4 | LICENSE = "OFL-1.1" | ||
5 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" | ||
6 | |||
7 | inherit allarch fontcache | ||
8 | |||
9 | SRC_URI = " \ | ||
10 | https://github.com/adobe-fonts/source-han-sans/releases/download/${PV}R/${ZIPNAME}.zip;subdir=${BP};downloadfilename=${BP}.zip \ | ||
11 | file://44-${BPN}.conf \ | ||
12 | " | ||
13 | |||
14 | do_install() { | ||
15 | install -d ${D}${sysconfdir}/fonts/conf.d/ | ||
16 | install -m 0644 ${UNPACKDIR}/44-${BPN}.conf ${D}${sysconfdir}/fonts/conf.d/ | ||
17 | |||
18 | install -d ${D}${datadir}/fonts/truetype/ | ||
19 | find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; | ||
20 | } | ||
21 | |||
22 | FILES:${PN} = " \ | ||
23 | ${sysconfdir}/fonts \ | ||
24 | ${datadir}/fonts \ | ||
25 | " | ||
26 | |||
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp-fonts.conf index a7a93feea..a7a93feea 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp-fonts.conf | |||
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb index 6a4509048..40128f97d 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb | |||
@@ -1,34 +1,6 @@ | |||
1 | require ttf.inc | 1 | require source-han-sans-fonts.inc |
2 | 2 | ||
3 | SUMMARY = "Adobe OpenType Pan-CJK font family for Japanese" | 3 | SUMMARY = "Adobe OpenType Pan-CJK font family for Japanese" |
4 | HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" | 4 | ZIPNAME = "SourceHanSansJP" |
5 | LICENSE = "OFL-1.1" | ||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" | ||
7 | |||
8 | inherit allarch fontcache | ||
9 | |||
10 | # Download tends to break - so - or not? | ||
11 | #EXCLUDE_FROM_WORLD = "1" | ||
12 | |||
13 | SRC_URI = " \ | ||
14 | svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/JP;protocol=http;rev=82 \ | ||
15 | file://44-source-han-sans-jp.conf \ | ||
16 | " | ||
17 | SRC_URI[md5sum] = "908fbf97f3df04a6838708c093f1e900" | ||
18 | SRC_URI[sha256sum] = "dc6dbae3fba35f220bac88ba7130b826c7efe1282f472788fae3628b79be3f54" | ||
19 | |||
20 | S = "${WORKDIR}/SourceHanSansJP" | ||
21 | |||
22 | do_install() { | ||
23 | install -d ${D}${sysconfdir}/fonts/conf.d/ | ||
24 | install -m 0644 ${WORKDIR}/44-source-han-sans-jp.conf ${D}${sysconfdir}/fonts/conf.d/ | ||
25 | |||
26 | install -d ${D}${datadir}/fonts/truetype/ | ||
27 | find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; | ||
28 | } | ||
29 | |||
30 | FILES:${PN} = " \ | ||
31 | ${sysconfdir}/fonts \ | ||
32 | ${datadir}/fonts \ | ||
33 | " | ||
34 | 5 | ||
6 | SRC_URI[sha256sum] = "1ae9f62ad620d686c4a049ce25cf54e3afd8fefc954a678c644cf9802750c17e" | ||
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr-fonts.conf index dee73ae77..dee73ae77 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr-fonts.conf | |||
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb index 5ab5057d8..8b32ab82d 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb | |||
@@ -1,34 +1,6 @@ | |||
1 | require ttf.inc | 1 | require source-han-sans-fonts.inc |
2 | 2 | ||
3 | SUMMARY = "Adobe OpenType Pan-CJK font family for Korean" | 3 | SUMMARY = "Adobe OpenType Pan-CJK font family for Korean" |
4 | HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" | 4 | ZIPNAME = "SourceHanSansKR" |
5 | LICENSE = "OFL-1.1" | ||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" | ||
7 | |||
8 | inherit allarch fontcache | ||
9 | |||
10 | # Download tends to break - so - or not? | ||
11 | #EXCLUDE_FROM_WORLD = "1" | ||
12 | |||
13 | SRC_URI = " \ | ||
14 | svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82 \ | ||
15 | file://44-source-han-sans-kr.conf \ | ||
16 | " | ||
17 | SRC_URI[md5sum] = "f8d1bd6c87d8575afdb25e2f46bd81d4" | ||
18 | SRC_URI[sha256sum] = "38fd15c80f9980492faaa1af39ff873d8a38e45027023fb17d5b10d4b4b0e6af" | ||
19 | |||
20 | S = "${WORKDIR}/SourceHanSansKR" | ||
21 | |||
22 | do_install() { | ||
23 | install -d ${D}${sysconfdir}/fonts/conf.d/ | ||
24 | install -m 0644 ${WORKDIR}/44-source-han-sans-kr.conf ${D}${sysconfdir}/fonts/conf.d/ | ||
25 | |||
26 | install -d ${D}${datadir}/fonts/truetype/ | ||
27 | find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; | ||
28 | } | ||
29 | |||
30 | FILES:${PN} = " \ | ||
31 | ${sysconfdir}/fonts \ | ||
32 | ${datadir}/fonts \ | ||
33 | " | ||
34 | 5 | ||
6 | SRC_URI[sha256sum] = "02fe28a48c6381c49d61c27a1b173c77f0e6f2b9f2b68e79f076f10a6a8f4bfe" | ||
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw-fonts.conf index ae289401b..ae289401b 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw-fonts.conf | |||
diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb index a2b3fff07..b841660ef 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb | |||
@@ -1,34 +1,6 @@ | |||
1 | require ttf.inc | 1 | require source-han-sans-fonts.inc |
2 | 2 | ||
3 | SUMMARY = "Adobe OpenType Pan-CJK font family for Traditional Chinese" | 3 | SUMMARY = "Adobe OpenType Pan-CJK font family for Traditional Chinese" |
4 | HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" | 4 | ZIPNAME = "SourceHanSansTW" |
5 | LICENSE = "OFL-1.1" | ||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" | ||
7 | |||
8 | inherit allarch fontcache | ||
9 | |||
10 | # Download tends to break - so - or not? | ||
11 | #EXCLUDE_FROM_WORLD = "1" | ||
12 | |||
13 | SRC_URI = " \ | ||
14 | svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82 \ | ||
15 | file://44-source-han-sans-tw.conf \ | ||
16 | " | ||
17 | SRC_URI[md5sum] = "6533b71b31c19e548768f0fc963202f3" | ||
18 | SRC_URI[sha256sum] = "92ba161921c5cdec5a8f8d5711676f0865b50cee071c25eb4bd4125b5af59fd0" | ||
19 | |||
20 | S = "${WORKDIR}/SourceHanSansTW" | ||
21 | |||
22 | do_install() { | ||
23 | install -d ${D}${sysconfdir}/fonts/conf.d/ | ||
24 | install -m 0644 ${WORKDIR}/44-source-han-sans-tw.conf ${D}${sysconfdir}/fonts/conf.d/ | ||
25 | |||
26 | install -d ${D}${datadir}/fonts/truetype/ | ||
27 | find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; | ||
28 | } | ||
29 | |||
30 | FILES:${PN} = " \ | ||
31 | ${sysconfdir}/fonts \ | ||
32 | ${datadir}/fonts \ | ||
33 | " | ||
34 | 5 | ||
6 | SRC_URI[sha256sum] = "11d78c8fbc1a4bb04a453cdd65c99db8d41ec5cd6ba6d68c8638e6ba170de806" | ||
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb index 43a387b81..54aeb318a 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb | |||
@@ -23,7 +23,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/dejavu/files/dejavu/" | |||
23 | 23 | ||
24 | do_install:append () { | 24 | do_install:append () { |
25 | install -d ${D}${sysconfdir}/fonts/conf.d/ | 25 | install -d ${D}${sysconfdir}/fonts/conf.d/ |
26 | install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ | 26 | install -m 0644 ${UNPACKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ |
27 | } | 27 | } |
28 | 28 | ||
29 | PACKAGES = "\ | 29 | PACKAGES = "\ |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb index d61860749..c142f1dd0 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb | |||
@@ -23,7 +23,8 @@ SRC_URI = "git://github.com/google/fonts.git;protocol=https;branch=main;subpath= | |||
23 | git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasanscondensed;name=firasanscondensed \ | 23 | git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasanscondensed;name=firasanscondensed \ |
24 | git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasansextracondensed;name=firasansextracondensed" | 24 | git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasansextracondensed;name=firasansextracondensed" |
25 | 25 | ||
26 | S = "${WORKDIR}" | 26 | S = "${WORKDIR}/sources" |
27 | UNPACKDIR = "${S}" | ||
27 | 28 | ||
28 | do_install:append() { | 29 | do_install:append() { |
29 | install -d ${D}${datadir}/fonts/truetype/ | 30 | install -d ${D}${datadir}/fonts/truetype/ |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb index 2ae1d619c..5a8fe4c32 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | |||
@@ -3,23 +3,23 @@ require ttf.inc | |||
3 | SUMMARY = "Inconsolata font - TTF Version" | 3 | SUMMARY = "Inconsolata font - TTF Version" |
4 | HOMEPAGE = "http://www.levien.com/type/myfonts/inconsolata.html" | 4 | HOMEPAGE = "http://www.levien.com/type/myfonts/inconsolata.html" |
5 | LICENSE = "OFL-1.1" | 5 | LICENSE = "OFL-1.1" |
6 | LIC_FILES_CHKSUM = "file://../OFL.txt;md5=969851e3a70122069a4d9ee61dd5a2ed" | 6 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/OFL.txt;md5=969851e3a70122069a4d9ee61dd5a2ed" |
7 | 7 | ||
8 | SRC_URI = "http://levien.com/type/myfonts/Inconsolata.otf \ | 8 | SRC_URI = "http://levien.com/type/myfonts/Inconsolata.otf \ |
9 | file://OFL.txt" | 9 | file://OFL.txt" |
10 | 10 | ||
11 | S = "${WORKDIR}/ttf-inconsolata-${PV}" | 11 | S = "${UNPACKDIR}/ttf-inconsolata-${PV}" |
12 | 12 | ||
13 | FILES:${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ | 13 | FILES:${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ |
14 | ${datadir}/doc/ttf-inconsolata/*" | 14 | ${datadir}/doc/ttf-inconsolata/*" |
15 | 15 | ||
16 | do_configure() { | 16 | do_configure() { |
17 | cp -fr ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf | 17 | cp -fr ${UNPACKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf |
18 | } | 18 | } |
19 | 19 | ||
20 | do_install:append() { | 20 | do_install:append() { |
21 | install -d ${D}${datadir}/doc/ttf-inconsolata/ | 21 | install -d ${D}${datadir}/doc/ttf-inconsolata/ |
22 | install -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ | 22 | install -m 0644 ${UNPACKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ |
23 | } | 23 | } |
24 | 24 | ||
25 | SRC_URI[md5sum] = "0fbe014c1f0fb5e3c71140ff0dc63edf" | 25 | SRC_URI[md5sum] = "0fbe014c1f0fb5e3c71140ff0dc63edf" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb index f386d6ec5..a0fb7b6a7 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb | |||
@@ -22,7 +22,7 @@ do_install:append () { | |||
22 | install -d ${D}${datadir}/fonts/TTF/ | 22 | install -d ${D}${datadir}/fonts/TTF/ |
23 | install -d ${D}${sysconfdir}/fonts/conf.d/ | 23 | install -d ${D}${sysconfdir}/fonts/conf.d/ |
24 | install -m 0644 LiberationSansNarrow*.ttf ${D}${datadir}/fonts/TTF/ | 24 | install -m 0644 LiberationSansNarrow*.ttf ${D}${datadir}/fonts/TTF/ |
25 | install -D -m 0644 ${WORKDIR}/30-0-liberation-sans-narrow.conf ${D}${sysconfdir}/conf.avail/30-${PN}-sans.conf | 25 | install -D -m 0644 ${UNPACKDIR}/30-0-liberation-sans-narrow.conf ${D}${sysconfdir}/conf.avail/30-${PN}-sans.conf |
26 | install -D -m 0644 ${S}/License.txt ${D}${datadir}/licenses/${PN}/LICENSE | 26 | install -D -m 0644 ${S}/License.txt ${D}${datadir}/licenses/${PN}/LICENSE |
27 | # normal liberation fonts come from ttf-liberation recipe so delete here | 27 | # normal liberation fonts come from ttf-liberation recipe so delete here |
28 | rm -rf ${D}${datadir}/fonts/truetype | 28 | rm -rf ${D}${datadir}/fonts/truetype |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb index 395164733..65d0f0bb3 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb | |||
@@ -10,7 +10,8 @@ SRC_URI[sha256sum] = "de5750f7048973f851961050f76b8b58e9bda400d5007c3078d9317fbe | |||
10 | 10 | ||
11 | DEPENDS = "fontforge-native" | 11 | DEPENDS = "fontforge-native" |
12 | 12 | ||
13 | S = "${WORKDIR}" | 13 | S = "${WORKDIR}/sources" |
14 | UNPACKDIR = "${S}" | ||
14 | FONT_PACKAGES = "${PN}" | 15 | FONT_PACKAGES = "${PN}" |
15 | FILES:${PN} = "${datadir}" | 16 | FILES:${PN} = "${datadir}" |
16 | 17 | ||
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb index e9aa5721f..fce76418f 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb | |||
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.paratype.com/public/" | |||
5 | SECTION = "x11/fonts" | 5 | SECTION = "x11/fonts" |
6 | 6 | ||
7 | LICENSE = "ParaTypeFFL-1.3" | 7 | LICENSE = "ParaTypeFFL-1.3" |
8 | LIC_FILES_CHKSUM = "file://../PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d" | 8 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d" |
9 | 9 | ||
10 | inherit allarch fontcache | 10 | inherit allarch fontcache |
11 | 11 | ||
@@ -16,9 +16,10 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/paratype-pt-sans-fonts/PTSans | |||
16 | SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7" | 16 | SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7" |
17 | SRC_URI[sha256sum] = "0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e" | 17 | SRC_URI[sha256sum] = "0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e" |
18 | 18 | ||
19 | S = "${UNPACKDIR}" | ||
20 | |||
19 | do_install () { | 21 | do_install () { |
20 | install -d ${D}${datadir}/fonts/X11/TTF/ | 22 | install -d ${D}${datadir}/fonts/X11/TTF/ |
21 | cd .. | ||
22 | for i in *.ttf; do | 23 | for i in *.ttf; do |
23 | install -m 0644 $i ${D}${prefix}/share/fonts/X11/TTF/${i} | 24 | install -m 0644 $i ${D}${prefix}/share/fonts/X11/TTF/${i} |
24 | done | 25 | done |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb index 1870c78f9..3752ec39b 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb | |||
@@ -9,6 +9,7 @@ SRC_URI = "https://github.com/google/roboto/releases/download/v${PV}/roboto-andr | |||
9 | SRC_URI[md5sum] = "3b43a5cb33196ec25e44d5fcb40219e1" | 9 | SRC_URI[md5sum] = "3b43a5cb33196ec25e44d5fcb40219e1" |
10 | SRC_URI[sha256sum] = "c825453253f590cfe62557733e7173f9a421fff103b00f57d33c4ad28ae53baf" | 10 | SRC_URI[sha256sum] = "c825453253f590cfe62557733e7173f9a421fff103b00f57d33c4ad28ae53baf" |
11 | 11 | ||
12 | S = "${WORKDIR}" | 12 | S = "${WORKDIR}/sources" |
13 | UNPACKDIR = "${S}" | ||
13 | 14 | ||
14 | FILES:${PN} = "${datadir}/fonts/truetype/*.ttf" | 15 | FILES:${PN} = "${datadir}/fonts/truetype/*.ttf" |
diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb index 461e3def7..0131a62ee 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb | |||
@@ -3,7 +3,7 @@ require ttf.inc | |||
3 | SUMMARY = "Thai Linux Working Group Fonts" | 3 | SUMMARY = "Thai Linux Working Group Fonts" |
4 | HOMEPAGE = "http://linux.thai.net/projects/fonts-tlwg" | 4 | HOMEPAGE = "http://linux.thai.net/projects/fonts-tlwg" |
5 | LICENSE = "GPL-2.0-only & TLWG" | 5 | LICENSE = "GPL-2.0-only & TLWG" |
6 | LIC_FILES_CHKSUM = "file://../fonts-tlwg-${PV}/COPYING;md5=3d20cd7eadf4afd5460c0adb32e387fd" | 6 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/fonts-tlwg-${PV}/COPYING;md5=3d20cd7eadf4afd5460c0adb32e387fd" |
7 | 7 | ||
8 | SRC_URI = "http://linux.thai.net/pub/ThaiLinux/software/fonts-tlwg/fonts-tlwg-${PV}.tar.xz;name=source \ | 8 | SRC_URI = "http://linux.thai.net/pub/ThaiLinux/software/fonts-tlwg/fonts-tlwg-${PV}.tar.xz;name=source \ |
9 | http://linux.thai.net/pub/ThaiLinux/software/ttf-tlwg/ttf-tlwg-${PV}.tar.xz;name=ttf" | 9 | http://linux.thai.net/pub/ThaiLinux/software/ttf-tlwg/ttf-tlwg-${PV}.tar.xz;name=ttf" |
diff --git a/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.5.bb b/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb index f078ad60e..0274608d0 100644 --- a/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.5.bb +++ b/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb | |||
@@ -9,9 +9,9 @@ It includes: \ | |||
9 | xkbvleds - display the state of LEDs on an XKB keyboard in a window \ | 9 | xkbvleds - display the state of LEDs on an XKB keyboard in a window \ |
10 | xkbwatch - reports changes in the XKB keyboard state \ | 10 | xkbwatch - reports changes in the XKB keyboard state \ |
11 | " | 11 | " |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=64322fab5239f5c8d97cf6e0e14f1c62" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=6767a97a97e21260134637b657b922ae" |
13 | 13 | ||
14 | DEPENDS += "libxaw libxkbfile" | 14 | DEPENDS += "libxaw libxkbfile" |
15 | 15 | ||
16 | SRC_URI_EXT = "xz" | 16 | SRC_URI_EXT = "xz" |
17 | SRC_URI[sha256sum] = "f6a4a8e9c54582beb3787b1faa8168caab125c1fee0ca9cfa5b6c9c1df25eea4" | 17 | SRC_URI[sha256sum] = "31a2bbee1e09ccba01de92897b8f540b545de812f318d31de07bd3a5a75ee25e" |
diff --git a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.7.bb b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb index e5cd0ce6f..4ddb1b988 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.7.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb | |||
@@ -7,4 +7,4 @@ LICENSE = "MIT" | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" |
8 | 8 | ||
9 | SRC_URI_EXT = "xz" | 9 | SRC_URI_EXT = "xz" |
10 | SRC_URI[sha256sum] = "7b726945a967b44c35cddee5edd74802907a239ce2e2e515730b8a32c8e50465" | 10 | SRC_URI[sha256sum] = "807f909eace684b866fc63b3e962729c120822a6c96e051ff51cf350b3ffb6cd" |
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch deleted file mode 100644 index a6cf16e4e..000000000 --- a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | From b23d38f1216c4d70738edaa367cf9ecd2dd4b660 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 13 Dec 2019 12:59:26 -0800 | ||
4 | Subject: [PATCH] Add configure time check for setsid | ||
5 | |||
6 | Do not assume glibc == linux | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | --- | ||
12 | configure | 1 + | ||
13 | configure.in | 1 + | ||
14 | main.c | 4 ++-- | ||
15 | xtermcfg.hin | 1 + | ||
16 | 4 files changed, 5 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/configure b/configure | ||
19 | index 72342c7..c2ec2ac 100755 | ||
20 | --- a/configure | ||
21 | +++ b/configure | ||
22 | @@ -5803,6 +5803,7 @@ for ac_func in \ | ||
23 | unsetenv \ | ||
24 | sched_yield \ | ||
25 | setpgid \ | ||
26 | + setsid \ | ||
27 | strftime \ | ||
28 | tcgetattr \ | ||
29 | waitpid \ | ||
30 | diff --git a/configure.in b/configure.in | ||
31 | index 56dbc25..0608c80 100644 | ||
32 | --- a/configure.in | ||
33 | +++ b/configure.in | ||
34 | @@ -99,6 +99,7 @@ AC_CHECK_FUNCS( \ | ||
35 | unsetenv \ | ||
36 | sched_yield \ | ||
37 | setpgid \ | ||
38 | + setsid \ | ||
39 | strftime \ | ||
40 | tcgetattr \ | ||
41 | waitpid \ | ||
42 | diff --git a/main.c b/main.c | ||
43 | index 24da0eb..332174c 100644 | ||
44 | --- a/main.c | ||
45 | +++ b/main.c | ||
46 | @@ -2956,7 +2956,7 @@ main(int argc, char *argv[]ENVP_ARG) | ||
47 | } | ||
48 | } | ||
49 | |||
50 | -#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) | ||
51 | +#if defined(__osf__) || (defined(__linux__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) | ||
52 | #define USE_OPENPTY 1 | ||
53 | static int opened_tty = -1; | ||
54 | #endif | ||
55 | @@ -4205,7 +4205,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed) | ||
56 | /* | ||
57 | * now in child process | ||
58 | */ | ||
59 | -#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) | ||
60 | +#if HAVE_SETSID | ||
61 | int pgrp = setsid(); /* variable may not be used... */ | ||
62 | #else | ||
63 | int pgrp = getpid(); | ||
64 | diff --git a/xtermcfg.hin b/xtermcfg.hin | ||
65 | index 19048cd..e54d2cd 100644 | ||
66 | --- a/xtermcfg.hin | ||
67 | +++ b/xtermcfg.hin | ||
68 | @@ -98,6 +98,7 @@ | ||
69 | #undef HAVE_SCHED_YIELD /* AC_CHECK_FUNCS(sched_yield) */ | ||
70 | #undef HAVE_SETITIMER /* CF_SETITIMER */ | ||
71 | #undef HAVE_SETPGID /* AC_CHECK_FUNCS(setpgid) */ | ||
72 | +#undef HAVE_SETSID /* AC_CHECK_FUNCS(setsid) */ | ||
73 | #undef HAVE_STDINT_H /* AC_PROG_CC_STDC */ | ||
74 | #undef HAVE_STDLIB_H /* AC_CHECK_HEADERS(stdlib.h) */ | ||
75 | #undef HAVE_STDNORETURN_H /* CF_C11_NORETURN */ | ||
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch new file mode 100644 index 000000000..0c9d64c82 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From e30ab2d73a21bc55511cbedbb9ae603246dbfcd1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 16 May 2024 23:10:00 -0700 | ||
4 | Subject: [PATCH] include missing pty.h header for openpty() | ||
5 | |||
6 | On musl this problem is unearthed | ||
7 | |||
8 | Fix | ||
9 | ./main.c: In function 'get_pty': | ||
10 | ./main.c:3123:14: error: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration] | ||
11 | 3123 | result = openpty(pty, &opened_tty, ttydev, NULL, NULL); | ||
12 | | ^~~~~~~ | ||
13 | | openat | ||
14 | |||
15 | Upstream-Status: Submitted [sent to dickey@invisible-island.net] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | main.c | 1 + | ||
19 | 1 file changed, 1 insertion(+) | ||
20 | |||
21 | --- a/main.c | ||
22 | +++ b/main.c | ||
23 | @@ -89,6 +89,7 @@ | ||
24 | |||
25 | #define RES_OFFSET(field) XtOffsetOf(XTERM_RESOURCE, field) | ||
26 | |||
27 | +#include <pty.h> | ||
28 | #include <xterm.h> | ||
29 | #include <version.h> | ||
30 | #include <graphics.h> | ||
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_388.bb b/meta-oe/recipes-graphics/xorg-app/xterm_392.bb index 8578f0cc9..677f5c999 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_388.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_392.bb | |||
@@ -2,13 +2,12 @@ require recipes-graphics/xorg-app/xorg-app-common.inc | |||
2 | SUMMARY = "xterm is the standard terminal emulator for the X Window System" | 2 | SUMMARY = "xterm is the standard terminal emulator for the X Window System" |
3 | DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" | 3 | DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=9c96124b492c0c02356850c243aaeca2" | 5 | LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=1a3032aa728f8fda9d686948940ca58d" |
6 | 6 | ||
7 | SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ | 7 | SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ |
8 | file://0001-Add-configure-time-check-for-setsid.patch \ | 8 | file://0001-include-missing-pty.h-header-for-openpty.patch \ |
9 | " | 9 | " |
10 | 10 | SRC_URI[sha256sum] = "4d57372ef08eafa9fb7682db8d07be0fe0513e58e8478c2ec8e9b62486e7fe5e" | |
11 | SRC_URI[sha256sum] = "ac429345e6f937a5945a89d425a265fee6c215fc669dbdc6a0326e21f4c5f674" | ||
12 | 11 | ||
13 | PACKAGECONFIG ?= "" | 12 | PACKAGECONFIG ?= "" |
14 | PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" | 13 | PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" |
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb index 9f445ff26..8c26bf798 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb | |||
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "b596168c4ed2f1023212dc828ce49cbe82a0bbd1aac3c5e2958154d788 | |||
14 | 14 | ||
15 | do_install:append() { | 15 | do_install:append() { |
16 | install -d ${D}${nonarch_base_libdir}/udev/rules.d | 16 | install -d ${D}${nonarch_base_libdir}/udev/rules.d |
17 | install -m 0644 ${WORKDIR}/99-xf86-input-tslib.rules ${D}${nonarch_base_libdir}/udev/rules.d/ | 17 | install -m 0644 ${UNPACKDIR}/99-xf86-input-tslib.rules ${D}${nonarch_base_libdir}/udev/rules.d/ |
18 | } | 18 | } |
19 | 19 | ||
20 | FILES:${PN} += "${nonarch_base_libdir}/udev" | 20 | FILES:${PN} += "${nonarch_base_libdir}/udev" |
diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb index dc909ed78..d698efa5e 100644 --- a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb +++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb | |||
@@ -34,11 +34,11 @@ PACKAGECONFIG = "png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', | |||
34 | PACKAGECONFIG[systemd] = "--with-systemd=yes,--with-systemd=no,systemd" | 34 | PACKAGECONFIG[systemd] = "--with-systemd=yes,--with-systemd=no,systemd" |
35 | PACKAGECONFIG[png] = "--with-png=yes,--with-png=no,libpng" | 35 | PACKAGECONFIG[png] = "--with-png=yes,--with-png=no,libpng" |
36 | 36 | ||
37 | CONFIGUREOPTS:remove = "--disable-silent-rules --disable-dependency-tracking ${@append_libtool_sysroot(d)}" | 37 | CONFIGUREOPTS:remove = "--disable-silent-rules --disable-dependency-tracking" |
38 | EXTRA_OECONF:remove = "--disable-static" | 38 | EXTRA_OECONF:remove = "--disable-static" |
39 | 39 | ||
40 | do_install:append() { | 40 | do_install:append() { |
41 | install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service | 41 | install -D ${UNPACKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service |
42 | for f in xscreensaver-getimage-file xscreensaver-getimage-video webcollage xscreensaver-text vidwhacker | 42 | for f in xscreensaver-getimage-file xscreensaver-getimage-video webcollage xscreensaver-text vidwhacker |
43 | do | 43 | do |
44 | sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" ${D}/${libexecdir}/${PN}/$f | 44 | sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" ${D}/${libexecdir}/${PN}/$f |
diff --git a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb index 0f1c8846b..7a15d16bc 100644 --- a/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb +++ b/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb | |||
@@ -37,8 +37,8 @@ S = "${WORKDIR}/git" | |||
37 | inherit autotools pkgconfig | 37 | inherit autotools pkgconfig |
38 | 38 | ||
39 | do_install:append() { | 39 | do_install:append() { |
40 | if [ -e ${WORKDIR}/iana-enterprise-numbers ]; then | 40 | if [ -e ${UNPACKDIR}/iana-enterprise-numbers ]; then |
41 | install -Dm 0755 ${WORKDIR}/iana-enterprise-numbers ${D}${datadir}/misc/enterprise-numbers | 41 | install -Dm 0755 ${UNPACKDIR}/iana-enterprise-numbers ${D}${datadir}/misc/enterprise-numbers |
42 | fi | 42 | fi |
43 | } | 43 | } |
44 | 44 | ||
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 01f185adb..3f57ef3bf 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Kernel selftest for Linux" | |||
2 | DESCRIPTION = "Kernel selftest for Linux" | 2 | DESCRIPTION = "Kernel selftest for Linux" |
3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://../COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 5 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
6 | 6 | ||
7 | DEPENDS = "rsync-native llvm-native" | 7 | DEPENDS = "rsync-native llvm-native" |
8 | 8 | ||
@@ -120,7 +120,7 @@ do_install() { | |||
120 | } | 120 | } |
121 | 121 | ||
122 | do_configure() { | 122 | do_configure() { |
123 | install -D -m 0644 ${WORKDIR}/COPYING ${S}/COPYING | 123 | install -D -m 0644 ${UNPACKDIR}/COPYING ${S}/COPYING |
124 | } | 124 | } |
125 | 125 | ||
126 | do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_unrelated" | 126 | do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_unrelated" |
diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.0.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb index f2ec48f39..928482ba3 100644 --- a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.0.bb +++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb | |||
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238 | |||
8 | 8 | ||
9 | DEPENDS = "zlib elfutils" | 9 | DEPENDS = "zlib elfutils" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.2" |
12 | SRCREV = "20ea95b4505c477af3b6ff6ce9d19cee868ddc5d" | 12 | SRCREV = "1b357586a7a62db7fe27af4ebe4bdefe6986cfd6" |
13 | 13 | ||
14 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 14 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
15 | COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux" | 15 | COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux" |
diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch index 7ae0856f8..7eaf29e4c 100644 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch +++ b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-makefile-Do-not-preserve-ownership-in-cp-command.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6650d0e79eea330b53635574885208a138fef97e Mon Sep 17 00:00:00 2001 | 1 | From ab6f78bfd6811c648ee71663cfc4dc8be151a519 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: Wed, 21 Dec 2022 22:50:56 -0800 | 3 | Date: Wed, 21 Dec 2022 22:50:56 -0800 |
4 | Subject: [PATCH] makefile: Do not preserve ownership in cp command | 4 | Subject: [PATCH] makefile: Do not preserve ownership in cp command |
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/Makefile b/Makefile | 16 | diff --git a/Makefile b/Makefile |
17 | index 27d425c..3aea142 100644 | 17 | index 7f4f5c3..1ba7b9d 100644 |
18 | --- a/Makefile | 18 | --- a/Makefile |
19 | +++ b/Makefile | 19 | +++ b/Makefile |
20 | @@ -273,7 +273,7 @@ endif # DESTDIR = "" | 20 | @@ -296,7 +296,7 @@ endif # DESTDIR = "" |
21 | 21 | ||
22 | install_libs: libs install_pkgconfig | 22 | install_libs: libs install_pkgconfig |
23 | $(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)); \ | 23 | $(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)); \ |
@@ -26,6 +26,3 @@ index 27d425c..3aea142 100644 | |||
26 | $(Q)$(call do_install,$(src)/include/tracefs.h,$(includedir_SQ),644) | 26 | $(Q)$(call do_install,$(src)/include/tracefs.h,$(includedir_SQ),644) |
27 | $(Q)$(call install_ld_config) | 27 | $(Q)$(call install_ld_config) |
28 | 28 | ||
29 | -- | ||
30 | 2.39.0 | ||
31 | |||
diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch b/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch deleted file mode 100644 index a24dd1315..000000000 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs/0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From f539d96ef4a34ad23d33c552d1770ab429b0220e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 14 Jun 2023 00:24:36 -0700 | ||
4 | Subject: [PATCH] tracefs-perf: Add missing headers for syscall() and SYS_* | ||
5 | defines | ||
6 | |||
7 | These headers are needed to provide prototype definitions for functions | ||
8 | e.g. close(), syscall(), getpagesize(), getpid() | ||
9 | |||
10 | The issue is observed with clang-16+ compiler on musl systems | ||
11 | |||
12 | Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20230614072759.316154-1-raj.khem@gmail.com/T/#u] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/tracefs-perf.c | 3 ++- | ||
16 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/tracefs-perf.c b/src/tracefs-perf.c | ||
19 | index 96d12cd..62c1508 100644 | ||
20 | --- a/src/tracefs-perf.c | ||
21 | +++ b/src/tracefs-perf.c | ||
22 | @@ -1,4 +1,5 @@ | ||
23 | -#include <asm/unistd.h> | ||
24 | +#include <unistd.h> | ||
25 | +#include <sys/syscall.h> | ||
26 | #include <sys/mman.h> | ||
27 | #include <signal.h> | ||
28 | #include <linux/perf_event.h> | ||
29 | -- | ||
30 | 2.41.0 | ||
31 | |||
diff --git a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.7.0.bb b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb index 9a408ba13..c90ac19fa 100644 --- a/meta-oe/recipes-kernel/libtracefs/libtracefs_1.7.0.bb +++ b/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb | |||
@@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 | |||
9 | SECTION = "libs" | 9 | SECTION = "libs" |
10 | DEPENDS = "libtraceevent bison-native flex-native" | 10 | DEPENDS = "libtraceevent bison-native flex-native" |
11 | 11 | ||
12 | SRCREV = "aebab37379d0fbadc702d64aca0fe5cf18676404" | 12 | SRCREV = "67f3b2ab9f836e6c9c70c94db7aac3251119a263" |
13 | SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \ | 13 | SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \ |
14 | file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \ | 14 | file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \ |
15 | file://0001-tracefs-perf-Add-missing-headers-for-syscall-and-SYS.patch \ | ||
16 | " | 15 | " |
17 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
18 | 17 | ||
diff --git a/meta-oe/recipes-kernel/linux/linux.inc b/meta-oe/recipes-kernel/linux/linux.inc index b4b066122..79a916d46 100644 --- a/meta-oe/recipes-kernel/linux/linux.inc +++ b/meta-oe/recipes-kernel/linux/linux.inc | |||
@@ -41,8 +41,8 @@ do_configure:prepend() { | |||
41 | # | 41 | # |
42 | # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used | 42 | # logo support, if you supply logo_linux_clut224.ppm in SRC_URI, then it's going to be used |
43 | # | 43 | # |
44 | if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then | 44 | if [ -e ${UNPACKDIR}/logo_linux_clut224.ppm ]; then |
45 | install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm | 45 | install -m 0644 ${UNPACKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm |
46 | kernel_conf_variable LOGO y | 46 | kernel_conf_variable LOGO y |
47 | kernel_conf_variable LOGO_LINUX_CLUT224 y | 47 | kernel_conf_variable LOGO_LINUX_CLUT224 y |
48 | fi | 48 | fi |
diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb index 726aa60ce..90e847c13 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb | |||
@@ -36,9 +36,9 @@ do_install:append() { | |||
36 | cp -rf ${S}/etc/* ${D}/${sysconfdir}/ | 36 | cp -rf ${S}/etc/* ${D}/${sysconfdir}/ |
37 | 37 | ||
38 | install -d ${D}${systemd_system_unitdir} | 38 | install -d ${D}${systemd_system_unitdir} |
39 | install -m 0644 ${WORKDIR}/minicoredumper.service ${D}${systemd_system_unitdir} | 39 | install -m 0644 ${UNPACKDIR}/minicoredumper.service ${D}${systemd_system_unitdir} |
40 | install -d ${D}${sysconfdir}/init.d | 40 | install -d ${D}${sysconfdir}/init.d |
41 | install -m 0755 ${WORKDIR}/minicoredumper.init ${D}${sysconfdir}/init.d/minicoredumper | 41 | install -m 0755 ${UNPACKDIR}/minicoredumper.init ${D}${sysconfdir}/init.d/minicoredumper |
42 | 42 | ||
43 | # correct path of minicoredumper | 43 | # correct path of minicoredumper |
44 | sed -i -e s:/usr/bin/minicoredumper:${sbindir}/minicoredumper:g ${D}${sysconfdir}/init.d/minicoredumper | 44 | sed -i -e s:/usr/bin/minicoredumper:${sbindir}/minicoredumper:g ${D}${sysconfdir}/init.d/minicoredumper |
diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0011-replace-__FILE__-with-__FILE_NAME__.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0011-replace-__FILE__-with-__FILE_NAME__.patch new file mode 100644 index 000000000..902032969 --- /dev/null +++ b/meta-oe/recipes-kernel/oprofile/oprofile/0011-replace-__FILE__-with-__FILE_NAME__.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 640b116618b89eeddd61a91b793bb3c879adfe57 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 7 May 2024 19:56:59 -0700 | ||
4 | Subject: [PATCH] replace __FILE__ with __FILE_NAME__ | ||
5 | |||
6 | This helps build paths not beeing assumed during runtime | ||
7 | since in cross-builds its possible that absolute paths during | ||
8 | build will not match runtime paths | ||
9 | |||
10 | Upstream-Status: Inappropriate [OE-Specific] | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | libutil++/tests/file_manip_tests.cpp | 10 +++++----- | ||
15 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
16 | |||
17 | diff --git a/libutil++/tests/file_manip_tests.cpp b/libutil++/tests/file_manip_tests.cpp | ||
18 | index dfe161b..3d960bc 100644 | ||
19 | --- a/libutil++/tests/file_manip_tests.cpp | ||
20 | +++ b/libutil++/tests/file_manip_tests.cpp | ||
21 | @@ -138,9 +138,9 @@ static void is_directory_tests() | ||
22 | static input_output<pair<string, string>, bool> | ||
23 | expect_is_files_identical[] = { | ||
24 | #define MAKE_PAIR(a, b) make_pair(string(a), string(b)) | ||
25 | - { MAKE_PAIR(__FILE__, __FILE__), true }, | ||
26 | - { MAKE_PAIR(__FILE__, "not_existing"), false }, | ||
27 | - { MAKE_PAIR("not_exisiting", __FILE__), false }, | ||
28 | + { MAKE_PAIR(__FILE_NAME__, __FILE_NAME__), true }, | ||
29 | + { MAKE_PAIR(__FILE_NAME__, "not_existing"), false }, | ||
30 | + { MAKE_PAIR("not_exisiting", __FILE_NAME__), false }, | ||
31 | { MAKE_PAIR("not_exisiting", "not_existing"), false }, | ||
32 | { MAKE_PAIR("", ""), false } | ||
33 | #undef MAKE_PAIR | ||
34 | @@ -163,8 +163,8 @@ void is_files_identical_tests(char const * prog_name) | ||
35 | |||
36 | static input_output<char const *, bool> expect_op_file_readable[] = | ||
37 | { | ||
38 | - { __FILE__, true }, | ||
39 | - { "./" __FILE__, true }, | ||
40 | + { __FILE_NAME__, true }, | ||
41 | + { "./" __FILE_NAME__, true }, | ||
42 | { ".", false }, | ||
43 | { "/.", false }, | ||
44 | { "./", false }, | ||
45 | -- | ||
46 | 2.45.0 | ||
47 | |||
diff --git a/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb b/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb index 092d22746..45f70aa38 100644 --- a/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb +++ b/meta-oe/recipes-kernel/oprofile/oprofile_1.4.0.bb | |||
@@ -30,6 +30,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ | |||
30 | file://0008-include-linux-limits.h-for-MAX_INPUT.patch \ | 30 | file://0008-include-linux-limits.h-for-MAX_INPUT.patch \ |
31 | file://0009-Prevent-running-check-tests-on-host-if-cross-compili.patch \ | 31 | file://0009-Prevent-running-check-tests-on-host-if-cross-compili.patch \ |
32 | file://0010-oprofile-Determine-the-root-home-directory-dynamical.patch \ | 32 | file://0010-oprofile-Determine-the-root-home-directory-dynamical.patch \ |
33 | file://0011-replace-__FILE__-with-__FILE_NAME__.patch \ | ||
33 | file://0001-configure-Include-unistd.h-for-getpid-API.patch \ | 34 | file://0001-configure-Include-unistd.h-for-getpid-API.patch \ |
34 | file://0001-Replace-std-bind2nd-with-generic-lambda.patch \ | 35 | file://0001-Replace-std-bind2nd-with-generic-lambda.patch \ |
35 | " | 36 | " |
@@ -42,7 +43,7 @@ inherit autotools pkgconfig ptest | |||
42 | 43 | ||
43 | EXTRA_OECONF = "--with-kernel=${STAGING_DIR_HOST}${prefix} --without-x ac_cv_prog_XSLTPROC=" | 44 | EXTRA_OECONF = "--with-kernel=${STAGING_DIR_HOST}${prefix} --without-x ac_cv_prog_XSLTPROC=" |
44 | do_configure () { | 45 | do_configure () { |
45 | cp ${WORKDIR}/acinclude.m4 ${S}/ | 46 | cp ${UNPACKDIR}/acinclude.m4 ${S}/ |
46 | autotools_do_configure | 47 | autotools_do_configure |
47 | } | 48 | } |
48 | 49 | ||
diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index bdc37c038..02a695218 100644 --- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | |||
@@ -12,7 +12,7 @@ processor frequency and idle power saving state residency on supported \ | |||
12 | processors." | 12 | processors." |
13 | 13 | ||
14 | LICENSE = "GPL-2.0-only" | 14 | LICENSE = "GPL-2.0-only" |
15 | LIC_FILES_CHKSUM = "file://../COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 15 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
16 | COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' | 16 | COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' |
17 | COMPATIBLE_HOST:libc-musl = "null" | 17 | COMPATIBLE_HOST:libc-musl = "null" |
18 | 18 | ||
@@ -50,7 +50,7 @@ do_configure:prepend() { | |||
50 | cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} | 50 | cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} |
51 | fi | 51 | fi |
52 | cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} | 52 | cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} |
53 | cp -r ${WORKDIR}/COPYING ${S} | 53 | cp -r ${UNPACKDIR}/COPYING ${S} |
54 | } | 54 | } |
55 | 55 | ||
56 | 56 | ||
diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 9fd91114d..bbce3e3bf 100644 --- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ | |||
13 | file://0001-genisoimage-Add-missing-extern-definition.patch \ | 13 | file://0001-genisoimage-Add-missing-extern-definition.patch \ |
14 | file://0001-add-new-option-eltorito-platform.patch \ | 14 | file://0001-add-new-option-eltorito-platform.patch \ |
15 | file://0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch \ | 15 | file://0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch \ |
16 | file://fix-incompatible-pointer-type-error.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI:append:class-nativesdk = " \ | 18 | SRC_URI:append:class-nativesdk = " \ |
18 | file://0001-install-netscsid-to-bin-for-nativesdk.patch \ | 19 | file://0001-install-netscsid-to-bin-for-nativesdk.patch \ |
diff --git a/meta-oe/recipes-multimedia/cdrkit/files/fix-incompatible-pointer-type-error.patch b/meta-oe/recipes-multimedia/cdrkit/files/fix-incompatible-pointer-type-error.patch new file mode 100644 index 000000000..887a54f7f --- /dev/null +++ b/meta-oe/recipes-multimedia/cdrkit/files/fix-incompatible-pointer-type-error.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | Fix incompatible pointer type error when gcc option '-Wincompatible-pointer-types' set: | ||
2 | |||
3 | cdrkit-1.1.11/genisoimage/eltorito.c:399:41: error: passing argument 1 of 'set_721' from incompatible pointer type [-Wincompatible-pointer-types] | ||
4 | 399 | set_721(&last_section_header->entry_count, nentries); | ||
5 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
6 | | | | ||
7 | | char (*)[2] | ||
8 | In file included from cdrkit/1.1.11/cdrkit-1.1.11/genisoimage/eltorito.c:39: | ||
9 | cdrkit-1.1.11/genisoimage/genisoimage.h:507:21: note: expected 'char *' but argument is of type 'char (*)[2]' | ||
10 | 507 | extern void set_721(char *, unsigned int); | ||
11 | | ^~~~~~ | ||
12 | |||
13 | Upstream-Status: Inactive-Upstream [lastrelease: 2010] | ||
14 | |||
15 | [1]: https://en.wikipedia.org/wiki/Cdrkit | ||
16 | |||
17 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
18 | |||
19 | --- | ||
20 | genisoimage/eltorito.c | 4 ++-- | ||
21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/genisoimage/eltorito.c b/genisoimage/eltorito.c | ||
24 | index a804988..e48d58c 100644 | ||
25 | --- a/genisoimage/eltorito.c | ||
26 | +++ b/genisoimage/eltorito.c | ||
27 | @@ -396,7 +396,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) | ||
28 | (arch != newarch) || | ||
29 | (current_boot_entry->type & ELTORITO_SECTION_HEADER)) { | ||
30 | if (last_section_header) | ||
31 | - set_721(&last_section_header->entry_count, nentries); | ||
32 | + set_721((char *)(&last_section_header->entry_count), nentries); | ||
33 | nentries = 1; | ||
34 | last_section_header = (struct eltorito_sectionheader_entry *) | ||
35 | (de2->table + offset); | ||
36 | @@ -419,7 +419,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) | ||
37 | } | ||
38 | |||
39 | if (last_section_header) { | ||
40 | - set_721(&last_section_header->entry_count, nentries); | ||
41 | + set_721((char *)(&last_section_header->entry_count), nentries); | ||
42 | last_section_header->header_id[0] = EL_TORITO_SHDR_ID_LAST_SHDR; | ||
43 | } | ||
44 | |||
diff --git a/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb b/meta-oe/recipes-multimedia/libass/libass_0.17.2.bb index 800ad1b15..e239d028e 100644 --- a/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb +++ b/meta-oe/recipes-multimedia/libass/libass_0.17.2.bb | |||
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75" | |||
7 | 7 | ||
8 | DEPENDS = "fontconfig freetype fribidi harfbuzz" | 8 | DEPENDS = "fontconfig freetype fribidi harfbuzz" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=0.17.1-branch" | 10 | SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=master" |
11 | SRCREV = "e8ad72accd3a84268275a9385beb701c9284e5b3" | 11 | SRCREV = "cbb48cc4f2f076300004b8b06a86bec55281d0c2" |
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb b/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb index eced6c772..8df0e9a2c 100644 --- a/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb +++ b/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb | |||
@@ -18,7 +18,6 @@ EXTRA_OECMAKE = " \ | |||
18 | -DJPEGXL_ENABLE_PLUGINS=ON \ | 18 | -DJPEGXL_ENABLE_PLUGINS=ON \ |
19 | -DBUILD_TESTING=OFF \ | 19 | -DBUILD_TESTING=OFF \ |
20 | -DJPEGXL_WARNINGS_AS_ERRORS=OFF \ | 20 | -DJPEGXL_WARNINGS_AS_ERRORS=OFF \ |
21 | -DJPEGXL_ENABLE_SIZELESS_VECTORS=ON \ | ||
22 | -DJPEGXL_ENABLE_SJPEG=OFF \ | 21 | -DJPEGXL_ENABLE_SJPEG=OFF \ |
23 | -DJPEGXL_ENABLE_BENCHMARK=OFF \ | 22 | -DJPEGXL_ENABLE_BENCHMARK=OFF \ |
24 | -DJPEGXL_ENABLE_EXAMPLES=OFF \ | 23 | -DJPEGXL_ENABLE_EXAMPLES=OFF \ |
@@ -31,9 +30,15 @@ EXTRA_OECMAKE = " \ | |||
31 | -DJPEGXL_ENABLE_TOOLS=OFF \ | 30 | -DJPEGXL_ENABLE_TOOLS=OFF \ |
32 | " | 31 | " |
33 | 32 | ||
34 | PACKAGECONFIG ?= "mime gdk-pixbuf-loader" | 33 | PACKAGECONFIG ?= "mime gdk-pixbuf-loader sizeless-vectors" |
34 | # libjxl/0.10.2/recipe-sysroot/usr/include/hwy/ops/rvv-inl.h:591:17: error: use | ||
35 | # of undeclared identifier '__riscv_vsetvlmax_e8mf8' | ||
36 | # 591 | HWY_RVV_FOREACH(HWY_RVV_LANES, Lanes, setvlmax_e, _ALL) | ||
37 | # | ^ | ||
38 | PACKAGECONFIG:remove:riscv64 = "sizeless-vectors" | ||
35 | PACKAGECONFIG[gdk-pixbuf-loader] = "-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=ON,-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=OFF,gdk-pixbuf" | 39 | PACKAGECONFIG[gdk-pixbuf-loader] = "-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=ON,-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=OFF,gdk-pixbuf" |
36 | PACKAGECONFIG[gimp] = "-DJPEGXL_ENABLE_PLUGIN_GIMP210=ON,-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF,gimp" | 40 | PACKAGECONFIG[gimp] = "-DJPEGXL_ENABLE_PLUGIN_GIMP210=ON,-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF,gimp" |
37 | PACKAGECONFIG[mime] = "-DJPEGXL_ENABLE_PLUGIN_MIME=ON,-DJPEGXL_ENABLE_PLUGIN_MIME=OFF" | 41 | PACKAGECONFIG[mime] = "-DJPEGXL_ENABLE_PLUGIN_MIME=ON,-DJPEGXL_ENABLE_PLUGIN_MIME=OFF" |
42 | PACKAGECONFIG[sizeless-vectors] = "-DJPEGXL_ENABLE_SIZELESS_VECTORS=ON,-DJPEGXL_ENABLE_SIZELESS_VECTORS=OFF" | ||
38 | 43 | ||
39 | FILES:${PN} += "${libdir}/gdk-pixbuf-2.0 ${datadir}" | 44 | FILES:${PN} += "${libdir}/gdk-pixbuf-2.0 ${datadir}" |
diff --git a/meta-oe/recipes-multimedia/live555/live555_20210824.bb b/meta-oe/recipes-multimedia/live555/live555_20210824.bb index a899049b7..80c770c3e 100644 --- a/meta-oe/recipes-multimedia/live555/live555_20210824.bb +++ b/meta-oe/recipes-multimedia/live555/live555_20210824.bb | |||
@@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | |||
27 | TARGET_CC_ARCH += "${LDFLAGS}" | 27 | TARGET_CC_ARCH += "${LDFLAGS}" |
28 | 28 | ||
29 | do_configure() { | 29 | do_configure() { |
30 | cp ${WORKDIR}/config.linux-cross . | 30 | cp ${UNPACKDIR}/config.linux-cross . |
31 | echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross | 31 | echo "COMPILE_OPTS+=" -fPIC -DXLOCALE_NOT_USED"" >> config.linux-cross |
32 | ./genMakefiles linux-cross | 32 | ./genMakefiles linux-cross |
33 | } | 33 | } |
diff --git a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch index 463651aa4..bd3d69788 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch +++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2829e6998b7595dd2108c1497fdd02485ef99e2c Mon Sep 17 00:00:00 2001 | 1 | From 1bbbf27a23c91dcc271b773a97153063461b986d Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Tue, 16 Aug 2011 16:04:35 +0200 | 3 | Date: Tue, 16 Aug 2011 16:04:35 +0200 |
4 | Subject: [PATCH] Upstream: not yet | 4 | Subject: [PATCH] Upstream: not yet |
@@ -11,10 +11,10 @@ Upstream-Status: Pending | |||
11 | 1 file changed, 16 insertions(+), 4 deletions(-) | 11 | 1 file changed, 16 insertions(+), 4 deletions(-) |
12 | 12 | ||
13 | diff --git a/build/make/configure.sh b/build/make/configure.sh | 13 | diff --git a/build/make/configure.sh b/build/make/configure.sh |
14 | index b645a666f..0b99a8b38 100644 | 14 | index 93643f3de..e84198200 100644 |
15 | --- a/build/make/configure.sh | 15 | --- a/build/make/configure.sh |
16 | +++ b/build/make/configure.sh | 16 | +++ b/build/make/configure.sh |
17 | @@ -658,6 +658,8 @@ process_common_cmdline() { | 17 | @@ -692,6 +692,8 @@ process_common_cmdline() { |
18 | ;; | 18 | ;; |
19 | --prefix=*) | 19 | --prefix=*) |
20 | prefix="${optval}" | 20 | prefix="${optval}" |
@@ -23,7 +23,7 @@ index b645a666f..0b99a8b38 100644 | |||
23 | ;; | 23 | ;; |
24 | --libdir=*) | 24 | --libdir=*) |
25 | libdir="${optval}" | 25 | libdir="${optval}" |
26 | @@ -687,13 +689,23 @@ process_cmdline() { | 26 | @@ -721,13 +723,23 @@ process_cmdline() { |
27 | } | 27 | } |
28 | 28 | ||
29 | post_process_common_cmdline() { | 29 | post_process_common_cmdline() { |
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.14.1.bb index b4d49842e..f32c7842c 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.14.1.bb | |||
@@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" | |||
7 | 7 | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" |
9 | 9 | ||
10 | SRCREV = "602e2e8979d111b02c959470da5322797dd96a19" | 10 | SRCREV = "12f3a2ac603e8f10742105519e0cd03c3b8f71dd" |
11 | SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ | 11 | SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ |
12 | file://libvpx-configure-support-blank-prefix.patch \ | 12 | file://libvpx-configure-support-blank-prefix.patch \ |
13 | " | 13 | " |
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb index a755e39ed..ddea8ad2e 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb | |||
@@ -68,7 +68,7 @@ do_install() { | |||
68 | 68 | ||
69 | do_install:append() { | 69 | do_install:append() { |
70 | install -d ${D}${sysconfdir}/init.d | 70 | install -d ${D}${sysconfdir}/init.d |
71 | install -m 0755 ${WORKDIR}/gpsd.init ${D}${sysconfdir}/init.d/gpsd | 71 | install -m 0755 ${UNPACKDIR}/gpsd.init ${D}${sysconfdir}/init.d/gpsd |
72 | install -d ${D}${sysconfdir}/default | 72 | install -d ${D}${sysconfdir}/default |
73 | install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}${sysconfdir}/default/gpsd.default | 73 | install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}${sysconfdir}/default/gpsd.default |
74 | 74 | ||
diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch deleted file mode 100644 index 829ace09b..000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From e13f15205425c67e1101031a33107fa9cd2d65f9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 26 May 2023 10:32:53 -0700 | ||
4 | Subject: [PATCH] Append cflags instead of overriding in Makefile.am | ||
5 | |||
6 | Fixes | ||
7 | WARNING: orrery-2.7-r0 do_package_qa: QA Issue: File /usr/bin/.debug/orrery in package orrery-dbg contains reference to TMPDIR [buildpaths] | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Makefile.am | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/Makefile.am b/Makefile.am | ||
17 | index b64449f..23637b3 100644 | ||
18 | --- a/Makefile.am | ||
19 | +++ b/Makefile.am | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -CFLAGS = -g -O3 -Wall | ||
22 | +CFLAGS += -g -O3 -Wall | ||
23 | |||
24 | bin_PROGRAMS = orrery | ||
25 | orrery_SOURCES = planetInfo.c orrery.c orrery.h phaseConstants.h | ||
26 | -- | ||
27 | 2.40.1 | ||
28 | |||
diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch deleted file mode 100644 index 3d5828011..000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From e600d3c09d2f97a197f86e6987d44d142e7b7cdf Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 27 Jun 2017 21:12:17 -0700 | ||
4 | Subject: [PATCH] orrery: Fix sprintf format | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | Upstream-Status: Pending | ||
9 | |||
10 | orrery.c | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/orrery.c b/orrery.c | ||
14 | index e3a1f6d..1b31a9f 100644 | ||
15 | --- a/orrery.c | ||
16 | +++ b/orrery.c | ||
17 | @@ -3767,7 +3767,7 @@ static void drawOptsScreens(void) | ||
18 | displayWidth/2 - gdk_string_width(smallFont, scratchString)/2, | ||
19 | 12, scratchString); | ||
20 | for (day = 0; day < 7; day++) { | ||
21 | - sprintf(scratchString, dayName[day]); | ||
22 | + sprintf(scratchString, "%s", dayName[day]); | ||
23 | gdk_draw_string(pixmap, smallFont, blueGC, | ||
24 | CAL_DAY_WIDTH/2 + day*CAL_DAY_WIDTH + CAL_LEFT_OFFSET - | ||
25 | gdk_string_width(smallFont, scratchString)/2, | ||
26 | -- | ||
27 | 2.13.2 | ||
28 | |||
diff --git a/meta-oe/recipes-navigation/orrery/orrery/orrery.png b/meta-oe/recipes-navigation/orrery/orrery/orrery.png deleted file mode 100644 index d9865b70c..000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/orrery.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch deleted file mode 100644 index 2abb320d8..000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | From: Benjamin Deering | ||
4 | Subject: orrery crashing X | ||
5 | Date: Thursday, September 2, 2010 - 5:25 pm | ||
6 | Link: http://kerneltrap.org/mailarchive/openmoko-community/2010/9/3/13218 | ||
7 | |||
8 | diff -uNr orrery.orig//orrery.c orrery/orrery.c | ||
9 | --- orrery.orig//orrery.c 2009-11-30 06:59:44.000000000 +0100 | ||
10 | +++ orrery/orrery.c 2010-11-15 22:33:17.000000000 +0100 | ||
11 | @@ -1238,12 +1238,44 @@ | ||
12 | } | ||
13 | currentEntry = currentEntry->forwardPointer; | ||
14 | } | ||
15 | - if (nDarkGreyPoints > 0) | ||
16 | - gdk_draw_points(pixmap, darkGreyGC, darkGreyPoints, nDarkGreyPoints); | ||
17 | - if (nGreyPoints > 0) | ||
18 | - gdk_draw_points(pixmap, greyGC, greyPoints, nGreyPoints); | ||
19 | - if (nWhitePoints > 0) | ||
20 | - gdk_draw_points(pixmap, whiteGC, whitePoints, nWhitePoints); | ||
21 | + GdkPixbuf* starDrawingBuf = gdk_pixbuf_get_from_drawable( NULL, | ||
22 | + pixmap, | ||
23 | + gdk_colormap_get_system() | ||
24 | + , 0, 0, 0, 0, displayWidth, displayHeight); | ||
25 | + g_assert (gdk_pixbuf_get_bits_per_sample (starDrawingBuf) == 8); | ||
26 | + guchar* p; | ||
27 | + int rowstride = gdk_pixbuf_get_rowstride (starDrawingBuf); | ||
28 | + guchar* pixels = gdk_pixbuf_get_pixels (starDrawingBuf); | ||
29 | + int n_channels = gdk_pixbuf_get_n_channels (starDrawingBuf); | ||
30 | + GdkGCValues starGCval; | ||
31 | + GdkColor starColor; | ||
32 | + int pointNum; | ||
33 | + gdk_gc_get_values(darkGreyGC, &starGCval); | ||
34 | + gdk_colormap_query_color( gdk_gc_get_colormap(darkGreyGC),starGCval.foreground.pixel, &starColor ); | ||
35 | + for( pointNum = 0; pointNum < nDarkGreyPoints; pointNum++) { | ||
36 | + p = pixels + darkGreyPoints[pointNum].y * rowstride + darkGreyPoints[pointNum].x * n_channels; | ||
37 | + p[0] = starColor.red & 0xff; | ||
38 | + p[1] = starColor.green & 0xff; | ||
39 | + p[2] = starColor.blue & 0xff; | ||
40 | + } | ||
41 | + gdk_gc_get_values(greyGC, &starGCval); | ||
42 | + gdk_colormap_query_color( gdk_gc_get_colormap(greyGC), starGCval.foreground.pixel, &starColor ); | ||
43 | + for( pointNum = 0; pointNum < nGreyPoints; pointNum++) { | ||
44 | + p = pixels + greyPoints[pointNum].y * rowstride + greyPoints[pointNum].x * n_channels; | ||
45 | + p[0] = starColor.red & 0xff; | ||
46 | + p[1] = starColor.green & 0xff; | ||
47 | + p[2] = starColor.blue & 0xff; | ||
48 | + } | ||
49 | + gdk_gc_get_values(whiteGC, &starGCval); | ||
50 | + gdk_colormap_query_color( gdk_gc_get_colormap(whiteGC), starGCval.foreground.pixel, &starColor ); | ||
51 | + for( pointNum = 0; pointNum < nWhitePoints; pointNum++) { | ||
52 | + p = pixels + whitePoints[pointNum].y * rowstride + whitePoints[pointNum].x * n_channels; | ||
53 | + p[0] = starColor.red & 0xff; | ||
54 | + p[1] = starColor.green & 0xff; | ||
55 | + p[2] = starColor.blue & 0xff; | ||
56 | + } | ||
57 | + gdk_draw_pixbuf ( pixmap , NULL , starDrawingBuf, | ||
58 | + 0, 0, 0, 0, displayWidth, displayHeight, GDK_RGB_DITHER_NORMAL, 0, 0 ) ; | ||
59 | } | ||
60 | |||
61 | void makeTimeString(char *string) | ||
diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb deleted file mode 100644 index 96a7018de..000000000 --- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | SUMMARY = "Astronomical application which displays the night sky" | ||
2 | HOMEPAGE = "http://projects.openmoko.org/projects/orrery/" | ||
3 | SECTION = "x11/scientific" | ||
4 | LICENSE = "GPL-2.0-or-later" | ||
5 | LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe" | ||
6 | DEPENDS = "gtk+" | ||
7 | |||
8 | inherit features_check autotools-brokensep pkgconfig | ||
9 | |||
10 | REQUIRED_DISTRO_FEATURES = "x11" | ||
11 | |||
12 | SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \ | ||
13 | file://orrery.png \ | ||
14 | file://use.GdkPixbuf.patch \ | ||
15 | file://0001-orrery-Fix-sprintf-format.patch \ | ||
16 | file://0001-Append-cflags-instead-of-overriding-in-Makefile.am.patch \ | ||
17 | " | ||
18 | |||
19 | SRC_URI[md5sum] = "bd62a33e7554ee1030313dfcdefcda8b" | ||
20 | SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6" | ||
21 | |||
22 | S = "${WORKDIR}/${BPN}" | ||
23 | |||
24 | do_configure:prepend() { | ||
25 | # fix DSO issue with binutils-2.22 | ||
26 | sed -i 's/ -lrt$/ -lrt -lm/g' ${S}/Makefile.am | ||
27 | } | ||
28 | do_install:append() { | ||
29 | install -d ${D}${datadir}/orrery | ||
30 | cp -R --no-dereference --preserve=mode,links -v ${S}/data/* ${D}${datadir}/orrery | ||
31 | chown -R root:root ${D}${datadir}/orrery | ||
32 | install -d ${D}${datadir}/icons | ||
33 | install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons | ||
34 | rm -rf ${D}${datadir}/orrery/Makefile* | ||
35 | } | ||
36 | |||
37 | FILES:${PN} += "${datadir}/icons/orrery.png" | ||
diff --git a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb index d85ef2057..a6703ecf8 100644 --- a/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb +++ b/meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb | |||
@@ -58,7 +58,7 @@ do_compile:prepend () { | |||
58 | do_install:append() { | 58 | do_install:append() { |
59 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 59 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
60 | install -d ${D}${systemd_unitdir}/system | 60 | install -d ${D}${systemd_unitdir}/system |
61 | install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system | 61 | install -m 0644 ${UNPACKDIR}/saslauthd.service ${D}${systemd_unitdir}/system |
62 | 62 | ||
63 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/saslauthd.service | 63 | sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/saslauthd.service |
64 | sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/saslauthd.service | 64 | sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/saslauthd.service |
@@ -68,7 +68,7 @@ do_install:append() { | |||
68 | echo "d /run/saslauthd/ - - - -" > ${D}${sysconfdir}/tmpfiles.d/saslauthd.conf | 68 | echo "d /run/saslauthd/ - - - -" > ${D}${sysconfdir}/tmpfiles.d/saslauthd.conf |
69 | 69 | ||
70 | install -d ${D}${sysconfdir}/default/ | 70 | install -d ${D}${sysconfdir}/default/ |
71 | install -m 0644 ${WORKDIR}/saslauthd.conf ${D}${sysconfdir}/default/saslauthd | 71 | install -m 0644 ${UNPACKDIR}/saslauthd.conf ${D}${sysconfdir}/default/saslauthd |
72 | sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/default/saslauthd | 72 | sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${sysconfdir}/default/saslauthd |
73 | fi | 73 | fi |
74 | } | 74 | } |
diff --git a/meta-oe/recipes-printing/qpdf/qpdf_11.8.0.bb b/meta-oe/recipes-printing/qpdf/qpdf_11.9.0.bb index a13c9a023..4778be42b 100644 --- a/meta-oe/recipes-printing/qpdf/qpdf_11.8.0.bb +++ b/meta-oe/recipes-printing/qpdf/qpdf_11.9.0.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | |||
6 | DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" | 6 | DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main" | 8 | SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main" |
9 | SRCREV = "452e1f5c20ec6adf62cd296cb9dddacbc06e6ffa" | 9 | SRCREV = "3b97c9bd266b7c32ea36d3536e22dab77412886d" |
10 | 10 | ||
11 | inherit cmake pkgconfig gettext | 11 | inherit cmake pkgconfig gettext |
12 | 12 | ||
diff --git a/meta-oe/recipes-security/audit/audit_4.0.1.bb b/meta-oe/recipes-security/audit/audit_4.0.1.bb index a37ae3bb8..c189cfea5 100644 --- a/meta-oe/recipes-security/audit/audit_4.0.1.bb +++ b/meta-oe/recipes-security/audit/audit_4.0.1.bb | |||
@@ -90,11 +90,11 @@ do_install:append() { | |||
90 | install -m 0640 ${D}/etc/audit/rules.d/audit.rules ${D}/etc/audit/audit.rules | 90 | install -m 0640 ${D}/etc/audit/rules.d/audit.rules ${D}/etc/audit/audit.rules |
91 | 91 | ||
92 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 92 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
93 | install -D -m 0644 ${WORKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/audit.conf | 93 | install -D -m 0644 ${UNPACKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/audit.conf |
94 | fi | 94 | fi |
95 | 95 | ||
96 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 96 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
97 | install -D -m 0755 ${WORKDIR}/auditd ${D}/etc/init.d/auditd | 97 | install -D -m 0755 ${UNPACKDIR}/auditd ${D}/etc/init.d/auditd |
98 | rm -rf ${D}${libdir}/systemd | 98 | rm -rf ${D}${libdir}/systemd |
99 | fi | 99 | fi |
100 | 100 | ||
diff --git a/meta-oe/recipes-security/bubblewrap/bubblewrap_0.8.0.bb b/meta-oe/recipes-security/bubblewrap/bubblewrap_0.9.0.bb index 06c42addb..c60c1dfd6 100644 --- a/meta-oe/recipes-security/bubblewrap/bubblewrap_0.8.0.bb +++ b/meta-oe/recipes-security/bubblewrap/bubblewrap_0.9.0.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" | |||
6 | DEPENDS = "libcap" | 6 | DEPENDS = "libcap" |
7 | 7 | ||
8 | SRC_URI = "https://github.com/containers/${BPN}/releases/download/v${PV}/${BP}.tar.xz" | 8 | SRC_URI = "https://github.com/containers/${BPN}/releases/download/v${PV}/${BP}.tar.xz" |
9 | SRC_URI[sha256sum] = "957ad1149db9033db88e988b12bcebe349a445e1efc8a9b59ad2939a113d333a" | 9 | SRC_URI[sha256sum] = "c6347eaced49ac0141996f46bba3b089e5e6ea4408bc1c43bab9f2d05dd094e1" |
10 | 10 | ||
11 | inherit autotools bash-completion github-releases manpages pkgconfig | 11 | inherit autotools bash-completion github-releases manpages pkgconfig |
12 | 12 | ||
diff --git a/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch b/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch deleted file mode 100644 index 5cbe64091..000000000 --- a/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 1da0cfbb9ae978822d961d8b22d8d5125c11247a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 26 Jan 2023 23:46:56 -0800 | ||
4 | Subject: [PATCH] include missing <cstdint> | ||
5 | |||
6 | gcc 13 moved some includes around and as a result <cstdint> is no | ||
7 | longer transitively included [1]. Explicitly include it for | ||
8 | uint8_t. | ||
9 | |||
10 | [1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/USBGuard/usbguard/pull/583] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/Library/Base64.cpp | 1 - | ||
16 | src/Library/Base64.hpp | 1 + | ||
17 | 2 files changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/Library/Base64.cpp b/src/Library/Base64.cpp | ||
20 | index ddb28dc..0246a13 100644 | ||
21 | --- a/src/Library/Base64.cpp | ||
22 | +++ b/src/Library/Base64.cpp | ||
23 | @@ -22,7 +22,6 @@ | ||
24 | |||
25 | #include "Base64.hpp" | ||
26 | #include <stdexcept> | ||
27 | -#include <cstdint> | ||
28 | |||
29 | namespace usbguard | ||
30 | { | ||
31 | diff --git a/src/Library/Base64.hpp b/src/Library/Base64.hpp | ||
32 | index 0947f21..e0c745c 100644 | ||
33 | --- a/src/Library/Base64.hpp | ||
34 | +++ b/src/Library/Base64.hpp | ||
35 | @@ -23,6 +23,7 @@ | ||
36 | #endif | ||
37 | |||
38 | #include <string> | ||
39 | +#include <cstdint> | ||
40 | #include <cstddef> | ||
41 | |||
42 | namespace usbguard | ||
43 | -- | ||
44 | 2.39.1 | ||
45 | |||
diff --git a/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb b/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb index c062f2705..752938057 100644 --- a/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb +++ b/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb | |||
@@ -12,10 +12,9 @@ LICENSE = "GPL-2.0-only" | |||
12 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 12 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
13 | 13 | ||
14 | SRC_URI = "https://github.com/USBGuard/usbguard/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ | 14 | SRC_URI = "https://github.com/USBGuard/usbguard/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ |
15 | file://0001-include-missing-cstdint.patch \ | ||
16 | file://0001-Add-and-use-pkgconfig-instead-of-libgcrypt-config.patch" | 15 | file://0001-Add-and-use-pkgconfig-instead-of-libgcrypt-config.patch" |
17 | 16 | ||
18 | SRC_URI[sha256sum] = "dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934" | 17 | SRC_URI[sha256sum] = "707dad2938923202697f636c2b4e0be80f192242039a2af3fc7ac35d03f78551" |
19 | 18 | ||
20 | inherit autotools-brokensep bash-completion pkgconfig systemd github-releases | 19 | inherit autotools-brokensep bash-completion pkgconfig systemd github-releases |
21 | 20 | ||
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/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/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.98.bb index 01501362e..0ceefb5e3 100644 --- a/meta-oe/recipes-support/nss/nss_3.98.bb +++ b/meta-oe/recipes-support/nss/nss_3.98.bb | |||
@@ -224,7 +224,7 @@ do_install:append() { | |||
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..6e5b32a94 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 \ |
@@ -39,6 +36,6 @@ FILES:${PN} = "${libdir}" | |||
39 | INSANE_SKIP:${PN} += "dev-so" | 36 | INSANE_SKIP:${PN} += "dev-so" |
40 | 37 | ||
41 | # Don't include so files in dev package | 38 | # Don't include so files in dev package |
42 | FILES:${PN}-dev = "${includedir} ${libdir}/cmake" | 39 | FILES:${PN}-dev = "${includedir} ${libdir}/cmake ${libdir}/pkgconfig" |
43 | 40 | ||
44 | BBCLASSEXTEND = "native nativesdk" | 41 | 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/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 | ||
diff --git a/meta-oe/recipes-test/catch2/catch2_2.13.10.bb b/meta-oe/recipes-test/catch2/catch2_3.6.0.bb index 8512a0f30..c4541c4d5 100644 --- a/meta-oe/recipes-test/catch2/catch2_2.13.10.bb +++ b/meta-oe/recipes-test/catch2/catch2_3.6.0.bb | |||
@@ -4,8 +4,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2" | |||
4 | LICENSE = "BSL-1.0" | 4 | LICENSE = "BSL-1.0" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x;protocol=https" | 7 | SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https" |
8 | SRCREV = "182c910b4b63ff587a3440e08f84f70497e49a81" | 8 | SRCREV = "4e8d92bf02f7d1c8006a0e7a5ecabd8e62d98502" |
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
diff --git a/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb b/meta-oe/recipes-test/cukinia/cukinia_0.7.0.bb index 1bcfb0a9b..e3424d019 100644 --- a/meta-oe/recipes-test/cukinia/cukinia_0.6.2.bb +++ b/meta-oe/recipes-test/cukinia/cukinia_0.7.0.bb | |||
@@ -2,14 +2,13 @@ SUMMARY = "Linux firmware validation framework" | |||
2 | DESCRIPTION = "Cukinia is designed to help Linux-based embedded firmware \ | 2 | DESCRIPTION = "Cukinia is designed to help Linux-based embedded firmware \ |
3 | developers run simple system-level validation tests on their firmware." | 3 | developers run simple system-level validation tests on their firmware." |
4 | HOMEPAGE = "https://github.com/savoirfairelinux/cukinia" | 4 | HOMEPAGE = "https://github.com/savoirfairelinux/cukinia" |
5 | LICENSE = "GPL-3.0-only | Apache-2.0" | 5 | LICENSE = "Apache-2.0" |
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" |
8 | file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" | ||
9 | 8 | ||
10 | SRC_URI = "git://github.com/savoirfairelinux/cukinia.git;protocol=https;branch=master" | 9 | SRC_URI = "git://github.com/savoirfairelinux/cukinia.git;protocol=https;branch=master" |
11 | 10 | ||
12 | SRCREV = "a290f2dbb813ce12ba407962655a5d8b57322221" | 11 | SRCREV = "be56f653743cc0e68bef81ef35df7c50ff8919c4" |
13 | 12 | ||
14 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
15 | 14 | ||
diff --git a/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch b/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch new file mode 100644 index 000000000..8bb19fb72 --- /dev/null +++ b/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 648868595cf290e77aab1f271db2a57e1f791301 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 20 May 2024 20:37:07 -0700 | ||
4 | Subject: [PATCH] executor: Remove including <error.h> in test_linux.h | ||
5 | |||
6 | it seems to be redundant and moreover it lets us compile on musl which | ||
7 | does not provide this system header | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/google/syzkaller/pull/4822] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | executor/test_linux.h | 1 - | ||
13 | 1 file changed, 1 deletion(-) | ||
14 | |||
15 | diff --git a/executor/test_linux.h b/executor/test_linux.h | ||
16 | index 7cf459569..8c9493539 100644 | ||
17 | --- a/executor/test_linux.h | ||
18 | +++ b/executor/test_linux.h | ||
19 | @@ -1,7 +1,6 @@ | ||
20 | // Copyright 2017 syzkaller project authors. All rights reserved. | ||
21 | // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. | ||
22 | |||
23 | -#include <error.h> | ||
24 | #include <stdint.h> | ||
25 | #include <sys/utsname.h> | ||
26 | |||
27 | -- | ||
28 | 2.45.1 | ||
29 | |||
diff --git a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb index b43207f2a..639f55de2 100644 --- a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb +++ b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb | |||
@@ -9,6 +9,7 @@ GO_IMPORT = "github.com/google/syzkaller" | |||
9 | SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IMPORT};branch=master \ | 9 | SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IMPORT};branch=master \ |
10 | file://0001-sys-targets-targets.go-allow-users-to-override-hardc.patch;patchdir=src/${GO_IMPORT} \ | 10 | file://0001-sys-targets-targets.go-allow-users-to-override-hardc.patch;patchdir=src/${GO_IMPORT} \ |
11 | file://0001-executor-Include-missing-linux-falloc.h.patch;patchdir=src/${GO_IMPORT} \ | 11 | file://0001-executor-Include-missing-linux-falloc.h.patch;patchdir=src/${GO_IMPORT} \ |
12 | file://0001-executor-Remove-including-error.h-in-test_linux.h.patch;patchdir=src/${GO_IMPORT} \ | ||
12 | " | 13 | " |
13 | SRCREV = "25905f5d0a2a7883bd33491997556193582c6059" | 14 | SRCREV = "25905f5d0a2a7883bd33491997556193582c6059" |
14 | 15 | ||
diff --git a/meta-oe/recipes-test/testfloat/testfloat_3e.bb b/meta-oe/recipes-test/testfloat/testfloat_3e.bb index 48f50d827..071be2a20 100644 --- a/meta-oe/recipes-test/testfloat/testfloat_3e.bb +++ b/meta-oe/recipes-test/testfloat/testfloat_3e.bb | |||
@@ -19,7 +19,8 @@ SRC_URI[TestFloat.sha256sum] = "6d4bdf0096b48a653aa59fc203a9e5fe18b5a58d7a1b7151 | |||
19 | SRC_URI[SoftFloat.md5sum] = "7dac954ea4aed0697cbfee800ba4f492" | 19 | SRC_URI[SoftFloat.md5sum] = "7dac954ea4aed0697cbfee800ba4f492" |
20 | SRC_URI[SoftFloat.sha256sum] = "21130ce885d35c1fe73fc1e1bf2244178167e05c6747cad5f450cc991714c746" | 20 | SRC_URI[SoftFloat.sha256sum] = "21130ce885d35c1fe73fc1e1bf2244178167e05c6747cad5f450cc991714c746" |
21 | 21 | ||
22 | S = "${WORKDIR}" | 22 | S = "${WORKDIR}/sources" |
23 | UNPACKDIR = "${S}" | ||
23 | 24 | ||
24 | do_compile(){ | 25 | do_compile(){ |
25 | oe_runmake -C SoftFloat-${PV}/build/Linux-Cross-Compile/ | 26 | oe_runmake -C SoftFloat-${PV}/build/Linux-Cross-Compile/ |