mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Bastian Krause <bst@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bastian Krause <bst@pengutronix.de>
Subject: [ptxdist] [PATCH] rauc: version bump 1.5 -> 1.5.1
Date: Thu, 28 Jan 2021 15:12:36 +0100	[thread overview]
Message-ID: <20210128141236.28646-1-bst@pengutronix.de> (raw)

The patch to build with old kernel headers is included in v1.5.1 .

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 ...c-mount.c-fix-build-with-kernel-4.14.patch | 38 -------------------
 patches/rauc-1.5/series                       |  4 --
 rules/rauc.make                               |  4 +-
 3 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 patches/rauc-1.5/0001-src-mount.c-fix-build-with-kernel-4.14.patch
 delete mode 100644 patches/rauc-1.5/series

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
diff --git a/rules/rauc.make b/rules/rauc.make
index 9571400d9..66c967d44 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
 #
 # Paths and names
 #
-RAUC_VERSION	:= 1.5
-RAUC_MD5	:= 83d86821473102682cd1ad2a4a9a7a4c
+RAUC_VERSION	:= 1.5.1
+RAUC_MD5	:= e1c1fad12d81b955784968c37130d272
 RAUC		:= rauc-$(RAUC_VERSION)
 RAUC_SUFFIX	:= tar.xz
 RAUC_URL	:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
-- 
2.30.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

             reply	other threads:[~2021-01-28 14:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-28 14:12 Bastian Krause [this message]
2021-02-03  7:11 ` [ptxdist] [APPLIED] " Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210128141236.28646-1-bst@pengutronix.de \
    --to=bst@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox