[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-398-gc2a9d54

[Julien B a. A. <ar...@us...>]

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  c2a9d54cff60465fb86c77994f20785551166da0 (commit)
       via  47f4fdda87f6435f73c98738d5cc3a32c31bcd6a (commit)
       via  3567fef9676d82cc923e3e03bccd90e9ae63a6b3 (commit)
       via  a128bdd57df105400eb8738d6a71c53f834b0797 (commit)
      from  11af5039cd031c949730ec447f9d045cb65e0f0b (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 c2a9d54cff60465fb86c77994f20785551166da0
Merge: 47f4fdda87f6435f73c98738d5cc3a32c31bcd6a 11af5039cd031c949730ec447f9d045cb65e0f0b
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Mar 3 14:39:01 2011 +0100

    Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 47f4fdda87f6435f73c98738d5cc3a32c31bcd6a
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Mar 3 14:38:37 2011 +0100

    [TEST] Makes test_wifi.sh more error proof

commit 3567fef9676d82cc923e3e03bccd90e9ae63a6b3
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Mar 3 14:37:57 2011 +0100

    [TEST] Add e2fsprogs to apf27_test.config

commit a128bdd57df105400eb8738d6a71c53f834b0797
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Mar 3 11:39:45 2011 +0100

    [TEST] Rename buildroot/local/apf9328_test/linux-2.6.29.4.config -> buildroot/local/apf9328_test/linux-2.6.29.6.config

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

Summary of changes:
 buildroot/local/apf27_test/apf27_test.config       |   17 ++++++++++++++++-
 buildroot/local/apf9328_test/apf9328_test.config   |    2 +-
 ...linux-2.6.29.4.config => linux-2.6.29.6.config} |    0
 target/test/test_wifi.sh                           |    4 ++++
 4 files changed, 21 insertions(+), 2 deletions(-)
 rename buildroot/local/apf9328_test/{linux-2.6.29.4.config => linux-2.6.29.6.config} (100%)

diff --git a/buildroot/local/apf27_test/apf27_test.config b/buildroot/local/apf27_test/apf27_test.config
index 5fda9cc..c1f649c 100644
--- a/buildroot/local/apf27_test/apf27_test.config
+++ b/buildroot/local/apf27_test/apf27_test.config
@@ -507,7 +507,22 @@ BR2_PACKAGE_CWIID=y
 # BR2_PACKAGE_DEVMEM2 is not set
 # BR2_PACKAGE_DM is not set
 # BR2_PACKAGE_DMRAID is not set
-# BR2_PACKAGE_E2FSPROGS is not set
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
+BR2_PACKAGE_E2FSPROGS_BLKID=y
+BR2_PACKAGE_E2FSPROGS_CHATTR=y
+BR2_PACKAGE_E2FSPROGS_DUMPE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2FSCK=y
+BR2_PACKAGE_E2FSPROGS_E2LABEL=y
+BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
+BR2_PACKAGE_E2FSPROGS_FINDFS=y
+BR2_PACKAGE_E2FSPROGS_FSCK=y
+BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
+BR2_PACKAGE_E2FSPROGS_LSATTR=y
+BR2_PACKAGE_E2FSPROGS_MKE2FS=y
+BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
+BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
+BR2_PACKAGE_E2FSPROGS_UUIDGEN=y
 # BR2_PACKAGE_EEPROG is not set
 # BR2_PACKAGE_FCONFIG is not set
 BR2_PACKAGE_FIRMWARE=y
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index 4e0a0a8..50d5062 100644
--- a/buildroot/local/apf9328_test/apf9328_test.config
+++ b/buildroot/local/apf9328_test/apf9328_test.config
@@ -873,7 +873,7 @@ BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
 # BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
-BR2_PACKAGE_LINUX_KCONFIG=".//local/apf9328_test/linux-2.6.29.4.config"
+BR2_PACKAGE_LINUX_KCONFIG=".//local/apf9328_test/linux-2.6.29.6.config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
 BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
 BR2_KERNEL_CURRENT_VERSION="2.6.26.3"
diff --git a/buildroot/local/apf9328_test/linux-2.6.29.4.config b/buildroot/local/apf9328_test/linux-2.6.29.6.config
similarity index 100%
rename from buildroot/local/apf9328_test/linux-2.6.29.4.config
rename to buildroot/local/apf9328_test/linux-2.6.29.6.config
diff --git a/target/test/test_wifi.sh b/target/test/test_wifi.sh
index a83d78e..3f2a2c9 100755
--- a/target/test/test_wifi.sh
+++ b/target/test/test_wifi.sh
@@ -39,6 +39,10 @@ test_wifi()
 		exit_failed
 	fi
 	ifconfig eth1 up
+	if [ "$?" != 0 ]; then
+		echo "WLAN interface not available !!"
+		exit_failed
+	fi
 	#ifconfig eth0 down
 
 	# get available APs (remove hidden one)


hooks/post-receive
-- 
armadeus