From patchwork Tue Nov 28 12:56:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 170759 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3894445vqx; Tue, 28 Nov 2023 04:57:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IGf7mAryLhb3f25QWNCpdAUMBLAKXgtXkuwSIppFKvwR9ngsLSl/cW9RyYc3Pons4IDfUr5 X-Received: by 2002:a05:6808:148f:b0:3b8:5c93:e08b with SMTP id e15-20020a056808148f00b003b85c93e08bmr12522919oiw.19.1701176222965; Tue, 28 Nov 2023 04:57:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701176222; cv=none; d=google.com; s=arc-20160816; b=lopMOeIbXaE21yER2fupXo1KYTN3AgeXlVt5q4D8aUJrKmOG0/NYhgj0fTvbDMp0oj n6XlDQzARcN7WcINUvC3nlLr0C8LIzOSbq5rm9UNIrIxAz9zPuYpBRTWzsedJNLafEme m+gWkrBBhJoY+nDW0zwSyY9QTSZs/O1nKl0VhNp0EnlGrscW8oJTIi2fIwDeE+tWAWSs ExaqFKvNthUha/lqC8idxZsKGoOd6UTWaGQvf7yJnQsNrALlsnMDsptlV2sI+tKQ+472 g7lRCxUaShUX2A34CLIYIQXH9zAK2ooI/cVaskqE6NTVMvFU27CAfh/hjuqK6US4YNIR Oedg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=fYX9vMVR2IbPyVFYehIt62SF5pTqMpLR1Zl+FRCitR8=; fh=YRXGQk/HFQa4m0Wt8I2zBZV8pwB8/PsOmZZYsB3Rim8=; b=nHmEZLi2qe7diERSwWFJZ2PNDTHM6ITMBvAhGyu+LfvjeRNLZMtxGsKZymAPgWPUTb 3qcyjdOGfzte6+k9x3tlETIspYiBpAttjtQJ0LmzUhQB6fP7/4U8HnQ+44U5lFn0D4zH OJQt4vRqOdsIurmO69kN9b9kN+cmLHBuyuYwW7KIPjEFbtC+owuf7MgsEjvNi+5x1nlC WrpyWcSVkqP4WowDsLGPUa4u2JUcYXHzpbi4o4bWmbdRC2jb2dTbaPOIHZ1SPCDpsK8E Ke+LpZoERf00UxtobuJ0SrDY1Lexh1qYJD2HN5r0ckON5qdLgdAcDIYjZqwXfTj/C/41 Zp4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=suRWt3rk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id b16-20020a6567d0000000b005bd18d53c2bsi11577397pgs.885.2023.11.28.04.57.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 04:57:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=suRWt3rk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 7860A80560DD; Tue, 28 Nov 2023 04:56:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344468AbjK1M4u (ORCPT + 99 others); Tue, 28 Nov 2023 07:56:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234660AbjK1M4t (ORCPT ); Tue, 28 Nov 2023 07:56:49 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B227D51 for ; Tue, 28 Nov 2023 04:56:56 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA23FC433C8; Tue, 28 Nov 2023 12:56:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701176216; bh=hKHaJ8sHOi5d/nae+CksoGF2YrFTwPKeiImXwy1CbcA=; h=From:To:Cc:Subject:Date:From; b=suRWt3rkU4bFv+rCEf4KZ8VphF9jns7IdIZjFj4SWTxc3ruyjfGa20ZZQbMdpt1rv 6SHkme8ylhuhhz9/uDA2lTLToaUTczmO1MHNDxxpzDS2rHbn0zVN4KVHTLA/X74SBh q/IXZ1ts897FtyqfWHRdvZFgiGZUaUQiawvjFIRVB3f7UqEbgfK+b6Ce6pxGPL2L91 0UBU85XL/GV/+J1vEqtiA0FaMMQkm73kMKdWZ5dSAh9JFmhdvrlTrAcjYtP0qHw2wr RwjKfr8omqpG9koNe73qHtzIWvE0Hb/pWk0129nNQkM6f+CB1D0rS9Podqk9TOcngD SeuUgYH3PbC/g== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Guillem Jover , Ben Hutchings , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: deb-pkg: remove the fakeroot builds support Date: Tue, 28 Nov 2023 21:56:42 +0900 Message-Id: <20231128125642.24931-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 28 Nov 2023 04:56:59 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783812559357728357 X-GMAIL-MSGID: 1783812559357728357 In 2017, the dpkg suite added the rootless builds support with the following commits: - 2436807c87b0 ("dpkg-deb: Add support for rootless builds") - fca1bfe84068 ("dpkg-buildpackage: Add support for rootless builds") It is supported by the default dpkg on Debian 10 and Ubuntu 20.04. Remove the old method. Signed-off-by: Masahiro Yamada --- scripts/Makefile.package | 4 +--- scripts/package/builddeb | 8 +------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 0c3adc48dfe8..a81dfb1f5181 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -109,8 +109,6 @@ debian-orig: linux.tar$(debian-orig-suffix) debian cp $< ../$(orig-name); \ fi -KBUILD_PKG_ROOTCMD ?= 'fakeroot -u' - PHONY += deb-pkg srcdeb-pkg bindeb-pkg deb-pkg: private build-type := source,binary @@ -125,7 +123,7 @@ deb-pkg srcdeb-pkg bindeb-pkg: $(if $(findstring source, $(build-type)), \ --unsigned-source --compression=$(KDEB_SOURCE_COMPRESS)) \ $(if $(findstring binary, $(build-type)), \ - -R'$(MAKE) -f debian/rules' -j1 -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \ + -R'$(MAKE) -f debian/rules' -j1 -a$$(cat debian/arch), \ --no-check-builddeps) \ $(DPKG_FLAGS)) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index d7dd0d04c70c..2fe51e6919da 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -36,19 +36,13 @@ create_package() { sh -c "cd '$pdir'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' \ | xargs -r0 md5sum > DEBIAN/md5sums" - # Fix ownership and permissions - if [ "$DEB_RULES_REQUIRES_ROOT" = "no" ]; then - dpkg_deb_opts="--root-owner-group" - else - chown -R root:root "$pdir" - fi # a+rX in case we are in a restrictive umask environment like 0077 # ug-s in case we build in a setuid/setgid directory chmod -R go-w,a+rX,ug-s "$pdir" # Create the package dpkg-gencontrol -p$pname -P"$pdir" - dpkg-deb $dpkg_deb_opts ${KDEB_COMPRESS:+-Z$KDEB_COMPRESS} --build "$pdir" .. + dpkg-deb --root-owner-group ${KDEB_COMPRESS:+-Z$KDEB_COMPRESS} --build "$pdir" .. } install_linux_image () {