diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2023-01-30 22:28:01 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2023-01-30 23:15:34 +0300 |
| commit | b9af8750acfaddd4a8b99c3e289510b5476c90f3 (patch) | |
| tree | 53385dd5fc99ccf4869c9c80fcd1e98e100fe81f | |
| parent | 70d69cd8440d2a940a971f262a3e36cc78781461 (diff) | |
| download | openbmc-b9af8750acfaddd4a8b99c3e289510b5476c90f3.tar.xz | |
subtree updates
meta-security: 3d9dab6d14..7eed4a60f5:
Armin Kuster (2):
linux-yocto.bbappend: bump to kernel version 6.x
meta-tpm: bump linux-yocto to 6.x kernel
Max Krummenacher (1):
samhain: rework due to changed cache handling
meta-openembedded: 2ab113e8be..ea63f13846:
Beniamin Sandu (1):
mbedtls: export source files/headers needed by ATF
Khem Raj (13):
poco: Do not use std::atomic<bool>
libwebsockets: Fix build with gcc13
v4l-utils: Fix build with gcc13
proj: Upgrade to 9.1.1 release
mpd: Upgrade to 0.23.12 release
geos: Upgrade to 3.9.4
geos: Fix build with gcc13
libinih: Upgrade to version 56
python3-pybind11: Upgrade to 2.10.3
waylandpp: Fix build with gcc-13
sedutil: Fix build with gcc13
usbguard: Fix build with gcc13
minifi-cpp: Fix build with gcc13
Martin Jansa (6):
keyutils: fix Upstream-Status formatting
gphoto2: fix Upstream-Status formatting
.patch: fix Upstream-Status formatting issues reported by patchreview tool from oe-core
android-tools: fix Upstream-Status formatting
mm-common: fix Upstream-Status formatting
.patch: fix Signed-off-by formatting issues reported by patchreview tool from oe-core
poky: 5e249ec855..29afbb5e14:
Alejandro Hernandez Samaniego (1):
newlib: Upgrade 4.2.0 -> 4.3.0
Alexander Kanavin (1):
gdk-pixbuf: do not use tools from gdk-pixbuf-native when building tests
Armin Kuster (1):
lttng-modules: Fix for 5.10.163 kernel version
Khem Raj (3):
valgrind: Include missing <cstdint>
webkitgtk: Fix build with gcc 13
gdb: Define alignof using _Alignof when using C11 or newer
Richard Purdie (3):
make-mod-scripts: Ensure kernel build output is deterministic
bitbake.conf: Inject a dash into PN for BB_HASH_CODEPARSER_VALS
scripts/bitbake-prserv-tool: Fix to work with memres bitbake
Ross Burton (1):
Revert "cve-update-db-native: show IP on failure"
meta-arm: 3d51e1117d..aecbb77f72:
Jon Mason (4):
arm/qemuarm-secureboot: Changes for v2023.01 u-boot
arm-bsp/juno: update to use u-boot v2023.01
arm-bsp/juno: update kernel patches for 6.1
arm-bsp/fvp-base: update kernel config to remove warning
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ia335876b7ce9a4c9d19ca41ae321b266b3b6d00e
121 files changed, 975 insertions, 534 deletions
diff --git a/meta-arm/meta-arm-bsp/conf/machine/juno.conf b/meta-arm/meta-arm-bsp/conf/machine/juno.conf index 4a86d4e267..43d6b3e331 100644 --- a/meta-arm/meta-arm-bsp/conf/machine/juno.conf +++ b/meta-arm/meta-arm-bsp/conf/machine/juno.conf @@ -18,7 +18,6 @@ IMAGE_FSTYPES += "tar.bz2 ext4 cpio.gz" SERIAL_CONSOLES = "115200;ttyAMA0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_u-boot ?= "2022.04" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" EXTRA_IMAGEDEPENDS += "trusted-firmware-a virtual/bootloader firmware-image-juno" diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch deleted file mode 100644 index a6838390c7..0000000000 --- a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 13dde05efae99c5261ed213108087d0f7ac9581e Mon Sep 17 00:00:00 2001 -From: Damodar Santhapuri <damodar.santhapuri@arm.com> -Date: Thu, 5 Nov 2020 22:40:48 +0530 -Subject: [PATCH] arm: juno: add custom bootcmd to autoboot from uEnv.txt file - -enable autoboot support with custom bootcmd loads uEnv.txt -from NOR to DRAM and import. - -Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com> -Upstream-Status: Pending ---- - include/configs/vexpress_aemv8.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h -index f0c5ceb3849a..cd7f6c1b9ba0 100644 ---- a/include/configs/vexpress_aemv8.h -+++ b/include/configs/vexpress_aemv8.h -@@ -137,13 +137,13 @@ - " afs load ${fdt_alt_name} ${fdt_addr_r}; "\ - "fi ; "\ - "fdt addr ${fdt_addr_r}; fdt resize; " \ -- "if afs load ${ramdisk_name} ${ramdisk_addr_r} ; "\ -+ "if afs load ${initrd_name} ${initrd_addr_r} ; "\ - "then "\ -- " setenv ramdisk_param ${ramdisk_addr_r}; "\ -+ " setenv initrd_param ${initrd_addr_r}; "\ - "else "\ -- " setenv ramdisk_param -; "\ -+ " setenv initrd_param -; "\ - "fi ; " \ -- "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}\0" -+ "booti ${kernel_addr_r} ${initrd_param} ${fdt_addr_r}" - #define BOOTENV_DEV_NAME_AFS(devtypeu, devtypel, instance) "afs " - - #define BOOT_TARGET_DEVICES(func) \ -@@ -164,8 +164,8 @@ - "kernel_name=norkern\0" \ - "kernel_alt_name=Image\0" \ - "kernel_addr_r=0x80080000\0" \ -- "ramdisk_name=ramdisk.img\0" \ -- "ramdisk_addr_r=0x88000000\0" \ -+ "initrd_name=ramdisk.img\0" \ -+ "initrd_addr_r=0x88000000\0" \ - "fdtfile=board.dtb\0" \ - "fdt_alt_name=juno\0" \ - "fdt_addr_r=0x80000000\0" \ --- -2.30.2 - diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch new file mode 100644 index 0000000000..0967df76dd --- /dev/null +++ b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch @@ -0,0 +1,27 @@ +From 726f8b4dbd3c5b1873aad531d5e26af3acd9b9ca Mon Sep 17 00:00:00 2001 +From: Jon Mason <jdmason@kudzu.us> +Date: Mon, 19 Dec 2022 11:36:04 -0500 +Subject: [PATCH] configs: vexpress: modify to boot compressed initramfs + +Signed-off-by: Jon Mason <jdmason@kudzu.us> +Upstream-Status: Inappropriate +--- + include/configs/vexpress_aemv8.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h +index 0c11b6b3331e..4ba4bebfbbae 100644 +--- a/include/configs/vexpress_aemv8.h ++++ b/include/configs/vexpress_aemv8.h +@@ -192,8 +192,10 @@ + #define VEXPRESS_RAMDISK_ADDR 0x8fe00000 + + #define EXTRA_ENV_NAMES \ ++ "kernel_comp_addr_r=0x90000000\0" \ ++ "kernel_comp_size=0x3000000\0" \ + "kernel_name=norkern\0" \ +- "kernel_alt_name=Image\0" \ ++ "kernel_alt_name=Image.gz\0" \ + "ramdisk_name=ramdisk.img\0" \ + "fdtfile=board.dtb\0" \ + "fdt_alt_name=juno\0" diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch deleted file mode 100644 index 2bf68fe6dc..0000000000 --- a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot/juno/0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 097a43223da4fa42335944295903ede2755e2dfd Mon Sep 17 00:00:00 2001 -From: Jon Mason <jdmason@kudzu.us> -Date: Mon, 19 Dec 2022 11:36:04 -0500 -Subject: [PATCH] configs: vexpress: modify to boot compressed initramfs - -Signed-off-by: Jon Mason <jdmason@kudzu.us> -Upstream-Status: Inappropriate - ---- - configs/vexpress_aemv8a_juno_defconfig | 1 + - include/configs/vexpress_aemv8.h | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/configs/vexpress_aemv8a_juno_defconfig b/configs/vexpress_aemv8a_juno_defconfig -index e02124cc7f54..6ffe8f5fe67e 100644 ---- a/configs/vexpress_aemv8a_juno_defconfig -+++ b/configs/vexpress_aemv8a_juno_defconfig -@@ -16,6 +16,7 @@ CONFIG_SYS_LOAD_ADDR=0x90000000 - CONFIG_BOOTDELAY=1 - CONFIG_USE_BOOTARGS=y - CONFIG_BOOTARGS="console=ttyAMA0,115200n8 root=/dev/sda2 rw rootwait earlycon=pl011,0x7ff80000 debug user_debug=31 androidboot.hardware=juno loglevel=9" -+CONFIG_BOOTCOMMAND="echo running default boot command; afs load ${kernel_name} ${kernel_addr_r} ; if test $? -eq 1; then echo Loading ${kernel_alt_name} instead of ${kernel_name}; afs load ${kernel_alt_name} ${kernel_addr_r};fi ; afs load ${fdtfile} ${fdt_addr_r} ; if test $? -eq 1; then echo Loading ${fdt_alt_name} instead of ${fdtfile}; afs load ${fdt_alt_name} ${fdt_addr_r}; fi ; fdt addr ${fdt_addr_r}; fdt resize; if afs load ${initrd_name} ${initrd_addr_r} ; then setenv initrd_param ${initrd_addr_r}; else setenv initrd_param -; fi ; booti ${kernel_addr_r} ${initrd_param} ${fdt_addr_r}" - # CONFIG_DISPLAY_CPUINFO is not set - # CONFIG_DISPLAY_BOARDINFO is not set - CONFIG_SYS_PROMPT="VExpress64# " -diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h -index cd7f6c1b9ba0..c2f5eb302076 100644 ---- a/include/configs/vexpress_aemv8.h -+++ b/include/configs/vexpress_aemv8.h -@@ -164,6 +164,8 @@ - "kernel_name=norkern\0" \ - "kernel_alt_name=Image\0" \ - "kernel_addr_r=0x80080000\0" \ -+ "kernel_comp_addr_r=0x90000000\0" \ -+ "kernel_comp_size=0x3000000\0" \ - "initrd_name=ramdisk.img\0" \ - "initrd_addr_r=0x88000000\0" \ - "fdtfile=board.dtb\0" \ --- -2.30.2 - diff --git a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend index f26ab4a648..b89ea872c7 100644 --- a/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -77,9 +77,7 @@ SRC_URI:append:fvp-baser-aemv8r64 = " \ # # Juno Machines # -SRC_URI:append:juno = " file://0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch \ - file://0002-configs-vexpress-modify-to-boot-compressed-initramfs.patch \ - " +SRC_URI:append:juno = " file://0001-configs-vexpress-modify-to-boot-compressed-initramfs.patch" # diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-board.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-board.cfg index 2fd0264a27..a9ee80e11a 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-board.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-board.cfg @@ -8,4 +8,3 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_CPU_IDLE=y -CONFIG_ARM_CPUIDLE=y diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno.scc b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno.scc index 240ecf5e48..a167d2254d 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno.scc +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno.scc @@ -1,5 +1,6 @@ include features/input/input.scc include features/net/net.scc +include features/usb/usb-base.scc include features/bluetooth/bluetooth.scc include cfg/timer/no_hz.scc include cfg/usb-mass-storage.scc diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-board.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-board.cfg index 654efa4520..2d7ad8c475 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-board.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-board.cfg @@ -13,7 +13,9 @@ CONFIG_MAILBOX=y CONFIG_ARM_MHU=y # SCMI support +CONFIG_HWMON=y CONFIG_ARM_SCMI_PROTOCOL=y +CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y CONFIG_ARM_SCMI_POWER_DOMAIN=y CONFIG_SENSORS_ARM_SCMI=y CONFIG_COMMON_CLK_SCMI=y @@ -28,7 +30,6 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_CPU_IDLE=y -CONFIG_ARM_CPUIDLE=y CONFIG_CPU_FREQ=y CONFIG_ARM_SCPI_CPUFREQ=y @@ -38,4 +39,4 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CONNECTOR=y -CONFIG_ARM_TIMER_SP804=y +CONFIG_PRINTK_TIME=y diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-net.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-net.cfg index 54e3686d37..20cc408f39 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-net.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-net.cfg @@ -1,2 +1,3 @@ +CONFIG_NET_VENDOR_SMSC=y CONFIG_SMSC911X=y CONFIG_SMC91X=y diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg index 295d190d19..ec919e39a2 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-pci.cfg @@ -1,4 +1,5 @@ CONFIG_PCI=y +CONFIG_PCI_IOV=y CONFIG_PCI_MSI=y CONFIG_PCI_REALLOC_ENABLE_AUTO=y CONFIG_PCI_PRI=y diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sata.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sata.cfg index a159af8f98..179d7b8f95 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sata.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-sata.cfg @@ -1,3 +1,2 @@ CONFIG_ATA=y CONFIG_SATA_SIL24=y -CONFIG_SKY2=y diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg index 6241374a64..f4d220e0de 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/juno/juno-thermal.cfg @@ -1,4 +1,7 @@ CONFIG_THERMAL=y +CONFIG_THERMAL_OF=y +CONFIG_ENERGY_MODEL=y +CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_CPU_THERMAL=y diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch index f19fb8b9e2..329c939fb6 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch @@ -1,4 +1,4 @@ -From 59fb813f9742b349f48250bd7793279cafe2752c Mon Sep 17 00:00:00 2001 +From dc250cab31c6611cc7fa76bc8b2027dbd56dd65d Mon Sep 17 00:00:00 2001 From: Pierre Gondois <pierre.gondois@arm.com> Date: Mon, 7 Nov 2022 16:56:58 +0100 Subject: [PATCH] arm64: dts: Update cache properties for Arm Ltd platforms @@ -136,6 +136,3 @@ index 5b6d9d8e934d..796cd7d02eb5 100644 }; }; --- -2.30.2 - diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch deleted file mode 100644 index 1c0f25eba1..0000000000 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c4a7b9b587ca1bb4678d48d8be7132492b23a81c Mon Sep 17 00:00:00 2001 -From: Cristian Marussi <cristian.marussi@arm.com> -Date: Fri, 28 Oct 2022 15:08:33 +0100 -Subject: [PATCH] arm64: dts: juno: Add thermal critical trip points - -When thermnal zones are defined, trip points definitions are mandatory. -Define a couple of critical trip points for monitoring of existing -PMIC and SOC thermal zones. - -This was lost between txt to yaml conversion and was re-enforced recently -via the commit 8c596324232d ("dt-bindings: thermal: Fix missing required property") - -Cc: Rob Herring <robh+dt@kernel.org> -Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> -Cc: devicetree@vger.kernel.org -Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> -Fixes: f7b636a8d83c ("arm64: dts: juno: add thermal zones for scpi sensors") -Link: https://lore.kernel.org/r/20221028140833.280091-8-cristian.marussi@arm.com -Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> - -Signed-off-by: Jon Mason <jon.mason@arm.com> -Upstream-Status: Backport ---- - arch/arm64/boot/dts/arm/juno-base.dtsi | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi -index 2f27619d8abd..8b4d280b1e7e 100644 ---- a/arch/arm64/boot/dts/arm/juno-base.dtsi -+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi -@@ -751,12 +751,26 @@ pmic { - polling-delay = <1000>; - polling-delay-passive = <100>; - thermal-sensors = <&scpi_sensors0 0>; -+ trips { -+ pmic_crit0: trip0 { -+ temperature = <90000>; -+ hysteresis = <2000>; -+ type = "critical"; -+ }; -+ }; - }; - - soc { - polling-delay = <1000>; - polling-delay-passive = <100>; - thermal-sensors = <&scpi_sensors0 3>; -+ trips { -+ soc_crit0: trip0 { -+ temperature = <80000>; -+ hysteresis = <2000>; -+ type = "critical"; -+ }; -+ }; - }; - - big_cluster_thermal_zone: big-cluster { --- -2.30.2 - diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch index 34dd025189..4495f397bd 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch @@ -1,4 +1,4 @@ -From 3bd7a0219082c2c91570b81afc35f2aec57cade2 Mon Sep 17 00:00:00 2001 +From bd354219987dddbf8ab6fd11450b4046547aca1b Mon Sep 17 00:00:00 2001 From: James Clark <james.clark@arm.com> Date: Thu, 17 Nov 2022 10:25:36 +0000 Subject: [PATCH] arm64: dts: fvp: Add SPE to Foundation FVP @@ -33,6 +33,3 @@ index c8bd23b1a7ba..029578072d8f 100644 watchdog@2a440000 { compatible = "arm,sbsa-gwdt"; reg = <0x0 0x2a440000 0 0x1000>, --- -2.30.2 - diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch index 72f7161fee..fc02751004 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch @@ -1,4 +1,4 @@ -From b2d5025e129289d9b914c696646e64495a7453c0 Mon Sep 17 00:00:00 2001 +From 22e740d069e14875a64864bf86e0826a96560b44 Mon Sep 17 00:00:00 2001 From: Sudeep Holla <sudeep.holla@arm.com> Date: Fri, 18 Nov 2022 15:10:17 +0000 Subject: [PATCH] arm64: dts: fvp: Add information about L1 and L2 caches @@ -144,6 +144,3 @@ index 5f6f30c801a7..60472d65a355 100644 }; }; --- -2.30.2 - diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch index c551250869..e3828ec96a 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/juno/0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch @@ -1,4 +1,4 @@ -From e15031539490733279c41ba87f4ef2b440a685f5 Mon Sep 17 00:00:00 2001 +From 4edb625e2256d5761312110e34cbc0164915d772 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Date: Fri, 25 Nov 2022 15:41:12 +0100 Subject: [PATCH] ARM: dts: vexpress: align LED node names with dtschema @@ -79,6 +79,3 @@ index f434fe5cf4a1..def538ce8769 100644 label = "v2m:green:user8"; gpios = <&v2m_led_gpios 7 0>; linux,default-trigger = "cpu5"; --- -2.30.2 - diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index 4f9bcfdf57..e2a36c9b60 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -97,15 +97,14 @@ SRC_URI:append:fvp-baser-aemv8r64 = " file://fvp-baser-aemv8r64.dts;subdir=git/a # Juno KMACHINE # COMPATIBLE_MACHINE:juno = "juno" -KBUILD_DEFCONFIG:juno = "defconfig" -KCONFIG_MODE:juno = "--alldefconfig" +#KBUILD_DEFCONFIG:juno = "defconfig" +#KCONFIG_MODE:juno = "--alldefconfig" FILESEXTRAPATHS:prepend:juno := "${ARMBSPFILESPATHS}" SRC_URI:append:juno = " \ - file://0001-arm64-dts-juno-Add-thermal-critical-trip-points.patch \ - file://0002-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch \ - file://0003-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch \ - file://0004-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch \ - file://0005-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch \ + file://0001-arm64-dts-Update-cache-properties-for-Arm-Ltd-platfo.patch \ + file://0002-arm64-dts-fvp-Add-SPE-to-Foundation-FVP.patch \ + file://0003-arm64-dts-fvp-Add-information-about-L1-and-L2-caches.patch \ + file://0004-ARM-dts-vexpress-align-LED-node-names-with-dtschema.patch \ " # diff --git a/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf b/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf index cb54fe9470..db02dc6891 100644 --- a/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf +++ b/meta-arm/meta-arm/conf/machine/qemuarm-secureboot.conf @@ -23,4 +23,4 @@ IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" MACHINE_FEATURES += "optee-ftpm" PREFERRED_VERSION_optee-os ?= "3.18.%" -PREFERRED_VERSION_u-boot ?= "2022.10" + diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch new file mode 100644 index 0000000000..8d3b32f803 --- /dev/null +++ b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch @@ -0,0 +1,34 @@ +From 67bb1f111c4668c4dfdc40547cb83fc6c1f010e9 Mon Sep 17 00:00:00 2001 +From: Jon Mason <jdmason@kudzu.us> +Date: Thu, 26 Jan 2023 11:46:33 -0500 +Subject: [PATCH] qemu: arm: make QFW, MMIO implied on qemu-arm + +There are instances when one would not want QFW enabled, like running +alternative firmware. Make this choice optional instead of forced by +using the implied keyword. + +Signed-off-by: Jon Mason <jdmason@kudzu.us> +Upstream-Status: Pending [Not submitted to upstream yet] + +--- + board/emulation/qemu-arm/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig +index ed9949651c4b..93f6f74d5bcc 100644 +--- a/board/emulation/qemu-arm/Kconfig ++++ b/board/emulation/qemu-arm/Kconfig +@@ -5,8 +5,8 @@ config TEXT_BASE + + config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y +- select CMD_QFW +- select QFW_MMIO ++ imply CMD_QFW ++ imply QFW_MMIO + imply VIRTIO_MMIO + imply VIRTIO_PCI + imply VIRTIO_NET +-- +2.30.2 + diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg index db8dfec00b..82c25e27c8 100644 --- a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg +++ b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot/qemuarm.cfg @@ -1,6 +1,7 @@ # This must match the address that TF-A jumps to for BL33 -CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEXT_BASE=0x60000000 CONFIG_ENV_IS_NOWHERE=y # CONFIG_ENV_IS_IN_FLASH is not set # CONFIG_MTD is not set # CONFIG_MTD_NOR_FLASH is not set +# CONFIG_CMD_QFW is not set diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend index 0683a78389..58d66e1d68 100644 --- a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,4 +1,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append:qemuarm64-secureboot = " file://qemuarm64.cfg" -SRC_URI:append:qemuarm-secureboot = " file://qemuarm.cfg" +SRC_URI:append:qemuarm-secureboot = " \ + file://0001-qemu-arm-make-QFW-MMIO-implied-on-qemu-arm.patch \ + file://qemuarm.cfg \ + " diff --git a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_2022.10.bb b/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_2022.10.bb deleted file mode 100644 index 905ae552a7..0000000000 --- a/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_2022.10.bb +++ /dev/null @@ -1,26 +0,0 @@ -HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" -DESCRIPTION = "U-Boot, a boot loader for Embedded boards based on PowerPC, \ -ARM, MIPS and several other processors, which can be installed in a boot \ -ROM and used to initialize and test the hardware or to download and run \ -application code." -SECTION = "bootloaders" -DEPENDS += "flex-native bison-native" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" -PE = "1" - -# We use the revision in order to avoid having to fetch it from the -# repo during parse -SRCREV = "4debc57a3da6c3f4d3f89a637e99206f4cea0a96" - -SRC_URI = "git://git.denx.de/u-boot.git;branch=master \ - " - -S = "${WORKDIR}/git" -B = "${WORKDIR}/build" -do_configure[cleandirs] = "${B}" - -require recipes-bsp/u-boot/u-boot.inc - -DEPENDS += "bc-native dtc-native gnutls-native" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch index 7e215e3080..c612dd8d5d 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch +++ b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0001-Use-unistd.h-not-argp.h-for-all-POSIX-systems.patch @@ -8,7 +8,7 @@ of any of the GNU specific argp extensions. Include unistd.h directly to allow building with musl on linux, whilst retaining compatibility with glibc and other unices. -Upstream-status: Submitted [https://github.com/Gregwar/fatcat/pull/34] +Upstream-Status: Submitted [https://github.com/Gregwar/fatcat/pull/34] Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> --- src/fatcat.cpp | 8 ++------ diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0002-Enable-64bit-off_t.patch b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0002-Enable-64bit-off_t.patch index caaf105eea..306e36d068 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0002-Enable-64bit-off_t.patch +++ b/meta-openembedded/meta-filesystems/recipes-utils/fatcat/fatcat/0002-Enable-64bit-off_t.patch @@ -10,7 +10,7 @@ same as lseek64 This helps compiling on latest musl where lseek64 and friends are not available -Upstream-status: Submitted [https://github.com/Gregwar/fatcat/pull/34] +Upstream-Status: Submitted [https://github.com/Gregwar/fatcat/pull/34] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- CMakeLists.txt | 2 ++ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.9.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb index e63c1b5e19..13938444c8 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.9.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb @@ -21,7 +21,7 @@ DEPENDS += " \ SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=v0.23.x;protocol=https \ file://mpd.conf.in \ " -SRCREV = "12147f6d5822899cc4316799b494c093b4b47f91" +SRCREV = "d91da9679801224847c30147f5914785b6f8f240" S = "${WORKDIR}/git" EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch index d05cf02b71..b174ec127e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch @@ -1,6 +1,6 @@ * tremor provides libvorbisidec, use it instead of libvorbisdec -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Tim Orling <TicoTimo@gmail.com> diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch index 96b5d2d246..e10002f78e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch @@ -1,7 +1,7 @@ * luaL_checkint and luaL_optint were deprecated in lua 5.3 * replacement functions are luaL_checkinteger and luaL_optinteger -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Tim Orling <TicoTimo@gmail.com> diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb index 3c52fe13b0..f5f1236f18 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.2.bb @@ -55,3 +55,9 @@ CVE_PRODUCT = "mbed_tls" CVE_CHECK_IGNORE += "CVE-2021-43666" # Fix merged upstream https://github.com/Mbed-TLS/mbedtls/commit/9a4a9c66a48edfe9ece03c7e4a53310adf73a86c CVE_CHECK_IGNORE += "CVE-2021-45451" + +# Export source files/headers needed by Arm Trusted Firmware +sysroot_stage_all:append() { + sysroot_stage_dir "${S}/library" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/library" + sysroot_stage_dir "${S}/include" "${SYSROOT_DESTDIR}/usr/share/mbedtls-source/include" +} diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch index 816a409cdd..4cfd8edf9f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch @@ -3,7 +3,7 @@ From: Roy Li <rongqing.li@windriver.com> Date: Tue, 19 Aug 2014 11:31:35 +0800 Subject: [PATCH] [PATCH] add the needed stdarg.h -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Roy Li <rongqing.li@windriver.com> diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch index d888dd8263..8126b3619a 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch @@ -6,7 +6,7 @@ make, move-pidfile-to-var-run, move-runfile-to-var-run move pidfile to /var/run redefine PR_RUN_DIR as ${localstatedir}/run -Signed-off-By: Armin Kuster <akuster808@gmail.com> +Signed-off-by: Armin Kuster <akuster808@gmail.com> diff --git a/Make.rules.in b/Make.rules.in diff --git a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch index 1d2a5368c1..91028d82bc 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/Fixed-100-CPU-using-issue-by-adding-minimum-POSIX-ti.patch @@ -8,8 +8,7 @@ Added minimum POSIX timer interval to prevent from timers firing to quickly for the process to handle, resulting in 100% CPU and endless signal queue. -Upstream-status: Backport -[From commit 1f0baae98a7b23e85f2bfd8f5de64795421c270e: +Upstream-Status: Backport [From commit 1f0baae98a7b23e85f2bfd8f5de64795421c270e: - critical: added minimum POSIX timer interval to prevent from timers firing to quickly for the process to handle, resulting in 100% CPU and endless signal queue] diff --git a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch index e4578dda74..cb8c81385b 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch @@ -6,7 +6,7 @@ Subject: [PATCH] ptpd: use pkgconfig Yocto uses pkg-config for libpcap, rather than pcap-config, so use that instead as the source for libs and cflags. -Upstream-status: Inappropriate [ embedded specific ] +Upstream-Status: Inappropriate [ embedded specific ] Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> --- diff --git a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch index d01c20d385..e4acd099ab 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch @@ -3,7 +3,7 @@ From: "Roy.Li" <rongqing.li@windriver.com> Date: Thu, 22 Aug 2013 08:56:09 +0800 Subject: [PATCH] tftp-hpa: add error check for disk filled up -Upstream-status: Pending [Sent to http://www.syslinux.org/archives/2013-August/020765.html] +Upstream-Status: Pending [Sent to http://www.syslinux.org/archives/2013-August/020765.html] Add error check when the write-buffer is finally flushed to the file, the caller can detect if the disk filled up (or had an i/o error) and diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch index d54cea9fdc..089156a7ae 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch @@ -2,9 +2,9 @@ This fixes an issue when building with gcc 4.x https://github.com/openembedded/openembedded/tree/master/recipes/netkit-rpc/netkit-rpc -Upstream-status: Backported +Upstream-Status: Backported -Signed-off-By: Armin Kuster <akuster808@gmail.com> +Signed-off-by: Armin Kuster <akuster808@gmail.com> --- netkit-rpc-0.17/rpcgen/rpc_cout.c~gcc4 +++ netkit-rpc-0.17/rpcgen/rpc_cout.c diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch index cd6df62fb3..c6e2e60624 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch @@ -8,7 +8,7 @@ https://sourceware.org/ml/libc-alpha/2016-02/msg00342.html Upstream-Status: Inappropriate [ no upstream maintaner ] -Signed-off-by Armin Kuster <akuster@mvista.com> +Signed-off-by: Armin Kuster <akuster@mvista.com> Index: netkit-rsh-0.17/rlogin/rlogin.c =================================================================== diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch index efd060f365..7afd70859f 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch @@ -1,6 +1,6 @@ make rexec support ipv6 -Upstream-status: Pending +Upstream-Status: Pending rexec equals rexec_af(... ,AF_INET) which only support ipv4, use rexec_af(..., AF_UNSPEC) to support both ipv6 and ipv4. diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch index c12ee9b465..ab0b9b64bc 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch @@ -8,7 +8,7 @@ Most distos have there own verison of this fix. This was derived by -- Colin Watson <cjwatson@ubuntu.com> Tue, 13 Sep 2011 10:07:08 +0100 -signed-off-by: Armin Kuster <akuster808@gmail.com> +Signed-off-by: Armin Kuster <akuster808@gmail.com> Index: netkit-rsh-0.17/rsh/Makefile =================================================================== diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch index c5a453abe2..3152ce288a 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch @@ -6,7 +6,7 @@ Subject: [PATCH] net-snmp: add knob whether nlist.h are checked Previously, it still was checked when there was no nlish.h in sysroots directory. Add knob to decide whether nlist.h are checked or not. -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Chong Lu <Chong.Lu@windriver.com> diff --git a/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch index c11a127b81..c9cf15c1db 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch @@ -10,7 +10,7 @@ it in place but remove the #if guard since it is only there to ensure that the l2tp_private.h file is updated if the rpc source file is changed and the two get out of sync. -Upstream-status: pending +Upstream-Status: pending Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> --- diff --git a/meta-openembedded/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch b/meta-openembedded/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch index 2a5b3e6193..9965d2ec57 100644 --- a/meta-openembedded/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch +++ b/meta-openembedded/meta-networking/recipes-support/fping/fping/0001-fping-Initialize-msghdr-struct-in-a-portable-way.patch @@ -7,7 +7,7 @@ Initializing the structure assuming glibc layout results in compile errors on musl, therefore do partial intialization and then assigning the members individually. -Upstream-status: Submitted [https://github.com/schweikert/fping/pull/263] +Upstream-Status: Submitted [https://github.com/schweikert/fping/pull/263] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- src/fping.c | 16 +++++++--------- diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch index 583a6ca60b..403146e603 100644 --- a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch +++ b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch @@ -13,7 +13,7 @@ We should exclude the linux time.h by disable linux/atm_zatm.h and move some useful definition in linux/atm_zatm.h to zntune.c to resolve it. -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Dengke Du <dengke.du@windriver.com> --- diff --git a/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch b/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch index 6a5350c37c..63e743f64b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch @@ -13,7 +13,7 @@ dhrystone sources: Additionally, this patch adds a simple Makefile. -Upstream-status: Pending +Upstream-Status: Pending Sign-off-by: Kimmo Surakka <kimmo.surakka@ge.com> Signed-off-by: Jose Alarcon <jose.alarcon@ge.com> diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch index e9b880c260..9d652e10ad 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-fix-dispmanx-build.patch @@ -16,7 +16,7 @@ See: My contribution is to tweak the wscript to link all the required libraries. -Upstream-status: submitted [https://github.com/glmark2/glmark2/pull/135] +Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/135] Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- src/native-state-dispmanx.cpp | 22 +++++++++++++++++----- diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch index 27bd62edb9..0cb22fd563 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0002-run-dispmanx-fullscreen.patch @@ -6,7 +6,7 @@ Subject: [PATCH] run dispmanx fullscreen The dispmanx flavour can only run fullscreen, therefore set the size to fullscreen when glmark2-es2-dispmanx is run. -Upstream-status: submitted [https://github.com/glmark2/glmark2/pull/135] +Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/135] Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- src/main.cpp | 5 +++++ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/fix-lmbench-memory-check-failure.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/fix-lmbench-memory-check-failure.patch index cbab5c424e..0274bc32af 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/fix-lmbench-memory-check-failure.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/fix-lmbench-memory-check-failure.patch @@ -24,7 +24,7 @@ Signed-off-by: Fupan Li <fupan.li@windriver.com> Add and reword above comments -Upstream-status: inappropriate [ configuration ] +Upstream-Status: Inappropriate [ configuration ] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench_result_html_report.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench_result_html_report.patch index 30708c81db..ae2443476a 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench_result_html_report.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench_result_html_report.patch @@ -13,7 +13,7 @@ Signed-off-by: Fupan Li <fupan.li@windriver.com> Reworded patch description. -Upstream-status: inappropriate [ configuration ] +Upstream-Status: Inappropriate [ configuration ] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch new file mode 100644 index 0000000000..41d004d9ff --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch @@ -0,0 +1,32 @@ +From 722e44cb5b74cae206f47a6dc0d985eba8ed1b2e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 17:17:49 -0800 +Subject: [PATCH] Fix -Werror=enum-int-mismatch in + lws_tls_server_abort_connection() + +GCC 13 is findinf this function signature mismatch. + +../git/lib/tls/openssl/openssl-server.c:713:1: error: conflicting types for 'lws_tls_server_abort_connection' due to enum/integer mismatch; have 'int(struct lws *)' [-Werror=enum-int-mismatch] + +Upstream-Status: Submitted [https://github.com/warmcat/libwebsockets/pull/2824] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/tls/openssl/openssl-server.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/tls/openssl/openssl-server.c b/lib/tls/openssl/openssl-server.c +index f2e77324f..43d65e030 100644 +--- a/lib/tls/openssl/openssl-server.c ++++ b/lib/tls/openssl/openssl-server.c +@@ -699,7 +699,7 @@ lws_tls_server_new_nonblocking(struct lws *wsi, lws_sockfd_type accept_fd) + return 0; + } + +-int ++enum lws_ssl_capable_status + lws_tls_server_abort_connection(struct lws *wsi) + { + if (wsi->tls.use_ssl) +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb index d401a187e2..67269b05af 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb @@ -7,7 +7,8 @@ DEPENDS = "zlib" S = "${WORKDIR}/git" SRCREV = "b0a749c8e7a8294b68581ce4feac0e55045eb00b" -SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.3-stable" +SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.3-stable \ + file://0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch" UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch index e2c4e9ff6c..c18627b2fa 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch @@ -1,10 +1,11 @@ Submitted By: Armin K. <krejzi at email dot com> Date: 2012-07-06 Initial Package Version: 0.4.6 -Upstream Status: Unknown Origin: Self Description: Some build fixes. +Upstream-Status: Pending + Index: obex-data-server-0.4.6/src/ods-obex.c =================================================================== --- obex-data-server-0.4.6.orig/src/ods-obex.c diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch index 7d1dbc6ee4..4866a5fbe0 100644 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch @@ -11,7 +11,7 @@ just ask for python3 executable. | meson.build:9:0: ERROR: <ExternalProgram 'python3' -> ['<...>/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools -Upstream-Status: Inappropriate [OE specific] +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> diff --git a/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch index acfaa3f6be..84d4467c0e 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch @@ -3,7 +3,7 @@ From: "Roy.Li" <rongqing.li@windriver.com> Date: Tue, 5 Sep 2017 10:24:10 +0800 Subject: [PATCH] [PATCH] do not use the hardcode libdir -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch index b3893f0c80..5009c73a05 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/core/0015-libsparse-Split-off-most-of-sparse_file_read_normal-.patch @@ -8,7 +8,7 @@ This carves out the core of sparse_file_read_normal and splits it off so it can be reused in the next patch. No functional change intended. Change-Id: Id00491fd7e5bb6fa28c517a0bb32b8b506539d4d -Upstream-status: Backport [95657f3e5976d96073f7bbfe3a49192509999d1d] +Upstream-Status: Backport [95657f3e5976d96073f7bbfe3a49192509999d1d] Signed-off-by: Sean Anderson <sean.anderson@seco.com> --- libsparse/sparse_read.c | 21 ++++++++++++++++----- diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch index 6906efd1c0..47c8edb497 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch @@ -10,7 +10,7 @@ C library. We don't need this check in meta-openembedded. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> -Upstream-status: Inappropriate +Upstream-Status: Inappropriate - upstream doxygen must build on many architectures, this change is too intrusive for upstream --- diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch index b4634a2445..f5a1716c07 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch @@ -8,8 +8,7 @@ are not under control or to be used at the CMakeLists level. In 3.20 that private generation changed pre-requisite targets[1] and now logs contain the path compiler_depend.ts instead of the actual file. -Upstream status: Pending [1] -[1] https://github.com/fluent/fluent-bit/issues/5492 +Upstream-Status: Pending [https://github.com/fluent/fluent-bit/issues/5492] --- CMakeLists.txt | 6 +----- lib/chunkio/CMakeLists.txt | 7 +------ diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch index af31b436db..6c585c2f5b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch @@ -7,8 +7,7 @@ bitbake passes CFLAGS that are often in conflict with the ones set in mbedtls' CMakeLists.txt. Such conflicts are the inability to use FORTIFY_SOURCE=2 except in release mode -Upstream status: Innapropriate due to fluent-bit having it's own Release -flags that also overwrite bitbake ones. +Upstream-Status: Innapropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.] --- lib/mbedtls-2.28.0/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch index 9d4d950d15..f6e3dce2f3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch @@ -8,8 +8,7 @@ Use pkg-config to get systemd.pc variables and systemdunitdir. Those variable ensure that .service files are installed in the correct paths and only when systemd is detected. -Upstream Status: Pending [1] -[1] https://github.com/fluent/fluent-bit/pull/5818 +Upstream-Status: Pending [https://github.com/fluent/fluent-bit/pull/5818] --- cmake/FindJournald.cmake | 4 ++++ diff --git a/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch index 0f133e2e75..21a6f292c8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch +++ b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch @@ -3,7 +3,7 @@ From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 6 Aug 2014 14:53:03 +0200 Subject: [PATCH] configure: use pkg-config for freetype -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- configure.ac | 37 ++++++++----------------------------- diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-missing-includes-cstdint-and-cstdio.patch new file mode 100644 index 0000000000..0fce8dc64f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -0,0 +1,70 @@ +From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 24 Jan 2023 21:40:43 -0800 +Subject: [PATCH] Add missing includes <cstdint> and <cstdio> + +This is needed with GCC 13 and newer [1] + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Backport [https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + + storage/rocksdb/rocksdb/util/slice.cc | 1 + + storage/rocksdb/rocksdb/util/string_util.h | 1 + + tpool/aio_linux.cc | 1 + + 6 files changed, 6 insertions(+) + +--- a/thirdparty/rocksdb/include/rocksdb/utilities/checkpoint.h ++++ b/thirdparty/rocksdb/include/rocksdb/utilities/checkpoint.h +@@ -8,6 +8,7 @@ + #pragma once + #ifndef ROCKSDB_LITE + ++#include <cstdint> + #include <string> + #include "rocksdb/status.h" + +--- a/thirdparty/rocksdb/util/string_util.h ++++ b/thirdparty/rocksdb/util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include <cstdint> + #include <sstream> + #include <string> + #include <unordered_map> +--- a/extensions/expression-language/common/Value.h ++++ b/extensions/expression-language/common/Value.h +@@ -15,6 +15,7 @@ + * limitations under the License. + */ + ++#include <cstdint> + #include <string> + #include <sstream> + #include <iomanip> +--- a/libminifi/include/utils/StringUtils.h ++++ b/libminifi/include/utils/StringUtils.h +@@ -18,6 +18,7 @@ + #define LIBMINIFI_INCLUDE_IO_STRINGUTILS_H_ + #include <iostream> + #include <cstring> ++#include <cstdint> + #include <functional> + #ifdef WIN32 + #include <cwctype> +--- a/thirdparty/rocksdb/db/compaction_iteration_stats.h ++++ b/thirdparty/rocksdb/db/compaction_iteration_stats.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include <cstdint> + struct CompactionIterationStats { + // Compaction statistics + diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index b843f72a52..1bf99d4907 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -31,6 +31,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=ht file://0001-cxxopts-Add-limits-header.patch \ file://0001-Fix-build-with-libc.patch \ file://0001-civetweb-Disable-lto.patch \ + file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..8afcb1fa48 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch @@ -0,0 +1,32 @@ +From 927cd88cad7bea94c2eebecc18f7881f0defaccb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 23:36:29 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> +is no longer transitively included [1]. Explicitly include +it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/Drive-Trust-Alliance/sedutil/pull/425] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Common/DtaOptions.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Common/DtaOptions.h b/Common/DtaOptions.h +index c012af1..7530a0b 100644 +--- a/Common/DtaOptions.h ++++ b/Common/DtaOptions.h +@@ -21,6 +21,7 @@ along with sedutil. If not, see <http://www.gnu.org/licenses/>. + #ifndef _DTAOPTIONS_H + #define _DTAOPTIONS_H + ++#include <cstdint> + /** Output modes */ + typedef enum _sedutiloutput { + sedutilNormal, +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb index a377d4ec5a..972a33c742 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sedutil/sedutil_git.bb @@ -7,11 +7,11 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" -BASEPV = "1.15.1" PV = "1.20.0" SRCREV = "d3de8e45e06a21d31cca0046ceb16ced1ef3563a" SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git;branch=master;protocol=https \ file://0001-Fix-build-on-big-endian-architectures.patch \ + file://0001-include-missing-cstdint.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch index f93650f86c..fd647b7386 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch @@ -11,7 +11,7 @@ together with oe autotools.bbclass this is done twice and causes: | autoreconf: running: aclocal --system-acdir=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/aclocal-copy/ --automake-acdir=/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ --force -I auto-m4 -I m4m | configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS. -Upstream-Status: Inapropriate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- diff --git a/meta-openembedded/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..f2169c43c9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch @@ -0,0 +1,59 @@ +From 5e3243b163aa5d50083b4036c21f84c1204f2023 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 23:25:05 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/NilsBrause/waylandpp/pull/75] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/wayland-client.hpp | 1 + + scanner/scanner.cpp | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp +index a3f782b..4598a0e 100644 +--- a/include/wayland-client.hpp ++++ b/include/wayland-client.hpp +@@ -29,6 +29,7 @@ + /** \file */ + + #include <atomic> ++#include <cstdint> + #include <functional> + #include <memory> + #include <string> +diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp +index bebd71e..c25746a 100644 +--- a/scanner/scanner.cpp ++++ b/scanner/scanner.cpp +@@ -15,6 +15,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include <cstdint> + #include <fstream> + #include <iostream> + #include <list> +@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[]) + wayland_hpp << "#pragma once" << std::endl + << std::endl + << "#include <array>" << std::endl ++ << "#include <cstdint>" << std::endl + << "#include <functional>" << std::endl + << "#include <memory>" << std::endl + << "#include <string>" << std::endl +@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[]) + wayland_server_hpp << "#pragma once" << std::endl + << std::endl + << "#include <array>" << std::endl ++ << "#include <cstdint>" << std::endl + << "#include <functional>" << std::endl + << "#include <memory>" << std::endl + << "#include <string>" << std::endl +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb index 0deed332c6..5ba5aa7940 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb @@ -2,7 +2,8 @@ SUMMARY = " C++ binding for Wayland using the most modern C++ technology" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3aae28cc66d61975114c2b14df215407" -SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master" +SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master \ + file://0001-include-missing-cstdint.patch" DEPENDS = "pugixml" DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2" diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch b/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch index 33116b3c06..d47e086c46 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch @@ -2,9 +2,9 @@ allow systemd path to be defined by configure option. The configure probes the host for systemd path information. -Upstream Status: Inappropriate [Embedded] +Upstream-Status: Inappropriate [Embedded] -Signed-off-By: Armin Kuster <akuster@mvista.com> +Signed-off-by: Armin Kuster <akuster@mvista.com> Index: ipmiutil-3.0.5/configure.ac =================================================================== diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch new file mode 100644 index 0000000000..032bf00c7d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-info-Include-missing-cstdint-for-uintptr_t.patch @@ -0,0 +1,31 @@ +From 1d9ce7cd799770981043f656373cbd1bf7558b9a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 17:00:00 -0800 +Subject: [PATCH] media-info: Include missing <cstdint> for uintptr_t + +gcc 13 moved some includes around and as a result <cstdint> is no longer +transitively included [1]. Explicitly include it. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://lore.kernel.org/linux-media/20230127010741.3883339-1-raj.khem@gmail.com/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + utils/common/media-info.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/utils/common/media-info.cpp b/utils/common/media-info.cpp +index 53e132f5..1a25a4b6 100644 +--- a/utils/common/media-info.cpp ++++ b/utils/common/media-info.cpp +@@ -3,6 +3,7 @@ + * Copyright 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved. + */ + ++#include <cstdint> + #include <cstring> + #include <fstream> + #include <iostream> +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb index 383be4a543..b42300f096 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.23.0.bb @@ -32,6 +32,7 @@ SRC_URI = "\ file://0003-original-patch-export-mediactl-headers.patch \ file://0004-Do-not-use-getsubopt.patch \ file://0005-configure.ac-Makefile.am-Support-building-without-NL.patch \ + file://0001-media-info-Include-missing-cstdint-for-uintptr_t.patch \ " SRCREV = "fd544473800d02e90bc289434cc44e5aa8fadd0f" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..6cfd2e81bc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch @@ -0,0 +1,82 @@ +From 11b9ef265a942cb3fdd373520d0c3fce67d3cdf9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 18:05:33 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Backport [https://github.com/kraj/geos/commit/0e8d4368b] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/geos/geomgraph/TopologyLocation.h | 1 + + include/geos/io/WKTWriter.h | 1 + + include/geos/shape/fractal/HilbertCode.h | 1 + + include/geos/shape/fractal/HilbertEncoder.h | 1 + + include/geos/shape/fractal/MortonCode.h | 1 + + 5 files changed, 5 insertions(+) + +diff --git a/include/geos/geomgraph/TopologyLocation.h b/include/geos/geomgraph/TopologyLocation.h +index 4cbbacb3..a3ecd212 100644 +--- a/include/geos/geomgraph/TopologyLocation.h ++++ b/include/geos/geomgraph/TopologyLocation.h +@@ -25,6 +25,7 @@ + #include <geos/inline.h> + #include <geos/geom/Location.h> + ++#include <cstdint> + #include <vector> + #include <array> + #include <string> +diff --git a/include/geos/io/WKTWriter.h b/include/geos/io/WKTWriter.h +index c0af8e71..0d60e975 100644 +--- a/include/geos/io/WKTWriter.h ++++ b/include/geos/io/WKTWriter.h +@@ -25,6 +25,7 @@ + + #include <string> + #include <cctype> ++#include <cstdint> + + #ifdef _MSC_VER + #pragma warning(push) +diff --git a/include/geos/shape/fractal/HilbertCode.h b/include/geos/shape/fractal/HilbertCode.h +index 46012efc..beeb28c6 100644 +--- a/include/geos/shape/fractal/HilbertCode.h ++++ b/include/geos/shape/fractal/HilbertCode.h +@@ -17,6 +17,7 @@ + + #include <geos/export.h> + #include <string> ++#include <cstdint> + + // Forward declarations + namespace geos { +diff --git a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h +index 61c0010d..0126d3d9 100644 +--- a/include/geos/shape/fractal/HilbertEncoder.h ++++ b/include/geos/shape/fractal/HilbertEncoder.h +@@ -16,6 +16,7 @@ + #pragma once + + #include <geos/export.h> ++#include <cstdint> + #include <string> + #include <vector> + +diff --git a/include/geos/shape/fractal/MortonCode.h b/include/geos/shape/fractal/MortonCode.h +index 6743f87c..ad4a42e7 100644 +--- a/include/geos/shape/fractal/MortonCode.h ++++ b/include/geos/shape/fractal/MortonCode.h +@@ -17,6 +17,7 @@ + + #include <geos/export.h> + #include <string> ++#include <cstdint> + + // Forward declarations + namespace geos { +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb deleted file mode 100644 index fdb72204ea..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require geos.inc - -SRC_URI[sha256sum] = "f8b2314e311456f7a449144efb5e3188c2a28774752bc50fc882a3cd5c89ee35" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.4.bb index 484ca9154f..558acd92bf 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.4.bb @@ -5,7 +5,9 @@ SECTION = "libs" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2" +SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2 \ + file://0001-include-missing-cstdint.patch" +SRC_URI[sha256sum] = "70dff2530d8cd2dfaeeb91a5014bd17afb1baee8f0e3eb18e44d5b4dbea47b14" inherit autotools pkgconfig binconfig diff --git a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.0.bb b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.1.bb index 218f083969..6ce1c88772 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27445198ba1500f508fce2b183ce0ff" DEPENDS = "sqlite3 sqlite3-native" SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "81b2239b94cad0886222cde4f53cb49d34905aad2a1317244a0c30a553db2315" +SRC_URI[sha256sum] = "003cd4010e52bb5eb8f7de1c143753aa830c8902b6ed01209f294846e40e6d39" inherit cmake lib_package diff --git a/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch b/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch index 769118e422..314487aef6 100644 --- a/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch +++ b/meta-openembedded/meta-oe/recipes-security/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch @@ -6,7 +6,7 @@ Subject: [PATCH] tests/toolbox.inc.sh: update regex for getting endian Update regex for getting endian in following condition: /proc/777/exe: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2 -Upstream-Status: Submited [Submitted to keyrings@vger.kernel.org ] +Upstream-Status: Submitted [Submitted to keyrings@vger.kernel.org ] Signed-off-by: Changqing Li <changqing.li@windriver.com> --- diff --git a/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..5cbe64091c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch @@ -0,0 +1,45 @@ +From 1da0cfbb9ae978822d961d8b22d8d5125c11247a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 23:46:56 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no +longer transitively included [1]. Explicitly include it for +uint8_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/USBGuard/usbguard/pull/583] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Library/Base64.cpp | 1 - + src/Library/Base64.hpp | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Library/Base64.cpp b/src/Library/Base64.cpp +index ddb28dc..0246a13 100644 +--- a/src/Library/Base64.cpp ++++ b/src/Library/Base64.cpp +@@ -22,7 +22,6 @@ + + #include "Base64.hpp" + #include <stdexcept> +-#include <cstdint> + + namespace usbguard + { +diff --git a/src/Library/Base64.hpp b/src/Library/Base64.hpp +index 0947f21..e0c745c 100644 +--- a/src/Library/Base64.hpp ++++ b/src/Library/Base64.hpp +@@ -23,6 +23,7 @@ + #endif + + #include <string> ++#include <cstdint> + #include <cstddef> + + namespace usbguard +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb b/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb index e1e087a6d0..4e96b4f41e 100644 --- a/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb @@ -12,6 +12,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/USBGuard/usbguard/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ + file://0001-include-missing-cstdint.patch \ file://0001-Add-and-use-pkgconfig-instead-of-libgcrypt-config.patch" SRC_URI[sha256sum] = "dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934" diff --git a/meta-openembedded/meta-oe/recipes-support/inih/libinih_56.bb b/meta-openembedded/meta-oe/recipes-support/inih/libinih_56.bb new file mode 100644 index 0000000000..89d68c6e16 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/inih/libinih_56.bb @@ -0,0 +1,14 @@ +SUMMARY = "inih (INI Not Invented Here)" +DESCRIPTION = "A .INI file parser written in C that was designed to be small and simple." +HOMEPAGE = "https://github.com/benhoyt/inih" +SECTION = "libs" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202" + +SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" +SRCREV = "5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b" + +inherit meson pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb deleted file mode 100644 index cf390800b9..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "C and C++ INI Library" -HOMEPAGE = "http://code.google.com/p/inih/" -PV = "0.0+gitr${SRCPV}" -PKGV = "${GITPKGVTAG}" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde" - -PR = "r3" - -# The github repository provides a cmake and pkg-config integration -SRCREV = "c858aff8c31fa63ef4d1e0176c10e5928cde9a23" -SRC_URI = "git://github.com/OSSystems/inih.git;branch=master;protocol=https \ - file://0001-include-install-header-files-without-prefix-dir-inih.patch \ - " - -UPSTREAM_CHECK_COMMITS = "1" - -S = "${WORKDIR}/git" - -inherit gitpkgv cmake - -# We don't have libinih since we only have static libraries -ALLOW_EMPTY:${PN} = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch b/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch index 6be49fbca4..16506999e2 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch +++ b/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch @@ -7,7 +7,7 @@ The include flag should point to the source directory, not the build directory. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Upstream-status: Submitted [https://github.com/libusbg/libusbg/pull/9] +Upstream-Status: Submitted [https://github.com/libusbg/libusbg/pull/9] --- examples/Makefile.am | 2 +- src/Makefile.am | 2 +- diff --git a/meta-openembedded/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch b/meta-openembedded/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch index 4872eb4f5e..dadefec33a 100644 --- a/meta-openembedded/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch +++ b/meta-openembedded/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch @@ -1,7 +1,7 @@ The original use of AC_ARG_WITH is buggy and causes expat support to be *disabled* if "--with-expat" is passed to configure. -Upstream status: pending +Upstream-Status: Pending Index: log4c-1.2.4/configure.in =================================================================== diff --git a/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch b/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch index 745f923af1..e2401bb31b 100644 --- a/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch +++ b/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch @@ -5,7 +5,7 @@ Subject: [PATCH 1/2] etc/openct.udev.in: disablePROGRAM Bug fix: https://bugzilla.redhat.com/show_bug.cgi?id=287871 -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch b/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch index d5e3fe5753..22eda729fb 100644 --- a/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch +++ b/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch @@ -5,7 +5,7 @@ Subject: [PATCH 2/2] etc/openct_usb.in: modify UDEVINFO this patch is from Fedora -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-openembedded/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch b/meta-openembedded/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch index 5b344b9e83..c6b01d06fc 100644 --- a/meta-openembedded/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch +++ b/meta-openembedded/meta-oe/recipes-support/picocom/picocom/0001-Fix-building-with-musl.patch @@ -3,7 +3,7 @@ From: Paul Eggleton <paul.eggleton@linux.intel.com> Date: Sun, 14 Jul 2019 19:13:21 -0700 Subject: [PATCH] Fix building with musl -Upstream-status: Pending +Upstream-Status: Pending Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch new file mode 100644 index 0000000000..b06135222a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch @@ -0,0 +1,60 @@ +From 4cbb225811205b51b65371d0d8abc2d2af8233b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 14:56:36 -0800 +Subject: [PATCH] Use std::atomic<int> instead of std::atomic<bool> + +GCC on RISCV does not yet support inline subword atomics [1] +Therefore avoid them until fixed + +Upstream-Status: Pending + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104338 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Foundation/include/Poco/AsyncChannel.h | 2 +- + Foundation/src/AsyncChannel.cpp | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Foundation/include/Poco/AsyncChannel.h b/Foundation/include/Poco/AsyncChannel.h +index 190bae7dd..d73ea6c72 100644 +--- a/Foundation/include/Poco/AsyncChannel.h ++++ b/Foundation/include/Poco/AsyncChannel.h +@@ -111,7 +111,7 @@ private: + NotificationQueue _queue; + std::size_t _queueSize = 0; + std::size_t _dropCount = 0; +- std::atomic<bool> _closed; ++ std::atomic<int> _closed; + }; + + +diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp +index 37cdec477..e829b180c 100644 +--- a/Foundation/src/AsyncChannel.cpp ++++ b/Foundation/src/AsyncChannel.cpp +@@ -48,11 +48,10 @@ private: + Message _msg; + }; + +- + AsyncChannel::AsyncChannel(Channel::Ptr pChannel, Thread::Priority prio): + _pChannel(pChannel), + _thread("AsyncChannel"), +- _closed(false) ++ _closed(0) + { + _thread.setPriority(prio); + } +@@ -95,7 +94,7 @@ void AsyncChannel::open() + + void AsyncChannel::close() + { +- if (!_closed.exchange(true)) ++ if (!_closed.exchange(1)) + { + if (_thread.isRunning()) + { +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb index f66a272524..51bd5611fb 100644 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.12.4.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" DEPENDS = "libpcre2 zlib" SRC_URI = "git://github.com/pocoproject/poco.git;branch=master;protocol=https \ + file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ file://run-ptest \ " SRCREV = "1211613642269b7d53bea58b02de7fcd25ece3b9" diff --git a/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/telepathy-python_fix_for_automake_1.12.patch b/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/telepathy-python_fix_for_automake_1.12.patch index f613fdce4d..0498f3ddd0 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/telepathy-python_fix_for_automake_1.12.patch +++ b/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python3-0.15.19/telepathy-python_fix_for_automake_1.12.patch @@ -9,7 +9,7 @@ of warning-errors. | make[1]: Leaving directory `/srv/home/nitin/builds2/build0/tmp/work/i586-poky-linux/telepathy-python-0.15.19-r4/telepathy-python-0.15.19/src' | make: *** [all-recursive] Error 1 -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2012/07/10 Index: telepathy-python-0.15.19/src/Makefile.am =================================================================== diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch index f4c74384f9..85423a3fec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch @@ -5,7 +5,7 @@ Subject: [PATCH] setup.py: link in sysroot, not in host directories Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Upstream-status: Unknown +Upstream-Status: Unknown --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.10.3.bb index 66aefac3d6..bb604982d0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.10.3.bb @@ -5,16 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f" DEPENDS = "boost" -SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https \ - file://0001-Do-not-strip-binaries.patch \ -" +SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https" -SRCREV = "aa304c9c7d725ffb9d10af08a3b34cb372307020" +SRCREV = "0bd8896a4010f2d91b2340570c24fa08606ec406" S = "${WORKDIR}/git" -BBCLASSEXTEND = "native" - EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" inherit cmake setuptools3 python3native @@ -23,17 +19,17 @@ PIP_INSTALL_DIST_PATH = "${S}/dist" PIP_INSTALL_PACKAGE = "pybind11" do_configure() { - cmake_do_configure + cmake_do_configure } do_compile() { - setuptools3_do_compile - cmake_do_compile + setuptools3_do_compile + cmake_do_compile } do_install() { - setuptools3_do_install - cmake_do_install + setuptools3_do_install + cmake_do_install } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-webserver/recipes-support/fcgiwrap/fcgiwrap/0001-Fix-implicit-fallthrough-warning.patch b/meta-openembedded/meta-webserver/recipes-support/fcgiwrap/fcgiwrap/0001-Fix-implicit-fallthrough-warning.patch index d05abd25ca..e160b8644a 100644 --- a/meta-openembedded/meta-webserver/recipes-support/fcgiwrap/fcgiwrap/0001-Fix-implicit-fallthrough-warning.patch +++ b/meta-openembedded/meta-webserver/recipes-support/fcgiwrap/fcgiwrap/0001-Fix-implicit-fallthrough-warning.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix implicit fallthrough warning Fixes a warning about an implicit fall through in a case statement (-Werror=implicit-fallthrough) with newer versions of GCC -Upstream-status: Submitted [https://github.com/gnosek/fcgiwrap/pull/54] +Upstream-Status: Submitted [https://github.com/gnosek/fcgiwrap/pull/54] Signed-off-by: Joshua Watt <Joshua.Watt@garmin.com> --- configure.ac | 3 + diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch index 9aad894e0c..1ca26ca0dd 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch @@ -3,7 +3,7 @@ Disable OS version check in status screen The code is not able to accurately detect the correct distro/version at the moment. -Upstream-status: Inappropriate +Upstream-Status: Inappropriate Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch index 8cb74c4b13..787bd8c69b 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch @@ -6,7 +6,7 @@ since these shouldn't be modified from the web interface. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Upstream-status: Pending +Upstream-Status: Pending --- webmin-1.570.orig/mount/index.cgi +++ webmin-1.570/mount/index.cgi diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch index 2cbc627076..c6c1f0df79 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch @@ -3,7 +3,7 @@ From: Diego Rondini <diego.ml@zoho.com> Date: Thu, 18 Feb 2016 15:44:06 +0100 Subject: [PATCH] Adjust Mysql config defaults -Upstream-status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Diego Rondini <diego.ml@zoho.com> --- diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/proftpd-config-fix.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/proftpd-config-fix.patch index 492a652d48..4e78ff4c22 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/proftpd-config-fix.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/proftpd-config-fix.patch @@ -1,4 +1,4 @@ -Upstream-status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/samba-config-fix.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/samba-config-fix.patch index 46645ac30e..d9ea2d145e 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/samba-config-fix.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/samba-config-fix.patch @@ -1,4 +1,4 @@ -Upstream-status: Inappropriate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> diff --git a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_5.%.bbappend b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_6.%.bbappend index e8027ff38d..e8027ff38d 100644 --- a/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_5.%.bbappend +++ b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_6.%.bbappend diff --git a/meta-security/recipes-ids/samhain/samhain-client.bb b/meta-security/recipes-ids/samhain/samhain-client.bb index 2b99e20169..0de9c344ab 100644 --- a/meta-security/recipes-ids/samhain/samhain-client.bb +++ b/meta-security/recipes-ids/samhain/samhain-client.bb @@ -8,5 +8,8 @@ EXTRA_OECONF += " \ --with-port=${SAMHAIN_PORT} \ " +MODE_NAME = "client" +SAMHAIN_MODE = "client" + RDEPENDS:${PN} = "acl zlib attr bash" RCONFLICTS:${PN} = "samhain-standalone" diff --git a/meta-security/recipes-ids/samhain/samhain-server.bb b/meta-security/recipes-ids/samhain/samhain-server.bb index 51bce07cd1..8bae2d204b 100644 --- a/meta-security/recipes-ids/samhain/samhain-server.bb +++ b/meta-security/recipes-ids/samhain/samhain-server.bb @@ -8,6 +8,9 @@ SRC_URI += "file://samhain-server-volatiles \ file://samhain-server-volatiles.conf \ " +MODE_NAME = "server" +SAMHAIN_MODE = "server" + TARGET_CC_ARCH += "${LDFLAGS}" do_install:append() { diff --git a/meta-security/recipes-ids/samhain/samhain-standalone.bb b/meta-security/recipes-ids/samhain/samhain-standalone.bb index b832dc84b9..ae9ed2b13b 100644 --- a/meta-security/recipes-ids/samhain/samhain-standalone.bb +++ b/meta-security/recipes-ids/samhain/samhain-standalone.bb @@ -7,6 +7,9 @@ SRC_URI += "file://samhain-not-run-ptest-on-host.patch \ PROVIDES += "samhain" +MODE_NAME = "standalone" +SAMHAIN_MODE = "no" + SYSTEMD_SERVICE:${PN} = "samhain.service" inherit ptest diff --git a/meta-security/recipes-ids/samhain/samhain.inc b/meta-security/recipes-ids/samhain/samhain.inc index eb8592d34b..8967d722e0 100644 --- a/meta-security/recipes-ids/samhain/samhain.inc +++ b/meta-security/recipes-ids/samhain/samhain.inc @@ -40,14 +40,6 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "${INITSCRIPT_NAME}.service" SYSTEMD_AUTO_ENABLE = "disable" -# mode mapping: -# BPN MODE_NAME SAMHAIN_MODE -# samhain-standalone standalone no -# samhain-client client client -# samhain-server server server -MODE_NAME = "${@d.getVar('BPN').split('-')[1]}" -SAMHAIN_MODE = "${@oe.utils.ifelse(d.getVar('MODE_NAME') == 'standalone', 'no', '${MODE_NAME}')}" - # supports mysql|postgresql|oracle|odbc but postgresql is the only one available PACKAGECONFIG ??= "postgresql ps \ diff --git a/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend b/meta-security/recipes-kernel/linux/linux-yocto_6.%.bbappend index 1d9054faaa..1d9054faaa 100644 --- a/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend +++ b/meta-security/recipes-kernel/linux/linux-yocto_6.%.bbappend diff --git a/poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf index 5aadf6e707..530b068757 100644 --- a/poky/meta/conf/bitbake.conf +++ b/poky/meta/conf/bitbake.conf @@ -959,7 +959,7 @@ BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ sstate-lockfile-shared prefuncs postfuncs export_func deptask rdeptask \ recrdeptask nodeprrecs stamp-extra-info sstate-outputdirs filename lineno \ progress mcdepends number_threads" -BB_HASH_CODEPARSER_VALS = "LOGFIFO=/ T=/ WORKDIR=/ DATE=1234 TIME=1234 PV=0.0-1 PN=nopn METADATA_REVISION=1234" +BB_HASH_CODEPARSER_VALS = "LOGFIFO=/ T=/ WORKDIR=/ DATE=1234 TIME=1234 PV=0.0-1 PN=no-pn METADATA_REVISION=1234" MLPREFIX ??= "" MULTILIB_VARIANTS ??= "" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index 23c2e02d0d..ec7ea90d16 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -339,7 +339,7 @@ RECIPE_MAINTAINER:pn-libgcc-initial = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER:pn-libgcrypt = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER:pn-libgfortran = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER:pn-libgit2 = "Unassigned <unassigned@yoctoproject.org>" -RECIPE_MAINTAINER:pn-libgloss = "Alejandro Hernandez <aehs29@gmail.com>" +RECIPE_MAINTAINER:pn-libgloss = "Alejandro Hernandez <alejandro@enedino.org>" RECIPE_MAINTAINER:pn-libglu = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-libgpg-error = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER:pn-libgudev = "Ross Burton <ross.burton@arm.com>" @@ -535,7 +535,7 @@ RECIPE_MAINTAINER:pn-nativesdk-libtool = "Richard Purdie <richard.purdie@linuxfo RECIPE_MAINTAINER:pn-nativesdk-packagegroup-sdk-host = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER:pn-nativesdk-qemu-helper = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER:pn-nativesdk-sdk-provides-dummy = "Richard Purdie <richard.purdie@linuxfoundation.org>" -RECIPE_MAINTAINER:pn-newlib = "Alejandro Hernandez <aehs29@gmail.com>" +RECIPE_MAINTAINER:pn-newlib = "Alejandro Hernandez <alejandro@enedino.org>" RECIPE_MAINTAINER:pn-ncurses = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER:pn-neard = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER:pn-net-tools = "Unassigned <unassigned@yoctoproject.org>" diff --git a/poky/meta/recipes-core/meta/cve-update-db-native.bb b/poky/meta/recipes-core/meta/cve-update-db-native.bb index e042e67b09..079f062f79 100644 --- a/poky/meta/recipes-core/meta/cve-update-db-native.bb +++ b/poky/meta/recipes-core/meta/cve-update-db-native.bb @@ -130,10 +130,7 @@ def update_db_file(db_tmp_file, d): response = urllib.request.urlopen(meta_url, timeout=cve_socket_timeout) except urllib.error.URLError as e: cve_f.write('Warning: CVE db update error, Unable to fetch CVE data.\n\n') - bb.warn("Failed to fetch CVE data (%s)" % e) - import socket - result = socket.getaddrinfo("nvd.nist.gov", 443, proto=socket.IPPROTO_TCP) - bb.warn("Host IPs are %s" % (", ".join(t[4][0] for t in result))) + bb.warn("Failed to fetch CVE data (%s)" % e.reason) return False if response: diff --git a/poky/meta/recipes-core/newlib/libgloss/fix-rs6000-crt0.patch b/poky/meta/recipes-core/newlib/libgloss/fix-rs6000-crt0.patch index c220fb8437..8c29fea8cf 100644 --- a/poky/meta/recipes-core/newlib/libgloss/fix-rs6000-crt0.patch +++ b/poky/meta/recipes-core/newlib/libgloss/fix-rs6000-crt0.patch @@ -5,35 +5,41 @@ name for crt0 in specific, so performing all of them results in an error during do_install, we simply modify the name of the objects so the installation can proceed and leave it to the user to select which object files to use. -Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> -Index: newlib-3.0.0/libgloss/rs6000/Makefile.in +01/2023: Rebased for libgloss 4.3.0 + +Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> + + +Index: git/libgloss/rs6000/Makefile.in =================================================================== ---- newlib-3.0.0.orig/libgloss/rs6000/Makefile.in -+++ newlib-3.0.0/libgloss/rs6000/Makefile.in -@@ -358,7 +358,7 @@ install-sim: - set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done +--- git.orig/libgloss/rs6000/Makefile.in ++++ git/libgloss/rs6000/Makefile.in +@@ -362,7 +362,7 @@ install-sim: install-mvme: + ${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR} - set -e; for x in ${MVME_CRT0} ${MVME_BSP} ${MVME_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done + set -e; for x in ${MVME_CRT0} ${MVME_BSP} ${MVME_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/mvme-$$x; done install-solaris: - set -e; for x in ${SOLARIS_CRT0} ${SOLARIS_BSP} ${SOLARIS_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done -@@ -367,15 +367,15 @@ install-linux: - set -e; for x in ${LINUX_CRT0} ${LINUX_BSP} ${LINUX_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done + ${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR} +@@ -374,17 +374,17 @@ install-linux: install-yellowknife: + ${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR} - set -e; for x in ${YELLOWKNIFE_CRT0} ${YELLOWKNIFE_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done + set -e; for x in ${YELLOWKNIFE_CRT0} ${YELLOWKNIFE_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/yellowknife-$$x; done set -e; for x in ${YELLOWKNIFE_SCRIPTS}; do ${INSTALL_DATA} $(srcdir)/$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done install-ads: + ${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR} - set -e; for x in ${ADS_CRT0} ${ADS_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done + set -e; for x in ${ADS_CRT0} ${ADS_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/ads-$$x; done set -e; for x in ${ADS_SCRIPTS}; do ${INSTALL_DATA} $(srcdir)/$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done install-mbx: + ${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR} - set -e; for x in ${MBX_CRT0} ${MBX_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done + set -e; for x in ${MBX_CRT0} ${MBX_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/mbx-$$x; done set -e; for x in ${MBX_SCRIPTS} ${MBX_SPECS}; do ${INSTALL_DATA} $(srcdir)/$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done diff --git a/poky/meta/recipes-core/newlib/libgloss/libgloss-build-without-nostdinc.patch b/poky/meta/recipes-core/newlib/libgloss/libgloss-build-without-nostdinc.patch new file mode 100644 index 0000000000..2b66155eea --- /dev/null +++ b/poky/meta/recipes-core/newlib/libgloss/libgloss-build-without-nostdinc.patch @@ -0,0 +1,30 @@ +Upstream-Status: Inappropriate [OE-Specific] + +Since commit e0c0ad82 libgloss started passing the -nostdinc to CC. + +They dont want to build against C library headers that are already in +the system to avoid pollution, however, we purposely build libgloss +against the newly built newlib C library, thats why we keep newlib +and libgloss in separate recipes and create a dependency between them. + +This causes an issue where bitbake stops finding newlib headers while +libgloss is being built. + +Do not pass -nostdinc to CC to maintain current behavior of +TCLIBC=newlib + + +Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> +Index: newlib-3.0.0/libgloss/configure +=================================================================== +--- newlib-3.0.0.orig/libgloss/configure ++++ newlib-3.0.0/libgloss/configure +@@ -5106,7 +5106,7 @@ fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_compiler_isystem" >&5 + $as_echo "$libc_cv_compiler_isystem" >&6; } +-CC="$CC -nostdinc $libc_cv_compiler_isystem" ++CC="$CC $libc_cv_compiler_isystem" + + host_makefile_frag_path=$host_makefile_frag + diff --git a/poky/meta/recipes-core/newlib/libgloss_4.2.0.bb b/poky/meta/recipes-core/newlib/libgloss_4.3.0.bb index 8c8ee91395..7e34e33c7a 100644 --- a/poky/meta/recipes-core/newlib/libgloss_4.2.0.bb +++ b/poky/meta/recipes-core/newlib/libgloss_4.3.0.bb @@ -4,8 +4,9 @@ DEPENDS += "newlib" FILESEXTRAPATHS:prepend := "${THISDIR}/libgloss:" +SRC_URI:append = " file://libgloss-build-without-nostdinc.patch" SRC_URI:append:powerpc = " file://fix-rs6000-crt0.patch" -SRC_URI:append:arm = " file://fix_makefile_include_arm_h.patch" +SRC_URI:append:powerpc = " file://fix-rs6000-cflags.patch" do_configure() { ${S}/libgloss/configure ${EXTRA_OECONF} @@ -28,6 +29,8 @@ do_install:append() { # Split packages correctly FILES:${PN} += "${libdir}/*.ld ${libdir}/*.specs" FILES:${PN}-dev += "${libdir}/cpu-init/*" +# RiscV installation moved the syscall header to this location +FILES:${PN}-dev += "${prefix}/${TARGET_SYS}/include/machine/*.h" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/poky/meta/recipes-core/newlib/newlib.inc b/poky/meta/recipes-core/newlib/newlib.inc index 27b52a43af..5351a9f991 100644 --- a/poky/meta/recipes-core/newlib/newlib.inc +++ b/poky/meta/recipes-core/newlib/newlib.inc @@ -10,24 +10,19 @@ LIC_FILES_CHKSUM = " \ file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LIBGLOSS;md5=c0469b6ebb847a75781066be515f032d \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.NEWLIB;md5=8bb75595dbcc7d45e5c0d116d7bdf6ce \ + file://COPYING.NEWLIB;md5=5a9d477b5f4eab20dccf655a77107a6e \ file://newlib/libc/posix/COPYRIGHT;md5=103468ff1982be840fdf4ee9f8b51bbf \ - file://newlib/libc/sys/linux/linuxthreads/LICENSE;md5=73640207fbc79b198c7ffd4ad4d97aa0 \ " -# Newlib maintainers sometimes publish the source -# from a specific snapshot, after an upgrade we can -# delete the following line and keep the empty default -NEWLIB_SNAPSHOT = ".20211231" -NEWLIB_SNAPSHOT ?= "" -SRC_URI = "https://sourceware.org/pub/newlib/newlib-${PV}${NEWLIB_SNAPSHOT}.tar.gz" -SRC_URI[sha256sum] = "c3a0e8b63bc3bef1aeee4ca3906b53b3b86c8d139867607369cb2915ffc54435" - +BASEVER = "4.3.0" +PV = "${BASEVER}+git${SRCPV}" +SRC_URI = "git://sourceware.org/git/newlib-cygwin.git;protocol=https;branch=main" +SRCREV="9e09d6ed83cce4777a5950412647ccc603040409" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "virtual/${TARGET_PREFIX}gcc" -S = "${WORKDIR}/newlib-${PV}${NEWLIB_SNAPSHOT}" +S = "${WORKDIR}/git" B = "${WORKDIR}/build" ## disable stdlib @@ -52,6 +47,12 @@ EXTRA_OECONF = " \ do_configure[cleandirs] = "${B}" +# We need a dummy limits.h to pass preprocessor checks +do_configure:append(){ + install -d ${STAGING_INCDIR} + touch ${STAGING_INCDIR}/limits.h +} + do_install() { oe_runmake install DESTDIR='${D}' } diff --git a/poky/meta/recipes-core/newlib/newlib_4.2.0.bb b/poky/meta/recipes-core/newlib/newlib_git.bb index fb922d65d1..fb922d65d1 100644 --- a/poky/meta/recipes-core/newlib/newlib_4.2.0.bb +++ b/poky/meta/recipes-core/newlib/newlib_git.bb diff --git a/poky/meta/recipes-devtools/gdb/gdb.inc b/poky/meta/recipes-devtools/gdb/gdb.inc index 5a9fe271b9..a5dc554581 100644 --- a/poky/meta/recipes-devtools/gdb/gdb.inc +++ b/poky/meta/recipes-devtools/gdb/gdb.inc @@ -15,5 +15,6 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ file://0008-Fix-invalid-sigprocmask-call.patch \ file://0009-gdbserver-ctrl-c-handling.patch \ file://readline-8.2.patch \ + file://0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ " SRC_URI[sha256sum] = "0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed" diff --git a/poky/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/poky/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch new file mode 100644 index 0000000000..3e29327613 --- /dev/null +++ b/poky/meta/recipes-devtools/gdb/gdb/0008-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch @@ -0,0 +1,55 @@ +From 48906e1038e469b429aa35d0f967730a929c3880 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 15 Jan 2023 00:16:25 -0800 +Subject: [PATCH 8/8] Define alignof using _Alignof when using C11 or newer + +WG14 N2350 made very clear that it is an UB having type definitions +within "offsetof" [1]. This patch enhances the implementation of macro +alignof_slot to use builtin "_Alignof" to avoid undefined behavior on +when using std=c11 or newer + +clang 16+ has started to flag this [2] + +Fixes build when using -std >= gnu11 and using clang16+ + +Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it +may support C11, exclude those compilers too + +gnulib needs this fix and then it will be applied to downstream packages +like gdb [3] + +[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm +[2] https://reviews.llvm.org/D133574 +[3] https://public-inbox.org/bug-gnulib/20230114232744.215167-1-raj.khem@gmail.com/T/#u + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d404c7dd974cc65f894526f4a1b76bc1dcd8d82] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libiberty/sha1.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libiberty/sha1.c b/libiberty/sha1.c +index 504f06d3b9b..790ada82443 100644 +--- a/libiberty/sha1.c ++++ b/libiberty/sha1.c +@@ -229,7 +229,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) + if (len >= 64) + { + #if !_STRING_ARCH_unaligned ++/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023 ++ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>. ++ clang versions < 8.0.0 have the same bug. */ ++#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \ ++ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \ ++ && !defined __clang__) \ ++ || (defined __clang__ && __clang_major__ < 8)) + # define alignof(type) offsetof (struct { char c; type x; }, x) ++#else ++# define alignof(type) _Alignof(type) ++#endif + # define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0) + if (UNALIGNED_P (buffer)) + while (len > 64) +-- +2.39.0 + diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch new file mode 100644 index 0000000000..fbee24a538 --- /dev/null +++ b/poky/meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch @@ -0,0 +1,34 @@ +From 687d9fb9e3de832379680e9d5268331011c92afa Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 08:53:26 -0800 +Subject: [PATCH] drd/tests: Include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer +transitively included [1]. Explicitly include it for uint{32,64}_t. + +Fixes +tsan_thread_wrappers_pthread.h:91:9: error: 'int64_t' does not name a type + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=464859] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + drd/tests/tsan_thread_wrappers_pthread.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drd/tests/tsan_thread_wrappers_pthread.h b/drd/tests/tsan_thread_wrappers_pthread.h +index f15e6ad..4cc8062 100644 +--- a/drd/tests/tsan_thread_wrappers_pthread.h ++++ b/drd/tests/tsan_thread_wrappers_pthread.h +@@ -55,6 +55,7 @@ + #define NO_TLS + #endif + ++#include <cstdint> + #include <string> + using namespace std; + +-- +2.39.1 + diff --git a/poky/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb b/poky/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb index 1e1f0ccdd3..701dbf3833 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb +++ b/poky/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb @@ -39,6 +39,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ file://0001-docs-Disable-manual-validation.patch \ + file://0001-drd-tests-Include-missing-cstdint.patch \ " SRC_URI[sha256sum] = "8536c031dbe078d342f121fa881a9ecd205cb5a78e639005ad570011bdb9f3c6" UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch deleted file mode 100644 index 02cc9a2a70..0000000000 --- a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch +++ /dev/null @@ -1,173 +0,0 @@ -From f81b60ebcbbfd9548c8aa1e388662c429068d1e3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Sat, 8 May 2021 21:58:54 +0200 -Subject: [PATCH] Add use_prebuilt_tools option - -This allows using the gdk-pixbuf tools from the host to -build and install tests in a cross-compile scenarion. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/119] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - gdk-pixbuf/meson.build | 11 +++++++++-- - meson.build | 6 +++--- - meson_options.txt | 4 ++++ - tests/meson.build | 16 ++++++++-------- - thumbnailer/meson.build | 24 ++++++++++++++++++------ - 5 files changed, 42 insertions(+), 19 deletions(-) - -diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build -index 54ff9dd..2e321cf 100644 ---- a/gdk-pixbuf/meson.build -+++ b/gdk-pixbuf/meson.build -@@ -342,13 +342,20 @@ foreach bin: gdkpixbuf_bin - include_directories: [ root_inc, gdk_pixbuf_inc ], - c_args: common_cflags + gdk_pixbuf_cflags, - install: true) -- meson.override_find_program(bin_name, bin) -+ if not get_option('use_prebuilt_tools') -+ meson.override_find_program(bin_name, bin) -+ endif - - # Used in tests - set_variable(bin_name.underscorify(), bin) - endforeach - --if not meson.is_cross_build() -+if get_option('use_prebuilt_tools') -+ gdk_pixbuf_query_loaders = find_program('gdk-pixbuf-query-loaders', required: true) -+ gdk_pixbuf_pixdata = find_program('gdk-pixbuf-pixdata', required: true) -+endif -+ -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - # The 'loaders.cache' used for testing, so we don't accidentally - # load the installed cache; we always build it by default - loaders_cache = custom_target('loaders.cache', -diff --git a/meson.build b/meson.build -index 813bd43..a93e6f7 100644 ---- a/meson.build -+++ b/meson.build -@@ -369,18 +369,18 @@ subdir('gdk-pixbuf') - # i18n - subdir('po') - --if not meson.is_cross_build() -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - if get_option('tests') - subdir('tests') - endif -- subdir('thumbnailer') - endif -+subdir('thumbnailer') - - # Documentation - build_docs = get_option('gtk_doc') or get_option('docs') - subdir('docs') - --if not meson.is_cross_build() -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - meson.add_install_script('build-aux/post-install.py', - gdk_pixbuf_bindir, - gdk_pixbuf_libdir, -diff --git a/meson_options.txt b/meson_options.txt -index d198d99..1c899e9 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -53,4 +53,8 @@ option('gio_sniffing', - description: 'Perform file type detection using GIO (Unused on MacOS and Windows)', - type: 'boolean', - value: true) -+option('use_prebuilt_tools', -+ description: 'Use prebuilt gdk-pixbuf tools from the host for cross-compilation', -+ type: 'boolean', -+ value: false) - -diff --git a/tests/meson.build b/tests/meson.build -index 28c2525..d97c02d 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -5,6 +5,12 @@ - # $PATH. Ideally we should use gnome.compile_resources() and let Meson deal with - # this problem: See https://github.com/mesonbuild/meson/issues/8266. - if enabled_loaders.contains('png') and host_system != 'windows' -+ -+ resources_deps = [loaders_cache,] -+ if not get_option('use_prebuilt_tools') -+ resources_deps += [gdk_pixbuf_pixdata,] -+ endif -+ - # Resources; we cannot use gnome.compile_resources() here, because we need to - # override the environment in order to use the utilities we just built instead - # of the system ones -@@ -21,10 +27,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: resources_deps, - ) - - resources_h = custom_target('resources.h', -@@ -40,10 +43,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: resources_deps, - ) - no_resources = false - else -diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build -index b6a206d..9336c21 100644 ---- a/thumbnailer/meson.build -+++ b/thumbnailer/meson.build -@@ -6,13 +6,29 @@ bin = executable('gdk-pixbuf-thumbnailer', - ], - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ], - install: true) --meson.override_find_program('gdk-pixbuf-thumbnailer', bin) -+if not get_option('use_prebuilt_tools') -+ meson.override_find_program('gdk-pixbuf-thumbnailer', bin) -+endif - - gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types', - 'gdk-pixbuf-print-mime-types.c', -+ install: true, - c_args: common_cflags, - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ]) - -+if get_option('use_prebuilt_tools') -+ gdk_pixbuf_print_mime_types = find_program('gdk-pixbuf-print-mime-types', required: true) -+endif -+ -+thumbnailer_deps = [loaders_cache,] -+ -+if not get_option('use_prebuilt_tools') -+ thumbnailer_deps += [ -+ gdk_pixbuf_print_mime_types, -+ gdk_pixbuf_pixdata, -+ ] -+endif -+ - custom_target('thumbnailer', - input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', - output: 'gdk-pixbuf-thumbnailer.thumbnailer', -@@ -25,10 +41,6 @@ custom_target('thumbnailer', - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_print_mime_types, -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: thumbnailer_deps, - install: true, - install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) diff --git a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch new file mode 100644 index 0000000000..7250fa3f62 --- /dev/null +++ b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch @@ -0,0 +1,66 @@ +From 9d3b374e75692da3d1d05344a1693c85a3098f47 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Thu, 26 Jan 2023 20:29:46 +0100 +Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile + settings + +There is no need to completely disable tests: most of them +do not require running target executables at build time, +and so can be built and installed. + +This requires inserting a couple of specific guards around +items that do require running target executables. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/150] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + meson.build | 6 +++--- + tests/meson.build | 10 ++++++---- + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 8a16c8f..7c8b20f 100644 +--- a/meson.build ++++ b/meson.build +@@ -369,10 +369,10 @@ subdir('gdk-pixbuf') + # i18n + subdir('po') + ++if get_option('tests') ++ subdir('tests') ++endif + if not meson.is_cross_build() +- if get_option('tests') +- subdir('tests') +- endif + subdir('thumbnailer') + endif + +diff --git a/tests/meson.build b/tests/meson.build +index 28c2525..c45e765 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -4,7 +4,7 @@ + # gdk-pixbuf-pixdata from build directory because it needs all DLL locations in + # $PATH. Ideally we should use gnome.compile_resources() and let Meson deal with + # this problem: See https://github.com/mesonbuild/meson/issues/8266. +-if enabled_loaders.contains('png') and host_system != 'windows' ++if enabled_loaders.contains('png') and host_system != 'windows' and not meson.is_cross_build() + # Resources; we cannot use gnome.compile_resources() here, because we need to + # override the environment in order to use the utilities we just built instead + # of the system ones +@@ -166,9 +166,11 @@ endif + test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ] + test_args = [ '-k' ] + test_env = environment() +-test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +-test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +-test_env.set('GDK_PIXBUF_MODULE_FILE', loaders_cache.full_path()) ++if not meson.is_cross_build() ++ test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) ++ test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) ++ test_env.set('GDK_PIXBUF_MODULE_FILE', loaders_cache.full_path()) ++endif + + foreach test_name, test_data: installed_tests + test_sources = [ test_name + '.c', 'test-common.c' ] diff --git a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb index aa44515fbb..cca89a9059 100644 --- a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb +++ b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb @@ -12,15 +12,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SECTION = "libs" -DEPENDS = "glib-2.0 gdk-pixbuf-native shared-mime-info" -DEPENDS:remove:class-native = "gdk-pixbuf-native" +DEPENDS = "glib-2.0 shared-mime-info" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://run-ptest \ file://fatal-loader.patch \ - file://0001-Add-use_prebuilt_tools-option.patch \ + file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ " SRC_URI[sha256sum] = "ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b" @@ -46,14 +45,6 @@ PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" EXTRA_OEMESON = "-Dman=false" -EXTRA_OEMESON:append:class-target = " \ - -Duse_prebuilt_tools=true \ -" - -EXTRA_OEMESON:append:class-nativesdk = " \ - -Duse_prebuilt_tools=true \ -" - PACKAGES =+ "${PN}-xlib" # For GIO image type sniffing @@ -115,10 +106,6 @@ do_install:append:class-native() { XDG_DATA_DIRS=${STAGING_DATADIR} \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \ - XDG_DATA_DIRS=${STAGING_DATADIR} \ - GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ XDG_DATA_DIRS=${STAGING_DATADIR} \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch new file mode 100644 index 0000000000..bfc49294b0 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-upper-bound-for-v5.10.163.patch @@ -0,0 +1,52 @@ +From 4fd2615b87b3cac0fd5bdc5fc82db05f6fcfdecf Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Tue, 17 Jan 2023 12:16:04 -0500 +Subject: [PATCH] fix: jbd2 upper bound for v5.10.163 + +Use the correct upper bound of 5,11,0. + +Change-Id: I435b44b940c7346ed8c3ef0d445365ed156702d0 +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> + +Upstream-Status: Backport +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + include/instrumentation/events/jbd2.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h +index f7993511..9b77ab92 100644 +--- a/include/instrumentation/events/jbd2.h ++++ b/include/instrumentation/events/jbd2.h +@@ -28,7 +28,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint, + ) + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ +- || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ ++ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) +@@ -97,7 +97,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction, + #endif + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ +- || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ ++ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) +@@ -140,7 +140,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data, + ) + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ +- || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ ++ || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) +-- +2.35.4 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch new file mode 100644 index 0000000000..8067cffaab --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-modules/fix-jbd2-use-the-correct-print-format-v5.10.163.patch @@ -0,0 +1,61 @@ +From dd7be14bd04c1de309ba267097b03a308da87dae Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Tue, 17 Jan 2023 11:03:12 -0500 +Subject: [PATCH] fix: jbd2: use the correct print format (v5.10.163) + +See upstream commit : + + commit d87a7b4c77a997d5388566dd511ca8e6b8e8a0a8 + Author: Bixuan Cui <cuibixuan@linux.alibaba.com> + Date: Tue Oct 11 19:33:44 2022 +0800 + + jbd2: use the correct print format + + The print format error was found when using ftrace event: + <...>-1406 [000] .... 23599442.895823: jbd2_end_commit: dev 252,8 transaction -1866216965 sync 0 head -1866217368 + <...>-1406 [000] .... 23599442.896299: jbd2_start_commit: dev 252,8 transaction -1866216964 sync 0 + + Use the correct print format for transaction, head and tid. + +Change-Id: I7601f5cbb86495c2607be7b11e02724c90b3ebf9 +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> + +Upstream-Status: Backport +Signed-off-by: Armin Kuster <akuster@mvista.com> + +--- + include/instrumentation/events/jbd2.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h +index d5d8ea0c..f7993511 100644 +--- a/include/instrumentation/events/jbd2.h ++++ b/include/instrumentation/events/jbd2.h +@@ -28,6 +28,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint, + ) + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ ++ || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) +@@ -96,6 +97,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction, + #endif + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ ++ || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) +@@ -138,6 +140,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data, + ) + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ ++ || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ + || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ + || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ + || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) +-- +2.35.4 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb index 542f42ae19..3cfc1bc58e 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-modules_2.13.8.bb @@ -11,6 +11,8 @@ include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0009-Rename-genhd-wrapper-to-blkdev.patch \ + file://fix-jbd2-use-the-correct-print-format-v5.10.163.patch \ + file://fix-jbd2-upper-bound-for-v5.10.163.patch \ " # Use :append here so that the patch is applied also when using devupstream diff --git a/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb index 9afd6714f0..38282e58f1 100644 --- a/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +++ b/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://www.yoctoproject.org/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -inherit kernel-arch +inherit kernel-arch linux-kernel-base inherit pkgconfig PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch b/poky/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch new file mode 100644 index 0000000000..1ff9dcea7e --- /dev/null +++ b/poky/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch @@ -0,0 +1,30 @@ +From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@redhat.com> +Date: Mon, 16 Jan 2023 16:55:26 -0800 +Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in + ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689 + +Unreviewed build fix. + +* Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h: + +Canonical link: https://commits.webkit.org/258968@main + +Upstream-Status: Backport [https://bugs.webkit.org/show_bug.cgi?id=250689] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h +index 94cb93e01fc0..ec7bda372f30 100644 +--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h ++++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h +@@ -12,6 +12,7 @@ + + #include <algorithm> + #include <array> ++#include <cstdint> + #include <string> + #include <vector> + diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb index f076fb0498..5d8d212871 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb @@ -14,6 +14,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://reproducibility.patch \ file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ + file://d318bb461f040b90453bc4e100dcf967243ecd98.patch \ " SRC_URI[sha256sum] = "41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a" diff --git a/poky/scripts/bitbake-prserv-tool b/poky/scripts/bitbake-prserv-tool index bed97bd8ac..80028342b1 100755 --- a/poky/scripts/bitbake-prserv-tool +++ b/poky/scripts/bitbake-prserv-tool @@ -17,8 +17,11 @@ help () clean_cache() { s=`bitbake -e | grep ^CACHE= | cut -f2 -d\"` + # Stop any active memory resident server + bitbake -m + # Remove cache entries since we want to trigger a full reparse if [ "x${s}" != "x" ]; then - rm -rf ${s} + rm -f ${s}/bb_cache*.dat.* fi } @@ -62,7 +65,7 @@ do_migrate_localcount () return 1 fi - rm -rf $df + rm -f $df clean_cache echo "Exporting LOCALCOUNT to AUTOINCs..." bitbake -R conf/migrate_localcount.conf -p |