Commit 46a63d4b authored by Masahiro Yamada's avatar Masahiro Yamada

kbuild: pkg: clean up package files/dirs from the top Makefile

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent cdfca821
...@@ -1386,12 +1386,14 @@ CLEAN_FILES += modules.builtin.modinfo ...@@ -1386,12 +1386,14 @@ CLEAN_FILES += modules.builtin.modinfo
# Directories & files removed with 'make mrproper' # Directories & files removed with 'make mrproper'
MRPROPER_DIRS += include/config include/generated \ 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 \ MRPROPER_FILES += .config .config.old .version \
Module.symvers \ Module.symvers \
signing_key.pem signing_key.priv signing_key.x509 \ signing_key.pem signing_key.priv signing_key.x509 \
x509.genkey extra_certificates signing_key.x509.keyid \ 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' # Directories & files removed with 'make distclean'
DISTCLEAN_DIRS += DISTCLEAN_DIRS +=
......
...@@ -36,4 +36,4 @@ subdir-$(CONFIG_MODVERSIONS) += genksyms ...@@ -36,4 +36,4 @@ subdir-$(CONFIG_MODVERSIONS) += genksyms
subdir-$(CONFIG_SECURITY_SELINUX) += selinux subdir-$(CONFIG_SECURITY_SELINUX) += selinux
# Let clean descend into subdirs # Let clean descend into subdirs
subdir- += basic dtc gdb kconfig mod package subdir- += basic dtc gdb kconfig mod
...@@ -65,8 +65,6 @@ binrpm-pkg: FORCE ...@@ -65,8 +65,6 @@ binrpm-pkg: FORCE
+rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
$(UTS_MACHINE) -bb $(objtree)/binkernel.spec $(UTS_MACHINE) -bb $(objtree)/binkernel.spec
clean-files += $(objtree)/*.spec
deb-pkg: FORCE deb-pkg: FORCE
$(MAKE) clean $(MAKE) clean
$(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian
...@@ -82,8 +80,6 @@ bindeb-pkg: FORCE ...@@ -82,8 +80,6 @@ bindeb-pkg: FORCE
intdeb-pkg: FORCE intdeb-pkg: FORCE
+$(CONFIG_SHELL) $(srctree)/scripts/package/builddeb +$(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
clean-dirs += $(objtree)/debian/
# snap-pkg # snap-pkg
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
snap-pkg: FORCE snap-pkg: FORCE
...@@ -98,17 +94,12 @@ snap-pkg: FORCE ...@@ -98,17 +94,12 @@ snap-pkg: FORCE
cd $(objtree)/snap && \ cd $(objtree)/snap && \
snapcraft --target-arch=$(UTS_MACHINE) snapcraft --target-arch=$(UTS_MACHINE)
clean-dirs += $(objtree)/snap/
# tarball targets # tarball targets
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
tar%pkg: FORCE tar%pkg: FORCE
$(MAKE) -f $(srctree)/Makefile $(MAKE) -f $(srctree)/Makefile
+$(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@ +$(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@
clean-dirs += $(objtree)/tar-install/
# perf-pkg - generate a source tarball with perf source # perf-pkg - generate a source tarball with perf source
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment