* [Buildroot] [PATCH] package/mke2img: do not overshoot user-specified size
From: Thomas Petazzoni @ 2014-12-28 21:08 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1419797482-28041-1-git-send-email-yann.morin.1998@free.fr>
Dear Yann E. MORIN,
On Sun, 28 Dec 2014 21:11:22 +0100, Yann E. MORIN wrote:
> Currently, we forcibly expand the generated filesystem by 1300 blocks
> (i.e. a bit more than 1MiB) when we need to generate an ext3 or ext4
> filesystem, even if the user already supplied us with the size it wants
> the filesystem to be.
>
> In that case, we overshoot what the user requested, which is bad because
> the filesystem may no longer fit in the partition it is supposed to be
> written into.
>
> Only add extra blocks when we do compute the required size, not when the
> user specifies the size.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/mke2img/mke2img | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
Thanks, applied after doing some quick testing: an ext2 image with a
user-specified size, and an ext3 image with an automatically calculated
size.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] package/mke2img: do not overshoot user-specified size
From: Thomas Petazzoni @ 2014-12-28 21:07 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a869f78ed153c440342478a09640ada2069e786f
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Currently, we forcibly expand the generated filesystem by 1300 blocks
(i.e. a bit more than 1MiB) when we need to generate an ext3 or ext4
filesystem, even if the user already supplied us with the size it wants
the filesystem to be.
In that case, we overshoot what the user requested, which is bad because
the filesystem may no longer fit in the partition it is supposed to be
written into.
Only add extra blocks when we do compute the required size, not when the
user specifies the size.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/mke2img/mke2img | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/package/mke2img/mke2img b/package/mke2img/mke2img
index 9c56bc2..e93d869 100755
--- a/package/mke2img/mke2img
+++ b/package/mke2img/mke2img
@@ -66,6 +66,12 @@ main() {
# bitmaps size + slack
nb_blocks=$(du -s -k "${root_dir}" |sed -r -e 's/[[:space:]]+.*$//')
nb_blocks=$((500+(nb_blocks+nb_inodes/8)*11/10))
+ if [ ${gen} -ge 3 ]; then
+ # we add 1300 blocks (a bit more than 1 MiB, assuming 1KiB blocks)
+ # for the journal
+ # Note: I came to 1300 blocks after trial-and-error checks. YMMV.
+ nb_blocks=$((nb_blocks+1300))
+ fi
fi
# Upgrade to rev1 if needed
@@ -76,10 +82,6 @@ main() {
# Add a journal for ext3 and above
if [ ${gen} -ge 3 ]; then
tune2fs_opts+=( -j -J size=1 )
- # we add 1300 blocks (a bit more than 1 MiB, assuming 1KiB blocks)
- # for the journal
- # Note: I came to 1300 blocks after trial-and-error checks. YMMV.
- nb_blocks=$((nb_blocks+1300))
fi
# Add ext4 specific features
^ permalink raw reply related
* [Buildroot] [PATCH] sdparm: bump to version 1.09
From: Thomas Petazzoni @ 2014-12-28 21:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1419780278-2727-1-git-send-email-gustavo@zacarias.com.ar>
Dear Gustavo Zacarias,
On Sun, 28 Dec 2014 12:24:38 -0300, Gustavo Zacarias wrote:
> Also add hash file.
> And make the libsgutils2 support (from sg3_utils) deterministic.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/sdparm/sdparm.hash | 2 ++
> package/sdparm/sdparm.mk | 10 ++++++++--
> 2 files changed, 10 insertions(+), 2 deletions(-)
> create mode 100644 package/sdparm/sdparm.hash
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] sdparm: bump to version 1.09
From: Thomas Petazzoni @ 2014-12-28 21:04 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=09a3e7545f12d588cfb4ff1428d6bf4943e34072
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Also add hash file.
And make the libsgutils2 support (from sg3_utils) deterministic.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/sdparm/sdparm.hash | 2 ++
package/sdparm/sdparm.mk | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/package/sdparm/sdparm.hash b/package/sdparm/sdparm.hash
new file mode 100644
index 0000000..ff5e7b6
--- /dev/null
+++ b/package/sdparm/sdparm.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 0f5e07438ef56e045443bd827008a38076e029558b00adbfc45f9cc8a5c75349 sdparm-1.09.tar.xz
diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk
index 1b3ec4b..4aff25d 100644
--- a/package/sdparm/sdparm.mk
+++ b/package/sdparm/sdparm.mk
@@ -4,10 +4,16 @@
#
################################################################################
-SDPARM_VERSION = 1.08
-SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tgz
+SDPARM_VERSION = 1.09
+SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tar.xz
SDPARM_SITE = http://sg.danny.cz/sg/p
SDPARM_LICENSE = BSD-3c
SDPARM_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_SG3_UTILS),y)
+SDPARM_DEPENDENCIES += sg3_utils
+else
+SDPARM_CONF_OPTS += --disable-libsgutils
+endif
+
$(eval $(autotools-package))
^ permalink raw reply related
* [Buildroot] [PATCH 4/4] python: rename patches to the new convention
From: Thomas Petazzoni @ 2014-12-28 20:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1419800095-7808-1-git-send-email-thomas.petazzoni@free-electrons.com>
Now that we don't use completely sequential numbers, because patches
below 100 are used to address cross-compilation issues in Python,
while patches above 100 are used to make more Python modules
configurable.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...01-remove-host-header-path.patch => 001-remove-host-header-path.patch} | 0
.../{python-002-fix-get-python-inc.patch => 002-fix-get-python-inc.patch} | 0
...ta-install-location.patch => 004-sysconfigdata-install-location.patch} | 0
...python-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} | 0
...ross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} | 0
.../{python-007-disable-extensions.patch => 007-disable-extensions.patch} | 0
...ls-use-python-sysroot.patch => 008-distutils-use-python-sysroot.patch} | 0
...thon-009-no-termcap-host-path.patch => 009-no-termcap-host-path.patch} | 0
.../{python-010-fix-python-config.patch => 010-fix-python-config.patch} | 0
...on-011-remove-python-symlink.patch => 011-remove-python-symlink.patch} | 0
...h-old-compilers.patch => 012-support-library-path-old-compilers.patch} | 0
...13-dont-add-multiarch-path.patch => 013-dont-add-multiarch-path.patch} | 0
...14-abort-on-failed-modules.patch => 014-abort-on-failed-modules.patch} | 0
...-sqlite-without-threads.patch => 015-fix-sqlite-without-threads.patch} | 0
...16-serial-ioctl-workaround.patch => 016-serial-ioctl-workaround.patch} | 0
...just-shebang.patch => 017-distutils-scripts-dont-adjust-shebang.patch} | 0
...on-100-optional-test-modules.patch => 100-optional-test-modules.patch} | 0
.../python/{python-101-optional-pydoc.patch => 101-optional-pydoc.patch} | 0
.../python/{python-102-optional-2to3.patch => 102-optional-2to3.patch} | 0
.../{python-103-optional-sqlite.patch => 103-optional-sqlite.patch} | 0
package/python/{python-104-optional-tk.patch => 104-optional-tk.patch} | 0
.../{python-105-optional-curses.patch => 105-optional-curses.patch} | 0
.../python/{python-106-optional-expat.patch => 106-optional-expat.patch} | 0
...python-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} | 0
package/python/{python-108-optional-nis.patch => 108-optional-nis.patch} | 0
...thon-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} | 0
package/python/{python-110-optional-db.patch => 110-optional-db.patch} | 0
package/python/{python-111-optional-ssl.patch => 111-optional-ssl.patch} | 0
.../python/{python-112-optional-bzip2.patch => 112-optional-bzip2.patch} | 0
.../python/{python-113-optional-zlib.patch => 113-optional-zlib.patch} | 0
.../{python-114-remove-idle-editor.patch => 114-remove-idle-editor.patch} | 0
31 files changed, 0 insertions(+), 0 deletions(-)
rename package/python/{python-001-remove-host-header-path.patch => 001-remove-host-header-path.patch} (100%)
rename package/python/{python-002-fix-get-python-inc.patch => 002-fix-get-python-inc.patch} (100%)
rename package/python/{python-004-sysconfigdata-install-location.patch => 004-sysconfigdata-install-location.patch} (100%)
rename package/python/{python-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} (100%)
rename package/python/{python-006-cross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} (100%)
rename package/python/{python-007-disable-extensions.patch => 007-disable-extensions.patch} (100%)
rename package/python/{python-008-distutils-use-python-sysroot.patch => 008-distutils-use-python-sysroot.patch} (100%)
rename package/python/{python-009-no-termcap-host-path.patch => 009-no-termcap-host-path.patch} (100%)
rename package/python/{python-010-fix-python-config.patch => 010-fix-python-config.patch} (100%)
rename package/python/{python-011-remove-python-symlink.patch => 011-remove-python-symlink.patch} (100%)
rename package/python/{python-012-support-library-path-old-compilers.patch => 012-support-library-path-old-compilers.patch} (100%)
rename package/python/{python-013-dont-add-multiarch-path.patch => 013-dont-add-multiarch-path.patch} (100%)
rename package/python/{python-014-abort-on-failed-modules.patch => 014-abort-on-failed-modules.patch} (100%)
rename package/python/{python-015-fix-sqlite-without-threads.patch => 015-fix-sqlite-without-threads.patch} (100%)
rename package/python/{python-016-serial-ioctl-workaround.patch => 016-serial-ioctl-workaround.patch} (100%)
rename package/python/{python-017-distutils-scripts-dont-adjust-shebang.patch => 017-distutils-scripts-dont-adjust-shebang.patch} (100%)
rename package/python/{python-100-optional-test-modules.patch => 100-optional-test-modules.patch} (100%)
rename package/python/{python-101-optional-pydoc.patch => 101-optional-pydoc.patch} (100%)
rename package/python/{python-102-optional-2to3.patch => 102-optional-2to3.patch} (100%)
rename package/python/{python-103-optional-sqlite.patch => 103-optional-sqlite.patch} (100%)
rename package/python/{python-104-optional-tk.patch => 104-optional-tk.patch} (100%)
rename package/python/{python-105-optional-curses.patch => 105-optional-curses.patch} (100%)
rename package/python/{python-106-optional-expat.patch => 106-optional-expat.patch} (100%)
rename package/python/{python-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} (100%)
rename package/python/{python-108-optional-nis.patch => 108-optional-nis.patch} (100%)
rename package/python/{python-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} (100%)
rename package/python/{python-110-optional-db.patch => 110-optional-db.patch} (100%)
rename package/python/{python-111-optional-ssl.patch => 111-optional-ssl.patch} (100%)
rename package/python/{python-112-optional-bzip2.patch => 112-optional-bzip2.patch} (100%)
rename package/python/{python-113-optional-zlib.patch => 113-optional-zlib.patch} (100%)
rename package/python/{python-114-remove-idle-editor.patch => 114-remove-idle-editor.patch} (100%)
diff --git a/package/python/python-001-remove-host-header-path.patch b/package/python/001-remove-host-header-path.patch
similarity index 100%
rename from package/python/python-001-remove-host-header-path.patch
rename to package/python/001-remove-host-header-path.patch
diff --git a/package/python/python-002-fix-get-python-inc.patch b/package/python/002-fix-get-python-inc.patch
similarity index 100%
rename from package/python/python-002-fix-get-python-inc.patch
rename to package/python/002-fix-get-python-inc.patch
diff --git a/package/python/python-004-sysconfigdata-install-location.patch b/package/python/004-sysconfigdata-install-location.patch
similarity index 100%
rename from package/python/python-004-sysconfigdata-install-location.patch
rename to package/python/004-sysconfigdata-install-location.patch
diff --git a/package/python/python-005-pyc-pyo-conditional.patch b/package/python/005-pyc-pyo-conditional.patch
similarity index 100%
rename from package/python/python-005-pyc-pyo-conditional.patch
rename to package/python/005-pyc-pyo-conditional.patch
diff --git a/package/python/python-006-cross-compile-getaddrinfo.patch b/package/python/006-cross-compile-getaddrinfo.patch
similarity index 100%
rename from package/python/python-006-cross-compile-getaddrinfo.patch
rename to package/python/006-cross-compile-getaddrinfo.patch
diff --git a/package/python/python-007-disable-extensions.patch b/package/python/007-disable-extensions.patch
similarity index 100%
rename from package/python/python-007-disable-extensions.patch
rename to package/python/007-disable-extensions.patch
diff --git a/package/python/python-008-distutils-use-python-sysroot.patch b/package/python/008-distutils-use-python-sysroot.patch
similarity index 100%
rename from package/python/python-008-distutils-use-python-sysroot.patch
rename to package/python/008-distutils-use-python-sysroot.patch
diff --git a/package/python/python-009-no-termcap-host-path.patch b/package/python/009-no-termcap-host-path.patch
similarity index 100%
rename from package/python/python-009-no-termcap-host-path.patch
rename to package/python/009-no-termcap-host-path.patch
diff --git a/package/python/python-010-fix-python-config.patch b/package/python/010-fix-python-config.patch
similarity index 100%
rename from package/python/python-010-fix-python-config.patch
rename to package/python/010-fix-python-config.patch
diff --git a/package/python/python-011-remove-python-symlink.patch b/package/python/011-remove-python-symlink.patch
similarity index 100%
rename from package/python/python-011-remove-python-symlink.patch
rename to package/python/011-remove-python-symlink.patch
diff --git a/package/python/python-012-support-library-path-old-compilers.patch b/package/python/012-support-library-path-old-compilers.patch
similarity index 100%
rename from package/python/python-012-support-library-path-old-compilers.patch
rename to package/python/012-support-library-path-old-compilers.patch
diff --git a/package/python/python-013-dont-add-multiarch-path.patch b/package/python/013-dont-add-multiarch-path.patch
similarity index 100%
rename from package/python/python-013-dont-add-multiarch-path.patch
rename to package/python/013-dont-add-multiarch-path.patch
diff --git a/package/python/python-014-abort-on-failed-modules.patch b/package/python/014-abort-on-failed-modules.patch
similarity index 100%
rename from package/python/python-014-abort-on-failed-modules.patch
rename to package/python/014-abort-on-failed-modules.patch
diff --git a/package/python/python-015-fix-sqlite-without-threads.patch b/package/python/015-fix-sqlite-without-threads.patch
similarity index 100%
rename from package/python/python-015-fix-sqlite-without-threads.patch
rename to package/python/015-fix-sqlite-without-threads.patch
diff --git a/package/python/python-016-serial-ioctl-workaround.patch b/package/python/016-serial-ioctl-workaround.patch
similarity index 100%
rename from package/python/python-016-serial-ioctl-workaround.patch
rename to package/python/016-serial-ioctl-workaround.patch
diff --git a/package/python/python-017-distutils-scripts-dont-adjust-shebang.patch b/package/python/017-distutils-scripts-dont-adjust-shebang.patch
similarity index 100%
rename from package/python/python-017-distutils-scripts-dont-adjust-shebang.patch
rename to package/python/017-distutils-scripts-dont-adjust-shebang.patch
diff --git a/package/python/python-100-optional-test-modules.patch b/package/python/100-optional-test-modules.patch
similarity index 100%
rename from package/python/python-100-optional-test-modules.patch
rename to package/python/100-optional-test-modules.patch
diff --git a/package/python/python-101-optional-pydoc.patch b/package/python/101-optional-pydoc.patch
similarity index 100%
rename from package/python/python-101-optional-pydoc.patch
rename to package/python/101-optional-pydoc.patch
diff --git a/package/python/python-102-optional-2to3.patch b/package/python/102-optional-2to3.patch
similarity index 100%
rename from package/python/python-102-optional-2to3.patch
rename to package/python/102-optional-2to3.patch
diff --git a/package/python/python-103-optional-sqlite.patch b/package/python/103-optional-sqlite.patch
similarity index 100%
rename from package/python/python-103-optional-sqlite.patch
rename to package/python/103-optional-sqlite.patch
diff --git a/package/python/python-104-optional-tk.patch b/package/python/104-optional-tk.patch
similarity index 100%
rename from package/python/python-104-optional-tk.patch
rename to package/python/104-optional-tk.patch
diff --git a/package/python/python-105-optional-curses.patch b/package/python/105-optional-curses.patch
similarity index 100%
rename from package/python/python-105-optional-curses.patch
rename to package/python/105-optional-curses.patch
diff --git a/package/python/python-106-optional-expat.patch b/package/python/106-optional-expat.patch
similarity index 100%
rename from package/python/python-106-optional-expat.patch
rename to package/python/106-optional-expat.patch
diff --git a/package/python/python-107-optional-codecs-cjk.patch b/package/python/107-optional-codecs-cjk.patch
similarity index 100%
rename from package/python/python-107-optional-codecs-cjk.patch
rename to package/python/107-optional-codecs-cjk.patch
diff --git a/package/python/python-108-optional-nis.patch b/package/python/108-optional-nis.patch
similarity index 100%
rename from package/python/python-108-optional-nis.patch
rename to package/python/108-optional-nis.patch
diff --git a/package/python/python-109-optional-unicodedata.patch b/package/python/109-optional-unicodedata.patch
similarity index 100%
rename from package/python/python-109-optional-unicodedata.patch
rename to package/python/109-optional-unicodedata.patch
diff --git a/package/python/python-110-optional-db.patch b/package/python/110-optional-db.patch
similarity index 100%
rename from package/python/python-110-optional-db.patch
rename to package/python/110-optional-db.patch
diff --git a/package/python/python-111-optional-ssl.patch b/package/python/111-optional-ssl.patch
similarity index 100%
rename from package/python/python-111-optional-ssl.patch
rename to package/python/111-optional-ssl.patch
diff --git a/package/python/python-112-optional-bzip2.patch b/package/python/112-optional-bzip2.patch
similarity index 100%
rename from package/python/python-112-optional-bzip2.patch
rename to package/python/112-optional-bzip2.patch
diff --git a/package/python/python-113-optional-zlib.patch b/package/python/113-optional-zlib.patch
similarity index 100%
rename from package/python/python-113-optional-zlib.patch
rename to package/python/113-optional-zlib.patch
diff --git a/package/python/python-114-remove-idle-editor.patch b/package/python/114-remove-idle-editor.patch
similarity index 100%
rename from package/python/python-114-remove-idle-editor.patch
rename to package/python/114-remove-idle-editor.patch
--
2.1.0
^ permalink raw reply
* [Buildroot] [PATCH 3/4] python: bump to 2.7.9
From: Thomas Petazzoni @ 2014-12-28 20:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1419800095-7808-1-git-send-email-thomas.petazzoni@free-electrons.com>
In addition to doing the bump, this commit also:
- Refreshes all the patches
- Removes python-003-properly-detect-if-python-build.patch, which has
been applied upstream.
- Passes the --without-ensurepip option, like is done in Python 3, to
avoid having Python use PIP to automatically download stuff when it
is being built.
- PYTHON_LIBTOOL_PATH = NO is added to prevent Buildroot from trying
to patch a version of libtool for which we don't have matching
patches, which isn't a problem since we're anyway not using the
part of the Python sources that uses libtool (it's the built-in
copy of libffi, and we use the external libffi).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
| 2 +-
...ython-003-properly-detect-if-python-build.patch | 23 ----------------------
...python-004-sysconfigdata-install-location.patch | 22 ++++++++++-----------
.../python/python-005-pyc-pyo-conditional.patch | 4 ++--
.../python-006-cross-compile-getaddrinfo.patch | 2 +-
package/python/python-007-disable-extensions.patch | 8 ++++----
.../python/python-009-no-termcap-host-path.patch | 2 +-
package/python/python-010-fix-python-config.patch | 20 +++++++++----------
.../python/python-011-remove-python-symlink.patch | 2 +-
...on-012-support-library-path-old-compilers.patch | 6 +++---
.../python-013-dont-add-multiarch-path.patch | 2 +-
.../python-014-abort-on-failed-modules.patch | 2 +-
.../python-015-fix-sqlite-without-threads.patch | 7 ++++---
.../python-016-serial-ioctl-workaround.patch | 7 ++++---
.../python/python-100-optional-test-modules.patch | 17 ++++++++--------
package/python/python-101-optional-pydoc.patch | 12 +++++------
package/python/python-102-optional-2to3.patch | 14 ++++++-------
package/python/python-103-optional-sqlite.patch | 12 +++++------
package/python/python-104-optional-tk.patch | 14 ++++++-------
package/python/python-105-optional-curses.patch | 8 ++++----
package/python/python-106-optional-expat.patch | 8 ++++----
.../python/python-107-optional-codecs-cjk.patch | 2 +-
package/python/python-108-optional-nis.patch | 2 +-
.../python/python-109-optional-unicodedata.patch | 2 +-
package/python/python-110-optional-db.patch | 10 +++++-----
package/python/python-111-optional-ssl.patch | 2 +-
package/python/python-112-optional-bzip2.patch | 2 +-
package/python/python-113-optional-zlib.patch | 2 +-
package/python/python-114-remove-idle-editor.patch | 6 +++---
package/python/python.mk | 3 ++-
30 files changed, 103 insertions(+), 122 deletions(-)
delete mode 100644 package/python/python-003-properly-detect-if-python-build.patch
--git a/package/python/python-001-remove-host-header-path.patch b/package/python/python-001-remove-host-header-path.patch
index 206751d..dfb84ff 100644
--- a/package/python/python-001-remove-host-header-path.patch
+++ b/package/python/python-001-remove-host-header-path.patch
@@ -21,7 +21,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -478,7 +478,7 @@
+@@ -480,7 +480,7 @@
for directory in reversed(options.dirs):
add_dir_to_list(dir_list, directory)
diff --git a/package/python/python-003-properly-detect-if-python-build.patch b/package/python/python-003-properly-detect-if-python-build.patch
deleted file mode 100644
index 3fb865f..0000000
--- a/package/python/python-003-properly-detect-if-python-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-distutils: fix build_ext check to find whether we're building Python or not
-
-The build_ext logic uses
-sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")) to
-determine whether we're building a third-party Python extension, or a
-built-in Python extension. However, this check is wrong in
-cross-compilation mode, and instead, the sysconfig.python_build
-variable should be used.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Index: b/Lib/distutils/command/build_ext.py
-===================================================================
---- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -235,7 +235,7 @@
- # Python's library directory must be appended to library_dirs
- # See Issues: #1600860, #4366
- if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
-- if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
-+ if not sysconfig.python_build:
- # building third party extensions
- self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
- else:
diff --git a/package/python/python-004-sysconfigdata-install-location.patch b/package/python/python-004-sysconfigdata-install-location.patch
index e053de3..a72db1a 100644
--- a/package/python/python-004-sysconfigdata-install-location.patch
+++ b/package/python/python-004-sysconfigdata-install-location.patch
@@ -21,17 +21,17 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -449,6 +449,9 @@
- # sys.path fixup -- see Modules/getpath.c.
- pybuilddir.txt: $(BUILDPYTHON)
- $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
-+ echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt
-+ mkdir -p `cat pysysconfigdatadir.txt`
-+ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
+@@ -462,6 +462,9 @@
+ rm -f ./pybuilddir.txt ; \
+ exit 1 ; \
+ fi
++ echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt
++ mkdir -p `cat pysysconfigdatadir.txt`
++ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
# Build the shared modules
# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-@@ -969,7 +972,7 @@
+@@ -1002,7 +1005,7 @@
else true; \
fi; \
done
@@ -40,7 +40,7 @@ Index: b/Makefile.pre.in
do \
if test -x $$i; then \
$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -979,6 +982,11 @@
+@@ -1012,6 +1015,11 @@
echo $(INSTALL_DATA) $$i $(LIBDEST); \
fi; \
done
@@ -52,7 +52,7 @@ Index: b/Makefile.pre.in
@for d in $(LIBSUBDIRS); \
do \
a=$(srcdir)/Lib/$$d; \
-@@ -1304,7 +1312,7 @@
+@@ -1337,7 +1345,7 @@
Modules/Setup Modules/Setup.local Modules/Setup.config \
Modules/ld_so_aix Modules/python.exp Misc/python.pc
-rm -f python*-gdb.py
@@ -65,7 +65,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -30,7 +30,7 @@
+@@ -33,7 +33,7 @@
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi
AC_MSG_RESULT($interp)
diff --git a/package/python/python-005-pyc-pyo-conditional.patch b/package/python/python-005-pyc-pyo-conditional.patch
index fbcdaa6..0a2f727 100644
--- a/package/python/python-005-pyc-pyo-conditional.patch
+++ b/package/python/python-005-pyc-pyo-conditional.patch
@@ -2,7 +2,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1017,24 +1017,32 @@
+@@ -1050,24 +1050,32 @@
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
@@ -39,7 +39,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -733,6 +733,17 @@
+@@ -736,6 +736,17 @@
;;
esac
diff --git a/package/python/python-006-cross-compile-getaddrinfo.patch b/package/python/python-006-cross-compile-getaddrinfo.patch
index ff05095..ba6e6f0 100644
--- a/package/python/python-006-cross-compile-getaddrinfo.patch
+++ b/package/python/python-006-cross-compile-getaddrinfo.patch
@@ -2,7 +2,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -3343,7 +3343,7 @@
+@@ -3346,7 +3346,7 @@
AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
diff --git a/package/python/python-007-disable-extensions.patch b/package/python/python-007-disable-extensions.patch
index 40ed6df..be4d943 100644
--- a/package/python/python-007-disable-extensions.patch
+++ b/package/python/python-007-disable-extensions.patch
@@ -2,7 +2,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -153,6 +153,8 @@
+@@ -156,6 +156,8 @@
# configure script arguments
CONFIG_ARGS= @CONFIG_ARGS@
@@ -11,7 +11,7 @@ Index: b/Makefile.pre.in
# Subdirectories with code
SRCDIRS= @SRCDIRS@
-@@ -464,6 +466,7 @@
+@@ -477,6 +479,7 @@
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -19,7 +19,7 @@ Index: b/Makefile.pre.in
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
# Build static library
-@@ -1158,7 +1161,8 @@
+@@ -1191,7 +1194,8 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -33,7 +33,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2281,6 +2281,8 @@
+@@ -2284,6 +2284,8 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
diff --git a/package/python/python-009-no-termcap-host-path.patch b/package/python/python-009-no-termcap-host-path.patch
index fadc7b3..781e179 100644
--- a/package/python/python-009-no-termcap-host-path.patch
+++ b/package/python/python-009-no-termcap-host-path.patch
@@ -7,7 +7,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -762,12 +762,9 @@
+@@ -764,12 +764,9 @@
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
readline_libs.append(curses_library)
diff --git a/package/python/python-010-fix-python-config.patch b/package/python/python-010-fix-python-config.patch
index 97ff157..2beb233 100644
--- a/package/python/python-010-fix-python-config.patch
+++ b/package/python/python-010-fix-python-config.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -879,6 +879,7 @@
+@@ -882,6 +882,7 @@
# Other platforms follow
if test $enable_shared = "yes"; then
@@ -18,7 +18,7 @@ Index: b/configure.ac
AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
case $ac_sys_system in
BeOS*)
-@@ -939,6 +940,7 @@
+@@ -942,6 +943,7 @@
esac
else # shared is disabled
@@ -26,7 +26,7 @@ Index: b/configure.ac
case $ac_sys_system in
CYGWIN*)
BLDLIBRARY='$(LIBRARY)'
-@@ -1915,6 +1917,9 @@
+@@ -1918,6 +1920,9 @@
AC_SUBST(BLDSHARED)
AC_SUBST(CCSHARED)
AC_SUBST(LINKFORSHARED)
@@ -36,8 +36,8 @@ Index: b/configure.ac
# SO is the extension of shared libraries `(including the dot!)
# -- usually .so, .sl on HP-UX, .dll on Cygwin
AC_MSG_CHECKING(SO)
-@@ -4563,7 +4568,7 @@
- AC_MSG_RESULT(done)
+@@ -4581,7 +4586,7 @@
+ AC_SUBST(ENSUREPIP)
# generate output files
-AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
@@ -49,7 +49,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -163,7 +163,7 @@
+@@ -166,7 +166,7 @@
SUBDIRSTOO= Include Lib Misc Demo
# Files and directories to be distributed
@@ -58,7 +58,7 @@ Index: b/Makefile.pre.in
DISTFILES= README ChangeLog $(CONFIGFILES)
DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
DIST= $(DISTFILES) $(DISTDIRS)
-@@ -407,7 +407,7 @@
+@@ -410,7 +410,7 @@
# Default target
all: build_all
@@ -67,7 +67,7 @@ Index: b/Makefile.pre.in
# Compile a binary with gcc profile guided optimization.
profile-opt:
-@@ -1068,10 +1068,12 @@
+@@ -1101,10 +1101,12 @@
fi; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
@@ -82,7 +82,7 @@ Index: b/Makefile.pre.in
# Install the include files
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -1130,7 +1132,7 @@
+@@ -1163,7 +1165,7 @@
$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
@@ -91,7 +91,7 @@ Index: b/Makefile.pre.in
@if [ -s Modules/python.exp -a \
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
echo; echo "Installing support files for building shared extension modules on AIX:"; \
-@@ -1312,6 +1314,7 @@
+@@ -1345,6 +1347,7 @@
config.cache config.log pyconfig.h Modules/config.c
-rm -rf build platform
-rm -rf $(PYTHONFRAMEWORKDIR)
diff --git a/package/python/python-011-remove-python-symlink.patch b/package/python/python-011-remove-python-symlink.patch
index af0a296..b0548c3 100644
--- a/package/python/python-011-remove-python-symlink.patch
+++ b/package/python/python-011-remove-python-symlink.patch
@@ -10,7 +10,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -858,17 +858,10 @@
+@@ -890,17 +890,10 @@
# $(PYTHON) -> python2 -> python$(VERSION))
# Also create equivalent chains for other installed files
bininstall: altbininstall
diff --git a/package/python/python-012-support-library-path-old-compilers.patch b/package/python/python-012-support-library-path-old-compilers.patch
index 6c48d1b..9803821 100644
--- a/package/python/python-012-support-library-path-old-compilers.patch
+++ b/package/python/python-012-support-library-path-old-compilers.patch
@@ -20,7 +20,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -416,6 +416,7 @@
+@@ -418,6 +418,7 @@
in_incdirs = False
inc_dirs = []
lib_dirs = []
@@ -28,7 +28,7 @@ Index: b/setup.py
try:
if ret >> 8 == 0:
with open(tmpfile) as fp:
-@@ -427,6 +428,7 @@
+@@ -429,6 +430,7 @@
elif line.startswith("End of search list"):
in_incdirs = False
elif is_gcc and line.startswith("LIBRARY_PATH"):
@@ -36,7 +36,7 @@ Index: b/setup.py
for d in line.strip().split("=")[1].split(":"):
d = os.path.normpath(d)
if '/gcc/' not in d:
-@@ -438,6 +440,15 @@
+@@ -440,6 +442,15 @@
finally:
os.unlink(tmpfile)
diff --git a/package/python/python-013-dont-add-multiarch-path.patch b/package/python/python-013-dont-add-multiarch-path.patch
index 0ab38ac..24e7af9 100644
--- a/package/python/python-013-dont-add-multiarch-path.patch
+++ b/package/python/python-013-dont-add-multiarch-path.patch
@@ -14,7 +14,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -454,9 +454,9 @@
+@@ -456,9 +456,9 @@
if not cross_compiling:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
diff --git a/package/python/python-014-abort-on-failed-modules.patch b/package/python/python-014-abort-on-failed-modules.patch
index 2031e20..4bceeb6 100644
--- a/package/python/python-014-abort-on-failed-modules.patch
+++ b/package/python/python-014-abort-on-failed-modules.patch
@@ -11,7 +11,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -281,6 +281,7 @@
+@@ -283,6 +283,7 @@
print "Failed to build these modules:"
print_three_column(failed)
print
diff --git a/package/python/python-015-fix-sqlite-without-threads.patch b/package/python/python-015-fix-sqlite-without-threads.patch
index 805edff..f51c37b 100644
--- a/package/python/python-015-fix-sqlite-without-threads.patch
+++ b/package/python/python-015-fix-sqlite-without-threads.patch
@@ -35,9 +35,10 @@ is never the last statement of the function.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-diff -durN python-2.7.8.orig/Modules/_sqlite/connection.c python-2.7.8/Modules/_sqlite/connection.c
---- python-2.7.8.orig/Modules/_sqlite/connection.c 2014-06-30 04:05:42.000000000 +0200
-+++ python-2.7.8/Modules/_sqlite/connection.c 2014-07-12 13:53:32.258041224 +0200
+Index: b/Modules/_sqlite/connection.c
+===================================================================
+--- a/Modules/_sqlite/connection.c
++++ b/Modules/_sqlite/connection.c
@@ -786,6 +786,7 @@
#ifdef WITH_THREAD
PyGILState_Release(threadstate);
diff --git a/package/python/python-016-serial-ioctl-workaround.patch b/package/python/python-016-serial-ioctl-workaround.patch
index 9ff775f..80ed65e 100644
--- a/package/python/python-016-serial-ioctl-workaround.patch
+++ b/package/python/python-016-serial-ioctl-workaround.patch
@@ -8,9 +8,10 @@ but isn't actually referenced in modern kernels.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
-diff -Nuar Python-2.7.8-orig/Modules/termios.c Python-2.7.8/Modules/termios.c
---- Python-2.7.8-orig/Modules/termios.c 2014-06-30 05:05:44.000000000 +0300
-+++ Python-2.7.8/Modules/termios.c 2014-07-18 06:16:43.393010357 +0300
+Index: b/Modules/termios.c
+===================================================================
+--- a/Modules/termios.c
++++ b/Modules/termios.c
@@ -16,7 +16,9 @@
* so this needs to be included first on that platform. */
#include <termio.h>
diff --git a/package/python/python-100-optional-test-modules.patch b/package/python/python-100-optional-test-modules.patch
index 33bc5f8..1180b29 100644
--- a/package/python/python-100-optional-test-modules.patch
+++ b/package/python/python-100-optional-test-modules.patch
@@ -15,19 +15,21 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -928,26 +928,42 @@
+@@ -960,27 +960,43 @@
plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
-LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \
-- lib-tk/test/test_ttk site-packages test test/audiodata test/data \
-- test/cjkencodings test/decimaltestdata test/xmltestdata \
+- lib-tk/test/test_ttk site-packages test test/audiodata test/capath \
+- test/data test/cjkencodings test/decimaltestdata test/xmltestdata \
- test/imghdrdata \
- test/subprocessdata \
- test/tracedmodules \
+LIBSUBDIRS= lib-tk site-packages \
encodings compiler hotshot \
- email email/mime email/test email/test/data \
++ email email/mime \
+ ensurepip ensurepip/_bundled \
- json json/tests \
- sqlite3 sqlite3/test \
- logging bsddb bsddb/test csv importlib wsgiref \
@@ -36,9 +38,8 @@ Index: b/Makefile.pre.in
- ctypes ctypes/test ctypes/macholib \
- idlelib idlelib/Icons idlelib/idle_test \
- distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
-+ email email/mime \
+ json \
-+ sqlite3 \
++ sqlite3 \
+ logging bsddb csv importlib wsgiref \
+ lib2to3 lib2to3/fixes lib2to3/pgen2 \
+ ctypes ctypes/macholib \
@@ -51,7 +52,7 @@ Index: b/Makefile.pre.in
curses pydoc_data $(MACHDEPS)
+
+TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
-+ lib-tk/test/test_ttk test test/audiodata test/data \
++ lib-tk/test/test_ttk test test/audiodata test/capath test/data \
+ test/cjkencodings test/decimaltestdata test/xmltestdata \
+ test/imghdrdata \
+ test/subprocessdata \
@@ -61,7 +62,7 @@ Index: b/Makefile.pre.in
+ sqlite3/test \
+ bsddb/test \
+ lib2to3/tests \
-+ lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
++ lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
+ ctypes/test \
+ idlelib/idle_test \
+ distutils/tests \
@@ -78,7 +79,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2625,6 +2625,12 @@
+@@ -2628,6 +2628,12 @@
fi
diff --git a/package/python/python-101-optional-pydoc.patch b/package/python/python-101-optional-pydoc.patch
index cb8631a..d5dc3d7 100644
--- a/package/python/python-101-optional-pydoc.patch
+++ b/package/python/python-101-optional-pydoc.patch
@@ -16,7 +16,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -941,7 +941,7 @@
+@@ -974,7 +974,7 @@
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
@@ -24,8 +24,8 @@ Index: b/Makefile.pre.in
+ curses $(MACHDEPS)
TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
- lib-tk/test/test_ttk test test/audiodata test/data \
-@@ -964,6 +964,10 @@
+ lib-tk/test/test_ttk test test/audiodata test/capath test/data \
+@@ -997,6 +997,10 @@
LIBSUBDIRS += $(TESTSUBDIRS)
endif
@@ -40,7 +40,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2624,6 +2624,11 @@
+@@ -2627,6 +2627,11 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -56,7 +56,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2219,6 +2219,12 @@
+@@ -2222,6 +2222,12 @@
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -69,7 +69,7 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2239,9 +2245,7 @@
+@@ -2242,9 +2248,7 @@
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
diff --git a/package/python/python-102-optional-2to3.patch b/package/python/python-102-optional-2to3.patch
index 0d23ca3..76edfa1 100644
--- a/package/python/python-102-optional-2to3.patch
+++ b/package/python/python-102-optional-2to3.patch
@@ -16,24 +16,24 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -934,7 +934,6 @@
+@@ -967,7 +967,6 @@
json \
- sqlite3 \
+ sqlite3 \
logging bsddb csv importlib wsgiref \
- lib2to3 lib2to3/fixes lib2to3/pgen2 \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -953,8 +952,6 @@
+@@ -986,8 +985,6 @@
json/tests \
sqlite3/test \
bsddb/test \
- lib2to3/tests \
-- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
+- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -968,6 +965,14 @@
+@@ -1001,6 +998,14 @@
LIBSUBDIRS += pydoc_data
endif
@@ -52,7 +52,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2636,6 +2636,12 @@
+@@ -2639,6 +2639,12 @@
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
@@ -69,7 +69,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2220,10 +2220,11 @@
+@@ -2223,10 +2223,11 @@
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
diff --git a/package/python/python-103-optional-sqlite.patch b/package/python/python-103-optional-sqlite.patch
index 1e17530..eb43c7a 100644
--- a/package/python/python-103-optional-sqlite.patch
+++ b/package/python/python-103-optional-sqlite.patch
@@ -12,7 +12,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2624,6 +2624,15 @@
+@@ -2627,6 +2627,15 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -32,15 +32,15 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -932,7 +932,6 @@
- encodings compiler hotshot \
+@@ -965,7 +965,6 @@
email email/mime \
+ ensurepip ensurepip/_bundled \
json \
-- sqlite3 \
+- sqlite3 \
logging bsddb csv importlib wsgiref \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
-@@ -950,7 +949,6 @@
+@@ -983,7 +982,6 @@
test/tracedmodules \
email/test email/test/data \
json/tests \
@@ -48,7 +48,7 @@ Index: b/Makefile.pre.in
bsddb/test \
ctypes/test \
idlelib/idle_test \
-@@ -973,6 +971,11 @@
+@@ -1006,6 +1004,11 @@
lib2to3/tests/data/fixers/myfixes
endif
diff --git a/package/python/python-104-optional-tk.patch b/package/python/python-104-optional-tk.patch
index 298c91d..f402e42 100644
--- a/package/python/python-104-optional-tk.patch
+++ b/package/python/python-104-optional-tk.patch
@@ -12,7 +12,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -928,7 +928,7 @@
+@@ -960,7 +960,7 @@
plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
@@ -20,18 +20,18 @@ Index: b/Makefile.pre.in
+LIBSUBDIRS= site-packages \
encodings compiler hotshot \
email email/mime \
- json \
-@@ -941,8 +941,7 @@
+ ensurepip ensurepip/_bundled \
+@@ -974,8 +974,7 @@
lib-old \
curses $(MACHDEPS)
-TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
-- lib-tk/test/test_ttk test test/audiodata test/data \
-+TESTSUBDIRS = test test/audiodata test/data \
+- lib-tk/test/test_ttk test test/audiodata test/capath test/data \
++TESTSUBDIRS = test test/audiodata test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \
test/imghdrdata \
test/subprocessdata \
-@@ -976,6 +975,12 @@
+@@ -1009,6 +1008,12 @@
TESTSUBDIRS += sqlite3/test
endif
@@ -48,7 +48,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2633,6 +2633,15 @@
+@@ -2636,6 +2636,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
diff --git a/package/python/python-105-optional-curses.patch b/package/python/python-105-optional-curses.patch
index 00f2266..a73fb04 100644
--- a/package/python/python-105-optional-curses.patch
+++ b/package/python/python-105-optional-curses.patch
@@ -12,16 +12,16 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -939,7 +939,7 @@
+@@ -972,7 +972,7 @@
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
- curses $(MACHDEPS)
+ $(MACHDEPS)
- TESTSUBDIRS = test test/audiodata test/data \
+ TESTSUBDIRS = test test/audiodata test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -981,6 +981,10 @@
+@@ -1014,6 +1014,10 @@
lib-tk/test/test_ttk
endif
@@ -36,7 +36,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2642,6 +2642,15 @@
+@@ -2645,6 +2645,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi
diff --git a/package/python/python-106-optional-expat.patch b/package/python/python-106-optional-expat.patch
index d80dee4..1ee117c 100644
--- a/package/python/python-106-optional-expat.patch
+++ b/package/python/python-106-optional-expat.patch
@@ -19,7 +19,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -935,7 +935,7 @@
+@@ -968,7 +968,7 @@
logging bsddb csv importlib wsgiref \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
@@ -28,7 +28,7 @@ Index: b/Makefile.pre.in
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
-@@ -985,6 +985,10 @@
+@@ -1018,6 +1018,10 @@
LIBSUBDIRS += curses
endif
@@ -43,7 +43,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2289,13 +2289,21 @@
+@@ -2292,13 +2292,21 @@
AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library
@@ -74,7 +74,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -1471,7 +1471,7 @@
+@@ -1474,7 +1474,7 @@
#
# More information on Expat can be found at www.libexpat.org.
#
diff --git a/package/python/python-107-optional-codecs-cjk.patch b/package/python/python-107-optional-codecs-cjk.patch
index 132b4bd..6329b0c 100644
--- a/package/python/python-107-optional-codecs-cjk.patch
+++ b/package/python/python-107-optional-codecs-cjk.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2641,6 +2641,12 @@
+@@ -2644,6 +2644,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
diff --git a/package/python/python-108-optional-nis.patch b/package/python/python-108-optional-nis.patch
index 12aa2f1..f07bbb6 100644
--- a/package/python/python-108-optional-nis.patch
+++ b/package/python/python-108-optional-nis.patch
@@ -13,7 +13,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2647,6 +2647,12 @@
+@@ -2650,6 +2650,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
fi])
diff --git a/package/python/python-109-optional-unicodedata.patch b/package/python/python-109-optional-unicodedata.patch
index 99a0daa..10da1ea 100644
--- a/package/python/python-109-optional-unicodedata.patch
+++ b/package/python/python-109-optional-unicodedata.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2653,6 +2653,12 @@
+@@ -2656,6 +2656,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
diff --git a/package/python/python-110-optional-db.patch b/package/python/python-110-optional-db.patch
index baee963..4b54e24 100644
--- a/package/python/python-110-optional-db.patch
+++ b/package/python/python-110-optional-db.patch
@@ -16,16 +16,16 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -932,7 +932,7 @@
- encodings compiler hotshot \
+@@ -965,7 +965,7 @@
email email/mime \
+ ensurepip ensurepip/_bundled \
json \
- logging bsddb csv importlib wsgiref \
+ logging csv importlib wsgiref \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command \
-@@ -948,7 +948,6 @@
+@@ -981,7 +981,6 @@
test/tracedmodules \
email/test email/test/data \
json/tests \
@@ -33,7 +33,7 @@ Index: b/Makefile.pre.in
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -989,6 +988,11 @@
+@@ -1022,6 +1021,11 @@
LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif
@@ -49,7 +49,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2653,6 +2653,28 @@
+@@ -2656,6 +2656,28 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
diff --git a/package/python/python-111-optional-ssl.patch b/package/python/python-111-optional-ssl.patch
index 5b20747..72891cd 100644
--- a/package/python/python-111-optional-ssl.patch
+++ b/package/python/python-111-optional-ssl.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2653,6 +2653,12 @@
+@@ -2656,6 +2656,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
diff --git a/package/python/python-112-optional-bzip2.patch b/package/python/python-112-optional-bzip2.patch
index eeb3303..3a646e1 100644
--- a/package/python/python-112-optional-bzip2.patch
+++ b/package/python/python-112-optional-bzip2.patch
@@ -9,7 +9,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2659,6 +2659,12 @@
+@@ -2662,6 +2662,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
fi])
diff --git a/package/python/python-113-optional-zlib.patch b/package/python/python-113-optional-zlib.patch
index b93c983..a4ca8bd 100644
--- a/package/python/python-113-optional-zlib.patch
+++ b/package/python/python-113-optional-zlib.patch
@@ -9,7 +9,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2665,6 +2665,12 @@
+@@ -2668,6 +2668,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
fi])
diff --git a/package/python/python-114-remove-idle-editor.patch b/package/python/python-114-remove-idle-editor.patch
index 9aba15c..67b9050 100644
--- a/package/python/python-114-remove-idle-editor.patch
+++ b/package/python/python-114-remove-idle-editor.patch
@@ -12,7 +12,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -934,7 +934,6 @@
+@@ -967,7 +967,6 @@
json \
logging csv importlib wsgiref \
ctypes ctypes/macholib \
@@ -20,7 +20,7 @@ Index: b/Makefile.pre.in
distutils distutils/command \
multiprocessing multiprocessing/dummy \
unittest \
-@@ -949,7 +948,6 @@
+@@ -982,7 +981,6 @@
email/test email/test/data \
json/tests \
ctypes/test \
@@ -32,7 +32,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2220,7 +2220,7 @@
+@@ -2223,7 +2223,7 @@
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
diff --git a/package/python/python.mk b/package/python/python.mk
index 3db31d3..45b1f7f 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -5,11 +5,12 @@
################################################################################
PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).8
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).9
PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
PYTHON_LICENSE = Python software foundation license v2, others
PYTHON_LICENSE_FILES = LICENSE
+PYTHON_LIBTOOL_PATCH = NO
# Python needs itself to be built, so in order to cross-compile
# Python, we need to build a host Python first. This host Python is
--
2.1.0
^ permalink raw reply related
* [Buildroot] [PATCH 2/4] python3: rename patches to the new convention
From: Thomas Petazzoni @ 2014-12-28 20:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1419800095-7808-1-git-send-email-thomas.petazzoni@free-electrons.com>
Now that we don't use completely sequential numbers, because patches
below 100 are used to address cross-compilation issues in Python 3,
while patches above 100 are used to make more Python 3 modules
configurable.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...01-remove-host-header-path.patch => 001-remove-host-header-path.patch} | 0
...ct-if-python-build.patch => 002-properly-detect-if-python-build.patch} | 0
...ta-install-location.patch => 003-sysconfigdata-install-location.patch} | 0
.../{python3-004-old-stdlib-cache.patch => 004-old-stdlib-cache.patch} | 0
...ython3-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} | 0
...ross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} | 0
...{python3-007-disable-extensions.patch => 007-disable-extensions.patch} | 0
...ysconfigdata.patch => 008-distutils-sysconfig-use-sysconfigdata.patch} | 0
...ls-use-python-sysroot.patch => 009-distutils-use-python-sysroot.patch} | 0
...hon3-010-no-termcap-host-path.patch => 010-no-termcap-host-path.patch} | 0
...h-old-compilers.patch => 011-support-library-path-old-compilers.patch} | 0
...12-dont-add-multiarch-path.patch => 012-dont-add-multiarch-path.patch} | 0
...13-abort-on-failed-modules.patch => 013-abort-on-failed-modules.patch} | 0
...14-serial-ioctl-workaround.patch => 014-serial-ioctl-workaround.patch} | 0
...just-shebang.patch => 015-distutils-scripts-dont-adjust-shebang.patch} | 0
...hon3-016-distutils-no-pep3147.patch => 016-distutils-no-pep3147.patch} | 0
...config-include-libdir.patch => 017-python-config-include-libdir.patch} | 0
...n3-100-optional-test-modules.patch => 100-optional-test-modules.patch} | 0
.../{python3-101-optional-pydoc.patch => 101-optional-pydoc.patch} | 0
.../python3/{python3-102-optional-2to3.patch => 102-optional-2to3.patch} | 0
.../{python3-103-optional-sqlite.patch => 103-optional-sqlite.patch} | 0
package/python3/{python3-104-optional-tk.patch => 104-optional-tk.patch} | 0
.../{python3-105-optional-curses.patch => 105-optional-curses.patch} | 0
.../{python3-106-optional-expat.patch => 106-optional-expat.patch} | 0
...ython3-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} | 0
.../python3/{python3-108-optional-nis.patch => 108-optional-nis.patch} | 0
...hon3-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} | 0
.../python3/{python3-110-optional-idle.patch => 110-optional-idle.patch} | 0
.../{python3-111-optional-decimal.patch => 111-optional-decimal.patch} | 0
29 files changed, 0 insertions(+), 0 deletions(-)
rename package/python3/{python3-001-remove-host-header-path.patch => 001-remove-host-header-path.patch} (100%)
rename package/python3/{python3-002-properly-detect-if-python-build.patch => 002-properly-detect-if-python-build.patch} (100%)
rename package/python3/{python3-003-sysconfigdata-install-location.patch => 003-sysconfigdata-install-location.patch} (100%)
rename package/python3/{python3-004-old-stdlib-cache.patch => 004-old-stdlib-cache.patch} (100%)
rename package/python3/{python3-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} (100%)
rename package/python3/{python3-006-cross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} (100%)
rename package/python3/{python3-007-disable-extensions.patch => 007-disable-extensions.patch} (100%)
rename package/python3/{python3-008-distutils-sysconfig-use-sysconfigdata.patch => 008-distutils-sysconfig-use-sysconfigdata.patch} (100%)
rename package/python3/{python3-009-distutils-use-python-sysroot.patch => 009-distutils-use-python-sysroot.patch} (100%)
rename package/python3/{python3-010-no-termcap-host-path.patch => 010-no-termcap-host-path.patch} (100%)
rename package/python3/{python3-011-support-library-path-old-compilers.patch => 011-support-library-path-old-compilers.patch} (100%)
rename package/python3/{python3-012-dont-add-multiarch-path.patch => 012-dont-add-multiarch-path.patch} (100%)
rename package/python3/{python3-013-abort-on-failed-modules.patch => 013-abort-on-failed-modules.patch} (100%)
rename package/python3/{python3-014-serial-ioctl-workaround.patch => 014-serial-ioctl-workaround.patch} (100%)
rename package/python3/{python3-015-distutils-scripts-dont-adjust-shebang.patch => 015-distutils-scripts-dont-adjust-shebang.patch} (100%)
rename package/python3/{python3-016-distutils-no-pep3147.patch => 016-distutils-no-pep3147.patch} (100%)
rename package/python3/{python3-017-python-config-include-libdir.patch => 017-python-config-include-libdir.patch} (100%)
rename package/python3/{python3-100-optional-test-modules.patch => 100-optional-test-modules.patch} (100%)
rename package/python3/{python3-101-optional-pydoc.patch => 101-optional-pydoc.patch} (100%)
rename package/python3/{python3-102-optional-2to3.patch => 102-optional-2to3.patch} (100%)
rename package/python3/{python3-103-optional-sqlite.patch => 103-optional-sqlite.patch} (100%)
rename package/python3/{python3-104-optional-tk.patch => 104-optional-tk.patch} (100%)
rename package/python3/{python3-105-optional-curses.patch => 105-optional-curses.patch} (100%)
rename package/python3/{python3-106-optional-expat.patch => 106-optional-expat.patch} (100%)
rename package/python3/{python3-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} (100%)
rename package/python3/{python3-108-optional-nis.patch => 108-optional-nis.patch} (100%)
rename package/python3/{python3-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} (100%)
rename package/python3/{python3-110-optional-idle.patch => 110-optional-idle.patch} (100%)
rename package/python3/{python3-111-optional-decimal.patch => 111-optional-decimal.patch} (100%)
diff --git a/package/python3/python3-001-remove-host-header-path.patch b/package/python3/001-remove-host-header-path.patch
similarity index 100%
rename from package/python3/python3-001-remove-host-header-path.patch
rename to package/python3/001-remove-host-header-path.patch
diff --git a/package/python3/python3-002-properly-detect-if-python-build.patch b/package/python3/002-properly-detect-if-python-build.patch
similarity index 100%
rename from package/python3/python3-002-properly-detect-if-python-build.patch
rename to package/python3/002-properly-detect-if-python-build.patch
diff --git a/package/python3/python3-003-sysconfigdata-install-location.patch b/package/python3/003-sysconfigdata-install-location.patch
similarity index 100%
rename from package/python3/python3-003-sysconfigdata-install-location.patch
rename to package/python3/003-sysconfigdata-install-location.patch
diff --git a/package/python3/python3-004-old-stdlib-cache.patch b/package/python3/004-old-stdlib-cache.patch
similarity index 100%
rename from package/python3/python3-004-old-stdlib-cache.patch
rename to package/python3/004-old-stdlib-cache.patch
diff --git a/package/python3/python3-005-pyc-pyo-conditional.patch b/package/python3/005-pyc-pyo-conditional.patch
similarity index 100%
rename from package/python3/python3-005-pyc-pyo-conditional.patch
rename to package/python3/005-pyc-pyo-conditional.patch
diff --git a/package/python3/python3-006-cross-compile-getaddrinfo.patch b/package/python3/006-cross-compile-getaddrinfo.patch
similarity index 100%
rename from package/python3/python3-006-cross-compile-getaddrinfo.patch
rename to package/python3/006-cross-compile-getaddrinfo.patch
diff --git a/package/python3/python3-007-disable-extensions.patch b/package/python3/007-disable-extensions.patch
similarity index 100%
rename from package/python3/python3-007-disable-extensions.patch
rename to package/python3/007-disable-extensions.patch
diff --git a/package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch b/package/python3/008-distutils-sysconfig-use-sysconfigdata.patch
similarity index 100%
rename from package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch
rename to package/python3/008-distutils-sysconfig-use-sysconfigdata.patch
diff --git a/package/python3/python3-009-distutils-use-python-sysroot.patch b/package/python3/009-distutils-use-python-sysroot.patch
similarity index 100%
rename from package/python3/python3-009-distutils-use-python-sysroot.patch
rename to package/python3/009-distutils-use-python-sysroot.patch
diff --git a/package/python3/python3-010-no-termcap-host-path.patch b/package/python3/010-no-termcap-host-path.patch
similarity index 100%
rename from package/python3/python3-010-no-termcap-host-path.patch
rename to package/python3/010-no-termcap-host-path.patch
diff --git a/package/python3/python3-011-support-library-path-old-compilers.patch b/package/python3/011-support-library-path-old-compilers.patch
similarity index 100%
rename from package/python3/python3-011-support-library-path-old-compilers.patch
rename to package/python3/011-support-library-path-old-compilers.patch
diff --git a/package/python3/python3-012-dont-add-multiarch-path.patch b/package/python3/012-dont-add-multiarch-path.patch
similarity index 100%
rename from package/python3/python3-012-dont-add-multiarch-path.patch
rename to package/python3/012-dont-add-multiarch-path.patch
diff --git a/package/python3/python3-013-abort-on-failed-modules.patch b/package/python3/013-abort-on-failed-modules.patch
similarity index 100%
rename from package/python3/python3-013-abort-on-failed-modules.patch
rename to package/python3/013-abort-on-failed-modules.patch
diff --git a/package/python3/python3-014-serial-ioctl-workaround.patch b/package/python3/014-serial-ioctl-workaround.patch
similarity index 100%
rename from package/python3/python3-014-serial-ioctl-workaround.patch
rename to package/python3/014-serial-ioctl-workaround.patch
diff --git a/package/python3/python3-015-distutils-scripts-dont-adjust-shebang.patch b/package/python3/015-distutils-scripts-dont-adjust-shebang.patch
similarity index 100%
rename from package/python3/python3-015-distutils-scripts-dont-adjust-shebang.patch
rename to package/python3/015-distutils-scripts-dont-adjust-shebang.patch
diff --git a/package/python3/python3-016-distutils-no-pep3147.patch b/package/python3/016-distutils-no-pep3147.patch
similarity index 100%
rename from package/python3/python3-016-distutils-no-pep3147.patch
rename to package/python3/016-distutils-no-pep3147.patch
diff --git a/package/python3/python3-017-python-config-include-libdir.patch b/package/python3/017-python-config-include-libdir.patch
similarity index 100%
rename from package/python3/python3-017-python-config-include-libdir.patch
rename to package/python3/017-python-config-include-libdir.patch
diff --git a/package/python3/python3-100-optional-test-modules.patch b/package/python3/100-optional-test-modules.patch
similarity index 100%
rename from package/python3/python3-100-optional-test-modules.patch
rename to package/python3/100-optional-test-modules.patch
diff --git a/package/python3/python3-101-optional-pydoc.patch b/package/python3/101-optional-pydoc.patch
similarity index 100%
rename from package/python3/python3-101-optional-pydoc.patch
rename to package/python3/101-optional-pydoc.patch
diff --git a/package/python3/python3-102-optional-2to3.patch b/package/python3/102-optional-2to3.patch
similarity index 100%
rename from package/python3/python3-102-optional-2to3.patch
rename to package/python3/102-optional-2to3.patch
diff --git a/package/python3/python3-103-optional-sqlite.patch b/package/python3/103-optional-sqlite.patch
similarity index 100%
rename from package/python3/python3-103-optional-sqlite.patch
rename to package/python3/103-optional-sqlite.patch
diff --git a/package/python3/python3-104-optional-tk.patch b/package/python3/104-optional-tk.patch
similarity index 100%
rename from package/python3/python3-104-optional-tk.patch
rename to package/python3/104-optional-tk.patch
diff --git a/package/python3/python3-105-optional-curses.patch b/package/python3/105-optional-curses.patch
similarity index 100%
rename from package/python3/python3-105-optional-curses.patch
rename to package/python3/105-optional-curses.patch
diff --git a/package/python3/python3-106-optional-expat.patch b/package/python3/106-optional-expat.patch
similarity index 100%
rename from package/python3/python3-106-optional-expat.patch
rename to package/python3/106-optional-expat.patch
diff --git a/package/python3/python3-107-optional-codecs-cjk.patch b/package/python3/107-optional-codecs-cjk.patch
similarity index 100%
rename from package/python3/python3-107-optional-codecs-cjk.patch
rename to package/python3/107-optional-codecs-cjk.patch
diff --git a/package/python3/python3-108-optional-nis.patch b/package/python3/108-optional-nis.patch
similarity index 100%
rename from package/python3/python3-108-optional-nis.patch
rename to package/python3/108-optional-nis.patch
diff --git a/package/python3/python3-109-optional-unicodedata.patch b/package/python3/109-optional-unicodedata.patch
similarity index 100%
rename from package/python3/python3-109-optional-unicodedata.patch
rename to package/python3/109-optional-unicodedata.patch
diff --git a/package/python3/python3-110-optional-idle.patch b/package/python3/110-optional-idle.patch
similarity index 100%
rename from package/python3/python3-110-optional-idle.patch
rename to package/python3/110-optional-idle.patch
diff --git a/package/python3/python3-111-optional-decimal.patch b/package/python3/111-optional-decimal.patch
similarity index 100%
rename from package/python3/python3-111-optional-decimal.patch
rename to package/python3/111-optional-decimal.patch
--
2.1.0
^ permalink raw reply
* [Buildroot] [PATCH 1/4] python3: bump to 3.4.2
From: Thomas Petazzoni @ 2014-12-28 20:54 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1419800095-7808-1-git-send-email-thomas.petazzoni@free-electrons.com>
This commit bumps python3 to Python 3.4.2. Two patches had to be
changed slightly to fix some minor conflicts.
PYTHON3_LIBTOOL_PATH = NO was added to prevent Buildroot from trying
to patch a version of libtool for which we don't have matching
patches, which isn't a problem since we're anyway not using the part
of the Python sources that uses libtool (it's the built-in copy of
libffi, and we use the external libffi).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
| 2 +-
.../python3-002-properly-detect-if-python-build.patch | 2 +-
.../python3-003-sysconfigdata-install-location.patch | 16 ++++++++--------
package/python3/python3-004-old-stdlib-cache.patch | 6 +++---
package/python3/python3-005-pyc-pyo-conditional.patch | 4 ++--
.../python3-006-cross-compile-getaddrinfo.patch | 2 +-
package/python3/python3-007-disable-extensions.patch | 10 +++++-----
...n3-008-distutils-sysconfig-use-sysconfigdata.patch | 19 +++++--------------
.../python3-009-distutils-use-python-sysroot.patch | 2 +-
.../python3/python3-010-no-termcap-host-path.patch | 2 +-
...thon3-011-support-library-path-old-compilers.patch | 6 +++---
.../python3/python3-012-dont-add-multiarch-path.patch | 2 +-
.../python3/python3-013-abort-on-failed-modules.patch | 2 +-
.../python3/python3-100-optional-test-modules.patch | 6 +++---
package/python3/python3-101-optional-pydoc.patch | 12 ++++++------
package/python3/python3-102-optional-2to3.patch | 14 +++++++-------
package/python3/python3-103-optional-sqlite.patch | 8 ++++----
package/python3/python3-104-optional-tk.patch | 8 ++++----
package/python3/python3-105-optional-curses.patch | 6 +++---
package/python3/python3-106-optional-expat.patch | 8 ++++----
package/python3/python3-107-optional-codecs-cjk.patch | 2 +-
package/python3/python3-108-optional-nis.patch | 2 +-
.../python3/python3-109-optional-unicodedata.patch | 2 +-
package/python3/python3-110-optional-idle.patch | 10 +++++-----
package/python3/python3-111-optional-decimal.patch | 4 ++--
package/python3/python3.mk | 9 ++++++++-
26 files changed, 82 insertions(+), 84 deletions(-)
--git a/package/python3/python3-001-remove-host-header-path.patch b/package/python3/python3-001-remove-host-header-path.patch
index e159e86..1eff608 100644
--- a/package/python3/python3-001-remove-host-header-path.patch
+++ b/package/python3/python3-001-remove-host-header-path.patch
@@ -24,7 +24,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -487,7 +487,8 @@
+@@ -493,7 +493,8 @@
add_dir_to_list(dir_list, directory)
if os.path.normpath(sys.base_prefix) != '/usr' \
diff --git a/package/python3/python3-002-properly-detect-if-python-build.patch b/package/python3/python3-002-properly-detect-if-python-build.patch
index ce874c6..e8ccd36 100644
--- a/package/python3/python3-002-properly-detect-if-python-build.patch
+++ b/package/python3/python3-002-properly-detect-if-python-build.patch
@@ -12,7 +12,7 @@ Index: b/Lib/distutils/command/build_ext.py
===================================================================
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
-@@ -246,7 +246,7 @@
+@@ -237,7 +237,7 @@
# Python's library directory must be appended to library_dirs
# See Issues: #1600860, #4366
if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
diff --git a/package/python3/python3-003-sysconfigdata-install-location.patch b/package/python3/python3-003-sysconfigdata-install-location.patch
index 1f230d4..dfcadf5 100644
--- a/package/python3/python3-003-sysconfigdata-install-location.patch
+++ b/package/python3/python3-003-sysconfigdata-install-location.patch
@@ -21,17 +21,17 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -543,6 +543,9 @@
- # sys.path fixup -- see Modules/getpath.c.
- pybuilddir.txt: $(BUILDPYTHON)
- $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
+@@ -558,6 +558,9 @@
+ rm -f ./pybuilddir.txt ; \
+ exit 1 ; \
+ fi
+ echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt
+ mkdir -p `cat pysysconfigdatadir.txt`
+ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
# Build the shared modules
# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-@@ -1181,7 +1184,7 @@
+@@ -1196,7 +1199,7 @@
else true; \
fi; \
done
@@ -40,7 +40,7 @@ Index: b/Makefile.pre.in
do \
if test -x $$i; then \
$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -1191,6 +1194,11 @@
+@@ -1206,6 +1209,11 @@
echo $(INSTALL_DATA) $$i $(LIBDEST); \
fi; \
done
@@ -52,7 +52,7 @@ Index: b/Makefile.pre.in
@for d in $(LIBSUBDIRS); \
do \
a=$(srcdir)/Lib/$$d; \
-@@ -1514,7 +1522,7 @@
+@@ -1529,7 +1537,7 @@
find build -name 'fficonfig.h' -exec rm -f {} ';' || true
find build -name '*.py' -exec rm -f {} ';' || true
find build -name '*.py[co]' -exec rm -f {} ';' || true
@@ -65,7 +65,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -67,7 +67,7 @@
+@@ -70,7 +70,7 @@
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi
AC_MSG_RESULT($interp)
diff --git a/package/python3/python3-004-old-stdlib-cache.patch b/package/python3/python3-004-old-stdlib-cache.patch
index ac34f8d..4ed994d 100644
--- a/package/python3/python3-004-old-stdlib-cache.patch
+++ b/package/python3/python3-004-old-stdlib-cache.patch
@@ -12,7 +12,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -349,6 +349,23 @@
+@@ -352,6 +352,23 @@
AC_SUBST(FRAMEWORKUNIXTOOLSPREFIX)
AC_SUBST(FRAMEWORKINSTALLAPPSPREFIX)
@@ -40,7 +40,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -157,6 +157,9 @@
+@@ -162,6 +162,9 @@
# Options to enable prebinding (for fast startup prior to Mac OS X 10.3)
OTHER_LIBTOOL_OPT=@OTHER_LIBTOOL_OPT@
@@ -50,7 +50,7 @@ Index: b/Makefile.pre.in
# Environment to run shared python without installed libraries
RUNSHARED= @RUNSHARED@
-@@ -1231,21 +1234,21 @@
+@@ -1246,21 +1249,21 @@
fi
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
diff --git a/package/python3/python3-005-pyc-pyo-conditional.patch b/package/python3/python3-005-pyc-pyo-conditional.patch
index 6b08c82..42dfa2f 100644
--- a/package/python3/python3-005-pyc-pyo-conditional.patch
+++ b/package/python3/python3-005-pyc-pyo-conditional.patch
@@ -2,7 +2,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1232,24 +1232,32 @@
+@@ -1247,24 +1247,32 @@
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
@@ -39,7 +39,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -936,6 +936,18 @@
+@@ -939,6 +939,18 @@
AC_MSG_CHECKING(LDLIBRARY)
diff --git a/package/python3/python3-006-cross-compile-getaddrinfo.patch b/package/python3/python3-006-cross-compile-getaddrinfo.patch
index 7347be5..62a8aa4 100644
--- a/package/python3/python3-006-cross-compile-getaddrinfo.patch
+++ b/package/python3/python3-006-cross-compile-getaddrinfo.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -3412,7 +3412,7 @@
+@@ -3429,7 +3429,7 @@
AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
diff --git a/package/python3/python3-007-disable-extensions.patch b/package/python3/python3-007-disable-extensions.patch
index 63c06b1..3b603f7 100644
--- a/package/python3/python3-007-disable-extensions.patch
+++ b/package/python3/python3-007-disable-extensions.patch
@@ -42,7 +42,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -175,6 +175,8 @@
+@@ -180,6 +180,8 @@
# configure script arguments
CONFIG_ARGS= @CONFIG_ARGS@
@@ -51,7 +51,7 @@ Index: b/Makefile.pre.in
# Subdirectories with code
SRCDIRS= @SRCDIRS@
-@@ -561,6 +563,7 @@
+@@ -576,6 +578,7 @@
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -59,7 +59,7 @@ Index: b/Makefile.pre.in
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
# Build static library
-@@ -1371,7 +1374,8 @@
+@@ -1386,7 +1389,8 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -73,7 +73,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2349,6 +2349,8 @@
+@@ -2366,6 +2366,8 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
@@ -86,7 +86,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -33,7 +33,10 @@
+@@ -39,7 +39,10 @@
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
# This global variable is used to hold the list of modules to be disabled.
diff --git a/package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch b/package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch
index c77fed3..d0758b1 100644
--- a/package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch
+++ b/package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch
@@ -2,10 +2,11 @@ Index: b/Lib/distutils/sysconfig.py
===================================================================
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
-@@ -430,49 +430,11 @@
+@@ -423,40 +423,11 @@
+ _config_vars = None
def _init_posix():
- """Initialize the module as appropriate for POSIX systems."""
+- """Initialize the module as appropriate for POSIX systems."""
- g = {}
- # load the installed Makefile:
- try:
@@ -36,23 +37,13 @@ Index: b/Lib/distutils/sysconfig.py
- if python_build:
- g['LDSHARED'] = g['BLDSHARED']
-
-- elif get_python_version() < '2.1':
-- # The following two branches are for 1.5.2 compatibility.
-- if sys.platform == 'aix4': # what about AIX 3.x ?
-- # Linker script is in the config directory, not in Modules as the
-- # Makefile says.
-- python_lib = get_python_lib(standard_lib=1)
-- ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
-- python_exp = os.path.join(python_lib, 'config', 'python.exp')
--
-- g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
--
+ # _sysconfigdata is generated@build time, see the sysconfig module
+ from _sysconfigdata import build_time_vars
global _config_vars
- _config_vars = g
+-
+ _config_vars = {}
+ _config_vars.update(build_time_vars)
-
def _init_nt():
+ """Initialize the module as appropriate for NT"""
diff --git a/package/python3/python3-009-distutils-use-python-sysroot.patch b/package/python3/python3-009-distutils-use-python-sysroot.patch
index cfe30fe..06f2039 100644
--- a/package/python3/python3-009-distutils-use-python-sysroot.patch
+++ b/package/python3/python3-009-distutils-use-python-sysroot.patch
@@ -43,7 +43,7 @@ Index: b/Lib/distutils/command/build_ext.py
===================================================================
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
-@@ -248,7 +248,10 @@
+@@ -239,7 +239,10 @@
if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
if not sysconfig.python_build:
# building third party extensions
diff --git a/package/python3/python3-010-no-termcap-host-path.patch b/package/python3/python3-010-no-termcap-host-path.patch
index 57fe47a..46c8a77 100644
--- a/package/python3/python3-010-no-termcap-host-path.patch
+++ b/package/python3/python3-010-no-termcap-host-path.patch
@@ -6,7 +6,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -725,12 +725,9 @@
+@@ -733,12 +733,9 @@
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
readline_libs.append(curses_library)
diff --git a/package/python3/python3-011-support-library-path-old-compilers.patch b/package/python3/python3-011-support-library-path-old-compilers.patch
index 4e0088a..296e9fe 100644
--- a/package/python3/python3-011-support-library-path-old-compilers.patch
+++ b/package/python3/python3-011-support-library-path-old-compilers.patch
@@ -20,7 +20,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -421,6 +421,7 @@
+@@ -427,6 +427,7 @@
in_incdirs = False
inc_dirs = []
lib_dirs = []
@@ -28,7 +28,7 @@ Index: b/setup.py
try:
if ret >> 8 == 0:
with open(tmpfile) as fp:
-@@ -432,6 +433,7 @@
+@@ -438,6 +439,7 @@
elif line.startswith("End of search list"):
in_incdirs = False
elif is_gcc and line.startswith("LIBRARY_PATH"):
@@ -36,7 +36,7 @@ Index: b/setup.py
for d in line.strip().split("=")[1].split(":"):
d = os.path.normpath(d)
if '/gcc/' not in d:
-@@ -443,6 +445,15 @@
+@@ -449,6 +451,15 @@
finally:
os.unlink(tmpfile)
diff --git a/package/python3/python3-012-dont-add-multiarch-path.patch b/package/python3/python3-012-dont-add-multiarch-path.patch
index cfd88b2..6867b9a 100644
--- a/package/python3/python3-012-dont-add-multiarch-path.patch
+++ b/package/python3/python3-012-dont-add-multiarch-path.patch
@@ -14,7 +14,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -461,10 +461,10 @@
+@@ -467,10 +467,10 @@
if not cross_compiling:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
diff --git a/package/python3/python3-013-abort-on-failed-modules.patch b/package/python3/python3-013-abort-on-failed-modules.patch
index c54c72e..5ad86fb 100644
--- a/package/python3/python3-013-abort-on-failed-modules.patch
+++ b/package/python3/python3-013-abort-on-failed-modules.patch
@@ -11,7 +11,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -278,6 +278,7 @@
+@@ -284,6 +284,7 @@
print("Failed to build these modules:")
print_three_column(failed)
print()
diff --git a/package/python3/python3-100-optional-test-modules.patch b/package/python3/python3-100-optional-test-modules.patch
index f6214d0..e3e81b7 100644
--- a/package/python3/python3-100-optional-test-modules.patch
+++ b/package/python3/python3-100-optional-test-modules.patch
@@ -15,7 +15,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1120,8 +1120,30 @@
+@@ -1135,8 +1135,30 @@
EXTRAPLATDIR= @EXTRAPLATDIR@
MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
@@ -48,7 +48,7 @@ Index: b/Makefile.pre.in
test/audiodata \
test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1148,28 +1170,22 @@
+@@ -1163,28 +1185,22 @@
test/test_importlib/namespace_pkgs/project3/parent/child \
test/test_importlib/namespace_pkgs/module_and_namespace_package \
test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
@@ -93,7 +93,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2656,6 +2656,12 @@
+@@ -2673,6 +2673,12 @@
fi
diff --git a/package/python3/python3-101-optional-pydoc.patch b/package/python3/python3-101-optional-pydoc.patch
index ddd5468..616ccb5 100644
--- a/package/python3/python3-101-optional-pydoc.patch
+++ b/package/python3/python3-101-optional-pydoc.patch
@@ -16,7 +16,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1087,7 +1087,9 @@
+@@ -1102,7 +1102,9 @@
-rm -f $(DESTDIR)$(BINDIR)/idle3
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
@@ -26,7 +26,7 @@ Index: b/Makefile.pre.in
-rm -f $(DESTDIR)$(BINDIR)/2to3
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
-@@ -1138,7 +1140,7 @@
+@@ -1153,7 +1155,7 @@
multiprocessing multiprocessing/dummy \
unittest \
venv venv/scripts venv/scripts/posix \
@@ -35,7 +35,7 @@ Index: b/Makefile.pre.in
TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
test test/test_asyncio \
-@@ -1182,6 +1184,10 @@
+@@ -1197,6 +1199,10 @@
test/test_importlib/import_ test/test_importlib/source \
unittest/test unittest/test/testmock
@@ -50,7 +50,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2655,6 +2655,11 @@
+@@ -2672,6 +2672,11 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -66,7 +66,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2203,6 +2203,12 @@
+@@ -2212,6 +2212,12 @@
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -79,7 +79,7 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2227,8 +2233,7 @@
+@@ -2236,8 +2242,7 @@
# If you change the scripts installed here, you also need to
# check the PyBuildScripts command above, and change the links
# created by the bininstall target in Makefile.pre.in
diff --git a/package/python3/python3-102-optional-2to3.patch b/package/python3/python3-102-optional-2to3.patch
index a23584f..cc010bc 100644
--- a/package/python3/python3-102-optional-2to3.patch
+++ b/package/python3/python3-102-optional-2to3.patch
@@ -16,7 +16,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1091,7 +1091,9 @@
+@@ -1106,7 +1106,9 @@
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
endif
-rm -f $(DESTDIR)$(BINDIR)/2to3
@@ -26,7 +26,7 @@ Index: b/Makefile.pre.in
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
-@@ -1131,7 +1133,6 @@
+@@ -1146,7 +1148,6 @@
html json http dbm xmlrpc \
sqlite3 \
logging csv wsgiref urllib \
@@ -34,7 +34,7 @@ Index: b/Makefile.pre.in
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1173,9 +1174,6 @@
+@@ -1188,9 +1189,6 @@
test/test_importlib/namespace_pkgs/module_and_namespace_package \
test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
sqlite3/test \
@@ -44,7 +44,7 @@ Index: b/Makefile.pre.in
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1188,6 +1186,14 @@
+@@ -1203,6 +1201,14 @@
LIBSUBDIRS += pydoc_data
endif
@@ -59,7 +59,7 @@ Index: b/Makefile.pre.in
ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS)
endif
-@@ -1283,10 +1289,12 @@
+@@ -1298,10 +1304,12 @@
-d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
endif
@@ -76,7 +76,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2204,10 +2204,11 @@
+@@ -2213,10 +2213,11 @@
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -94,7 +94,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2667,6 +2667,12 @@
+@@ -2684,6 +2684,12 @@
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
diff --git a/package/python3/python3-103-optional-sqlite.patch b/package/python3/python3-103-optional-sqlite.patch
index e444301..f9cfeeb 100644
--- a/package/python3/python3-103-optional-sqlite.patch
+++ b/package/python3/python3-103-optional-sqlite.patch
@@ -12,7 +12,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2655,6 +2655,15 @@
+@@ -2672,6 +2672,15 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -32,7 +32,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1131,7 +1131,6 @@
+@@ -1146,7 +1146,6 @@
email email/mime \
ensurepip ensurepip/_bundled \
html json http dbm xmlrpc \
@@ -40,7 +40,7 @@ Index: b/Makefile.pre.in
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
-@@ -1173,7 +1172,6 @@
+@@ -1188,7 +1187,6 @@
test/test_importlib/namespace_pkgs/project3/parent/child \
test/test_importlib/namespace_pkgs/module_and_namespace_package \
test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
@@ -48,7 +48,7 @@ Index: b/Makefile.pre.in
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1194,6 +1192,11 @@
+@@ -1209,6 +1207,11 @@
lib2to3/tests/data/fixers/myfixes
endif
diff --git a/package/python3/python3-104-optional-tk.patch b/package/python3/python3-104-optional-tk.patch
index 0d15fe1..7d67204 100644
--- a/package/python3/python3-104-optional-tk.patch
+++ b/package/python3/python3-104-optional-tk.patch
@@ -12,7 +12,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1124,7 +1124,7 @@
+@@ -1139,7 +1139,7 @@
EXTRAPLATDIR= @EXTRAPLATDIR@
MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
@@ -21,7 +21,7 @@ Index: b/Makefile.pre.in
site-packages \
asyncio \
collections concurrent concurrent/futures encodings \
-@@ -1142,8 +1142,7 @@
+@@ -1157,8 +1157,7 @@
venv venv/scripts venv/scripts/posix \
curses $(MACHDEPS)
@@ -31,7 +31,7 @@ Index: b/Makefile.pre.in
test/test_email test/test_email/data \
test/test_json \
test/audiodata \
-@@ -1197,6 +1196,12 @@
+@@ -1212,6 +1211,12 @@
TESTSUBDIRS += sqlite3/test
endif
@@ -48,7 +48,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2664,6 +2664,15 @@
+@@ -2681,6 +2681,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
diff --git a/package/python3/python3-105-optional-curses.patch b/package/python3/python3-105-optional-curses.patch
index 8e63908..b61528e 100644
--- a/package/python3/python3-105-optional-curses.patch
+++ b/package/python3/python3-105-optional-curses.patch
@@ -12,7 +12,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1140,7 +1140,7 @@
+@@ -1155,7 +1155,7 @@
multiprocessing multiprocessing/dummy \
unittest \
venv venv/scripts venv/scripts/posix \
@@ -21,7 +21,7 @@ Index: b/Makefile.pre.in
TESTSUBDIRS = test test/test_asyncio \
test/test_email test/test_email/data \
-@@ -1202,6 +1202,10 @@
+@@ -1217,6 +1217,10 @@
tkinter/test/test_ttk
endif
@@ -36,7 +36,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2673,6 +2673,15 @@
+@@ -2690,6 +2690,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi
diff --git a/package/python3/python3-106-optional-expat.patch b/package/python3/python3-106-optional-expat.patch
index ce1eb2a..c05e4e9 100644
--- a/package/python3/python3-106-optional-expat.patch
+++ b/package/python3/python3-106-optional-expat.patch
@@ -19,7 +19,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1134,7 +1134,7 @@
+@@ -1149,7 +1149,7 @@
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
@@ -28,7 +28,7 @@ Index: b/Makefile.pre.in
importlib \
turtledemo \
multiprocessing multiprocessing/dummy \
-@@ -1206,6 +1206,10 @@
+@@ -1221,6 +1221,10 @@
LIBSUBDIRS += curses
endif
@@ -43,7 +43,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2352,13 +2352,21 @@
+@@ -2369,13 +2369,21 @@
AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library
@@ -74,7 +74,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -1417,7 +1417,7 @@
+@@ -1426,7 +1426,7 @@
#
# More information on Expat can be found at www.libexpat.org.
#
diff --git a/package/python3/python3-107-optional-codecs-cjk.patch b/package/python3/python3-107-optional-codecs-cjk.patch
index 0f261fc..5d26c91 100644
--- a/package/python3/python3-107-optional-codecs-cjk.patch
+++ b/package/python3/python3-107-optional-codecs-cjk.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2672,6 +2672,12 @@
+@@ -2689,6 +2689,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
diff --git a/package/python3/python3-108-optional-nis.patch b/package/python3/python3-108-optional-nis.patch
index de6057c..58dcc1e 100644
--- a/package/python3/python3-108-optional-nis.patch
+++ b/package/python3/python3-108-optional-nis.patch
@@ -13,7 +13,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2678,6 +2678,12 @@
+@@ -2695,6 +2695,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
fi])
diff --git a/package/python3/python3-109-optional-unicodedata.patch b/package/python3/python3-109-optional-unicodedata.patch
index 46e9a6f..939ce34 100644
--- a/package/python3/python3-109-optional-unicodedata.patch
+++ b/package/python3/python3-109-optional-unicodedata.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2684,6 +2684,12 @@
+@@ -2701,6 +2701,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
diff --git a/package/python3/python3-110-optional-idle.patch b/package/python3/python3-110-optional-idle.patch
index 4d5e70b..555f5ef 100644
--- a/package/python3/python3-110-optional-idle.patch
+++ b/package/python3/python3-110-optional-idle.patch
@@ -15,7 +15,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1085,7 +1085,9 @@
+@@ -1100,7 +1100,9 @@
-rm -f $(DESTDIR)$(LIBPC)/python3.pc
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
-rm -f $(DESTDIR)$(BINDIR)/idle3
@@ -25,7 +25,7 @@ Index: b/Makefile.pre.in
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
ifeq (@PYDOC@,yes)
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
-@@ -1133,7 +1135,6 @@
+@@ -1148,7 +1150,6 @@
html json http dbm xmlrpc \
logging csv wsgiref urllib \
ctypes ctypes/macholib \
@@ -33,7 +33,7 @@ Index: b/Makefile.pre.in
distutils distutils/command \
importlib \
turtledemo \
-@@ -1210,6 +1211,10 @@
+@@ -1225,6 +1226,10 @@
LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif
@@ -48,7 +48,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2726,6 +2726,12 @@
+@@ -2743,6 +2743,12 @@
AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
@@ -65,7 +65,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2204,11 +2204,13 @@
+@@ -2213,11 +2213,13 @@
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
diff --git a/package/python3/python3-111-optional-decimal.patch b/package/python3/python3-111-optional-decimal.patch
index d895ee5..c325ce2 100644
--- a/package/python3/python3-111-optional-decimal.patch
+++ b/package/python3/python3-111-optional-decimal.patch
@@ -12,7 +12,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2385,13 +2385,20 @@
+@@ -2402,13 +2402,20 @@
AC_MSG_RESULT($with_system_ffi)
# Check for use of the system libmpdec library
@@ -42,7 +42,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -1972,7 +1972,7 @@
+@@ -1980,7 +1980,7 @@
def _decimal_ext(self):
extra_compile_args = []
undef_macros = []
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 5c72c6e..f6663dc 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -5,12 +5,19 @@
################################################################################
PYTHON3_VERSION_MAJOR = 3.4
-PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1
+PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2
PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
PYTHON3_SITE = http://python.org/ftp/python/$(PYTHON3_VERSION)
PYTHON3_LICENSE = Python software foundation license v2, others
PYTHON3_LICENSE_FILES = LICENSE
+# Python itself doesn't use libtool, but it includes the source code
+# of libffi, which uses libtool. Unfortunately, it uses a beta version
+# of libtool for which we don't have a matching patch. However, this
+# is not a problem, because we don't use the libffi copy included in
+# the Python sources, but instead use an external libffi library.
+PYTHON3_LIBTOOL_PATCH = NO
+
# Python needs itself and a "pgen" program to build itself, both being
# provided in the Python sources. So in order to cross-compile Python,
# we need to build a host Python first. This host Python is also
--
2.1.0
^ permalink raw reply related
* [Buildroot] [PATCH 0/4] Python and Python 3 version bumps
From: Thomas Petazzoni @ 2014-12-28 20:54 UTC (permalink / raw)
To: buildroot
Hello,
This set of four patches bump Python and Python 3 to the latest
available versions, and also rename the Python and Python 3 patches to
follow the new patch naming convention.
Thanks,
Thomas
Thomas Petazzoni (4):
python3: bump to 3.4.2
python3: rename patches to the new convention
python: bump to 2.7.9
python: rename patches to the new convention
...ath.patch => 001-remove-host-header-path.patch} | 2 +-
...thon-inc.patch => 002-fix-get-python-inc.patch} | 0
...ch => 004-sysconfigdata-install-location.patch} | 22 ++++++++++-----------
...itional.patch => 005-pyc-pyo-conditional.patch} | 4 ++--
...o.patch => 006-cross-compile-getaddrinfo.patch} | 2 +-
...tensions.patch => 007-disable-extensions.patch} | 8 ++++----
...atch => 008-distutils-use-python-sysroot.patch} | 0
...t-path.patch => 009-no-termcap-host-path.patch} | 2 +-
...on-config.patch => 010-fix-python-config.patch} | 20 +++++++++----------
...mlink.patch => 011-remove-python-symlink.patch} | 2 +-
...> 012-support-library-path-old-compilers.patch} | 6 +++---
...ath.patch => 013-dont-add-multiarch-path.patch} | 2 +-
...les.patch => 014-abort-on-failed-modules.patch} | 2 +-
....patch => 015-fix-sqlite-without-threads.patch} | 7 ++++---
...und.patch => 016-serial-ioctl-workaround.patch} | 7 ++++---
...17-distutils-scripts-dont-adjust-shebang.patch} | 0
...dules.patch => 100-optional-test-modules.patch} | 17 ++++++++--------
...tional-pydoc.patch => 101-optional-pydoc.patch} | 12 +++++------
...optional-2to3.patch => 102-optional-2to3.patch} | 14 ++++++-------
...onal-sqlite.patch => 103-optional-sqlite.patch} | 12 +++++------
...104-optional-tk.patch => 104-optional-tk.patch} | 14 ++++++-------
...onal-curses.patch => 105-optional-curses.patch} | 8 ++++----
...tional-expat.patch => 106-optional-expat.patch} | 8 ++++----
...ecs-cjk.patch => 107-optional-codecs-cjk.patch} | 2 +-
...8-optional-nis.patch => 108-optional-nis.patch} | 2 +-
...dedata.patch => 109-optional-unicodedata.patch} | 2 +-
...110-optional-db.patch => 110-optional-db.patch} | 10 +++++-----
...1-optional-ssl.patch => 111-optional-ssl.patch} | 2 +-
...tional-bzip2.patch => 112-optional-bzip2.patch} | 2 +-
...optional-zlib.patch => 113-optional-zlib.patch} | 2 +-
...e-editor.patch => 114-remove-idle-editor.patch} | 6 +++---
...ython-003-properly-detect-if-python-build.patch | 23 ----------------------
package/python/python.mk | 3 ++-
...ath.patch => 001-remove-host-header-path.patch} | 2 +-
...h => 002-properly-detect-if-python-build.patch} | 2 +-
...ch => 003-sysconfigdata-install-location.patch} | 16 +++++++--------
...dlib-cache.patch => 004-old-stdlib-cache.patch} | 6 +++---
...itional.patch => 005-pyc-pyo-conditional.patch} | 4 ++--
...o.patch => 006-cross-compile-getaddrinfo.patch} | 2 +-
...tensions.patch => 007-disable-extensions.patch} | 10 +++++-----
...08-distutils-sysconfig-use-sysconfigdata.patch} | 19 +++++-------------
...atch => 009-distutils-use-python-sysroot.patch} | 2 +-
...t-path.patch => 010-no-termcap-host-path.patch} | 2 +-
...> 011-support-library-path-old-compilers.patch} | 6 +++---
...ath.patch => 012-dont-add-multiarch-path.patch} | 2 +-
...les.patch => 013-abort-on-failed-modules.patch} | 2 +-
...und.patch => 014-serial-ioctl-workaround.patch} | 0
...15-distutils-scripts-dont-adjust-shebang.patch} | 0
...ep3147.patch => 016-distutils-no-pep3147.patch} | 0
...atch => 017-python-config-include-libdir.patch} | 0
...dules.patch => 100-optional-test-modules.patch} | 6 +++---
...tional-pydoc.patch => 101-optional-pydoc.patch} | 12 +++++------
...optional-2to3.patch => 102-optional-2to3.patch} | 14 ++++++-------
...onal-sqlite.patch => 103-optional-sqlite.patch} | 8 ++++----
...104-optional-tk.patch => 104-optional-tk.patch} | 8 ++++----
...onal-curses.patch => 105-optional-curses.patch} | 6 +++---
...tional-expat.patch => 106-optional-expat.patch} | 8 ++++----
...ecs-cjk.patch => 107-optional-codecs-cjk.patch} | 2 +-
...8-optional-nis.patch => 108-optional-nis.patch} | 2 +-
...dedata.patch => 109-optional-unicodedata.patch} | 2 +-
...optional-idle.patch => 110-optional-idle.patch} | 10 +++++-----
...al-decimal.patch => 111-optional-decimal.patch} | 4 ++--
package/python3/python3.mk | 9 ++++++++-
63 files changed, 185 insertions(+), 206 deletions(-)
rename package/python/{python-001-remove-host-header-path.patch => 001-remove-host-header-path.patch} (98%)
rename package/python/{python-002-fix-get-python-inc.patch => 002-fix-get-python-inc.patch} (100%)
rename package/python/{python-004-sysconfigdata-install-location.patch => 004-sysconfigdata-install-location.patch} (87%)
rename package/python/{python-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} (97%)
rename package/python/{python-006-cross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} (94%)
rename package/python/{python-007-disable-extensions.patch => 007-disable-extensions.patch} (95%)
rename package/python/{python-008-distutils-use-python-sysroot.patch => 008-distutils-use-python-sysroot.patch} (100%)
rename package/python/{python-009-no-termcap-host-path.patch => 009-no-termcap-host-path.patch} (97%)
rename package/python/{python-010-fix-python-config.patch => 010-fix-python-config.patch} (96%)
rename package/python/{python-011-remove-python-symlink.patch => 011-remove-python-symlink.patch} (98%)
rename package/python/{python-012-support-library-path-old-compilers.patch => 012-support-library-path-old-compilers.patch} (97%)
rename package/python/{python-013-dont-add-multiarch-path.patch => 013-dont-add-multiarch-path.patch} (98%)
rename package/python/{python-014-abort-on-failed-modules.patch => 014-abort-on-failed-modules.patch} (97%)
rename package/python/{python-015-fix-sqlite-without-threads.patch => 015-fix-sqlite-without-threads.patch} (81%)
rename package/python/{python-016-serial-ioctl-workaround.patch => 016-serial-ioctl-workaround.patch} (74%)
rename package/python/{python-017-distutils-scripts-dont-adjust-shebang.patch => 017-distutils-scripts-dont-adjust-shebang.patch} (100%)
rename package/python/{python-100-optional-test-modules.patch => 100-optional-test-modules.patch} (87%)
rename package/python/{python-101-optional-pydoc.patch => 101-optional-pydoc.patch} (92%)
rename package/python/{python-102-optional-2to3.patch => 102-optional-2to3.patch} (92%)
rename package/python/{python-103-optional-sqlite.patch => 103-optional-sqlite.patch} (91%)
rename package/python/{python-104-optional-tk.patch => 104-optional-tk.patch} (86%)
rename package/python/{python-105-optional-curses.patch => 105-optional-curses.patch} (91%)
rename package/python/{python-106-optional-expat.patch => 106-optional-expat.patch} (96%)
rename package/python/{python-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} (96%)
rename package/python/{python-108-optional-nis.patch => 108-optional-nis.patch} (97%)
rename package/python/{python-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} (96%)
rename package/python/{python-110-optional-db.patch => 110-optional-db.patch} (94%)
rename package/python/{python-111-optional-ssl.patch => 111-optional-ssl.patch} (96%)
rename package/python/{python-112-optional-bzip2.patch => 112-optional-bzip2.patch} (96%)
rename package/python/{python-113-optional-zlib.patch => 113-optional-zlib.patch} (96%)
rename package/python/{python-114-remove-idle-editor.patch => 114-remove-idle-editor.patch} (95%)
delete mode 100644 package/python/python-003-properly-detect-if-python-build.patch
rename package/python3/{python3-001-remove-host-header-path.patch => 001-remove-host-header-path.patch} (98%)
rename package/python3/{python3-002-properly-detect-if-python-build.patch => 002-properly-detect-if-python-build.patch} (98%)
rename package/python3/{python3-003-sysconfigdata-install-location.patch => 003-sysconfigdata-install-location.patch} (92%)
rename package/python3/{python3-004-old-stdlib-cache.patch => 004-old-stdlib-cache.patch} (97%)
rename package/python3/{python3-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} (98%)
rename package/python3/{python3-006-cross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} (96%)
rename package/python3/{python3-007-disable-extensions.patch => 007-disable-extensions.patch} (97%)
rename package/python3/{python3-008-distutils-sysconfig-use-sysconfigdata.patch => 008-distutils-sysconfig-use-sysconfigdata.patch} (69%)
rename package/python3/{python3-009-distutils-use-python-sysroot.patch => 009-distutils-use-python-sysroot.patch} (99%)
rename package/python3/{python3-010-no-termcap-host-path.patch => 010-no-termcap-host-path.patch} (97%)
rename package/python3/{python3-011-support-library-path-old-compilers.patch => 011-support-library-path-old-compilers.patch} (97%)
rename package/python3/{python3-012-dont-add-multiarch-path.patch => 012-dont-add-multiarch-path.patch} (97%)
rename package/python3/{python3-013-abort-on-failed-modules.patch => 013-abort-on-failed-modules.patch} (97%)
rename package/python3/{python3-014-serial-ioctl-workaround.patch => 014-serial-ioctl-workaround.patch} (100%)
rename package/python3/{python3-015-distutils-scripts-dont-adjust-shebang.patch => 015-distutils-scripts-dont-adjust-shebang.patch} (100%)
rename package/python3/{python3-016-distutils-no-pep3147.patch => 016-distutils-no-pep3147.patch} (100%)
rename package/python3/{python3-017-python-config-include-libdir.patch => 017-python-config-include-libdir.patch} (100%)
rename package/python3/{python3-100-optional-test-modules.patch => 100-optional-test-modules.patch} (98%)
rename package/python3/{python3-101-optional-pydoc.patch => 101-optional-pydoc.patch} (95%)
rename package/python3/{python3-102-optional-2to3.patch => 102-optional-2to3.patch} (95%)
rename package/python3/{python3-103-optional-sqlite.patch => 103-optional-sqlite.patch} (94%)
rename package/python3/{python3-104-optional-tk.patch => 104-optional-tk.patch} (94%)
rename package/python3/{python3-105-optional-curses.patch => 105-optional-curses.patch} (94%)
rename package/python3/{python3-106-optional-expat.patch => 106-optional-expat.patch} (96%)
rename package/python3/{python3-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} (96%)
rename package/python3/{python3-108-optional-nis.patch => 108-optional-nis.patch} (97%)
rename package/python3/{python3-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} (96%)
rename package/python3/{python3-110-optional-idle.patch => 110-optional-idle.patch} (95%)
rename package/python3/{python3-111-optional-decimal.patch => 111-optional-decimal.patch} (97%)
--
2.1.0
^ permalink raw reply
* [Buildroot] [PATCH] package/mke2img: do not overshoot user-specified size
From: Yann E. MORIN @ 2014-12-28 20:11 UTC (permalink / raw)
To: buildroot
Currently, we forcibly expand the generated filesystem by 1300 blocks
(i.e. a bit more than 1MiB) when we need to generate an ext3 or ext4
filesystem, even if the user already supplied us with the size it wants
the filesystem to be.
In that case, we overshoot what the user requested, which is bad because
the filesystem may no longer fit in the partition it is supposed to be
written into.
Only add extra blocks when we do compute the required size, not when the
user specifies the size.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/mke2img/mke2img | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/package/mke2img/mke2img b/package/mke2img/mke2img
index 9c56bc2..e93d869 100755
--- a/package/mke2img/mke2img
+++ b/package/mke2img/mke2img
@@ -66,6 +66,12 @@ main() {
# bitmaps size + slack
nb_blocks=$(du -s -k "${root_dir}" |sed -r -e 's/[[:space:]]+.*$//')
nb_blocks=$((500+(nb_blocks+nb_inodes/8)*11/10))
+ if [ ${gen} -ge 3 ]; then
+ # we add 1300 blocks (a bit more than 1 MiB, assuming 1KiB blocks)
+ # for the journal
+ # Note: I came to 1300 blocks after trial-and-error checks. YMMV.
+ nb_blocks=$((nb_blocks+1300))
+ fi
fi
# Upgrade to rev1 if needed
@@ -76,10 +82,6 @@ main() {
# Add a journal for ext3 and above
if [ ${gen} -ge 3 ]; then
tune2fs_opts+=( -j -J size=1 )
- # we add 1300 blocks (a bit more than 1 MiB, assuming 1KiB blocks)
- # for the journal
- # Note: I came to 1300 blocks after trial-and-error checks. YMMV.
- nb_blocks=$((nb_blocks+1300))
fi
# Add ext4 specific features
--
1.9.1
^ permalink raw reply related
* [Buildroot] [PATCH] libvncserver: OpenSSL support needs NPTL thread support
From: Thomas Petazzoni @ 2014-12-28 16:34 UTC (permalink / raw)
To: buildroot
The OpenSSL support of libvncserver already has a dependency on thread
support, but it in fact requires NPTL threading.
Fixes:
http://autobuild.buildroot.org/results/be2/be20dec9ffe7de3adc46a834852b20353d39baff/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libvncserver/libvncserver.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index ed6b64d..87bcf45 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -32,8 +32,8 @@ ifneq ($(BR2_INET_IPV6),y)
LIBVNCSERVER_CONF_OPTS += --without-ipv6
endif
-# openssl supports needs pthread
-ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
+# openssl supports needs NPTL thread support
+ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS_NPTL),yy)
LIBVNCSERVER_DEPENDENCIES += openssl
else
LIBVNCSERVER_CONF_OPTS += --without-crypto --without-ssl
--
2.1.0
^ permalink raw reply related
* [Buildroot] [PATCH] openocd: bump to version 0.8.0
From: Thomas Petazzoni @ 2014-12-28 16:31 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1419777098-6809-1-git-send-email-vincent.stehle@laposte.net>
Dear Vincent Stehl?,
On Sun, 28 Dec 2014 15:31:38 +0100, Vincent Stehl? wrote:
> Refresh a few patches. Drop the ones, which are upstream already. (Keep patches
> numbers steady for easier review.) Adapt configure options. Add hash file.
>
> Signed-off-by: Vincent Stehl? <vincent.stehle@laposte.net>
> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> Cc: Peter Korsgaard <jacmet@sunsite.dk>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Thanks for this contribution. There is already a patch in patchwork to
bump OpenOCD to version 0.8.0, see
http://patchwork.ozlabs.org/patch/420900/. Would it be possible to sync
with this proposal to propose a single patch set for OpenOCD ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance
From: Fabio Porcedda @ 2014-12-28 16:24 UTC (permalink / raw)
To: buildroot
In-Reply-To: <CAHkwnC8_FvgQuk3ngdcdy-dgG9iEo6A5xthyoQcM16CMMMonXw@mail.gmail.com>
On Tue, Dec 23, 2014 at 11:51 AM, Fabio Porcedda
<fabio.porcedda@gmail.com> wrote:
> On Tue, Dec 23, 2014 at 11:17 AM, Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com> wrote:
>> Hello,
>>
>> On Tue, 23 Dec 2014 09:54:58 +0100, Fabio Porcedda wrote:
>>> Rename the variable "QUIET" to "BR_QUIET" accordingly to the convention
>>> that internal variables should be named BR_XXX.
>>>
>>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>>
>> Do we really want all internal variables to be named BR_* ? Like
>> HOST_CONFIGURE_OPTS, TARGET_CONFIGURE_OPTS, TARGET_MAKE_ENV and al. ?
>> I'm not sure we want to do this, do we?
>
> On Wed, Nov 26, 2014 at 10:35 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> <snip>
>> Also, in retrospect, QUIET was not a really good name for this variable
>> in the Makefile. It would have been better if it were named BR_QUIET.
>> But that was introduced way before we decided on a variable naming
>> convention... :-/
>
> So which naming conventions Yann was referring?
Hi Yann,
Can you please explain further your opinion?
BR
--
Fabio Porcedda
^ permalink raw reply
* [Buildroot] [PATCH] sdparm: bump to version 1.09
From: Gustavo Zacarias @ 2014-12-28 15:24 UTC (permalink / raw)
To: buildroot
Also add hash file.
And make the libsgutils2 support (from sg3_utils) deterministic.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/sdparm/sdparm.hash | 2 ++
package/sdparm/sdparm.mk | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 package/sdparm/sdparm.hash
diff --git a/package/sdparm/sdparm.hash b/package/sdparm/sdparm.hash
new file mode 100644
index 0000000..ff5e7b6
--- /dev/null
+++ b/package/sdparm/sdparm.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 0f5e07438ef56e045443bd827008a38076e029558b00adbfc45f9cc8a5c75349 sdparm-1.09.tar.xz
diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk
index 1b3ec4b..4aff25d 100644
--- a/package/sdparm/sdparm.mk
+++ b/package/sdparm/sdparm.mk
@@ -4,10 +4,16 @@
#
################################################################################
-SDPARM_VERSION = 1.08
-SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tgz
+SDPARM_VERSION = 1.09
+SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tar.xz
SDPARM_SITE = http://sg.danny.cz/sg/p
SDPARM_LICENSE = BSD-3c
SDPARM_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_SG3_UTILS),y)
+SDPARM_DEPENDENCIES += sg3_utils
+else
+SDPARM_CONF_OPTS += --disable-libsgutils
+endif
+
$(eval $(autotools-package))
--
2.0.5
^ permalink raw reply related
* [Buildroot] [PATCH] package/kodi: fix leftover instance of 'xbmc'
From: Yann E. MORIN @ 2014-12-28 15:05 UTC (permalink / raw)
To: buildroot
During the XBMC -> Kodi rename, some instance of 'xbmc' were left out,
which meant our startup script would not run Kodi, and that Kodi would
create its /.kodi directory.
This patch renames the missing bits.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/kodi/S50kodi | 2 +-
package/kodi/kodi.mk | 20 +++++++++++---------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/package/kodi/S50kodi b/package/kodi/S50kodi
index 3b0049f..8468c24 100755
--- a/package/kodi/S50kodi
+++ b/package/kodi/S50kodi
@@ -4,7 +4,7 @@
#
BIN=/usr/bin/br-kodi
-KODI=/usr/lib/xbmc/xbmc.bin
+KODI=/usr/lib/xbmc/kodi.bin
KODI_ARGS="--standalone -fs -n"
PIDFILE=/var/run/kodi.pid
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 8a52433..1fb7256 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -203,16 +203,16 @@ endef
KODI_PRE_CONFIGURE_HOOKS += KODI_BOOTSTRAP
define KODI_CLEAN_UNUSED_ADDONS
- rm -Rf $(TARGET_DIR)/usr/share/xbmc/addons/screensaver.rsxs.plasma
- rm -Rf $(TARGET_DIR)/usr/share/xbmc/addons/visualization.milkdrop
- rm -Rf $(TARGET_DIR)/usr/share/xbmc/addons/visualization.projectm
- rm -Rf $(TARGET_DIR)/usr/share/xbmc/addons/visualization.itunes
+ rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/screensaver.rsxs.plasma
+ rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.milkdrop
+ rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.projectm
+ rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.itunes
endef
KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_UNUSED_ADDONS
define KODI_CLEAN_CONFLUENCE_SKIN
- find $(TARGET_DIR)/usr/share/xbmc/addons/skin.confluence/media -name *.png -delete
- find $(TARGET_DIR)/usr/share/xbmc/addons/skin.confluence/media -name *.jpg -delete
+ find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.png -delete
+ find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.jpg -delete
endef
KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_CONFLUENCE_SKIN
@@ -223,12 +223,14 @@ endef
KODI_POST_INSTALL_TARGET_HOOKS += KODI_INSTALL_BR_WRAPPER
# When run from a startup script, Kodi has no $HOME where to store its
-# configuration, so ends up storing it in /.xbmc (yes, at the root of
+# configuration, so ends up storing it in /.kodi (yes, at the root of
# the rootfs). This is a problem for read-only filesystems. But we can't
-# easily change that, so create /.xbmc as a symlink where we want the
-# config to eventually be.
+# easily change that, so create /.kodi as a symlink where we want the
+# config to eventually be. Add synlinks for the legacy XBMC name as well
define KODI_INSTALL_CONFIG_DIR
$(INSTALL) -d -m 0755 $(TARGET_DIR)/var/kodi
+ ln -sf /var/kodi $(TARGET_DIR)/.kodi
+ ln -sf /var/kodi $(TARGET_DIR)/var/xbmc
ln -sf /var/kodi $(TARGET_DIR)/.xbmc
endef
KODI_POST_INSTALL_TARGET_HOOKS += KODI_INSTALL_CONFIG_DIR
--
1.9.1
^ permalink raw reply related
* [Buildroot] [PATCH] configs/qemu: update to the latest kernel/headers versions
From: Gustavo Zacarias @ 2014-12-28 14:49 UTC (permalink / raw)
To: buildroot
Used to test the new default binutils 2.24 (all passed).
Also update the virtex readme since the dtb is in output/images as well.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
board/qemu/ppc-virtex-ml507/readme.txt | 2 +-
configs/qemu_aarch64_virt_defconfig | 4 ++--
configs/qemu_arm_nuri_defconfig | 4 ++--
configs/qemu_arm_versatile_defconfig | 4 ++--
configs/qemu_arm_vexpress_defconfig | 4 ++--
configs/qemu_microblazebe_mmu_defconfig | 4 ++--
configs/qemu_microblazeel_mmu_defconfig | 4 ++--
configs/qemu_mips64_malta_defconfig | 4 ++--
configs/qemu_mips64el_malta_defconfig | 4 ++--
configs/qemu_mips_malta_defconfig | 4 ++--
configs/qemu_mipsel_malta_defconfig | 4 ++--
configs/qemu_ppc64_pseries_defconfig | 4 ++--
configs/qemu_ppc_g3beige_defconfig | 4 ++--
configs/qemu_ppc_mpc8544ds_defconfig | 4 ++--
configs/qemu_ppc_virtex_ml507_defconfig | 4 ++--
configs/qemu_sh4_r2d_defconfig | 4 ++--
configs/qemu_sparc_ss10_defconfig | 4 ++--
configs/qemu_x86_64_defconfig | 4 ++--
configs/qemu_x86_defconfig | 4 ++--
configs/qemu_xtensa_lx60_defconfig | 4 ++--
20 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/board/qemu/ppc-virtex-ml507/readme.txt b/board/qemu/ppc-virtex-ml507/readme.txt
index 5713970..f8bf150 100644
--- a/board/qemu/ppc-virtex-ml507/readme.txt
+++ b/board/qemu/ppc-virtex-ml507/readme.txt
@@ -1,6 +1,6 @@
Run the emulation with:
- qemu-system-ppc -M virtex-ml507 -kernel output/images/vmlinux -m 256 -nographic -append "console=ttyS0" -dtb virtex440-ml507.dtb
+ qemu-system-ppc -M virtex-ml507 -kernel output/images/vmlinux -m 256 -nographic -append "console=ttyS0" -dtb output/images/virtex440-ml507.dtb
The login prompt will appear in the terminal that started Qemu.
diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig
index 4f414d4..b8aa036 100644
--- a/configs/qemu_aarch64_virt_defconfig
+++ b/configs/qemu_aarch64_virt_defconfig
@@ -10,13 +10,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-3.18.config"
BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig
index 06884ff..45ca553 100644
--- a/configs/qemu_arm_nuri_defconfig
+++ b/configs/qemu_arm_nuri_defconfig
@@ -16,12 +16,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
# Lock to 3.10 headers to avoid breaking with newer kernels
# Stuck at 3.10.x because there's no Nuri DTS
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.62"
+BR2_DEFAULT_KERNEL_VERSION="3.10.63"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.62"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.63"
BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig
index bc28c8e..513f068 100644
--- a/configs/qemu_arm_versatile_defconfig
+++ b/configs/qemu_arm_versatile_defconfig
@@ -12,13 +12,13 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.18.config"
BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig
index 188b614..4910540 100644
--- a/configs/qemu_arm_vexpress_defconfig
+++ b/configs/qemu_arm_vexpress_defconfig
@@ -15,12 +15,12 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig
index dd3a009..28c9469 100644
--- a/configs/qemu_microblazebe_mmu_defconfig
+++ b/configs/qemu_microblazebe_mmu_defconfig
@@ -11,13 +11,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.18.config"
BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig
index b5305d1..a1a6cb0 100644
--- a/configs/qemu_microblazeel_mmu_defconfig
+++ b/configs/qemu_microblazeel_mmu_defconfig
@@ -11,13 +11,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.18.config"
BR2_LINUX_KERNEL_LINUX_BIN=y
diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig
index 42b1e16..be85860 100644
--- a/configs/qemu_mips64_malta_defconfig
+++ b/configs/qemu_mips64_malta_defconfig
@@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.18.config"
BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig
index 6ce9302..348b892 100644
--- a/configs/qemu_mips64el_malta_defconfig
+++ b/configs/qemu_mips64el_malta_defconfig
@@ -11,13 +11,13 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux-3.18.config"
BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig
index a61b2b3..4210f9b 100644
--- a/configs/qemu_mips_malta_defconfig
+++ b/configs/qemu_mips_malta_defconfig
@@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.18.config"
BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig
index 7de0b70..0318023 100644
--- a/configs/qemu_mipsel_malta_defconfig
+++ b/configs/qemu_mipsel_malta_defconfig
@@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.18.config"
BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig
index 6225f65..9c6d116 100644
--- a/configs/qemu_ppc64_pseries_defconfig
+++ b/configs/qemu_ppc64_pseries_defconfig
@@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_DEFCONFIG="pseries"
BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig
index 4cbf7bf..207e347 100644
--- a/configs/qemu_ppc_g3beige_defconfig
+++ b/configs/qemu_ppc_g3beige_defconfig
@@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux-3.18.config"
BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig
index acd1d5a..3d34dfc 100644
--- a/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/configs/qemu_ppc_mpc8544ds_defconfig
@@ -8,13 +8,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig
index b5f18b7..d96a582 100644
--- a/configs/qemu_ppc_virtex_ml507_defconfig
+++ b/configs/qemu_ppc_virtex_ml507_defconfig
@@ -8,7 +8,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Use soft float
@@ -17,7 +17,7 @@ BR2_SOFT_FLOAT=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5"
BR2_LINUX_KERNEL_VMLINUX=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig
index ed33cb9..23da9f4 100644
--- a/configs/qemu_sh4_r2d_defconfig
+++ b/configs/qemu_sh4_r2d_defconfig
@@ -16,13 +16,13 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Linux kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.18.config"
BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig
index 0468f44..cc5f1be 100644
--- a/configs/qemu_sparc_ss10_defconfig
+++ b/configs/qemu_sparc_ss10_defconfig
@@ -10,13 +10,13 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Linux kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux-3.18.config"
BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig
index 17aad2f..9bbcbdf 100644
--- a/configs/qemu_x86_64_defconfig
+++ b/configs/qemu_x86_64_defconfig
@@ -11,12 +11,12 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.18.config"
diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig
index 996be70..9cb5ce2 100644
--- a/configs/qemu_x86_defconfig
+++ b/configs/qemu_x86_defconfig
@@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.18.config"
diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig
index f260095..6ebda98 100644
--- a/configs/qemu_xtensa_lx60_defconfig
+++ b/configs/qemu_xtensa_lx60_defconfig
@@ -16,13 +16,13 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
# Lock to 3.18 headers to avoid breaking with newer kernels
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-3.18.config"
BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
--
2.0.5
^ permalink raw reply related
* [Buildroot] [PATCH] openocd: bump to version 0.8.0
From: Vincent Stehlé @ 2014-12-28 14:31 UTC (permalink / raw)
To: buildroot
Refresh a few patches. Drop the ones, which are upstream already. (Keep patches
numbers steady for easier review.) Adapt configure options. Add hash file.
Signed-off-by: Vincent Stehl? <vincent.stehle@laposte.net>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Peter Korsgaard <jacmet@sunsite.dk>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
Hi,
Here is a proposal to "bump" OpenOCD. Buildroot is at v0.5.0 but this is v0.8.0
upstream already.
This "works for me" for one board and a few compilation tries, but this is only
lightly tested in view of all possible configurations. Feedbacks and tests are
very welcome!
Also, I can change the patches numbering if this is preferred.
Best regards,
V.
...s-compilation-host-libsub-was-used-before.patch | 33 ------------------
...002-fix-xscale-uninitialise-breakpoint_pc.patch | 27 ++++++++-------
package/openocd/openocd-0003-force-gnu99.patch | 22 +++++++-----
.../openocd/openocd-0004-force_jimtcl_static.patch | 22 ++++++------
.../openocd/openocd-0005-dont-force-ldflags.patch | 37 --------------------
package/openocd/openocd-0006-automake-compat.patch | 40 ----------------------
package/openocd/openocd.hash | 3 ++
package/openocd/openocd.mk | 6 ++--
8 files changed, 46 insertions(+), 144 deletions(-)
delete mode 100644 package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch
delete mode 100644 package/openocd/openocd-0005-dont-force-ldflags.patch
delete mode 100644 package/openocd/openocd-0006-automake-compat.patch
create mode 100644 package/openocd/openocd.hash
diff --git a/package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch b/package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch
deleted file mode 100644
index caf1a8b..0000000
--- a/package/openocd/openocd-0001-fix-cross-compilation-host-libsub-was-used-before.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3728c4af7f6303ccedab56ec220797f8f290580e Mon Sep 17 00:00:00 2001
-From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-Date: Wed, 10 Aug 2011 00:17:29 +0800
-Subject: [PATCH] fix cross compilation: host libsub was used before
-
-tested in buildroot
-
-Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
----
- configure.in | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index dfa1e8f..cfe2218 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1046,8 +1046,11 @@ build_usb=no
- if test $build_jlink = yes -o $build_vsllink = yes -o $build_usbprog = yes -o \
- $build_rlink = yes -o $build_ulink = yes -o $build_armjtagew = yes
- then
-- AC_CHECK_HEADERS([usb.h],[],
-- [AC_MSG_ERROR([usb.h is required to build some OpenOCD driver(s)])])
-+ dnl check for libusb
-+ PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11)
-+ CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
-+ LDFLAGS="$LDFLAGS $LIBUSB_LDFLAGS"
-+ LIBS="$LIBS $LIBUSB_LIBS"
- build_usb=yes
- fi
-
---
-1.7.5.4
-
diff --git a/package/openocd/openocd-0002-fix-xscale-uninitialise-breakpoint_pc.patch b/package/openocd/openocd-0002-fix-xscale-uninitialise-breakpoint_pc.patch
index 328241e..af1e09f 100644
--- a/package/openocd/openocd-0002-fix-xscale-uninitialise-breakpoint_pc.patch
+++ b/package/openocd/openocd-0002-fix-xscale-uninitialise-breakpoint_pc.patch
@@ -1,20 +1,23 @@
xscale: fix uninitialise breakpoint_pc
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+
+[Refresh for v0.8.0]
+Signed-off-by: Vincent Stehl? <vincent.stehle@laposte.net>
---
- src/target/xscale.c | 2 +-
+ src/target/xscale.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: b/src/target/xscale.c
-===================================================================
+diff --git a/src/target/xscale.c b/src/target/xscale.c
+index e88a231..8d773b1 100644
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
-@@ -2811,7 +2811,7 @@ static int xscale_analyze_trace(struct t
- struct xscale_common *xscale = target_to_xscale(target);
- struct xscale_trace_data *trace_data = xscale->trace.data;
- int i, retval;
-- uint32_t breakpoint_pc;
-+ uint32_t breakpoint_pc = 0;
- struct arm_instruction instruction;
- uint32_t current_pc = 0; /* initialized when address determined */
-
+@@ -2667,7 +2667,7 @@ static int xscale_analyze_trace(struct target *target, struct command_context *c
+ struct xscale_common *xscale = target_to_xscale(target);
+ struct xscale_trace_data *trace_data = xscale->trace.data;
+ int i, retval;
+- uint32_t breakpoint_pc;
++ uint32_t breakpoint_pc = 0;
+ struct arm_instruction instruction;
+ uint32_t current_pc = 0;/* initialized when address determined */
+
diff --git a/package/openocd/openocd-0003-force-gnu99.patch b/package/openocd/openocd-0003-force-gnu99.patch
index 106d112..03a271f 100644
--- a/package/openocd/openocd-0003-force-gnu99.patch
+++ b/package/openocd/openocd-0003-force-gnu99.patch
@@ -1,19 +1,23 @@
force gnu99
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+
+[Refresh for v0.8.0]
+Signed-off-by: Vincent Stehl? <vincent.stehle@laposte.net>
---
- configure.in | 1 +
- 1 file changed, 1 insertion(+)
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -28,6 +28,7 @@ AC_DISABLE_SHARED
+diff --git a/configure.ac b/configure.ac
+index 27fdb2c..9b2d4f3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,8 @@ AC_DISABLE_SHARED
AC_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
+ AC_SUBST([LIBTOOL_DEPS])
+CFLAGS="$CFLAGS -std=gnu99"
-
++
dnl configure checks required for Jim files (these are obsolete w/ C99)
AC_C_CONST
+ AC_TYPE_LONG_LONG_INT
diff --git a/package/openocd/openocd-0004-force_jimtcl_static.patch b/package/openocd/openocd-0004-force_jimtcl_static.patch
index 7118b57..988eae5 100644
--- a/package/openocd/openocd-0004-force_jimtcl_static.patch
+++ b/package/openocd/openocd-0004-force_jimtcl_static.patch
@@ -1,25 +1,27 @@
force jimtcl to build static
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+
+[Refresh for v0.8.0]
+Signed-off-by: Vincent Stehl? <vincent.stehle@laposte.net>
---
- jimtcl/auto.def | 5 -----
- 1 file changed, 5 deletions(-)
+ jimtcl/auto.def | 4 ----
+ 1 file changed, 4 deletions(-)
-Index: b/jimtcl/auto.def
-===================================================================
+diff --git a/jimtcl/auto.def b/jimtcl/auto.def
+index ddb0c1e..13d3ab3 100644
--- a/jimtcl/auto.def
+++ b/jimtcl/auto.def
-@@ -148,13 +148,8 @@ if {[opt-bool references]} {
+@@ -181,12 +181,8 @@ if {[opt-bool references]} {
msg-result "Enabling references"
define JIM_REFERENCES
}
-if {[opt-bool shared with-jim-shared]} {
- msg-result "Building shared library"
-- define JIM_LIBTYPE shared
-} else {
msg-result "Building static library"
- define JIM_LIBTYPE static
+ define JIM_STATICLIB
-}
- if {[opt-bool install-jim]} {
- define install_jim 1
- } else {
+ define JIM_INSTALL [opt-bool install-jim]
+
+ # Attributes of the extensions
diff --git a/package/openocd/openocd-0005-dont-force-ldflags.patch b/package/openocd/openocd-0005-dont-force-ldflags.patch
deleted file mode 100644
index 1880e00..0000000
--- a/package/openocd/openocd-0005-dont-force-ldflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-[PATCH] don't force library search path / rpath settings
-
-openocd adds -L$exec_prefix/lib -Wl,rpath,$exec_prefix/lib to the compile
-LDFLAGS if it isn't installed into /usr/local, which breaks cross compilation
-as the compiler ends up using host libraries.
----
- configure.in | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-Index: openocd-0.5.0/configure.in
-===================================================================
---- openocd-0.5.0.orig/configure.in
-+++ openocd-0.5.0/configure.in
-@@ -174,23 +174,6 @@
- # Let make expand exec_prefix.
- test x"$OCDxprefix" = xNONE && OCDxprefix="$OCDprefix"
-
--# what matters is the "exec-prefix"
--if test "$OCDxprefix" != "$ac_default_prefix"
--then
-- # We are installing in a non-standard place
-- # Nonstandard --prefix and/or --exec-prefix
-- # We have an override of some sort.
-- # use build specific install library dir
--
-- LDFLAGS="$LDFLAGS -L$OCDxprefix/lib"
-- # RPATH becomes an issue on Linux only
-- if test $host_os = linux-gnu || test $host_os = linux ; then
-- LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib"
-- fi
-- # The "INCDIR" is also usable
-- CFLAGS="$CFLAGS -I$includedir"
--fi
--
- AC_ARG_WITH(ftd2xx,
- AS_HELP_STRING([--with-ftd2xx=<PATH>],[This option has been removed.]),
- [
diff --git a/package/openocd/openocd-0006-automake-compat.patch b/package/openocd/openocd-0006-automake-compat.patch
deleted file mode 100644
index cdc6c92..0000000
--- a/package/openocd/openocd-0006-automake-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Backport from openocd commit 737a52d7b22b1774acc5d20f9bd25000a70ac116
-Fix for automake 1.11.2+
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura openocd-0.5.0/src/jtag/drivers/Makefile.am openocd-0.5.0.automake/src/jtag/drivers/Makefile.am
---- openocd-0.5.0/src/jtag/drivers/Makefile.am 2011-08-09 02:34:19.000000000 -0300
-+++ openocd-0.5.0.automake/src/jtag/drivers/Makefile.am 2012-05-01 13:57:01.007561480 -0300
-@@ -5,7 +5,8 @@
- libocdjtagdrivers_la_SOURCES = \
- $(DRIVERFILES)
-
--nobase_dist_pkglib_DATA =
-+ocddatadir = $(pkglibdir)
-+nobase_dist_ocddata_DATA =
-
- ULINK_FIRMWARE = $(srcdir)/OpenULINK
-
-@@ -64,7 +65,7 @@
- endif
- if ULINK
- DRIVERFILES += ulink.c
--nobase_dist_pkglib_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
-+nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
- endif
- if VSLLINK
- DRIVERFILES += vsllink.c
-diff -Nura openocd-0.5.0/src/target/Makefile.am openocd-0.5.0.automake/src/target/Makefile.am
---- openocd-0.5.0/src/target/Makefile.am 2011-08-09 02:34:19.000000000 -0300
-+++ openocd-0.5.0.automake/src/target/Makefile.am 2012-05-01 13:57:01.934567076 -0300
-@@ -165,7 +165,7 @@
- avr32_mem.h \
- avr32_regs.h
-
--nobase_dist_pkglib_DATA =
--nobase_dist_pkglib_DATA += ecos/at91eb40a.elf
-+ocddatadir = $(pkglibdir)
-+nobase_dist_ocddata_DATA = ecos/at91eb40a.elf
-
- MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash
new file mode 100644
index 0000000..bc5c8c0
--- /dev/null
+++ b/package/openocd/openocd.hash
@@ -0,0 +1,3 @@
+# From http://sourceforge.net/projects/openocd/files/openocd/0.8.0/
+sha1 10bf9eeb54e03083cb1a101785b2d69fbdf18f31 openocd-0.8.0.tar.bz2
+md5 6d83c34763a5f1d1ac7ad83c5a11f4fb openocd-0.8.0.tar.bz2
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
index 07366af..868e07f 100644
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENOCD_VERSION = 0.5.0
+OPENOCD_VERSION = 0.8.0
OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
OPENOCD_SITE = http://downloads.sourceforge.net/project/openocd/openocd/$(OPENOCD_VERSION)
OPENOCD_LICENSE = GPLv2+
@@ -21,7 +21,7 @@ OPENOCD_DEPENDENCIES = libusb-compat
# Adapters
ifeq ($(BR2_PACKAGE_OPENOCD_FT2XXX),y)
-OPENOCD_CONF_OPTS += --enable-ft2232_libftdi
+OPENOCD_CONF_OPTS += --enable-ftdi
OPENOCD_DEPENDENCIES += libftdi
endif
@@ -38,7 +38,7 @@ HOST_OPENOCD_DEPENDENCIES = host-libusb-compat host-libftdi
HOST_OPENOCD_CONF_OPTS = \
--disable-doxygen-html \
--enable-dummy \
- --enable-ft2232_libftdi \
+ --enable-ftdi \
--enable-jlink \
--enable-vsllink
--
2.1.4
^ permalink raw reply related
* [Buildroot] [PATCH 3/3 v2] toolchain: add hashes for all remaining external toolchains
From: Yann E. MORIN @ 2014-12-28 13:31 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20141228135810.763ae357@free-electrons.com>
Thomas, All,
On 2014-12-28 13:58 +0100, Thomas Petazzoni spake thusly:
> On Sun, 28 Dec 2014 13:19:31 +0100, Yann E. MORIN wrote:
>
> > +# Buildroot (?)
> > +sha256 3e1c7c53fadfd3346ab60386c573f07f0617ab119546ec8cb93bc20c23cff2b3 lin32-microblazeel-unknown-linux-gnu_14.3_early.tar.xz
> > +sha256 b72f7be654a75bb643372f3909de7b8739f0f56bdf8bea98fea41dcecefe6b6b microblazeel-unknown-linux-gnu.tgz
> > +sha256 ed2fea022f2def257ca6db09911b73c7102aaa1792d2da2d81371a763e5c2eff lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
> > +sha256 53ee0b1ad50e651eb14d0b53044b90e7bf7e3cb341ee57fe575bc4c4e142ea37 microblaze-unknown-linux-gnu.tgz
>
> These are not Buildroot toolchains. They are provided by Xilinx, but
> hosted on sources.buildroot.net since the official site was not working
> anymore, or something like that.
OK, I'll update the comment accordingly, unless whoever commits that
does it. ;-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH] qt5multimedia: enable gstreamer-1.x support
From: Peter Seiderer @ 2014-12-28 13:18 UTC (permalink / raw)
To: buildroot
Hello Thomas,
On Sat, Dec 27, 2014 at 09:51:10PM +0100, Thomas Petazzoni wrote:
> Dear Peter Seiderer,
>
> On Sun, 21 Dec 2014 12:59:56 +0100, Peter Seiderer wrote:
> > Add 0001-Initial-porting-effort-to-GStreamer-1.0.patch from [1] (with minor
> > conflict fixed).
> > Add 0002-Fix-compilation-when-building-against-GStreamer-0.10.patch from [2].
> >
> > Fix qt5multimedia.mk for the gstreamer-1.x case.
> >
> > [1] https://qt.gitorious.org/qt/tolszaks-qtmultimedia/commit/c847d2f36bd45befcd44d52f92140758563350bf.patch
> > [2] https://qt.gitorious.org/qt/tolszaks-qtmultimedia/commit/609048bd6fcd37162b2b5b139392a8ec8b2260e9.patch
> >
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
>
> We have another patch at http://patchwork.ozlabs.org/patch/424107/ that
> bumps the entire Qt5 stuff to Qt 5.4.0. How would this interact with
> your patch enabling gstreamer 1.x support? Is gstreamer 1.x support
> part of Qt 5.4.0 ?
No sorry, gstreamer 1.x support is not part of Qt-5.4.0 (checked already beforehand,
would have saved me a little work), but I can rebase/resend my patch after
the Qt bump is committed...
Regards,
Peter
>
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 3/3 v2] toolchain: add hashes for all remaining external toolchains
From: Thomas Petazzoni @ 2014-12-28 12:58 UTC (permalink / raw)
To: buildroot
In-Reply-To: <f924e745902fb357ec83221b28fb8a0f9a38a311.1419768498.git.yann.morin.1998@free.fr>
Dear Yann E. MORIN,
On Sun, 28 Dec 2014 13:19:31 +0100, Yann E. MORIN wrote:
> +# Buildroot (?)
> +sha256 3e1c7c53fadfd3346ab60386c573f07f0617ab119546ec8cb93bc20c23cff2b3 lin32-microblazeel-unknown-linux-gnu_14.3_early.tar.xz
> +sha256 b72f7be654a75bb643372f3909de7b8739f0f56bdf8bea98fea41dcecefe6b6b microblazeel-unknown-linux-gnu.tgz
> +sha256 ed2fea022f2def257ca6db09911b73c7102aaa1792d2da2d81371a763e5c2eff lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
> +sha256 53ee0b1ad50e651eb14d0b53044b90e7bf7e3cb341ee57fe575bc4c4e142ea37 microblaze-unknown-linux-gnu.tgz
These are not Buildroot toolchains. They are provided by Xilinx, but
hosted on sources.buildroot.net since the official site was not working
anymore, or something like that.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH] whois: bump to version 5.2.3
From: Gustavo Zacarias @ 2014-12-28 12:49 UTC (permalink / raw)
To: buildroot
With support for new gTLDs and updated TLDs.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/whois/whois.hash | 4 ++--
package/whois/whois.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/whois/whois.hash b/package/whois/whois.hash
index 858eb94..ec5dbcd 100644
--- a/package/whois/whois.hash
+++ b/package/whois/whois.hash
@@ -1,2 +1,2 @@
-# From http://ftp.debian.org/debian/pool/main/w/whois/whois_5.2.2.dsc
-sha256 cba874b457a6b7c4659245780d3d7321d129ab47da86103e07578ec7430fec09 whois_5.2.2.tar.xz
+# From http://ftp.debian.org/debian/pool/main/w/whois/whois_5.2.3.dsc
+sha256 b1c9a4005bd41036a9e82dd4830005f33ffa5255ab764f4dbe3300715c15e803 whois_5.2.3.tar.xz
diff --git a/package/whois/whois.mk b/package/whois/whois.mk
index 63268c6..8b8a796 100644
--- a/package/whois/whois.mk
+++ b/package/whois/whois.mk
@@ -4,8 +4,8 @@
#
################################################################################
-WHOIS_VERSION = 5.2.2
-WHOIS_SITE = http://snapshot.debian.org/archive/debian/20141112T101048Z/pool/main/w/whois
+WHOIS_VERSION = 5.2.3
+WHOIS_SITE = http://snapshot.debian.org/archive/debian/20141227T042107Z/pool/main/w/whois
WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz
# take precedence over busybox implementation
WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox)
--
2.0.5
^ permalink raw reply related
* [Buildroot] [PATCH] dillo: bump to version 3.0.4.1
From: Gustavo Zacarias @ 2014-12-28 12:36 UTC (permalink / raw)
To: buildroot
Also add hash file.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
... 0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch} | 0
package/dillo/dillo.hash | 2 ++
package/dillo/dillo.mk | 5 ++---
3 files changed, 4 insertions(+), 3 deletions(-)
rename package/dillo/{dillo-0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch => 0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch} (100%)
create mode 100644 package/dillo/dillo.hash
diff --git a/package/dillo/dillo-0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch b/package/dillo/0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch
similarity index 100%
rename from package/dillo/dillo-0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch
rename to package/dillo/0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch
diff --git a/package/dillo/dillo.hash b/package/dillo/dillo.hash
new file mode 100644
index 0000000..927db62
--- /dev/null
+++ b/package/dillo/dillo.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 ed97c48029ad1fe62c8a505f81c6ea127532697374153e652065fc6ced098647 dillo-3.0.4.1.tar.bz2
diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk
index d6fc746..c216322 100644
--- a/package/dillo/dillo.mk
+++ b/package/dillo/dillo.mk
@@ -4,13 +4,12 @@
#
################################################################################
-DILLO_VERSION = 3.0.4
+DILLO_VERSION = 3.0.4.1
DILLO_SOURCE = dillo-$(DILLO_VERSION).tar.bz2
DILLO_SITE = http://www.dillo.org/download
DILLO_LICENSE = GPLv3+
DILLO_LICENSE_FILES = COPYING
-# dillo-0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch
-# touches configure.ac
+# For 0001-configure.ac-change-fltk-config-test-to-be-more-cros.patch
DILLO_AUTORECONF = YES
DILLO_DEPENDENCIES = fltk
--
2.0.5
^ permalink raw reply related
* [Buildroot] [PATCH 1/2] links: bump to version 2.8
From: Gustavo Zacarias @ 2014-12-28 12:31 UTC (permalink / raw)
To: buildroot
Also add hash file.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/links/0001-no-largefile.patch | 26 ++++++++++++++++++++++++++
package/links/links-0001-no-largefile.patch | 22 ----------------------
package/links/links-0002-CVE-2013-6050.patch | 17 -----------------
package/links/links.hash | 2 ++
package/links/links.mk | 2 +-
5 files changed, 29 insertions(+), 40 deletions(-)
create mode 100644 package/links/0001-no-largefile.patch
delete mode 100644 package/links/links-0001-no-largefile.patch
delete mode 100644 package/links/links-0002-CVE-2013-6050.patch
create mode 100644 package/links/links.hash
diff --git a/package/links/0001-no-largefile.patch b/package/links/0001-no-largefile.patch
new file mode 100644
index 0000000..782a25a
--- /dev/null
+++ b/package/links/0001-no-largefile.patch
@@ -0,0 +1,26 @@
+Make links buildable without LFS support.
+Author/status: unknown.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura links-2.8/com-defs.h links-2.8.nonlfs/com-defs.h
+--- links-2.8/com-defs.h 2013-07-31 20:45:30.000000000 -0300
++++ links-2.8.nonlfs/com-defs.h 2014-12-28 08:42:47.352237462 -0300
+@@ -5,6 +5,9 @@
+ #define __EXTENSIONS__
+ #endif
+
++#include <features.h>
++/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
+ #ifndef _LARGEFILE_SOURCE
+ #define _LARGEFILE_SOURCE 1
+ #endif
+@@ -20,6 +23,7 @@
+ #ifndef _FILE_OFFSET_BITS
+ #define _FILE_OFFSET_BITS 64
+ #endif
++#endif /* UCLIBC !LFS */
+
+ #if defined(vax) && !defined(__vax)
+ #define __vax vax
diff --git a/package/links/links-0001-no-largefile.patch b/package/links/links-0001-no-largefile.patch
deleted file mode 100644
index f3143cb..0000000
--- a/package/links/links-0001-no-largefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: links-1.01pre1-no-ssl/links.h
-===================================================================
---- links-1.01pre1-no-ssl.orig/links.h 2010-06-21 00:39:10.000000000 +0200
-+++ links-1.01pre1-no-ssl/links.h 2010-06-21 00:39:52.000000000 +0200
-@@ -2,6 +2,9 @@
- #define __EXTENSIONS__
- #endif
-
-+#include <features.h>
-+/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
- #ifndef _LARGEFILE_SOURCE
- #define _LARGEFILE_SOURCE 1
- #endif
-@@ -9,6 +12,7 @@
- #ifndef _FILE_OFFSET_BITS
- #define _FILE_OFFSET_BITS 64
- #endif
-+#endif
-
- #ifdef HAVE_CONFIG_H
- #include "config.h"
diff --git a/package/links/links-0002-CVE-2013-6050.patch b/package/links/links-0002-CVE-2013-6050.patch
deleted file mode 100644
index d85c250..0000000
--- a/package/links/links-0002-CVE-2013-6050.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix integer overflow in graphics mode (CVE-2013-6050)
-Author: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
-Bug-CVE: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-6050
-
-Index: links-2.7/html_tbl.c
-===================================================================
---- links-2.7.orig/html_tbl.c 2013-11-22 01:57:29.000000000 +0100
-+++ links-2.7/html_tbl.c 2013-11-22 01:58:30.000000000 +0100
-@@ -1550,6 +1550,8 @@ static void add_to_rect_sets(struct rect
- static void add_to_cell_sets(struct table_cell ****s, int **nn, int *n, struct rect *r, struct table_cell *c)
- {
- int i, j;
-+ if (r->y1 < 0 || r->y2 < 0)
-+ fatal_exit("add_to_cell_sets: integer overflow: %d, %d", r->y1, r->y2);
- for (i = r->y1 >> RECT_BOUND_BITS; i <= (r->y2 - 1) >> RECT_BOUND_BITS; i++) {
- if (i >= *n) {
- struct table_cell ***ns;
diff --git a/package/links/links.hash b/package/links/links.hash
new file mode 100644
index 0000000..a6e79b3
--- /dev/null
+++ b/package/links/links.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 5070a759af7f107ca4f9572833b8f086cd9f7c21ef5e1fce8482a2883a743c7a links-2.8.tar.gz
diff --git a/package/links/links.mk b/package/links/links.mk
index c7f3671..2ad56f9 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LINKS_VERSION = 2.7
+LINKS_VERSION = 2.8
LINKS_SITE = http://links.twibright.com/download
LINKS_DEPENDENCIES = host-pkgconf
LINKS_LICENSE = GPLv2+
--
2.0.5
^ permalink raw reply related
* [Buildroot] [PATCH 3/3 v2] toolchain: add hashes for all remaining external toolchains
From: Yann E. MORIN @ 2014-12-28 12:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1419768498.git.yann.morin.1998@free.fr>
Getting the hashes from upstream is not always possible:
- Mentor's Sourcery: seems to require an account
- TI's Arago: not able to locate the upstream.
- Linaro: only signatures
- Buildroot: Eh! ;-)
So, all hashes were locally computed.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
---
.../toolchain-external/toolchain-external.hash | 44 +++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash
index b4fb5e0..ca16294 100644
--- a/toolchain/toolchain-external/toolchain-external.hash
+++ b/toolchain/toolchain-external/toolchain-external.hash
@@ -6,11 +6,53 @@ md5 14facaac538a43533b89d969d7904d46 mips-2014.05-27-mips-linux-gnu-i686-pc-li
# From: https://sourcery.mentor.com/GNUToolchain/release2640
md5 0ba8bc4923c04728ee3787bed4cd5148 mips-2013.11-36-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+######################################
+# Next hashes are all locally computed
+
# Blackfin toolchains from Analog Devices
-# Locally computed
sha256 fba010929c7355a0286fc4b1817d6065ee21380d3c2993383d3778f0b998ca9d blackfin-toolchain-2012R2-RC2.i386.tar.bz2
sha256 90284fe72125f381817da505b6f91f2b0c86a763ffe2c722c7d6b3ae60b25010 blackfin-toolchain-2013R1-RC1.i386.tar.bz2
sha256 e424e90d8481d942a40266d78d1488726561fed3ec38403094f98055e61889d0 blackfin-toolchain-2014R1-RC2.i386.tar.bz2
sha256 436ca3d901b152094cd6be2b6e274c59643387f46bb0563db1adcab1202f1455 blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2
sha256 4d66a3390ae9e1c4b9aad214757791a5e0c45ef2bb31977fa6d3a80d96290237 blackfin-toolchain-uclibc-full-2013R1-RC1.i386.tar.bz2
sha256 c65b1b4b918d5185349d62a3b7bf43b4b21e1175c52598ec047ca56b3f11d857 blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2
+
+# Mentor's Sourcery CodeBench Lite toolchains
+# ARM
+sha256 395f1c504a8fb6b7a10663143627b7eee2edc8fd884aa13c4b8505a3623960f5 arm-2013.05-24-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+sha256 8455854d3b3abbc2328e6c061c6b9625ef8f9c1f236db9f1771877715bd70b9b arm-2013.11-33-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+sha256 39ee0e789034334ecc89af94e838e3a4815400ac5ff980f808f466b04778532e arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+# NiosII
+sha256 29567361910b020751ea8041ecb45b3cc74714e71c6deb4981b678772b746b33 sourceryg++-2013.05-43-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2
+sha256 fb02fe3d595bd80a6e0ebc9d59a64010d84ae8d13f47e241b3a335f42b0414dc sourceryg++-2014.05-47-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2
+# PowerPC
+sha256 d68d1a2a055ece3824a1a11fcc0a8e813ee1d215025247cce0d877caa12c4b54 freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
+sha256 525e1f53abbf65c2974ae9af762c45bb38520fe5fc50e968a23fe6a18e9eec04 freescale-2011.03-38-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
+sha256 d6c94587d546197836e7e1a6909f6aabfa5879e91f501ab03088a6887cc242fc mentor-2012.03-71-powerpc-mentor-linux-gnu-i686-pc-linux-gnu.tar.bz2
+# SuperH
+sha256 ce8115844619a8b02f85e801999fe4cc2e603788be784ae860a070f92ab8053d renesas-2011.03-37-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+sha256 a545a9d412c47d85edcad09a86fe1d12a48e2b6e19d0ccf86b63d2cf0bffa687 renesas-2012.03-35-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+sha256 59d6766fde244931aa52db01433d5acd051998762a931121c5fc109536a1a802 renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+sha256 deaae7338c51f526ef809857e0335080e22ddbc2355cad14ade0813b40cd2e22 renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2
+sha256 e7d87fc62daecfb3989168bc5b84e099013fe9b796df3da5daebd2e0c0b1af6c renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz2
+# x86
+sha256 5f308a3fe0752f181fd0d33a70a17efb8300d0e34a94ed18a1a0304dc18e150e ia32-2011.09-24-i686-pc-linux-gnu-i386-linux.tar.bz2
+sha256 6ac2f0d9ec56242ecbe4315533f3e00a675909850a41bdafc052fbfe27ece300 ia32-2012.03-27-i686-pc-linux-gnu-i386-linux.tar.bz2
+sha256 ea804cf02014369da52abc4f64e91e96bde2dd2230aca96109459013d4545458 ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
+# Aarch64
+sha256 8ea78c5988b2bb507534f1ad46aa46659f66b39d55f2fc40e163a90b4195e70f aarch64-2014.05-30-aarch64-linux-gnu-i686-pc-linux-gnu.tar.bz2
+
+# ARM toolchains from Texas Instrument's Arago project
+sha256 f2febf3b3c565536461ad4405f1bcb835d75a6afb2a8bec958a1248cb4b81fc7 arago-2011.09-armv7a-linux-gnueabi-sdk.tar.bz2
+sha256 254af7d02eb3bcc8345c78e131700bc995d65b68232caaed21150a5fd1456070 arago-2011.09-armv5te-linux-gnueabi-sdk.tar.bz2
+
+# ARM and Aarch64 toolchains from Linaro
+sha256 0cffac0caea0eb3c8bdddfa14be011ce366680f40aeddbefc7cf23cb6d4f1891 gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
+sha256 4bc9d86390f8fa67a693ba4768ba5b12faaf7dd37c706c05ccd9321e765226e4 gcc-linaro-armeb-linux-gnueabihf-4.9-2014.09_linux.tar.xz
+sha256 3954f496ab01de67241109e82abfaa9b7625fdab4f05e79e7902e9814a07b832 gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
+
+# Buildroot (?)
+sha256 3e1c7c53fadfd3346ab60386c573f07f0617ab119546ec8cb93bc20c23cff2b3 lin32-microblazeel-unknown-linux-gnu_14.3_early.tar.xz
+sha256 b72f7be654a75bb643372f3909de7b8739f0f56bdf8bea98fea41dcecefe6b6b microblazeel-unknown-linux-gnu.tgz
+sha256 ed2fea022f2def257ca6db09911b73c7102aaa1792d2da2d81371a763e5c2eff lin32-microblaze-unknown-linux-gnu_14.3_early.tar.xz
+sha256 53ee0b1ad50e651eb14d0b53044b90e7bf7e3cb341ee57fe575bc4c4e142ea37 microblaze-unknown-linux-gnu.tgz
--
1.9.1
^ permalink raw reply related
* [Buildroot] [PATCH 2/3 v2] toolchain-external: add hashes for Blackfin toolchains
From: Yann E. MORIN @ 2014-12-28 12:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1419768498.git.yann.morin.1998@free.fr>
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Those toolchains are downloaded from Sourceforge, and are therefore
affected by the Sourcefoge download issues. Therefore, this commit
adds the hashes for those toolchain tarballs.
Fixes:
http://autobuild.buildroot.org/results/fa5/fa5e38246dddd661f1d674f3521d21297796bce3/
(and other similar issues)
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
toolchain/toolchain-external/toolchain-external.hash | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/toolchain/toolchain-external/toolchain-external.hash b/toolchain/toolchain-external/toolchain-external.hash
index 7e64d4f..b4fb5e0 100644
--- a/toolchain/toolchain-external/toolchain-external.hash
+++ b/toolchain/toolchain-external/toolchain-external.hash
@@ -5,3 +5,12 @@ md5 ad4a66e4791606c5df70f48c4a97b0ec mips-2014.11-22-mips-linux-gnu-i686-pc-li
md5 14facaac538a43533b89d969d7904d46 mips-2014.05-27-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
# From: https://sourcery.mentor.com/GNUToolchain/release2640
md5 0ba8bc4923c04728ee3787bed4cd5148 mips-2013.11-36-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+
+# Blackfin toolchains from Analog Devices
+# Locally computed
+sha256 fba010929c7355a0286fc4b1817d6065ee21380d3c2993383d3778f0b998ca9d blackfin-toolchain-2012R2-RC2.i386.tar.bz2
+sha256 90284fe72125f381817da505b6f91f2b0c86a763ffe2c722c7d6b3ae60b25010 blackfin-toolchain-2013R1-RC1.i386.tar.bz2
+sha256 e424e90d8481d942a40266d78d1488726561fed3ec38403094f98055e61889d0 blackfin-toolchain-2014R1-RC2.i386.tar.bz2
+sha256 436ca3d901b152094cd6be2b6e274c59643387f46bb0563db1adcab1202f1455 blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2
+sha256 4d66a3390ae9e1c4b9aad214757791a5e0c45ef2bb31977fa6d3a80d96290237 blackfin-toolchain-uclibc-full-2013R1-RC1.i386.tar.bz2
+sha256 c65b1b4b918d5185349d62a3b7bf43b4b21e1175c52598ec047ca56b3f11d857 blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2
--
1.9.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox