Skip to contentSkip to conversation

uclibc: patch 0.9.31 for avr32, to add __kernel_long_t and __kernel_ulong_t data types

PATCH New spdawson at gmail.com 3 participants 5 messages Nov 15, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 uclibc: patch 0.9.31 for avr32, to add __kernel_long_t and __kernel_ulong_t data types

From: Simon Dawson <[email protected]>

As reported by Thomas Petazzoni, the uclibc 0.9.31 build fails for avr32:

In file included from /opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/kernel.h:4,

                 from /opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/netlink.h:4,
                 from /opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/rtnetlink.h:5,
                 from libc/inet/netlinkaccess.h:27,
                 from libc/inet/if_index.c:36:

/opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/sysinfo.h:8: error: expected specifier-qualifier-list before '__kernel_long_t' make[1]: *** [libc/inet/if_index.os] Error 1
make[1]: Leaving directory `/opt/toolchain-build/build/uclibc-0.9.31.1'

The problem is reported at:

https://lkml.org/lkml/2013/5/18/1

The offending kernel commit is:

http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=ccdfcc398594

The fix is to patch uclibc 0.9.31 to add the missing kernel data types. The patch will only be generated for avr32, since uclibc 0.9.31 is not available in Buildroot for any other architecture.

---
 ...add-__kernel_long-and-__kernel_ulong.patch.avr32 | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/uclibc/0.9.31.1/uclibc-0013-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch.avr32
package/uclibc/0.9.31.1/uclibc-0013-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch.avr32 new file +21 -0
new file mode 100644
index 0000000..55cb0c5
@@ -0,0 +1,21 @@
+libc/sysdeps: add __kernel_long and __kernel_ulong
+
+Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
+exported header files were updated to use these new types. Add the
+definitions for __kernel_long_t and __kernel_ulong_t to the relevant
+kernel_types.h headers.
+
+Signed-off-by: Simon Dawson <[email protected]>
+
+diff -Nurp a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
+--- a/libc/sysdeps/linux/avr32/bits/kernel_types.h	2011-06-08 19:58:40.000000000 +0100
++++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h	2013-11-15 08:01:09.209037851 +0000
+@@ -39,6 +39,8 @@ typedef unsigned int		__kernel_gid32_t;
+ typedef unsigned short		__kernel_old_uid_t;
+ typedef unsigned short		__kernel_old_gid_t;
+ typedef unsigned short		__kernel_old_dev_t;
++typedef long			__kernel_long_t;
++typedef unsigned long		__kernel_ulong_t;
+ 
+ #ifdef __GNUC__
+ typedef long long		__kernel_loff_t;
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 uclibc: patch 0.9.31 for avr32, to add __kernel_long_t and __kernel_ulong_t data types

Hi Simon,

Quoted 25 lines · On Fri, Nov 15, 2013 at 9:59 AM, <[email protected]> wrote:

From: Simon Dawson <[email protected]>

As reported by Thomas Petazzoni, the uclibc 0.9.31 build fails for avr32:

In file included from /opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/kernel.h:4,

                 from /opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/netlink.h:4,
                 from /opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/rtnetlink.h:5,
                 from libc/inet/netlinkaccess.h:27,
                 from libc/inet/if_index.c:36:

/opt/br-avr32-full-2013.11-rc1/usr/avr32-buildroot-linux-uclibc/sysroot/usr/include/linux/sysinfo.h:8: error: expected specifier-qualifier-list before '__kernel_long_t' make[1]: *** [libc/inet/if_index.os] Error 1
make[1]: Leaving directory `/opt/toolchain-build/build/uclibc-0.9.31.1'

The problem is reported at:

https://lkml.org/lkml/2013/5/18/1

The offending kernel commit is:

http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=ccdfcc398594

The fix is to patch uclibc 0.9.31 to add the missing kernel data types. The patch will only be generated for avr32, since uclibc 0.9.31 is not available in Buildroot for any other architecture.

Quoted 5 lines
---
 ...add-__kernel_long-and-__kernel_ulong.patch.avr32 | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/uclibc/0.9.31.1/uclibc-0013-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch.avr32

A few buildroot developer days ago, we said we'd like to get rid of architecture-specific patching. IIRC avr32 was the only architecture having such patches. Is it possible to make such patches 'common' in the sense that they are always named .patch and thus applied for all architectures?
If the contents should really only be applied to avr32, is it a possibility to use some #ifdef inside the patch?

Thanks,
Thomas

#2 lore raw

PATCH 1/1 uclibc: patch 0.9.31 for avr32, to add __kernel_long_t and __kernel_ulong_t data types

Dear Thomas De Schampheleire,

Quoted 7 lines · Thomas De Schampheleire

A few buildroot developer days ago, we said we'd like to get rid of architecture-specific patching. IIRC avr32 was the only architecture having such patches. Is it possible to make such patches 'common' in the sense that they are always named .patch and thus applied for all architectures?
If the contents should really only be applied to avr32, is it a possibility to use some #ifdef inside the patch?

In the specific case of this patch, it modifies only avr32-specific header files, so I don't quite see why it needs to be named .patch.avr32 instead of just .patch.

Especially since anyway 0.9.31 can only be enabled for the AVR32 architecture.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/1 uclibc: patch 0.9.31 for avr32, to add __kernel_long_t and __kernel_ulong_t data types

Hi Thomases.

Quoted 6 lines · Thomas Petazzoni

In the specific case of this patch, it modifies only avr32-specific header files, so I don't quite see why it needs to be named .patch.avr32 instead of just .patch.

Especially since anyway 0.9.31 can only be enabled for the AVR32 architecture.

I'll rename the patch, and resubmit. As for the other *.patch.avr32 files, I'll have a look at them as soon as I can.

Simon.

#4 lore raw

PATCH 1/1 uclibc: patch 0.9.31 for avr32, to add __kernel_long_t and __kernel_ulong_t data types

Hi Simon,

Quoted 8 lines · Simon Dawson

Hi Thomases.

Quoted 4 lines · Thomas Petazzoni

In the specific case of this patch, it modifies only avr32-specific header files, so I don't quite see why it needs to be named .patch.avr32 instead of just .patch.

Quoted 5 lines
Quoted 2 lines

Especially since anyway 0.9.31 can only be enabled for the AVR32 architecture.

I'll rename the patch, and resubmit. As for the other *.patch.avr32 files, I'll have a look at them as soon as I can.

That would be great, thanks!

Best regards,
Thomas