From patchwork Mon Dec 5 08:56:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1712177 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=s2y3LM9U; 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 4NQcqc4npBz23yl for ; Mon, 5 Dec 2022 19:57:00 +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 1p27HO-0006px-It; Mon, 05 Dec 2022 08:56:50 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1p27HC-0006T1-JC for kernel-team@lists.ubuntu.com; Mon, 05 Dec 2022 08:56:38 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (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-1.canonical.com (Postfix) with ESMTPS id E242F3F133 for ; Mon, 5 Dec 2022 08:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1670230594; bh=kVSCRQyJAsFx4cR06RbLRKFs4CbKGWZ8GKeLBvjBxgo=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s2y3LM9UbfQdX7EhSX3ETc3JF1hxkjdm4t78GtXJQdKmZeKDs3m4PG8B6xpXUeb5z o6d/i/9qcx48uRyfk6t/Ss38ghmU6p5Mdu584GC+PfYYLPOdGFQgLSO7ANoxJn5dre 5JvU/fNKKWoT+pD8Yevbqnw6vxf4jc8eg1XbV6jUwHgtQ6U376XPhdTry+MvejfEXI UuGutXsPG2d548MYA4dtMDg7wVexgfxrxyEYcWGZcHJhF18zc3yxwelKED8o9l7Khh +dUsc+jyDy7fzO9yDdr8P19bBYko+AV3tr3GEgtcUJi9xyS6BsIjaog+EBvdgMshBH /RWodets6KonA== Received: by mail-pl1-f200.google.com with SMTP id jc4-20020a17090325c400b00189ceee4049so3656321plb.3 for ; Mon, 05 Dec 2022 00:56:34 -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=kVSCRQyJAsFx4cR06RbLRKFs4CbKGWZ8GKeLBvjBxgo=; b=uRO+YlrD0u/5v+kX6xTykmnO6dMtYuakNQzJ+QcIxmpUTS3LhFWlblPB+/9KWHf5bX vK6f3qhMSd1Nh2GzCe+ncuL2QWWOQCbFJb7rdSJmmcSuXVt7BBD6ZNFOHEXEMGqBDh10 WnLDbxJkmKi2T9P0uyz0z7NTf++SSUUUhZpMncy4sleSjKh5565JsM5wm6uJV8zYsmWi 5QFDkBEHO2rnNxBOxLZGxEI7o2r7o8g81rtAlXWlW7Xh3ucRAKKwppdVWeGTIk0dYON2 gD5RuEQHBWySQdobSMSzwvURAHqzwjIAqsaQYELg76ok0cX5rGq8vEQO6urQ3kq2ftRD g0hw== X-Gm-Message-State: ANoB5pmJOhO/6yqvSu4Lsa0BuoWH29ei3X/5cEhdLRRg7PFiiJF1YQ5g 6z4bx119w2+aUQkiYEYx9ERj3x2pNhAhkJugnSSlPg+csWS0rxA9/IcxKnqLXCoZf1VvbRbSUNW iiLgLpGvzLeSw+jwP7H3iqPS918RBhM+QwF0hJEe0kw== X-Received: by 2002:a17:902:d4c5:b0:189:5e92:d457 with SMTP id o5-20020a170902d4c500b001895e92d457mr49569128plg.166.1670230593428; Mon, 05 Dec 2022 00:56:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf4PKx60jKsOj1oAIgiR8Ymm1hI3znegSs18N8vXoPyEFwdznBLhk/ATJ3/YBWOlEgaQQyHD/A== X-Received: by 2002:a17:902:d4c5:b0:189:5e92:d457 with SMTP id o5-20020a170902d4c500b001895e92d457mr49569111plg.166.1670230593119; Mon, 05 Dec 2022 00:56:33 -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.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 00:56:32 -0800 (PST) From: Masahiro Yamada To: kernel-team@lists.ubuntu.com Subject: [L/unstable 08/13] UBUNTU: [Packaging] use olddefconfig in stamp-prepare-tree Date: Mon, 5 Dec 2022 17:56:14 +0900 Message-Id: <20221205085619.257813-9-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 syncconfig here because Kbuild takes care of it before staring the build. prepare and scripts are unneeded for the same reason. All the use of 'syncconfig' in debian/rules is suspicous because syncconfig may stop to ask for user's preference when it finds a new config option. There is nobody to answer the Kconfig's question when the package is being built in auto-builders such as cbd, launchpad. Presumably what you want here is olddefconfig, which is a non-interactive command to set any config option to its default. Signed-off-by: Masahiro Yamada --- debian/rules.d/2-binary-arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 2737638d1134..f32767671705 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -36,7 +36,7 @@ $(stampdir)/stamp-prepare-tree-%: debian/scripts/fix-filenames sed -ie 's/.*CONFIG_UBUNTU_ODM_DRIVERS.*/# CONFIG_UBUNTU_ODM_DRIVERS is not set/' \ $(builddir)/build-$*/.config find $(builddir)/build-$* -name "*.ko" | xargs rm -f - $(build_cd) $(kmake) $(build_O) -j1 syncconfig prepare scripts + $(build_cd) $(kmake) $(build_O) -j1 olddefconfig touch $@ # Used by developers as a shortcut to prepare a tree for compilation.