armadeus-commitlog Mailing List for armadeus (Page 15)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Sébastien S. <ss...@us...> - 2019-10-07 08:07:21
|
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 cc9d850a4e3f506ae1729cd511fcb8c00c3889c8 (commit)
from f647568ee1507b0409d3eb48eacc754555144e34 (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 cc9d850a4e3f506ae1729cd511fcb8c00c3889c8
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 7 10:06:50 2019 +0200
[BUILDROOT] Bump BR to 2019.02.6
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
...ip-update-security-and-bux-fix-patches-fr.patch | 83 ----------------------
patches/buildroot/2019.02/cleanup_buildroot.sh | 2 -
3 files changed, 1 insertion(+), 86 deletions(-)
delete mode 100644 patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch
diff --git a/Makefile b/Makefile
index 8affdfda6..cac084637 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2019.02
-BUILDROOT_VERSION ?= $(BUILDROOT_MAJOR_VERSION).5
+BUILDROOT_VERSION ?= $(BUILDROOT_MAJOR_VERSION).6
include ./Makefile.in
BUILDROOT_SITE:=https://buildroot.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_MAJOR_VERSION)
diff --git a/patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch b/patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch
deleted file mode 100644
index 79fcb70fe..000000000
--- a/patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From eda353497d512b1a036caedfdc574b1643cb43e2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Tue, 3 Sep 2019 10:26:19 +0200
-Subject: [PATCH 1/1] package/unzip: add security patch from Debian
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix the URL and add a new patch. Quoting changelog [1]:
-
-unzip (6.0-25) unstable; urgency=medium
-
- * Apply one more patch by Mark Adler:
- - Do not raise a zip bomb alert for a misplaced central directory.
- This should allow Firefox to build again. Closes: #932404.
- Reported by Peter Green. Hopefully CVE-2019-13232 is fixed now.
-
- -- Santiago Vila <sa...@de...> Sat, 27 Jul 2019 18:01:36 +0200
-
-[1] https://sources.debian.org/data/main/u/unzip/6.0-25/debian/changelog
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- package/unzip/unzip.hash | 1 +
- package/unzip/unzip.mk | 33 +++++++++++++++++----------------
- 2 files changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/package/unzip/unzip.hash b/package/unzip/unzip.hash
-index 0c384d006e..a10778a468 100644
---- a/package/unzip/unzip.hash
-+++ b/package/unzip/unzip.hash
-@@ -16,3 +16,4 @@ sha256 4eabc3faeddd56ebc3d5053486b61f8758d840902725fd555d3472cffb094437 20-cve-2
- sha256 df3b0eeea8dcc161a2565e306b5dda13d27de43145e198baaf0eab822321ee7e 21-fix-warning-messages-on-big-files.patch
- sha256 2cf5a89e921da99e883bcde0ea03e2c77ae9185f57efaf35e7d43bc24353cfdc 22-cve-2019-13232-fix-bug-in-undefer-input.patch
- sha256 c8e82c80fc7760f90567118a465e4cfa1b8e5d0a5723f9c70e3d21247e550615 23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch
-+sha256 37ba0bea723beeb22670babda18bd980368cc6591bc7bd9caa04f62692c7e5ac 24-cve-2019-13232-do-not-raise-alert-for-misplaced-central-directory.patch
-diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk
-index 2887b7b288..1d972055de 100644
---- a/package/unzip/unzip.mk
-+++ b/package/unzip/unzip.mk
-@@ -11,21 +11,22 @@ UNZIP_LICENSE = Info-ZIP
- UNZIP_LICENSE_FILES = LICENSE
-
- UNZIP_PATCH = \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/07-increase-size-of-cfactorstr.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/08-allow-greater-hostver-values.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/09-cve-2014-8139-crc-overflow.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/10-cve-2014-8140-test-compr-eb.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/11-cve-2014-8141-getzip64data.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/12-cve-2014-9636-test-compr-eb.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/14-cve-2015-7696.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/15-cve-2015-7697.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/16-fix-integer-underflow-csiz-decrypted.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/17-restore-unix-timestamps-accurately.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/18-cve-2014-9913-unzip-buffer-overflow.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/19-cve-2016-9844-zipinfo-buffer-overflow.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/20-cve-2018-1000035-unzip-buffer-overflow.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/21-fix-warning-messages-on-big-files.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/22-cve-2019-13232-fix-bug-in-undefer-input.patch \
-- https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/07-increase-size-of-cfactorstr.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/08-allow-greater-hostver-values.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/09-cve-2014-8139-crc-overflow.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/10-cve-2014-8140-test-compr-eb.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/11-cve-2014-8141-getzip64data.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/12-cve-2014-9636-test-compr-eb.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/14-cve-2015-7696.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/15-cve-2015-7697.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/16-fix-integer-underflow-csiz-decrypted.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/17-restore-unix-timestamps-accurately.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/18-cve-2014-9913-unzip-buffer-overflow.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/19-cve-2016-9844-zipinfo-buffer-overflow.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/20-cve-2018-1000035-unzip-buffer-overflow.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/21-fix-warning-messages-on-big-files.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/22-cve-2019-13232-fix-bug-in-undefer-input.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch \
-+ https://sources.debian.org/data/main/u/unzip/6.0-25/debian/patches/24-cve-2019-13232-do-not-raise-alert-for-misplaced-central-directory.patch
-
- $(eval $(cmake-package))
---
-2.21.0
-
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index 524c4a040..9eb81f4e0 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -189,8 +189,6 @@ rm -rf buildroot/package/sunxi-mali/sunxi-mali.mk
rm -rf buildroot/package/thingerio/Config.in
rm -rf buildroot/package/thingerio/thingerio.hash
rm -rf buildroot/package/thingerio/thingerio.mk
-rm -rf buildroot/package/unzip/unzip.hash
-rm -rf buildroot/package/unzip/unzip.mk
rm -rf buildroot/package/wolf4sdl/Config.in
rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-10-07 07:50:06
|
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 f647568ee1507b0409d3eb48eacc754555144e34 (commit)
from ec57708cb84988932e12cfcea9dfa0c6ad92ea86 (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 f647568ee1507b0409d3eb48eacc754555144e34
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Oct 7 09:49:28 2019 +0200
[BUILDROOT] opos6ul{,nano,sp}_defconfig: bump kernel to 4.19.77
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 1d42788ee..2895d10e4 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.76"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.77"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index bc05094b8..206e41020 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.76"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.77"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 6ed8c2a61..7ec0f416f 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.76"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.77"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-10-01 14:57:32
|
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 ec57708cb84988932e12cfcea9dfa0c6ad92ea86 (commit)
from 2c6344f0509cecfb268c6f47e6f241be220cd93c (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 ec57708cb84988932e12cfcea9dfa0c6ad92ea86
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Oct 1 16:57:12 2019 +0200
[BUILDROOT] opos6ul{,nano,sp}_defconfig: bump kernel to 4.19.76
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index ba5c607dc..1d42788ee 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.73"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.76"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 6703e6d8f..bc05094b8 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.73"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.76"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index ff69abde1..6ed8c2a61 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.73"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.76"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2019-09-18 13:51:57
|
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 2c6344f0509cecfb268c6f47e6f241be220cd93c (commit)
from 50091e5c278ce9c6adf1a239697f58fb41ec94af (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 2c6344f0509cecfb268c6f47e6f241be220cd93c
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Sep 18 15:51:03 2019 +0200
[BUILD] Makes scripts/quiltify.sh work when using BR2_EXTERNAL. Only tested with U-Boot for now.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 +--
Makefile.in | 6 ++--
buildroot/configs/apf27_defconfig | 2 +-
buildroot/configs/apf27preempt-rt_defconfig | 2 +-
buildroot/configs/apf27test_defconfig | 2 +-
buildroot/configs/apf27xenomai_defconfig | 2 +-
buildroot/configs/apf28_defconfig | 2 +-
buildroot/configs/apf28legacy_defconfig | 2 +-
buildroot/configs/apf28legacytest_defconfig | 2 +-
buildroot/configs/apf28test_defconfig | 2 +-
buildroot/configs/apf51_defconfig | 2 +-
buildroot/configs/apf51test_defconfig | 2 +-
buildroot/configs/apf6_defconfig | 2 +-
buildroot/configs/apf6dawnsmalllinux_defconfig | 2 +-
buildroot/configs/apf6legacy-4.1_defconfig | 2 +-
buildroot/configs/apf6legacy-preempt-rt_defconfig | 2 +-
buildroot/configs/apf6legacy_defconfig | 2 +-
buildroot/configs/apf6mainline-4.19_defconfig | 2 +-
buildroot/configs/apf6mainline-4.9_defconfig | 2 +-
buildroot/configs/apf6mediacenter_defconfig | 2 +-
buildroot/configs/apf6test_defconfig | 2 +-
buildroot/configs/apf6xenomai_defconfig | 2 +-
buildroot/configs/pps51_defconfig | 2 +-
buildroot/configs/pps_defconfig | 2 +-
scripts/quiltify.sh | 34 ++++++++++++-----------
25 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/Makefile b/Makefile
index 32613febe..8affdfda6 100644
--- a/Makefile
+++ b/Makefile
@@ -198,12 +198,12 @@ shell_env:
@echo ARMADEUS_BUILDROOT_VERSION=$(BUILDROOT_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_BUILDROOT_PATCH_DIR=$(BUILDROOT_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_DIR=$(ARMADEUS_LINUX_DIR) >> $(ARMADEUS_ENV_FILE)
- @echo ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
+ @echo "ARMADEUS_LINUX_PATCH_DIR=$(ARMADEUS_LINUX_PATCH_DIR)" >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_CONFIG=$(ARMADEUS_LINUX_CONFIG) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_VERSION=$(ARMADEUS_LINUX_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LINUX_MAIN_VERSION=$(ARMADEUS_LINUX_MAIN_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_DIR=$(ARMADEUS_U_BOOT_DIR) >> $(ARMADEUS_ENV_FILE)
- @echo ARMADEUS_U_BOOT_PATCH_DIR=$(ARMADEUS_U_BOOT_PATCH_DIR) >> $(ARMADEUS_ENV_FILE)
+ @echo "ARMADEUS_U_BOOT_PATCH_DIR=\"$(ARMADEUS_U_BOOT_PATCH_DIR)\"" >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_VERSION=$(ARMADEUS_U_BOOT_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_CUSTOM_VERSION=$(ARMADEUS_U_BOOT_CUSTOM_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_CONFIG=$(ARMADEUS_U_BOOT_CONFIG) >> $(ARMADEUS_ENV_FILE)
diff --git a/Makefile.in b/Makefile.in
index ea99edd3a..b02a44d60 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,6 +17,8 @@ BASE_DIR := $(patsubst %/,%,$(patsubst %.,%,$(O)))
BUILDROOT_CONFIG_DIR := $(BASE_DIR)
endif
+TOPDIR = $(BUILDROOT_DIR)
+
ifneq ($(BUILDROOT_DL_DIR),)
# To be removed with BR 2014.02
ARMADEUS_DL_DIR := $(BUILDROOT_DL_DIR)
@@ -100,8 +102,8 @@ endif
ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/uboot-$(ARMADEUS_U_BOOT_VERSION)
ifneq ($(BR2_TARGET_UBOOT_PATCH),"")
-TEMP_U_BOOT_PATCH_DIR = $(shell echo $(BR2_TARGET_UBOOT_PATCH) | rev | cut -d " " -f 1 | rev)
-ARMADEUS_U_BOOT_PATCH_DIR = $(shell echo $(BUILDROOT_DIR)/$(TEMP_U_BOOT_PATCH_DIR))
+# PATCHES configured in defconfig:
+ARMADEUS_U_BOOT_PATCH_DIR:= $(shell echo $(BR2_TARGET_UBOOT_PATCH))
else
ARMADEUS_U_BOOT_PATCH_DIR:=$(ARMADEUS_PATCH_DIR)/u-boot/$(ARMADEUS_U_BOOT_VERSION)
endif
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index cd53e2a61..5b454ff3e 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -80,7 +80,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
diff --git a/buildroot/configs/apf27preempt-rt_defconfig b/buildroot/configs/apf27preempt-rt_defconfig
index 0f092cabe..86704ac46 100644
--- a/buildroot/configs/apf27preempt-rt_defconfig
+++ b/buildroot/configs/apf27preempt-rt_defconfig
@@ -87,7 +87,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 9a23b9311..ae6c38b50 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -169,7 +169,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
diff --git a/buildroot/configs/apf27xenomai_defconfig b/buildroot/configs/apf27xenomai_defconfig
index 0f521d567..d4e55387b 100644
--- a/buildroot/configs/apf27xenomai_defconfig
+++ b/buildroot/configs/apf27xenomai_defconfig
@@ -86,7 +86,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nohab-spl.bin"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index ed34b688e..715f38ed2 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -81,7 +81,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_SB=y
diff --git a/buildroot/configs/apf28legacy_defconfig b/buildroot/configs/apf28legacy_defconfig
index 0163a2ee4..725cc106f 100644
--- a/buildroot/configs/apf28legacy_defconfig
+++ b/buildroot/configs/apf28legacy_defconfig
@@ -84,7 +84,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_SB=y
BR2_TARGET_UBOOT_ENVIMAGE=y
diff --git a/buildroot/configs/apf28legacytest_defconfig b/buildroot/configs/apf28legacytest_defconfig
index a41727304..d14fc3eda 100644
--- a/buildroot/configs/apf28legacytest_defconfig
+++ b/buildroot/configs/apf28legacytest_defconfig
@@ -157,7 +157,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_SB=y
BR2_TARGET_UBOOT_ENVIMAGE=y
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 531791bd1..f259859c8 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -160,7 +160,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2017.01.h"
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_SB=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index c6996058a..f8daa08c3 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -84,7 +84,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 3acd460e2..11e49db16 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -173,7 +173,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2017.01"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2017.01"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2017.01.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 9a8ee3e7a..77ec38e95 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -132,7 +132,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6dawnsmalllinux_defconfig b/buildroot/configs/apf6dawnsmalllinux_defconfig
index 280a29ea5..f7c148cbd 100644
--- a/buildroot/configs/apf6dawnsmalllinux_defconfig
+++ b/buildroot/configs/apf6dawnsmalllinux_defconfig
@@ -163,7 +163,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index b5709e691..6e2c87e21 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -174,7 +174,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6legacy-preempt-rt_defconfig b/buildroot/configs/apf6legacy-preempt-rt_defconfig
index 06c2ff513..e7fc44611 100644
--- a/buildroot/configs/apf6legacy-preempt-rt_defconfig
+++ b/buildroot/configs/apf6legacy-preempt-rt_defconfig
@@ -130,7 +130,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 6999c2d6e..02d77ab63 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -162,7 +162,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6mainline-4.19_defconfig b/buildroot/configs/apf6mainline-4.19_defconfig
index 6b090c19d..6f1505d63 100644
--- a/buildroot/configs/apf6mainline-4.19_defconfig
+++ b/buildroot/configs/apf6mainline-4.19_defconfig
@@ -155,7 +155,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6mainline-4.9_defconfig b/buildroot/configs/apf6mainline-4.9_defconfig
index f69689d65..23aceab4c 100644
--- a/buildroot/configs/apf6mainline-4.9_defconfig
+++ b/buildroot/configs/apf6mainline-4.9_defconfig
@@ -161,7 +161,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6mediacenter_defconfig b/buildroot/configs/apf6mediacenter_defconfig
index 9f3bf2d3e..40d4715d1 100644
--- a/buildroot/configs/apf6mediacenter_defconfig
+++ b/buildroot/configs/apf6mediacenter_defconfig
@@ -107,7 +107,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6test_defconfig b/buildroot/configs/apf6test_defconfig
index 2e21df9e2..463246dc5 100644
--- a/buildroot/configs/apf6test_defconfig
+++ b/buildroot/configs/apf6test_defconfig
@@ -156,7 +156,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/apf6xenomai_defconfig b/buildroot/configs/apf6xenomai_defconfig
index 974c91e0d..766cc83e6 100644
--- a/buildroot/configs/apf6xenomai_defconfig
+++ b/buildroot/configs/apf6xenomai_defconfig
@@ -101,7 +101,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2014.07"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.07"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.07"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.07.h"
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 4035f6dd8..41b02b7d0 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -96,7 +96,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="apf51"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2014.04.tar.bz2"
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.04"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.04"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH="$(ARMADEUS_PATH)/apf51/apf51-u-boot-2014.04.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-nand-spl.imx"
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 3b442e584..12ea6edd2 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -81,7 +81,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="apf27"
BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2014.04.tar.bz2 "
-BR2_TARGET_UBOOT_PATCH="../patches/u-boot/2014.04"
+BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/../patches/u-boot/2014.04"
BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.04.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 846c763c3..88e4083e4 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -8,7 +8,7 @@ answer=""
ask_user_banner()
{
echo
- echo -e "--- "$1
+ echo -e "\033[1m--- $1 \033[0m"
}
# $1: thing to ask, $* possibilities. Will fill in "answer" variable.
@@ -178,29 +178,31 @@ fi
# Import patches
-if [ ! -d "$QUILT_TARGET_PATCH_DIR" ]; then
- echo "Patches dir ($QUILT_TARGET_PATCH_DIR) doesn't exist: exiting..."
- exit 1
-fi
-
pushd $QUILT_TARGET_DIR
if [ "$?" != 0 ]; then
echo "Please correct that ($QUILT_TARGET_DIR)"
exit 1
fi
mkdir patches
-if [ "$QUILT_PATCH_FILTER" != "" ]; then
- PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch | grep $QUILT_PATCH_FILTER`
- if [ "$PATCHES" == "" ]; then
- # No filtered patches, try normal ones
- PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
+PATCHES=""
+for PATCH_DIR in ${QUILT_TARGET_PATCH_DIR}; do
+ if [ ! -d "${PATCH_DIR}" ]; then
+ echo "Patches dir (${PATCH_DIR}) doesn't exist: exiting..."
+ exit 1
fi
-else
- PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
-fi
+ if [ "$QUILT_PATCH_FILTER" != "" ]; then
+ PATCHES=`ls -ar ${PATCH_DIR}/*.patch | grep $QUILT_PATCH_FILTER; echo ${PATCHES}`
+ if [ "${PATCHES}" == "" ]; then
+ # No filtered patches, try normal ones
+ PATCHES=`ls -ar ${PATCH_DIR}/*.patch; echo ${PATCHES}`
+ fi
+ else
+ PATCHES=`ls -ar ${PATCH_DIR}/*.patch; echo ${PATCHES}`
+ fi
+done
-for patch in $PATCHES; do
- echo ">>> Importing patch $patch"
+for patch in ${PATCHES}; do
+ echo -e "\033[1m>>> Importing patch:\033[0m $patch"
quilt import $patch
done
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-09-17 12:52:29
|
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 50091e5c278ce9c6adf1a239697f58fb41ec94af (commit)
via 3a949eaa1721155a09d88a2b4042a34128c8c934 (commit)
from fd2c81627d0ccb30879496295b8e8acb36d49a76 (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 50091e5c278ce9c6adf1a239697f58fb41ec94af
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Sep 17 14:51:42 2019 +0200
[BUILDROOT] opos6ul{,nano,sp}_defconfig: bump kernel to 4.19.73
commit 3a949eaa1721155a09d88a2b4042a34128c8c934
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Sep 17 14:45:13 2019 +0200
[BUILDROOT] Create armadeus drivers symlink using BR TOPDIR var
This fix issue when building the kernel from an output directory
out-of-tree.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
buildroot/target/device/armadeus/Makefile.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 6b94cf850..ba5c607dc 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.67"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.73"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 72f3ad022..6703e6d8f 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.67"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.73"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index b90576a74..ff69abde1 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.67"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.73"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index d6c5496ef..64fd17e41 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -51,7 +51,7 @@ endif # BR2_CPU_NAME != imx6ul
endif # BR2_CPU_NAME != imx6
define LINUX_POST_EXTRACT_ACTION
- ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules $(@D)/drivers/armadeus
+ ln -sf $(TOPDIR)/../target/linux/modules $(@D)/drivers/armadeus
$(SED) "s,^ARCH.*,ARCH=$(KERNEL_ARCH),g;" $(@D)/Makefile
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(@D)/Makefile
endef
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2019-09-06 10:26:37
|
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 fd2c81627d0ccb30879496295b8e8acb36d49a76 (commit)
from 163911cf6596c93efaee62ce590e8525e4f9ec9c (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 fd2c81627d0ccb30879496295b8e8acb36d49a76
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Sep 6 12:25:52 2019 +0200
[LINUX] 4.9: fixes detection of Murata 1MW Wi-Fi module (Cypress CYW43455 chipset)
-----------------------------------------------------------------------
Summary of changes:
...BCM43455-with-modalias-sdio-c00v02D0dA9BF.patch | 41 ++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 patches/linux/4.9/0804-mainline-brcmfmac-add-support-for-BCM43455-with-modalias-sdio-c00v02D0dA9BF.patch
diff --git a/patches/linux/4.9/0804-mainline-brcmfmac-add-support-for-BCM43455-with-modalias-sdio-c00v02D0dA9BF.patch b/patches/linux/4.9/0804-mainline-brcmfmac-add-support-for-BCM43455-with-modalias-sdio-c00v02D0dA9BF.patch
new file mode 100644
index 000000000..ea9e2505f
--- /dev/null
+++ b/patches/linux/4.9/0804-mainline-brcmfmac-add-support-for-BCM43455-with-modalias-sdio-c00v02D0dA9BF.patch
@@ -0,0 +1,41 @@
+BCM43455 is a more recent revision of the BCM4345. Some of the BCM43455
+got a dedicated SDIO device ID which is currently not supported by
+brcmfmac.
+Adding the new sdio_device_id to brcmfmac is enough to get the BCM43455
+supported because the chip itself is already supported (due to BCM4345
+support in the driver).
+
+Signed-off-by: Martin Blumenstingl <mar...@go...>
+---
+This is the proper patch following the (short) discussion from [0]
+
+[0] https://marc.info/?l=linux-wireless&m=148455981002310&w=2
+
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 +
+ include/linux/mmc/sdio_ids.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+index 72139b579b18..5bc2ba214735 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+@@ -1104,6 +1104,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
+ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339),
+ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430),
+ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345),
++ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43455),
+ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),
+ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356),
+ { /* end: all zeroes */ }
+diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
+index d43ef96bf075..71b113e1223f 100644
+--- a/include/linux/mmc/sdio_ids.h
++++ b/include/linux/mmc/sdio_ids.h
+@@ -36,6 +36,7 @@
+ #define SDIO_DEVICE_ID_BROADCOM_43362 0xa962
+ #define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6
+ #define SDIO_DEVICE_ID_BROADCOM_4345 0x4345
++#define SDIO_DEVICE_ID_BROADCOM_43455 0xa9bf
+ #define SDIO_DEVICE_ID_BROADCOM_4354 0x4354
+ #define SDIO_DEVICE_ID_BROADCOM_4356 0x4356
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-09-03 07:53:21
|
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 0c9112946493d31ca22ca93c2f73fe3205dc6450 (commit)
from b90a6b1b3485d9b3f90d16a2ed2c4562cb3a4c7e (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 0c9112946493d31ca22ca93c2f73fe3205dc6450
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Sep 3 09:51:40 2019 +0200
[BUILDROOT] opos6ul_config: partialy revert previous commit
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 37 +++++++++++--------------------------
1 file changed, 11 insertions(+), 26 deletions(-)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index bd18ba927..6b94cf850 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -1,8 +1,10 @@
BR2_arm=y
BR2_cortex_a7=y
BR2_ARM_FPU_NEON_VFPV4=y
-BR2_DL_DIR="/home/sszy/development/buildroot-download"
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TARGET_GENERIC_HOSTNAME="opos6ul"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
@@ -25,34 +27,18 @@ BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev imx6ul-opos6uldev-dual-ethernet imx6ull-opos6uldev-dual-ethernet imx6ul-opos6ulspdev imx6ull-opos6ulspdev imx6ull-opos6ulnanodev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev imx6ul-opos6uldev-dual-ethernet imx6ull-opos6uldev-dual-ethernet"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-BR2_PACKAGE_AS_DEVICES=y
-BR2_PACKAGE_AS_DEVICES_CPP=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_FAAD2=y
-BR2_PACKAGE_GSTREAMER1=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
-BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
-BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
-BR2_PACKAGE_GST1_PLUGINS_BAD=y
-BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
-BR2_PACKAGE_UNZIP=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_PV=y
@@ -63,6 +49,8 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
+BR2_PACKAGE_ASCII_INVADERS=y
+BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
@@ -70,6 +58,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
@@ -79,17 +68,17 @@ BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
-BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_LEPTONMODULE=y
-BR2_PACKAGE_MEMTESTER=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_PYTHON3_CURSES=y
BR2_PACKAGE_PYTHON3_DECIMAL=y
BR2_PACKAGE_PYTHON3_READLINE=y
+BR2_PACKAGE_PYTHON3_SSL=y
+BR2_PACKAGE_PYTHON3_SQLITE=y
BR2_PACKAGE_PYTHON_CAN=y
BR2_PACKAGE_PYTHON_DATEUTIL=y
BR2_PACKAGE_PYTHON_GOBJECT=y
@@ -112,6 +101,7 @@ BR2_PACKAGE_HAVEGED=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_DNSMASQ=y
@@ -133,10 +123,6 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_XENOMAI=y
-BR2_PACKAGE_XENOMAI_COBALT=y
-# BR2_PACKAGE_XENOMAI_ENABLE_SMP is not set
-BR2_PACKAGE_XENOMAI_TESTSUITE=y
BR2_PACKAGE_CPULOAD=y
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
@@ -144,7 +130,7 @@ BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
-BR2_TARGET_ROOTFS_EXT2_SIZE="160M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="128M"
BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
@@ -161,4 +147,3 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL"
BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
-BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-08-16 15:39:10
|
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 b90a6b1b3485d9b3f90d16a2ed2c4562cb3a4c7e (commit)
from 420930ef1da54d0348f74987629d2f3496dd2cff (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 b90a6b1b3485d9b3f90d16a2ed2c4562cb3a4c7e
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Aug 16 13:19:24 2019 +0200
[BUILDROOT] opos6ul{,nano,sp}_defconfig: bump kernel to 4.19.67
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 39 +++++++++++++++++++++++----------
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
3 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 62d0b101d..bd18ba927 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -1,10 +1,8 @@
BR2_arm=y
BR2_cortex_a7=y
BR2_ARM_FPU_NEON_VFPV4=y
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
+BR2_DL_DIR="/home/sszy/development/buildroot-download"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
-BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TARGET_GENERIC_HOSTNAME="opos6ul"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
@@ -22,23 +20,39 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.60"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.67"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev imx6ul-opos6uldev-dual-ethernet imx6ull-opos6uldev-dual-ethernet"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-opos6uldev imx6ull-opos6uldev imx6ul-opos6uldev-dual-ethernet imx6ull-opos6uldev-dual-ethernet imx6ul-opos6ulspdev imx6ull-opos6ulspdev imx6ull-opos6ulnanodev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_AS_DEVICES=y
+BR2_PACKAGE_AS_DEVICES_CPP=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_FAAD2=y
+BR2_PACKAGE_GSTREAMER1=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
+BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
+BR2_PACKAGE_GST1_PLUGINS_BAD=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV=y
+BR2_PACKAGE_UNZIP=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_PV=y
@@ -49,8 +63,6 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
-BR2_PACKAGE_ASCII_INVADERS=y
-BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
@@ -58,7 +70,6 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
-BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
@@ -68,17 +79,17 @@ BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_DBUS_PYTHON=y
BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_KBD=y
BR2_PACKAGE_LEPTONMODULE=y
+BR2_PACKAGE_MEMTESTER=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_PYTHON3_CURSES=y
BR2_PACKAGE_PYTHON3_DECIMAL=y
BR2_PACKAGE_PYTHON3_READLINE=y
-BR2_PACKAGE_PYTHON3_SSL=y
-BR2_PACKAGE_PYTHON3_SQLITE=y
BR2_PACKAGE_PYTHON_CAN=y
BR2_PACKAGE_PYTHON_DATEUTIL=y
BR2_PACKAGE_PYTHON_GOBJECT=y
@@ -101,7 +112,6 @@ BR2_PACKAGE_HAVEGED=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
-BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_DNSMASQ=y
@@ -123,6 +133,10 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_XENOMAI=y
+BR2_PACKAGE_XENOMAI_COBALT=y
+# BR2_PACKAGE_XENOMAI_ENABLE_SMP is not set
+BR2_PACKAGE_XENOMAI_TESTSUITE=y
BR2_PACKAGE_CPULOAD=y
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
@@ -130,7 +144,7 @@ BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_LABEL="ROOTFS"
-BR2_TARGET_ROOTFS_EXT2_SIZE="128M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="160M"
BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
@@ -147,3 +161,4 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL"
BR2_PACKAGE_HOST_E2TOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_IMX_USB_LOADER=y
+BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 5a28847cc..72f3ad022 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.60"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.67"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 2b14194f1..b90576a74 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.60"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.67"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2019-08-06 09:47:27
|
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 420930ef1da54d0348f74987629d2f3496dd2cff (commit)
from 042d726a3b952280c5eb4885e7927882a730d9f9 (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 420930ef1da54d0348f74987629d2f3496dd2cff
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Aug 6 11:46:13 2019 +0200
[BUILDROOT] add ascii-invaders package and activate it by default on all configs
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 1 +
buildroot/configs/apf27preempt-rt_defconfig | 1 +
buildroot/configs/apf27test_defconfig | 1 +
buildroot/configs/apf27xenomai_defconfig | 1 +
buildroot/configs/apf28_defconfig | 1 +
buildroot/configs/apf28legacy_defconfig | 1 +
buildroot/configs/apf28legacytest_defconfig | 1 +
buildroot/configs/apf28test_defconfig | 1 +
buildroot/configs/apf51_defconfig | 1 +
buildroot/configs/apf51test_defconfig | 1 +
buildroot/configs/apf6_defconfig | 1 +
buildroot/configs/apf6dawnsmalllinux_defconfig | 1 +
buildroot/configs/apf6failsafe_defconfig | 1 +
buildroot/configs/apf6legacy-4.1_defconfig | 1 +
buildroot/configs/apf6legacy-preempt-rt_defconfig | 1 +
buildroot/configs/apf6legacy_defconfig | 1 +
buildroot/configs/apf6mainline-4.19_defconfig | 1 +
buildroot/configs/apf6mainline-4.9_defconfig | 1 +
buildroot/configs/apf6mediacenter_defconfig | 1 +
buildroot/configs/apf6test_defconfig | 1 +
buildroot/configs/apf6xenomai_defconfig | 1 +
buildroot/configs/opos6ul_defconfig | 1 +
buildroot/configs/opos6ul_legacy_defconfig | 1 +
buildroot/configs/opos6ullegacy-4.14_defconfig | 1 +
buildroot/configs/opos6ullegacy-4.1_defconfig | 1 +
buildroot/configs/opos6ullegacy-4.9_defconfig | 1 +
buildroot/configs/opos6ulnano-preempt-rt_defconfig | 1 +
buildroot/configs/opos6ulnano_defconfig | 1 +
buildroot/configs/opos6ulsp_defconfig | 1 +
buildroot/configs/opos6ultest_defconfig | 1 +
.../041-mainline-package-add-ascii-invaders.patch | 108 +++++++++++++++++++++
patches/buildroot/2019.02/cleanup_buildroot.sh | 3 +
32 files changed, 141 insertions(+)
create mode 100644 patches/buildroot/2019.02/041-mainline-package-add-ascii-invaders.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 7bbfd4a05..cd53e2a61 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -52,6 +52,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_DTC=y
BR2_PACKAGE_DTC_PROGRAMS=y
diff --git a/buildroot/configs/apf27preempt-rt_defconfig b/buildroot/configs/apf27preempt-rt_defconfig
index 98f35bde9..0f092cabe 100644
--- a/buildroot/configs/apf27preempt-rt_defconfig
+++ b/buildroot/configs/apf27preempt-rt_defconfig
@@ -56,6 +56,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_DTC=y
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 6d787de92..9a23b9311 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -91,6 +91,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_LBREAKOUT2=y
BR2_PACKAGE_OPENTYRIAN=y
diff --git a/buildroot/configs/apf27xenomai_defconfig b/buildroot/configs/apf27xenomai_defconfig
index 676caa00b..0f521d567 100644
--- a/buildroot/configs/apf27xenomai_defconfig
+++ b/buildroot/configs/apf27xenomai_defconfig
@@ -57,6 +57,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_DTC=y
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index f6ea444f8..ed34b688e 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -42,6 +42,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_TREE=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
diff --git a/buildroot/configs/apf28legacy_defconfig b/buildroot/configs/apf28legacy_defconfig
index eb1009089..0163a2ee4 100644
--- a/buildroot/configs/apf28legacy_defconfig
+++ b/buildroot/configs/apf28legacy_defconfig
@@ -44,6 +44,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_TREE=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_INPUT_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH is not set
diff --git a/buildroot/configs/apf28legacytest_defconfig b/buildroot/configs/apf28legacytest_defconfig
index f3082e408..a41727304 100644
--- a/buildroot/configs/apf28legacytest_defconfig
+++ b/buildroot/configs/apf28legacytest_defconfig
@@ -79,6 +79,7 @@ BR2_PACKAGE_TREE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_LBREAKOUT2=y
BR2_PACKAGE_OPENTYRIAN=y
BR2_PACKAGE_DOOM_WAD=y
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 309492aed..531791bd1 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -82,6 +82,7 @@ BR2_PACKAGE_TREE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_LBREAKOUT2=y
BR2_PACKAGE_OPENTYRIAN=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index f11324fa4..c6996058a 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -53,6 +53,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBV=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 94d4e8d28..3acd460e2 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -107,6 +107,7 @@ BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBV=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 47cf74a49..9a8ee3e7a 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -79,6 +79,7 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
diff --git a/buildroot/configs/apf6dawnsmalllinux_defconfig b/buildroot/configs/apf6dawnsmalllinux_defconfig
index a5fb58771..280a29ea5 100644
--- a/buildroot/configs/apf6dawnsmalllinux_defconfig
+++ b/buildroot/configs/apf6dawnsmalllinux_defconfig
@@ -78,6 +78,7 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
diff --git a/buildroot/configs/apf6failsafe_defconfig b/buildroot/configs/apf6failsafe_defconfig
index 9eeb42875..b2de82f16 100644
--- a/buildroot/configs/apf6failsafe_defconfig
+++ b/buildroot/configs/apf6failsafe_defconfig
@@ -38,6 +38,7 @@ BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_PV=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_APF_CONFIG=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_DTC=y
diff --git a/buildroot/configs/apf6legacy-4.1_defconfig b/buildroot/configs/apf6legacy-4.1_defconfig
index c118111b2..b5709e691 100644
--- a/buildroot/configs/apf6legacy-4.1_defconfig
+++ b/buildroot/configs/apf6legacy-4.1_defconfig
@@ -105,6 +105,7 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
diff --git a/buildroot/configs/apf6legacy-preempt-rt_defconfig b/buildroot/configs/apf6legacy-preempt-rt_defconfig
index d3ce3f6c6..06c2ff513 100644
--- a/buildroot/configs/apf6legacy-preempt-rt_defconfig
+++ b/buildroot/configs/apf6legacy-preempt-rt_defconfig
@@ -80,6 +80,7 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 9359c5d6a..6999c2d6e 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -97,6 +97,7 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
diff --git a/buildroot/configs/apf6mainline-4.19_defconfig b/buildroot/configs/apf6mainline-4.19_defconfig
index dade3fa41..6b090c19d 100644
--- a/buildroot/configs/apf6mainline-4.19_defconfig
+++ b/buildroot/configs/apf6mainline-4.19_defconfig
@@ -96,6 +96,7 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
diff --git a/buildroot/configs/apf6mainline-4.9_defconfig b/buildroot/configs/apf6mainline-4.9_defconfig
index 874c8b9ef..f69689d65 100644
--- a/buildroot/configs/apf6mainline-4.9_defconfig
+++ b/buildroot/configs/apf6mainline-4.9_defconfig
@@ -101,6 +101,7 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
diff --git a/buildroot/configs/apf6mediacenter_defconfig b/buildroot/configs/apf6mediacenter_defconfig
index 4cc64bc80..9f3bf2d3e 100644
--- a/buildroot/configs/apf6mediacenter_defconfig
+++ b/buildroot/configs/apf6mediacenter_defconfig
@@ -50,6 +50,7 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
diff --git a/buildroot/configs/apf6test_defconfig b/buildroot/configs/apf6test_defconfig
index b7d78f154..2e21df9e2 100644
--- a/buildroot/configs/apf6test_defconfig
+++ b/buildroot/configs/apf6test_defconfig
@@ -88,6 +88,7 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_OPENTYRIAN=y
BR2_PACKAGE_PRBOOM=y
diff --git a/buildroot/configs/apf6xenomai_defconfig b/buildroot/configs/apf6xenomai_defconfig
index 468e78eb5..974c91e0d 100644
--- a/buildroot/configs/apf6xenomai_defconfig
+++ b/buildroot/configs/apf6xenomai_defconfig
@@ -53,6 +53,7 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index de6365bc6..62d0b101d 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -49,6 +49,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
diff --git a/buildroot/configs/opos6ul_legacy_defconfig b/buildroot/configs/opos6ul_legacy_defconfig
index ff23663fd..d340c281a 100644
--- a/buildroot/configs/opos6ul_legacy_defconfig
+++ b/buildroot/configs/opos6ul_legacy_defconfig
@@ -45,6 +45,7 @@ BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
diff --git a/buildroot/configs/opos6ullegacy-4.14_defconfig b/buildroot/configs/opos6ullegacy-4.14_defconfig
index d4eb63b17..b92ba067a 100644
--- a/buildroot/configs/opos6ullegacy-4.14_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.14_defconfig
@@ -103,6 +103,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
diff --git a/buildroot/configs/opos6ullegacy-4.1_defconfig b/buildroot/configs/opos6ullegacy-4.1_defconfig
index 5dd7eec08..16119ee56 100644
--- a/buildroot/configs/opos6ullegacy-4.1_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.1_defconfig
@@ -97,6 +97,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
diff --git a/buildroot/configs/opos6ullegacy-4.9_defconfig b/buildroot/configs/opos6ullegacy-4.9_defconfig
index 60739d380..5169cbf35 100644
--- a/buildroot/configs/opos6ullegacy-4.9_defconfig
+++ b/buildroot/configs/opos6ullegacy-4.9_defconfig
@@ -103,6 +103,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
diff --git a/buildroot/configs/opos6ulnano-preempt-rt_defconfig b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
index 037eed9b0..02f00171d 100644
--- a/buildroot/configs/opos6ulnano-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
@@ -47,6 +47,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 844699c7d..5a28847cc 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -49,6 +49,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 54e97070f..2b14194f1 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -49,6 +49,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
diff --git a/buildroot/configs/opos6ultest_defconfig b/buildroot/configs/opos6ultest_defconfig
index d5b0882ac..ab4440b37 100644
--- a/buildroot/configs/opos6ultest_defconfig
+++ b/buildroot/configs/opos6ultest_defconfig
@@ -49,6 +49,7 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_GIT=y
BR2_PACKAGE_TREE=y
+BR2_PACKAGE_ASCII_INVADERS=y
BR2_PACKAGE_HWDATA=y
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
diff --git a/patches/buildroot/2019.02/041-mainline-package-add-ascii-invaders.patch b/patches/buildroot/2019.02/041-mainline-package-add-ascii-invaders.patch
new file mode 100644
index 000000000..536593a3a
--- /dev/null
+++ b/patches/buildroot/2019.02/041-mainline-package-add-ascii-invaders.patch
@@ -0,0 +1,108 @@
+From c63f804bfffe8121e2976ea0acc777d747b2d3e0 Mon Sep 17 00:00:00 2001
+From: Thomas Huth <hu...@tu...>
+Date: Mon, 22 Apr 2019 10:11:25 +0200
+Subject: package/ascii-invaders: Add the game ascii-invaders
+
+An ASCII-art game like Space Invaders using ncurses.
+
+Signed-off-by: Thomas Huth <hu...@tu...>
+Reviewed-by: Gilles Talis <gil...@gm...>
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+---
+ DEVELOPERS | 3 +++
+ package/Config.in | 1 +
+ package/ascii-invaders/Config.in | 7 +++++++
+ package/ascii-invaders/ascii-invaders.hash | 5 +++++
+ package/ascii-invaders/ascii-invaders.mk | 28 ++++++++++++++++++++++++++++
+ 5 files changed, 44 insertions(+)
+ create mode 100644 package/ascii-invaders/Config.in
+ create mode 100644 package/ascii-invaders/ascii-invaders.hash
+ create mode 100644 package/ascii-invaders/ascii-invaders.mk
+
+diff --git a/DEVELOPERS b/DEVELOPERS
+index 6b30e14136..c820312d12 100644
+--- a/DEVELOPERS
++++ b/DEVELOPERS
+@@ -2084,6 +2084,9 @@ F: support/scripts/size-stats
+ F: utils/size-stats-compare
+ F: toolchain/
+
++N: Thomas Huth <hu...@tu...>
++F: package/ascii-invaders/
++
+ N: Thomas Petazzoni <tho...@bo...>
+ F: arch/Config.in.arm
+ F: boot/boot-wrapper-aarch64/
+diff --git a/package/Config.in b/package/Config.in
+index a7c4c53165..f9acf596a3 100644
+--- a/package/Config.in
++++ b/package/Config.in
+@@ -245,6 +245,7 @@ comment "Themes"
+ endmenu
+
+ menu "Games"
++ source "package/ascii-invaders/Config.in"
+ source "package/chocolate-doom/Config.in"
+ source "package/doom-wad/Config.in"
+ source "package/flare-engine/Config.in"
+diff --git a/package/ascii-invaders/Config.in b/package/ascii-invaders/Config.in
+new file mode 100644
+index 0000000000..f02ab74994
+--- /dev/null
++++ b/package/ascii-invaders/Config.in
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_ASCII_INVADERS
++ bool "ascii_invaders"
++ select BR2_PACKAGE_NCURSES
++ help
++ An ASCII-art game like Space Invaders using ncurses.
++
++ https://github.com/macdice/ascii-invaders
+diff --git a/package/ascii-invaders/ascii-invaders.hash b/package/ascii-invaders/ascii-invaders.hash
+new file mode 100644
+index 0000000000..b4805e7b1d
+--- /dev/null
++++ b/package/ascii-invaders/ascii-invaders.hash
+@@ -0,0 +1,5 @@
++# Locally calculated
++sha512 326708ffc2c277e04575920c58f6a267e0bf46f8d2a3dbca9b5c317fb01006d4f673ab35f92f292549cc52dbee4400a84c85478eb81b9bd7703689a705547bc7 v1.0.1.tar.gz
++
++# Hash for license file
++sha512 1e455684996d7733b2f1ccd4606d034694d16ceff6ede6125d7f1537d20dabe05976cca4cef5cbf6c31352cbd62a515fd8e34a2ffb54dae1181c1116b24c6cf7 LICENSE
+diff --git a/package/ascii-invaders/ascii-invaders.mk b/package/ascii-invaders/ascii-invaders.mk
+new file mode 100644
+index 0000000000..c91e0eeaa8
+--- /dev/null
++++ b/package/ascii-invaders/ascii-invaders.mk
+@@ -0,0 +1,28 @@
++################################################################################
++#
++# ASCII-Invaders
++#
++################################################################################
++
++ASCII_INVADERS_VERSION = v1.0.1
++ASCII_INVADERS_SOURCE = $(ASCII_INVADERS_VERSION).tar.gz
++ASCII_INVADERS_SITE = $(call github,macdice,ascii-invaders,$(ASCII_INVADERS_VERSION))
++ASCII_INVADERS_DEPENDENCIES = ncurses
++ASCII_INVADERS_LICENSE = GPL-2.0+
++ASCII_INVADERS_LICENSE_FILES = LICENSE
++
++# For compiling statically, libraries must be specified after the object file
++define ASCII_INVADERS_POST_EXTRACT_FIXUP
++ sed -i 's/\$$(LIBS) invaders.o/invaders.o \$$(LIBS)/' $(@D)/Makefile
++endef
++ASCII_INVADERS_POST_EXTRACT_HOOKS += ASCII_INVADERS_POST_EXTRACT_FIXUP
++
++define ASCII_INVADERS_BUILD_CMDS
++ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
++endef
++
++define ASCII_INVADERS_INSTALL_TARGET_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/ascii_invaders $(TARGET_DIR)/usr/bin/ascii_invaders
++endef
++
++$(eval $(generic-package))
+--
+cgit v1.2.1
+
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index 81784b598..524c4a040 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -23,6 +23,9 @@ rm -rf buildroot/package/agg/agg.mk
rm -rf buildroot/package/alsa-utils/alsa-utils.mk
rm -rf buildroot/package/apf-config/Config.in
rm -rf buildroot/package/apf-config/apf-config.mk
+rm -rf buildroot/package/ascii-invaders/Config.in
+rm -rf buildroot/package/ascii-invaders/ascii-invaders.hash
+rm -rf buildroot/package/ascii-invaders/ascii-invaders.mk
rm -rf buildroot/package/beremiz/Config.in
rm -rf buildroot/package/beremiz/beremiz.mk
rm -rf buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-08-06 09:18:48
|
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 042d726a3b952280c5eb4885e7927882a730d9f9 (commit)
from adad60925930f8c4e9644d44e318a3127fcdcc0d (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 042d726a3b952280c5eb4885e7927882a730d9f9
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Aug 6 11:18:16 2019 +0200
[BUILDROOT] package/xenomai: bump to version 3.0.9
-----------------------------------------------------------------------
Summary of changes:
...074-package-xenomai-bump-to-version-3.0.8.patch | 142 +++++++++++++++++++++
...075-package-xenomai-bump-to-version-3.0.9.patch | 42 ++++++
patches/buildroot/2019.02/cleanup_buildroot.sh | 2 +
3 files changed, 186 insertions(+)
create mode 100644 patches/buildroot/2019.02/074-package-xenomai-bump-to-version-3.0.8.patch
create mode 100644 patches/buildroot/2019.02/075-package-xenomai-bump-to-version-3.0.9.patch
diff --git a/patches/buildroot/2019.02/074-package-xenomai-bump-to-version-3.0.8.patch b/patches/buildroot/2019.02/074-package-xenomai-bump-to-version-3.0.8.patch
new file mode 100644
index 000000000..ed9345412
--- /dev/null
+++ b/patches/buildroot/2019.02/074-package-xenomai-bump-to-version-3.0.8.patch
@@ -0,0 +1,142 @@
+From d0dcca4705aaae85ce4ef0dc637b95fd4e81b9b3 Mon Sep 17 00:00:00 2001
+From: Norbert Lange <nol...@gm...>
+Date: Fri, 15 Mar 2019 13:32:13 +0100
+Subject: [PATCH 1/1] package/xenomai: bump to version 3.0.8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+remove upstream patch.
+
+Signed-off-by: Norbert Lange <nor...@an...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ ...ated-destination-buffer-with-strncpy.patch | 91 -------------------
+ package/xenomai/xenomai.hash | 3 +-
+ package/xenomai/xenomai.mk | 2 +-
+ 3 files changed, 3 insertions(+), 93 deletions(-)
+ delete mode 100644 package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch
+
+diff --git a/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch b/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch
+deleted file mode 100644
+index f91a31daaf..0000000000
+--- a/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch
++++ /dev/null
+@@ -1,91 +0,0 @@
+-From cdc63fe259c70a8a5304aa07087650ebf4ee6b5d Mon Sep 17 00:00:00 2001
+-From: Philippe Gerum <rp...@xe...>
+-Date: Wed, 24 Oct 2018 11:28:49 +0200
+-Subject: [PATCH] demos/posix: prevent unterminated destination buffer with
+- strncpy()
+-
+-GCC 8.x introduced -Wstringop-truncation to help detecting likely
+-unwanted outcomes of strncpy(dst, src, n), such as omitting the NUL
+-character into the destination buffer whenever n < sizeof(src).
+-
+-Fix unsafe strncpy() calls when we do expect a null-terminated
+-destination buffer.
+-
+-Signed-off-by: Philippe Gerum <rp...@xe...>
+-[Retrieved from
+-https://gitlab.denx.de/Xenomai/xenomai/commit/cdc63fe259c70a8a5304aa07087650ebf4ee6b5d]
+-Signed-off-by: Fabrice Fontaine <fon...@gm...>
+----
+- demo/posix/cobalt/can-rtt.c | 4 ++--
+- demo/posix/cobalt/eth_p_all.c | 3 ++-
+- demo/posix/cyclictest/cyclictest.c | 4 ++--
+- 3 files changed, 6 insertions(+), 5 deletions(-)
+-
+-diff --git a/demo/posix/cobalt/can-rtt.c b/demo/posix/cobalt/can-rtt.c
+-index 61cad05e5..dd212d804 100644
+---- a/demo/posix/cobalt/can-rtt.c
+-+++ b/demo/posix/cobalt/can-rtt.c
+-@@ -248,7 +248,7 @@ int main(int argc, char *argv[])
+- return -1;
+- }
+-
+-- strncpy(ifr.ifr_name, rxdev, IFNAMSIZ);
+-+ namecpy(ifr.ifr_name, rxdev);
+- printf("RX rxsock=%d, ifr_name=%s\n", rxsock, ifr.ifr_name);
+-
+- if (ioctl(rxsock, SIOCGIFINDEX, &ifr) < 0) {
+-@@ -282,7 +282,7 @@ int main(int argc, char *argv[])
+- goto failure1;
+- }
+-
+-- strncpy(ifr.ifr_name, txdev, IFNAMSIZ);
+-+ namecpy(ifr.ifr_name, txdev);
+- printf("TX txsock=%d, ifr_name=%s\n", txsock, ifr.ifr_name);
+-
+- if (ioctl(txsock, SIOCGIFINDEX, &ifr) < 0) {
+-diff --git a/demo/posix/cobalt/eth_p_all.c b/demo/posix/cobalt/eth_p_all.c
+-index 6ac12ab3e..91aef9fbd 100644
+---- a/demo/posix/cobalt/eth_p_all.c
+-+++ b/demo/posix/cobalt/eth_p_all.c
+-@@ -40,6 +40,7 @@
+- #include <net/if.h>
+- #include <arpa/inet.h>
+- #include <netinet/ether.h>
+-+#include <boilerplate/ancillaries.h>
+-
+- char buffer[10*1024];
+- int sock;
+-@@ -72,7 +73,7 @@ int main(int argc, char *argv[])
+- if (argc > 1) {
+- struct ifreq ifr;
+-
+-- strncpy(ifr.ifr_name, argv[1], IFNAMSIZ);
+-+ namecpy(ifr.ifr_name, argv[1]);
+- if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0) {
+- perror("cannot get interface index");
+- close(sock);
+-diff --git a/demo/posix/cyclictest/cyclictest.c b/demo/posix/cyclictest/cyclictest.c
+-index ebe5461db..76983bd02 100644
+---- a/demo/posix/cyclictest/cyclictest.c
+-+++ b/demo/posix/cyclictest/cyclictest.c
+-@@ -1353,7 +1353,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
+- case 'F':
+- case OPT_FIFO:
+- use_fifo = 1;
+-- strncpy(fifopath, optarg, strlen(optarg));
+-+ strncpy(fifopath, optarg, sizeof(fifopath) - 1);
+- break;
+-
+- case 'H':
+-@@ -1458,7 +1458,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
+- case 'T':
+- case OPT_TRACER:
+- tracetype = CUSTOM;
+-- strncpy(tracer, optarg, sizeof(tracer));
+-+ strncpy(tracer, optarg, sizeof(tracer) - 1);
+- break;
+- case 'u':
+- case OPT_UNBUFFERED:
+---
+-2.18.1
+-
+diff --git a/package/xenomai/xenomai.hash b/package/xenomai/xenomai.hash
+index c36badb6bf..e275b7424a 100644
+--- a/package/xenomai/xenomai.hash
++++ b/package/xenomai/xenomai.hash
+@@ -1,2 +1,3 @@
+ # Locally computed;
+-sha256 2c0dd3f0e36e4a10f97e0028989bb873e80f4d1ce212ac55fd3b28857c464f94 xenomai-3.0.6.tar.bz2
++sha256 c373261ddb8280d9d7078cdd9cd9646dfb7d70d8cd3aa9693d9148f03990d711 xenomai-3.0.8.tar.bz2
++
+diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
+index 98f550af60..3cb7dada4b 100644
+--- a/package/xenomai/xenomai.mk
++++ b/package/xenomai/xenomai.mk
+@@ -6,7 +6,7 @@
+
+ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
+ ifeq ($(XENOMAI_VERSION),)
+-XENOMAI_VERSION = 3.0.6
++XENOMAI_VERSION = 3.0.8
+ else
+ BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
+ endif
+--
+2.21.0
+
diff --git a/patches/buildroot/2019.02/075-package-xenomai-bump-to-version-3.0.9.patch b/patches/buildroot/2019.02/075-package-xenomai-bump-to-version-3.0.9.patch
new file mode 100644
index 000000000..5217f84fe
--- /dev/null
+++ b/patches/buildroot/2019.02/075-package-xenomai-bump-to-version-3.0.9.patch
@@ -0,0 +1,42 @@
+From 598030daf00b8eb2a8e2f1cc0dd7e7b6579be9e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Wed, 31 Jul 2019 19:14:14 +0200
+Subject: [PATCH 1/1] package/xenomai: bump to version 3.0.9
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+remove upstream patch:
+https://gitlab.denx.de/Xenomai/xenomai/commit/c5e9c0817839536562a2ae90921f4799f4a9ad46
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ ...ated-destination-buffer-with-strncpy.patch | 91 -------------------
+ package/xenomai/xenomai.hash | 2 +-
+ package/xenomai/xenomai.mk | 2 +-
+ 3 files changed, 2 insertions(+), 93 deletions(-)
+ delete mode 100644 package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch
+
+Index: buildroot/package/xenomai/xenomai.hash
+===================================================================
+--- buildroot.orig/package/xenomai/xenomai.hash
++++ buildroot/package/xenomai/xenomai.hash
+@@ -1,3 +1,2 @@
+ # Locally computed;
+-sha256 c373261ddb8280d9d7078cdd9cd9646dfb7d70d8cd3aa9693d9148f03990d711 xenomai-3.0.8.tar.bz2
+-
++sha256 9e4b879ee48e6423f76cba5882f41d129164fe977119080ff41ef531ee50dc4e xenomai-3.0.9.tar.bz2
+Index: buildroot/package/xenomai/xenomai.mk
+===================================================================
+--- buildroot.orig/package/xenomai/xenomai.mk
++++ buildroot/package/xenomai/xenomai.mk
+@@ -6,7 +6,7 @@
+
+ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
+ ifeq ($(XENOMAI_VERSION),)
+-XENOMAI_VERSION = 3.0.8
++XENOMAI_VERSION = 3.0.9
+ else
+ BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
+ endif
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index fef00621b..81784b598 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -196,7 +196,9 @@ rm -rf buildroot/package/xc3sprog/Config.in
rm -rf buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch
rm -rf buildroot/package/xc3sprog/xc3sprog-fixes-xc2c32a_qf32-jtag-id.patch
rm -rf buildroot/package/xc3sprog/xc3sprog.mk
+rm -rf buildroot/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch
rm -rf buildroot/package/xenomai/Config.in
+rm -rf buildroot/package/xenomai/xenomai.hash
rm -rf buildroot/package/xenomai/xenomai.mk
rm -rf buildroot/system/Config.in
rm -rf buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2019-07-30 17:07:08
|
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 adad60925930f8c4e9644d44e318a3127fcdcc0d (commit)
via 968502f73f5089320a544b44b10c3bad6919ae65 (commit)
via 75184a093a762ed5a56507cf532aada2081e5e7c (commit)
from 7bc58c097a23ed22d4049ff41334e12730da550a (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 adad60925930f8c4e9644d44e318a3127fcdcc0d
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Jul 30 19:06:02 2019 +0200
[BUILDROOT] apf28*_defconfigs: add lsblk cmd line tool (in util-linux)
commit 968502f73f5089320a544b44b10c3bad6919ae65
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Jul 30 19:01:30 2019 +0200
[BUILDROOT] apf6/opos6ul: add real fbset cmd line tool to defconfigs with recent kernel
commit 75184a093a762ed5a56507cf532aada2081e5e7c
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Jul 30 19:00:17 2019 +0200
[BUILDROOT] apf28: add framebuffer test tools to defconfigs using recent kernel
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 8 ++++++++
buildroot/configs/apf28legacy_defconfig | 2 ++
buildroot/configs/apf28legacytest_defconfig | 2 ++
buildroot/configs/apf28test_defconfig | 5 +++++
buildroot/configs/apf6_defconfig | 1 +
buildroot/configs/apf6mainline-4.19_defconfig | 1 +
buildroot/configs/apf6mainline-4.9_defconfig | 1 +
buildroot/configs/apf6test_defconfig | 1 +
buildroot/configs/opos6ul_defconfig | 1 +
buildroot/configs/opos6ulnano_defconfig | 1 +
buildroot/configs/opos6ulsp_defconfig | 1 +
buildroot/configs/opos6ultest_defconfig | 1 +
12 files changed, 25 insertions(+)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 093363002..f6ea444f8 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -34,6 +34,7 @@ BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_GDB=y
@@ -41,6 +42,12 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_TREE=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
+BR2_PACKAGE_FB_TEST_APP=y
+BR2_PACKAGE_FBTERM=y
+BR2_PACKAGE_FBV=y
+# BR2_PACKAGE_FBV_GIF is not set
BR2_PACKAGE_LINUXCONSOLETOOLS=y
BR2_PACKAGE_UBOOT_TOOLS=y
BR2_PACKAGE_DTC=y
@@ -63,6 +70,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
diff --git a/buildroot/configs/apf28legacy_defconfig b/buildroot/configs/apf28legacy_defconfig
index 2d0154100..eb1009089 100644
--- a/buildroot/configs/apf28legacy_defconfig
+++ b/buildroot/configs/apf28legacy_defconfig
@@ -36,6 +36,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_GDB=y
@@ -71,6 +72,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
diff --git a/buildroot/configs/apf28legacytest_defconfig b/buildroot/configs/apf28legacytest_defconfig
index 7917ef424..f3082e408 100644
--- a/buildroot/configs/apf28legacytest_defconfig
+++ b/buildroot/configs/apf28legacytest_defconfig
@@ -36,6 +36,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
BR2_PACKAGE_AS_DEVICES_CPP=y
@@ -144,6 +145,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 667fbd0ff..309492aed 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -38,6 +38,7 @@ BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
BR2_PACKAGE_AS_DEVICES_CPP=y
@@ -88,8 +89,11 @@ BR2_PACKAGE_PRBOOM=y
BR2_PACKAGE_SLIDESHOW=y
BR2_PACKAGE_FBDUMP=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
+BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
+# BR2_PACKAGE_FBV_GIF is not set
BR2_PACKAGE_SDL_GFX=y
BR2_PACKAGE_SDL_IMAGE_GIF=y
BR2_PACKAGE_SDL_SOUND=y
@@ -144,6 +148,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_WPA_SUPPLICANT_IEEE80211W=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index a8afe09b8..47cf74a49 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -80,6 +80,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
diff --git a/buildroot/configs/apf6mainline-4.19_defconfig b/buildroot/configs/apf6mainline-4.19_defconfig
index 429c6061e..dade3fa41 100644
--- a/buildroot/configs/apf6mainline-4.19_defconfig
+++ b/buildroot/configs/apf6mainline-4.19_defconfig
@@ -97,6 +97,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
diff --git a/buildroot/configs/apf6mainline-4.9_defconfig b/buildroot/configs/apf6mainline-4.9_defconfig
index 5bf19c238..874c8b9ef 100644
--- a/buildroot/configs/apf6mainline-4.9_defconfig
+++ b/buildroot/configs/apf6mainline-4.9_defconfig
@@ -102,6 +102,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
diff --git a/buildroot/configs/apf6test_defconfig b/buildroot/configs/apf6test_defconfig
index 960148695..b7d78f154 100644
--- a/buildroot/configs/apf6test_defconfig
+++ b/buildroot/configs/apf6test_defconfig
@@ -94,6 +94,7 @@ BR2_PACKAGE_PRBOOM=y
BR2_PACKAGE_QUAKE_PAK=y
BR2_PACKAGE_SDLQUAKE=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 238236cae..de6365bc6 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -57,6 +57,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index bcbdd215a..844699c7d 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -57,6 +57,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 65eab43fb..54e97070f 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -57,6 +57,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
diff --git a/buildroot/configs/opos6ultest_defconfig b/buildroot/configs/opos6ultest_defconfig
index 18d63e1c1..d5b0882ac 100644
--- a/buildroot/configs/opos6ultest_defconfig
+++ b/buildroot/configs/opos6ultest_defconfig
@@ -60,6 +60,7 @@ BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_PRBOOM=y
BR2_PACKAGE_SLIDESHOW=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FBSET=y
BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBTERM=y
BR2_PACKAGE_FBV=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2019-07-26 16:46:14
|
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 7bc58c097a23ed22d4049ff41334e12730da550a (commit)
via d9975a65127e0ccbf449ee38753765573e2f6cc7 (commit)
from f8744d170160e8e2c06a5b1ba216f8a7d19ca2c3 (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 7bc58c097a23ed22d4049ff41334e12730da550a
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Jul 26 18:44:51 2019 +0200
[BUILDROOT] apf28_defconfig: bump linux to 4.9.186
commit d9975a65127e0ccbf449ee38753765573e2f6cc7
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Jul 26 18:41:46 2019 +0200
[LINUX] 4.9: apf28: fixes ethernet interface detection failure
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 2 +-
...deus-net-fec-fixes-fec-reset-phy-return-value.patch | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 patches/linux/4.9/0706-armadeus-net-fec-fixes-fec-reset-phy-return-value.patch
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 0d5be9c64..093363002 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -25,7 +25,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.173"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.186"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.9"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/apf28-linux-4.9.config"
diff --git a/patches/linux/4.9/0706-armadeus-net-fec-fixes-fec-reset-phy-return-value.patch b/patches/linux/4.9/0706-armadeus-net-fec-fixes-fec-reset-phy-return-value.patch
new file mode 100644
index 000000000..2f4699e1b
--- /dev/null
+++ b/patches/linux/4.9/0706-armadeus-net-fec-fixes-fec-reset-phy-return-value.patch
@@ -0,0 +1,18 @@
+Without this, fec_reset_phy() returns random values that will prevent
+correct probe of FEC network interface.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-4.9.173/drivers/net/ethernet/freescale/fec_main.c
+===================================================================
+--- linux-4.9.173.orig/drivers/net/ethernet/freescale/fec_main.c
++++ linux-4.9.173/drivers/net/ethernet/freescale/fec_main.c
+@@ -3240,6 +3240,8 @@ static int fec_reset_phy(struct platform
+ else
+ usleep_range(msec * 1000, msec * 1000 + 1000);
+ gpio_set_value_cansleep(fep->phy_reset_gpio, !active_high);
++
++ return 0;
+ }
+
+ static int fec_get_reset_gpio(struct platform_device *pdev)
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-07-26 09:47:27
|
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 f8744d170160e8e2c06a5b1ba216f8a7d19ca2c3 (commit)
from 4ed56b3efe497196cf17b7d560d181c51760fa57 (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 f8744d170160e8e2c06a5b1ba216f8a7d19ca2c3
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jul 26 11:16:59 2019 +0200
[BSP] add modules/fpga/virtual_components/button/testbutton to target/linux/.gitignore
-----------------------------------------------------------------------
Summary of changes:
target/linux/.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/target/linux/.gitignore b/target/linux/.gitignore
index 97bfbadcf..70f47751c 100644
--- a/target/linux/.gitignore
+++ b/target/linux/.gitignore
@@ -11,3 +11,4 @@ Module.symvers
Module.markers
*.builtin
*.a*
+modules/fpga/virtual_components/button/testbutton
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-07-25 11:37:02
|
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 4ed56b3efe497196cf17b7d560d181c51760fa57 (commit)
from 3805f79dea9ce72cee81cc40ca2901e56f83e4e9 (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 4ed56b3efe497196cf17b7d560d181c51760fa57
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jul 25 13:24:22 2019 +0200
[LINUX] 3.19: apf6: make WiFi work again
-----------------------------------------------------------------------
Summary of changes:
.../4.19/0707-armadeus-dts-apf6-fix-wifi.patch | 54 ++++++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch
diff --git a/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch b/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch
new file mode 100644
index 000000000..a4687344f
--- /dev/null
+++ b/patches/linux/4.19/0707-armadeus-dts-apf6-fix-wifi.patch
@@ -0,0 +1,54 @@
+Index: linux-4.19.60/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+===================================================================
+--- linux-4.19.60.orig/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-4.19.60/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -48,6 +48,24 @@
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+
++/ {
++ reg_1p8v: regulator-1p8v {
++ compatible = "regulator-fixed";
++ regulator-name = "1P8V";
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ regulator-always-on;
++ vin-supply = <®_3p3v>;
++ };
++
++ usdhc1_pwrseq: usdhc1-pwrseq {
++ compatible = "mmc-pwrseq-simple";
++ reset-gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
++ post-power-on-delay-ms = <15>;
++ power-off-delay-us = <70>;
++ };
++};
++
+ &fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet>;
+@@ -82,7 +100,13 @@
+ &usdhc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc1>;
++ bus-width = <4>;
+ non-removable;
++ mmc-pwrseq = <&usdhc1_pwrseq>;
++ vmmc-supply = <®_3p3v>;
++ vqmmc-supply = <®_1p8v>;
++ cap-power-off-card;
++ keep-power-in-suspend;
+ status = "okay";
+
+ #address-cells = <1>;
+@@ -148,8 +172,8 @@
+ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
+ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
+ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
+- MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x1b0b0 /* WL_EN */
+- MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* WL_IRQ */
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x130b0 /* WL_EN */
++ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x13000 /* WL_IRQ */
+ >;
+ };
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2019-07-23 15:33:13
|
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 3805f79dea9ce72cee81cc40ca2901e56f83e4e9 (commit)
from 846e706268236387a02b1a57f9bc6797968641f5 (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 3805f79dea9ce72cee81cc40ca2901e56f83e4e9
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Jul 23 17:31:14 2019 +0200
[BUILDROOT] 2019.02: add thinger.io client package
-----------------------------------------------------------------------
Summary of changes:
...040-armadeus-add-thingerio-client-package.patch | 96 ++++++++++++++++++++++
patches/buildroot/2019.02/cleanup_buildroot.sh | 3 +
2 files changed, 99 insertions(+)
create mode 100644 patches/buildroot/2019.02/040-armadeus-add-thingerio-client-package.patch
diff --git a/patches/buildroot/2019.02/040-armadeus-add-thingerio-client-package.patch b/patches/buildroot/2019.02/040-armadeus-add-thingerio-client-package.patch
new file mode 100644
index 000000000..0f26d8252
--- /dev/null
+++ b/patches/buildroot/2019.02/040-armadeus-add-thingerio-client-package.patch
@@ -0,0 +1,96 @@
+Vive le Claude...
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/thingerio/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/thingerio/Config.in
+@@ -0,0 +1,33 @@
++config BR2_PACKAGE_THINGERIO
++ bool "thinger"
++ depends on !BR2_STATIC_LIBS
++ help
++ thinger is the thinger.io Linux client. If openssl is present
++ it will make use of it.
++
++ https://github.com/thinger-io/Linux-Client
++
++comment "thinger needs a toolchain w/ dynamic library"
++ depends on BR2_STATIC_LIBS
++
++if BR2_PACKAGE_THINGERIO
++
++config BR2_PACKAGE_THINGERIO_USER_ID
++ string "User ID"
++ default "YOUR_USER_ID"
++ help
++ Thinger.io User ID that will be used by thinger app (hardcoded in source code).
++
++config BR2_PACKAGE_THINGERIO_DEVICE_ID
++ string "Device ID"
++ default "YOUR_DEVICE_ID"
++ help
++ Thinger.io Device ID that will be used by thinger app (hardcoded in source code).
++
++config BR2_PACKAGE_THINGERIO_DEVICE_CREDENTIAL
++ string "Device credential"
++ default "YOUR_DEVICE_CREDENTIAL"
++ help
++ Thinger.io User ID that will be used by thinger app (hardcoded in source code).
++
++endif
+Index: buildroot/package/thingerio/thingerio.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/thingerio/thingerio.mk
+@@ -0,0 +1,30 @@
++################################################################################
++#
++# thingerio
++#
++################################################################################
++
++THINGERIO_VERSION = 6bbd564ed3875fa5ef1ae8e6e65cd645ca8e8150
++THINGERIO_SITE = $(call github,thinger-io,Linux-Client,$(THINGERIO_VERSION))
++THINGERIO_LICENSE = MIT
++THINGERIO_LICENSE_FILES = README.md
++
++ifeq ($(BR2_PACKAGE_HAS_OPENSSL),y)
++THINGERIO_DEPENDENCIES += openssl
++else
++THINGERIO_CONF_OPTS += -DENABLE_OPENSSL=OFF
++endif
++
++define THINGERIO_MODIFY_IDS
++ $(SED) "s/YOUR_USER_ID/$(BR2_PACKAGE_THINGERIO_USER_ID)/" $(@D)/src/main.cpp
++ $(SED) "s/YOUR_DEVICE_ID/$(BR2_PACKAGE_THINGERIO_DEVICE_ID)/" $(@D)/src/main.cpp
++ $(SED) "s/YOUR_DEVICE_CREDENTIAL/$(BR2_PACKAGE_THINGERIO_DEVICE_CREDENTIAL)/" $(@D)/src/main.cpp
++endef
++
++THINGERIO_POST_EXTRACT_HOOKS += THINGERIO_MODIFY_IDS
++
++define THINGERIO_INSTALL_TARGET_CMDS
++ $(INSTALL) -D -m 755 $(@D)/thinger $(TARGET_DIR)/usr/local/bin/thinger
++endef
++
++$(eval $(cmake-package))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -1633,6 +1633,7 @@ menu "Networking"
+ source "package/snmppp/Config.in"
+ source "package/sofia-sip/Config.in"
+ source "package/thrift/Config.in"
++ source "package/thingerio/Config.in"
+ source "package/usbredir/Config.in"
+ source "package/wampcc/Config.in"
+ source "package/websocketpp/Config.in"
+Index: buildroot/package/thingerio/thingerio.hash
+===================================================================
+--- /dev/null
++++ buildroot/package/thingerio/thingerio.hash
+@@ -0,0 +1,2 @@
++# Locally computed
++sha256 12ac174c9da65213657289706170919f5f1eebfa24b8a9c4f16fd97fe7f19ba8 thingerio-6bbd564ed3875fa5ef1ae8e6e65cd645ca8e8150.tar.gz
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index 87132505b..fef00621b 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -183,6 +183,9 @@ rm -rf buildroot/package/sunxi-mali/egl.pc
rm -rf buildroot/package/sunxi-mali/glesv2.pc
rm -rf buildroot/package/sunxi-mali/sunxi-mali.hash
rm -rf buildroot/package/sunxi-mali/sunxi-mali.mk
+rm -rf buildroot/package/thingerio/Config.in
+rm -rf buildroot/package/thingerio/thingerio.hash
+rm -rf buildroot/package/thingerio/thingerio.mk
rm -rf buildroot/package/unzip/unzip.hash
rm -rf buildroot/package/unzip/unzip.mk
rm -rf buildroot/package/wolf4sdl/Config.in
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2019-07-23 15:12:42
|
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 846e706268236387a02b1a57f9bc6797968641f5 (commit)
from 30ad8d2828469278f0978adc7d6746ade06702d5 (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 846e706268236387a02b1a57f9bc6797968641f5
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Jul 23 17:12:08 2019 +0200
[BUILDROOT] apf28*_config s: add tree cmd by default
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 1 +
buildroot/configs/apf28legacy_defconfig | 1 +
buildroot/configs/apf28legacytest_defconfig | 1 +
buildroot/configs/apf28test_defconfig | 1 +
4 files changed, 4 insertions(+)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 7198ebc48..0d5be9c64 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -38,6 +38,7 @@ BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_TREE=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
BR2_PACKAGE_LINUXCONSOLETOOLS=y
diff --git a/buildroot/configs/apf28legacy_defconfig b/buildroot/configs/apf28legacy_defconfig
index 28ad78c5d..2d0154100 100644
--- a/buildroot/configs/apf28legacy_defconfig
+++ b/buildroot/configs/apf28legacy_defconfig
@@ -40,6 +40,7 @@ BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_GDB=y
BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_TREE=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
BR2_PACKAGE_I2C_TOOLS=y
diff --git a/buildroot/configs/apf28legacytest_defconfig b/buildroot/configs/apf28legacytest_defconfig
index d0a2ca73a..7917ef424 100644
--- a/buildroot/configs/apf28legacytest_defconfig
+++ b/buildroot/configs/apf28legacytest_defconfig
@@ -74,6 +74,7 @@ BR2_PACKAGE_GDB=y
BR2_PACKAGE_LMBENCH=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_TREE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 47bacef82..667fbd0ff 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -77,6 +77,7 @@ BR2_PACKAGE_GDB=y
BR2_PACKAGE_LMBENCH=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_TREE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2019-07-23 15:02:15
|
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 30ad8d2828469278f0978adc7d6746ade06702d5 (commit)
from 98d5fbfe2b95f16fb756c6e96a46994b642cc3ff (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 30ad8d2828469278f0978adc7d6746ade06702d5
Author: Julien BOIBESSOT <jul...@ar...>
Date: Tue Jul 23 16:59:40 2019 +0200
[BUILDROOT] fixes sd8977 package build and calibration data installation
-----------------------------------------------------------------------
Summary of changes:
.../2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/patches/buildroot/2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch b/patches/buildroot/2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch
index fec2f8fd8..03799a4e4 100644
--- a/patches/buildroot/2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch
+++ b/patches/buildroot/2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch
@@ -2,7 +2,7 @@ Index: buildroot/package/sd8977/sd8977.mk
===================================================================
--- /dev/null
+++ buildroot/package/sd8977/sd8977.mk
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,37 @@
+################################################################################
+#
+# sd8977 (driver + firmware + helpers)
@@ -11,8 +11,8 @@ Index: buildroot/package/sd8977/sd8977.mk
+
+SD8977_VERSION = W16.68.1.p195
+SD8977_SITE = http://extranet.marvell.com
-+SD8977_FULLNAME = SD-WLAN-SD-BT-8977-U16-MMC-$(SD8977_DRIVER_VERSION)-16.26.1.p195-C4X16625_V2-MGPL
-+SD8977_SOURCE = $(SD8977_DRIVER_FULLNAME).zip
++SD8977_FULLNAME = SD-WLAN-SD-BT-8977-U16-MMC-$(SD8977_VERSION)-16.26.1.p195-C4X16625_V2-MGPL
++SD8977_SOURCE = $(SD8977_FULLNAME).zip
+SD8977_LICENSE = GPL-2.0
+SD8977_LICENSE_FILES = COPYING
+SD8977_MODULE_MAKE_OPTS += CONFIG_SD8977=m
@@ -23,6 +23,8 @@ Index: buildroot/package/sd8977/sd8977.mk
+define SD8977_INSTALL_FIRMWARE
+ $(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/mrvl
+ cp -dpf $(@D)/FwImage/sdsd8977_combo_v2.bin $(TARGET_DIR)/lib/firmware/mrvl/
++ # Calibration data
++ cp -dpf $(@D)/$(SD8977_MODULE_SUBDIRS)/mapp/mlanconfig/config/cal_data.conf $(TARGET_DIR)/lib/firmware/mrvl/
+endef
+SD8977_POST_INSTALL_TARGET_HOOKS += SD8977_INSTALL_FIRMWARE
+
@@ -42,7 +44,7 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -530,6 +530,7 @@ endmenu
+@@ -519,6 +519,7 @@ endmenu
source "package/rtl8821au/Config.in"
source "package/sane-backends/Config.in"
source "package/sam7-pgm-ng/Config.in"
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-07-23 08:23:52
|
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 98d5fbfe2b95f16fb756c6e96a46994b642cc3ff (commit)
from 9c70f875ce7ad8d9a5a0b4e68a957d2017662c1f (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 98d5fbfe2b95f16fb756c6e96a46994b642cc3ff
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jul 23 10:22:21 2019 +0200
[BUILDROOT] opos6ul{,nano,sp}_defconfig: bump kernel to 4.19.60
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
...113-ARM-dts-imx6ul-fix-PWM-1-4-interrupts.patch | 61 ----------------------
4 files changed, 3 insertions(+), 64 deletions(-)
delete mode 100644 patches/linux/4.19/0113-ARM-dts-imx6ul-fix-PWM-1-4-interrupts.patch
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 432a313cc..238236cae 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.59"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.60"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index b6ae971fb..bcbdd215a 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.59"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.60"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index eda7be341..65eab43fb 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.59"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.60"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/patches/linux/4.19/0113-ARM-dts-imx6ul-fix-PWM-1-4-interrupts.patch b/patches/linux/4.19/0113-ARM-dts-imx6ul-fix-PWM-1-4-interrupts.patch
deleted file mode 100644
index d80bd7050..000000000
--- a/patches/linux/4.19/0113-ARM-dts-imx6ul-fix-PWM-1-4-interrupts.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ab040fee0e097eeeadafa26d3899d0435b4bc424 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Tue, 18 Jun 2019 17:42:14 +0200
-Subject: [PATCH 1/1] ARM: dts: imx6ul: fix PWM[1-4] interrupts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-According to the i.MX6UL/L RM, table 3.1 "ARM Cortex A7 domain interrupt
-summary", the interrupts for the PWM[1-4] go from 83 to 86.
-
-Fixes: b9901fe84f02 ("ARM: dts: imx6ul: add pwm[1-4] nodes")
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- arch/arm/boot/dts/imx6ul.dtsi | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
-index bbf010c73336..a7f6d1d58e20 100644
---- a/arch/arm/boot/dts/imx6ul.dtsi
-+++ b/arch/arm/boot/dts/imx6ul.dtsi
-@@ -358,7 +358,7 @@
- pwm1: pwm@2080000 {
- compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
- reg = <0x02080000 0x4000>;
-- interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
-+ interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks IMX6UL_CLK_PWM1>,
- <&clks IMX6UL_CLK_PWM1>;
- clock-names = "ipg", "per";
-@@ -369,7 +369,7 @@
- pwm2: pwm@2084000 {
- compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
- reg = <0x02084000 0x4000>;
-- interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;
-+ interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks IMX6UL_CLK_PWM2>,
- <&clks IMX6UL_CLK_PWM2>;
- clock-names = "ipg", "per";
-@@ -380,7 +380,7 @@
- pwm3: pwm@2088000 {
- compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
- reg = <0x02088000 0x4000>;
-- interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
-+ interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks IMX6UL_CLK_PWM3>,
- <&clks IMX6UL_CLK_PWM3>;
- clock-names = "ipg", "per";
-@@ -391,7 +391,7 @@
- pwm4: pwm@208c000 {
- compatible = "fsl,imx6ul-pwm", "fsl,imx27-pwm";
- reg = <0x0208c000 0x4000>;
-- interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-+ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&clks IMX6UL_CLK_PWM4>,
- <&clks IMX6UL_CLK_PWM4>;
- clock-names = "ipg", "per";
---
-2.21.0
-
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-07-18 09:30:50
|
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 9c70f875ce7ad8d9a5a0b4e68a957d2017662c1f (commit)
from 9614358193258da8c49e03c2e04efe576e9f4012 (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 9c70f875ce7ad8d9a5a0b4e68a957d2017662c1f
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jul 18 11:29:16 2019 +0200
[LINUX] modules: fpga: remove empty help in Kconfig
Its removes the following warnings:
drivers/armadeus/fpga/others/i2ctest/Kconfig:8: warning: 'ARMADEUS_I2C_OCORE_IRQMNG' defined with blank help text
drivers/armadeus/fpga/board_designs/wishbone_example/wb_button/Kconfig:9: warning: 'ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER' defined with blank help text
drivers/armadeus/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig:13: warning: 'ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER' defined with blank help text
-----------------------------------------------------------------------
Summary of changes:
.../modules/fpga/board_designs/wishbone_example/wb_button/Kconfig | 1 -
.../modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig | 3 ---
target/linux/modules/fpga/others/Kconfig | 2 +-
target/linux/modules/fpga/others/i2ctest/Kconfig | 1 -
4 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig
index 435a6cb71..ac084e420 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig
@@ -6,4 +6,3 @@ config ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER
default n
depends on ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE
select ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON
- ---help---
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig
index 71c0509da..b997841bb 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig
@@ -1,4 +1,3 @@
-
#
# Armadeus custom drivers configuration
#
@@ -10,5 +9,3 @@ config ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER
default n
depends on ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE
select ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR
- ---help---
-
diff --git a/target/linux/modules/fpga/others/Kconfig b/target/linux/modules/fpga/others/Kconfig
index 573a97628..4d083867d 100644
--- a/target/linux/modules/fpga/others/Kconfig
+++ b/target/linux/modules/fpga/others/Kconfig
@@ -5,6 +5,6 @@
comment "Others drivers for the FPGA"
depends on ARMADEUS_FPGA_DRIVERS
-
+
source "drivers/armadeus/fpga/others/i2ctest/Kconfig"
source "drivers/armadeus/fpga/others/ps2keyboard/Kconfig"
diff --git a/target/linux/modules/fpga/others/i2ctest/Kconfig b/target/linux/modules/fpga/others/i2ctest/Kconfig
index 70cc75e81..e0fbd031a 100644
--- a/target/linux/modules/fpga/others/i2ctest/Kconfig
+++ b/target/linux/modules/fpga/others/i2ctest/Kconfig
@@ -5,4 +5,3 @@ config ARMADEUS_I2C_OCORE_IRQMNG
tristate "Driver for testing wishbone i2c-ocore-irq_mng"
default n
depends on ARMADEUS_FPGA_DRIVERS
- ---help---
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-07-15 14:59:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9614358193258da8c49e03c2e04efe576e9f4012 (commit)
from e8b04b01275171d663eed367cd8fc50393f1e63a (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 9614358193258da8c49e03c2e04efe576e9f4012
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 15 16:58:43 2019 +0200
[BSP] add *.a* to target/linux/.gitignore
-----------------------------------------------------------------------
Summary of changes:
target/linux/.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/target/linux/.gitignore b/target/linux/.gitignore
index 47c953857..97bfbadcf 100644
--- a/target/linux/.gitignore
+++ b/target/linux/.gitignore
@@ -10,3 +10,4 @@
Module.symvers
Module.markers
*.builtin
+*.a*
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-07-15 14:51:54
|
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 e8b04b01275171d663eed367cd8fc50393f1e63a (commit)
via a6658acc6d1233639b379ca6a6b8ddfb2e721b17 (commit)
from 8806a57da017c3594f20265de17df66521642b90 (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 e8b04b01275171d663eed367cd8fc50393f1e63a
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 15 16:43:51 2019 +0200
[ASDEVICES] install cpp headers in includes/as_devices/
Keep includes/as_devices/cpp for compatibility.
commit a6658acc6d1233639b379ca6a6b8ddfb2e721b17
Author: Gildas PRIME <gil...@bi...>
Date: Mon Jul 15 16:04:46 2019 +0200
[BSP] Makefile: add OPOS6UL_* in help messages
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 ++-
target/packages/as_devices/cpp/Makefile | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 8d430ae99..e871b1529 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo " "; \
echo " System not configured. Use make <board>_defconfig " >&2; \
echo " armadeus valid configurations are: " >&2; \
- echo " "$(shell find $(ARMADEUS_CONFIG_DIR) -name "[ap][fp][fs]*_defconfig" | sed 's/.*\///');\
+ echo " "$(shell find $(ARMADEUS_CONFIG_DIR) -name "[apo][fp][fso]*_defconfig" | sed 's/.*\///');\
echo " "; \
echo -en "\033[0m";
@@ -72,6 +72,7 @@ help:
@echo ' opos6ul_defconfig - get default config for an OPOS6UL+Dev kit (4.8+ mainline/vanilla kernel)'
@echo ' opos6ul_legacy_defconfig - get default config for an OPOS6UL+Dev kit (3.14 Freescale kernel)'
@echo ' opos6ulnano_defconfig - get default config for an OPOS6ULNANO+Dev kit (4.9+ mainline/vanilla kernel)'
+ @echo ' opos6ulsp_defconfig - get default config for an OPOS6ULSP+Dev kit (4.19+ mainline/vanilla kernel)'
@echo ''
@echo 'Build:'
@echo ' all - make world '
diff --git a/target/packages/as_devices/cpp/Makefile b/target/packages/as_devices/cpp/Makefile
index 542918b0a..cee9cd3ad 100644
--- a/target/packages/as_devices/cpp/Makefile
+++ b/target/packages/as_devices/cpp/Makefile
@@ -44,8 +44,9 @@ install: $(SO_NAME)
mkdir -p $(INSTALL_DIR)/usr/lib
install -D $(SO_NAME) $(INSTALL_DIR)/usr/lib
cd $(INSTALL_DIR)/usr/lib/; ln -sf $(SO_NAME) $(LIBNAME)
- mkdir -p $(INSTALL_DIR)/usr/include/as_devices/cpp
- cp *.hpp $(INSTALL_DIR)/usr/include/as_devices/cpp
+ mkdir -p $(INSTALL_DIR)/usr/include/as_devices
+ cp *.hpp $(INSTALL_DIR)/usr/include/as_devices/
+ cd $(INSTALL_DIR)/usr/include/as_devices/; ln -sfn . cpp
install-exe: $(SO_NAME)
install -D $(SO_NAME) $(INSTALL_DIR)/usr/lib
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-07-15 08:31:21
|
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 8806a57da017c3594f20265de17df66521642b90 (commit)
from 619e77d44912fc53fb5f8cd54c4b315155d578b8 (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 8806a57da017c3594f20265de17df66521642b90
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 15 10:30:41 2019 +0200
[BUILDROOT] opos6ul{,nano,sp}_defconfig: bump kernel to 4.19.59
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 383635d72..432a313cc 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.51"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.59"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index c7427c1bf..b6ae971fb 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.51"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.59"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 5527414e4..eda7be341 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.51"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.59"
BR2_LINUX_KERNEL_PATCH="../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-07-12 13:39:04
|
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 619e77d44912fc53fb5f8cd54c4b315155d578b8 (commit)
via cb93376509ddcaf4b70e76f982c2787a7e4d31e9 (commit)
from 9f82aab36dd626b9c5ed31fa6d091087ae93c488 (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 619e77d44912fc53fb5f8cd54c4b315155d578b8
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jul 12 15:35:46 2019 +0200
[BSP] Makefile: always save BR sources in downloads directory
commit cb93376509ddcaf4b70e76f982c2787a7e4d31e9
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jul 12 15:34:01 2019 +0200
[BUILDROOT] 2019.02: unzip: fix downloading by updating patches from Debian
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 +-
...ip-update-security-and-bux-fix-patches-fr.patch | 89 ++++++++++++++++++++++
patches/buildroot/2019.02/cleanup_buildroot.sh | 2 +
3 files changed, 92 insertions(+), 5 deletions(-)
create mode 100644 patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch
diff --git a/Makefile b/Makefile
index 72f722bba..8d430ae99 100644
--- a/Makefile
+++ b/Makefile
@@ -37,11 +37,7 @@ ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
#BUILDROOT_DIR is defined in ./Makefile.in
PATCH_DIR = patches
-ifeq ($(ARMADEUS_DL_DIR),)
-BUILDROOT_FILE_PATH = $(BUILDROOT_DIR)/downloads
-else
-BUILDROOT_FILE_PATH = $(ARMADEUS_DL_DIR)
-endif
+BUILDROOT_FILE_PATH = $(ARMADEUS_TOPDIR)/downloads
TAR_OPTIONS = --exclude=.svn --exclude=.git --exclude=.gitignore --strip-component=1 -xf
BUILDROOT_PATCH_SCRIPT = $(BUILDROOT_DIR)/support/scripts/apply-patches.sh
ARMADEUS_ENV_FILE:=$(ARMADEUS_TOPDIR)/armadeus_env.sh
diff --git a/patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch b/patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch
new file mode 100644
index 000000000..bd3fe9ff3
--- /dev/null
+++ b/patches/buildroot/2019.02/236-package-unzip-update-security-and-bux-fix-patches-fr.patch
@@ -0,0 +1,89 @@
+From 1df827a1219a61cba3ace88a3ef5d2cc02d17b32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 12 Jul 2019 15:15:26 +0200
+Subject: [PATCH 1/1] package/unzip: update security and bux fix patches from
+ Debian
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix the URL and add three new patches. Quoting changelog [1]:
+
+unzip (6.0-24) unstable; urgency=medium
+
+ * Apply two patches by Mark Adler:
+ - Fix bug in undefer_input() that misplaced the input state.
+ - Detect and reject a zip bomb using overlapped entries. Closes: #931433.
+ Bug discovered by David Fifield. For reference, this is CVE-2019-13232.
+
+ -- Santiago Vila <sa...@de...> Thu, 11 Jul 2019 18:03:34 +0200
+
+unzip (6.0-23) unstable; urgency=medium
+
+ * Fix lame code in fileio.c which parsed 64-bit values incorrectly.
+ Thanks to David Fifield for the report. Closes: #929502.
+
+ -- Santiago Vila <sa...@de...> Wed, 29 May 2019 00:24:08 +0200
+
+[1] https://sources.debian.org/data/main/u/unzip/6.0-24/debian/changelog
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/unzip/unzip.hash | 3 +++
+ package/unzip/unzip.mk | 29 ++++++++++++++++-------------
+ 2 files changed, 19 insertions(+), 13 deletions(-)
+
+diff --git a/package/unzip/unzip.hash b/package/unzip/unzip.hash
+index fbf2615ad6..0c384d006e 100644
+--- a/package/unzip/unzip.hash
++++ b/package/unzip/unzip.hash
+@@ -13,3 +13,6 @@ sha256 ea04cfc8b7ca3b3c03117da0d891870b8c542d26188ef5593fd7e479f4f29f4e 17-resto
+ sha256 1872ffdd4d82edd7b1e62c469642bf16a1ca12dd26d41bd3f0b44f0f7602eb63 18-cve-2014-9913-unzip-buffer-overflow.patch
+ sha256 60840ea8f5d11a276972fb5b43652cdd49a9ed93b2cc0586ad309bf52104b012 19-cve-2016-9844-zipinfo-buffer-overflow.patch
+ sha256 4eabc3faeddd56ebc3d5053486b61f8758d840902725fd555d3472cffb094437 20-cve-2018-1000035-unzip-buffer-overflow.patch
++sha256 df3b0eeea8dcc161a2565e306b5dda13d27de43145e198baaf0eab822321ee7e 21-fix-warning-messages-on-big-files.patch
++sha256 2cf5a89e921da99e883bcde0ea03e2c77ae9185f57efaf35e7d43bc24353cfdc 22-cve-2019-13232-fix-bug-in-undefer-input.patch
++sha256 c8e82c80fc7760f90567118a465e4cfa1b8e5d0a5723f9c70e3d21247e550615 23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch
+diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk
+index 43e90125e6..2887b7b288 100644
+--- a/package/unzip/unzip.mk
++++ b/package/unzip/unzip.mk
+@@ -11,18 +11,21 @@ UNZIP_LICENSE = Info-ZIP
+ UNZIP_LICENSE_FILES = LICENSE
+
+ UNZIP_PATCH = \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/07-increase-size-of-cfactorstr.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/08-allow-greater-hostver-values.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/09-cve-2014-8139-crc-overflow.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/10-cve-2014-8140-test-compr-eb.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/11-cve-2014-8141-getzip64data.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/12-cve-2014-9636-test-compr-eb.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/14-cve-2015-7696.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/15-cve-2015-7697.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/16-fix-integer-underflow-csiz-decrypted.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/17-restore-unix-timestamps-accurately.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/18-cve-2014-9913-unzip-buffer-overflow.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/19-cve-2016-9844-zipinfo-buffer-overflow.patch \
+- https://sources.debian.org/data/main/u/unzip/6.0-22/debian/patches/20-cve-2018-1000035-unzip-buffer-overflow.patch
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/07-increase-size-of-cfactorstr.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/08-allow-greater-hostver-values.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/09-cve-2014-8139-crc-overflow.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/10-cve-2014-8140-test-compr-eb.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/11-cve-2014-8141-getzip64data.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/12-cve-2014-9636-test-compr-eb.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/14-cve-2015-7696.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/15-cve-2015-7697.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/16-fix-integer-underflow-csiz-decrypted.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/17-restore-unix-timestamps-accurately.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/18-cve-2014-9913-unzip-buffer-overflow.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/19-cve-2016-9844-zipinfo-buffer-overflow.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/20-cve-2018-1000035-unzip-buffer-overflow.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/21-fix-warning-messages-on-big-files.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/22-cve-2019-13232-fix-bug-in-undefer-input.patch \
++ https://sources.debian.org/data/main/u/unzip/6.0-24/debian/patches/23-cve-2019-13232-zip-bomb-with-overlapped-entries.patch
+
+ $(eval $(cmake-package))
+--
+2.21.0
+
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index 25660156d..87132505b 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -183,6 +183,8 @@ rm -rf buildroot/package/sunxi-mali/egl.pc
rm -rf buildroot/package/sunxi-mali/glesv2.pc
rm -rf buildroot/package/sunxi-mali/sunxi-mali.hash
rm -rf buildroot/package/sunxi-mali/sunxi-mali.mk
+rm -rf buildroot/package/unzip/unzip.hash
+rm -rf buildroot/package/unzip/unzip.mk
rm -rf buildroot/package/wolf4sdl/Config.in
rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2019-07-11 14:56:00
|
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 9f82aab36dd626b9c5ed31fa6d091087ae93c488 (commit)
from 8ce9ce1f3af56cf1dc5ede1bd8ee2b69abd2ed34 (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 9f82aab36dd626b9c5ed31fa6d091087ae93c488
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jul 11 16:53:47 2019 +0200
[BSP] Makefile: use BUILDROOT_CONFIG_DIR when deleting .config file
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index b60d7b204..72f722bba 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@ linux-clean: $(BUILDROOT_DIR)/.configured
%_defconfig: $(BUILDROOT_DIR)/.patched
@if [ -e "$(ARMADEUS_CONFIG_DIR)/$@" ] || [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_defconfig,%,$@)/$@" ] || [ -e "$(BR2_EXTERNAL)/configs/$@" ]; then \
- rm -f $(BUILDROOT_DIR)/.config ; \
+ rm -f $(BUILDROOT_CONFIG_DIR)/.config ; \
$(MAKE) -C $(BUILDROOT_DIR) $@ ; \
$(MAKE) -C $(BUILDROOT_DIR) menuconfig ; \
touch $(BUILDROOT_DIR)/.configured ; \
@@ -158,7 +158,7 @@ linux-clean: $(BUILDROOT_DIR)/.configured
# for the one who doesn't want config menu:
%_autoconf: $(BUILDROOT_DIR)/.patched
@if [ -e "$(BUILDROOT_DIR)/configs/$(patsubst %_autoconf,%,$@)_defconfig" ]; then \
- rm -f $(BUILDROOT_DIR)/.config ; \
+ rm -f $(BUILDROOT_CONFIG_DIR)/.config ; \
$(MAKE) -C $(BUILDROOT_DIR) $(patsubst %_autoconf,%,$@)_defconfig ; \
touch $(BUILDROOT_DIR)/.configured ; \
else \
@@ -226,7 +226,7 @@ shell_env:
@echo ARMADEUS_DL_DIR=$(ARMADEUS_DL_DIR) >> $(ARMADEUS_ENV_FILE)
PHONY_TARGETS+=dummy all linux linux-clean buildroot-clean buildroot-dirclean
-PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config shell_env buildroot-sources buildroot-unpacked
+PHONY_TARGETS+=menuconfig $(BUILDROOT_CONFIG_DIR)/.config shell_env buildroot-sources buildroot-unpacked
PHONY_TARGETS+=buildroot-patched
.PHONY: $(PHONY_TARGETS)
hooks/post-receive
--
armadeus
|