[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-33-gead0eaa
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-33-gead0eaa
|
From: Julien B a. A. <ar...@us...> - 2012-02-08 10:10:07
|
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 ead0eaa2661d3bf8292da9c9f786ffaeb622aad3 (commit)
via c129553e3312bd1379da8af8b0b7c82cb96bcfd2 (commit)
via 0afefb09c0b89d1c4cce202094f65a007827940a (commit)
from f0ec980317703907d1695d8e440e25ed7a2dd514 (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 ead0eaa2661d3bf8292da9c9f786ffaeb622aad3
Merge: c129553 f0ec980
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 8 11:09:28 2012 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c129553e3312bd1379da8af8b0b7c82cb96bcfd2
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 8 11:08:41 2012 +0100
[BUILDROOT] Makes 2.6.35.3 the default APF28 kernel version
commit 0afefb09c0b89d1c4cce202094f65a007827940a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 8 09:58:29 2012 +0100
[BUILDROOT] Fixes 169-python-update_from_BR_mainline.patch
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 6 +-
.../169-python-update_from_BR_mainline.patch | 120 ++++++++++----------
2 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index e4f1e6a..4a1a695 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -8,7 +8,7 @@ BR2_JLEVEL=1
BR2_CCACHE=y
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.1"
+BR2_DEFAULT_KERNEL_VERSION="2.6.35.3"
BR2_UCLIBC_VERSION_0_9_30=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_BINUTILS_VERSION_2_20=y
@@ -68,7 +68,7 @@ BR2_TARGET_UBOOT_TOOL_ENV=y
# BR2_TARGET_UBOOT_NETWORK is not set
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.1"
-BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
+BR2_LINUX_KERNEL_PATCH="ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_10.12.01.patch.tar.gz ../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch b/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch
index 8cd7039..b9ea015 100644
--- a/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch
+++ b/patches/buildroot/2011.05/169-python-update_from_BR_mainline.patch
@@ -2,9 +2,9 @@ Updates python package by taking BR mainline as reference
Can be removed when migrating BR to 2012.02
-diff -urN buildroot/package/python/python-2.7-001-support-for-build.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-001-support-for-build.patch
+diff -urN buildroot/package/python/python-2.7-001-support-for-build.patch buildroot_git_dev/package/python/python-2.7-001-support-for-build.patch
--- buildroot/package/python/python-2.7-001-support-for-build.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-001-support-for-build.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-001-support-for-build.patch 2011-09-30 17:12:38.000000000 +0200
@@ -22,11 +22,11 @@
configure.in | 17 +++++++++++++++++
2 files changed, 34 insertions(+), 15 deletions(-)
@@ -108,9 +108,9 @@ diff -urN buildroot/package/python/python-2.7-001-support-for-build.patch /home/
done
AC_MSG_RESULT(done)
-diff -urN buildroot/package/python/python-2.7-002-cross-compile-variable.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-002-cross-compile-variable.patch
+diff -urN buildroot/package/python/python-2.7-002-cross-compile-variable.patch buildroot_git_dev/package/python/python-2.7-002-cross-compile-variable.patch
--- buildroot/package/python/python-2.7-002-cross-compile-variable.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-002-cross-compile-variable.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-002-cross-compile-variable.patch 2011-09-30 17:12:38.000000000 +0200
@@ -15,11 +15,11 @@
configure.in | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
@@ -152,9 +152,9 @@ diff -urN buildroot/package/python/python-2.7-002-cross-compile-variable.patch /
AC_ARG_VAR(PYTHON_FOR_BUILD,[build system Python])
AC_ARG_VAR(PGEN_FOR_BUILD,[build system Python pgen])
-diff -urN buildroot/package/python/python-2.7-003-no-import-when-cross-compiling.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-003-no-import-when-cross-compiling.patch
+diff -urN buildroot/package/python/python-2.7-003-no-import-when-cross-compiling.patch buildroot_git_dev/package/python/python-2.7-003-no-import-when-cross-compiling.patch
--- buildroot/package/python/python-2.7-003-no-import-when-cross-compiling.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-003-no-import-when-cross-compiling.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-003-no-import-when-cross-compiling.patch 2011-09-30 17:12:38.000000000 +0200
@@ -9,10 +9,10 @@
setup.py | 4 ++++
1 file changed, 4 insertions(+)
@@ -169,9 +169,9 @@ diff -urN buildroot/package/python/python-2.7-003-no-import-when-cross-compiling
@@ -304,6 +304,10 @@
self.announce('WARNING: skipping import check for Cygwin-based "%s"'
% ext.name)
-diff -urN buildroot/package/python/python-2.7-004-no-host-headers-libs.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-004-no-host-headers-libs.patch
+diff -urN buildroot/package/python/python-2.7-004-no-host-headers-libs.patch buildroot_git_dev/package/python/python-2.7-004-no-host-headers-libs.patch
--- buildroot/package/python/python-2.7-004-no-host-headers-libs.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-004-no-host-headers-libs.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-004-no-host-headers-libs.patch 2011-09-30 17:12:38.000000000 +0200
@@ -10,23 +10,37 @@
setup.py | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-)
@@ -251,9 +251,9 @@ diff -urN buildroot/package/python/python-2.7-004-no-host-headers-libs.patch /ho
# the more recent berkeleydb's db.h file first in the include path
# when attempting to compile and it will fail.
f = "/usr/include/db.h"
-diff -urN buildroot/package/python/python-2.7-005-staging-headers-libs.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-005-staging-headers-libs.patch
+diff -urN buildroot/package/python/python-2.7-005-staging-headers-libs.patch buildroot_git_dev/package/python/python-2.7-005-staging-headers-libs.patch
--- buildroot/package/python/python-2.7-005-staging-headers-libs.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-005-staging-headers-libs.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-005-staging-headers-libs.patch 2011-09-30 17:12:38.000000000 +0200
@@ -12,12 +12,12 @@
setup.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
@@ -272,9 +272,9 @@ diff -urN buildroot/package/python/python-2.7-005-staging-headers-libs.patch /ho
def detect_modules(self):
+ try:
-diff -urN buildroot/package/python/python-2.7-006-disable-extensions.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-006-disable-extensions.patch
+diff -urN buildroot/package/python/python-2.7-006-disable-extensions.patch buildroot_git_dev/package/python/python-2.7-006-disable-extensions.patch
--- buildroot/package/python/python-2.7-006-disable-extensions.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-006-disable-extensions.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-006-disable-extensions.patch 2011-09-30 17:12:38.000000000 +0200
@@ -38,11 +38,11 @@
setup.py | 5 ++++-
3 files changed, 11 insertions(+), 4 deletions(-)
@@ -339,9 +339,9 @@ diff -urN buildroot/package/python/python-2.7-006-disable-extensions.patch /home
@@ -21,7 +21,10 @@
COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
-diff -urN buildroot/package/python/python-2.7-007-do-not-generate-pyo-files.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-007-do-not-generate-pyo-files.patch
+diff -urN buildroot/package/python/python-2.7-007-do-not-generate-pyo-files.patch buildroot_git_dev/package/python/python-2.7-007-do-not-generate-pyo-files.patch
--- buildroot/package/python/python-2.7-007-do-not-generate-pyo-files.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-007-do-not-generate-pyo-files.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-007-do-not-generate-pyo-files.patch 2011-09-30 17:12:38.000000000 +0200
@@ -13,11 +13,11 @@
Makefile.pre.in | 9 ---------
1 file changed, 9 deletions(-)
@@ -358,9 +358,9 @@ diff -urN buildroot/package/python/python-2.7-007-do-not-generate-pyo-files.patc
-d $(LIBDEST) -f \
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
$(DESTDIR)$(LIBDEST)
-diff -urN buildroot/package/python/python-2.7-008-reread-environment.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-008-reread-environment.patch
+diff -urN buildroot/package/python/python-2.7-008-reread-environment.patch buildroot_git_dev/package/python/python-2.7-008-reread-environment.patch
--- buildroot/package/python/python-2.7-008-reread-environment.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-008-reread-environment.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-008-reread-environment.patch 2011-09-30 17:12:38.000000000 +0200
@@ -25,11 +25,11 @@
setup.py | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
@@ -400,9 +400,9 @@ diff -urN buildroot/package/python/python-2.7-008-reread-environment.patch /home
@@ -20,6 +20,9 @@
# Were we compiled --with-pydebug or with #define Py_DEBUG?
COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
-diff -urN buildroot/package/python/python-2.7-009-python-symlink.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-009-python-symlink.patch
+diff -urN buildroot/package/python/python-2.7-009-python-symlink.patch buildroot_git_dev/package/python/python-2.7-009-python-symlink.patch
--- buildroot/package/python/python-2.7-009-python-symlink.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-009-python-symlink.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-009-python-symlink.patch 2011-09-30 17:12:38.000000000 +0200
@@ -10,11 +10,11 @@
Makefile.pre.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -419,9 +419,9 @@ diff -urN buildroot/package/python/python-2.7-009-python-symlink.patch /home/jul
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
-diff -urN buildroot/package/python/python-2.7-010-change-pyconfig-h-location.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-010-change-pyconfig-h-location.patch
+diff -urN buildroot/package/python/python-2.7-010-change-pyconfig-h-location.patch buildroot_git_dev/package/python/python-2.7-010-change-pyconfig-h-location.patch
--- buildroot/package/python/python-2.7-010-change-pyconfig-h-location.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-010-change-pyconfig-h-location.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-010-change-pyconfig-h-location.patch 2011-09-30 17:12:38.000000000 +0200
@@ -26,10 +26,10 @@
Makefile.pre.in | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
@@ -477,9 +477,9 @@ diff -urN buildroot/package/python/python-2.7-010-change-pyconfig-h-location.pat
$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile
-diff -urN buildroot/package/python/python-2.7-011-no-rpath.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-011-no-rpath.patch
+diff -urN buildroot/package/python/python-2.7-011-no-rpath.patch buildroot_git_dev/package/python/python-2.7-011-no-rpath.patch
--- buildroot/package/python/python-2.7-011-no-rpath.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-011-no-rpath.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-011-no-rpath.patch 2011-09-30 17:12:38.000000000 +0200
@@ -13,11 +13,11 @@
setup.py | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
@@ -523,9 +523,9 @@ diff -urN buildroot/package/python/python-2.7-011-no-rpath.patch /home/julien/wo
elif cand == "bdb":
if db_incs is not None:
print "building dbm using bdb"
-diff -urN buildroot/package/python/python-2.7-012-correct-32bit-64bit-check.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-012-correct-32bit-64bit-check.patch
+diff -urN buildroot/package/python/python-2.7-012-correct-32bit-64bit-check.patch buildroot_git_dev/package/python/python-2.7-012-correct-32bit-64bit-check.patch
--- buildroot/package/python/python-2.7-012-correct-32bit-64bit-check.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-012-correct-32bit-64bit-check.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-012-correct-32bit-64bit-check.patch 2011-09-30 17:12:38.000000000 +0200
@@ -16,10 +16,10 @@
setup.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
@@ -558,9 +558,9 @@ diff -urN buildroot/package/python/python-2.7-012-correct-32bit-64bit-check.patc
missing.append('_codecs_%s' % loc)
# Dynamic loading module
-diff -urN buildroot/package/python/python-2.7-013-fix-linux-3-compilation.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-013-fix-linux-3-compilation.patch
+diff -urN buildroot/package/python/python-2.7-013-fix-linux-3-compilation.patch buildroot_git_dev/package/python/python-2.7-013-fix-linux-3-compilation.patch
--- buildroot/package/python/python-2.7-013-fix-linux-3-compilation.patch 1970-01-01 01:00:00.000000000 +0100
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-013-fix-linux-3-compilation.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-013-fix-linux-3-compilation.patch 2011-09-30 17:12:38.000000000 +0200
@@ -0,0 +1,24 @@
+Index: Python-2.7.2/configure
+===================================================================
@@ -586,9 +586,9 @@ diff -urN buildroot/package/python/python-2.7-013-fix-linux-3-compilation.patch
+ '') MACHDEP="unknown";;
+ esac
+ fi
-diff -urN buildroot/package/python/python-2.7-014-verbose-module-build.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-014-verbose-module-build.patch
+diff -urN buildroot/package/python/python-2.7-014-verbose-module-build.patch buildroot_git_dev/package/python/python-2.7-014-verbose-module-build.patch
--- buildroot/package/python/python-2.7-014-verbose-module-build.patch 1970-01-01 01:00:00.000000000 +0100
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-014-verbose-module-build.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-014-verbose-module-build.patch 2011-09-30 17:12:38.000000000 +0200
@@ -0,0 +1,19 @@
+Enables verbose output when building modules
+
@@ -609,9 +609,9 @@ diff -urN buildroot/package/python/python-2.7-014-verbose-module-build.patch /ho
+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' CROSS_COMPILING=@CROSS_COMPILING@ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" CONFIG_ARGS="$(CONFIG_ARGS)" $(PYTHON_FOR_BUILD) -E $(srcdir)/setup.py build;; \
+ esac
+
-diff -urN buildroot/package/python/python-2.7-015-distutils-cross-compilation-support.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-015-distutils-cross-compilation-support.patch
+diff -urN buildroot/package/python/python-2.7-015-distutils-cross-compilation-support.patch buildroot_git_dev/package/python/python-2.7-015-distutils-cross-compilation-support.patch
--- buildroot/package/python/python-2.7-015-distutils-cross-compilation-support.patch 1970-01-01 01:00:00.000000000 +0100
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-015-distutils-cross-compilation-support.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-015-distutils-cross-compilation-support.patch 2011-09-30 17:12:38.000000000 +0200
@@ -0,0 +1,84 @@
+Add some cross-compilation fixes to distutils
+
@@ -697,9 +697,9 @@ diff -urN buildroot/package/python/python-2.7-015-distutils-cross-compilation-su
+ # generate output files
+ AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
+ AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
-diff -urN buildroot/package/python/python-2.7-100-optional-test-modules.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-100-optional-test-modules.patch
+diff -urN buildroot/package/python/python-2.7-100-optional-test-modules.patch buildroot_git_dev/package/python/python-2.7-100-optional-test-modules.patch
--- buildroot/package/python/python-2.7-100-optional-test-modules.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-100-optional-test-modules.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-100-optional-test-modules.patch 2011-09-30 17:12:38.000000000 +0200
@@ -10,20 +10,19 @@
configure.in | 6 ++++++
2 files changed, 33 insertions(+), 13 deletions(-)
@@ -780,9 +780,9 @@ diff -urN buildroot/package/python/python-2.7-100-optional-test-modules.patch /h
fi
-diff -urN buildroot/package/python/python-2.7-101-optional-pydoc.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-101-optional-pydoc.patch
+diff -urN buildroot/package/python/python-2.7-101-optional-pydoc.patch buildroot_git_dev/package/python/python-2.7-101-optional-pydoc.patch
--- buildroot/package/python/python-2.7-101-optional-pydoc.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-101-optional-pydoc.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-101-optional-pydoc.patch 2011-09-30 17:12:38.000000000 +0200
@@ -11,11 +11,11 @@
setup.py | 10 +++++++---
3 files changed, 17 insertions(+), 4 deletions(-)
@@ -853,9 +853,9 @@ diff -urN buildroot/package/python/python-2.7-101-optional-pydoc.patch /home/jul
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
-diff -urN buildroot/package/python/python-2.7-102-optional-2to3.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-102-optional-2to3.patch
+diff -urN buildroot/package/python/python-2.7-102-optional-2to3.patch buildroot_git_dev/package/python/python-2.7-102-optional-2to3.patch
--- buildroot/package/python/python-2.7-102-optional-2to3.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-102-optional-2to3.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-102-optional-2to3.patch 2011-09-30 17:12:38.000000000 +0200
@@ -11,34 +11,29 @@
setup.py | 5 +++--
3 files changed, 26 insertions(+), 9 deletions(-)
@@ -940,9 +940,9 @@ diff -urN buildroot/package/python/python-2.7-102-optional-2to3.patch /home/juli
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
-diff -urN buildroot/package/python/python-2.7-103-optional-sqlite.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-103-optional-sqlite.patch
+diff -urN buildroot/package/python/python-2.7-103-optional-sqlite.patch buildroot_git_dev/package/python/python-2.7-103-optional-sqlite.patch
--- buildroot/package/python/python-2.7-103-optional-sqlite.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-103-optional-sqlite.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-103-optional-sqlite.patch 2011-09-30 17:12:38.000000000 +0200
@@ -6,11 +6,11 @@
configure.in | 9 +++++++++
1 file changed, 9 insertions(+)
@@ -959,9 +959,9 @@ diff -urN buildroot/package/python/python-2.7-103-optional-sqlite.patch /home/ju
esac])
fi
-diff -urN buildroot/package/python/python-2.7-104-optional-tk.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-104-optional-tk.patch
+diff -urN buildroot/package/python/python-2.7-104-optional-tk.patch buildroot_git_dev/package/python/python-2.7-104-optional-tk.patch
--- buildroot/package/python/python-2.7-104-optional-tk.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-104-optional-tk.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-104-optional-tk.patch 2011-09-30 17:12:38.000000000 +0200
@@ -7,31 +7,30 @@
configure.in | 9 +++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
@@ -1023,9 +1023,9 @@ diff -urN buildroot/package/python/python-2.7-104-optional-tk.patch /home/julien
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
-diff -urN buildroot/package/python/python-2.7-105-optional-curses.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-105-optional-curses.patch
+diff -urN buildroot/package/python/python-2.7-105-optional-curses.patch buildroot_git_dev/package/python/python-2.7-105-optional-curses.patch
--- buildroot/package/python/python-2.7-105-optional-curses.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-105-optional-curses.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-105-optional-curses.patch 2011-09-30 17:12:38.000000000 +0200
@@ -7,11 +7,11 @@
configure.in | 9 +++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
@@ -1069,9 +1069,9 @@ diff -urN buildroot/package/python/python-2.7-105-optional-curses.patch /home/ju
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi
-diff -urN buildroot/package/python/python-2.7-106-optional-expat.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-106-optional-expat.patch
+diff -urN buildroot/package/python/python-2.7-106-optional-expat.patch buildroot_git_dev/package/python/python-2.7-106-optional-expat.patch
--- buildroot/package/python/python-2.7-106-optional-expat.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-106-optional-expat.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-106-optional-expat.patch 2011-09-30 17:12:38.000000000 +0200
@@ -14,20 +14,20 @@
setup.py | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-)
@@ -1133,9 +1133,9 @@ diff -urN buildroot/package/python/python-2.7-106-optional-expat.patch /home/jul
#
# More information on Expat can be found at www.libexpat.org.
#
-diff -urN buildroot/package/python/python-2.7-107-optional-codecs-cjk.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-107-optional-codecs-cjk.patch
+diff -urN buildroot/package/python/python-2.7-107-optional-codecs-cjk.patch buildroot_git_dev/package/python/python-2.7-107-optional-codecs-cjk.patch
--- buildroot/package/python/python-2.7-107-optional-codecs-cjk.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-107-optional-codecs-cjk.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-107-optional-codecs-cjk.patch 2011-09-30 17:12:38.000000000 +0200
@@ -6,11 +6,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1152,9 +1152,9 @@ diff -urN buildroot/package/python/python-2.7-107-optional-codecs-cjk.patch /hom
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
-diff -urN buildroot/package/python/python-2.7-108-optional-nis.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-108-optional-nis.patch
+diff -urN buildroot/package/python/python-2.7-108-optional-nis.patch buildroot_git_dev/package/python/python-2.7-108-optional-nis.patch
--- buildroot/package/python/python-2.7-108-optional-nis.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-108-optional-nis.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-108-optional-nis.patch 2011-09-30 17:12:38.000000000 +0200
@@ -9,11 +9,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1171,9 +1171,9 @@ diff -urN buildroot/package/python/python-2.7-108-optional-nis.patch /home/julie
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
fi])
-diff -urN buildroot/package/python/python-2.7-109-optional-unicodedata.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-109-optional-unicodedata.patch
+diff -urN buildroot/package/python/python-2.7-109-optional-unicodedata.patch buildroot_git_dev/package/python/python-2.7-109-optional-unicodedata.patch
--- buildroot/package/python/python-2.7-109-optional-unicodedata.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-109-optional-unicodedata.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-109-optional-unicodedata.patch 2011-09-30 17:12:38.000000000 +0200
@@ -6,11 +6,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1190,9 +1190,9 @@ diff -urN buildroot/package/python/python-2.7-109-optional-unicodedata.patch /ho
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
-diff -urN buildroot/package/python/python-2.7-110-optional-db.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-110-optional-db.patch
+diff -urN buildroot/package/python/python-2.7-110-optional-db.patch buildroot_git_dev/package/python/python-2.7-110-optional-db.patch
--- buildroot/package/python/python-2.7-110-optional-db.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-110-optional-db.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-110-optional-db.patch 2011-09-30 17:12:38.000000000 +0200
@@ -11,28 +11,29 @@
configure.in | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
@@ -1253,9 +1253,9 @@ diff -urN buildroot/package/python/python-2.7-110-optional-db.patch /home/julien
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
-diff -urN buildroot/package/python/python-2.7-111-optional-ssl.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-111-optional-ssl.patch
+diff -urN buildroot/package/python/python-2.7-111-optional-ssl.patch buildroot_git_dev/package/python/python-2.7-111-optional-ssl.patch
--- buildroot/package/python/python-2.7-111-optional-ssl.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-111-optional-ssl.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-111-optional-ssl.patch 2011-09-30 17:12:38.000000000 +0200
@@ -6,11 +6,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1272,9 +1272,9 @@ diff -urN buildroot/package/python/python-2.7-111-optional-ssl.patch /home/julie
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
-diff -urN buildroot/package/python/python-2.7-112-optional-bzip2.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-112-optional-bzip2.patch
+diff -urN buildroot/package/python/python-2.7-112-optional-bzip2.patch buildroot_git_dev/package/python/python-2.7-112-optional-bzip2.patch
--- buildroot/package/python/python-2.7-112-optional-bzip2.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-112-optional-bzip2.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-112-optional-bzip2.patch 2011-09-30 17:12:38.000000000 +0200
@@ -5,11 +5,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1291,9 +1291,9 @@ diff -urN buildroot/package/python/python-2.7-112-optional-bzip2.patch /home/jul
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
fi])
-diff -urN buildroot/package/python/python-2.7-113-optional-zlib.patch /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-113-optional-zlib.patch
+diff -urN buildroot/package/python/python-2.7-113-optional-zlib.patch buildroot_git_dev/package/python/python-2.7-113-optional-zlib.patch
--- buildroot/package/python/python-2.7-113-optional-zlib.patch 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python-2.7-113-optional-zlib.patch 2011-09-30 17:12:38.000000000 +0200
++++ buildroot_git_dev/package/python/python-2.7-113-optional-zlib.patch 2011-09-30 17:12:38.000000000 +0200
@@ -5,11 +5,11 @@
configure.in | 6 ++++++
1 file changed, 6 insertions(+)
@@ -1310,9 +1310,9 @@ diff -urN buildroot/package/python/python-2.7-113-optional-zlib.patch /home/juli
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
fi])
-diff -urN buildroot/package/python/python.mk /home/julien/workspace/buildroot_git_dev/package/python/python.mk
+diff -urN buildroot/package/python/python.mk buildroot_git_dev/package/python/python.mk
--- buildroot/package/python/python.mk 2011-05-27 16:18:21.000000000 +0200
-+++ /home/julien/workspace/buildroot_git_dev/package/python/python.mk 2012-01-10 16:28:47.000000000 +0100
++++ buildroot_git_dev/package/python/python.mk 2012-01-10 16:28:47.000000000 +0100
@@ -4,7 +4,7 @@
#
#############################################################
hooks/post-receive
--
armadeus
|
