[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-101-g7b9dcc3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-101-g7b9dcc3
|
From: jscheer <js...@us...> - 2010-11-09 15:46: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 7b9dcc33d990f5d45342178a37923c96a5bd2da1 (commit)
via aaa9d9dd1885087d99ddaa66e36885c29108bba2 (commit)
from 74a3da157a5e0c5eafaf4ff88144f8c74f00c599 (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 7b9dcc33d990f5d45342178a37923c96a5bd2da1
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 9 16:46:00 2010 +0100
[LINUX] Change PPS baseboard prompt message in 500-pps-armadeus-add_pps_baseboard.patch.
commit aaa9d9dd1885087d99ddaa66e36885c29108bba2
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 9 16:40:50 2010 +0100
[BUILDROOT] Remove PPS package patch 135-pps-add_test_scripts_package.patch and manually add PPS Buildroot files to Armadeus package.
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 1 +
buildroot/package/armadeus/pps/Config.in | 6 ++
buildroot/package/armadeus/pps/pps.mk | 38 +++++++++++
.../500-pps-armadeus-add_pps_baseboard.patch | 4 +-
.../135-pps-add_test_scripts_package.patch | 70 --------------------
.../2010.11/135-pps-add_test_scripts_package.patch | 70 --------------------
6 files changed, 47 insertions(+), 142 deletions(-)
create mode 100644 buildroot/package/armadeus/pps/Config.in
create mode 100644 buildroot/package/armadeus/pps/pps.mk
delete mode 100644 patches/buildroot/135-pps-add_test_scripts_package.patch
delete mode 100644 patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 355644b..d03f031 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -8,6 +8,7 @@ source package/armadeus/fpgaregs/Config.in
source package/armadeus/imxregs/Config.in
source package/armadeus/imxssi/Config.in
source package/armadeus/max5821ctrl/Config.in
+source package/armadeus/pps/Config.in
source package/armadeus/testsuite/Config.in
endmenu
diff --git a/buildroot/package/armadeus/pps/Config.in b/buildroot/package/armadeus/pps/Config.in
new file mode 100644
index 0000000..383785c
--- /dev/null
+++ b/buildroot/package/armadeus/pps/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS
+ bool "PPS Test scripts"
+ default n
+ help
+ Install PPS Test scripts to test ethernet, wifi & USB Gadget on PPS board.
+ Test scripts will be installed on the APF in /usr/local/pps/scripts.
diff --git a/buildroot/package/armadeus/pps/pps.mk b/buildroot/package/armadeus/pps/pps.mk
new file mode 100644
index 0000000..7df17a4
--- /dev/null
+++ b/buildroot/package/armadeus/pps/pps.mk
@@ -0,0 +1,38 @@
+#############################################################
+#
+# PPS Test scripts
+#
+#############################################################
+
+ARMADEUS-PPS_TESTSCRIPTS_SOURCE:=$(TOPDIR)/../target/pps/scripts
+ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR:=$(TARGET_DIR)/usr/local/pps/scripts
+ARMADEUS-PPS_WWW_DIR:=$(TOPDIR)/../target/pps/www
+ARMADEUS-PPS_WWW_TARGET_DIR:=$(TARGET_DIR)/var
+ARMADEUS-PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
+ARMADEUS-PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/wpa_supplicant
+
+$(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh:
+ $(ARMADEUS-PPS_TESTSCRIPTS_SOURCE)/install.sh $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
+
+$(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html:
+ cp -Rf $(ARMADEUS-PPS_WWW_DIR) $(ARMADEUS-PPS_WWW_TARGET_DIR)
+
+$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig:
+ mkdir -p $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
+ cp -f $(ARMADEUS-PPS_CONFIGS_DIR)/* $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
+
+pps-testscripts: $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig
+
+armadeus-pps-testscripts-clean:
+ rm -rf $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
+ rm -rf $(ARMADEUS-PPS_WWW_TARGET_DIR)/www
+ rm -rf $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS)),y)
+TARGETS+=pps-testscripts
+endif
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
index 24373c2..525edd1 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
@@ -346,11 +346,11 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
version.
+config MACH_PPS
-+ prompt "Md PPS"
++ prompt "Armadeus Systems APF27 PPS Secured Gateway"
+ bool
+ depends on MACH_APF27
+ help
-+ This selects the PPS as baseboard.
++ This selects the APF27 PPS as baseboard.
+
endchoice
diff --git a/patches/buildroot/135-pps-add_test_scripts_package.patch b/patches/buildroot/135-pps-add_test_scripts_package.patch
deleted file mode 100644
index fa9ea66..0000000
--- a/patches/buildroot/135-pps-add_test_scripts_package.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Add package PPS Test scripts to Buildroot.
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/package/armadeus/Config.in
-===================================================================
---- buildroot.orig/package/armadeus/Config.in 2010-11-05 17:04:08.000000000 +0100
-+++ buildroot/package/armadeus/Config.in 2010-11-05 17:05:06.000000000 +0100
-@@ -8,6 +8,7 @@
- source package/armadeus/imxregs/Config.in
- source package/armadeus/imxssi/Config.in
- source package/armadeus/max5821ctrl/Config.in
-+source package/armadeus/pps/Config.in
- source package/armadeus/testsuite/Config.in
-
- endmenu
-Index: buildroot/package/armadeus/pps/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/armadeus/pps/Config.in 2010-11-05 17:05:39.000000000 +0100
-@@ -0,0 +1,6 @@
-+config BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS
-+ bool "PPS Test scripts"
-+ default n
-+ help
-+ Install PPS Test scripts to test ethernet, wifi & USB Gadget on PPS board.
-+ Test scripts will be installed on the APF in /usr/local/pps/scripts.
-Index: buildroot/package/armadeus/pps/pps.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/armadeus/pps/pps.mk 2010-11-08 14:09:58.000000000 +0100
-@@ -0,0 +1,38 @@
-+#############################################################
-+#
-+# PPS Test scripts
-+#
-+#############################################################
-+
-+ARMADEUS-PPS_TESTSCRIPTS_SOURCE:=$(TOPDIR)/../target/pps/scripts
-+ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR:=$(TARGET_DIR)/usr/local/pps/scripts
-+ARMADEUS-PPS_WWW_DIR:=$(TOPDIR)/../target/pps/www
-+ARMADEUS-PPS_WWW_TARGET_DIR:=$(TARGET_DIR)/var
-+ARMADEUS-PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
-+ARMADEUS-PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/wpa_supplicant
-+
-+$(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh:
-+ $(ARMADEUS-PPS_TESTSCRIPTS_SOURCE)/install.sh $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
-+
-+$(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html:
-+ cp -Rf $(ARMADEUS-PPS_WWW_DIR) $(ARMADEUS-PPS_WWW_TARGET_DIR)
-+
-+$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig:
-+ mkdir -p $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+ cp -f $(ARMADEUS-PPS_CONFIGS_DIR)/* $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+
-+pps-testscripts: $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig
-+
-+armadeus-pps-testscripts-clean:
-+ rm -rf $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
-+ rm -rf $(ARMADEUS-PPS_WWW_TARGET_DIR)/www
-+ rm -rf $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS)),y)
-+TARGETS+=pps-testscripts
-+endif
diff --git a/patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch b/patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch
deleted file mode 100644
index 5f10fc1..0000000
--- a/patches/buildroot/2010.11/135-pps-add_test_scripts_package.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Add package PPS Test scripts to Buildroot.
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/package/armadeus/Config.in
-===================================================================
---- buildroot.orig/package/armadeus/Config.in 2010-11-08 10:20:10.000000000 +0100
-+++ buildroot/package/armadeus/Config.in 2010-11-08 14:20:14.000000000 +0100
-@@ -8,6 +8,7 @@
- source package/armadeus/imxregs/Config.in
- source package/armadeus/imxssi/Config.in
- source package/armadeus/max5821ctrl/Config.in
-+source package/armadeus/pps/Config.in
- source package/armadeus/testsuite/Config.in
-
- endmenu
-Index: buildroot/package/armadeus/pps/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/armadeus/pps/Config.in 2010-11-08 14:20:14.000000000 +0100
-@@ -0,0 +1,6 @@
-+config BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS
-+ bool "PPS Test scripts"
-+ default n
-+ help
-+ Install PPS Test scripts to test ethernet, wifi & USB Gadget on PPS board.
-+ Test scripts will be installed on the APF in /usr/local/pps/scripts.
-Index: buildroot/package/armadeus/pps/pps.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/armadeus/pps/pps.mk 2010-11-08 14:20:53.000000000 +0100
-@@ -0,0 +1,38 @@
-+#############################################################
-+#
-+# PPS Test scripts
-+#
-+#############################################################
-+
-+ARMADEUS-PPS_TESTSCRIPTS_SOURCE:=$(TOPDIR)/../target/pps/scripts
-+ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR:=$(TARGET_DIR)/usr/local/pps/scripts
-+ARMADEUS-PPS_WWW_DIR:=$(TOPDIR)/../target/pps/www
-+ARMADEUS-PPS_WWW_TARGET_DIR:=$(TARGET_DIR)/var
-+ARMADEUS-PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
-+ARMADEUS-PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/wpa_supplicant
-+
-+$(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh:
-+ $(ARMADEUS-PPS_TESTSCRIPTS_SOURCE)/install.sh $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
-+
-+$(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html:
-+ cp -Rf $(ARMADEUS-PPS_WWW_DIR) $(ARMADEUS-PPS_WWW_TARGET_DIR)
-+
-+$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig:
-+ mkdir -p $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+ cp -f $(ARMADEUS-PPS_CONFIGS_DIR)/* $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+
-+pps-testscripts: $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig
-+
-+armadeus-pps-testscripts-clean:
-+ rm -rf $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
-+ rm -rf $(ARMADEUS-PPS_WWW_TARGET_DIR)/www
-+ rm -rf $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS)),y)
-+TARGETS+=pps-testscripts
-+endif
hooks/post-receive
--
armadeus
|
