Compare commits
33
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0901a670a8 | ||
|
|
fee18cca53 | ||
|
|
80f25d4706 | ||
|
|
f6fa3324eb | ||
|
|
c4a56d3f6d | ||
|
|
1eec67d164 | ||
|
|
ee65a2119a | ||
|
|
3ee745782a | ||
|
|
8e5a5a9bcc | ||
|
|
928494b785 | ||
|
|
f39d38d77a | ||
|
|
7dd56b6cd9 | ||
|
|
014a8201c8 | ||
|
|
4c9b13b8dd | ||
|
|
7025f76274 | ||
|
|
e35c5ee607 | ||
|
|
a0964a9157 | ||
|
|
4033902ad0 | ||
|
|
0c44722b0c | ||
|
|
773a89d414 | ||
|
|
0fd5860280 | ||
|
|
e02e59d124 | ||
|
|
e67568ceda | ||
|
|
58ff0cb5c4 | ||
|
|
47c5ac28e1 | ||
|
|
07a444d088 | ||
|
|
20c2b2f76c | ||
|
|
ed590a22e2 | ||
|
|
5d49bc51e0 | ||
|
|
1ec30e6f11 | ||
|
|
39a5490072 | ||
|
|
b617eb3281 | ||
|
|
366d403bed |
+4
-5
@@ -271,12 +271,11 @@ package/am33x-cm3/0004-Makefile-add-fno-builtin.patch lib_patch.Upstream
|
||||
package/am33x-cm3/S93-am335x-pm-firmware-load lib_sysv.Variables
|
||||
package/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch lib_patch.Upstream
|
||||
package/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch lib_patch.Upstream
|
||||
package/android-tools/0003-Fix-build-issue-with-uclibc.patch lib_patch.Upstream
|
||||
package/android-tools/0004-Fix-build-issue-with-musl.patch lib_patch.Upstream
|
||||
package/android-tools/0005-Use-pkgconf-to-get-libs-deps.patch lib_patch.Upstream
|
||||
package/android-tools/0006-fix-big-endian-build.patch lib_patch.Upstream
|
||||
package/android-tools/0007-include-cdefs-h-when-needed.patch lib_patch.Upstream
|
||||
package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch lib_patch.Sob lib_patch.Upstream
|
||||
package/android-tools/0005-makefiles-use-pkgconf-to-get-libs-deps.patch lib_patch.Upstream
|
||||
package/android-tools/0006-Fix-build-on-big-endian-systems.patch lib_patch.Upstream
|
||||
package/android-tools/0007-Include-cdefs.h-wherever-it-is-needed.patch lib_patch.Upstream
|
||||
package/android-tools/0008-usb_linux.c-fix-minor-major-build-failure-due-to-gli.patch lib_patch.Upstream
|
||||
package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch lib_patch.Upstream
|
||||
package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch lib_patch.Upstream
|
||||
package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch lib_patch.Upstream
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
2024.11-rc3, released Decemmber 5th, 2024
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
Updated/fixed packages: alsa-lib, android-tools, bats-core,
|
||||
doxygen, frr, gnutls, libvpl, linux-tools, lmbench, lrzsz,
|
||||
musl, nfs-utils, opkg, polkit, postgresql, procps-ng,
|
||||
python-psycopg2, quagga, rt-tests, rust, sexpect
|
||||
|
||||
2024.11-rc2, released November 23rd, 2024
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
@@ -963,7 +963,7 @@ config BR2_FORTIFY_SOURCE_2
|
||||
# gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61164
|
||||
depends on !BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_GCC_AT_LEAST_6
|
||||
help
|
||||
This option sets _FORTIFY_SOURCES to 2 and some more
|
||||
This option sets _FORTIFY_SOURCE to 2 and some more
|
||||
checking is added, but some conforming programs might fail.
|
||||
Also adds checks at run-time (detected buffer overflow
|
||||
terminates the program)
|
||||
@@ -972,7 +972,7 @@ config BR2_FORTIFY_SOURCE_3
|
||||
bool "Extended"
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12
|
||||
help
|
||||
This option sets _FORTIFY_SOURCES to 3 and even more
|
||||
This option sets _FORTIFY_SOURCE to 3 and even more
|
||||
checking is added compared to level 2. Extends checks at
|
||||
run-time that can introduce an additional performance
|
||||
overhead.
|
||||
|
||||
-53
@@ -2119,11 +2119,6 @@ F: package/python-huepy/
|
||||
F: package/python-tqdm/
|
||||
F: package/rtl8189es/
|
||||
|
||||
N: Louis-Paul Cordier <lpdev@cordier.org>
|
||||
F: package/intel-gmmlib/
|
||||
F: package/intel-mediadriver/
|
||||
F: package/intel-mediasdk/
|
||||
|
||||
N: Luca Ceresoli <luca.ceresoli@bootlin.com>
|
||||
F: board/olimex/a20_olinuxino/
|
||||
F: board/zynq/
|
||||
@@ -3370,54 +3365,6 @@ F: package/casync/
|
||||
F: package/gloox/
|
||||
F: package/tpm2-pkcs11/
|
||||
|
||||
N: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
F: fs/squashfs/
|
||||
F: package/asterisk/
|
||||
F: package/cegui/
|
||||
F: package/dahdi-linux/
|
||||
F: package/dahdi-tools/
|
||||
F: package/dbus-broker/
|
||||
F: package/dtc/
|
||||
F: package/dtv-scan-tables/
|
||||
F: package/freerdp/
|
||||
F: package/keyutils/
|
||||
F: package/libbsd/
|
||||
F: package/libedit/
|
||||
F: package/libgsm/
|
||||
F: package/libiberty/
|
||||
F: package/libinput/
|
||||
F: package/libiscsi/
|
||||
F: package/libpri/
|
||||
F: package/libseccomp/
|
||||
F: package/libss7/
|
||||
F: package/linux-firmware/
|
||||
F: package/linux-tools/
|
||||
F: package/matchbox*
|
||||
F: package/mesa3d-headers/
|
||||
F: package/nbd/
|
||||
F: package/nut/
|
||||
F: package/nvidia-driver/
|
||||
F: package/python-pyparsing/
|
||||
F: package/pkg-download.mk
|
||||
F: package/pkg-waf.mk
|
||||
F: package/slirp/
|
||||
F: package/snappy/
|
||||
F: package/spice/
|
||||
F: package/spice-protocol/
|
||||
F: package/systemd/
|
||||
F: package/systemd-bootchart/
|
||||
F: package/tmux/
|
||||
F: package/tvheadend/
|
||||
F: package/usbredir/
|
||||
F: package/vde2/
|
||||
F: package/w_scan/
|
||||
F: package/wayland/
|
||||
F: package/weston/
|
||||
F: package/wtfutil/
|
||||
F: package/zisofs-tools/
|
||||
F: support/download/
|
||||
F: support/testing/tests/graphics_base.py
|
||||
|
||||
N: Yann E. MORIN <yann.morin@orange.com>
|
||||
F: .editorconfig
|
||||
F: package/gpsd/
|
||||
|
||||
@@ -92,9 +92,9 @@ all:
|
||||
.PHONY: all
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2024.11-rc2
|
||||
export BR2_VERSION := 2024.11-rc3
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1732356000
|
||||
BR2_VERSION_EPOCH = 1733418000
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
||||
@@ -101,12 +101,14 @@ Flashing boot.bin:
|
||||
|
||||
KD240 / KR260 Flashing Instructions:
|
||||
Flashing u-boot.itb:
|
||||
$ usb start
|
||||
$ sf probe
|
||||
$ fatload usb 0 0x1000000 u-boot.itb
|
||||
$ sf erase 0x280000 +$filesize
|
||||
$ sf write 0x1000000 0x280000 $filesize
|
||||
|
||||
Flashing boot.bin:
|
||||
$ usb start
|
||||
$ sf probe
|
||||
$ fatload usb 0 0x1000000 boot.bin
|
||||
$ sf erase 0x200000 +$filesize
|
||||
|
||||
+15
-15
@@ -10,20 +10,20 @@ Notes on using Grub2 for BIOS-based platforms
|
||||
is enough free space *before* the first partition to
|
||||
store Grub2. Leaving 1 MB of free space is safe.
|
||||
3. Setup loop device and loop partitions
|
||||
sudo losetup -f disk.img
|
||||
sudo partx -a /dev/loop0
|
||||
loop_dev=$(sudo losetup -f disk.img)
|
||||
sudo partx -a "$loop_dev"
|
||||
4. Prepare the root partition
|
||||
sudo mkfs.ext3 -L root /dev/loop0p1
|
||||
sudo mount /dev/loop0p1 /mnt
|
||||
sudo mkfs.ext3 -L root "${loop_dev}p1"
|
||||
sudo mount "${loop_dev}p1" /mnt
|
||||
sudo tar -C /mnt -xf output/images/rootfs.tar
|
||||
sudo umount /mnt
|
||||
5. Install Grub2
|
||||
sudo ./output/host/sbin/grub-bios-setup \
|
||||
-b ./output/host/lib/grub/i386-pc/boot.img \
|
||||
-c ./output/images/grub.img -d . /dev/loop0
|
||||
-c ./output/images/grub.img -d . "$loop_dev"
|
||||
6. Cleanup loop device
|
||||
sudo partx -d /dev/loop0
|
||||
sudo losetup -d /dev/loop0
|
||||
sudo partx -d "$loop_dev"
|
||||
sudo losetup -d "$loop_dev"
|
||||
7. Your disk.img is ready!
|
||||
|
||||
Using genimage
|
||||
@@ -65,22 +65,22 @@ Notes on using Grub2 for x86/x86_64 EFI-based platforms
|
||||
- Create a second partition, type 8300, for the root
|
||||
filesystem.
|
||||
3. Setup loop device and loop partitions
|
||||
sudo losetup -f disk.img
|
||||
sudo partx -a /dev/loop0
|
||||
loop_dev=$(sudo losetup -f disk.img)
|
||||
sudo partx -a "$loop_dev"
|
||||
4. Prepare the boot partition
|
||||
sudo mkfs.vfat -n boot /dev/loop0p1
|
||||
sudo mount /dev/loop0p1 /mnt
|
||||
sudo mkfs.vfat -n boot "${loop_dev}p1"
|
||||
sudo mount "${loop_dev}p1" /mnt
|
||||
sudo cp -a output/images/efi-part/* /mnt/
|
||||
sudo cp output/images/bzImage /mnt/
|
||||
sudo umount /mnt
|
||||
5. Prepare the root partition
|
||||
sudo mkfs.ext3 -L root /dev/loop0p2
|
||||
sudo mount /dev/loop0p2 /mnt
|
||||
sudo mkfs.ext3 -L root "${loop_dev}p2"
|
||||
sudo mount "${loop_dev}p2" /mnt
|
||||
sudo tar -C /mnt -xf output/images/rootfs.tar
|
||||
sudo umount /mnt
|
||||
6 Cleanup loop device
|
||||
sudo partx -d /dev/loop0
|
||||
sudo losetup -d /dev/loop0
|
||||
sudo partx -d "$loop_dev"
|
||||
sudo losetup -d "$loop_dev"
|
||||
7. Your disk.img is ready!
|
||||
|
||||
To test your i386/x86-64 EFI image in Qemu
|
||||
|
||||
@@ -76,37 +76,37 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2024.11-rc2</b></h3>
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2024.11-rc3</b></h3>
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2024.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2024.11-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2024.11-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2024.11-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2024.11-rc2.tar.gz">buildroot-2024.11-rc2.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2024.11-rc2.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2024.11-rc3.tar.gz">buildroot-2024.11-rc3.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2024.11-rc3.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2024.11-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2024.11-rc3.tar.xz"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2024.11-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2024.11-rc3.tar.xz"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2024.11-rc2.tar.xz">buildroot-2024.11-rc2.tar.xz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2024.11-rc2.tar.xz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2024.11-rc3.tar.xz">buildroot-2024.11-rc3.tar.xz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2024.11-rc3.tar.xz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
+410
-389
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "6.11.9" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "6.11.10" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
|
||||
sha256 75658a7aa3bd9598c96ee1e5862c5e1d34fced75c28d825c727a1510a6f384b4 linux-6.11.9.tar.xz
|
||||
sha256 e2c35611775534941b9d4dd871f3ae5b988b6594dc9033b5ca784366e07d9336 linux-6.6.62.tar.xz
|
||||
sha256 010784bd7161c32c4cd68a423d4dcb14e4587677d238b2825a31fe012869224c linux-6.1.118.tar.xz
|
||||
sha256 4bc184915290629d61f935aa1eb1b6e711b8e47d8f289a39f0d584ecbdb4fe77 linux-6.11.10.tar.xz
|
||||
sha256 d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835 linux-6.6.63.tar.xz
|
||||
sha256 aecdaf39d0a844a81ce4c67d9daff8979e938bb690df4f679fbbb494fe423278 linux-6.1.119.tar.xz
|
||||
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
|
||||
sha256 8a4b2a47ccc9b208b2b6ed9a216ea1a5eb12852c723bec1a04de9e671a1d7da8 linux-5.15.173.tar.xz
|
||||
sha256 cd1850ef3b771886df4e0b4c4eb07033864abab2bb553a20fd9e3cdc23584b47 linux-5.10.230.tar.xz
|
||||
|
||||
@@ -69,6 +69,7 @@ config BR2_PACKAGE_ALSA_LIB_SEQ
|
||||
config BR2_PACKAGE_ALSA_LIB_UCM
|
||||
bool "ucm"
|
||||
default y
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_ALSA_LIB_MIXER
|
||||
|
||||
config BR2_PACKAGE_ALSA_LIB_ALISP
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
[PATCH] Fix makefiles for out-of-tree build
|
||||
From 1fe49c34aa3e32e801af5c56293ec71ff6e7e2bc Mon Sep 17 00:00:00 2001
|
||||
From: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
Date: Sun, 1 Dec 2024 15:43:17 +0100
|
||||
Subject: [PATCH] Fix makefiles for out-of-tree build
|
||||
|
||||
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
---
|
||||
@@ -158,5 +161,5 @@ index 9e8b751..94a069b 100644
|
||||
LIBS+= -lz -lselinux
|
||||
|
||||
--
|
||||
2.5.1
|
||||
2.47.0
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
[PATCH] Fix adbd for non-Ubuntu systems
|
||||
From d433d5c340f3b36de58ea8550fd140dbdaea13b4 Mon Sep 17 00:00:00 2001
|
||||
From: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
Date: Sun, 1 Dec 2024 15:43:33 +0100
|
||||
Subject: [PATCH] Fix adbd for non-Ubuntu systems
|
||||
|
||||
Remove glib/dbus dependencies and partially restore services.c to be
|
||||
closer to the original source code in order to run on systems without
|
||||
@@ -7,7 +10,7 @@ sudo.
|
||||
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
---
|
||||
core/adbd/adb.c | 1 -
|
||||
core/adbd/services.c | 160 ++++-------------------------------------------
|
||||
core/adbd/services.c | 160 +++------------------------------------
|
||||
debian/makefiles/adbd.mk | 4 +-
|
||||
3 files changed, 14 insertions(+), 151 deletions(-)
|
||||
|
||||
@@ -260,5 +263,5 @@ index 49dab8c..22c1816 100644
|
||||
OBJS= $(patsubst %, %.o, $(basename $(SRCS)))
|
||||
|
||||
--
|
||||
2.5.1
|
||||
2.47.0
|
||||
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
From 946dbb00fe4b2a75c688a470fc0c3924aa018a24 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 14 Jul 2024 11:39:49 +0200
|
||||
Subject: [PATCH] Adjust base64 function handling
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
In order to support libcs that do not provide b64_pton(), one of the
|
||||
Debian patches adds a copy of b64_pton() and b64_ntop(). However, no
|
||||
prototype is added for those functions, causing an "implicit
|
||||
declaration" warning... or error depending on the compiler version
|
||||
used:
|
||||
|
||||
core/adbd/adb_auth_client.c:75:15: error: implicit declaration of function ‘b64_pton’ [-Wimplicit-function-declaration]
|
||||
|
||||
This patch adds appropriate prototypes, but while at it, also renames
|
||||
the internal copy of b64_*() functions to have an adb_ prefix in order
|
||||
to clarify things and not clash with definitions potentially coming
|
||||
from the C library.
|
||||
|
||||
Upstream: N/A, we're too far from upstream
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
core/adb/adb_auth_client.c | 3 ++-
|
||||
core/adbd/adb_auth_client.c | 3 ++-
|
||||
core/adbd/base64.c | 4 ++--
|
||||
3 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/core/adb/adb_auth_client.c b/core/adb/adb_auth_client.c
|
||||
index 0b4913e..25b9828 100644
|
||||
--- a/core/adb/adb_auth_client.c
|
||||
+++ b/core/adb/adb_auth_client.c
|
||||
@@ -45,6 +45,7 @@ static char *key_paths[] = {
|
||||
static fdevent listener_fde;
|
||||
static int framework_fd = -1;
|
||||
|
||||
+extern int adb_b64_pton(char const *src, u_char *target, size_t targsize);
|
||||
|
||||
static void read_keys(const char *file, struct listnode *list)
|
||||
{
|
||||
@@ -72,7 +73,7 @@ static void read_keys(const char *file, struct listnode *list)
|
||||
if (sep)
|
||||
*sep = '\0';
|
||||
|
||||
- ret = __b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
|
||||
+ ret = adb_b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
|
||||
if (ret != sizeof(key->key)) {
|
||||
D("%s: Invalid base64 data ret=%d\n", file, ret);
|
||||
free(key);
|
||||
diff --git a/core/adbd/adb_auth_client.c b/core/adbd/adb_auth_client.c
|
||||
index 0b4913e..25b9828 100644
|
||||
--- a/core/adbd/adb_auth_client.c
|
||||
+++ b/core/adbd/adb_auth_client.c
|
||||
@@ -45,6 +45,7 @@ static char *key_paths[] = {
|
||||
static fdevent listener_fde;
|
||||
static int framework_fd = -1;
|
||||
|
||||
+extern int adb_b64_pton(char const *src, u_char *target, size_t targsize);
|
||||
|
||||
static void read_keys(const char *file, struct listnode *list)
|
||||
{
|
||||
@@ -72,7 +73,7 @@ static void read_keys(const char *file, struct listnode *list)
|
||||
if (sep)
|
||||
*sep = '\0';
|
||||
|
||||
- ret = __b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
|
||||
+ ret = adb_b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
|
||||
if (ret != sizeof(key->key)) {
|
||||
D("%s: Invalid base64 data ret=%d\n", file, ret);
|
||||
free(key);
|
||||
diff --git a/core/adbd/base64.c b/core/adbd/base64.c
|
||||
index 7270703..91fc1b2 100644
|
||||
--- a/core/adbd/base64.c
|
||||
+++ b/core/adbd/base64.c
|
||||
@@ -134,7 +134,7 @@ static const char Pad64 = '=';
|
||||
*/
|
||||
|
||||
int
|
||||
-b64_ntop(src, srclength, target, targsize)
|
||||
+adb_b64_ntop(src, srclength, target, targsize)
|
||||
u_char const *src;
|
||||
size_t srclength;
|
||||
char *target;
|
||||
@@ -212,7 +212,7 @@ b64_ntop(src, srclength, target, targsize)
|
||||
*/
|
||||
|
||||
int
|
||||
-b64_pton(src, target, targsize)
|
||||
+adb_b64_pton(src, target, targsize)
|
||||
char const *src;
|
||||
u_char *target;
|
||||
size_t targsize;
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
[PATCH] Fix build issue with uclibc
|
||||
|
||||
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
---
|
||||
core/adbd/adb_auth_client.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/core/adb/adb_auth_client.c b/core/adb/adb_auth_client.c
|
||||
index 0b4913e..068d837 100644
|
||||
--- a/core/adb/adb_auth_client.c
|
||||
+++ b/core/adb/adb_auth_client.c
|
||||
@@ -72,7 +72,7 @@ static void read_keys(const char *file, struct listnode *list)
|
||||
if (sep)
|
||||
*sep = '\0';
|
||||
|
||||
- ret = __b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
|
||||
+ ret = b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
|
||||
if (ret != sizeof(key->key)) {
|
||||
D("%s: Invalid base64 data ret=%d\n", file, ret);
|
||||
free(key);
|
||||
diff --git a/core/adbd/adb_auth_client.c b/core/adbd/adb_auth_client.c
|
||||
index 0b4913e..068d837 100644
|
||||
--- a/core/adbd/adb_auth_client.c
|
||||
+++ b/core/adbd/adb_auth_client.c
|
||||
@@ -72,7 +72,7 @@ static void read_keys(const char *file, struct listnode *list)
|
||||
if (sep)
|
||||
*sep = '\0';
|
||||
|
||||
- ret = __b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
|
||||
+ ret = b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4);
|
||||
if (ret != sizeof(key->key)) {
|
||||
D("%s: Invalid base64 data ret=%d\n", file, ret);
|
||||
free(key);
|
||||
--
|
||||
2.6.1
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
[PATCH] Fix build issue with musl
|
||||
From d14ca3e3362448590adaebacb76d4d8046f9b556 Mon Sep 17 00:00:00 2001
|
||||
From: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
Date: Sun, 1 Dec 2024 15:44:16 +0100
|
||||
Subject: [PATCH] Fix build issue with musl
|
||||
|
||||
arpa/nameser.h doesn't use the same macro name to avoid several
|
||||
inclusions.
|
||||
@@ -8,19 +11,12 @@ TEMP_FAILURE_RETRY macro.
|
||||
|
||||
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
---
|
||||
core/adbd/arpa_nameser.h | 12 +++++++++---
|
||||
core/adbd/base64.c | 1 -
|
||||
core/adbd/framebuffer_service.c | 1 +
|
||||
core/adbd/qemu_pipe.h | 1 -
|
||||
core/include/cutils/android_reboot.h | 8 ++++++--
|
||||
core/include/cutils/bitops.h | 10 ++++++----
|
||||
core/include/cutils/partition_utils.h | 8 ++++++--
|
||||
extras/ext4_utils/sha1.c | 3 ---
|
||||
extras/ext4_utils/sha1.h | 13 ++++++-------
|
||||
9 files changed, 34 insertions(+), 23 deletions(-)
|
||||
core/adbd/arpa_nameser.h | 3 +++
|
||||
core/adbd/framebuffer_service.c | 1 +
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/core/adbd/arpa_nameser.h b/core/adbd/arpa_nameser.h
|
||||
index 438dc04..b2a28d6 100644
|
||||
index 438dc04..f3d2fee 100644
|
||||
--- a/core/adbd/arpa_nameser.h
|
||||
+++ b/core/adbd/arpa_nameser.h
|
||||
@@ -52,6 +52,8 @@
|
||||
@@ -32,7 +28,7 @@ index 438dc04..b2a28d6 100644
|
||||
|
||||
#define BIND_4_COMPAT
|
||||
|
||||
@@ -574,4 +579,5 @@ __END_DECLS
|
||||
@@ -574,4 +576,5 @@ __END_DECLS
|
||||
#define XLOG(...) do {} while (0)
|
||||
#endif
|
||||
|
||||
@@ -51,4 +47,5 @@ index 20c08d2..48e0241 100644
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/mman.h>
|
||||
--
|
||||
2.6.1
|
||||
2.47.0
|
||||
|
||||
|
||||
+30
-17
@@ -1,4 +1,7 @@
|
||||
makefiles: use pkgconf to get libs deps
|
||||
From 10f3f6fb75da72f155e72794d6647e4fa21a87d0 Mon Sep 17 00:00:00 2001
|
||||
From: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
Date: Sun, 1 Dec 2024 15:45:01 +0100
|
||||
Subject: [PATCH] makefiles: use pkgconf to get libs deps
|
||||
|
||||
LIBS lists library dependencies without taking into account static linking
|
||||
that need ordered listing and more libraries listed since differently from
|
||||
@@ -10,26 +13,36 @@ needed libraries are listed during linking.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
---
|
||||
diff -urpN android-tools-4.2.2+git20130218.orig/debian/makefiles/adbd.mk android-tools-4.2.2+git20130218/debian/makefiles/adbd.mk
|
||||
--- android-tools-4.2.2+git20130218.orig/debian/makefiles/adbd.mk 2019-04-08 16:05:02.967710428 +0200
|
||||
+++ android-tools-4.2.2+git20130218/debian/makefiles/adbd.mk 2019-04-08 16:30:42.463084426 +0200
|
||||
@@ -44,7 +44,7 @@ CPPFLAGS+= -DADBD_NON_ANDROID
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/adbd
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/include
|
||||
debian/makefiles/adb.mk | 2 +-
|
||||
debian/makefiles/adbd.mk | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
-LIBS+= -lc -lpthread -lz -lcrypto -lcrypt
|
||||
+LIBS+= -lc -lpthread -lz `pkg-config --libs libcrypto` -lcrypt
|
||||
|
||||
OBJS= $(patsubst %, %.o, $(basename $(SRCS)))
|
||||
|
||||
diff -urpN android-tools-4.2.2+git20130218.orig/debian/makefiles/adb.mk android-tools-4.2.2+git20130218/debian/makefiles/adb.mk
|
||||
--- android-tools-4.2.2+git20130218.orig/debian/makefiles/adb.mk 2019-04-08 16:05:02.959701400 +0200
|
||||
+++ android-tools-4.2.2+git20130218/debian/makefiles/adb.mk 2019-04-08 16:31:06.529426250 +0200
|
||||
diff --git a/debian/makefiles/adb.mk b/debian/makefiles/adb.mk
|
||||
index 654b9f1..a03c93a 100644
|
||||
--- a/debian/makefiles/adb.mk
|
||||
+++ b/debian/makefiles/adb.mk
|
||||
@@ -41,7 +41,7 @@ CPPFLAGS+= -DHAVE_TERMIO_H
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/adb
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/include
|
||||
|
||||
|
||||
-LIBS+= -lc -lpthread -lz -lcrypto
|
||||
+LIBS+= -lc -lpthread -lz `pkg-config --libs libcrypto`
|
||||
|
||||
|
||||
OBJS= $(SRCS:.c=.o)
|
||||
|
||||
diff --git a/debian/makefiles/adbd.mk b/debian/makefiles/adbd.mk
|
||||
index 22c1816..a8eee3a 100644
|
||||
--- a/debian/makefiles/adbd.mk
|
||||
+++ b/debian/makefiles/adbd.mk
|
||||
@@ -44,7 +44,7 @@ CPPFLAGS+= -DADBD_NON_ANDROID
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/adbd
|
||||
CPPFLAGS+= -I$(SRCDIR)/core/include
|
||||
|
||||
-LIBS+= -lc -lpthread -lz -lcrypto -lcrypt
|
||||
+LIBS+= -lc -lpthread -lz `pkg-config --libs libcrypto` -lcrypt
|
||||
|
||||
OBJS= $(patsubst %, %.o, $(basename $(SRCS)))
|
||||
|
||||
--
|
||||
2.47.0
|
||||
|
||||
+15
-5
@@ -1,4 +1,7 @@
|
||||
Fix build on big endian systems
|
||||
From 8f7e9458dbfca969d3edc9cf409b3439e98f4c5a Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sun, 1 Dec 2024 15:45:26 +0100
|
||||
Subject: [PATCH] Fix build on big endian systems
|
||||
|
||||
The usb_linux_client.c file defines cpu_to_le16/32 by using the C
|
||||
library htole16/32 function calls. However, cpu_to_le16/32 are used
|
||||
@@ -14,9 +17,13 @@ To solve this, we simply open-code cpu_to_le16/32 in a way that allows
|
||||
them to be used when initializing structures.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
core/adb/usb_linux_client.c | 11 +++++++++--
|
||||
core/adbd/usb_linux_client.c | 11 +++++++++--
|
||||
2 files changed, 18 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: b/core/adb/usb_linux_client.c
|
||||
===================================================================
|
||||
diff --git a/core/adb/usb_linux_client.c b/core/adb/usb_linux_client.c
|
||||
index fb1dad0..a981e96 100644
|
||||
--- a/core/adb/usb_linux_client.c
|
||||
+++ b/core/adb/usb_linux_client.c
|
||||
@@ -34,8 +34,15 @@
|
||||
@@ -37,8 +44,8 @@ Index: b/core/adb/usb_linux_client.c
|
||||
|
||||
struct usb_handle
|
||||
{
|
||||
Index: b/core/adbd/usb_linux_client.c
|
||||
===================================================================
|
||||
diff --git a/core/adbd/usb_linux_client.c b/core/adbd/usb_linux_client.c
|
||||
index 33875a8..0e4d200 100644
|
||||
--- a/core/adbd/usb_linux_client.c
|
||||
+++ b/core/adbd/usb_linux_client.c
|
||||
@@ -34,8 +34,15 @@
|
||||
@@ -59,3 +66,6 @@ Index: b/core/adbd/usb_linux_client.c
|
||||
|
||||
struct usb_handle
|
||||
{
|
||||
--
|
||||
2.47.0
|
||||
|
||||
+12
-6
@@ -1,4 +1,7 @@
|
||||
Include cdefs.h wherever it is needed
|
||||
From d3f0157bf2ac1afc9a810ccbe188110df724129d Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Sun, 1 Dec 2024 15:46:15 +0100
|
||||
Subject: [PATCH] Include cdefs.h wherever it is needed
|
||||
|
||||
cdefs.h is included from within a lot of glibc headers, so it almost
|
||||
invariably and automagically gets pulled in with glibc.
|
||||
@@ -11,12 +14,12 @@ So we must include it when we are going to use macros it provides.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
core/adbd/services.c | 1 +
|
||||
core/libcutils/android_reboot.c | 1 +
|
||||
2 files changed, 2 insertions(+), 0 deletion(-)
|
||||
core/adbd/services.c | 1 +
|
||||
core/libcutils/android_reboot.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/core/adbd/services.c b/core/adbd/services.c
|
||||
index 20c08d2..48e0241 100644
|
||||
index 5adcefe..6de1951 100644
|
||||
--- a/core/adbd/services.c
|
||||
+++ b/core/adbd/services.c
|
||||
@@ -20,6 +20,7 @@
|
||||
@@ -28,7 +31,7 @@ index 20c08d2..48e0241 100644
|
||||
#include "sysdeps.h"
|
||||
|
||||
diff --git a/core/libcutils/android_reboot.c b/core/libcutils/android_reboot.c
|
||||
index 20c08d2..48e0241 100644
|
||||
index 79c05f8..9386006 100644
|
||||
--- a/core/libcutils/android_reboot.c
|
||||
+++ b/core/libcutils/android_reboot.c
|
||||
@@ -23,6 +23,7 @@
|
||||
@@ -39,3 +42,6 @@ index 20c08d2..48e0241 100644
|
||||
|
||||
#include <cutils/android_reboot.h>
|
||||
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
usb_linux.c: fix minor()/major() build failure due to glibc 2.28
|
||||
|
||||
glibc 2.28 no longer includes <sys/sysmacros.h> from <sys/types.h>,
|
||||
and therefore <sys/sysmacros.h> must be included explicitly when
|
||||
major()/minor() are used.
|
||||
|
||||
This commit adds a patch to directly include <sys/sysmacros.h> into
|
||||
all usb_linux.c files where minor() and major() macros are used.
|
||||
|
||||
diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c
|
||||
--- host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c 2013-02-18 15:49:03.000000000 +0100
|
||||
+++ host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c 2018-09-09 11:47:16.476292546 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <dirent.h>
|
||||
diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c
|
||||
--- host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c 2018-09-09 02:32:57.154503866 +0200
|
||||
+++ host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c 2018-09-09 11:47:28.148353880 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <dirent.h>
|
||||
diff -urpN host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c
|
||||
--- host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c 2013-02-18 15:49:03.000000000 +0100
|
||||
+++ host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c 2018-09-09 11:46:53.028169154 +0200
|
||||
@@ -33,6 +33,7 @@
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
@@ -0,0 +1,59 @@
|
||||
From 99c20bd08065d9c78d81ba7aa48a2a113ab28c26 Mon Sep 17 00:00:00 2001
|
||||
From: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
Date: Sun, 1 Dec 2024 15:46:50 +0100
|
||||
Subject: [PATCH] usb_linux.c: fix minor()/major() build failure due to glibc
|
||||
2.28
|
||||
|
||||
glibc 2.28 no longer includes <sys/sysmacros.h> from <sys/types.h>,
|
||||
and therefore <sys/sysmacros.h> must be included explicitly when
|
||||
major()/minor() are used.
|
||||
|
||||
This commit adds a patch to directly include <sys/sysmacros.h> into
|
||||
all usb_linux.c files where minor() and major() macros are used.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
---
|
||||
core/adb/usb_linux.c | 1 +
|
||||
core/adbd/usb_linux.c | 1 +
|
||||
core/fastboot/usb_linux.c | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/core/adb/usb_linux.c b/core/adb/usb_linux.c
|
||||
index 7bf2057..f748267 100644
|
||||
--- a/core/adb/usb_linux.c
|
||||
+++ b/core/adb/usb_linux.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <dirent.h>
|
||||
diff --git a/core/adbd/usb_linux.c b/core/adbd/usb_linux.c
|
||||
index 7bf2057..f748267 100644
|
||||
--- a/core/adbd/usb_linux.c
|
||||
+++ b/core/adbd/usb_linux.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <dirent.h>
|
||||
diff --git a/core/fastboot/usb_linux.c b/core/fastboot/usb_linux.c
|
||||
index b7a9ca3..2dac62b 100644
|
||||
--- a/core/fastboot/usb_linux.c
|
||||
+++ b/core/fastboot/usb_linux.c
|
||||
@@ -33,6 +33,7 @@
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/stat.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <dirent.h>
|
||||
#include <fcntl.h>
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From d24abbec201975a5eb7f8589614cfb424b8c80b6 Mon Sep 17 00:00:00 2001
|
||||
From 3c4319da20fab4e48ec02e28f5b013b4a33b5fe4 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Kaplan <kaplan2539@gmail.com>
|
||||
Date: Sat, 10 Nov 2018 19:50:51 -0800
|
||||
Subject: [PATCH] Fix makefiles for out-of-tree ext4_utils build
|
||||
@@ -44,5 +44,5 @@ index cb64916..c5904bf 100644
|
||||
LIBS+= -lz -lselinux
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.47.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From bb3da0e32be4f2260940edf3ee0f88103dfd0dcc Mon Sep 17 00:00:00 2001
|
||||
From 79bf5cdee607241434e0d1c5b72e724eb1d20102 Mon Sep 17 00:00:00 2001
|
||||
From: Eneas U de Queiroz <cote2004-github@yahoo.com>
|
||||
Date: Tue, 5 Feb 2019 01:12:19 +0200
|
||||
Subject: [PATCH] adb: added patch for openssl 1.1.0 compatibility
|
||||
@@ -43,5 +43,5 @@ index 9039d42..debd2ef 100644
|
||||
out:
|
||||
BN_free(n0inv);
|
||||
--
|
||||
2.14.1
|
||||
2.47.0
|
||||
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
From 9724d78fda4eb023f83d2fd30e665b436d7a7f97 Mon Sep 17 00:00:00 2001
|
||||
From 6919b6619a9c744d2220f7af6e211c50662ba94b Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 14 Jul 2024 11:41:10 +0200
|
||||
Subject: [PATCH] core/fastboot/fastboot.c: reorder functions to avoid implicit
|
||||
@@ -50,5 +50,5 @@ index 3de6d7d..9b2c86f 100644
|
||||
{
|
||||
if (match_fastboot_with_serial(info, NULL) == 0) {
|
||||
--
|
||||
2.45.2
|
||||
2.47.0
|
||||
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
From 2812c2005cfa4bfc5741651c8310e36f28c0327e Mon Sep 17 00:00:00 2001
|
||||
From 72b9e79c81a237f1839afb4fdee680eafdd180d9 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 14 Jul 2024 11:41:56 +0200
|
||||
Subject: [PATCH] core/libsparse/sparse_read.c: add missing output_file.h
|
||||
@@ -33,5 +33,5 @@ index 704bcfa..0a8f838 100644
|
||||
#if defined(__APPLE__) && defined(__MACH__)
|
||||
#define lseek64 lseek
|
||||
--
|
||||
2.45.2
|
||||
2.47.0
|
||||
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
From 83f9bed233b86dd2bbf603611b13b673caeccb69 Mon Sep 17 00:00:00 2001
|
||||
From 01e86db8460d873aec15d658bfc717b026c0545f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 14 Jul 2024 11:46:51 +0200
|
||||
Subject: [PATCH] extras/ext4_utils/make_ext4fs_main.c: disable
|
||||
@@ -50,5 +50,5 @@ index 17d3735..cb58011 100644
|
||||
if (!sehnd && mountpoint) {
|
||||
sehnd = selinux_android_file_context_handle();
|
||||
--
|
||||
2.45.2
|
||||
2.47.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 2b5060146b0890f7f1a63ef891af1358b8cdf9bc Mon Sep 17 00:00:00 2001
|
||||
From 850fd3f4a0384ebe492a466a9b1149060619aacb Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 14 Jul 2024 12:57:22 +0200
|
||||
Subject: [PATCH] core/adbd/adb.c: open code capset()
|
||||
@@ -48,5 +48,5 @@ index 7fe6445..98b1de1 100644
|
||||
D("Local port disabled\n");
|
||||
} else {
|
||||
--
|
||||
2.45.2
|
||||
2.47.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From c14070011e070d8674cf3578708cbae433090a47 Mon Sep 17 00:00:00 2001
|
||||
From 8f351150de38641c8ce2e9b7f9a5cba29ccd8f7e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 14 Jul 2024 13:00:02 +0200
|
||||
Subject: [PATCH] core/adbd/adb.c: include correct header for prctl()
|
||||
@@ -30,5 +30,5 @@ index 98b1de1..10f420b 100644
|
||||
#else
|
||||
#include "usb_vendors.h"
|
||||
--
|
||||
2.45.2
|
||||
2.47.0
|
||||
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
From 5db9529436f13b8c073a0310da3a1107f84645da Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Wed, 4 Dec 2024 20:51:22 +0100
|
||||
Subject: [PATCH] extras/ext4_utils/make_ext4fs.c: define
|
||||
__SANE_USERSPACE_TYPES__
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The Debian patch ppc64el-ftbfs.patch is already defining
|
||||
__SANE_USERSPACE_TYPES__ in a few files to solve a conflict between
|
||||
kernel header definitions and local definition of some types, on
|
||||
powerpc64 and mips64.
|
||||
|
||||
However, the Debian patch lacks an update to ext4_utils.c, and has the
|
||||
definition too late in make_ext4fs.c. This commit therefore fixes
|
||||
those two remaining issues, fixing:
|
||||
|
||||
error: conflicting types for ‘u64’; have ‘long unsigned int’
|
||||
|
||||
Upstream: N/A, we're too far from upstream
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
extras/ext4_utils/ext4_utils.c | 5 ++++-
|
||||
extras/ext4_utils/make_ext4fs.c | 4 ++++
|
||||
2 files changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/extras/ext4_utils/ext4_utils.c b/extras/ext4_utils/ext4_utils.c
|
||||
index e95f5cc..9f6836f 100644
|
||||
--- a/extras/ext4_utils/ext4_utils.c
|
||||
+++ b/extras/ext4_utils/ext4_utils.c
|
||||
@@ -14,6 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
+#if defined(__linux__)
|
||||
+#define __SANE_USERSPACE_TYPES__
|
||||
+#endif
|
||||
+
|
||||
#include "ext4_utils.h"
|
||||
#include "uuid.h"
|
||||
#include "allocate.h"
|
||||
@@ -36,7 +40,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(__linux__)
|
||||
-#define __SANE_USERSPACE_TYPES__
|
||||
#include <linux/fs.h>
|
||||
#elif defined(__APPLE__) && defined(__MACH__)
|
||||
#include <sys/disk.h>
|
||||
diff --git a/extras/ext4_utils/make_ext4fs.c b/extras/ext4_utils/make_ext4fs.c
|
||||
index 3124aed..332a213 100644
|
||||
--- a/extras/ext4_utils/make_ext4fs.c
|
||||
+++ b/extras/ext4_utils/make_ext4fs.c
|
||||
@@ -14,6 +14,10 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
+#if defined(__linux__)
|
||||
+#define __SANE_USERSPACE_TYPES__
|
||||
+#endif
|
||||
+
|
||||
#include "make_ext4fs.h"
|
||||
#include "ext4_utils.h"
|
||||
#include "allocate.h"
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated
|
||||
sha256 aeff09fdc8b0c88b3087c99de00cf549356d7a2f6a69e3fcec5e0e861d2f9063 bats-core-1.11.0.tar.gz
|
||||
sha256 5c57ed9616b78f7fd8c553b9bae3c7c9870119edd727ec17dbd1185c599f79d9 bats-core-1.11.1.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 55074b2b3b87809105034e1468e59076554d76a80c67bcc592000cc3d929852d LICENSE.md
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BATS_CORE_VERSION = 1.11.0
|
||||
BATS_CORE_VERSION = 1.11.1
|
||||
BATS_CORE_SITE = $(call github,bats-core,bats-core,v$(BATS_CORE_VERSION))
|
||||
BATS_CORE_LICENSE = MIT
|
||||
BATS_CORE_LICENSE_FILES = LICENSE.md
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
DOXYGEN_VERSION = 1.8.18
|
||||
DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz
|
||||
DOXYGEN_SITE = http://doxygen.nl/files
|
||||
DOXYGEN_SITE = https://sourceforge.net/projects/doxygen/files/rel-$(DOXYGEN_VERSION)
|
||||
DOXYGEN_LICENSE = GPL-2.0
|
||||
DOXYGEN_LICENSE_FILES = LICENSE
|
||||
DOXYGEN_CPE_ID_VENDOR = doxygen
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated
|
||||
sha256 6eb254c72dca867fefffd5ded80a6c2d5ce8df223ce93263302db4b8bfbb19c4 frr-9.1.1.tar.gz
|
||||
sha256 a23ab9aba5c45d919f9c6d14febfad8a797b7f63272bde4009c70ff77aac3a77 frr-9.1.2.tar.gz
|
||||
sha256 7bf053957d6c38e39a06a112c60ff35b228d3bd03edbe8c9a03508b051128d16 COPYING
|
||||
sha256 f9e0c21faf738da586281c0beaad3cd56204c19085a10fe05e4d3d7f8b5863d2 doc/licenses/BSD-2-Clause
|
||||
sha256 aca297b8fd3a43e3bb200f1e2e043c0db6c897325f5ff7f23f7530302a6bf713 doc/licenses/BSD-3-Clause
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FRR_VERSION = 9.1.1
|
||||
FRR_VERSION = 9.1.2
|
||||
FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION))
|
||||
FRR_LICENSE = GPL-2.0+
|
||||
FRR_LICENSE_FILES = \
|
||||
|
||||
@@ -62,11 +62,11 @@ HOST_GNUTLS_CONF_OPTS = \
|
||||
--without-tpm \
|
||||
--without-tpm2 \
|
||||
--disable-openssl-compatibility \
|
||||
--without-libbrotli \
|
||||
--without-brotli \
|
||||
--without-idn \
|
||||
--without-p11-kit \
|
||||
--without-zlib \
|
||||
--without-libzstd
|
||||
--without-zstd
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y)
|
||||
GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library)
|
||||
@@ -77,10 +77,10 @@ GNUTLS_CONF_OPTS += --disable-openssl-compatibility
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BROTLI),y)
|
||||
GNUTLS_CONF_OPTS += --with-libbrotli
|
||||
GNUTLS_CONF_OPTS += --with-brotli
|
||||
GNUTLS_DEPENDENCIES += brotli
|
||||
else
|
||||
GNUTLS_CONF_OPTS += --without-libbrotli
|
||||
GNUTLS_CONF_OPTS += --without-brotli
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
|
||||
@@ -110,10 +110,10 @@ GNUTLS_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZSTD),y)
|
||||
GNUTLS_CONF_OPTS += --with-libzstd
|
||||
GNUTLS_CONF_OPTS += --with-zstd
|
||||
GNUTLS_DEPENDENCIES += zstd
|
||||
else
|
||||
GNUTLS_CONF_OPTS += --without-libzstd
|
||||
GNUTLS_CONF_OPTS += --without-zstd
|
||||
endif
|
||||
|
||||
# Provide a default CA cert location
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
config BR2_PACKAGE_LIBVPL_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_ARCH_IS_64
|
||||
default y if BR2_ARCH_IS_64 && !BR2_mips64 && !BR2_mips64el
|
||||
default y if BR2_arm
|
||||
|
||||
config BR2_PACKAGE_LIBVPL
|
||||
|
||||
@@ -432,9 +432,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
|
||||
default "5.4.286" if BR2_KERNEL_HEADERS_5_4
|
||||
default "5.10.230" if BR2_KERNEL_HEADERS_5_10
|
||||
default "5.15.173" if BR2_KERNEL_HEADERS_5_15
|
||||
default "6.1.118" if BR2_KERNEL_HEADERS_6_1
|
||||
default "6.6.62" if BR2_KERNEL_HEADERS_6_6
|
||||
default "6.11.9" if BR2_KERNEL_HEADERS_6_11
|
||||
default "6.1.119" if BR2_KERNEL_HEADERS_6_1
|
||||
default "6.6.63" if BR2_KERNEL_HEADERS_6_6
|
||||
default "6.11.10" if BR2_KERNEL_HEADERS_6_11
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
|
||||
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
|
||||
|
||||
@@ -28,7 +28,8 @@ PERF_MAKE_FLAGS = \
|
||||
NO_LIBPERL=1 \
|
||||
NO_LIBPYTHON=1 \
|
||||
NO_LIBBIONIC=1 \
|
||||
NO_LIBTRACEEVENT=1
|
||||
NO_LIBTRACEEVENT=1 \
|
||||
NO_SHELLCHECK=1
|
||||
|
||||
# We need to pass an argument to ld for setting the emulation when
|
||||
# building for MIPS architecture, otherwise the default one will always
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 2c7ff6989bc6161d8a2cc823d3aa7c9cb1deca80 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Wed, 4 Dec 2024 22:59:31 +0100
|
||||
Subject: [PATCH] scripts/build: make it possible to set LDLIBS
|
||||
|
||||
LDLIBS is currently unconditionnally set to '-lm', but doesn't allow
|
||||
the user to provide additional libraries to link with.
|
||||
|
||||
Upstream: dead, last release in 2006
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
scripts/build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/build b/scripts/build
|
||||
index 60b755c..4820d80 100755
|
||||
--- a/scripts/build
|
||||
+++ b/scripts/build
|
||||
@@ -18,7 +18,7 @@ done
|
||||
|
||||
trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15
|
||||
|
||||
-LDLIBS=-lm
|
||||
+LDLIBS="${LDLIBS} -lm"
|
||||
|
||||
# check for HP-UX's ANSI compiler
|
||||
echo "main(int ac, char *av[]) { int i; }" > ${BASE}$$.c
|
||||
--
|
||||
2.47.0
|
||||
|
||||
@@ -26,7 +26,6 @@ LMBENCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
|
||||
|
||||
define LMBENCH_CONFIGURE_CMDS
|
||||
sed -i 's/CFLAGS=/CFLAGS+=/g' $(@D)/src/Makefile
|
||||
sed -i 's/LDLIBS=/LDLIBS+=/g' $(@D)/scripts/build
|
||||
sed -i '/cd .*doc/d' $(@D)/src/Makefile
|
||||
sed -i '/include/d' $(@D)/src/Makefile
|
||||
touch $@
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 43b2b711fedd3a28d497b3a5c0e9054fa203ef3d Mon Sep 17 00:00:00 2001
|
||||
From c2758812867a52a6bb56b87d52c35ebff797e777 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 15 Sep 2024 15:12:07 +0200
|
||||
Subject: [PATCH] configure: fix main() prototype
|
||||
@@ -10,23 +10,25 @@ configure script directly.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Upstream: N/A, patching generated file
|
||||
[wsa: rebased to 0.12.21rc]
|
||||
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
|
||||
---
|
||||
configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index db26726..d160e27 100755
|
||||
index cc586d5..16a259a 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -1008,7 +1008,7 @@ cross_compiling=$ac_cv_prog_cc_cross
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1010 "configure"
|
||||
@@ -1053,7 +1053,7 @@ cat > conftest.$ac_ext << EOF
|
||||
#line 1054 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
-main(){return(0);}
|
||||
+int main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
--
|
||||
2.46.0
|
||||
2.45.2
|
||||
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
From a9faaf7f02811e7409074362700e963609885ba6 Mon Sep 17 00:00:00 2001
|
||||
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
|
||||
Date: Fri, 29 Nov 2024 14:14:25 +0100
|
||||
Subject: [PATCH] FTBFS fix missing includes
|
||||
|
||||
From: https://sources.debian.org/data/main/l/lrzsz/0.12.21rc-0.1/debian/patches/include.diff
|
||||
|
||||
Description: Fixes FTBFS (missing includes)
|
||||
Author: Martin A. Godisch <godisch@debian.org>
|
||||
Bug-Debian: https://bugs.debian.org/1066514
|
||||
Forwarded: no
|
||||
|
||||
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
|
||||
Upstream: https://sources.debian.org/data/main/l/lrzsz/0.12.21rc-0.1/debian/patches/include.diff
|
||||
---
|
||||
lib/error.c | 1 +
|
||||
src/canit.c | 1 +
|
||||
src/lrz.c | 1 +
|
||||
src/lsyslog.c | 1 +
|
||||
src/lsz.c | 1 +
|
||||
src/tcp.c | 1 +
|
||||
src/zperr.c | 1 +
|
||||
src/zreadline.c | 1 +
|
||||
8 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/lib/error.c b/lib/error.c
|
||||
index 8b96b91..3861578 100644
|
||||
--- a/lib/error.c
|
||||
+++ b/lib/error.c
|
||||
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <string.h>
|
||||
|
||||
#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC || defined(__cplusplus)
|
||||
# if __STDC__ || defined(__cplusplus)
|
||||
diff --git a/src/canit.c b/src/canit.c
|
||||
index f947a25..ae91807 100644
|
||||
--- a/src/canit.c
|
||||
+++ b/src/canit.c
|
||||
@@ -24,6 +24,7 @@
|
||||
#define SS_NORMAL 0
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <signal.h>
|
||||
#include <setjmp.h>
|
||||
#include <ctype.h>
|
||||
diff --git a/src/lrz.c b/src/lrz.c
|
||||
index 2f6a5ad..63e1326 100644
|
||||
--- a/src/lrz.c
|
||||
+++ b/src/lrz.c
|
||||
@@ -27,6 +27,7 @@
|
||||
#define SS_NORMAL 0
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <signal.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
diff --git a/src/lsyslog.c b/src/lsyslog.c
|
||||
index d21ab35..24d8cd1 100644
|
||||
--- a/src/lsyslog.c
|
||||
+++ b/src/lsyslog.c
|
||||
@@ -18,6 +18,7 @@
|
||||
02111-1307, USA.
|
||||
|
||||
*/
|
||||
+#define _GNU_SOURCE
|
||||
#include "config.h"
|
||||
#ifdef ENABLE_SYSLOG
|
||||
#include "zglobal.h"
|
||||
diff --git a/src/lsz.c b/src/lsz.c
|
||||
index b9d2545..1598150 100644
|
||||
--- a/src/lsz.c
|
||||
+++ b/src/lsz.c
|
||||
@@ -28,6 +28,7 @@
|
||||
#define SS_NORMAL 0
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <signal.h>
|
||||
#include <setjmp.h>
|
||||
#include <ctype.h>
|
||||
diff --git a/src/tcp.c b/src/tcp.c
|
||||
index 7e1ba3f..cdf9187 100644
|
||||
--- a/src/tcp.c
|
||||
+++ b/src/tcp.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
+#include <string.h>
|
||||
|
||||
#include "zglobal.h"
|
||||
#include <stdlib.h>
|
||||
diff --git a/src/zperr.c b/src/zperr.c
|
||||
index 31963de..0b9dc29 100644
|
||||
--- a/src/zperr.c
|
||||
+++ b/src/zperr.c
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "zglobal.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef __STDC__
|
||||
diff --git a/src/zreadline.c b/src/zreadline.c
|
||||
index dd9736b..7bc3736 100644
|
||||
--- a/src/zreadline.c
|
||||
+++ b/src/zreadline.c
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
+#include <string.h>
|
||||
#include <signal.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 lrzsz-0.12.20.tar.gz
|
||||
sha256 4d845f239ddcd86735b5dbf01f3869b072ffb6f6c8aa24c346dc4a3c95453c55 lrzsz-0.12.21rc.tar.gz
|
||||
sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LRZSZ_VERSION = 0.12.20
|
||||
LRZSZ_SITE = http://www.ohse.de/uwe/releases
|
||||
LRZSZ_VERSION = 0.12.21rc
|
||||
LRZSZ_SITE = http://www.ohse.de/uwe/testing
|
||||
LRZSZ_CONF_OPTS = --disable-timesync
|
||||
LRZSZ_LICENSE = GPL-2.0+
|
||||
LRZSZ_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From 9c78557af0a5e521cdb46a4ca7630f2987d2523e Mon Sep 17 00:00:00 2001
|
||||
From: Rich Felker <dalias@aerifal.cx>
|
||||
Date: Sat, 10 Aug 2024 19:49:24 -0400
|
||||
Subject: [PATCH] use hidden visibility for C entry point function _start_c
|
||||
|
||||
the file-level crt_arch.h asm fragments generally make direct
|
||||
(non-PLT) calls from _start to _start_c, which is only valid when
|
||||
there is a local, non-interposable definition for _start_c. generally,
|
||||
the linker is expected to know that local definitions in a main
|
||||
executable (as opposed to shared library) output are non-interposable,
|
||||
making this work, but historically there have been linker bugs in this
|
||||
area, and microblaze is reportedly still broken, flagging the
|
||||
relocation for the call as a textrel.
|
||||
|
||||
the equivalent _dlstart_c, called from the same crt_arch.h asm
|
||||
fragments, has always used hidden visibility without problem, and
|
||||
semantically it should be hidden, so make it hidden. this ensures the
|
||||
direct call is always valid regardless of whether the linker properly
|
||||
special-cases main executable output.
|
||||
|
||||
Upstream: https://git.musl-libc.org/cgit/musl/commit/?id=9c78557af0a5e521cdb46a4ca7630f2987d2523e
|
||||
Signed-off-by: J. Neuschäfer <j.neuschaefer@gmx.net>
|
||||
---
|
||||
crt/crt1.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/crt/crt1.c b/crt/crt1.c
|
||||
index 8fe8ab5d..10601215 100644
|
||||
--- a/crt/crt1.c
|
||||
+++ b/crt/crt1.c
|
||||
@@ -11,7 +11,7 @@ weak void _fini();
|
||||
int __libc_start_main(int (*)(), int, char **,
|
||||
void (*)(), void(*)(), void(*)());
|
||||
|
||||
-void _start_c(long *p)
|
||||
+hidden void _start_c(long *p)
|
||||
{
|
||||
int argc = p[0];
|
||||
char **argv = (void *)(p+1);
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -79,7 +79,7 @@ NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP
|
||||
|
||||
ifeq ($(BR2_INIT_SYSTEMD),y)
|
||||
NFS_UTILS_CONF_OPTS += --with-systemd=/usr/lib/systemd/system
|
||||
NFS_UTILS_DEPENDENCIES += systemd
|
||||
NFS_UTILS_DEPENDENCIES += systemd host-systemd
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --without-systemd
|
||||
endif
|
||||
|
||||
@@ -13,7 +13,7 @@ OPKG_INSTALL_STAGING = YES
|
||||
OPKG_CONF_OPTS = \
|
||||
--enable-sha256 \
|
||||
--without-acl \
|
||||
--without-xattrs
|
||||
--without-xattr
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPKG_GPG_SIGN),y)
|
||||
OPKG_CONF_OPTS += --enable-gpg
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
From 51a1c5b5ab616fe0243b40baddb4864199bbe624 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@smile.fr>
|
||||
Date: Sat, 2 Nov 2024 23:33:16 +0100
|
||||
Subject: [PATCH] meson: disable PIDFD when systemd is not available
|
||||
|
||||
Since the Polkit version bump 125, TestPolkitInitd fail due to an
|
||||
upstream issue related to the new PIDFD support introduced in
|
||||
Polkit 124 [1].
|
||||
|
||||
The PIDFD issue only affect OS without systemd.
|
||||
|
||||
Only enable PIDFD support when systemd is available until
|
||||
upstream fix the issue.
|
||||
|
||||
Fixes:
|
||||
https://gitlab.com/buildroot.org/buildroot/-/jobs/8199992596
|
||||
|
||||
[1] https://github.com/polkit-org/polkit/issues/451
|
||||
|
||||
Upstream: Not applicable
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@smile.fr>
|
||||
---
|
||||
meson.build | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 302c189..5c247f4 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -202,8 +202,6 @@ if enable_logind
|
||||
endif
|
||||
config_data.set('HAVE_LIBSYSTEMD', enable_logind)
|
||||
|
||||
-config_data.set('HAVE_PIDFD_OPEN', cc.get_define('SYS_pidfd_open', prefix: '#include <sys/syscall.h>') != '')
|
||||
-
|
||||
# systemd unit / sysuser / tmpfiles.d file installation directories
|
||||
systemdsystemunitdir = get_option('systemdsystemunitdir')
|
||||
systemd_dep = dependency('systemd', required : false)
|
||||
@@ -222,6 +220,10 @@ else
|
||||
tmpfiles_dir = '/usr/lib/tmpfiles.d'
|
||||
endif
|
||||
|
||||
+# PIDFD is broken with sysvinit based OS since 124 release
|
||||
+# https://github.com/polkit-org/polkit/issues/451
|
||||
+config_data.set('HAVE_PIDFD_OPEN', systemd_dep.found() and cc.get_define('SYS_pidfd_open', prefix: '#include <sys/syscall.h>') != '')
|
||||
+
|
||||
# User for running polkitd
|
||||
polkitd_user = get_option('polkitd_user')
|
||||
config_data.set_quoted('POLKITD_USER', polkitd_user)
|
||||
--
|
||||
2.45.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://ftp.postgresql.org/pub/source/v16.5/postgresql-16.5.tar.bz2.sha256
|
||||
sha256 a6cbbb7037f98cb8afa7d3970b7c48040cf02b115e39253a0c037a8bb8e778f0 postgresql-16.5.tar.bz2
|
||||
# From https://ftp.postgresql.org/pub/source/v16.6/postgresql-16.6.tar.bz2.sha256
|
||||
sha256 23369cdaccd45270ac5dcc30fa9da205d5be33fa505e1f17a0418d2caeca477b postgresql-16.6.tar.bz2
|
||||
# License file, Locally calculated
|
||||
sha256 9bf20ee493926a7e17a74bc7f05089fbc014269667b1540bc35a6b194a40c9de COPYRIGHT
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
POSTGRESQL_VERSION = 16.5
|
||||
POSTGRESQL_VERSION = 16.6
|
||||
POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
|
||||
POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
|
||||
POSTGRESQL_LICENSE = PostgreSQL
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
From f37d178d5c25c547835d054fbb1eda32c25034b3 Mon Sep 17 00:00:00 2001
|
||||
From: Craig Small <csmall@dropbear.xyz>
|
||||
Date: Mon, 30 Sep 2024 17:26:01 +1000
|
||||
Subject: [PATCH] build-sys: Fix pidfd_open checking
|
||||
|
||||
The previous build setup would check for pidfd_open using
|
||||
AC_CHECK_FUNC and would be incorrectly reported as true.
|
||||
|
||||
Also, if pidfd_open() and __NR_pidfd_open were not present,
|
||||
pidwait would silently not be built.
|
||||
|
||||
So, changes:
|
||||
compile a small programin using pidfd_open to test it properly
|
||||
conditionally try to find NR_pidfd_open if the function fails
|
||||
complain if neither are present
|
||||
have --disable-pidwait configure option so you are explicit in
|
||||
not wanting and knowing you wont get pidwait
|
||||
|
||||
References:
|
||||
#352
|
||||
commit d9c3e3676d86094abaa239b3218f57bf49d70b4f
|
||||
commit 17f94796a9b3c4f1ff28829107a82107dcb362b4
|
||||
|
||||
Signed-off-by: Craig Small <csmall@dropbear.xyz>
|
||||
|
||||
Upstream: https://gitlab.com/procps-ng/procps/-/commit/2507bc475782ff5e0541d37c780dff1e293c9553
|
||||
|
||||
Signed-off-by: Scott Fan <fancp2007@gmail.com>
|
||||
[Scott: backported to version 4.0.4]
|
||||
---
|
||||
configure.ac | 45 ++++++++++++++++++++++++++++++---------------
|
||||
1 file changed, 30 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index fec27e3f..0719fcd1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -170,21 +170,6 @@ AC_TRY_COMPILE([#include <errno.h>],
|
||||
AC_MSG_RESULT(yes),
|
||||
AC_MSG_RESULT(no))
|
||||
|
||||
-AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [
|
||||
- AC_MSG_CHECKING([for __NR_pidfd_open])
|
||||
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
-#include <sys/syscall.h>
|
||||
-#ifndef __NR_pidfd_open
|
||||
-#error __NR_pidfd_open not defined
|
||||
-#endif
|
||||
- ])], [enable_pidwait=yes], [enable_pidwait=no])
|
||||
- AC_MSG_RESULT([$enable_pidwait])
|
||||
-])
|
||||
-if test "$enable_pidwait" = yes; then
|
||||
- AC_DEFINE([ENABLE_PIDWAIT], [1], [Enable pidwait])
|
||||
-fi
|
||||
-AM_CONDITIONAL([BUILD_PIDWAIT], [test x$enable_pidwait = xyes])
|
||||
-
|
||||
dnl watch8bit must be before the AC_ARG_WITH set as it sets up ncurses
|
||||
AC_SUBST([WITH_WATCH8BIT])
|
||||
AC_ARG_ENABLE([watch8bit],
|
||||
@@ -321,6 +306,36 @@ AC_ARG_ENABLE([pidof],
|
||||
)
|
||||
AM_CONDITIONAL(BUILD_PIDOF, test "x$enable_pidof" = xyes)
|
||||
|
||||
+# If pidwait is enabled, we need either pidfd_open() or __NR_pidfd_open need to be defined
|
||||
+# Cannot use AC_CHECK_FUNC as it (incorrectly) passes with pidfd_open missing
|
||||
+AC_ARG_ENABLE([pidwait],
|
||||
+ AS_HELP_STRING([--disable-pidwait], [do not build pidwait]),
|
||||
+ [], [
|
||||
+ enable_pidwait=yes
|
||||
+ AC_DEFINE(ENABLE_PIDWAIT, 1, [enable pidwait])
|
||||
+ ]
|
||||
+)
|
||||
+AM_CONDITIONAL(BUILD_PIDWAIT, test "x$enable_pidwait" = xyes)
|
||||
+AC_MSG_CHECKING([for pidfd_open()])
|
||||
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ [pidfd_open(1,1)]]])],
|
||||
+ have_pidfd_open=yes; AC_MSG_RESULT([yes]) ,
|
||||
+ have_pidfd_open=no; AC_MSG_RESULT([no])
|
||||
+ )
|
||||
+
|
||||
+AS_IF([[test "x$enable_pidwait" = xyes -a "x$have_pidfd_open" = xno]],
|
||||
+ AC_MSG_CHECKING([for __NR_pidfd_open])
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
+#include <sys/syscall.h>
|
||||
+#ifndef __NR_pidfd_open
|
||||
+#error __NR_pidfd_open not defined
|
||||
+#endif
|
||||
+ ])],
|
||||
+ AC_MSG_RESULT([yes]),
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ AC_MSG_ERROR([Neither pidfd_open or __NR_pidfd_open found. Disable pidwait with configure option --disable-pidwait])
|
||||
+ )
|
||||
+ ,[])
|
||||
+
|
||||
AC_ARG_ENABLE([kill],
|
||||
AS_HELP_STRING([--disable-kill], [do not build kill]),
|
||||
[], [enable_kill=yes]
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
From 1e2d53e1d86cb75e8f39b42b9a5c409e5d3261ed Mon Sep 17 00:00:00 2001
|
||||
From: oli-ben <24815225-oli-ben@users.noreply.gitlab.com>
|
||||
Date: Wed, 27 Nov 2024 20:17:11 +0000
|
||||
Subject: [PATCH] build-sys: Fix define of HAVE_PIDFD_OPEN
|
||||
|
||||
Fix cross-compilation issues when using GCC-12.3
|
||||
* configure fails to detect that the sysroot does support the pidfd_open
|
||||
syscall wrapper
|
||||
* configure fails to define HAVE_PIDFD_OPEN which is used in pgrep.c,
|
||||
so it fails building, because __NR_pidfd_open is then undefined
|
||||
|
||||
Upstream: https://gitlab.com/procps-ng/procps/-/commit/587efb47df7ddbfda4e6abdd1e7792a2531a238f
|
||||
|
||||
Signed-off-by: Scott Fan <fancp2007@gmail.com>
|
||||
[Scott: backported to version 4.0.4]
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0719fcd1..6242a8f8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -317,8 +317,8 @@ AC_ARG_ENABLE([pidwait],
|
||||
)
|
||||
AM_CONDITIONAL(BUILD_PIDWAIT, test "x$enable_pidwait" = xyes)
|
||||
AC_MSG_CHECKING([for pidfd_open()])
|
||||
-AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ [pidfd_open(1,1)]]])],
|
||||
- have_pidfd_open=yes; AC_MSG_RESULT([yes]) ,
|
||||
+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[pidfd_open(1,1)]])],
|
||||
+ have_pidfd_open=yes; AC_DEFINE(HAVE_PIDFD_OPEN, 1, [pidfd_open is defined]) AC_MSG_RESULT([yes]),
|
||||
have_pidfd_open=no; AC_MSG_RESULT([no])
|
||||
)
|
||||
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 81ded587d2484b6f470f2d5c837c5591491377ce Mon Sep 17 00:00:00 2001
|
||||
From: Craig Small <csmall@dropbear.xyz>
|
||||
Date: Thu, 28 Nov 2024 07:20:42 +1100
|
||||
Subject: [PATCH] pgrep: Include sys/syscall.h if making pidwait
|
||||
|
||||
sys/syscall.h would only be included if pidwait was made
|
||||
and we found pidfd_open() The previous commit fixed the
|
||||
finding part, but in fact we want sys/syscall.h either
|
||||
way because syscall() is defined there too.
|
||||
|
||||
Most of the time the header is included by other headers
|
||||
but adding it explicitly means if that header is removed or
|
||||
changed it still works.
|
||||
|
||||
Signed-off-by: Craig Small <csmall@dropbear.xyz>
|
||||
|
||||
Upstream: https://gitlab.com/procps-ng/procps/-/commit/5acbb5dc1587d688de646d739a97251eb893bbb0
|
||||
|
||||
Signed-off-by: Scott Fan <fancp2007@gmail.com>
|
||||
[Scott: backported to version 4.0.4]
|
||||
---
|
||||
src/pgrep.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/src/pgrep.c b/src/pgrep.c
|
||||
index d8e57dff..a2607532 100644
|
||||
--- a/src/pgrep.c
|
||||
+++ b/src/pgrep.c
|
||||
@@ -44,9 +44,7 @@
|
||||
|
||||
#ifdef ENABLE_PIDWAIT
|
||||
#include <sys/epoll.h>
|
||||
-#ifndef HAVE_PIDFD_OPEN
|
||||
#include <sys/syscall.h>
|
||||
-#endif /* !HAVE_PIDFD_OPEN */
|
||||
#endif
|
||||
|
||||
/* EXIT_SUCCESS is 0 */
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -16,6 +16,8 @@ PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS)
|
||||
|
||||
# Applying 0001-build-sys-Add-systemd-elogind-to-w.patch touches Makefile.am
|
||||
# Applying 0002-fix-ncurses-h-include.patch touches configure.ac
|
||||
# Applying 0003-build-sys-Fix-pidfd_open-checking.patch touches configure.ac
|
||||
# Applying 0004-build-sys-Fix-define-of-HAVE_PIDFD_OPEN.patch touches configure.ac
|
||||
PROCPS_NG_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
config BR2_PACKAGE_PYTHON_PSYCOPG2
|
||||
bool "python-psycopg2"
|
||||
depends on BR2_USE_MMU # postgresql
|
||||
depends on BR2_USE_WCHAR # postgresql
|
||||
depends on !BR2_STATIC_LIBS # postgresql
|
||||
depends on !BR2_OPTIMIZE_FAST # postgresql
|
||||
select BR2_PACKAGE_POSTGRESQL
|
||||
help
|
||||
@@ -21,10 +23,11 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2
|
||||
customized thanks to a flexible objects adaptation system.
|
||||
Psycopg 2 is both Unicode and Python 3 friendly.
|
||||
|
||||
http://initd.org/psycopg/
|
||||
https://github.com/psycopg/psycopg2/
|
||||
|
||||
comment "python-psycopg2 needs a toolchain w/ wchar"
|
||||
depends on !BR2_USE_WCHAR
|
||||
comment "python-psycopg2 needs a toolchain w/ dynamic library, wchar"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
|
||||
|
||||
comment "python-psycopg2 can't be built with Optimize for fast"
|
||||
depends on BR2_OPTIMIZE_FAST
|
||||
|
||||
@@ -5,7 +5,8 @@
|
||||
################################################################################
|
||||
|
||||
QUAGGA_VERSION = 1.2.4
|
||||
QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
|
||||
# upstream (http://download.savannah.gnu.org/releases/quagga) dead
|
||||
QUAGGA_SITE = http://sources.buildroot.net/quagga
|
||||
QUAGGA_INSTALL_STAGING = YES
|
||||
QUAGGA_DEPENDENCIES = host-gawk host-pkgconf
|
||||
QUAGGA_LICENSE = GPL-2.0+
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests
|
||||
RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests/older
|
||||
RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz
|
||||
RT_TESTS_VERSION = 2.7
|
||||
RT_TESTS_LICENSE = GPL-2.0+
|
||||
|
||||
@@ -25,22 +25,6 @@ HOST_RUST_DEPENDENCIES = \
|
||||
|
||||
HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0)
|
||||
|
||||
# Some vendor crates contain Cargo.toml.orig files. The associated
|
||||
# .cargo-checksum.json file will contain a checksum for Cargo.toml.orig but
|
||||
# support/scripts/apply-patches.sh will delete them. This will cause the build
|
||||
# to fail, as Cargo will not be able to find the file and verify the checksum.
|
||||
# So, remove all Cargo.toml.orig entries from the affected .cargo-checksum.json
|
||||
# files
|
||||
define HOST_RUST_EXCLUDE_ORIG_FILES
|
||||
for file in $$(find $(@D) -name '*.orig'); do \
|
||||
crate=$$(dirname $${file}); \
|
||||
fn=$${crate}/.cargo-checksum.json; \
|
||||
sed -i -e 's/"Cargo.toml.orig":"[a-z0-9]\+",//g' $${fn}; \
|
||||
done
|
||||
endef
|
||||
|
||||
HOST_RUST_POST_EXTRACT_HOOKS += HOST_RUST_EXCLUDE_ORIG_FILES
|
||||
|
||||
define HOST_RUST_CONFIGURE_CMDS
|
||||
( \
|
||||
echo '[build]'; \
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
From 7ef4ef027c5064502bba23869aed9d1595a4e301 Mon Sep 17 00:00:00 2001
|
||||
Message-ID: <7ef4ef027c5064502bba23869aed9d1595a4e301.1732873390.git.baruch@tkos.co.il>
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Fri, 29 Nov 2024 11:36:16 +0200
|
||||
Subject: [PATCH] Unconditionally define _GNU_SOURCE
|
||||
|
||||
uClibc also uses _GNU_SOURCE to expose glibc compatible API extensions.
|
||||
But toolchain built with uClibc don't define __gnu_linux__. This leads
|
||||
to implicit declaration warnings at build time. With GCC 14 these
|
||||
warnings become errors by default.
|
||||
|
||||
For example:
|
||||
|
||||
.../sexpect-2.3.14/server.c: In function 'expect_exact':
|
||||
.../sexpect-2.3.14/server.c:630:17: error: implicit declaration of function 'strcasestr'; did you mean 'strcasecmp'?
|
||||
[-Wimplicit-function-declaration]
|
||||
630 | found = strcasestr(g.expbuf, g.conn.pass.pattern);
|
||||
| ^~~~~~~~~~
|
||||
| strcasecmp
|
||||
|
||||
Define _GNU_SOURCE unconditionally to fix the build.
|
||||
|
||||
Upstream: https://github.com/clarkwang/sexpect/pull/40
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
main.c | 2 --
|
||||
pty.c | 2 --
|
||||
server.c | 2 --
|
||||
3 files changed, 6 deletions(-)
|
||||
|
||||
diff --git a/main.c b/main.c
|
||||
index 886050a887c1..2bc7c867e297 100644
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -1,7 +1,5 @@
|
||||
|
||||
-#if defined(__gnu_linux__) || defined(__CYGWIN__)
|
||||
#define _GNU_SOURCE
|
||||
-#endif
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <limits.h>
|
||||
diff --git a/pty.c b/pty.c
|
||||
index bf4f6e99805e..f90325d87c77 100644
|
||||
--- a/pty.c
|
||||
+++ b/pty.c
|
||||
@@ -1,7 +1,5 @@
|
||||
|
||||
-#if defined(__gnu_linux__) || defined(__CYGWIN__)
|
||||
#define _GNU_SOURCE
|
||||
-#endif
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
diff --git a/server.c b/server.c
|
||||
index c7e41e0a7dc4..308852f08089 100644
|
||||
--- a/server.c
|
||||
+++ b/server.c
|
||||
@@ -1,7 +1,5 @@
|
||||
|
||||
-#if defined(__gnu_linux__) || defined(__CYGWIN__)
|
||||
#define _GNU_SOURCE
|
||||
-#endif
|
||||
|
||||
#include <assert.h>
|
||||
#include <fcntl.h>
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -25,13 +25,19 @@ class TestMosquitto(infra.basetest.BRTest):
|
||||
msg = "Hello Buildroot!"
|
||||
|
||||
# We subscribe to a topic and write one message to a log file.
|
||||
self.assertRunOk(f"mosquitto_sub -t {topic} -C 1 > {log} &")
|
||||
cmd = f"( mosquitto_sub -t {topic} -C 1 > {log} 2> /dev/null & )"
|
||||
self.assertRunOk(cmd)
|
||||
|
||||
time.sleep(1)
|
||||
# We give some time to the subscriber process to settle.
|
||||
time.sleep(5)
|
||||
|
||||
# We publish a message.
|
||||
self.assertRunOk(f"mosquitto_pub -t {topic} -m '{msg}'")
|
||||
|
||||
# We give some more time to the subscriber process to write
|
||||
# the log and quit.
|
||||
time.sleep(5)
|
||||
|
||||
# We check the log file contains our message.
|
||||
out, ret = self.emulator.run(f"cat {log}")
|
||||
self.assertEqual(ret, 0)
|
||||
|
||||
Reference in New Issue
Block a user