From 8476428660987f3d2b43efc2daf5bc443c72c704 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 10 Sep 2021 08:53:05 +0200 Subject: [PATCH] package/gnuradio: drop gr-pager (gr-flex) option gr-pager (labeled 'gr-flex' in our menuconfig) is not available since bump to version 3.8.0.0 in commit 0d6a7b2981d4 (package/gnuradio: bump to version 3.8.0.0) and upstream commit: https://github.com/gnuradio/gnuradio/commit/2d2caa205f3c3059deab7c82660908656167fd90 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 5045cab63d0ed033ce1a1b3c7ee6b098ed2abaeb) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/gnuradio/Config.in | 6 ------ package/gnuradio/gnuradio.mk | 6 ------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index a0c1a6898f..031948a2eb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2021.05" +config BR2_PACKAGE_GNURADIO_PAGER + bool "gnuradio gr-flex support removed" + select BR2_LEGACY + help + gr-flex has been removed from gnuradio since version 3.8.0.0. + config BR2_PACKAGE_UDISKS_LVM2 bool "udisks lvm2 support removed" select BR2_LEGACY diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 738088802e..c10e0fa3f5 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -130,12 +130,6 @@ config BR2_PACKAGE_GNURADIO_FILTER help Filter signal processing blocks -config BR2_PACKAGE_GNURADIO_PAGER - bool "gr-flex support" - select BR2_PACKAGE_GNURADIO_ANALOG - help - FLEX pager decoder implementation blocks - config BR2_PACKAGE_GNURADIO_QTGUI bool "gr-qtgui" depends on BR2_PACKAGE_GNURADIO_PYTHON diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 1f4458db92..10402da49f 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -130,12 +130,6 @@ else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif -ifeq ($(BR2_PACKAGE_GNURADIO_PAGER),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=OFF -endif - ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y) GNURADIO_DEPENDENCIES += qt5base python-pyqt5 qwt GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON