armadeus-commitlog Mailing List for armadeus (Page 8)
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
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Sébastien S. <ss...@us...> - 2022-07-26 08:46:46
|
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 220e7de748be08c2c4f2a3b5d72fd5768c63e3fb (commit)
via adbc937bca67ed3ead5a4d2bf9424fc82b4de9a8 (commit)
from f19f4443cfd66d9982ba6059a40898f6f847cd48 (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 220e7de748be08c2c4f2a3b5d72fd5768c63e3fb
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jul 26 10:42:43 2022 +0200
[BSP] Makefile: move .configured file to output dir
This is needed when building out-of-tree.
commit adbc937bca67ed3ead5a4d2bf9424fc82b4de9a8
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jul 26 10:24:30 2022 +0200
[BUILDROOT] Bump BR to 2022.02.1
-----------------------------------------------------------------------
Summary of changes:
Makefile | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 95730eeb6..d767b410d 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?= 1
+BUILDROOT_MINOR_VERSION ?= 3
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
@@ -148,7 +148,7 @@ $(BUILDROOT_DIR)/.patched: $(BUILDROOT_DIR)/.unpacked
buildroot-patched: $(BUILDROOT_DIR)/.patched
-$(BUILDROOT_DIR)/.configured: $(BUILDROOT_DIR)/.patched
+$(BUILDROOT_OUTPUT_DIR)/.configured: $(BUILDROOT_DIR)/.patched
@if [ ! -f $@ ]; then \
$(ECHO_CONFIGURATION_NOT_DEFINED) \
exit 1; \
@@ -159,10 +159,10 @@ buildauto: $(BUILDROOT_DIR)/.patched
# ! Be sure that /local/downloads exists if you want to use automated build !
BUILDROOT_DL_DIR=/local/downloads BR2_DL_DIR=/local/downloads $(MAKE) -s -C $(BUILDROOT_DIR)
-linux: $(BUILDROOT_DIR)/.configured
+linux: $(BUILDROOT_OUTPUT_DIR)/.configured
@$(MAKE) -C $(BUILDROOT_DIR) linux-rebuild
-linux-clean: $(BUILDROOT_DIR)/.configured
+linux-clean: $(BUILDROOT_OUTPUT_DIR)/.configured
@$(MAKE) -C $(BUILDROOT_DIR) linux-clean
%_defconfig: $(BUILDROOT_DIR)/.patched
@@ -170,7 +170,7 @@ linux-clean: $(BUILDROOT_DIR)/.configured
rm -f $(BUILDROOT_CONFIG_DIR)/.config ; \
$(MAKE) -C $(BUILDROOT_DIR) $@ ; \
$(MAKE) -C $(BUILDROOT_DIR) menuconfig ; \
- touch $(BUILDROOT_DIR)/.configured ; \
+ touch $(BUILDROOT_OUTPUT_DIR)/.configured ; \
else \
echo -e "\033[1m\nThis configuration does not exist !!\n\033[0m" ; \
fi;
@@ -180,12 +180,12 @@ linux-clean: $(BUILDROOT_DIR)/.configured
@if [ -e "$(BUILDROOT_DIR)/configs/$(patsubst %_autoconf,%,$@)_defconfig" ]; then \
rm -f $(BUILDROOT_CONFIG_DIR)/.config ; \
$(MAKE) -C $(BUILDROOT_DIR) $(patsubst %_autoconf,%,$@)_defconfig ; \
- touch $(BUILDROOT_DIR)/.configured ; \
+ touch $(BUILDROOT_OUTPUT_DIR)/.configured ; \
else \
echo -e "\033[1m\nThis configuration does not exist !!\n\033[0m" ; \
fi;
-all: $(BUILDROOT_DIR)/.configured
+all: $(BUILDROOT_OUTPUT_DIR)/.configured
@mkdir -p $(BUILDROOT_OUTPUT_DIR)
@echo -n `date +%s` > $(BUILDROOT_OUTPUT_DIR)/before.txt
@$(MAKE) -C $(BUILDROOT_DIR) $@
@@ -194,12 +194,12 @@ all: $(BUILDROOT_DIR)/.configured
@BEFORE=`cat $(BUILDROOT_OUTPUT_DIR)/before.txt`; AFTER=`cat $(BUILDROOT_OUTPUT_DIR)/after.txt`; BUILD_TIME_IN_SEC=`expr $$AFTER - $$BEFORE`; echo -e "\033[1mBuild time: $$BUILD_TIME_IN_SEC seconds\033[0m"
@rm $(BUILDROOT_OUTPUT_DIR)/before.txt $(BUILDROOT_OUTPUT_DIR)/after.txt
-menuconfig: $(BUILDROOT_DIR)/.configured
+menuconfig: $(BUILDROOT_OUTPUT_DIR)/.configured
@$(MAKE) -C $(BUILDROOT_DIR) $@
# !! .DEFAULT do NOT handle dependencies !!
.DEFAULT:
- @if [ ! -e "$(BUILDROOT_DIR)/.configured" ]; then \
+ @if [ ! -e "$(BUILDROOT_OUTPUT_DIR)/.configured" ]; then \
$(ECHO_CONFIGURATION_NOT_DEFINED) \
exit 1; \
fi
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-07-18 08:52: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 f19f4443cfd66d9982ba6059a40898f6f847cd48 (commit)
from 7a52cbc5ae1eb285ddbf696176b3e031cca142d8 (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 f19f4443cfd66d9982ba6059a40898f6f847cd48
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jul 18 10:48:52 2022 +0200
[BUILDROOT] 2022.02: patches to fixed rt-tests downloading
* Bump rt-tests to version 2.4
-----------------------------------------------------------------------
Summary of changes:
.../415-package-rt-tests-bump-version-to-2.4.patch | 41 ++++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 2 ++
2 files changed, 43 insertions(+)
create mode 100644 patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch
diff --git a/patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch b/patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch
new file mode 100644
index 000000000..5a5eebca5
--- /dev/null
+++ b/patches/buildroot/2022.02/415-package-rt-tests-bump-version-to-2.4.patch
@@ -0,0 +1,41 @@
+From f9bacf348a9529fb9c926129687bafa55a6d9d12 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Mon, 18 Jul 2022 10:43:34 +0200
+Subject: [PATCH 1/1] package/rt-tests: bump version to 2.4
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/rt-tests/rt-tests.hash | 2 +-
+ package/rt-tests/rt-tests.mk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash
+index 4f84e0d0ca..1c5071fc63 100644
+--- a/package/rt-tests/rt-tests.hash
++++ b/package/rt-tests/rt-tests.hash
+@@ -1,4 +1,4 @@
+ # From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc
+-sha256 b5e7959bcb5c703b2743030751af975ea4e04962e29fc1118f4b605987585735 rt-tests-2.3.tar.xz
++sha256 393457f0c91cce57e82b876ecb9b672871f898e6cecafc751548079512bcc808 rt-tests-2.4.tar.xz
+ # locally computed hash
+ sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
+diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
+index 056a4a6723..74290211ce 100644
+--- a/package/rt-tests/rt-tests.mk
++++ b/package/rt-tests/rt-tests.mk
+@@ -6,7 +6,7 @@
+
+ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests
+ RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz
+-RT_TESTS_VERSION = 2.3
++RT_TESTS_VERSION = 2.4
+ RT_TESTS_LICENSE = GPL-2.0+
+ RT_TESTS_LICENSE_FILES = COPYING
+
+--
+2.35.1
+
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index e8ad29e66..985b411d3 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -68,6 +68,8 @@ rm -rf buildroot/package/pywebradio/Config.in
rm -rf buildroot/package/pywebradio/pywebradio.mk
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
+rm -rf buildroot/package/rt-tests/rt-tests.hash
+rm -rf buildroot/package/rt-tests/rt-tests.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
rm -rf buildroot/package/sd8977/Config.in
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-06-30 09:01:35
|
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, add-ci has been deleted
was 4b495ca6ef4fee178b8ee2a40e7db6c32a76d6e0
-----------------------------------------------------------------------
4b495ca6ef4fee178b8ee2a40e7db6c32a76d6e0 Add CI script
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-06-30 08:25: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, add-ci has been created
at 4b495ca6ef4fee178b8ee2a40e7db6c32a76d6e0 (commit)
- Log -----------------------------------------------------------------
commit 4b495ca6ef4fee178b8ee2a40e7db6c32a76d6e0
Author: Kevin Joly <kev...@ar...>
Date: Wed Jun 15 11:14:49 2022 +0200
Add CI script
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2022-06-01 09:41:17
|
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 e5d5857e63a71df3063c5b58ad7bdd7e95e609a5 (commit)
from ec1dc1f9d8167aa8c4e11b24c11d574e6d5ce3dd (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 e5d5857e63a71df3063c5b58ad7bdd7e95e609a5
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Jun 1 11:40:40 2022 +0200
[BUILD] Makes scripts/export_linux_config.sh works with BR2_EXTERNAL BSP too.
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 1ca11afca..cc8b995ce 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,12 +105,19 @@ endif
ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
-ifneq ($(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE),)
-TEMP_ARMADEUS_LINUX_CONFIG = $(shell echo $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) | rev | cut -d "/" -f 1 | rev)
-ARMADEUS_LINUX_CONFIG = $(ARMADEUS_BOARD_DIR)/$(TEMP_ARMADEUS_LINUX_CONFIG)
+
+ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
+ifeq ($(shell test -e $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) && echo -n yes),yes)
+ # Absolute path in config
+ ARMADEUS_LINUX_CONFIG=$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
+ else
+ TEMP_ARMADEUS_LINUX_CONFIG = $(shell echo $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) | rev | cut -d "/" -f 1 | rev)
+ ARMADEUS_LINUX_CONFIG = $(ARMADEUS_BOARD_DIR)/$(TEMP_ARMADEUS_LINUX_CONFIG)
+ endif
else
-ARMADEUS_LINUX_CONFIG = $(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
+ ARMADEUS_LINUX_CONFIG = $(ARMADEUS_BOARD_DIR)/$(ARMADEUS_BOARD_NAME)-linux-$(ARMADEUS_LINUX_MAIN_VERSION).config
endif
+
ARMADEUS_U_BOOT_CONFIG:=$(BUILDROOT_DIR)/$(shell echo $(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE))
ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_HOST_DIR)/usr/bin
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-05-23 15:41:45
|
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 ec1dc1f9d8167aa8c4e11b24c11d574e6d5ce3dd (commit)
from bcb88e7e3f439875edc39607bd1e66e438b08fc3 (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 ec1dc1f9d8167aa8c4e11b24c11d574e6d5ce3dd
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon May 23 17:38:57 2022 +0200
[LINUX] 5.4: add patches for APF6
-----------------------------------------------------------------------
Summary of changes:
patches/linux/5.4/0702-armadeus-pcie-fix-build.patch | 15 +++++++++++++++
...core-Allow-setting-slot-index-via-device-tree-al.patch | 0
.../0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch | 0
3 files changed, 15 insertions(+)
create mode 100644 patches/linux/5.4/0702-armadeus-pcie-fix-build.patch
copy patches/linux/{4.19 => 5.4}/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch (100%)
copy patches/linux/{4.19 => 5.4}/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch (100%)
diff --git a/patches/linux/5.4/0702-armadeus-pcie-fix-build.patch b/patches/linux/5.4/0702-armadeus-pcie-fix-build.patch
new file mode 100644
index 000000000..2c1d9a8a7
--- /dev/null
+++ b/patches/linux/5.4/0702-armadeus-pcie-fix-build.patch
@@ -0,0 +1,15 @@
+Index: linux-5.4.180/drivers/pci/controller/dwc/pci-imx6.c
+===================================================================
+--- linux-5.4.180.orig/drivers/pci/controller/dwc/pci-imx6.c
++++ linux-5.4.180/drivers/pci/controller/dwc/pci-imx6.c
+@@ -105,7 +105,9 @@ struct imx6_pcie {
+
+ /* PCIe Port Logic registers (memory-mapped) */
+ #define PL_OFFSET 0x700
+-
++#define PCIE_PL_PFLR (PL_OFFSET + 0x08)
++#define PCIE_PL_PFLR_LINK_STATE_MASK (0x3f << 16)
++#define PCIE_PL_PFLR_FORCE_LINK (1 << 15)
+ #define PCIE_PHY_CTRL (PL_OFFSET + 0x114)
+ #define PCIE_PHY_CTRL_DATA(x) FIELD_PREP(GENMASK(15, 0), (x))
+ #define PCIE_PHY_CTRL_CAP_ADR BIT(16)
diff --git a/patches/linux/4.19/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch b/patches/linux/5.4/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch
similarity index 100%
copy from patches/linux/4.19/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch
copy to patches/linux/5.4/0811-mmc-core-Allow-setting-slot-index-via-device-tree-al.patch
diff --git a/patches/linux/4.19/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch b/patches/linux/5.4/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch
similarity index 100%
copy from patches/linux/4.19/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch
copy to patches/linux/5.4/0812-mmc-core-Don-t-allocate-IDA-for-OF-aliases.patch
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-04-26 12:41:16
|
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 bcb88e7e3f439875edc39607bd1e66e438b08fc3 (commit)
from c62e1930f7df5147d662fd2ff148a15c8e8cbdf7 (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 bcb88e7e3f439875edc39607bd1e66e438b08fc3
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Apr 26 14:38:36 2022 +0200
[BUILDROOT] opos8mmdev: add PI connector (J3) support
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos8mm-legacy-5.10_defconfig | 2 +-
...4-dts-opos8mm-add-PI-connector-J3-devices.patch | 178 +++++++++++++++++++++
2 files changed, 179 insertions(+), 1 deletion(-)
create mode 100644 patches/linux/5.4.imx_legacy/0547-arm64-dts-opos8mm-add-PI-connector-J3-devices.patch
diff --git a/buildroot/configs/opos8mm-legacy-5.10_defconfig b/buildroot/configs/opos8mm-legacy-5.10_defconfig
index c18a46d64..f0af3d0f4 100644
--- a/buildroot/configs/opos8mm-legacy-5.10_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.10_defconfig
@@ -23,7 +23,7 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="1024"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="17fca1cefc03afe15dcc0eed41df923c4f1bd80b"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="b2b967715afac4607ad5b44e07e2e5631cc8cad0"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-5.10_defconfig"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/patches/linux/5.4.imx_legacy/0547-arm64-dts-opos8mm-add-PI-connector-J3-devices.patch b/patches/linux/5.4.imx_legacy/0547-arm64-dts-opos8mm-add-PI-connector-J3-devices.patch
new file mode 100644
index 000000000..284165d02
--- /dev/null
+++ b/patches/linux/5.4.imx_legacy/0547-arm64-dts-opos8mm-add-PI-connector-J3-devices.patch
@@ -0,0 +1,178 @@
+From 5f50af9099d18fbf07e3403a2258bfe9e7874c0f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Tue, 26 Apr 2022 13:21:05 +0200
+Subject: [PATCH 1/1] arm64: dts: opos8mm: add PI connector (J3) devices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ .../boot/dts/freescale/imx8mm-opos8mmdev.dts | 87 +++++++++++++++++++
+ 1 file changed, 87 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts b/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
+index 979032820561b..79cb951d3ad92 100644
+--- a/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
++++ b/arch/arm64/boot/dts/freescale/imx8mm-opos8mmdev.dts
+@@ -152,6 +152,25 @@
+ };
+ };
+
++&ecspi1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_ecspi1>;
++ cs-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>, <&gpio1 6 GPIO_ACTIVE_LOW>;
++ status = "okay";
++
++ spi@0 {
++ compatible = "spidev";
++ reg = <0>;
++ spi-max-frequency = <5000000>;
++ };
++
++ spi@1 {
++ compatible = "spidev";
++ reg = <1>;
++ spi-max-frequency = <5000000>;
++ };
++};
++
+ &ecspi2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi2>;
+@@ -236,6 +255,13 @@
+ };
+ };
+
++&i2c4 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c4>;
++ clock-frequency = <384000>;
++ status = "okay";
++};
++
+ &lcdif {
+ status = "okay";
+ };
+@@ -290,6 +316,12 @@
+ status = "okay";
+ };
+
++&pwm3 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm3>;
++ status = "okay";
++};
++
+ &sai5 {
+ #sound-dai-cells = <0>;
+ pinctrl-names = "default";
+@@ -305,6 +337,12 @@
+ status = "okay";
+ };
+
++&uart1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_uart1>;
++ status = "okay";
++};
++
+ /* console */
+ &uart4 {
+ pinctrl-names = "default";
+@@ -346,6 +384,9 @@
+ };
+
+ &iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_gpios>;
++
+ pinctrl_backlight: backlightgrp {
+ fsl,pins = <
+ MX8MM_IOMUXC_GPIO1_IO15_GPIO1_IO15 0x10
+@@ -361,6 +402,16 @@
+ >;
+ };
+
++ pinctrl_ecspi1: ecspi1grp {
++ fsl,pins = <
++ MX8MM_IOMUXC_ECSPI1_MOSI_ECSPI1_MOSI 0x10
++ MX8MM_IOMUXC_ECSPI1_MISO_ECSPI1_MISO 0x90
++ MX8MM_IOMUXC_ECSPI1_SCLK_ECSPI1_SCLK 0x90
++ MX8MM_IOMUXC_ECSPI1_SS0_GPIO5_IO9 0x90
++ MX8MM_IOMUXC_GPIO1_IO06_GPIO1_IO6 0x90
++ >;
++ };
++
+ pinctrl_ecspi2: ecspi2grp {
+ fsl,pins = <
+ MX8MM_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0x10
+@@ -382,6 +433,23 @@
+ >;
+ };
+
++ pinctrl_gpios: gpiosgrp {
++ fsl,pins = <
++ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x90
++ MX8MM_IOMUXC_GPIO1_IO01_GPIO1_IO1 0x90
++ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x90
++ MX8MM_IOMUXC_GPIO1_IO05_GPIO1_IO5 0x90
++ MX8MM_IOMUXC_GPIO1_IO07_GPIO1_IO7 0x90
++ MX8MM_IOMUXC_GPIO1_IO08_GPIO1_IO8 0x90
++ MX8MM_IOMUXC_GPIO1_IO11_GPIO1_IO11 0x90
++ MX8MM_IOMUXC_GPIO1_IO13_GPIO1_IO13 0x90
++ MX8MM_IOMUXC_SAI2_RXD0_GPIO4_IO23 0x90
++ MX8MM_IOMUXC_SAI2_TXFS_GPIO4_IO24 0x90
++ MX8MM_IOMUXC_UART3_RXD_GPIO5_IO26 0x90
++ MX8MM_IOMUXC_UART3_TXD_GPIO5_IO27 0x90
++ >;
++ };
++
+ pinctrl_i2c2: i2c2grp {
+ fsl,pins = <
+ MX8MM_IOMUXC_I2C2_SCL_I2C2_SCL 0x40000082
+@@ -396,6 +464,12 @@
+ >;
+ };
+
++ pinctrl_i2c4: i2c4grp {
++ fsl,pins = <
++ MX8MM_IOMUXC_I2C4_SCL_I2C4_SCL 0x40000082
++ MX8MM_IOMUXC_I2C4_SDA_I2C4_SDA 0x40000082
++ >;
++ };
+
+ pinctrl_imx219_regs: imx219regsgrp {
+ fsl,pins = <
+@@ -418,6 +492,12 @@
+ >;
+ };
+
++ pinctrl_pwm3: pwm3grp {
++ fsl,pins = <
++ MX8MM_IOMUXC_GPIO1_IO14_PWM3_OUT 0x10
++ >;
++ };
++
+ pinctrl_touchscreen: touchscreengrp {
+ fsl,pins = <
+ /* TOUCH_RST */
+@@ -437,6 +517,13 @@
+ >;
+ };
+
++ pinctrl_uart1: uart1grp {
++ fsl,pins = <
++ MX8MM_IOMUXC_SAI2_RXC_UART1_DCE_RX 0x90
++ MX8MM_IOMUXC_SAI2_RXFS_UART1_DCE_TX 0x90
++ >;
++ };
++
+ pinctrl_uart4: uart4grp {
+ fsl,pins = <
+ MX8MM_IOMUXC_UART4_RXD_UART4_DCE_RX 0x0E
+--
+2.35.1
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-04-25 08:00: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 c62e1930f7df5147d662fd2ff148a15c8e8cbdf7 (commit)
from 7cea9a93dab519115a8f3abc32a6349af8d997f6 (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 c62e1930f7df5147d662fd2ff148a15c8e8cbdf7
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Apr 25 09:57:16 2022 +0200
[BUILDROOT] opos8mm (legacy 5.4): fix ATF build
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos8mm-legacy-5.4_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot/configs/opos8mm-legacy-5.4_defconfig b/buildroot/configs/opos8mm-legacy-5.4_defconfig
index 03228d2c4..57bab1502 100644
--- a/buildroot/configs/opos8mm-legacy-5.4_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.4_defconfig
@@ -143,7 +143,7 @@ BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="git://git.code.sf.net/p/armadeus/atf"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="17ee556077e9aa04ef83e19ebfa542eaceaf4470"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="4caa5e377e7806db88f3db7addb9200c2f9f3bcc"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-04-22 10:25: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 7cea9a93dab519115a8f3abc32a6349af8d997f6 (commit)
from 60a8947d8966dff69bcf8c0871f507b5a45ef14d (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 7cea9a93dab519115a8f3abc32a6349af8d997f6
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Apr 22 12:21:47 2022 +0200
[BUILDROOT] Fixes builds on opos6ulnano and opos8mm (legacy 5.4)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos8mm-legacy-5.4_defconfig | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index d3237588b..815bc35e5 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -127,7 +127,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="150M"
BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
diff --git a/buildroot/configs/opos8mm-legacy-5.4_defconfig b/buildroot/configs/opos8mm-legacy-5.4_defconfig
index 8ea718a6b..03228d2c4 100644
--- a/buildroot/configs/opos8mm-legacy-5.4_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.4_defconfig
@@ -109,6 +109,7 @@ BR2_PACKAGE_LIBGPIOD_TOOLS=y
BR2_PACKAGE_LIBV4L=y
BR2_PACKAGE_LIBV4L_UTILS=y
BR2_PACKAGE_TSLIB=y
+BR2_PACKAGE_LIBTIRPC=y
BR2_PACKAGE_BLUEZ_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-04-21 10:46: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 60a8947d8966dff69bcf8c0871f507b5a45ef14d (commit)
via d653557a6cce93878f02a0aafc01ec8c8d43ba08 (commit)
from 77744c972813c353eb9e972032b9602382cbc8b3 (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 60a8947d8966dff69bcf8c0871f507b5a45ef14d
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Apr 21 12:43:38 2022 +0200
[BUILDROOT] 2022.02: add custom patches to ATF
commit d653557a6cce93878f02a0aafc01ec8c8d43ba08
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Apr 14 10:33:17 2022 +0200
[BUILDROOT] Bump BR to 2022.02.1
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
.../004-armadeus-add-custom-patches-to-atf.patch | 53 +++++++++++++
...e-libzlib-security-bump-version-to-1.2.12.patch | 89 ----------------------
patches/buildroot/2022.02/cleanup_buildroot.sh | 5 +-
4 files changed, 56 insertions(+), 93 deletions(-)
create mode 100644 patches/buildroot/2022.02/004-armadeus-add-custom-patches-to-atf.patch
delete mode 100644 patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch
diff --git a/Makefile b/Makefile
index 378ae1324..95730eeb6 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2022.02
-BUILDROOT_MINOR_VERSION ?=
+BUILDROOT_MINOR_VERSION ?= 1
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/patches/buildroot/2022.02/004-armadeus-add-custom-patches-to-atf.patch b/patches/buildroot/2022.02/004-armadeus-add-custom-patches-to-atf.patch
new file mode 100644
index 000000000..1025cc137
--- /dev/null
+++ b/patches/buildroot/2022.02/004-armadeus-add-custom-patches-to-atf.patch
@@ -0,0 +1,53 @@
+Add custom patches to ATF
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+Index: buildroot/boot/arm-trusted-firmware/Config.in
+===================================================================
+--- buildroot.orig/boot/arm-trusted-firmware/Config.in
++++ buildroot/boot/arm-trusted-firmware/Config.in
+@@ -63,6 +63,16 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_C
+
+ endif
+
++config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH
++ string "Custom ARM Trusted Firmware (ATF) patches"
++ help
++ A space-separated list of patches to apply to ATF.
++ Each patch can be described as an URL, a local file path,
++ or a directory. In the case of a directory, all files
++ matching *.patch in the directory will be applied.
++
++ Most users may leave this empty
++
+ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM
+ string "ATF platform"
+ help
+Index: buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+===================================================================
+--- buildroot.orig/boot/arm-trusted-firmware/arm-trusted-firmware.mk
++++ buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+@@ -39,6 +39,24 @@ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_
+ ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-arm-gnu-a-toolchain
+ endif
+
++# Analogous code exists in linux/linux.mk. Basically, the generic
++# package infrastructure handles downloading and applying remote
++# patches. Local patches are handled depending on whether they are
++# directories or files.
++ARM_TRUSTED_FIRMWARE_PATCHES = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PATCH))
++ARM_TRUSTED_FIRMWARE_PATCH = $(filter ftp://% http://% https://%,$(ARM_TRUSTED_FIRMWARE_PATCHES))
++
++define ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES
++ for p in $(filter-out ftp://% http://% https://%,$(ARM_TRUSTED_FIRMWARE_PATCHES)) ; do \
++ if test -d $$p ; then \
++ $(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \
++ else \
++ $(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || exit 1; \
++ fi \
++ done
++endef
++ARM_TRUSTED_FIRMWARE_POST_PATCH_HOOKS += ARM_TRUSTED_FIRMWARE_APPLY_LOCAL_PATCHES
++
+ ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM))
+
+ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y)
diff --git a/patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch b/patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch
deleted file mode 100644
index a12bd0997..000000000
--- a/patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 0612a2231fa3b7de6356afd22436892d9d620461 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <ber...@t-...>
-Date: Wed, 30 Mar 2022 20:06:05 +0200
-Subject: [PATCH 1/1] package/libzlib: security bump version to 1.2.12
-
-Fixes CVE-2018-25032.
-
-Release notes:
-http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html
-
-Changelog: https://github.com/madler/zlib/blob/master/ChangeLog
-
-Added upstream patch to fix build error.
-
-Updated license hash due to version bump, reformatted hashes:
-https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389
-
-Signed-off-by: Bernd Kuhls <ber...@t-...>
-Signed-off-by: Peter Korsgaard <pe...@ko...>
-(cherry picked from commit a7fa40a9c1e93c063bbc5c5d4cac0c67493087a7)
-Signed-off-by: Peter Korsgaard <pe...@ko...>
----
- ...hat-discarded-provided-CC-definition.patch | 28 +++++++++++++++++++
- package/libzlib/libzlib.hash | 4 +--
- package/libzlib/libzlib.mk | 2 +-
- 3 files changed, 31 insertions(+), 3 deletions(-)
- create mode 100644 package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
-
-diff --git a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
-new file mode 100644
-index 0000000000..398e1c9481
---- /dev/null
-+++ b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
-@@ -0,0 +1,28 @@
-+From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
-+From: Mark Adler <ma...@al...>
-+Date: Mon, 28 Mar 2022 18:34:10 -0700
-+Subject: [PATCH] Fix configure issue that discarded provided CC definition.
-+
-+Downloaded from upstream commit:
-+https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d
-+
-+Signed-off-by: Bernd Kuhls <ber...@t-...>
-+---
-+ configure | 3 +++
-+ 1 file changed, 3 insertions(+)
-+
-+diff --git a/configure b/configure
-+index 52ff4a04e..3fa3e8618 100755
-+--- a/configure
-++++ b/configure
-+@@ -174,7 +174,10 @@ if test -z "$CC"; then
-+ else
-+ cc=${CROSS_PREFIX}cc
-+ fi
-++else
-++ cc=${CC}
-+ fi
-++
-+ cflags=${CFLAGS-"-O3"}
-+ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
-+ case "$cc" in
-diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash
-index e3736b1011..e6ca974e2f 100644
---- a/package/libzlib/libzlib.hash
-+++ b/package/libzlib/libzlib.hash
-@@ -1,4 +1,4 @@
- # From http://www.zlib.net/
--sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz
-+sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz
- # License files, locally calculated
--sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README
-+sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README
-diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk
-index a10fc748d1..933732d6ba 100644
---- a/package/libzlib/libzlib.mk
-+++ b/package/libzlib/libzlib.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
-
--LIBZLIB_VERSION = 1.2.11
-+LIBZLIB_VERSION = 1.2.12
- LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz
- LIBZLIB_SITE = http://www.zlib.net
- LIBZLIB_LICENSE = Zlib
---
-2.34.1
-
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index d276a19f0..e8ad29e66 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -11,6 +11,8 @@
rm -rf buildroot/Makefile
rm -rf buildroot/arch/Config.in.arm
+rm -rf buildroot/boot/arm-trusted-firmware/Config.in
+rm -rf buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/package/Config.in
@@ -43,9 +45,6 @@ rm -rf buildroot/package/libimxvpuapi2/Config.in
rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.hash
rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.mk
rm -rf buildroot/package/libopenssl/libopenssl.mk
-rm -rf buildroot/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
-rm -rf buildroot/package/libzlib/libzlib.hash
-rm -rf buildroot/package/libzlib/libzlib.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
rm -rf buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-04-04 17:41:22
|
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 77744c972813c353eb9e972032b9602382cbc8b3 (commit)
from 2113fe03030a1ff28f8df24a34645fc0a65aee78 (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 77744c972813c353eb9e972032b9602382cbc8b3
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Apr 4 19:38:11 2022 +0200
[BUILDROOT] 2022.02: patch to fix libzlib downloading
Bump libzlib version to 1.2.12
-----------------------------------------------------------------------
Summary of changes:
...e-libzlib-security-bump-version-to-1.2.12.patch | 89 ++++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 3 +
2 files changed, 92 insertions(+)
create mode 100644 patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch
diff --git a/patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch b/patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch
new file mode 100644
index 000000000..a12bd0997
--- /dev/null
+++ b/patches/buildroot/2022.02/415-package-libzlib-security-bump-version-to-1.2.12.patch
@@ -0,0 +1,89 @@
+From 0612a2231fa3b7de6356afd22436892d9d620461 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <ber...@t-...>
+Date: Wed, 30 Mar 2022 20:06:05 +0200
+Subject: [PATCH 1/1] package/libzlib: security bump version to 1.2.12
+
+Fixes CVE-2018-25032.
+
+Release notes:
+http://madler.net/pipermail/zlib-announce_madler.net/2022/000012.html
+
+Changelog: https://github.com/madler/zlib/blob/master/ChangeLog
+
+Added upstream patch to fix build error.
+
+Updated license hash due to version bump, reformatted hashes:
+https://github.com/madler/zlib/commit/21767c654d31d2dccdde4330529775c6c5fd5389
+
+Signed-off-by: Bernd Kuhls <ber...@t-...>
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+(cherry picked from commit a7fa40a9c1e93c063bbc5c5d4cac0c67493087a7)
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+---
+ ...hat-discarded-provided-CC-definition.patch | 28 +++++++++++++++++++
+ package/libzlib/libzlib.hash | 4 +--
+ package/libzlib/libzlib.mk | 2 +-
+ 3 files changed, 31 insertions(+), 3 deletions(-)
+ create mode 100644 package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
+
+diff --git a/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
+new file mode 100644
+index 0000000000..398e1c9481
+--- /dev/null
++++ b/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
+@@ -0,0 +1,28 @@
++From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
++From: Mark Adler <ma...@al...>
++Date: Mon, 28 Mar 2022 18:34:10 -0700
++Subject: [PATCH] Fix configure issue that discarded provided CC definition.
++
++Downloaded from upstream commit:
++https://github.com/madler/zlib/commit/05796d3d8d5546cf1b4dfe2cd72ab746afae505d
++
++Signed-off-by: Bernd Kuhls <ber...@t-...>
++---
++ configure | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/configure b/configure
++index 52ff4a04e..3fa3e8618 100755
++--- a/configure
+++++ b/configure
++@@ -174,7 +174,10 @@ if test -z "$CC"; then
++ else
++ cc=${CROSS_PREFIX}cc
++ fi
+++else
+++ cc=${CC}
++ fi
+++
++ cflags=${CFLAGS-"-O3"}
++ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
++ case "$cc" in
+diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash
+index e3736b1011..e6ca974e2f 100644
+--- a/package/libzlib/libzlib.hash
++++ b/package/libzlib/libzlib.hash
+@@ -1,4 +1,4 @@
+ # From http://www.zlib.net/
+-sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz
++sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 zlib-1.2.12.tar.xz
+ # License files, locally calculated
+-sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README
++sha256 fc2c3368901700f0acdeb1d8afeaca5923296768ec6824ecdf627aac396001fd README
+diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk
+index a10fc748d1..933732d6ba 100644
+--- a/package/libzlib/libzlib.mk
++++ b/package/libzlib/libzlib.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-LIBZLIB_VERSION = 1.2.11
++LIBZLIB_VERSION = 1.2.12
+ LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz
+ LIBZLIB_SITE = http://www.zlib.net
+ LIBZLIB_LICENSE = Zlib
+--
+2.34.1
+
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index 6d2ce4ddd..d276a19f0 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -43,6 +43,9 @@ rm -rf buildroot/package/libimxvpuapi2/Config.in
rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.hash
rm -rf buildroot/package/libimxvpuapi2/libimxvpuapi2.mk
rm -rf buildroot/package/libopenssl/libopenssl.mk
+rm -rf buildroot/package/libzlib/0001-Fix-configure-issue-that-discarded-provided-CC-definition.patch
+rm -rf buildroot/package/libzlib/libzlib.hash
+rm -rf buildroot/package/libzlib/libzlib.mk
rm -rf buildroot/package/lmic-pi/Config.in
rm -rf buildroot/package/lmic-pi/lmic-pi.mk
rm -rf buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2022-03-31 21:57: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 2113fe03030a1ff28f8df24a34645fc0a65aee78 (commit)
from 404916f56e58880dacdc3f929172c8f87ac6ff89 (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 2113fe03030a1ff28f8df24a34645fc0a65aee78
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Mar 31 23:56:42 2022 +0200
[BUILDROOT] 2021.02/2022.02: add option for external toolchain to install ldconfig in target rootfs and use it at 1rst boot.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 1 +
buildroot/configs/apf6failsafe_defconfig | 1 +
buildroot/configs/apf6mainline-4.9_defconfig | 1 +
buildroot/configs/apf6mediacenter_defconfig | 1 +
buildroot/configs/apf6test_defconfig | 1 +
buildroot/configs/opos6ul_defconfig | 1 +
buildroot/configs/opos6ul_legacy_defconfig | 1 +
buildroot/configs/opos6ul_recovery_defconfig | 1 +
buildroot/configs/opos6ulnano-preempt-rt_defconfig | 1 +
buildroot/configs/opos6ulnano_defconfig | 1 +
buildroot/configs/opos6ulsp_defconfig | 1 +
buildroot/configs/opos6ultest_defconfig | 1 +
buildroot/configs/opos8mm-legacy-5.4_defconfig | 1 +
.../rootfs/target_overlay/etc/init.d/S11firstboot | 6 +++
...madeus-add-ldconfig-target-install-option.patch | 51 ++++++++++++++++++++++
patches/buildroot/2021.02/cleanup_buildroot.sh | 2 +
...madeus-add-ldconfig-target-install-option.patch | 51 ++++++++++++++++++++++
patches/buildroot/2022.02/cleanup_buildroot.sh | 2 +
18 files changed, 125 insertions(+)
create mode 100644 patches/buildroot/2021.02/047-armadeus-add-ldconfig-target-install-option.patch
create mode 100644 patches/buildroot/2022.02/047-armadeus-add-ldconfig-target-install-option.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 87bba9a19..6a2e5beb7 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -8,6 +8,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y
+BR2_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
diff --git a/buildroot/configs/apf6failsafe_defconfig b/buildroot/configs/apf6failsafe_defconfig
index 852f91b03..6bd9d62a1 100644
--- a/buildroot/configs/apf6failsafe_defconfig
+++ b/buildroot/configs/apf6failsafe_defconfig
@@ -7,6 +7,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to APF6 rescue/failsafe system !"
diff --git a/buildroot/configs/apf6mainline-4.9_defconfig b/buildroot/configs/apf6mainline-4.9_defconfig
index 27e38d107..9134002cf 100644
--- a/buildroot/configs/apf6mainline-4.9_defconfig
+++ b/buildroot/configs/apf6mainline-4.9_defconfig
@@ -8,6 +8,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
+BR2_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
diff --git a/buildroot/configs/apf6mediacenter_defconfig b/buildroot/configs/apf6mediacenter_defconfig
index 2818fffe5..f46e5c7da 100644
--- a/buildroot/configs/apf6mediacenter_defconfig
+++ b/buildroot/configs/apf6mediacenter_defconfig
@@ -7,6 +7,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
diff --git a/buildroot/configs/apf6test_defconfig b/buildroot/configs/apf6test_defconfig
index 428d8ab75..4517907de 100644
--- a/buildroot/configs/apf6test_defconfig
+++ b/buildroot/configs/apf6test_defconfig
@@ -7,6 +7,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index 346542091..483a17124 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -6,6 +6,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_TARGET_GENERIC_HOSTNAME="opos6ul"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
diff --git a/buildroot/configs/opos6ul_legacy_defconfig b/buildroot/configs/opos6ul_legacy_defconfig
index 300436135..50ca58ef3 100644
--- a/buildroot/configs/opos6ul_legacy_defconfig
+++ b/buildroot/configs/opos6ul_legacy_defconfig
@@ -6,6 +6,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_TARGET_GENERIC_HOSTNAME="opos6ul"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
diff --git a/buildroot/configs/opos6ul_recovery_defconfig b/buildroot/configs/opos6ul_recovery_defconfig
index c5afc9488..1beaf329f 100644
--- a/buildroot/configs/opos6ul_recovery_defconfig
+++ b/buildroot/configs/opos6ul_recovery_defconfig
@@ -6,6 +6,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_TARGET_GENERIC_HOSTNAME="opos6ul"
BR2_TARGET_GENERIC_ISSUE="Welcome to OPOS6UL rescue/failsafe system !"
diff --git a/buildroot/configs/opos6ulnano-preempt-rt_defconfig b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
index dd56845e8..510da0654 100644
--- a/buildroot/configs/opos6ulnano-preempt-rt_defconfig
+++ b/buildroot/configs/opos6ulnano-preempt-rt_defconfig
@@ -6,6 +6,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_TARGET_GENERIC_HOSTNAME="opos6ulnano"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index cb7bb0ccc..d3237588b 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -6,6 +6,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_TARGET_GENERIC_HOSTNAME="opos6ulnano"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 1abd1315b..9d704813f 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -6,6 +6,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_TARGET_GENERIC_HOSTNAME="opos6ulsp"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
diff --git a/buildroot/configs/opos6ultest_defconfig b/buildroot/configs/opos6ultest_defconfig
index 1d0c6401b..17aaa0281 100644
--- a/buildroot/configs/opos6ultest_defconfig
+++ b/buildroot/configs/opos6ultest_defconfig
@@ -6,6 +6,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_TARGET_GENERIC_HOSTNAME="opos6ul"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
diff --git a/buildroot/configs/opos8mm-legacy-5.4_defconfig b/buildroot/configs/opos8mm-legacy-5.4_defconfig
index f16ff9fe9..8ea718a6b 100644
--- a/buildroot/configs/opos8mm-legacy-5.4_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.4_defconfig
@@ -4,6 +4,7 @@ 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_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY=y
BR2_TARGET_GENERIC_HOSTNAME="opos8mm"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
diff --git a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot
index 88cbd653b..543c91e86 100755
--- a/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot
+++ b/buildroot/target/device/armadeus/rootfs/target_overlay/etc/init.d/S11firstboot
@@ -39,6 +39,12 @@ start()
cp /etc/fw_env_${machine}.config /etc/fw_env.config
fi
+ # Run ldconfig (if present) to speed up executables launch
+ if [ -x /sbin/ldconfig ]; then
+ echo "Running ldconfig"
+ /sbin/ldconfig
+ fi
+
rm $FIRST_BOOT
fi
return 0
diff --git a/patches/buildroot/2021.02/047-armadeus-add-ldconfig-target-install-option.patch b/patches/buildroot/2021.02/047-armadeus-add-ldconfig-target-install-option.patch
new file mode 100644
index 000000000..f5f36d752
--- /dev/null
+++ b/patches/buildroot/2021.02/047-armadeus-add-ldconfig-target-install-option.patch
@@ -0,0 +1,51 @@
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/toolchain/toolchain-external/Config.in
+===================================================================
+--- buildroot.orig/toolchain/toolchain-external/Config.in
++++ buildroot/toolchain/toolchain-external/Config.in
+@@ -162,4 +162,11 @@ config BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER
+ Copy the gdbserver provided by the external toolchain to the
+ target.
+
++config BR2_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY
++ bool "Copy ldconfig to the Target"
++ depends on BR2_TOOLCHAIN_EXTERNAL
++ help
++ Copy the ldconfig provided by the external toolchain to the
++ target. (May add some Mbytes to your rootfs).
++
+ endif # BR2_TOOLCHAIN_EXTERNAL
+Index: buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
+===================================================================
+--- buildroot.orig/toolchain/toolchain-external/pkg-toolchain-external.mk
++++ buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
+@@ -430,6 +430,19 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET
+ endef
+ endif
+
++ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY),y)
++define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDCONFIG
++ $(Q)$(call MESSAGE,"Copying ldconfig")
++ $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
++ if test -f $${ARCH_SYSROOT_DIR}/sbin/ldconfig ; then \
++ install -m 0755 -D $${ARCH_SYSROOT_DIR}/sbin/ldconfig $(TARGET_DIR)/sbin/ldconfig ; \
++ else \
++ echo "Could not find ldconfig in external toolchain" ; \
++ exit 1 ; \
++ fi
++endef
++endif
++
+ define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS
+ $(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \
+ ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
+@@ -600,6 +613,7 @@ define $(2)_INSTALL_TARGET_CMDS
+ $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER)
+ $$(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO)
+ $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDD)
++ $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDCONFIG)
+ endef
+
+ # Call the generic package infrastructure to generate the necessary
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index ac538bc6e..2bc27423c 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -159,3 +159,5 @@ 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/system/Config.in
+rm -rf buildroot/toolchain/toolchain-external/Config.in
+rm -rf buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
diff --git a/patches/buildroot/2022.02/047-armadeus-add-ldconfig-target-install-option.patch b/patches/buildroot/2022.02/047-armadeus-add-ldconfig-target-install-option.patch
new file mode 100644
index 000000000..5d072c4d8
--- /dev/null
+++ b/patches/buildroot/2022.02/047-armadeus-add-ldconfig-target-install-option.patch
@@ -0,0 +1,51 @@
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/toolchain/toolchain-external/Config.in
+===================================================================
+--- buildroot.orig/toolchain/toolchain-external/Config.in
++++ buildroot/toolchain/toolchain-external/Config.in
+@@ -162,4 +162,11 @@ config BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER
+ Copy the gdbserver provided by the external toolchain to the
+ target.
+
++config BR2_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY
++ bool "Copy ldconfig to the Target"
++ depends on BR2_TOOLCHAIN_EXTERNAL
++ help
++ Copy the ldconfig provided by the external toolchain to the
++ target. (May add some Mbytes to your rootfs).
++
+ endif # BR2_TOOLCHAIN_EXTERNAL
+Index: buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
+===================================================================
+--- buildroot.orig/toolchain/toolchain-external/pkg-toolchain-external.mk
++++ buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
+@@ -430,6 +430,19 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET
+ endef
+ endif
+
++ifeq ($(BR2_TOOLCHAIN_EXTERNAL_LDCONFIG_COPY),y)
++define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDCONFIG
++ $(Q)$(call MESSAGE,"Copying ldconfig")
++ $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
++ if test -f $${ARCH_SYSROOT_DIR}/sbin/ldconfig ; then \
++ install -m 0755 -D $${ARCH_SYSROOT_DIR}/sbin/ldconfig $(TARGET_DIR)/sbin/ldconfig ; \
++ else \
++ echo "Could not find ldconfig in external toolchain" ; \
++ exit 1 ; \
++ fi
++endef
++endif
++
+ define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS
+ $(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \
+ ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
+@@ -621,6 +634,7 @@ define $(2)_INSTALL_TARGET_CMDS
+ $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER)
+ $$(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO)
+ $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDD)
++ $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDCONFIG)
+ endef
+
+ # Call the generic package infrastructure to generate the necessary
diff --git a/patches/buildroot/2022.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
index 0f4d0556b..6d2ce4ddd 100755
--- a/patches/buildroot/2022.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -86,3 +86,5 @@ 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/system/Config.in
+rm -rf buildroot/toolchain/toolchain-external/Config.in
+rm -rf buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-03-09 16:24:31
|
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 404916f56e58880dacdc3f929172c8f87ac6ff89 (commit)
from e8bbe8f46c14feee059ac9c702a37e8e1d6847ac (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 404916f56e58880dacdc3f929172c8f87ac6ff89
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Mar 9 17:22:09 2022 +0100
[BUILDROOT] Bump BR to 2022.02
-----------------------------------------------------------------------
Summary of changes:
Makefile | 8 +--
buildroot/configs/apf27_defconfig | 4 +-
buildroot/configs/apf51_defconfig | 1 +
buildroot/configs/opos6ul_defconfig | 1 -
buildroot/configs/opos6ulnano_defconfig | 13 ++--
buildroot/configs/opos6ulsp_defconfig | 1 -
buildroot/configs/opos8mm-legacy-5.10_defconfig | 1 +
...bc-ng-1.0.22.config => uClibc-ng-1.0.40.config} | 1 +
buildroot/target/device/armadeus/uClibc-ng.config | 2 +-
.../001-add_armadeus_device.patch | 0
.../002-add_armadeus_specific_packages.patch | 0
...point-to-armadeus-in-out-of-tree-makefile.patch | 0
...us-gpsd-add-options-setting-in-menuconfig.patch | 0
.../009-armadeus-xc3sprog-new-package.patch | 0
.../010-armadeus-sam7-pgm-ng-new-package.patch | 0
.../018-armadeus-add-pcidebug-package.patch | 0
.../019-armadeus-add-cmux-package.patch | 0
.../025-armadeus-apf-config-add-package.patch | 0
.../029-armadeus-lora-forwarder-add-package.patch | 0
.../030-armadeus-lmic-pi-add-package.patch | 0
.../031-armadeus-lepton-add-package.patch | 0
.../031-armadeus-lepton-fix-makefile.patch | 0
...armadeus-fixes-uclibc-build-with-ucontext.patch | 0
...9-armadeus-add-sd8977-driver-and-firmware.patch | 0
...040-armadeus-add-thingerio-client-package.patch | 0
...madeus-expect-forces-unbuffer-instalation.patch | 0
.../045-armadeus-add-pwm-music-package.patch | 0
...add_support_for_custom_configuration_file.patch | 0
.../081-adds_quake_package.patch | 0
.../118-armadeus-snes9x-add-package.patch | 8 +--
.../121-target-arm926t_is_arm926ej-s.patch | 0
.../123-armadeus-pywebradio-add-package.patch | 0
.../124-e-uae-add_package.patch | 0
.../188-marble-add_package.patch | 14 ++---
.../201-armadeus-add_gnokii.patch | 0
.../204-wpa-supplicant-add-option-ieee80211w.patch | 0
...x-coreutils-stty-add-rs485-config-options.patch | 0
.../209-armadeus-add_matiec.patch | 0
.../237-armadeus-busybox-speed-up-mdev.patch | 0
.../341-python-flask-socketio-new-package.patch | 0
.../412-package-libimxdmabuffer-new-package.patch | 0
.../413-package-libimxvpuapi2-new-package.patch | 0
...-package-gstreamer1-gst1-imx2-new-package.patch | 0
.../{2021.02 => 2022.02}/cleanup_buildroot.sh | 73 ----------------------
44 files changed, 24 insertions(+), 103 deletions(-)
copy buildroot/target/device/armadeus/{uClibc-ng-1.0.22.config => uClibc-ng-1.0.40.config} (98%)
copy patches/buildroot/{2015.02 => 2022.02}/001-add_armadeus_device.patch (100%)
copy patches/buildroot/{2015.02 => 2022.02}/002-add_armadeus_specific_packages.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch (100%)
copy patches/buildroot/{2015.02 => 2022.02}/009-armadeus-xc3sprog-new-package.patch (100%)
copy patches/buildroot/{2015.02 => 2022.02}/010-armadeus-sam7-pgm-ng-new-package.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/018-armadeus-add-pcidebug-package.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/019-armadeus-add-cmux-package.patch (100%)
copy patches/buildroot/{2021.02 => 2022.02}/025-armadeus-apf-config-add-package.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/029-armadeus-lora-forwarder-add-package.patch (100%)
copy patches/buildroot/{2021.02 => 2022.02}/030-armadeus-lmic-pi-add-package.patch (100%)
copy patches/buildroot/{2021.02 => 2022.02}/031-armadeus-lepton-add-package.patch (100%)
copy patches/buildroot/{2017.02 => 2022.02}/031-armadeus-lepton-fix-makefile.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/035-armadeus-fixes-uclibc-build-with-ucontext.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/039-armadeus-add-sd8977-driver-and-firmware.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/040-armadeus-add-thingerio-client-package.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/044-armadeus-expect-forces-unbuffer-instalation.patch (100%)
copy patches/buildroot/{2021.02 => 2022.02}/045-armadeus-add-pwm-music-package.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/050-U-Boot-add_support_for_custom_configuration_file.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/081-adds_quake_package.patch (100%)
copy patches/buildroot/{2016.02 => 2022.02}/118-armadeus-snes9x-add-package.patch (98%)
copy patches/buildroot/{2015.02 => 2022.02}/121-target-arm926t_is_arm926ej-s.patch (100%)
copy patches/buildroot/{2021.02 => 2022.02}/123-armadeus-pywebradio-add-package.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/124-e-uae-add_package.patch (100%)
copy patches/buildroot/{2016.08 => 2022.02}/188-marble-add_package.patch (97%)
copy patches/buildroot/{2019.02 => 2022.02}/201-armadeus-add_gnokii.patch (100%)
copy patches/buildroot/{2015.02 => 2022.02}/204-wpa-supplicant-add-option-ieee80211w.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/205-busybox-coreutils-stty-add-rs485-config-options.patch (100%)
copy patches/buildroot/{2015.02 => 2022.02}/209-armadeus-add_matiec.patch (100%)
copy patches/buildroot/{2020.02 => 2022.02}/237-armadeus-busybox-speed-up-mdev.patch (100%)
copy patches/buildroot/{2019.02 => 2022.02}/341-python-flask-socketio-new-package.patch (100%)
copy patches/buildroot/{2021.02 => 2022.02}/412-package-libimxdmabuffer-new-package.patch (100%)
copy patches/buildroot/{2021.02 => 2022.02}/413-package-libimxvpuapi2-new-package.patch (100%)
copy patches/buildroot/{2021.02 => 2022.02}/414-package-gstreamer1-gst1-imx2-new-package.patch (100%)
copy patches/buildroot/{2021.02 => 2022.02}/cleanup_buildroot.sh (50%)
diff --git a/Makefile b/Makefile
index f357a5548..378ae1324 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-BUILDROOT_MAJOR_VERSION ?= 2021.02
-BUILDROOT_MINOR_VERSION ?= 10
+BUILDROOT_MAJOR_VERSION ?= 2022.02
+BUILDROOT_MINOR_VERSION ?=
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
@@ -39,7 +39,7 @@ BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_MAJOR_VERS
ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
-BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
+BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.xz
#BUILDROOT_DIR is defined in ./Makefile.in
PATCH_DIR = patches
BUILDROOT_FILE_PATH = $(ARMADEUS_TOPDIR)/downloads
@@ -136,7 +136,7 @@ buildroot-sources: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE)
$(BUILDROOT_DIR)/.unpacked: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) $(BUILDROOT_PATCH_DIR)/*.patch
$(BUILDROOT_PATCH_DIR)/cleanup_buildroot.sh
rm -f $(BUILDROOT_DIR)/.applied_patches_list
- bzcat $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) | \
+ xzcat $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) | \
tar -C $(BUILDROOT_DIR) $(TAR_OPTIONS) -
touch $@
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index cfb274eda..e1ad9bf4b 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -4,9 +4,7 @@ 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_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.19.8"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_PTHREAD_DEBUG=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 756d4aeac..ab082189e 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -5,6 +5,7 @@ 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_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-ng.config"
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_PTHREAD_DEBUG=y
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index d7cb98ca3..346542091 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -101,7 +101,6 @@ BR2_PACKAGE_PYTHON_DATEUTIL=y
BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_PAHO_MQTT=y
-BR2_PACKAGE_PYTHON_PYCLI=y
BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT=y
BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index d0a8d3d08..cb7bb0ccc 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -49,17 +49,16 @@ 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
BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_ASCII_INVADERS=y
+BR2_PACKAGE_FB_TEST_APP=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
@@ -68,6 +67,7 @@ BR2_PACKAGE_MURATA_CYW_FW_CYW43430=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
@@ -77,16 +77,11 @@ 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_PYTHON3_PYEXPAT=y
-BR2_PACKAGE_PYTHON3_ZLIB=y
BR2_PACKAGE_PYTHON_CAN=y
BR2_PACKAGE_PYTHON_DATEUTIL=y
BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_PAHO_MQTT=y
-BR2_PACKAGE_PYTHON_PYCLI=y
BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT=y
BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
@@ -103,7 +98,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
@@ -149,3 +143,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/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index dedf8fc71..1abd1315b 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -82,7 +82,6 @@ BR2_PACKAGE_PYTHON_DATEUTIL=y
BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_NUMPY=y
BR2_PACKAGE_PYTHON_PAHO_MQTT=y
-BR2_PACKAGE_PYTHON_PYCLI=y
BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT=y
BR2_PACKAGE_PYTHON_SERIAL=y
BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
diff --git a/buildroot/configs/opos8mm-legacy-5.10_defconfig b/buildroot/configs/opos8mm-legacy-5.10_defconfig
index fb2b3850a..c18a46d64 100644
--- a/buildroot/configs/opos8mm-legacy-5.10_defconfig
+++ b/buildroot/configs/opos8mm-legacy-5.10_defconfig
@@ -4,6 +4,7 @@ BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="opos8mm"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
diff --git a/buildroot/target/device/armadeus/uClibc-ng-1.0.22.config b/buildroot/target/device/armadeus/uClibc-ng-1.0.40.config
similarity index 98%
copy from buildroot/target/device/armadeus/uClibc-ng-1.0.22.config
copy to buildroot/target/device/armadeus/uClibc-ng-1.0.40.config
index f85f304bd..a56225c4c 100644
--- a/buildroot/target/device/armadeus/uClibc-ng-1.0.22.config
+++ b/buildroot/target/device/armadeus/uClibc-ng-1.0.40.config
@@ -31,6 +31,7 @@ UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
UCLIBC_HAS_PRINTF_M_SPEC=y
UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_NFTW=y
UCLIBC_HAS_FTW=y
UCLIBC_HAS_GNU_GLOB=y
RUNTIME_PREFIX="/"
diff --git a/buildroot/target/device/armadeus/uClibc-ng.config b/buildroot/target/device/armadeus/uClibc-ng.config
index 57bfdf3be..aac788352 120000
--- a/buildroot/target/device/armadeus/uClibc-ng.config
+++ b/buildroot/target/device/armadeus/uClibc-ng.config
@@ -1 +1 @@
-uClibc-ng-1.0.22.config
\ No newline at end of file
+uClibc-ng-1.0.40.config
\ No newline at end of file
diff --git a/patches/buildroot/2015.02/001-add_armadeus_device.patch b/patches/buildroot/2022.02/001-add_armadeus_device.patch
similarity index 100%
copy from patches/buildroot/2015.02/001-add_armadeus_device.patch
copy to patches/buildroot/2022.02/001-add_armadeus_device.patch
diff --git a/patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch b/patches/buildroot/2022.02/002-add_armadeus_specific_packages.patch
similarity index 100%
copy from patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch
copy to patches/buildroot/2022.02/002-add_armadeus_specific_packages.patch
diff --git a/patches/buildroot/2019.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch b/patches/buildroot/2022.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch
similarity index 100%
copy from patches/buildroot/2019.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch
copy to patches/buildroot/2022.02/003-armadeus-point-to-armadeus-in-out-of-tree-makefile.patch
diff --git a/patches/buildroot/2019.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch b/patches/buildroot/2022.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
similarity index 100%
copy from patches/buildroot/2019.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
copy to patches/buildroot/2022.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
diff --git a/patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch b/patches/buildroot/2022.02/009-armadeus-xc3sprog-new-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch
copy to patches/buildroot/2022.02/009-armadeus-xc3sprog-new-package.patch
diff --git a/patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch b/patches/buildroot/2022.02/010-armadeus-sam7-pgm-ng-new-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch
copy to patches/buildroot/2022.02/010-armadeus-sam7-pgm-ng-new-package.patch
diff --git a/patches/buildroot/2019.02/018-armadeus-add-pcidebug-package.patch b/patches/buildroot/2022.02/018-armadeus-add-pcidebug-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/018-armadeus-add-pcidebug-package.patch
copy to patches/buildroot/2022.02/018-armadeus-add-pcidebug-package.patch
diff --git a/patches/buildroot/2019.02/019-armadeus-add-cmux-package.patch b/patches/buildroot/2022.02/019-armadeus-add-cmux-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/019-armadeus-add-cmux-package.patch
copy to patches/buildroot/2022.02/019-armadeus-add-cmux-package.patch
diff --git a/patches/buildroot/2021.02/025-armadeus-apf-config-add-package.patch b/patches/buildroot/2022.02/025-armadeus-apf-config-add-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/025-armadeus-apf-config-add-package.patch
copy to patches/buildroot/2022.02/025-armadeus-apf-config-add-package.patch
diff --git a/patches/buildroot/2019.02/029-armadeus-lora-forwarder-add-package.patch b/patches/buildroot/2022.02/029-armadeus-lora-forwarder-add-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/029-armadeus-lora-forwarder-add-package.patch
copy to patches/buildroot/2022.02/029-armadeus-lora-forwarder-add-package.patch
diff --git a/patches/buildroot/2021.02/030-armadeus-lmic-pi-add-package.patch b/patches/buildroot/2022.02/030-armadeus-lmic-pi-add-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/030-armadeus-lmic-pi-add-package.patch
copy to patches/buildroot/2022.02/030-armadeus-lmic-pi-add-package.patch
diff --git a/patches/buildroot/2021.02/031-armadeus-lepton-add-package.patch b/patches/buildroot/2022.02/031-armadeus-lepton-add-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/031-armadeus-lepton-add-package.patch
copy to patches/buildroot/2022.02/031-armadeus-lepton-add-package.patch
diff --git a/patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch b/patches/buildroot/2022.02/031-armadeus-lepton-fix-makefile.patch
similarity index 100%
copy from patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch
copy to patches/buildroot/2022.02/031-armadeus-lepton-fix-makefile.patch
diff --git a/patches/buildroot/2019.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch b/patches/buildroot/2022.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch
similarity index 100%
copy from patches/buildroot/2019.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch
copy to patches/buildroot/2022.02/035-armadeus-fixes-uclibc-build-with-ucontext.patch
diff --git a/patches/buildroot/2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch b/patches/buildroot/2022.02/039-armadeus-add-sd8977-driver-and-firmware.patch
similarity index 100%
copy from patches/buildroot/2019.02/039-armadeus-add-sd8977-driver-and-firmware.patch
copy to patches/buildroot/2022.02/039-armadeus-add-sd8977-driver-and-firmware.patch
diff --git a/patches/buildroot/2019.02/040-armadeus-add-thingerio-client-package.patch b/patches/buildroot/2022.02/040-armadeus-add-thingerio-client-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/040-armadeus-add-thingerio-client-package.patch
copy to patches/buildroot/2022.02/040-armadeus-add-thingerio-client-package.patch
diff --git a/patches/buildroot/2019.02/044-armadeus-expect-forces-unbuffer-instalation.patch b/patches/buildroot/2022.02/044-armadeus-expect-forces-unbuffer-instalation.patch
similarity index 100%
copy from patches/buildroot/2019.02/044-armadeus-expect-forces-unbuffer-instalation.patch
copy to patches/buildroot/2022.02/044-armadeus-expect-forces-unbuffer-instalation.patch
diff --git a/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch b/patches/buildroot/2022.02/045-armadeus-add-pwm-music-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
copy to patches/buildroot/2022.02/045-armadeus-add-pwm-music-package.patch
diff --git a/patches/buildroot/2019.02/050-U-Boot-add_support_for_custom_configuration_file.patch b/patches/buildroot/2022.02/050-U-Boot-add_support_for_custom_configuration_file.patch
similarity index 100%
copy from patches/buildroot/2019.02/050-U-Boot-add_support_for_custom_configuration_file.patch
copy to patches/buildroot/2022.02/050-U-Boot-add_support_for_custom_configuration_file.patch
diff --git a/patches/buildroot/2019.02/081-adds_quake_package.patch b/patches/buildroot/2022.02/081-adds_quake_package.patch
similarity index 100%
copy from patches/buildroot/2019.02/081-adds_quake_package.patch
copy to patches/buildroot/2022.02/081-adds_quake_package.patch
diff --git a/patches/buildroot/2016.02/118-armadeus-snes9x-add-package.patch b/patches/buildroot/2022.02/118-armadeus-snes9x-add-package.patch
similarity index 98%
copy from patches/buildroot/2016.02/118-armadeus-snes9x-add-package.patch
copy to patches/buildroot/2022.02/118-armadeus-snes9x-add-package.patch
index 7bcaff72e..2362fa71c 100644
--- a/patches/buildroot/2016.02/118-armadeus-snes9x-add-package.patch
+++ b/patches/buildroot/2022.02/118-armadeus-snes9x-add-package.patch
@@ -6,14 +6,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -235,6 +235,7 @@ menu "Games"
+@@ -295,6 +295,7 @@ menu "Games"
source "package/rubix/Config.in"
source "package/sdlquake/Config.in"
source "package/sl/Config.in"
+ source "package/snes9x/Config.in"
- source "package/wolf4sdl/Config.in"
- endmenu
-
+ source "package/solarus/Config.in"
+ source "package/stella/Config.in"
+ source "package/supertux/Config.in"
Index: buildroot/package/snes9x/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2015.02/121-target-arm926t_is_arm926ej-s.patch b/patches/buildroot/2022.02/121-target-arm926t_is_arm926ej-s.patch
similarity index 100%
copy from patches/buildroot/2015.02/121-target-arm926t_is_arm926ej-s.patch
copy to patches/buildroot/2022.02/121-target-arm926t_is_arm926ej-s.patch
diff --git a/patches/buildroot/2021.02/123-armadeus-pywebradio-add-package.patch b/patches/buildroot/2022.02/123-armadeus-pywebradio-add-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/123-armadeus-pywebradio-add-package.patch
copy to patches/buildroot/2022.02/123-armadeus-pywebradio-add-package.patch
diff --git a/patches/buildroot/2019.02/124-e-uae-add_package.patch b/patches/buildroot/2022.02/124-e-uae-add_package.patch
similarity index 100%
copy from patches/buildroot/2019.02/124-e-uae-add_package.patch
copy to patches/buildroot/2022.02/124-e-uae-add_package.patch
diff --git a/patches/buildroot/2016.08/188-marble-add_package.patch b/patches/buildroot/2022.02/188-marble-add_package.patch
similarity index 97%
copy from patches/buildroot/2016.08/188-marble-add_package.patch
copy to patches/buildroot/2022.02/188-marble-add_package.patch
index 4fce68641..6359b5b7f 100644
--- a/patches/buildroot/2016.08/188-marble-add_package.patch
+++ b/patches/buildroot/2022.02/188-marble-add_package.patch
@@ -6,14 +6,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -288,6 +288,7 @@ comment "Demos"
- source "package/sdl_water/Config.in"
-
- comment "Other GUIs"
+@@ -318,6 +318,7 @@ comment "Graphic applications"
+ source "package/jhead/Config.in"
+ source "package/kmscube/Config.in"
+ source "package/libva-utils/Config.in"
+ source "package/marble/Config.in"
- source "package/python-wx/Config.in"
- source "package/qt/Config.in"
- source "package/qt5/Config.in"
+ source "package/mesa3d-demos/Config.in"
+ source "package/midori/Config.in"
+ source "package/netsurf/Config.in"
Index: buildroot/package/marble/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2019.02/201-armadeus-add_gnokii.patch b/patches/buildroot/2022.02/201-armadeus-add_gnokii.patch
similarity index 100%
copy from patches/buildroot/2019.02/201-armadeus-add_gnokii.patch
copy to patches/buildroot/2022.02/201-armadeus-add_gnokii.patch
diff --git a/patches/buildroot/2015.02/204-wpa-supplicant-add-option-ieee80211w.patch b/patches/buildroot/2022.02/204-wpa-supplicant-add-option-ieee80211w.patch
similarity index 100%
copy from patches/buildroot/2015.02/204-wpa-supplicant-add-option-ieee80211w.patch
copy to patches/buildroot/2022.02/204-wpa-supplicant-add-option-ieee80211w.patch
diff --git a/patches/buildroot/2019.02/205-busybox-coreutils-stty-add-rs485-config-options.patch b/patches/buildroot/2022.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
similarity index 100%
copy from patches/buildroot/2019.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
copy to patches/buildroot/2022.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
diff --git a/patches/buildroot/2015.02/209-armadeus-add_matiec.patch b/patches/buildroot/2022.02/209-armadeus-add_matiec.patch
similarity index 100%
copy from patches/buildroot/2015.02/209-armadeus-add_matiec.patch
copy to patches/buildroot/2022.02/209-armadeus-add_matiec.patch
diff --git a/patches/buildroot/2020.02/237-armadeus-busybox-speed-up-mdev.patch b/patches/buildroot/2022.02/237-armadeus-busybox-speed-up-mdev.patch
similarity index 100%
copy from patches/buildroot/2020.02/237-armadeus-busybox-speed-up-mdev.patch
copy to patches/buildroot/2022.02/237-armadeus-busybox-speed-up-mdev.patch
diff --git a/patches/buildroot/2019.02/341-python-flask-socketio-new-package.patch b/patches/buildroot/2022.02/341-python-flask-socketio-new-package.patch
similarity index 100%
copy from patches/buildroot/2019.02/341-python-flask-socketio-new-package.patch
copy to patches/buildroot/2022.02/341-python-flask-socketio-new-package.patch
diff --git a/patches/buildroot/2021.02/412-package-libimxdmabuffer-new-package.patch b/patches/buildroot/2022.02/412-package-libimxdmabuffer-new-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/412-package-libimxdmabuffer-new-package.patch
copy to patches/buildroot/2022.02/412-package-libimxdmabuffer-new-package.patch
diff --git a/patches/buildroot/2021.02/413-package-libimxvpuapi2-new-package.patch b/patches/buildroot/2022.02/413-package-libimxvpuapi2-new-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/413-package-libimxvpuapi2-new-package.patch
copy to patches/buildroot/2022.02/413-package-libimxvpuapi2-new-package.patch
diff --git a/patches/buildroot/2021.02/414-package-gstreamer1-gst1-imx2-new-package.patch b/patches/buildroot/2022.02/414-package-gstreamer1-gst1-imx2-new-package.patch
similarity index 100%
copy from patches/buildroot/2021.02/414-package-gstreamer1-gst1-imx2-new-package.patch
copy to patches/buildroot/2022.02/414-package-gstreamer1-gst1-imx2-new-package.patch
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2022.02/cleanup_buildroot.sh
similarity index 50%
copy from patches/buildroot/2021.02/cleanup_buildroot.sh
copy to patches/buildroot/2022.02/cleanup_buildroot.sh
index ac538bc6e..0f4d0556b 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2022.02/cleanup_buildroot.sh
@@ -14,16 +14,8 @@ rm -rf buildroot/arch/Config.in.arm
rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/package/Config.in
-rm -rf buildroot/package/agg/Config.in
-rm -rf buildroot/package/agg/agg.mk
rm -rf buildroot/package/apf-config/Config.in
rm -rf buildroot/package/apf-config/apf-config.mk
-rm -rf buildroot/package/bayer2rgb-neon/Config.in
-rm -rf buildroot/package/bayer2rgb-neon/bayer2rgb-neon.hash
-rm -rf buildroot/package/bayer2rgb-neon/bayer2rgb-neon.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
rm -rf buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
rm -rf buildroot/package/busybox/S10mdev
rm -rf buildroot/package/cmux/Config.in
@@ -31,48 +23,16 @@ rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
-rm -rf buildroot/package/expat/expat.hash
-rm -rf buildroot/package/expat/expat.mk
rm -rf buildroot/package/expect/expect.mk
-rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
-rm -rf buildroot/package/freescale-imx/Config.in
-rm -rf buildroot/package/freescale-imx/firmware-imx/Config.in
-rm -rf buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash
-rm -rf buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
-rm -rf buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
-rm -rf buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
-rm -rf buildroot/package/freescale-imx/imx-gpu-viv/Config.in
-rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
-rm -rf buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
-rm -rf buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.hash
-rm -rf buildroot/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
-rm -rf buildroot/package/freescale-imx/imx-seco/imx-seco.hash
-rm -rf buildroot/package/freescale-imx/imx-seco/imx-seco.mk
-rm -rf buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
-rm -rf buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
-rm -rf buildroot/package/gnash/Config.in
-rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
rm -rf buildroot/package/gnokii/gnokii.mk
-rm -rf buildroot/package/gnuboy/Config.in
-rm -rf buildroot/package/gnuboy/gnuboy.mk
rm -rf buildroot/package/gpsd/Config.in
rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
-rm -rf buildroot/package/gsmmux/Config.in
-rm -rf buildroot/package/gsmmux/gsmmux.mk
rm -rf buildroot/package/gstreamer1/Config.in
rm -rf buildroot/package/gstreamer1/gst1-imx2/Config.in
rm -rf buildroot/package/gstreamer1/gst1-imx2/gst1-imx2.hash
rm -rf buildroot/package/gstreamer1/gst1-imx2/gst1-imx2.mk
-rm -rf buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/Config.in
-rm -rf buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.hash
-rm -rf buildroot/package/gstreamer1/gst1-plugins-bayer2rgb-neon/gst1-plugins-bayer2rgb-neon.mk
-rm -rf buildroot/package/imx-test/10.11.01/imx-test-01_fixes.patch
-rm -rf buildroot/package/imx-test/10.11.01/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
-rm -rf buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
-rm -rf buildroot/package/imx-test/Config.in
-rm -rf buildroot/package/imx-test/imx-test.mk
rm -rf buildroot/package/leptonmodule/0001-flirpi-add-missing-dependency-to-leptcam-target.patch
rm -rf buildroot/package/leptonmodule/Config.in
rm -rf buildroot/package/leptonmodule/leptonmodule.mk
@@ -94,66 +54,33 @@ rm -rf buildroot/package/marble/marble.mk
rm -rf buildroot/package/matiec/Config.in
rm -rf buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch
rm -rf buildroot/package/matiec/matiec.mk
-rm -rf buildroot/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
-rm -rf buildroot/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch
-rm -rf buildroot/package/openocd/openocd.hash
-rm -rf buildroot/package/openocd/openocd.mk
rm -rf buildroot/package/pci_debug/Config.in
rm -rf buildroot/package/pci_debug/pci_debug.hash
rm -rf buildroot/package/pci_debug/pci_debug.mk
-rm -rf buildroot/package/pcre/0002-Disable-C-unit-tests.patch
-rm -rf buildroot/package/pcre/pcre.hash
-rm -rf buildroot/package/pcre/pcre.mk
rm -rf buildroot/package/pwmmusic/Config.in
rm -rf buildroot/package/pwmmusic/pwmmusic.mk
rm -rf buildroot/package/python-flask-socketio/Config.in
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.hash
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.mk
-rm -rf buildroot/package/python-pygame/Config.in
-rm -rf buildroot/package/python-wx/Config.in
-rm -rf buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
-rm -rf buildroot/package/python-wx/python-wx.mk
-rm -rf buildroot/package/python/Config.in
-rm -rf buildroot/package/python/python.mk
rm -rf buildroot/package/pywebradio/Config.in
rm -rf buildroot/package/pywebradio/pywebradio.mk
-rm -rf buildroot/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
-rm -rf buildroot/package/qt5/qt5base/0008-Add-missing-limits-include.patch
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
rm -rf buildroot/package/sd8977/Config.in
rm -rf buildroot/package/sd8977/sd8977.mk
-rm -rf buildroot/package/sdl_water/Config.in
-rm -rf buildroot/package/sdl_water/sdl_water.mk
rm -rf buildroot/package/sdlquake/Config.in
rm -rf buildroot/package/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
rm -rf buildroot/package/sdlquake/sdlquake.mk
-rm -rf buildroot/package/slideshow/Config.in
-rm -rf buildroot/package/slideshow/slideshow-01-restart-after-end.patch
-rm -rf buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
-rm -rf buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
-rm -rf buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
-rm -rf buildroot/package/slideshow/slideshow.mk
rm -rf buildroot/package/snes9x/Config.in
rm -rf buildroot/package/snes9x/snes9x-1.39-compile.patch
rm -rf buildroot/package/snes9x/snes9x.mk
-rm -rf buildroot/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch
-rm -rf buildroot/package/socat/socat.hash
-rm -rf buildroot/package/socat/socat.mk
-rm -rf buildroot/package/stress-ng/stress-ng.hash
-rm -rf buildroot/package/stress-ng/stress-ng.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/wolf4sdl/Config.in
-rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
rm -rf buildroot/package/wpa_supplicant/Config.in
rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
-rm -rf buildroot/package/x265/Config.in
-rm -rf buildroot/package/x265/x265.hash
-rm -rf buildroot/package/x265/x265.mk
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
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-03-01 15:18:23
|
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 e8bbe8f46c14feee059ac9c702a37e8e1d6847ac (commit)
via e973548f8bf9ee335ee4f3ff45693694d83f6696 (commit)
via 1c4b013e6aa1fb65d699a0912f37cc39f848a5ad (commit)
from 3297d7542a085ad0c8e1af3d04d59b39b4ff6c2b (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 e8bbe8f46c14feee059ac9c702a37e8e1d6847ac
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Mar 1 16:00:19 2022 +0100
[BUILDROOT] 2021.02: patches for expat
Fixes expat downloading
commit e973548f8bf9ee335ee4f3ff45693694d83f6696
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Mar 1 14:40:43 2022 +0100
[BUILDROOT] Bump BR to 2021.02.10
commit 1c4b013e6aa1fb65d699a0912f37cc39f848a5ad
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Mar 1 14:39:22 2022 +0100
[BUILDROOT] 2021.02: cleanup_buildroot.sh: remove pwmmusic
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
...kage-expat-security-bump-to-version-2.4.5.patch | 78 ++++++++++++++++++++++
.../420-package-expat-bump-to-version-2.4.6.patch | 50 ++++++++++++++
patches/buildroot/2021.02/cleanup_buildroot.sh | 4 ++
4 files changed, 133 insertions(+), 1 deletion(-)
create mode 100644 patches/buildroot/2021.02/419-package-expat-security-bump-to-version-2.4.5.patch
create mode 100644 patches/buildroot/2021.02/420-package-expat-bump-to-version-2.4.6.patch
diff --git a/Makefile b/Makefile
index 4dedd4a78..f357a5548 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2021.02
-BUILDROOT_MINOR_VERSION ?= 9
+BUILDROOT_MINOR_VERSION ?= 10
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/patches/buildroot/2021.02/419-package-expat-security-bump-to-version-2.4.5.patch b/patches/buildroot/2021.02/419-package-expat-security-bump-to-version-2.4.5.patch
new file mode 100644
index 000000000..136d8a74a
--- /dev/null
+++ b/patches/buildroot/2021.02/419-package-expat-security-bump-to-version-2.4.5.patch
@@ -0,0 +1,78 @@
+From 21c07c0aaa7e43b8f676c564f173a510d345a77a Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fon...@gm...>
+Date: Sat, 19 Feb 2022 13:28:31 +0100
+Subject: [PATCH 1/2] package/expat: security bump to version 2.4.5
+
+Security fixes:
+ #562 CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8
+ sequences (e.g. from start tag names) to the XML
+ processing application on top of Expat can cause
+ arbitrary damage (e.g. code execution) depending
+ on how invalid UTF-8 is handled inside the XML
+ processor; validation was not their job but Expat's.
+ Exploits with code execution are known to exist.
+ #561 CVE-2022-25236 -- Passing (one or more) namespace separator
+ characters in "xmlns[:prefix]" attribute values
+ made Expat send malformed tag names to the XML
+ processor on top of Expat which can cause
+ arbitrary damage (e.g. code execution) depending
+ on such unexpectable cases are handled inside the XML
+ processor; validation was not their job but Expat's.
+ Exploits with code execution are known to exist.
+ #558 CVE-2022-25313 -- Fix stack exhaustion in doctype parsing
+ that could be triggered by e.g. a 2 megabytes
+ file with a large number of opening braces.
+ Expected impact is denial of service or potentially
+ arbitrary code execution.
+ #560 CVE-2022-25314 -- Fix integer overflow in function copyString;
+ only affects the encoding name parameter at parser creation
+ time which is often hardcoded (rather than user input),
+ takes a value in the gigabytes to trigger, and a 64-bit
+ machine. Expected impact is denial of service.
+ #559 CVE-2022-25315 -- Fix integer overflow in function storeRawNames;
+ needs input in the gigabytes and a 64-bit machine.
+ Expected impact is denial of service or potentially
+ arbitrary code execution.
+
+https://blog.hartwork.org/posts/expat-2-4-5-released/
+https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes
+
+Signed-off-by: Fabrice Fontaine <fon...@gm...>
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ package/expat/expat.hash | 8 ++++----
+ package/expat/expat.mk | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/package/expat/expat.hash b/package/expat/expat.hash
+index 10e13206d0..cd2e8c7fb9 100644
+--- a/package/expat/expat.hash
++++ b/package/expat/expat.hash
+@@ -1,7 +1,7 @@
+-# From https://sourceforge.net/projects/expat/files/expat/2.4.4/
+-md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz
+-sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz
++# From https://sourceforge.net/projects/expat/files/expat/2.4.5/
++md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz
++sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz
+
+ # Locally calculated
+-sha256 b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 expat-2.4.4.tar.xz
++sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz
+ sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING
+diff --git a/package/expat/expat.mk b/package/expat/expat.mk
+index 250600c25e..7815d61027 100644
+--- a/package/expat/expat.mk
++++ b/package/expat/expat.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-EXPAT_VERSION = 2.4.4
++EXPAT_VERSION = 2.4.5
+ EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
+ EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
+ EXPAT_INSTALL_STAGING = YES
+--
+2.34.1
+
diff --git a/patches/buildroot/2021.02/420-package-expat-bump-to-version-2.4.6.patch b/patches/buildroot/2021.02/420-package-expat-bump-to-version-2.4.6.patch
new file mode 100644
index 000000000..b73a26e0c
--- /dev/null
+++ b/patches/buildroot/2021.02/420-package-expat-bump-to-version-2.4.6.patch
@@ -0,0 +1,50 @@
+From 46390b3a7c47420b7523b8f18276f3ccd49940c7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fon...@gm...>
+Date: Sun, 20 Feb 2022 21:47:22 +0100
+Subject: [PATCH 2/2] package/expat: bump to version 2.4.6
+
+This release fixes a regression introduced by one of the security fixes
+in 2.4.5.
+
+https://blog.hartwork.org/posts/expat-2-4-6-released
+https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes
+
+Signed-off-by: Fabrice Fontaine <fon...@gm...>
+Signed-off-by: Peter Korsgaard <pe...@ko...>
+---
+ package/expat/expat.hash | 8 ++++----
+ package/expat/expat.mk | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/package/expat/expat.hash b/package/expat/expat.hash
+index cd2e8c7fb9..0d9f60931f 100644
+--- a/package/expat/expat.hash
++++ b/package/expat/expat.hash
+@@ -1,7 +1,7 @@
+-# From https://sourceforge.net/projects/expat/files/expat/2.4.5/
+-md5 9dc183e6c1eebc1b658c1e71be0885e1 expat-2.4.5.tar.xz
+-sha1 360a49b55c442e91cb7b328bc0335083909ddf4f expat-2.4.5.tar.xz
++# From https://sourceforge.net/projects/expat/files/expat/2.4.6/
++md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz
++sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz
+
+ # Locally calculated
+-sha256 f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 expat-2.4.5.tar.xz
++sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz
+ sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING
+diff --git a/package/expat/expat.mk b/package/expat/expat.mk
+index 7815d61027..c481b5c225 100644
+--- a/package/expat/expat.mk
++++ b/package/expat/expat.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-EXPAT_VERSION = 2.4.5
++EXPAT_VERSION = 2.4.6
+ EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
+ EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
+ EXPAT_INSTALL_STAGING = YES
+--
+2.34.1
+
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index 56fb8e557..ac538bc6e 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -31,6 +31,8 @@ rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/expat/expat.hash
+rm -rf buildroot/package/expat/expat.mk
rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
rm -rf buildroot/package/freescale-imx/Config.in
@@ -102,6 +104,8 @@ rm -rf buildroot/package/pci_debug/pci_debug.mk
rm -rf buildroot/package/pcre/0002-Disable-C-unit-tests.patch
rm -rf buildroot/package/pcre/pcre.hash
rm -rf buildroot/package/pcre/pcre.mk
+rm -rf buildroot/package/pwmmusic/Config.in
+rm -rf buildroot/package/pwmmusic/pwmmusic.mk
rm -rf buildroot/package/python-flask-socketio/Config.in
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.hash
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.mk
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-02-25 13:53: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/u-boot".
The branch, armadeus-2020.07 has been updated
via 9974d9963dc53258726a7a1903452903029e8451 (commit)
from 815dd4fdf0fedb63c7d78e473328f2d253d8b354 (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 9974d9963dc53258726a7a1903452903029e8451
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 25 14:45:44 2022 +0100
cmd: pwm: fix typo 'eisable' -> 'disable'
Fixed misspelled 'disable' in help text.
-----------------------------------------------------------------------
Summary of changes:
cmd/pwm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/pwm.c b/cmd/pwm.c
index 7f9206f67c..69260d4635 100644
--- a/cmd/pwm.c
+++ b/cmd/pwm.c
@@ -111,5 +111,5 @@ U_BOOT_CMD(pwm, 6, 0, do_pwm,
"invert <pwm_dev_num> <channel> <polarity> - invert polarity\n"
"pwm config <pwm_dev_num> <channel> <period_ns> <duty_ns> - config PWM\n"
"pwm enable <pwm_dev_num> <channel> - enable PWM output\n"
- "pwm disable <pwm_dev_num> <channel> - eisable PWM output\n"
+ "pwm disable <pwm_dev_num> <channel> - disable PWM output\n"
"Note: All input values are in decimal");
hooks/post-receive
--
armadeus/u-boot
|
|
From: Sébastien S. <ss...@us...> - 2022-02-25 13:37: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/u-boot".
The branch, armadeus-2020.07 has been updated
via 815dd4fdf0fedb63c7d78e473328f2d253d8b354 (commit)
via b1d2b9fa994af59e580095402d0e63c4248c0d19 (commit)
from 003d786995a88a2ddf87fc37d9b339a9002db79b (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 815dd4fdf0fedb63c7d78e473328f2d253d8b354
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 25 11:24:03 2022 +0100
cmd: backport pwm command from upstream
commit b1d2b9fa994af59e580095402d0e63c4248c0d19
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 25 10:08:55 2022 +0100
pwm: imx: Enable PWM support on i.MX8MM
Add missing parts for i.MX8MM PWM support
-----------------------------------------------------------------------
Summary of changes:
arch/arm/include/asm/arch-imx8m/imx-regs.h | 22 ++++++
cmd/Kconfig | 6 ++
cmd/Makefile | 1 +
cmd/pwm.c | 115 +++++++++++++++++++++++++++++
drivers/clk/imx/clk-imx8mm.c | 30 +++++++-
drivers/pwm/pwm-imx-util.c | 2 +-
drivers/pwm/pwm-imx.c | 26 +++++++
7 files changed, 200 insertions(+), 2 deletions(-)
create mode 100644 cmd/pwm.c
diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h
index ee9669f9cd..e659b046f8 100644
--- a/arch/arm/include/asm/arch-imx8m/imx-regs.h
+++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h
@@ -92,6 +92,28 @@
#define SRC_DDR1_RCR_CORE_RESET_N_MASK BIT(1)
#define SRC_DDR1_RCR_PRESET_N_MASK BIT(0)
+#define PWM1_BASE_ADDR 0x30660000
+#define PWM2_BASE_ADDR 0x30670000
+#define PWM3_BASE_ADDR 0x30680000
+#define PWM4_BASE_ADDR 0x30690000
+
+#define PWMCR_PRESCALER(x) (((x - 1) & 0xFFF) << 4)
+#define PWMCR_DOZEEN (1 << 24)
+#define PWMCR_WAITEN (1 << 23)
+#define PWMCR_DBGEN (1 << 22)
+#define PWMCR_CLKSRC_IPG_HIGH (2 << 16)
+#define PWMCR_CLKSRC_IPG (1 << 16)
+#define PWMCR_EN (1 << 0)
+
+struct pwm_regs {
+ u32 cr;
+ u32 sr;
+ u32 ir;
+ u32 sar;
+ u32 pr;
+ u32 cnr;
+};
+
struct iomuxc_gpr_base_regs {
u32 gpr[47];
};
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 192b3b262f..32bab49d08 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -988,6 +988,12 @@ config CMD_GPIO
help
GPIO support.
+config CMD_PWM
+ bool "pwm"
+ depends on DM_PWM
+ help
+ Control PWM channels, this allows invert/config/enable/disable PWM channels.
+
config CMD_GPT
bool "GPT (GUID Partition Table) command"
select EFI_PARTITION
diff --git a/cmd/Makefile b/cmd/Makefile
index 974ad48b0a..09fff4b6dd 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -112,6 +112,7 @@ endif
obj-$(CONFIG_CMD_PINMUX) += pinmux.o
obj-$(CONFIG_CMD_PMC) += pmc.o
obj-$(CONFIG_CMD_PXE) += pxe.o pxe_utils.o
+obj-$(CONFIG_CMD_PWM) += pwm.o
obj-$(CONFIG_CMD_WOL) += wol.o
obj-$(CONFIG_CMD_QFW) += qfw.o
obj-$(CONFIG_CMD_READ) += read.o
diff --git a/cmd/pwm.c b/cmd/pwm.c
new file mode 100644
index 0000000000..7f9206f67c
--- /dev/null
+++ b/cmd/pwm.c
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Control PWM channels
+ *
+ * Copyright (c) 2020 SiFive, Inc
+ * author: Pragnesh Patel <pra...@si...>
+ */
+
+#include <command.h>
+#include <dm.h>
+#include <pwm.h>
+
+enum pwm_cmd {
+ PWM_SET_INVERT,
+ PWM_SET_CONFIG,
+ PWM_SET_ENABLE,
+ PWM_SET_DISABLE,
+};
+
+static int do_pwm(struct cmd_tbl *cmdtp, int flag, int argc,
+ char *const argv[])
+{
+ const char *str_cmd, *str_channel = NULL, *str_enable = NULL;
+ const char *str_pwm = NULL, *str_period = NULL, *str_duty = NULL;
+ enum pwm_cmd sub_cmd;
+ struct udevice *dev;
+ u32 channel, pwm_enable, pwm_dev, period_ns = 0, duty_ns = 0;
+ int ret;
+
+ if (argc < 4)
+ return CMD_RET_USAGE;
+
+ str_cmd = argv[1];
+ argc -= 2;
+ argv += 2;
+
+ str_pwm = *argv;
+ argc--;
+ argv++;
+
+ if (!str_pwm)
+ return CMD_RET_USAGE;
+
+ switch (*str_cmd) {
+ case 'i':
+ sub_cmd = PWM_SET_INVERT;
+ if (argc != 2)
+ return CMD_RET_USAGE;
+ break;
+ case 'c':
+ sub_cmd = PWM_SET_CONFIG;
+ if (argc != 3)
+ return CMD_RET_USAGE;
+ break;
+ case 'e':
+ sub_cmd = PWM_SET_ENABLE;
+ if (argc != 1)
+ return CMD_RET_USAGE;
+ break;
+ case 'd':
+ sub_cmd = PWM_SET_DISABLE;
+ if (argc != 1)
+ return CMD_RET_USAGE;
+ break;
+ default:
+ return CMD_RET_USAGE;
+ }
+
+ pwm_dev = simple_strtoul(str_pwm, NULL, 10);
+ ret = uclass_get_device(UCLASS_PWM, pwm_dev, &dev);
+ if (ret) {
+ printf("pwm: '%s' not found\n", str_pwm);
+ return cmd_process_error(cmdtp, ret);
+ }
+
+ str_channel = *argv;
+ channel = simple_strtoul(str_channel, NULL, 10);
+ argc--;
+ argv++;
+
+ if (sub_cmd == PWM_SET_INVERT) {
+ str_enable = *argv;
+ pwm_enable = simple_strtoul(str_enable, NULL, 10);
+ ret = pwm_set_invert(dev, channel, pwm_enable);
+ } else if (sub_cmd == PWM_SET_CONFIG) {
+ str_period = *argv;
+ argc--;
+ argv++;
+ period_ns = simple_strtoul(str_period, NULL, 10);
+
+ str_duty = *argv;
+ duty_ns = simple_strtoul(str_duty, NULL, 10);
+
+ ret = pwm_set_config(dev, channel, period_ns, duty_ns);
+ } else if (sub_cmd == PWM_SET_ENABLE) {
+ ret = pwm_set_enable(dev, channel, 1);
+ } else if (sub_cmd == PWM_SET_DISABLE) {
+ ret = pwm_set_enable(dev, channel, 0);
+ }
+
+ if (ret) {
+ printf("error(%d)\n", ret);
+ return CMD_RET_FAILURE;
+ }
+
+ return CMD_RET_SUCCESS;
+}
+
+U_BOOT_CMD(pwm, 6, 0, do_pwm,
+ "control pwm channels",
+ "invert <pwm_dev_num> <channel> <polarity> - invert polarity\n"
+ "pwm config <pwm_dev_num> <channel> <period_ns> <duty_ns> - config PWM\n"
+ "pwm enable <pwm_dev_num> <channel> - enable PWM output\n"
+ "pwm disable <pwm_dev_num> <channel> - eisable PWM output\n"
+ "Note: All input values are in decimal");
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index d609fad7ac..bf8ea6dc58 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -119,6 +119,18 @@ static const char *imx8mm_wdog_sels[] = {"clock-osc-24m", "sys_pll1_133m", "sys_
static const char *imx8mm_usdhc3_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m",
"sys_pll3_out", "sys_pll1_266m", "audio_pll2_clk", "sys_pll1_100m", };
+static const char *imx8mm_pwm1_sels[] = {"clock-osc-24m", "sys_pll2_100m", "sys_pll1_160m", "sys_pll1_40m",
+ "sys_pll3_out", "clk_ext1", "sys_pll1_80m", "video_pll1_out", };
+
+static const char *imx8mm_pwm2_sels[] = {"clock-osc-24m", "sys_pll2_100m", "sys_pll1_160m", "sys_pll1_40m",
+ "sys_pll3_out", "clk_ext1", "sys_pll1_80m", "video_pll1_out", };
+
+static const char *imx8mm_pwm3_sels[] = {"clock-osc-24m", "sys_pll2_100m", "sys_pll1_160m", "sys_pll1_40m",
+ "sys_pll3_out", "clk_ext2", "sys_pll1_80m", "video_pll1_out", };
+
+static const char *imx8mm_pwm4_sels[] = {"clock-osc-24m", "sys_pll2_100m", "sys_pll1_160m", "sys_pll1_40m",
+ "sys_pll3_out", "clk_ext2", "sys_pll1_80m", "video_pll1_out", };
+
static ulong imx8mm_clk_get_rate(struct clk *clk)
{
struct clk *c;
@@ -373,7 +385,23 @@ static int imx8mm_clk_probe(struct udevice *dev)
clk_dm(IMX8MM_CLK_USDHC3,
imx8m_clk_composite("usdhc3", imx8mm_usdhc3_sels,
base + 0xbc80));
-
+ clk_dm(IMX8MM_CLK_PWM1,
+ imx8m_clk_composite("pwm1", imx8mm_pwm1_sels, base + 0xb380));
+ clk_dm(IMX8MM_CLK_PWM2,
+ imx8m_clk_composite("pwm2", imx8mm_pwm2_sels, base + 0xb400));
+ clk_dm(IMX8MM_CLK_PWM3,
+ imx8m_clk_composite("pwm3", imx8mm_pwm3_sels, base + 0xb480));
+ clk_dm(IMX8MM_CLK_PWM4,
+ imx8m_clk_composite("pwm4", imx8mm_pwm4_sels, base + 0xb500));
+
+ clk_dm(IMX8MM_CLK_PWM1_ROOT,
+ imx_clk_gate4("pwm1_root_clk", "pwm1", base + 0x4280, 0));
+ clk_dm(IMX8MM_CLK_PWM2_ROOT,
+ imx_clk_gate4("pwm2_root_clk", "pwm2", base + 0x4290, 0));
+ clk_dm(IMX8MM_CLK_PWM3_ROOT,
+ imx_clk_gate4("pwm3_root_clk", "pwm3", base + 0x42a0, 0));
+ clk_dm(IMX8MM_CLK_PWM4_ROOT,
+ imx_clk_gate4("pwm4_root_clk", "pwm4", base + 0x42b0, 0));
clk_dm(IMX8MM_CLK_I2C1_ROOT,
imx_clk_gate4("i2c1_root_clk", "i2c1", base + 0x4170, 0));
clk_dm(IMX8MM_CLK_I2C2_ROOT,
diff --git a/drivers/pwm/pwm-imx-util.c b/drivers/pwm/pwm-imx-util.c
index 823a9d2d6b..f87e4f6e1a 100644
--- a/drivers/pwm/pwm-imx-util.c
+++ b/drivers/pwm/pwm-imx-util.c
@@ -22,7 +22,7 @@ struct pwm_regs *pwm_id_to_reg(int pwm_id)
return (struct pwm_regs *)PWM1_BASE_ADDR;
case 1:
return (struct pwm_regs *)PWM2_BASE_ADDR;
-#ifdef CONFIG_MX6
+#if defined(CONFIG_MX6) || defined(CONFIG_IMX8MM)
case 2:
return (struct pwm_regs *)PWM3_BASE_ADDR;
case 3:
diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index f5b9544cb8..eb49dc9128 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -7,6 +7,7 @@
*/
#include <common.h>
+#include <clk.h>
#include <div64.h>
#include <dm.h>
#include <log.h>
@@ -83,6 +84,8 @@ void pwm_disable(int pwm_id)
struct imx_pwm_priv {
struct pwm_regs *regs;
bool invert;
+ struct clk per_clk;
+ struct clk ipg_clk;
};
static int imx_pwm_set_invert(struct udevice *dev, uint channel,
@@ -137,6 +140,29 @@ static int imx_pwm_ofdata_to_platdata(struct udevice *dev)
static int imx_pwm_probe(struct udevice *dev)
{
+ if (CONFIG_IS_ENABLED(CLK_CCF)) {
+ struct imx_pwm_priv *priv = dev_get_priv(dev);
+ int ret;
+
+ ret = clk_get_by_name(dev, "ipg", &priv->ipg_clk);
+ if (ret < 0) {
+ debug("Can't get PWM ipg clk: %d\n", ret);
+ return ret;
+ }
+ ret = clk_enable(&priv->ipg_clk);
+ if(ret)
+ return ret;
+
+ ret = clk_get_by_name(dev, "per", &priv->per_clk);
+ if (ret < 0) {
+ debug("Can't get PWM per clk: %d\n", ret);
+ return ret;
+ }
+ ret = clk_enable(&priv->ipg_clk);
+ if(ret)
+ return ret;
+ }
+
return 0;
}
hooks/post-receive
--
armadeus/u-boot
|
|
From: Julien B a. A. <ar...@us...> - 2022-02-24 17:27:20
|
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 3297d7542a085ad0c8e1af3d04d59b39b4ff6c2b (commit)
from 5d02e1c57773c261a3ff87e1c87d572b71cc6f71 (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 3297d7542a085ad0c8e1af3d04d59b39b4ff6c2b
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Feb 24 18:26:25 2022 +0100
[HARD] Add SVG for some modules (APF28/6, OPOS6UL/NANO/8MM)
-----------------------------------------------------------------------
Summary of changes:
hardware/apf28/svg/APF28.svg | 1091 ++++++
hardware/apf6/svg/APF6.svg | 1509 +++++++++
hardware/opos6ul/OPOS6UL.svg | 539 +++
hardware/opos6ul/OPOS6UL_SP.svg | 934 ++++++
hardware/opos6ul_nano/OPOS6UL_NANO.svg | 797 +++++
hardware/opos6ul_nano/OPS6UL_NANO adapt.jpg.svg | 367 +++
hardware/opos8mm/OPOS8MM.svg | 2118 ++++++++++++
hardware/opos8mm/OPOS8MM_DEV.svg | 4002 +++++++++++++++++++++++
hardware/ov5640.svg | 1218 +++++++
9 files changed, 12575 insertions(+)
create mode 100644 hardware/apf28/svg/APF28.svg
create mode 100644 hardware/apf6/svg/APF6.svg
create mode 100644 hardware/opos6ul/OPOS6UL.svg
create mode 100644 hardware/opos6ul/OPOS6UL_SP.svg
create mode 100644 hardware/opos6ul_nano/OPOS6UL_NANO.svg
create mode 100644 hardware/opos6ul_nano/OPS6UL_NANO adapt.jpg.svg
create mode 100644 hardware/opos8mm/OPOS8MM.svg
create mode 100644 hardware/opos8mm/OPOS8MM_DEV.svg
create mode 100644 hardware/ov5640.svg
diff --git a/hardware/apf28/svg/APF28.svg b/hardware/apf28/svg/APF28.svg
new file mode 100644
index 000000000..f1546bf52
--- /dev/null
+++ b/hardware/apf28/svg/APF28.svg
@@ -0,0 +1,1091 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ id="svg901"
+ width="1219"
+ height="1707"
+ viewBox="0 0 1219 1707"
+ sodipodi:docname="APF28.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)">
+ <metadata
+ id="metadata907">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs905">
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1311"
+ gradientUnits="userSpaceOnUse"
+ x="498.78937"
+ y="883.88568">
+ <meshrow
+ id="meshrow1313">
+ <meshpatch
+ id="meshpatch1315">
+ <stop
+ path="c 6.76645,0 13.5329,0 20.2993,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1317" />
+ <stop
+ path="c 0,2.9823 0,5.9646 0,8.94689"
+ style="stop-color:#535a55;stop-opacity:1"
+ id="stop1319" />
+ <stop
+ path="c -6.76645,0 -13.5329,0 -20.2993,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1321" />
+ <stop
+ path="c 0,-2.9823 0,-5.9646 0,-8.94689"
+ style="stop-color:#535a55;stop-opacity:1"
+ id="stop1323" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1373"
+ inkscape:window-height="845"
+ id="namedview903"
+ showgrid="false"
+ inkscape:zoom="1.8009126"
+ inkscape:cx="517.19842"
+ inkscape:cy="816.98376"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg901" />
+ <g
+ id="g1362"
+ inkscape:label="recto"
+ style="display:inline">
+ <path
+ inkscape:label="carte"
+ inkscape:connector-curvature="0"
+ id="rect915"
+ d="M 777.3125,778.80859 V 1031.3867 H 922.93945 V 778.80859 Z m 12.05664,3.3418 a 8.4750023,8.7137346 0 0 1 8.47461,8.71289 8.4750023,8.7137346 0 0 1 -8.47461,8.71484 8.4750023,8.7137346 0 0 1 -8.47461,-8.71484 8.4750023,8.7137346 0 0 1 8.47461,-8.71289 z M 911.48047,1010.498 a 8.4750023,8.7137346 0 0 1 8.47461,8.7129 8.4750023,8.7137346 0 0 1 -8.47461,8.7149 8.4750023,8.7137346 0 0 1 -8.47461,-8.7149 8.4750023,8.7137346 0 0 1 8.47461,-8.7129 z"
+ style="display:inline;opacity:1;fill:#12502b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.30999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ inkscape:label="rondelle"
+ id="g1165">
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:1;fill:#eeb204;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.08559322;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 911.48047,1006.0801 a 13.130285,13.130285 0 0 0 -13.13086,13.1308 13.130285,13.130285 0 0 0 8.23242,12.1758 h 9.78711 a 13.130285,13.130285 0 0 0 6.57031,-5.7969 v -12.7753 a 13.130285,13.130285 0 0 0 -11.45898,-6.7344 z m 0,4.4179 a 8.4750023,8.7137346 0 0 1 8.47461,8.7129 8.4750023,8.7137346 0 0 1 -8.47461,8.7149 8.4750023,8.7137346 0 0 1 -8.47656,-8.7149 8.4750023,8.7137346 0 0 1 8.47656,-8.7129 z"
+ id="path939"
+ inkscape:label="2" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:1;fill:#eeb204;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.08559322;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 784.17578,778.80859 a 13.130285,13.130285 0 0 0 -6.86328,6.89844 v 10.3457 a 13.130285,13.130285 0 0 0 12.05664,7.94141 13.130285,13.130285 0 0 0 13.12891,-13.13086 13.130285,13.130285 0 0 0 -7.96094,-12.05469 z m 5.19336,3.3418 a 8.4750023,8.7137346 0 0 1 8.47461,8.71289 8.4750023,8.7137346 0 0 1 -8.47461,8.71484 8.4750023,8.7137346 0 0 1 -8.47656,-8.71484 8.4750023,8.7137346 0 0 1 8.47656,-8.71289 z"
+ id="path939-3"
+ inkscape:label="1" />
+ </g>
+ <g
+ inkscape:label="gros compsants"
+ id="g1178">
+ <g
+ id="g1170"
+ inkscape:label="1">
+ <rect
+ y="806.9787"
+ x="803.09601"
+ height="69.232414"
+ width="106.95214"
+ id="rect815"
+ style="opacity:1;fill:#172726;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.72183394;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ inkscape:label="pate"
+ y="806.9787"
+ x="910.04816"
+ height="69.232414"
+ width="5.7295823"
+ id="rect815-3"
+ style="opacity:1;fill:#7f8681;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.62998235;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ inkscape:label="pate"
+ y="806.9787"
+ x="796.01599"
+ height="69.232414"
+ width="7.0800571"
+ id="rect815-3-6"
+ style="opacity:1;fill:#7f8681;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.70030189;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <rect
+ style="opacity:1;fill:#0c1818;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.59512162;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect815-3-7"
+ width="81.356163"
+ height="82.73716"
+ x="801.3429"
+ y="880.33038"
+ inkscape:label="2" />
+ <rect
+ style="opacity:1;fill:#192429;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.04971409;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect853"
+ width="73.263252"
+ height="42.202332"
+ x="800.15625"
+ y="976.39319"
+ inkscape:label="3" />
+ </g>
+ <g
+ inkscape:label="composants"
+ id="g1300">
+ <g
+ id="g1185"
+ inkscape:label="1">
+ <rect
+ inkscape:label="pate"
+ y="909.51422"
+ x="907.06396"
+ height="7.8781714"
+ width="10.265495"
+ id="rect855"
+ style="opacity:1;fill:#7e998d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.93819606;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ inkscape:label="pate"
+ y="919.77972"
+ x="907.422"
+ height="6.8038754"
+ width="9.668664"
+ id="rect855-5"
+ style="opacity:1;fill:#7e998d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.74806046;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ inkscape:label="pate"
+ y="919.06354"
+ x="894.6499"
+ height="7.7588053"
+ width="9.0718327"
+ id="rect855-3"
+ style="opacity:1;fill:#7e998d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.80817306;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ inkscape:label="pate"
+ y="909.51428"
+ x="894.76923"
+ height="7.161974"
+ width="9.0718327"
+ id="rect855-56"
+ style="opacity:1;fill:#7e998d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.7372365;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="910.80432"
+ x="896.56567"
+ height="14.630544"
+ width="18.241735"
+ id="rect855-2"
+ style="opacity:1;fill:#192429;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.52093792;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ id="g1261"
+ inkscape:label="3">
+ <g
+ inkscape:label="1"
+ id="g1247">
+ <rect
+ style="opacity:1;fill:#78735f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.10544419;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913"
+ width="8.236269"
+ height="4.8940148"
+ x="905.39276"
+ y="957.49945" />
+ <rect
+ style="opacity:1;fill:#b1c7b6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.64407563;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-2"
+ width="8.236269"
+ height="2.9841552"
+ x="905.39276"
+ y="954.51526" />
+ <rect
+ style="opacity:1;fill:#b1c7b6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.64407563;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-2-7"
+ width="8.236269"
+ height="2.9841552"
+ x="905.39276"
+ y="962.39349" />
+ </g>
+ <g
+ inkscape:label="2"
+ id="g1242">
+ <rect
+ style="opacity:1;fill:#78735f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.10544419;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-0"
+ width="8.236269"
+ height="4.8940148"
+ x="905.33313"
+ y="978.44824" />
+ <rect
+ style="opacity:1;fill:#b1c7b6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.64407563;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-2-9"
+ width="8.236269"
+ height="2.9841552"
+ x="905.33313"
+ y="975.46405" />
+ <rect
+ style="opacity:1;fill:#b1c7b6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.64407563;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-2-7-3"
+ width="8.236269"
+ height="2.9841552"
+ x="905.33313"
+ y="983.34229" />
+ </g>
+ <g
+ inkscape:label="3"
+ id="g1237">
+ <rect
+ style="opacity:1;fill:#78735f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.10544419;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-6"
+ width="8.236269"
+ height="4.8940148"
+ x="-990.14612"
+ y="891.84479"
+ transform="rotate(-90)" />
+ <rect
+ style="opacity:1;fill:#b1c7b6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.64407563;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-2-0"
+ width="8.236269"
+ height="2.9841552"
+ x="-990.14612"
+ y="896.73883"
+ transform="rotate(-90)" />
+ <rect
+ style="opacity:1;fill:#b1c7b6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.64407563;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-2-7-6"
+ width="8.236269"
+ height="2.9841552"
+ x="-990.14612"
+ y="888.86066"
+ transform="rotate(-90)" />
+ </g>
+ </g>
+ <g
+ id="g1232"
+ inkscape:label="2">
+ <g
+ inkscape:label="1"
+ id="g1222">
+ <rect
+ style="opacity:1;fill:#78735f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.97206247;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-26"
+ width="6.5481758"
+ height="5.4004426"
+ x="936.5719"
+ y="-911.82281"
+ transform="rotate(90)" />
+ <rect
+ style="opacity:1;fill:#b1c7b6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.51159132;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-26-1"
+ width="3.8472264"
+ height="5.4004426"
+ x="932.72467"
+ y="-911.82281"
+ transform="rotate(90)" />
+ <rect
+ style="opacity:1;fill:#b1c7b6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.51159132;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-26-1-8"
+ width="3.8472264"
+ height="5.4004426"
+ x="943.12006"
+ y="-911.82281"
+ transform="rotate(90)" />
+ </g>
+ <g
+ inkscape:label="2"
+ id="g1217">
+ <rect
+ style="opacity:1;fill:#78735f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.97206247;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-26-7"
+ width="6.5481758"
+ height="5.4004426"
+ x="974.99512"
+ y="-881.47437"
+ transform="rotate(90)" />
+ <rect
+ style="opacity:1;fill:#b1c7b6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.51159132;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-26-1-9"
+ width="3.8472264"
+ height="5.4004426"
+ x="971.14789"
+ y="-881.47437"
+ transform="rotate(90)" />
+ <rect
+ style="opacity:1;fill:#b1c7b6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.51159132;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect913-26-1-8-2"
+ width="3.8472264"
+ height="5.4004426"
+ x="981.54327"
+ y="-881.47437"
+ transform="rotate(90)" />
+ </g>
+ </g>
+ <g
+ id="g1212"
+ inkscape:label="4">
+ <g
+ id="g1371">
+ <rect
+ style="opacity:1;fill:#383834;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.38858628;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1042"
+ width="10.205812"
+ height="14.502996"
+ x="889.75586"
+ y="960.84174" />
+ <rect
+ style="opacity:1;fill:#383834;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.11631441;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1042-0"
+ width="2.9530895"
+ height="5.4395709"
+ x="-1339.3749"
+ y="-184.13252"
+ transform="matrix(-0.77273248,-0.63473185,0.73325904,-0.67994939,0,0)" />
+ <rect
+ style="opacity:1;fill:#383834;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.11029828;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1042-0-2"
+ width="2.9363384"
+ height="5.4117951"
+ x="87.042351"
+ y="1324.5919"
+ transform="matrix(-0.7697439,0.63835282,0.73000746,0.68343917,0,0)" />
+ <rect
+ style="opacity:1;fill:#383834;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97446156;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1042-0-3"
+ width="2.5568399"
+ height="4.7873373"
+ x="1309.3705"
+ y="1.2191312"
+ transform="matrix(0.68012061,0.73310023,-0.63490936,0.77258663,0,0)" />
+ <rect
+ style="opacity:1;fill:#383834;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.97446156;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1042-0-3-5"
+ width="2.5568399"
+ height="4.7873373"
+ x="68.783623"
+ y="-1327.7087"
+ transform="matrix(0.68012061,-0.73310023,-0.63490936,-0.77258663,0,0)" />
+ <rect
+ style="opacity:1;fill:#383834;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3328799;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1042-9"
+ width="3.2228642"
+ height="7.1057229"
+ x="886.71631"
+ y="964.54034" />
+ <rect
+ style="opacity:1;fill:#383834;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.58785796;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1042-2"
+ width="4.5738721"
+ height="7.1057105"
+ x="899.3764"
+ y="964.54034" />
+ </g>
+ <ellipse
+ ry="3.1546788"
+ rx="2.9841561"
+ cy="964.95135"
+ cx="897.15649"
+ id="path1044"
+ style="opacity:1;fill:#9b9b9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00813484;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ inkscape:label="texte"
+ id="g1202">
+ <rect
+ style="opacity:1;fill:#00491d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.11990047;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1124"
+ width="61.47361"
+ height="8.7137356"
+ x="829.35657"
+ y="785.85083" />
+ <rect
+ style="opacity:1;fill:#00491d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.41032553;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1126"
+ width="29.722151"
+ height="8.2362728"
+ x="829.35657"
+ y="794.56458" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:6.19754314px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#12502b;fill-opacity:1;stroke:none;stroke-width:0.15493859"
+ x="830.33679"
+ y="792.40454"
+ id="text1132"
+ inkscape:label="Armadeus Systems"><tspan
+ sodipodi:role="line"
+ id="tspan1130"
+ x="830.33679"
+ y="792.40454"
+ style="fill:#12502b;fill-opacity:1;stroke-width:0.15493859">Armadeus Systems</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-weight:normal;font-size:5.16408491px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#12502b;fill-opacity:1;stroke:none;stroke-width:0.12910214"
+ x="829.68701"
+ y="800.55969"
+ id="text1140"
+ inkscape:label="APF28 V1.1"><tspan
+ sodipodi:role="line"
+ id="tspan1138"
+ x="829.68701"
+ y="800.55969"
+ style="fill:#12502b;fill-opacity:1;stroke-width:0.12910214">APF28 V1.1</tspan></text>
+ </g>
+ <g
+ inkscape:label="points"
+ id="g1194">
+ <circle
+ style="display:inline;opacity:1;fill:#eeb204;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79370785;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path890"
+ cx="890.49371"
+ cy="1010.9682"
+ r="3.4254165"
+ inkscape:label="3" />
+ <circle
+ style="display:inline;opacity:1;fill:#eeb204;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79370785;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path890-2"
+ cx="787.91754"
+ cy="996.14392"
+ r="3.4254165"
+ inkscape:label="2" />
+ <circle
+ style="display:inline;opacity:1;fill:#eeb204;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79370785;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path890-8"
+ cx="790.95612"
+ cy="920.85492"
+ r="3.4254165"
+ inkscape:label="1" />
+ </g>
+ </g>
+ <g
+ id="g2079"
+ inkscape:label="verso">
+ <path
+ inkscape:label="carte"
+ inkscape:connector-curvature="0"
+ id="rect915-6"
+ d="M 383.51125,1032.1779 V 779.5998 H 529.1382 v 252.5781 z m 12.05664,-3.3418 a 8.4750023,8.7137346 0 0 0 8.47461,-8.7129 8.4750023,8.7137346 0 0 0 -8.47461,-8.7148 8.4750023,8.7137346 0 0 0 -8.47461,8.7148 8.4750023,8.7137346 0 0 0 8.47461,8.7129 z M 517.67922,800.4885 a 8.4750023,8.7137346 0 0 0 8.47461,-8.7129 8.4750023,8.7137346 0 0 0 -8.47461,-8.7149 8.4750023,8.7137346 0 0 0 -8.47461,8.7149 8.4750023,8.7137346 0 0 0 8.47461,8.7129 z"
+ style="display:inline;opacity:1;fill:#12502b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.30999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="matrix(1,0,0,-1,-393.80125,1810.9865)"
+ inkscape:label="rondelle"
+ id="g1165-7">
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:1;fill:#eeb204;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.08559322;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 911.48047,1006.0801 a 13.130285,13.130285 0 0 0 -13.13086,13.1308 13.130285,13.130285 0 0 0 8.23242,12.1758 h 9.78711 a 13.130285,13.130285 0 0 0 6.57031,-5.7969 v -12.7753 a 13.130285,13.130285 0 0 0 -11.45898,-6.7344 z m 0,4.4179 a 8.4750023,8.7137346 0 0 1 8.47461,8.7129 8.4750023,8.7137346 0 0 1 -8.47461,8.7149 8.4750023,8.7137346 0 0 1 -8.47656,-8.7149 8.4750023,8.7137346 0 0 1 8.47656,-8.7129 z"
+ id="path939-5"
+ inkscape:label="2" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:1;fill:#eeb204;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.08559322;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 784.17578,778.80859 a 13.130285,13.130285 0 0 0 -6.86328,6.89844 v 10.3457 a 13.130285,13.130285 0 0 0 12.05664,7.94141 13.130285,13.130285 0 0 0 13.12891,-13.13086 13.130285,13.130285 0 0 0 -7.96094,-12.05469 z m 5.19336,3.3418 a 8.4750023,8.7137346 0 0 1 8.47461,8.71289 8.4750023,8.7137346 0 0 1 -8.47461,8.71484 8.4750023,8.7137346 0 0 1 -8.47656,-8.71484 8.4750023,8.7137346 0 0 1 8.47656,-8.71289 z"
+ id="path939-3-3"
+ inkscape:label="1" />
+ </g>
+ <g
+ transform="matrix(1,0,0,-1,-393.80125,1810.9865)"
+ inkscape:label="points"
+ id="g1194-5">
+ <circle
+ style="display:inline;opacity:1;fill:#eeb204;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79370785;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path890-4"
+ cx="890.49371"
+ cy="1010.9682"
+ r="3.4254165"
+ inkscape:label="3" />
+ <circle
+ style="display:inline;opacity:1;fill:#eeb204;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79370785;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path890-2-7"
+ cx="787.91754"
+ cy="996.14392"
+ r="3.4254165"
+ inkscape:label="2" />
+ <circle
+ style="display:inline;opacity:1;fill:#eeb204;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.79370785;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path890-8-6"
+ cx="790.95612"
+ cy="920.85492"
+ r="3.4254165"
+ inkscape:label="1" />
+ </g>
+ <g
+ inkscape:label="barette gauche"
+ id="g1980">
+ <rect
+ style="opacity:1;fill:#0c0e04;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.92261076;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633"
+ width="5.5"
+ height="95.5"
+ x="397.5"
+ y="905.75" />
+ <rect
+ style="opacity:1;fill:#20241d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.8297568;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4"
+ width="8.3565063"
+ height="2.8125002"
+ x="396.07175"
+ y="902.9375" />
+ <rect
+ style="opacity:1;fill:#20241d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83685058;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-8"
+ width="8.5"
+ height="2.8125002"
+ x="395.92825"
+ y="1001.2712" />
+ <rect
+ style="opacity:1;fill:#6c6356;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99914479;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-1"
+ width="1.4282506"
+ height="95.521187"
+ x="403"
+ y="905.75" />
+ <rect
+ style="opacity:1;fill:#6c6356;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99914479;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-1-2"
+ width="1.4282506"
+ height="95.521187"
+ x="396.07175"
+ y="905.75" />
+ <rect
+ style="opacity:1;fill:#8d7250;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.7869432;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-1-9"
+ width="5.1249971"
+ height="95.521149"
+ x="404.42825"
+ y="905.75" />
+ <rect
+ style="opacity:1;fill:#8d7250;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.78352618;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-1-9-9"
+ width="5.1157503"
+ height="95.521187"
+ x="390.95599"
+ y="905.75" />
+ </g>
+ <g
+ inkscape:label="barette droite"
+ id="g1971">
+ <rect
+ style="opacity:1;fill:#0c0e04;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.92261076;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-8"
+ width="5.5"
+ height="95.5"
+ x="507.33914"
+ y="905.73944" />
+ <rect
+ style="opacity:1;fill:#20241d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.8297568;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-85"
+ width="8.3565063"
+ height="2.8125002"
+ x="505.91089"
+ y="902.92694" />
+ <rect
+ style="opacity:1;fill:#20241d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83685058;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-8-0"
+ width="8.5"
+ height="2.8125002"
+ x="505.7674"
+ y="1001.2606" />
+ <rect
+ style="opacity:1;fill:#6c6356;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99914479;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-1-96"
+ width="1.4282506"
+ height="95.521187"
+ x="512.83911"
+ y="905.73944" />
+ <rect
+ style="opacity:1;fill:#6c6356;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99914479;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-1-2-3"
+ width="1.4282506"
+ height="95.521187"
+ x="505.91089"
+ y="905.73944" />
+ <rect
+ style="opacity:1;fill:#8d7250;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.83284712;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-1-9-8"
+ width="5.2499971"
+ height="95.521149"
+ x="514.2674"
+ y="905.73944" />
+ <rect
+ style="opacity:1;fill:#8d7250;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.78352618;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1633-4-1-9-9-5"
+ width="5.1157503"
+ height="95.521187"
+ x="500.79514"
+ y="905.73944" />
+ </g>
+ <g
+ inkscape:label="composants"
+ id="g1962">
+ <g
+ id="g1280"
+ inkscape:label="g1280">
+ <rect
+ y="953.44104"
+ x="449.29446"
+ height="19.934158"
+ width="20.88909"
+ id="rect406"
+ style="opacity:1;fill:#192122;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.69871545;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="955.11212"
+ x="470.18356"
+ height="16.711269"
+ width="3.7762744"
+ id="rect1213"
+ style="opacity:1;fill:#778f88;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.254107;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="954.69434"
+ x="445.68698"
+ height="17.188734"
+ width="3.607465"
+ id="rect1213-5"
+ style="opacity:1;fill:#778f88;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.22565818;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ transform="rotate(90)"
+ y="-468.09464"
+ x="949.96735"
+ height="16.711269"
+ width="3.3542509"
+ id="rect1213-9"
+ style="opacity:1;fill:#778f88;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.06688738;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ transform="rotate(90)"
+ y="-467.97528"
+ x="973.37518"
+ height="16.711269"
+ width="3.7762744"
+ id="rect1213-9-3"
+ style="opacity:1;fill:#778f88;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.254107;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ id="g1328">
+ <rect
+ y="883.88568"
+ x="512.3363"
+ height="11.985463"
+ width="7.6808257"
+ id="rect1282"
+ style="opacity:1;fill:#c3c8c2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.14229429;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="883.88568"
+ x="497.94531"
+ height="11.39463"
+ width="7.089993"
+ id="rect1282-7"
+ style="opacity:1;fill:#c3c8c2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07008839;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="883.88568"
+ x="498.78937"
+ height="8.9468946"
+ width="20.299341"
+ id="rect1301"
+ style="opacity:1;fill:url(#meshgradient1311);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.49879837;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ id="g1352">
+ <rect
+ y="854.72516"
+ x="498.71207"
+ height="14.085215"
+ width="7.5200725"
+ id="rect1330"
+ style="opacity:1;fill:#0b0d0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.59660435;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="850.66675"
+ x="498.71207"
+ height="4.0584512"
+ width="7.5200768"
+ id="rect1332"
+ style="opacity:1;fill:#8a8f8c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.08690989;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="868.81036"
+ x="498.71207"
+ height="4.0584512"
+ width="7.5200768"
+ id="rect1332-4"
+ style="opacity:1;fill:#8a8f8c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.08690989;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ id="g1391">
+ <rect
+ y="833.89996"
+ x="493.38376"
+ height="7.0710683"
+ width="11.844039"
+ id="rect1354"
+ style="opacity:1;fill:#766e56;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04481506;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="505.22778"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="491.35083"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-2"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="translate(-7.4246191,-10.69505)"
+ id="g1391-5">
+ <rect
+ y="833.89996"
+ x="493.38376"
+ height="7.0710683"
+ width="11.844039"
+ id="rect1354-4"
+ style="opacity:1;fill:#766e56;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04481506;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="505.22778"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-7"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="491.35083"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-2-4"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="rotate(90,474.37063,776.81486)"
+ id="g1391-4">
+ <rect
+ y="833.89996"
+ x="493.38376"
+ height="7.0710683"
+ width="11.844039"
+ id="rect1354-3"
+ style="opacity:1;fill:#766e56;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04481506;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="505.22778"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-0"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="491.35083"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-2-7"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="matrix(0,0.82222203,-0.65000002,0,1058.3997,419.47059)"
+ id="g1391-8-4">
+ <rect
+ y="833.89996"
+ x="493.38376"
+ height="7.0710683"
+ width="11.844039"
+ id="rect1354-6-3"
+ style="opacity:1;fill:#766e56;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04481506;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="505.22778"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-8-1"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="491.35083"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-2-8-4"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="matrix(0,-1,0.65000002,0,-105.92688,1481.875)"
+ id="g1391-8-4-8-2">
+ <rect
+ y="833.89996"
+ x="493.38376"
+ height="7.0710683"
+ width="11.844039"
+ id="rect1354-6-3-9-72"
+ style="opacity:1;fill:#192122;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04481506;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="505.22778"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-8-1-2-2"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="491.35083"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-2-8-4-66-6"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="matrix(-0.82222203,0,0,-0.65000002,909.22723,1390.9609)"
+ id="g1391-8-4-1">
+ <rect
+ y="833.89996"
+ x="493.38376"
+ height="7.0710683"
+ width="11.844039"
+ id="rect1354-6-3-0"
+ style="opacity:1;fill:#766e56;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04481506;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="505.22778"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-8-1-6"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="491.35083"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-2-8-4-1"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="matrix(-0.82222203,0,0,-0.65000002,882.88758,1354.8985)"
+ id="g1391-8-4-5">
+ <rect
+ y="833.89996"
+ x="493.38376"
+ height="7.0710683"
+ width="11.844039"
+ id="rect1354-6-3-94"
+ style="opacity:1;fill:#766e56;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04481506;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="505.22778"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-8-1-9"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="491.35083"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-2-8-4-0"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="matrix(-0.82222203,0,0,-0.65000002,813.41429,1380.5311)"
+ id="g1391-8-4-91">
+ <rect
+ y="833.89996"
+ x="493.38376"
+ height="7.0710683"
+ width="11.844039"
+ id="rect1354-6-3-7"
+ style="opacity:1;fill:#766e56;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04481506;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="505.22778"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-8-1-7"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="491.35083"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-2-8-4-11"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="matrix(0,0.82222203,-0.65000002,0,943.31809,449.52265)"
+ id="g1391-8-4-59">
+ <rect
+ y="833.89996"
+ x="493.38376"
+ height="7.0710683"
+ width="11.844039"
+ id="rect1354-6-3-77"
+ style="opacity:1;fill:#766e56;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04481506;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="505.22778"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-8-1-67"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="491.35083"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-2-8-4-3"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ transform="matrix(0,0.82222203,-0.65000002,0,1022.1605,523.94564)"
+ id="g1391-8-4-6">
+ <rect
+ y="833.89996"
+ x="493.38376"
+ height="7.0710683"
+ width="11.844039"
+ id="rect1354-6-3-5"
+ style="opacity:1;fill:#766e56;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.04481506;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="505.22778"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-8-1-63"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="833.89996"
+ x="491.35083"
+ height="7.0710683"
+ width="2.0329323"
+ id="rect1354-5-2-8-4-9"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4328635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <g
+ id="g1842">
+ <rect
+ y="845.0509"
+ x="510.93121"
+ height="9.9490948"
+ width="5.6937637"
+ id="rect1781"
+ style="opacity:1;fill:#0b0d0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76356125;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="855"
+ x="510.93121"
+ height="2.8240948"
+ width="5.6937637"
+ id="rect1781-3"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93959004;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="842.22681"
+ x="510.93121"
+ height="2.8240948"
+ width="5.6937637"
+ id="rect1781-3-0"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93959004;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <text
+ transform="rotate(-90)"
+ id="text1835"
+ y="515.84253"
+ x="-854.21661"
+ style="font-style:normal;font-weight:normal;font-size:5.17906332px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.12947658"
+ xml:space="preserve"><tspan
+ style="stroke-width:0.12947658"
+ y="515.84253"
+ x="-854.21661"
+ id="tspan1833"
+ sodipodi:role="line">.10</tspan></text>
+ </g>
+ <g
+ transform="rotate(90,528.77677,829.87368)"
+ id="g1842-4">
+ <rect
+ y="845.0509"
+ x="510.93121"
+ height="9.9490948"
+ width="5.6937637"
+ id="rect1781-4"
+ style="opacity:1;fill:#0b0d0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76356125;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="855"
+ x="510.93121"
+ height="2.8240948"
+ width="5.6937637"
+ id="rect1781-3-4"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93959004;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="842.22681"
+ x="510.93121"
+ height="2.8240948"
+ width="5.6937637"
+ id="rect1781-3-0-4"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93959004;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <text
+ transform="rotate(-90)"
+ id="text1835-7"
+ y="515.84253"
+ x="-854.21661"
+ style="font-style:normal;font-weight:normal;font-size:5.17906332px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.12947658"
+ xml:space="preserve"><tspan
+ style="stroke-width:0.12947658"
+ y="515.84253"
+ x="-854.21661"
+ id="tspan1833-6"
+ sodipodi:role="line">.10</tspan></text>
+ </g>
+ <g
+ transform="translate(-0.0280966,21.099551)"
+ id="g1842-3">
+ <rect
+ y="845.0509"
+ x="510.93121"
+ height="9.9490948"
+ width="5.6937637"
+ id="rect1781-1"
+ style="opacity:1;fill:#0b0d0f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.76356125;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="855"
+ x="510.93121"
+ height="2.8240948"
+ width="5.6937637"
+ id="rect1781-3-7"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93959004;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="842.22681"
+ x="510.93121"
+ height="2.8240948"
+ width="5.6937637"
+ id="rect1781-3-0-5"
+ style="opacity:1;fill:#b1c5b4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93959004;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <text
+ transform="rotate(-90)"
+ id="text1835-9"
+ y="515.84253"
+ x="-854.21661"
+ style="font-style:normal;font-weight:normal;font-size:5.17906332px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.12947658"
+ xml:space="preserve"><tspan
+ style="stroke-width:0.12947658"
+ y="515.84253"
+ x="-854.21661"
+ id="tspan1833-62"
+ sodipodi:role="line">.10</tspan></text>
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/hardware/apf6/svg/APF6.svg b/hardware/apf6/svg/APF6.svg
new file mode 100644
index 000000000..da16b9cba
--- /dev/null
+++ b/hardware/apf6/svg/APF6.svg
@@ -0,0 +1,1509 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ id="svg10"
+ width="1219"
+ height="1707"
+ viewBox="0 0 1219 1707"
+ sodipodi:docname="APF6.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)">
+ <metadata
+ id="metadata16">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs14">
+ <linearGradient
+ id="linearGradient2354"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2352" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2294"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2292" />
+ </linearGradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1319"
+ gradientUnits="userSpaceOnUse"
+ x="508.51321"
+ y="947.51123">
+ <meshrow
+ id="meshrow1321">
+ <meshpatch
+ id="meshpatch1323">
+ <stop
+ path="c 2.75548,0 5.51095,0 8.26643,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1325" />
+ <stop
+ path="c 0,3.57928 0,7.15856 0,10.7378"
+ style="stop-color:#6c766c;stop-opacity:1"
+ id="stop1327" />
+ <stop
+ path="c -2.75548,0 -5.51095,0 -8.26643,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1329" />
+ <stop
+ path="c 0,-3.57928 0,-7.15856 0,-10.7378"
+ style="stop-color:#6c766c;stop-opacity:1"
+ id="stop1331" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1469"
+ gradientUnits="userSpaceOnUse"
+ x="476.98148"
+ y="914.44543">
+ <meshrow
+ id="meshrow1471">
+ <meshpatch
+ id="meshpatch1473">
+ <stop
+ path="c 1.33513,0 2.67026,0 4.00538,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1475" />
+ <stop
+ path="c 0,1.47716 0,2.95433 0,4.43149"
+ style="stop-color:#c5ecdf;stop-opacity:1"
+ id="stop1477" />
+ <stop
+ path="c -1.33513,0 -2.67026,0 -4.00538,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1479" />
+ <stop
+ path="c 0,-1.47716 0,-2.95433 0,-4.43149"
+ style="stop-color:#c5ecdf;stop-opacity:1"
+ id="stop1481" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1483"
+ gradientUnits="userSpaceOnUse"
+ x="476.85364"
+ y="921.34833">
+ <meshrow
+ id="meshrow1485">
+ <meshpatch
+ id="meshpatch1487">
+ <stop
+ path="c 1.33513,0 2.67026,0 4.00538,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1489" />
+ <stop
+ path="c 0,1.47716 0,2.95433 0,4.43149"
+ style="stop-color:#c5ecdf;stop-opacity:1"
+ id="stop1491" />
+ <stop
+ path="c -1.33513,0 -2.67026,0 -4.00538,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1493" />
+ <stop
+ path="c 0,-1.47716 0,-2.95433 0,-4.43149"
+ style="stop-color:#c5ecdf;stop-opacity:1"
+ id="stop1495" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1578"
+ gradientUnits="userSpaceOnUse"
+ x="508.51321"
+ y="947.51123">
+ <meshrow
+ id="meshrow1590">
+ <meshpatch
+ id="meshpatch1588">
+ <stop
+ id="stop1580"
+ style="stop-color:#ffffff;stop-opacity:1"
+ path="c 2.75548,0 5.51095,0 8.26643,0" />
+ <stop
+ id="stop1582"
+ style="stop-color:#6c766c;stop-opacity:1"
+ path="c 0,3.57928 0,7.15856 0,10.7378" />
+ <stop
+ id="stop1584"
+ style="stop-color:#ffffff;stop-opacity:1"
+ path="c -2.75548,0 -5.51095,0 -8.26643,0" />
+ <stop
+ id="stop1586"
+ style="stop-color:#6c766c;stop-opacity:1"
+ path="c 0,-3.57928 0,-7.15856 0,-10.7378" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1602"
+ gradientUnits="userSpaceOnUse"
+ x="437.22592"
+ y="895.61163">
+ <meshrow
+ id="meshrow1604">
+ <meshpatch
+ id="meshpatch1606">
+ <stop
+ path="c 4.40308,0 8.80616,0 13.2092,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1608" />
+ <stop
+ path="c 0,1.84645 0,3.69291 0,5.53936"
+ style="stop-color:#7a7c73;stop-opacity:1"
+ id="stop1610" />
+ <stop
+ path="c -4.40308,0 -8.80616,0 -13.2092,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1612" />
+ <stop
+ path="c 0,-1.84645 0,-3.69291 0,-5.53936"
+ style="stop-color:#7a7c73;stop-opacity:1"
+ id="stop1614" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1373"
+ inkscape:window-height="845"
+ id="namedview12"
+ showgrid="false"
+ inkscape:zoom="3.7356954"
+ inkscape:cx="398.92887"
+ inkscape:cy="868.86956"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg10"
+ inkscape:measure-start="0,0"
+ inkscape:measure-end="0,0" />
+ <g
...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2022-02-24 13:25:36
|
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 5d02e1c57773c261a3ff87e1c87d572b71cc6f71 (commit)
from 25c91b9b073e9ebb085a9790d69b2606d73368d8 (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 5d02e1c57773c261a3ff87e1c87d572b71cc6f71
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Feb 24 14:23:01 2022 +0100
[BUILDROOT] 2021.02: Fix pwm-music patch
-----------------------------------------------------------------------
Summary of changes:
.../045-armadeus-add-pwm-music-package.patch | 54 ++++++++++++++++++++++
.../123-armadeus-pywebradio-add-package.patch | 6 +--
2 files changed, 57 insertions(+), 3 deletions(-)
create mode 100644 patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
diff --git a/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch b/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
new file mode 100644
index 000000000..4972dda72
--- /dev/null
+++ b/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
@@ -0,0 +1,54 @@
+Add PWM Music package (mostly to test buzzers connected on PWM ;-) )
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -52,6 +52,7 @@ menu "Audio and video applications"
+ source "package/on2-8170-libs/Config.in"
+ source "package/opus-tools/Config.in"
+ source "package/pulseaudio/Config.in"
++ source "package/pwmmusic/Config.in"
+ source "package/sox/Config.in"
+ source "package/squeezelite/Config.in"
+ source "package/tovid/Config.in"
+Index: buildroot/package/pwmmusic/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/pwmmusic/Config.in
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_PWMMUSIC
++ bool "PWM Music"
++ help
++ PWM Music Library for embedded Linux systems.
++ Currently only supports SMB music ;-)
++
++ https://github.com/will-zegers/PWM-Music-Lib
+Index: buildroot/package/pwmmusic/pwmmusic.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/pwmmusic/pwmmusic.mk
+@@ -0,0 +1,21 @@
++################################################################################
++#
++# pwmmusic
++#
++################################################################################
++
++PWMMUSIC_VERSION = f2cc3bad9e2fa5a78cd7846e651735ec47766248
++PWMMUSIC_SITE = $(call github,will-zegers,PWM-Music-Lib,$(PWMMUSIC_VERSION))
++PWMMUSIC_LICENSE = UNKNOWN
++PWMMUSIC_LICENSE_FILES = README.md
++
++define PWMMUSIC_BUILD_CMDS
++ $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
++ -C $(@D)/src all
++endef
++
++define PWMMUSIC_INSTALL_TARGET_CMDS
++ install -m 0755 -D $(@D)/src/pwmSong $(TARGET_DIR)/root/pwm_smb
++endef
++
++$(eval $(generic-package))
diff --git a/patches/buildroot/2021.02/123-armadeus-pywebradio-add-package.patch b/patches/buildroot/2021.02/123-armadeus-pywebradio-add-package.patch
index 48fc1deed..bb100180c 100644
--- a/patches/buildroot/2021.02/123-armadeus-pywebradio-add-package.patch
+++ b/patches/buildroot/2021.02/123-armadeus-pywebradio-add-package.patch
@@ -2,14 +2,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -30,6 +30,7 @@ menu "Audio and video applications"
+@@ -52,6 +52,7 @@ menu "Audio and video applications"
source "package/on2-8170-libs/Config.in"
source "package/opus-tools/Config.in"
source "package/pulseaudio/Config.in"
+ source "package/pywebradio/Config.in"
+ source "package/pwmmusic/Config.in"
source "package/sox/Config.in"
- source "package/tidsp-binaries/Config.in"
- source "package/tstools/Config.in"
+ source "package/squeezelite/Config.in"
Index: buildroot/package/pywebradio/Config.in
===================================================================
--- /dev/null
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-02-24 10:13:31
|
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 25c91b9b073e9ebb085a9790d69b2606d73368d8 (commit)
from 62e4d3b55e3bdf4b1cb598c9cb8d0d1266687dda (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 25c91b9b073e9ebb085a9790d69b2606d73368d8
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 24 11:10:42 2022 +0100
Revert "[BUILDROOT] Add PWM Music package"
This reverts commit ec875f2aac27e54cf54ff374cd3bdf6022a025ec.
As it breaks build:
Applying 045-armadeus-add-pwm-music-package.patch using patch:
patching file package/Config.in
Hunk #1 FAILED at 52.
1 out of 1 hunk FAILED -- saving rejects to file package/Config.in.rej
-----------------------------------------------------------------------
Summary of changes:
.../045-armadeus-add-pwm-music-package.patch | 54 ----------------------
patches/buildroot/2021.02/cleanup_buildroot.sh | 2 -
2 files changed, 56 deletions(-)
delete mode 100644 patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
diff --git a/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch b/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
deleted file mode 100644
index 59c70d3c8..000000000
--- a/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Add PWM Music package (mostly to test buzzers connected on PWM ;-) )
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -52,6 +52,7 @@ menu "Audio and video applications"
- source "package/on2-8170-libs/Config.in"
- source "package/opus-tools/Config.in"
- source "package/pulseaudio/Config.in"
-+ source "package/pwmmusic/Config.in"
- source "package/pywebradio/Config.in"
- source "package/sox/Config.in"
- source "package/squeezelite/Config.in"
-Index: buildroot/package/pwmmusic/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/pwmmusic/Config.in
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_PWMMUSIC
-+ bool "PWM Music"
-+ help
-+ PWM Music Library for embedded Linux systems.
-+ Currently only supports SMB music ;-)
-+
-+ https://github.com/will-zegers/PWM-Music-Lib
-Index: buildroot/package/pwmmusic/pwmmusic.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/pwmmusic/pwmmusic.mk
-@@ -0,0 +1,21 @@
-+################################################################################
-+#
-+# pwmmusic
-+#
-+################################################################################
-+
-+PWMMUSIC_VERSION = f2cc3bad9e2fa5a78cd7846e651735ec47766248
-+PWMMUSIC_SITE = $(call github,will-zegers,PWM-Music-Lib,$(PWMMUSIC_VERSION))
-+PWMMUSIC_LICENSE = UNKNOWN
-+PWMMUSIC_LICENSE_FILES = README.md
-+
-+define PWMMUSIC_BUILD_CMDS
-+ $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
-+ -C $(@D)/src all
-+endef
-+
-+define PWMMUSIC_INSTALL_TARGET_CMDS
-+ install -m 0755 -D $(@D)/src/pwmSong $(TARGET_DIR)/root/pwm_smb
-+endef
-+
-+$(eval $(generic-package))
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index e8cfb7cda..56fb8e557 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -102,8 +102,6 @@ rm -rf buildroot/package/pci_debug/pci_debug.mk
rm -rf buildroot/package/pcre/0002-Disable-C-unit-tests.patch
rm -rf buildroot/package/pcre/pcre.hash
rm -rf buildroot/package/pcre/pcre.mk
-rm -rf buildroot/package/pwmmusic/Config.in
-rm -rf buildroot/package/pwmmusic/pwmmusic.mk
rm -rf buildroot/package/python-flask-socketio/Config.in
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.hash
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.mk
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-02-24 09:27: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 62e4d3b55e3bdf4b1cb598c9cb8d0d1266687dda (commit)
via cd3aa1777a4dc8592c18efa5f2ed0208e7ec0e03 (commit)
from ec875f2aac27e54cf54ff374cd3bdf6022a025ec (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 62e4d3b55e3bdf4b1cb598c9cb8d0d1266687dda
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 24 10:22:01 2022 +0100
[BUILD] Makefile.in: fix ARMADEUS_TOOLCHAIN_PREFIX
To support other arches than 'arm', ie. 'aarch64'.
commit cd3aa1777a4dc8592c18efa5f2ed0208e7ec0e03
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Feb 23 18:50:09 2022 +0100
[BUILDROOT] post_build.sh: OPOS8M{Mini,Nano} -> OPOS8M{M,N}
So that S11firstboot init.d script can find /etc/fw_env_opos8mm.config
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 2 +-
buildroot/target/device/armadeus/rootfs/post_build.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 54310d908..1ca11afca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,7 +117,7 @@ ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_HOST_DIR)/usr/bin
ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
ARMADEUS_TOOLCHAIN_PREFIX=$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)-
else
-ARMADEUS_TOOLCHAIN_PREFIX=arm-linux-
+ARMADEUS_TOOLCHAIN_PREFIX=$(BR2_ARCH)-linux-
endif
ARMADEUS_GCC_VERSION=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc -dumpversion)
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index e5b6697a4..7c100ab7d 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -43,9 +43,9 @@ if [ "$3" != "imxl" ]; then
echo "OPOS6UL" > $1/etc/machine
fi
elif [ "$3" == "imx8mm" ]; then
- echo "OPOS8MMINI" > $1/etc/machine
+ echo "OPOS8MM" > $1/etc/machine
elif [ "$3" == "imx8mn" ]; then
- echo "OPOS8MNANO" > $1/etc/machine
+ echo "OPOS8MN" > $1/etc/machine
else
echo "APF"${3//[!0-9]/} > $1/etc/machine
fi
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2022-02-23 18:06:38
|
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 ec875f2aac27e54cf54ff374cd3bdf6022a025ec (commit)
from 8e2932b969bb5ed31a94097f7364015ca4268306 (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 ec875f2aac27e54cf54ff374cd3bdf6022a025ec
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Feb 23 19:06:02 2022 +0100
[BUILDROOT] Add PWM Music package
-----------------------------------------------------------------------
Summary of changes:
.../045-armadeus-add-pwm-music-package.patch | 54 ++++++++++++++++++++++
patches/buildroot/2021.02/cleanup_buildroot.sh | 2 +
2 files changed, 56 insertions(+)
create mode 100644 patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
diff --git a/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch b/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
new file mode 100644
index 000000000..59c70d3c8
--- /dev/null
+++ b/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
@@ -0,0 +1,54 @@
+Add PWM Music package (mostly to test buzzers connected on PWM ;-) )
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -52,6 +52,7 @@ menu "Audio and video applications"
+ source "package/on2-8170-libs/Config.in"
+ source "package/opus-tools/Config.in"
+ source "package/pulseaudio/Config.in"
++ source "package/pwmmusic/Config.in"
+ source "package/pywebradio/Config.in"
+ source "package/sox/Config.in"
+ source "package/squeezelite/Config.in"
+Index: buildroot/package/pwmmusic/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/pwmmusic/Config.in
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_PWMMUSIC
++ bool "PWM Music"
++ help
++ PWM Music Library for embedded Linux systems.
++ Currently only supports SMB music ;-)
++
++ https://github.com/will-zegers/PWM-Music-Lib
+Index: buildroot/package/pwmmusic/pwmmusic.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/pwmmusic/pwmmusic.mk
+@@ -0,0 +1,21 @@
++################################################################################
++#
++# pwmmusic
++#
++################################################################################
++
++PWMMUSIC_VERSION = f2cc3bad9e2fa5a78cd7846e651735ec47766248
++PWMMUSIC_SITE = $(call github,will-zegers,PWM-Music-Lib,$(PWMMUSIC_VERSION))
++PWMMUSIC_LICENSE = UNKNOWN
++PWMMUSIC_LICENSE_FILES = README.md
++
++define PWMMUSIC_BUILD_CMDS
++ $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
++ -C $(@D)/src all
++endef
++
++define PWMMUSIC_INSTALL_TARGET_CMDS
++ install -m 0755 -D $(@D)/src/pwmSong $(TARGET_DIR)/root/pwm_smb
++endef
++
++$(eval $(generic-package))
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index 56fb8e557..e8cfb7cda 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -102,6 +102,8 @@ rm -rf buildroot/package/pci_debug/pci_debug.mk
rm -rf buildroot/package/pcre/0002-Disable-C-unit-tests.patch
rm -rf buildroot/package/pcre/pcre.hash
rm -rf buildroot/package/pcre/pcre.mk
+rm -rf buildroot/package/pwmmusic/Config.in
+rm -rf buildroot/package/pwmmusic/pwmmusic.mk
rm -rf buildroot/package/python-flask-socketio/Config.in
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.hash
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.mk
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2022-02-23 12:02:35
|
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 8e2932b969bb5ed31a94097f7364015ca4268306 (commit)
via 0477e60809882d6737bc857f28fb0fd12e913135 (commit)
from efe1a74a4b5b2e20dc669f7179c2b399614224d9 (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 8e2932b969bb5ed31a94097f7364015ca4268306
Merge: 0477e6080 efe1a74a4
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Feb 23 13:01:26 2022 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit 0477e60809882d6737bc857f28fb0fd12e913135
Author: Julien BOIBESSOT <jul...@ar...>
Date: Wed Jan 12 15:21:28 2022 +0100
[HARD] Adding of SVG for APF6_SP
-----------------------------------------------------------------------
Summary of changes:
hardware/apf6/svg/APF6_SP.svg | 2001 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 2001 insertions(+)
create mode 100644 hardware/apf6/svg/APF6_SP.svg
diff --git a/hardware/apf6/svg/APF6_SP.svg b/hardware/apf6/svg/APF6_SP.svg
new file mode 100644
index 000000000..d7efa27b3
--- /dev/null
+++ b/hardware/apf6/svg/APF6_SP.svg
@@ -0,0 +1,2001 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ id="svg10"
+ width="1219"
+ height="1707"
+ viewBox="0 0 1219 1707"
+ sodipodi:docname="APF6SP.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)">
+ <metadata
+ id="metadata16">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs14">
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Lstart"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path1781"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+ transform="scale(0.8) translate(12.5,0)" />
+ </marker>
+ <linearGradient
+ id="linearGradient2354"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2352" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2294"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2292" />
+ </linearGradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1319"
+ gradientUnits="userSpaceOnUse"
+ x="508.51321"
+ y="947.51123">
+ <meshrow
+ id="meshrow1321">
+ <meshpatch
+ id="meshpatch1323">
+ <stop
+ path="c 2.75548,0 5.51095,0 8.26643,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1325" />
+ <stop
+ path="c 0,3.57928 0,7.15856 0,10.7378"
+ style="stop-color:#6c766c;stop-opacity:1"
+ id="stop1327" />
+ <stop
+ path="c -2.75548,0 -5.51095,0 -8.26643,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1329" />
+ <stop
+ path="c 0,-3.57928 0,-7.15856 0,-10.7378"
+ style="stop-color:#6c766c;stop-opacity:1"
+ id="stop1331" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1469"
+ gradientUnits="userSpaceOnUse"
+ x="476.98148"
+ y="914.44543">
+ <meshrow
+ id="meshrow1471">
+ <meshpatch
+ id="meshpatch1473">
+ <stop
+ path="c 1.33513,0 2.67026,0 4.00538,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1475" />
+ <stop
+ path="c 0,1.47716 0,2.95433 0,4.43149"
+ style="stop-color:#c5ecdf;stop-opacity:1"
+ id="stop1477" />
+ <stop
+ path="c -1.33513,0 -2.67026,0 -4.00538,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1479" />
+ <stop
+ path="c 0,-1.47716 0,-2.95433 0,-4.43149"
+ style="stop-color:#c5ecdf;stop-opacity:1"
+ id="stop1481" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1483"
+ gradientUnits="userSpaceOnUse"
+ x="476.85364"
+ y="921.34833">
+ <meshrow
+ id="meshrow1485">
+ <meshpatch
+ id="meshpatch1487">
+ <stop
+ path="c 1.33513,0 2.67026,0 4.00538,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1489" />
+ <stop
+ path="c 0,1.47716 0,2.95433 0,4.43149"
+ style="stop-color:#c5ecdf;stop-opacity:1"
+ id="stop1491" />
+ <stop
+ path="c -1.33513,0 -2.67026,0 -4.00538,0"
+ style="stop-color:#ffffff;stop-opacity:1"
+ id="stop1493" />
+ <stop
+ path="c 0,-1.47716 0,-2.95433 0,-4.43149"
+ style="stop-color:#c5ecdf;stop-opacity:1"
+ id="stop1495" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1578"
+ gradientUnits="userSpaceOnUse"
+ x="508.51321"
+ y="947.51123"
+ gradientTransform="matrix(0.65979383,0,0,0.6825397,174.4481,302.50162)">
+ <meshrow
+ id="meshrow1590">
+ <meshpatch
+ id="meshpatch1588">
+ <stop
+ id="stop1580"
+ style="stop-color:#ffffff;stop-opacity:1"
+ path="c 2.75548,0 5.51095,0 8.26643,0" />
+ <stop
+ id="stop1582"
+ style="stop-color:#6c766c;stop-opacity:1"
+ path="c 0,3.57928 0,7.15856 0,10.7378" />
+ <stop
+ id="stop1584"
+ style="stop-color:#ffffff;stop-opacity:1"
+ path="c -2.75548,0 -5.51095,0 -8.26643,0" />
+ <stop
+ id="stop1586"
+ style="stop-color:#6c766c;stop-opacity:1"
+ path="c 0,-3.57928 0,-7.15856 0,-10.7378" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1565"
+ gradientUnits="userSpaceOnUse"
+ x="508.51321"
+ y="947.51123">
+ <meshrow
+ id="meshrow1577">
+ <meshpatch
+ id="meshpatch1575">
+ <stop
+ id="stop1567"
+ style="stop-color:#ffffff;stop-opacity:1"
+ path="c 2.75548,0 5.51095,0 8.26643,0" />
+ <stop
+ id="stop1569"
+ style="stop-color:#6c766c;stop-opacity:1"
+ path="c 0,3.57928 0,7.15856 0,10.7378" />
+ <stop
+ id="stop1571"
+ style="stop-color:#ffffff;stop-opacity:1"
+ path="c -2.75548,0 -5.51095,0 -8.26643,0" />
+ <stop
+ id="stop1573"
+ style="stop-color:#6c766c;stop-opacity:1"
+ path="c 0,-3.57928 0,-7.15856 0,-10.7378" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ <meshgradient
+ inkscape:collect="always"
+ id="meshgradient1644"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.1806452,0,0,1.0923077,-81.198488,-82.075295)"
+ x="437.22592"
+ y="895.61163">
+ <meshrow
+ id="meshrow1656">
+ <meshpatch
+ id="meshpatch1654">
+ <stop
+ id="stop1646"
+ style="stop-color:#ffffff;stop-opacity:1"
+ path="c 4.40308,0 8.80616,0 13.2092,0" />
+ <stop
+ id="stop1648"
+ style="stop-color:#7a7c73;stop-opacity:1"
+ path="c 0,1.84645 0,3.69291 0,5.53936" />
+ <stop
+ id="stop1650"
+ style="stop-color:#ffffff;stop-opacity:1"
+ path="c -4.40308,0 -8.80616,0 -13.2092,0" />
+ <stop
+ id="stop1652"
+ style="stop-color:#7a7c73;stop-opacity:1"
+ path="c 0,-1.84645 0,-3.69291 0,-5.53936" />
+ </meshpatch>
+ </meshrow>
+ </meshgradient>
+ </defs>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1373"
+ inkscape:window-height="845"
+ id="namedview12"
+ showgrid="false"
+ inkscape:zoom="1.0371673"
+ inkscape:cx="698.47489"
+ inkscape:cy="899.96413"
+ inkscape:window-x="67"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g1779"
+ inkscape:measure-start="0,0"
+ inkscape:measure-end="0,0" />
+ <image
+ y="137.13734"
+ x="-141.03302"
+ id="image1228"
+ xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0a HBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAarBMMDASIA AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3 ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3 uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDvvBlh G3hDSjtHNsnb2roBpsf90VT8EKD4N0r/AK91H6V0GyhrUVzM/syL+6KadMi/uj8q1StNK0rILmX/ AGZF/dH5Un9mxf3R+Vam2k20WQXMz+zYv7o/Kj+zYv7orT20bRTsguZn9mxf3R+VH9mxf3RWnto2 0WQXMz+zIv7opP7Mj/uitTbRtosguZf9mR/3R+VJ/ZkX90Vq7aTbRYLmV/Zcf90Uf2XH/dFau2jb RYVzK/suP+6KT+y4/wC6K1dtG2iw7mT/AGXH/dFJ/ZUf90flWttoxRYLmQNKjI+4Pyo/smL+6K18 UmKLCuZH9kx/3R+VH9kxf3RWvijFOyHdmR/ZMf8AdH5Un9kxf3R+VbG2k20WQrsyP7Ji/uj8qT+y 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 WigBMUYpaKAExRilooAbijFOpMUAJijFLiigBMUYpaWkA3FGKXFKKYCYoxS0UgExRilopgJim4p9 NoAbikxTqSgBuKMUtFADcUYp1JSAYRSYp5FNpgMxSYp9JQA3FGKdRQA3FLilooAbijFOooAbikxT 6TFIBmKMU6imA3FGKdRSATAoxS0tACYpMU6ikAwimkVJTDQBERUZFTGmEUWAhZRURX2qc9KiaiwE JUelRFanNRtSsBCVHpTQo9KkIpMUWC4zaPSin4opWHc6HwR/yJ+nf9cv6muhrnvA/wDyKGnf9c/6 muhq3uIQ0008im0hjaKWigBKKWigQlLRSA5zxTAWkpaSgAooooAKKKKACiiigApKWigBKKWkoEJR S0UDEoxS0UANxxRilooASkp1JQAlFLSUAFJS0UAJRRRQAlFLRQAlFFFMAooooASilooASiiigApM UtFACUUtFACYpKWigBKKWkoAKSlooAb2opaKAG0UtJQISgUtFAwoJxS0UAMADdRjBpTxS9KKAGB8 kDacHvTZFdkYI2044OM1JRQBEAULszcHke3FRyEt5gVsHA7dKnYBlIzimiMKxbqTQAqghQKTB9e9 PpKAGEn9adSFc9h1zQM85NAC0UUUAJg880UtFACUUtJQAUUUUAFFFFABRRRQAUUUUARTPsQHHUgV JSMoYYNLQAUUUUCCiiigAooooAWikpaBhRRRQAlFLSUAFFFFABRRRQIKKKKACiiigYUUUtACYBHN LQKKAExzmm06m0AJRRRQAlFFFABSUUUANNIaU0hoENoopKBhRRS0AFFFFABSUtJQAUlLSUAFJRRQ IKKKKAFopKB0pALRRRQMQ0w04mmmgBpqM080w0hEZ6VGakao2oAiNRtUhqNqBjKSlNJQAUUUUgOg 8D4/4Q/Tv+uf9TXRVzngX/kTtPz/AHD/ADNdJ0qnuAhphpxPsaaaQxKKKKBBSUtFMAooxRQAUUdq KAEJxRS0UAJRRjmloASiiigAooooAKKKKBCUtFFAxKKWkoEFFFFACUUvakoAKSlooGN9qKWigBKK KKAEopaSgApKWimAlFLSUCCiiigApKWigBKKKKACiiigYUlLRQAlJS0UAJRRRQAUlLSUAJSUtJQI KKKKAFooooGJRS0lAhKaehxTqTHB5NADBuLMPypxpNvLYJGadQMQZxzxTWO0ElsfWnimEEnj19KA FoAwc5NLRQISjnB9aDyDR2oGJzmloooAKSlooASkzzjvS0UABOKKKBQAA8UUmCT149KWgAooooEF JS0lABRS0lABRS0lABRRRQAtFIKWgYUUUUAFFFJ3oAKKKKACiiigQUUUUAFFFFAwpaSgUALRRRQA lNp1NoASiiigBKKKKAEopaSgBtIaU0hoENpKWkpjCiiikIWikpaBhSUUUAJRRRQAlJS0UCEoooxQ AoooFFIAooyM4zRQAhppp3amGgY01GakNRmkIY1RGpDUZoAjNRmpGqI0ANNNpTSUAFFJRSGdB4F/ 5E7T/wDcP8zXSiub8C/8ifp//XP+prpKp7gIaaacaaaQDaKWkpgFAoooAWikooAWkopaAEooooAK KKKAEopaSgAooopgFFFFAhMjOKWiigAopKWkAnaiiigAooooASiiigYlFLSUAJRRRQAUUUUAJRRR TAKKKKAEopaSgQUUUUAJRRRQAUUUUAFIM45paKBhSUtJQAUlFFABSc0tFACUlLSUCEooooAWlpKK BgelJj1paSgQUlFFABSdaWkzxQAdKSkwGJyM8Y+tLQMKKKKBBRQBjNIABQAUgIPQ5oPOKAoUYAwO tAwpaSigAPSmIhUkk9e1PooAKTk9qWigBFGB0xS0UUAFFFIDkUCFpKKKAFoopKADnceBiiiigAoo ooAWiiigAooooGFFFFACUUUUCCiiigAooooAKKKKBi0UlLQAUUUUAJTadTaAEpKWigBKKKKAEooo oAbSGlppoEJSUtJQAUUUUAFLSUUDCiiigApKKSgQUUUUAFFFFABRRRSAQrnFLRRQA3pTTTjTTQMY elRmpDUZoEMNRtUhqMmkBEajNSGo2oGMNJSmkoAKKSikB0XgcY8H6d/1z/qa6Oue8FZ/4RHTievl /wBa6Gqe4CGmmnGmkUhiUlLSUxBRRRQAtFI2Qp2gFuwJxmmhyZChRhgZ3Y4oAfRRiigApKWigBKK WkzQAUlFFABRRRQAUlLRTEFFFFIBKKWkoAKKO1FABSUtFACUUUGgApKWkoGJRRRTAKKKSkAUUUUw CiiigQUlLTWAZSD0NAC0UUUAJRRRQAUUUUAFFFFAwpKWkoASiiigAoopKAEoopKBBRRRQAtFFFAB SUuBmkoAKb+FOpKADGBRRSUAJtBOeeuaKWkoGFJS0UCEooooGNcZwMkc54paCMigDGeT+NAC0lLS UAFFFNfd5bbMbscZ6UAOopFztG7Ge+KWgApgLE8fdx+NPooAO1FFFAhKKKKACiiigAooooAKKKKA FooooAKKOaKACiikoGFFFFAgooooAKKKKACiiigApaSigYtFFFACU2nU2gBKKKSgAooooEJRRSUD ENNNOppoEJSUtJTAKKKKQwooooAKSlpOKAEooJABJOAKQEGgQZozRSUDFopKKAFBozSUUALRmk5o pAJTTTqaaAGGmGnmmGkIYajNPNRmgCM1GakNRmgYw0lKaSgBKKKKQHSeCf8AkUNO/wCuX9a6Gue8 E8eENO/65f1roap7ggppp1NNIY2iiimISilpKADNGaKMUAGaXNJiloAKSlpKACiiigBKKKKACiii gAooopiCkpaSkMKKWkoEFFFFABSUUUAFFFFAwpKKCcDNACE0UgHc9aWgApKWkoAKKKKYBRRRQISi ikAwT70ALRRRQAlFFFABRRRQAUUUUDEooooASiiigApKYPMJbcAMHjHcU+gBKSlooEJRRRQAtFFF AwpDmiigQmfakIzS9s0dqAEbODimKDuGSemakPApKACkpaSgApKOaKACiiigYU0MCSAelDqWUgMV 9xTIIjEH3MWLMT9KAJPxopaSgAooooAKKKKADnnP4U0L8xOTg9vSnUUAFFFFAhKKKKACiiigAooo oAKKKKAFooooAKKKKBiUUtFAhKQA85NLRQAUUUUAFFFFABRRRQMKKKKAClpKKACm06mmgBKSlpKA CkpaSgBBkZyc0UtJQAlNpxppoEJSUtJQMKKKKACiiigBM0UUUCE6iiikoAKKKSgYtJRRQAUtFFIA pKWkNACGmmnU00AMNMNPNMNIRGajNSmozQMiNRmpDUbUAMNJTjTaAEooopAdJ4J/5E/Tc/8APIV0 Nc/4J/5FDTf+uQroKp7ggppp1MNIYlFFFMQUUUUAFFFFAC0lFFABSUtJQAUUUUAJRS0lABRRRTAK KKKQgpKKKACgcUUUAFFFFABSUtJ2oAKKRc7eetFAwpuCTz29KdRQAlFFFABSUtJQAUUUUwCiiigA pKKKBBRRRQAlFFFABRRRQAUUUlAwoopKACikooAXNFN6UtAgpKKSgAooooAWigUUAFJS0lACUUtJ QAUUUUAJSUtJQMKSlpKBBRRRQMKKKKACikooAKKKKACiiigAooooAKKQ57fjRQIKKKKACiiigAoo ooACMjqRRRRQAtFFFABRRRQMKKKSgAooooEFFFJ3oAWiiigAoFFFAwooooAKWkooAKbTqaaAEpKW koAKSlpKACkpaSgBDTadTTQISkpaSgAooooGLSUUUAFFFFACUlLSUAJRS0lAgooooAKKKKACiik7 UhiU00402gBhphp5phoERmozUhqM0gI2qM1IajNAxpptONNoAKKKKQHSeC/+RR03/riK6CsHwb/y KWm9v3IreqnuCEpppxpppDEpKWkpiClpKWgAooooAKKKKACkpaSgAooooASiiigAooooAKKKKYhK WikpAFFFFABRRRQAUlFFABSUtJQMKKKSgAooopgJRRRSAKSlopiCikooAKKKKACkpaSgAooooAKK KKACkpaSgYUlLSUAFFFFACYopaSgBKSlpKBBRRRQAtFFFABSUtJQAlFFFABSUtJQAUlLSGgApKKK ACiiigYUUUlAgooooGFFFFABRRRQAUUUUAFJS0nagQUUUUAFFFFABRRRQAUUUUALRSUCgBaKSigB aSjNFAwooooEFFFJQAtFJQSFBJOAO9AC0UlFAC0UUUDCiiigAptKabQIKSiigYUlFFAgpKWkoGJT acabQISkpaSgAooooAKKKKBhRRRQAlJS0lAhKKKKACiikoAWikpaBiUUUUgENNNKaaaBDDTDTzTD QAw1GaeaYaQEZqM1IajNAxhpKU0lABRSUUgOm8GHPhHTcjH7la36xPCT7/C2nNjGYFOB2rbqnuCC mGnGmmkMbRRRTEFFFFAC0UlFAC9qSlpKACiiigAoopKACiiigAooopgFFFFIQlFFFABRRRQAUUUU AJRRRQAUlFFAxKKWkoAKKKSmAUUUUhBSUtJTAM84ooooAKKKKACkoooAKKKKACiiigYUUlFAgpKW koGFFFFABSGig+lAhKSjGKKACiigUAFLSUtABSUUUAJSUtJQAUUUUAFJRRQAlFFFAwooooEFJRRQ AUc568UhOKWgAooooGFFFFAgooooGFJRR3NAgooooAKKKSgBFXbnknJzzTqKSgBaKKKACiiigBAD uYluD0GOlL3oowM5xzQAYB7dKKKKACiikoAWkoooAKKKKACiiigBaKSigBaKKKBiU2nU2gQlFFJQ MKKKKACkoooAaabTjTaBCUUUlMApaSlpAFFFFABRRSUDE7UUUUCEooooAKSiigBaKKKAEoopKQxD TacaaaBDDTDTzUZpAMNRmpDUZoGMNRmnmozQIaaSlJptAIKKKKQzqPB//Ip6Z/17r/Kt0VheD/8A kU9M/wCuC1u1T3BCGmmnGmGkMSiiimIKKKKACiiigAooooAKKKKACkoooAKKKKACiiimAUlLRSEJ RRRmgBsjFI2YKWIGcDvUFpdC53AjDD0qxuFAZR0oGLijFJuFGaBBRRSUDCiikoAO1FFFABSUUUwC iikoEFFFFABRRRQAUUUUAJRRRQAUUUUAFJRRQMKO1FFAgpKKKBhRRRQAlFFJQIKSlpKAEpaSgUDF paSloEJRRSUAFJS0lABRSUUAFFFJQMKKKKACiikoAKKKKBBRRRQMKKKKBBRRRQAUlLSUAFFFFACU UUUAFIM5OcY7UtFABRRRQAtFJRQAtFFFABRRRQAUUUUAFJRRQAUUUUAFFFFABRRRQAUUUUDCjtRR QAU2lpKBCUlLSUDCkpaQUAFJS0lACGmmnGm0CEpKWkpgFFFFIBaKKKBhSUUUAJRRSUCCkpaSgYUU UUAAooooAKSlpKQCGmmnGmmkIjNMNPNMagBhqM080w0ARmozUjVGaAGGm0402gaFopKKQHU+D/8A kU9M/wCuC/yrcFYfhDH/AAiemY/54L/Ktyqe4IDTDTjTTSGJRRRTEFFFFABRRRQAUUUUAFFFFABS UtJQAUUUUAFFFJQIWkoooAKaRTqKAI9tGKkpKAGYNKBTqKBiUUtJQAUUUlABRRRQAlFFFMAooooE JRRRQAUUUUAIKWiigBKKKKACiiigBKKWkoAKKKTtQAUUUUDCiiigBKKKSgQUlLSUAJRRRQMWigUU CCkpaTPOKACkoooASiikoAWkoooGFJS0UCEooooAKKKKACiiigAooooAKKKKAEooooAKKKSgAooo oAKKKKACiiigAooooAUUUlLQAUUUUAFFFFACUUUUAFFFJQAtFJS0AJS0lFAC0UUUDCiiigBKbTqb QISiiigYUlFFABSUtJQAhptONNoENopaSmAUUUUgClpKKAFpKKKBic85oopKBBSUtJQMKKKKACii igApKWkpAIaaacaaaBEZphp5phpARmozUhqM0AMNRmnmmGgBhptONNoGgooooA6jwd/yKWmf9cF/ lW7WF4O/5FLTP+uC1u03uCENNNONNNIYlFFFAgooopgFFFFABRiiigAooooAKSlpKACiiigAoooo AKKSloEJ2ooooAKKKQZ5zQAtJS0lAAeRSdqWkoGFJS0UAJRRRTAKSiigAoopKQgooIB60UwCiiig ApKKKACiiigBO9LRRQAlFLSUDCkJAHJpaTtzQAUUUUAFJS0lABSUtJQIKSlpKAEooooAKWkpRQAU lLSUAJRRRQAlJS96KAEooooGFJS0lAgooooAKKKKACiiigAopKKAClpKWgBKKKKACkpaSgAooooA KKKKACiiigAooooAKKKKAFooooAKKKKAEooooAKSlpKAFpKKKACiiigBaSlpKBi0UUUAJTadTaBC UUUUDEooooAKSlpKAGmkNKaSgQ2iiimAUUUUgCiiigAoopKACkpaSgApKWkoGFFFFAAKKKKACkpa KQDTTTTzTTQIiNMNSGmGkBGajYVIajY0ARmozUhqM0AMptONNoGgooooA6jwfz4S0z/rgtbtYXg7 /kUtM/64LW7Te4IQ9KaacaaaQxKKKKBBRRRTAKKKKACiiigAooooAKSlpKACiiigAoopKYBS0lLS EJRRRQMKKKKBBSUtJQAUUUUAJ2pKWkoGFJntS0UwEooooEJRS0lABRRRQAUUUUAFJRRQAUUUUDCi iigQlFFFAwooo7UAJjnrxRRRQAUlFFABSUtJQIKSiigBKKKKBhS0lLQIKSiigBKKKSgAooooASii igYlFFAoEFFFFABRRRQAUUUlABRRRQAtFJRQAUUUUAFJRjmigAooooAKKTpS0AFFFJQAtFFFABRR RQAtFFFABSUtJQAUUUUAFJRiigAooooAKKKKAFooooGFFJRQIDTaWkoGJRRRQAlFFFABSUtJQAhp ppTSUCG0lLRTASlpKWkAUUUUAFFFFACUlLSUAJRRRQMKKSigBRS0lGaAFpKM0maQBTTSmmmgQw1G aeaYaAIzUZqQ1GaQDDUZp5qM0AMx15JpKU0lAwooooA6jwd/yKOmevkLW7WF4O58JaZ/1wWt2m9w QhpppxpppDEooooEFFFFMAooooAKKKKACiiigBKKKKACiiigApKWigBKKWigQlFFFABRRRQAUlFF ABRRSUAFJS0lAwooopgJRRRQIKSiigAooooAKKKKAEooooAKKBnvRQAUlLRQAlFIQc5zx3pc0DCk paKAEopDRQAtJRRQAUlFFAhKSlpKACiiigYtFJS0CEoopKACkpaSgApKKKACkxS0lABQKKKACiii gAooooASiiigAooooAKKKKACiikoAWko6UUAFFFJQAHByOtFFFAC0lFFAC0UlFAC0UUUAFLSUUAL SUUUAFFFFABSUUUAFFFFABRRRQAtJRRQMKWkooADTaWm0AFJS0lABRRRQAUlLSUANNNpxptAhKSl pKYBRRRQAtFJRSAWkoooASiikoGFJS0lABRRRQIKKKKQwpKWigBtNNONNNAhhqM1IajNADDUZqQ1 GaQEZqM1IajNADDSUpptA0LRSUUhnU+Dv+RS0zHTyFrdFYXg7/kUtN/64LW6Kp7iQhpppxpppDEo oooEFFFFMAooooAKKKKACiiigApKKKACiiimAUlLRSEJS0lLQAlFFFABRRRQAUlLSUAFFFFAxKSl pKACiikoAKKKSmIWkoooAKKKKAEoo9aKACiiigYUUUlAC0lFFAgoopKAFzSUtJQMKSlpKACiiigQ lFFRpNHI7okisyHDAHJX60APpKWkoAKKKKBhS0lLQISkpaSgBKKKKAEooooAKSlpKACiiigAoooo AKKKKAEooooAKKKTpQAtFFFABSUtJQAUUUUAITggYooooAKKKKACiiigAooooAWiiigAooooAKKK KACikooAKKKKACiiigAoFFFABRRRQMBRRRQAhptOptABSUtJQAUUlFABRRSUCENNNONNoASkoopg FFFFABRRRSAKKKKAEooooGJSUtJQAUUUUCCiiikMKKKKAG0004000CIzTDTzTDQAw1GaeajNIBhq M1IajNADDTacabQNBRRRSGdN4Kff4O0psYzbr/KugFc/4K/5E/S8dPIWugFUxCGm04000hiUUUUC CiiimAUUUUAFFFFABRRRQAlFFFABRRRQAUUUlAhaSiigAooo70AFFFFABSUUUAFJS0lABSUUUDCk paSmIKKKSgAooooAKKKKAEooooAKKKKACiiigYlFFFAgooooAKSiigApKWkoAKSlpKACoo7aGGSR 44kR5Dl2VcFj71LRQAlJS0lABRRRQMBS0lLQISkpaSgBKSlNJQAUUUUDCkpaSgQUUUUAFFFFABRR RQAlFFFACUtFJQAtFFFABSUUUAFJS0lABRRRQAUUUUAFFJiloAKKKKAFopKWgAooooAKKKKACkoo oAKKKKACiiigAooooAKKKKBhRRRSEIabTjTaYwpKKKAEooooAKSlpO1AhDTTTjTaAG0UUUwCikpa ACiiikAUUUUAJSUtJQMKSlpKACiiigQUUUUhhRRRQA00004000CIzTDTzTDSAjNRmpDUZoGRtUZq Q0w0CIzSUppKBoKKKKQHTeCiD4O0vHTyFroBXP8AgoY8HaWP+nda3xVdQA02nGmmkMSiiigQUUUU wCiiigAooooAKKKKAEooooAKKKKACkpaKBBSUUUAFFFFABRQOBRQAlFFFABSUUUDEooopiCkpaSg YUUUlAgooooAKSlpKACiikOcHB5oAWiijtQAUlHNByRwcGgAoopOd3XigAopCD2OPXil5z14oGFF HOPekweOfrxQIKKOcdaKACkoooAKKKSgApKWkoAKKKBQMKWko7UCCkpaSgBKSlpKACiiigApKWko AKKKKACkpaSgBaSiigAooooAKSlooAQDFFLSUAFFFFABSUtJQAUUUUAFFFJQAUUUUALRSUtABRRR QAtFFFABSUtJQACiiigAoFFJQAtFFFABSUtJQAtFFFAwooo7UhCU2nU2mMSiiigBKKKKACkpaSgQ lNpxppoASkpaYCSzAqQB0PrTAFZWJAIJHWlycnijHpS0gCiiigApKWkoAKSl7UlAwpKWkoAKKKKB BRRRSGFJS0lACU006mmkIjNMNPNMNMCM1GakNRmkBGajapGqM0AMNJSmkoGgooopDOp8Hjb4S0se luv8q3BWF4OAHhHSwDn/AEdP5VuiqYgNNpxptIYlFFFAgooopgFFFFABRRRQAUlLSUAFFFFABRRR QAUUUUCEooooAKKKKACiiigBKKO1FACUUtJQMSiiigApKWkpgFJS0lAgooooAKSiigAooooAKKKK BiUUUUAFFFJQIKKKKACiikoAKKKKAEooooAKSlpKACkpaSgAopKBQMWlpKKBBSUtJQAlJS0lABSU tJQAUd80UUAFFFFABRRRQAlFFFABRRRQAUUUlABSHIYYHB4NOpMUAFFFFABSUUUAFFFFACUtFJQA tJRRQAtFFFABRRRQAUUUUALSUUUAFFFFABSUtJQAtFFFACUUUUALSUtJQMWikpaBCU2nU2gYlFFF ACUUUUAFJS0lAhDTTSmm0AJRRRTASlpKWkAUUUUAFJS0lABSUUUDEooooAKKKKBBRRRSAKSlpKBi Uw0+mGgQw0w080w0ARmozUhqM0hkbVGakaozQIYaSlNJQNBRRRSGdR4OGPCOlDOf9HT+VborD8H4 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 gBKKKBQAtFFFAwooooASm06m0AJRRRQAlFFFABSUtJQAhplONJQIbRRRTGFFFFABRRRQAUUUUgEo oooASkpaSgQUUUUAFFFFIApKWkoAaaaacaaaAGGozTzTDQBGaYaeajNIBhqM1IajagBlJS0lA0FF FFAzrvC3/IraZ/17R/8AoIrYrH8Lf8ivpmP+faP/ANBFbFMSENJSmkpDEooooAKKKKYBRRRQIKKK KACiiigAooooAKSiigApKWkoEFFFFABSUUUDCkoooAKKKKAEooooAKSiimIKSlpKACiiigYUlLSU AFFFJQAUUUUAFFFFACUUUUCEooooAKKKKACkpaKAEooooASiiigApKWkoASkpaSgYUUUlAC0tIKW gBKKKKBCUUUUAIBjPX8aKKKACkpaSgAooooAKSlpKACiiigApKKKACiiigAooooAKSlpKACiiigA opKKACiiigAooooAKKKKAFooooAKKKKACiiigApKWigApKKKAClpKKACiiigBaKKKBhRRRQAlNp1 NoASkpaKAEooooAKSlpKAGmm0402mISiiigYUUUUAFFFFIAooooASiiigBKSlpKBBRRRQAUUUUAF JS0lIBppppxppoAjNMNPNRmgBhqM1IajNIBhqNqeajagBtJS02gYtFJRQM6/wt/yK2l/9e0f/oIr YFY/hb/kVtL/AOvaP/0EVsCm9xIQ0lKaSkMSiiigAooopgFFFFAgooooAKKKKACiiigApKWkoAKS lpKBBRRRQAUlFFAxKKWkoAKKKSgAoo570UAJRRRTEFJS0lABRRRQMSilpKACkpaKAEoFFAoAKKKK AEooooEJRRRQAUUUUAFJS0lABRRRQAlFHfNFABSUtJQMSkpaSgBKWkpaAClpKWgBKKKSgQUUUlAB RRRQAUlLSUAFJRRQAUUUUAFFFFACUUUUAFFFJQAtFJRQAtJRRQAUUUlABRRRQAUUUUAFFFFABRRR QAUtJS0AFFFFABRRSUALSUUUAFFFFAAfrRRRQAUUUUAFLSUUDFFFFFACU006mmgBKSlpKACiiigA pKWkoAaaaacabTEJRRRQMSlpKWkAUUUUwCkpaSkAUUUUAJSUtJQIKKKKACiiigApKKKQDTTDTzTD QAw1GakNRmgBhqM080w0gIzUZqQ1G1ADDSUppKBoM0UUUDOw8L/8ivpn/XtH/wCgitcVj+FuPC2l /wDXtH/6CK2BT6iQhpKU0lIYlFFFABRRRTAKKKKBBRRRQAUUUUAFFFJ+NABRRRQAUlLSUCCiiigB KKKO9AwpKKKACkpaSgAoopKYgooooASiiigAooo7UDEpCSMcZpaKACkpaSgAooooAKKKKAEo7UUU CEooooAiEjG4aPyzsUZ39s+lS0UUAFJRRQAUUUlABRRRQMKSiigQlJSmkoGJRRRTAWiiikAUnSlp CARg9KBCAgjI5FFHTgUUAFFFFACUUUUAJRRRQAUUUlAC0lLSUAFFFFABSUUUAFFFFACbRu3Y5xjN LRRQAUlFFACUtJRQAtJRRQAUUUUDFopKKBC0UUUALRSUUALSUUUAFFFFABSUtJQAtFFFABRRRQMK KKKAClpKKACm06m0AJSUtJQAUUUlABSUtJQAhptLTaYgpKWkoAKKKKQBuAIGeTS0mKKBi0lFFABS UtJQAlFFFAgooooAKKTvS0AIAB0oopDSAQ0w06mmgBhqM1IajNAEZqM1IaYaQEZqNqkNRtQAw0lK aSgYUUUUDOv8Lf8AIraX/wBe0f8A6CK2BWP4WOfC2ln/AKdo/wD0EVsCm9xIQ0lKaSkMSiiigQUU UUwCiiigAooooAKKKKACiiigBKKKKACkpaSgQUUUlAwooooASiiigApKKKACkpaSmIKKKSgAoooo AKKKKBiUUUUAJRRRQAUUUUAFFFFACUUUUCEooooAKKKKAEooooAKSlpKACiiigYlFFFAhtFLSUDE ooooAWiiigApKWkoEFJRRQAUlLSUAFJS0lABRRRQAUUUlABRRRQAUUUlABRRRQAUUUUAFJS0lABR RRQAUlLSUAFFFFABRRRQMKKKKBC0UUUAFFFFABRRRQAUUUlAC0lLSUALRSUUALSA8n2oooGLRRRQ AUUUUAHam0tNNABSUtJQAUUUUAFNNLSUAIaZTjSUxCUlLSUDCiiikIKKKKBhRRRQAUlLSUAJRRRQ IKKKSgBaKKKAEpKWkpANNNNONNNADDUZqQ1GaAGGozTzTDSAjNRmpDUZoAZSUtJQNBRRRQM67wr/ AMitpf8A17R/+gitgVj+Ff8AkVtLz/z7R/8AoIrYFN7iQGkpaSkMSiiigAooopgFFFFAgooooAKK KKACiiigBKKKKBBSUUUDCiikoEFJS0lAwpOlLRQAlFFFACUUUUxBSUioFLEZ+Y5PNLQAUUUUAFFJ RQMKKKKAEooooAKKKKACiikoAKKKSgQUUUUAFFFFACUUUUAFJRRQAUUUUDEpKWkoEJRRRQMSiiig BaKBRQAUlLSUCEooooASiiigApKWkoAKKKSgBaSiigAoopKACiiigAooooAKKKSgBaSiigAooooA SiiigAooooAKKKKACiiigBaKSigYtFFFAgpKKKACiiigAzRRRQAUUUUAFFFFAxaKKKACiiigAplO NNoAKSlpKACiikoAKSlpKAGmm0402mISiiigAooopAFFFFAwooooAKSlpKAEooooEJRRRQAUtJRQ AUUUlIBDTDTjTTQAw1GakNRmgCM0w081GaQDDUZqQ1EaAG0lKaSgaCiiigZ13hXnwrpf/XtH/wCg itisXwkd3hPSz/07R/yFbVN7iQUlLSUhiUUUUAFFFFMAooooEFFFFABRRRQAUUUlABRRRQISiiig YUlLSUAFJRRQAUUUUAJRRRQAlFFFMQUlFFABRRRQMSiiigApKMnOMcY60UAFFFFABRRRQAUUUlAB SdqWigQlFFFABRSUUAFFFFACUUUUAFJS0lAwpKWkoEJSUtJQMKKKKAFooooAKSlpKBCUUUUAJRRR QAUlFFABSUUUAFFFJQAtJ1oooAKKSigAooooAKKKKACiiigAoopKACiiigAooooASlpKKAFopKWg YUtJRQIKWkooAKKKKBhSYyKWkoELRSUUALRSUtABRRRQMKWkpaACikbcVO0gHHBIzSjpz1oAQ031 px6U2gApKWkoAKSlpKACkNLSZoAaabTjTaYCUUUUCCiiikAUUUUDCiiigBKKKSgApKWkoEFFFFAB RRRQAUlLSUgGmmmnGmmgBhqM080w0ARmozUhqM0AMNRGpDUZpANpKU02gYUUUUDOs8I/8ilpX/Xt H/IVtisXwl/yKml/9eyfyFbNN7iQtJRRSGJRRRQAUUUUxBRRRQAUUUUAFFFFABRSUUCCiikoAKKK KBiUUUUAJRRRQAUlFFAgooooASiiimAUlFFABRRRQMSiiigApKWkoAKKKKACiiigAopKKACkpaSg QUUUh6UAFFA6UUAFFFFACUUUUAFJS0lABSUUlABSUtJQMKKKKAFooooAKbnnHenUlAgpKWkoASii igBKKKKAEooooAKSiigAopBnHPNFABRRRQAUUlFAxaKKSgQtFFJQAtJRRQAUUUUAFFFJQAUUUUAF LSUUALRRRQAUUUUAFFJRQAUUUUAFFFFABRRRQAUtJRnAz2oGLRSAgjIpaAFooooASm06m+tABSUt JQAUlLSUAFJS0lADTTacabTEJRRSUALRSUtABRRRSGFFFJQAUlLSUCCkoooAKKKKACiiigApKWkN IBppppxphoAYajNSGozQAw1GaeaYaAIzUZqQ1GaQDabSmkoGFFFFAzrPCX/Ip6X/ANe0f8hW1WJ4 R/5FLS/+vZP5Ctum9xIWkpaSkMSiiimIKKKKACiiigAooooAKKSigAooooAKSlpKBBSUtJQMKKKS gAooooAKSiigQnOfaloooASiiimAlFFFABRRRQMSiiigApKKKACiiigApKKKACiiigQlFFFABRRS UAFFFFABSUtJQAUUUUAJRRRQMSkpaSgApKKKBBRRRQMWiiigApKWkoEJRRRQAlFFJQAUUUlABRRS UAFFFFACUUUUAJRRRQMKKKKACiiikAUUUlMBaKSigQtJRRQAUUUUAFFFFABRRRQAtFJRQAtJRRQA UUUUAFFFFABSUUUALRSUUALRSUUAKKWkpaBhS0lFIANNp1NpgFJS0lACUUUUAFIaWkNADTTacabT EJSUtJQAUUUUALRRRSGFJS0lABSUtJQISiiigAoopKACloooATpQaWkpANNMNONNNADDUZqQ1GaA IzUZqQ1GaQDDUZqQ1EaAGmkpaSgYUUUUhnV+EDnwlpZ/6dk/lW3WH4O58IaV/wBeyfyrcqnuIWko opDEooopgFFFFAgooooAKKKKACkpaKAEooooASiiigQlFFJQMWkoooAKKKKAEooooEFFFJQAUUUU wEooooAKKKKBiUUUhoAWkoooAKKKSgAooooAKSlpKBBRRRQAlFFFABRRRQAUlLSUAFFFJQAUlLSU DCkoooEJRRRQAUUUUAFLSUtAwpKKKBCUUUUAJRRRQAlJS0lABSUtIc4OBk0AFJS0lABSUtJQAUUU lABRRRQAUUUUgCiiimAUUUUAFFFFABSDjqc0tJQAtFFJQAtFJS0AFFFFABRTTuyuCMd806gApKWk oAKKKKACiiigAooooAKKKKAFopKWkMWigUc96ACm0p6UlMBKKKSgAooooAKbTqaaAENNpxptMBKS lpKBBRRRQAUUUUgFpKKKBhSUUUCEooooASiiigApaSigApDS0lIBppppxppoAjNRmpDTDQBGajNS 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...
[truncated message content] |
|
From: Fabien M <fa...@us...> - 2022-02-18 16:23:35
|
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 efe1a74a4b5b2e20dc669f7179c2b399614224d9 (commit)
from 40cf2cfb2e76c7d33a7389b6e3de4b6bd7ef0297 (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 efe1a74a4b5b2e20dc669f7179c2b399614224d9
Author: Fabien Marteau <fab...@ar...>
Date: Fri Feb 18 17:22:53 2022 +0100
[SCRIPTS][DOCKER] adding Dockerfile for apf27 compilation (ubuntu:12.04)
-----------------------------------------------------------------------
Summary of changes:
scripts/docker/apf27-ubuntu-12.04/Dockerfile | 35 ++++++++++++++++++++++++++++
scripts/docker/apf27-ubuntu-12.04/README.md | 18 ++++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 scripts/docker/apf27-ubuntu-12.04/Dockerfile
create mode 100644 scripts/docker/apf27-ubuntu-12.04/README.md
diff --git a/scripts/docker/apf27-ubuntu-12.04/Dockerfile b/scripts/docker/apf27-ubuntu-12.04/Dockerfile
new file mode 100644
index 000000000..61fa39316
--- /dev/null
+++ b/scripts/docker/apf27-ubuntu-12.04/Dockerfile
@@ -0,0 +1,35 @@
+#Build container to build apf27 BSP
+FROM ubuntu:12.04
+MAINTAINER fab...@ar...
+
+ARG USER=docker
+ARG UID=1000
+ARG GID=1000
+ARG PW=docker
+
+RUN useradd -m ${USER} --uid=${UID} && echo "${USER}:${PW}" | chpasswd
+
+# Sources from https://gist.github.com/ivomts/4558134
+RUN echo "deb http://old-releases.ubuntu.com/ubuntu/ precise main restricted" > /etc/apt/sources.list && \
+ echo "deb http://old-releases.ubuntu.com/ubuntu/ precise-updates main restricted" >> /etc/apt/sources.list && \
+ echo "deb-src http://old-releases.ubuntu.com/ubuntu/ precise main restricted" >> /etc/apt/sources.list && \
+ echo "deb http://old-releases.ubuntu.com/ubuntu/ precise-updates main restricted" >> /etc/apt/sources.list && \
+ echo "deb-src http://old-releases.ubuntu.com/ubuntu/ precise-updates main restricted" >> /etc/apt/sources.list
+
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install -y build-essential python libncurses5-dev libqt4-dev libglib2.0-dev
+RUN apt-get install -y wget libgtk2.0-dev lib32z1 lib32stdc++6 rsync unzip
+RUN apt-get install -y zip bc lzma whois git vim
+
+# Locales
+RUN apt-get install -y locales
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+USER ${UID}:${GID}
+WORKDIR /home/${USER}
+
+CMD ["echo","apf27-ubuntu-12.04 image created"]
diff --git a/scripts/docker/apf27-ubuntu-12.04/README.md b/scripts/docker/apf27-ubuntu-12.04/README.md
new file mode 100644
index 000000000..c74b3689a
--- /dev/null
+++ b/scripts/docker/apf27-ubuntu-12.04/README.md
@@ -0,0 +1,18 @@
+# Docker image for apf27 bsp
+
+## Build
+To build it :
+
+```
+sudo docker build -t apf27bsp:1.0 .
+```
+
+## Launch
+
+To launch it dont forget to mount downloads directory and your bsp directory :
+
+```
+sudo docker run --mount src=/downloads,target=/downloads,type=bind \
+ --mount src=/home/user/prj/armadeusbsp,target=/opt/bsp/,type=bind \
+ -it apf27bsp:1.0 /bin/bash
+```
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-02-17 13:32: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 40cf2cfb2e76c7d33a7389b6e3de4b6bd7ef0297 (commit)
from 72d21fabc5c43a8b85490f0d61c876660ecf5861 (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 40cf2cfb2e76c7d33a7389b6e3de4b6bd7ef0297
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 17 14:15:54 2022 +0100
[BUILDROOT] 2021.02: patches for qt5base
Fixes build failures.
-----------------------------------------------------------------------
Summary of changes:
...package-qt5-qt5base-fix-build-with-gcc-11.patch | 89 ++++++++++++++++++++++
...t5base-fix-another-gcc-11-compile-failure.patch | 70 +++++++++++++++++
patches/buildroot/2021.02/cleanup_buildroot.sh | 2 +
3 files changed, 161 insertions(+)
create mode 100644 patches/buildroot/2021.02/417-package-qt5-qt5base-fix-build-with-gcc-11.patch
create mode 100644 patches/buildroot/2021.02/418-package-qt5base-fix-another-gcc-11-compile-failure.patch
diff --git a/patches/buildroot/2021.02/417-package-qt5-qt5base-fix-build-with-gcc-11.patch b/patches/buildroot/2021.02/417-package-qt5-qt5base-fix-build-with-gcc-11.patch
new file mode 100644
index 000000000..3834d2612
--- /dev/null
+++ b/patches/buildroot/2021.02/417-package-qt5-qt5base-fix-build-with-gcc-11.patch
@@ -0,0 +1,89 @@
+From 7bd57831e991ea1239687b83cc94b306f21b9031 Mon Sep 17 00:00:00 2001
+From: Maxim Kochetkov <fid...@in...>
+Date: Tue, 6 Jul 2021 07:29:02 +0300
+Subject: [PATCH 1/1] package/qt5/qt5base: fix build with gcc 11
+
+Fix the following build failure with gcc 11:
+
+text/qbytearraymatcher.h:103:38: error: 'numeric_limits' is not a member of 'std'
+ 103 | const auto uchar_max = (std::numeric_limits<uchar>::max)();
+ | ^~~~~~~~~~~~~~
+
+Signed-off-by: Maxim Kochetkov <fid...@in...>
+Tested-by: Peter Seiderer <ps....@gm...>
+Signed-off-by: Thomas Petazzoni <tho...@bo...>
+---
+ .../qt5base/0007-Build-fixes-for-GCC-11.patch | 61 +++++++++++++++++++
+ 1 file changed, 61 insertions(+)
+ create mode 100644 package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
+
+diff --git a/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
+new file mode 100644
+index 0000000000..d20600c6ce
+--- /dev/null
++++ b/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
+@@ -0,0 +1,61 @@
++From 86494659b2ab14edc653cd2d9260561ad4c4e4e8 Mon Sep 17 00:00:00 2001
++From: Ville Voutilainen <vil...@qt...>
++Date: Mon, 18 Jan 2021 09:58:17 +0200
++Subject: [PATCH] Build fixes for GCC 11
++
++Task-number: QTBUG-89977
++Change-Id: Ic1b7ddbffb8a0a00f8c621d09a868f1d94a52c21
++Reviewed-by: Lars Knoll <lar...@qt...>
++Reviewed-by: Thiago Macieira <thi...@in...>
++[Retrieved (and backported) from:
++https://github.com/qt/qtbase/commit/813a928c7c3cf98670b6043149880ed5c955efb9]
++Signed-off-by: Maxim Kochetkov <fid...@in...>
++---
++ src/corelib/text/qbytearraymatcher.h | 2 ++
++ src/corelib/tools/qsharedpointer_impl.h | 3 ---
++ src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
++ 3 files changed, 3 insertions(+), 4 deletions(-)
++
++diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
++index 0eedfc1d20..f5f9bef7b8 100644
++--- a/src/corelib/text/qbytearraymatcher.h
+++++ b/src/corelib/text/qbytearraymatcher.h
++@@ -42,6 +42,8 @@
++
++ #include <QtCore/qbytearray.h>
++
+++#include <limits>
+++
++ QT_BEGIN_NAMESPACE
++
++
++diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
++index 790c187cb9..4aee98af53 100644
++--- a/src/corelib/tools/qsharedpointer_impl.h
+++++ b/src/corelib/tools/qsharedpointer_impl.h
++@@ -155,9 +155,6 @@ namespace QtSharedPointer {
++ #endif
++ inline void checkQObjectShared(...) { }
++ inline void setQObjectShared(...) { }
++-
++- inline void operator delete(void *ptr) { ::operator delete(ptr); }
++- inline void operator delete(void *, void *) { }
++ };
++ // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)
++
++diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
++index 9e7e1a5572..f0866a90ac 100644
++--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
++@@ -698,7 +698,7 @@ void QXcbWindow::show()
++ if (isTransient(window())) {
++ const QWindow *tp = window()->transientParent();
++ if (tp && tp->handle())
++- transientXcbParent = static_cast<const QXcbWindow *>(tp->handle())->winId();
+++ transientXcbParent = tp->handle()->winId();
++ // Default to client leader if there is no transient parent, else modal dialogs can
++ // be hidden by their parents.
++ if (!transientXcbParent)
++--
++2.31.1
++
+--
+2.34.1
+
diff --git a/patches/buildroot/2021.02/418-package-qt5base-fix-another-gcc-11-compile-failure.patch b/patches/buildroot/2021.02/418-package-qt5base-fix-another-gcc-11-compile-failure.patch
new file mode 100644
index 000000000..b455ea582
--- /dev/null
+++ b/patches/buildroot/2021.02/418-package-qt5base-fix-another-gcc-11-compile-failure.patch
@@ -0,0 +1,70 @@
+From 6202ba67b74e9de7099df8b98e3db8d33490996a Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps....@gm...>
+Date: Sun, 18 Jul 2021 00:08:09 +0200
+Subject: [PATCH 1/1] package/qt5base: fix another gcc-11 compile failure
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- add upstream patch fixing gcc-11 compile failure (missing
+ limits include)
+
+Fixes:
+
+ In file included from ../../../include/QtCore/5.15.2/QtCore/private/qoffsetstringarray_p.h:1,
+ from ../../dbus/qdbuserror.cpp:44:
+ ../../../src/corelib/tools/qoffsetstringarray_p.h:70:22: error: ânumeric_limitsâ is not a member of âstdâ
+ 70 | Last <= std::numeric_limits<quint8>::max(),
+ | ^~~~~~~~~~~~~~
+ ../../../src/corelib/tools/qoffsetstringarray_p.h:70:43: error: wrong number of template arguments (1, should be 3)
+ 70 | Last <= std::numeric_limits<quint8>::max(),
+ | ^
+
+Signed-off-by: Peter Seiderer <ps....@gm...>
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ .../0008-Add-missing-limits-include.patch | 32 +++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+ create mode 100644 package/qt5/qt5base/0008-Add-missing-limits-include.patch
+
+diff --git a/package/qt5/qt5base/0008-Add-missing-limits-include.patch b/package/qt5/qt5base/0008-Add-missing-limits-include.patch
+new file mode 100644
+index 0000000000..e489f2e551
+--- /dev/null
++++ b/package/qt5/qt5base/0008-Add-missing-limits-include.patch
+@@ -0,0 +1,32 @@
++From 87a869a8404047240cccaa9f101351aeb9417a26 Mon Sep 17 00:00:00 2001
++From: Nicolas Fella <nic...@kd...>
++Date: Sun, 20 Jun 2021 17:36:41 +0200
++Subject: [PATCH] Add missing limits include
++
++The code uses std::numeric_limits but is lacking the appropriate include
++
++Pick-to: 5.15 6.1 6.2
++Change-Id: I41fa5ac4d8c4e06f35b5b1551ef2ad8417df80bd
++Reviewed-by: Giuseppe D'Angelo <giu...@kd...>
++
++[Upstream: https://code.qt.io/cgit/qt/qtbase.git/patch/?id=2b2b3155d9f6ba1e4f859741468fbc47db09292b]
++Signed-off-by: Peter Seiderer <ps....@gm...>
++---
++ src/corelib/tools/qoffsetstringarray_p.h | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h
++index 4dd9e960..e26a57ff 100644
++--- a/src/corelib/tools/qoffsetstringarray_p.h
+++++ b/src/corelib/tools/qoffsetstringarray_p.h
++@@ -55,6 +55,7 @@
++
++ #include <tuple>
++ #include <array>
+++#include <limits>
++
++ QT_BEGIN_NAMESPACE
++
++--
++2.32.0
++
+--
+2.34.1
+
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index d3e71f53a..56fb8e557 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -113,6 +113,8 @@ rm -rf buildroot/package/python/Config.in
rm -rf buildroot/package/python/python.mk
rm -rf buildroot/package/pywebradio/Config.in
rm -rf buildroot/package/pywebradio/pywebradio.mk
+rm -rf buildroot/package/qt5/qt5base/0007-Build-fixes-for-GCC-11.patch
+rm -rf buildroot/package/qt5/qt5base/0008-Add-missing-limits-include.patch
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2022-02-17 10:47:45
|
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 72d21fabc5c43a8b85490f0d61c876660ecf5861 (commit)
from 8c9bbc29eb6c44af31fc11b486a8763aadd2fefd (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 72d21fabc5c43a8b85490f0d61c876660ecf5861
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 17 11:45:46 2022 +0100
[BUILDROOT] Bump BR to 2021.02.9
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
...ls-fix_installation_bug_on_some_host_systems.patch | 19 -------------------
patches/buildroot/2021.02/cleanup_buildroot.sh | 1 -
3 files changed, 1 insertion(+), 21 deletions(-)
delete mode 100644 patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
diff --git a/Makefile b/Makefile
index 93619dd95..4dedd4a78 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2021.02
-BUILDROOT_MINOR_VERSION ?= 8
+BUILDROOT_MINOR_VERSION ?= 9
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch b/patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
deleted file mode 100644
index efd7c1828..000000000
--- a/patches/buildroot/2021.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Depending on "cp" version, alsa-utils install may fail with:
- "$(TARGET_DIR)/usr/share/alsa/ directory doesn't exist"
-This patch fixes it.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/alsa-utils/alsa-utils.mk
-===================================================================
---- buildroot.orig/package/alsa-utils/alsa-utils.mk
-+++ buildroot/package/alsa-utils/alsa-utils.mk
-@@ -77,7 +77,7 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS
- fi
- if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \
- mkdir -p $(TARGET_DIR)/usr/share/; \
-- cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \
-+ cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa; \
- fi
- endef
-
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index af9686886..d3e71f53a 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -16,7 +16,6 @@ rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/package/Config.in
rm -rf buildroot/package/agg/Config.in
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/bayer2rgb-neon/Config.in
hooks/post-receive
--
armadeus
|