From patchwork Wed Jan 15 16:25:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11335289 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A7D614B4 for ; Wed, 15 Jan 2020 16:26:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5995F206D7 for ; Wed, 15 Jan 2020 16:26:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579105576; bh=EO+lbnTl8JD9KU9HVqHVfPTrZrSDTWy4iAB8c1tG5vA=; h=From:To:Cc:Subject:Date:List-ID:From; b=B05F2zPKx9MAhooi9zs5Ni28zOp8KOVJGd9CB59WfGu9LzOsrG2vIwg37+lGxXxph VWWE+ecTGAyAbFei4hXaP/1c4Ff3ZU2WmkpsiztCTATDuGnTBcKJLNJLRhgFou7aQj s+YTnhpf2swbU0xDqe4I4FnJGuuT89EwosvQm1RE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726483AbgAOQ0M (ORCPT ); Wed, 15 Jan 2020 11:26:12 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:58429 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726165AbgAOQ0L (ORCPT ); Wed, 15 Jan 2020 11:26:11 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-07.nifty.com with ESMTP id 00FGPX3A015075; Thu, 16 Jan 2020 01:25:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 00FGPX3A015075 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579105534; bh=fouf2erZu2zlCkdO4KBDKaCsNgyUUXqd28gkzb62sDQ=; h=From:To:Cc:Subject:Date:From; b=2jYDSnqaNaNLiGKL9a3+LeixR2nydWYpWyaOzexh5Fl4No7EzQEPBW6thW7SaE74S IWAKY3tIhP9MXAbLlX7jJc6COJrQeRCXcSL40kztlR8Q2dIfzTtadrlPRNk4mQJJmc dJZUO0CNVzs5qHlBOuvgPeBIzbV6WnWHq1xcp+HEyRv4EtHMaLQ7Qk2wpcwtvIBcIu Dwv+t5ctbsFQexwnjpIJIOb4YEid8YCbB49h0jr7tjRPII9WXy0Yipp6zdsXXoBNKE 9tpo3NStFusR8Q+HoYlsLt/pwRPjB+kJdeqvQSe9qKseFY5xXR7KBUvmHLhN3aGWdk hErpZcH+i5DlA== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/7] builddeb: remove unneeded files in hdrobjfiles for headers package Date: Thu, 16 Jan 2020 01:25:23 +0900 Message-Id: <20200115162529.11089-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org - We do not need tools/objtool/fixdep or tools/objtool/sync-check.sh for building external modules. Including tools/objtool/objtool is enough. - gcc-common.h is a check-in file. I do not see any point to search for it in objtree. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/package/builddeb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index b60388051c7f..eb067d6f1370 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -170,11 +170,11 @@ done (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles" (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles" if is_enabled CONFIG_STACK_VALIDATION; then - (cd $objtree; find tools/objtool -type f -executable) >> "$objtree/debian/hdrobjfiles" + echo tools/objtool/objtool >> "$objtree/debian/hdrobjfiles" fi (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles" if is_enabled CONFIG_GCC_PLUGINS; then - (cd $objtree; find scripts/gcc-plugins -name \*.so -o -name gcc-common.h) >> "$objtree/debian/hdrobjfiles" + (cd $objtree; find scripts/gcc-plugins -name \*.so) >> "$objtree/debian/hdrobjfiles" fi destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" From patchwork Wed Jan 15 16:25:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11335287 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C44AD14B4 for ; Wed, 15 Jan 2020 16:26:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99A98206D7 for ; Wed, 15 Jan 2020 16:26:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579105571; bh=JrcCpTfCm9WowMtnvLASi5++U0clXi0l/2Dd1WwudU0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DdwkI7LTxIbmJkOOgOao8hNqZFyLTdDfk9VmQu9K+IZOBegxDnzXQjA8Gd5C3pE4f ppCBeT0Xr6+Pgoftb0JqOHf4sdDCVH3PTEEaHA6p9zB826ZEY+9Y6OLnj1U0FUbvN2 CkPKdDeLUhnvy8ujsWA4YXip6YG59mQI7UgSQISc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726474AbgAOQ0L (ORCPT ); Wed, 15 Jan 2020 11:26:11 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:58428 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726483AbgAOQ0L (ORCPT ); Wed, 15 Jan 2020 11:26:11 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-07.nifty.com with ESMTP id 00FGPX3B015075; Thu, 16 Jan 2020 01:25:34 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 00FGPX3B015075 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579105535; bh=bNWJyqCxP966kt6UgpmkmKoVzlzhn+sJ9RduGT9o9Zg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TS7n4fGh6+5Wo6/YAAcbqj1QRY3g0QdaU9+FYvCu/ixZ4IW1O/LKlagyciMS8fPt1 zk2R9NOyfbEX5QbAaATaNROAi4DnCNE/EQiyY647LPCZGVPMNFTWdPlltA34LTQHt2 H3ZNyXPq5SyOOwAMi0uq7fVVcdCuwnQB0AMHrSUX9aQ3DMirOICNrUQEuTdXsro9/W BpMojQU54/D+w07rfiknS+RP/vz6IPM8ejieQyMAzj8lVYyEGmwgjid1WsNvpODAE2 WBGxzVe97F1bHxuIxeZQhGhMLVyCowM15yYzXPc0Q/G5f1l1f5IUVultgIHVCvCN3Z HPQxi08+TI2RA== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/7] builddeb: match temporary directory name to the package name Date: Thu, 16 Jan 2020 01:25:24 +0900 Message-Id: <20200115162529.11089-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200115162529.11089-1-masahiroy@kernel.org> References: <20200115162529.11089-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The temporary directory names, debian/hdrtmp (linux-headers package) vs debian/headertmp (linux-libc-dev package), are confusing. Matching the directory name to the package name is clearer, IMHO. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/package/builddeb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index eb067d6f1370..0a0a7c1447f4 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -47,10 +47,10 @@ create_package() { } version=$KERNELRELEASE -tmpdir="$objtree/debian/tmp" -kernel_headers_dir="$objtree/debian/hdrtmp" -libc_headers_dir="$objtree/debian/headertmp" -dbg_dir="$objtree/debian/dbgtmp" +tmpdir="$objtree/debian/linux-image" +kernel_headers_dir="$objtree/debian/linux-headers" +libc_headers_dir="$objtree/debian/linux-libc-dev" +dbg_dir="$objtree/debian/linux-image-dbg" packagename=linux-image-$version kernel_headers_packagename=linux-headers-$version libc_headers_packagename=linux-libc-dev From patchwork Wed Jan 15 16:25:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11335291 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73E7F138D for ; Wed, 15 Jan 2020 16:26:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 536CE24671 for ; Wed, 15 Jan 2020 16:26:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579105580; bh=fiQN7tX4lhgGkCMVarWJ5EYMl9/zE0hefm2D1qE3Af0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hHhn2jU30Sp1WLrmxA+Lf0lI3mZOhD27VRcjbs4OVRyEuZ30cRuebTs54DyRJKPtb XyXA9H1CJnQGCMik1N6qb/U4qFxCJnEzzd9hrHprwNpvSzcyDSRiva1mOgD+k970/9 xXDMxfBWdsjgiAv911uYRy2hHJLQfV9MZzFswgr8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729039AbgAOQ0Q (ORCPT ); Wed, 15 Jan 2020 11:26:16 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:58519 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726165AbgAOQ0Q (ORCPT ); Wed, 15 Jan 2020 11:26:16 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-07.nifty.com with ESMTP id 00FGPX3C015075; Thu, 16 Jan 2020 01:25:35 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 00FGPX3C015075 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579105535; bh=gFAgJ6b5Jn67RGEgm344mvWSA0S1s/Vavy96BOU0mH8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dYH+M0POPw02E+6JkkezXpT1uApI8FkcSricQC1Xp4gL/2Nr4MNpPE1QdXxuLKdaW 4XYtOP/e8peEG5I48W1+/eEvabkkzSf+yKlGYVdYMwXgenjJx+u/Fq9Jz/cNKua9yH hmjZGz0d7x9ICJKdGQ+RceRlpPkdEh/a/VGYALjL5sCJ0t5UarILiFuhb4hAMnMpgL a1gi/JGjzGS/DuvfgCLfTptHB2WDD8zCLeQxCmY6ZURFgD+z7BYsLuA+d68L2JlKkP xv/Yds72o1z8qazNa2H+ltERz257abdJN5lSyAGactPK9Pl3+gL8eohoWN94r3R9hL pkg/cj6ZCOlpA== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/7] builddeb: remove redundant $objtree/ Date: Thu, 16 Jan 2020 01:25:25 +0900 Message-Id: <20200115162529.11089-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200115162529.11089-1-masahiroy@kernel.org> References: <20200115162529.11089-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org This script works only when it is invoked in the $objtree, that is, it is already relying on $objtree is '.' Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/package/builddeb | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 0a0a7c1447f4..9b92745bf13a 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -47,10 +47,10 @@ create_package() { } version=$KERNELRELEASE -tmpdir="$objtree/debian/linux-image" -kernel_headers_dir="$objtree/debian/linux-headers" -libc_headers_dir="$objtree/debian/linux-libc-dev" -dbg_dir="$objtree/debian/linux-image-dbg" +tmpdir=debian/linux-image +kernel_headers_dir=debian/linux-headers +libc_headers_dir=debian/linux-libc-dev +dbg_dir=debian/linux-image-dbg packagename=linux-image-$version kernel_headers_packagename=linux-headers-$version libc_headers_packagename=linux-libc-dev @@ -77,7 +77,7 @@ esac BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes) # Setup the directory structure -rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files +rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" debian/files mkdir -m 755 -p "$tmpdir/DEBIAN" mkdir -p "$tmpdir/lib" "$tmpdir/boot" mkdir -p "$kernel_headers_dir/lib/modules/$version/" @@ -165,24 +165,24 @@ EOF done # Build kernel header package -(cd $srctree; find . arch/$SRCARCH -maxdepth 1 -name Makefile\*) > "$objtree/debian/hdrsrcfiles" -(cd $srctree; find include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles" -(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles" -(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles" +(cd $srctree; find . arch/$SRCARCH -maxdepth 1 -name Makefile\*) > debian/hdrsrcfiles +(cd $srctree; find include scripts -type f -o -type l) >> debian/hdrsrcfiles +(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> debian/hdrsrcfiles +(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> debian/hdrsrcfiles if is_enabled CONFIG_STACK_VALIDATION; then - echo tools/objtool/objtool >> "$objtree/debian/hdrobjfiles" + echo tools/objtool/objtool >> debian/hdrobjfiles fi -(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles" +find arch/$SRCARCH/include Module.symvers include scripts -type f >> debian/hdrobjfiles if is_enabled CONFIG_GCC_PLUGINS; then - (cd $objtree; find scripts/gcc-plugins -name \*.so) >> "$objtree/debian/hdrobjfiles" + find scripts/gcc-plugins -name \*.so >> debian/hdrobjfiles fi destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" -(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -) -(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -) -(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be +(cd $srctree; tar -c -f - -T -) < debian/hdrsrcfiles | (cd $destdir; tar -xf -) +tar -c -f - -T - < debian/hdrobjfiles | (cd $destdir; tar -xf -) +cp $KCONFIG_CONFIG $destdir/.config # copy .config manually to be where it's expected to be ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build" -rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles" +rm -f debian/hdrsrcfiles debian/hdrobjfiles if [ "$ARCH" != "um" ]; then create_package "$kernel_headers_packagename" "$kernel_headers_dir" From patchwork Wed Jan 15 16:25:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11335297 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC24014B7 for ; Wed, 15 Jan 2020 16:26:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA66B24656 for ; Wed, 15 Jan 2020 16:26:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579105603; bh=Os96ml7Pmf21QOwrRKIYNtWFm3N+GGpLbQeFHckdnSo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mBiqAwwEULqFNg0PMQjJ70ohnlirSpZeHNQnhk/dijUu3zXpO4aFVfMedgpaYfiGW HAfLPBDfT1QzEMV77eURs66Eo20Umdn/znF0Npy2N+L3KIdN8b61Sxhgtz7O+X/zO2 iap90vKiHJjEJGDZwVhSsWCcn00PebZFNcRCCttA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729122AbgAOQ0h (ORCPT ); Wed, 15 Jan 2020 11:26:37 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:58902 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728931AbgAOQ0h (ORCPT ); Wed, 15 Jan 2020 11:26:37 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-07.nifty.com with ESMTP id 00FGPX3D015075; Thu, 16 Jan 2020 01:25:35 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 00FGPX3D015075 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579105536; bh=gZ1tQR0oF7mVTSCbFvPvL7tdZTj4E7ydMnWZsVBinlI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gl9akiXqlGKyRdP38V6y52S2PnAsNXth0HcyFKetp8G197JKZkXg1RABArt05XdKc MgYrWxyR3QvlfzYFepw01VijZSsj9pwP+PY2cqSVC5eSxg217F6LDAS70urYXoLWj3 Zlk9Or/lzo+fvxbJkK5Hu4I67CwsHOKOvzUwQ4HTUZwYxt9SkbG8vaNR7TuPmSg7pg /i3RUgD1kcOWVWDpfvGo+GhM3FkLY8C7lb9D0Hb13s1ZryiaWnNMMUxUEsBqhEt0lC VEF8lodgb4eJfVN+oJZCNpsWghB/R1fO1SW0cpUs0bHHsUWQ/7ngWtkqAzV807THvY UtbXFbGlbdXgA== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 4/7] builddeb: avoid invoking sub-shells where possible Date: Thu, 16 Jan 2020 01:25:26 +0900 Message-Id: <20200115162529.11089-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200115162529.11089-1-masahiroy@kernel.org> References: <20200115162529.11089-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The commands surrounded by ( ... ) is run in a sub-shell, but you do not have to spawn a sub-shell for every single line. Use just one ( ... ) for creating debian/hdrsrcfiles. For tar, use -C option instead. Signed-off-by: Masahiro Yamada --- Changes in v2: - fix misconversion pointed out by Ben scripts/package/builddeb | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 9b92745bf13a..7d7e0abe62b6 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -165,21 +165,34 @@ EOF done # Build kernel header package -(cd $srctree; find . arch/$SRCARCH -maxdepth 1 -name Makefile\*) > debian/hdrsrcfiles -(cd $srctree; find include scripts -type f -o -type l) >> debian/hdrsrcfiles -(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> debian/hdrsrcfiles -(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> debian/hdrsrcfiles -if is_enabled CONFIG_STACK_VALIDATION; then - echo tools/objtool/objtool >> debian/hdrobjfiles -fi -find arch/$SRCARCH/include Module.symvers include scripts -type f >> debian/hdrobjfiles -if is_enabled CONFIG_GCC_PLUGINS; then - find scripts/gcc-plugins -name \*.so >> debian/hdrobjfiles -fi +( + cd $srctree + find . arch/$SRCARCH -maxdepth 1 -name Makefile\* + find include scripts -type f -o -type l + find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform + find arch/$SRCARCH/include -type f + + if [ -d arch/$SRCARCH/scripts ]; then + find arch/$SRCARCH/scripts -type f + fi +) > debian/hdrsrcfiles + +{ + if is_enabled CONFIG_STACK_VALIDATION; then + find tools/objtool -type f -executable + fi + + find arch/$SRCARCH/include Module.symvers include scripts -type f + + if is_enabled CONFIG_GCC_PLUGINS; then + find scripts/gcc-plugins -name \*.so + fi +} > debian/hdrobjfiles + destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" -(cd $srctree; tar -c -f - -T -) < debian/hdrsrcfiles | (cd $destdir; tar -xf -) -tar -c -f - -T - < debian/hdrobjfiles | (cd $destdir; tar -xf -) +tar -c -f - -C $srctree -T debian/hdrsrcfiles | tar -xf - -C $destdir +tar -c -f - -T debian/hdrobjfiles | tar -xf - -C $destdir cp $KCONFIG_CONFIG $destdir/.config # copy .config manually to be where it's expected to be ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build" rm -f debian/hdrsrcfiles debian/hdrobjfiles From patchwork Wed Jan 15 16:25:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11335299 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CD742138D for ; Wed, 15 Jan 2020 16:26:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A22582073A for ; Wed, 15 Jan 2020 16:26:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579105604; bh=Yn0/+IcC1oDld+uN4L5568VrbQlfpX4cCU2144CvLSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u0PdF7BsEqO+XQPcM9ryPShuElKEnKvkR+vxFGSG5IMzHYsk/XUtuQAWqkYQtUo5d qJBJkk8vRqHh+mBZaozM07SKvtgjBo6amK2cH6U0khb13T5FQrBMhS35qm9PqOYK5f C5R6ikbrCm7PpkJDD3NVVCnHjFrFMH0wOwcVLr/0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726132AbgAOQ0h (ORCPT ); Wed, 15 Jan 2020 11:26:37 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:58897 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729108AbgAOQ0g (ORCPT ); Wed, 15 Jan 2020 11:26:36 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-07.nifty.com with ESMTP id 00FGPX3E015075; Thu, 16 Jan 2020 01:25:36 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 00FGPX3E015075 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579105537; bh=sNE2F0kSkktCHvfxE2N29UtQt+eVh1lpwgFeM/VhRfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q0ibsP24OCjTzgrN0oWHuS1fJgmOx3EojUf5fQVYvZrATOrt44OXAFqs4/qmjzKyj yuvHXZOvux1XywE1cr02JTpizEp6T1kcm6OWS31fCakIX+GIzpu4/OqeoS5OyZ5k5i TJ9fD2LYo4flKs6kTPrlty5v/q3vVYXgTe9TYMwhtu1gvOgdpBQj6jPKVQOaE2Dx/0 D5r1iT5+L9LDURA1ilFTSCCwQxaeKkY6qCvMNjfcYkVJQkDaRBTl5iIZPSpSM33+t7 LxuW7FOjVdSEBltWYfalCvINq2deuXOTtF5z816qGXEkcp/MXNW4nsY+rVDMRbo4YK Z7uT3yiliUDfA== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 5/7] builddeb: remove redundant make for ARCH=um Date: Thu, 16 Jan 2020 01:25:27 +0900 Message-Id: <20200115162529.11089-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200115162529.11089-1-masahiroy@kernel.org> References: <20200115162529.11089-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The kernel build has already been done before builddeb is invoked. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/package/builddeb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 7d7e0abe62b6..650572497811 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -82,10 +82,9 @@ mkdir -m 755 -p "$tmpdir/DEBIAN" mkdir -p "$tmpdir/lib" "$tmpdir/boot" mkdir -p "$kernel_headers_dir/lib/modules/$version/" -# Build and install the kernel +# Install the kernel if [ "$ARCH" = "um" ] ; then mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin" "$tmpdir/usr/share/doc/$packagename" - $MAKE linux cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map" cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config" gzip "$tmpdir/usr/share/doc/$packagename/config" From patchwork Wed Jan 15 16:25:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11335295 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8CD6114B7 for ; Wed, 15 Jan 2020 16:26:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 679862073A for ; Wed, 15 Jan 2020 16:26:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579105594; bh=u5MFszoN1JPaqgeePGAc8KL7Oz3K0CYVMM5jxfu/AZc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=DR8ibnj/qG3Fg6JAto6LqWrCqEBZLbgIpKfgxI/ijtaeudP2Zkjo2NSHv4cZh3RuL g5sFPqz5fUDdUoDN7Z70OSLCFwTwGWFyhZDK7Ir6SLekYsG124rEnETqIbFdyRd/WB hTN1E0GdzekbCBH9WqOhJLYTSl8bcbPrG3kjpA1M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729094AbgAOQ0d (ORCPT ); Wed, 15 Jan 2020 11:26:33 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:58807 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728931AbgAOQ0d (ORCPT ); Wed, 15 Jan 2020 11:26:33 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-07.nifty.com with ESMTP id 00FGPX3F015075; Thu, 16 Jan 2020 01:25:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 00FGPX3F015075 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579105537; bh=SEzkfqLZA5fw4djq7bJOm8sVYjBuyq0I52p1d8MNddM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Fc1htuEu0hhGM+LXiiz9jPm7Sjt2wyllm3s/ijJtphezTfvlp3qwnUs7spJbDs+O Y2R/p3Gbm9iASej2a+ynh5n2DsVw5yJ/AmupXikxMtSRkUeAB+LL6BqMnSkizW0LzL seCEkQe25qUPrjiCSfJT8nknNow88VSs1C/eqwaPEOMk5xyCYY8osgdw8KeINusFw5 5KlIUUF1kIkDChN9PCswbw3N+oDUo+GcDQRV6Z/7M5riXAewZTEHwUZVzuKXr62UjY LIueaYPv9iAqM/5FvKVunIa2WQdW1AnrULh4dZvxaU0kvNtn2uUCqwEyhNK9dnahYu OTaOkxw/6oXyw== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 6/7] builddeb: split kernel headers deployment out into a function Date: Thu, 16 Jan 2020 01:25:28 +0900 Message-Id: <20200115162529.11089-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200115162529.11089-1-masahiroy@kernel.org> References: <20200115162529.11089-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Deploy kernel headers (linux-headers package) in a separate function for readability. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/package/builddeb | 84 ++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 38 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 650572497811..d149452692da 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -46,13 +46,53 @@ create_package() { dpkg --build "$pdir" .. } +deploy_kernel_headers () { + pdir=$1 + + rm -rf $pdir + + ( + cd $srctree + find . arch/$SRCARCH -maxdepth 1 -name Makefile\* + find include scripts -type f -o -type l + find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform + find arch/$SRCARCH/include -type f + + if [ -d arch/$SRCARCH/scripts ]; then + find arch/$SRCARCH/scripts -type f + fi + ) > debian/hdrsrcfiles + + { + if is_enabled CONFIG_STACK_VALIDATION; then + find tools/objtool -type f -executable + fi + + find arch/$SRCARCH/include Module.symvers include scripts -type f + + if is_enabled CONFIG_GCC_PLUGINS; then + find scripts/gcc-plugins -name \*.so + fi + } > debian/hdrobjfiles + + destdir=$pdir/usr/src/linux-headers-$version + mkdir -p $destdir + tar -c -f - -C $srctree -T debian/hdrsrcfiles | tar -xf - -C $destdir + tar -c -f - -T debian/hdrobjfiles | tar -xf - -C $destdir + rm -f debian/hdrsrcfiles debian/hdrobjfiles + + # copy .config manually to be where it's expected to be + cp $KCONFIG_CONFIG $destdir/.config + + mkdir -p $pdir/lib/modules/$version/ + ln -s /usr/src/linux-headers-$version $pdir/lib/modules/$version/build +} + version=$KERNELRELEASE tmpdir=debian/linux-image -kernel_headers_dir=debian/linux-headers libc_headers_dir=debian/linux-libc-dev dbg_dir=debian/linux-image-dbg packagename=linux-image-$version -kernel_headers_packagename=linux-headers-$version libc_headers_packagename=linux-libc-dev dbg_packagename=$packagename-dbg @@ -77,10 +117,9 @@ esac BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes) # Setup the directory structure -rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" debian/files +rm -rf "$tmpdir" "$libc_headers_dir" "$dbg_dir" debian/files mkdir -m 755 -p "$tmpdir/DEBIAN" mkdir -p "$tmpdir/lib" "$tmpdir/boot" -mkdir -p "$kernel_headers_dir/lib/modules/$version/" # Install the kernel if [ "$ARCH" = "um" ] ; then @@ -163,41 +202,10 @@ EOF chmod 755 "$tmpdir/DEBIAN/$script" done -# Build kernel header package -( - cd $srctree - find . arch/$SRCARCH -maxdepth 1 -name Makefile\* - find include scripts -type f -o -type l - find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform - find arch/$SRCARCH/include -type f - - if [ -d arch/$SRCARCH/scripts ]; then - find arch/$SRCARCH/scripts -type f - fi -) > debian/hdrsrcfiles - -{ - if is_enabled CONFIG_STACK_VALIDATION; then - find tools/objtool -type f -executable - fi - - find arch/$SRCARCH/include Module.symvers include scripts -type f - - if is_enabled CONFIG_GCC_PLUGINS; then - find scripts/gcc-plugins -name \*.so - fi -} > debian/hdrobjfiles - -destdir=$kernel_headers_dir/usr/src/linux-headers-$version -mkdir -p "$destdir" -tar -c -f - -C $srctree -T debian/hdrsrcfiles | tar -xf - -C $destdir -tar -c -f - -T debian/hdrobjfiles | tar -xf - -C $destdir -cp $KCONFIG_CONFIG $destdir/.config # copy .config manually to be where it's expected to be -ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build" -rm -f debian/hdrsrcfiles debian/hdrobjfiles - if [ "$ARCH" != "um" ]; then - create_package "$kernel_headers_packagename" "$kernel_headers_dir" + deploy_kernel_headers debian/linux-headers + create_package linux-headers-$version debian/linux-headers + create_package "$libc_headers_packagename" "$libc_headers_dir" fi From patchwork Wed Jan 15 16:25:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11335293 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1FBA814B7 for ; Wed, 15 Jan 2020 16:26:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F21DE206D7 for ; Wed, 15 Jan 2020 16:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579105593; bh=sr3Nyf67+jKfP9CdzCV08hTcvjtDaKSP78rrc6yztCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gWSEtHdgB93V78hkLPIPeNVeelxrxkbos2K8o2HqHK7zRC5nxk7gxMd5qKy7HaMTR 7F09eiubZDX0Lslyr0LotrH9GEeGq9QoX6onu4LtDrTzq6EerQjVDIxoHuuVcUxvUB /rYL/OgRn4X9AmTuCLwu1Z97PyLrE2yawfeIiopw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729067AbgAOQ0c (ORCPT ); Wed, 15 Jan 2020 11:26:32 -0500 Received: from conuserg-07.nifty.com ([210.131.2.74]:58809 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726165AbgAOQ0c (ORCPT ); Wed, 15 Jan 2020 11:26:32 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-07.nifty.com with ESMTP id 00FGPX3G015075; Thu, 16 Jan 2020 01:25:37 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 00FGPX3G015075 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579105538; bh=J3kTsJCLUXlDsDdSDZ99wjZGkzlnfm+/v4cWcQiS+NE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WuoxDDciqjiu4MKo5MqEY8TSQM4SThkmsANgntkKTxMCGwCnhE2bJUZIOJ0RqZfzP tsaL/Qp2xiBMwoZp+G1xWijfjBLZzFscjuSa2BKbseciOiXwJn6EI+wdJKZT3wPVEL +/pRIiFJVjRihtkSedaadBLNJOJo/Juej/uirLKu4JEi5ftuGXHSDoujktPCOS97Ce +J99ar+XuUjugx2Mwb2P+1wHF4c1Bpa2fFQe68SCQZZjfP2H401OHa3VAsY+FqExUK NVT9CjzyMoXayBH7NmUUmUIU8Xwn9zbKHIlTxqQkrL+kwhiTK7B9/BnT6ZR3Wi3RZ7 /zd3vt6Yq5EUg== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH v2 7/7] builddeb: split libc headers deployment out into a function Date: Thu, 16 Jan 2020 01:25:29 +0900 Message-Id: <20200115162529.11089-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200115162529.11089-1-masahiroy@kernel.org> References: <20200115162529.11089-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Deploy user-space headers (linux-libc-dev package) in a separate function for readability. Signed-off-by: Masahiro Yamada --- Changes in v2: None scripts/package/builddeb | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index d149452692da..f49f41fd4c95 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -88,12 +88,25 @@ deploy_kernel_headers () { ln -s /usr/src/linux-headers-$version $pdir/lib/modules/$version/build } +deploy_libc_headers () { + pdir=$1 + + 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//asm to match the structure + # used by Debian-based distros (to support multi-arch) + host_arch=$(dpkg-architecture -a$(cat debian/arch) -qDEB_HOST_MULTIARCH) + mkdir $pdir/usr/include/$host_arch + mv $pdir/usr/include/asm $pdir/usr/include/$host_arch/ +} + version=$KERNELRELEASE tmpdir=debian/linux-image -libc_headers_dir=debian/linux-libc-dev dbg_dir=debian/linux-image-dbg packagename=linux-image-$version -libc_headers_packagename=linux-libc-dev dbg_packagename=$packagename-dbg if [ "$ARCH" = "um" ] ; then @@ -117,7 +130,7 @@ esac BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes) # Setup the directory structure -rm -rf "$tmpdir" "$libc_headers_dir" "$dbg_dir" debian/files +rm -rf "$tmpdir" "$dbg_dir" debian/files mkdir -m 755 -p "$tmpdir/DEBIAN" mkdir -p "$tmpdir/lib" "$tmpdir/boot" @@ -167,16 +180,6 @@ if is_enabled CONFIG_MODULES; then fi fi -if [ "$ARCH" != "um" ]; then - $MAKE -f $srctree/Makefile headers - $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr" - # move asm headers to /usr/include//asm to match the structure - # used by Debian-based distros (to support multi-arch) - host_arch=$(dpkg-architecture -a$(cat debian/arch) -qDEB_HOST_MULTIARCH) - mkdir $libc_headers_dir/usr/include/$host_arch - mv $libc_headers_dir/usr/include/asm $libc_headers_dir/usr/include/$host_arch/ -fi - # Install the maintainer scripts # Note: hook scripts under /etc/kernel are also executed by official Debian # kernel packages, as well as kernel packages built using make-kpkg. @@ -206,7 +209,8 @@ if [ "$ARCH" != "um" ]; then deploy_kernel_headers debian/linux-headers create_package linux-headers-$version debian/linux-headers - create_package "$libc_headers_packagename" "$libc_headers_dir" + deploy_libc_headers debian/linux-libc-dev + create_package linux-libc-dev debian/linux-libc-dev fi create_package "$packagename" "$tmpdir"