* [PATCH] kbuild: remove stale code for 'source' symlink in packaging scripts
@ 2023-10-01 14:03 Masahiro Yamada
2023-10-02 23:12 ` Nathan Chancellor
2023-10-04 19:44 ` Nicolas Schier
0 siblings, 2 replies; 3+ messages in thread
From: Masahiro Yamada @ 2023-10-01 14:03 UTC (permalink / raw)
To: linux-kbuild
Cc: linux-kernel, Masahiro Yamada, Nathan Chancellor,
Nick Desaulniers, Nicolas Schier
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>
---
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] kbuild: remove stale code for 'source' symlink in packaging scripts
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
2023-10-04 19:44 ` Nicolas Schier
1 sibling, 0 replies; 3+ messages in thread
From: Nathan Chancellor @ 2023-10-02 23:12 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-kbuild, linux-kernel, Nick Desaulniers, Nicolas Schier
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] kbuild: remove stale code for 'source' symlink in packaging scripts
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
@ 2023-10-04 19:44 ` Nicolas Schier
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Schier @ 2023-10-04 19:44 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-kbuild, linux-kernel, Nathan Chancellor, Nick Desaulniers
On Sun 01 Oct 2023 23:03:39 GMT, 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>
> ---
>
> 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
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-04 19:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2023-10-04 19:44 ` Nicolas Schier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®