[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-38-g18aaa6a22
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-38-g18aaa6a22
|
From: Sébastien S. <ss...@us...> - 2019-03-22 13:39:00
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 18aaa6a22694bb9071aa3005f80e9d8a0c2eda6a (commit)
from 5c82571723fa8581ec6d856bb040e4c7059104f0 (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 18aaa6a22694bb9071aa3005f80e9d8a0c2eda6a
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Mar 22 14:36:16 2019 +0100
[BUILDROOT] Prepare patches to BR 2019.02
-----------------------------------------------------------------------
Summary of changes:
.../001-add_armadeus_device.patch | 0
.../002-add_armadeus_specific_packages.patch | 0
...us-gpsd-add-options-setting-in-menuconfig.patch | 11 +--
.../007-armadeus-add-agg-package.patch | 8 +-
.../008-armadeus-add-gnash-package.patch | 4 +-
.../009-armadeus-xc3sprog-new-package.patch | 0
.../010-armadeus-sam7-pgm-ng-new-package.patch | 0
...12-armadeus-add-tkinter-support-to-python.patch | 30 +++---
.../014-armadeus-python-wx-add-package.patch | 8 +-
.../016-armadeus-add-gnuboy-package.patch | 14 +--
.../018-armadeus-add-pcidebug-package.patch | 10 +-
.../019-armadeus-add-cmux-package.patch | 12 +--
.../021-armadeus-add-sdl_water-package.patch | 13 +--
.../025-armadeus-apf-config-add-package.patch | 12 +--
...deus-install-ldd-with-external-toolchains.patch | 14 +--
.../028-armadeus-fbgrab-bump-to-1.3-version.patch | 2 +-
.../029-armadeus-lora-forwarder-add-package.patch | 38 ++++----
.../030-armadeus-lmic-pi-add-package.patch | 12 +--
.../031-armadeus-lepton-add-package.patch | 12 +--
.../031-armadeus-lepton-fix-makefile.patch | 0
.../034-armadeus-add-slideshow-package.patch | 10 +-
...armadeus-fb-test-fixes-tty-config-on-exit.patch | 24 ++---
...madeus-expect-forces-unbuffer-instalation.patch | 2 +-
...add_support_for_custom_configuration_file.patch | 46 ++++-----
...072-armadeus-xenomai-download-adeos-patch.patch | 18 ++--
...ai-add-configure-options-for-old-versions.patch | 0
.../081-adds_quake_package.patch | 11 +--
.../083-pygame-armadeus_addons.patch | 0
.../107-armadeus-games-add-wolf4sdl-package.patch | 8 +-
.../118-armadeus-snes9x-add-package.patch | 10 +-
.../121-target-arm926t_is_arm926ej-s.patch | 0
.../123-armadeus-pywebradio-add-package.patch | 0
.../124-e-uae-add_package.patch | 10 +-
...-disable_ip_busybox_if_iproute2_buildroot.patch | 10 +-
...fix_installation_bug_on_some_host_systems.patch | 0
.../172-gsmmux-add_package.patch | 0
.../176-imx-test-add_package.patch | 16 ++--
.../188-marble-add_package.patch | 4 +-
.../201-armadeus-add_gnokii.patch | 10 +-
.../204-wpa-supplicant-add-option-ieee80211w.patch | 0
...x-coreutils-stty-add-rs485-config-options.patch | 104 +++++++++------------
.../208-armadeus-add_beremiz.patch | 6 +-
.../209-armadeus-add_matiec.patch | 0
.../219-shiboken-add_package.patch | 0
.../237-armadeus-busybox-speed-up-mdev.patch | 10 +-
.../{2018.02 => 2019.02}/cleanup_buildroot.sh | 31 ------
46 files changed, 241 insertions(+), 289 deletions(-)
copy patches/buildroot/{2015.02 => 2019.02}/001-add_armadeus_device.patch (100%)
copy patches/buildroot/{2015.02 => 2019.02}/002-add_armadeus_specific_packages.patch (100%)
copy patches/buildroot/{2015.02 => 2019.02}/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch (88%)
copy patches/buildroot/{2017.02 => 2019.02}/007-armadeus-add-agg-package.patch (94%)
copy patches/buildroot/{2016.02 => 2019.02}/008-armadeus-add-gnash-package.patch (98%)
copy patches/buildroot/{2015.02 => 2019.02}/009-armadeus-xc3sprog-new-package.patch (100%)
copy patches/buildroot/{2015.02 => 2019.02}/010-armadeus-sam7-pgm-ng-new-package.patch (100%)
copy patches/buildroot/{2018.02 => 2019.02}/012-armadeus-add-tkinter-support-to-python.patch (73%)
copy patches/buildroot/{2015.02 => 2019.02}/014-armadeus-python-wx-add-package.patch (96%)
copy patches/buildroot/{2016.02 => 2019.02}/016-armadeus-add-gnuboy-package.patch (89%)
copy patches/buildroot/{2016.02 => 2019.02}/018-armadeus-add-pcidebug-package.patch (91%)
copy patches/buildroot/{2016.08 => 2019.02}/019-armadeus-add-cmux-package.patch (91%)
copy patches/buildroot/{2016.02 => 2019.02}/021-armadeus-add-sdl_water-package.patch (89%)
copy patches/buildroot/{2018.02 => 2019.02}/025-armadeus-apf-config-add-package.patch (88%)
copy patches/buildroot/{2017.02 => 2019.02}/026-armadeus-install-ldd-with-external-toolchains.patch (86%)
copy patches/buildroot/{2016.05 => 2019.02}/028-armadeus-fbgrab-bump-to-1.3-version.patch (99%)
copy patches/buildroot/{2016.08 => 2019.02}/029-armadeus-lora-forwarder-add-package.patch (94%)
copy patches/buildroot/{2016.08 => 2019.02}/030-armadeus-lmic-pi-add-package.patch (91%)
copy patches/buildroot/{2018.02 => 2019.02}/031-armadeus-lepton-add-package.patch (91%)
copy patches/buildroot/{2017.02 => 2019.02}/031-armadeus-lepton-fix-makefile.patch (100%)
copy patches/buildroot/{2018.02 => 2019.02}/034-armadeus-add-slideshow-package.patch (97%)
copy patches/buildroot/{2016.08 => 2019.02}/038-armadeus-fb-test-fixes-tty-config-on-exit.patch (98%)
copy patches/buildroot/{2018.02 => 2019.02}/044-armadeus-expect-forces-unbuffer-instalation.patch (99%)
copy patches/buildroot/{2017.02 => 2019.02}/050-U-Boot-add_support_for_custom_configuration_file.patch (74%)
copy patches/buildroot/{2018.02 => 2019.02}/072-armadeus-xenomai-download-adeos-patch.patch (91%)
copy patches/buildroot/{2015.02 => 2019.02}/073-armadeus-xenomai-add-configure-options-for-old-versions.patch (100%)
copy patches/buildroot/{2016.05 => 2019.02}/081-adds_quake_package.patch (95%)
copy patches/buildroot/{2015.02 => 2019.02}/083-pygame-armadeus_addons.patch (100%)
copy patches/buildroot/{2017.02 => 2019.02}/107-armadeus-games-add-wolf4sdl-package.patch (95%)
copy patches/buildroot/{2018.02 => 2019.02}/118-armadeus-snes9x-add-package.patch (98%)
copy patches/buildroot/{2015.02 => 2019.02}/121-target-arm926t_is_arm926ej-s.patch (100%)
copy patches/buildroot/{2015.02 => 2019.02}/123-armadeus-pywebradio-add-package.patch (100%)
copy patches/buildroot/{2016.08 => 2019.02}/124-e-uae-add_package.patch (89%)
copy patches/buildroot/{2015.02 => 2019.02}/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch (88%)
copy patches/buildroot/{2015.02 => 2019.02}/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch (100%)
copy patches/buildroot/{2015.02 => 2019.02}/172-gsmmux-add_package.patch (100%)
copy patches/buildroot/{2017.02 => 2019.02}/176-imx-test-add_package.patch (97%)
copy patches/buildroot/{2015.02 => 2019.02}/188-marble-add_package.patch (99%)
copy patches/buildroot/{2016.08 => 2019.02}/201-armadeus-add_gnokii.patch (87%)
copy patches/buildroot/{2015.02 => 2019.02}/204-wpa-supplicant-add-option-ieee80211w.patch (100%)
copy patches/buildroot/{2017.02 => 2019.02}/205-busybox-coreutils-stty-add-rs485-config-options.patch (79%)
copy patches/buildroot/{2015.02 => 2019.02}/208-armadeus-add_beremiz.patch (97%)
copy patches/buildroot/{2015.02 => 2019.02}/209-armadeus-add_matiec.patch (100%)
copy patches/buildroot/{2015.02 => 2019.02}/219-shiboken-add_package.patch (100%)
copy patches/buildroot/{2018.02 => 2019.02}/237-armadeus-busybox-speed-up-mdev.patch (82%)
copy patches/buildroot/{2018.02 => 2019.02}/cleanup_buildroot.sh (76%)
diff --git a/patches/buildroot/2015.02/001-add_armadeus_device.patch b/patches/buildroot/2019.02/001-add_armadeus_device.patch
similarity index 100%
copy from patches/buildroot/2015.02/001-add_armadeus_device.patch
copy to patches/buildroot/2019.02/001-add_armadeus_device.patch
diff --git a/patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch b/patches/buildroot/2019.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/2019.02/002-add_armadeus_specific_packages.patch
diff --git a/patches/buildroot/2015.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch b/patches/buildroot/2019.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
similarity index 88%
copy from patches/buildroot/2015.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
copy to patches/buildroot/2019.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
index a3cb16059..ce8c85ed2 100644
--- a/patches/buildroot/2015.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
+++ b/patches/buildroot/2019.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
@@ -4,23 +4,22 @@ Index: buildroot/package/gpsd/Config.in
===================================================================
--- buildroot.orig/package/gpsd/Config.in
+++ buildroot/package/gpsd/Config.in
-@@ -26,6 +26,11 @@ config BR2_PACKAGE_GPSD_DEVICES
+@@ -25,6 +25,10 @@ config BR2_PACKAGE_GPSD_DEVICES
string "Where to look for GPSes"
default "/dev/ttyS1"
+config BR2_PACKAGE_GPSD_OPTIONS
+ string "Daemon options"
+ default ""
-+ depends on BR2_PACKAGE_GPSD
+
- menu "Features"
+ comment "Features"
config BR2_PACKAGE_GPSD_CLIENT_DEBUG
Index: buildroot/package/gpsd/gpsd.mk
===================================================================
--- buildroot.orig/package/gpsd/gpsd.mk
+++ buildroot/package/gpsd/gpsd.mk
-@@ -211,6 +211,7 @@ endef
+@@ -220,6 +220,7 @@ endef
define GPSD_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd
$(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd
@@ -40,9 +39,9 @@ Index: buildroot/package/gpsd/S50gpsd
+DAEMON_OPTIONS="-P $PIDFILE $DEVICES $OTHER_OPTIONS"
start() {
- echo -n "Starting $NAME: "
+ printf "Starting $NAME: "
- start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- -P $PIDFILE $DEVICES && echo "OK" || echo "Failed"
+ start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- $DAEMON_OPTIONS && echo "OK" || echo "Failed"
}
stop() {
- echo -n "Stopping $NAME: "
+ printf "Stopping $NAME: "
diff --git a/patches/buildroot/2017.02/007-armadeus-add-agg-package.patch b/patches/buildroot/2019.02/007-armadeus-add-agg-package.patch
similarity index 94%
copy from patches/buildroot/2017.02/007-armadeus-add-agg-package.patch
copy to patches/buildroot/2019.02/007-armadeus-add-agg-package.patch
index 37c889f36..368cf3949 100644
--- a/patches/buildroot/2017.02/007-armadeus-add-agg-package.patch
+++ b/patches/buildroot/2019.02/007-armadeus-add-agg-package.patch
@@ -66,9 +66,9 @@ Index: buildroot/package/Config.in
+++ buildroot/package/Config.in
@@ -849,6 +849,7 @@ menu "Filesystem"
endmenu
-
+
menu "Graphics"
+ source "package/agg/Config.in"
- source "package/assimp/Config.in"
- source "package/atk/Config.in"
- source "package/atkmm/Config.in"
+ source "package/assimp/Config.in"
+ source "package/atk/Config.in"
+ source "package/atkmm/Config.in"
diff --git a/patches/buildroot/2016.02/008-armadeus-add-gnash-package.patch b/patches/buildroot/2019.02/008-armadeus-add-gnash-package.patch
similarity index 98%
copy from patches/buildroot/2016.02/008-armadeus-add-gnash-package.patch
copy to patches/buildroot/2019.02/008-armadeus-add-gnash-package.patch
index 5c50ac279..5886adaff 100644
--- a/patches/buildroot/2016.02/008-armadeus-add-gnash-package.patch
+++ b/patches/buildroot/2019.02/008-armadeus-add-gnash-package.patch
@@ -145,10 +145,10 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -18,6 +18,7 @@ menu "Audio and video applications"
- source "package/ffmpeg/Config.in"
+@@ -19,6 +19,7 @@ menu "Audio and video applications"
source "package/flac/Config.in"
source "package/flite/Config.in"
+ source "package/gmrender-resurrect/Config.in"
+ source "package/gnash/Config.in"
source "package/gstreamer/Config.in"
source "package/gstreamer1/Config.in"
diff --git a/patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch b/patches/buildroot/2019.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/2019.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/2019.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/2019.02/010-armadeus-sam7-pgm-ng-new-package.patch
diff --git a/patches/buildroot/2018.02/012-armadeus-add-tkinter-support-to-python.patch b/patches/buildroot/2019.02/012-armadeus-add-tkinter-support-to-python.patch
similarity index 73%
copy from patches/buildroot/2018.02/012-armadeus-add-tkinter-support-to-python.patch
copy to patches/buildroot/2019.02/012-armadeus-add-tkinter-support-to-python.patch
index 33f9e85ad..3fdd81d36 100644
--- a/patches/buildroot/2018.02/012-armadeus-add-tkinter-support-to-python.patch
+++ b/patches/buildroot/2019.02/012-armadeus-add-tkinter-support-to-python.patch
@@ -4,25 +4,23 @@ Index: buildroot/package/python/Config.in
===================================================================
--- buildroot.orig/package/python/Config.in
+++ buildroot/package/python/Config.in
-@@ -80,6 +80,18 @@ config BR2_PACKAGE_PYTHON_SSL
- help
- _ssl module for Python (required for https in urllib etc).
-
+@@ -80,6 +80,16 @@ config BR2_PACKAGE_PYTHON_SSL
+ help
+ _ssl module for Python (required for https in urllib etc).
+
+config BR2_PACKAGE_PYTHON_TKINTER
+ depends on BR2_PACKAGE_XORG7
-+ depends on BR2_PACKAGE_TCL
+ select BR2_PACKAGE_TK
+ bool "tkinter"
+ help
+ Tkinter module for Python.
+
-+comment "tkinter needs a X server and tcl"
++comment "tkinter needs a X server"
+ depends on !BR2_PACKAGE_XORG7
-+ depends on !BR2_PACKAGE_TCL
+
config BR2_PACKAGE_PYTHON_UNICODEDATA
- bool "unicodedata module"
- default y
+ bool "unicodedata module"
+ default y
Index: buildroot/package/python/python.mk
===================================================================
--- buildroot.orig/package/python/python.mk
@@ -30,7 +28,7 @@ Index: buildroot/package/python/python.mk
@@ -137,6 +137,12 @@ else
PYTHON_CONF_OPTS += --disable-ossaudiodev
endif
-
+
+ifeq ($(BR2_PACKAGE_PYTHON_TKINTER),y)
+PYTHON_DEPENDENCIES += tk
+else
@@ -41,10 +39,10 @@ Index: buildroot/package/python/python.mk
# try to communicate over the network during the build.
PYTHON_CONF_ENV += \
@@ -162,7 +168,6 @@ PYTHON_CONF_OPTS += \
- --disable-test-modules \
- --disable-lib2to3 \
- --disable-gdbm \
+ --disable-test-modules \
+ --disable-lib2to3 \
+ --disable-gdbm \
- --disable-tk \
- --disable-nis \
- --disable-dbm \
- --disable-pyo-build \
+ --disable-nis \
+ --disable-dbm \
+ --disable-pyo-build \
diff --git a/patches/buildroot/2015.02/014-armadeus-python-wx-add-package.patch b/patches/buildroot/2019.02/014-armadeus-python-wx-add-package.patch
similarity index 96%
copy from patches/buildroot/2015.02/014-armadeus-python-wx-add-package.patch
copy to patches/buildroot/2019.02/014-armadeus-python-wx-add-package.patch
index 72696e324..cea56eed9 100644
--- a/patches/buildroot/2015.02/014-armadeus-python-wx-add-package.patch
+++ b/patches/buildroot/2019.02/014-armadeus-python-wx-add-package.patch
@@ -105,11 +105,11 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -226,6 +226,7 @@ endif
+@@ -316,6 +316,7 @@ comment "Graphic libraries"
+ source "package/tk/Config.in"
comment "Other GUIs"
- source "package/efl/Config.in"
+ source "package/python-wx/Config.in"
- source "package/qt/Config.in"
source "package/qt5/Config.in"
- if BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+ source "package/kf5/Config.in"
+ if BR2_PACKAGE_QT5
diff --git a/patches/buildroot/2016.02/016-armadeus-add-gnuboy-package.patch b/patches/buildroot/2019.02/016-armadeus-add-gnuboy-package.patch
similarity index 89%
copy from patches/buildroot/2016.02/016-armadeus-add-gnuboy-package.patch
copy to patches/buildroot/2019.02/016-armadeus-add-gnuboy-package.patch
index b43b91560..8f259298a 100644
--- a/patches/buildroot/2016.02/016-armadeus-add-gnuboy-package.patch
+++ b/patches/buildroot/2019.02/016-armadeus-add-gnuboy-package.patch
@@ -4,14 +4,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -224,6 +224,7 @@ endmenu
- menu "Games"
- source "package/chocolate-doom/Config.in"
- source "package/doom-wad/Config.in"
+@@ -247,6 +247,7 @@ menu "Games"
+ source "package/doom-wad/Config.in"
+ source "package/flare-engine/Config.in"
+ source "package/flare-game/Config.in"
+ source "package/gnuboy/Config.in"
- source "package/gnuchess/Config.in"
- source "package/lbreakout2/Config.in"
- source "package/ltris/Config.in"
+ source "package/gnuchess/Config.in"
+ source "package/lbreakout2/Config.in"
+ source "package/ltris/Config.in"
Index: buildroot/package/gnuboy/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2016.02/018-armadeus-add-pcidebug-package.patch b/patches/buildroot/2019.02/018-armadeus-add-pcidebug-package.patch
similarity index 91%
copy from patches/buildroot/2016.02/018-armadeus-add-pcidebug-package.patch
copy to patches/buildroot/2019.02/018-armadeus-add-pcidebug-package.patch
index 34a2f8032..ce260c1a4 100644
--- a/patches/buildroot/2016.02/018-armadeus-add-pcidebug-package.patch
+++ b/patches/buildroot/2019.02/018-armadeus-add-pcidebug-package.patch
@@ -4,12 +4,12 @@ Index: buildroot/package/Config.in
+++ buildroot/package/Config.in
@@ -422,6 +422,7 @@ endif
source "package/openpowerlink/Config.in"
- source "package/owl-linux/Config.in"
- source "package/parted/Config.in"
+ source "package/owl-linux/Config.in"
+ source "package/parted/Config.in"
+ source "package/pci_debug/Config.in"
- source "package/pciutils/Config.in"
- source "package/picocom/Config.in"
- source "package/pifmrds/Config.in"
+ source "package/pciutils/Config.in"
+ source "package/picocom/Config.in"
+ source "package/pifmrds/Config.in"
Index: buildroot/package/pci_debug/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2016.08/019-armadeus-add-cmux-package.patch b/patches/buildroot/2019.02/019-armadeus-add-cmux-package.patch
similarity index 91%
copy from patches/buildroot/2016.08/019-armadeus-add-cmux-package.patch
copy to patches/buildroot/2019.02/019-armadeus-add-cmux-package.patch
index f51c00cb1..9fbcfa86c 100644
--- a/patches/buildroot/2016.08/019-armadeus-add-cmux-package.patch
+++ b/patches/buildroot/2019.02/019-armadeus-add-cmux-package.patch
@@ -7,13 +7,13 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
@@ -1185,6 +1185,7 @@ menu "Networking"
- source "package/c-ares/Config.in"
- source "package/canfestival/Config.in"
- source "package/cgic/Config.in"
+ source "package/c-ares/Config.in"
+ source "package/canfestival/Config.in"
+ source "package/cgic/Config.in"
+ source "package/cmux/Config.in"
- source "package/cppzmq/Config.in"
- source "package/czmq/Config.in"
- source "package/filemq/Config.in"
+ source "package/cppzmq/Config.in"
+ source "package/czmq/Config.in"
+ source "package/filemq/Config.in"
Index: buildroot/package/cmux/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2016.02/021-armadeus-add-sdl_water-package.patch b/patches/buildroot/2019.02/021-armadeus-add-sdl_water-package.patch
similarity index 89%
copy from patches/buildroot/2016.02/021-armadeus-add-sdl_water-package.patch
copy to patches/buildroot/2019.02/021-armadeus-add-sdl_water-package.patch
index 651f63f32..f715d77df 100644
--- a/patches/buildroot/2016.02/021-armadeus-add-sdl_water-package.patch
+++ b/patches/buildroot/2019.02/021-armadeus-add-sdl_water-package.patch
@@ -6,15 +6,16 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -277,6 +277,8 @@ endif
- source "package/sdl_sound/Config.in"
- source "package/sdl_ttf/Config.in"
- source "package/sdl2/Config.in"
+@@ -315,6 +315,9 @@ comment "Graphic libraries"
+ source "package/sdl2_net/Config.in"
+ source "package/sdl2_ttf/Config.in"
+ source "package/tk/Config.in"
+comment "Demos"
+ source "package/sdl_water/Config.in"
-
++
+
comment "Other GUIs"
- source "package/python-wx/Config.in"
+ source "package/python-wx/Config.in"
Index: buildroot/package/sdl_water/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2018.02/025-armadeus-apf-config-add-package.patch b/patches/buildroot/2019.02/025-armadeus-apf-config-add-package.patch
similarity index 88%
copy from patches/buildroot/2018.02/025-armadeus-apf-config-add-package.patch
copy to patches/buildroot/2019.02/025-armadeus-apf-config-add-package.patch
index b0b119ef1..23cb1a631 100644
--- a/patches/buildroot/2018.02/025-armadeus-apf-config-add-package.patch
+++ b/patches/buildroot/2019.02/025-armadeus-apf-config-add-package.patch
@@ -52,10 +52,10 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
@@ -359,6 +359,7 @@ endmenu
- source "package/aer-inject/Config.in"
- source "package/am335x-pru-package/Config.in"
- source "package/amd-catalyst/Config.in"
+ source "package/aer-inject/Config.in"
+ source "package/am335x-pru-package/Config.in"
+ source "package/amd-catalyst/Config.in"
+ source "package/apf-config/Config.in"
- source "package/avrdude/Config.in"
- source "package/bcache-tools/Config.in"
- source "package/biosdevname/Config.in"
+ source "package/avrdude/Config.in"
+ source "package/bcache-tools/Config.in"
+ source "package/biosdevname/Config.in"
diff --git a/patches/buildroot/2017.02/026-armadeus-install-ldd-with-external-toolchains.patch b/patches/buildroot/2019.02/026-armadeus-install-ldd-with-external-toolchains.patch
similarity index 86%
copy from patches/buildroot/2017.02/026-armadeus-install-ldd-with-external-toolchains.patch
copy to patches/buildroot/2019.02/026-armadeus-install-ldd-with-external-toolchains.patch
index 6b6cc7b92..3f967827c 100644
--- a/patches/buildroot/2017.02/026-armadeus-install-ldd-with-external-toolchains.patch
+++ b/patches/buildroot/2019.02/026-armadeus-install-ldd-with-external-toolchains.patch
@@ -5,23 +5,23 @@ 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
@@ -506,6 +506,12 @@ define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG
- fi
+ fi
endef
-
+
+define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDD
+ $(Q)if test -f $(STAGING_DIR)/usr/bin/ldd ; then \
+ $(INSTALL) -D $(STAGING_DIR)/usr/bin/ldd $(TARGET_DIR)/usr/bin/ldd ; \
+ $(SED) 's:/bin/bash:/bin/sh:' $(TARGET_DIR)/usr/bin/ldd ; \
+ fi
+endef
-
+
################################################################################
# inner-toolchain-external-package -- defines the generic installation rules
@@ -596,6 +602,7 @@ define $(2)_INSTALL_TARGET_CMDS
- $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS)
- $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER)
- $$(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO)
+ $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS)
+ $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_GDBSERVER)
+ $$(TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO)
+ $$(TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LDD)
endef
-
+
# Call the generic package infrastructure to generate the necessary
diff --git a/patches/buildroot/2016.05/028-armadeus-fbgrab-bump-to-1.3-version.patch b/patches/buildroot/2019.02/028-armadeus-fbgrab-bump-to-1.3-version.patch
similarity index 99%
copy from patches/buildroot/2016.05/028-armadeus-fbgrab-bump-to-1.3-version.patch
copy to patches/buildroot/2019.02/028-armadeus-fbgrab-bump-to-1.3-version.patch
index d1d9947ff..581ca95f8 100644
--- a/patches/buildroot/2016.05/028-armadeus-fbgrab-bump-to-1.3-version.patch
+++ b/patches/buildroot/2019.02/028-armadeus-fbgrab-bump-to-1.3-version.patch
@@ -12,7 +12,7 @@ Index: buildroot/package/fbgrab/0002-fix-1.3-version.patch
+@@ -26,7 +26,7 @@
+ #include <zlib.h>
+ #include <linux/fb.h> /* to handle framebuffer ioctls */
-+
++
+-#define VERSION "1.2"
++#define VERSION "1.3"
+ #define DEFAULT_FB "/dev/fb0"
diff --git a/patches/buildroot/2016.08/029-armadeus-lora-forwarder-add-package.patch b/patches/buildroot/2019.02/029-armadeus-lora-forwarder-add-package.patch
similarity index 94%
copy from patches/buildroot/2016.08/029-armadeus-lora-forwarder-add-package.patch
copy to patches/buildroot/2019.02/029-armadeus-lora-forwarder-add-package.patch
index da18eaf90..d4d4c95ca 100644
--- a/patches/buildroot/2016.08/029-armadeus-lora-forwarder-add-package.patch
+++ b/patches/buildroot/2019.02/029-armadeus-lora-forwarder-add-package.patch
@@ -49,13 +49,13 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
@@ -1508,6 +1508,7 @@ menu "Networking applications"
- source "package/linphone/Config.in"
- source "package/linux-zigbee/Config.in"
- source "package/lldpd/Config.in"
+ source "package/linphone/Config.in"
+ source "package/linux-zigbee/Config.in"
+ source "package/lldpd/Config.in"
+ source "package/lora-forwarder/Config.in"
- source "package/lrzsz/Config.in"
- source "package/macchanger/Config.in"
- source "package/memcached/Config.in"
+ source "package/lrzsz/Config.in"
+ source "package/macchanger/Config.in"
+ source "package/memcached/Config.in"
Index: buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
===================================================================
--- /dev/null
@@ -67,14 +67,14 @@ Index: buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
+--- lora-forwarder-a29921789bc5b63d6a7c51e46dd6314aca06b99e/Makefile 2016-01-06 12:06:08.000000000 +0100
++++ lora-forwarder-a29921789bc5b63d6a7c51e46dd6314aca06b99e.mod/Makefile 2016-10-28 18:38:25.527840090 +0200
+@@ -7,14 +7,14 @@
-+
++
+ all: single_chan_pkt_fwd
-+
++
+-single_chan_pkt_fwd: base64.o main.o
+- $(CC) main.o base64.o $(LIBS) -o single_chan_pkt_fwd
++single_chan_pkt_fwd: base64.c main.cpp
++ $(CC) $(CFLAGS) main.cpp base64.c $(LIBS) -o single_chan_pkt_fwd
-+
++
+-main.o: main.cpp
+- $(CC) $(CFLAGS) main.cpp
+-
@@ -85,11 +85,11 @@ Index: buildroot/package/lora-forwarder/0001-fix-cross-compiling.patch
++#
++#base64.o: base64.c
++# $(CC) $(CFLAGS) base64.c
-+
++
+ clean:
-+- rm *.o single_chan_pkt_fwd
++- rm *.o single_chan_pkt_fwd
+\ Pas de fin de ligne à la fin du fichier
-++ rm -f *.o single_chan_pkt_fwd
+++ rm -f *.o single_chan_pkt_fwd
Index: buildroot/package/lora-forwarder/0002-add-server-ip-runtime-option.patch
===================================================================
--- /dev/null
@@ -106,11 +106,11 @@ Index: buildroot/package/lora-forwarder/0002-add-server-ip-runtime-option.patch
+ #define PORT 1700 // The port on which to send data
++static char *server_ip = SERVER1;
++static int server_port = PORT;
-+
++
+ // #############################################
+ // #############################################
+@@ -317,7 +319,7 @@
-+
++
+ //send the update
+ #ifdef SERVER1
+- inet_aton(SERVER1 , &si_other.sin_addr);
@@ -120,7 +120,7 @@ Index: buildroot/package/lora-forwarder/0002-add-server-ip-runtime-option.patch
+ die("sendto()");
+@@ -325,7 +327,7 @@
+ #endif
-+
++
+ #ifdef SERVER2
+- inet_aton(SERVER2 , &si_other.sin_addr);
++ inet_aton(server_ip, &si_other.sin_addr);
@@ -130,12 +130,12 @@ Index: buildroot/package/lora-forwarder/0002-add-server-ip-runtime-option.patch
+@@ -531,10 +533,31 @@
+ } // dio0=1
+ }
-+
++
+-int main () {
++#include <unistd.h>
++int main (int argc, char *argv[])
++{
-+
++
+ struct timeval nowtime;
+ uint32_t lasttime;
++ int option = -1;
@@ -157,7 +157,7 @@ Index: buildroot/package/lora-forwarder/0002-add-server-ip-runtime-option.patch
++ break;
++ }
++ }
-+
++
+ wiringPiSetup () ;
+ pinMode(ssPin, OUTPUT);
+@@ -553,7 +576,7 @@
@@ -166,6 +166,6 @@ Index: buildroot/package/lora-forwarder/0002-add-server-ip-runtime-option.patch
+ si_other.sin_family = AF_INET;
+- si_other.sin_port = htons(PORT);
++ si_other.sin_port = htons(server_port);
-+
++
+ ifr.ifr_addr.sa_family = AF_INET;
+ strncpy(ifr.ifr_name, "eth0", IFNAMSIZ-1); // can we rely on eth0?
diff --git a/patches/buildroot/2016.08/030-armadeus-lmic-pi-add-package.patch b/patches/buildroot/2019.02/030-armadeus-lmic-pi-add-package.patch
similarity index 91%
copy from patches/buildroot/2016.08/030-armadeus-lmic-pi-add-package.patch
copy to patches/buildroot/2019.02/030-armadeus-lmic-pi-add-package.patch
index 5a8874b82..f5e1c1d40 100644
--- a/patches/buildroot/2016.08/030-armadeus-lmic-pi-add-package.patch
+++ b/patches/buildroot/2019.02/030-armadeus-lmic-pi-add-package.patch
@@ -43,13 +43,13 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
@@ -1251,6 +1251,7 @@ menu "Networking"
- source "package/libwebsock/Config.in"
- source "package/libwebsockets/Config.in"
- source "package/lksctp-tools/Config.in"
+ source "package/libwebsock/Config.in"
+ source "package/libwebsockets/Config.in"
+ source "package/lksctp-tools/Config.in"
+ source "package/lmic-pi/Config.in"
- source "package/mongoose/Config.in"
- source "package/neon/Config.in"
- source "package/norm/Config.in"
+ source "package/mongoose/Config.in"
+ source "package/neon/Config.in"
+ source "package/norm/Config.in"
Index: buildroot/package/lmic-pi/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2018.02/031-armadeus-lepton-add-package.patch b/patches/buildroot/2019.02/031-armadeus-lepton-add-package.patch
similarity index 91%
copy from patches/buildroot/2018.02/031-armadeus-lepton-add-package.patch
copy to patches/buildroot/2019.02/031-armadeus-lepton-add-package.patch
index f901f1837..95eec08ba 100644
--- a/patches/buildroot/2018.02/031-armadeus-lepton-add-package.patch
+++ b/patches/buildroot/2019.02/031-armadeus-lepton-add-package.patch
@@ -55,10 +55,10 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
@@ -428,6 +428,7 @@ endmenu
- source "package/iucode-tool/Config.in"
- source "package/kbd/Config.in"
- source "package/lcdproc/Config.in"
+ source "package/iucode-tool/Config.in"
+ source "package/kbd/Config.in"
+ source "package/lcdproc/Config.in"
+ source "package/leptonmodule/Config.in"
- source "package/libuio/Config.in"
- source "package/libump/Config.in"
- source "package/linux-backports/Config.in"
+ source "package/libuio/Config.in"
+ source "package/libump/Config.in"
+ source "package/linux-backports/Config.in"
diff --git a/patches/buildroot/2017.02/031-armadeus-lepton-fix-makefile.patch b/patches/buildroot/2019.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/2019.02/031-armadeus-lepton-fix-makefile.patch
diff --git a/patches/buildroot/2018.02/034-armadeus-add-slideshow-package.patch b/patches/buildroot/2019.02/034-armadeus-add-slideshow-package.patch
similarity index 97%
copy from patches/buildroot/2018.02/034-armadeus-add-slideshow-package.patch
copy to patches/buildroot/2019.02/034-armadeus-add-slideshow-package.patch
index a55d07808..6a4c4be3d 100644
--- a/patches/buildroot/2018.02/034-armadeus-add-slideshow-package.patch
+++ b/patches/buildroot/2019.02/034-armadeus-add-slideshow-package.patch
@@ -7,12 +7,12 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
@@ -269,6 +269,7 @@ comment "Graphic applications"
- source "package/pngquant/Config.in"
- source "package/qt5cinex/Config.in"
- source "package/rrdtool/Config.in"
+ source "package/pngquant/Config.in"
+ source "package/qt5cinex/Config.in"
+ source "package/rrdtool/Config.in"
+ source "package/slideshow/Config.in"
- source "package/tesseract-ocr/Config.in"
-
+ source "package/tesseract-ocr/Config.in"
+
comment "Graphic libraries"
Index: buildroot/package/slideshow/Config.in
===================================================================
diff --git a/patches/buildroot/2016.08/038-armadeus-fb-test-fixes-tty-config-on-exit.patch b/patches/buildroot/2019.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
similarity index 98%
copy from patches/buildroot/2016.08/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
copy to patches/buildroot/2019.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
index ac7362746..dfbabe59e 100644
--- a/patches/buildroot/2016.08/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
+++ b/patches/buildroot/2019.02/038-armadeus-fb-test-fixes-tty-config-on-exit.patch
@@ -15,9 +15,9 @@ Index: buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.pat
+--- fb-test-app-rosetta-1.1.0/common.c 2014-09-25 18:52:11.000000000 +0200
++++ fb-test-app-rosetta-1.1.0.mod/common.c 2015-04-29 09:29:03.617876194 +0200
+@@ -35,12 +35,28 @@
-+
++
+ #include "common.h"
-+
++
++void fb_close(struct fb_info *fb_info)
++{
++ munmap(fb_info->ptr, fb_info->var.yres_virtual *
@@ -33,14 +33,14 @@ Index: buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.pat
+ {
+ char str[64];
+ int fd,tty;
-+
++
+ tty = open("/dev/tty1", O_RDWR);
++ ASSERT(tty >= 0);
++ fb_info->tty = tty;
++
++ if(ioctl(tty, KDGETMODE, &fb_info->oldmode) == -1)
++ printf("Failed to get current mode on tty1\n");
-+
++
+ if(ioctl(tty, KDSETMODE, KD_GRAPHICS) == -1)
+ printf("Failed to set graphics mode on tty1\n");
+diff -urN -X linux-2.6.29.6/Documentation/dontdiff fb-test-app-rosetta-1.1.0/common.h fb-test-app-rosetta-1.1.0.mod/common.h
@@ -52,12 +52,12 @@ Index: buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.pat
+ int fd;
++ int tty;
++ int oldmode;
-+
++
+ void *ptr;
-+
++
+@@ -52,6 +54,7 @@
+ extern char fontdata_8x8[];
-+
++
+ void fb_open(int fb_num, struct fb_info *fb_info);
++void fb_close(struct fb_info *fb_info);
+ void fb_update_window(int fd, short x, short y, short w, short h);
@@ -71,13 +71,13 @@ Index: buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.pat
+ #include <getopt.h>
+ #include <time.h>
++#include <signal.h>
-+
++
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+@@ -196,6 +197,19 @@
+ printf(" -p pattern = fill framebuffer with pattern number\n");
+ }
-+
++
++static int cont = 1;
++
++void signal_handler(int sig)
@@ -97,7 +97,7 @@ Index: buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.pat
+@@ -233,9 +247,17 @@
+ }
+ }
-+
++
++ signal(SIGTERM, signal_handler);
++ signal(SIGINT, signal_handler);
++ signal(SIGQUIT, signal_handler);
@@ -105,10 +105,10 @@ Index: buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.pat
++
+ fb_open(req_fb, &fb_info);
++ atexit(cleanup);
-+
++
+ do_fill_screen(&fb_info, req_pattern);
++ while (cont)
++ sleep(1);
-+
++
+ return 0;
+ }
diff --git a/patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch b/patches/buildroot/2019.02/044-armadeus-expect-forces-unbuffer-instalation.patch
similarity index 99%
copy from patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch
copy to patches/buildroot/2019.02/044-armadeus-expect-forces-unbuffer-instalation.patch
index 35297b245..7c086bf90 100644
--- a/patches/buildroot/2018.02/044-armadeus-expect-forces-unbuffer-instalation.patch
+++ b/patches/buildroot/2019.02/044-armadeus-expect-forces-unbuffer-instalation.patch
@@ -10,7 +10,7 @@ index d78ff6c..d88f00f 100644
@@ -17,4 +17,13 @@ EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
# Since we don't want examples installed
EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-binaries
-
+
+# unbuffer requires TCL_SH interpreter
+ifneq ($(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
+define EXPECT_INSTALL_UNBUFFER
diff --git a/patches/buildroot/2017.02/050-U-Boot-add_support_for_custom_configuration_file.patch b/patches/buildroot/2019.02/050-U-Boot-add_support_for_custom_configuration_file.patch
similarity index 74%
copy from patches/buildroot/2017.02/050-U-Boot-add_support_for_custom_configuration_file.patch
copy to patches/buildroot/2019.02/050-U-Boot-add_support_for_custom_configuration_file.patch
index 8bc8e6cd1..d22890aed 100644
--- a/patches/buildroot/2017.02/050-U-Boot-add_support_for_custom_configuration_file.patch
+++ b/patches/buildroot/2019.02/050-U-Boot-add_support_for_custom_configuration_file.patch
@@ -7,26 +7,26 @@ Index: buildroot/boot/uboot/Config.in
===================================================================
--- buildroot.orig/boot/uboot/Config.in
+++ buildroot/boot/uboot/Config.in
-@@ -22,7 +22,6 @@ config BR2_TARGET_UBOOT_BUILD_SYSTEM_KCO
-
+@@ -23,7 +23,6 @@ config BR2_TARGET_UBOOT_BUILD_SYSTEM_LEG
+
endchoice
-
+
-if BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
config BR2_TARGET_UBOOT_BOARDNAME
- string "U-Boot board name"
- help
-@@ -30,7 +29,6 @@ config BR2_TARGET_UBOOT_BOARDNAME
- This will be suffixed with _config to meet U-Boot standard naming.
- See boards.cfg in U-Boot source code for the list of available
- configurations.
+ string "U-Boot board name"
+ help
+@@ -31,7 +30,6 @@ config BR2_TARGET_UBOOT_BOARDNAME
+ This will be suffixed with _config to meet U-Boot standard
+ naming. See boards.cfg in U-Boot source code for the list of
+ available configurations.
-endif
-
+
choice
- prompt "U-Boot Version"
-@@ -146,6 +144,12 @@ config BR2_TARGET_UBOOT_NEEDS_OPENSSL
- typically the case when the board configuration has
- CONFIG_FIT_SIGNATURE enabled.
-
+ prompt "U-Boot Version"
+@@ -192,6 +190,12 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_E
+
+ endchoice
+
+config BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH
+ string "Custom header Configuration file path"
+ help
@@ -34,16 +34,16 @@ Index: buildroot/boot/uboot/Config.in
+ it will be copied into include/configs/<uboot_board_name>.h .
+
menu "U-Boot binary format"
-
+
config BR2_TARGET_UBOOT_FORMAT_AIS
Index: buildroot/boot/uboot/uboot.mk
===================================================================
--- buildroot.orig/boot/uboot/uboot.mk
+++ buildroot/boot/uboot/uboot.mk
-@@ -166,6 +166,14 @@ define UBOOT_APPLY_LOCAL_PATCHES
+@@ -209,6 +209,14 @@ define UBOOT_FIXUP_LIBFDT_INCLUDE
endef
- UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_LOCAL_PATCHES
-
+ UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE
+
+ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH)),)
+define UBOOT_COPY_HEADER_CONFIG_FILE
+ cp -pf $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_HEADER_CONFIG_FILE_PATH)) \
@@ -54,10 +54,10 @@ Index: buildroot/boot/uboot/uboot.mk
+
ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y)
define UBOOT_CONFIGURE_CMDS
- $(TARGET_CONFIGURE_OPTS) \
-@@ -283,14 +291,13 @@ endif
+ $(TARGET_CONFIGURE_OPTS) \
+@@ -403,14 +411,13 @@ endif
ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy)
-
+
#
-# Check U-Boot board name (for legacy) or the defconfig/custom config
-# file options (for kconfig)
@@ -72,4 +72,4 @@ Index: buildroot/boot/uboot/uboot.mk
+ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y)
ifeq ($(BR2_TARGET_UBOOT_USE_DEFCONFIG),y)
ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_BOARD_DEFCONFIG)),)
- $(error No board defconfig name specified, check your BR2_TARGET_UBOOT_DEFCONFIG setting)
+ $(error No board defconfig name specified, check your BR2_TARGET_UBOOT_BOARD_DEFCONFIG setting)
diff --git a/patches/buildroot/2018.02/072-armadeus-xenomai-download-adeos-patch.patch b/patches/buildroot/2019.02/072-armadeus-xenomai-download-adeos-patch.patch
similarity index 91%
copy from patches/buildroot/2018.02/072-armadeus-xenomai-download-adeos-patch.patch
copy to patches/buildroot/2019.02/072-armadeus-xenomai-download-adeos-patch.patch
index 197dc11ad..44d726e09 100644
--- a/patches/buildroot/2018.02/072-armadeus-xenomai-download-adeos-patch.patch
+++ b/patches/buildroot/2019.02/072-armadeus-xenomai-download-adeos-patch.patch
@@ -12,7 +12,7 @@ Index: buildroot/linux/linux-ext-xenomai.mk
+++ buildroot/linux/linux-ext-xenomai.mk
@@ -7,11 +7,20 @@
LINUX_EXTENSIONS += xenomai
-
+
# Adeos patch version
-XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
-ifeq ($(XENOMAI_ADEOS_PATCH),)
@@ -32,22 +32,22 @@ Index: buildroot/linux/linux-ext-xenomai.mk
+XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
+XENOMAI_ADEOS_OPTS = --adeos=$(DL_DIR)/$(XENOMAI_ADEOS_PATCH)
endif
-
+
# Prepare kernel patch
Index: buildroot/linux/Config.ext.in
===================================================================
--- buildroot.orig/linux/Config.ext.in
+++ buildroot/linux/Config.ext.in
@@ -25,13 +25,14 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
- Xenomai is know to support Blackfin, SH4, x86, ARM, NIOS2
- and PowerPC architectures.
-
+ Xenomai is know to support Blackfin, SH4, x86, ARM, NIOS2
+ and PowerPC architectures.
+
-config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
- string "Path for Adeos patch file"
+config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL
+ string "Path/URL for Adeos patch file"
- depends on BR2_LINUX_KERNEL_EXT_XENOMAI
- help
+ depends on BR2_LINUX_KERNEL_EXT_XENOMAI
+ help
- Optionally, explicitly specify the Adeos patch to use.
- Download it at http://download.gna.org/adeos/patches
- and verify that your kernel version in buildroot matches.
@@ -55,6 +55,6 @@ Index: buildroot/linux/Config.ext.in
+ Examples http://download.gna.org/adeos/patches/v2.6/arm/adeos-ipipe-2.6.38.8-arm-1.18-09.patch
+ or file:///home/foo/adeos-ipipe-2.6.38.8-arm-1.18-09.patch
+ Please verify that your kernel version in buildroot matches.
-
+
comment "xenomai needs a uClibc or glibc toolchain w/ threads"
- depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
+ depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
diff --git a/patches/buildroot/2015.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch b/patches/buildroot/2019.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
similarity index 100%
copy from patches/buildroot/2015.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
copy to patches/buildroot/2019.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
diff --git a/patches/buildroot/2016.05/081-adds_quake_package.patch b/patches/buildroot/2019.02/081-adds_quake_package.patch
similarity index 95%
copy from patches/buildroot/2016.05/081-adds_quake_package.patch
copy to patches/buildroot/2019.02/081-adds_quake_package.patch
index 9e2e45567..e6e238362 100644
--- a/patches/buildroot/2016.05/081-adds_quake_package.patch
+++ b/patches/buildroot/2019.02/081-adds_quake_package.patch
@@ -148,12 +148,11 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
@@ -231,7 +231,9 @@ menu "Games"
- source "package/opentyrian/Config.in"
- source "package/opentyrian-data/Config.in"
- source "package/prboom/Config.in"
+ source "package/opentyrian/Config.in"
+ source "package/opentyrian-data/Config.in"
+ source "package/prboom/Config.in"
+ source "package/quake-pak/Config.in"
- source "package/rubix/Config.in"
+ source "package/rubix/Config.in"
+ source "package/sdlquake/Config.in"
- source "package/sl/Config.in"
+ source "package/sl/Config.in"
endmenu
-
diff --git a/patches/buildroot/2015.02/083-pygame-armadeus_addons.patch b/patches/buildroot/2019.02/083-pygame-armadeus_addons.patch
similarity index 100%
copy from patches/buildroot/2015.02/083-pygame-armadeus_addons.patch
copy to patches/buildroot/2019.02/083-pygame-armadeus_addons.patch
diff --git a/patches/buildroot/2017.02/107-armadeus-games-add-wolf4sdl-package.patch b/patches/buildroot/2019.02/107-armadeus-games-add-wolf4sdl-package.patch
similarity index 95%
copy from patches/buildroot/2017.02/107-armadeus-games-add-wolf4sdl-package.patch
copy to patches/buildroot/2019.02/107-armadeus-games-add-wolf4sdl-package.patch
index c9c0ab383..823d171cf 100644
--- a/patches/buildroot/2017.02/107-armadeus-games-add-wolf4sdl-package.patch
+++ b/patches/buildroot/2019.02/107-armadeus-games-add-wolf4sdl-package.patch
@@ -65,10 +65,10 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
@@ -229,6 +229,7 @@ menu "Games"
- source "package/sl/Config.in"
- source "package/stella/Config.in"
- source "package/supertuxkart/Config.in"
+ source "package/sl/Config.in"
+ source "package/stella/Config.in"
+ source "package/supertuxkart/Config.in"
+ source "package/wolf4sdl/Config.in"
endmenu
-
+
menu "Graphic libraries and applications (graphic/text)"
diff --git a/patches/buildroot/2018.02/118-armadeus-snes9x-add-package.patch b/patches/buildroot/2019.02/118-armadeus-snes9x-add-package.patch
similarity index 98%
copy from patches/buildroot/2018.02/118-armadeus-snes9x-add-package.patch
copy to patches/buildroot/2019.02/118-armadeus-snes9x-add-package.patch
index fb916e2e4..ba162ac4e 100644
--- a/patches/buildroot/2018.02/118-armadeus-snes9x-add-package.patch
+++ b/patches/buildroot/2019.02/118-armadeus-snes9x-add-package.patch
@@ -7,13 +7,13 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
@@ -229,6 +229,7 @@ menu "Games"
- source "package/sl/Config.in"
- source "package/stella/Config.in"
- source "package/supertuxkart/Config.in"
+ source "package/sl/Config.in"
+ source "package/stella/Config.in"
+ source "package/supertuxkart/Config.in"
+ source "package/snes9x/Config.in"
- source "package/wolf4sdl/Config.in"
+ source "package/wolf4sdl/Config.in"
endmenu
-
+
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/2019.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/2019.02/121-target-arm926t_is_arm926ej-s.patch
diff --git a/patches/buildroot/2015.02/123-armadeus-pywebradio-add-package.patch b/patches/buildroot/2019.02/123-armadeus-pywebradio-add-package.patch
similarity index 100%
copy from patches/buildroot/2015.02/123-armadeus-pywebradio-add-package.patch
copy to patches/buildroot/2019.02/123-armadeus-pywebradio-add-package.patch
diff --git a/patches/buildroot/2016.08/124-e-uae-add_package.patch b/patches/buildroot/2019.02/124-e-uae-add_package.patch
similarity index 89%
copy from patches/buildroot/2016.08/124-e-uae-add_package.patch
copy to patches/buildroot/2019.02/124-e-uae-add_package.patch
index eade15b63..dffb152be 100644
--- a/patches/buildroot/2016.08/124-e-uae-add_package.patch
+++ b/patches/buildroot/2019.02/124-e-uae-add_package.patch
@@ -2,14 +2,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -179,6 +179,7 @@ endmenu
-
+@@ -246,6 +246,7 @@ endmenu
menu "Games"
+ source "package/chocolate-doom/Config.in"
source "package/doom-wad/Config.in"
+ source "package/e-uae/Config.in"
- source "package/gnuboy/Config.in"
- source "package/gnuchess/Config.in"
- source "package/lbreakout2/Config.in"
+ source "package/flare-engine/Config.in"
+ source "package/flare-game/Config.in"
+ source "package/gnuboy/Config.in"
Index: buildroot/package/e-uae/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2015.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch b/patches/buildroot/2019.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
similarity index 88%
copy from patches/buildroot/2015.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
copy to patches/buildroot/2019.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
index f681e689a..3e1f5a78e 100644
--- a/patches/buildroot/2015.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
+++ b/patches/buildroot/2019.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
@@ -10,7 +10,7 @@ Index: buildroot/package/busybox/busybox.mk
===================================================================
--- buildroot.orig/package/busybox/busybox.mk
+++ buildroot/package/busybox/busybox.mk
-@@ -190,6 +190,15 @@ define BUSYBOX_NOCLOBBER_INSTALL
+@@ -217,6 +217,15 @@ define BUSYBOX_NOCLOBBER_INSTALL
$(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh
endef
@@ -26,11 +26,11 @@ Index: buildroot/package/busybox/busybox.mk
define BUSYBOX_KCONFIG_FIXUP_CMDS
$(BUSYBOX_SET_MMU)
$(BUSYBOX_SET_LARGEFILE)
-@@ -199,6 +208,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS
+@@ -224,6 +233,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS
+ $(BUSYBOX_PREFER_STATIC)
+ $(BUSYBOX_SET_MDEV)
$(BUSYBOX_SET_CRYPT_SHA)
- $(BUSYBOX_NETKITBASE)
- $(BUSYBOX_NETKITTELNET)
+ $(BUSYBOX_IPROUTE2)
+ $(BUSYBOX_LINUX_PAM)
$(BUSYBOX_INTERNAL_SHADOW_PASSWORDS)
$(BUSYBOX_SET_INIT)
- $(BUSYBOX_SET_WATCHDOG)
diff --git a/patches/buildroot/2015.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch b/patches/buildroot/2019.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
similarity index 100%
copy from patches/buildroot/2015.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
copy to patches/buildroot/2019.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
diff --git a/patches/buildroot/2015.02/172-gsmmux-add_package.patch b/patches/buildroot/2019.02/172-gsmmux-add_package.patch
similarity index 100%
copy from patches/buildroot/2015.02/172-gsmmux-add_package.patch
copy to patches/buildroot/2019.02/172-gsmmux-add_package.patch
diff --git a/patches/buildroot/2017.02/176-imx-test-add_package.patch b/patches/buildroot/2019.02/176-imx-test-add_package.patch
similarity index 97%
copy from patches/buildroot/2017.02/176-imx-test-add_package.patch
copy to patches/buildroot/2019.02/176-imx-test-add_package.patch
index 705e55b1a..71367f623 100644
--- a/patches/buildroot/2017.02/176-imx-test-add_package.patch
+++ b/patches/buildroot/2019.02/176-imx-test-add_package.patch
@@ -158,13 +158,13 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
@@ -412,6 +412,7 @@ endmenu
- source "package/hwloc/Config.in"
- source "package/i2c-tools/Config.in"
- source "package/i7z/Config.in"
+ source "package/hwloc/Config.in"
+ source "package/i2c-tools/Config.in"
+ source "package/i7z/Config.in"
+ source "package/imx-test/Config.in"
- source "package/input-event-daemon/Config.in"
- source "package/input-tools/Config.in"
- source "package/intel-microcode/Config.in"
+ source "package/input-event-daemon/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/intel-microcode/Config.in"
Index: buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
===================================================================
--- /dev/null
@@ -231,7 +231,7 @@ Index: buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
+ struct sigaction act;
+- struct v4l2_dbg_chip_ident chip;
++// struct v4l2_dbg_chip_ident chip;
-+
++
+ /* for ctrl-c */
+ sigemptyset(&act.sa_mask);
+@@ -618,14 +618,14 @@
@@ -253,7 +253,7 @@ Index: buildroot/package/imx-test/5.4/0001-imx-test-fixes.patch
+ return TFAIL;
+@@ -717,7 +717,7 @@
+ }
-+
++
+ if (!g_overlay) {
+- g_alpha.alpha = 255;
++ g_alpha.alpha = 128; //255;
diff --git a/patches/buildroot/2015.02/188-marble-add_package.patch b/patches/buildroot/2019.02/188-marble-add_package.patch
similarity index 99%
copy from patches/buildroot/2015.02/188-marble-add_package.patch
copy to patches/buildroot/2019.02/188-marble-add_package.patch
index 52319addd..70aa0ffe4 100644
--- a/patches/buildroot/2015.02/188-marble-add_package.patch
+++ b/patches/buildroot/2019.02/188-marble-add_package.patch
@@ -6,10 +6,10 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -235,6 +235,7 @@ source "package/sdl_water/Config.in"
+@@ -288,6 +288,7 @@ comment "Demos"
+ source "package/sdl_water/Config.in"
comment "Other GUIs"
- source "package/efl/Config.in"
+ source "package/marble/Config.in"
source "package/python-wx/Config.in"
source "package/qt/Config.in"
diff --git a/patches/buildroot/2016.08/201-armadeus-add_gnokii.patch b/patches/buildroot/2019.02/201-armadeus-add_gnokii.patch
similarity index 87%
copy from patches/buildroot/2016.08/201-armadeus-add_gnokii.patch
copy to patches/buildroot/2019.02/201-armadeus-add_gnokii.patch
index acda1619e..fa36ca236 100644
--- a/patches/buildroot/2016.08/201-armadeus-add_gnokii.patch
+++ b/patches/buildroot/2019.02/201-armadeus-add_gnokii.patch
@@ -7,14 +7,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -1030,6 +1030,7 @@ endif
- source "package/foomatic-filters/Config.in"
- source "package/fping/Config.in"
+@@ -1709,6 +1709,7 @@ menu "Networking applications"
+ source "package/freeswitch-mod-bcg729/Config.in"
source "package/gesftpserver/Config.in"
+ source "package/glorytun/Config.in"
+ source "package/gnokii/Config.in"
+ source "package/gupnp-tools/Config.in"
source "package/gutenprint/Config.in"
- source "package/hiawatha/Config.in"
- source "package/hostapd/Config.in"
+ source "package/hans/Config.in"
Index: buildroot/package/gnokii/Config.in
===================================================================
--- /dev/null
diff --git a/patches/buildroot/2015.02/204-wpa-supplicant-add-option-ieee80211w.patch b/patches/buildroot/2019.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/2019.02/204-wpa-supplicant-add-option-ieee80211w.patch
diff --git a/patches/buildroot/2017.02/205-busybox-coreutils-stty-add-rs485-config-options.patch b/patches/buildroot/2019.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
similarity index 79%
copy from patches/buildroot/2017.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
copy to patches/buildroot/2019.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
index 63efe2101..d583d574d 100644
--- a/patches/buildroot/2017.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
+++ b/patches/buildroot/2019.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
@@ -2,39 +2,27 @@ Index: buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
===================================================================
--- /dev/null
+++ buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
-@@ -0,0 +1,313 @@
-+From: Clemens Gruber <cle...@pq...>
-+Date: Thu, 4 Aug 2016 14:51:44 +0200
-+Subject: [PATCH] stty: RS-485 support
-+
-+Signed-off-by: Clemens Gruber <cle...@pq...>
-+Signed-off-by: Julien Boibessot <jul...@ar...> (adaptation to busybox 1.26)
-+---
-+ coreutils/stty.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++----
-+ 1 file changed, 150 insertions(+), 9 deletions(-)
-+
-+diff --git a/coreutils/stty.c b/coreutils/stty.c
-+index 52967ea8f351..5a2d44c7e790 100644
-+--- a/coreutils/stty.c
-++++ b/coreutils/stty.c
-+@@ -18,6 +18,10 @@
-+ David MacKenzie <dj...@gn...>
-+
-+ Special for busybox ported by Vladimir Oleynik <dz...@si...> 2001
-++
-++ RS485 options added by Janos Angeli <an...@an...> 2013
-++ Adapted by Clemens Gruber <cle...@pq...> 2014-2016
-++
-+ */
+@@ -0,0 +1,299 @@
++--- busybox-1.29.3.org/coreutils/stty.c 2018-07-02 13:23:06.000000000 +0200
+++++ busybox-1.29.3/coreutils/stty.c 2019-03-22 13:00:31.734053792 +0100
++@@ -19,6 +19,10 @@
++ * David MacKenzie <dj...@gn...>
++ *
++ * Special for busybox ported by Vladimir Oleynik <dz...@si...> 2001
+++ *
+++ * RS485 options added by Janos Angeli <an...@an...> 2013
+++ * Adapted by Clemens Gruber <cle...@pq...> 2014-2016
+++ *
++ */
+ //config:config STTY
-+ //config: bool "stty"
-+@@ -40,8 +44,13 @@
++ //config: bool "stty (8.6 kb)"
++@@ -41,8 +45,13 @@
+ //usage: "\n [SETTING] See manpage"
-+
++
+ #include "libbb.h"
++
+ #include "common_bufsiz.h"
-+
++
++#include <asm-generic/ioctls.h>
++#include <linux/ioctl.h>
++#include <linux/serial.h>
@@ -42,10 +30,10 @@ Index: buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
+ #ifndef _POSIX_VDISABLE
+ # define _POSIX_VDISABLE ((unsigned char) 0)
+ #endif
-+@@ -941,11 +950,27 @@ static int find_param(const char *name)
++@@ -961,11 +970,27 @@
+ return i;
+ }
-+
++
+-static int recover_mode(const char *arg, struct termios *mode)
++static int find_rs485config(const char *name)
++{
@@ -68,13 +56,13 @@ Index: buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
+ unsigned chr;
+ unsigned long iflag, oflag, cflag, lflag;
++ unsigned long rsflags, rsdelaybefore, rsdelayafter;
-+
++
+ /* Scan into temporaries since it is too much trouble to figure out
+ the right format for 'tcflag_t' */
-+@@ -964,15 +989,30 @@ static int recover_mode(const char *arg, struct termios *mode)
++@@ -984,15 +1009,30 @@
+ arg += n;
+ }
-+
++
++ if (rs485 >= 0) {
++ if (sscanf(arg, ":%lx:%lx:%lx%n", &rsflags, &rsdelaybefore, &rsdelayafter, &n) != 3)
++ return 0;
@@ -94,17 +82,17 @@ Index: buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
++
+ return 0;
++ }
-+
++
+ return 1;
+ }
-+
++
+ static void display_recoverable(const struct termios *mode,
+- int UNUSED_PARAM dummy)
++ const struct serial_rs485 *rs485conf, int UNUSED_PARAM dummy, int rs485)
+ {
+ int i;
+ printf("%lx:%lx:%lx:%lx",
-+@@ -980,6 +1020,14 @@ static void display_recoverable(const struct termios *mode,
++@@ -1000,6 +1040,14 @@
+ (unsigned long) mode->c_cflag, (unsigned long) mode->c_lflag);
+ for (i = 0; i < NCCS; ++i)
+ printf(":%x", (unsigned int) mode->c_cc[i]);
@@ -118,17 +106,17 @@ Index: buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
++
+ bb_putchar('\n');
+ }
-+
-+@@ -1000,7 +1048,7 @@ static void display_speed(const struct termios *mode, int fancy)
++
++@@ -1020,7 +1068,7 @@
+ wrapf(fmt_str, tty_baud_to_value(ispeed), tty_baud_to_value(ospeed));
+ }
-+
++
+-static void do_display(const struct termios *mode, int all)
++static void do_display(const struct termios *mode, const struct serial_rs485 *rs485conf, int all, int rs485)
+ {
+ int i;
+ tcflag_t *bitsp;
-+@@ -1066,6 +1114,24 @@ static void do_display(const struct termios *mode, int all)
++@@ -1088,6 +1136,24 @@
+ }
+ }
+ newline();
@@ -151,9 +139,9 @@ Index: b...
[truncated message content] |