From patchwork Sat Jan 25 04:12: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: 11351491 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 948531580 for ; Sat, 25 Jan 2020 04:13:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69FF321D7E for ; Sat, 25 Jan 2020 04:13:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579925608; bh=tC/862s6NYIi6bv+76sQda0kXCCSCOq8TamINFzB0xc=; h=From:To:Cc:Subject:Date:List-ID:From; b=pd0+B8TBGUpcRePDU0GDvYj2K6nmRckk66r/7sXhXb8TYKAnwEsf7l9pMmPWtF9N7 r3U6hK+j3RPh1lEDXgAaZrlpGrjpE3GWbzjjkmbTrLwof1oI7r3PoQvLqEuOKxEsBM DM0WhzqzLIrRcO1A2qcT5EQN6WmjJuFDwbpC7uIA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727590AbgAYEN1 (ORCPT ); Fri, 24 Jan 2020 23:13:27 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:28179 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725747AbgAYENM (ORCPT ); Fri, 24 Jan 2020 23:13:12 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 00P4CcjR032210; Sat, 25 Jan 2020 13:12:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 00P4CcjR032210 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579925559; bh=3vvOuD9IzieNaW/plXSSiBRcrjm3RzM1ZdcZ0+Z2l48=; h=From:To:Cc:Subject:Date:From; b=Pf8V87+KzHTlWdbHpFggBOLCnT6DP0dC9yyZaHqVL/yn69CdToNPw4XhZa15tMWYy yUIqbEQZhWf2aHIcMD9qgyfSmDXTf3IA0DXzAOF7kirlkTYzcwubfbDl59CncSONjO WUzgufDocufbNl27Sdx2n3fVkFANWyY4a4F5Bn4stV8I2MimhwO27/UvhNOr8GfP7R I4xYEIRz0wtbFtK5TOfSNiPpYupPYwREKP+T4Ep/E/hzU7aCa2v9McfX22Fix9BRgD sGWsT9LYahTxvAOWuA3RJEClxXcweMleR6oC+PRugFuLkPKHAXirCODUe/z7gtQPXr 40si5H3hUuWWQ== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH v3 1/7] builddeb: remove unneeded files in hdrobjfiles for headers package Date: Sat, 25 Jan 2020 13:12:29 +0900 Message-Id: <20200125041235.8856-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 v3: None 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 f903ba947daf..d4bb28fbd3de 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 Sat Jan 25 04:12:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11351479 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 78C621395 for ; Sat, 25 Jan 2020 04:13:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 521242072C for ; Sat, 25 Jan 2020 04:13:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579925593; bh=BOi6a6Xs1jpdnPQ577X0vPH1MjtGAKXZG3NjPfHjhZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SbHAY9LTdKkyPEUyubYF9JJmptdkOuomL03JLGNbO/0QEiWlPNEXZbj3Z6feYYGHo V2D/Q0brr+HuOm7o4z4uftex+/rhNmkiNdHPE8AjLL5JneYnVdiX87D60MwuWH8oqE Lj8crAQJZaMdH8KlcnRvoCAPk9TETuj1gOcujUW8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725887AbgAYENM (ORCPT ); Fri, 24 Jan 2020 23:13:12 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:28180 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725765AbgAYENL (ORCPT ); Fri, 24 Jan 2020 23:13:11 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 00P4CcjS032210; Sat, 25 Jan 2020 13:12:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 00P4CcjS032210 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579925559; bh=X/wkV6avTrwPTXdELDBmqNsqA0J2HLOgmvKqcuficjo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rKFCAGLfzSsrZ3P0rBq48NqePjzKYag+KQj5GDtMKduOB5Q2z6flvW9Ys+kgev1Ff tAvdG/Z6MRxQviJzAvDsPI93zoxvtyZKTP+CCJNf/LRhBhlQJhWDaAo85g67+gW8VK 4RUOisTzMfXwz3gtMCP6R9jJoz95yodl+Vz59kA6SSA6Rex3uFoLVnWl+fcPhpt14R xBgWfefZHSWGJT7j6NAoMt+VcDQ4CsjKnYP8TxUVqnnBVIGgJzgu5Ans3hvxdNu7QP Mp/Ymk4BHch4WTUpEPON2ZwbhRfA/JoFuJASOxB+vNAAjUQ3lf5zPhkB2SN0qZ59Yn pKZGQoTDcFmDA== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH v3 2/7] builddeb: match temporary directory name to the package name Date: Sat, 25 Jan 2020 13:12:30 +0900 Message-Id: <20200125041235.8856-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200125041235.8856-1-masahiroy@kernel.org> References: <20200125041235.8856-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 v3: None 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 d4bb28fbd3de..d72267835373 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 Sat Jan 25 04:12:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11351489 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 5FCB71395 for ; Sat, 25 Jan 2020 04:13:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EF4A222D9 for ; Sat, 25 Jan 2020 04:13:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579925608; bh=jNCUp3iJ+a+rra5kJGZP/4QrnHgaCWBX2Z8p7netUXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=X8Zek8d5Ct9WDqYrpqMfL+sFhzCEixY+w4jD7aeXXZmDmBWQJdT+iaFsfIPQiMY9Q hNGhFGNps8VqcHhEjEhT9IOxwiJGJJ94Trg94Wu2+JE3RBbvAI91s6cPuVzQeH2VuL SFAi4vs+E/H/rmnkfzIo87vqhZAuqSuPNMPQdWc8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727322AbgAYENM (ORCPT ); Fri, 24 Jan 2020 23:13:12 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:28181 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725821AbgAYENM (ORCPT ); Fri, 24 Jan 2020 23:13:12 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 00P4CcjT032210; Sat, 25 Jan 2020 13:12:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 00P4CcjT032210 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579925560; bh=tUhvpMwkZdY4w8aUILG/4nwelCuOwW5UNGpHqUzCITQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ddgJPgEfvIAHr9ds5VAb0veO+zcyOprQ07hVyBzizSpTuIGdM8zeHReOc1KmGPRfu GQ2aHEuVoHL4mzKoCGH/7+aLAp2sfe1P77WHD0XVVateGeuwcesjqF/WlW5VADCsnN RcKYluAbVRro+wS1LXGZKrMWN9No6vG/n5Pc9w5W/BqUV5olRcIOpadKM3wygdNrbh peqQhKGQCted4puQtMFxg+MhON1LRAcWZ2EFeHQZNNxw8JJ1wuvQy+BrMY0ZZ3iMrV Ns4ZMSc75o0pLTYXWymYSCD3iEPYR7GokJcbMTFOMj662+0rRHx//ghDNiaaphwgBw HyosljXTxOQcg== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH v3 3/7] builddeb: remove redundant $objtree/ Date: Sat, 25 Jan 2020 13:12:31 +0900 Message-Id: <20200125041235.8856-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200125041235.8856-1-masahiroy@kernel.org> References: <20200125041235.8856-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 v3: None 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 d72267835373..15a76817e4ac 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 Sat Jan 25 04:12:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11351483 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 C88041395 for ; Sat, 25 Jan 2020 04:13:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A77C12072C for ; Sat, 25 Jan 2020 04:13:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579925601; bh=SYeTX+PqU+P+ZCKuAYOp98NXw6qAemwsQeMBd6kxEO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PyK528FKih+FcCgJ0Ei4DfJxCDFnKDrlHGeDUy9Gy40FzAor15IxBU2Q3ulQ8J8Ue VgkTSbgJSp3wcr+aNjRFVFxGIBTEA78nmXvQ3T/aA97C406bCMrkz7ncWko54KE7WV 7qGcSMIMoZ0TOQGqT/FMa3NOxkQJZP1dPinjqWVI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729281AbgAYENS (ORCPT ); Fri, 24 Jan 2020 23:13:18 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:28283 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725821AbgAYENO (ORCPT ); Fri, 24 Jan 2020 23:13:14 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 00P4CcjU032210; Sat, 25 Jan 2020 13:12:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 00P4CcjU032210 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579925561; bh=HYAKUp6qSuTf3zs3jQ3kzK92dAW45rJ8WzZQ2aLc2co=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MwyuSZU+2Nnb2GFmp3L+6xjFm5z95hUsk5KemWOzetJbNx8Lwn/T5ouoI2/i7dHTT g0clURqojp9Mxf/nwoqQloI6pkr3Y9OuoJaJ4Xn67KiW6f4p1Gy8rZcmy+0PDC8fau wlZbVLJSMq060ylgzTgFka5oTqquvzgFwBQ4JsT+rs3QXkzy3RkFpBOqkOpJjgD8Q5 qrCLkO6o1ZCmGw68hc4TJBLo5WwuSX2dBPjS6YrbkSYoVCaHlrnpuwP4XwDPUw9czJ o26odSB/TUuv5NYYG7UxbkL7PisC580n76GpGkNlV7dlCejtav/ULtFUbnqUsahl+E Za5ZtecZ/u8SQ== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH v3 4/7] builddeb: avoid invoking sub-shells where possible Date: Sat, 25 Jan 2020 13:12:32 +0900 Message-Id: <20200125041235.8856-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200125041235.8856-1-masahiroy@kernel.org> References: <20200125041235.8856-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 v3: - fix more misconversion Changes in v2: - fix misconversion pointed out by Ben scripts/package/builddeb | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 15a76817e4ac..a73e0d5377e9 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -165,21 +165,30 @@ 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 $(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 + 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 Sat Jan 25 04:12:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11351487 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 D7BBB1395 for ; Sat, 25 Jan 2020 04:13:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD4E62081E for ; Sat, 25 Jan 2020 04:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579925605; bh=bVyFiKS4dSWWKzlJf6F4HW1Btt/PTMswrulIRxdXgW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rTpx6TC3t/rBAaa98TcCeg1wxSBfPUvIMi3jgwvr/mu3wdJAlBJwvVLBn0xFYLMVc AFSKV1ly7SUNqzNp+v/DIo7lY27VqJR/3IW9935OoNsjlsE1wYoNSvsXM0iEwZ5/8s NXtjOxQF5khto/UYz87Tsk1mwTgj1zDaazFQSiiw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729098AbgAYENN (ORCPT ); Fri, 24 Jan 2020 23:13:13 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:28259 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726911AbgAYENM (ORCPT ); Fri, 24 Jan 2020 23:13:12 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 00P4CcjV032210; Sat, 25 Jan 2020 13:12:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 00P4CcjV032210 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579925561; bh=Dso1H1TBmUhcKsqk7LnsP10aar5lfgKI054ROI08iKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wsRAS3aYbUlaNw0y6FUjyvzUNxVAwRbSOB81zYiJiIB/KJtBVlvHYl/OnfW3hTFyx 9OsfvTgiBcjzeR3K1+3NJ83TRHFBjRLyEe2pso0pE9IwJgs2TxI7MOwAzeUzIAwXty WDa5HD/pJ5TeVoxd/CI4F7QVGYuR4JjbpCQwj51MQu+JjueTJSNMiaZXn+MpwIZ+Cr QrLHXYXPWVyqshpibJdft3B9xoGAljV+wYKUlkqii6H1BvF8nO1bu5O8ksqY4OqXkg CPg+7XzVdUFfpJ84Rkyj8nL+fvOfNU4n76W82joiFS3DHAqrjqoYU1a3GsGKQuvUTy 8cYYdt+pEe7tg== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH v3 5/7] builddeb: remove redundant make for ARCH=um Date: Sat, 25 Jan 2020 13:12:33 +0900 Message-Id: <20200125041235.8856-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200125041235.8856-1-masahiroy@kernel.org> References: <20200125041235.8856-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 v3: None 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 a73e0d5377e9..731b5d0b2422 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 Sat Jan 25 04:12:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11351481 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 4BDD71395 for ; Sat, 25 Jan 2020 04:13:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 296E12072C for ; Sat, 25 Jan 2020 04:13:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579925598; bh=YfXD1Sx0T19EQ1Ql8URj2aC/uDdWl5QC2YWl1vlwczs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SNL1+4gcpVmA8rFLgzvFRiJERrKGmQrRlzyJMRgUl4ywQrzpVC3sR2t1NXLzF1xGp L5RBOGuv31pKkVe0SdsgafrUDAShFxCS8xkhdLKp1uZ3rJ0LvKd9HzYo/PGaKk13Tk 0k0ernRj4Wc/sRcmVf+XC+vwpDf2pSJXwJbnazqs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726911AbgAYENP (ORCPT ); Fri, 24 Jan 2020 23:13:15 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:28284 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729094AbgAYENO (ORCPT ); Fri, 24 Jan 2020 23:13:14 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 00P4CcjW032210; Sat, 25 Jan 2020 13:12:42 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 00P4CcjW032210 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579925562; bh=DG1+0oy8pe9VgxtUO7mvJEvd8z/S/+uUauFOl2NXC1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SkeIFRMVAwkb5V8gm44+bB/0gZ9C6GwjWTNPsaBQqjiUKZVGqcUyWkVZ3yqh+SEgE 7nbQYU+Obebin4iEdVtEPVoj91fHChkmv3Q+Hv+ouX/QU6+fxIIxOTBD1Q6VdVQ3qF ZmoOaxnVVvafcBxpz0Atg3Z4TZcwhasGzMhuoAos5dlXfxDlbDN9wCL/KDd/i2CQmU KHtXrWSJ0qvx9LG2tRr15llJg8OFJwmhLJZT7VaZ6d45jBmgB1cv9yp+vWI2KDmG64 4JdWTBxJLkiyu+eKEahob2siiu9WxBSSNhEdtJ9sfhsmqO+Ch5YvD8Uuhp8fjkhbR8 mrYCWs77jmB2Q== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH v3 6/7] builddeb: split kernel headers deployment out into a function Date: Sat, 25 Jan 2020 13:12:34 +0900 Message-Id: <20200125041235.8856-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200125041235.8856-1-masahiroy@kernel.org> References: <20200125041235.8856-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 v3: None Changes in v2: None scripts/package/builddeb | 76 ++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 731b5d0b2422..c9287e57d398 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -46,13 +46,49 @@ create_package() { dpkg-deb ${KDEB_COMPRESS:+-Z$KDEB_COMPRESS} --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 $(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 + 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 +113,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,37 +198,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 $(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 - 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 Sat Jan 25 04:12:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11351485 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 A3C4613A4 for ; Sat, 25 Jan 2020 04:13:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82C902072C for ; Sat, 25 Jan 2020 04:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579925605; bh=0uAvB3qvilhBILkCY8gcLkBdeaYaQeYKx7ThVwDAlKQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dhfXeg8cZYPg9ZoPKPRjosIKobYLXdhoV3b7xIMvfIWjZjRgWBSqvQdYSOuLgWBmN Q8U+kkc492fuNvWVUYKar5fayDK0K2IqSoDcswUE2De0jlLULaggYPlcMEIhvnLZUz 6cXtKrgYJVAbd5ut7f7RHS7rsC1egGM5cJh77ajk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725821AbgAYENW (ORCPT ); Fri, 24 Jan 2020 23:13:22 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:28258 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727590AbgAYENN (ORCPT ); Fri, 24 Jan 2020 23:13:13 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 00P4CcjX032210; Sat, 25 Jan 2020 13:12:42 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 00P4CcjX032210 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1579925563; bh=Ru4RO9PKJOZis0APDfihMYPE7fsaicItemyL6M7oN+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FS8EhjVCq9yLkCuXeVC2bJXm3D5HHa7RhlFTflpittdcMQkz7xBs+khyyBF9YMWo3 6KU9s4c1TXHJVxiVuUfOunxCHsTJK+5aJOXTQ9bE+PKbDW7vE7GM5Ot6a5/1plLDQM hhgq4ls2oiiRVKWXnoon0+sxgt1zhC/rjXKA8mhydeXVMTEDOnJvw+kQdPpZMvg2vh y5RhAUq878+HQ20XzKJG1+zyFFZgG30+h6DQdFSAI6TQqm1RI7Sj16eI6+lquxUqk8 6SDl8n198DZZLhgynVrq91Hj6QcVHTOTGkIhWmt5BfgDW8URUTzuFPMB1ded5ZRYDN BEZZVhSA6Rxig== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Riku Voipio , linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH v3 7/7] builddeb: split libc headers deployment out into a function Date: Sat, 25 Jan 2020 13:12:35 +0900 Message-Id: <20200125041235.8856-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200125041235.8856-1-masahiroy@kernel.org> References: <20200125041235.8856-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 v3: None 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 c9287e57d398..6df3c9f8b2da 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -84,12 +84,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 @@ -113,7 +126,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" @@ -163,16 +176,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. @@ -202,7 +205,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"