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 3BA39C6FA99 for ; Fri, 10 Mar 2023 15:31:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234267AbjCJPbg (ORCPT ); Fri, 10 Mar 2023 10:31:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234276AbjCJPbP (ORCPT ); Fri, 10 Mar 2023 10:31:15 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67F6413F547 for ; Fri, 10 Mar 2023 07:19:21 -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 ams.source.kernel.org (Postfix) with ESMTPS id 93218B822EF for ; Fri, 10 Mar 2023 14:57:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7299C433D2; Fri, 10 Mar 2023 14:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678460238; bh=MDrfGfSgoBEGqplHjaBJsPg8MbP5AfXhL9GYLigsNlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uy2x5QhCQzLMFm1kJqADXpauS4GjhQRD8nATKdn53J3j6RdRTbS8QD68lZSN+CpDj 9qrofC0QbZHlhbap+X2ESGfQ4RgxazE6nqV/NXVzrwfnXRBzG7TiExHEB7ofK6FRTR Qki5dou8oFDemg0ivm4ZyEbL2mhnrBTFg/CM1ues= 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 5.10 268/529] builddeb: clean generated package content Date: Fri, 10 Mar 2023 14:36:51 +0100 Message-Id: <20230310133817.388329224@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310133804.978589368@linuxfoundation.org> References: <20230310133804.978589368@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 60a2a63a5e900..32d528a367868 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