[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-44-g9468cdd
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-44-g9468cdd
|
From: Julien B a. A. <ar...@us...> - 2009-12-14 09:08:04
|
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 9468cdd845770e4a855d21fea674b6bf7e2be1f4 (commit)
via 7fec27d8055f002d833a584accd111aa7a6f4810 (commit)
via 7726a45e81e044daa0eb8819900fa8098777c6e1 (commit)
via 8d0a9d41d75833cf9f33f852ada7175633d5262c (commit)
from cda9b13b63b9d876917ee6fc8f1d573af4a60086 (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 9468cdd845770e4a855d21fea674b6bf7e2be1f4
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 14 10:06:06 2009 +0100
[TOOLS] Add a small script to ease installation on Debian like systems. Thanks Sebastien.
commit 7fec27d8055f002d833a584accd111aa7a6f4810
Merge: 7726a45e81e044daa0eb8819900fa8098777c6e1 cda9b13b63b9d876917ee6fc8f1d573af4a60086
Author: Julien Boibessot <jul...@ar...>
Date: Fri Dec 11 23:16:06 2009 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 7726a45e81e044daa0eb8819900fa8098777c6e1
Author: Julien Boibessot <jul...@ar...>
Date: Fri Dec 11 22:55:11 2009 +0100
[LINUX] Make Linux 2.6.27 compiles on Ubuntu 9.10 (and probably other recent releases). Thanks Sebastien V.C. for the report.
commit 8d0a9d41d75833cf9f33f852ada7175633d5262c
Author: Julien Boibessot <jul...@ar...>
Date: Fri Dec 11 18:11:02 2009 +0100
[BUILDROOT] Add 2 new mount points in default rootfs for removable media: /media/mmc and /media/usbdisk.
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.27.13.config | 3 +-
.../apf9328/apf9328-linux-2.6.27.13.config | 3 +-
.../324-armadeus-change_getline_in_get_line.patch | 34 ++++++++++++++++
.../target_skeleton/{bin => media/mmc}/.empty | 0
.../target_skeleton/{bin => media/usbdisk}/.empty | 0
scripts/install_on_debian_like.sh | 41 ++++++++++++++++++++
6 files changed, 79 insertions(+), 2 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/324-armadeus-change_getline_in_get_line.patch
copy buildroot/target/device/armadeus/rootfs/target_skeleton/{bin => media/mmc}/.empty (100%)
copy buildroot/target/device/armadeus/rootfs/target_skeleton/{bin => media/usbdisk}/.empty (100%)
create mode 100755 scripts/install_on_debian_like.sh
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
index de6611a..dc42d8d 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.27.13.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.13
-# Thu Apr 16 18:13:44 2009
+# Fri Dec 11 22:30:17 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1236,6 +1236,7 @@ CONFIG_ARMADEUS_DRIVERS=y
# CONFIG_ARMADEUS_GPIO_DRIVER is not set
# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX9768 is not set
#
# FPGA related
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config
index 574fc21..422224b 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.27.13.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.13
-# Fri Mar 13 14:22:46 2009
+# Fri Dec 11 22:30:17 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1115,6 +1115,7 @@ CONFIG_ARMADEUS_GPIO_DRIVER=m
CONFIG_ARMADEUS_PPDEV_DRIVER=m
CONFIG_ARMADEUS_KEYPAD_DRIVER=m
CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX9768 is not set
#
# FPGA related
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/324-armadeus-change_getline_in_get_line.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/324-armadeus-change_getline_in_get_line.patch
new file mode 100644
index 0000000..72590dd
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/324-armadeus-change_getline_in_get_line.patch
@@ -0,0 +1,34 @@
+On recent releases (for ex Ubuntu 9.10) getline is a reserved libc function.
+So rename it like it was done on recent kernels.
+
+Index: linux-2.6.27.13/scripts/unifdef.c
+===================================================================
+--- linux-2.6.27.13.orig/scripts/unifdef.c 2009-12-11 22:42:20.000000000 +0100
++++ linux-2.6.27.13/scripts/unifdef.c 2009-12-11 22:43:43.000000000 +0100
+@@ -206,7 +206,7 @@
+ static void error(const char *);
+ static int findsym(const char *);
+ static void flushline(bool);
+-static Linetype getline(void);
++static Linetype get_line(void);
+ static Linetype ifeval(const char **);
+ static void ignoreoff(void);
+ static void ignoreon(void);
+@@ -512,7 +512,7 @@
+
+ for (;;) {
+ linenum++;
+- lineval = getline();
++ lineval = get_line();
+ trans_table[ifstate[depth]][lineval]();
+ debug("process %s -> %s depth %d",
+ linetype_name[lineval],
+@@ -526,7 +526,7 @@
+ * help from skipcomment().
+ */
+ static Linetype
+-getline(void)
++get_line(void)
+ {
+ const char *cp;
+ int cursym;
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/media/mmc/.empty
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty
copy to buildroot/target/device/armadeus/rootfs/target_skeleton/media/mmc/.empty
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/media/usbdisk/.empty
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/bin/.empty
copy to buildroot/target/device/armadeus/rootfs/target_skeleton/media/usbdisk/.empty
diff --git a/scripts/install_on_debian_like.sh b/scripts/install_on_debian_like.sh
new file mode 100755
index 0000000..1aa4e89
--- /dev/null
+++ b/scripts/install_on_debian_like.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# Script Written by Sebastien Van Cauwenberghe <sv...@gm...>
+# do what you want with this script ;)
+
+echo "Please select the development Board : "
+BOARDOPTIONS="apf9328 apf27"
+select BOARD in $BOARDOPTIONS; do
+ if [ "$BOARD" = "apf9328" ]; then
+ echo "APF9328 selected"
+ break
+ elif [ "$BOARD" = "apf27" ]; then
+ echo "APF27 selected"
+ break
+ else
+ echo "Bad option"
+ fi
+done
+
+VERSION=3.2
+FILE="armadeus-$VERSION.tar.bz2"
+URL=http://downloads.sourceforge.net/project/armadeus/armadeus/armadeus-$VERSION/$FILE
+
+CURSHELL=`ls -al /bin/sh | cut -d " " -f 10`
+BASH_LOCATION=`which bash`
+if [ -L /bin/sh ]; then
+ if [ "$CURSHELL" != "$BASH_LOCATION" ]; then
+ echo "Warning: /bin/sh doesn't point to $BASH_LOCATION... fixing it"
+ sudo rm /bin/sh
+ sudo ln -s $BASH_LOCATION /bin/sh
+ fi
+fi
+
+sudo aptitude -y install build-essential gcc g++ autoconf automake libtool bison flex gettext patch subversion texinfo wget git-core
+sudo aptitude -y install libncurses5 libncurses5-dev zlib1g-dev liblzo2-2 liblzo2-dev libacl1 libacl1-dev uuid-dev libglib2.0-dev libnetpbm10-dev
+
+wget -c $URL
+tar -xjf $FILE
+cd armadeus-$VERSION
+make $BOARD"_defconfig"
+make
hooks/post-receive
--
armadeus
|
