diff options
14 files changed, 265 insertions, 18 deletions
diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.1.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.1.bb index b5be30cbb2..c297de053d 100644 --- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.1.bb +++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.8.1.bb | |||
@@ -6,7 +6,7 @@ and can hence offer more features than plain dm-crypt. On the other \ | |||
6 | hand, the header is visible and vulnerable to damage." | 6 | hand, the header is visible and vulnerable to damage." |
7 | HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" | 7 | HOMEPAGE = "https://gitlab.com/cryptsetup/cryptsetup" |
8 | SECTION = "console" | 8 | SECTION = "console" |
9 | LICENSE = "GPL-2.0-with-OpenSSL-exception" | 9 | LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later & GPL-2.0-with-OpenSSL-exception" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326" |
11 | 11 | ||
12 | DEPENDS = " \ | 12 | DEPENDS = " \ |
diff --git a/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-oe/recipes-devtools/luajit/luajit_git.bb index f4a1345ab2..9df5fca0e6 100644 --- a/meta-oe/recipes-devtools/luajit/luajit_git.bb +++ b/meta-oe/recipes-devtools/luajit/luajit_git.bb | |||
@@ -95,3 +95,7 @@ COMPATIBLE_HOST:powerpc64 = "null" | |||
95 | COMPATIBLE_HOST:powerpc64le = "null" | 95 | COMPATIBLE_HOST:powerpc64le = "null" |
96 | COMPATIBLE_HOST:riscv64 = "null" | 96 | COMPATIBLE_HOST:riscv64 = "null" |
97 | COMPATIBLE_HOST:riscv32 = "null" | 97 | COMPATIBLE_HOST:riscv32 = "null" |
98 | |||
99 | CVE_STATUS[CVE-2024-25176] = "fixed-version: The used revision contains the fix already." | ||
100 | CVE_STATUS[CVE-2024-25177] = "fixed-version: The used revision contains the fix already." | ||
101 | CVE_STATUS[CVE-2024-25178] = "fixed-version: The used revision contains the fix already." | ||
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0001-tcl-board-ti_-_swd_native.cfg-Add-support-for-direct.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-tcl-board-ti_-_swd_native.cfg-Add-support-for-direct.patch new file mode 100644 index 0000000000..8a3b72321f --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0001-tcl-board-ti_-_swd_native.cfg-Add-support-for-direct.patch | |||
@@ -0,0 +1,77 @@ | |||
1 | From 5c55d79ecfecc4a1b5a5ebcf649227ca1e1bf38e Mon Sep 17 00:00:00 2001 | ||
2 | From: Joao Lima <joao.lima@hbkworld.com> | ||
3 | Date: Tue, 30 Sep 2025 12:13:04 +0000 | ||
4 | Subject: [PATCH 1/2] tcl/board/ti_*_swd_native.cfg: Add support for direct | ||
5 | memory access via SW | ||
6 | |||
7 | Add support for SWD emulation as a transport method for | ||
8 | direct memory operations of boards TI AM64x and TI J784s4 | ||
9 | |||
10 | Upstream-Status: Submitted [http://openocd.zylin.com/#/c/9020/] | ||
11 | |||
12 | Change-Id: I17fe9b2bef5c58886625bfdb88d92645ba4d7da7 | ||
13 | Signed-off-by: Joao Lima <joao.lima@hbkworld.com> | ||
14 | --- | ||
15 | tcl/board/ti_am64xx_swd_native.cfg | 23 +++++++++++++++++++++++ | ||
16 | tcl/board/ti_j784s4_swd_native.cfg | 22 ++++++++++++++++++++++ | ||
17 | 2 files changed, 45 insertions(+) | ||
18 | create mode 100644 tcl/board/ti_am64xx_swd_native.cfg | ||
19 | create mode 100644 tcl/board/ti_j784s4_swd_native.cfg | ||
20 | |||
21 | diff --git a/tcl/board/ti_am64xx_swd_native.cfg b/tcl/board/ti_am64xx_swd_native.cfg | ||
22 | new file mode 100644 | ||
23 | index 000000000..d3727149e | ||
24 | --- /dev/null | ||
25 | +++ b/tcl/board/ti_am64xx_swd_native.cfg | ||
26 | @@ -0,0 +1,23 @@ | ||
27 | +# SPDX-License-Identifier: GPL-2.0-or-later | ||
28 | +# Copyright (C) 2022-2023 Texas Instruments Incorporated - http://www.ti.com/ | ||
29 | +# | ||
30 | +# Texas Instruments am642 | ||
31 | +# Link: https://www.ti.com/product/AM642 | ||
32 | +# | ||
33 | +# This configuration file is used as a self hosted debug configuration that | ||
34 | +# works on every AM642 platform based on firewall configuration permitted | ||
35 | +# in the system. | ||
36 | +# | ||
37 | +# In this system openOCD runs on one of the CPUs inside AM625 and provides | ||
38 | +# network ports that can then be used to debug the microcontrollers on the | ||
39 | +# SoC - either self hosted IDE OR remotely. | ||
40 | + | ||
41 | +# We are using dmem, which uses dapdirect_swd transport | ||
42 | +adapter driver dmem | ||
43 | +transport select swd | ||
44 | + | ||
45 | +if { ![info exists SOC] } { | ||
46 | + set SOC am642 | ||
47 | +} | ||
48 | + | ||
49 | +source [find target/ti_k3.cfg] | ||
50 | diff --git a/tcl/board/ti_j784s4_swd_native.cfg b/tcl/board/ti_j784s4_swd_native.cfg | ||
51 | new file mode 100644 | ||
52 | index 000000000..13b2ac3b8 | ||
53 | --- /dev/null | ||
54 | +++ b/tcl/board/ti_j784s4_swd_native.cfg | ||
55 | @@ -0,0 +1,22 @@ | ||
56 | +# SPDX-License-Identifier: GPL-2.0-or-later | ||
57 | +# Copyright (C) 2022-2023 Texas Instruments Incorporated - http://www.ti.com/ | ||
58 | +# | ||
59 | +# Texas Instruments TDA4VM/J721E | ||
60 | +# Link: https://www.ti.com/product/TDA4VM | ||
61 | +# | ||
62 | +# This configuration file is used as a self hosted debug configuration that | ||
63 | +# works on every TDA4VM platform based on firewall configuration permitted | ||
64 | +# in the system. | ||
65 | +# | ||
66 | +# In this system openOCD runs on one of the CPUs inside TDA4VM and provides | ||
67 | +# network ports that can then be used to debug the microcontrollers on the | ||
68 | +# SoC - either self hosted IDE OR remotely. | ||
69 | + | ||
70 | +# We are using dmem, which uses dapdirect_swd transport | ||
71 | +adapter driver dmem | ||
72 | +transport select swd | ||
73 | + | ||
74 | +if { ![info exists SOC] } { | ||
75 | + set SOC j784s4 | ||
76 | +} | ||
77 | +source [find target/ti_k3.cfg] | ||
diff --git a/meta-oe/recipes-devtools/openocd/openocd/0002-tcl-target-ti_k3.cfg-Add-support-for-direct-memory-a.patch b/meta-oe/recipes-devtools/openocd/openocd/0002-tcl-target-ti_k3.cfg-Add-support-for-direct-memory-a.patch new file mode 100644 index 0000000000..c879696ef5 --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0002-tcl-target-ti_k3.cfg-Add-support-for-direct-memory-a.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From 39bc4461642eaaf993d0a6cf772d51cdde8c0ae8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joao Lima <joao.lima@hbkworld.com> | ||
3 | Date: Tue, 30 Sep 2025 12:13:30 +0000 | ||
4 | Subject: [PATCH 2/2] tcl/target/ti_k3.cfg: Add support for direct memory | ||
5 | access via SWD | ||
6 | |||
7 | Adds support for direct memory access via SWD emulation for AM64x and | ||
8 | J784s4 boards, configuring addresses and parameters required for | ||
9 | direct memory operations. | ||
10 | |||
11 | Upstream-Status: Submitted [http://openocd.zylin.com/#/c/9021/] | ||
12 | |||
13 | Change-Id: Iebc16612b3990b2ef19ddc4143b66ab1bcbfe0f3 | ||
14 | Signed-off-by: Joao Lima <joao.lima@hbkworld.com> | ||
15 | --- | ||
16 | tcl/target/ti_k3.cfg | 22 +++++++++++++++++++++- | ||
17 | 1 file changed, 21 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/tcl/target/ti_k3.cfg b/tcl/target/ti_k3.cfg | ||
20 | index 0dee74e5e..6b0ac2e52 100644 | ||
21 | --- a/tcl/target/ti_k3.cfg | ||
22 | +++ b/tcl/target/ti_k3.cfg | ||
23 | @@ -176,6 +176,16 @@ switch $_soc { | ||
24 | # Uses the same JTAG ID | ||
25 | set _armv8_cores 0 | ||
26 | } | ||
27 | + | ||
28 | + # Setup DMEM access descriptions | ||
29 | + # DAPBUS (Debugger) description | ||
30 | + set _dmem_base_address 0x740002000 | ||
31 | + set _dmem_ap_address_offset 0x100 | ||
32 | + set _dmem_max_aps 10 | ||
33 | + # Emulated AP description | ||
34 | + set _dmem_emu_base_address 0x760000000 | ||
35 | + set _dmem_emu_base_address_map_to 0x1d500000 | ||
36 | + set _dmem_emu_ap_list 1 | ||
37 | } | ||
38 | am625 { | ||
39 | set _K3_DAP_TAPID 0x0bb7e02f | ||
40 | @@ -333,7 +343,7 @@ switch $_soc { | ||
41 | set ARMV8_CTIBASE {0x90420000 0x90520000 0x90620000 0x90720000 | ||
42 | 0x90820000 0x90920000 0x90a20000 0x90b20000} | ||
43 | |||
44 | - # J721s2 has 4 clusters of 2 R5 cores each. | ||
45 | + # J784s4 has 4 clusters of 2 R5 cores each. | ||
46 | set _r5_cores 8 | ||
47 | set R5_DBGBASE {0x9d010000 0x9d012000 | ||
48 | 0x9d410000 0x9d412000 | ||
49 | @@ -348,6 +358,16 @@ switch $_soc { | ||
50 | main1_r5.0 main1_r5.1 | ||
51 | main2_r5.0 main2_r5.1} | ||
52 | |||
53 | + # Setup DMEM access descriptions | ||
54 | + # DAPBUS (Debugger) description | ||
55 | + set _dmem_base_address 0x4c40002000 | ||
56 | + set _dmem_ap_address_offset 0x100 | ||
57 | + set _dmem_max_aps 8 | ||
58 | + # Emulated AP description | ||
59 | + set _dmem_emu_base_address 0x4c60000000 | ||
60 | + set _dmem_emu_base_address_map_to 0x1d600000 | ||
61 | + set _dmem_emu_ap_list 1 | ||
62 | + | ||
63 | # sysctrl CTI base | ||
64 | set CM3_CTIBASE {0x20001000} | ||
65 | # Sysctrl power-ap unlock offsets | ||
diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 3bbe33ca1d..30629583cc 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb | |||
@@ -4,19 +4,25 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=599d2d1ee7fc84c0467b3d19801db870" | |||
4 | DEPENDS = "libusb-compat libftdi" | 4 | DEPENDS = "libusb-compat libftdi" |
5 | RDEPENDS:${PN} = "libusb1" | 5 | RDEPENDS:${PN} = "libusb1" |
6 | 6 | ||
7 | MIRRORS += " \ | ||
8 | git://repo.or.cz/openocd.git git://github.com/openocd-org/openocd.git \ | ||
9 | " | ||
10 | |||
7 | SRC_URI = " \ | 11 | SRC_URI = " \ |
8 | git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ | 12 | git://repo.or.cz/openocd.git;protocol=http;name=openocd;branch=master \ |
9 | git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ | 13 | git://repo.or.cz/r/git2cl.git;protocol=http;destsuffix=tools/git2cl;name=git2cl;branch=master \ |
10 | git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/jimtcl;name=jimtcl;branch=master \ | 14 | git://github.com/msteveb/jimtcl.git;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/jimtcl;name=jimtcl;branch=master \ |
11 | git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ | 15 | git://repo.or.cz/r/libjaylink.git;protocol=http;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \ |
12 | file://0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch \ | 16 | file://0001-Makefile.am-Use-SOURCE_DATE_EPOCH-environment-variab.patch \ |
17 | file://0001-tcl-board-ti_-_swd_native.cfg-Add-support-for-direct.patch \ | ||
18 | file://0002-tcl-target-ti_k3.cfg-Add-support-for-direct-memory-a.patch \ | ||
13 | " | 19 | " |
14 | 20 | ||
15 | SRCREV_FORMAT = "openocd" | 21 | SRCREV_FORMAT = "openocd" |
16 | SRCREV_openocd = "91bd4313444c5a949ce49d88ab487608df7d6c37" | 22 | SRCREV_openocd = "66ea461846a3a4a96687c9287c3f61ae8ce0b775" |
17 | SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" | 23 | SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" |
18 | SRCREV_jimtcl = "fcbb4499a6b46ef69e7a95da53e30796e20817f0" | 24 | SRCREV_jimtcl = "f160866171457474f7c4d6ccda70f9b77524407e" |
19 | SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4" | 25 | SRCREV_libjaylink = "0d23921a05d5d427332a142d154c213d0c306eb1" |
20 | 26 | ||
21 | PV = "0.12+git" | 27 | PV = "0.12+git" |
22 | 28 | ||
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.20.bb b/meta-oe/recipes-extended/redis/redis_6.2.20.bb index f2e6175462..cc98781fed 100644 --- a/meta-oe/recipes-extended/redis/redis_6.2.20.bb +++ b/meta-oe/recipes-extended/redis/redis_6.2.20.bb | |||
@@ -20,6 +20,10 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ | |||
20 | 20 | ||
21 | SRC_URI[sha256sum] = "7f8b8a7aed53c445a877adf9e3743cdd323518524170135a58c0702f2dba6ef4" | 21 | SRC_URI[sha256sum] = "7f8b8a7aed53c445a877adf9e3743cdd323518524170135a58c0702f2dba6ef4" |
22 | 22 | ||
23 | CVE_STATUS[CVE-2025-21605] = "cpe-incorrect: the used version already contains the fix" | ||
24 | CVE_STATUS[CVE-2022-0543] = "not-applicable-config: the vulnerability is not present in upstream, only in Debian-packaged version" | ||
25 | CVE_STATUS[CVE-2022-3734] = "not-applicable-config: only affects Windows" | ||
26 | |||
23 | inherit update-rc.d systemd useradd | 27 | inherit update-rc.d systemd useradd |
24 | 28 | ||
25 | FINAL_LIBS:x86:toolchain-clang = "-latomic" | 29 | FINAL_LIBS:x86:toolchain-clang = "-latomic" |
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.11.bb b/meta-oe/recipes-extended/redis/redis_7.2.11.bb index 5aea249133..83cb4531d2 100644 --- a/meta-oe/recipes-extended/redis/redis_7.2.11.bb +++ b/meta-oe/recipes-extended/redis/redis_7.2.11.bb | |||
@@ -21,6 +21,9 @@ SRC_URI[sha256sum] = "2f9886eca68d30114ad6a01da65631f8007d802fd3e6c9fac711251e63 | |||
21 | 21 | ||
22 | RPROVIDES:${PN} = "virtual-redis" | 22 | RPROVIDES:${PN} = "virtual-redis" |
23 | 23 | ||
24 | CVE_STATUS[CVE-2025-21605] = "cpe-incorrect: the used version already contains the fix" | ||
25 | CVE_STATUS[CVE-2025-27151] = "cpe-incorrect: the used version already contains the fix" | ||
26 | |||
24 | inherit pkgconfig update-rc.d systemd useradd | 27 | inherit pkgconfig update-rc.d systemd useradd |
25 | 28 | ||
26 | FINAL_LIBS:x86:toolchain-clang = "-latomic" | 29 | FINAL_LIBS:x86:toolchain-clang = "-latomic" |
diff --git a/meta-oe/recipes-printing/cups/libppd_2.0.0.bb b/meta-oe/recipes-printing/cups/libppd_2.1.1.bb index 99b1f6e730..1b7d2be844 100644 --- a/meta-oe/recipes-printing/cups/libppd_2.0.0.bb +++ b/meta-oe/recipes-printing/cups/libppd_2.1.1.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c1fca671047153ce6825c4ab06f2ab49" | |||
6 | DEPENDS = "libcupsfilters" | 6 | DEPENDS = "libcupsfilters" |
7 | 7 | ||
8 | SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz" | 8 | SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz" |
9 | SRC_URI[sha256sum] = "882d3c659a336e91559de8f3c76fc26197fe6e5539d9b484a596e29a5a4e0bc8" | 9 | SRC_URI[sha256sum] = "3fa341cc03964046d2bf6b161d80c1b4b2e20609f38d860bcaa11cb70c1285e4" |
10 | 10 | ||
11 | inherit autotools gettext pkgconfig github-releases | 11 | inherit autotools gettext pkgconfig github-releases |
12 | 12 | ||
diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb deleted file mode 100644 index 01425c6db0..0000000000 --- a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | SUMMARY = "raw image decoder" | ||
2 | LICENSE = "LGPL-2.1-only | CDDL-1.0" | ||
3 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f" | ||
4 | |||
5 | SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https" | ||
6 | SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d" | ||
7 | |||
8 | inherit autotools pkgconfig | ||
9 | |||
10 | DEPENDS = "jpeg jasper lcms" | ||
11 | |||
12 | CVE_STATUS[CVE-2020-22628] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2" | ||
13 | CVE_STATUS[CVE-2023-1729] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2" | ||
diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.4.bb b/meta-oe/recipes-support/libraw/libraw_0.21.4.bb new file mode 100644 index 0000000000..ef0a0255d9 --- /dev/null +++ b/meta-oe/recipes-support/libraw/libraw_0.21.4.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | SUMMARY = "raw image decoder" | ||
2 | LICENSE = "LGPL-2.1-only | CDDL-1.0" | ||
3 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f" | ||
4 | |||
5 | SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https;tag=${PV}" | ||
6 | SRCREV = "9646d776c7c61976080a8f2be67928df0750493e" | ||
7 | |||
8 | inherit autotools pkgconfig | ||
9 | |||
10 | DEPENDS = "jpeg jasper lcms" | ||
diff --git a/meta-oe/recipes-support/libssh/libssh_0.11.3.bb b/meta-oe/recipes-support/libssh/libssh_0.11.3.bb index bfeeccdad4..5928581312 100644 --- a/meta-oe/recipes-support/libssh/libssh_0.11.3.bb +++ b/meta-oe/recipes-support/libssh/libssh_0.11.3.bb | |||
@@ -47,3 +47,6 @@ do_install_ptest () { | |||
47 | } | 47 | } |
48 | 48 | ||
49 | BBCLASSEXTEND = "native nativesdk" | 49 | BBCLASSEXTEND = "native nativesdk" |
50 | |||
51 | CVE_STATUS[CVE-2025-5987] = "fixed-version: The vulnerability was fixed in 0.11.2" | ||
52 | CVE_STATUS[CVE-2025-5318] = "fixed-version: The vulnerability was fixed in 0.11.2" | ||
diff --git a/meta-oe/recipes-support/touchpademulator/touchpademulator/0001-makefile-Use-CC-instead-of-hardcoding-gcc-calls.patch b/meta-oe/recipes-support/touchpademulator/touchpademulator/0001-makefile-Use-CC-instead-of-hardcoding-gcc-calls.patch new file mode 100644 index 0000000000..062adc9665 --- /dev/null +++ b/meta-oe/recipes-support/touchpademulator/touchpademulator/0001-makefile-Use-CC-instead-of-hardcoding-gcc-calls.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 37284f7208e43da34cac64b419219c5d4e20b36e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 2 Oct 2025 15:25:50 -0700 | ||
4 | Subject: [PATCH] makefile: Use CC instead of hardcoding gcc calls | ||
5 | |||
6 | This helps to cross-compile it using infrastructure like yocto | ||
7 | |||
8 | Upstream-Status: Submitted [https://gitlab.com/CalcProgrammer1/TouchpadEmulator/-/merge_requests/4] | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | Makefile | 4 +++- | ||
13 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/Makefile b/Makefile | ||
16 | index adf39a6..4cebaa6 100644 | ||
17 | --- a/Makefile | ||
18 | +++ b/Makefile | ||
19 | @@ -1,7 +1,9 @@ | ||
20 | +CC ?= gcc | ||
21 | + | ||
22 | default: TouchpadEmulator | ||
23 | |||
24 | TouchpadEmulator: TouchpadEmulator.c | ||
25 | - gcc -Wall $(shell pkg-config --cflags dbus-1 dbus-glib-1) TouchpadEmulator.c -ldbus-1 -ldbus-glib-1 -lpthread -o TouchpadEmulator | ||
26 | + $(CC) -Wall $(shell pkg-config --cflags dbus-1 dbus-glib-1) TouchpadEmulator.c -ldbus-1 -ldbus-glib-1 -lpthread -o TouchpadEmulator | ||
27 | |||
28 | clean: | ||
29 | git clean -dfx | ||
diff --git a/meta-oe/recipes-support/touchpademulator/touchpademulator/0002-LaunchTouchpadEmulator.sh-Demand-sh-instead-of-bash.patch b/meta-oe/recipes-support/touchpademulator/touchpademulator/0002-LaunchTouchpadEmulator.sh-Demand-sh-instead-of-bash.patch new file mode 100644 index 0000000000..999c557d54 --- /dev/null +++ b/meta-oe/recipes-support/touchpademulator/touchpademulator/0002-LaunchTouchpadEmulator.sh-Demand-sh-instead-of-bash.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 5b715a6741a7a2fcd0dc04e31c682a0183a49fa6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 2 Oct 2025 15:27:09 -0700 | ||
4 | Subject: [PATCH] LaunchTouchpadEmulator.sh: Demand sh instead of bash | ||
5 | |||
6 | This script does not really use any bash specific extentions | ||
7 | so asking for simple /bin/sh should be good and makes it more | ||
8 | portable | ||
9 | |||
10 | Upstream-Status: Submitted [https://gitlab.com/CalcProgrammer1/TouchpadEmulator/-/merge_requests/4] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | LaunchTouchpadEmulator.sh | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/LaunchTouchpadEmulator.sh b/LaunchTouchpadEmulator.sh | ||
17 | index d12fc27..63134cd 100755 | ||
18 | --- a/LaunchTouchpadEmulator.sh | ||
19 | +++ b/LaunchTouchpadEmulator.sh | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -#! /bin/bash | ||
22 | +#! /bin/sh | ||
23 | |||
24 | if [ "$1" = "--autostart" ] ; then | ||
25 | mkdir -p ~/.config/autostart | ||
diff --git a/meta-oe/recipes-support/touchpademulator/touchpademulator_git.bb b/meta-oe/recipes-support/touchpademulator/touchpademulator_git.bb new file mode 100644 index 0000000000..e7b0387f7e --- /dev/null +++ b/meta-oe/recipes-support/touchpademulator/touchpademulator_git.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | SUMMARY = "Emulate a touchpad mouse device using a touchscreen on Linux" | ||
2 | LICENSE = "GPL-2.0-or-later" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f744a106227710d355bcc787e464ba2d \ | ||
4 | file://debian/copyright;md5=7bed05b78c0e4abec501cf82c4b85d9c" | ||
5 | |||
6 | SRC_URI = "git://gitlab.com/CalcProgrammer1/TouchpadEmulator;protocol=https;branch=master \ | ||
7 | file://0001-makefile-Use-CC-instead-of-hardcoding-gcc-calls.patch \ | ||
8 | file://0002-LaunchTouchpadEmulator.sh-Demand-sh-instead-of-bash.patch \ | ||
9 | " | ||
10 | |||
11 | PV = "0.3+git" | ||
12 | SRCREV = "7800f4c3af4defaf1be1083c93983ed4ff0e3b32" | ||
13 | |||
14 | inherit pkgconfig | ||
15 | |||
16 | DEPENDS += "dbus dbus-glib" | ||
17 | |||
18 | # Fixes: | ||
19 | # File /usr/bin/TouchpadEmulator in package touchpademulator doesn't have GNU_HASH (didn't pass LDFLAGS?) [ldflags] | ||
20 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
21 | |||
22 | do_configure () { | ||
23 | : | ||
24 | } | ||
25 | |||
26 | do_compile () { | ||
27 | oe_runmake | ||
28 | } | ||
29 | |||
30 | do_install () { | ||
31 | oe_runmake install 'DESTDIR=${D}' | ||
32 | } | ||
33 | |||
34 | FILES:${PN} += "${datadir}/icons" | ||