NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/swupdate: bump to version 2022.12

Browse Source 
Drop patch which is now upstream.

Update service files based on latest versions in:
https://github.com/sbabic/meta-swupdate/tree/master/recipes-support/swupdate/swupdate

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
James Hilliard 2022-12-13 14:10:49 -07:00 committed by Peter Korsgaard
parent b9612601b0
commit 8ef654997c
5 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
package/swupdate/0001-swupdate-core-bootloader.c-fix-build-without-reallocarray.patch
View File

@ -1,35 +0,0 @@
From f30c4771e93cad7e77d7f2add94327865d226553 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 15 May 2022 14:53:35 +0200
Subject: [PATCH] core/bootloader.c: fix build without reallocarray
Use realloc instead of reallocarray to avoid the following build failure
with uclibc raised since version 2022.05 and
https://github.com/sbabic/swupdate/commit/b8897ed695e1cd954859142b14ec8546d2e7994a:
microblaze-buildroot-linux-uclibc/bin/ld: core/built-in.o: in function `register_bootloader':
(.text.register_bootloader+0x30): undefined reference to `reallocarray'
Fixes:
- http://autobuild.buildroot.org/results/7208e8189b4a6f35aaa4ed7777ecdd37421a7c7f
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Backported from: f30c4771e93cad7e77d7f2add94327865d226553
Signed-off-by: Ben Hutchings <ben.hutchings@mind.be>
---
core/bootloader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/bootloader.c b/core/bootloader.c
index f34cb414..5694d43d 100644
--- a/core/bootloader.c
+++ b/core/bootloader.c
@@ -25,7 +25,7 @@ static unsigned int num_available = 0;
int register_bootloader(const char *name, bootloader *bl)
{
- entry *tmp = reallocarray(available, num_available + 1, sizeof(entry));
+ entry *tmp = realloc(available, (num_available + 1) * sizeof(entry));
if (!tmp) {
return -ENOMEM;
}

1
package/swupdate/swupdate-usb@.service
View File

@ -1,5 +1,6 @@
[Unit]
Description=usb media swupdate service
Requires=swupdate.service
Requires=swupdate-progress.service
[Service]

2
package/swupdate/swupdate.hash
View File

@ -1,5 +1,5 @@
# Locally calculated
sha256 1e819f71b19626bde1a4906ced39d3406ca240b458d3c4a998bd9c7333eba260 swupdate-2022.05.tar.gz
sha256 e6335e87812a98a87f1c55df03c9f4e4ef042789570002c5db120b09f64b0d86 swupdate-2022.12.tar.gz
sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt
sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt
sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt

2
package/swupdate/swupdate.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
SWUPDATE_VERSION = 2022.05
SWUPDATE_VERSION = 2022.12
SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1
SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \

1
package/swupdate/swupdate.service
View File

@ -4,6 +4,7 @@ Documentation=https://github.com/sbabic/swupdate
Documentation=https://sbabic.github.io/swupdate
[Service]
Type=notify
ExecStart=/usr/lib/swupdate/swupdate.sh
KillMode=mixed