summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorBastian Krause <bst@pengutronix.de>2021-01-28 15:12:36 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-01-28 20:34:16 +0100
commit6b73471ae820f8df58440be8392f728ebdbea446 (patch)
treed81856aa8ef95c3ac6b1cd866b5affbc94a6db1a /patches
parentd7ed080323392e6f894a5ec0ffb35165bec087db (diff)
downloadptxdist-6b73471ae820f8df58440be8392f728ebdbea446.tar.gz
ptxdist-6b73471ae820f8df58440be8392f728ebdbea446.tar.xz
rauc: version bump 1.5 -> 1.5.1
The patch to build with old kernel headers is included in v1.5.1 . Signed-off-by: Bastian Krause <bst@pengutronix.de> Message-Id: <20210128141236.28646-1-bst@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/rauc-1.5/0001-src-mount.c-fix-build-with-kernel-4.14.patch38
-rw-r--r--patches/rauc-1.5/series4
2 files changed, 0 insertions, 42 deletions
diff --git a/patches/rauc-1.5/0001-src-mount.c-fix-build-with-kernel-4.14.patch b/patches/rauc-1.5/0001-src-mount.c-fix-build-with-kernel-4.14.patch
deleted file mode 100644
index fa870776b..000000000
--- a/patches/rauc-1.5/0001-src-mount.c-fix-build-with-kernel-4.14.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 22 Dec 2020 11:52:31 +0100
-Subject: [PATCH] src/mount.c: fix build with kernel < 4.14
-
-Build with kernel headers < 4.14 fails since version 1.5.0 and
-https://github.com/rauc/rauc/commit/527bf2f7f746e0253f7843542e19cb0fa0c7c869:
-
-src/mount.c: In function 'r_setup_loop':
-src/mount.c:201:25: error: 'LOOP_SET_BLOCK_SIZE' undeclared (first use in this function)
- looprc = ioctl(loopfd, LOOP_SET_BLOCK_SIZE, 4096);
- ^
-
-Indeed, LOOP_SET_BLOCK_SIZE is only defined since
-https://github.com/torvalds/linux/commit/89e4fdecb51cf5535867026274bc97de9480ade5
-
-Fixes:
- - http://autobuild.buildroot.org/results/829ae7ed66686c11a941ac99bd08a06f754affb4
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/mount.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/mount.c b/src/mount.c
-index 2e593ca85f2b..75acf4963780 100644
---- a/src/mount.c
-+++ b/src/mount.c
-@@ -11,6 +11,10 @@
- #include "mount.h"
- #include "utils.h"
-
-+#ifndef LOOP_SET_BLOCK_SIZE
-+#define LOOP_SET_BLOCK_SIZE 0x4C09
-+#endif
-+
- gboolean r_mount_bundle(const gchar *source, const gchar *mountpoint, GError **error)
- {
- const unsigned long flags = MS_NODEV | MS_NOSUID | MS_RDONLY;
diff --git a/patches/rauc-1.5/series b/patches/rauc-1.5/series
deleted file mode 100644
index a858c05a5..000000000
--- a/patches/rauc-1.5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-src-mount.c-fix-build-with-kernel-4.14.patch
-# 2b3e4a2d47a9d09e94d2a2d75e69f11c - git-ptx-patches magic