From 8430114f4c4c17cbe619dbd430db535325783a3c Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 26 Dec 2023 13:33:04 +0100 Subject: [PATCH] swupdate: adapt patches to 2023.12.1 https://onedigi.atlassian.net/browse/DEL-8885 Signed-off-by: Gabriel Valcazar --- ...ange-Makefile-to-build-swupdate-library-s.patch | 6 +++--- ...d-on-the-fly-build-configuration-variable.patch | 8 ++++---- ...iff-handler-for-applying-librsync-s-rdiff.patch | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate/0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch b/meta-digi-dey/recipes-support/swupdate/swupdate/0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch index dc7485828..66244556f 100644 --- a/meta-digi-dey/recipes-support/swupdate/swupdate/0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch +++ b/meta-digi-dey/recipes-support/swupdate/swupdate/0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch @@ -17,18 +17,18 @@ Signed-off-by: Mike Engel create mode 120000 ipc-static/progress_ipc.c diff --git a/Makefile b/Makefile -index 09d03a3..f34810b 100644 +index cdcab69..9065a40 100644 --- a/Makefile +++ b/Makefile @@ -364,6 +364,7 @@ include $(srctree)/Makefile.flags objs-y := core handlers bootloader suricatta - libs-y := corelib mongoose parser fs + libs-y := corelib mongoose parser fs containers +libs-y += ipc-static bindings-y := bindings tools-y := tools -@@ -480,6 +481,7 @@ install: all +@@ -479,6 +480,7 @@ install: all install -m 0644 $(srctree)/include/progress_ipc.h ${DESTDIR}/${INCLUDEDIR} install -m 0755 $(objtree)/${swupdate-ipc-lib} ${DESTDIR}/${LIBDIR} ln -sfr ${DESTDIR}/${LIBDIR}/${swupdate-ipc-lib} ${DESTDIR}/${LIBDIR}/libswupdate.so diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate/0002-config-add-on-the-fly-build-configuration-variable.patch b/meta-digi-dey/recipes-support/swupdate/swupdate/0002-config-add-on-the-fly-build-configuration-variable.patch index 5370861f1..75805e89b 100644 --- a/meta-digi-dey/recipes-support/swupdate/swupdate/0002-config-add-on-the-fly-build-configuration-variable.patch +++ b/meta-digi-dey/recipes-support/swupdate/swupdate/0002-config-add-on-the-fly-build-configuration-variable.patch @@ -13,10 +13,10 @@ Signed-off-by: Mike Engel 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig -index 85fa5fd71c4c..5ad2026c675c 100644 +index 5a3dc9a..17fa27c 100644 --- a/Kconfig +++ b/Kconfig -@@ -258,6 +258,13 @@ config FEATURE_SYSLOG +@@ -262,6 +262,13 @@ config FEATURE_SYSLOG # This option is auto-selected when you select any applet which may # send its output to syslog. You do not need to select it manually. @@ -31,10 +31,10 @@ index 85fa5fd71c4c..5ad2026c675c 100644 menu 'Build Options' diff --git a/core/network_thread.c b/core/network_thread.c -index 88042f1238cb..4bc100055e42 100644 +index ca23908..c539d27 100644 --- a/core/network_thread.c +++ b/core/network_thread.c -@@ -106,7 +106,9 @@ static bool is_selection_allowed(const char *software_set, char *running_mode, +@@ -102,7 +102,9 @@ static bool is_selection_allowed(const char *software_set, char *running_mode, } free(swset); } diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate/0003-handlers-rdiff-handler-for-applying-librsync-s-rdiff.patch b/meta-digi-dey/recipes-support/swupdate/swupdate/0003-handlers-rdiff-handler-for-applying-librsync-s-rdiff.patch index 8784f33ad..0a93088ee 100644 --- a/meta-digi-dey/recipes-support/swupdate/swupdate/0003-handlers-rdiff-handler-for-applying-librsync-s-rdiff.patch +++ b/meta-digi-dey/recipes-support/swupdate/swupdate/0003-handlers-rdiff-handler-for-applying-librsync-s-rdiff.patch @@ -19,10 +19,10 @@ Signed-off-by: David Escalona create mode 100644 handlers/ubivol_rdiff_handler.c diff --git a/Makefile.flags b/Makefile.flags -index 2a021c8..b542358 100644 +index 95c785c..5bdf520 100644 --- a/Makefile.flags +++ b/Makefile.flags -@@ -209,6 +209,10 @@ ifeq ($(CONFIG_RDIFFHANDLER),y) +@@ -202,6 +202,10 @@ ifeq ($(CONFIG_RDIFFHANDLER),y) LDLIBS += rsync endif @@ -34,10 +34,10 @@ index 2a021c8..b542358 100644 LDLIBS += zmq endif diff --git a/configs/all_handlers_defconfig b/configs/all_handlers_defconfig -index 8f6f8e0..9077220 100644 +index da4b28f..5da2d0d 100644 --- a/configs/all_handlers_defconfig +++ b/configs/all_handlers_defconfig -@@ -31,5 +31,6 @@ CONFIG_SHELLSCRIPTHANDLER=y +@@ -30,5 +30,6 @@ CONFIG_SHELLSCRIPTHANDLER=y CONFIG_SWUFORWARDER_HANDLER=y CONFIG_SSBLSWITCH=y CONFIG_UBIVOL=y @@ -45,10 +45,10 @@ index 8f6f8e0..9077220 100644 CONFIG_UCFWHANDLER=y CONFIG_UNIQUEUUID=y diff --git a/handlers/Config.in b/handlers/Config.in -index 107ffeb..62d54bd 100644 +index 9f4e177..129e972 100644 --- a/handlers/Config.in +++ b/handlers/Config.in -@@ -166,6 +166,19 @@ config RDIFFHANDLER +@@ -158,6 +158,19 @@ config RDIFFHANDLER comment "rdiff support needs librsync" depends on !HAVE_LIBRSYNC @@ -69,7 +69,7 @@ index 107ffeb..62d54bd 100644 bool "readback" depends on HASH_VERIFY diff --git a/handlers/Makefile b/handlers/Makefile -index b5203f9..bd47d3b 100644 +index eb24a49..e74dacb 100644 --- a/handlers/Makefile +++ b/handlers/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_CFIHAMMING1)+= flash_hamming1_handler.o