From patchwork Fri Jan 27 16:40:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 49496 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp930517wrn; Fri, 27 Jan 2023 08:45:32 -0800 (PST) X-Google-Smtp-Source: AMrXdXuTSwYvSF6YuUUDLp3xbeexviB71QwY7TM8pWOpYUHVxZ9jizwR9SbJ10z2noRnhns6cw90 X-Received: by 2002:a05:6a21:151b:b0:b8:a355:5914 with SMTP id nq27-20020a056a21151b00b000b8a3555914mr45014158pzb.37.1674837932475; Fri, 27 Jan 2023 08:45:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674837932; cv=none; d=google.com; s=arc-20160816; b=hBrpuQXV5apuujEAPFt3ccj+92tDkwuieoGDahZc92AF3Ute5M7H9FkJUNj9kCk+DN WyelF0/zEFJ30eiSvf88PGk/bRR52IRRX+iSFG9AKwLPFpcy/U6z9tCsKyc5MO8/YrSb SuncorldyiuXWVn8idvzkBfNaTet1RhBFaMJKhQzllLWID848ps48eWpv5j0FR+Ayw66 E0YWzT1gHAB423s27iayBOnhPD9KXtLOOelDQakpkoKi+JWCBX5ObtGFvhQLuGWLQrmR i6w7IfmMo7zZhR3ShDaOWOX/yvc2tawJwOiHrCak70VP5stNOdWU7PBJe2QEx5o/DZ6a ZD5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=62bn5UEmAvRhBbAX7EBUBgOJPDmmCKHC414fBvwoQug=; b=1I2wXoUBcf24Y8j1Mu4/tz7e6+Pmle/WVYPTbKRdl21F1G7ytxK/ZCvcN4xeZFTgi6 /b8fXYAdhopaYMRTPcLDl+Tgr79vS8l/8Cyvv1rP/RNImpYlT/ZLAR1U+TFtCQ158Wsa mqreWDgs+BggFGdWkUvmJyqtYZmWgCpFOAJKpCjlo4bkvh7EL7y2AL9LYOgjOm0ci3oP Ns8Zyh6KcizVg2qtwd8g60bgeHtfq+nE3olhFB6tLircdIWAnjmzs8xT2SNK8Fou2s5F ndFX7PNG1MU0UM0lcZ5/Oy5BjRICRhbdTvNdfccM6cApLmBMOrJI9/GLC2hmHf019hZd h2pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FEAY7lRP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j70-20020a638049000000b004d142689459si4504542pgd.467.2023.01.27.08.45.20; Fri, 27 Jan 2023 08:45:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FEAY7lRP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234978AbjA0Qk5 (ORCPT + 99 others); Fri, 27 Jan 2023 11:40:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234054AbjA0Qkz (ORCPT ); Fri, 27 Jan 2023 11:40:55 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 528317CC98; Fri, 27 Jan 2023 08:40:51 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1A96CB82013; Fri, 27 Jan 2023 16:40:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15C12C433EF; Fri, 27 Jan 2023 16:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674837648; bh=gL29Zrz0/D+2aRM80IoOkzpVQZltIiXkr3UTM6jkxQI=; h=From:To:Cc:Subject:Date:From; b=FEAY7lRPlS71P4vd1mnOb99+zfCXZaNiJYGX4C2auV8u6+E/Fr/+xnTia4it9Lg/A TKsdC0BkfD8EveWUIgnGydssTz39HY/6ecVefBUWWopPuSN1IYZ9Zt/GNhb+RCInDF J1nViTa+lFvrk29dS6qrYa9O6m+V9Bmtgrk7u34UfAWvNMizFXZkZyXOCHrkzlMou2 +7QkQ9lUnQkg4aQKEAEpzlOUHOPjexk/clFb6WhiwIFtfQ5dX+on8ey9bg4rjE/G6w bq5Qrj4hsjAPdMn4lsiac0f94e1c62dTuL0XUjSLFW1Yw7ptqEtyKwpDu46SFACjvf ig2SpHcdkRvMg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH] setlocalversion: remove unneeded check and set -e Date: Sat, 28 Jan 2023 01:40:41 +0900 Message-Id: <20230127164041.548225-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756194859768281208?= X-GMAIL-MSGID: =?utf-8?q?1756194859768281208?= Kbuild creates include/config/auto.conf before running this script, so include/config/auto.conf always exists unless the user directly runs this script. Remove the redundant check. Instead, set -e. Signed-off-by: Masahiro Yamada --- scripts/setlocalversion | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 7c7cbefa5aa4..3df25b045e81 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -10,6 +10,8 @@ # # +set -e + usage() { echo "Usage: $0 [srctree]" >&2 exit 1 @@ -103,11 +105,6 @@ collect_files() echo "$res" } -if ! test -e include/config/auto.conf; then - echo "Error: kernelrelease not valid - run 'make prepare' to update it" >&2 - exit 1 -fi - if [ -z "${KERNELVERSION}" ]; then echo "KERNELVERSION is not set" >&2 exit 1