* [Buildroot] [PATCH next 1/3] git: bump version to 2.13.0
From: Thomas Petazzoni @ 2017-05-10 21:45 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170510110910.27889-1-Vincent.Riera@imgtec.com>
Hello,
On Wed, 10 May 2017 12:09:08 +0100, Vicente Olivert Riera wrote:
> Patches 0001 and 0002 already included in this release:
> https://github.com/git/git/commit/379642bcd8d89db52feba88a651e4e56d6ac5767
> https://github.com/git/git/commit/2225e1ea20481a7c0da526891470abf9ece623e7
>
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> .../git/0001-grep-set-default-output-method.patch | 59 ---------------
> ...ep-fix-builds-with-with-no-thread-support.patch | 87 ----------------------
> package/git/git.hash | 2 +-
> package/git/git.mk | 2 +-
> 4 files changed, 2 insertions(+), 148 deletions(-)
> delete mode 100644 package/git/0001-grep-set-default-output-method.patch
> delete mode 100644 package/git/0002-grep-fix-builds-with-with-no-thread-support.patch
Series applied to next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit branch/next] tcpreplay: bump version to 4.2.5
From: Thomas Petazzoni @ 2017-05-10 21:44 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=eb2919bd460767425062f4b9748e10862acc3eb6
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/tcpreplay/tcpreplay.hash | 2 +-
package/tcpreplay/tcpreplay.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash
index 9e8d151..c908964 100644
--- a/package/tcpreplay/tcpreplay.hash
+++ b/package/tcpreplay/tcpreplay.hash
@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
-sha256 da78ea1a1fe8ff177a4f9e71c4c6739b79ac86db2c2bb90955318b8e8439beb7 tcpreplay-4.2.4.tar.gz
+sha256 941026be34e1db5101d3d22ebddd6fff76179a1ee81e273338f533ba4eca89d7 tcpreplay-4.2.5.tar.gz
diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index 879f518..d303c60 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TCPREPLAY_VERSION = 4.2.4
+TCPREPLAY_VERSION = 4.2.5
TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)
TCPREPLAY_LICENSE = GPL-3.0
TCPREPLAY_LICENSE_FILES = docs/LICENSE
^ permalink raw reply related
* [Buildroot] [git commit branch/next] cjson: bump version to v1.5.2
From: Thomas Petazzoni @ 2017-05-10 21:44 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=6a72aea6161b8deb1779af090f36e536c4e6478a
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/cjson/cjson.hash | 2 +-
package/cjson/cjson.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/cjson/cjson.hash b/package/cjson/cjson.hash
index 09cc335..14853da 100644
--- a/package/cjson/cjson.hash
+++ b/package/cjson/cjson.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 81e6574f0b1c0d7cd34fa5e0f3fd34b162fc1c568fc1473880999c2030bfb6f0 cjson-v1.5.1.tar.gz
+sha256 6d1482c1b492893b25ab7e77ee6098fe3ef10585df660e5ffe67e632a8c5b9e4 cjson-v1.5.2.tar.gz
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
index 43cd8bd..c0f4b98 100644
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -4,7 +4,7 @@
#
################################################################################
-CJSON_VERSION = v1.5.1
+CJSON_VERSION = v1.5.2
CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION))
CJSON_INSTALL_STAGING = YES
CJSON_LICENSE = MIT
^ permalink raw reply related
* [Buildroot] [git commit branch/next] git: bump version to 2.13.0
From: Thomas Petazzoni @ 2017-05-10 21:44 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=312d71c7a9139e3a23f0c9c284d4b36414f48623
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Patches 0001 and 0002 already included in this release:
https://github.com/git/git/commit/379642bcd8d89db52feba88a651e4e56d6ac5767
https://github.com/git/git/commit/2225e1ea20481a7c0da526891470abf9ece623e7
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../git/0001-grep-set-default-output-method.patch | 59 ---------------
...ep-fix-builds-with-with-no-thread-support.patch | 87 ----------------------
package/git/git.hash | 2 +-
package/git/git.mk | 2 +-
4 files changed, 2 insertions(+), 148 deletions(-)
diff --git a/package/git/0001-grep-set-default-output-method.patch b/package/git/0001-grep-set-default-output-method.patch
deleted file mode 100644
index ade35eb..0000000
--- a/package/git/0001-grep-set-default-output-method.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 379642bcd8d89db52feba88a651e4e56d6ac5767 Mon Sep 17 00:00:00 2001
-From: Brandon Williams <bmwill@google.com>
-Date: Fri, 17 Mar 2017 11:41:54 -0700
-Subject: [PATCH] grep: set default output method
-
-Signed-off-by: Brandon Williams <bmwill@google.com>
-Signed-off-by: Junio C Hamano <gitster@pobox.com>
-Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
----
- grep.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/grep.c b/grep.c
-index 0dbdc1d..56ef0ec 100644
---- a/grep.c
-+++ b/grep.c
-@@ -12,6 +12,11 @@ static int grep_source_is_binary(struct grep_source *gs);
-
- static struct grep_opt grep_defaults;
-
-+static void std_output(struct grep_opt *opt, const void *buf, size_t size)
-+{
-+ fwrite(buf, size, 1, stdout);
-+}
-+
- /*
- * Initialize the grep_defaults template with hardcoded defaults.
- * We could let the compiler do this, but without C99 initializers
-@@ -42,6 +47,7 @@ void init_grep_defaults(void)
- color_set(opt->color_selected, "");
- color_set(opt->color_sep, GIT_COLOR_CYAN);
- opt->color = -1;
-+ opt->output = std_output;
- }
-
- static int parse_pattern_type_arg(const char *opt, const char *arg)
-@@ -152,6 +158,7 @@ void grep_init(struct grep_opt *opt, const char *prefix)
- opt->pathname = def->pathname;
- opt->regflags = def->regflags;
- opt->relative = def->relative;
-+ opt->output = def->output;
-
- color_set(opt->color_context, def->color_context);
- color_set(opt->color_filename, def->color_filename);
-@@ -1379,11 +1386,6 @@ static int look_ahead(struct grep_opt *opt,
- return 0;
- }
-
--static void std_output(struct grep_opt *opt, const void *buf, size_t size)
--{
-- fwrite(buf, size, 1, stdout);
--}
--
- static int fill_textconv_grep(struct userdiff_driver *driver,
- struct grep_source *gs)
- {
---
-2.6.2
-
diff --git a/package/git/0002-grep-fix-builds-with-with-no-thread-support.patch b/package/git/0002-grep-fix-builds-with-with-no-thread-support.patch
deleted file mode 100644
index 077b554..0000000
--- a/package/git/0002-grep-fix-builds-with-with-no-thread-support.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 2225e1ea20481a7c0da526891470abf9ece623e7 Mon Sep 17 00:00:00 2001
-From: Brandon Williams <bmwill@google.com>
-Date: Fri, 17 Mar 2017 11:41:55 -0700
-Subject: [PATCH] grep: fix builds with with no thread support
-
-Commit 0281e487fd91 ("grep: optionally recurse into submodules")
-added functions grep_submodule() and grep_submodule_launch() which
-use "struct work_item" which is defined only when thread support
-is available.
-
-The original implementation of grep_submodule() used the "struct
-work_item" in order to gain access to a strbuf to store its output which
-was to be printed at a later point in time. This differs from how both
-grep_file() and grep_sha1() handle their output. This patch eliminates
-the reliance on the "struct work_item" and instead opts to use the
-output function stored in the output field of the "struct grep_opt"
-object directly, making it behave similarly to both grep_file() and
-grep_sha1().
-
-Reported-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
-Signed-off-by: Brandon Williams <bmwill@google.com>
-Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
-Signed-off-by: Junio C Hamano <gitster@pobox.com>
-Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
----
- builtin/grep.c | 21 +++++++++------------
- 1 file changed, 9 insertions(+), 12 deletions(-)
-
-diff --git a/builtin/grep.c b/builtin/grep.c
-index 2c727ef..33561f2 100644
---- a/builtin/grep.c
-+++ b/builtin/grep.c
-@@ -538,7 +538,7 @@ static int grep_submodule_launch(struct grep_opt *opt,
- int status, i;
- const char *end_of_base;
- const char *name;
-- struct work_item *w = opt->output_priv;
-+ struct strbuf child_output = STRBUF_INIT;
-
- end_of_base = strchr(gs->name, ':');
- if (gs->identifier && end_of_base)
-@@ -593,14 +593,16 @@ static int grep_submodule_launch(struct grep_opt *opt,
- * child process. A '0' indicates a hit, a '1' indicates no hit and
- * anything else is an error.
- */
-- status = capture_command(&cp, &w->out, 0);
-+ status = capture_command(&cp, &child_output, 0);
- if (status && (status != 1)) {
- /* flush the buffer */
-- write_or_die(1, w->out.buf, w->out.len);
-+ write_or_die(1, child_output.buf, child_output.len);
- die("process for submodule '%s' failed with exit code: %d",
- gs->name, status);
- }
-
-+ opt->output(opt, child_output.buf, child_output.len);
-+ strbuf_release(&child_output);
- /* invert the return code to make a hit equal to 1 */
- return !status;
- }
-@@ -641,19 +643,14 @@ static int grep_submodule(struct grep_opt *opt, const unsigned char *sha1,
- } else
- #endif
- {
-- struct work_item w;
-+ struct grep_source gs;
- int hit;
-
-- grep_source_init(&w.source, GREP_SOURCE_SUBMODULE,
-+ grep_source_init(&gs, GREP_SOURCE_SUBMODULE,
- filename, path, sha1);
-- strbuf_init(&w.out, 0);
-- opt->output_priv = &w;
-- hit = grep_submodule_launch(opt, &w.source);
-+ hit = grep_submodule_launch(opt, &gs);
-
-- write_or_die(1, w.out.buf, w.out.len);
--
-- grep_source_clear(&w.source);
-- strbuf_release(&w.out);
-+ grep_source_clear(&gs);
- return hit;
- }
- }
---
-2.6.2
-
diff --git a/package/git/git.hash b/package/git/git.hash
index 9af360e..efe6225 100644
--- a/package/git/git.hash
+++ b/package/git/git.hash
@@ -1,2 +1,2 @@
# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
-sha256 d21a9e23506e618d561fb25a8a7bd6134f927b86147930103487117a7a678c4a git-2.12.2.tar.xz
+sha256 4bbf2ab6f2341253a38f95306ec7936833eb1c42572da5c1fa61f0abb2191258 git-2.13.0.tar.xz
diff --git a/package/git/git.mk b/package/git/git.mk
index c2e4b8d..9cc88dd 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GIT_VERSION = 2.12.2
+GIT_VERSION = 2.13.0
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
GIT_SITE = https://www.kernel.org/pub/software/scm/git
GIT_LICENSE = GPL-2.0, LGPL-2.1+
^ permalink raw reply related
* [Buildroot] [PATCH 2/3] support/testing: remove unused variable
From: Thomas Petazzoni @ 2017-05-10 21:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494452026-21567-2-git-send-email-luca@lucaceresoli.net>
Hello,
On Wed, 10 May 2017 23:33:45 +0200, Luca Ceresoli wrote:
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> ---
> support/testing/infra/basetest.py | 1 -
> 1 file changed, 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 1/3] support/testing: show messages in a more readable format
From: Thomas Petazzoni @ 2017-05-10 21:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494452026-21567-1-git-send-email-luca@lucaceresoli.net>
Hello,
On Wed, 10 May 2017 23:33:44 +0200, Luca Ceresoli wrote:
> Currently messages from run-tests are quite unpleasant:
>
> [br-tests/TestPostScripts/2017-05-09 15:51:57] Building
> [br-tests/TestPostScripts/2017-05-09 15:52:23] Building done
> [br-tests/TestPostScripts/2017-05-09 15:52:23] Cleaning up
> .[br-tests/TestNoTimezone/2017-05-09 15:52:23] Starting
> [br-tests/TestNoTimezone/2017-05-09 15:52:23] Building
> [br-tests/TestNoTimezone/2017-05-09 15:53:17] Building done
> [br-tests/TestNoTimezone/2017-05-09 15:53:22] Cleaning up
> .[br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:53:22] Starting
> [br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:53:22] Building
> [br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:54:33] Building done
> [br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:54:37] Cleaning up
> [...]
>
> Change them in a more readable way by removing the date and using a
> columnar style:
>
> 15:12:22 TestPostScripts Starting
> 15:12:25 TestPostScripts Building
> 15:12:48 TestPostScripts Building done
> 15:12:48 TestPostScripts Cleaning up
> .15:12:48 TestNoTimezone Starting
> 15:12:54 TestNoTimezone Building
> 15:13:44 TestNoTimezone Building done
> 15:13:49 TestNoTimezone Cleaning up
> .15:13:49 TestGlibcNonDefaultLimitedTimezone Starting
> 15:14:00 TestGlibcNonDefaultLimitedTimezone Building
> 15:14:56 TestGlibcNonDefaultLimitedTimezone Building done
> 15:15:01 TestGlibcNonDefaultLimitedTimezone Cleaning up
> [...]
>
> Note the '.' and other characters presented by nose2 are still
> printed. They are not affected by this change.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> ---
> support/testing/infra/basetest.py | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] support/testing: remove unused variable
From: Thomas Petazzoni @ 2017-05-10 21:42 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=bab4a2fd37b1ce4bdeb25f7bf98adf07eea8c504
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
support/testing/infra/basetest.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py
index cb5d210..557baa2 100644
--- a/support/testing/infra/basetest.py
+++ b/support/testing/infra/basetest.py
@@ -41,7 +41,6 @@ class BRTest(unittest.TestCase):
def setUp(self):
self.testname = self.__class__.__name__
self.builddir = os.path.join(self.__class__.outputdir, self.testname)
- self.runlog = self.builddir + "-run.log"
self.emulator = None
self.show_msg("Starting")
self.b = Builder(self.__class__.config, self.builddir, self.logtofile)
^ permalink raw reply related
* [Buildroot] [git commit] support/testing: show messages in a more readable format
From: Thomas Petazzoni @ 2017-05-10 21:42 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=08151c6aec559b68c0991dadf0147673cbae851f
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Currently messages from run-tests are quite unpleasant:
[br-tests/TestPostScripts/2017-05-09 15:51:57] Building
[br-tests/TestPostScripts/2017-05-09 15:52:23] Building done
[br-tests/TestPostScripts/2017-05-09 15:52:23] Cleaning up
.[br-tests/TestNoTimezone/2017-05-09 15:52:23] Starting
[br-tests/TestNoTimezone/2017-05-09 15:52:23] Building
[br-tests/TestNoTimezone/2017-05-09 15:53:17] Building done
[br-tests/TestNoTimezone/2017-05-09 15:53:22] Cleaning up
.[br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:53:22] Starting
[br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:53:22] Building
[br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:54:33] Building done
[br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:54:37] Cleaning up
[...]
Change them in a more readable way by removing the date and using a
columnar style:
15:12:22 TestPostScripts Starting
15:12:25 TestPostScripts Building
15:12:48 TestPostScripts Building done
15:12:48 TestPostScripts Cleaning up
.15:12:48 TestNoTimezone Starting
15:12:54 TestNoTimezone Building
15:13:44 TestNoTimezone Building done
15:13:49 TestNoTimezone Cleaning up
.15:13:49 TestGlibcNonDefaultLimitedTimezone Starting
15:14:00 TestGlibcNonDefaultLimitedTimezone Building
15:14:56 TestGlibcNonDefaultLimitedTimezone Building done
15:15:01 TestGlibcNonDefaultLimitedTimezone Cleaning up
[...]
Note the '.' and other characters presented by nose2 are still
printed. They are not affected by this change.
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
support/testing/infra/basetest.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py
index eb9da90..cb5d210 100644
--- a/support/testing/infra/basetest.py
+++ b/support/testing/infra/basetest.py
@@ -36,10 +36,8 @@ class BRTest(unittest.TestCase):
keepbuilds = False
def show_msg(self, msg):
- print "[%s/%s/%s] %s" % (os.path.basename(self.__class__.outputdir),
- self.testname,
- datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
- msg)
+ print "{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"),
+ self.testname, msg)
def setUp(self):
self.testname = self.__class__.__name__
self.builddir = os.path.join(self.__class__.outputdir, self.testname)
^ permalink raw reply related
* [Buildroot] [PATCH v3 2/3] package/ltp-testsuite: introduce BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
From: Thomas Petazzoni @ 2017-05-10 21:41 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170509205929.8394-2-romain.naour@gmail.com>
Hello,
On Tue, 9 May 2017 22:59:28 +0200, Romain Naour wrote:
> ltp-testsuite needs __sync*() built-ins for 4-byte data, except on a few
> architectures for which a specific implementation is provided in
> ltp-testsuite source code.
>
> To prepare for the introduction of this dependency, add
> BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS.
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
> package/ltp-testsuite/Config.in | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
Thanks, I've applied patches 2 and 3, after changing a bit how the
ARCH_SUPPORTS option is defined, as I suggested in my review of patch 3.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [Bug 9796] source-check broken for Git downloads
From: bugzilla at busybox.net @ 2017-05-10 21:39 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-9796-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=9796
Yann E. MORIN <yann.morin.1998@free.fr> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |ASSIGNED
--- Comment #4 from Yann E. MORIN <yann.morin.1998@free.fr> ---
The underlying reason s that foo-source-check has no stamp file
associated to it, and eventually, $(PKG) is empty.
I'll fix soonish...
--
You are receiving this mail because:
You are on the CC list for the bug.
^ permalink raw reply
* [Buildroot] [git commit] package/ltp-testsuite: refine architecture dependency
From: Thomas Petazzoni @ 2017-05-10 21:38 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=583f59702bdd2baa040a37eef061530973269880
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
As stated in commit [1], sparc toolchains doesn't have
any of __sync_*() family of functions implementation.
When __sync_add_and_fetch() is missing, ltp fallback to a local
implementation of tst_atomic_add_return() specific for each
supported architecture.
But there is none for sparc.
So add a dependency on BR2_TOOLCHAIN_HAS_SYNC_4 except for
architectures where a specific implementation is provided
in ltp-testsuite.
Fixes:
http://autobuild.buildroot.net/results/d7c/d7c3b145a64ed3916b89ddb4090050f3b9205e37
[1] 6856e417da4f3aa77e2a814db2a89429af072f7d
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/ltp-testsuite/Config.in | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 5c7152f..4c00e40 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -1,6 +1,15 @@
config BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
bool
- default y
+ # Needs __sync*() built-ins for 4-byte data, except on a few
+ # architectures for which a specific implementation is
+ # provided in ltp-testsuite
+ default y if BR2_TOOLCHAIN_HAS_SYNC_4
+ default y if BR2_arc
+ default y if BR2_i386
+ default y if BR2_powerpc
+ default y if BR2_powepc64
+ default y if BR2_powerpc64le
+ default y if BR2_x86_64
# does not build on nios2, cachectl.h issue
depends on !BR2_nios2
^ permalink raw reply related
* [Buildroot] [git commit] package/ltp-testsuite: introduce BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
From: Thomas Petazzoni @ 2017-05-10 21:37 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=0c514410ed1554ce7a86f87c061479fe979385b2
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
ltp-testsuite needs __sync*() built-ins for 4-byte data, except on a few
architectures for which a specific implementation is provided in
ltp-testsuite source code.
To prepare for the introduction of this dependency, add
BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
[Thomas: slightly adjust how the ARCH_SUPPORTS option is defined.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/ltp-testsuite/Config.in | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index a7d3e58..5c7152f 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -1,10 +1,15 @@
+config BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
+ bool
+ default y
+ # does not build on nios2, cachectl.h issue
+ depends on !BR2_nios2
+
config BR2_PACKAGE_LTP_TESTSUITE
bool "ltp-testsuite"
depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on !BR2_TOOLCHAIN_USES_MUSL
- # does not build, cachectl.h issue
- depends on !BR2_nios2
+ depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
help
The Linux Test Project provides a huge testsuite for Linux.
@@ -12,6 +17,6 @@ config BR2_PACKAGE_LTP_TESTSUITE
http://linux-test-project.github.io
comment "ltp-testsuite needs a glibc or uClibc toolchain w/ NPTL"
- depends on !BR2_nios2
+ depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_TOOLCHAIN_USES_MUSL
^ permalink raw reply related
* [Buildroot] [PATCH v3 1/3] package/ltp-testsuite: remove ldd command test with static only build
From: Thomas Petazzoni @ 2017-05-10 21:36 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170509205929.8394-1-romain.naour@gmail.com>
Hello,
On Tue, 9 May 2017 22:59:27 +0200, Romain Naour wrote:
> ldd command build system try to build a shared library unconditionally:
>
> arc-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -matomic -Os -static \
> -I[...]/sysroot/usr/include/tirpc -g -O2 -fno-strict-aliasing -pipe \
> -Wall -W -Wold-style-definition -shared -o lddfile1.obj.so lddfile1.o
>
> Fixes:
> http://autobuild.buildroot.net/results/2ec/2eccf9f517ab15d8d459b06195423fdfe3fba9fa
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> package/ltp-testsuite/ltp-testsuite.mk | 8 ++++++++
> 1 file changed, 8 insertions(+)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] package/ltp-testsuite: remove ldd command test with static only build
From: Thomas Petazzoni @ 2017-05-10 21:35 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=bb98e425f8edc27c3d39d49cfec94a514b03b988
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
ldd command build system try to build a shared library unconditionally:
arc-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -matomic -Os -static \
-I[...]/sysroot/usr/include/tirpc -g -O2 -fno-strict-aliasing -pipe \
-Wall -W -Wold-style-definition -shared -o lddfile1.obj.so lddfile1.o
Fixes:
http://autobuild.buildroot.net/results/2ec/2eccf9f517ab15d8d459b06195423fdfe3fba9fa
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/ltp-testsuite/ltp-testsuite.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index 7f26bd2..a4546df 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -68,4 +68,12 @@ endef
LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_UNSUPPORTED
endif
+# ldd command build system tries to build a shared library unconditionally.
+ifeq ($(BR2_STATIC_LIBS),y)
+define LTP_TESTSUITE_REMOVE_LDD
+ rm -rf $(@D)/testcases/commands/ldd
+endef
+LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_LDD
+endif
+
$(eval $(autotools-package))
^ permalink raw reply related
* [Buildroot] [for-master] package/expedite: bump to the current master
From: Thomas Petazzoni @ 2017-05-10 21:35 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170510164843.16001-1-romain.naour@gmail.com>
Hello,
On Wed, 10 May 2017 18:48:43 +0200, Romain Naour wrote:
> The current master is ahead of one commit, this commit include
> the fix for the build issue reported upstream [1].
> Remove the patch 0001 which is no longer necessary.
>
> [1] https://phab.enlightenment.org/T5440
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
> .../0001-fix-build-failure-with-gcc-5.patch | 289 ---------------------
> package/expedite/expedite.hash | 2 +-
> package/expedite/expedite.mk | 2 +-
> 3 files changed, 2 insertions(+), 291 deletions(-)
> delete mode 100644 package/expedite/0001-fix-build-failure-with-gcc-5.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] package/expedite: bump to the current master
From: Thomas Petazzoni @ 2017-05-10 21:34 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=027e0765b5d0f1f0773a987a6cf22b7071939929
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
The current master is ahead of one commit, this commit include
the fix for the build issue reported upstream [1].
Remove the patch 0001 which is no longer necessary.
[1] https://phab.enlightenment.org/T5440
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../0001-fix-build-failure-with-gcc-5.patch | 289 ---------------------
package/expedite/expedite.hash | 2 +-
package/expedite/expedite.mk | 2 +-
3 files changed, 2 insertions(+), 291 deletions(-)
diff --git a/package/expedite/0001-fix-build-failure-with-gcc-5.patch b/package/expedite/0001-fix-build-failure-with-gcc-5.patch
deleted file mode 100644
index 2d5d6ef..0000000
--- a/package/expedite/0001-fix-build-failure-with-gcc-5.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-From 01a29e6a1d2ed083d1a1884dbca37ae518f354c7 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sun, 30 Apr 2017 12:07:02 +0200
-Subject: [PATCH] fix build failure with gcc < 5
-
-Definition of variables inside the initialization part of for() loops
-was added by [1] and produce some build failure with "old" gcc version
-(gcc < 5).
-
-This way of writing for loop is not consistent with the rest of the
-code. So revert to the C89 for loop syntax.
-
-Reported upstream:
-https://phab.enlightenment.org/T5440
-
-[1] https://git.enlightenment.org/tools/expedite.git/commit/?id=0529ce56b6fb01e9651e76461e9608e15a040fb3
-
-Fixes:
-http://autobuild.buildroot.net/results/930/930796603d37bc309a591eec68037192c51028ce
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/bin/image_data_argb.c | 9 ++++++---
- src/bin/image_data_argb_alpha.c | 6 ++++--
- src/bin/image_data_ycbcr601pl.c | 12 ++++++++----
- .../image_data_ycbcr601pl_map_nearest_solid_rotate.c | 12 ++++++++----
- src/bin/image_data_ycbcr601pl_map_solid_rotate.c | 12 ++++++++----
- src/bin/image_data_ycbcr601pl_wide_stride.c | 17 +++++++++++------
- 6 files changed, 45 insertions(+), 23 deletions(-)
-
-diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
-index d5889ce..9c607b2 100644
---- a/src/bin/image_data_argb.c
-+++ b/src/bin/image_data_argb.c
-@@ -20,12 +20,13 @@ static Evas_Object *o_images[1];
- /* setup */
- static void _setup(void)
- {
-+ int i;
- Evas_Object *o;
- Eina_Slice sl;
-
- sl.len = 640 * 480 * 4;
- sl.mem = malloc(sl.len);
-- for (int i = 0; i < 1; i++)
-+ for (i = 0; i < 1; i++)
- {
- o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
- o_images[i] = o;
-@@ -42,7 +43,8 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
-- for (int i = 0; i < 1; i++)
-+ int i;
-+ for (i = 0; i < 1; i++)
- {
- Evas_Object *o = o_images[i];
- Eina_Slice sl = {};
-@@ -56,7 +58,8 @@ static void _cleanup(void)
- /* loop - do things */
- static void _loop(double t, int f)
- {
-- for (int i = 0; i < 1; i++)
-+ int i;
-+ for (i = 0; i < 1; i++)
- {
- Evas_Object *o = o_images[i];
- unsigned int *data, *p;
-diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
-index 79f4c54..ffbe57e 100644
---- a/src/bin/image_data_argb_alpha.c
-+++ b/src/bin/image_data_argb_alpha.c
-@@ -20,12 +20,13 @@ static Evas_Object *o_images[1];
- /* setup */
- static void _setup(void)
- {
-+ int i;
- Evas_Object *o;
- Eina_Slice sl;
-
- sl.len = 640 * 480 * 4;
- sl.mem = malloc(sl.len);
-- for (int i = 0; i < 1; i++)
-+ for (i = 0; i < 1; i++)
- {
- o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
- o_images[i] = o;
-@@ -42,7 +43,8 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
-- for (int i = 0; i < 1; i++)
-+ int i;
-+ for (i = 0; i < 1; i++)
- {
- Evas_Object *o = o_images[i];
- Eina_Slice sl = {};
-diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
-index 032d5b3..e126e98 100644
---- a/src/bin/image_data_ycbcr601pl.c
-+++ b/src/bin/image_data_ycbcr601pl.c
-@@ -21,9 +21,11 @@ static Eina_Slice slice[3];
- /* setup */
- static void _setup(void)
- {
-+ int i;
- FILE *f;
-- for (int i = 0; i < 1; i++)
-+ for (i = 0; i < 1; i++)
- {
-+ int p;
- Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
- o_images[i] = o;
- efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-@@ -37,7 +39,7 @@ static void _setup(void)
- slice[2].len = 320 * 240;
- f = fopen(build_path("tp.yuv"), "rb");
- if (!f) continue;
-- for (int p = 0; p < 3; p++)
-+ for (p = 0; p < 3; p++)
- {
- slice[p].mem = malloc(slice[p].len);
- fread((void *) slice[p].mem, slice[p].len, 1, f);
-@@ -51,10 +53,12 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
-- for (int i = 0; i < 1; i++)
-+ int i;
-+ for (i = 0; i < 1; i++)
- {
-+ int p;
- Evas_Object *o = o_images[i];
-- for (int p = 0; p < 3; p++)
-+ for (p = 0; p < 3; p++)
- {
- efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
- free((void *) slice[p].mem);
-diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
-index 0a5bcf4..db52b0b 100644
---- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
-+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
-@@ -21,9 +21,11 @@ static Eina_Slice slice[3];
- /* setup */
- static void _setup(void)
- {
-+ int i;
- FILE *f;
-- for (int i = 0; i < 1; i++)
-+ for (i = 0; i < 1; i++)
- {
-+ int p;
- Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
- o_images[i] = o;
- efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-@@ -37,7 +39,7 @@ static void _setup(void)
- slice[2].len = 320 * 240;
- f = fopen(build_path("tp.yuv"), "rb");
- if (!f) continue;
-- for (int p = 0; p < 3; p++)
-+ for (p = 0; p < 3; p++)
- {
- slice[p].mem = malloc(slice[p].len);
- fread((void *) slice[p].mem, slice[p].len, 1, f);
-@@ -51,10 +53,12 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
-- for (int i = 0; i < 1; i++)
-+ int i;
-+ for (i = 0; i < 1; i++)
- {
-+ int p;
- Evas_Object *o = o_images[i];
-- for (int p = 0; p < 3; p++)
-+ for (p = 0; p < 3; p++)
- {
- efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
- free((void *) slice[p].mem);
-diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
-index 355293f..ac4364d 100644
---- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
-+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
-@@ -22,8 +22,10 @@ static Eina_Slice slice[3];
- static void _setup(void)
- {
- FILE *f;
-- for (int i = 0; i < 1; i++)
-+ int i;
-+ for (i = 0; i < 1; i++)
- {
-+ int p;
- Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
- o_images[i] = o;
- efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-@@ -37,7 +39,7 @@ static void _setup(void)
- slice[2].len = 320 * 240;
- f = fopen(build_path("tp.yuv"), "rb");
- if (!f) continue;
-- for (int p = 0; p < 3; p++)
-+ for (p = 0; p < 3; p++)
- {
- slice[p].mem = malloc(slice[p].len);
- fread((void *) slice[p].mem, slice[p].len, 1, f);
-@@ -51,10 +53,12 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
-- for (int i = 0; i < 1; i++)
-+ int i;
-+ for (i = 0; i < 1; i++)
- {
-+ int p;
- Evas_Object *o = o_images[i];
-- for (int p = 0; p < 3; p++)
-+ for (p = 0; p < 3; p++)
- {
- efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
- free((void *) slice[p].mem);
-diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
-index d4e8fa2..9adb62f 100644
---- a/src/bin/image_data_ycbcr601pl_wide_stride.c
-+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
-@@ -21,11 +21,13 @@ static Eina_Slice slice[3];
- /* setup */
- static void _setup(void)
- {
-+ int i;
- int stride;
- FILE *f;
- int w = 320 - 16;
-- for (int i = 0; i < 1; i++)
-+ for (i = 0; i < 1; i++)
- {
-+ int p;
- Evas_Object *o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
- o_images[i] = o;
- efl_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-@@ -41,7 +43,7 @@ static void _setup(void)
- f = fopen(build_path("tp.yuv"), "rb");
- if (!f) continue;
- stride = 640;
-- for (int p = 0; p < 3; p++)
-+ for (p = 0; p < 3; p++)
- {
- slice[p].mem = malloc(slice[p].len);
- fread((void *) slice[p].mem, slice[p].len, 1, f);
-@@ -57,10 +59,12 @@ static void _setup(void)
- /* cleanup */
- static void _cleanup(void)
- {
-- for (int i = 0; i < 1; i++)
-+ int i;
-+ for (i = 0; i < 1; i++)
- {
-+ int p;
- Evas_Object *o = o_images[i];
-- for (int p = 0; p < 3; p++)
-+ for (p = 0; p < 3; p++)
- {
- efl_gfx_buffer_managed_set(o, NULL, 640, 480, 0,
- EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
-@@ -77,11 +81,12 @@ static void _loop(double t, int f)
- Evas_Coord x, y, w, h;
- for (i = 0; i < 1; i++)
- {
-+ int p;
- Evas_Object *o = o_images[i];
- Eina_Slice sl[3];
- int stride;
-
-- for (int p = 0; p < 3; p++)
-+ for (p = 0; p < 3; p++)
- efl_gfx_buffer_managed_get(o, &sl[p], p);
-
- w = 640;
-@@ -97,7 +102,7 @@ static void _loop(double t, int f)
- if (w > 640) w = 320;
-
- stride = 640;
-- for (int p = 0; p < 3; p++)
-+ for (p = 0; p < 3; p++)
- {
- efl_gfx_buffer_managed_set(o, &sl[p], w, 480, stride,
- EFL_GFX_COLORSPACE_YCBCR422P601_PL, p);
---
-2.9.3
-
diff --git a/package/expedite/expedite.hash b/package/expedite/expedite.hash
index 2d1db59..828ee05 100644
--- a/package/expedite/expedite.hash
+++ b/package/expedite/expedite.hash
@@ -1,2 +1,2 @@
# locally computed
-sha256 007e382861555f1023b679e21ff44122b0622c514ce8ef9d7c390b9ac1511009 expedite-0529ce56b6fb01e9651e76461e9608e15a040fb3.tar.gz
+sha256 56e1dbd9826d932f0ef72a10dfdf32b6e0f680ab6830f8a8cfc60644ac69dbf1 expedite-e7b11dd328d9db82b49cde795944a721beaf0112.tar.gz
diff --git a/package/expedite/expedite.mk b/package/expedite/expedite.mk
index d49e87a..6bd4b00 100644
--- a/package/expedite/expedite.mk
+++ b/package/expedite/expedite.mk
@@ -4,7 +4,7 @@
#
################################################################################
-EXPEDITE_VERSION = 0529ce56b6fb01e9651e76461e9608e15a040fb3
+EXPEDITE_VERSION = e7b11dd328d9db82b49cde795944a721beaf0112
EXPEDITE_SITE = http://git.enlightenment.org/tools/expedite.git
EXPEDITE_SITE_METHOD = git
EXPEDITE_LICENSE = BSD-2-Clause
^ permalink raw reply related
* [Buildroot] [PATCH 1/5] DEVELOPERS: add Matt Weber -> package/libqmi
From: Thomas Petazzoni @ 2017-05-10 21:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494262354-51074-1-git-send-email-matthew.weber@rockwellcollins.com>
Hello,
On Mon, 8 May 2017 11:52:30 -0500, Matt Weber wrote:
> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
> ---
> DEVELOPERS | 1 +
> 1 file changed, 1 insertion(+)
I've applied the series, after squashing into a single patch, which was
more logical.
Thanks a lot!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH master] mpir: fix build on MIPS R6 CPUs
From: Thomas Petazzoni @ 2017-05-10 21:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170510105546.51108-1-Vincent.Riera@imgtec.com>
Hello,
On Wed, 10 May 2017 11:55:46 +0100, Vicente Olivert Riera wrote:
> Commit ef9eebf65f554d9aacfd420600c8ba17787151a8 tried to fix this
> problem in a wrong way. It was fixed only for generic R6 CPUs, so the
> problem still persist if you choose any other R6 CPU, like I6400 for
> instance.
>
> Fix it properly by using the right kconfig options.
>
> Fixes:
> http://autobuild.buildroot.net/results/f33/f33cb1e0b49fe8aee68fb4b66ea4c304b71a6f8f/
>
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> package/mpir/mpir.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 3/3] support/testing: simplify logging by keeping the log file open
From: Luca Ceresoli @ 2017-05-10 21:33 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494452026-21567-1-git-send-email-luca@lucaceresoli.net>
We currently call infra.smart_open() to open log files each time we
need to write to them.
Opening the file once in the constructor of Builder and Emulator and
writing to it whenever needed is simpler and slightly more efficient.
Remove smart_open and instead create a new open_log_file() function
which just opens the logfile. Also let it compute the filename, in
order to simplify even further the Builder and Emulator code.
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
support/testing/infra/__init__.py | 21 +++++++--------------
support/testing/infra/builder.py | 12 +++---------
support/testing/infra/emulator.py | 15 +++++----------
3 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/support/testing/infra/__init__.py b/support/testing/infra/__init__.py
index c3f645cf99d7..b0427e706ca6 100644
--- a/support/testing/infra/__init__.py
+++ b/support/testing/infra/__init__.py
@@ -8,24 +8,17 @@ from urllib2 import urlopen, HTTPError, URLError
ARTIFACTS_URL = "http://autobuild.buildroot.net/artefacts/"
- at contextlib.contextmanager
-def smart_open(filename=None):
+def open_log_file(builddir, stage, logtofile=True):
"""
- Return a file-like object that can be written to using the 'with'
- keyword, as in the example:
- with infra.smart_open("test.log") as outfile:
- outfile.write("Hello, world!\n")
+ Open a file for logging and return its handler.
+ If logtofile is True, returns sys.stdout. Otherwise opens a file
+ with a suitable name in the build directory.
"""
- if filename and filename != '-':
- fhandle = open(filename, 'a+')
+ if logtofile:
+ fhandle = open("{}-{}.log".format(builddir, stage), 'a+')
else:
fhandle = sys.stdout
-
- try:
- yield fhandle
- finally:
- if fhandle is not sys.stdout:
- fhandle.close()
+ return fhandle
def filepath(relpath):
return os.path.join(os.getcwd(), "support/testing", relpath)
diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py
index 105da01ca2fa..a475bb0a3021 100644
--- a/support/testing/infra/builder.py
+++ b/support/testing/infra/builder.py
@@ -8,16 +8,12 @@ class Builder(object):
def __init__(self, config, builddir, logtofile):
self.config = config
self.builddir = builddir
- self.logtofile = logtofile
+ self.logfile = infra.open_log_file(builddir, "build", logtofile)
def build(self):
if not os.path.isdir(self.builddir):
os.makedirs(self.builddir)
- log = "{}-build.log".format(self.builddir)
- if not self.logtofile:
- log = None
-
config_file = os.path.join(self.builddir, ".config")
with open(config_file, "w+") as cf:
cf.write(self.config)
@@ -25,14 +21,12 @@ class Builder(object):
cmd = ["make",
"O={}".format(self.builddir),
"olddefconfig"]
- with infra.smart_open(log) as log_fh:
- ret = subprocess.call(cmd, stdout=log_fh, stderr=log_fh)
+ ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile)
if ret != 0:
raise SystemError("Cannot olddefconfig")
cmd = ["make", "-C", self.builddir]
- with infra.smart_open(log) as log_fh:
- ret = subprocess.call(cmd, stdout=log_fh, stderr=log_fh)
+ ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile)
if ret != 0:
raise SystemError("Build failed")
diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py
index 7c476cb0e494..2480b4654056 100644
--- a/support/testing/infra/emulator.py
+++ b/support/testing/infra/emulator.py
@@ -14,9 +14,7 @@ class Emulator(object):
self.__tn = None
self.downloaddir = downloaddir
self.log = ""
- self.log_file = "{}-run.log".format(builddir)
- if logtofile is None:
- self.log_file = None
+ self.logfile = infra.open_log_file(builddir, "run", logtofile)
# Start Qemu to boot the system
#
@@ -72,9 +70,8 @@ class Emulator(object):
if kernel_cmdline:
qemu_cmd += ["-append", " ".join(kernel_cmdline)]
- with infra.smart_open(self.log_file) as lfh:
- lfh.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd))
- self.qemu = subprocess.Popen(qemu_cmd, stdout=lfh, stderr=lfh)
+ self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd))
+ self.qemu = subprocess.Popen(qemu_cmd, stdout=self.logfile, stderr=self.logfile)
# Wait for the telnet port to appear and connect to it.
while True:
@@ -88,8 +85,7 @@ class Emulator(object):
def __read_until(self, waitstr, timeout=5):
data = self.__tn.read_until(waitstr, timeout)
self.log += data
- with infra.smart_open(self.log_file) as lfh:
- lfh.write(data)
+ self.logfile.write(data)
return data
def __write(self, wstr):
@@ -100,8 +96,7 @@ class Emulator(object):
def login(self, password=None):
self.__read_until("buildroot login:", 10)
if "buildroot login:" not in self.log:
- with infra.smart_open(self.log_file) as lfh:
- lfh.write("==> System does not boot")
+ self.logfile.write("==> System does not boot")
raise SystemError("System does not boot")
self.__write("root\n")
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH 2/3] support/testing: remove unused variable
From: Luca Ceresoli @ 2017-05-10 21:33 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494452026-21567-1-git-send-email-luca@lucaceresoli.net>
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
support/testing/infra/basetest.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py
index cb5d2100f44a..557baa215c65 100644
--- a/support/testing/infra/basetest.py
+++ b/support/testing/infra/basetest.py
@@ -41,7 +41,6 @@ class BRTest(unittest.TestCase):
def setUp(self):
self.testname = self.__class__.__name__
self.builddir = os.path.join(self.__class__.outputdir, self.testname)
- self.runlog = self.builddir + "-run.log"
self.emulator = None
self.show_msg("Starting")
self.b = Builder(self.__class__.config, self.builddir, self.logtofile)
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH 1/3] support/testing: show messages in a more readable format
From: Luca Ceresoli @ 2017-05-10 21:33 UTC (permalink / raw)
To: buildroot
Currently messages from run-tests are quite unpleasant:
[br-tests/TestPostScripts/2017-05-09 15:51:57] Building
[br-tests/TestPostScripts/2017-05-09 15:52:23] Building done
[br-tests/TestPostScripts/2017-05-09 15:52:23] Cleaning up
.[br-tests/TestNoTimezone/2017-05-09 15:52:23] Starting
[br-tests/TestNoTimezone/2017-05-09 15:52:23] Building
[br-tests/TestNoTimezone/2017-05-09 15:53:17] Building done
[br-tests/TestNoTimezone/2017-05-09 15:53:22] Cleaning up
.[br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:53:22] Starting
[br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:53:22] Building
[br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:54:33] Building done
[br-tests/TestGlibcNonDefaultLimitedTimezone/2017-05-09 15:54:37] Cleaning up
[...]
Change them in a more readable way by removing the date and using a
columnar style:
15:12:22 TestPostScripts Starting
15:12:25 TestPostScripts Building
15:12:48 TestPostScripts Building done
15:12:48 TestPostScripts Cleaning up
.15:12:48 TestNoTimezone Starting
15:12:54 TestNoTimezone Building
15:13:44 TestNoTimezone Building done
15:13:49 TestNoTimezone Cleaning up
.15:13:49 TestGlibcNonDefaultLimitedTimezone Starting
15:14:00 TestGlibcNonDefaultLimitedTimezone Building
15:14:56 TestGlibcNonDefaultLimitedTimezone Building done
15:15:01 TestGlibcNonDefaultLimitedTimezone Cleaning up
[...]
Note the '.' and other characters presented by nose2 are still
printed. They are not affected by this change.
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
support/testing/infra/basetest.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py
index eb9da90119ac..cb5d2100f44a 100644
--- a/support/testing/infra/basetest.py
+++ b/support/testing/infra/basetest.py
@@ -36,10 +36,8 @@ class BRTest(unittest.TestCase):
keepbuilds = False
def show_msg(self, msg):
- print "[%s/%s/%s] %s" % (os.path.basename(self.__class__.outputdir),
- self.testname,
- datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
- msg)
+ print "{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"),
+ self.testname, msg)
def setUp(self):
self.testname = self.__class__.__name__
self.builddir = os.path.join(self.__class__.outputdir, self.testname)
--
2.7.4
^ permalink raw reply related
* [Buildroot] [git commit] mpir: fix build on MIPS R6 CPUs
From: Thomas Petazzoni @ 2017-05-10 21:33 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=dd9b085daf855a19b16b74a76a4fbca3b07432b1
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Commit ef9eebf65f554d9aacfd420600c8ba17787151a8 tried to fix this
problem in a wrong way. It was fixed only for generic R6 CPUs, so the
problem still persist if you choose any other R6 CPU, like I6400 for
instance.
Fix it properly by using the right kconfig options.
Fixes:
http://autobuild.buildroot.net/results/f33/f33cb1e0b49fe8aee68fb4b66ea4c304b71a6f8f/
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/mpir/mpir.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/mpir/mpir.mk b/package/mpir/mpir.mk
index 697e838..91f704d 100644
--- a/package/mpir/mpir.mk
+++ b/package/mpir/mpir.mk
@@ -27,7 +27,7 @@ MPIR_CONF_ENV += MPN_PATH="generic"
endif
# Optimized mips32/mips64 code not suitable for mips32r6/mips64r6
-ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y)
+ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y)
MPIR_CONF_ENV += MPN_PATH="generic"
endif
^ permalink raw reply related
* [Buildroot] [git commit] DEVELOPERS: add a number of packages to Matt Weber
From: Thomas Petazzoni @ 2017-05-10 21:32 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=c270b4a4c064d9892f0bbe810bcd4f9ee598e467
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This commit adds Matt Weber as a developer for the libqmi, nginx-upload,
cgroupfs-mount, validjson and SELinux-related packages.
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
DEVELOPERS | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/DEVELOPERS b/DEVELOPERS
index 8fbb69a..13c72ed 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1070,22 +1070,32 @@ F: package/ts4900-fpga/
N: Matt Weber <matthew.weber@rockwellcollins.com>
F: package/bc/
+F: package/checkpolicy/
+F: package/cgroupfs-mount/
F: package/eigen/
F: package/fmc/
F: package/fmlib/
F: package/igmpproxy/
F: package/iputils/
F: package/libcsv/
+F: package/libselinux/
+F: package/libsemanage/
+F: package/libsepol/
+F: package/libqmi/
+F: package/nginx-upload/
F: package/omniorb/
+F: package/policycoreutils/
F: package/python-ipy/
F: package/python-posix-ipc/
F: package/python-pypcap/
F: package/python-pyrex/
F: package/raptor/
+F: package/sepolgen/
F: package/setools/
F: package/simicsfs/
F: package/smcroute/
F: package/tclap/
+F: package/valijson/
N: Mauro Condarelli <mc5686@mclink.it>
F: package/mc/
^ permalink raw reply related
* [Buildroot] [PATCH 1/3] refpolicy: new package
From: Adam Duskett @ 2017-05-10 20:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170510215029.779b02e2@free-electrons.com>
Hello
On May 10, 2017 3:50 PM, "Thomas Petazzoni" <
thomas.petazzoni@free-electrons.com> wrote:
Hello,
On Wed, 10 May 2017 12:58:46 -0500, Matthew Weber wrote:
> On Wed, May 10, 2017 at 12:46 PM, Adam Duskett <aduskett@gmail.com> wrote:
> > The patch is for adding selinux reference policy (refpolicy).
> > It is a complete SELinux policy that can be used as the system policy
> > for a variety of systems and used as the basis for creating other
policies.
> >
>
> Similar patchset submitted here:
> https://patchwork.ozlabs.org/patch/711535/
Exactly what I was going to say: what is the difference between this
new submission, and the one from Bryce Ferguson already in patchwork ?
I talked to Bryce earlier today and asked if I could take over the patch
for him, so I cleaned up the makefile and made everything cleaner for the
next round.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
Adam
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170510/439adc57/attachment.html>
^ permalink raw reply
* [Buildroot] [Bug 9796] source-check broken for Git downloads
From: bugzilla at busybox.net @ 2017-05-10 20:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-9796-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=9796
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Assignee|unassigned at buildroot.uclibc |yann.morin.1998 at free.fr
|.org |
--
You are receiving this mail because:
You are on the CC list for the bug.
^ permalink raw reply
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