[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-612-gdffc5c7
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-612-gdffc5c7
|
From: Sébastien S. <ss...@us...> - 2015-02-19 11:23:41
|
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 dffc5c7fdd62e1412cadfb6060beb7b595047340 (commit)
from d8d223316c87e9b195bae8f4c448f0c4cbed497e (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 dffc5c7fdd62e1412cadfb6060beb7b595047340
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 19 12:28:36 2015 +0100
[BUILDROOT] 2015.02: fix patches 017 and 018
-----------------------------------------------------------------------
Summary of changes:
.../2015.02/017-armadeus-add-rxtx-package.patch | 36 ++++++++++----------
.../018-armadeus-add-pcidebug-package.patch | 28 ++++++++--------
patches/buildroot/2015.02/cleanup_buildroot.sh | 3 +-
3 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch b/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch
index 06c7e0e..15a74b3 100644
--- a/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch
+++ b/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch
@@ -1,19 +1,19 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2015-02-17 22:28:58.031607275 +0100
-+++ buildroot/package/Config.in 2015-02-18 08:48:22.331606200 +0100
-@@ -349,6 +349,7 @@
- source "package/read-edid/Config.in"
- source "package/rng-tools/Config.in"
- source "package/rpi-userland/Config.in"
-+source "package/rxtx/Config.in"
- source "package/sane-backends/Config.in"
- source "package/sam7-pgm-ng/Config.in"
- source "package/sdparm/Config.in"
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -369,6 +369,7 @@ endif
+ source "package/read-edid/Config.in"
+ source "package/rng-tools/Config.in"
+ source "package/rpi-userland/Config.in"
++ source "package/rxtx/Config.in"
+ source "package/sane-backends/Config.in"
+ source "package/sam7-pgm-ng/Config.in"
+ source "package/sdparm/Config.in"
Index: buildroot/package/rxtx/Config.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/rxtx/Config.in 2015-02-18 09:06:45.577077357 +0100
+--- /dev/null
++++ buildroot/package/rxtx/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_RXTX
+ bool "rxtx"
@@ -29,8 +29,8 @@ Index: buildroot/package/rxtx/Config.in
+ depends on !BR2_PACKAGE_RXTX
Index: buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch 2015-02-18 08:49:35.103967048 +0100
+--- /dev/null
++++ buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
@@ -0,0 +1,90 @@
+--- rxtx-2.1-7r2/src/I2CImp.c.orig 2004-10-17 16:23:02.000000000 +0200
++++ rxtx-2.1-7r2/src/I2CImp.c 2006-10-26 21:25:32.000000000 +0200
@@ -124,8 +124,8 @@ Index: buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
+ #endif /* WIN32 */
Index: buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch 2015-02-18 08:49:35.103967048 +0100
+--- /dev/null
++++ buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
@@ -0,0 +1,38 @@
+--- rxtx-2.1-7r2/configure.ori 2006-01-30 05:37:40.000000000 +0100
++++ rxtx-2.1-7r2/configure 2011-02-27 00:15:04.000000000 +0100
@@ -167,8 +167,8 @@ Index: buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
+ 1.1*)
Index: buildroot/package/rxtx/rxtx.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/rxtx/rxtx.mk 2015-02-18 08:59:46.274997681 +0100
+--- /dev/null
++++ buildroot/package/rxtx/rxtx.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
diff --git a/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch b/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch
index 88e1ef2..8a8b11e 100644
--- a/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch
+++ b/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch
@@ -1,19 +1,19 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2015-02-18 09:14:28.467372230 +0100
-+++ buildroot/package/Config.in 2015-02-18 09:36:09.873825541 +0100
-@@ -344,6 +344,7 @@
- source "package/owfs/Config.in"
- source "package/owl-linux/Config.in"
- source "package/parted/Config.in"
-+source "package/pci_debug/Config.in"
- source "package/pciutils/Config.in"
- source "package/picocom/Config.in"
- source "package/read-edid/Config.in"
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -362,6 +362,7 @@ endif
+ source "package/owfs/Config.in"
+ source "package/owl-linux/Config.in"
+ source "package/parted/Config.in"
++ source "package/pci_debug/Config.in"
+ source "package/pciutils/Config.in"
+ source "package/picocom/Config.in"
+ source "package/pifmrds/Config.in"
Index: buildroot/package/pci_debug/Config.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pci_debug/Config.in 2015-02-18 09:43:45.860087739 +0100
+--- /dev/null
++++ buildroot/package/pci_debug/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_PCI_DEBUG
+ bool "pcidebug"
@@ -31,8 +31,8 @@ Index: buildroot/package/pci_debug/Config.in
+ http://www.ovro.caltech.edu/%7Edwh/correlator/pdf/altera_pcie.zip
Index: buildroot/package/pci_debug/pci_debug.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pci_debug/pci_debug.mk 2015-02-18 10:01:50.657466829 +0100
+--- /dev/null
++++ buildroot/package/pci_debug/pci_debug.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index 93c8826..cab2e20 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -4,7 +4,8 @@
# #
# Removes files added or modified through patches. #
# #
-# This file has been automatically generated. #
+# This file has been automatically generated by: #
+# scripts/quiltify.sh export #
# #
####################################################
hooks/post-receive
--
armadeus
|