Message ID | 20231230135200.1058873-1-masahiroy@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-13438-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp3092046dyb; Sat, 30 Dec 2023 05:52:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IHzIT5auiRE5QnWpi+24gmAjgX9VG5qCk6KMLUEiYR3n1VjQiTPhM/HlkGc4VUVba/4YKLk X-Received: by 2002:a92:cd8a:0:b0:35f:e8a1:2b18 with SMTP id r10-20020a92cd8a000000b0035fe8a12b18mr14807340ilb.21.1703944350524; Sat, 30 Dec 2023 05:52:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703944350; cv=none; d=google.com; s=arc-20160816; b=K6rhtDIUI+h9vyCrI36WSfvdHCXUdUQ+ciL6uKrSK4/k2yxfuNKnqujweNtvRmLt7C QdTVI1X7rGuJyOrDw2vE5c8pGuASVxvK11GVUYQxhwu3DX+NxL7mVEbatNTX+fSPJAoj fda2Hd3Ch3sQL3Lc4+OuGsWHNIUBpSk0T9kiAuauvQN0KcPNe6s/2r3QM0dPt2UncTQh UKmT1CRSIZ8SzGwLqy/xtljweYP4s/YEfXA2W42AhPBmI3ApBlZDv/mlHf4myMLnEZOP ZzVVs+2PEnp+xk19a1NgrgHGOuCdQtswR3UC4ggMtuQAPVKSkYFFSyPPaeP/Xy+3zsDb fNwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=CDRS04BashpMFDUIxCodRBzo58n8uptM7wfoDDa34Wo=; fh=5gYN4msaJmwnN8mGpibv8VZnTy0MtvGQcf5D09XpoaQ=; b=RSMM7BO1c8sDQbRaYEITjItZW46g9I+38szeSdJp9eY1i6oTc/78WLV5TaU1Z5rE9q LrMaQok0iNcTKbEiEpJMOXZaBNpgCuhdgPypJbqYA5wdEQbvE6CURlMEQTSy+2ie0dts /LWGNMx1KyXsoSQsj7PP7VjA591exm+Mfgvl95ckD08lk61eJNepAq0aXbduJlBAbZUp tr9QuLEOJoHP/coRcD4SivI+XIypLQFGak+cGdhN51IoDKxHeoTEurivWekPRvbaPt3N AtyHLnsoxxvlzyR38eLJ8A1EeNrj4Jke+FxovsehPjxTQh7Y2bbbbDQMAwoTJV8zTdWz l4iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Tf9kgC0O; spf=pass (google.com: domain of linux-kernel+bounces-13438-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13438-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id k2-20020a632402000000b005bdd6196f4asi13253932pgk.392.2023.12.30.05.52.30 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Dec 2023 05:52:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13438-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Tf9kgC0O; spf=pass (google.com: domain of linux-kernel+bounces-13438-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13438-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 1C61BB213AE for <ouuuleilei@gmail.com>; Sat, 30 Dec 2023 13:52:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0B5FC9479; Sat, 30 Dec 2023 13:52:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Tf9kgC0O" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53AA18BED; Sat, 30 Dec 2023 13:52:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89A96C433C7; Sat, 30 Dec 2023 13:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703944324; bh=I8YWkNwCfpsTCQMjWVH+WYYNUuZhW8O5gv7Trb+2X3I=; h=From:To:Cc:Subject:Date:From; b=Tf9kgC0OzB3/DOGkdXeZio0IHJKL0+iT99ZhAUEHwPB0KSBkAJMOZVNxoqlbUbBpj pTEX1c1KaFnopzGD2H0tB+fXdJmjc5uEYJYs/jSTF82EM1nhS+6zgUCHUwgxqpwFfU yqwpEYfeyuBiMDa4Yii9+JuIxfxYDPXQMmVvJMmS2scOTTLsfO4u2jNcgYwjzsDRd9 tCjWpcW0pLEkeE4wrNRBUUPNTvE0Lf5bYxbUmYpKdEH4AZx1S3xDv3e98SKwYvBRi3 rrpkw78tGtd0QI3+59xcPYUAU4FDP9tCp+TQ/rfhR+yLYxsNhJxL1FgpPfFV1QUZSs fBTqkkwz/hdOQ== From: Masahiro Yamada <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings <ben@decadent.org.uk>, Masahiro Yamada <masahiroy@kernel.org>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Nicolas Schier <nicolas@fjasle.eu>, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] kbuild: deb-pkg: move 'make headers' to build-arch Date: Sat, 30 Dec 2023 22:51:56 +0900 Message-Id: <20231230135200.1058873-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786715151367167081 X-GMAIL-MSGID: 1786715151367167081 |
Series |
[1/5] kbuild: deb-pkg: move 'make headers' to build-arch
|
|
Commit Message
Masahiro Yamada
Dec. 30, 2023, 1:51 p.m. UTC
Strictly speaking, 'make headers' should be a part of build-arch
instead of binary-arch.
'make headers' constructs read-to-copy UAPI headers in the kernel
directory.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/package/builddeb | 1 -
scripts/package/debian/rules | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
Comments
On Sat, Dec 30, 2023 at 10:52 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > Strictly speaking, 'make headers' should be a part of build-arch > instead of binary-arch. > > 'make headers' constructs read-to-copy UAPI headers in the kernel > directory. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > scripts/package/builddeb | 1 - > scripts/package/debian/rules | 4 ++-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/scripts/package/builddeb b/scripts/package/builddeb > index cc8c7a807fcc..842ee4b40528 100755 > --- a/scripts/package/builddeb > +++ b/scripts/package/builddeb > @@ -155,7 +155,6 @@ install_libc_headers () { > > rm -rf $pdir > > - $MAKE -f $srctree/Makefile headers > $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH=$pdir/usr > > # move asm headers to /usr/include/<libc-machine>/asm to match the structure > diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules > index cb084e387469..a686c37d0d02 100755 > --- a/scripts/package/debian/rules > +++ b/scripts/package/debian/rules > @@ -26,8 +26,8 @@ binary-arch: build-arch > build: build-arch build-indep > build-indep: > build-arch: > - $(MAKE) $(make-opts) \ > - olddefconfig all > + $(MAKE) $(make-opts) olddefconfig > + $(MAKE) $(make-opts) headers all To avoid a build error for ARCH=um, I will apply the following fix-up. diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules index 1a18ca3c43db..098307780062 100755 --- a/scripts/package/debian/rules +++ b/scripts/package/debian/rules @@ -27,7 +27,7 @@ build: build-arch build-indep build-indep: build-arch: $(MAKE) $(make-opts) olddefconfig - $(MAKE) $(make-opts) headers all + $(MAKE) $(make-opts) $(if $(filter um,$(ARCH)),,headers) all .PHONY: clean clean: > > .PHONY: clean > clean: > -- > 2.40.1 >
On Tue, Jan 09, 2024 at 01:38:07PM +0900, Masahiro Yamada wrote: > On Sat, Dec 30, 2023 at 10:52 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > > > Strictly speaking, 'make headers' should be a part of build-arch > > instead of binary-arch. > > > > 'make headers' constructs read-to-copy UAPI headers in the kernel s/read/ready/ ? > > directory. > > > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > --- > > > > scripts/package/builddeb | 1 - > > scripts/package/debian/rules | 4 ++-- > > 2 files changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/scripts/package/builddeb b/scripts/package/builddeb > > index cc8c7a807fcc..842ee4b40528 100755 > > --- a/scripts/package/builddeb > > +++ b/scripts/package/builddeb > > @@ -155,7 +155,6 @@ install_libc_headers () { > > > > rm -rf $pdir > > > > - $MAKE -f $srctree/Makefile headers > > $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH=$pdir/usr > > > > # move asm headers to /usr/include/<libc-machine>/asm to match the structure > > diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules > > index cb084e387469..a686c37d0d02 100755 > > --- a/scripts/package/debian/rules > > +++ b/scripts/package/debian/rules > > @@ -26,8 +26,8 @@ binary-arch: build-arch > > build: build-arch build-indep > > build-indep: > > build-arch: > > - $(MAKE) $(make-opts) \ > > - olddefconfig all > > + $(MAKE) $(make-opts) olddefconfig > > + $(MAKE) $(make-opts) headers all > > > > > To avoid a build error for ARCH=um, > I will apply the following fix-up. > > > > > > diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules > index 1a18ca3c43db..098307780062 100755 > --- a/scripts/package/debian/rules > +++ b/scripts/package/debian/rules > @@ -27,7 +27,7 @@ build: build-arch build-indep > build-indep: > build-arch: > $(MAKE) $(make-opts) olddefconfig > - $(MAKE) $(make-opts) headers all > + $(MAKE) $(make-opts) $(if $(filter um,$(ARCH)),,headers) all Reviewed-by: Nicolas Schier <n.schier@avm.de> I'm wondering if we might want to change the headers target in top-level Makefile to not bail-out for ARCH=um but only show a warning that there is nothing to export. Kind regards, Nicolas
On Tue, Jan 9, 2024 at 10:24 PM Nicolas Schier <n.schier@avm.de> wrote: > > On Tue, Jan 09, 2024 at 01:38:07PM +0900, Masahiro Yamada wrote: > > On Sat, Dec 30, 2023 at 10:52 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > > > > > Strictly speaking, 'make headers' should be a part of build-arch > > > instead of binary-arch. > > > > > > 'make headers' constructs read-to-copy UAPI headers in the kernel > > s/read/ready/ ? Yes, thanks for catching it. > I'm wondering if we might want to change the headers target in top-level > Makefile to not bail-out for ARCH=um but only show a warning that there > is nothing to export. Yes, this is another way of fixing it, but I do not even want to show a warning. Having 'make ARCH=um headers' succeed silently is another way. I just stayed on a safer side.
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index cc8c7a807fcc..842ee4b40528 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -155,7 +155,6 @@ install_libc_headers () { rm -rf $pdir - $MAKE -f $srctree/Makefile headers $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH=$pdir/usr # move asm headers to /usr/include/<libc-machine>/asm to match the structure diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules index cb084e387469..a686c37d0d02 100755 --- a/scripts/package/debian/rules +++ b/scripts/package/debian/rules @@ -26,8 +26,8 @@ binary-arch: build-arch build: build-arch build-indep build-indep: build-arch: - $(MAKE) $(make-opts) \ - olddefconfig all + $(MAKE) $(make-opts) olddefconfig + $(MAKE) $(make-opts) headers all .PHONY: clean clean: