From patchwork Tue Aug 10 13:35:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1515406 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::437; helo=mail-wr1-x437.google.com; envelope-from=swupdate+bncbcxploxj6ikrbl4bzkeamgqedqsrdwa@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=WvzFMxrK; dkim-atps=neutral Received: from mail-wr1-x437.google.com (mail-wr1-x437.google.com [IPv6:2a00:1450:4864:20::437]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GkYql1xHPz9sWc for ; Tue, 10 Aug 2021 23:35:47 +1000 (AEST) Received: by mail-wr1-x437.google.com with SMTP id w1-20020adf8bc10000b0290154bed98988sf5129919wra.1 for ; Tue, 10 Aug 2021 06:35:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1628602543; cv=pass; d=google.com; s=arc-20160816; b=a+aakahnkLe5QW3HZkB97mFAyq9i6ljUGPcxnD8Mr5cCewZ/jFqUc8kyIVDh5s8smC trveVmu2vKhcMoXCM8WTpfmN17vJDKBqRMQylprC5kc0VWIGtXX+Q4BlYmCRpwi4UC8t Dx9D1T/99X9h1AlQTRS51ynKVRBQVTrZEbSy4NrVPn8NbJOY/vhoIYGIwOUXrQfCKsSh kGwpt2z1sFsI6gl4p6QZXt664IjVEu51oLvTgfLoolrBqAWkr+1DoHyo20g/gxIlyXoi rgIcT+LnNtdPfsOU3bINuDTztnnRzmSCFUFHEaA61+Upnecy6bTG6Eu1mNEU8UZlSHdy qtUw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:sender:dkim-signature; bh=zIqoaA/oJh3tYKoRGjtg5lLcGcOxTUzkAIthFsDZD/k=; b=cHjN+LXJKMvNARMSbDMJr8Cw3gv2UESfKc637GTczZScfVsZ8cvcCfWHV3+hqmfQME hJRV41AXYYUPHDYVO2gireEOR+aef+ajwWZfHeWZkV5HGkbrbANaKu+pC6wNQ8hZuPpw CQ0AHNZ7t+9eoShFd/z+ujA5wi+RS/84d70o07Etv2BZdmP/DbXSAg1CNCfEZFsgN0np RBUoyt7YT61P/R5LeK9XOAjn9rPFUcEOtOifbf2+mroBbCvw1SGBSz/bjExuQ7RzHBAp Dc9wr6DyNg2eNztvVF/pl96fGqVUfOUv9WFtvS0t3xymzD8itarTk7dxL3CAe/7Uh/TL kxBw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=zIqoaA/oJh3tYKoRGjtg5lLcGcOxTUzkAIthFsDZD/k=; b=WvzFMxrKNg2GJ24nj/oCiuUrkUZufMvvdP7rJC6U9bfuQTnTVZMUNmVpV7XinFM+Bp 3xzzXDHLkfxUATuyPl1BHUzk8eL6jC2N86K1ynaHkXSXe1XBQMvMSQHtvtKe8RcYYRVK Z1DNf0EB5Nl4Ys/Q/IXTmFdIDyiNOj2AfSmhIDU/8waWWOQp2camyE0AOROPO13xae6k valNG1IXXzyKavIPQb/s8COssBeNd0CypPd++jHokwcpqgy3FeNSRqpc2c7Ct3hwK6qJ 78w3kagmhwu5sp+RKz9bF32VTD9KFeDuGeeyZncFBHvyilO9OmyozN5R7wK2BnrHO8sT wbzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=zIqoaA/oJh3tYKoRGjtg5lLcGcOxTUzkAIthFsDZD/k=; b=OSiuVrS6C9UKd0XRB24hybbiucwcscv7KVpvXuDJZkMW3L71rRvok5EjuubAren/iI GXWoIAEkVcKt+Q2nEqIyMapDM0HAqgd6zGK4dcKhNPZ1Z+EAhkL0w62Cmohw/E76ax5u nXtduwiIJKfvFpcrk0r2A/CZG6w36u+rnK8sVwRHrpdb8/2H8dysMcaLQa0kI1gIgHKi 3NiBMvYKZLBWJxw09Xc8DZiDAnZBUm+aTKeKPZ1t1N++atYe16Is1yFPTdvxsM9mZnIs 1PhXvg+LLX4FidTUcNLM6FffpRLPLSdys0CLjShl5RWRgcd6qmQlyxT4ni9dtkbZLjEV 4ngQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM5335sIlUT/1i6vVeune1mYx+wnL3bWQY5EOV6MgyJk5sNAs2l0qI Ky7WdqtLf3z5tNuGwl6JXi0= X-Google-Smtp-Source: ABdhPJzgZjIRSW14cGXIQsUHPHsDyR5VvyjI/Ur7tn6lcOEzZo0ObCbcpdR0HB+SG3+k+IuaNpykyQ== X-Received: by 2002:a1c:a551:: with SMTP id o78mr2585840wme.170.1628602543674; Tue, 10 Aug 2021 06:35:43 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:e5c5:: with SMTP id a5ls8679692wrn.0.gmail; Tue, 10 Aug 2021 06:35:42 -0700 (PDT) X-Received: by 2002:a5d:4583:: with SMTP id p3mr23505843wrq.398.1628602542856; Tue, 10 Aug 2021 06:35:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628602542; cv=none; d=google.com; s=arc-20160816; b=KsFB1vz1FwbOIBMG8KvoXIEY2Ik5Oh/JTCSpGb7SjMIDcoexkPzxGw8xtyQ94mvcN8 HvdsXxynQ7j7RXDlzFPVHC6p1FU0Md+bvNNF5OQa/p5Rz36Wii3Rkf5CWiY3jhSetdk3 28SdpcTfPI9rc4Xoj+omcKCh2Z3ojQvOJ1Kr+Ra5yiXT/yuHlv0PgBzxVh1I/suSe08N wVTS1VEqRp+6icF8fCzk+54/VoSP+qksXyyPGmVaH3+1cceLrP75s4Yg07iQBpVYgzM1 Is3J7yU59vhaZVlv5jF3Iji3WhBuKfm7elLi0IATE9E3FhzpNEj0Vqa27s1F6VWDy3dj LvNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=nDZz8amWa0/TiunaGea0LeuivmAJt3+URLNxjUXFMvw=; b=LwvqWSg9CqqAHG7ettuzbYEKCTrAGR0oowvWrdfAoejne3rslZdcneg93dOi73KgDO F3nZieAxX9c7Ccf8myDqlKkwKHtC40/TpPddJBamL8VBLciyoHRaikuT6AQACWksTvk8 L7/zrL/BlbAD5qRoAkB3nvDGSpg7UHQKZ6x0D4XZ/Gho1/Mzp/TT9i9nGICOUY5z/Qd9 e2pHuDoqb00f8eD8zYAJewsWDf+HJQ25tm0j72sb4BeYBPDdtmieRtdzKmVOVyTroSFs irI4zxQabUunRupfkIdpe6MrKGvoCSDuMTBSIhr7eaB6ZrOR35HiYFmAXl1+wtoEIkMz XLFA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.9]) by gmr-mx.google.com with ESMTPS id z5si165026wml.4.2021.08.10.06.35.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Aug 2021 06:35:42 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) client-ip=212.18.0.9; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4GkYqf4pD4z1qwyC; Tue, 10 Aug 2021 15:35:42 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4GkYqf4fsJz1qqyK; Tue, 10 Aug 2021 15:35:42 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id ELcdB_RXQGUv; Tue, 10 Aug 2021 15:35:41 +0200 (CEST) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Tue, 10 Aug 2021 15:35:41 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id 7F0B6454086D; Tue, 10 Aug 2021 15:35:41 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vmuVUq2kphIq; Tue, 10 Aug 2021 15:35:39 +0200 (CEST) Received: from paperino.fritz.box (paperino.fritz.box [192.168.178.48]) by babic.homelinux.org (Postfix) with ESMTP id D0BEC454142B; Tue, 10 Aug 2021 15:35:36 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH 3/3] Kconfig: use DISKFORMAT as flag Date: Tue, 10 Aug 2021 15:35:34 +0200 Message-Id: <20210810133534.497031-3-sbabic@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210810133534.497031-1-sbabic@denx.de> References: <20210810133534.497031-1-sbabic@denx.de> MIME-Version: 1.0 X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.9 is neither permitted nor denied by domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , The following warnings are generated if DISKFORMAT_HANDLER is set without setting DISKPART: scripts/kconfig/conf --silentoldconfig Kconfig warning: (DISKFORMAT_HANDLER) selects DISKFORMAT which has unmet direct dependencies (DISKPART) warning: (DISKFORMAT_HANDLER) selects DISKFORMAT which has unmet direct dependencies (DISKPART) This is due to a dependency between the handlers, that is not necessary because it is possible to link just one of them. Replace CONFIG_DISKFORMAT with CONFIG_DISKPART_FORMAT in diskpüart handler, and use CONFIG_DISKFORMAT as a flag to enable/disable the activation of the filesystems creators. Signed-off-by: Stefano Babic --- Kconfig | 4 ++++ fs/Config.in | 5 ++--- handlers/Config.in | 8 +++----- handlers/diskpart_handler.c | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Kconfig b/Kconfig index 93aee4e..dc86957 100644 --- a/Kconfig +++ b/Kconfig @@ -129,6 +129,10 @@ config CURL_SSL bool default n +config DISKFORMAT + bool + default n + config SYSTEMD bool "enable systemd support" depends on HAVE_LINUX diff --git a/fs/Config.in b/fs/Config.in index 682d952..dae855a 100644 --- a/fs/Config.in +++ b/fs/Config.in @@ -2,21 +2,20 @@ # # SPDX-License-Identifier: GPL-2.0-only +if DISKFORMAT config FAT_FILESYSTEM bool "FAT file system creation support" - depends on DISKFORMAT default n help Enable support for creating FAT file systems. config EXT_FILESYSTEM bool "EXT2 / EXT3 / EXT4 file system creation support" - depends on DISKFORMAT depends on HAVE_LIBEXT2FS default n help Enable support for creating EXT file systems. comment "EXT2 / EXT3 / EXT4 file system creation support needs libext2fs" - depends on DISKFORMAT depends on !HAVE_LIBEXT2FS +endif diff --git a/handlers/Config.in b/handlers/Config.in index 36f3ca4..14f8af9 100644 --- a/handlers/Config.in +++ b/handlers/Config.in @@ -106,9 +106,11 @@ config DISKPART comment "diskpart support needs libfdisk" depends on !HAVE_LIBFDISK -config DISKFORMAT +config DISKPART_FORMAT bool "diskpart extension for creating file systems" depends on DISKPART + select DISKFORMAT + default n help This extension allows formatting newly created partitions. @@ -120,12 +122,8 @@ config DISKFORMAT_HANDLER The diskformat handler allows creating filesystems on empty partitions. -if DISKFORMAT - source fs/Config.in -endif - config UNIQUEUUID bool "uniqueuuid" depends on HAVE_LIBBLKID diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c index 99f19a5..a0034b0 100644 --- a/handlers/diskpart_handler.c +++ b/handlers/diskpart_handler.c @@ -925,7 +925,7 @@ handler_release: sleep(2); -#ifdef CONFIG_DISKFORMAT +#ifdef CONFIG_DISKPART_FORMAT /* Create filesystems */ if (!ret && createtable->parent) { LIST_FOREACH(part, &priv.listparts, next) {