[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-24-g439aa6c
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2012-10-29 16:13:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 439aa6c327c6e0103b8355e619f9e64a776be55e (commit)
from 0d0073e3de929d150a3586dbf054a5a9ba3ba68c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 439aa6c327c6e0103b8355e619f9e64a776be55e
Author: Eric Jarrige <eri...@ar...>
Date: Mon Oct 29 17:16:32 2012 +0100
[BUILROOT] Add updated BR patches to support the next BR release and to push some patches to BR mainline
-----------------------------------------------------------------------
Summary of changes:
.../001-add_armadeus_device.patch | 0
.../002-add_armadeus_specific_packages.patch | 0
.../{2012.02 => 2012.11}/006-lcd4linux.patch | 0
.../{2012.02 => 2012.11}/018-allegro.patch | 0
.../021-sdl-water-config.patch | 0
patches/buildroot/2012.11/034-slideshow.patch | 224 +++
patches/buildroot/2012.11/040-linux-makefile.patch | 47 +
.../043-mesa-add_packages.patch | 0
.../045-openssh-add_passwd_expire.patch | 0
patches/buildroot/2012.11/047-uclibc-config.patch | 32 +
...support-for-Safe-Boot-file-format-this-fo.patch | 46 +
...d_possibility_to_choose_board_header_file.patch | 0
...x_in_a_standalone_way_after_configuration.patch | 0
...-linux-change_board_specific_patches_name.patch | 0
.../{2012.02 => 2012.11}/072-xenomai-package.patch | 0
.../buildroot/2012.11/081-adds_quake_package.patch | 160 ++
.../083-pygame-armadeus_addons.patch | 0
.../buildroot/2012.11/085-adds_gpm_package.patch | 168 ++
.../buildroot/2012.11/095-uucp-add_packages.patch | 63 +
.../buildroot/2012.11/097-adds_flite_package.patch | 81 +
...for_pld_asm_instruction_on_non_armv5_arch.patch | 0
...r-add_patch_for_recent_alsa_compatibility.patch | 0
.../buildroot/2012.11/107-games-add_wolf4sdl.patch | 92 +
.../buildroot/2012.11/110-bluez3-add_package.patch | 118 ++
patches/buildroot/2012.11/111-bluez3-hacks.patch | 198 +++
.../2012.11/116-openobex-add_package.patch | 146 ++
.../2012.11/117-ussp-push-add_package.patch | 48 +
.../118-snes9x-add_package.patch | 0
.../buildroot/2012.11/119-fbtest-add_package.patch | 176 ++
.../buildroot/2012.11/120-cwiid-add_package.patch | 106 ++
.../121-target-arm926t_is_arm926ej-s.patch | 0
.../buildroot/2012.11/122-urg-add_package.patch | 56 +
.../2012.11/123-pywebradio-add_package.patch | 56 +
.../buildroot/2012.11/124-e-uae-add_package.patch | 54 +
.../2012.11/125-opentyrian-add_package.patch | 83 +
.../2012.11/130-lbreakout-add_package.patch | 82 +
.../2012.11/131-ltetris-add_package.patch | 84 +
...-qt-full_integration_with_cross_compiling.patch | 44 +
.../buildroot/2012.11/133-qwt-add_package.patch | 163 ++
...ffs2-add_board_name_to_binary_rootfs_name.patch | 0
.../135-linux-add_linux26-clean_target.patch | 0
...42-ncurses-fix_compilation_with_old_hosts.patch | 25 +
...-disable_ip_busybox_if_iproute2_buildroot.patch | 0
...fix_installation_bug_on_some_host_systems.patch | 0
...lection_even_when_custom_rootfs_is_chosen.patch | 0
.../158-setserial-bump_version.patch | 0
.../2012.11/168-libcanfestival-add_package.patch | 149 ++
.../170-mplayer-make_it_compile_on_apf51.patch | 0
.../buildroot/2012.11/172-gsmmux-add_package.patch | 88 +
.../2012.11/174-imx-lib-add_package.patch | 105 ++
.../2012.11/176-imx-test-add_package.patch | 148 ++
...177-restore-java-packages-classpath-jamvm.patch | 1808 ++++++++++++++++++++
.../178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch | 29 +
...e4defrag_build_against_old_kernel_headers.patch | 0
.../2012.11/181-qtcreator-add_package.patch | 1001 +++++++++++
.../182-uclibc-add_accept4_declaration_fix.patch | 0
.../2012.11/183-firmware-imx-add_package.patch | 49 +
.../2012.11/184-fsl-mm-codeclib-add_package.patch | 30 +
.../2012.11/185-gst-fsl-plugin-add_package.patch | 97 ++
...-linux-firmware-add_marvell_libertas_8686.patch | 101 ++
...nore-env_sectors-on-NOR-and-SPI-dataflash.patch | 0
.../buildroot/2012.11/188-marble-add_package.patch | 88 +
.../189-dbus-fix_installation.patch | 0
.../191-madplay-requires_libintl.patch | 0
.../2012.11/196-python-crc16-add_package.patch | 58 +
.../buildroot/2012.11/197-cunit-add_package.patch | 49 +
.../{2012.02 => 2012.11}/cleanup_buildroot.sh | 0
67 files changed, 6152 insertions(+), 0 deletions(-)
copy patches/buildroot/{2012.02 => 2012.11}/001-add_armadeus_device.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/002-add_armadeus_specific_packages.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/006-lcd4linux.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/018-allegro.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/021-sdl-water-config.patch (100%)
create mode 100644 patches/buildroot/2012.11/034-slideshow.patch
create mode 100644 patches/buildroot/2012.11/040-linux-makefile.patch
copy patches/buildroot/{2012.02 => 2012.11}/043-mesa-add_packages.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/045-openssh-add_passwd_expire.patch (100%)
create mode 100644 patches/buildroot/2012.11/047-uclibc-config.patch
create mode 100644 patches/buildroot/2012.11/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
copy patches/buildroot/{2012.02 => 2012.11}/051d-u-boot-add_possibility_to_choose_board_header_file.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/071-linux-change_board_specific_patches_name.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/072-xenomai-package.patch (100%)
create mode 100644 patches/buildroot/2012.11/081-adds_quake_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/083-pygame-armadeus_addons.patch (100%)
create mode 100644 patches/buildroot/2012.11/085-adds_gpm_package.patch
create mode 100644 patches/buildroot/2012.11/095-uucp-add_packages.patch
create mode 100644 patches/buildroot/2012.11/097-adds_flite_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/101-mplayer-add_patch_for_recent_alsa_compatibility.patch (100%)
create mode 100644 patches/buildroot/2012.11/107-games-add_wolf4sdl.patch
create mode 100644 patches/buildroot/2012.11/110-bluez3-add_package.patch
create mode 100644 patches/buildroot/2012.11/111-bluez3-hacks.patch
create mode 100644 patches/buildroot/2012.11/116-openobex-add_package.patch
create mode 100644 patches/buildroot/2012.11/117-ussp-push-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/118-snes9x-add_package.patch (100%)
create mode 100644 patches/buildroot/2012.11/119-fbtest-add_package.patch
create mode 100644 patches/buildroot/2012.11/120-cwiid-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/121-target-arm926t_is_arm926ej-s.patch (100%)
create mode 100644 patches/buildroot/2012.11/122-urg-add_package.patch
create mode 100644 patches/buildroot/2012.11/123-pywebradio-add_package.patch
create mode 100644 patches/buildroot/2012.11/124-e-uae-add_package.patch
create mode 100644 patches/buildroot/2012.11/125-opentyrian-add_package.patch
create mode 100644 patches/buildroot/2012.11/130-lbreakout-add_package.patch
create mode 100644 patches/buildroot/2012.11/131-ltetris-add_package.patch
create mode 100644 patches/buildroot/2012.11/132-qt-full_integration_with_cross_compiling.patch
create mode 100644 patches/buildroot/2012.11/133-qwt-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/134-jffs2-add_board_name_to_binary_rootfs_name.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/135-linux-add_linux26-clean_target.patch (100%)
create mode 100644 patches/buildroot/2012.11/142-ncurses-fix_compilation_with_old_hosts.patch
copy patches/buildroot/{2012.02 => 2012.11}/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/158-setserial-bump_version.patch (100%)
create mode 100644 patches/buildroot/2012.11/168-libcanfestival-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/170-mplayer-make_it_compile_on_apf51.patch (100%)
create mode 100644 patches/buildroot/2012.11/172-gsmmux-add_package.patch
create mode 100644 patches/buildroot/2012.11/174-imx-lib-add_package.patch
create mode 100644 patches/buildroot/2012.11/176-imx-test-add_package.patch
create mode 100644 patches/buildroot/2012.11/177-restore-java-packages-classpath-jamvm.patch
create mode 100644 patches/buildroot/2012.11/178-uboot-add-missing-UBOOT_CLEAN_CMDS.patch
copy patches/buildroot/{2012.02 => 2012.11}/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch (100%)
create mode 100644 patches/buildroot/2012.11/181-qtcreator-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/182-uclibc-add_accept4_declaration_fix.patch (100%)
create mode 100644 patches/buildroot/2012.11/183-firmware-imx-add_package.patch
create mode 100644 patches/buildroot/2012.11/184-fsl-mm-codeclib-add_package.patch
create mode 100644 patches/buildroot/2012.11/185-gst-fsl-plugin-add_package.patch
create mode 100644 patches/buildroot/2012.11/186-linux-firmware-add_marvell_libertas_8686.patch
copy patches/buildroot/{2012.02 => 2012.11}/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch (100%)
create mode 100644 patches/buildroot/2012.11/188-marble-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/189-dbus-fix_installation.patch (100%)
copy patches/buildroot/{2012.02 => 2012.11}/191-madplay-requires_libintl.patch (100%)
create mode 100644 patches/buildroot/2012.11/196-python-crc16-add_package.patch
create mode 100644 patches/buildroot/2012.11/197-cunit-add_package.patch
copy patches/buildroot/{2012.02 => 2012.11}/cleanup_buildroot.sh (100%)
diff --git a/patches/buildroot/2012.02/001-add_armadeus_device.patch b/patches/buildroot/2012.11/001-add_armadeus_device.patch
similarity index 100%
copy from patches/buildroot/2012.02/001-add_armadeus_device.patch
copy to patches/buildroot/2012.11/001-add_armadeus_device.patch
diff --git a/patches/buildroot/2012.02/002-add_armadeus_specific_packages.patch b/patches/buildroot/2012.11/002-add_armadeus_specific_packages.patch
similarity index 100%
copy from patches/buildroot/2012.02/002-add_armadeus_specific_packages.patch
copy to patches/buildroot/2012.11/002-add_armadeus_specific_packages.patch
diff --git a/patches/buildroot/2012.02/006-lcd4linux.patch b/patches/buildroot/2012.11/006-lcd4linux.patch
similarity index 100%
copy from patches/buildroot/2012.02/006-lcd4linux.patch
copy to patches/buildroot/2012.11/006-lcd4linux.patch
diff --git a/patches/buildroot/2012.02/018-allegro.patch b/patches/buildroot/2012.11/018-allegro.patch
similarity index 100%
copy from patches/buildroot/2012.02/018-allegro.patch
copy to patches/buildroot/2012.11/018-allegro.patch
diff --git a/patches/buildroot/2012.02/021-sdl-water-config.patch b/patches/buildroot/2012.11/021-sdl-water-config.patch
similarity index 100%
copy from patches/buildroot/2012.02/021-sdl-water-config.patch
copy to patches/buildroot/2012.11/021-sdl-water-config.patch
diff --git a/patches/buildroot/2012.11/034-slideshow.patch b/patches/buildroot/2012.11/034-slideshow.patch
new file mode 100644
index 0000000..a37edb2
--- /dev/null
+++ b/patches/buildroot/2012.11/034-slideshow.patch
@@ -0,0 +1,224 @@
+Add slideshow package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-02-21 16:44:08.000000000 +0100
++++ buildroot/package/Config.in 2012-02-21 16:44:09.000000000 +0100
+@@ -124,6 +124,7 @@
+ source "package/sdl_net/Config.in"
+ source "package/sdl_ttf/Config.in"
+ source "package/sdl_gfx/Config.in"
++source "package/slideshow/Config.in"
+ comment "Demos"
+ source "package/sdlwater/Config.in"
+
+Index: buildroot/package/slideshow/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/Config.in 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,8 @@
++config BR2_PACKAGE_SLIDESHOW
++ bool "Slideshow"
++ depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
++ help
++ Perigee Slideshow is a command line program that searches a directory
++ for supported graphic files and displays them in a slideshow.
++
++ http://www.xmission.com/~jstanley/slideshow.html
+Index: buildroot/package/slideshow/slideshow.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow.mk 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,39 @@
++#############################################################
++#
++# slideshow
++#
++#############################################################
++
++SLIDESHOW_VERSION:=1.1
++SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
++SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
++
++SLIDESHOW_DEPENDENCIES += sdl sdl_image
++
++define SLIDESHOW_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CXX)" CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++ LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
++ -C $(SLIDESHOW_DIR)
++endef
++
++define SLIDESHOW_INSTALL_TARGET_CMDS
++ cp -dpf $(SLIDESHOW_DIR)/slideshow $(TARGET_DIR)/usr/bin
++endef
++
++define SLIDESHOW_CLEAN_CMDS
++ $(MAKE) clean -C $(SLIDESHOW_DIR)
++endef
++
++define SLIDESHOW_UNINSTALL_TARGET_CMDS
++ rm -f $(TARGET_DIR)/usr/bin/slideshow
++endef
++
++$(eval $(generic-package))
++
++# BR currently doesn't support .zip archive, so do extraction manually:
++$(SLIDESHOW_TARGET_EXTRACT): $(SLIDESHOW_TARGET_SOURCE)
++ $(call MESSAGE,"Extracting")
++ unzip $(DL_DIR)/$($(PKG)_SOURCE) -d $(BUILD_DIR)
++ mv $(BUILD_DIR)/slideshow/* $(BUILD_DIR)/slideshow-$(SLIDESHOW_VERSION)/
++ rm -rf $(BUILD_DIR)/slideshow
++ touch $@
+Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,73 @@
++--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
+++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
++@@ -196,43 +196,48 @@
++ SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
++ SDL_UpdateRects(m_sdl, 1, &rc);
++ }
++-
++- user_command cmd = wait_for_command();
++-
+++
+++ user_command cmd = wait_for_command();
+++
++ switch(cmd)
++- {
++- case c_quit:
++- stop_timer();
++- return true;
++- case c_first_slide:
+++ {
+++ case c_quit:
+++ stop_timer();
+++ return true;
+++ case c_first_slide:
++ stop_timer();
++ m_image_index = 0;
++ break;
++ case c_last_slide:
++- stop_timer();
+++ stop_timer();
++ m_image_index = m_file_list->count() - 1;
++- break;
+++ break;
++ case c_prev_slide:
++- stop_timer();
+++ stop_timer();
++ if ( m_image_index > 0 )
++ m_image_index--;
++ break;
++ case c_next_slide:
++- stop_timer();
++- // fall through
++- case c_timer_advance:
++- if ( m_image_index < m_file_list->count() - 1 )
+++ stop_timer();
+++ // fall through
+++ case c_timer_advance:
+++ if ( m_image_index <= m_file_list->count() - 1 )
++ m_image_index++;
++- break;
++- case c_redraw:
++ break;
++- }
+++ case c_redraw:
+++ break;
+++ }
++
++ // stop the auto-advance when the last picture is about to be shown
++- if ( m_image_index == m_file_list->count() - 1 )
++- stop_timer();
++- }
++-
+++ if ( m_image_index == m_file_list->count() /*- 1*/ )
+++ {
+++ //stop_timer();
+++ m_image_index = 0;
+++ m_prev_image_index = -1;
+++ }
+++
+++ }
+++
++ return true;
++ }
++
+Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,13 @@
++--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
+++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
++@@ -84,8 +84,8 @@
++
++ Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
++ Uint8 *pChar, *pScreen;
++- char c;
++- int i, j;
+++ //char c;
+++ int i, j, c;
++
++ for(const char *p = text; *p != '\0'; p++)
++ {
+Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,28 @@
++On recent gcc some includes are needed to have string stuff defined.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++Index: slideshow-1.1/file_list.cpp
++===================================================================
++--- slideshow-1.1.orig/file_list.cpp 2011-07-01 18:58:49.000000000 +0200
+++++ slideshow-1.1/file_list.cpp 2011-07-01 18:59:10.000000000 +0200
++@@ -8,6 +8,7 @@
++ #include <fstream>
++ #include <stdlib.h>
++ #include <ctype.h>
+++#include <string.h>
++
++ #ifdef WIN32
++ #include <io.h>
++Index: slideshow-1.1/slideshow.h
++===================================================================
++--- slideshow-1.1.orig/slideshow.h 2011-07-01 18:59:56.000000000 +0200
+++++ slideshow-1.1/slideshow.h 2011-07-01 19:00:02.000000000 +0200
++@@ -9,6 +9,7 @@
++ #pragma once
++ #endif // _MSC_VER > 1000
++
+++#include <iostream>
++ #include "SDL.h"
++ #include "cache.h"
++
+Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch 2012-02-21 16:44:09.000000000 +0100
+@@ -0,0 +1,17 @@
++Otherwise crashes on APF27.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++Index: slideshow-1.1/slideshow.cpp
++===================================================================
++--- slideshow-1.1.orig/slideshow.cpp 2011-07-02 13:19:00.000000000 +0200
+++++ slideshow-1.1/slideshow.cpp 2011-07-02 13:19:17.000000000 +0200
++@@ -416,7 +416,7 @@
++ else
++ flags |= SDL_FULLSCREEN;
++
++- m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 32, flags);
+++ m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 16 /*32*/, flags);
++
++ if ( !m_sdl )
++ {
diff --git a/patches/buildroot/2012.11/040-linux-makefile.patch b/patches/buildroot/2012.11/040-linux-makefile.patch
new file mode 100644
index 0000000..49e96a9
--- /dev/null
+++ b/patches/buildroot/2012.11/040-linux-makefile.patch
@@ -0,0 +1,47 @@
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk 2012-02-12 23:22:29.000000000 +0100
++++ buildroot/linux/linux.mk 2012-02-21 20:57:38.000000000 +0100
+@@ -44,7 +44,8 @@
+
+ # Get the real Linux version, which tells us where kernel modules are
+ # going to be installed in the target filesystem.
+-LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
++LINUX_VERSION_PROBED = $(LINUX_VERSION)
++#LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
+
+ ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
+ LINUX_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
+@@ -124,7 +125,14 @@
+ KERNEL_SOURCE_CONFIG = $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
+ endif
+
++ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
++define ARMADEUS_LINUX_CONFIG_HACKS
++ ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(@D)/drivers/armadeus
++endef
++endif
++
+ define LINUX_CONFIGURE_CMDS
++ $(ARMADEUS_LINUX_CONFIG_HACKS)
+ cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+ $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
+ rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+@@ -168,7 +176,7 @@
+ endif
+
+ define LINUX_INSTALL_IMAGES_CMDS
+- cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
++ cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)/$(ARMADEUS_LINUX_IMAGE_NAME)
+ endef
+
+ define LINUX_INSTALL_TARGET_CMDS
+@@ -214,7 +222,7 @@
+ # Build the kernel.
+ $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
+ # Copy the kernel image to its final destination
+- cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
++ cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)/$(ARMADEUS_LINUX_IMAGE_NAME)
+ # If there is a .ub file copy it to the final destination
+ test ! -f $(LINUX_IMAGE_PATH).ub || cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR)
+ $(Q)touch $@
diff --git a/patches/buildroot/2012.02/043-mesa-add_packages.patch b/patches/buildroot/2012.11/043-mesa-add_packages.patch
similarity index 100%
copy from patches/buildroot/2012.02/043-mesa-add_packages.patch
copy to patches/buildroot/2012.11/043-mesa-add_packages.patch
diff --git a/patches/buildroot/2012.02/045-openssh-add_passwd_expire.patch b/patches/buildroot/2012.11/045-openssh-add_passwd_expire.patch
similarity index 100%
copy from patches/buildroot/2012.02/045-openssh-add_passwd_expire.patch
copy to patches/buildroot/2012.11/045-openssh-add_passwd_expire.patch
diff --git a/patches/buildroot/2012.11/047-uclibc-config.patch b/patches/buildroot/2012.11/047-uclibc-config.patch
new file mode 100644
index 0000000..f80184c
--- /dev/null
+++ b/patches/buildroot/2012.11/047-uclibc-config.patch
@@ -0,0 +1,32 @@
+Make uClibc 0.9.33 as Buildroot's default version
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/toolchain/uClibc/uclibc.mk
+===================================================================
+--- buildroot.orig/toolchain/uClibc/uclibc.mk 2012-02-29 23:19:47.000000000 +0100
++++ buildroot/toolchain/uClibc/uclibc.mk 2012-03-23 16:57:54.000000000 +0100
+@@ -102,23 +102,6 @@
+ -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
+ $(UCLIBC_DIR)/.oldconfig
+ ifeq ($(UCLIBC_TARGET_ARCH),arm)
+- (/bin/echo "# CONFIG_GENERIC_ARM is not set"; \
+- /bin/echo "# CONFIG_ARM610 is not set"; \
+- /bin/echo "# CONFIG_ARM710 is not set"; \
+- /bin/echo "# CONFIG_ARM7TDMI is not set"; \
+- /bin/echo "# CONFIG_ARM720T is not set"; \
+- /bin/echo "# CONFIG_ARM920T is not set"; \
+- /bin/echo "# CONFIG_ARM922T is not set"; \
+- /bin/echo "# CONFIG_ARM926T is not set"; \
+- /bin/echo "# CONFIG_ARM10T is not set"; \
+- /bin/echo "# CONFIG_ARM1136JF_S is not set"; \
+- /bin/echo "# CONFIG_ARM1176JZ_S is not set"; \
+- /bin/echo "# CONFIG_ARM1176JZF_S is not set"; \
+- /bin/echo "# CONFIG_ARM_SA110 is not set"; \
+- /bin/echo "# CONFIG_ARM_SA1100 is not set"; \
+- /bin/echo "# CONFIG_ARM_XSCALE is not set"; \
+- /bin/echo "# CONFIG_ARM_IWMMXT is not set"; \
+- ) >> $(UCLIBC_DIR)/.oldconfig
+ $(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \
+ $(UCLIBC_DIR)/.oldconfig
+ $(SED) 's/^.*$(UCLIBC_ARM_TYPE).*/$(UCLIBC_ARM_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig
diff --git a/patches/buildroot/2012.11/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch b/patches/buildroot/2012.11/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
new file mode 100644
index 0000000..7d06140
--- /dev/null
+++ b/patches/buildroot/2012.11/051a-U-Boot-add-support-for-Safe-Boot-file-format-this-fo.patch
@@ -0,0 +1,46 @@
+From c6f5dc1ac36a8b01a732b972035a1ace5b97f790 Mon Sep 17 00:00:00 2001
+From: Eric Jarrige <eri...@ar...>
+Date: Tue, 13 Mar 2012 12:42:52 +0100
+Subject: [PATCH 2/2] u-boot: add support for u-boot.sb file format
+
+add u-boot.sb binary format in BR menuconfig - Safe Boot (.sb) file format
+have to be used with Freescale CPUs like imx23, imx28, stp37xx
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+ boot/uboot/Config.in | 3 +++
+ boot/uboot/uboot.mk | 4 ++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
+index c8db9fb..5fd5258 100644
+--- a/boot/uboot/Config.in
++++ b/boot/uboot/Config.in
+@@ -90,6 +90,9 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
+ depends on BR2_bfin
+ bool "u-boot.ldr"
+
++config BR2_TARGET_UBOOT_FORMAT_SB
++ bool "u-boot.sb"
++
+ endchoice
+
+ menuconfig BR2_TARGET_UBOOT_NETWORK
+diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
+index db9de8d..1394400 100644
+--- a/boot/uboot/uboot.mk
++++ b/boot/uboot/uboot.mk
+@@ -29,6 +29,10 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
+ UBOOT_BIN = u-boot-nand.bin
+ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
+ UBOOT_BIN = u-boot.img
++else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
++UBOOT_DEPENDENCIES += host-elftosb
++UBOOT_BIN = u-boot.sb
++UBOOT_MAKE_TARGET = $(UBOOT_BIN)
+ else
+ UBOOT_BIN = u-boot.bin
+ UBOOT_BIN_IFT = $(UBOOT_BIN).ift
+--
+1.7.2.5
+
diff --git a/patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2012.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
similarity index 100%
copy from patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
copy to patches/buildroot/2012.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
diff --git a/patches/buildroot/2012.02/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch b/patches/buildroot/2012.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
similarity index 100%
copy from patches/buildroot/2012.02/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
copy to patches/buildroot/2012.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
diff --git a/patches/buildroot/2012.02/071-linux-change_board_specific_patches_name.patch b/patches/buildroot/2012.11/071-linux-change_board_specific_patches_name.patch
similarity index 100%
copy from patches/buildroot/2012.02/071-linux-change_board_specific_patches_name.patch
copy to patches/buildroot/2012.11/071-linux-change_board_specific_patches_name.patch
diff --git a/patches/buildroot/2012.02/072-xenomai-package.patch b/patches/buildroot/2012.11/072-xenomai-package.patch
similarity index 100%
copy from patches/buildroot/2012.02/072-xenomai-package.patch
copy to patches/buildroot/2012.11/072-xenomai-package.patch
diff --git a/patches/buildroot/2012.11/081-adds_quake_package.patch b/patches/buildroot/2012.11/081-adds_quake_package.patch
new file mode 100644
index 0000000..bd913d8
--- /dev/null
+++ b/patches/buildroot/2012.11/081-adds_quake_package.patch
@@ -0,0 +1,160 @@
+
+This patch adds Quake packages to buildroot:
+* Quake engine itself (SDL port)
+* a shareware data file (PAK/WAD) to test the engine
+
+It is inspired of OpenEmbedded work.
+
+Still searching a way to apply sdlquake-1.0.9-no-x86-asm.patch on all arch
+EXCEPT x86.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/games/sdlquake/sdlquake.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/sdlquake.mk 2012-07-21 19:23:16.000000000 +0200
+@@ -0,0 +1,22 @@
++#############################################################
++#
++# Quake 1 (SDL Port)
++#
++#############################################################
++
++SDLQUAKE_VERSION = 1.0.9
++SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
++SDLQUAKE_AUTORECONF = YES
++
++SDLQUAKE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr
++
++SDLQUAKE_DEPENDENCIES = sdl
++
++define SDLQUAKE_AUTOCONF_FIXES
++ (cd $(@D); touch INSTALL NEWS README AUTHORS ChangeLog; \
++ echo "AC_PROG_CC" >> configure.in;)
++endef
++
++SDLQUAKE_POST_PATCH_HOOKS += SDLQUAKE_AUTOCONF_FIXES
++
++$(eval $(autotools-package))
+Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2012-07-21 19:13:42.000000000 +0200
+@@ -0,0 +1,35 @@
++--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
+++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
++@@ -33,7 +33,6 @@
++ crc.h \
++ cvar.c \
++ cvar.h \
++- d_copy.S \
++ d_edge.c \
++ d_fill.c \
++ d_iface.h \
++@@ -48,7 +47,6 @@
++ d_sprite.c \
++ d_surf.c \
++ d_zpoint.c \
++- dosasm.S \
++ dosisms.h \
++ draw.c \
++ draw.h \
++@@ -103,7 +101,6 @@
++ r_sprite.c \
++ r_surf.c \
++ r_vars.c \
++- r_varsa.S \
++ render.h \
++ resource.h \
++ sbar.c \
++@@ -136,7 +133,7 @@
++ world.h \
++ zone.c \
++ zone.h \
++- $(X86_SRCS) $(NONX86_SRCS)
+++ $(NONX86_SRCS)
++
++ X86_SRCS = \
++ snd_mixa.S \
+Index: buildroot/package/games/sdlquake/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/sdlquake/Config.in 2012-07-21 19:13:42.000000000 +0200
+@@ -0,0 +1,10 @@
++config BR2_PACKAGE_SDLQUAKE
++ bool "sdlquake"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_MIXER
++ select BR2_PACKAGE_SDL_NET
++ help
++ sdlquake is a port of ID Software's popular Quake 3-D shooter game.
++ (Not supported by ID Software)
++
++ http://www.libsdl.org/projects/quake/
+Index: buildroot/package/games/quake-pak/quake-pak.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/quake-pak/quake-pak.mk 2012-07-21 19:13:42.000000000 +0200
+@@ -0,0 +1,34 @@
++#############################################################
++#
++# Quake shareware data files (PAK/WAD)
++#
++#############################################################
++
++QUAKE_PAK_VERSION = 1.0.6
++QUAKE_PAK_SOURCE = quakesw-$(QUAKE_PAK_VERSION).tar.gz
++QUAKE_PAK_SITE = http://www.libsdl.org/projects/quake/data/
++QUAKE_PAK_CAT = $(ZCAT)
++QUAKE_PAK_TARGET_DIR = $(TARGET_DIR)/usr/share/games/quake/
++
++$(DL_DIR)/$(QUAKE_PAK_SOURCE):
++ $(WGET) -P $(DL_DIR) $(QUAKE_PAK_SITE)/$(QUAKE_PAK_SOURCE)
++
++quake-pak-source: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
++
++$(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak: $(DL_DIR)/$(QUAKE_PAK_SOURCE)
++ mkdir -p $(QUAKE_PAK_TARGET_DIR)
++ $(QUAKE_PAK_CAT) $(DL_DIR)/$(QUAKE_PAK_SOURCE) | tar -C $(QUAKE_PAK_TARGET_DIR) $(TAR_OPTIONS) -
++
++quake-pak: $(QUAKE_PAK_TARGET_DIR)/id1/pak0.pak
++
++quake-pak-dirclean:
++ rm -rf $(QUAKE_PAK_TARGET_DIR)/id1/
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_QUAKE_PAK)),y)
++TARGETS+=quake-pak
++endif
+Index: buildroot/package/games/quake-pak/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/games/quake-pak/Config.in 2012-07-21 19:13:42.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_QUAKE_PAK
++ bool "shareware Quake PAK/WAD file"
++ depends on BR2_PACKAGE_SDLQUAKE
++ help
++ This will install the shareware pak/wad data file for the Quake game.
++
++ The file will be placed in the /usr/share/games/quake/ directory.
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-07-21 19:13:42.000000000 +0200
++++ buildroot/package/Config.in 2012-07-21 19:38:59.000000000 +0200
+@@ -93,8 +93,10 @@
+ menu "Games"
+ source "package/games/gnuchess/Config.in"
+ source "package/games/prboom/Config.in"
++source "package/games/quake-pak/Config.in"
+ source "package/games/doom-wad/Config.in"
+ source "package/games/rubix/Config.in"
++source "package/games/sdlquake/Config.in"
+ endmenu
+
+ menu "Graphic libraries and applications (graphic/text)"
diff --git a/patches/buildroot/2012.02/083-pygame-armadeus_addons.patch b/patches/buildroot/2012.11/083-pygame-armadeus_addons.patch
similarity index 100%
copy from patches/buildroot/2012.02/083-pygame-armadeus_addons.patch
copy to patches/buildroot/2012.11/083-pygame-armadeus_addons.patch
diff --git a/patches/buildroot/2012.11/085-adds_gpm_package.patch b/patches/buildroot/2012.11/085-adds_gpm_package.patch
new file mode 100644
index 0000000..1633551
--- /dev/null
+++ b/patches/buildroot/2012.11/085-adds_gpm_package.patch
@@ -0,0 +1,168 @@
+Add GPM (General Purpose Mouse server) to Buildroot.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/gpm/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpm/Config.in 2012-02-21 16:44:41.000000000 +0100
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_GPM
++ bool "gpm mouse server"
++ help
++ gpm means general purpose mouse and is the mouse support for Linux
++ in the console.
++
++ http://www.nico.schottelius.org/software/gpm/
+Index: buildroot/package/gpm/gpm.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpm/gpm.mk 2012-02-21 16:44:41.000000000 +0100
+@@ -0,0 +1,18 @@
++#############################################################
++#
++# General Purpose Mouse server for Linux console.
++#
++#############################################################
++
++GPM_VERSION = 1.20.6
++GPM_SOURCE = gpm-$(GPM_VERSION).tar.bz2
++GPM_SITE = http://unix.schottelius.org/gpm/archives/
++GPM_INSTALL_STAGING = YES
++GPM_INSTALL_TARGET = YES
++
++$(eval $(autotools-package))
++
++$(GPM_HOOK_POST_INSTALL): $(GPM_TARGET_INSTALL_TARGET)
++ $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/gpm
++ touch $@
++
+Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2012-02-21 16:44:41.000000000 +0100
+@@ -0,0 +1,77 @@
++
++Replaces all "obsolete" functions (at least to compile for uClibc).
++
++diff -urN gpm-1.20.6/src/daemon/old_main.c gpm-1.20.6.mod/src/daemon/old_main.c
++--- gpm-1.20.6/src/daemon/old_main.c 2009-02-09 10:58:53.000000000 +0100
+++++ gpm-1.20.6.mod/src/daemon/old_main.c 2009-09-25 10:27:54.000000000 +0200
++@@ -85,7 +85,7 @@
++ /* control node */
++
++ if((ctlfd=socket(AF_UNIX,SOCK_STREAM,0))==-1) gpm_report(GPM_PR_OOPS,GPM_MESS_SOCKET_PROB);
++- bzero((char *)&ctladdr,sizeof(ctladdr));
+++ memset((char *)&ctladdr, 0, sizeof(ctladdr));
++ ctladdr.sun_family=AF_UNIX;
++ strcpy(ctladdr.sun_path,GPM_NODE_CTL);
++ unlink(GPM_NODE_CTL);
++diff -urN gpm-1.20.6/src/daemon/open_console.c gpm-1.20.6.mod/src/daemon/open_console.c
++--- gpm-1.20.6/src/daemon/open_console.c 2009-02-09 10:58:53.000000000 +0100
+++++ gpm-1.20.6.mod/src/daemon/open_console.c 2009-09-25 10:33:02.000000000 +0200
++@@ -21,7 +21,9 @@
++
++ #include <fcntl.h> /* open and co. */
++ #include <sys/stat.h> /* stat() */
++-#include <stropts.h> /* ioctl */
+++#if !(defined(__linux__))
+++# include <stropts.h> /* ioctl */
+++#endif
++
++ /* Linux specific (to be outsourced in gpm2 */
++ #include <linux/serial.h> /* for serial console check */
++diff -urN gpm-1.20.6/src/daemon/processconn.c gpm-1.20.6.mod/src/daemon/processconn.c
++--- gpm-1.20.6/src/daemon/processconn.c 2009-02-09 10:58:53.000000000 +0100
+++++ gpm-1.20.6.mod/src/daemon/processconn.c 2009-09-25 10:27:26.000000000 +0200
++@@ -45,7 +45,7 @@
++
++ /*....................................... Accept */
++
++- bzero((char *) &addr, sizeof(addr));
+++ memset((char *) &addr, 0, sizeof(addr));
++ addr.sun_family = AF_UNIX;
++
++ len = sizeof(addr);
++diff -urN gpm-1.20.6/src/lib/liblow.c gpm-1.20.6.mod/src/lib/liblow.c
++--- gpm-1.20.6/src/lib/liblow.c |