All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit branch/2020.02.x] package/rauc: fix build with headers < 4.14
Date: Thu, 24 Dec 2020 09:49:50 +0100	[thread overview]
Message-ID: <20201224083318.6464B888D4@busybox.osuosl.org> (raw)

commit: https://git.buildroot.net/buildroot/commit/?id=39da6d82178b65aaa0aa95ad45c49ba34006b864
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.02.x

Fixes:
 - http://autobuild.buildroot.org/results/829ae7ed66686c11a941ac99bd08a06f754affb4

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 45a09e9041cf22196ae4b1f6c4f22731967abb0c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...01-src-mount.c-fix-build-with-kernel-4.14.patch | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch b/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch
new file mode 100644
index 0000000000..9604e8878a
--- /dev/null
+++ b/package/rauc/0001-src-mount.c-fix-build-with-kernel-4.14.patch
@@ -0,0 +1,43 @@
+From f73eefdbc0577b125f7d36f54a27d8e95af831dd Mon Sep 17 00:00:00 2001
+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>
+[Upstream status: https://github.com/rauc/rauc/pull/673]
+---
+ src/mount.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/mount.c b/src/mount.c
+index 2e593ca..75acf49 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;
+-- 
+2.29.2
+

                 reply	other threads:[~2020-12-24  8:49 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20201224083318.6464B888D4@busybox.osuosl.org \
    --to=peter@korsgaard.com \
    --cc=buildroot@busybox.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.