lkml.org 
[lkml]   [2019]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 1/4] kbuild: pkg: clean up package files/dirs from the top Makefile
On Wed, Aug 21, 2019 at 4:02 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> I am not a big fan of the $(objtree)/ hack for clean-files/clean-dirs.
>
> These are created in the top of $(objtree), so let's clean them up
> from the top Makefile.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---

Applied to linux-kbuild.


>
> Makefile | 6 ++++--
> scripts/Makefile | 2 +-
> scripts/package/Makefile | 9 ---------
> 3 files changed, 5 insertions(+), 12 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 5d202ad1481a..e88d4fcd5e87 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1389,12 +1389,14 @@ CLEAN_FILES += modules.builtin.modinfo
>
> # Directories & files removed with 'make mrproper'
> MRPROPER_DIRS += include/config include/generated \
> - arch/$(SRCARCH)/include/generated .tmp_objdiff
> + arch/$(SRCARCH)/include/generated .tmp_objdiff \
> + debian/ snap/ tar-install/
> MRPROPER_FILES += .config .config.old .version \
> Module.symvers \
> signing_key.pem signing_key.priv signing_key.x509 \
> x509.genkey extra_certificates signing_key.x509.keyid \
> - signing_key.x509.signer vmlinux-gdb.py
> + signing_key.x509.signer vmlinux-gdb.py \
> + *.spec
>
> # Directories & files removed with 'make distclean'
> DISTCLEAN_DIRS +=
> diff --git a/scripts/Makefile b/scripts/Makefile
> index 16bcb8087899..c42891e10ba3 100644
> --- a/scripts/Makefile
> +++ b/scripts/Makefile
> @@ -36,4 +36,4 @@ subdir-$(CONFIG_MODVERSIONS) += genksyms
> subdir-$(CONFIG_SECURITY_SELINUX) += selinux
>
> # Let clean descend into subdirs
> -subdir- += basic dtc gdb kconfig mod package
> +subdir- += basic dtc gdb kconfig mod
> diff --git a/scripts/package/Makefile b/scripts/package/Makefile
> index ca7f46b562a4..a2d8830f54be 100644
> --- a/scripts/package/Makefile
> +++ b/scripts/package/Makefile
> @@ -65,8 +65,6 @@ binrpm-pkg: FORCE
> +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
> $(UTS_MACHINE) -bb $(objtree)/binkernel.spec
>
> -clean-files += $(objtree)/*.spec
> -
> deb-pkg: FORCE
> $(MAKE) clean
> $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian
> @@ -82,8 +80,6 @@ bindeb-pkg: FORCE
> intdeb-pkg: FORCE
> +$(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
>
> -clean-dirs += $(objtree)/debian/
> -
> # snap-pkg
> # ---------------------------------------------------------------------------
> snap-pkg: FORCE
> @@ -98,17 +94,12 @@ snap-pkg: FORCE
> cd $(objtree)/snap && \
> snapcraft --target-arch=$(UTS_MACHINE)
>
> -clean-dirs += $(objtree)/snap/
> -
> # tarball targets
> # ---------------------------------------------------------------------------
> tar%pkg: FORCE
> $(MAKE) -f $(srctree)/Makefile
> +$(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@
>
> -clean-dirs += $(objtree)/tar-install/
> -
> -
> # perf-pkg - generate a source tarball with perf source
> # ---------------------------------------------------------------------------
>
> --
> 2.17.1
>


--
Best Regards
Masahiro Yamada

\
 
 \ /
  Last update: 2019-08-28 18:44    [W:0.077 / U:0.820 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site