[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-58-g3668bc7b0
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2019-05-15 08:01:58
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3668bc7b0434dcbadc85961a81c293788145616e (commit)
via be69aa650278b22be0f74ee08459f43efc6aa3b7 (commit)
via 77b0be6bedde46bdedb525f767adfbbcf7cba6b3 (commit)
from a1a3385a4f400ba011360ab44a48548b275917b9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3668bc7b0434dcbadc85961a81c293788145616e
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed May 15 09:59:16 2019 +0200
[BUILDROOT] 2019.02: bump stress-ng
commit be69aa650278b22be0f74ee08459f43efc6aa3b7
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed May 15 09:34:07 2019 +0200
[BUILDROOT] 2019.02: update cleanup_buildroot.sh
commit 77b0be6bedde46bdedb525f767adfbbcf7cba6b3
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue May 14 19:38:01 2019 +0200
[BUILDROOT] 2019.02: fix ADEOS patch downloading
-----------------------------------------------------------------------
Summary of changes:
...072-armadeus-xenomai-download-adeos-patch.patch | 34 +++--
...package-stress-ng-bump-to-version-0.09.55.patch | 155 +++++++++++++++++++++
...package-stress-ng-bump-to-version-0.09.58.patch | 40 ++++++
patches/buildroot/2019.02/cleanup_buildroot.sh | 7 +-
4 files changed, 216 insertions(+), 20 deletions(-)
create mode 100644 patches/buildroot/2019.02/238-package-stress-ng-bump-to-version-0.09.55.patch
create mode 100644 patches/buildroot/2019.02/239-package-stress-ng-bump-to-version-0.09.58.patch
diff --git a/patches/buildroot/2019.02/072-armadeus-xenomai-download-adeos-patch.patch b/patches/buildroot/2019.02/072-armadeus-xenomai-download-adeos-patch.patch
index 44d726e09..083ceb642 100644
--- a/patches/buildroot/2019.02/072-armadeus-xenomai-download-adeos-patch.patch
+++ b/patches/buildroot/2019.02/072-armadeus-xenomai-download-adeos-patch.patch
@@ -3,6 +3,7 @@ Allows downloading of adeos patch if not present locally
TODO: mark BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH as deprecated in BR before
submitting mainline.
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
@@ -10,44 +11,41 @@ Index: buildroot/linux/linux-ext-xenomai.mk
===================================================================
--- buildroot.orig/linux/linux-ext-xenomai.mk
+++ buildroot/linux/linux-ext-xenomai.mk
-@@ -7,11 +7,20 @@
+@@ -7,11 +7,17 @@
LINUX_EXTENSIONS += xenomai
-
+
# Adeos patch version
-XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
-ifeq ($(XENOMAI_ADEOS_PATCH),)
+XENOMAI_ADEOS_PATCH_URL = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL))
+ifneq ($(XENOMAI_ADEOS_PATCH_URL),)
-+define XENOMAI_ADEOS_DOWNLOAD_PATCH
-+ @$(call MESSAGE,"Download adeos patch")
-+ $(call DOWNLOAD,$(XENOMAI_ADEOS_PATCH_URL))
-+endef
-+LINUX_POST_DOWNLOAD_HOOKS += XENOMAI_ADEOS_DOWNLOAD_PATCH
++XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
++LINUX_EXTRA_DOWNLOADS += $(XENOMAI_ADEOS_PATCH_URL)
++BR_NO_CHECK_HASH_FOR += $(XENOMAI_ADEOS_PATCH)
+endif
+
+ifeq ($(XENOMAI_ADEOS_PATCH_URL),)
XENOMAI_ADEOS_OPTS = --default
else
-XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
-+XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
-+XENOMAI_ADEOS_OPTS = --adeos=$(DL_DIR)/$(XENOMAI_ADEOS_PATCH)
++XENOMAI_ADEOS_OPTS = --adeos=$(LINUX_DL_DIR)/$(XENOMAI_ADEOS_PATCH)
endif
-
+
# Prepare kernel patch
Index: buildroot/linux/Config.ext.in
===================================================================
--- buildroot.orig/linux/Config.ext.in
+++ buildroot/linux/Config.ext.in
-@@ -25,13 +25,14 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
- Xenomai is know to support Blackfin, SH4, x86, ARM, NIOS2
- and PowerPC architectures.
-
+@@ -27,13 +27,14 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
+ Xenomai is know to support Blackfin, SH4, x86, ARM, NIOS2
+ and PowerPC architectures.
+
-config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
- string "Path for Adeos patch file"
+config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL
+ string "Path/URL for Adeos patch file"
- depends on BR2_LINUX_KERNEL_EXT_XENOMAI
- help
+ depends on BR2_LINUX_KERNEL_EXT_XENOMAI
+ help
- Optionally, explicitly specify the Adeos patch to use.
- Download it at http://download.gna.org/adeos/patches
- and verify that your kernel version in buildroot matches.
@@ -55,6 +53,6 @@ Index: buildroot/linux/Config.ext.in
+ Examples http://download.gna.org/adeos/patches/v2.6/arm/adeos-ipipe-2.6.38.8-arm-1.18-09.patch
+ or file:///home/foo/adeos-ipipe-2.6.38.8-arm-1.18-09.patch
+ Please verify that your kernel version in buildroot matches.
-
+
comment "xenomai needs a uClibc or glibc toolchain w/ threads"
- depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS
diff --git a/patches/buildroot/2019.02/238-package-stress-ng-bump-to-version-0.09.55.patch b/patches/buildroot/2019.02/238-package-stress-ng-bump-to-version-0.09.55.patch
new file mode 100644
index 000000000..9f38460d1
--- /dev/null
+++ b/patches/buildroot/2019.02/238-package-stress-ng-bump-to-version-0.09.55.patch
@@ -0,0 +1,155 @@
+From 9524384192ea42dbfcc3ff84c63b574d91870510 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fon...@gm...>
+Date: Sat, 9 Mar 2019 21:24:32 +0100
+Subject: [PATCH] package/stress-ng: bump to version 0.09.55
+
+Drop three patches (already in version)
+
+Signed-off-by: Fabrice Fontaine <fon...@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ ...ress-ng.h-fix-include-on-semaphore.h.patch | 34 -------------------
+ ...2-stress-stackmmap-needs-swapcontext.patch | 29 ----------------
+ ...bsd-wchar-Explicitly-include-stdio.h.patch | 29 ----------------
+ package/stress-ng/stress-ng.hash | 2 +-
+ package/stress-ng/stress-ng.mk | 2 +-
+ 5 files changed, 2 insertions(+), 94 deletions(-)
+ delete mode 100644 package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch
+ delete mode 100644 package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch
+ delete mode 100644 package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch
+
+diff --git a/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch b/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch
+deleted file mode 100644
+index 3d656f3159..0000000000
+--- a/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch
++++ /dev/null
+@@ -1,34 +0,0 @@
+-From 818ed67f67c487d519bb55ed5656cff2dd58375e Mon Sep 17 00:00:00 2001
+-From: Fabrice Fontaine <fon...@gm...>
+-Date: Tue, 4 Dec 2018 21:41:12 +0100
+-Subject: [PATCH] stress-ng.h: fix include on semaphore.h
+-
+-semaphore.h is available only if HAVE_LIB_PTHREAD and
+-HAVE_SEM_POSIX are defined
+-
+-Fixes:
+- - http://autobuild.buildroot.org/results/1c95898b2833683a22bbe2ff8471fa08d94210e1
+-
+-Signed-off-by: Fabrice Fontaine <fon...@gm...>
+-[Upstream status: https://github.com/ColinIanKing/stress-ng/commit/9b861e679f9de32e4c68437453756f93e13c01fb]
+----
+- stress-ng.h | 2 ++
+- 1 file changed, 2 insertions(+)
+-
+-diff --git a/stress-ng.h b/stress-ng.h
+-index 0485dc1c..1bf2e207 100644
+---- a/stress-ng.h
+-+++ b/stress-ng.h
+-@@ -53,7 +53,9 @@
+- #include <dirent.h>
+- #include <limits.h>
+- #include <setjmp.h>
+-+#if defined(HAVE_LIB_PTHREAD) && (HAVE_SEM_POSIX)
+- #include <semaphore.h>
+-+#endif
+- #include <sched.h>
+-
+- #if defined(__GNUC__) && defined(__linux__)
+---
+-2.14.1
+-
+diff --git a/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch b/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch
+deleted file mode 100644
+index 8c1bf6025b..0000000000
+--- a/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch
++++ /dev/null
+@@ -1,29 +0,0 @@
+-From 748ac7e88833472211ccce82563beb5050528e00 Mon Sep 17 00:00:00 2001
+-From: Fabrice Fontaine <fon...@gm...>
+-Date: Tue, 4 Dec 2018 21:52:49 +0100
+-Subject: [PATCH] stress-stackmmap: needs swapcontext
+-
+-Fixes:
+- - http://autobuild.buildroot.org/results/f2d3b06afa6e31527a71c03671c8f08eb3f46c36
+-
+-Signed-off-by: Fabrice Fontaine <fon...@gm...>
+----
+- stress-stackmmap.c | 2 +-
+- 1 file changed, 1 insertion(+), 1 deletion(-)
+-
+-diff --git a/stress-stackmmap.c b/stress-stackmmap.c
+-index c2f4c31d..eb31d084 100644
+---- a/stress-stackmmap.c
+-+++ b/stress-stackmmap.c
+-@@ -24,7 +24,7 @@
+- */
+- #include "stress-ng.h"
+-
+--#if defined(__linux__)
+-+#if defined(HAVE_SWAPCONTEXT)
+-
+- #include <ucontext.h>
+-
+---
+-2.14.1
+-
+diff --git a/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch b/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch
+deleted file mode 100644
+index 931aaff2bd..0000000000
+--- a/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch
++++ /dev/null
+@@ -1,29 +0,0 @@
+-From 291070801245da26e4841c321910b55016ca23c0 Mon Sep 17 00:00:00 2001
+-From: Vadim Kochan <va...@gm...>
+-Date: Tue, 1 Jan 2019 17:24:54 +0200
+-Subject: [PATCH] test/test-bsd-wchar: Explicitly include stdio.h
+-
+-libbsd's wchar requires FILE for some it's functions, for some
+-reason it is not included by wchar automatically and the test fails. So
+-include it explicitly.
+-
+-Signed-off-by: Vadim Kochan <va...@gm...>
+----
+- test/test-bsd-wchar.c | 1 +
+- 1 file changed, 1 insertion(+)
+-
+-diff --git a/test/test-bsd-wchar.c b/test/test-bsd-wchar.c
+-index 4f7c7ca..6125968 100644
+---- a/test/test-bsd-wchar.c
+-+++ b/test/test-bsd-wchar.c
+-@@ -22,6 +22,7 @@
+- * functionality.
+- *
+- */
+-+#include <stdio.h>
+- #include <bsd/wchar.h>
+-
+- int main(void)
+---
+-2.14.1
+-
+diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash
+index c7c6ec0fe8..fd7ab42224 100644
+--- a/package/stress-ng/stress-ng.hash
++++ b/package/stress-ng/stress-ng.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256 ed888f5192297855f3ce39b4591b1decc9c580c9753f2cc9c86449f50d23aeb0 stress-ng-0.09.47.tar.xz
++sha256 3430e007c4d27c5d79ff177a209d81acc7d3242dbf28effb05ecb92b32a8a03f stress-ng-0.09.55.tar.xz
+ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk
+index 42b27e3cd9..767af79f25 100644
+--- a/package/stress-ng/stress-ng.mk
++++ b/package/stress-ng/stress-ng.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-STRESS_NG_VERSION = 0.09.47
++STRESS_NG_VERSION = 0.09.55
+ STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
+ STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
+ STRESS_NG_LICENSE = GPL-2.0+
+--
+2.19.2
+
diff --git a/patches/buildroot/2019.02/239-package-stress-ng-bump-to-version-0.09.58.patch b/patches/buildroot/2019.02/239-package-stress-ng-bump-to-version-0.09.58.patch
new file mode 100644
index 000000000..3632745bc
--- /dev/null
+++ b/patches/buildroot/2019.02/239-package-stress-ng-bump-to-version-0.09.58.patch
@@ -0,0 +1,40 @@
+From 06a8745d74dcb6684179394374082597a7b16a4f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Wed, 15 May 2019 09:55:29 +0200
+Subject: [PATCH 1/1] package/stress-ng: bump to version 0.09.58
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/stress-ng/stress-ng.hash | 2 +-
+ package/stress-ng/stress-ng.mk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash
+index fd7ab42224..4356f55849 100644
+--- a/package/stress-ng/stress-ng.hash
++++ b/package/stress-ng/stress-ng.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256 3430e007c4d27c5d79ff177a209d81acc7d3242dbf28effb05ecb92b32a8a03f stress-ng-0.09.55.tar.xz
++sha256 ea1ba0e96637d7ecc0d2b08c981c4fcb3e7753ca7d64d76210154440b9a194e6 stress-ng-0.09.58.tar.xz
+ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk
+index 767af79f25..c5adf99ae5 100644
+--- a/package/stress-ng/stress-ng.mk
++++ b/package/stress-ng/stress-ng.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-STRESS_NG_VERSION = 0.09.55
++STRESS_NG_VERSION = 0.09.58
+ STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
+ STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
+ STRESS_NG_LICENSE = GPL-2.0+
+--
+2.19.2
+
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index e1badf18d..1d6685108 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -137,8 +137,6 @@ rm -rf buildroot/package/qt5/qt5webengine/5.6.3/qt5webengine.hash
rm -rf buildroot/package/qt5/qt5webengine/chromium-latest.inc
rm -rf buildroot/package/qt5/qt5webengine/chromium-lts.inc
rm -rf buildroot/package/qt5/qt5webengine/qt5webengine.hash
-rm -rf buildroot/package/qt5/qt5webkit/Config.in
-rm -rf buildroot/package/qt5/qt5webkit/qt5webkit.mk
rm -rf buildroot/package/qt5/qt5websockets/qt5websockets.hash
rm -rf buildroot/package/qt5/qt5x11extras/5.11.3/qt5x11extras.hash
rm -rf buildroot/package/qt5/qt5x11extras/5.12.1/qt5x11extras.hash
@@ -167,6 +165,11 @@ rm -rf buildroot/package/slideshow/slideshow.mk
rm -rf buildroot/package/snes9x/Config.in
rm -rf buildroot/package/snes9x/snes9x-1.39-compile.patch
rm -rf buildroot/package/snes9x/snes9x.mk
+rm -rf buildroot/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch
+rm -rf buildroot/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch
+rm -rf buildroot/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch
+rm -rf buildroot/package/stress-ng/stress-ng.hash
+rm -rf buildroot/package/stress-ng/stress-ng.mk
rm -rf buildroot/package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch
rm -rf buildroot/package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch
rm -rf buildroot/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch
hooks/post-receive
--
armadeus
|