From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AEA76C433EF for ; Tue, 22 Mar 2022 01:34:05 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1D94F83B24; Tue, 22 Mar 2022 02:33:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 3AC8F83B13; Tue, 22 Mar 2022 02:33:45 +0100 (CET) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 85C2883B1A for ; Tue, 22 Mar 2022 02:33:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f175.google.com with SMTP id j21so13473094qta.0 for ; Mon, 21 Mar 2022 18:33:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JBAgPbX3JkQnI3TJRvdNEfy8CYHu6X2JLZIgsl1soH0=; b=UJBHzNL2/lieJ5axcT/9+Bl/ChtCLlueHLluIlusvDyOrZuVc5I+QijpO58QCvWOAR 9AgkS0bwG5k0GSln31ORsZjP5B9xopbZLR28mez3zjoAWGLGwCBmQSPxaC/OzumQzBUH vN8kB/9mu44V2iYU6hH4wYIRrxra4sEKkYXIWXuGdBRLtC3SqatUEWnw/LUD0VJVR+wA cbaYKm5r5Z5SoG1EOY4iNd1g5V71wsk0XEtokovllQ6ICyAmqQhoK87w+KoN3n83ELBB +e7irMkYcnSLpbP14jMbze9k1q61N+ZCDQH57vDo0TrTduW0dWcvb0bRRrDGOjGU6mcU AGow== X-Gm-Message-State: AOAM5318jkc19BnVQgT4eXCEP9sljsLbiXMfzUGmvgJgRSHpQho0dnGp EYjtWmBEsixiBqhvlqbQSwBw3DKfNg== X-Google-Smtp-Source: ABdhPJyQ1bA2z/3gkdsOXuyTunbuJkHHMM/Ipg9OuismyHYcwHCBRpNjFgye6L8H3ZLnqcpLgr5gMQ== X-Received: by 2002:a05:622a:15c5:b0:2e1:cdc9:dd1c with SMTP id d5-20020a05622a15c500b002e1cdc9dd1cmr18443173qty.79.1647912818235; Mon, 21 Mar 2022 18:33:38 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id x6-20020ac86b46000000b002e02be9c0easm11858910qts.69.2022.03.21.18.33.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 18:33:37 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 2/7] CI: Update unmigrated symbol check Date: Mon, 21 Mar 2022 21:33:28 -0400 Message-Id: <20220322013333.3874290-2-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220322013333.3874290-1-trini@konsulko.com> References: <20220322013333.3874290-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean We need to check for config header files that #undef migrated symbols as well. Signed-off-by: Tom Rini --- .azure-pipelines.yml | 6 ++++-- .gitlab-ci.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 0f1a1bd86326..cf6d28cf050f 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -68,8 +68,10 @@ stages: -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ | sort -u > $KSYMLST for CFG in `find include/configs -name "*.h"`; do - grep '#define[[:blank:]]CONFIG_' $CFG | \ - sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' | \ + (grep '#define[[:blank:]]CONFIG_' $CFG | \ + sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ; \ + grep '#undef[[:blank:]]CONFIG_' $CFG | \ + sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') | \ sort -u > ${KUSEDLST} || true NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | \ cut -d , -f 3` diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 388e666ec9e3..a5a5d78a86fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,8 +129,10 @@ check for migrated symbols in board header: -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' | sort -u > $KSYMLST; for CFG in `find include/configs -name "*.h"`; do - grep '#define[[:blank:]]CONFIG_' $CFG | - sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' | + (grep '#define[[:blank:]]CONFIG_' $CFG | + sed -n 's/#define.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' ; + grep '#undef[[:blank:]]CONFIG_' $CFG | + sed -n 's/#undef.\(CONFIG_[A-Za-z0-9_]*\).*/\1/p') | sort -u > ${KUSEDLST} || true; NUM=`comm -123 --total --output-delimiter=, ${KSYMLST} ${KUSEDLST} | cut -d , -f 3`; -- 2.25.1