armadeus-commitlog Mailing List for armadeus (Page 56)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julien B a. A. <ar...@us...> - 2013-09-20 15:19:29
|
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 f136d1e302a1b3bcc3412cd11b0406d0e4c42a58 (commit)
via b7f530b0988934cbc64e2d410e29f107ba256d13 (commit)
via 38ada73ee8f054dcae9ba6a1144d6e17b2b5a2df (commit)
from be428adca76ec97958af7b0a28e2861e80d1c95f (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 f136d1e302a1b3bcc3412cd11b0406d0e4c42a58
Author: Julien Boibessot <jul...@ar...>
Date: Fri Sep 20 17:19:08 2013 +0200
[BUILDROOT][2013.05] Makes initrd generation works again with armadeus adaptations to BR
commit b7f530b0988934cbc64e2d410e29f107ba256d13
Author: Julien Boibessot <jul...@ar...>
Date: Fri Sep 20 16:18:11 2013 +0200
[BUILDROOT][2013.05] Mark patches 211 as a BR upstream one
commit 38ada73ee8f054dcae9ba6a1144d6e17b2b5a2df
Author: Julien Boibessot <jul...@ar...>
Date: Fri Sep 20 16:13:58 2013 +0200
[BUILDROOT][2013.05] Fixes pywebradio package installation
-----------------------------------------------------------------------
Summary of changes:
...linux-add-board-name-to-initrd-image-name.patch | 18 ++++++++++++++++
...d => 123-armadeus-pywebradio-add-package.patch} | 22 ++++++-------------
.../buildroot/2013.05/211-cups-fix_site_url.patch | 19 +++++++++++-----
patches/buildroot/2013.05/cleanup_buildroot.sh | 1 +
4 files changed, 39 insertions(+), 21 deletions(-)
create mode 100644 patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
rename patches/buildroot/2013.05/{123-pywebradio-add_package.patch.tobefixed => 123-armadeus-pywebradio-add-package.patch} (61%)
diff --git a/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch b/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
new file mode 100644
index 0000000..5bdc59a
--- /dev/null
+++ b/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
@@ -0,0 +1,18 @@
+We rename images in binaries/ directory, so take that into account when Linux
+needs to find cpio image to generate initrd.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk 2013-09-20 17:00:19.172366934 +0200
++++ buildroot/linux/linux.mk 2013-09-20 17:00:53.184535598 +0200
+@@ -185,7 +185,7 @@
+ $(if $(BR2_TARGET_ROOTFS_INITRAMFS),
+ touch $(BINARIES_DIR)/rootfs.cpio
+ $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
+- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.cpio\",$(@D)/.config)
++ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.cpio\",$(@D)/.config)
+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
+ $(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
diff --git a/patches/buildroot/2013.05/123-pywebradio-add_package.patch.tobefixed b/patches/buildroot/2013.05/123-armadeus-pywebradio-add-package.patch
similarity index 61%
rename from patches/buildroot/2013.05/123-pywebradio-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/123-armadeus-pywebradio-add-package.patch
index cc145d2..f603691 100644
--- a/patches/buildroot/2013.05/123-pywebradio-add_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/123-armadeus-pywebradio-add-package.patch
@@ -1,7 +1,7 @@
Index: buildroot/package/multimedia/Config.in
===================================================================
---- buildroot.orig/package/multimedia/Config.in 2012-02-21 16:44:45.000000000 +0100
-+++ buildroot/package/multimedia/Config.in 2012-02-21 16:45:43.000000000 +0100
+--- buildroot.orig/package/multimedia/Config.in 2013-09-02 21:35:20.250475033 +0200
++++ buildroot/package/multimedia/Config.in 2013-09-10 11:38:45.375000535 +0200
@@ -20,6 +20,7 @@
source "package/multimedia/mpd/Config.in"
source "package/multimedia/mpg123/Config.in"
@@ -13,7 +13,7 @@ Index: buildroot/package/multimedia/Config.in
Index: buildroot/package/pywebradio/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pywebradio/Config.in 2012-02-21 16:45:43.000000000 +0100
++++ buildroot/package/pywebradio/Config.in 2013-09-10 11:38:45.375000535 +0200
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYWEBRADIO
+ bool "pywebradio"
@@ -24,25 +24,17 @@ Index: buildroot/package/pywebradio/Config.in
Index: buildroot/package/pywebradio/pywebradio.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pywebradio/pywebradio.mk 2012-02-21 16:45:43.000000000 +0100
-@@ -0,0 +1,28 @@
++++ buildroot/package/pywebradio/pywebradio.mk 2013-09-20 16:11:40.685894942 +0200
+@@ -0,0 +1,20 @@
+#############################################################
+#
+# pywebradio
+#
+#############################################################
+
-+PYWEBRADIO_TRUNK:=http://forge.doumenc.org/svn/pyqtradio/trunk
-+PYWEBRADIO_SITE:=
++PYWEBRADIO_SITE = http://forge.doumenc.org/svn/pyqtradio/trunk
++PYWEBRADIO_SITE_METHOD = svn
+PYWEBRADIO_VERSION:=421
-+PYWEBRADIO_NAME:=pywebradio-svn-r$(PYWEBRADIO_VERSION)
-+PYWEBRADIO_DIR:=$(BUILD_DIR)/$(PYWEBRADIO_NAME)
-+PYWEBRADIO_SOURCE:=$(PYWEBRADIO_NAME).tar.bz2
-+
-+# GENTARGETS do not allow to get sources from SVN ??
-+#$(DL_DIR)/$(PYWEBRADIO_SOURCE):
-+# $(SVN_CO) -r $(PYWEBRADIO_VERSION) $(PYWEBRADIO_TRUNK) $(PYWEBRADIO_DIR)
-+# tar -cv -C $(BUILD_DIR) $(PYWEBRADIO_NAME) | bzip2 - -c > $@
+
+define PYWEBRADIO_INSTALL_TARGET_CMDS
+ cd $(@D); \
diff --git a/patches/buildroot/2013.05/211-cups-fix_site_url.patch b/patches/buildroot/2013.05/211-cups-fix_site_url.patch
index 40b8dc7..a7e0b49 100644
--- a/patches/buildroot/2013.05/211-cups-fix_site_url.patch
+++ b/patches/buildroot/2013.05/211-cups-fix_site_url.patch
@@ -1,12 +1,17 @@
-Fix CUPS site URL.
+From ca0b3486e1e0ab96e73a29c53bfb326e92151333 Mon Sep 17 00:00:00 2001
+From: Jelle Sels <jel...@gm...>
+Date: Tue, 11 Jun 2013 18:39:40 +0000
+Subject: cups: fix upstream URL
-Signed-off-by: Jérémie Scheer <jer...@ar...>
+Signed-off-by: Jelle Sels <jel...@gm...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
---
+(limited to 'package/cups/cups.mk')
-Index: buildroot/package/cups/cups.mk
-===================================================================
---- buildroot.orig/package/cups/cups.mk 2013-05-31 22:29:04.000000000 +0200
-+++ buildroot/package/cups/cups.mk 2013-09-19 10:26:29.000000000 +0200
+diff --git a/package/cups/cups.mk b/package/cups/cups.mk
+index f8ace71..9b8d7c5 100644
+--- a/package/cups/cups.mk
++++ b/package/cups/cups.mk
@@ -6,7 +6,7 @@
CUPS_VERSION = 1.3.11
@@ -16,3 +21,5 @@ Index: buildroot/package/cups/cups.mk
CUPS_INSTALL_STAGING = YES
CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
+--
+cgit v0.9.1
diff --git a/patches/buildroot/2013.05/cleanup_buildroot.sh b/patches/buildroot/2013.05/cleanup_buildroot.sh
index 1532894..4e8d879 100755
--- a/patches/buildroot/2013.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.05/cleanup_buildroot.sh
@@ -79,3 +79,4 @@ rm -f buildroot/package/busybox/1.21.0/busybox-1.21.0-stty_add_rs485_config.patc
rm -f buildroot/package/busybox/snapshot/busybox-stty_add_rs485_config.patch
rm -rf buildroot/package/joe/
rm -rf buildroot/package/gpsd/
+rm -rf buildroot/linux/
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-09-19 18:23:26
|
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 be428adca76ec97958af7b0a28e2861e80d1c95f (commit)
via 535e51f7e66e061055504f90cdf7734bf19385a8 (commit)
from 2a1f5d4a52feb5936d676ada9447d71cc1d64afe (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 be428adca76ec97958af7b0a28e2861e80d1c95f
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Thu Sep 19 20:23:40 2013 +0200
[LINUX] APF28: fix mac address detection
commit 535e51f7e66e061055504f90cdf7734bf19385a8
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Thu Sep 19 20:22:12 2013 +0200
[LINUX] APF28: add 3.11 / 3.11.1 support
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-3.11.1.config | 1 +
...8-linux-3.10.config => apf28-linux-3.11.config} | 4 +-
...0443-armadeus-apf28-fix_mac_address_issue.patch | 47 ++++++++++++++++++++
3 files changed, 50 insertions(+), 2 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.11.1.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.config => apf28-linux-3.11.config} (98%)
create mode 100644 patches/linux/3.11/0443-armadeus-apf28-fix_mac_address_issue.patch
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.1.config
new file mode 120000
index 0000000..fe420fd
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.1.config
@@ -0,0 +1 @@
+apf28-linux-3.11.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config
similarity index 98%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config
index 3b2e691..2393a05 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config
@@ -104,6 +104,7 @@ CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
CONFIG_HWMON=m
CONFIG_WATCHDOG=y
+CONFIG_STMP3XXX_RTC_WATCHDOG=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_MEDIA_SUPPORT=m
@@ -129,8 +130,6 @@ CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
CONFIG_USB_ETH=m
@@ -146,6 +145,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_STMP=y
CONFIG_DMADEVICES=y
CONFIG_MXS_DMA=y
CONFIG_STAGING=y
diff --git a/patches/linux/3.11/0443-armadeus-apf28-fix_mac_address_issue.patch b/patches/linux/3.11/0443-armadeus-apf28-fix_mac_address_issue.patch
new file mode 100644
index 0000000..d71338a
--- /dev/null
+++ b/patches/linux/3.11/0443-armadeus-apf28-fix_mac_address_issue.patch
@@ -0,0 +1,47 @@
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.11.1/arch/arm/mach-mxs/mach-mxs.c
+===================================================================
+--- linux-3.11.1.orig/arch/arm/mach-mxs/mach-mxs.c
++++ linux-3.11.1/arch/arm/mach-mxs/mach-mxs.c
+@@ -156,6 +156,7 @@ enum mac_oui {
+ OUI_FSL,
+ OUI_DENX,
+ OUI_CRYSTALFONTZ,
++ OUI_ARMADEUS,
+ };
+
+ static void __init update_fec_mac_prop(enum mac_oui oui)
+@@ -210,6 +211,11 @@ static void __init update_fec_mac_prop(e
+ macaddr[1] = 0xb9;
+ macaddr[2] = 0xe1;
+ break;
++ case OUI_ARMADEUS:
++ macaddr[0] = 0x00;
++ macaddr[1] = 0x1e;
++ macaddr[2] = 0xac;
++ break;
+ }
+ val = ocotp[i];
+ macaddr[3] = (val >> 16) & 0xff;
+@@ -235,6 +241,11 @@ static void __init imx28_evk_init(void)
+ mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
+ }
+
++static void __init imx28_apf28_init(void)
++{
++ update_fec_mac_prop(OUI_ARMADEUS);
++}
++
+ static int apx4devkit_phy_fixup(struct phy_device *phy)
+ {
+ phy->dev_flags |= MICREL_PHY_50MHZ_CLK;
+@@ -433,6 +444,8 @@ static void __init mxs_machine_init(void
+ imx28_evk_init();
+ else if (of_machine_is_compatible("bluegiga,apx4devkit"))
+ apx4devkit_init();
++ else if (of_machine_is_compatible("armadeus,imx28-apf28"))
++ imx28_apf28_init();
+ else if (of_machine_is_compatible("crystalfontz,cfa10037") ||
+ of_machine_is_compatible("crystalfontz,cfa10049") ||
+ of_machine_is_compatible("crystalfontz,cfa10055") ||
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-19 13:36:32
|
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 2a1f5d4a52feb5936d676ada9447d71cc1d64afe (commit)
from 011d2a2de48c85d9fcf2670ecbbf493ab23df4f7 (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 2a1f5d4a52feb5936d676ada9447d71cc1d64afe
Author: Eric Jarrige <eri...@ar...>
Date: Thu Sep 19 15:31:55 2013 +0200
[UBOOT] 2013.04: restore command env param compatitbility
-----------------------------------------------------------------------
Summary of changes:
...-restore-command-env-param-compatitbility.patch | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
create mode 100644 patches/u-boot/2013.04/001-restore-command-env-param-compatitbility.patch
diff --git a/patches/u-boot/2013.04/001-restore-command-env-param-compatitbility.patch b/patches/u-boot/2013.04/001-restore-command-env-param-compatitbility.patch
new file mode 100644
index 0000000..6aee8c0
--- /dev/null
+++ b/patches/u-boot/2013.04/001-restore-command-env-param-compatitbility.patch
@@ -0,0 +1,15 @@
+restore command env param compatitbility with legacy U-Boot versions
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+--- uboot-custom/common/cmd_nvedit.c
++++ uboot-custom/common/cmd_nvedit.c
+@@ -724,7 +724,7 @@ static int do_env_default(cmd_tbl_t *cmd
+ }
+ }
+ debug("Final value for argc=%d\n", argc);
+- if (all && (argc == 0)) {
++ if ((all || (flag & H_FORCE)) && (argc == 0)) {
+ /* Reset the whole environment */
+ set_default_env("## Resetting to default environment\n");
+ return 0;
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2013-09-19 08:39:35
|
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 011d2a2de48c85d9fcf2670ecbbf493ab23df4f7 (commit)
from 82509bb3365a4b0efc30f412bf0e13fe4caa70a4 (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 011d2a2de48c85d9fcf2670ecbbf493ab23df4f7
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Sep 19 10:39:17 2013 +0200
[BUILDROOT] Fix Cups and Fbgrab site URLs.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2012.02/209-cups-fix_site_url.patch | 18 ++++++++++++++++++
.../2012.02/210-fbgrab-fix_site_url.patch | 17 +++++++++++++++++
.../buildroot/2013.05/211-cups-fix_site_url.patch | 18 ++++++++++++++++++
.../2013.05/212-fbgrab-fix_site_url.patch | 17 +++++++++++++++++
4 files changed, 70 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/209-cups-fix_site_url.patch
create mode 100644 patches/buildroot/2012.02/210-fbgrab-fix_site_url.patch
create mode 100644 patches/buildroot/2013.05/211-cups-fix_site_url.patch
create mode 100644 patches/buildroot/2013.05/212-fbgrab-fix_site_url.patch
diff --git a/patches/buildroot/2012.02/209-cups-fix_site_url.patch b/patches/buildroot/2012.02/209-cups-fix_site_url.patch
new file mode 100644
index 0000000..9190c24
--- /dev/null
+++ b/patches/buildroot/2012.02/209-cups-fix_site_url.patch
@@ -0,0 +1,18 @@
+Fix CUPS site URL.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+---
+
+Index: buildroot/package/cups/cups.mk
+===================================================================
+--- buildroot.orig/package/cups/cups.mk 2012-02-29 23:19:47.000000000 +0100
++++ buildroot/package/cups/cups.mk 2013-09-18 17:15:20.000000000 +0200
+@@ -6,7 +6,7 @@
+ CUPS_VERSION = 1.3.9
+ CUPS_NAME = cups-$(CUPS_VERSION)
+ CUPS_DIR = $(BUILD_DIR)/$(CUPS_NAME)
+-CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
++CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION)
+ CUPS_SOURCE:=$(CUPS_NAME)-source.tar.bz2
+ CUPS_DESTDIR = $(STAGING_DIR)/usr/lib
+ CUPS_CAT:=$(BZCAT)
diff --git a/patches/buildroot/2012.02/210-fbgrab-fix_site_url.patch b/patches/buildroot/2012.02/210-fbgrab-fix_site_url.patch
new file mode 100644
index 0000000..2c6d1e7
--- /dev/null
+++ b/patches/buildroot/2012.02/210-fbgrab-fix_site_url.patch
@@ -0,0 +1,17 @@
+Fix Fbgrab site URL.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+---
+
+Index: buildroot/package/fbgrab/fbgrab.mk
+===================================================================
+--- buildroot.orig/package/fbgrab/fbgrab.mk 2012-02-29 23:19:47.000000000 +0100
++++ buildroot/package/fbgrab/fbgrab.mk 2013-09-18 17:54:43.000000000 +0200
+@@ -1,6 +1,6 @@
+ FBGRAB_VERSION = 1.0
+ FBGRAB_SOURCE = fbgrab-$(FBGRAB_VERSION).tar.gz
+-FBGRAB_SITE = http://hem.bredband.net/gmogmo/fbgrab
++FBGRAB_SITE = http://fbgrab.monells.se
+ FBGRAB_DEPENDENCIES = libpng
+
+ define FBGRAB_BUILD_CMDS
diff --git a/patches/buildroot/2013.05/211-cups-fix_site_url.patch b/patches/buildroot/2013.05/211-cups-fix_site_url.patch
new file mode 100644
index 0000000..40b8dc7
--- /dev/null
+++ b/patches/buildroot/2013.05/211-cups-fix_site_url.patch
@@ -0,0 +1,18 @@
+Fix CUPS site URL.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+---
+
+Index: buildroot/package/cups/cups.mk
+===================================================================
+--- buildroot.orig/package/cups/cups.mk 2013-05-31 22:29:04.000000000 +0200
++++ buildroot/package/cups/cups.mk 2013-09-19 10:26:29.000000000 +0200
+@@ -6,7 +6,7 @@
+
+ CUPS_VERSION = 1.3.11
+ CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
+-CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
++CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION)
+ CUPS_INSTALL_STAGING = YES
+ CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
+ CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
diff --git a/patches/buildroot/2013.05/212-fbgrab-fix_site_url.patch b/patches/buildroot/2013.05/212-fbgrab-fix_site_url.patch
new file mode 100644
index 0000000..061bc88
--- /dev/null
+++ b/patches/buildroot/2013.05/212-fbgrab-fix_site_url.patch
@@ -0,0 +1,17 @@
+Fix Fbgrab site URL.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+---
+
+Index: buildroot/package/fbgrab/fbgrab.mk
+===================================================================
+--- buildroot.orig/package/fbgrab/fbgrab.mk 2013-05-31 22:29:04.000000000 +0200
++++ buildroot/package/fbgrab/fbgrab.mk 2013-09-19 10:32:21.000000000 +0200
+@@ -1,6 +1,6 @@
+ FBGRAB_VERSION = 1.0
+ FBGRAB_SOURCE = fbgrab-$(FBGRAB_VERSION).tar.gz
+-FBGRAB_SITE = http://hem.bredband.net/gmogmo/fbgrab
++FBGRAB_SITE = http://fbgrab.monells.se
+ FBGRAB_DEPENDENCIES = libpng
+
+ define FBGRAB_BUILD_CMDS
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-18 14:57:32
|
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 82509bb3365a4b0efc30f412bf0e13fe4caa70a4 (commit)
from 2f09cdf1b86bfd8ba70f1d330adb1fc4af916926 (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 82509bb3365a4b0efc30f412bf0e13fe4caa70a4
Author: Eric Jarrige <eri...@ar...>
Date: Wed Sep 18 17:09:00 2013 +0200
[LINUX] 3.10: apf51: update to 3.10.11
-----------------------------------------------------------------------
Summary of changes:
...ux-3.10.9.config => apf51-linux-3.10.11.config} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.9.config => apf51-linux-3.10.11.config} (100%)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.9.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.9.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.11.config
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-18 10:41: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 2f09cdf1b86bfd8ba70f1d330adb1fc4af916926 (commit)
from 74d4c4f04f5c67603647cb20a2bd9a1c219d53bf (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 2f09cdf1b86bfd8ba70f1d330adb1fc4af916926
Author: Eric Jarrige <eri...@ar...>
Date: Wed Sep 18 12:53:03 2013 +0200
[LINUX] 3.10: apf28: update to 3.10.11
-----------------------------------------------------------------------
Summary of changes:
...ux-3.10.9.config => apf28-linux-3.10.11.config} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.9.config => apf28-linux-3.10.11.config} (100%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.9.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.9.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.11.config
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-09-18 08:37:01
|
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 74d4c4f04f5c67603647cb20a2bd9a1c219d53bf (commit)
from 00c0686f2dd9606d316a931ab145482bc8af3241 (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 74d4c4f04f5c67603647cb20a2bd9a1c219d53bf
Author: Julien Boibessot <jul...@ar...>
Date: Wed Sep 18 10:36:42 2013 +0200
[BUILDROOT] Add a config to build Linux 3.11/mainline based APF51 system
-----------------------------------------------------------------------
Summary of changes:
.../{apf51_defconfig => apf51mainline_defconfig} | 11 +++++------
...x-3.11-rc4.config => apf51-linux-3.11.1.config} | 0
2 files changed, 5 insertions(+), 6 deletions(-)
copy buildroot/configs/{apf51_defconfig => apf51mainline_defconfig} (94%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.11-rc4.config => apf51-linux-3.11.1.config} (100%)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51mainline_defconfig
similarity index 94%
copy from buildroot/configs/apf51_defconfig
copy to buildroot/configs/apf51mainline_defconfig
index 440ee1f..93f139f 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -3,12 +3,9 @@ BR2_cortex_a8=y
BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_SOURCEFORGE_MIRROR="switch"
-BR2_JLEVEL=1
-BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
+BR2_DEFAULT_KERNEL_VERSION="3.11.1"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_23_2=y
BR2_PACKAGE_HOST_GDB=y
@@ -67,7 +64,6 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
BR2_PACKAGE_PORTMAP=y
BR2_PACKAGE_PPPD=y
-BR2_PACKAGE_UUCP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
@@ -99,7 +95,10 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.11.1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x90008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-apf51dev"
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11-rc4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.11-rc4.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.11.1.config
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-17 13:40:05
|
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 00c0686f2dd9606d316a931ab145482bc8af3241 (commit)
via 47c57c0ba6c70ea00ccc6c4a35a05420e240aba6 (commit)
via c6ec4e372805d8351352c546f235d761b76ebbed (commit)
from 4b05a4a44b5d1908fa84da314d4bffa85a5d75e5 (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 00c0686f2dd9606d316a931ab145482bc8af3241
Author: Philippe Reynes <tr...@ya...>
Date: Sun Sep 15 21:03:42 2013 +0200
[LINUX] 3.11: move to 3.11.1
Signed-off-by: Philippe Reynes <tr...@ya...>
commit 47c57c0ba6c70ea00ccc6c4a35a05420e240aba6
Author: Philippe Reynes <tr...@ya...>
Date: Fri Sep 13 21:10:32 2013 +0200
[LINUX] 3.10: move to 3.10.11
Signed-off-by: Philippe Reynes <tr...@ya...>
commit c6ec4e372805d8351352c546f235d761b76ebbed
Author: Philippe Reynes <tr...@ya...>
Date: Sat Sep 7 10:09:52 2013 +0200
[LINUX] 3.11: remove 3.11-rc4
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
...x-3.10.10.config => apf27-linux-3.10.11.config} | 0
...x-3.11-rc4.config => apf27-linux-3.11.1.config} | 0
patches/linux/{3.10.10 => 3.10.11} | 0
patches/linux/{3.11-rc4 => 3.11.1} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.10.config => apf27-linux-3.10.11.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.11-rc4.config => apf27-linux-3.11.1.config} (100%)
rename patches/linux/{3.10.10 => 3.10.11} (100%)
rename patches/linux/{3.11-rc4 => 3.11.1} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.10.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.10.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.11.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.11-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.1.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.11-rc4.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.11.1.config
diff --git a/patches/linux/3.10.10 b/patches/linux/3.10.11
similarity index 100%
rename from patches/linux/3.10.10
rename to patches/linux/3.10.11
diff --git a/patches/linux/3.11-rc4 b/patches/linux/3.11.1
similarity index 100%
rename from patches/linux/3.11-rc4
rename to patches/linux/3.11.1
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-10 12:27:20
|
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 4b05a4a44b5d1908fa84da314d4bffa85a5d75e5 (commit)
from 5b5c717382b90b993365181e75f76e259519f2ef (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 4b05a4a44b5d1908fa84da314d4bffa85a5d75e5
Author: Philippe Reynes <tr...@ya...>
Date: Fri Aug 30 18:22:17 2013 +0200
[LINUX] 3.10: move to 3.10.10
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
...ux-3.10.9.config => apf27-linux-3.10.10.config} | 0
patches/linux/{3.10.9 => 3.10.10} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.9.config => apf27-linux-3.10.10.config} (100%)
rename patches/linux/{3.10.9 => 3.10.10} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.9.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.9.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.10.config
diff --git a/patches/linux/3.10.9 b/patches/linux/3.10.10
similarity index 100%
rename from patches/linux/3.10.9
rename to patches/linux/3.10.10
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-09-04 17:34:30
|
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 5b5c717382b90b993365181e75f76e259519f2ef (commit)
via a6e820f0a75456bb0ca197cfc04ab6aa1da771ef (commit)
via c23f8c5f37d6ec4e6f670beb37cbc0f89c3da9ec (commit)
via 690120f116e189faa6abdf084d041f121fee98fe (commit)
via 336969227a18604df526d82299e7d9f6c1f0720f (commit)
from ac8b3e8d43e26909eb841bf1fa5f528e2b019027 (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 5b5c717382b90b993365181e75f76e259519f2ef
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 2 21:25:46 2013 +0200
[BUILDROOT][2013.05] Fixes madplay build
commit a6e820f0a75456bb0ca197cfc04ab6aa1da771ef
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 2 18:57:37 2013 +0200
[BUILDROOT][2013.05] Fixes ltris build
commit c23f8c5f37d6ec4e6f670beb37cbc0f89c3da9ec
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 2 18:26:00 2013 +0200
[BUILDROOT][2013.05] Fixes lbreakout2 build
commit 690120f116e189faa6abdf084d041f121fee98fe
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 2 17:48:29 2013 +0200
[BUILDROOT][2013.05] Fixes opentyrian build
commit 336969227a18604df526d82299e7d9f6c1f0720f
Author: Julien Boibessot <jul...@ar...>
Date: Sun Sep 1 22:03:37 2013 +0200
[BUILDROOT] [2013.05] Fixes snes9x compilation
-----------------------------------------------------------------------
Summary of changes:
...r-add_patch_for_recent_alsa_compatibility.patch | 187 --------------------
...fixed => 118-armadeus-snes9x-add-package.patch} | 81 +++------
...d => 125-armadeus-opentyrian-add-package.patch} | 53 +++---
...d => 130-armadeus-lbreakout2-add-package.patch} | 18 +-
...ixed => 131-armadeus-ltetris-add-package.patch} | 0
...armadeus-madplay-fixes-libintl-dependency.patch | 24 +++
.../191-madplay-requires_libintl.patch.tobefixed | 29 ---
7 files changed, 90 insertions(+), 302 deletions(-)
delete mode 100644 patches/buildroot/2013.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
rename patches/buildroot/2013.05/{118-snes9x-add_package.patch.tobefixed => 118-armadeus-snes9x-add-package.patch} (82%)
rename patches/buildroot/2013.05/{125-opentyrian-add_package.patch.tobefixed => 125-armadeus-opentyrian-add-package.patch} (62%)
rename patches/buildroot/2013.05/{130-lbreakout-add_package.patch.tobefixed => 130-armadeus-lbreakout2-add-package.patch} (78%)
rename patches/buildroot/2013.05/{131-ltetris-add_package.patch.tobefixed => 131-armadeus-ltetris-add-package.patch} (100%)
create mode 100644 patches/buildroot/2013.05/191-armadeus-madplay-fixes-libintl-dependency.patch
delete mode 100644 patches/buildroot/2013.05/191-madplay-requires_libintl.patch.tobefixed
diff --git a/patches/buildroot/2013.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch b/patches/buildroot/2013.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
deleted file mode 100644
index 6a37eb1..0000000
--- a/patches/buildroot/2013.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-Can't remember where I found these changes but they are mandatory, otherwise
-you will get this when compiling:
-audio_alsa.c:(.text+0x1d8): undefined reference to `snd_pcm_hw_params_set_rate_near@ALSA_0.9'
-audio_alsa.c:(.text+0x230): undefined reference to `snd_pcm_hw_params_set_buffer_time_near@ALSA_0.9'
-audio_alsa.c:(.text+0x258): undefined reference to `snd_pcm_hw_params_get_buffer_size@ALSA_0.9'
-audio_alsa.c:(.text+0x274): undefined reference to `snd_pcm_hw_params_set_period_time_near@ALSA_0.9'
-audio_alsa.c:(.text+0x2a4): undefined reference to `snd_pcm_hw_params_get_period_size@ALSA_0.9'
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/multimedia/madplay/madplay-audio-alsa.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/madplay/madplay-audio-alsa.patch 2012-02-21 16:44:48.000000000 +0100
-@@ -0,0 +1,172 @@
-+* needed for madplay to compile when ALSA is configured with
-+ --with-versioned=no option.
-+* fix allocation of buffer, buffer_size is number of frames
-+* use default 16 bit depth (some hardware has small buffers, 16/24 bit
-+ difference is very small)
-+
-+--- madplay-0.15.2b.org/audio_alsa.c 2004-02-23 22:35:23.000000000 +0100
-++++ madplay-0.15.2b/audio_alsa.c 2009-01-19 19:18:36.000000000 +0100
-+@@ -28,31 +28,30 @@
-+
-+ #include <errno.h>
-+
-+-#define ALSA_PCM_OLD_HW_PARAMS_API
-+-#define ALSA_PCM_OLD_SW_PARAMS_API
-+ #include <alsa/asoundlib.h>
-+
-+ #include <mad.h>
-+
-+ #include "audio.h"
-+
-+-char *buf = NULL;
-+-int paused = 0;
-++#define BUFFER_TIME_MAX 500000
-++unsigned char *buf = NULL;
-++int paused = 0;
-++
-++unsigned int rate = 0;
-++unsigned int channels = -1;
-++unsigned int bitdepth = -1;
-++unsigned int sample_size= -1;
-+
-+-int rate = -1;
-+-int channels = -1;
-+-int bitdepth = -1;
-+-int sample_size = -1;
-+-
-+-int buffer_time = 500000;
-+-int period_time = 100000;
-++unsigned int buffer_time;
-++unsigned int period_time;
-+ char *defaultdev = "plughw:0,0";
-+
-+ snd_pcm_hw_params_t *alsa_hwparams;
-+ snd_pcm_sw_params_t *alsa_swparams;
-+
-+ snd_pcm_sframes_t buffer_size;
-+-snd_pcm_sframes_t period_size;
-++snd_pcm_uframes_t period_size;
-+
-+ snd_pcm_format_t alsa_format = -1;
-+ snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
-+@@ -66,7 +65,7 @@
-+ snd_pcm_hw_params_t *params,
-+ snd_pcm_access_t access)
-+ {
-+- int err, dir;
-++ int err;
-+
-+ /* choose all parameters */
-+ err = snd_pcm_hw_params_any(handle,params);
-+@@ -74,6 +73,12 @@
-+ printf("Access type not available for playback: %s\n", snd_strerror(err));
-+ return err;
-+ }
-++ /* set the access type */
-++ err = snd_pcm_hw_params_set_access(handle, params, alsa_access);
-++ if (err < 0) {
-++ printf("Sample format not available for playback: %s\n", snd_strerror(err));
-++ return err;
-++ }
-+ /* set the sample format */
-+ err = snd_pcm_hw_params_set_format(handle, params, alsa_format);
-+ if (err < 0) {
-+@@ -87,29 +92,42 @@
-+ return err;
-+ }
-+ /* set the stream rate */
-+- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
-++ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
-+ if (err < 0) {
-+ printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
-+ return err;
-+ }
-+- if (err != rate) {
-++ /*if (err != rate) {
-+ printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
-+ return -EINVAL;
-++ }*/
-++ err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, NULL);
-++ if (err < 0) {
-++ printf("Unable to retrieve buffer time: %s\n", snd_strerror(err));
-++ return err;
-+ }
-++ if (buffer_time > BUFFER_TIME_MAX)
-++ buffer_time = BUFFER_TIME_MAX;
-+ /* set buffer time */
-+- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
-++ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, NULL);
-+ if (err < 0) {
-+ printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
-+ return err;
-+ }
-+- buffer_size = snd_pcm_hw_params_get_buffer_size(params);
-++ if (period_time * 4 > buffer_time)
-++ period_time = buffer_time / 4;
-+ /* set period time */
-+- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
-++ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, NULL);
-+ if (err < 0) {
-+ printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
-+ return err;
-+ }
-+- period_size = snd_pcm_hw_params_get_period_size(params, &dir);
-++ /* retrieve buffer size */
-++ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
-++ if (err < 0) {
-++ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
-++ return err;
-++ }
-+ /* write the parameters to device */
-+ err = snd_pcm_hw_params(handle, params);
-+ if (err < 0) {
-+@@ -123,6 +141,7 @@
-+ int set_swparams(snd_pcm_t *handle,
-+ snd_pcm_sw_params_t *params)
-+ {
-++ unsigned int start_threshold;
-+ int err;
-+
-+ /* get current swparams */
-+@@ -136,13 +155,7 @@
-+ if (err < 0) {
-+ printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
-+ return err;
-+- }
-+- /* allow transfer when at least period_size samples can be processed */
-+- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
-+- if (err < 0) {
-+- printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
-+- return err;
-+- }
-++ }
-+ /* align all transfers to 1 samples */
-+ err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
-+ if (err < 0) {
-+@@ -190,7 +203,7 @@
-+ rate = config->speed;
-+
-+ if ( bitdepth == 0 )
-+- config->precision = bitdepth = 32;
-++ config->precision = bitdepth = 16;
-+
-+ switch (bitdepth)
-+ {
-+@@ -241,7 +254,7 @@
-+ return -1;
-+ }
-+
-+- buf = malloc(buffer_size);
-++ buf = malloc(buffer_size * sample_size);
-+ if (buf == NULL) {
-+ audio_error="unable to allocate output buffer table";
-+ return -1;
-+@@ -279,7 +292,7 @@
-+ int play(struct audio_play *play)
-+ {
-+ int err, len;
-+- char *ptr;
-++ unsigned char *ptr;
-+
-+ ptr = buf;
-+ len = play->nsamples;
diff --git a/patches/buildroot/2013.05/118-snes9x-add_package.patch.tobefixed b/patches/buildroot/2013.05/118-armadeus-snes9x-add-package.patch
similarity index 82%
rename from patches/buildroot/2013.05/118-snes9x-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/118-armadeus-snes9x-add-package.patch
index 691d6a3..78f10ce 100644
--- a/patches/buildroot/2013.05/118-snes9x-add_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/118-armadeus-snes9x-add-package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:45:03.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:45:06.000000000 +0100
+--- buildroot.orig/package/Config.in 2013-09-01 21:14:59.583784109 +0200
++++ buildroot/package/Config.in 2013-09-01 21:58:32.600741347 +0200
@@ -108,6 +108,7 @@
source "package/doom-wad/Config.in"
source "package/rubix/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/snes9x/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/snes9x/Config.in 2012-02-21 16:45:06.000000000 +0100
++++ buildroot/package/snes9x/Config.in 2013-09-01 21:14:59.619784268 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_SNES9X
+ bool "Snes9X"
@@ -33,41 +33,26 @@ Index: buildroot/package/snes9x/Config.in
Index: buildroot/package/snes9x/snes9x.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/snes9x/snes9x.mk 2012-02-21 16:45:06.000000000 +0100
-@@ -0,0 +1,80 @@
++++ buildroot/package/snes9x/snes9x.mk 2013-09-01 21:48:26.973738208 +0200
+@@ -0,0 +1,53 @@
+#############################################################
+#
+# SNES9X SNES emulator
+#
+#############################################################
-+SNES9X_VERSION:=1.39
-+SNES9X_SOURCE:=snes9x-sdl-$(SNES9X_VERSION).tar.bz2
-+SNES9X_SITE:=http://www.vanille.de/mirror/
++
++SNES9X_VERSION = 1.39
++SNES9X_SOURCE = snes9x-sdl-$(SNES9X_VERSION).tar.bz2
++SNES9X_SITE = http://www.vanille.de/mirror/
+# roms: http://rtgamer.free.fr/index.php?pg=2&rub=sn
-+SNES9X_CAT:=bzcat
-+SNES9X_DIR:=$(BUILD_DIR)/snes9x-sdl-$(SNES9X_VERSION)
-+SNES9X_TARGET_BIN:=/usr/local/bin/snes9x
++
++SNES9X_DEPENDENCIES = sdl
+
+#SNES9X_VERSION:=1.43
+#SNES9X_SOURCE:=snes9x-$(SNES9X_VERSION)-src.tar.gz
+#SNES9X_SITE:=http://vincent.grigorieff.free.fr/snes9x/
-+#SNES9X_CAT:=$(ZCAT)
-+#SNES9X_DIR:=$(BUILD_DIR)/snes9x-$(SNES9X_VERSION)-src
-+
-+$(DL_DIR)/$(SNES9X_SOURCE):
-+ $(call DOWNLOAD,$(SNES9X_SITE),$(SNES9X_SOURCE))
-+
-+snes9x-source: $(DL_DIR)/$(SNES9X_SOURCE)
-+
-+$(SNES9X_DIR)/.unpacked: $(DL_DIR)/$(SNES9X_SOURCE)
-+ $(SNES9X_CAT) $(DL_DIR)/$(SNES9X_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ touch $@
-+
-+$(SNES9X_DIR)/.patched: $(SNES9X_DIR)/.unpacked
-+ support/scripts/apply-patches.sh $(SNES9X_DIR) package/snes9x/ snes9x-$(SNES9X_VERSION)\*.patch
-+ touch $@
+
-+$(SNES9X_DIR)/.configured: $(SNES9X_DIR)/.patched
++#$(SNES9X_DIR)/.configured: $(SNES9X_DIR)/.patched
+# For v1.49 only !!
+# (cd $(SNES9X_DIR)/snes9x; \
+# $(TARGET_CONFIGURE_OPTS) \
@@ -84,41 +69,29 @@ Index: buildroot/package/snes9x/snes9x.mk
+# --without-opengl \
+# --without-nasm \
+# --without-mmx );
-+ touch $@
++# touch $@
+
-+$(SNES9X_DIR)/snes9x: $(SNES9X_DIR)/.configured
-+# $(MAKE) -C $(SNES9X_DIR)/snes9x
-+ $(MAKE) -C $(SNES9X_DIR) \
-+ CC=$(TARGET_CC) CCC="$(TARGET_CXX) -fno-rtti -fno-exceptions" \
-+ INCLUDES="-I$(STAGING_DIR)/usr/lib/include `$(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
-+ LDLIBS="`$(STAGING_DIR)/usr/bin/sdl-config --libs`"
-+ touch $@
++define SNES9X_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CC)" CCC="$(TARGET_CXX) -fno-rtti -fno-exceptions" \
++ INCLUDES="-I$(STAGING_DIR)/usr/lib/include `$(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++ LDLIBS="`$(STAGING_DIR)/usr/bin/sdl-config --libs` -lm" \
++ -C $(@D)
++endef
+
-+$(TARGET_DIR)/$(SNES9X_TARGET_BIN): $(SNES9X_DIR)/snes9x
-+ cp -f $(SNES9X_DIR)/snes9x $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
-+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
++define SNES9X_INSTALL_TARGET_CMDS
++ cp -f $(@D)/snes9x $(TARGET_DIR)/usr/local/bin/
++endef
+
-+SNES9X snes9x: sdl $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
-+
-+snes9x-clean:
+# $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SNES9X_DIR) uninstall
-+ -$(MAKE) -C $(SNES9X_DIR) clean
-+
-+snes9x-dirclean:
-+ rm -rf $(SNES9X_DIR)
++define WOLF4SDL_CLEAN_CMDS
++ -$(MAKE) -C $(@D) clean
++endef
+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_SNES9X)),y)
-+TARGETS+=snes9x
-+endif
++$(eval $(generic-package))
Index: buildroot/package/snes9x/snes9x-1.39-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/snes9x/snes9x-1.39-compile.patch 2012-02-21 16:45:06.000000000 +0100
++++ buildroot/package/snes9x/snes9x-1.39-compile.patch 2013-09-01 21:14:59.619784268 +0200
@@ -0,0 +1,295 @@
+
+#
diff --git a/patches/buildroot/2013.05/125-opentyrian-add_package.patch.tobefixed b/patches/buildroot/2013.05/125-armadeus-opentyrian-add-package.patch
similarity index 62%
rename from patches/buildroot/2013.05/125-opentyrian-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/125-armadeus-opentyrian-add-package.patch
index 3044d3b..6c58187 100644
--- a/patches/buildroot/2013.05/125-opentyrian-add_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/125-armadeus-opentyrian-add-package.patch
@@ -1,7 +1,7 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:45:45.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:45:46.000000000 +0100
+--- buildroot.orig/package/Config.in 2013-09-01 22:12:12.080804929 +0200
++++ buildroot/package/Config.in 2013-09-02 17:46:24.214361708 +0200
@@ -104,6 +104,7 @@
menu "Games"
source "package/e-uae/Config.in"
@@ -13,7 +13,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/opentyrian/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/opentyrian/Config.in 2012-02-21 16:45:46.000000000 +0100
++++ buildroot/package/opentyrian/Config.in 2013-09-01 22:12:12.100805024 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_OPENTYRIAN
+ bool "OpenTyrian"
@@ -29,41 +29,48 @@ Index: buildroot/package/opentyrian/Config.in
Index: buildroot/package/opentyrian/opentyrian.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/opentyrian/opentyrian.mk 2012-02-21 16:45:46.000000000 +0100
-@@ -0,0 +1,50 @@
++++ buildroot/package/opentyrian/opentyrian.mk 2013-09-02 17:46:46.842473913 +0200
+@@ -0,0 +1,57 @@
+#############################################################
+#
+# OpenTyrian
+#
+#############################################################
+
-+OPENTYRIAN_TRUNK:=https://opentyrian.googlecode.com/hg/
-+# Opentyrian sources should be checked out from it's main repository (they
-+# dont't provide stable versions), but this would require mercurial to be
-+# intalled on host system. So I use a custom made tar.bz2
-+OPENTYRIAN_SITE:=ftp://ftp2.armadeus.com/armadeusw/download/
-+OPENTYRIAN_VERSION:=2a8a946b62bd
-+OPENTYRIAN_NAME:=opentyrian-hg-r$(OPENTYRIAN_VERSION)
-+OPENTYRIAN_DIR:=$(BUILD_DIR)/$(OPENTYRIAN_NAME)
-+OPENTYRIAN_SOURCE:=$(OPENTYRIAN_NAME).tar.bz2
-+OPENTYRIAN_CAT=$(BZCAT)
-+OPENTYRIAN_DATA:=tyrian21.zip
-+OPENTYRIAN_DATA_SITE:=http://camanis.net/tyrian
++OPENTYRIAN_SITE = https://code.google.com/p/opentyrian/
++OPENTYRIAN_SITE_METHOD = hg
++OPENTYRIAN_VERSION = 41a46e19b054
++#OPENTYRIAN_VERSION = 2a8a946b62bd (old one)
++OPENTYRIAN_LICENSE = GPLv2
++GPM_LICENSE_FILES = COPYING
++
++OPENTYRIAN_DEPENDENCIES = sdl sdl_net
++
++OPENTYRIAN_DATA = tyrian21.zip
++OPENTYRIAN_DATA_SITE = http://sites.google.com/a/camanis.net/opentyrian/tyrian/
+
+define OPENTYRIAN_DOWNLOAD_DATA
-+ $(call DOWNLOAD,$(OPENTYRIAN_DATA_SITE),$(OPENTYRIAN_DATA))
-+ unzip $(DL_DIR)/$(OPENTYRIAN_DATA) -d $(OPENTYRIAN_DIR)
++ @$(call MESSAGE,Downloading data)
++# $(call DOWNLOAD,$(OPENTYRIAN_DATA_SITE),$(OPENTYRIAN_DATA))
++# conflict with OPENTYRIAN_SITE_METHOD ^^^
++ cd $(DL_DIR); wget -c $(OPENTYRIAN_DATA_SITE)/$(OPENTYRIAN_DATA)
++endef
++
++OPENTYRIAN_POST_DOWNLOAD_HOOKS += OPENTYRIAN_DOWNLOAD_DATA
++
++define OPENTYRIAN_EXTRACT_DATA
++ unzip $(DL_DIR)/$(OPENTYRIAN_DATA) -d $(@D)
+endef
+
-+OPENTYRIAN_POST_EXTRACT_HOOKS += OPENTYRIAN_DOWNLOAD_DATA
++OPENTYRIAN_POST_EXTRACT_HOOKS += OPENTYRIAN_EXTRACT_DATA
+
+define OPENTYRIAN_BUILD_CMDS
+ $(MAKE) PLATFORM=UNIX \
+ CC="$(TARGET_CC)" \
+ STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" \
-+ SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config \
-+ -C $(OPENTYRIAN_DIR) \
-+ release
++ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
++ LDFLAGS="-lm" \
++ -C $(@D) release
+endef
+
+define OPENTYRIAN_INSTALL_TARGET_CMDS
diff --git a/patches/buildroot/2013.05/130-lbreakout-add_package.patch.tobefixed b/patches/buildroot/2013.05/130-armadeus-lbreakout2-add-package.patch
similarity index 78%
rename from patches/buildroot/2013.05/130-lbreakout-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/130-armadeus-lbreakout2-add-package.patch
index 1265cb8..b8fa713 100644
--- a/patches/buildroot/2013.05/130-lbreakout-add_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/130-armadeus-lbreakout2-add-package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:45:46.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:45:48.000000000 +0100
+--- buildroot.orig/package/Config.in 2013-09-02 17:49:40.103333069 +0200
++++ buildroot/package/Config.in 2013-09-02 18:24:40.857750147 +0200
@@ -104,6 +104,7 @@
menu "Games"
source "package/e-uae/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/lbreakout2/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lbreakout2/Config.in 2012-02-21 16:45:48.000000000 +0100
++++ buildroot/package/lbreakout2/Config.in 2013-09-02 17:49:40.119333151 +0200
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_LBREAKOUT2
+ bool "LBreakout2"
@@ -48,7 +48,7 @@ Index: buildroot/package/lbreakout2/Config.in
Index: buildroot/package/lbreakout2/lbreakout2.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lbreakout2/lbreakout2.mk 2012-02-21 16:45:48.000000000 +0100
++++ buildroot/package/lbreakout2/lbreakout2.mk 2013-09-02 18:23:05.225275930 +0200
@@ -0,0 +1,30 @@
+#############################################################
+#
@@ -56,12 +56,12 @@ Index: buildroot/package/lbreakout2/lbreakout2.mk
+#
+#############################################################
+
-+LBREAKOUT2_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lgames
-+LBREAKOUT2_VERSION = 2.6.1
-+LBREAKOUT2_SOURCE = lbreakout2-$(LBREAKOUT2_VERSION).tar.gz
-+LBREAKOUT2_CAT = $(ZCAT)
++LBREAKOUT2_SITE = http://sourceforge.net/projects/lgames/files/lbreakout2/2.6/
++LBREAKOUT2_VERSION = 2.6.3
++LBREAKOUT2_LICENSE = GPLv2
++LBREAKOUT2_LICENSE_FILES = COPYING
+
-+LBREAKOUT2_DEPENDENCIES = sdl
++LBREAKOUT2_DEPENDENCIES = sdl libpng
+LBREAKOUT2_CONF_OPT += --disable-nls
+
+ifeq ($(BR2_PACKAGE_LBREAKOUT2_AUDIO),y)
diff --git a/patches/buildroot/2013.05/131-ltetris-add_package.patch.tobefixed b/patches/buildroot/2013.05/131-armadeus-ltetris-add-package.patch
similarity index 100%
rename from patches/buildroot/2013.05/131-ltetris-add_package.patch.tobefixed
rename to patches/buildroot/2013.05/131-armadeus-ltetris-add-package.patch
diff --git a/patches/buildroot/2013.05/191-armadeus-madplay-fixes-libintl-dependency.patch b/patches/buildroot/2013.05/191-armadeus-madplay-fixes-libintl-dependency.patch
new file mode 100644
index 0000000..dc19099
--- /dev/null
+++ b/patches/buildroot/2013.05/191-armadeus-madplay-fixes-libintl-dependency.patch
@@ -0,0 +1,24 @@
+Otherwise compilation fails (in intl/relocatable.c):
+./relocatable.c: In function 'libintl_relocate':
+./relocatable.c:402:40: error: 'INSTALLPREFIX' undeclared (first use in this function)
+./relocatable.c:402:40: note: each undeclared identifier is reported only once for each function it appears in
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/multimedia/madplay/madplay.mk
+===================================================================
+--- buildroot.orig/package/multimedia/madplay/madplay.mk 2013-05-31 22:29:04.000000000 +0200
++++ buildroot/package/multimedia/madplay/madplay.mk 2013-09-02 19:18:01.433620945 +0200
+@@ -12,6 +12,12 @@
+ MADPLAY_LIBTOOL_PATCH = NO
+ MADPLAY_DEPENDENCIES = libmad libid3tag
+
++ifeq ($(BR2_PACKAGE_GETTEXT),y)
++MADPLAY_DEPENDENCIES += gettext
++else
++MADPLAY_CONF_OPT += --disable-nls
++endif
++
+ # Check if ALSA is built, then we should configure after alsa-lib so
+ # ./configure can find alsa-lib.
+ ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y)
diff --git a/patches/buildroot/2013.05/191-madplay-requires_libintl.patch.tobefixed b/patches/buildroot/2013.05/191-madplay-requires_libintl.patch.tobefixed
deleted file mode 100644
index 5d3ecdf..0000000
--- a/patches/buildroot/2013.05/191-madplay-requires_libintl.patch.tobefixed
+++ /dev/null
@@ -1,29 +0,0 @@
-Otherwise compilation fails (in intl/relocatable.c)
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/multimedia/madplay/Config.in
-===================================================================
---- buildroot.orig/package/multimedia/madplay/Config.in 2012-08-08 09:56:30.000000000 +0200
-+++ buildroot/package/multimedia/madplay/Config.in 2012-08-08 09:57:12.000000000 +0200
-@@ -2,6 +2,7 @@
- bool "madplay"
- select BR2_PACKAGE_LIBMAD
- select BR2_PACKAGE_LIBID3TAG
-+ select BR2_PACKAGE_LIBINTL
- help
- Command-line front-end to libmad, a high-quality MPEG audio decoder.
- It currently supports MPEG-1 and the MPEG-2 extension to lower
-Index: buildroot/package/multimedia/madplay/madplay.mk
-===================================================================
---- buildroot.orig/package/multimedia/madplay/madplay.mk 2012-08-08 10:04:31.000000000 +0200
-+++ buildroot/package/multimedia/madplay/madplay.mk 2012-08-08 10:04:51.000000000 +0200
-@@ -10,7 +10,7 @@
- MADPLAY_LICENSE = GPLv2+
- MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
- MADPLAY_LIBTOOL_PATCH = NO
--MADPLAY_DEPENDENCIES = libmad libid3tag
-+MADPLAY_DEPENDENCIES = libmad libid3tag libintl
-
- # Check if ALSA is built, then we should configure after alsa-lib so
- # ./configure can find alsa-lib.
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-03 14:35:58
|
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 ac8b3e8d43e26909eb841bf1fa5f528e2b019027 (commit)
from f4b74c5748a66f20921b8446dc821452b0cda88d (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 ac8b3e8d43e26909eb841bf1fa5f528e2b019027
Author: Eric Jarrige <eri...@ar...>
Date: Tue Sep 3 16:46:49 2013 +0200
[TEST] apf51: disable gstreamer (not used) to build the test config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51test_defconfig | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index c114238..3c29091 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -3,7 +3,6 @@ BR2_cortex_a8=y
BR2_WGET="wget --passive-ftp --tries=3"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_SOURCEFORGE_MIRROR="switch"
BR2_JLEVEL=1
BR2_CCACHE=y
BR2_STRIP_sstrip=y
@@ -65,17 +64,6 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_FFMPEG=y
BR2_PACKAGE_FFMPEG_FFPLAY=y
-BR2_PACKAGE_GSTREAMER=y
-BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
-BR2_PACKAGE_GST_PLUGINS_GOOD=y
-BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP=y
-BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP=y
-BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2=y
-BR2_PACKAGE_GST_PLUGINS_BAD=y
-BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
-BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX=y
-BR2_PACKAGE_GST_PLUGINS_UGLY=y
-BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD=y
BR2_PACKAGE_MPLAYER=y
# BR2_PACKAGE_MPLAYER_MPLAYER is not set
BR2_PACKAGE_GDB=y
@@ -118,6 +106,8 @@ BR2_PACKAGE_PYTHON_PYGAME_FONT=y
BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
BR2_PACKAGE_PYTHON_SERIAL=y
+BR2_PACKAGE_LIBID3TAG=y
+BR2_PACKAGE_LIBMAD=y
BR2_PACKAGE_SPEEX=y
BR2_PACKAGE_MESALIB=y
BR2_PACKAGE_TSLIB=y
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2013-09-03 09:47:38
|
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 f4b74c5748a66f20921b8446dc821452b0cda88d (commit)
from 727b2d871b9bb1247de973de544f22143116e8c5 (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 f4b74c5748a66f20921b8446dc821452b0cda88d
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Sep 3 11:47:08 2013 +0200
[BUILDROOT] Add package Poppler for Qt.
-----------------------------------------------------------------------
Summary of changes:
.../2012.02/208-poppler-add_package.patch | 106 ++++++++++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
.../2013.05/210-poppler-qt_compiling.patch | 38 +++++++
3 files changed, 145 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/208-poppler-add_package.patch
create mode 100644 patches/buildroot/2013.05/210-poppler-qt_compiling.patch
diff --git a/patches/buildroot/2012.02/208-poppler-add_package.patch b/patches/buildroot/2012.02/208-poppler-add_package.patch
new file mode 100644
index 0000000..cd04d28
--- /dev/null
+++ b/patches/buildroot/2012.02/208-poppler-add_package.patch
@@ -0,0 +1,106 @@
+Add package Poppler.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+---
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2013-09-03 11:27:09.000000000 +0200
++++ buildroot/package/Config.in 2013-09-03 11:27:09.000000000 +0200
+@@ -352,6 +352,7 @@
+ source "package/opencv/Config.in"
+ source "package/pango/Config.in"
+ source "package/pixman/Config.in"
++source "package/poppler/Config.in"
+ source "package/tiff/Config.in"
+ source "package/webkit/Config.in"
+ endmenu
+Index: buildroot/package/poppler/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/poppler/Config.in 2013-09-03 11:27:09.000000000 +0200
+@@ -0,0 +1,14 @@
++config BR2_PACKAGE_POPPLER
++ bool "poppler"
++ depends on BR2_INSTALL_LIBSTDCPP
++ select BR2_PACKAGE_QT
++ select BR2_PACKAGE_FONTCONFIG
++ select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
++ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
++ help
++ Poppler is a PDF rendering library based on the xpdf-3.0 code base.
++
++ http://poppler.freedesktop.org/
++
++comment "poppler requires a toolchain with C++ support enabled"
++ depends on !BR2_INSTALL_LIBSTDCPP
+Index: buildroot/package/poppler/poppler.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/poppler/poppler.mk 2013-09-03 11:29:00.000000000 +0200
+@@ -0,0 +1,65 @@
++#############################################################
++#
++# poppler
++#
++#############################################################
++
++POPPLER_VERSION = 0.24.1
++POPPLER_SITE = http://poppler.freedesktop.org
++POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
++POPPLER_DEPENDENCIES = qt fontconfig
++POPPLER_LICENSE = GPLv2+
++POPPLER_LICENSE_FILES = COPYING
++POPPLER_CONF_OPT = --with-font-configuration=fontconfig
++POPPLER_INSTALL_STAGING = YES
++
++ifeq ($(BR2_PACKAGE_LCMS2),y)
++ POPPLER_CONF_OPT += --enable-cms=lcms2
++ POPPLER_DEPENDENCIES += lcms2
++else
++ POPPLER_CONF_OPT += --enable-cms=none
++endif
++
++ifeq ($(BR2_PACKAGE_TIFF),y)
++ POPPLER_CONF_OPT += --enable-libtiff
++ POPPLER_DEPENDENCIES += tiff
++else
++ POPPLER_CONF_OPT += --disable-libtiff
++endif
++
++ifeq ($(BR2_PACKAGE_JPEG),y)
++ POPPLER_CONF_OPT += --enable-libjpeg
++ POPPLER_DEPENDENCIES += jpeg
++else
++ POPPLER_CONF_OPT += --disable-libjpeg
++endif
++
++ifeq ($(BR2_PACKAGE_LIBPNG),y)
++ POPPLER_CONF_OPT += --enable-libpng
++ POPPLER_DEPENDENCIES += libpng
++else
++ POPPLER_CONF_OPT += --disable-libpng
++endif
++
++ifeq ($(BR2_PACKAGE_ZLIB),y)
++ POPPLER_CONF_OPT += --enable-zlib
++ POPPLER_DEPENDENCIES += zlib
++else
++ POPPLER_CONF_OPT += --disable-zlib
++endif
++
++ifeq ($(BR2_PACKAGE_POPPLER_LIBCURL),y)
++ POPPLER_CONF_OPT += --enable-libcurl
++ POPPLER_DEPENDENCIES += libcurl
++else
++ POPPLER_CONF_OPT += --disable-libcurl
++endif
++
++ifeq ($(BR2_PACKAGE_XORG7),y)
++ POPPLER_CONF_OPT += --with-x
++ POPPLER_DEPENDENCIES += xlib_libX11 xlib_libXext
++else
++ POPPLER_CONF_OPT += --without-x
++endif
++
++$(eval $(call AUTOTARGETS, package, popple))
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index f386fa4..75150de 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -88,3 +88,4 @@ rm -rf buildroot/package/opkg/
rm -rf buildroot/package/minicom/
rm -rf buildroot/package/joe/
rm -f buildroot/package/busybox/busybox-1.19.4/*.patch
+rm -rf buildroot/package/poppler
diff --git a/patches/buildroot/2013.05/210-poppler-qt_compiling.patch b/patches/buildroot/2013.05/210-poppler-qt_compiling.patch
new file mode 100644
index 0000000..8a12729
--- /dev/null
+++ b/patches/buildroot/2013.05/210-poppler-qt_compiling.patch
@@ -0,0 +1,38 @@
+Compile Poppler with Qt.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+---
+
+Index: buildroot/package/poppler/Config.in
+===================================================================
+--- buildroot.orig/package/poppler/Config.in 2013-05-31 22:29:04.000000000 +0200
++++ buildroot/package/poppler/Config.in 2013-09-03 11:36:33.000000000 +0200
+@@ -1,6 +1,7 @@
+ config BR2_PACKAGE_POPPLER
+ bool "poppler"
+ depends on BR2_INSTALL_LIBSTDCPP
++ select BR2_PACKAGE_QT
+ select BR2_PACKAGE_FONTCONFIG
+ select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+Index: buildroot/package/poppler/poppler.mk
+===================================================================
+--- buildroot.orig/package/poppler/poppler.mk 2013-09-03 11:28:33.000000000 +0200
++++ buildroot/package/poppler/poppler.mk 2013-09-03 11:36:51.000000000 +0200
+@@ -4,12 +4,14 @@
+ #
+ #############################################################
+
+-POPPLER_VERSION = 0.22.3
++POPPLER_VERSION = 0.24.1
+ POPPLER_SITE = http://poppler.freedesktop.org
+-POPPLER_DEPENDENCIES = fontconfig
++POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
++POPPLER_DEPENDENCIES = qt fontconfig
+ POPPLER_LICENSE = GPLv2+
+ POPPLER_LICENSE_FILES = COPYING
+ POPPLER_CONF_OPT = --with-font-configuration=fontconfig
++POPPLER_INSTALL_STAGING = YES
+
+ ifeq ($(BR2_PACKAGE_LCMS2),y)
+ POPPLER_CONF_OPT += --enable-cms=lcms2
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-02 12:57:47
|
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 727b2d871b9bb1247de973de544f22143116e8c5 (commit)
from 5dc65bc35e9af70001124ea8bc5c779ef2b72b21 (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 727b2d871b9bb1247de973de544f22143116e8c5
Author: Eric Jarrige <eri...@ar...>
Date: Mon Sep 2 15:08:19 2013 +0200
[TEST] apf51: update framebuffer test script
-----------------------------------------------------------------------
Summary of changes:
target/test/test_framebuffer.sh | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/target/test/test_framebuffer.sh b/target/test/test_framebuffer.sh
index f0a131c..3ac5041 100755
--- a/target/test/test_framebuffer.sh
+++ b/target/test/test_framebuffer.sh
@@ -14,7 +14,7 @@
source ./test_helpers.sh
source ./test_env.sh
-EXEC_NAME="fbtest"
+EXEC_NAME="fb-test-perf"
test_framebuffer()
{
@@ -24,9 +24,16 @@ test_framebuffer()
echo 0 > /sys/class/graphics/fbcon/cursor_blink
is_package_installed $EXEC_NAME
- $EXEC_NAME
+ $EXEC_NAME 0 fb-test-perf.log
RES=$?
+ if [ "$RES" == 0 ]; then
+ EXEC_NAME="fb-test"
+ is_package_installed $EXEC_NAME
+ $EXEC_NAME
+ RES=$?
+ fi
+
# Reactivate cursor
echo 1 > /sys/class/graphics/fbcon/cursor_blink
# Ask user for feedbacks
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-08-31 20:34:07
|
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 5dc65bc35e9af70001124ea8bc5c779ef2b72b21 (commit)
via d30f5f9fe3fe96485f60844918572014d4f905c3 (commit)
via 0052d60a6e90a0365bdd583e87af2c15a73c0e36 (commit)
from ed76c44f81ac61919d599e80f1e07b03e8fd7184 (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 5dc65bc35e9af70001124ea8bc5c779ef2b72b21
Author: Julien Boibessot <jul...@ar...>
Date: Sat Aug 31 22:33:13 2013 +0200
[BUILDROOT][2013.05] Fixes wolf4sdl compilation
commit d30f5f9fe3fe96485f60844918572014d4f905c3
Author: Julien Boibessot <jul...@ar...>
Date: Sat Aug 31 18:00:27 2013 +0200
[BUILDROOT][2013.05] Fixes gpm package compilation
commit 0052d60a6e90a0365bdd583e87af2c15a73c0e36
Author: Julien Boibessot <jul...@ar...>
Date: Sat Aug 31 11:44:14 2013 +0200
[BUILDROOT][2013.05] Fixes slideshow package compilation
-----------------------------------------------------------------------
Summary of changes:
...ed => 034-armadeus-add-slideshow-package.patch} | 102 +++++---------------
...obefixed => 085-armadeus-add-gpm-package.patch} | 72 ++++++--------
.../107-armadeus-games-add-wolf4sdl-package.patch | 74 ++++++++++++++
.../2013.05/107-games-add_wolf4sdl.patch.tobefixed | 92 ------------------
4 files changed, 129 insertions(+), 211 deletions(-)
rename patches/buildroot/2013.05/{034-slideshow.patch.tobefixed => 034-armadeus-add-slideshow-package.patch} (73%)
rename patches/buildroot/2013.05/{085-adds_gpm_package.patch.tobefixed => 085-armadeus-add-gpm-package.patch} (77%)
create mode 100644 patches/buildroot/2013.05/107-armadeus-games-add-wolf4sdl-package.patch
delete mode 100644 patches/buildroot/2013.05/107-games-add_wolf4sdl.patch.tobefixed
diff --git a/patches/buildroot/2013.05/034-slideshow.patch.tobefixed b/patches/buildroot/2013.05/034-armadeus-add-slideshow-package.patch
similarity index 73%
rename from patches/buildroot/2013.05/034-slideshow.patch.tobefixed
rename to patches/buildroot/2013.05/034-armadeus-add-slideshow-package.patch
index 464cbb1..2770a7c 100644
--- a/patches/buildroot/2013.05/034-slideshow.patch.tobefixed
+++ b/patches/buildroot/2013.05/034-armadeus-add-slideshow-package.patch
@@ -4,20 +4,20 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -140,6 +140,7 @@
+--- buildroot.orig/package/Config.in 2013-08-31 10:58:24.309663632 +0200
++++ buildroot/package/Config.in 2013-08-31 11:40:08.262080053 +0200
+@@ -139,6 +139,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"
+ source "package/sdl_water/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
++++ buildroot/package/slideshow/Config.in 2013-08-31 10:58:24.321663682 +0200
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_SLIDESHOW
+ bool "Slideshow"
@@ -30,7 +30,7 @@ Index: buildroot/package/slideshow/Config.in
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
++++ buildroot/package/slideshow/slideshow.mk 2013-08-31 10:58:24.321663682 +0200
@@ -0,0 +1,39 @@
+#############################################################
+#
@@ -74,85 +74,31 @@ Index: buildroot/package/slideshow/slideshow.mk
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:
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2013-08-31 11:37:38.645338140 +0200
+@@ -0,0 +1,19 @@
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN slideshow-1.1/slideshow.cpp slideshow-1.1.mod/slideshow.cpp
++--- slideshow-1.1/slideshow.cpp 2013-08-31 11:35:19.932650303 +0200
+++++ slideshow-1.1.mod/slideshow.cpp 2013-08-31 11:34:48.396493925 +0200
++@@ -228,9 +228,10 @@
+ break;
-+- }
-++ case c_redraw:
-++ break;
-++ }
++ }
+
-+ // stop the auto-advance when the last picture is about to be shown
++- // 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();
+++ // Restart from beginning when the last picture is shown
+++ if ( m_image_index == m_file_list->count() )
++ 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
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2013-08-31 10:58:24.321663682 +0200
@@ -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
@@ -170,7 +116,7 @@ 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 2012-02-21 16:44:09.000000000 +0100
++++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch 2013-08-31 10:58:24.321663682 +0200
@@ -0,0 +1,28 @@
+On recent gcc some includes are needed to have string stuff defined.
+
@@ -203,7 +149,7 @@ 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 2012-02-21 16:44:09.000000000 +0100
++++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch 2013-08-31 11:41:13.326402690 +0200
@@ -0,0 +1,17 @@
+Otherwise crashes on APF27.
+
@@ -213,7 +159,7 @@ Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
+===================================================================
+--- 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 @@
++@@ -411,7 +411,7 @@
+ else
+ flags |= SDL_FULLSCREEN;
+
diff --git a/patches/buildroot/2013.05/085-adds_gpm_package.patch.tobefixed b/patches/buildroot/2013.05/085-armadeus-add-gpm-package.patch
similarity index 77%
rename from patches/buildroot/2013.05/085-adds_gpm_package.patch.tobefixed
rename to patches/buildroot/2013.05/085-armadeus-add-gpm-package.patch
index 45f43be..7dc72f4 100644
--- a/patches/buildroot/2013.05/085-adds_gpm_package.patch.tobefixed
+++ b/patches/buildroot/2013.05/085-armadeus-add-gpm-package.patch
@@ -2,10 +2,22 @@ Add GPM (General Purpose Mouse server) to Buildroot.
Signed-off-by: Julien Boibessot <jul...@ar...>
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2013-08-31 11:47:09.652169613 +0200
++++ buildroot/package/Config.in 2013-08-31 17:55:16.589692815 +0200
+@@ -208,6 +208,7 @@
+ source "package/flashbench/Config.in"
+ source "package/genext2fs/Config.in"
+ source "package/genromfs/Config.in"
++source "package/gpm/Config.in"
+ source "package/makedevs/Config.in"
+ source "package/mtd/Config.in"
+ source "package/nfs-utils/Config.in"
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
++++ buildroot/package/gpm/Config.in 2013-08-31 11:47:09.684169773 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GPM
+ bool "gpm mouse server"
@@ -17,31 +29,35 @@ Index: buildroot/package/gpm/Config.in
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 @@
++++ buildroot/package/gpm/gpm.mk 2013-08-31 13:19:52.727755419 +0200
+@@ -0,0 +1,22 @@
+#############################################################
+#
+# General Purpose Mouse server for Linux console.
+#
+#############################################################
+
-+GPM_VERSION = 1.20.6
++GPM_VERSION = 1.20.7
+GPM_SOURCE = gpm-$(GPM_VERSION).tar.bz2
-+GPM_SITE = http://unix.schottelius.org/gpm/archives/
++GPM_SITE = http://www.nico.schottelius.org/software/gpm/archives/
++GPM_LICENSE = GPLv2
++GPM_LICENSE_FILES = COPYING
++GPM_AUTORECONF = YES
++
+GPM_INSTALL_STAGING = YES
-+GPM_INSTALL_TARGET = YES
+
-+$(eval $(autotools-package))
++define GPM_AUTOGEN_CALL
++ cd $(@D); ./autogen.sh
++endef
+
-+$(GPM_HOOK_POST_INSTALL): $(GPM_TARGET_INSTALL_TARGET)
-+ $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/gpm
-+ touch $@
++GPM_PRE_CONFIGURE_HOOKS += GPM_AUTOGEN_CALL
+
-Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
++$(eval $(autotools-package))
+Index: buildroot/package/gpm/gpm-1.20.7-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 @@
++++ buildroot/package/gpm/gpm-1.20.7-removes_obsolete_functions.patch 2013-08-31 11:57:30.095246230 +0200
+@@ -0,0 +1,63 @@
+
+Replaces all "obsolete" functions (at least to compile for uClibc).
+
@@ -57,20 +73,6 @@ Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
+ 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
@@ -119,22 +121,10 @@ Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
+ *(param_data [param].addr.flag_p) = 0;
+ } else {
+ gpm_report (GPM_PR_WARN,"Flag value (%s) for parameter %s is invalid",
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -209,6 +209,7 @@
- source "package/flashbench/Config.in"
- source "package/genext2fs/Config.in"
- source "package/genromfs/Config.in"
-+source "package/gpm/Config.in"
- source "package/makedevs/Config.in"
- source "package/mtd/Config.in"
- source "package/nfs-utils/Config.in"
-Index: buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch
+Index: buildroot/package/gpm/gpm-1.20.7-removes_strip_from_install.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch 2012-02-21 16:44:41.000000000 +0100
++++ buildroot/package/gpm/gpm-1.20.7-removes_strip_from_install.patch 2013-08-31 11:47:09.684169773 +0200
@@ -0,0 +1,30 @@
+GPM asks "install" to strip the executables while installing it.
+This doesn't seems cross-compiling friendly, so remove the option (-s) and let
diff --git a/patches/buildroot/2013.05/107-armadeus-games-add-wolf4sdl-package.patch b/patches/buildroot/2013.05/107-armadeus-games-add-wolf4sdl-package.patch
new file mode 100644
index 0000000..56dd11a
--- /dev/null
+++ b/patches/buildroot/2013.05/107-armadeus-games-add-wolf4sdl-package.patch
@@ -0,0 +1,74 @@
+Add Wolf4SDL to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/wolf4sdl/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/wolf4sdl/Config.in 2013-08-31 18:01:30.675547815 +0200
+@@ -0,0 +1,11 @@
++config BR2_PACKAGE_WOLF4SDL
++ bool "Wolf4SDL"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_MIXER
++ help
++ Wolf4SDL is an open-source port of id Software's classic first-person
++ shooter Wolfenstein 3D to the cross-plattform multimedia library
++ "Simple DirectMedia Layer (SDL)". It is meant to keep the original
++ feel while taking advantage of some improvements (see README).
++
++ http://www.stud.uni-karlsruhe.de/~uvaue/chaos/main.html
+Index: buildroot/package/wolf4sdl/wolf4sdl.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/wolf4sdl/wolf4sdl.mk 2013-08-31 22:28:54.499104844 +0200
+@@ -0,0 +1,37 @@
++#############################################################
++#
++# Wolf4SDL
++#
++#############################################################
++
++WOLF4SDL_VERSION = 1.6
++WOLF4SDL_SOURCE = Wolf4SDL-$(WOLF4SDL_VERSION)-src.zip
++WOLF4SDL_SITE = http://www.alice-dsl.net/mkroll/bins/
++
++WOLF4SDL_DEPENDENCIES = sdl sdl_mixer
++
++define WOLF4SDL_EXTRACT_CMDS
++ unzip -d $(BUILD_DIR) $(DL_DIR)/$(WOLF4SDL_SOURCE)
++ mv $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src/* $(@D)
++ rmdir $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src
++endef
++
++define WOLF4SDL_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \
++ PREFIX="$(TARGET_DIR)/usr/local" \
++ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
++ -C $(@D)
++endef
++
++define WOLF4SDL_INSTALL_TARGET_CMDS
++ $(MAKE) PREFIX="$(TARGET_DIR)/usr/local" \
++ INSTALL="$(INSTALL)" \
++ INSTALL_PROGRAM="$(INSTALL) -m 775" \
++ install -C $(@D)
++endef
++
++define WOLF4SDL_CLEAN_CMDS
++ $(MAKE) -C $(@D) clean
++endef
++
++$(eval $(generic-package))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2013-08-31 18:01:30.583547362 +0200
++++ buildroot/package/Config.in 2013-08-31 22:31:05.275753324 +0200
+@@ -108,6 +108,7 @@
+ source "package/doom-wad/Config.in"
+ source "package/rubix/Config.in"
+ source "package/sdlquake/Config.in"
++source "package/wolf4sdl/Config.in"
+ endmenu
+
+ menu "Graphic libraries and applications (graphic/text)"
diff --git a/patches/buildroot/2013.05/107-games-add_wolf4sdl.patch.tobefixed b/patches/buildroot/2013.05/107-games-add_wolf4sdl.patch.tobefixed
deleted file mode 100644
index 289870f..0000000
--- a/patches/buildroot/2013.05/107-games-add_wolf4sdl.patch.tobefixed
+++ /dev/null
@@ -1,92 +0,0 @@
-Add Wolf4SDL to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/wolf4sdl/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/wolf4sdl/Config.in 2012-02-21 16:44:52.000000000 +0100
-@@ -0,0 +1,11 @@
-+config BR2_PACKAGE_WOLF4SDL
-+ bool "Wolf4SDL"
-+ select BR2_PACKAGE_SDL
-+ select BR2_PACKAGE_SDL_MIXER
-+ help
-+ Wolf4SDL is an open-source port of id Software's classic first-person
-+ shooter Wolfenstein 3D to the cross-plattform multimedia library
-+ "Simple DirectMedia Layer (SDL)". It is meant to keep the original
-+ feel while taking advantage of some improvements (see README).
-+
-+ http://www.stud.uni-karlsruhe.de/~uvaue/chaos/main.html
-Index: buildroot/package/wolf4sdl/wolf4sdl.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/wolf4sdl/wolf4sdl.mk 2012-02-21 16:44:52.000000000 +0100
-@@ -0,0 +1,55 @@
-+#############################################################
-+#
-+# Wolf4SDL
-+#
-+#############################################################
-+WOLF4SDL_VERSION = 1.6
-+WOLF4SDL_SOURCE = Wolf4SDL-$(WOLF4SDL_VERSION)-src.zip
-+WOLF4SDL_SITE = http://www.alice-dsl.net/mkroll/bins/
-+WOLF4SDL_TARGET_BIN = /usr/local/bin/wolf3d
-+WOLF4SDL_DIR = $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src
-+
-+#WOLF4SDL_INSTALL_STAGING = NO
-+#WOLF4SDL_INSTALL_TARGET = YES
-+#WOLF4SDL_DEPENDENCIES = sdl sdl_mixer
-+#$(eval $(autotools-package))
-+
-+$(DL_DIR)/$(WOLF4SDL_SOURCE):
-+ $(call DOWNLOAD,$(WOLF4SDL_SITE),$(WOLF4SDL_SOURCE))
-+
-+wolf4sdl-source: $(DL_DIR)/$(WOLF4SDL_SOURCE)
-+
-+$(WOLF4SDL_DIR)/.unpacked: $(DL_DIR)/$(WOLF4SDL_SOURCE)
-+ unzip $(DL_DIR)/$(WOLF4SDL_SOURCE) -d $(BUILD_DIR)
-+# mv $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src/* $(WOLF4SDL_DIR)
-+# rm -rf $(BUILD_DIR)/Wolf4SDL-$(WOLF4SDL_VERSION)-src
-+ touch $@
-+
-+$(WOLF4SDL_DIR)/wolf3d: $(WOLF4SDL_DIR)/.unpacked
-+ $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" PREFIX=$(TARGET_DIR)/usr/local \
-+ SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config \
-+ -C $(WOLF4SDL_DIR)
-+
-+$(TARGET_DIR)/$(WOLF4SDL_TARGET_BIN): $(WOLF4SDL_DIR)/wolf3d
-+ $(MAKE) PREFIX=$(TARGET_DIR)/usr/local \
-+ INSTALL=$(INSTALL) \
-+ INSTALL_PROGRAM="$(INSTALL) -m 775" \
-+ install -C $(WOLF4SDL_DIR)
-+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(WOLF4SDL_TARGET_BIN)
-+
-+WOLF4SDL wolf4sdl: sdl sdl_mixer $(TARGET_DIR)/$(WOLF4SDL_TARGET_BIN)
-+
-+wolf4sdl-clean:
-+ -$(MAKE) -C $(WOLF4SDL_DIR) clean
-+
-+wolf4sdl-dirclean:
-+ rm -rf $(WOLF4SDL_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_WOLF4SDL)),y)
-+TARGETS+=wolf4sdl
-+endif
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:44:50.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:44:52.000000000 +0100
-@@ -108,6 +108,7 @@
- source "package/doom-wad/Config.in"
- source "package/rubix/Config.in"
- source "package/sdlquake/Config.in"
-+source "package/wolf4sdl/Config.in"
- endmenu
-
- menu "Graphic libraries and applications (graphic/text)"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-08-30 18:33: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 ed76c44f81ac61919d599e80f1e07b03e8fd7184 (commit)
from 6638aee53f75d26cde187fc62224a124d65f44c1 (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 ed76c44f81ac61919d599e80f1e07b03e8fd7184
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 30 20:29:26 2013 +0200
[BUILDROOT][2013.05] fpga_firmware: add some precisions to help (more than one FPGA firmware can be installed at a time in linux rootfs) and fixes a bug for FPGA symlink in output/images/
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/fpga_firmware/Config.in | 20 +++++++++++---------
.../armadeus/fpga_firmware/fpga_firmware.mk | 5 ++++-
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/buildroot/package/armadeus/fpga_firmware/Config.in b/buildroot/package/armadeus/fpga_firmware/Config.in
index 40c97e8..c519a06 100644
--- a/buildroot/package/armadeus/fpga_firmware/Config.in
+++ b/buildroot/package/armadeus/fpga_firmware/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
if BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
choice
- prompt "Firmware to install"
+ prompt "Firmware(s) to install"
default BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART
@@ -15,23 +15,25 @@ config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART
will be named /lib/firmware/fpga/apf51_gsm_gps_firmware.bin.
config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
- bool "Install a custom FPGA firmware"
+ bool "Custom list"
help
- Use a custom FPGA binary file. The FPGA binary file will be
- installed in /lib/firmware/fpga/ on the target.
+ Use one or more custom FPGA binary files. The FPGA binary files will
+ be installed in /lib/firmware/fpga/ on the target.
endchoice
config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE
- string "FPGA binary file path to install"
+ string "Firmware(s) path list"
depends on BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
help
- Path to your custom FPGA binary file to install.
+ Path list to your custom FPGA binary files to install.
config BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE
- bool "Export this file to Buildroot images folder"
+ bool "Export the FPGA firmware to Buildroot output/images/ folder"
help
- Build a link from Buildroot binary folder to the fpga firmware.
- This link will be named $(BOARD_NAME)-firmware.bin
+ Build a link from Buildroot output/images/ folder to the FPGA
+ firmware.
+ This link will be named $(BOARD_NAME)-firmware.bin (default name
+ looked by U-Boot when asking for firmware update).
endif # BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
diff --git a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
index 46b913f..b34f72e 100644
--- a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
+++ b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
@@ -21,7 +21,10 @@ $(STAMP_DIR)/.fpga_firmware_installed:
$(INSTALL) -m 0755 $$firmware $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR) ; \
done
ifeq ($(BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE),y)
- ln -sf $(FPGA_FIRMWARE) $(BINARIES_DIR)/$(BOARD_NAME)-firmware.bin
+ # Only last file in previous list will remain as symlink
+ for firmware in $(FIRMWARES); do \
+ ln -sf $$firmware $(BINARIES_DIR)/$(BOARD_NAME)-firmware.bin ; \
+ done
endif
touch $@
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-08-30 15:33:12
|
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 6638aee53f75d26cde187fc62224a124d65f44c1 (commit)
from 9e3cc1c5fbc98e7121352f2942dd20b7464a9e6b (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 6638aee53f75d26cde187fc62224a124d65f44c1
Author: Eric Jarrige <eri...@ar...>
Date: Fri Aug 30 17:43:48 2013 +0200
[BUILDROOT] apf28: fix again test config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28test_defconfig | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index ab1148b..192032a 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -107,8 +107,9 @@ BR2_PACKAGE_MESALIB=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBUSB=y
BR2_PACKAGE_LIBXML2=y
+BR2_PACKAGE_BLUEZ_UTILS=y
+BR2_PACKAGE_BLUEZ_UTILS_COMPAT=y
BR2_PACKAGE_BOA=y
-BR2_PACKAGE_BLUEZ3_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_IPERF=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-08-30 13:39:56
|
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 9e3cc1c5fbc98e7121352f2942dd20b7464a9e6b (commit)
from 70b24e341b7d478e22f9061401632a03e1499254 (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 9e3cc1c5fbc98e7121352f2942dd20b7464a9e6b
Author: Eric Jarrige <eri...@ar...>
Date: Fri Aug 30 15:50:33 2013 +0200
[BUILDROOT] apf28: update again test config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28test_defconfig | 38 +++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 984c595..ab1148b 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -49,24 +49,41 @@ BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_ARMADEUS_TESTSUITE=y
BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_FFMPEG=y
BR2_PACKAGE_FFMPEG_FFPLAY=y
+BR2_PACKAGE_GSTREAMER=y
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
+BR2_PACKAGE_GST_PLUGINS_GOOD=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2=y
+BR2_PACKAGE_GST_PLUGINS_BAD=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX=y
+BR2_PACKAGE_GST_PLUGINS_UGLY=y
+BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD=y
BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_GDB=y
+BR2_PACKAGE_LMBENCH=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_PRBOOM=y
BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_FBDUMP=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FBV=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_SDL_IMAGE_GIF=y
-BR2_PACKAGE_SDL_IMAGE_JPEG=y
-BR2_PACKAGE_SDL_IMAGE_PNG=y
+BR2_PACKAGE_SDL_SOUND=y
+BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
+BR2_PACKAGE_SDL_GFX=y
+BR2_PACKAGE_SLIDESHOW=y
BR2_PACKAGE_SDL_WATER=y
+BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
BR2_PACKAGE_I2C_TOOLS=y
@@ -78,17 +95,30 @@ BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
BR2_PACKAGE_PYTHON=y
-BR2_PACKAGE_LZO=y
+BR2_PACKAGE_PYTHON_READLINE=y
+BR2_PACKAGE_PYTHON_PYGAME=y
+BR2_PACKAGE_PYTHON_PYGAME_IMAGE=y
+BR2_PACKAGE_PYTHON_PYGAME_FONT=y
+BR2_PACKAGE_PYTHON_PYGAME_MIXER=y
+BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC=y
+BR2_PACKAGE_PYTHON_SERIAL=y
+BR2_PACKAGE_SPEEX=y
+BR2_PACKAGE_MESALIB=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBUSB=y
-BR2_PACKAGE_BLUEZ_UTILS=y
+BR2_PACKAGE_LIBXML2=y
+BR2_PACKAGE_BOA=y
+BR2_PACKAGE_BLUEZ3_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_LINKS=y
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
+BR2_PACKAGE_NTP_NTPDATE=y
BR2_PACKAGE_PORTMAP=y
+BR2_PACKAGE_PPPD=y
BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-08-30 13:01:23
|
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 70b24e341b7d478e22f9061401632a03e1499254 (commit)
from c26b143ec68b74b27b759b572adb2c56fa123442 (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 70b24e341b7d478e22f9061401632a03e1499254
Author: Eric Jarrige <eri...@ar...>
Date: Fri Aug 30 15:12:01 2013 +0200
[BUILDROOT] apf27: update and fix test config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27test_defconfig | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 261b012..60acf9c 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -61,7 +61,6 @@ BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_MADPLAY=y
BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LMBENCH=y
@@ -73,8 +72,9 @@ BR2_PACKAGE_PRBOOM=y
BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_FBDUMP=y
BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FBTEST=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FBV=y
+BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_SDL_IMAGE_GIF=y
BR2_PACKAGE_SDL_IMAGE_JPEG=y
BR2_PACKAGE_SDL_IMAGE_PNG=y
@@ -84,23 +84,26 @@ BR2_PACKAGE_SDL_GFX=y
BR2_PACKAGE_SLIDESHOW=y
BR2_PACKAGE_SDL_WATER=y
BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_FIRMWARE=y
-BR2_PACKAGE_FIRMWARE_88W8686=y
-BR2_PACKAGE_GPSD=y
-BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_INPUT_TOOLS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
+BR2_PACKAGE_GPSD=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_INPUT_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LUA=y
-BR2_PACKAGE_LUA_INTERPRETER=y
BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
BR2_PACKAGE_PYTHON=y
-BR2_PACKAGE_PYSERIAL=y
+BR2_PACKAGE_PYTHON3=y
+BR2_PACKAGE_PYTHON_SERIAL=y
+BR2_PACKAGE_LIBID3TAG=y
+BR2_PACKAGE_LIBMAD=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBUSB=y
+BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_BOA=y
BR2_PACKAGE_BLUEZ3_LIBS=y
BR2_PACKAGE_CAN_UTILS=y
@@ -114,8 +117,6 @@ BR2_PACKAGE_NTP=y
BR2_PACKAGE_NTP_NTPDATE=y
BR2_PACKAGE_PORTMAP=y
BR2_PACKAGE_PPPD=y
-BR2_PACKAGE_TCPDUMP=y
-BR2_PACKAGE_UUCP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-08-30 12:45:06
|
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 c26b143ec68b74b27b759b572adb2c56fa123442 (commit)
from 2ab58dbb56024541a9f733e30a5a9b3ac9bcd93e (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 c26b143ec68b74b27b759b572adb2c56fa123442
Author: Eric Jarrige <eri...@ar...>
Date: Fri Aug 30 14:55:42 2013 +0200
[BUILDROOT] apf28: update and fix test config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28test_defconfig | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 7fc29c4..984c595 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -51,29 +51,37 @@ BR2_PACKAGE_ARMADEUS_TESTSUITE=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+BR2_PACKAGE_FFMPEG=y
+BR2_PACKAGE_FFMPEG_FFPLAY=y
BR2_PACKAGE_MPLAYER=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_PRBOOM=y
BR2_PACKAGE_DOOM_WAD=y
-BR2_PACKAGE_FBTEST=y
+BR2_PACKAGE_FBDUMP=y
+BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBV=y
+BR2_PACKAGE_FB_TEST_APP=y
+BR2_PACKAGE_SDL_IMAGE_GIF=y
+BR2_PACKAGE_SDL_IMAGE_JPEG=y
+BR2_PACKAGE_SDL_IMAGE_PNG=y
BR2_PACKAGE_SDL_WATER=y
-BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_INPUT_TOOLS=y
+# BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set
+# BR2_PACKAGE_INPUT_TOOLS_JSCAL is not set
+# BR2_PACKAGE_INPUT_TOOLS_JSTEST is not set
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LUA=y
-BR2_PACKAGE_LUA_INTERPRETER=y
BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_LZO=y
-BR2_PACKAGE_ZLIB=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBUSB=y
-BR2_PACKAGE_NCURSES_TARGET_PANEL=y
-BR2_PACKAGE_NCURSES_TARGET_FORM=y
-BR2_PACKAGE_NCURSES_TARGET_MENU=y
+BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_IPROUTE2=y
@@ -82,7 +90,6 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
BR2_PACKAGE_PORTMAP=y
BR2_PACKAGE_TCPDUMP=y
-BR2_PACKAGE_UUCP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-08-30 12:44:08
|
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 2ab58dbb56024541a9f733e30a5a9b3ac9bcd93e (commit)
via 28e8de06d22a4f54af20ec1c199f853d0a49c06a (commit)
from 5ddc9a5cc3127525e4c407ba66b1f960484c000b (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 2ab58dbb56024541a9f733e30a5a9b3ac9bcd93e
Merge: 28e8de0 5ddc9a5
Author: Eric Jarrige <eri...@ar...>
Date: Fri Aug 30 14:54:42 2013 +0200
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit 28e8de06d22a4f54af20ec1c199f853d0a49c06a
Author: Eric Jarrige <eri...@ar...>
Date: Fri Aug 30 14:54:06 2013 +0200
[BUILDROOT] apf51: update and fix test config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51test_defconfig | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 425d2fa..c114238 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -63,6 +63,8 @@ BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+BR2_PACKAGE_FFMPEG=y
+BR2_PACKAGE_FFMPEG_FFPLAY=y
BR2_PACKAGE_GSTREAMER=y
BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
BR2_PACKAGE_GST_PLUGINS_GOOD=y
@@ -75,6 +77,7 @@ BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX=y
BR2_PACKAGE_GST_PLUGINS_UGLY=y
BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD=y
BR2_PACKAGE_MPLAYER=y
+# BR2_PACKAGE_MPLAYER_MPLAYER is not set
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LMBENCH=y
BR2_PACKAGE_LTRACE=y
@@ -82,12 +85,12 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_OPENTYRIAN=y
BR2_PACKAGE_PRBOOM=y
BR2_PACKAGE_DOOM_WAD=y
+BR2_PACKAGE_FBDUMP=y
BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FBTEST=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FBV=y
+BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_SDL_IMAGE_GIF=y
-BR2_PACKAGE_SDL_IMAGE_JPEG=y
-BR2_PACKAGE_SDL_IMAGE_PNG=y
BR2_PACKAGE_SDL_SOUND=y
BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
BR2_PACKAGE_SDL_GFX=y
@@ -106,7 +109,6 @@ BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_INPUT_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_LUA=y
-BR2_PACKAGE_LUA_INTERPRETER=y
BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
BR2_PACKAGE_PYTHON=y
BR2_PACKAGE_PYTHON_READLINE=y
@@ -119,6 +121,7 @@ BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_SPEEX=y
BR2_PACKAGE_MESALIB=y
BR2_PACKAGE_TSLIB=y
+BR2_PACKAGE_LIBUSB=y
BR2_PACKAGE_LIBXML2=y
BR2_PACKAGE_BOA=y
BR2_PACKAGE_BLUEZ3_UTILS=y
@@ -133,7 +136,6 @@ BR2_PACKAGE_NTP_NTPDATE=y
BR2_PACKAGE_PORTMAP=y
BR2_PACKAGE_PPPD=y
BR2_PACKAGE_TCPDUMP=y
-BR2_PACKAGE_UUCP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-08-29 12:14:39
|
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 5ddc9a5cc3127525e4c407ba66b1f960484c000b (commit)
from 72ad076c450705b7333c0175addbd0ad72bce71b (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 5ddc9a5cc3127525e4c407ba66b1f960484c000b
Author: Eric Jarrige <eri...@ar...>
Date: Thu Aug 29 14:25:12 2013 +0200
[BUILDROOT] fix apf27test config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27test_defconfig | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 1bf6fa5..261b012 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -67,7 +67,6 @@ BR2_PACKAGE_GDB=y
BR2_PACKAGE_LMBENCH=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_STRACE=y
-BR2_PACKAGE_LIBINTL=y
BR2_PACKAGE_LBREAKOUT2=y
BR2_PACKAGE_OPENTYRIAN=y
BR2_PACKAGE_PRBOOM=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-08-29 11:57:58
|
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 72ad076c450705b7333c0175addbd0ad72bce71b (commit)
from a44e08f33b21a03906e25ec8886a2df1b67562f2 (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 72ad076c450705b7333c0175addbd0ad72bce71b
Author: Eric Jarrige <eri...@ar...>
Date: Thu Aug 29 14:08:34 2013 +0200
[BUILD] fix sdl_water patch cleanup
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2013.05/cleanup_buildroot.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/patches/buildroot/2013.05/cleanup_buildroot.sh b/patches/buildroot/2013.05/cleanup_buildroot.sh
index 3d2ad78..1532894 100755
--- a/patches/buildroot/2013.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.05/cleanup_buildroot.sh
@@ -24,7 +24,7 @@ rm -rf buildroot/package/tslib/
rm -rf buildroot/package/openssh/
rm -rf buildroot/package/qtcreator
rm -rf buildroot/package/sdl/
-rm -rf buildroot/package/sdlwater/
+rm -rf buildroot/package/sdl_water/
rm -rf buildroot/package/slideshow/
rm -rf buildroot/package/python-crc16/
rm -rf buildroot/package/socketcan/
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-08-29 11:53:13
|
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 a44e08f33b21a03906e25ec8886a2df1b67562f2 (commit)
from f745726bd0c6f562c64e8591bf45bca8b0c98e82 (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 a44e08f33b21a03906e25ec8886a2df1b67562f2
Author: Eric Jarrige <eri...@ar...>
Date: Thu Aug 29 14:03:42 2013 +0200
[BUILD] fix command for a make apfxx_autoconf
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 3522b52..488b4ea 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ linux26-clean linux-clean: $(BUILDROOT_DIR)/.configured
# for the one who doesn't want config menu:
%_autoconf: $(BUILDROOT_DIR)/.patched
- @if [ -e "$(BUILDROOT_DIR)/target/device/armadeus/$(patsubst %_autoconf,%,$@)/$(patsubst %_autoconf,%,$@)_defconfig" ]; then \
+ @if [ -e "$(BUILDROOT_DIR)/configs/$(patsubst %_autoconf,%,$@)_defconfig" ]; then \
rm -f $(BUILDROOT_DIR)/.config ; \
$(MAKE) -C $(BUILDROOT_DIR) $(patsubst %_autoconf,%,$@)_defconfig ; \
touch $(BUILDROOT_DIR)/.configured ; \
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-08-28 19:23:22
|
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 f745726bd0c6f562c64e8591bf45bca8b0c98e82 (commit)
via 82baf6d02021490ca8be3067c7adb5356550a1fa (commit)
from c1ce665aef02f7d125874222d5035c3558b9fb1a (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 f745726bd0c6f562c64e8591bf45bca8b0c98e82
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 28 21:22:43 2013 +0200
[BUILDROOT][2013.05] Remove obsolete allegro patch, as we won't support this package anymore (in short term)
commit 82baf6d02021490ca8be3067c7adb5356550a1fa
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 28 21:21:21 2013 +0200
[BUILDROOT][2013.05] Makes sdl_water package compiles again
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2013.05/018-allegro.patch.tobefixed | 114 --------------------
.../021-armadeus-add-sdl_water-package.patch | 59 ++++++++++
.../2013.05/021-sdl-water-config.patch.tobefixed | 99 -----------------
3 files changed, 59 insertions(+), 213 deletions(-)
delete mode 100644 patches/buildroot/2013.05/018-allegro.patch.tobefixed
create mode 100644 patches/buildroot/2013.05/021-armadeus-add-sdl_water-package.patch
delete mode 100644 patches/buildroot/2013.05/021-sdl-water-config.patch.tobefixed
diff --git a/patches/buildroot/2013.05/018-allegro.patch.tobefixed b/patches/buildroot/2013.05/018-allegro.patch.tobefixed
deleted file mode 100644
index d548bf9..0000000
--- a/patches/buildroot/2013.05/018-allegro.patch.tobefixed
+++ /dev/null
@@ -1,114 +0,0 @@
-Add allegro package to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -116,6 +116,7 @@
- source "package/rrdtool/Config.in"
-
- comment "graphic libraries"
-+source "package/allegro/Config.in"
- source "package/cegui06/Config.in"
- source "package/directfb/Config.in"
- source "package/directfb-examples/Config.in"
-Index: buildroot/package/allegro/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/Config.in 2012-02-21 16:44:05.000000000 +0100
-@@ -0,0 +1,13 @@
-+config BR2_PACKAGE_ALLEGRO
-+ bool "Allegro"
-+ help
-+ Allegro is a game programming library for C/C++ developers
-+ distributed freely and supporting the following platforms:
-+ DOS, Unix (Linux, FreeBSD, Irix, Solaris, Darwin), Windows, QNX,
-+ BeOS and MacOS X.
-+ It provides many functions for graphics, sounds, player input
-+ (keyboard, mouse and joystick) and timers. It also provides fixed and
-+ floating point mathematical functions, 3d functions, file management
-+ functions, compressed datafile and a GUI.
-+
-+ http://alleg.sourceforge.net/
-Index: buildroot/package/allegro/allegro.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/allegro.mk 2012-02-21 16:44:05.000000000 +0100
-@@ -0,0 +1,75 @@
-+#############################################################
-+#
-+# Allegro: a game programming library
-+#
-+#############################################################
-+ALLEGRO_VERSION:=4.2.1
-+ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
-+ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg/files/allegro/4.2.1
-+ALLEGRO_CAT:=zcat
-+ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
-+
-+$(DL_DIR)/$(ALLEGRO_SOURCE):
-+ $(call DOWNLOAD,$(ALLEGRO_SITE),$(ALLEGRO_SOURCE))
-+
-+allegro-source: $(DL_DIR)/$(ALLEGRO_SOURCE)
-+
-+$(ALLEGRO_DIR)/.unpacked: $(DL_DIR)/$(ALLEGRO_SOURCE)
-+ $(ALLEGRO_CAT) $(DL_DIR)/$(ALLEGRO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ touch $@
-+
-+$(ALLEGRO_DIR)/.configured: $(ALLEGRO_DIR)/.unpacked
-+ (cd $(ALLEGRO_DIR); \
-+ $(TARGET_CONFIGURE_OPTS) \
-+ CFLAGS="$(TARGET_CFLAGS)" \
-+ LDFLAGS="$(TARGET_LDFLAGS)" \
-+ CROSSCOMPILE=1 \
-+ ./configure \
-+ --target=$(GNU_TARGET_NAME) \
-+ --host=$(GNU_TARGET_NAME) \
-+ --build=$(GNU_HOST_NAME) \
-+ --prefix=/usr \
-+ --without-svgalib \
-+ --enable-modules=no \
-+ --enable-static=yes \
-+ --enable-shared=no \
-+ --disable-asm \
-+ --disable-mmx \
-+ --disable-sse \
-+ --disable-color24 \
-+ --disable-color32 \
-+ --without-x );
-+ touch $@
-+# allegro doesn't seem to build as shared library
-+# --disable-color24 \
-+# --disable-color32 \
-+
-+$(ALLEGRO_DIR)/lib/unix/liballeg.a: $(ALLEGRO_DIR)/.configured
-+ $(MAKE) -C $(ALLEGRO_DIR) CROSSCOMPILE=1
-+ touch $@
-+
-+#$(STAGING_DIR)/usr/lib/liballeg.so: $(ALLEGRO_DIR)/lib/unix/liballeg.a
-+# $(MAKE) -C $(ALLEGRO_DIR) install
-+# touch -c $@
-+#
-+# $(TARGET_DIR)/usr/lib/liballeg.so.so: $(STAGING_DIR)/usr/lib/liballeg.so
-+# cp -dpf $(STAGING_DIR)/usr/lib/liballeg*.so* $(TARGET_DIR)/usr/lib/
-+# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/liballeg.so
-+
-+ALLEGRO allegro: $(ALLEGRO_DIR)/lib/unix/liballeg.a
-+
-+allegro-clean:
-+ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(ALLEGRO_DIR) uninstall
-+ -$(MAKE) -C $(ALLEGRO_DIR) clean
-+
-+allegro-dirclean:
-+ rm -rf $(ALLEGRO_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_ALLEGRO)),y)
-+TARGETS+=allegro
-+endif
diff --git a/patches/buildroot/2013.05/021-armadeus-add-sdl_water-package.patch b/patches/buildroot/2013.05/021-armadeus-add-sdl_water-package.patch
new file mode 100644
index 0000000..f650048
--- /dev/null
+++ b/patches/buildroot/2013.05/021-armadeus-add-sdl_water-package.patch
@@ -0,0 +1,59 @@
+Add sdlwater package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2013-08-28 19:15:51.163133453 +0200
++++ buildroot/package/Config.in 2013-08-28 21:16:29.159024736 +0200
+@@ -139,6 +139,8 @@
+ source "package/sdl_net/Config.in"
+ source "package/sdl_ttf/Config.in"
+ source "package/sdl_gfx/Config.in"
++comment "Demos"
++source "package/sdl_water/Config.in"
+
+ comment "other GUIs"
+ source "package/efl/Config.in"
+Index: buildroot/package/sdl_water/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/sdl_water/Config.in 2013-08-28 19:15:51.231133799 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_SDL_WATER
++ bool "SDL_water"
++ select BR2_PACKAGE_SDL
++ help
++ Water effect demo coded with SDL
++
++ http://www.libsdl.org/projects/SDL_water/
+Index: buildroot/package/sdl_water/sdl_water.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/sdl_water/sdl_water.mk 2013-08-28 19:35:31.024984077 +0200
+@@ -0,0 +1,25 @@
++#############################################################
++#
++# SDL Water Demo
++#
++#############################################################
++
++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_TARGET_DATA_DIR = $(TARGET_DIR)/usr/share/images/
++
++SDL_WATER_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
++ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
++
++SDL_WATER_DEPENDENCIES = sdl
++
++SDL_WATER_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
++
++define SDL_WATER_INSTALL_BMP
++ install -D -m 0644 $(@D)/water320.bmp $(SDL_WATER_TARGET_DATA_DIR)/water320.bmp
++endef
++
++SDL_WATER_POST_INSTALL_TARGET_HOOKS += SDL_WATER_INSTALL_BMP
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2013.05/021-sdl-water-config.patch.tobefixed b/patches/buildroot/2013.05/021-sdl-water-config.patch.tobefixed
deleted file mode 100644
index bfdf33c..0000000
--- a/patches/buildroot/2013.05/021-sdl-water-config.patch.tobefixed
+++ /dev/null
@@ -1,99 +0,0 @@
-Add sdlwater package to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot/package/Config.in
-+++ buildroot/package/Config.in
-@@ -140,6 +140,8 @@
- source "package/sdl_net/Config.in"
- source "package/sdl_ttf/Config.in"
- source "package/sdl_gfx/Config.in"
-+comment "Demos"
-+source "package/sdlwater/Config.in"
-
- comment "other GUIs"
- source "package/efl/Config.in"
-Index: buildroot/package/sdlwater/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/Config.in 2012-02-21 16:44:08.000000000 +0100
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_SDL_WATER
-+ bool "SDL_water"
-+ select BR2_PACKAGE_SDL
-+ help
-+ Water effect demo coded with SDL
-+
-+ http://www.libsdl.org/projects/SDL_water/
-Index: buildroot/package/sdlwater/sdlwater.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/sdlwater.mk 2012-02-21 16:44:08.000000000 +0100
-@@ -0,0 +1,65 @@
-+#############################################################
-+#
-+# SDL Water Demo
-+#
-+#############################################################
-+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_CAT:=$(ZCAT)
-+SDL_WATER_DIR:=$(BUILD_DIR)/water-$(SDL_WATER_VERSION)
-+SDL_WATER_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share/images/
-+
-+$(DL_DIR)/$(SDL_WATER_SOURCE):
-+ $(call DOWNLOAD,$(SDL_WATER_SITE),$(SDL_WATER_SOURCE))
-+
-+sdl-water-source: $(DL_DIR)/$(SDL_WATER_SOURCE)
-+
-+$(SDL_WATER_DIR)/.unpacked: $(DL_DIR)/$(SDL_WATER_SOURCE)
-+ $(SDL_WATER_CAT) $(DL_DIR)/$(SDL_WATER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ touch $@
-+
-+$(SDL_WATER_DIR)/.configured: $(SDL_WATER_DIR)/.unpacked
-+ (cd $(SDL_WATER_DIR); \
-+ $(TARGET_CONFIGURE_OPTS) \
-+ CFLAGS="$(TARGET_CFLAGS) " \
-+ ./configure \
-+ --target=$(GNU_TARGET_NAME) \
-+ --host=$(GNU_TARGET_NAME) \
-+ --build=$(GNU_HOST_NAME) \
-+ --prefix=$(STAGING_DIR)/usr \
-+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr/ \
-+ --disable-video-x11 );
-+ touch $@
-+
-+$(SDL_WATER_DIR)/water: $(SDL_WATER_DIR)/.configured
-+ $(MAKE) -C $(SDL_WATER_DIR)
-+
-+$(STAGING_DIR)/usr/bin/water: $(SDL_WATER_DIR)/water
-+ $(MAKE) -C $(SDL_WATER_DIR) install
-+ touch -c $@
-+
-+$(TARGET_DIR)/usr/bin/water: $(STAGING_DIR)/usr/bin/water
-+ mkdir -p $(SDL_WATER_TARGET_DATA_DIR)
-+ cp -dpf $(SDL_WATER_DIR)/water320.bmp $(SDL_WATER_TARGET_DATA_DIR)/
-+ cp -dpf $< $(TARGET_DIR)/usr/bin/
-+ -$(STRIPCMD) $@
-+
-+SDL-WATER sdl-water: uclibc sdl $(TARGET_DIR)/usr/bin/water
-+
-+sdl-water-clean:
-+ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_WATER_DIR) uninstall
-+ rm $(SDL_WATER_TARGET_DATA_DIR)/water320.bmp
-+ -$(MAKE) -C $(SDL_WATER_DIR) clean
-+
-+sdl-water-dirclean:
-+ rm -rf $(SDL_WATER_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_SDL_WATER)),y)
-+TARGETS+=sdl-water
-+endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-08-28 16:22:42
|
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 c1ce665aef02f7d125874222d5035c3558b9fb1a (commit)
from a129f97527881c7930b5ee05795118c30c4b75d8 (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 c1ce665aef02f7d125874222d5035c3558b9fb1a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Aug 28 18:21:50 2013 +0200
[LINUX] 3.7 : apf27 : Makes FPGA and armadeus custom drivers compiles better with 3.7+ kernels
-----------------------------------------------------------------------
Summary of changes:
.../linux/3.7/0322-armadeus-add_mach_fpga_h.patch | 11 ++++++++---
target/linux/modules/Makefile | 2 +-
target/linux/modules/as1531_platform/Makefile | 2 +-
target/linux/modules/backlight/Makefile | 2 +-
target/linux/modules/display/Makefile | 2 +-
target/linux/modules/dma_test/Makefile | 2 +-
target/linux/modules/fpga/Makefile | 2 +-
target/linux/modules/fpga/POD/Makefile | 2 +-
.../fpga/board_designs/wishbone_example/Makefile | 5 +----
.../wishbone_example/wb_button/Makefile | 2 +-
.../wishbone_example/wb_irq_mngr/Makefile | 3 +--
.../wishbone_example/wb_irq_mngr/board_irq_mng.c | 14 ++++++++++++--
.../board_designs/wishbone_example/wb_led/Makefile | 2 +-
target/linux/modules/fpga/dev_tools/Makefile | 2 +-
.../linux/modules/fpga/dev_tools/loader/Makefile | 2 +-
target/linux/modules/fpga/others/i2ctest/Makefile | 2 +-
.../linux/modules/fpga/others/ps2keyboard/Makefile | 2 +-
.../fpga/virtual_components/button/Makefile | 2 +-
target/linux/modules/generic/Makefile | 2 +-
target/linux/modules/gpio/Makefile | 2 +-
target/linux/modules/imx_counter/Makefile | 2 +-
target/linux/modules/imxlkeypad/Makefile | 2 +-
target/linux/modules/isp1761/Makefile | 2 +-
target/linux/modules/max1027/Makefile | 2 +-
target/linux/modules/max9768/Makefile | 2 +-
target/linux/modules/mxs_lradc/Makefile | 2 +-
target/linux/modules/pwm/Makefile | 2 +-
27 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
index 34b4777..3846b13 100644
--- a/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.7/0322-armadeus-add_mach_fpga_h.patch
@@ -1,8 +1,8 @@
-Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
+Index: linux-3.7.9/arch/arm/plat-mxc/include/mach/fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h 2013-01-02 18:45:18.000000000 +0100
-@@ -0,0 +1,50 @@
++++ linux-3.7.9/arch/arm/plat-mxc/include/mach/fpga.h 2013-08-28 16:14:57.901315036 +0200
+@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2009-2013 Armadeus Systems
+ *
@@ -40,8 +40,13 @@ Index: linux-3.7.1/arch/arm/plat-mxc/include/mach/fpga.h
+#include <mach/iomux-v1.h>
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
+# define APF27_FPGA_IRQ (IRQ_GPIOF(12))
++#else
++# define APF27_FPGA_INT_PIN (IMX_GPIO_NR(6, 12)) /* PF12 */
++# define APF27_FPGA_IRQ (gpio_to_irq(APF27_FPGA_INT_PIN))
++#endif
+# define ARMADEUS_FPGA_IRQ APF27_FPGA_IRQ
+# define IRQ_FPGA_START 96
+#elif defined(CONFIG_MACH_APF9328) /* */
diff --git a/target/linux/modules/Makefile b/target/linux/modules/Makefile
index f83dc54..07265eb 100755
--- a/target/linux/modules/Makefile
+++ b/target/linux/modules/Makefile
@@ -4,7 +4,7 @@
# Add your subdirectories to obj- target
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_DRIVERS) += gpio/ pwm/ backlight/ isp1761/ \
diff --git a/target/linux/modules/as1531_platform/Makefile b/target/linux/modules/as1531_platform/Makefile
index 34154bf..cf0ce91 100755
--- a/target/linux/modules/as1531_platform/Makefile
+++ b/target/linux/modules/as1531_platform/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_AS1531_PLAT) += as1531_plat.o
diff --git a/target/linux/modules/backlight/Makefile b/target/linux/modules/backlight/Makefile
index a579fbf..9d2e6f3 100644
--- a/target/linux/modules/backlight/Makefile
+++ b/target/linux/modules/backlight/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_IMX_BACKLIGHT) += imx_bl.o
imx_bl-objs := imx_bl_2.6.23.o
diff --git a/target/linux/modules/display/Makefile b/target/linux/modules/display/Makefile
index 06d7ba2..c52be76 100644
--- a/target/linux/modules/display/Makefile
+++ b/target/linux/modules/display/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_HX5116_DISPLAY) += hx5116_display.o
diff --git a/target/linux/modules/dma_test/Makefile b/target/linux/modules/dma_test/Makefile
index f216193..3a36838 100755
--- a/target/linux/modules/dma_test/Makefile
+++ b/target/linux/modules/dma_test/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-m += dma.o
diff --git a/target/linux/modules/fpga/Makefile b/target/linux/modules/fpga/Makefile
index d13b61f..2eff197 100755
--- a/target/linux/modules/fpga/Makefile
+++ b/target/linux/modules/fpga/Makefile
@@ -4,7 +4,7 @@
# Add your subdirectories to obj- target
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS) += dev_tools/ board_designs/ virtual_components/
diff --git a/target/linux/modules/fpga/POD/Makefile b/target/linux/modules/fpga/POD/Makefile
index 8c309cc..aa26121 100644
--- a/target/linux/modules/fpga/POD/Makefile
+++ b/target/linux/modules/fpga/POD/Makefile
@@ -4,7 +4,7 @@
# Sub-directories are automatically added to obj- target
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_POD_DRIVERS) += $(shell ls -F drivers/armadeus/fpga/POD/ | grep \/$)
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
index f463ee8..fc0d58e 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
@@ -1,11 +1,10 @@
-
#
# Main Makefile for the Armadeus FPGA related drivers
#
# Add your subdirectories to obj- target
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE) += wb_button/ wb_irq_mngr/ wb_led/
@@ -23,6 +22,4 @@ install:
test:
$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc push-led.c -o push-led
-
endif
-
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
index cef6f50..99f158c 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
@@ -2,7 +2,7 @@
# Makefile for the Armadeus Wb_button drivers
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += wb_example_buttons.o
wb_example_buttons-objs := board_buttons.o
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
index 35693be..f14b22c 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
@@ -2,14 +2,13 @@
# Makefile for the Armadeus FPGA OpenCore IRQ manager IP
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER) += wb_example_irq_mngr.o
wb_example_irq_mngr-objs := board_irq_mng.o
-
else
ARMADEUS_BASE_DIR=../../../../../..
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
index 0727225..aad5be4 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
@@ -43,8 +43,8 @@ static struct resource irq_mng0_resources[] = {
.flags = IORESOURCE_MEM,
},
[1] = {
- .start = ARMADEUS_FPGA_IRQ,
- .end = ARMADEUS_FPGA_IRQ,
+ .start = 0, /* Filled later in */
+ .end = 0, /* Filled later in */
.flags = IORESOURCE_IRQ,
}
};
@@ -86,7 +86,14 @@ static int __init board_irq_mng_init(void)
if (ret)
return -EINVAL;
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
set_irq_type(ARMADEUS_FPGA_IRQ, IRQ_TYPE_EDGE_RISING);
+#else
+ irq_set_irq_type(ARMADEUS_FPGA_IRQ, IRQ_TYPE_EDGE_RISING);
+#endif
+ irq_mng0_device.resource[1].start = ARMADEUS_FPGA_IRQ;
+ irq_mng0_device.resource[1].end = ARMADEUS_FPGA_IRQ;
+
return platform_device_register(&irq_mng0_device);
}
@@ -94,7 +101,10 @@ static void __exit board_irq_mng_exit(void)
{
platform_device_unregister(&irq_mng0_device);
#ifdef CONFIG_MACH_APF27
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
mxc_gpio_release_multiple_pins(fpga_pins, ARRAY_SIZE(fpga_pins));
+ /* see https://github.com/torvalds/linux/commit/581f84e24b45ab871ae5f15f9290261c7226ffa9 */
+# endif
#endif
}
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
index 7bf86a5..103956b 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
@@ -2,7 +2,7 @@
# Makefile for the Armadeus FPGA led driver
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_LED_DRIVER) += wb_example_led.o
wb_example_led-objs := board_leds.o
diff --git a/target/linux/modules/fpga/dev_tools/Makefile b/target/linux/modules/fpga/dev_tools/Makefile
index 3db20fa..ca7f657 100644
--- a/target/linux/modules/fpga/dev_tools/Makefile
+++ b/target/linux/modules/fpga/dev_tools/Makefile
@@ -4,7 +4,7 @@
# Add your subdirectories to obj- target
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
diff --git a/target/linux/modules/fpga/dev_tools/loader/Makefile b/target/linux/modules/fpga/dev_tools/loader/Makefile
index 24d3790..3872580 100644
--- a/target/linux/modules/fpga/dev_tools/loader/Makefile
+++ b/target/linux/modules/fpga/dev_tools/loader/Makefile
@@ -2,7 +2,7 @@
# Makefile for the Armadeus FPGA loader driver
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_FPGA_LOADER_DRIVER) += fpgaloader.o
fpgaloader-objs := xilinx-fpga-loader.o fpga-loader.o
diff --git a/target/linux/modules/fpga/others/i2ctest/Makefile b/target/linux/modules/fpga/others/i2ctest/Makefile
index 5d971e2..a4e7343 100755
--- a/target/linux/modules/fpga/others/i2ctest/Makefile
+++ b/target/linux/modules/fpga/others/i2ctest/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when cali2ctest from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-m += i2ctest.o
diff --git a/target/linux/modules/fpga/others/ps2keyboard/Makefile b/target/linux/modules/fpga/others/ps2keyboard/Makefile
index 7ba4fe4..d754447 100755
--- a/target/linux/modules/fpga/others/ps2keyboard/Makefile
+++ b/target/linux/modules/fpga/others/ps2keyboard/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_PS2KBD_DRIVER) += apf9328ps2.o
apf9328ps2-objs := core.o
diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
index bb42489..a01141b 100755
--- a/target/linux/modules/fpga/virtual_components/button/Makefile
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -2,7 +2,7 @@
# Makefile for the Armadeus FPGA button driver
#
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON) += button_ocore.o
diff --git a/target/linux/modules/generic/Makefile b/target/linux/modules/generic/Makefile
index 1e87d59..11b4c1e 100755
--- a/target/linux/modules/generic/Makefile
+++ b/target/linux/modules/generic/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_GENERIC_DRIVER) += genmod.o
generic-objs := generic.o
diff --git a/target/linux/modules/gpio/Makefile b/target/linux/modules/gpio/Makefile
index d536614..f4fc5e4 100755
--- a/target/linux/modules/gpio/Makefile
+++ b/target/linux/modules/gpio/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_GPIO_DRIVER) += gpio.o
obj-$(CONFIG_ARMADEUS_PPDEV_DRIVER) += ppdev.o
diff --git a/target/linux/modules/imx_counter/Makefile b/target/linux/modules/imx_counter/Makefile
index a9c0ef6..e098eb7 100755
--- a/target/linux/modules/imx_counter/Makefile
+++ b/target/linux/modules/imx_counter/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_APF27_GPT2) += gpt2_plat.o
diff --git a/target/linux/modules/imxlkeypad/Makefile b/target/linux/modules/imxlkeypad/Makefile
index a51267b..4618199 100755
--- a/target/linux/modules/imxlkeypad/Makefile
+++ b/target/linux/modules/imxlkeypad/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_KEYPAD_DRIVER) += imxkeypad.o
diff --git a/target/linux/modules/isp1761/Makefile b/target/linux/modules/isp1761/Makefile
index 63f4599..31f039c 100644
--- a/target/linux/modules/isp1761/Makefile
+++ b/target/linux/modules/isp1761/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_ISP1761) += hal/ host/ apf9328-isp1761.o
diff --git a/target/linux/modules/max1027/Makefile b/target/linux/modules/max1027/Makefile
index aef647a..0b9e6c8 100755
--- a/target/linux/modules/max1027/Makefile
+++ b/target/linux/modules/max1027/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_MAX1027) += max1027.o
diff --git a/target/linux/modules/max9768/Makefile b/target/linux/modules/max9768/Makefile
index d60e4f4..a3d6506 100644
--- a/target/linux/modules/max9768/Makefile
+++ b/target/linux/modules/max9768/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_MAX9768) += max9768.o
diff --git a/target/linux/modules/mxs_lradc/Makefile b/target/linux/modules/mxs_lradc/Makefile
index 24fd8aa..ea0c8f4 100755
--- a/target/linux/modules/mxs_lradc/Makefile
+++ b/target/linux/modules/mxs_lradc/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_SENSOR_MXS_LRADC) += mxs_lradc.o
diff --git a/target/linux/modules/pwm/Makefile b/target/linux/modules/pwm/Makefile
index 266e39f..706ebdd 100755
--- a/target/linux/modules/pwm/Makefile
+++ b/target/linux/modules/pwm/Makefile
@@ -3,7 +3,7 @@
#
# Part executed when called from kernel build system:
-ifneq ($(KERNELRELEASE),)
+ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_PWM_DRIVER) += imx-pwm.o
imx-pwm-objs := pwm.o
hooks/post-receive
--
armadeus
|
