From patchwork Tue Sep 3 21:13:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1157319 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="ZGrNfQc+"; 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 46NKTB3Lb9z9s4Y for ; Wed, 4 Sep 2019 07:14:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CCD6C22B6D; Tue, 3 Sep 2019 21:14: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 aBIml2B0s0EW; Tue, 3 Sep 2019 21:14:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3B5C222902; Tue, 3 Sep 2019 21:14: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 081751BF59D for ; Tue, 3 Sep 2019 21:14:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0264D81B74 for ; Tue, 3 Sep 2019 21:14:13 +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 JsvNi4GnJ8cZ for ; Tue, 3 Sep 2019 21:14:10 +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 74B938582C for ; Tue, 3 Sep 2019 21:14:10 +0000 (UTC) Received: by mail-lj1-f194.google.com with SMTP id l14so17523099lje.2 for ; Tue, 03 Sep 2019 14:14:10 -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=+FLCy59GEtTCVY8YKyvxCFvKf6WXrqOYxetP3mkwXEg=; b=ZGrNfQc+v8azK44aNxvLY7kvcenFL0HIaF05LxqR1hEruPQr265T2RDBk3ll2fKhOX pvU4p+vB6UjtnDpQHphn8Ug4OSE7a/p6vtBlbBX4FT++aVm3ZrVxOcUWzOOIoX6IjzYs iUoszg2dr8qM6A7iiVwJ8fi48J+Qc4m3FSIE0c/vVWeLxpdqxzVvBW/CCh7/0O3TNEr4 VvW7EU2Dwr2tklSp8vlUtnU3cOhxhwcOoii3/oJLtcKK7fqXUH6+aaXNB6CsRF9kvEpS dMoRRdBsi2D7bElYiboVUD6j0A8omalDnOsRwLvTId/jsXbOa0VNovCz7bOFcGe+KXQR lEPQ== 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=+FLCy59GEtTCVY8YKyvxCFvKf6WXrqOYxetP3mkwXEg=; b=rNFUHv0lM2ubUv1uFf+KtZzoa4bCsftDRQRnsFunsRdrft2ItBey/mJaATzb7aFmul rNI0QZ5qhpcAVoDcP2cpsoIKhg3QN/t/pB0KoDYgYBCoS4fklnGfgELODzEPQgLZfmvf 9RI7SFYQKw//0bUkiY2xrkcpxU5iuVOiB3bk/SNeTf2l5bP+57rcBXuzcVm9qKqv8w2Y G5S3Ms5Oso1d6dllAOr66kwMMnWhWwF4xDIlz2WnRcXEoBs2bSthcuwdmS0SeNIP/dDs zvM/veppedq7PUxQ2KOAnTo89jHY7KAR1jOXSXequtgoT6qq2Dyixq9/4xqXVLGJ9EAp BULg== X-Gm-Message-State: APjAAAVf779diEvMvnscxRDfwxBA4ByOKrbkeEE0LdfIbsXxjaAd/Fkg Cw9GmsSm66IF1bz3a/bQ3ZgfiX6rtaw= X-Google-Smtp-Source: APXvYqxaeDoHZ2b7YxIoSqf0bUyqulsrfJDP0QZ54HXxQNuPt+c/LVBtVCOPtrGzO80GIeDI+SLliQ== X-Received: by 2002:a05:651c:158:: with SMTP id c24mr21182432ljd.66.1567545248533; Tue, 03 Sep 2019 14:14:08 -0700 (PDT) Received: from localhost.localdomain (user-5-173-240-120.play-internet.pl. [5.173.240.120]) by smtp.gmail.com with ESMTPSA id u1sm1650822lfi.83.2019.09.03.14.14.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 14:14:08 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Tue, 3 Sep 2019 23:13:34 +0200 Message-Id: <20190903211341.10341-11-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> References: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH 11/18] checkpackagelib/lib_config.py: 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 MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Jerzy Grzegorek Cc: Arnout Vandecappelle (Essensium/Mind) 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 f1c709388c..a356702ca8 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -85,8 +85,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 Tue Sep 3 21:13:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1157317 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="N8tjipOz"; 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 46NKT51CRjz9s4Y for ; Wed, 4 Sep 2019 07:14:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B1BF386559; Tue, 3 Sep 2019 21:14: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 JjWlNJts8f-0; Tue, 3 Sep 2019 21:14:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 25E4D868D5; Tue, 3 Sep 2019 21:14: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 C02711BF59D for ; Tue, 3 Sep 2019 21:14:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BCEBE86B11 for ; Tue, 3 Sep 2019 21:14:13 +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 QO3hM-uEKHsR for ; Tue, 3 Sep 2019 21:14:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1943987864 for ; Tue, 3 Sep 2019 21:14:12 +0000 (UTC) Received: by mail-lj1-f171.google.com with SMTP id u14so10939070ljj.11 for ; Tue, 03 Sep 2019 14:14: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=mjXauNmUO0TernUAP8EFgwRqTr2qVWBH5tcjyntMOMA=; b=N8tjipOzHw0QnW7T7hCwS8Nu95Ql5oFXkvNeW3I4m7bD5sEFI1oUCRGtsSkrGCCFaC kpf6P9MEk9DHs4L5rzDoB6CiWZvF7Jw/vIN1aEtWdDtEhY06ZrHvyTXZJijpHcphSl3s CkB4ihskh0LcwIQO4pCQuC62JIqB30ddq8F2zZGGcT8+6i58jMcCv+7hRF55fuHxKzdq vOE00b/xOYjZ21lwT/NIyFDsVZMSIaZonu4u152rW5ztlKpiXKa00NlDM31faHPvNZX2 EeGllUiuvEfM8vpr81R84O7rFrERjooLPuk9mR9GMOfMHoNunKqwDtGf/JqeEwzVZySa DDFQ== 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=mjXauNmUO0TernUAP8EFgwRqTr2qVWBH5tcjyntMOMA=; b=DX9qU82RNPjjajE33wKkQFIxb/95t2P8U6km9M+dOF0rpKGuNQ4NcdVvn1gmJG0Fcz NTvfo+AY0yu4EH0p4l0/v0kVf+otH4fqTIbCLIo7G2udQFTSncC8rK22lfc0GyBI0pzq 7AIUJnKzKE3ujmaiVAANWhARk/RApyXH0sL/pM+GyWci8U+Yn0BmyU0Wf3EKAzBDDNgF ObNFD3wJ46HUtQ3OGxKI9dIDiuCL+xWPKCTlEITeqaj8frmhs1TKxXSzMbqw+NPS+vtX D2Tt4hUe858OOviS3k1Ous3NUXSQQYyeAvXFYSjLjxvqKUkkxuVlFOugO0BI5EhGS4g+ kEMg== X-Gm-Message-State: APjAAAVAhNAXDBN9mLnhUDU97qfXqDs3RBYK5ieVhBhceRXN+Qoz5k5b l28EltiFM8T8Eq3vXqQLsCdw71ahJ18= X-Google-Smtp-Source: APXvYqwHG8PqYVsb+gGlRQvudpPSbBFISGjXCh6T44+ILvqXzI7dyCwZOzVqei4W/n8LgFDztgogKA== X-Received: by 2002:a2e:6596:: with SMTP id e22mr5949794ljf.87.1567545250204; Tue, 03 Sep 2019 14:14:10 -0700 (PDT) Received: from localhost.localdomain (user-5-173-240-120.play-internet.pl. [5.173.240.120]) by smtp.gmail.com with ESMTPSA id u1sm1650822lfi.83.2019.09.03.14.14.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 14:14:09 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Tue, 3 Sep 2019 23:13:35 +0200 Message-Id: <20190903211341.10341-12-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> References: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH 12/18] checkpackagelib/lib_config.py: 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 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: Arnout Vandecappelle (Essensium/Mind) --- 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 a356702ca8..1ef46774a9 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -105,6 +105,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 Tue Sep 3 21:13:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1157318 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="sJFQ8FSn"; 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 46NKT75ffnz9s4Y for ; Wed, 4 Sep 2019 07:14:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 988AB869A5; Tue, 3 Sep 2019 21:14:17 +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 Te89Rse5B9vD; Tue, 3 Sep 2019 21:14:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0CD9F869ED; Tue, 3 Sep 2019 21:14:17 +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 629B61BF59D for ; Tue, 3 Sep 2019 21:14:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5F9D88582C for ; Tue, 3 Sep 2019 21:14:16 +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 MoG5cWHvK6Jf for ; Tue, 3 Sep 2019 21:14:14 +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 C9EFE86B11 for ; Tue, 3 Sep 2019 21:14:13 +0000 (UTC) Received: by mail-lf1-f68.google.com with SMTP id q27so14039563lfo.10 for ; Tue, 03 Sep 2019 14:14:13 -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=amdrgLeOjCUl+Uny1sLxP9+sUcPZFb31SWJw6vTyFek=; b=sJFQ8FSneJ0b0T1eJkjPctDvpIvo+XTDaaagux6qi6IqkUIjsfQNhikGYpyWrnxui/ c4ciDW5jf7olsAVI8Mwg/9Rc9KxfH4viavA67ZHrp10Pzuh8cdH+AnBqGaonjr9mzQh/ aRyF8t/BH7dh6y7yeo8WO34WSshsJq5YA2GVG7nfxQ3UxrjadX0G8gmwcIEtv5e32ORj sjb7Cbr09584v6Zn5PR4JE6PMKR5SKbjrwkjc52LfbOYpha1AzGfG+ENBH0fyTqU+mpX Jj6MaknlmcNYhFWhq6+L+CWmkK9B69fhwps/VkXWVQsWqJ/SXP6hqzExvsEsVyafJ4bi xQpA== 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=amdrgLeOjCUl+Uny1sLxP9+sUcPZFb31SWJw6vTyFek=; b=RlUyfXQ+uK10UHYVG6qli9Tj59q8YkSOct1KJC6nzEdvXv3Pu23Nn+iR/Zvm3HQmNV qwlq1RHF+VwQcY+19JDhYPjB/GmR9ni7mDHZCyzJq8EfBg+QlKC1VJzEXA1GdGH9nLLs bjxJB0XNzgzNfdBTuWLAR3+ghOghPOxf2uMCNPsYi9Z7lcrFSA32hqWMp8qKZJP47kcX +Rhd88M7Xs+x8dwq6HpKTPRxmx6u3DuE4WWTpfXfhHoAq9Cpnvgz5bg0hG22YLDwzWUj Bqy4LRv6EksbJUWW2vg6Ej/hvYwRoN5CO9TbNP12M0KOhzvwH537jej43dWI073MogdL HcMA== X-Gm-Message-State: APjAAAW+1HYu7E/wJzSy7ldoXGfTXJq5Gkko4uQ/7RX78kfbPcXK0oQC DIdt7u5DbF20/jqjmZrg+P5a+6rnjxs= X-Google-Smtp-Source: APXvYqzjFwZ09GozHMtY8AjM8r3td1HJ420i1K7v2lcOt0xDCLjKUW/hSECm49obk5iQiikVbd553g== X-Received: by 2002:a19:48c3:: with SMTP id v186mr6365359lfa.141.1567545251903; Tue, 03 Sep 2019 14:14:11 -0700 (PDT) Received: from localhost.localdomain (user-5-173-240-120.play-internet.pl. [5.173.240.120]) by smtp.gmail.com with ESMTPSA id u1sm1650822lfi.83.2019.09.03.14.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 14:14:11 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Tue, 3 Sep 2019 23:13:36 +0200 Message-Id: <20190903211341.10341-13-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> References: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH 13/18] 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 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: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Config.in b/package/Config.in index 710ed12be0..7bc97fff72 100644 --- a/package/Config.in +++ b/package/Config.in @@ -590,7 +590,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" @@ -670,6 +669,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 Tue Sep 3 21:13:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1157322 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="cHqpuv9L"; 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 46NKTK0shZz9sDB for ; Wed, 4 Sep 2019 07:14:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B8E8C87846; Tue, 3 Sep 2019 21:14:26 +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 ruiKuQp3t+9Y; Tue, 3 Sep 2019 21:14:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A106787834; Tue, 3 Sep 2019 21:14:21 +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 2E9D71BF59D for ; Tue, 3 Sep 2019 21:14:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2C07786B11 for ; Tue, 3 Sep 2019 21:14:20 +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 xN4BDkTf+h-Z for ; Tue, 3 Sep 2019 21:14:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by whitealder.osuosl.org (Postfix) with ESMTPS id B781B8785D for ; Tue, 3 Sep 2019 21:14:15 +0000 (UTC) Received: by mail-lf1-f48.google.com with SMTP id d10so6182470lfi.0 for ; Tue, 03 Sep 2019 14:14:15 -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=vsxni6FJJhDBtBXMkv2sEbjwzWzQEIuOSDqFve3CnrY=; b=cHqpuv9LKTTsvrYdU23X8i6QHEsHADcQRoFM1PiPdgtsrdjLTIWdVEFLGtEBKJgnpI DUzZTCPatk8Rx35mQlRa/UXI4mNkHVbKRCDETNPX/kSnDxhJ3Sstgh30cUb6KVYQTz3N 2hY9XBHgO0N7X5bMcFGPE+vjIilMT1/6PViZXQKqyG/c+cXjpPOXOjrLRq1ZqjrGCnVX UpXp0c2BVaj0UIlh1TPG9fA4GmlGjgzpLcuehG5MmN/lyWcXtUqGkpJhvIgOSTXWKt9E G8ijg0G6ZBgCAvvwx/xKcMRpYt9JpC5ywKdGcskfKPxXuMPTA7Cf92mhb/vhbetnq2cu O+Lg== 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=vsxni6FJJhDBtBXMkv2sEbjwzWzQEIuOSDqFve3CnrY=; b=gleWtjCn+24FCEQTBEoQfEU6cbhkE2lB1oIUmBDJ/1ip/P+uHHBkDXql9/863zMYd8 31Zc80l36QBeMFrMkqHo9uHHQ/0n99B7inZ0GV7ved6xLF3xdYtYMz7f/6VqhIwgMO40 mcFlHHW2VP8IIIc/wMU8M2XSJdgRKzXfFC7KEJ3kJLmth4LTIKl50fdLxXQvzRtONw22 LQr5kiaoIfH0pwV+XvHKcYceewil6XooEoII+h2hoepu9+ASSJGBOgbXjK2AGwhgRqD7 XqwiUdkbXdN5gbYV18w1mwQXEv3A2lf6hu3ctwtJtsItmGgkM2/APQ1E09rU8sucRt9f 8xVQ== X-Gm-Message-State: APjAAAX9TWgDRgh8zJDgwXoJyc4TTQWZwpRFnAdp5mFjXfmtQPZQPOM+ HGTuY9M+zn9rlxShJxSjP74d3Lc7lQQ= X-Google-Smtp-Source: APXvYqyqPhlCMZaQhfLiTn2RXDRUk6bzdOc29+WiSHbm6PBpfex11YF11gplDlG4m93Av15JnnLbiA== X-Received: by 2002:a19:ca07:: with SMTP id a7mr23805073lfg.181.1567545253809; Tue, 03 Sep 2019 14:14:13 -0700 (PDT) Received: from localhost.localdomain (user-5-173-240-120.play-internet.pl. [5.173.240.120]) by smtp.gmail.com with ESMTPSA id u1sm1650822lfi.83.2019.09.03.14.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 14:14:13 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Tue, 3 Sep 2019 23:13:37 +0200 Message-Id: <20190903211341.10341-14-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> References: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH 14/18] checkpackagelib/lib_config.py: 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 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: Arnout Vandecappelle (Essensium/Mind) --- utils/checkpackagelib/lib_config.py | 44 ++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 1ef46774a9..cb8061e371 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -61,6 +61,10 @@ class AttributesOrder(_CheckFunction): class CommentsMenusPackagesOrder(_CheckFunction): + comment = [""] + comments_order_checking = [False] + print_comment_warning = [True] + menu_of_packages = ["The top level menu"] package = [""] print_package_warning = [True] @@ -81,6 +85,16 @@ class CommentsMenusPackagesOrder(_CheckFunction): def initialize_level_elements(self, text): self.level = len(self.state.split('-')) - 1 + + 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): @@ -98,7 +112,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" @@ -142,6 +161,29 @@ class CommentsMenusPackagesOrder(_CheckFunction): self.level = len(self.state.split('-')) - 1 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 Tue Sep 3 21:13:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1157320 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=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="I2Wv61eY"; 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 46NKTB3v7Sz9sDB for ; Wed, 4 Sep 2019 07:14:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D8017884A6; Tue, 3 Sep 2019 21:14:20 +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 QkQQTQnfbwlD; Tue, 3 Sep 2019 21:14:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 261D2884B5; Tue, 3 Sep 2019 21:14:20 +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 D5E511BF973 for ; Tue, 3 Sep 2019 21:14:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D033086B11 for ; Tue, 3 Sep 2019 21:14:18 +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 kZB3H9bAeC9w for ; Tue, 3 Sep 2019 21:14:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id D0E4C86138 for ; Tue, 3 Sep 2019 21:14:17 +0000 (UTC) Received: by mail-lf1-f45.google.com with SMTP id u29so14047988lfk.7 for ; Tue, 03 Sep 2019 14:14:17 -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=+vad0ZftOTqv+UG04A4bNfGgjtVAjFR+RwIg3s19wcc=; b=I2Wv61eYWjJX0r1wdwfi/J5ViXNjuHsEDFEu3NNP4Q9e++alS4xPglG0GEmobAmvkv +WB327QGp9JaCItxn0/jF9/RVMiaSvCoW6o4FC9MP3yqkc+Ww/6lZkOkpCCfiEFtxRlC zMMD6BPpLBXqFKLcoiyHWNIk+zK5aHxKb/6V2oJoxxsdYcEorJJINvonLNg3Ri4hwENG NvnWE9QZnpS1Pf7lzSlJfZjpH595D+tfI1Awy5T/kE3DHVMz+lIaC03GkpthBbUOKN2t 1t+smF/kLkw5TSA1GamUsu7O9qrGSnO/1R6b+Vl9VUoKuCU32midA418vki8X2YHgUER sxRw== 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=+vad0ZftOTqv+UG04A4bNfGgjtVAjFR+RwIg3s19wcc=; b=N9uTn7Nit50Vm5EGJeWlBqq/j2zACDMWpuDIgtUh9WxGP6Hn7NuZQroG5q2+1KtLSX txLrxqKjdXZ7a6Poh2+NpCFBb8lGr1Wq4qRYscXXy8wZlLpuIWryTrTZs5J+dj8ZdZnD TvhRU5Ejnh2ybdrrpVwagy8Mj1op3HAMdRbpv7HZIPgscLRnqOVf/0MWS01NM0DILqah 5lWYe9gitXIneY3Gpox3fdXkelNX4vZOi0rAnjtpbq5QcEDo23buRKrN8s/kOOeEqpA/ Cj4j3GgYnPlLiFi2P86bJstpctoxj9CXIZussdPJT+Rpj5rcqTJ0Wzo250cVCXUsOQZC ohjw== X-Gm-Message-State: APjAAAViPoNv1WBaIBgPiTZRO3niHZ7OrCXxXVDz+D/wY7YfgM0eospC mMzLu+P02cbBQqr8wxUcwn38u38OIxU= X-Google-Smtp-Source: APXvYqwVAwZQerJqqIjzZ138RuHQuLIxQHRmn0SKb2eo56dlHxmKVNOEdk12LgUTWzU/c3nagXmwkg== X-Received: by 2002:ac2:47e3:: with SMTP id b3mr13673197lfp.80.1567545255901; Tue, 03 Sep 2019 14:14:15 -0700 (PDT) Received: from localhost.localdomain (user-5-173-240-120.play-internet.pl. [5.173.240.120]) by smtp.gmail.com with ESMTPSA id u1sm1650822lfi.83.2019.09.03.14.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 14:14:15 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Tue, 3 Sep 2019 23:13:38 +0200 Message-Id: <20190903211341.10341-15-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> References: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH 15/18] checkpackagelib/lib_config.py: 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 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: Arnout Vandecappelle (Essensium/Mind) --- utils/checkpackagelib/lib_config.py | 41 ++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index cb8061e371..ad0142d259 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -65,6 +65,10 @@ class CommentsMenusPackagesOrder(_CheckFunction): comments_order_checking = [False] print_comment_warning = [True] + first_menu = [True, True] + menu = [""] + print_menu_warning = [True] + menu_of_packages = ["The top level menu"] package = [""] print_package_warning = [True] @@ -95,6 +99,15 @@ class CommentsMenusPackagesOrder(_CheckFunction): self.comments_order_checking.append(False) self.print_comment_warning.append(True) + try: + self.first_menu[self.level+1] = True + self.menu[self.level] = "" + self.print_menu_warning[self.level] = True + except IndexError: + self.first_menu.append(True) + self.menu.append("") + self.print_menu_warning.append(True) + self.initialize_package_level_elements(text) def check_line(self, lineno, text): @@ -146,7 +159,33 @@ class CommentsMenusPackagesOrder(_CheckFunction): self.state += "-menu" - self.initialize_level_elements(text) + self.level = len(self.state.split('-')) - 1 + + 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 Tue Sep 3 21:13:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1157321 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=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="H8fTDZfW"; 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 46NKTJ6LlXz9s4Y for ; Wed, 4 Sep 2019 07:14:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D4AFF884D5; Tue, 3 Sep 2019 21:14:24 +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 rEBXsVxIkTWe; Tue, 3 Sep 2019 21:14:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A904B884B5; Tue, 3 Sep 2019 21:14:22 +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 23C741BF59D for ; Tue, 3 Sep 2019 21:14:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1FDC685040 for ; Tue, 3 Sep 2019 21:14:21 +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 6nY28F0asPUn for ; Tue, 3 Sep 2019 21:14:20 +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 1AF6D87821 for ; Tue, 3 Sep 2019 21:14:20 +0000 (UTC) Received: by mail-lf1-f66.google.com with SMTP id l11so14081470lfk.6 for ; Tue, 03 Sep 2019 14:14:20 -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=2FKT+wivFs0r7jahiUhjUuP5+MdWcV+svn6/cLCqwU4=; b=H8fTDZfW8kh8Q88etfFQLfFNSxLckeIbstLMMgfmJLElj+BV+UTf3n+xPPRQfTV0tF tkLgladybDNlDCLpMeLEAQbeoma2D8fCF4gvW3nhb3BR9RF1uLKsrWdsIFeZVx0nuBED 4luDvr44P5lYi+eWJN2A/Hg9QWjVAqs5jH0lQYkabLYjc39HKC6ghnSIuoPGP8DH0l6D ICL9PxzBD4J9QrbOXz4FdevXz8Cp309KVYt2pwKgFw9RW1QSxCfgq0MtZ12LHoed6B+p UtI6IJdPKdNHF/XaGBzI5FWgL2Osl6sPhXeKrJlpI7l/4raegTggxwz2pgmjKtdybML4 WT8A== 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=2FKT+wivFs0r7jahiUhjUuP5+MdWcV+svn6/cLCqwU4=; b=Z7qLCtqnnfnHJChigwQ7a3FReTXjwJhaNa3FZ+XF1coPN9bZbzb9zq/x8W7W5539ys tIe33bbeTX3ZkTZdYKKjOaZGjLsKywr8hDq+dFixnYXtm2OP5bCxzNVW+sM5PlFEkpi0 RX+/AUkl9JvnezRs86NEU5yBoVFC61j9ZV0aLRdhQ8tDHkvkpcxtARADV04djSllI16N 3lQk6ZGKlyIAQ6+WxUqC45gmy8noI51E2GVxCC21eI0IipwxuleAXDFyzcerF249rCXm mTfEdAt/Y9bzkMIZo0d/GHoFuJVuY5YG5hmqHlKDbGgUzQaIjTc4SctCm83T+MpA/pSd IX+w== X-Gm-Message-State: APjAAAWZdhD1guFQC9JAnlqr8Ae05SJUEYuLwc32CViFjY5kGFxj0T7W eBSJ3W139Ulc5JpQVx/CpVNRffh62Zk= X-Google-Smtp-Source: APXvYqwxyqBsb/z67xA+jHm2xj2nwIBY7u5nDe4Rp2iKbZuoMN5OB2sMHV3Ne0drJNLeirHg2JsxaQ== X-Received: by 2002:a19:f617:: with SMTP id x23mr6851809lfe.97.1567545258183; Tue, 03 Sep 2019 14:14:18 -0700 (PDT) Received: from localhost.localdomain (user-5-173-240-120.play-internet.pl. [5.173.240.120]) by smtp.gmail.com with ESMTPSA id u1sm1650822lfi.83.2019.09.03.14.14.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 14:14:17 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Tue, 3 Sep 2019 23:13:39 +0200 Message-Id: <20190903211341.10341-16-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> References: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH 16/18] 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 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: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 70 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/package/Config.in b/package/Config.in index 7bc97fff72..a1072990ca 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1424,6 +1424,41 @@ menu "Hardware handling" source "package/wiringpi/Config.in" endmenu +menu "JSON/XML" + source "package/benejson/Config.in" + source "package/cjson/Config.in" + source "package/expat/Config.in" + source "package/ezxml/Config.in" + source "package/jansson/Config.in" + source "package/jose/Config.in" + source "package/jsmn/Config.in" + source "package/json-c/Config.in" + source "package/json-for-modern-cpp/Config.in" + source "package/json-glib/Config.in" + source "package/jsoncpp/Config.in" + source "package/libbson/Config.in" + source "package/libfastjson/Config.in" + source "package/libjson/Config.in" + source "package/libroxml/Config.in" + source "package/libucl/Config.in" + source "package/libxml2/Config.in" + source "package/libxmlpp/Config.in" + source "package/libxmlrpc/Config.in" + source "package/libxslt/Config.in" + source "package/libyaml/Config.in" + source "package/mxml/Config.in" + source "package/pugixml/Config.in" + source "package/rapidjson/Config.in" + source "package/rapidxml/Config.in" + source "package/raptor/Config.in" + source "package/tinyxml/Config.in" + source "package/tinyxml2/Config.in" + source "package/valijson/Config.in" + source "package/xerces/Config.in" + source "package/yajl/Config.in" + source "package/yaml-cpp/Config.in" +endmenu + menu "Javascript" source "package/angularjs/Config.in" if BR2_PACKAGE_ANGULARJS @@ -1452,41 +1487,6 @@ endif source "package/json-javascript/Config.in" endmenu -menu "JSON/XML" - source "package/benejson/Config.in" - source "package/cjson/Config.in" - source "package/expat/Config.in" - source "package/ezxml/Config.in" - source "package/jansson/Config.in" - source "package/jose/Config.in" - source "package/jsmn/Config.in" - source "package/json-c/Config.in" - source "package/json-for-modern-cpp/Config.in" - source "package/json-glib/Config.in" - source "package/jsoncpp/Config.in" - source "package/libbson/Config.in" - source "package/libfastjson/Config.in" - source "package/libjson/Config.in" - source "package/libroxml/Config.in" - source "package/libucl/Config.in" - source "package/libxml2/Config.in" - source "package/libxmlpp/Config.in" - source "package/libxmlrpc/Config.in" - source "package/libxslt/Config.in" - source "package/libyaml/Config.in" - source "package/mxml/Config.in" - source "package/pugixml/Config.in" - source "package/rapidjson/Config.in" - source "package/rapidxml/Config.in" - source "package/raptor/Config.in" - source "package/tinyxml/Config.in" - source "package/tinyxml2/Config.in" - source "package/valijson/Config.in" - source "package/xerces/Config.in" - source "package/yajl/Config.in" - source "package/yaml-cpp/Config.in" -endmenu - menu "Logging" source "package/eventlog/Config.in" source "package/glog/Config.in" From patchwork Tue Sep 3 21:13:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1157323 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="C+6KaNRG"; 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 46NKTN5NFYz9s4Y for ; Wed, 4 Sep 2019 07:14:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 26EEC87898; Tue, 3 Sep 2019 21:14:31 +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 N4yxjWZgHjDe; Tue, 3 Sep 2019 21:14:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D9BF787821; Tue, 3 Sep 2019 21:14:29 +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 4D5861BF59D for ; Tue, 3 Sep 2019 21:14:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4AAEB86B11 for ; Tue, 3 Sep 2019 21:14:28 +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 Z6JzoGEh4Ipy for ; Tue, 3 Sep 2019 21:14:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 632FC8610A for ; Tue, 3 Sep 2019 21:14:22 +0000 (UTC) Received: by mail-lj1-f193.google.com with SMTP id t14so17547613lji.4 for ; Tue, 03 Sep 2019 14:14:22 -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=PiHHgNINQ3dikPZ8eKzWmV3vFJYeyjZia+lImkEXY1Q=; b=C+6KaNRGn6TswLhrd4SiHi4ZVgKhZ2RMYHgcZImntWFgYY+KpVtnfyRFt68P/bJOvZ 1x3QlQTXVWV7UoOlhprGtAfnuyv1MXjjMctChWHOjrSiG/fk4KRVL3vRZvfMqSm8G+r4 jMNV7hrp7RL62U6Ib4dVPjK/3G9vSY61MyNhc4a3gsJsk6I2TVlY/qwDdGR33nkA5EkA sZV4JDH9wHyHVkhfE0ExRGizUQFEMmRbTXhRZX/UXQT011eW2Cs+27udk+ZvAay6x8uf ERH5yNpLafg0yqVCW8On28hL989oEdkulUCGiNgyhQqqc1HC2CiPRotg4C0vpchEuziI /etg== 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=PiHHgNINQ3dikPZ8eKzWmV3vFJYeyjZia+lImkEXY1Q=; b=FcFCIUX2YI3WLzUnuIXgycV9uPjMtQ5rQDyX4Gh8zGKhYCnrlHo8v9eA7R7JsZgoxb YDJHniOeHl4bV8i0MAzuOl7N2Q2qm1Tob4gQbbBOiftH/hrfAER8adp/fzOIqQmJ5IaO HgYfmvGkMzsByTKEOS7SCoLy68M9bfsw4dU1vCOVNb6MHp43Pk4PBcXpQIRH4n3YbddF hHRdqY0bK1bYlVPauzbZPT7PcMQtgiP96s+5alISEKfuAAb0ZXJ+ELjpO+ywpzAn7QA7 xXNhh0gwXGrFAPpJftT0E8KC1TVVqpcdOqlYqpR6vuFCCTeXw0iK5B7cgXV/UCF31bdN s1ww== X-Gm-Message-State: APjAAAUogDmnfb8bp2RvSmoP4V09dLkYHttQtrpWVO99COSzvJZMFV+a RXDY/Of4r7ETzgvFanrQS4nQG48fMe0= X-Google-Smtp-Source: APXvYqxQSKI0tDfFD5kbu5pjsaVbTyz8kOIsvkTncMr7WKxAI7hCrqv0+Z022v0PdfcwWNsbZfhEkA== X-Received: by 2002:a2e:b4c9:: with SMTP id r9mr9784537ljm.196.1567545260487; Tue, 03 Sep 2019 14:14:20 -0700 (PDT) Received: from localhost.localdomain (user-5-173-240-120.play-internet.pl. [5.173.240.120]) by smtp.gmail.com with ESMTPSA id u1sm1650822lfi.83.2019.09.03.14.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 14:14:20 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Tue, 3 Sep 2019 23:13:40 +0200 Message-Id: <20190903211341.10341-17-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> References: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH 17/18] 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 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: Arnout Vandecappelle (Essensium/Mind) --- 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 626038e8c8..8e30e2f3ea 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -304,17 +304,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 Tue Sep 3 21:13:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1157324 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="d1eFq7Io"; 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 46NKTR08kYz9s4Y for ; Wed, 4 Sep 2019 07:14:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 18F9C22CB0; Tue, 3 Sep 2019 21:14:33 +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 k2CckfFDXvFC; Tue, 3 Sep 2019 21:14:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B35EF22902; Tue, 3 Sep 2019 21:14:30 +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 934F41BF59D for ; Tue, 3 Sep 2019 21:14:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 909C986B11 for ; Tue, 3 Sep 2019 21:14:28 +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 Y2SFs6z2CBi0 for ; Tue, 3 Sep 2019 21:14:25 +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 1A48C8784F for ; Tue, 3 Sep 2019 21:14:24 +0000 (UTC) Received: by mail-lj1-f196.google.com with SMTP id e17so6493352ljf.13 for ; Tue, 03 Sep 2019 14:14:24 -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=jgv8lT+q8Xmtdx10knw2E4oTBuQq3cDh2bOqHGisJ24=; b=d1eFq7Iox1SPPfXxgsyNLB6cLO3xU6cwJO492G4b8VPimX3ZV22p3U4XeHboxeLx8D 4QS+See8REzyPiMPoHyywQgdauBzKskuHNWT31vvdmeT2w0a1l3cC5pfqVE+BO0H9Gdq bnirt14ePmFfSVnC0URxOOCGpvd0Ph7QggUkq/NgpSxBM8XbutWjAeOVGF0kN/x3RrC1 XnAtoG/XpaHhZFHcPRwe0QGE96+OaPjD0i5tdWG07NeA92jkCcTs9NlwhuqqHmhRj7YZ Yl7zwnBlAF+jDhhEGbU9Iwu3ox1hjHE9rOynvMd4CcifNRjPZ4LFnbMKHDjGmhtZg1Mw YOZA== 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=jgv8lT+q8Xmtdx10knw2E4oTBuQq3cDh2bOqHGisJ24=; b=XVay1g3jHJaobd/7CtpBPyB8bkrl5436kQzrjgb7IRBfox7JPevnt9wYU0QlbfYtRP FcSv1XhQvLdYga/6oAdjZjxsRmEr+HJOWLLHFU4xh8Xtg4ahG6eeQAMfIP0A4zSCM+GZ aB0TK0/Dtk5v9JvrKWn2EpJMTgxYAH9K8MvW7pVN3UA16OFx+VmB9yeU/ajiKnSOJYWZ S7K9T9v0fnztdHr9E6r0cPi862tA8GgtO3afqmwfAfTiCtPyJjFUCfCTy0kwkhwx9gMG qJmiToWv0ud6gl3PisaKzjQtOrygUA4owp8u7EoIbdaTp6iuxpXNBwCnrLtmaHO4ESRU a19w== X-Gm-Message-State: APjAAAXRQJ8Eir3WUVKha3bLBuAOVZu9OLWap9S4QBsCjPmBIsKaM6Oo kr+TboLFFSOTGCjkGTgZPcJCUOXBEys= X-Google-Smtp-Source: APXvYqxXay4jnIpnLIRFv7l/xkaRlO8R7AiSPBNR0cwYlvXrvtreRHZGqsBTGTFcSxuoIlYHk7Sulg== X-Received: by 2002:a2e:5456:: with SMTP id y22mr8755964ljd.60.1567545262221; Tue, 03 Sep 2019 14:14:22 -0700 (PDT) Received: from localhost.localdomain (user-5-173-240-120.play-internet.pl. [5.173.240.120]) by smtp.gmail.com with ESMTPSA id u1sm1650822lfi.83.2019.09.03.14.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 14:14:21 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Tue, 3 Sep 2019 23:13:41 +0200 Message-Id: <20190903211341.10341-18-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> References: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH 18/18] 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 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: Arnout Vandecappelle (Essensium/Mind) --- 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 8e30e2f3ea..a7b4723d46 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -309,12 +309,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" @@ -335,6 +329,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"