From patchwork Sun Oct 1 14:03:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 147102 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp890643vqb; Sun, 1 Oct 2023 07:08:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF2X7NUFvX5QveYxfx+1bLtjhGdcOHNc1W8Z1680v/GYcj+NYiHLjIE01yB6cWcJVNI2ZDt X-Received: by 2002:a05:6808:497:b0:3a3:95f9:c99b with SMTP id z23-20020a056808049700b003a395f9c99bmr10004263oid.35.1696169293993; Sun, 01 Oct 2023 07:08:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696169293; cv=none; d=google.com; s=arc-20160816; b=aS+xzl5DrWW9QwIMS0ZC637MwDf5nkQx3mQSn5A6GrqwpK/sllS1nsi2EoykmByz4A xeRZGRd+DAxEOsI6NfI+uhPBcXsNkmCCb6NgkvR56O/Now8alTRcWrVN+d2mVJ/0wrsp fh5THM4ajEy9bSHW61luLCdrKkmLbXzBk8rKWbHoEwEhjZ8JoLK7oNbj6N8ajNrkFC3w 6KbJXadL9YK/zmfHkHo0UoHdD97ovYHVgCM3/ClufGQHyPg8HpWjyDWCZqKjP0/qUadE hI2sAar3P+3VF395jQUK1sH9eWc2ANqUQF1pT1DiilgCLZpm6ZtfbUYNigBVxIupdo5q Mmrg== 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=m+2RzWBPj2WHoPHeJrYWaUuU0VyGWov6rVfiHfg1lf8=; fh=wKrPioF+0wPaktGqmf0aQvlk8PY4Pc32rTAsBSAiP8I=; b=o+SqvOdKEzXDATGVQIS0nI2xfvkjJxDrL7RtDCMxKugKnTzsfrCvjRqS+RAIxUHwMK 5UN+g9ty1h9UsavfkFTz1pjFpo/epynezG32dfjpeqMyHAtpUmAV6kU6PQqGVB4zLOAg PwS8HJTRre3sS5KLjBibUZLyq0Mrk4+5qTzi+xHrlSfwkNHFK9d4hR3mx8bwFTzQiA+H V1vxwysmqKiMWVRDxcwRbwLfBD7NBsKjjcXsoB+GdRmBiZwwL2jvmksTC4vb4TbaUP22 rSXT/OGFqXah3BThvyDCrK6+LO/78MTTXwvIOiBKFSx3oGxzFnDcKrXLygxZY35PCPeM Yb6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=diyT5n3E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id lr3-20020a17090b4b8300b0027736d8d371si6242611pjb.26.2023.10.01.07.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 07:08:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=diyT5n3E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 085FC8076646; Sun, 1 Oct 2023 07:08:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235026AbjJAODt (ORCPT + 18 others); Sun, 1 Oct 2023 10:03:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231216AbjJAODs (ORCPT ); Sun, 1 Oct 2023 10:03:48 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 619E29F; Sun, 1 Oct 2023 07:03:46 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67E2FC433C7; Sun, 1 Oct 2023 14:03:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696169025; bh=3LIpQH6MN3tTgISuUJS+MrG+dyX1WcYUgjAL90yBmcw=; h=From:To:Cc:Subject:Date:From; b=diyT5n3Erw4CBxvvAhE+uw79QY8yXl0wxr2XxAzsWWWiMipbv6ppyuz5whMdCsAzZ P4Nq21lPh8xZiSKO6NxWsc4gugxca7mbR0ZZINH1tOYgfRyWIHTYTtSjHshhDVn+38 8ooR2zg12DbTUWM1+B0jyDxB1inkTxlJsV+1uybnHNOKtIRDn2nhrSLJjwhJ7T51a/ vC+QpSxSj3PEXq/JcT13CtDF2ylIoQZ/z4LorY5tw+ohaUgDac48L6WhDDA3gMlXGk ltnt3GNKP0aZRONOw6c7fDJaybnwWVOzcogt7DAk5o6Flko8fYBqLObBc6fTXNecRt Z0GkUNbHqQGUA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH] kbuild: remove stale code for 'source' symlink in packaging scripts Date: Sun, 1 Oct 2023 23:03:39 +0900 Message-Id: <20231001140339.1707548-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Sun, 01 Oct 2023 07:08:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778562413844104017 X-GMAIL-MSGID: 1778562413844104017 Since commit d8131c2965d5 ("kbuild: remove $(MODLIB)/source symlink"), modules_install does not create the 'source' symlink. Remove the stale code from builddeb and kernel.spec. Signed-off-by: Masahiro Yamada Reviewed-by: Nathan Chancellor Reviewed-by: Nicolas Schier --- scripts/package/builddeb | 1 - scripts/package/kernel.spec | 3 --- 2 files changed, 4 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index bf3f8561aa68..d7dd0d04c70c 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -64,7 +64,6 @@ install_linux_image () { ${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build" - rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source" # Install the kernel if [ "${ARCH}" = um ] ; then diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec index ac3f2ee6d7a0..3eee0143e0c5 100644 --- a/scripts/package/kernel.spec +++ b/scripts/package/kernel.spec @@ -68,7 +68,6 @@ cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEA cp System.map %{buildroot}/boot/System.map-%{KERNELRELEASE} cp .config %{buildroot}/boot/config-%{KERNELRELEASE} ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/build -ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/source %if %{with_devel} %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}' %endif @@ -101,7 +100,6 @@ fi %defattr (-, root, root) /lib/modules/%{KERNELRELEASE} %exclude /lib/modules/%{KERNELRELEASE}/build -%exclude /lib/modules/%{KERNELRELEASE}/source /boot/* %files headers @@ -113,5 +111,4 @@ fi %defattr (-, root, root) /usr/src/kernels/%{KERNELRELEASE} /lib/modules/%{KERNELRELEASE}/build -/lib/modules/%{KERNELRELEASE}/source %endif