[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-69-g610f066
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-69-g610f066
|
From: Sébastien S. <ss...@us...> - 2016-05-06 13:12:33
|
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 610f066051cdea2ecfb921dc96173ff39eedaa1d (commit)
via 8ed0356c63528fb9a99af29ed15a6298fc5a6d30 (commit)
via 3820dc8aa49ae3efccc771bff44222688be127ed (commit)
via 0084338915959b2b728dd50d44cb201fcf80a203 (commit)
via d426d8914e717182c080336c86154a77efae28ec (commit)
via ac687a0480b866adf36d72a9d75fa03ff674fae5 (commit)
from 9ba3b5cfe6b1110b71f9ea1f1464e73ba22c9dd8 (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 610f066051cdea2ecfb921dc96173ff39eedaa1d
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue May 3 17:56:47 2016 +0200
[BUILDROOT] 2016.02: apf-config: Remove BR2_LARGEFILE dependency
BR2_LARGEFILE has been removed.
commit 8ed0356c63528fb9a99af29ed15a6298fc5a6d30
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue May 3 14:51:52 2016 +0200
[U-BOOT] 2014.07: fix compilation with GCC5
commit 3820dc8aa49ae3efccc771bff44222688be127ed
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon May 2 18:09:32 2016 +0200
[BUILDROOT] Create armadeus drivers symlink after patching the kernel
BR 2016.02 calls support/kconfig/merge_config.sh before the CONFIGURE
step and thus needs the armadeus drivers symlink to be present. Create
the symlink right after patches are applied.
commit 0084338915959b2b728dd50d44cb201fcf80a203
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon May 2 11:52:37 2016 +0200
[BUILDROOT] 2016.02: xenomai: define XENOMAI_ADEOS_PATCH when needed
This removes the following error message:
> basename: missing operand
> Try 'basename --help' for more information.
commit d426d8914e717182c080336c86154a77efae28ec
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon May 2 09:24:49 2016 +0200
[BUILDROOT] Check properly if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR is unset
This fixes uboot patching on BR 2016.02.
While at it, add a comment to remind us to remove this hook when switching to
BR 2016.02.
commit ac687a0480b866adf36d72a9d75fa03ff674fae5
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri May 6 12:20:10 2016 +0200
[BUILDROOT] Remove trailing slash in <PKG>_SITE
Without this, make savedefconfig fails asking for removing trailing
slash in <PKG>_SITE.
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/anybus-tools/anybus-tools.mk | 2 +-
buildroot/package/armadeus/fpgaregs/fpgaregs.mk | 2 +-
.../package/armadeus/freescale-tools/tools.mk | 4 +-
.../imx28-usb-downloader/imx28-usb-downloader.mk | 2 +-
buildroot/package/armadeus/imxregs/imxregs.mk | 2 +-
buildroot/package/armadeus/imxssi/imxssi.mk | 2 +-
buildroot/package/armadeus/testsuite/testsuite.mk | 2 +-
buildroot/target/device/armadeus/Makefile.in | 7 +-
.../2016.02/007-armadeus-add-agg-package.patch | 2 +-
.../2016.02/008-armadeus-add-gnash-package.patch | 4 +-
.../2016.02/016-armadeus-add-gnuboy-package.patch | 18 ++--
.../2016.02/017-armadeus-add-rxtx-package.patch | 2 +-
.../018-armadeus-add-pcidebug-package.patch | 6 +-
.../021-armadeus-add-sdl_water-package.patch | 2 +-
.../025-armadeus-apf-config-add-package.patch | 19 ++--
.../034-armadeus-add-slideshow-package.patch | 32 ++++----
...072-armadeus-xenomai-download-adeos-patch.patch | 5 +-
.../buildroot/2016.02/081-adds_quake_package.patch | 4 +-
.../107-armadeus-games-add-wolf4sdl-package.patch | 2 +-
.../2016.02/118-armadeus-snes9x-add-package.patch | 2 +-
.../2016.02/176-imx-test-add_package.patch | 6 +-
.../901-armadeus-add-python-flask-login.patch | 20 ++--
...x-compiler-gcc5.h-to-fix-builds-with-gcc5.patch | 92 ++++++++++++++++++++
.../604-inline-use-the-gcc-inline-version.patch | 20 ++++
24 files changed, 186 insertions(+), 73 deletions(-)
create mode 100644 patches/u-boot/2014.07/603-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch
create mode 100644 patches/u-boot/2014.07/604-inline-use-the-gcc-inline-version.patch
diff --git a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
index 817c051..ebe997e 100644
--- a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
+++ b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
@@ -5,7 +5,7 @@
#############################################################
ANYBUS_TOOLS_VERSION = 0.1
ANYBUS_TOOLS_BIN_NAME = anybus-tools
-ANYBUS_TOOLS_SITE=$(TOPDIR)/../target/packages/anybus-tools/
+ANYBUS_TOOLS_SITE=$(TOPDIR)/../target/packages/anybus-tools
ifeq ($(generic-package), )
ANYBUS_TOOLS_SITE_METHOD=copy
else
diff --git a/buildroot/package/armadeus/fpgaregs/fpgaregs.mk b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
index b2f7310..dd0b7e8 100644
--- a/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
+++ b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
@@ -5,7 +5,7 @@
#############################################################
FPGAREGS_VERSION = 2014.06
-FPGAREGS_SITE = $(TOPDIR)/../target/linux/debug/fpgaregs/
+FPGAREGS_SITE = $(TOPDIR)/../target/linux/debug/fpgaregs
FPGAREGS_SITE_METHOD = local
FPGAREGS_LICENSE = GPLv2+
diff --git a/buildroot/package/armadeus/freescale-tools/tools.mk b/buildroot/package/armadeus/freescale-tools/tools.mk
index 49c94d6..083047e 100644
--- a/buildroot/package/armadeus/freescale-tools/tools.mk
+++ b/buildroot/package/armadeus/freescale-tools/tools.mk
@@ -7,8 +7,8 @@
FREESCALE_TOOLS_VERSION = 20071002
FREESCALE_TOOLS_SOURCE = misc-$(FREESCALE_TOOLS_VERSION).tar.gz
FREESCALE_TOOLS_PATCH = misc-vpu_lib-2.2.2-mx27-2.patch
-FREESCALE_TOOLS_SITE = http://www.bitshrine.org/gpp/
-FREESCALE_TOOLS_PATCH_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
+FREESCALE_TOOLS_SITE = http://www.bitshrine.org/gpp
+FREESCALE_TOOLS_PATCH_SITE = ftp://ftp2.armadeus.com/armadeusw/download
FREESCALE_TOOLS_INSTALL_STAGING = YES
FREESCALE_TOOLS_TARGET_DIR = $(TARGET_DIR)/usr/bin/vpu
diff --git a/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk b/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
index 74cd854..85fe761 100644
--- a/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
+++ b/buildroot/package/armadeus/imx28-usb-downloader/imx28-usb-downloader.mk
@@ -5,7 +5,7 @@
################################################################################
IMX28_USB_DOWNLOADER_VERSION = 0.1
-IMX28_USB_DOWNLOADER_SITE = $(TOPDIR)/../target/packages/gnet-imx28-usb-downloader/
+IMX28_USB_DOWNLOADER_SITE = $(TOPDIR)/../target/packages/gnet-imx28-usb-downloader
IMX28_USB_DOWNLOADER_SITE_METHOD = local
IMX28_USB_DOWNLOADER_DEPENDENCIES = libusb-compat
diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index a0bcdeb..7d6e2bd 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -5,7 +5,7 @@
#############################################################
IMXREGS_VERSION = 2015.05
-IMXREGS_SITE = $(TOPDIR)/../target/linux/debug/imxregs/
+IMXREGS_SITE = $(TOPDIR)/../target/linux/debug/imxregs
IMXREGS_SITE_METHOD = local
IMXREGS_LICENSE = GPLv2+
IMXREGS_LICENSE_FILES = COPYING
diff --git a/buildroot/package/armadeus/imxssi/imxssi.mk b/buildroot/package/armadeus/imxssi/imxssi.mk
index 13605a9..e6d3c31 100644
--- a/buildroot/package/armadeus/imxssi/imxssi.mk
+++ b/buildroot/package/armadeus/imxssi/imxssi.mk
@@ -5,7 +5,7 @@
################################################################################
IMXSSI_VERSION = 1.01
-IMXSSI_SITE = $(TOPDIR)/../target/linux/debug/imxssi/
+IMXSSI_SITE = $(TOPDIR)/../target/linux/debug/imxssi
IMXSSI_SITE_METHOD = local
IMXSSI_LICENSE = GPLv2+
IMXSSI_LICENSE_FILES = COPYING
diff --git a/buildroot/package/armadeus/testsuite/testsuite.mk b/buildroot/package/armadeus/testsuite/testsuite.mk
index a061dd6..633576f 100644
--- a/buildroot/package/armadeus/testsuite/testsuite.mk
+++ b/buildroot/package/armadeus/testsuite/testsuite.mk
@@ -5,7 +5,7 @@
################################################################################
TESTSUITE_VERSION = 1.11
-TESTSUITE_SITE = $(TOPDIR)/../target/test/
+TESTSUITE_SITE = $(TOPDIR)/../target/test
TESTSUITE_SITE_METHOD = local
ARMADEUS_TESTSUITE_WISHBONE_BUTTON_SRCDIR = $(TOPDIR)/../target/linux/modules/fpga/virtual_components/button/
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 42d9871..a8cd78d 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -11,7 +11,8 @@ ARMADEUS_DTB_IMAGE_NAME:=$(addsuffix .dtb,$(BOARD_NAME))
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
# !! if you modify the following, please also update scripts/quiltify.sh !!
-ifneq ($(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR), "")
+# TODO: Remove this hook when switching to >=BR2016.02
+ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
define UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \*.patch
endef
@@ -57,12 +58,12 @@ UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_POST_INSTALL_IMAGES_ACTION
endif # BR2_CPU_NAME != imx6ul
endif # BR2_CPU_NAME != imx6
-define LINUX_PRE_CONFIGURE_ACTION
+define LINUX_POST_PATCH_ACTION
ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules $(@D)/drivers/armadeus
$(SED) "s,^ARCH.*,ARCH=$(KERNEL_ARCH),g;" $(@D)/Makefile
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(@D)/Makefile
endef
-LINUX_PRE_CONFIGURE_HOOKS += LINUX_PRE_CONFIGURE_ACTION
+LINUX_POST_PATCH_HOOKS += LINUX_POST_PATCH_ACTION
endif
diff --git a/patches/buildroot/2016.02/007-armadeus-add-agg-package.patch b/patches/buildroot/2016.02/007-armadeus-add-agg-package.patch
index a896724..37c889f 100644
--- a/patches/buildroot/2016.02/007-armadeus-add-agg-package.patch
+++ b/patches/buildroot/2016.02/007-armadeus-add-agg-package.patch
@@ -27,7 +27,7 @@ Index: buildroot/package/agg/agg.mk
+###############################################################################
+
+AGG_VERSION = 2.5
-+AGG_SITE = http://www.antigrain.com/
++AGG_SITE = http://www.antigrain.com
+AGG_LICENSE = GPLv3+
+AGG_LICENSE_FILES = COPYING
+AGG_INSTALL_STAGING = YES
diff --git a/patches/buildroot/2016.02/008-armadeus-add-gnash-package.patch b/patches/buildroot/2016.02/008-armadeus-add-gnash-package.patch
index 89a7b14..5c50ac2 100644
--- a/patches/buildroot/2016.02/008-armadeus-add-gnash-package.patch
+++ b/patches/buildroot/2016.02/008-armadeus-add-gnash-package.patch
@@ -33,7 +33,7 @@ Index: buildroot/package/gnash/gnash.mk
+
+GNASH_VERSION = 0.8.10
+GNASH_SOURCE = gnash-$(GNASH_VERSION).tar.bz2
-+GNASH_SITE = http://ftp.gnu.org/pub/gnu/gnash/$(GNASH_VERSION)/
++GNASH_SITE = http://ftp.gnu.org/pub/gnu/gnash/$(GNASH_VERSION)
+GNASH_LICENSE = LGPLv2.1+
+GNASH_LICENSE_FILES = COPYING
+
@@ -145,7 +145,7 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -14,6 +14,7 @@ menu "Audio and video applications"
+@@ -18,6 +18,7 @@ menu "Audio and video applications"
source "package/ffmpeg/Config.in"
source "package/flac/Config.in"
source "package/flite/Config.in"
diff --git a/patches/buildroot/2016.02/016-armadeus-add-gnuboy-package.patch b/patches/buildroot/2016.02/016-armadeus-add-gnuboy-package.patch
index 9e111fe..b43b915 100644
--- a/patches/buildroot/2016.02/016-armadeus-add-gnuboy-package.patch
+++ b/patches/buildroot/2016.02/016-armadeus-add-gnuboy-package.patch
@@ -2,11 +2,11 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2015-02-17 10:36:30.371633079 +0100
-+++ buildroot/package/Config.in 2015-02-17 12:43:19.369364057 +0100
-@@ -178,6 +178,7 @@
-
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -224,6 +224,7 @@ endmenu
menu "Games"
+ source "package/chocolate-doom/Config.in"
source "package/doom-wad/Config.in"
+ source "package/gnuboy/Config.in"
source "package/gnuchess/Config.in"
@@ -14,8 +14,8 @@ Index: buildroot/package/Config.in
source "package/ltris/Config.in"
Index: buildroot/package/gnuboy/Config.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gnuboy/Config.in 2015-02-17 12:11:19.047841714 +0100
+--- /dev/null
++++ buildroot/package/gnuboy/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_GNUBOY
+ bool "gnuboy"
@@ -31,8 +31,8 @@ Index: buildroot/package/gnuboy/Config.in
+ http://code.google.com/p/gnuboy/
Index: buildroot/package/gnuboy/gnuboy.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gnuboy/gnuboy.mk 2015-02-17 12:15:09.672981702 +0100
+--- /dev/null
++++ buildroot/package/gnuboy/gnuboy.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
@@ -40,7 +40,7 @@ Index: buildroot/package/gnuboy/gnuboy.mk
+#
+################################################################################
+
-+GNUBOY_SITE = http://gnuboy.googlecode.com/svn/trunk/
++GNUBOY_SITE = http://gnuboy.googlecode.com/svn/trunk
+GNUBOY_SITE_METHOD = svn
+GNUBOY_VERSION = 201
+GNUBOY_LICENSE = GPLv2+
diff --git a/patches/buildroot/2016.02/017-armadeus-add-rxtx-package.patch b/patches/buildroot/2016.02/017-armadeus-add-rxtx-package.patch
index cb870b7..a7c78f4 100644
--- a/patches/buildroot/2016.02/017-armadeus-add-rxtx-package.patch
+++ b/patches/buildroot/2016.02/017-armadeus-add-rxtx-package.patch
@@ -177,7 +177,7 @@ Index: buildroot/package/rxtx/rxtx.mk
+################################################################################
+
+RXTX_VERSION = 2.1-7r2
-+RXTX_SITE = http://rxtx.qbang.org/pub/rxtx/
++RXTX_SITE = http://rxtx.qbang.org/pub/rxtx
+RXTX_SOURCE = rxtx-$(RXTX_VERSION).tgz
+RXTX_DEPENDENCIES = classpath
+
diff --git a/patches/buildroot/2016.02/018-armadeus-add-pcidebug-package.patch b/patches/buildroot/2016.02/018-armadeus-add-pcidebug-package.patch
index 8a8b11e..34a2f80 100644
--- a/patches/buildroot/2016.02/018-armadeus-add-pcidebug-package.patch
+++ b/patches/buildroot/2016.02/018-armadeus-add-pcidebug-package.patch
@@ -2,8 +2,8 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -362,6 +362,7 @@ endif
- source "package/owfs/Config.in"
+@@ -422,6 +422,7 @@ endif
+ source "package/openpowerlink/Config.in"
source "package/owl-linux/Config.in"
source "package/parted/Config.in"
+ source "package/pci_debug/Config.in"
@@ -41,7 +41,7 @@ Index: buildroot/package/pci_debug/pci_debug.mk
+################################################################################
+
+PCI_DEBUG_VERSION = 2012.03
-+PCI_DEBUG_SITE = http://www.ovro.caltech.edu/%7Edwh/correlator/pdf/
++PCI_DEBUG_SITE = http://www.ovro.caltech.edu/%7Edwh/correlator/pdf
+PCI_DEBUG_SOURCE = altera_pcie.zip
+#PCI_DEBUG_LICENSE = ????
+PCI_DEBUG_DEPENDENCIES = readline
diff --git a/patches/buildroot/2016.02/021-armadeus-add-sdl_water-package.patch b/patches/buildroot/2016.02/021-armadeus-add-sdl_water-package.patch
index a0a3b40..651f63f 100644
--- a/patches/buildroot/2016.02/021-armadeus-add-sdl_water-package.patch
+++ b/patches/buildroot/2016.02/021-armadeus-add-sdl_water-package.patch
@@ -40,7 +40,7 @@ Index: buildroot/package/sdl_water/sdl_water.mk
+
+SDL_WATER_VERSION = 1.0
+SDL_WATER_SOURCE = water-$(SDL_WATER_VERSION).tar.gz
-+SDL_WATER_SITE = http://www.libsdl.org/projects/water/src/
++SDL_WATER_SITE = http://www.libsdl.org/projects/water/src
+SDL_WATER_TARGET_DATA_DIR = $(TARGET_DIR)/usr/share/images/
+
+SDL_WATER_CONF_OPTS = --with-sdl-prefix=$(STAGING_DIR)/usr \
diff --git a/patches/buildroot/2016.02/025-armadeus-apf-config-add-package.patch b/patches/buildroot/2016.02/025-armadeus-apf-config-add-package.patch
index deae89e..fdda3c3 100644
--- a/patches/buildroot/2016.02/025-armadeus-apf-config-add-package.patch
+++ b/patches/buildroot/2016.02/025-armadeus-apf-config-add-package.patch
@@ -2,12 +2,11 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/apf-config/Config.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/apf-config/Config.in 2015-07-27 16:16:25.679411119 +0200
-@@ -0,0 +1,21 @@
+--- /dev/null
++++ buildroot/package/apf-config/Config.in
+@@ -0,0 +1,20 @@
+config BR2_PACKAGE_APF_CONFIG
+ bool "apf-config"
-+ depends on BR2_LARGEFILE # e2fsprogs
+ depends on BR2_USE_WCHAR # e2fsprogs
+ depends on BR2_USE_MMU # e2fsprogs, util-linux
+ select BR2_PACKAGE_NEWT # whiptail
@@ -25,11 +24,11 @@ Index: buildroot/package/apf-config/Config.in
+ https://github.com/artemysfr/raspi-config
+
+comment "apf-config needs a toolchain w/ largefile, mmu, wchar"
-+ depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_USE_MMU)
++ depends on !(BR2_USE_WCHAR && BR2_USE_MMU)
Index: buildroot/package/apf-config/apf-config.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/apf-config/apf-config.mk 2015-07-27 16:08:07.883416925 +0200
+--- /dev/null
++++ buildroot/package/apf-config/apf-config.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
@@ -51,9 +50,9 @@ Index: buildroot/package/apf-config/apf-config.mk
+$(eval $(generic-package))
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2015-07-27 15:34:24.295440527 +0200
-+++ buildroot/package/Config.in 2015-07-27 16:06:00.035418416 +0200
-@@ -305,6 +305,7 @@
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -345,6 +345,7 @@ endmenu
source "package/a10disp/Config.in"
source "package/acpid/Config.in"
source "package/am335x-pru-package/Config.in"
diff --git a/patches/buildroot/2016.02/034-armadeus-add-slideshow-package.patch b/patches/buildroot/2016.02/034-armadeus-add-slideshow-package.patch
index af98643..4355881 100644
--- a/patches/buildroot/2016.02/034-armadeus-add-slideshow-package.patch
+++ b/patches/buildroot/2016.02/034-armadeus-add-slideshow-package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2015-03-12 09:50:41.996444715 +0100
-+++ buildroot/package/Config.in 2015-03-12 10:23:35.000000000 +0100
-@@ -197,6 +197,7 @@
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -246,6 +246,7 @@ comment "Graphic applications"
source "package/mesa3d-demos/Config.in"
source "package/qt5cinex/Config.in"
source "package/rrdtool/Config.in"
@@ -16,8 +16,8 @@ Index: buildroot/package/Config.in
source "package/cegui06/Config.in"
Index: buildroot/package/slideshow/Config.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/Config.in 2015-03-12 09:50:41.992444715 +0100
+--- /dev/null
++++ buildroot/package/slideshow/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_SLIDESHOW
+ bool "Slideshow"
@@ -29,8 +29,8 @@ Index: buildroot/package/slideshow/Config.in
+ 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 2015-03-12 10:22:50.624512814 +0100
+--- /dev/null
++++ buildroot/package/slideshow/slideshow.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
@@ -40,7 +40,7 @@ Index: buildroot/package/slideshow/slideshow.mk
+
+SLIDESHOW_VERSION = 1.1
+SLIDESHOW_SOURCE = slideshow-source-$(SLIDESHOW_VERSION).zip
-+SLIDESHOW_SITE = http://www.xmission.com/~jstanley/
++SLIDESHOW_SITE = http://www.xmission.com/~jstanley
+
+SLIDESHOW_DEPENDENCIES += sdl sdl_image
+
@@ -65,8 +65,8 @@ Index: buildroot/package/slideshow/slideshow.mk
+$(eval $(generic-package))
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 2015-03-12 09:50:41.992444715 +0100
+--- /dev/null
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch
@@ -0,0 +1,19 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
@@ -89,8 +89,8 @@ Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+ 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 2015-03-12 09:50:41.992444715 +0100
+--- /dev/null
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
@@ -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
@@ -107,8 +107,8 @@ Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+ {
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 2015-03-12 09:50:41.992444715 +0100
+--- /dev/null
++++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
@@ -0,0 +1,28 @@
+On recent gcc some includes are needed to have string stuff defined.
+
@@ -140,8 +140,8 @@ Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_rece
+
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 2015-03-12 09:50:41.992444715 +0100
+--- /dev/null
++++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
@@ -0,0 +1,17 @@
+Otherwise crashes on APF27.
+
diff --git a/patches/buildroot/2016.02/072-armadeus-xenomai-download-adeos-patch.patch b/patches/buildroot/2016.02/072-armadeus-xenomai-download-adeos-patch.patch
index f9af085..a6bacce 100644
--- a/patches/buildroot/2016.02/072-armadeus-xenomai-download-adeos-patch.patch
+++ b/patches/buildroot/2016.02/072-armadeus-xenomai-download-adeos-patch.patch
@@ -15,8 +15,8 @@ Index: buildroot/linux/linux-ext-xenomai.mk
# Adeos patch version
-XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
+-ifeq ($(XENOMAI_ADEOS_PATCH),)
+XENOMAI_ADEOS_PATCH_URL = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL))
-+XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
+ifneq ($(XENOMAI_ADEOS_PATCH_URL),)
+define XENOMAI_ADEOS_DOWNLOAD_PATCH
+ @$(call MESSAGE,"Download adeos patch")
@@ -25,10 +25,11 @@ Index: buildroot/linux/linux-ext-xenomai.mk
+LINUX_POST_DOWNLOAD_HOOKS += XENOMAI_ADEOS_DOWNLOAD_PATCH
+endif
+
- ifeq ($(XENOMAI_ADEOS_PATCH),)
++ifeq ($(XENOMAI_ADEOS_PATCH_URL),)
XENOMAI_ADEOS_OPTS = --default
else
-XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
++XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
+XENOMAI_ADEOS_OPTS = --adeos=$(DL_DIR)/$(XENOMAI_ADEOS_PATCH)
endif
diff --git a/patches/buildroot/2016.02/081-adds_quake_package.patch b/patches/buildroot/2016.02/081-adds_quake_package.patch
index b2c9c10..9e2e455 100644
--- a/patches/buildroot/2016.02/081-adds_quake_package.patch
+++ b/patches/buildroot/2016.02/081-adds_quake_package.patch
@@ -22,7 +22,7 @@ Index: buildroot/package/sdlquake/sdlquake.mk
+#############################################################
+
+SDLQUAKE_VERSION = 1.0.9
-+SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src/
++SDLQUAKE_SITE = http://www.libsdl.org/projects/quake/src
+SDLQUAKE_AUTORECONF = YES
+
+SDLQUAKE_CONF_OPTS = --with-sdl-prefix=$(STAGING_DIR)/usr
@@ -105,7 +105,7 @@ Index: buildroot/package/quake-pak/quake-pak.mk
+
+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_SITE = http://www.libsdl.org/projects/quake/data
+QUAKE_PAK_CAT = $(ZCAT)
+QUAKE_PAK_TARGET_DIR = $(TARGET_DIR)/usr/share/games/quake/
+
diff --git a/patches/buildroot/2016.02/107-armadeus-games-add-wolf4sdl-package.patch b/patches/buildroot/2016.02/107-armadeus-games-add-wolf4sdl-package.patch
index d22045b..48599f7 100644
--- a/patches/buildroot/2016.02/107-armadeus-games-add-wolf4sdl-package.patch
+++ b/patches/buildroot/2016.02/107-armadeus-games-add-wolf4sdl-package.patch
@@ -31,7 +31,7 @@ Index: buildroot/package/wolf4sdl/wolf4sdl.mk
+
+WOLF4SDL_VERSION = 1.6
+WOLF4SDL_SOURCE = Wolf4SDL-$(WOLF4SDL_VERSION)-src.zip
-+WOLF4SDL_SITE = http://www.alice-dsl.net/mkroll/bins/
++WOLF4SDL_SITE = http://www.alice-dsl.net/mkroll/bins
+
+WOLF4SDL_DEPENDENCIES = sdl sdl_mixer
+
diff --git a/patches/buildroot/2016.02/118-armadeus-snes9x-add-package.patch b/patches/buildroot/2016.02/118-armadeus-snes9x-add-package.patch
index ae209f8..7bcaff7 100644
--- a/patches/buildroot/2016.02/118-armadeus-snes9x-add-package.patch
+++ b/patches/buildroot/2016.02/118-armadeus-snes9x-add-package.patch
@@ -43,7 +43,7 @@ Index: buildroot/package/snes9x/snes9x.mk
+
+SNES9X_VERSION = 1.39
+SNES9X_SOURCE = snes9x-sdl-$(SNES9X_VERSION).tar.bz2
-+SNES9X_SITE = http://www.vanille.de/mirror/
++SNES9X_SITE = http://www.vanille.de/mirror
+# roms: http://rtgamer.free.fr/index.php?pg=2&rub=sn
+
+SNES9X_DEPENDENCIES = sdl
diff --git a/patches/buildroot/2016.02/176-imx-test-add_package.patch b/patches/buildroot/2016.02/176-imx-test-add_package.patch
index 8e226b9..0aabc9a 100644
--- a/patches/buildroot/2016.02/176-imx-test-add_package.patch
+++ b/patches/buildroot/2016.02/176-imx-test-add_package.patch
@@ -22,7 +22,7 @@ Index: buildroot/package/imx-test/imx-test.mk
+#############################################################
+IMX_TEST_VERSION = 10.11.01
+IMX_TEST_SOURCE = imx-test-$(IMX_TEST_VERSION).tar.gz
-+IMX_TEST_SITE = ftp://ftp2.armadeus.com/armadeusw/download/
++IMX_TEST_SITE = ftp://ftp2.armadeus.com/armadeusw/download
+IMX_TEST_DEPENDENCIES = imx-lib
+
+ifeq ($(BR2_CPU_NAME),imx27)
@@ -138,9 +138,9 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -340,6 +340,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
- endif
+@@ -398,6 +398,7 @@ endif
source "package/hwdata/Config.in"
+ source "package/hwloc/Config.in"
source "package/i2c-tools/Config.in"
+ source "package/imx-test/Config.in"
source "package/input-event-daemon/Config.in"
diff --git a/patches/buildroot/2016.02/901-armadeus-add-python-flask-login.patch b/patches/buildroot/2016.02/901-armadeus-add-python-flask-login.patch
index 34bc5b6..c25a994 100644
--- a/patches/buildroot/2016.02/901-armadeus-add-python-flask-login.patch
+++ b/patches/buildroot/2016.02/901-armadeus-add-python-flask-login.patch
@@ -1,7 +1,7 @@
Index: buildroot/package/python-flask-login/Config.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/python-flask-login/Config.in 2015-03-09 18:08:56.848078024 +0100
+--- /dev/null
++++ buildroot/package/python-flask-login/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_FLASK_LOGIN
+ bool "python-flask-login"
@@ -13,8 +13,8 @@ Index: buildroot/package/python-flask-login/Config.in
+ http://flask.pocoo.org/
Index: buildroot/package/python-flask-login/python-flask-login.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/python-flask-login/python-flask-login.mk 2015-03-09 18:08:56.848078024 +0100
+--- /dev/null
++++ buildroot/package/python-flask-login/python-flask-login.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
@@ -33,20 +33,20 @@ Index: buildroot/package/python-flask-login/python-flask-login.mk
+$(eval $(python-package))
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2015-03-09 18:08:56.852078024 +0100
-+++ buildroot/package/Config.in 2015-03-09 18:20:16.000000000 +0100
-@@ -549,6 +549,7 @@
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -670,6 +670,7 @@ menu "External python modules"
source "package/python-enum34/Config.in"
source "package/python-flask/Config.in"
source "package/python-flask-jsonrpc/Config.in"
+ source "package/python-flask-login/Config.in"
source "package/python-flup/Config.in"
source "package/python-gobject/Config.in"
- source "package/python-httplib2/Config.in"
+ source "package/python-html5lib/Config.in"
Index: buildroot/package/python-flask-login/python-flask-login.hash
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/python-flask-login/python-flask-login.hash 2015-03-09 18:08:56.848078024 +0100
+--- /dev/null
++++ buildroot/package/python-flask-login/python-flask-login.hash
@@ -0,0 +1,2 @@
+md5 c0a7eaf28623f0aeac4929dc05a7a064 Flask-Login-0.2.11.tar.gz
+sha256 83d5f10e5c4f214feed6cc41c212db63a58a15ac32e56df81591bfa0a5cee3e5 Flask-Login-0.2.11.tar.gz
diff --git a/patches/u-boot/2014.07/603-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch b/patches/u-boot/2014.07/603-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch
new file mode 100644
index 0000000..b214836
--- /dev/null
+++ b/patches/u-boot/2014.07/603-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch
@@ -0,0 +1,92 @@
+From 478b02f1a7043b673565075ea5016376f3293b23 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hde...@re...>
+Date: Sat, 7 Feb 2015 22:52:40 +0100
+Subject: [PATCH] Add linux/compiler-gcc5.h to fix builds with gcc5
+
+Add linux/compiler-gcc5/h from the kernel sources at:
+
+commit 5631b8fba640a4ab2f8a954f63a603fa34eda96b
+Author: Steven Noonan <st...@up...>
+Date: Sat Oct 25 15:09:42 2014 -0700
+
+ compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles
+
+Signed-off-by: Hans de Goede <hde...@re...>
+---
+ include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+ create mode 100644 include/linux/compiler-gcc5.h
+
+diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
+new file mode 100644
+index 0000000..c8c5659
+--- /dev/null
++++ b/include/linux/compiler-gcc5.h
+@@ -0,0 +1,65 @@
++#ifndef __LINUX_COMPILER_H
++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
++#endif
++
++#define __used __attribute__((__used__))
++#define __must_check __attribute__((warn_unused_result))
++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
++
++/* Mark functions as cold. gcc will assume any path leading to a call
++ to them will be unlikely. This means a lot of manual unlikely()s
++ are unnecessary now for any paths leading to the usual suspects
++ like BUG(), printk(), panic() etc. [but let's keep them for now for
++ older compilers]
++
++ Early snapshots of gcc 4.3 don't support this and we can't detect this
++ in the preprocessor, but we can live with this because they're unreleased.
++ Maketime probing would be overkill here.
++
++ gcc also has a __attribute__((__hot__)) to move hot functions into
++ a special section, but I don't see any sense in this right now in
++ the kernel context */
++#define __cold __attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++
++/*
++ * Mark a position in code as unreachable. This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased. Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone __attribute__((__noclone__))
++
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible __attribute__((externally_visible))
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#define __HAVE_BUILTIN_BSWAP16__
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+--
+2.3.6
diff --git a/patches/u-boot/2014.07/604-inline-use-the-gcc-inline-version.patch b/patches/u-boot/2014.07/604-inline-use-the-gcc-inline-version.patch
new file mode 100644
index 0000000..0e8c88c
--- /dev/null
+++ b/patches/u-boot/2014.07/604-inline-use-the-gcc-inline-version.patch
@@ -0,0 +1,20 @@
+Author: Jeroen Hofstee jeroen at myspectrum.nl
+See http://lists.denx.de/pipermail/u-boot/2014-May/180709.html
+Index: uboot-2014.07/include/linux/compiler-gcc.h
+===================================================================
+--- uboot-2014.07.orig/include/linux/compiler-gcc.h
++++ uboot-2014.07/include/linux/compiler-gcc.h
+@@ -44,9 +44,10 @@
+ */
+ #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \
+ !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)
+-# define inline inline __attribute__((always_inline))
+-# define __inline__ __inline__ __attribute__((always_inline))
+-# define __inline __inline __attribute__((always_inline))
++/* XXX: check __GNUC_STDC_INLINE__, fix line length */
++# define inline inline __attribute__((always_inline)) __attribute__((__gnu_inline__))
++# define __inline__ __inline__ __attribute__((always_inline)) __attribute__((__gnu_inline__))
++# define __inline __inline __attribute__((always_inline)) __attribute__((__gnu_inline__))
+ #endif
+
+ #define __deprecated __attribute__((deprecated))
hooks/post-receive
--
armadeus
|