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 B5AEDC433F5 for ; Tue, 8 Feb 2022 14:11:34 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C65883D1E; Tue, 8 Feb 2022 15:11:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lBDXBzbc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0573083C6B; Tue, 8 Feb 2022 10:42:33 +0100 (CET) Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) (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 057BF83916 for ; Tue, 8 Feb 2022 10:42:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=wkernelteam@gmail.com Received: by mail-lf1-x12f.google.com with SMTP id i34so32240283lfv.2 for ; Tue, 08 Feb 2022 01:42:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:content-language:to:cc:from :subject:content-transfer-encoding; bh=XsQ4JnfDTYRRs2zf6r5ypAy9N01WJVHHIw3bHufk6qc=; b=lBDXBzbc23JtNxq07EAWiycrT4Plf0yxEDJhk++gjLDXVkMxoWG6hxB0eYjTqTdaQd KVq0IOeSlIh95+SQUy3nMGpu3MFthLcdid/gBdhd7OQNlVB1AdIwZRHEbOSS1CzHCAI+ qJuR2Zguklj6TqONMd/ZAzs7TwLJUZKR5CvoPM2B0ZTCLii/xzYfuiOQ3tgKUiBCaOth bL9WwGreRbEqqB4s32JFBGEJAP7PCiypxsASg+C+Q74FhdR/PbI41AyHgY2gpSAmxhCW ZamGT2P0JbQko9EeMDHRswfDgetHl5CBf/0C05gyhNhSO59jOAqQz3KqnvVRz5O9y8mL XUsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:to:cc:from:subject:content-transfer-encoding; bh=XsQ4JnfDTYRRs2zf6r5ypAy9N01WJVHHIw3bHufk6qc=; b=AJqdpGFlQVUdvsozoWMy9GCyIARZbMn6bas5ZZvI1TM6yQkQvdbCQIZyMR8qU6llQ/ nYFt4zV+9p3VWvC4SR85bouqhmaj5OmoJhsv1t6m9CHlUBurL8BmnMJgms1Z5nsTAbF/ eH+yUw3eiIaeoXqWZ8H6S9QODEdhaEm2VIwDbmF3eWL89OBsZ5TBfjZ0eD/IshMUvjP9 /c8GisKfzmI7jV2uWybgk4tHBFQB8kU1Dg0nH25i4rSmvljAVvscV7f4qSDIYvcDhKJ+ sBj59DkO0cfVC4tth4CJv7IDBDq7PVWIjF8HarexfrZAKJ0OoA8N5CTZ0qr0ytKgCRR7 Uj4w== X-Gm-Message-State: AOAM5322HSXa3stadjNYd7SxVQm3SpRMniw03qSvTAwxOI3Vo5UQFV2C 2HLg9yi7hL6ijvXwgvOy8Zlv1GCfXauFDw== X-Google-Smtp-Source: ABdhPJzJrFnO+0nSh2wEa9fi1OmJ8myRnHs/tGsy5brIHic2ACr6q/3lCwMqQJjYNjfqLmedaD5Avg== X-Received: by 2002:ac2:43c2:: with SMTP id u2mr2395339lfl.506.1644313349094; Tue, 08 Feb 2022 01:42:29 -0800 (PST) Received: from [192.168.0.228] (89-178-123-85.broadband.corbina.ru. [89.178.123.85]) by smtp.gmail.com with ESMTPSA id bt3sm1847072lfb.295.2022.02.08.01.42.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Feb 2022 01:42:28 -0800 (PST) Message-ID: <05dd9970-7cf4-9780-a834-fe684995b2b8@gmail.com> Date: Tue, 8 Feb 2022 12:42:28 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 Content-Language: en-US To: u-boot@lists.denx.de Cc: Tom Rini From: Nikita Maslov Subject: [PATCH v2] scripts: setlocalversion: remove quotes around localversion from config Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Tue, 08 Feb 2022 15:11:17 +0100 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 From: Nikita Maslov Date: Fri, 14 Jan 2022 00:13:39 +0300 Subject: [PATCH v2] scripts: setlocalversion: remove quotes around localversion from config After replacing of include/config/auto.conf sourcing with extraction of CONFIG_LOCALVERSION, resulting version string contains quotes around localversion part which are always present in auto.conf (even if localversion is empty). This patch fixes this script to remove quotes. Signed-off-by: Nikita Maslov Cc: Philipp Tomsich Cc: Tom Rini Reviewed-by: Simon Glass --- Changes for v2: - re-post because of messed up word wrapping scripts/setlocalversion | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index c1c0435267..4a63143706 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -153,8 +153,9 @@ if test -e include/config/auto.conf; then # We are interested only in CONFIG_LOCALVERSION and # CONFIG_LOCALVERSION_AUTO, so extract these in a safe # way (i.e. w/o sourcing auto.conf) - CONFIG_LOCALVERSION=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION=/ {print $2}'` - CONFIG_LOCALVERSION_AUTO=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION_AUTO=/ {print $2}'` + # xargs echo removes quotes + CONFIG_LOCALVERSION=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION=/ {print $2}' | xargs echo` + CONFIG_LOCALVERSION_AUTO=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION_AUTO=/ {print $2}' | xargs echo` else echo "Error: kernelrelease not valid - run 'make prepare' to update it" >&2 exit 1 --