2010.11-rc1 fixes
Here are a few fixes for 2010.11
You can pull from :
git://git.potipota.net/buildroot 2010.11-various-fixes-2
Regards,
--
Lionel Landwerlin
PATCH 1/4 libglib2: add missing dependency on ipv6
From: Lionel Landwerlin <[email protected]>
--- package/libglib2/Config.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
package/libglib2/Config.in +3 -1
@@ -5,10 +5,12 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_ZLIB depends on BR2_USE_WCHAR # gettext + depends on BR2_INET_IPV6 # ipv6 help Low-level core library that forms the basis of GTK+ and GNOME. http://www.gtk.org/ -comment "libglib2 requires a toolchain with WCHAR support" +comment "libglib2 requires a toolchain with WCHAR & IPV6 support" depends on !BR2_USE_WCHAR + depends on !BR2_INET_IPV6
Signature · 1 line
1.7.2.3
PATCH 1/4 libglib2: add missing dependency on ipv6
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:
llandwerlin> From: Lionel Landwerlin <[email protected]> llandwerlin> Signed-off-by: Lionel Landwerlin <[email protected]>
No, glib2 works fine without ipv6, you just have to ensure the libglib2-optional-ipv6.patch gets applied. Our patch handling is a bit complicated for autotarget/gentarget packages, so it tends to confuse more than help. I think I might simplify it a bit post 2010.11.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/4 libglib2: fix application for no builtin atomic patch
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- ....0-fix-compilation-with-no-builtin-atomic.patch | 25 -------------------- ....0-fix-compilation-with-no-builtin-atomic.patch | 25 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 package/libglib2/libglib-2.26.0-fix-compilation-with-no-builtin-atomic.patch create mode 100644 package/libglib2/libglib2-2.26.0-fix-compilation-with-no-builtin-atomic.patch
package/libglib2/libglib-2.26.0-fix-compilation-with-no-builtin-atomic.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001 -From: Lionel Landwerlin <[email protected]> -Date: Sat, 6 Nov 2010 14:56:15 +0100 -Subject: [PATCH] glib: fix compilation with no builtin atomic operations compilers - -Signed-off-by: Lionel Landwerlin <[email protected]> ---- - glib/gatomic.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/glib/gatomic.c b/glib/gatomic.c -index 845c866..01468ce 100644 ---- a/glib/gatomic.c -+++ b/glib/gatomic.c -@@ -881,6 +881,7 @@ g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomi - #endif /* DEFINE_WITH_WIN32_INTERLOCKED */ - - #ifdef DEFINE_WITH_MUTEXES -+# include "gthread.h" - /* We have to use the slow, but safe locking method */ - static GMutex *g_atomic_mutex; - --- -1.7.2.3 -
package/libglib2/libglib2-2.26.0-fix-compilation-with-no-builtin-atomic.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 58096320ea0888c4fbbff318839017a4d2e82703 Mon Sep 17 00:00:00 2001 +From: Lionel Landwerlin <[email protected]> +Date: Sat, 6 Nov 2010 14:56:15 +0100 +Subject: [PATCH] glib: fix compilation with no builtin atomic operations compilers + +Signed-off-by: Lionel Landwerlin <[email protected]> +--- + glib/gatomic.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/glib/gatomic.c b/glib/gatomic.c +index 845c866..01468ce 100644 +--- a/glib/gatomic.c ++++ b/glib/gatomic.c +@@ -881,6 +881,7 @@ g_atomic_pointer_compare_and_exchange (volatile gpointer G_GNUC_MAY_ALIAS *atomi + #endif /* DEFINE_WITH_WIN32_INTERLOCKED */ + + #ifdef DEFINE_WITH_MUTEXES ++# include "gthread.h" + /* We have to use the slow, but safe locking method */ + static GMutex *g_atomic_mutex; + +-- +1.7.2.3 +
Signature · 1 line
1.7.2.3
PATCH 2/4 libglib2: fix application for no builtin atomic patch
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:
llandwerlin> From: Lionel Landwerlin <[email protected]> llandwerlin> Signed-off-by: Lionel Landwerlin <[email protected]> llandwerlin> ---
llandwerlin> ....0-fix-compilation-with-no-builtin-atomic.patch | 25 -------------------- llandwerlin> ....0-fix-compilation-with-no-builtin-atomic.patch | 25 ++++++++++++++++++++
llandwerlin> 2 files changed, 25 insertions(+), 25 deletions(-)
The '-M' option to git diff is very handy for this, at it would have shown it as a direct rename. I believe you can put something like this in your ~/.gitconfig
[diff]
renames = "copy"
To have it done automatically.
Anyway, thanks for the patch, but I committed a similar patch already (Sorry, I had some email problems yesterday).
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/4 linux-fusion: bump to 8.1.2
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- .../linux-fusion-8.1.1-missing-include.patch | 17 -------- ...ux-fusion-8.1.2-fix-warnings-at-link-time.patch | 40 ++++++++++++++++++++ package/linux-fusion/linux-fusion.mk | 6 +- 3 files changed, 43 insertions(+), 20 deletions(-) delete mode 100644 package/linux-fusion/linux-fusion-8.1.1-missing-include.patch create mode 100644 package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch
package/linux-fusion/linux-fusion-8.1.1-missing-include.patch deleted +0 -17
@@ -1,17 +0,0 @@ -fusiondev.c does not compile due to TASK_INTERRUPTIBLE and other -related constants not being defined. - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: linux-fusion-8.1.1/linux/drivers/char/fusion/fusiondev.c -=================================================================== ---- linux-fusion-8.1.1.orig/linux/drivers/char/fusion/fusiondev.c 2010-07-16 22:49:23.000000000 +0200 -+++ linux-fusion-8.1.1/linux/drivers/char/fusion/fusiondev.c 2010-07-16 22:49:39.000000000 +0200 -@@ -32,6 +32,7 @@ - #include <linux/proc_fs.h> - #include <linux/poll.h> - #include <linux/init.h> -+#include <linux/sched.h> - #include <asm/io.h> - #include <asm/uaccess.h> -
package/linux-fusion/linux-fusion-8.1.2-fix-warnings-at-link-time.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 7884688ba7a2e4cb7772cbedb34245a7fc9bf9d9 Mon Sep 17 00:00:00 2001 +From: Lionel Landwerlin <[email protected]> +Date: Wed, 3 Nov 2010 10:25:17 +0100 +Subject: [PATCH] Fix warnings at link time + +Signed-off-by: Lionel Landwerlin <[email protected]> +--- + linux/drivers/char/fusion/entries.c | 2 +- + linux/drivers/char/fusion/fusiondev.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/linux/drivers/char/fusion/entries.c b/linux/drivers/char/fusion/entries.c +index 11edd43..8d102cf 100644 +--- a/linux/drivers/char/fusion/entries.c ++++ b/linux/drivers/char/fusion/entries.c +@@ -28,7 +28,7 @@ + #include "fusiondev.h" + #include "entries.h" + +-struct timeval now; ++static struct timeval now; + + void + fusion_entries_init(FusionEntries * entries, +diff --git a/linux/drivers/char/fusion/fusiondev.c b/linux/drivers/char/fusion/fusiondev.c +index 2457bc1..7c7680d 100644 +--- a/linux/drivers/char/fusion/fusiondev.c ++++ b/linux/drivers/char/fusion/fusiondev.c +@@ -64,7 +64,7 @@ + MODULE_LICENSE("GPL"); + MODULE_AUTHOR("Denis Oliver Kropp <[email protected]>"); + +-struct proc_dir_entry *proc_fusion_dir; ++static struct proc_dir_entry *proc_fusion_dir; + + static int fusion_major = FUSION_MAJOR; + +-- +1.6.0.6 +
package/linux-fusion/linux-fusion.mk +3 -3
@@ -3,7 +3,7 @@ # linux-fusion # ############################################################# -LINUX_FUSION_VERSION = 8.1.1 +LINUX_FUSION_VERSION = 8.1.2 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion LINUX_FUSION_INSTALL_STAGING = YES
@@ -25,14 +25,14 @@ define LINUX_FUSION_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) -C $(@D) endef -# Only the header file is needed in the staging directory define LINUX_FUSION_INSTALL_STAGING_CMDS - install -m 644 $(@D)/linux/include/linux/fusion.h $(STAGING_DIR)/usr/include/linux + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LINUX_FUSION_MAKE_OPTS) INSTALL_MOD_PATH=$(STAGING_DIR) -C $(@D) headers_install endef define LINUX_FUSION_INSTALL_TARGET_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) \ $(LINUX_FUSION_MAKE_OPTS) \ + INSTALL_MOD_PATH=$(TARGET_DIR) \ -C $(@D) install mkdir -p $(LINUX_FUSION_ETC_DIR) cp -dpf package/linux-fusion/40-fusion.rules $(LINUX_FUSION_ETC_DIR)
Signature · 1 line
1.7.2.3
PATCH 3/4 linux-fusion: bump to 8.1.2
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:
llandwerlin> From: Lionel Landwerlin <[email protected]> llandwerlin> Signed-off-by: Lionel Landwerlin <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/4 libglib2: bump to 2.26.1
In reply to llandwerlin at gmail.comFrom: Lionel Landwerlin <[email protected]>
--- package/libglib2/libglib2.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/libglib2/libglib2.mk +1 -1
@@ -4,7 +4,7 @@ # ############################################################# LIBGLIB2_VERSION_MAJOR = 2.26 -LIBGLIB2_VERSION_MINOR = 0 +LIBGLIB2_VERSION_MINOR = 1 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR) LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
Signature · 1 line
1.7.2.3
PATCH 4/4 libglib2: bump to 2.26.1
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"llandwerlin" == llandwerlin <[email protected]> writes:
llandwerlin> From: Lionel Landwerlin <[email protected]> llandwerlin> Signed-off-by: Lionel Landwerlin <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard