deleted file mode 100644
@@ -1,51 +0,0 @@
-From 1078af97a5ac5c3091c8e601b836cd69a7aab7fc Mon Sep 17 00:00:00 2001
-From: Stefano Babic <sbabic@denx.de>
-Date: Tue, 16 Jun 2020 10:29:55 +0200
-Subject: [PATCH] Shellscript stops before completing
-
-Commit 8fb94d7 reworks the way shell script are called, redirecting
-stdout and stderr to SWUpdate. A shell script runs then in a child
-process. Under some circumstances, SWUpdate closes the forked process
-before the child process completes.
-
-Be sure that the child process has terminated before to go on.
-
-Signed-off-by: Stefano Babic <sbabic@denx.de>
-Reported-by: Piotr Piwko <piotr.piwko@gmail.com>
-Tested-by: Piotr Piwko <piotr.piwko@gmail.com>
----
- core/pctl.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/core/pctl.c b/core/pctl.c
-index 8b1c667..01ad540 100644
---- a/core/pctl.c
-+++ b/core/pctl.c
-@@ -263,6 +263,7 @@ int run_system_cmd(const char *cmd)
- }
- } else {
- int fds[2];
-+ pid_t w;
-
- close(stdoutpipe[PIPE_WRITE]);
- close(stderrpipe[PIPE_WRITE]);
-@@ -276,7 +277,6 @@ int run_system_cmd(const char *cmd)
- * and from stderr (of the child process) as ERROR
- */
- do {
-- pid_t w;
- int n1 = 0;
- struct timeval tv;
- fd_set readfds;
-@@ -373,7 +373,7 @@ int run_system_cmd(const char *cmd)
- }
- }
- } while (ret > 0 && n1 > 0);
-- } while (!WIFEXITED(wstatus));
-+ } while (w != process_id);
-
- close(stdoutpipe[PIPE_READ]);
- close(stderrpipe[PIPE_READ]);
-2.25.1
-
deleted file mode 100644
@@ -1,107 +0,0 @@
-From 9b8b498550d4571233fbee6476521c98bc397485 Mon Sep 17 00:00:00 2001
-From: Stefano Babic <sbabic@denx.de>
-Date: Wed, 29 Jul 2020 12:57:59 +0200
-Subject: [PATCH] diskpart: fix adding more as 4 partitions
-
-Signed-off-by: Stefano Babic <sbabic@denx.de>
----
- handlers/diskpart_handler.c | 41 +++++++++++++++++++++++++++----------
- 1 file changed, 30 insertions(+), 11 deletions(-)
-
-diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c
-index 372412b..be570ca 100644
---- a/handlers/diskpart_handler.c
-+++ b/handlers/diskpart_handler.c
-@@ -21,6 +21,11 @@
-
- void diskpart_handler(void);
-
-+/*
-+ * This is taken from libfdisk to declare if a field is not set
-+ */
-+#define LIBFDISK_INIT_UNDEF(_x) ((__typeof__(_x)) -1)
-+
- /**
- * Keys for the properties field in sw-description
- */
-@@ -71,16 +76,23 @@ static int diskpart_set_partition(struct fdisk_context *cxt,
- unsigned long sector_size = fdisk_get_sector_size(cxt);
- struct fdisk_label *lb;
- struct fdisk_parttype *parttype = NULL;
-- int ret;
-+ int ret = 0;
-
- lb = fdisk_get_label(cxt, NULL);
-
- if (!sector_size)
- sector_size = 1;
-- ret = fdisk_partition_set_partno(pa, part->partno) ||
-- fdisk_partition_set_size(pa, part->size / sector_size) ||
-- fdisk_partition_set_name(pa, part->name) ||
-- fdisk_partition_set_start(pa, part->start);
-+ fdisk_partition_unset_partno(pa);
-+ fdisk_partition_unset_size(pa);
-+ fdisk_partition_unset_start(pa);
-+ if (part->start != LIBFDISK_INIT_UNDEF(part->start))
-+ ret = fdisk_partition_set_start(pa, part->start);
-+ if (part->partno != LIBFDISK_INIT_UNDEF(part->partno))
-+ ret |= fdisk_partition_set_partno(pa, part->partno);
-+ if (strlen(part->name))
-+ ret |= fdisk_partition_set_name(pa, part->name);
-+ if (part->size != LIBFDISK_INIT_UNDEF(part->size))
-+ ret |= fdisk_partition_set_size(pa, part->size / sector_size);
-
- /*
- * GPT uses strings instead of hex code for partition type
-@@ -150,6 +162,10 @@ static int diskpart(struct img_type *img,
- }
- elem = LIST_FIRST(parts);
-
-+ part->partno = LIBFDISK_INIT_UNDEF(part->partno);
-+ part->start = LIBFDISK_INIT_UNDEF(part->start);
-+ part->size = LIBFDISK_INIT_UNDEF(part->size);
-+
- part->partno = strtoul(entry->key + strlen("partition-"), NULL, 10);
- while (elem) {
- char *equal = index(elem->value, '=');
-@@ -179,10 +195,10 @@ static int diskpart(struct img_type *img,
- }
-
- TRACE("partition-%zu:%s size %" PRIu64 " start %zu type %s",
-- part->partno,
-- part->name,
-- part->size,
-- part->start,
-+ part->partno != LIBFDISK_INIT_UNDEF(part->partno) ? part->partno : 0,
-+ strlen(part->name) ? part->name : "UNDEF NAME",
-+ part->size != LIBFDISK_INIT_UNDEF(part->size) ? part->size : 0,
-+ part->start!= LIBFDISK_INIT_UNDEF(part->start) ? part->start : 0,
- part->type);
-
- /*
-@@ -253,10 +269,12 @@ static int diskpart(struct img_type *img,
- if (ret) {
- WARN("I cannot set all partition's parameters");
- }
-- if (fdisk_add_partition(cxt, newpa, &partno) < 0) {
-- ERROR("I cannot add partition %zu(%s)", part->partno, part->name);
-+ if ((ret = fdisk_add_partition(cxt, newpa, &partno)) < 0) {
-+ ERROR("I cannot add partition %zu(%s): %d", part->partno, part->name, ret);
- }
- fdisk_unref_partition(newpa);
-+ if (ret < 0)
-+ goto handler_exit;
- } else {
- ret = diskpart_set_partition(cxt, pa, part);
- if (ret) {
-@@ -267,6 +285,7 @@ static int diskpart(struct img_type *img,
- }
- fdisk_unref_partition(pa);
- }
-+ fdisk_reset_partition(pa);
- i++;
- }
-
-2.25.1
-
deleted file mode 100644
@@ -1,31 +0,0 @@
-From e3a6b120ff88f6dc34570002de97754b607966ec Mon Sep 17 00:00:00 2001
-From: Stefano Babic <sbabic@denx.de>
-Date: Tue, 9 Jun 2020 13:58:06 +0000
-Subject: [PATCH] diskpart: force kernel to reread partition table
-
-After writing a partition table to disk, the kernel should be informed
-(like the partconf tool does), else it is not possible to install images
-in the new created partitions.
-
-Signed-off-by: Stefano Babic <sbabic@denx.de>
----
- handlers/diskpart_handler.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c
-index 16adc17..372412b 100644
---- a/handlers/diskpart_handler.c
-+++ b/handlers/diskpart_handler.c
-@@ -273,7 +273,8 @@ static int diskpart(struct img_type *img,
- /*
- * Everything done, write into disk
- */
-- ret = fdisk_write_disklabel(cxt);
-+ ret = fdisk_write_disklabel(cxt) |
-+ fdisk_reread_partition_table(cxt);
-
- handler_exit:
- if (fdisk_deassign_device(cxt, 0))
-2.25.1
-
deleted file mode 100644
@@ -1,11 +0,0 @@
-require swupdate.inc
-
-SRCREV = "1a6dfbb5a0be978ac1a159758e278ab4d44167e2"
-
-SRC_URI += "file://0001-diskpart-force-kernel-to-reread-partition-table.patch \
- file://0001-Shellscript-stops-before-completing.patch \
- file://0001-diskpart-fix-adding-more-as-4-partitions.patch \
- "
-
-# Building out of tree is broken in this version
-B = "${S}"