[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-412-gc9c6a59
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-412-gc9c6a59
|
From: Julien B a. A. <ar...@us...> - 2013-08-25 19:51:21
|
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 c9c6a5994c04428532e93e64ff8d618ae4e278c9 (commit)
from 94de3699fe386f51ba1a3e793cc65256501e0557 (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 c9c6a5994c04428532e93e64ff8d618ae4e278c9
Author: Julien Boibessot <jul...@ar...>
Date: Sun Aug 25 21:50:47 2013 +0200
[BUILDROOT] [2013.05] Fixes patch 201 (gnokii)
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2013.05/188-marble-add_package.patch | 10 +++++-----
.../2013.05/201-armadeus-add_gnokii.patch | 14 +++++++-------
.../207-armadeus-add_python_pyro_3.14.patch | 10 +++++-----
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/patches/buildroot/2013.05/188-marble-add_package.patch b/patches/buildroot/2013.05/188-marble-add_package.patch
index b11e9e1..62eee91 100644
--- a/patches/buildroot/2013.05/188-marble-add_package.patch
+++ b/patches/buildroot/2013.05/188-marble-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2013-08-22 17:52:32.000000000 +0200
-+++ buildroot/package/Config.in 2013-08-22 18:15:49.000000000 +0200
-@@ -146,6 +146,7 @@
+--- buildroot.orig/package/Config.in 2013-08-25 21:48:05.281080224 +0200
++++ buildroot/package/Config.in 2013-08-25 21:48:05.445081025 +0200
+@@ -156,6 +156,7 @@
comment "other GUIs"
source "package/efl/Config.in"
source "package/qt/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/marble/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/marble/Config.in 2013-08-22 17:52:32.000000000 +0200
++++ buildroot/package/marble/Config.in 2013-08-25 21:48:05.445081025 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_MARBLE
+ bool "KDE Marble"
@@ -33,7 +33,7 @@ Index: buildroot/package/marble/Config.in
Index: buildroot/package/marble/marble.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/marble/marble.mk 2013-08-22 18:07:18.000000000 +0200
++++ buildroot/package/marble/marble.mk 2013-08-25 21:48:05.445081025 +0200
@@ -0,0 +1,51 @@
+#############################################################
+#
diff --git a/patches/buildroot/2013.05/201-armadeus-add_gnokii.patch b/patches/buildroot/2013.05/201-armadeus-add_gnokii.patch
index 9816079..7c34e46 100644
--- a/patches/buildroot/2013.05/201-armadeus-add_gnokii.patch
+++ b/patches/buildroot/2013.05/201-armadeus-add_gnokii.patch
@@ -7,14 +7,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2013-04-03 15:46:12.000000000 +0200
+++ buildroot/package/Config.in 2013-04-03 15:46:12.000000000 +0200
-@@ -218,6 +218,7 @@
- source "package/flashbench/Config.in"
- source "package/genext2fs/Config.in"
- source "package/genromfs/Config.in"
+@@ -719,6 +719,7 @@
+ source "package/ebtables/Config.in"
+ source "package/ethtool/Config.in"
+ source "package/gesftpserver/Config.in"
+source "package/gnokii/Config.in"
- source "package/makedevs/Config.in"
- source "package/mtd/Config.in"
- source "package/nfs-utils/Config.in"
+ source "package/heirloom-mailx/Config.in"
+ source "package/hiawatha/Config.in"
+ source "package/hostapd/Config.in"
Index: buildroot/package/gnokii/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2013.05/207-armadeus-add_python_pyro_3.14.patch b/patches/buildroot/2013.05/207-armadeus-add_python_pyro_3.14.patch
index c6b4b26..8aee727 100644
--- a/patches/buildroot/2013.05/207-armadeus-add_python_pyro_3.14.patch
+++ b/patches/buildroot/2013.05/207-armadeus-add_python_pyro_3.14.patch
@@ -5,9 +5,9 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2013-07-17 15:36:59.458364680 +0200
-+++ buildroot/package/Config.in 2013-07-17 15:47:51.258374825 +0200
-@@ -362,6 +362,7 @@
+--- buildroot.orig/package/Config.in 2013-08-25 21:48:18.733146929 +0200
++++ buildroot/package/Config.in 2013-08-25 21:48:18.761147059 +0200
+@@ -361,6 +361,7 @@
source "package/python-nfc/Config.in"
source "package/python-protobuf/Config.in"
source "package/python-pygame/Config.in"
@@ -18,7 +18,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/python-pyro/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/python-pyro/Config.in 2013-07-17 15:44:56.634372109 +0200
++++ buildroot/package/python-pyro/Config.in 2013-08-25 21:48:18.765147087 +0200
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_PYRO
+ bool "python-pyro"
@@ -32,7 +32,7 @@ Index: buildroot/package/python-pyro/Config.in
Index: buildroot/package/python-pyro/python-pyro.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/python-pyro/python-pyro.mk 2013-07-17 15:48:24.678375347 +0200
++++ buildroot/package/python-pyro/python-pyro.mk 2013-08-25 21:48:18.765147087 +0200
@@ -0,0 +1,17 @@
+#############################################################
+#
hooks/post-receive
--
armadeus
|
