From patchwork Sat Oct 5 12:22:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172182 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="ZZm7Q+wR"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm994zRGz9sCJ for ; Sat, 5 Oct 2019 22:22:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 18FF8203C8; Sat, 5 Oct 2019 12:22:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ARZYO2mJd9id; Sat, 5 Oct 2019 12:22:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D03E22041D; Sat, 5 Oct 2019 12:22:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C42FB1BF29F for ; Sat, 5 Oct 2019 12:22:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C19BF87865 for ; Sat, 5 Oct 2019 12:22:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6Ew930WZVmXy for ; Sat, 5 Oct 2019 12:22:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by whitealder.osuosl.org (Postfix) with ESMTPS id 46C0687863 for ; Sat, 5 Oct 2019 12:22:46 +0000 (UTC) Received: by mail-lj1-f179.google.com with SMTP id a22so9154065ljd.0 for ; Sat, 05 Oct 2019 05:22:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3ZXMxqmx7DR9d+nVZHVUOisar0UQmJAt2xbW1UfJ5vU=; b=ZZm7Q+wR71F37L2yd7US254nDhWAVdzplMboin9imA0N0k8zbaDMPLXQMa6I5yat2s nR/+kD9JeqVuyRLi+eqHrlkYui/kiDSINHblQ8pRWw7KHZ8vDYAjnDtyUsBv59VVXY64 EkVyurY+tzldrXUybLIjGg33UuugFi9pZz2Y/Pb/TRqDiKs+391dX4JLsMpxLEJfBXZI EJvb5vbQex2eGQ/RDf8jHLlkb/+prVnSsmUYRFD8qaA92L3loI/EcKhPQZhuTkgCe29a 3mR6iXew5K//TiIWFvvrvzTBJ9ePvXs5KTj6uyV/hpYBJQclyj3YUH7hYt/f8a0a1NJY 0OUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3ZXMxqmx7DR9d+nVZHVUOisar0UQmJAt2xbW1UfJ5vU=; b=Rm6HtRg3GOi/Ur4jomIRs+ZB9oozxuHZZBzSurymJKKl1C7gZVUeOlI1GQdCHcjzBz XLVhpg60dopuLDCVg6kExNLXnOw83G/PIGTYgum6eYj9pb3mK1p5a0optXx/AlP5jJ6w GujSrMfDqpaItRB9dDkUd/MvI4iXCiS+6Kp5P3Q6wo0iHYXlK+eCntHqToO+SdPb74mk Lu4tmbAbAF2/HWdQjG+PEatKPvNxTf/HRLmihUGGtD8LnE2oh2MXd6GMGVFJw1llQaWt Pw77SnPTqJRBc1DnbAJTIqLvsz70igUco6s4/ZlsKJVvN9ceHltDDFSu3seJjNQOrTTa D0Jg== X-Gm-Message-State: APjAAAWZjjQO11ox6ML+B8pnbNpktaztQ7b49fh+NH6lGizysxzPmQmE J6s1Lvv0ioSozqAZtnt5ik9OPfoE X-Google-Smtp-Source: APXvYqwuJsXGlVIgsxYLwV3HwOZqnfkIZNkiGEFMLlMvIL1akYVEXSEqA6x/O5omEdk8s6NoJb+XbA== X-Received: by 2002:a2e:9693:: with SMTP id q19mr12906695lji.12.1570278164331; Sat, 05 Oct 2019 05:22:44 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.22.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:22:43 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:15 +0200 Message-Id: <20191005122227.7297-2-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 01/13] utils/checkpackagelib: CommentsMenusPackagesOrder: remove '-comment' state before the '-menu' one 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The comment may contain packages or if-endif block(s) but not menu(s) of packages, so lets remove the '-comment' state before the '-menu' one. Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski Reviewed-by: Ricardo Martincoski --- utils/checkpackagelib/lib_config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index fc0df3dd17..499660feb7 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -107,6 +107,9 @@ class CommentsMenusPackagesOrder(_CheckFunction): self.state += "-if" elif text.startswith("menu"): + if self.state.endswith("-comment"): + self.state = self.state[:-8] + self.state += "-menu" self.initialize_level_elements(text) From patchwork Sat Oct 5 12:22:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172184 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="hwzepvAZ"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9C4KcWz9sPw for ; Sat, 5 Oct 2019 22:22:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0734287865; Sat, 5 Oct 2019 12:22:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ICEdfyVhmwU0; Sat, 5 Oct 2019 12:22:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0565487881; Sat, 5 Oct 2019 12:22:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5484C1BF29F for ; Sat, 5 Oct 2019 12:22:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 51F3087865 for ; Sat, 5 Oct 2019 12:22:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Kwi8JIeUdrOD for ; Sat, 5 Oct 2019 12:22:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 704F887863 for ; Sat, 5 Oct 2019 12:22:48 +0000 (UTC) Received: by mail-lf1-f66.google.com with SMTP id q12so1328175lfc.11 for ; Sat, 05 Oct 2019 05:22:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gAUMPE3MOvwgdVlhI/2Uw+WxDwSKd3qLAD+3r3JSrJc=; b=hwzepvAZ1fV0Qi2IxCHUJa1ryuOi34aNcZk/0yqZe1d3zfIM1y+mx8taSG2lRcHNjA zY3s0NKYL8uNFqb8b7ABYe/GJ+d6oie3PkcbrOnFnjRfoHTXAncQ2Bs9Q53YMGSXHGKD +716w+YtH4n1M3Bj7m/JF3JvtvJQyXStn83UNMG8xVKiY0Nvwu/Enjo3Cl7YTTdqp0rT 1B4qkAJnqKgXOaU++WPS8byImqdeEBBJu5kdD4BojGmwT+srsge78DgOxHPMGAxMSf7Y g8UeDsN7yrhuKamQqrZPOF4orGm9fNadZ0+qd8EgYLE2aL9y2+Me/IsivoCU5Pu8Kj8j oOpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gAUMPE3MOvwgdVlhI/2Uw+WxDwSKd3qLAD+3r3JSrJc=; b=XneYaKUy1SvbgZteGfhVsNSFril92cRZo6mbv/4LRWGeTvoh/0lQ1kDF7EZbyw/xAB Yrv8ZV/sRFW3NkOzPpsRe+oc3JRM9wddMnx6btaD9tXyHIGWsV+HWN+oJP2NnSd8gaGo wnpjVqnaQoS5deaGqglsivSRi3i891iyNItDyoeBS5MQ3iQSyDgcwHBSI5y70y+D7Q7M 4DW/Zwz0aKpgtLgE68KjBoZlQg8L/qOZ48RUPNtMxvQ4mV1c/S8+lz7JjimtiTLn+irO etbev5tH+UV/Wh0LMVb8D1WOgcTeyjgpyIDXJkS+eU7JAufPSQCN7FQyUgaSv9FBb78G dXCg== X-Gm-Message-State: APjAAAUfDXWmicnPhdQP5mIBpLj8LR9EX7tR6rE5WtnCY1kwXgUR67il n7oLCopPnrjO0WE8E1/3SlYOuxlT X-Google-Smtp-Source: APXvYqxmrvOqedzZkkQTkeACDuADN7f4C0gMr5KGmQFRNCP8K1iNiOu4KFKJAjb6K6lHJuIqdSg7ng== X-Received: by 2002:ac2:59c2:: with SMTP id x2mr10643962lfn.125.1570278166476; Sat, 05 Oct 2019 05:22:46 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.22.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:22:45 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:16 +0200 Message-Id: <20191005122227.7297-3-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 02/13] utils/checkpackagelib: CommentsMenusPackagesOrder: separate the lines support 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The lines 'comment...', 'if ...' and 'menu ...' will be handled without sharing any code so lets separate their handling. Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski Reviewed-by: Ricardo Martincoski --- utils/checkpackagelib/lib_config.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 499660feb7..06c066c5ca 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -95,22 +95,22 @@ class CommentsMenusPackagesOrder(_CheckFunction): source_line = re.match(r'^\s*source ".*/([^/]*)/Config.in(.host)?"', text) - if text.startswith("comment ") or text.startswith("if ") or \ - text.startswith("menu "): + if text.startswith("comment "): + if not self.state.endswith("-comment"): + self.state += "-comment" - if text.startswith("comment"): - if not self.state.endswith("-comment"): - self.state += "-comment" + self.initialize_level_elements(text) + + elif text.startswith("if "): + self.state += "-if" - elif text.startswith("if") or text.startswith("menu"): - if text.startswith("if"): - self.state += "-if" + self.initialize_level_elements(text) - elif text.startswith("menu"): - if self.state.endswith("-comment"): - self.state = self.state[:-8] + elif text.startswith("menu "): + if self.state.endswith("-comment"): + self.state = self.state[:-8] - self.state += "-menu" + self.state += "-menu" self.initialize_level_elements(text) From patchwork Sat Oct 5 12:22:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172186 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="MHo/9vIl"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9K0bvdz9sCJ for ; Sat, 5 Oct 2019 22:23:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B5AD8879AB; Sat, 5 Oct 2019 12:22:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DWhoRm4QwVE8; Sat, 5 Oct 2019 12:22:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D2A0B878C2; Sat, 5 Oct 2019 12:22:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E2A2E1BF29F for ; Sat, 5 Oct 2019 12:22:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DFD7A87865 for ; Sat, 5 Oct 2019 12:22:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7OMYt2UlEYBR for ; Sat, 5 Oct 2019 12:22:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3585987863 for ; Sat, 5 Oct 2019 12:22:50 +0000 (UTC) Received: by mail-lj1-f176.google.com with SMTP id l21so9135747lje.4 for ; Sat, 05 Oct 2019 05:22:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SGbrhrV5sGrZxwXLOI6lRwk/1LELcj9Y2TGcovo3svE=; b=MHo/9vIlPniUhUijlcXk7iFfT7WeG9IgTWcjaZCnycI1mIgDVcc8upoT/XJisIJuxr EZGO19aaV5eNIPJO7G5a843ChAVpsW3R86F7tkmElDvcezwqsotWNBYmbbsRD/cjrO/S d3WS3IPYKHWOhuOvt6kLtKMc/B9Yhw7MjZ7exsbRy6i/30UAZN+GhsYkCjwp8HYD+QzZ tBqE1ahcUa4Yg0qJvaq5rjkU+tPHMZwIXJ54znj+URtAZftwN0nlCJayH+o9pX2cLpr8 4xJZWygHS1D6ylkeyn5iPt9sByz0i1DOh9aBB3sEjriMjUuzJMgHLVFaSu/w34cE8d8L lNeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SGbrhrV5sGrZxwXLOI6lRwk/1LELcj9Y2TGcovo3svE=; b=UUIEEOLpMDQJ8fsVSQinhzO0mxV464rsj8N99u+iMBb7WBv/fVtd5uMG9JmoouJI+x 4bnaFXB5Qslzvqc4IIcKGzLWumK7GNRIaKafo6whHjWbmv78TRLLb+xWYT59KRPx7B7s lP8JbIP3Vz7tbt4TkT9+QUiau+BWsvRlLptivRGjHVJAMK4cYx07j/q+GgfynbkWqiPk laKiG/vXSdrXDH8M690gIwLO71+A3+scWBpSE1qeVn3x1B9eMGFZayOJhWd9uGE25jBr 2hgUUvJgQctS0M1m8Czw4wztg1x4jipi8KdyS3VKMY9kX6MRZnWc9c3tOYTuBtvlLn+5 6l9A== X-Gm-Message-State: APjAAAVwlC9B2EmrVjlK5mLUd2ViBt85dPUEy3jvXWYxXMOYz/uz486n i8bjYefjwJ7F3wo1OcYyth0hg9ZO X-Google-Smtp-Source: APXvYqw3rz9wzem8v2gsFYC+r64N56V+5Nx3bcbxuCy2b9URmXgOiNINpv+1tIfhvvGODyL6kCPz4w== X-Received: by 2002:a2e:6c08:: with SMTP id h8mr12256660ljc.28.1570278168276; Sat, 05 Oct 2019 05:22:48 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.22.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:22:47 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:17 +0200 Message-Id: <20191005122227.7297-4-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 03/13] utils/checkpackagelib: CommentsMenusPackagesOrder: use '-' to describe state 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski Reviewed-by: Ricardo Martincoski --- utils/checkpackagelib/lib_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 06c066c5ca..d1d4a4f549 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -115,7 +115,7 @@ class CommentsMenusPackagesOrder(_CheckFunction): self.initialize_level_elements(text) elif text.startswith("endif") or text.startswith("endmenu"): - if self.state.endswith("comment"): + if self.state.endswith("-comment"): self.state = self.state[:-8] if text.startswith("endif"): From patchwork Sat Oct 5 12:22:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172185 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="Jz+9JTnM"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9G2cPrz9sCJ for ; Sat, 5 Oct 2019 22:22:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E8CB8869ED; Sat, 5 Oct 2019 12:22:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eoreBufLBGkL; Sat, 5 Oct 2019 12:22:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5F31E869C0; Sat, 5 Oct 2019 12:22:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7D9551BF29F for ; Sat, 5 Oct 2019 12:22:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1803C879AB for ; Sat, 5 Oct 2019 12:22:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j0cN07cojhrm for ; Sat, 5 Oct 2019 12:22:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by whitealder.osuosl.org (Postfix) with ESMTPS id EC23587863 for ; Sat, 5 Oct 2019 12:22:51 +0000 (UTC) Received: by mail-lj1-f177.google.com with SMTP id v24so9134444ljj.3 for ; Sat, 05 Oct 2019 05:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oz5NUl+GmQRiSo0MP9G0Ak19WYLyw2uw1CdD61Ui13Q=; b=Jz+9JTnMPGeDCNKNfZdKYCYGGIdUbWtSiLg+ac4C5url7nhknR2I4ksT5y2MhsxEVM aHzXi7KAt83OT6qgEq6LcGhYnWCBTQNdm06leFUMZFSIuPn+dwkkRPzp85Jov9GpEMMY SwzzWFUHCeazPSnHuHVnNgI02MnYUbTYLElVpFcBFf4B+TwtF9XobFmPfjX8CO/QcaVW FVrR5nJuAdE48/YJpGwr66K2wR21XBR07FJ0dzuQ09k9qTAEQb2uCG9Ledhk/Jlxb4Zq dlJpbsnUcVda+B0pwlmBtE4RD1S1i7+PT6JfVcGlPgwZjCGESYL95eC0Rqqk5xtHubBm UQPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oz5NUl+GmQRiSo0MP9G0Ak19WYLyw2uw1CdD61Ui13Q=; b=sybZQzubXS6+z6bF8WehzDWdyeEuOWThWcJpBqMDSm8c6bgZCkdIiD1sRM/H2fONcx iW1NiySDw+gkqn6I2Q1TciCZyFgy83Y0xNwi21+jr3U6oZpXo+9GUfGo1u9ikY8bAp/V 8bscJm0XyVqMz+BjApTv7UCZHRr+WmR6wptD8A5ih01m3pe9GqRLnpisdhmn2khfrUsW 2tVlfFBmbZfaQep2SU0KoUaKWCczFDgSfpkHoMFbtAVd07IaWhT2VD4hQZu0MzJTdFtG Z1bwq3jjfPQ9Xo9Oz9cL/V7+zf5D+1YGKAAiFzLPmUjREZdu9xbD5fr6RaOB2Ltm98Zb TqGA== X-Gm-Message-State: APjAAAUPii2OyCl3FYSfvwFIuPm09Ignk3fwCJEzSo6SZu9f+zsFpyYn GZlBE2ayIC756kabljPTJ2P8AZ2B X-Google-Smtp-Source: APXvYqzDQRwKy2IDU86Knn9C3U1fUr3Dg1cFdaH1VgWjqxujLL3s9/c3dl+QEtGJZ4UrU0fAyGyrkg== X-Received: by 2002:a2e:442:: with SMTP id 63mr12611352lje.66.1570278170002; Sat, 05 Oct 2019 05:22:50 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.22.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:22:49 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:18 +0200 Message-Id: <20191005122227.7297-5-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 04/13] utils/checkpackagelib: CommentsMenusPackagesOrder: use package arrays initialize in before() 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also order them alphabetically. Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski Acked-by: Ricardo Martincoski --- utils/checkpackagelib/lib_config.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index d1d4a4f549..c5d0dc0fdb 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -61,14 +61,13 @@ class AttributesOrder(_CheckFunction): class CommentsMenusPackagesOrder(_CheckFunction): - menu_of_packages = [""] - package = [""] - print_package_warning = [True] - def before(self): - self.state = "" self.level = 0 + self.menu_of_packages = [""] self.new_package = "" + self.package = [""] + self.print_package_warning = [True] + self.state = "" def get_level(self): return len(self.state.split('-')) - 1 From patchwork Sat Oct 5 12:22:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172187 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="RFyKM9Zk"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9L45l5z9sCJ for ; Sat, 5 Oct 2019 22:23:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A404C86B67; Sat, 5 Oct 2019 12:23:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xLI9LQ4mEb0m; Sat, 5 Oct 2019 12:22:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4CAC986A35; Sat, 5 Oct 2019 12:22:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DE5A91BF29F for ; Sat, 5 Oct 2019 12:22:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D936687B85 for ; Sat, 5 Oct 2019 12:22:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rKeLB+Zx3Usc for ; Sat, 5 Oct 2019 12:22:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id C275887938 for ; Sat, 5 Oct 2019 12:22:53 +0000 (UTC) Received: by mail-lj1-f194.google.com with SMTP id n14so9093142ljj.10 for ; Sat, 05 Oct 2019 05:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mrEezIHXuskkSzSMJ5A7bJcUZbHtFOs80GdPYVJNZM0=; b=RFyKM9Zk+PUE+ypC+G1LZY/7iDpvmCBPDhiebckt7yEhhDNsMbks8vwaqZ8Uoic2Qb /e4qrtgYFwPDO8U0kWqKL5/J6PUzC9Ffq18rOqsTRWRregepnpAMM5uJCrfqpbjtOVAn iVCs9/gVFkpEiNPxrfiLtlIA1Z5zjLKb4Pd6OI31UF4ZZmw3tPhsGwXOB2ZVO2B0Xon/ maV/Son6WiAVmn2M5zs1deBj0Pum6TA8JFpkEdZNs7gLtzEFP5+fnkar1vfYIr+joBQl dXPt9JQ+F7ThA8lGcYaGuWte0wC/dZALhpGhH2oeVlzpurUoRGOcRMHvDmlkR8zcboEI 0Eew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mrEezIHXuskkSzSMJ5A7bJcUZbHtFOs80GdPYVJNZM0=; b=XmzPwX7udPU2vIY4191odYIyiS9mMxZW4QkLZfjIMeaRxfa6usaxQ8s/8CcDMZJgtq bOcAKxh41zsMRatntVHpODwBv7q+AiyrsJlUTEDNVU1axlKDttCfdz2C5ahaMX5wp1Xw WbS19zHMVHq9QEJ+8blTnLAss7DIloneszYzOdcVG3/mGPfl03vSbfC8h78ulsSNc98L TphRFXwPThs1ugIK5D7Qt+lLy+DhVk7vpUvOQ2pldS8r3EW0Zm00wuC8vjZmApjM4AA6 YkYXD439gkPHYu9UKSQXqFcUyIW5gRNQrboBS7v36X04hgYfY+RtgO1A51CJwjrRk2V/ cbXQ== X-Gm-Message-State: APjAAAUUW1ZXdpVBU/dV9ASdUjJH+Ncc/rTCWeaQ8uM6v5xUep1dLVI1 hHtijQb2cqBN2NGpu4/ZTG/K0flc X-Google-Smtp-Source: APXvYqzjJ3JdzzzDMz4BWoSdqTg3o26+MqZGT0W8846a1bAV4thlYw5Oogg0hKuJx+9QLMPLHibFQw== X-Received: by 2002:a05:651c:1032:: with SMTP id w18mr10033836ljm.256.1570278171784; Sat, 05 Oct 2019 05:22:51 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:22:51 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:19 +0200 Message-Id: <20191005122227.7297-6-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 05/13] utils/checkpackagelib: CommentsMenusPackagesOrder: initialize 'menu_of_packages' array 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 'source' without a previous 'menu' is common in package/Config.in in br2-externals. Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski Reviewed-by: Ricardo Martincoski --- utils/checkpackagelib/lib_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index c5d0dc0fdb..3a84828902 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -63,7 +63,7 @@ class AttributesOrder(_CheckFunction): class CommentsMenusPackagesOrder(_CheckFunction): def before(self): self.level = 0 - self.menu_of_packages = [""] + self.menu_of_packages = ["The top level menu"] self.new_package = "" self.package = [""] self.print_package_warning = [True] From patchwork Sat Oct 5 12:22:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172190 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="ulBT1s89"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9T5fTRz9sCJ for ; Sat, 5 Oct 2019 22:23:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 00CA08789A; Sat, 5 Oct 2019 12:23:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id exZ5Da3fModx; Sat, 5 Oct 2019 12:23:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id F1CB687881; Sat, 5 Oct 2019 12:23:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 46CDF1BF29F for ; Sat, 5 Oct 2019 12:23:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 437FE878D8 for ; Sat, 5 Oct 2019 12:23:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3cb0CJXG-yPL for ; Sat, 5 Oct 2019 12:22:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id C1E3987AB6 for ; Sat, 5 Oct 2019 12:22:56 +0000 (UTC) Received: by mail-lf1-f68.google.com with SMTP id t8so6240560lfc.13 for ; Sat, 05 Oct 2019 05:22:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=g+4rV/AD3bKA6FIaUnQkhwCow/LGPborNbVfsX/fcxs=; b=ulBT1s892AMgJG32X+A34STRT6a+aWBWI/QDtovB9YNLXGwgv7wwPegciKPDbBIq57 EVZCZGJhFQuzcpto+QUCfTtdqf5EaLXgP8yhNhp90VS78+Err1q5EmlcRD2iUqEuJKOu k/176ZP+mAjh/ZqZBDLCpdJ/eQwaRECWhI3WpJopMq1WxxTsmqMf5aCEml1qgDZRmOBq T8N0nbcjxvWgw8Y65Jon83pdv5m4cqVeVL/T5yTH3qvcwnp11n2swkrwXvlKVXWy+OQ3 ZfezseKAIUP6JYQx0jflLVD7/iWcWAxIFFs5yYBmBLSur+yUSVTSzdUVs/x/TgjIxriE hlCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=g+4rV/AD3bKA6FIaUnQkhwCow/LGPborNbVfsX/fcxs=; b=TEQaccS+p9lIbb+3NCIbiWm96Rdcd5UBFFCGjVftZ2IZcImXBRPZBXyngZJVdQDqUJ rGeYHgB8ASVJZ0oOQ0qPL2yKjofXdmix2V0mQC9u/6+1K5oNYnRDwHM+BACoXBAUelEN aydmH3xHMKCtFOwASi3mUaYvQWQJ4N6GMMmpuDnc0McpOikXU/sVPWf9uzejpgDSSJar RwnK3jB3x7gccGBP8RKh5eyjUTfqk/XslOGnLvFn7CiZyt7LKUA5KZAFfHAxpJ3YZT4D YtIeJfKQz22RUqemCGMEbqezpTy4Vu8dB4LCwlKfS7lH4iAD/QTrML9U97/Mhwtp04Lv 8cOg== X-Gm-Message-State: APjAAAXerODaV9Uvr54O6DcXC2+13qA0qRxSenHcjXUw0r1onZOqubR0 pthm1bV1Lw2If7wJLFT6KLF+3J0F X-Google-Smtp-Source: APXvYqyTC859+/80GJEVCtYhofs2/t9iFl2qir+pu9ef6LAwnNKn327STyo91g3IJiNRMczDevcjPQ== X-Received: by 2002:ac2:5ec1:: with SMTP id d1mr11624239lfq.83.1570278174776; Sat, 05 Oct 2019 05:22:54 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:22:54 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:20 +0200 Message-Id: <20191005122227.7297-7-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 06/13] utils/checkpackagelib: CommentsMenusPackagesOrder: add more Config.in files to check 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski Reviewed-by: Ricardo Martincoski --- utils/checkpackagelib/lib_config.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 3a84828902..142e8f745d 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -88,8 +88,11 @@ class CommentsMenusPackagesOrder(_CheckFunction): def check_line(self, lineno, text): # We only want to force sorting for the top-level menus - if self.filename not in ["package/Config.in", - "package/Config.in.host"]: + if self.filename not in ["boot/Config.in", + "fs/Config.in", + "package/Config.in", + "package/Config.in.host", + "package/kodi/Config.in"]: return source_line = re.match(r'^\s*source ".*/([^/]*)/Config.in(.host)?"', text) From patchwork Sat Oct 5 12:22:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172188 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="LkcEkvzw"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9M6Q0Nz9sPv for ; Sat, 5 Oct 2019 22:23:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 57DB62041D; Sat, 5 Oct 2019 12:23:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0kaj1IS5P007; Sat, 5 Oct 2019 12:23:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3AEA220434; Sat, 5 Oct 2019 12:23:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 40F7E1BF29F for ; Sat, 5 Oct 2019 12:23:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 35C4E87863 for ; Sat, 5 Oct 2019 12:23:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8VL+a263Ra3k for ; Sat, 5 Oct 2019 12:22:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id ACAE387872 for ; Sat, 5 Oct 2019 12:22:58 +0000 (UTC) Received: by mail-lf1-f49.google.com with SMTP id r134so6254769lff.12 for ; Sat, 05 Oct 2019 05:22:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2ChaII0qzT+2TGxZPjb6pr5T4E8idhuL8EbxXmjVuqE=; b=LkcEkvzwXXAC4HZzmcy1C52nXrthjEdUI4pbLaF2sxdVE9gsa/12eNheksjTyMDpEo zy+s8RE4tIX8M08QnwtzR3VHk+VI1kOHqjej7Dce3Fm+WB8Hf9Jfmc8JUNXottuCODrB ESt+6KcjdQMEuDsx7EHmH2pQAY65F2FKZ21GbmJNip5vqWQTmyrQlPUnrooteAA1iHFB mkg7bTrgle6iSO4hcmB/67h+j2T7pCO0x+H3mP7+9uW6pIiRiVM1JUBiEkUZ0E1tq3ng YERlJIWPTPFZIElKSUbIRkNLGNas1PBPNqeCoYN7ucKR9Y2A2rBFjNOtQ19lpnJtZpaS vspg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2ChaII0qzT+2TGxZPjb6pr5T4E8idhuL8EbxXmjVuqE=; b=UPSW0F9vtcGeeu4QZFO3YRLi6reN5vZpwdn55SsCrAGGVhPKDwI1TiHS3YaHQ01aHd NkGt3eKXXTZqIFZw72jZ5F8u9vN66KL03dl+xaFOW1enGcs2+G6TIeVUfsZbzpi7C9Gd ZuSuDD3jW0KuPdvwGZL4j2shaumDGRFuOMKKTgegc9WqKZAcIHtJhm9X3leYPgwcIxtE EeaqWohG1A6j5OO7GY/FEktsJD+tOh+6J4kKD1f9PjrFEs5qypECPCwjHwzufCDVcPLk qN/u2s61Knpmp/GDZij1R5iJFg4Z7mWVwp1oRD7dFoCy1PzUKefENrRfKsunCnTdDrDF wb/g== X-Gm-Message-State: APjAAAUN8R9Oz5p5r1GR2C5m6QBXo4HS/Fc8/FGIZV7CY/BIflxuMwJw afIRxxCANcQWjoAbWrRDfp0sEbGF X-Google-Smtp-Source: APXvYqxTnMHSv4C8w1Ufvd+ovuA9eQzouIxN2k9DAXA9yi6oeuKp6DRupjvhk3PrphwrjyFxXk7DzQ== X-Received: by 2002:ac2:5196:: with SMTP id u22mr11898596lfi.130.1570278176632; Sat, 05 Oct 2019 05:22:56 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:22:56 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:21 +0200 Message-Id: <20191005122227.7297-8-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 07/13] utils/checkpackagelib: CommentsMenusPackagesOrder: check package ordering just before 'if ' statement 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Because the statement if BR2_PACKAGE_..._FOO (if exist) refers to the foo package, so the line source package/foo/Config.in should go just before that statement. Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski --- utils/checkpackagelib/lib_config.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 142e8f745d..709dbae0fe 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -108,6 +108,22 @@ class CommentsMenusPackagesOrder(_CheckFunction): self.initialize_level_elements(text) + if text.startswith("if BR2_PACKAGE_") and \ + self.new_package.replace('-', '_').upper() not in text: + self.print_package_warning[self.level-1] = False + prefix = "{}:{}: ".format(self.filename, lineno) + spaces = " " * len(prefix) + return ["{prefix}Packages in: {menu},\n" + "{spaces}are not alphabetically ordered;\n" + "{spaces}first incorrect package: {package} ;\n" + "{spaces}this package, placed just before if statement,\n" + "{spaces}should match the one used in\n" + "{spaces}{text}" + .format(prefix=prefix, spaces=spaces, text=text, + menu=self.menu_of_packages[self.level-1], + package=self.new_package), + text] + elif text.startswith("menu "): if self.state.endswith("-comment"): self.state = self.state[:-8] From patchwork Sat Oct 5 12:22:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172189 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="DpMVWpk+"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9R0Gq5z9sCJ for ; Sat, 5 Oct 2019 22:23:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 43C3120453; Sat, 5 Oct 2019 12:23:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V1YagLWqeMI3; Sat, 5 Oct 2019 12:23:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 362642043F; Sat, 5 Oct 2019 12:23:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9DF6E1BF29F for ; Sat, 5 Oct 2019 12:23:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 99BD587872 for ; Sat, 5 Oct 2019 12:23:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gHJtMACP+SBA for ; Sat, 5 Oct 2019 12:23:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id B578D87863 for ; Sat, 5 Oct 2019 12:23:00 +0000 (UTC) Received: by mail-lj1-f194.google.com with SMTP id y23so9099271lje.9 for ; Sat, 05 Oct 2019 05:23:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HN+6EgjHuh7DWsr1/eQWzWoB+wiS3QOQoBNbofbg83A=; b=DpMVWpk+eAL5PflNmfuCOQ8b+NvaPBgjk/IWZcr3nQMCXBadsV5iEsOsCRF03krg2S 2CswoHwiIFsmBpDOdxGvTgPwkLn7Vu6Pv7VZpp+oL+6I9FhAdfonG8+NO6U0JJ4cbIVx czqsSpqYKzwW1PznuNcc3e3/5aQoxdL8xeXKBtJbJ2VhAIeLpohkEmS7u1Vkd+RqWUfV 5XqBcCpb/QGhLDg63A61NFJaQPDsv1rzUgxySr+BKfOZGhwxzkOPWtJIfca+Hp/PdkPf UwfdvWcr7FemA0E7iBRkfGeEIsMNPmJ4Fx1/I8wBzzg01U8ZbeMdSKylqrxzonMnUyEM 1c1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HN+6EgjHuh7DWsr1/eQWzWoB+wiS3QOQoBNbofbg83A=; b=kbAfDA82WBMZjKuqqZ3Xhij5sOIpaBv3J/PycOdHuRClCKHP8Sz24izdf+Ixr6GXRP GvMxw6zcosVa/B88AhYkByoYN/zxrZzByS35KVTg52ldAM3ru74HOxrbGhThFsnifuOd EheHDdn3x+0pfhgszoYcFdVYHIS0u1CVeyvwDneKUjGwyD3jgqcaesJgcVDZlLbjo5LM EDAGWXchMgF/Dw5BBO++ntNNi0JLdwM0QPGsWS4m7MU1rejAo+AxSIccZOr6ZsnGLJNI hltWkRLbUxsQZU6CAcvma0ch4ArO4HjnUBkQ+vH3Dc6KxbD7Kjh1WEYYGhT/T9Yp+V56 ekZw== X-Gm-Message-State: APjAAAULdtFpeI3nGojXbH5ljYWZD+p9zGv4kyq2DwN5OytfDqWNp6WB n7b0XScMk9s54ClhSMZ+tCFHqmrO X-Google-Smtp-Source: APXvYqzWuCwPR52IgjGYRnOrnR4aXt4YUNAVR0Kdx1P+wQQDuALmK8nS0ssAdmYFauSz1/HRk0gsTQ== X-Received: by 2002:a2e:9ccb:: with SMTP id g11mr12624637ljj.62.1570278178805; Sat, 05 Oct 2019 05:22:58 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.22.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:22:58 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:22 +0200 Message-Id: <20191005122227.7297-9-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 08/13] package/Config.in: fix packages ordering 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: package/Config.in:594: Packages in: menu "Interpreter languages and scripting", are not alphabetically ordered; first incorrect package: luajit ; this package, placed just before if statement, should match the one used in if BR2_PACKAGE_HAS_LUAINTERPRETER && !BR2_STATIC_LIBS Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski --- package/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index b52b2a96e3..d540ac00bf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -591,7 +591,6 @@ endif source "package/jimtcl/Config.in" source "package/lua/Config.in" source "package/luainterpreter/Config.in" - source "package/luajit/Config.in" if BR2_PACKAGE_HAS_LUAINTERPRETER && !BR2_STATIC_LIBS # lua modules are dynamically loaded, so not available on static builds menu "Lua libraries/modules" @@ -671,6 +670,7 @@ menu "Lua libraries/modules" source "package/xavante/Config.in" endmenu endif + source "package/luajit/Config.in" source "package/micropython/Config.in" source "package/micropython-lib/Config.in" source "package/moarvm/Config.in" From patchwork Sat Oct 5 12:22:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172191 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="Uln+UeGI"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9T6qvwz9sPv for ; Sat, 5 Oct 2019 22:23:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 49FFF86BF7; Sat, 5 Oct 2019 12:23:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CkpyQrJFlXay; Sat, 5 Oct 2019 12:23:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id DE38186A32; Sat, 5 Oct 2019 12:23:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 430171BF29F for ; Sat, 5 Oct 2019 12:23:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 403AA87863 for ; Sat, 5 Oct 2019 12:23:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zLEQymuCMm3K for ; Sat, 5 Oct 2019 12:23:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id BA43387AB6 for ; Sat, 5 Oct 2019 12:23:02 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id j19so9146683lja.1 for ; Sat, 05 Oct 2019 05:23:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UDuJrq6uhLRXa/TKg4NyzNRknmFnbdz/DJneYrhx4KA=; b=Uln+UeGIn0M/k69AsDiVaLWXbQ3VaFMx9zk4+hvAUNWejcqq04cvpHcOhM7B5Ao2YI vBKxqXlCtcVItIuHaOXn8pHTn9kGjPQ1LGBQhR0gPpcfvmf3zyzb0s3JqpmmU7acbyPP OX5Q2XmW0vUd81W0zJ+sBqNXREZnAPCHTzxecM5Yr8CXyZeYLsXxdzY4WOLe9poWm+Qf BbsT82me1lvqTeh05VccFl8AnmyHU8OcUja82PXTDNj4kefXDkojGuxvO5EKv7iYtq1d TazBQE6vkxa/uM0S11rGHfIEj7C6ZL09mKXDruOQHJFJmXaXC4KVOxiYpEzuWTPTCty/ yzEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UDuJrq6uhLRXa/TKg4NyzNRknmFnbdz/DJneYrhx4KA=; b=Bxb7G/75REy8sbD3EPHpXmCYBuJYjNcCQTLOGSnIwkfBNoNfKmMt5lqXaOdul9XSir 3i7lMu6mUX37unJxxABF2olwGO1K56rmu9iRGrmYM0CS50cBLhOtMwR7OHZ7BBlxf0O1 5HkKMlr+GNSEEt37sH+64zWcoTKucY5v2BSVGswJD1rvFY2f/44CM6YnimG/BcmRSHfJ PH55QHjBmumqA/35Kjcu8k+v9AU4z//wqTzFH0OJNnTH6dJhRm4bbHB8rG6B2EUACU0R 0OmOYSefU/0c0n/JdTnWbMrxeewVbKjAxek5mx2joHcrJlXq7Y0obEzy8pm2JpwLYluq qxsA== X-Gm-Message-State: APjAAAWctvJV7yDjz9sjAA7ymtERn/R5phtGfT2Dkp9oY/b8n7L4lK4G 91n1wTXRb8EeXjWuxwNPYjD8XGHb X-Google-Smtp-Source: APXvYqwtEU8N3s2sO8dAtGD7m5/EoK61QlazkcbNZh1dqQDB98WZaGFUYESBQw/4zyo+NMS7HEPgxg== X-Received: by 2002:a2e:7407:: with SMTP id p7mr8587406ljc.182.1570278180750; Sat, 05 Oct 2019 05:23:00 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:23:00 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:23 +0200 Message-Id: <20191005122227.7297-10-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 09/13] utils/checkpackagelib: CommentsMenusPackagesOrder: check the order of comments menu 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" At any level if the 'comment ...' line occurs for the first time a new state '-comment' is added and all arrays elements for that level are initialized. For the second and subsequent time only packages arrays elements are initialized. The menu of comments corresponds to menu of packages of lower level. Only the valid comments are compared. The comment is valid only if there is at least one a 'source ...' line after it and before the next 'comment ...', 'menu ...' or 'if ...' line. The alphabetical order of comments at that level is checked until the first error occurs. Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski --- utils/checkpackagelib/lib_config.py | 43 ++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 709dbae0fe..06d45bd6ec 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -62,10 +62,13 @@ class AttributesOrder(_CheckFunction): class CommentsMenusPackagesOrder(_CheckFunction): def before(self): + self.comment = [""] + self.comments_order_checking = [False] self.level = 0 self.menu_of_packages = ["The top level menu"] self.new_package = "" self.package = [""] + self.print_comment_warning = [True] self.print_package_warning = [True] self.state = "" @@ -84,6 +87,16 @@ class CommentsMenusPackagesOrder(_CheckFunction): def initialize_level_elements(self, text): self.level = self.get_level() + + try: + self.comment[self.level] = "" + self.comments_order_checking[self.level] = False + self.print_comment_warning[self.level] = True + except IndexError: + self.comment.append("") + self.comments_order_checking.append(False) + self.print_comment_warning.append(True) + self.initialize_package_level_elements(text) def check_line(self, lineno, text): @@ -101,7 +114,12 @@ class CommentsMenusPackagesOrder(_CheckFunction): if not self.state.endswith("-comment"): self.state += "-comment" - self.initialize_level_elements(text) + self.initialize_level_elements(text) + else: + self.initialize_package_level_elements(text) + + if self.print_comment_warning[self.level]: + self.comments_order_checking[self.level] = True elif text.startswith("if "): self.state += "-if" @@ -145,6 +163,29 @@ class CommentsMenusPackagesOrder(_CheckFunction): self.level = self.get_level() elif source_line: + if self.comments_order_checking[self.level]: + + self.comments_order_checking[self.level] = False + + new_comment = self.menu_of_packages[self.level][9: -1:] + + if self.comment[self.level] != "" and \ + self.print_comment_warning[self.level] and \ + new_comment < self.comment[self.level]: + self.print_comment_warning[self.level] = False + prefix = "{}:{}: ".format(self.filename, lineno) + spaces = " " * len(prefix) + return ["{prefix}Comments in: {menu},\n" + "{spaces}are not alphabetically ordered;\n" + "{spaces}correct order: '-', '_', digits, capitals, lowercase;\n" + "{spaces}first incorrect comment: {comment}" + .format(prefix=prefix, spaces=spaces, + menu=self.menu_of_packages[self.level-1], + comment=new_comment), + text] + + self.comment[self.level] = new_comment + self.new_package = source_line.group(1) # We order _ before A, so replace it with . From patchwork Sat Oct 5 12:22:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172192 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="lMdTqCqG"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9Y1mfDz9sCJ for ; Sat, 5 Oct 2019 22:23:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B66A120444; Sat, 5 Oct 2019 12:23:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mddb5LzHxIda; Sat, 5 Oct 2019 12:23:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id ACCBD241C8; Sat, 5 Oct 2019 12:23:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C8AC41BF29F for ; Sat, 5 Oct 2019 12:23:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C095687881 for ; Sat, 5 Oct 2019 12:23:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MndPv6RUBZp3 for ; Sat, 5 Oct 2019 12:23:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id BA72087863 for ; Sat, 5 Oct 2019 12:23:04 +0000 (UTC) Received: by mail-lj1-f196.google.com with SMTP id m13so9085227ljj.11 for ; Sat, 05 Oct 2019 05:23:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rSnNLn2jV9e4qFKFYkVRLc//vRepkcc9xf5Nu5mSgPc=; b=lMdTqCqGB5+sDc1NCele/MjZ634sk5s3TzziQJdjaE/3ETyd9ox5FmyAsFR2fDGfRN iKxPYvfLN+cp+fAjMRIhOYrW1ugbGcsklJP6g/bZV4hQQE+iYedLHZ5pP+rJ8oYBfF9S gsX1Mg1+G2QlrmXP2uAgPhLmbGtsdaxMl/ddKOLgUYdAm2RZr0ld9Uwxz5oh37LiPQDh wqJH5zJDvqjo/s8BAqMYPTQpIzLXDLGTicy53spbm2RkUNTlghI3K3OlOt/WR06jvcPo nMhCt63vkzOVx8hGB6zIkS8b9J0oHfWJDx8YQ0YW1HP/n+FbGGyNmNAkiuvD/9capDxR awYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rSnNLn2jV9e4qFKFYkVRLc//vRepkcc9xf5Nu5mSgPc=; b=VamMBA2igUMc0o0E7GeOvUHqZBfA2bLeYcSH3sEk9EE7w03JTzf2OHmQQ81ppdI5OX zQ7Rfs+IGa6mPw93iSKbe0JMv0sskm9qTwz6enxzms/Orvbk3HQ+wAeCxwbAYDDRe/Iv 4BnYjBNcdSQZzkPe8R+zz6Var4PqjAb3p09ulicqmJcNf68D/4LII6cIQWm1Rmtrscnf hZl1rud8LW/+no1jWHe0RpnzEtt3eQBghC/YB6CbEi1zYUlbAUPdvgFkbd7OsTmzYYgX oca9ceWJDiyawagIz/IhER+dQLarNz68SFltTYPZFdH/qJC1vXMUzxm6bicnvuoMJMqH Z4jA== X-Gm-Message-State: APjAAAXbNCHt5D3VUcyp+XzZAjeNKjJK0rzSW8uDXsJgjoi3IhwVEgjr go+4Q54Jp1xb02TGlGxt+md0IQhZ X-Google-Smtp-Source: APXvYqz7Ao4GP4XxjAkFavNFr8YOL1o/XMklxbDTJM9bX8UZzU9BWrzFSfJ+D1zwESI+6Moi4GsG/w== X-Received: by 2002:a2e:7212:: with SMTP id n18mr12346079ljc.91.1570278182792; Sat, 05 Oct 2019 05:23:02 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:23:02 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:24 +0200 Message-Id: <20191005122227.7297-11-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 10/13] utils/checkpackagelib: CommentsMenusPackagesOrder: check the order of menu of menus 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" At any level if the 'menu ...' line occurs for the first time a new state '-menu' is added and all arrays elements for that level are initialized. For the second and subsequent times only packages arrays elements are initialized. Because of this that condition must be checked before appending elements to arrays. Therefore array's first_menu element must exist for that level and therefore this array must have one more element than the others and in time of initialization the higher level element of this array is initialized. The menu of menus corresponds to menu of packages of lower level. The alphabetical order of menus at that level is checked until the first error occurs. Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski --- utils/checkpackagelib/lib_config.py | 37 ++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 06d45bd6ec..97d256bb1c 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -64,11 +64,14 @@ class CommentsMenusPackagesOrder(_CheckFunction): def before(self): self.comment = [""] self.comments_order_checking = [False] + self.first_menu = [True, True] self.level = 0 + self.menu = [""] self.menu_of_packages = ["The top level menu"] self.new_package = "" self.package = [""] self.print_comment_warning = [True] + self.print_menu_warning = [True] self.print_package_warning = [True] self.state = "" @@ -91,11 +94,17 @@ class CommentsMenusPackagesOrder(_CheckFunction): try: self.comment[self.level] = "" self.comments_order_checking[self.level] = False + self.first_menu[self.level+1] = True + self.menu[self.level] = "" self.print_comment_warning[self.level] = True + self.print_menu_warning[self.level] = True except IndexError: self.comment.append("") self.comments_order_checking.append(False) + self.first_menu.append(True) + self.menu.append("") self.print_comment_warning.append(True) + self.print_menu_warning.append(True) self.initialize_package_level_elements(text) @@ -148,7 +157,33 @@ class CommentsMenusPackagesOrder(_CheckFunction): self.state += "-menu" - self.initialize_level_elements(text) + self.level = self.get_level() + + if self.first_menu[self.level]: + self.first_menu[self.level] = False + + self.initialize_level_elements(text) + else: + self.initialize_package_level_elements(text) + + new_menu = text[6: -2:] + + if self.menu[self.level] != "" and \ + self.print_menu_warning[self.level] and \ + new_menu < self.menu[self.level]: + self.print_menu_warning[self.level] = False + prefix = "{}:{}: ".format(self.filename, lineno) + spaces = " " * len(prefix) + return ["{prefix}Menus in: {menu},\n" + "{spaces}are not alphabetically ordered;\n" + "{spaces}correct order: '-', '_', digits, capitals, lowercase;\n" + "{spaces}first incorrect menu: {comment}" + .format(prefix=prefix, spaces=spaces, + menu=self.menu_of_packages[self.level-1], + comment=new_menu), + text] + + self.menu[self.level] = new_menu elif text.startswith("endif") or text.startswith("endmenu"): if self.state.endswith("-comment"): From patchwork Sat Oct 5 12:22:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172195 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="JTaiEV+G"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9k3d0qz9sCJ for ; Sat, 5 Oct 2019 22:23:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 66AE924BA1; Sat, 5 Oct 2019 12:23:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EBwQHWecYALG; Sat, 5 Oct 2019 12:23:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 27AFB2047F; Sat, 5 Oct 2019 12:23:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6F9F31BF94B for ; Sat, 5 Oct 2019 12:23:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6D09E878A5 for ; Sat, 5 Oct 2019 12:23:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q4ikCkIBj86x for ; Sat, 5 Oct 2019 12:23:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id A25C787863 for ; Sat, 5 Oct 2019 12:23:07 +0000 (UTC) Received: by mail-lj1-f195.google.com with SMTP id 7so9120662ljw.7 for ; Sat, 05 Oct 2019 05:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZS3CSgMorh9tYRa65qoYG7rL4c6y6D07XsZ4pSuNi2o=; b=JTaiEV+G5Ht2payaN1L0BFnBdLa5qItg4GpIhkO8xAk2RtTbwPkSvZ37u4QA9vRnCC aVMSBSImqHuVin4YSjl8gG8gfUzCQxYyra7RK+wVr5PomBtTgWbIOPzZzLQkx/wOwuRE hv9qVo3HibVQjYnfnd2Bo8LR8z8UpQKoI9YZpscJwJVQmyIgf+oLqq2mlpddSpEYR0P/ P7UHUVElW5vixQ5Iv9sLkJehON4uTnnyIJVrQDccON3w707McCBVEI6zJz5BuOdBtVQ8 5LOtuznhVsmlY5unWSK6lAXYL5x1/0AW1LzKAH+YnktNnZ3jtwQwqKE3eOQ1NoEQrAUy H8JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZS3CSgMorh9tYRa65qoYG7rL4c6y6D07XsZ4pSuNi2o=; b=IApuiwAxEE16nBh0K4z9YkyAUpSBF4bLUTmPEmfxH5EopeS/m2yDZLszVOyEXvLy+l RZKTQGAD1Y21aXe8wW0+D8Mg7TyX94JwA09B4BTO1j4vBBfMm3KwLRCMSvm95a2ozRdq GbPiPGGLIOtixq4ehbVfGweNzdQnDT/pYSJY2xC/A4ZfOpn+5oDQutU8lmNo4pSJwcyX 6KkC8pJeQD4uDwDh30pWj4+jSw43KZEhQxO/SiS7WErLkKUkClh/YYZAeBnOFvj0HvMi eJC8XloH4LfMIccHLUlEA3U4bZ1sE3Emt2X+ylHPg0JEigx0HYYkcS50jL3NMty5DZZE zrMg== X-Gm-Message-State: APjAAAXmLTchDmsWZPaDcAmJ7DCt74JKjMMl/ah9FXMbE5IKFx4Ot+yq gw9tPv7amgnNPe/sILUIpAn9SZWp X-Google-Smtp-Source: APXvYqyYVRhJqEsc2eqwg5JZ/Rsng4NkFAS03uL8kGn2cqPInIkxU5ksQpLZ39+PIjdx9bXLfOr5CQ== X-Received: by 2002:a2e:b0f4:: with SMTP id h20mr12455199ljl.10.1570278185061; Sat, 05 Oct 2019 05:23:05 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.23.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:23:04 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:25 +0200 Message-Id: <20191005122227.7297-12-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 11/13] package/Config.in: fix menus ordering 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: package/Config.in:1455: Menus in: menu "Libraries", are not alphabetically ordered; correct order: '-', '_', digits, capitals, lowercase; first incorrect menu: JSON/XML Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski --- package/Config.in | 56 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/package/Config.in b/package/Config.in index d540ac00bf..ca381ffdb6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1438,34 +1438,6 @@ menu "Hardware handling" source "package/wiringpi/Config.in" endmenu -menu "Javascript" - source "package/angularjs/Config.in" -if BR2_PACKAGE_ANGULARJS -menu "External AngularJS plugins" - source "package/angular-websocket/Config.in" -endmenu -endif - source "package/bootstrap/Config.in" - source "package/duktape/Config.in" - source "package/explorercanvas/Config.in" - source "package/flot/Config.in" - source "package/jquery/Config.in" -if BR2_PACKAGE_JQUERY -menu "External jQuery plugins" - source "package/jquery-datetimepicker/Config.in" - source "package/jquery-keyboard/Config.in" - source "package/jquery-mobile/Config.in" - source "package/jquery-sidebar/Config.in" - source "package/jquery-sparkline/Config.in" - source "package/jquery-ui/Config.in" - source "package/jquery-ui-themes/Config.in" - source "package/jquery-validation/Config.in" -endmenu -endif - source "package/jsmin/Config.in" - source "package/json-javascript/Config.in" -endmenu - menu "JSON/XML" source "package/benejson/Config.in" source "package/cjson/Config.in" @@ -1501,6 +1473,34 @@ menu "JSON/XML" source "package/yaml-cpp/Config.in" endmenu +menu "Javascript" + source "package/angularjs/Config.in" +if BR2_PACKAGE_ANGULARJS +menu "External AngularJS plugins" + source "package/angular-websocket/Config.in" +endmenu +endif + source "package/bootstrap/Config.in" + source "package/duktape/Config.in" + source "package/explorercanvas/Config.in" + source "package/flot/Config.in" + source "package/jquery/Config.in" +if BR2_PACKAGE_JQUERY +menu "External jQuery plugins" + source "package/jquery-datetimepicker/Config.in" + source "package/jquery-keyboard/Config.in" + source "package/jquery-mobile/Config.in" + source "package/jquery-sidebar/Config.in" + source "package/jquery-sparkline/Config.in" + source "package/jquery-ui/Config.in" + source "package/jquery-ui-themes/Config.in" + source "package/jquery-validation/Config.in" +endmenu +endif + source "package/jsmin/Config.in" + source "package/json-javascript/Config.in" +endmenu + menu "Logging" source "package/glog/Config.in" source "package/liblog4c-localtime/Config.in" From patchwork Sat Oct 5 12:22:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172194 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="SWdjOHDS"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9f0dGWz9sPv for ; Sat, 5 Oct 2019 22:23:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 938F524AFE; Sat, 5 Oct 2019 12:23:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iWTTtw0oLKr3; Sat, 5 Oct 2019 12:23:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3697C23B28; Sat, 5 Oct 2019 12:23:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 18D051BF29F for ; Sat, 5 Oct 2019 12:23:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1616387894 for ; Sat, 5 Oct 2019 12:23:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cO54wF73aifk for ; Sat, 5 Oct 2019 12:23:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id DE7F387D9F for ; Sat, 5 Oct 2019 12:23:08 +0000 (UTC) Received: by mail-lf1-f49.google.com with SMTP id x80so6299628lff.3 for ; Sat, 05 Oct 2019 05:23:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7OVg4aG083H7SyxgCKMPWA8zdmMZnfKRUQ5ZeatBXYY=; b=SWdjOHDSRaX2Dh/Oar3xKUTZUmWWEMkLwbGFBhQupc/V3J7fqPj0k9JlzmZYTMtBM8 SCibYBvJwrhD1tgMNTeLW69m+VdkVFPsz66dRpejETcbZx4shUYloJv0ALkzVlF/cTHY Z+f1De4DFI8//KAx0Daa28+RXdb8LJIUGjkJyu9k6/SY5iIe+sjIy9gYL5xNebWzY6VE tF3xW7OKRby6EvxMKm/d/DKqCmEGv+5qY/2+YbPUP7w+XNCak8ftwv8pWj3ydxg3/Do0 f3lcRxvhEgJEuQTsmz37GhYwLsan0X7czbwYrAovPONd4NK4YiBCQnsgSRbsySr28KKw 7hZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7OVg4aG083H7SyxgCKMPWA8zdmMZnfKRUQ5ZeatBXYY=; b=RnvZI25c8IrBQ29Dl+MkhGF301kXzY8WmaGM2ujwbcKxAI4AVUcYzByRjr5u/rPULv h/rgzmsENYwXcHMMXbjsi0owSNaMBvg/ebFeHi4BlAUHx5ky6ZbiuOFMdg+gr9uJoezg ASaYvVe40A6Du7dhrYAYkthBegXadFzpcTqFgJEe4QC+CQNYT8qqTRpuMMcewxV6sYAl kBdo8iQZI1SLyCNvf+oWaGQWqBIfrX2GTj0lRu6STc0PB2p4qqCxwcIQUaHIy8fOewcl UYaEkS8z9hDXAJJC/z1JSUkMje2bm9p9olCPGQgPmXtYggiuXMLCcDenIrxQPptpi8tM bocQ== X-Gm-Message-State: APjAAAVfOfKx3VLkwKlU4Y+83Lt6KRZJAoieH4X3AqBSJ8Un79f3epF5 kB46t3OUH7D9VCBo1kE+5ER21ZcU X-Google-Smtp-Source: APXvYqz5AknKTF3JwPJ2pE45+eSOKVONntzG1bWM1SIn/qlq3r+VBIJD3nVfPi3jFf52L1/PirNW9w== X-Received: by 2002:ac2:4218:: with SMTP id y24mr6292396lfh.148.1570278186929; Sat, 05 Oct 2019 05:23:06 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.23.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:23:06 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:26 +0200 Message-Id: <20191005122227.7297-13-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 12/13] package/kodi/Config.in: fix menus ordering 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: package/kodi/Config.in:313: Menus in: if BR2_PACKAGE_KODI, are not alphabetically ordered; correct order: '-', '_', digits, capitals, lowercase; first incorrect menu: Inputstream addons Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski --- package/kodi/Config.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index e8a504312c..a586f130b8 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -303,17 +303,17 @@ menu "Audio encoder addons" source "package/kodi-audioencoder-wav/Config.in" endmenu +menu "Inputstream addons" + source "package/kodi-inputstream-adaptive/Config.in" + source "package/kodi-inputstream-rtmp/Config.in" +endmenu + menu "Peripheral addons" source "package/kodi-peripheral-joystick/Config.in" source "package/kodi-peripheral-steamcontroller/Config.in" source "package/kodi-peripheral-xarcade/Config.in" endmenu -menu "Inputstream addons" - source "package/kodi-inputstream-adaptive/Config.in" - source "package/kodi-inputstream-rtmp/Config.in" -endmenu - menu "PVR addons" source "package/kodi-pvr-argustv/Config.in" source "package/kodi-pvr-dvblink/Config.in" From patchwork Sat Oct 5 12:22:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1172193 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.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="vXhkVD2F"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46lm9d2LHHz9sCJ for ; Sat, 5 Oct 2019 22:23:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CE0E8869C8; Sat, 5 Oct 2019 12:23:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bTvrIKlvVtbY; Sat, 5 Oct 2019 12:23:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4F0DD86A32; Sat, 5 Oct 2019 12:23:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DDC761BF29F for ; Sat, 5 Oct 2019 12:23:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DADA487863 for ; Sat, 5 Oct 2019 12:23:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mPMF51702s3i for ; Sat, 5 Oct 2019 12:23:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1F00A87899 for ; Sat, 5 Oct 2019 12:23:12 +0000 (UTC) Received: by mail-lj1-f194.google.com with SMTP id 7so9120806ljw.7 for ; Sat, 05 Oct 2019 05:23:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+8M8jobMmdsiAq4OYtBviQeV7p0bLsV8tWlQLKr/qdQ=; b=vXhkVD2FeAGt6tALt1G0+z88vxJNR9/6p31YxCGFDwe4cYZzuD99AQo2wgmrTlw9U3 Dyq92j3jdMgXeiIuCFXrmen4J1KmLqUrGrDse/USkxvMCk+PJqSNoV67Q0pWhtKO6sF3 UvK3al4iECBlMNcjycabZIloOVpMiScqYOALganT/NaeanADSY4FOhmmn/AxLvtmsafb Bap3jhJiD5ICVWFSiHUZn8OUsNSx6I7RmrlO7Xf65gy8YwJuN07xJPdlG1kwSrr3bggU nfkHKrRaTjZnqvoHkRklbQNtaivmeKGLVEqWPXt53D9vj99Si0jzCV+Vln+URdTQkU9y Aiyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+8M8jobMmdsiAq4OYtBviQeV7p0bLsV8tWlQLKr/qdQ=; b=f6fVpQoOyax5au61ysUd6ME8Gb4xG+NmallV/GrsgwqQPvGu2lajIf9ZqxbGi5zABN x4OWzB5OUe+M7Ar2B99on3Gf/wzzBHJGDlH9oCyO9i9rOvnki5IRBYn/H4UY0Xb+Un+i CPYaZemOmsGi92VDslPlbZDbbwf8wWXy5zoudieZQfjat+ndVA15cijZ4PVgqp4yv/TN xg3nA1yAQQz67phcPj5AzA4Aot/7RjP5fsGCxm3phi5yoYlMlf7plFVRNP6gFTbHhm0i 1YlsYVTjvDAo3D8/K7WhWe3pd2Rv/8gq4XK3Zr9G6WBTz9HrPck5GMckIQ7nuWs7ZTmR lJlw== X-Gm-Message-State: APjAAAUW+pCHr5BmYiBuYmcv9+HZAo8jtEEBZml7mj77o59mdHmb0zNJ +XHq5QhkMqFkpOUiCpOr00gnOcAo X-Google-Smtp-Source: APXvYqwCi+JlUT5h1bxAUSQoV5bSdFgjdAgqcNqmtBd/8sVoILLvmHiG6lLUs7Aik8YRfv3ciy0RIw== X-Received: by 2002:a2e:86d5:: with SMTP id n21mr12539082ljj.1.1570278190077; Sat, 05 Oct 2019 05:23:10 -0700 (PDT) Received: from localhost.localdomain (user-5-173-241-167.play-internet.pl. [5.173.241.167]) by smtp.gmail.com with ESMTPSA id h10sm1856214ljb.14.2019.10.05.05.23.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 05:23:09 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Sat, 5 Oct 2019 14:22:27 +0200 Message-Id: <20191005122227.7297-14-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> References: <20191005122227.7297-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH v2 13/13] package/kodi/Config.in: fix menus ordering 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: Jerzy Grzegorek , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: package/kodi/Config.in:318: Menus in: if BR2_PACKAGE_KODI, are not alphabetically ordered; correct order: '-', '_', digits, capitals, lowercase; first incorrect menu: PVR addons Signed-off-by: Jerzy Grzegorek Cc: Ricardo Martincoski --- package/kodi/Config.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index a586f130b8..c222c8fdf5 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -308,12 +308,6 @@ menu "Inputstream addons" source "package/kodi-inputstream-rtmp/Config.in" endmenu -menu "Peripheral addons" - source "package/kodi-peripheral-joystick/Config.in" - source "package/kodi-peripheral-steamcontroller/Config.in" - source "package/kodi-peripheral-xarcade/Config.in" -endmenu - menu "PVR addons" source "package/kodi-pvr-argustv/Config.in" source "package/kodi-pvr-dvblink/Config.in" @@ -334,6 +328,12 @@ menu "PVR addons" source "package/kodi-pvr-wmc/Config.in" endmenu +menu "Peripheral addons" + source "package/kodi-peripheral-joystick/Config.in" + source "package/kodi-peripheral-steamcontroller/Config.in" + source "package/kodi-peripheral-xarcade/Config.in" +endmenu + menu "Screensavers" source "package/kodi-screensaver-asteroids/Config.in" source "package/kodi-screensaver-asterwave/Config.in"