From patchwork Sat Dec 30 13:51:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 184011 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp3092164dyb; Sat, 30 Dec 2023 05:52:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHjjqLqA3atJJWnJorZQErrXxGfjm5TPHMTvBQf+QUf/mT8Xw5cs5n4pAlhQ9wDfi4TA2F X-Received: by 2002:a05:6a21:6d96:b0:196:3126:bc59 with SMTP id wl22-20020a056a216d9600b001963126bc59mr6364714pzb.15.1703944374312; Sat, 30 Dec 2023 05:52:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703944374; cv=none; d=google.com; s=arc-20160816; b=NYEyV+E8zqT5OxYreU4sT5gXsCdteLlQEnzwjOB5fV7p0Flq5wj85l2GAaPE7Ob5Ne jNuNBPnfNcXtESFwfyWvHxIM6NMS49+evvVgSHopE5yaODMrbEKRoUcC21XHXTI7Or0j Sj/ycE2OoVkcYzjrLjATHWpYk+bibmc1QlygVfHr6ofGEOEQFbhmT67aWYrgO+wJVSx9 tar7IJGF2zyXzD2uXGWut7tofa7mWtb8pW0ATe2shKi76ukyTDvurcSL5LihTVmq+D1M 4jg1Oqx9DRWhn0tmisnKtaH1llTFuhIO/cyFLDgia4aV4lmqoF2B3vKLe2v9dOw1rzMA o3MQ== 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:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=owjFKRcQ9tOSshK2nO0jqqEaEQ/XCqjrdIyQ4CIXGUE=; fh=5gYN4msaJmwnN8mGpibv8VZnTy0MtvGQcf5D09XpoaQ=; b=j9rPfJCsRRbGJ11c0Z79pPmtPO/Lz+Mk0Yl5EcQmGC0ek0oXo7UJ6fp5OH/9T66IpV SL0yVKq2JnQVs2WGL8Dt9Zd0CgW0JfhuSNM/h+RDZ4FaHuy3nNyQ/pPAkkiVj26qUsen 17BtWt6WCvsk0crzTj22HelWM+4XLyxDB3XWWtX+LfuB8MbEA4Duuo4uvESyX5TlWwtQ xo+IlJ4McS+NaUle7eD1TkByLCDICfi/jL+Ey+UETK3ZTv1erVgKCSioBuRRq7ePf8Y2 y1npnf4LfOgQs8AlRu6Qd1rrf6/N9/ZG00ek6VNz5nEUrl6cPRqgv4df7L4SOWXZ/DXk JVSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VgkfbaYC; spf=pass (google.com: domain of linux-kernel+bounces-13440-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13440-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id y66-20020a633245000000b005c66404de05si16136370pgy.413.2023.12.30.05.52.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Dec 2023 05:52:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13440-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VgkfbaYC; spf=pass (google.com: domain of linux-kernel+bounces-13440-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13440-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 0256F2822FD for ; Sat, 30 Dec 2023 13:52:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3E5F2C148; Sat, 30 Dec 2023 13:52:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VgkfbaYC" 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 A40F0B661; Sat, 30 Dec 2023 13:52:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB020C433C8; Sat, 30 Dec 2023 13:52:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703944328; bh=h/bVRvqBDpxa6Xn0ybqaJ9bxYvhDa1MDNIDx4fYYn6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VgkfbaYCDnHDqECG5hJVZR4EQlngt3vDZwFAgOzAFgdXSBoJ7FXVGq7VOueQuzxsS hHwa1t8KnFh4E8L5rr3MbbignJ7mDEOXoiTR+DXXqLlfemzFZH+S4PhLjRW3VnYPDk drVHFhSJcJ+E51onp3H6vscUszm3mH33sAR4eu3Bzkm2bSq0EhdWkrkGruZAITfeoD 3+dJPOhpQpfo5Dvbul59uZCTRhsL2nKuExlfb/YIxeUUtr2ais4vJRqBHClToyoY7K pWYhp24PFAfwIfpLQsdHfiMLV5cndhZ14/E409qw7CADQ2RFYaHQNSamG1yrtZtD2U FwCxOQ9coOuJg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH 3/5] kbuild: deb-pkg: use debian/ for tmpdir Date: Sat, 30 Dec 2023 22:51:58 +0900 Message-Id: <20231230135200.1058873-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231230135200.1058873-1-masahiroy@kernel.org> References: <20231230135200.1058873-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786715176606216745 X-GMAIL-MSGID: 1786715176606216745 Use debian/ for tmpdir, which is the default of debhelper. This simplifies the code. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/package/builddeb | 41 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 842ee4b40528..bf96a3c24608 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -25,9 +25,7 @@ if_enabled_echo() { } create_package() { - local pname="$1" pdir="$2" - - export DH_OPTIONS="-p${pname} -P${pdir}" + export DH_OPTIONS="-p${1}" dh_installdocs dh_installchangelogs @@ -39,8 +37,8 @@ create_package() { } install_linux_image () { - pdir=$1 - pname=$2 + pname=$1 + pdir=debian/$1 rm -rf ${pdir} @@ -109,7 +107,7 @@ install_linux_image () { } install_linux_image_dbg () { - pdir=$1 + pdir=debian/$1 rm -rf ${pdir} @@ -139,8 +137,8 @@ install_linux_image_dbg () { } install_kernel_headers () { - pdir=$1 - version=$2 + pdir=debian/$1 + version=${1#linux-headers-} rm -rf $pdir @@ -151,7 +149,7 @@ install_kernel_headers () { } install_libc_headers () { - pdir=$1 + pdir=debian/$1 rm -rf $pdir @@ -171,28 +169,13 @@ for package in ${packages_enabled} do case ${package} in *-dbg) - install_linux_image_dbg debian/linux-image-dbg;; + install_linux_image_dbg "${package}";; linux-image-*|user-mode-linux-*) - install_linux_image debian/linux-image ${package};; + install_linux_image "${package}";; linux-libc-dev) - install_libc_headers debian/linux-libc-dev;; + install_libc_headers "${package}";; linux-headers-*) - install_kernel_headers debian/linux-headers ${package#linux-headers-};; + install_kernel_headers "${package}";; esac + create_package "${package}" done - -for package in ${packages_enabled} -do - case ${package} in - *-dbg) - create_package ${package} debian/linux-image-dbg;; - linux-image-*|user-mode-linux-*) - create_package ${package} debian/linux-image;; - linux-libc-dev) - create_package ${package} debian/linux-libc-dev;; - linux-headers-*) - create_package ${package} debian/linux-headers;; - esac -done - -exit 0