From: Nathan Chancellor <nathan@kernel.org>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
Nick Desaulniers <ndesaulniers@google.com>,
Nicolas Schier <nicolas@fjasle.eu>
Subject: Re: [PATCH] kbuild: remove stale code for 'source' symlink in packaging scripts
Date: Mon, 2 Oct 2023 16:12:56 -0700 [thread overview]
Message-ID: <20231002231256.GA1269812@dev-arch.thelio-3990X> (raw)
In-Reply-To: <20231001140339.1707548-1-masahiroy@kernel.org>
On Sun, Oct 01, 2023 at 11:03:39PM +0900, Masahiro Yamada wrote:
> 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 <masahiroy@kernel.org>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> ---
>
> 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
> --
> 2.39.2
>
next prev parent reply other threads:[~2023-10-02 23:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-01 14:03 [PATCH] kbuild: remove stale code for 'source' symlink in packaging scripts Masahiro Yamada
2023-10-02 23:12 ` Nathan Chancellor [this message]
2023-10-04 19:44 ` Nicolas Schier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231002231256.GA1269812@dev-arch.thelio-3990X \
--to=nathan@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.