[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-681-g1964406

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  1964406fabff17c114da28397c2ae60f07c6be0d (commit)
       via  df0a409a629f8c696c638332b3b7bffaa7141881 (commit)
      from  2f619a9a7ead6f0acb7e91b262ccfa13b063332b (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 1964406fabff17c114da28397c2ae60f07c6be0d
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Mar 23 15:53:56 2015 +0100

    [BUILDROOT] 2015.02: fixes gnuboy building

commit df0a409a629f8c696c638332b3b7bffaa7141881
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Mar 23 13:53:40 2015 +0100

    [BUILDROOT] 2015.02: fixes apf27xenomai_defconfig build

-----------------------------------------------------------------------

Summary of changes:
 ...check => 016-armadeus-add-gnuboy-package.patch} |   24 ++-
 .../buildroot/2015.02/072-xenomai-package.tofix    |  222 --------------------
 ...ai-add-configure-options-for-old-versions.patch |    2 +-
 .../buildroot/2015.02/124-e-uae-add_package.patch  |    2 +-
 patches/buildroot/2015.02/cleanup_buildroot.sh     |    2 +
 5 files changed, 17 insertions(+), 235 deletions(-)
 rename patches/buildroot/2015.02/{016-armadeus-add-gnuboy-package.tocheck => 016-armadeus-add-gnuboy-package.patch} (84%)
 delete mode 100644 patches/buildroot/2015.02/072-xenomai-package.tofix

diff --git a/patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck b/patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.patch
similarity index 84%
rename from patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck
rename to patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.patch
index b35fccf..9e111fe 100644
--- a/patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck
+++ b/patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.patch
@@ -1,15 +1,17 @@
+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
-@@ -166,6 +166,7 @@
+@@ -178,6 +178,7 @@
+ 
  menu "Games"
- source "package/e-uae/Config.in"
- source "package/doom-wad/Config.in"
-+source "package/gnuboy/Config.in"
- source "package/gnuchess/Config.in"
- source "package/lbreakout2/Config.in"
- source "package/ltris/Config.in"
+ 	source "package/doom-wad/Config.in"
++	source "package/gnuboy/Config.in"
+ 	source "package/gnuchess/Config.in"
+ 	source "package/lbreakout2/Config.in"
+ 	source "package/ltris/Config.in"
 Index: buildroot/package/gnuboy/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -44,7 +46,7 @@ Index: buildroot/package/gnuboy/gnuboy.mk
 +GNUBOY_LICENSE = GPLv2+
 +GNUBOY_LICENSE_FILES = COPYING
 +
-+GNUBOY_CONF_OPT += \
++GNUBOY_CONF_OPTS += \
 +	--enable-arch=$(ARCH) \
 +	--disable-asm \
 +	--with-fb
@@ -52,10 +54,10 @@ Index: buildroot/package/gnuboy/gnuboy.mk
 +GNUBOY_CFLAGS = $(TARGET_CFLAGS)
 +
 +ifeq ($(BR2_PACKAGE_SDL),y)
-+GNUBOY_CONF_OPT += --with-sdl
++GNUBOY_CONF_OPTS += --with-sdl
 +GNUBOY_DEPENDENCIES += sdl
 +else
-+GNUBOY_CONF_OPT += --without-sdl
++GNUBOY_CONF_OPTS += --without-sdl
 +GNUBOY_CFLAGS += -DGNUBOY_NO_SCREENSHOT
 +endif
 +
@@ -71,7 +73,7 @@ Index: buildroot/package/gnuboy/gnuboy.mk
 +# While the configuration system uses autoconf, the Makefiles are
 +# hand-written ???????? and do not use automake. Therefore, we have to hack
 +# around their deficiencies by passing installation paths.
-+GNUBOY_INSTALL_TARGET_OPT = \
++GNUBOY_INSTALL_TARGET_OPTS = \
 +	INSTALL="$(INSTALL)" \
 +	prefix=$(TARGET_DIR)/usr \
 +	exec_prefix=$(TARGET_DIR)/usr \
diff --git a/patches/buildroot/2015.02/072-xenomai-package.tofix b/patches/buildroot/2015.02/072-xenomai-package.tofix
deleted file mode 100644
index 712c8ec..0000000
--- a/patches/buildroot/2015.02/072-xenomai-package.tofix
+++ /dev/null
@@ -1,222 +0,0 @@
-* Allows downloading adeos patch instead of specifying a local path
-* Adds patches specific for Armadeus boards
-* Adds linux config file
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
-
-Index: buildroot/linux/Config.ext.in
-===================================================================
---- buildroot.orig/linux/Config.ext.in
-+++ buildroot/linux/Config.ext.in
-@@ -15,13 +15,19 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
-	  ARM, 2.6.35.9, 2.6.37.6, 2.6.38.8, on NIOS2, 2.6.35, on
-	  PowerPC, 2.6.35.7, 2.6.36.4, 3.0.8.
-
-+config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_URL
-+	depends on BR2_LINUX_KERNEL_EXT_XENOMAI
-+	string "Adeos patch URL"
-+	default "http://download.gna.org/adeos/patches/v2.6/$(BR2_ARCH)/older"
-+	help
-+	  Optionally, explicitly specify the Adeos url.
-+
- config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
-	depends on BR2_LINUX_KERNEL_EXT_XENOMAI
-	string "Path for Adeos patch file"
-+	default "adeos-ipipe-2.6.29-arm-1.13-05.patch"
-	help
-	  Optionally, explicitly specify the Adeos patch to use.
--	  Download it at http://download.gna.org/adeos/patches/v2.6/$(ARCH)/
--	  and verify that your kernel version in buildroot matches.
-
- # RTAI
- config BR2_LINUX_KERNEL_EXT_RTAI
-Index: buildroot/linux/linux-ext-xenomai.mk
-===================================================================
---- buildroot.orig/linux/linux-ext-xenomai.mk
-+++ buildroot/linux/linux-ext-xenomai.mk
-@@ -13,7 +13,7 @@ XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR
- ifeq ($(XENOMAI_ADEOS_PATCH),)
- XENOMAI_ADEOS_OPT = --default
- else
--XENOMAI_ADEOS_OPT = --adeos=$(XENOMAI_ADEOS_PATCH)
-+XENOMAI_ADEOS_OPT = --adeos=$(DL_DIR)/$(XENOMAI_ADEOS_PATCH)
- endif
-
- # Prepare kernel patch
-@@ -23,6 +23,9 @@ define XENOMAI_PREPARE_KERNEL
-		--arch=$(KERNEL_ARCH) \
-		$(XENOMAI_ADEOS_OPT) \
-		--verbose
-+	support/scripts/apply-patches.sh $(LINUX_DIR) \
-+		package/xenomai/						\
-+		adeos-*.patch
- endef
-
- LINUX_PRE_PATCH_HOOKS += XENOMAI_PREPARE_KERNEL
-Index: buildroot/linux/linux.mk
-===================================================================
---- buildroot.orig/linux/linux.mk
-+++ buildroot/linux/linux.mk
-@@ -174,6 +174,12 @@ define ARMADEUS_LINUX_CONFIG_HACKS
- endef
- endif
-
-+ifeq ($(strip $(BR2_LINUX_KERNEL_EXT_XENOMAI)),y)
-+define KERNEL_EXT_XENOMAI_CONFIG_HACKS
-+	cat package/xenomai/xeno-kernel.config >> $(@D)/.config
-+endef
-+endif
-+
- define LINUX_CONFIGURE_CMDS
-	$(ARMADEUS_LINUX_CONFIG_HACKS)
-	cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
-@@ -204,6 +210,7 @@ define LINUX_CONFIGURE_CMDS
-	$(if $(BR2_LINUX_KERNEL_APPENDED_DTB),
-		$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB,$(@D)/.config))
-	yes '' | $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig
-+	$(KERNEL_EXT_XENOMAI_CONFIG_HACKS)
- endef
-
- ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y)
-Index: buildroot/package/xenomai/adeos-00-compatibility_with_armadeus.patch
-===================================================================
---- /dev/null
-+++ buildroot/package/xenomai/adeos-00-compatibility_with_armadeus.patch
-@@ -0,0 +1,10 @@
-+--- a/arch/arm/mach-imx/include/mach/imxfb.h
-++++ b/arch/arm/mach-imx/include/mach/imxfb.h
-+@@ -14,7 +14,6 @@
-+ #define PCR_BPIX_8	(3 << 25)
-+ #define PCR_BPIX_12	(4 << 25)
-+ #define PCR_BPIX_16	(4 << 25)
-+-#define PCR_BPIX_MASK   (7 << 25)
-+ #define PCR_PIXPOL	(1 << 24)
-+ #define PCR_FLMPOL	(1 << 23)
-+ #define PCR_LPPOL	(1 << 22)
-Index: buildroot/package/xenomai/adeos-01-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
-===================================================================
---- /dev/null
-+++ buildroot/package/xenomai/adeos-01-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
-@@ -0,0 +1,23 @@
-+Corrects Freeze problem with MX2 when Adeos is active and
-+application/driver uses interruption on GPIO
-+
-+Signed-off-by: Gwenhael GOAVEC-MEROU <gw...@tr...>
-+
-+Index: kernel/arch/arm/plat-mxc/gpio.c
-+===================================================================
-+--- a/arch/arm/plat-mxc/gpio.c	2009-12-17 22:09:56.000000000 +0100
-++++ b/arch/arm/plat-mxc/gpio.c	2009-12-17 15:45:17.000000000 +0100
-+@@ -241,11 +241,11 @@
-+ 	int i;
-+
-+ 	for (i = 0; i < gpio_table_size; i++) {
-+-		irq_msk = __raw_readl(port->base + GPIO_IMR);
-++		irq_msk = __raw_readl(port[i].base + GPIO_IMR);
-+ 		if (!irq_msk)
-+ 			continue;
-+
-+-		irq_stat = __raw_readl(port->base + GPIO_ISR) & irq_msk;
-++		irq_stat = __raw_readl(port[i].base + GPIO_ISR) & irq_msk;
-+
-+ 		gpio_irq_no = port[i].virtual_irq_start;
-+
-Index: buildroot/package/xenomai/xeno-kernel.config
-===================================================================
---- /dev/null
-+++ buildroot/package/xenomai/xeno-kernel.config
-@@ -0,0 +1,69 @@
-+CONFIG_XENOMAI=y
-+CONFIG_XENO_OPT_NUCLEUS=y
-+CONFIG_XENO_OPT_PERVASIVE=y
-+# CONFIG_XENO_OPT_ISHIELD is not set
-+CONFIG_XENO_OPT_PRIOCPL=y
-+CONFIG_XENO_OPT_PIPELINE_HEAD=y
-+CONFIG_XENO_OPT_PIPE_NRDEV=32
-+CONFIG_XENO_OPT_REGISTRY_NRSLOTS=512
-+CONFIG_XENO_OPT_SYS_HEAPSZ=128
-+CONFIG_XENO_OPT_SYS_STACKPOOLSZ=32
-+CONFIG_XENO_OPT_STATS=y
-+# CONFIG_XENO_OPT_DEBUG is not set
-+# CONFIG_XENO_OPT_SHIRQ is not set
-+CONFIG_XENO_OPT_TIMING_PERIODIC=y
-+CONFIG_XENO_OPT_TIMING_SCHEDLAT=0
-+# CONFIG_XENO_OPT_SCALABLE_SCHED is not set
-+CONFIG_XENO_OPT_TIMER_LIST=y
-+# CONFIG_XENO_OPT_TIMER_HEAP is not set
-+# CONFIG_XENO_OPT_TIMER_WHEEL is not set
-+CONFIG_XENO_HW_FPU=y
-+CONFIG_XENO_SKIN_NATIVE=y
-+CONFIG_XENO_OPT_NATIVE_BUFFER=y
-+# CONFIG_XENO_OPT_NOWARN_DEPRECATED is not set
-+CONFIG_XENO_OPT_NATIVE_PERIOD=0
-+CONFIG_XENO_OPT_NATIVE_PIPE=y
-+CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ=1024
-+CONFIG_XENO_OPT_NATIVE_SEM=y
-+CONFIG_XENO_OPT_NATIVE_EVENT=y
-+CONFIG_XENO_OPT_NATIVE_MUTEX=y
-+CONFIG_XENO_OPT_NATIVE_COND=y
-+CONFIG_XENO_OPT_NATIVE_QUEUE=y
-+CONFIG_XENO_OPT_NATIVE_HEAP=y
-+CONFIG_XENO_OPT_NATIVE_ALARM=y
-+CONFIG_XENO_OPT_NATIVE_MPS=y
-+CONFIG_XENO_OPT_NATIVE_INTR=y
-+CONFIG_XENO_SKIN_POSIX=y
-+CONFIG_XENO_OPT_POSIX_PERIOD=0
-+# CONFIG_XENO_OPT_POSIX_SHM is not set
-+# CONFIG_XENO_OPT_POSIX_INTR is not set
-+# CONFIG_XENO_OPT_POSIX_SELECT is not set
-+# CONFIG_XENO_OPT_SCHED_CLASSES is not set
-+CONFIG_XENO_OPT_SEM_HEAPSZ=12
-+CONFIG_XENO_OPT_GLOBAL_SEM_HEAPSZ=12
-+# CONFIG_XENO_OPT_DEBUG_POSIX is not set
-+CONFIG_XENO_OPT_TIMING_VIRTICK=1000
-+CONFIG_XENO_HW_UNLOCKED_SWITCH=y
-+# CONFIG_XENO_SKIN_PSOS is not set
-+# CONFIG_XENO_SKIN_UITRON is not set
-+# CONFIG_XENO_SKIN_VRTX is not set
-+# CONFIG_XENO_SKIN_VXWORKS is not set
-+# CONFIG_XENO_SKIN_RTAI is not set
-+CONFIG_XENO_SKIN_RTDM=y
-+CONFIG_XENO_OPT_RTDM_PERIOD=0
-+CONFIG_XENO_OPT_RTDM_FILDES=128
-+CONFIG_XENO_OPT_RTDM_SELECT=y
-+# CONFIG_XENO_DRIVERS_16550A is not set
-+# CONFIG_XENO_DRIVERS_ANALOGY is not set
-+# CONFIG_XENO_DRIVERS_RTIPC is not set
-+CONFIG_XENO_DRIVERS_TIMERBENCH=m
-+CONFIG_XENO_DRIVERS_KLATENCY=m
-+CONFIG_XENO_DRIVERS_IRQBENCH=m
-+# CONFIG_XENO_DRIVERS_SIGTEST is not set
-+CONFIG_XENO_DRIVERS_SWITCHTEST=m
-+# CONFIG_XENO_DRIVERS_CAN is not set
-+# CONFIG_ARM_FCSE is not set
-+CONFIG_IPIPE=y
-+CONFIG_IPIPE_DOMAINS=4
-+CONFIG_IPIPE_COMPAT=y
-+# CONFIG_IPIPE_DEBUG is not set
-Index: buildroot/package/xenomai/xenomai.mk
-===================================================================
---- buildroot/package/xenomai/xenomai.mk
-+++ buildroot/package/xenomai/xenomai.mk
-@@ -12,12 +12,20 @@ endif
-
- XENOMAI_SITE = http://download.gna.org/xenomai/stable/
- XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
-+XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
-+XENOMAI_ADEOS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_URL))
- XENOMAI_LICENSE = headers: GPLv2+ with exception, libraries: LGPLv2.1+, kernel: GPLv2+, docs: GFDLv1.2+, ipipe patch and can driver: GPLv2
- # GFDL is not included but refers to gnu.org
- XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING
-
- XENOMAI_INSTALL_STAGING = YES
-
-+define ADEOS_DOWNLOAD_PATCH
-+	$(call DOWNLOAD,$(XENOMAI_ADEOS_SITE),$(XENOMAI_ADEOS_PATCH))
-+endef
-+
-+XENOMAI_POST_DOWNLOAD_HOOKS += ADEOS_DOWNLOAD_PATCH
-+
- XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/
-
- ifeq ($(BR2_HAVE_DEVFILES),)
diff --git a/patches/buildroot/2015.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch b/patches/buildroot/2015.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
index 8a28738..7da9cf0 100644
--- a/patches/buildroot/2015.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
+++ b/patches/buildroot/2015.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
@@ -28,7 +28,7 @@ Index: buildroot/package/xenomai/xenomai.mk
  XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
 
  XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ --disable-doc-install
-+XENOMAI_ADDITIONAL_CONF_OPT = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CONF_OPTS))
++XENOMAI_ADDITIONAL_CONF_OPT = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CONF_OPT))
 +ifneq ($(XENOMAI_ADDITIONAL_CONF_OPT),)
 +XENOMAI_CONF_OPTS += $(XENOMAI_ADDITIONAL_CONF_OPT)
 +endif
diff --git a/patches/buildroot/2015.02/124-e-uae-add_package.patch b/patches/buildroot/2015.02/124-e-uae-add_package.patch
index 63b3e94..eade15b 100644
--- a/patches/buildroot/2015.02/124-e-uae-add_package.patch
+++ b/patches/buildroot/2015.02/124-e-uae-add_package.patch
@@ -7,9 +7,9 @@ Index: buildroot/package/Config.in
  menu "Games"
 	source "package/doom-wad/Config.in"
 +	source "package/e-uae/Config.in"
+ 	source "package/gnuboy/Config.in"
 	source "package/gnuchess/Config.in"
 	source "package/lbreakout2/Config.in"
-	source "package/ltris/Config.in"
 Index: buildroot/package/e-uae/Config.in
 ===================================================================
 --- /dev/null
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index be158a4..ea37d99 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -53,6 +53,8 @@ rm -rf buildroot/package/gnash/Config.in
 rm -rf buildroot/package/gnash/gnash.mk
 rm -rf buildroot/package/gnokii/Config.in
 rm -rf buildroot/package/gnokii/gnokii.mk
+rm -rf buildroot/package/gnuboy/Config.in
+rm -rf buildroot/package/gnuboy/gnuboy.mk
 rm -rf buildroot/package/gpsd/Config.in
 rm -rf buildroot/package/gpsd/S50gpsd
 rm -rf buildroot/package/gpsd/gpsd.mk


hooks/post-receive
-- 
armadeus


