[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-44-g50d319f
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-44-g50d319f
|
From: Julien B a. A. <ar...@us...> - 2012-02-13 16:11:14
|
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 50d319fed0e399971bef3267b1e339def413e49e (commit)
via 7886c80b7aa364d0875d113f8d640b2884fe045c (commit)
from 3069d4accd17f29b2a210594e6020491065ad0cc (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 50d319fed0e399971bef3267b1e339def413e49e
Merge: 7886c80 3069d4a
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 13 17:10:50 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 7886c80b7aa364d0875d113f8d640b2884fe045c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 13 17:10:23 2012 +0100
[BUILDROOT] gsmmux: also handles sagem's custom version and move package to right menuconfig place
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2011.05/172-gsmmux-add_package.patch | 53 ++++++++++++++------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/patches/buildroot/2011.05/172-gsmmux-add_package.patch b/patches/buildroot/2011.05/172-gsmmux-add_package.patch
index 8f24112..2b400cd 100644
--- a/patches/buildroot/2011.05/172-gsmmux-add_package.patch
+++ b/patches/buildroot/2011.05/172-gsmmux-add_package.patch
@@ -4,18 +4,25 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/gsmmux/gsmmux.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gsmmux/gsmmux.mk 2012-02-06 15:51:44.000000000 +0100
-@@ -0,0 +1,31 @@
++++ buildroot/package/gsmmux/gsmmux.mk 2012-02-13 14:22:57.000000000 +0100
+@@ -0,0 +1,38 @@
+#############################################################
+#
+# gsmmux
+#
+#############################################################
+
++GSMMUX_BINARY = gsmMuxd
++ifeq ($(BR2_PACKAGE_GSMMUX_GENERIC),y)
+GSMMUX_VERSION = 18
+GSMMUX_SITE = http://svn.berlios.de/svnroot/repos/gsmmux/trunk
+GSMMUX_SITE_METHOD = svn
-+GSMMUX_BINARY = gsmMuxd
++GSMMUX_BUILD_BINARY = build/$(GSMMUX_BINARY)
++else
++GSMMUX_VERSION = sagem
++GSMMUX_SITE = ftp://ftp2.armadeus.com/armadeusw/downloads
++GSMMUX_BUILD_BINARY = $(GSMMUX_BINARY)
++endif
+GSMMUX_TARGET_DIR = $(TARGET_DIR)/usr/bin
+
+define GSMMUX_BUILD_CMDS
@@ -25,7 +32,7 @@ Index: buildroot/package/gsmmux/gsmmux.mk
+endef
+
+define GSMMUX_INSTALL_TARGET_CMDS
-+ cp $(@D)/build/$(GSMMUX_BINARY) $(GSMMUX_TARGET_DIR)
++ cp $(@D)/$(GSMMUX_BUILD_BINARY) $(GSMMUX_TARGET_DIR)
+endef
+
+define GSMMUX_CLEAN_CMDS
@@ -39,21 +46,21 @@ Index: buildroot/package/gsmmux/gsmmux.mk
+$(eval $(call GENTARGETS,package,gsmmux))
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2012-02-06 15:45:15.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-06 15:45:58.000000000 +0100
-@@ -338,6 +338,7 @@
- #endif
-
- menu "Networking"
+--- buildroot.orig/package/Config.in 2012-02-13 13:56:47.000000000 +0100
++++ buildroot/package/Config.in 2012-02-13 14:21:59.000000000 +0100
+@@ -191,6 +191,7 @@
+ source "package/genromfs/Config.in"
+ source "package/gpm/Config.in"
+ source "package/gpsd/Config.in"
+source "package/gsmmux/Config.in"
- source "package/libcanfestival/Config.in"
- source "package/libcgi/Config.in"
- source "package/libcgicc/Config.in"
+ source "package/gvfs/Config.in"
+ source "package/hal/Config.in"
+ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
Index: buildroot/package/gsmmux/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gsmmux/Config.in 2012-02-06 15:45:08.000000000 +0100
-@@ -0,0 +1,9 @@
++++ buildroot/package/gsmmux/Config.in 2012-02-13 14:20:00.000000000 +0100
+@@ -0,0 +1,25 @@
+config BR2_PACKAGE_GSMMUX
+ bool "gsmmux"
+ help
@@ -63,3 +70,19 @@ Index: buildroot/package/gsmmux/Config.in
+ channel to the modem.
+
+ http://developer.berlios.de/projects/gsmmux/
++
++if BR2_PACKAGE_GSMMUX
++
++choice
++ prompt "Version to use"
++ default BR2_PACKAGE_GSMMUX_SAGEM
++
++config BR2_PACKAGE_GSMMUX_GENERIC
++ bool "generic"
++
++config BR2_PACKAGE_GSMMUX_SAGEM
++ bool "sagem"
++
++endchoice
++
++endif
hooks/post-receive
--
armadeus
|
