From patchwork Mon Dec 5 08:56:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=gfH+V7Aq; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQcqK5rPyz23p1 for ; Mon, 5 Dec 2022 19:56:45 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1p27H9-0006Qr-9V; Mon, 05 Dec 2022 08:56:35 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27H6-0006MZ-Om for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:32 +0000 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 5AEBF3F120 for ; Mon, 5 Dec 2022 08:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230592; bh=6czmO4QqGzrQS06mJJw5yjeurK7K8SqENQbmOMfTJG8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gfH+V7AqGK+rOCG21+j9OHwV9ZMtGNzG2zqRqlDcaa8p9aUvOmd0km6TryZ+wf7sp rif2erh79xpUJEh43e9OEiJAkWcGGtAc8Kz2qjeQ2RpUEv8FGFUXnFH8HzRcjXbOYi nQ1j04wFrhkXgNdougIyJht1eXVrxX7F3RxeLRWddj2nVqOIckNCPQlXXtXWyW4Gay /tnTibA1rED9XMU/l3sQHONsImujeczly7YZW5+JP7/RemidJXozUYoCJYDwj9TfKB 9EhEJP1RqfwXC/Bcw2QdNan7RZ2FZWMNdWSAkUi8azPswZ/0fIAkMbbcj2Z1wvL1f2 bQo42d/0RgC+Q== Received: by mail-pf1-f199.google.com with SMTP id e6-20020aa78c46000000b005772151d489so235968pfd.15 for ; Mon, 05 Dec 2022 00:56:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6czmO4QqGzrQS06mJJw5yjeurK7K8SqENQbmOMfTJG8=; b=sLg4+VuXIA9n6twlJ85azbdV18YTl3RdeB31hQNLFfbYZWV1Up45+TsG67C2gihVIv 8DmrRzuEept76aru5mdAwYd5tF33S5fEug9wInx5VeT8wGMO4lJwUBkmUzjAaz/BJWuo EFVvtpv43YubqBfvB9+I4XFEKyHmpif/tUPu/akAFKgsQ/3cNec+lZo4CIhu0qe44kbI tVlBl9TVUveFCKcYZ/NYhokrebjMWFe7sKGgD4/TmMJKHnxfPrIeTLYaJxyzKTo/fMfC tyvo8tDQg/3WIQzmDRte69Izt4JK/TkTDUO3xNvXYzwNEKruYJ6PrjXvGQYAWVkG8U8D 7CIA== X-Gm-Message-State: ANoB5pnP64JvMrW9lrW78+y7p0u3U3UQpSgytM9JvlJdZUI7NXvUxSF+ FEPE1NGptrE27BOrTvXwG9c55U9TunCxM2nurZTim1F66BJrM6By1YR869J+yTWpJ33eXcF6Unj XUa/kqxXa7IOfr8CGchJ5ix4vMs+cFFTsUc1kR2faJA== X-Received: by 2002:a63:ff62:0:b0:476:898c:ded8 with SMTP id s34-20020a63ff62000000b00476898cded8mr64358839pgk.251.1670230590758; Mon, 05 Dec 2022 00:56:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf7Ck0K/5ScJm0+RL7bWMTAfGlE/ftvCC1KeWsSM/TdmQ7P1vZC4Dk3Ut6i4A9o75/Vj9nvleg== X-Received: by 2002:a63:ff62:0:b0:476:898c:ded8 with SMTP id s34-20020a63ff62000000b00476898cded8mr64358823pgk.251.1670230590473; Mon, 05 Dec 2022 00:56:30 -0800 (PST) Received: from zoe.. ([2001:f74:8f00:c00:6aff::1005]) by smtp.gmail.com with ESMTPSA id q6-20020a170902a3c600b00178b77b7e71sm10018133plb.188.2022.12.05.00.56.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:30 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 06/13] UBUNTU: [Packaging] simplify custom_override Date: Mon, 5 Dec 2022 17:56:12 +0900 Message-Id: <20221205085619.257813-7-masahiro.yamada@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221205085619.257813-1-masahiro.yamada@canonical.com> References: <20221205085619.257813-1-masahiro.yamada@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" You do not need to invoke the shell for if/else choice. You can do it by using the $(if ...) built-in function. $(if $($(1)_$(2)),$($(1)_$(2)),$($(1))) GNU Make >= 3.81 supports $(or ...), so the code can be even simpler: $(or $($(1)_$(2)),$($(1))) No functional change is intended. Signed-off-by: Masahiro Yamada --- debian/rules.d/0-common-vars.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index a54b83dd943b..ec9c5680493b 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -278,8 +278,7 @@ LN = ln -sf # Checks if a var is overriden by the custom rules. Called with var and # flavour as arguments. -custom_override = \ - $(shell if [ -n "$($(1)_$(2))" ]; then echo "$($(1)_$(2))"; else echo "$($(1))"; fi) +custom_override = $(or $($(1)_$(2)),$($(1))) # selftests that Ubuntu cares about ubuntu_selftests = breakpoints cpu-hotplug efivarfs memfd memory-hotplug mount net ptrace seccomp timers powerpc user ftrace