[Buildroot] [PATCH 0 of 2] RedHat 5 support fixes

[Buildroot] [PATCH 0 of 2] RedHat 5 support fixes

[Thomas De Schampheleire]

This small patch series fixes two issues when using Buildroot on RedHat 5.
Granted, RedHat 5 is an old distribution, but in some corporate environments
it is still used. As the fixes are relatively small, I hope they can be
accepted.

The corresponding problems have been introduced somewhere between 2013.05
and 2014.05, and are still present on current master.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
Thomas De Schampheleire (2)
  check-kernel-headers: mktemp --tmpdir not available on RedHat 5
  kmod: add patches to support build on Redhat 5

 package/kmod/kmod-0001-fix-O_CLOEXEC.patch                    |  38 ++++++
 package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch |  41 +++++++
 support/scripts/check-kernel-headers.sh                       |   2 +-
 3 files changed, 80 insertions(+), 1 deletions(-)

[Buildroot] [PATCH 1 of 2] check-kernel-headers: mktemp --tmpdir not available on RedHat 5

[Thomas De Schampheleire]

# HG changeset patch
# User Thomas De Schampheleire <thomas.de_schampheleire@alcatel-lucent.com>
# Date 1407153076 -7200
#      Mon Aug 04 13:51:16 2014 +0200
# Node ID 2c7735c0247a4c83a3c2ea1d58e74be613465255
# Parent  6af0c3866b64670bb6d62302b64f3164b1f70fb6
check-kernel-headers: mktemp --tmpdir not available on RedHat 5

mktemp --tmpdir is not available on older Redhat 5 machines. The alternative
that has the same behavior is 'mktemp -t'.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
 support/scripts/check-kernel-headers.sh |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/support/scripts/check-kernel-headers.sh b/support/scripts/check-kernel-headers.sh
--- a/support/scripts/check-kernel-headers.sh
+++ b/support/scripts/check-kernel-headers.sh
@@ -8,7 +8,7 @@
 HDR_V="${HDR_VER#*.}"
 HDR_m="${HDR_V%%.*}"
 
-EXEC="$(mktemp --tmpdir check-headers.XXXXXX)"
+EXEC="$(mktemp -t check-headers.XXXXXX)"
 
 # We do not want to account for the patch-level, since headers are
 # not supposed to change for different patchlevels, so we mask it out.

[Buildroot] [PATCH 2 of 2] kmod: add patches to support build on Redhat 5

[Thomas De Schampheleire]

# HG changeset patch
# User Thomas De Schampheleire <thomas.de_schampheleire@alcatel-lucent.com>
# Date 1407153133 -7200
#      Mon Aug 04 13:52:13 2014 +0200
# Node ID f2b8b2b5efec1b2340c423f14f12df11a95ceac7
# Parent  2c7735c0247a4c83a3c2ea1d58e74be613465255
kmod: add patches to support build on Redhat 5

kmod uses certain features not available on older Redhat 5 machines.
This commit imports two patches from OpenEmbedded to fix that.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
 package/kmod/kmod-0001-fix-O_CLOEXEC.patch                    |  38 ++++++
 package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch |  41 +++++++
 2 files changed, 79 insertions(+), 0 deletions(-)

diff --git a/package/kmod/kmod-0001-fix-O_CLOEXEC.patch b/package/kmod/kmod-0001-fix-O_CLOEXEC.patch
new file mode 100644
--- /dev/null
+++ b/package/kmod/kmod-0001-fix-O_CLOEXEC.patch
@@ -0,0 +1,38 @@
+From bd43367eee868059770188fd9e9db38520dc6fff Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Wed, 22 Jan 2014 01:06:40 -0500
+Subject: [PATCH] libkmod/libkmod-internal.h: check whether O_CLOEXEC is
+ defined or not
+
+O_CLOEXEC is introduced from Linux 2.6.23, so old kernel doesn't have
+it, we need check before use.
+
+This patch is much more like a workaround, since it may need fcntl() use
+FD_CLOEXEC to replace.
+
+This problem was reported by "Ting Liu <b28495@freescale.com>"
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
+Upstream-Status: Pending
+---
+ libkmod/libkmod-internal.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
+index 0180124..100b40f 100644
+--- a/libkmod/libkmod-internal.h
++++ b/libkmod/libkmod-internal.h
+@@ -9,6 +9,10 @@
+ #include "macro.h"
+ #include "libkmod.h"
+ 
++#ifndef O_CLOEXEC
++#define O_CLOEXEC 0
++#endif
++
+ static _always_inline_ _printf_format_(2, 3) void
+ 	kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {}
+ 
+-- 
+1.7.10.4
+
diff --git a/package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch b/package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch
new file mode 100644
--- /dev/null
+++ b/package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch
@@ -0,0 +1,41 @@
+From 0c4dbadc9db3cda1cfca64e44ea08c6e89919ea7 Mon Sep 17 00:00:00 2001
+From: Ting Liu <b28495@freescale.com>
+Date: Tue, 10 Sep 2013 13:44:18 +0800
+Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
+
+We can't use htobe* and be*toh functions because they are not
+available on older versions of glibc, For example, shipped on Centos 5.5.
+
+Change to directly calling bswap_* as defined in+byteswap.h.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Ting Liu <b28495@freescale.com>
+---
+ libkmod/libkmod-signature.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
+index 6b80caa..3544a36 100644
+--- a/libkmod/libkmod-signature.c
++++ b/libkmod/libkmod-signature.c
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <endian.h>
++#include <byteswap.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -121,7 +122,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
+ 			modsig->hash >= PKEY_HASH__LAST ||
+ 			modsig->id_type >= PKEY_ID_TYPE__LAST)
+ 		return false;
+-	sig_len = be32toh(get_unaligned(&modsig->sig_len));
++	sig_len = bswap_32(get_unaligned(&modsig->sig_len));
+ 	if (size < (off_t)(modsig->signer_len + modsig->key_id_len + sig_len))
+ 		return false;
+ 
+-- 
+1.7.5.4
+

[Buildroot] [PATCH 1 of 2] check-kernel-headers: mktemp --tmpdir not available on RedHat 5

[Yann E. MORIN]

Thomas, All,

On 2014-09-02 11:25 +0200, Thomas De Schampheleire spake thusly:
> # HG changeset patch
> # User Thomas De Schampheleire <thomas.de_schampheleire@alcatel-lucent.com>
> # Date 1407153076 -7200
> #      Mon Aug 04 13:51:16 2014 +0200
> # Node ID 2c7735c0247a4c83a3c2ea1d58e74be613465255
> # Parent  6af0c3866b64670bb6d62302b64f3164b1f70fb6
> check-kernel-headers: mktemp --tmpdir not available on RedHat 5
> 
> mktemp --tmpdir is not available on older Redhat 5 machines. The alternative
> that has the same behavior is 'mktemp -t'.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  support/scripts/check-kernel-headers.sh |  2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/support/scripts/check-kernel-headers.sh b/support/scripts/check-kernel-headers.sh
> --- a/support/scripts/check-kernel-headers.sh
> +++ b/support/scripts/check-kernel-headers.sh
> @@ -8,7 +8,7 @@
>  HDR_V="${HDR_VER#*.}"
>  HDR_m="${HDR_V%%.*}"
>  
> -EXEC="$(mktemp --tmpdir check-headers.XXXXXX)"
> +EXEC="$(mktemp -t check-headers.XXXXXX)"
>  
>  # We do not want to account for the patch-level, since headers are
>  # not supposed to change for different patchlevels, so we mask it out.
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1 of 2] check-kernel-headers: mktemp --tmpdir not available on RedHat 5

[Peter Korsgaard]

>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:

 > # HG changeset patch
 > # User Thomas De Schampheleire <thomas.de_schampheleire@alcatel-lucent.com>
 > # Date 1407153076 -7200
 > #      Mon Aug 04 13:51:16 2014 +0200
 > # Node ID 2c7735c0247a4c83a3c2ea1d58e74be613465255
 > # Parent  6af0c3866b64670bb6d62302b64f3164b1f70fb6

Is all of this hg noise needed? Your patches didn't used to contain
this.

 > check-kernel-headers: mktemp --tmpdir not available on RedHat 5

 > mktemp --tmpdir is not available on older Redhat 5 machines. The alternative
 > that has the same behavior is 'mktemp -t'.

Redhat Linux 5.0, that was one of the very first Linux distributions I
ever used - It's been a while ;) 

I guess you mean RHEL 5, so I've adjusted the commit message and
committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1 of 2] check-kernel-headers: mktemp --tmpdir not available on RedHat 5

[Thomas De Schampheleire]

Peter Korsgaard <jacmet@uclibc.org> schreef:
>>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:
>
> > # HG changeset patch
> > # User Thomas De Schampheleire <thomas.de_schampheleire@alcatel-lucent.com>
> > # Date 1407153076 -7200
> > #      Mon Aug 04 13:51:16 2014 +0200
> > # Node ID 2c7735c0247a4c83a3c2ea1d58e74be613465255
> > # Parent  6af0c3866b64670bb6d62302b64f3164b1f70fb6
>
>Is all of this hg noise needed? Your patches didn't used to contain
>this.

Oi sorry, I have forgotten a switch to turn this off here.

>
> > check-kernel-headers: mktemp --tmpdir not available on RedHat 5
>
> > mktemp --tmpdir is not available on older Redhat 5 machines. The alternative
> > that has the same behavior is 'mktemp -t'.
>
>Redhat Linux 5.0, that was one of the very first Linux distributions I
>ever used - It's been a while ;) 
>
>I guess you mean RHEL 5, so I've adjusted the commit message and
>committed, thanks.

Thanks, I do indeed mean RHEL5, wasn't aware that there was a difference.

Best regards,
Thomas

[Buildroot] [PATCH 2 of 2] kmod: add patches to support build on Redhat 5

[Peter Korsgaard]

>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:

 > # HG changeset patch
 > # User Thomas De Schampheleire <thomas.de_schampheleire@alcatel-lucent.com>
 > # Date 1407153133 -7200
 > #      Mon Aug 04 13:52:13 2014 +0200
 > # Node ID f2b8b2b5efec1b2340c423f14f12df11a95ceac7
 > # Parent  2c7735c0247a4c83a3c2ea1d58e74be613465255
 > kmod: add patches to support build on Redhat 5

 > kmod uses certain features not available on older Redhat 5 machines.
 > This commit imports two patches from OpenEmbedded to fix that.

 > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

 > ---
 >  package/kmod/kmod-0001-fix-O_CLOEXEC.patch                    |  38 ++++++
 >  package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch |  41 +++++++
 >  2 files changed, 79 insertions(+), 0 deletions(-)


The first patch looks ok, but:

 > diff --git a/package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch b/package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch
 > new file mode 100644
 > --- /dev/null
 > +++ b/package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch
 > @@ -0,0 +1,41 @@
 > +From 0c4dbadc9db3cda1cfca64e44ea08c6e89919ea7 Mon Sep 17 00:00:00 2001
 > +From: Ting Liu <b28495@freescale.com>
 > +Date: Tue, 10 Sep 2013 13:44:18 +0800
 > +Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
 > +
 > +We can't use htobe* and be*toh functions because they are not
 > +available on older versions of glibc, For example, shipped on Centos 5.5.
 > +
 > +Change to directly calling bswap_* as defined in+byteswap.h.
 > +
 > +Upstream-Status: Inappropriate
 > +
 > +Signed-off-by: Ting Liu <b28495@freescale.com>
 > +---
 > + libkmod/libkmod-signature.c |    3 ++-
 > + 1 files changed, 2 insertions(+), 1 deletions(-)
 > +
 > +diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
 > +index 6b80caa..3544a36 100644
 > +--- a/libkmod/libkmod-signature.c
 > ++++ b/libkmod/libkmod-signature.c
 > +@@ -19,6 +19,7 @@
 > +  */
 > + 
 > + #include <endian.h>
 > ++#include <byteswap.h>
 > + #include <stdint.h>
 > + #include <stdlib.h>
 > + #include <string.h>
 > +@@ -121,7 +122,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
 > + 			modsig->hash >= PKEY_HASH__LAST ||
 > + 			modsig->id_type >= PKEY_ID_TYPE__LAST)
 > + 		return false;
 > +-	sig_len = be32toh(get_unaligned(&modsig->sig_len));
 > ++	sig_len = bswap_32(get_unaligned(&modsig->sig_len));

Ehh, so what happens when we want to build kmod for a big endian target?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1 of 2] check-kernel-headers: mktemp --tmpdir not available on RedHat 5

[Peter Korsgaard]

>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:

Hi,

 >> Redhat Linux 5.0, that was one of the very first Linux distributions I
 >> ever used - It's been a while ;) 
 >> 
 >> I guess you mean RHEL 5, so I've adjusted the commit message and
 >> committed, thanks.

 > Thanks, I do indeed mean RHEL5, wasn't aware that there was a difference.

https://en.wikipedia.org/wiki/Red_Hat_Linux

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2 of 2] kmod: add patches to support build on Redhat 5

[Thomas De Schampheleire]

On Sun, Sep 28, 2014 at 8:43 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:
>
>  > # HG changeset patch
>  > # User Thomas De Schampheleire <thomas.de_schampheleire@alcatel-lucent.com>
>  > # Date 1407153133 -7200
>  > #      Mon Aug 04 13:52:13 2014 +0200
>  > # Node ID f2b8b2b5efec1b2340c423f14f12df11a95ceac7
>  > # Parent  2c7735c0247a4c83a3c2ea1d58e74be613465255
>  > kmod: add patches to support build on Redhat 5
>
>  > kmod uses certain features not available on older Redhat 5 machines.
>  > This commit imports two patches from OpenEmbedded to fix that.
>
>  > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
>  > ---
>  >  package/kmod/kmod-0001-fix-O_CLOEXEC.patch                    |  38 ++++++
>  >  package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch |  41 +++++++
>  >  2 files changed, 79 insertions(+), 0 deletions(-)
>
>
> The first patch looks ok, but:
>
>  > diff --git a/package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch b/package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch
>  > new file mode 100644
>  > --- /dev/null
>  > +++ b/package/kmod/kmod-0002-use-bswap-instead-of-htobe-betoh.patch
>  > @@ -0,0 +1,41 @@
>  > +From 0c4dbadc9db3cda1cfca64e44ea08c6e89919ea7 Mon Sep 17 00:00:00 2001
>  > +From: Ting Liu <b28495@freescale.com>
>  > +Date: Tue, 10 Sep 2013 13:44:18 +0800
>  > +Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
>  > +
>  > +We can't use htobe* and be*toh functions because they are not
>  > +available on older versions of glibc, For example, shipped on Centos 5.5.
>  > +
>  > +Change to directly calling bswap_* as defined in+byteswap.h.
>  > +
>  > +Upstream-Status: Inappropriate
>  > +
>  > +Signed-off-by: Ting Liu <b28495@freescale.com>
>  > +---
>  > + libkmod/libkmod-signature.c |    3 ++-
>  > + 1 files changed, 2 insertions(+), 1 deletions(-)
>  > +
>  > +diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
>  > +index 6b80caa..3544a36 100644
>  > +--- a/libkmod/libkmod-signature.c
>  > ++++ b/libkmod/libkmod-signature.c
>  > +@@ -19,6 +19,7 @@
>  > +  */
>  > +
>  > + #include <endian.h>
>  > ++#include <byteswap.h>
>  > + #include <stdint.h>
>  > + #include <stdlib.h>
>  > + #include <string.h>
>  > +@@ -121,7 +122,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
>  > +                    modsig->hash >= PKEY_HASH__LAST ||
>  > +                    modsig->id_type >= PKEY_ID_TYPE__LAST)
>  > +            return false;
>  > +-   sig_len = be32toh(get_unaligned(&modsig->sig_len));
>  > ++   sig_len = bswap_32(get_unaligned(&modsig->sig_len));
>
> Ehh, so what happens when we want to build kmod for a big endian target?
>

Hmm, indeed, that doesn't seem right.
I found another patch that looks better [1], sent to the linux-modules
mailing list in September 2013, received some comments and a v2 was
promised but never arrived (AFAICS). I will adopt the patch and fix
the comments, then resend to buildroot + linux-modules.

[1] http://www.spinics.net/lists/linux-modules/msg01127.html

Thanks,
Thomas

[Buildroot] [PATCH 2 of 2] kmod: add patches to support build on Redhat 5

[Peter Korsgaard]

>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes:

Hi,

 >> > +-   sig_len = be32toh(get_unaligned(&modsig->sig_len));
 >> > ++   sig_len = bswap_32(get_unaligned(&modsig->sig_len));
 >> 
 >> Ehh, so what happens when we want to build kmod for a big endian target?

 > Hmm, indeed, that doesn't seem right.
 > I found another patch that looks better [1], sent to the linux-modules
 > mailing list in September 2013, received some comments and a v2 was
 > promised but never arrived (AFAICS). I will adopt the patch and fix
 > the comments, then resend to buildroot + linux-modules.

 > [1] http://www.spinics.net/lists/linux-modules/msg01127.html

Thanks, that patch (+ suggested changes) looks sensible to me.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2 of 2] kmod: add patches to support build on Redhat 5

[Thomas Petazzoni]

Dear Thomas De Schampheleire,

On Tue, 02 Sep 2014 11:25:46 +0200, Thomas De Schampheleire wrote:
> # HG changeset patch
> # User Thomas De Schampheleire <thomas.de_schampheleire@alcatel-lucent.com>
> # Date 1407153133 -7200
> #      Mon Aug 04 13:52:13 2014 +0200
> # Node ID f2b8b2b5efec1b2340c423f14f12df11a95ceac7
> # Parent  2c7735c0247a4c83a3c2ea1d58e74be613465255
> kmod: add patches to support build on Redhat 5
> 
> kmod uses certain features not available on older Redhat 5 machines.
> This commit imports two patches from OpenEmbedded to fix that.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Following the discussion with Peter, I'm marking this patch as Changes
requested in patchwork.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com