From patchwork Wed Feb 6 14:10:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1037548 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WiXHp9v4"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vjzM0dYBz9sDL for ; Thu, 7 Feb 2019 01:11:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5FE9B86DD6; Wed, 6 Feb 2019 14:11:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id siTq9tvu5K5M; Wed, 6 Feb 2019 14:11:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D37C98614A; Wed, 6 Feb 2019 14:11:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1D02F1BF398 for ; Wed, 6 Feb 2019 14:11:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 19FDD8614A for ; Wed, 6 Feb 2019 14:11:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rFLR+NAfeXUo for ; Wed, 6 Feb 2019 14:11:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id AC644820B3 for ; Wed, 6 Feb 2019 14:11:02 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id c8so897216wrs.4 for ; Wed, 06 Feb 2019 06:11:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=ixPmYtMk+JKE6XykLsaLPptH9U47E2m4YQwRZNOfMbo=; b=WiXHp9v45AHE2cSxdnYvZlraZ1k7hwiC1fT9q6KVq1hpKBNEGuhyDd4DVkmhxQBnrp fVhttLpZp0tlM943npwYputqfRBmCc5tFxp39+L2hNK9Pac1sihqvVnThoEC4i5AvV7U x1/nEaXdUkL+S8iNhcZr7ci71q/0nxk088b7kM2Bvi9bPiDsRa/CgPQLKzwHmyvRVoVg hR+JC8L4y4X57b/cq5Kxu9sxinwXxeqS82iW7SeyZm9SaRRSghD1h9a2HkjK37oU/zD7 f3qwFBY8S38s8MvcJlvKLM4zrIEQTfeU0OLXPTd6M2e4e+b41fBUKZmUOJ9OyfN+I0/c xkqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=ixPmYtMk+JKE6XykLsaLPptH9U47E2m4YQwRZNOfMbo=; b=MePwIv0R1FpTd0C/9KvO6FSp1BNuqojeBHBdPnEn2vDFvZ4ex2+G2JpeKUwPVgsb8f /LP0mBRQlcv1pYrLBu+5ani1SscPvKiw6fq0CmmbWnfATjO8Kee6WoE6SMquZ49rO2/K e3oGalb/WitQiwXzLwO1M8gal4KUEaEf4Yh3PaHQZJ+mQMnJ0L7uIH2c3BTolvA7wrS2 sepFQZkBADUxRNZxP8bEG1qKO0U58k1zi0JGVAYk8jZ6TG/nzfpDXPgWgizcBiQXjFoi 6yeI60neziNs8F3kjGvURaat4z+7DpF+hTjBPlVgOjQu/pBKogjrKQPQT6ViiFHrwRcG oS3w== X-Gm-Message-State: AHQUAubFHl4mAedTU0qzp2ZI49/Sdjx/SSCUOw3E1DOBQg+NtQlz5i42 08asF+Z7j72iZbAXTQh5kKnr/CBW X-Google-Smtp-Source: AHgI3Ib02Pm3MhiXu+zvuFTLo6ZCuYdf9UYRt4RenEjOrG/ZC1SGnG8kQFUghMx86kKeY/Oz2hPjNw== X-Received: by 2002:adf:83a7:: with SMTP id 36mr8177210wre.13.1549462260524; Wed, 06 Feb 2019 06:11:00 -0800 (PST) Received: from dell.be.48ers.dk ([2620:0:1055:fd00:ba8a:60ff:feb3:d607]) by smtp.gmail.com with ESMTPSA id a132sm34295465wmh.5.2019.02.06.06.10.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 06:10:59 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.89) (envelope-from ) id 1grNul-0006IM-AA; Wed, 06 Feb 2019 15:10:59 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 6 Feb 2019 15:10:43 +0100 Message-Id: <20190206141058.24155-1-peter@korsgaard.com> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH 01/16] package/gnuradio: remove qtgui option X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Gwenhael Goavec-Merou MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The gr-qtgui option uses python-pyqt/Qt4, which we are about to remove, so remove the option. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ package/gnuradio/Config.in | 10 ---------- package/gnuradio/gnuradio.mk | 10 ++-------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index be2f722b05..c84a9239a7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2019.02" +config BR2_PACKAGE_GNURADIO_QTGUI + bool "gnuradio gr-qtgui option removed" + select BR2_LEGACY + help + The gr-qtgui option was removed. + config BR2_PACKAGE_LUACRYPTO bool "luacrypto package removed" select BR2_LEGACY diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 533a49c81e..3fdaea850e 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -116,16 +116,6 @@ config BR2_PACKAGE_GNURADIO_PAGER help FLEX pager decoder implementation blocks -config BR2_PACKAGE_GNURADIO_QTGUI - bool "gr-qtgui" - depends on BR2_PACKAGE_PYTHON_PYQT - depends on BR2_PACKAGE_QWT - depends on BR2_PACKAGE_QT_STL - select BR2_PACKAGE_GNURADIO_FFT - select BR2_PACKAGE_GNURADIO_FILTER - help - GNU Radio Qt scopes - config BR2_PACKAGE_GNURADIO_TRELLIS bool "gr-trellis support" select BR2_PACKAGE_GNURADIO_DIGITAL diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 564ad8b2a4..d6d07f6566 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -25,7 +25,8 @@ endif GNURADIO_CONF_OPTS = \ -DENABLE_DEFAULT=OFF \ -DENABLE_VOLK=ON \ - -DENABLE_GNURADIO_RUNTIME=ON + -DENABLE_GNURADIO_RUNTIME=ON \ + -DENABLE_GR_QTGUI=OFF # For third-party blocks, the gnuradio libraries are mandatory at # compile time. @@ -126,13 +127,6 @@ else GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF endif -ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y) -GNURADIO_DEPENDENCIES += python-pyqt qwt -GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=OFF -endif - ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON else