[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-303-g1ed492493

[Sébastien S. <ss...@us...>]

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  1ed492493fb9eed6131165fab0423b3265771580 (commit)
      from  c8b892179e22431df0eca3272c42a4f73fb6929b (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 1ed492493fb9eed6131165fab0423b3265771580
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon Nov 15 13:44:14 2021 +0100

    [BUILDROOT] Bump BR to 2021.02.7

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |  2 +-
 ...e-gpsd-fix-python-tools-build-and-install.patch | 70 ----------------------
 patches/buildroot/2021.02/cleanup_buildroot.sh     |  1 -
 3 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 patches/buildroot/2021.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch

diff --git a/Makefile b/Makefile
index 2c5af5836..53d8ff56c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2021.02
-BUILDROOT_MINOR_VERSION ?= 6
+BUILDROOT_MINOR_VERSION ?= 7
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else
diff --git a/patches/buildroot/2021.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch b/patches/buildroot/2021.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
deleted file mode 100644
index f1edba59c..000000000
--- a/patches/buildroot/2021.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-gpsd-3.19: allow and fix build of python modules and tool installation.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/gpsd/gpsd.mk
-===================================================================
---- buildroot.orig/package/gpsd/gpsd.mk
-+++ buildroot/package/gpsd/gpsd.mk
-@@ -24,9 +24,22 @@ GPSD_SCONS_OPTS = \
- 	sysroot=$(STAGING_DIR) \
- 	strip=no \
- 	python=no \
--	qt=no \
- 	systemd=$(if $(BR2_INIT_SYSTEMD),yes,no)
- 
-+ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y)
-+ifeq ($(BR2_PACKAGE_PYTHON),y)
-+GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION)"
-+GPSD_SCONS_OPTS += \
-+	python_libdir=/usr/lib/python$(PYTHON_VERSION)/
-+else ifeq ($(BR2_PACKAGE_PYTHON3),y)
-+GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m"
-+GPSD_SCONS_OPTS += \
-+        python_libdir=/usr/lib/python$(PYTHON3_VERSION)/
-+else
-+GPSD_SCONS_OPTS += python=no
-+endif
-+endif
-+
- ifeq ($(BR2_PACKAGE_NCURSES),y)
- GPSD_DEPENDENCIES += ncurses
- else
-Index: buildroot/package/gpsd/Config.in
-===================================================================
---- buildroot.orig/package/gpsd/Config.in
-+++ buildroot/package/gpsd/Config.in
-@@ -99,6 +99,9 @@ config BR2_PACKAGE_GPSD_CONTROLSEND
- config BR2_PACKAGE_GPSD_SQUELCH
- 	bool "squelch gpsd_report and gpsd_hexdump to save cpu"
- 
-+config BR2_PACKAGE_GPSD_PYTHON
-+	bool "install python tools (ubxtool, python-gps, etc...)"
-+
- comment "Protocols"
- 
- config BR2_PACKAGE_GPSD_AIVDM
-Index: buildroot/package/gpsd/0002-SConstruct-python-gps-cross-build.patch
-===================================================================
---- /dev/null
-+++ buildroot/package/gpsd/0002-SConstruct-python-gps-cross-build.patch
-@@ -0,0 +1,19 @@
-+Do not use/overwrite some python_config[] values when cross-building modules,
-+as these values are dynamically built using Host Python.
-+
-+Signed-off-by: Julien Boibessot <jul...@ar...>
-+
-+diff gpsd-3.19/SConstruct gpsd-3.19.mod/SConstruct
-+--- gpsd-3.19/SConstruct	2020-01-10 18:42:13.743506998 +0100
-++++ gpsd-3.19.mod/SConstruct	2020-01-10 18:41:18.087219606 +0100
-+@@ -1660,6 +1660,10 @@
-+                              python_config['CXX'].split()[1:]))
-+ 
-+     ldshared = python_config['LDSHARED']
-++    python_config['CC'] = python_env['CC'] = os.environ['CC']
-++    python_config['INCLUDEPY'] = os.environ['INCLUDEPY']
-++
-++    ldshared = python_env['CC'] + ' -shared'
-+     ldshared = ldshared.replace('-fPIE', '')
-+     ldshared = ldshared.replace('-pie', '')
-+     python_env.Replace(SHLINKFLAGS=[],
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index 6f62250d8..8d6e2bbaa 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -55,7 +55,6 @@ 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/0002-SConstruct-python-gps-cross-build.patch
 rm -rf buildroot/package/gpsd/Config.in
 rm -rf buildroot/package/gpsd/S50gpsd
 rm -rf buildroot/package/gpsd/gpsd.mk


hooks/post-receive
-- 
armadeus