From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0B90C678DB for ; Tue, 7 Mar 2023 17:40:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231874AbjCGRkm (ORCPT ); Tue, 7 Mar 2023 12:40:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231888AbjCGRk0 (ORCPT ); Tue, 7 Mar 2023 12:40:26 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECD7E9E648 for ; Tue, 7 Mar 2023 09:36:31 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 26F58CE1B30 for ; Tue, 7 Mar 2023 17:36:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E666C433D2; Tue, 7 Mar 2023 17:36:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678210588; bh=g8D+ToN4tt184BPdGY0WnN+YrqjOr/MmPeKRuYWyTvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V+6zCe+UtwvzAsWCPg+QfxbOLQEYkUggmIvJfsVyOsScEWKNH3W7KCUElRqqdDL3v +2mFsbY3d2f0wiAOdNWqL3RFR0vp2c8E0H554EHYJu/ohzssnhB9Vo1Nkf1vtfVLoz yX2grI/lvtKMmW+AzXx+0RiczOCddXIpi2SbnYdc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Bastian Germann , Masahiro Yamada , Sasha Levin Subject: [PATCH 6.2 0588/1001] builddeb: clean generated package content Date: Tue, 7 Mar 2023 17:56:00 +0100 Message-Id: <20230307170047.005713858@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170022.094103862@linuxfoundation.org> References: <20230307170022.094103862@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bastian Germann [ Upstream commit c9f9cf2560e40b62015c6c4a04be60f55ce5240e ] For each binary Debian package, a directory with the package name is created in the debian directory. Correct the generated file matches in the package's clean target, which were renamed without adjusting the target. Fixes: 1694e94e4f46 ("builddeb: match temporary directory name to the package name") Signed-off-by: Bastian Germann Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- scripts/package/mkdebian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 6cf383225b8b5..c3bbef7a6754f 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -236,7 +236,7 @@ binary-arch: build-arch KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile intdeb-pkg clean: - rm -rf debian/*tmp debian/files + rm -rf debian/files debian/linux-* \$(MAKE) clean binary: binary-arch -- 2.39.2