[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-256-gebfd36c
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2011-06-28 14:12: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 ebfd36cd64bd1737680c0667b8c795ec948ea040 (commit)
via 11ad535807725e41268de885ba6c2133dbfa4a6c (commit)
via cf6230f42468dac0179791d51ec6fa8d274f6f04 (commit)
from 6ab1789742ee14ab40071ba5413e9bc1536ceec8 (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 ebfd36cd64bd1737680c0667b8c795ec948ea040
Merge: 11ad535807725e41268de885ba6c2133dbfa4a6c 6ab1789742ee14ab40071ba5413e9bc1536ceec8
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 16:10:35 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 11ad535807725e41268de885ba6c2133dbfa4a6c
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 16:09:38 2011 +0200
[STRATON] Change as_devices related comment in Config.in
commit cf6230f42468dac0179791d51ec6fa8d274f6f04
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 28 16:06:51 2011 +0200
[PPS] Updates Buildroot and Linux 2.6.29 default configs; mostly to get download & gpiolib fixes from APF27
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/pps_defconfig | 14 +++++++++-----
buildroot/package/armadeus/straton/Config.in | 2 +-
.../device/armadeus/pps/pps-linux-2.6.29.config | 5 ++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 32eadd0..c218cdc 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot version: 2010.11-00354-g97b1b34-dirty
-# Mon Feb 21 17:54:45 2011
+# Buildroot version: 2010.11
+# Fri Jun 24 10:57:47 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -99,7 +99,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Commands
#
-BR2_WGET="wget --passive-ftp"
+BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
BR2_GIT="git clone"
@@ -115,7 +115,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_SOURCEFORGE_MIRROR="easynews"
+BR2_SOURCEFORGE_MIRROR="switch"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
@@ -457,6 +457,7 @@ BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9=y
BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_KBD is not set
# BR2_PACKAGE_LCD4LINUX is not set
# BR2_PACKAGE_LM_SENSORS is not set
# BR2_PACKAGE_LVM2 is not set
@@ -508,6 +509,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
# BR2_PACKAGE_PCIUTILS is not set
+# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
# BR2_PACKAGE_SQUASHFS is not set
@@ -579,6 +581,7 @@ BR2_PACKAGE_OPENSSL_BIN=y
# BR2_PACKAGE_FREETYPE is not set
# BR2_PACKAGE_JPEG is not set
# BR2_PACKAGE_LIBART is not set
+# BR2_PACKAGE_GDK_PIXBUF is not set
# BR2_PACKAGE_LIBPNG is not set
# BR2_PACKAGE_LIBSVGTINY is not set
# BR2_PACKAGE_LIBUNGIF is not set
@@ -706,6 +709,7 @@ BR2_PACKAGE_IPTABLES=y
# BR2_PACKAGE_NETSNMP is not set
# BR2_PACKAGE_NETSTAT_NAT is not set
# BR2_PACKAGE_NFS_UTILS is not set
+# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
# BR2_PACKAGE_NTP_SNTP is not set
@@ -713,6 +717,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPDC is not set
# BR2_PACKAGE_NTP_NTPQ is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
+# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENOBEX is not set
@@ -728,7 +733,6 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
# BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SOCKETCAN is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
# BR2_PACKAGE_TCPDUMP is not set
diff --git a/buildroot/package/armadeus/straton/Config.in b/buildroot/package/armadeus/straton/Config.in
index 41eda04..073d42e 100644
--- a/buildroot/package/armadeus/straton/Config.in
+++ b/buildroot/package/armadeus/straton/Config.in
@@ -1,4 +1,4 @@
-comment "Select as_devices package to use straton"
+comment "straton requires as_devices to be installed"
depends on !(BR2_PACKAGE_AS_DEVICES)
config BR2_PACKAGE_STRATON
diff --git a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
index 333371b..92bbaef 100644
--- a/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Wed Mar 2 14:25:41 2011
+# Tue Jun 21 18:13:55 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -186,7 +186,6 @@ CONFIG_MACH_MX27=y
# MX2 Platforms
#
CONFIG_MACH_APF27=y
-CONFIG_MACH_APF27_FPGA=y
# CONFIG_MACH_MX27ADS is not set
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_PCM970_BASEBOARD is not set
@@ -987,7 +986,7 @@ CONFIG_SPI_MXC_SELECT2=y
CONFIG_SPI_TSC2102=m
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
#
# Memory mapped GPIO expanders:
hooks/post-receive
--
armadeus
|