Merge tag 'ata-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[tomoyo/tomoyo-test1.git] / scripts / Makefile.package

diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index 525a282..61f72eb 100644 (file)
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -2,37 +2,15 @@
 # Makefile for the different targets used to generate full packages of a kernel
 
 include $(srctree)/scripts/Kbuild.include
 # Makefile for the different targets used to generate full packages of a kernel
 
 include $(srctree)/scripts/Kbuild.include

+include $(srctree)/scripts/Makefile.lib

 
 

-# RPM target
-# ---------------------------------------------------------------------------
-# The rpm target generates two rpm files:
-# /usr/src/packages/SRPMS/kernel-2.6.7rc2-1.src.rpm
-# /usr/src/packages/RPMS/i386/kernel-2.6.7rc2-1.<arch>.rpm
-# The src.rpm files includes all source for the kernel being built
-# The <arch>.rpm includes kernel configuration, modules etc.
-#
-# Process to create the rpm files
-# a) clean the kernel
-# b) Generate .spec file
-# c) Build a tar ball, using symlink to make kernel version
-#    first entry in the path
-# d) and pack the result to a tar.gz file
-# e) generate the rpm files, based on kernel.spec
-# - Use /. to avoid tar packing just the symlink
-
-# Note that the rpm-pkg target cannot be used with KBUILD_OUTPUT,
-# but the binrpm-pkg target can; for some reason O= gets ignored.
-
-# Remove hyphens since they have special meaning in RPM filenames

 KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
 KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))

-KDEB_SOURCENAME ?= linux-upstream

 KBUILD_PKG_ROOTCMD ?="fakeroot -u"
 KBUILD_PKG_ROOTCMD ?="fakeroot -u"

-export KDEB_SOURCENAME

 # Include only those top-level files that are needed by make, plus the GPL copy
 TAR_CONTENT := Documentation LICENSES arch block certs crypto drivers fs \
                include init io_uring ipc kernel lib mm net rust \
                samples scripts security sound tools usr virt \
 # Include only those top-level files that are needed by make, plus the GPL copy
 TAR_CONTENT := Documentation LICENSES arch block certs crypto drivers fs \
                include init io_uring ipc kernel lib mm net rust \
                samples scripts security sound tools usr virt \

-               .config .scmversion Makefile \
+               .config Makefile \

                Kbuild Kconfig COPYING $(wildcard localversion*)
 MKSPEC     := $(srctree)/scripts/package/mkspec
 
                Kbuild Kconfig COPYING $(wildcard localversion*)
 MKSPEC     := $(srctree)/scripts/package/mkspec
 


@@ -42,35 +20,69 @@ if test "$(objtree)" != "$(srctree)"; then \
        echo >&2; \
        echo >&2 "  ERROR:"; \
        echo >&2 "  Building source tarball is not possible outside the"; \
        echo >&2; \
        echo >&2 "  ERROR:"; \
        echo >&2 "  Building source tarball is not possible outside the"; \

-       echo >&2 "  kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \
-       echo >&2 "  binrpm-pkg or bindeb-pkg target instead."; \
+       echo >&2 "  kernel source tree. Don't set KBUILD_OUTPUT"; \

        echo >&2; \
        false; \
 fi ; \
        echo >&2; \
        false; \
 fi ; \

-$(srctree)/scripts/setlocalversion --save-scmversion; \

 tar -I $(KGZIP) -c $(RCS_TAR_IGNORE) -f $(2).tar.gz \
 tar -I $(KGZIP) -c $(RCS_TAR_IGNORE) -f $(2).tar.gz \

-       --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3); \
-rm -f $(objtree)/.scmversion
+       --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3)
+
+# tarball compression
+# ---------------------------------------------------------------------------
+
+%.tar.gz: %.tar
+       $(call cmd,gzip)
+
+%.tar.bz2: %.tar
+       $(call cmd,bzip2)
+
+%.tar.xz: %.tar
+       $(call cmd,xzmisc)
+
+%.tar.zst: %.tar
+       $(call cmd,zstd)
+
+# Git
+# ---------------------------------------------------------------------------
+
+filechk_HEAD = git -C $(srctree) rev-parse --verify HEAD 2>/dev/null
+
+.tmp_HEAD: check-git FORCE
+       $(call filechk,HEAD)
+
+PHONY += check-git
+check-git:
+       @if ! $(srctree)/scripts/check-git; then \
+               echo >&2 "error: creating source package requires git repository"; \
+               false; \
+       fi
+
+# Linux source tarball
+# ---------------------------------------------------------------------------
+
+quiet_cmd_archive_linux = ARCHIVE $@
+      cmd_archive_linux = \
+       git -C $(srctree) archive --output=$$(realpath $@) --prefix=$(basename $@)/ $$(cat $<)
+
+targets += linux.tar
+linux.tar: .tmp_HEAD FORCE
+       $(call if_changed,archive_linux)

 
 # rpm-pkg
 # ---------------------------------------------------------------------------
 PHONY += rpm-pkg
 
 # rpm-pkg
 # ---------------------------------------------------------------------------
 PHONY += rpm-pkg

-rpm-pkg:
-       $(MAKE) clean
-       $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
-       $(call cmd,src_tar,$(KERNELPATH),kernel.spec)
-       +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -ta $(KERNELPATH).tar.gz \
+rpm-pkg: srpm = $(shell rpmspec --srpm --query --queryformat='%{name}-%{VERSION}-%{RELEASE}.src.rpm' kernel.spec)
+rpm-pkg: srcrpm-pkg
+       +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -rb $(srpm) \

        --define='_smp_mflags %{nil}'
 
 # srcrpm-pkg
 # ---------------------------------------------------------------------------
 PHONY += srcrpm-pkg
        --define='_smp_mflags %{nil}'
 
 # srcrpm-pkg
 # ---------------------------------------------------------------------------
 PHONY += srcrpm-pkg

-srcrpm-pkg:
-       $(MAKE) clean
+srcrpm-pkg: linux.tar.gz

        $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
        $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec

-       $(call cmd,src_tar,$(KERNELPATH),kernel.spec)
-       +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -ts $(KERNELPATH).tar.gz \
-       --define='_smp_mflags %{nil}' --define='_srcrpmdir $(srctree)'
+       +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -bs kernel.spec \
+       --define='_smp_mflags %{nil}' --define='_sourcedir rpmbuild/SOURCES' --define='_srcrpmdir .'

 
 # binrpm-pkg
 # ---------------------------------------------------------------------------
 
 # binrpm-pkg
 # ---------------------------------------------------------------------------


@@ -81,18 +93,30 @@ binrpm-pkg:
        +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
                $(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec
 
        +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
                $(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec
 

+quiet_cmd_debianize = GEN     $@
+      cmd_debianize = $(srctree)/scripts/package/mkdebian
+
+debian: FORCE
+       $(call cmd,debianize)
+
+PHONY += debian-orig
+debian-orig: private source = $(shell dpkg-parsechangelog -S Source)
+debian-orig: private version = $(shell dpkg-parsechangelog -S Version | sed 's/-[^-]*$$//')
+debian-orig: private orig-name = $(source)_$(version).orig.tar.gz
+debian-orig: linux.tar.gz debian
+       $(Q)if [ "$(df  --output=target .. 2>/dev/null)" = "$(df --output=target $< 2>/dev/null)" ]; then \
+               ln -f $< ../$(orig-name); \
+       else \
+               cp $< ../$(orig-name); \
+       fi
+

 PHONY += deb-pkg
 PHONY += deb-pkg

-deb-pkg:
-       $(MAKE) clean
-       $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian
-       $(call cmd,src_tar,$(KDEB_SOURCENAME))
-       origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\
-               mv $(KDEB_SOURCENAME).tar.gz ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz
-       +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -i.git -us -uc
+deb-pkg: debian-orig
+       +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \
+               --build=source,binary -nc -us -uc

 
 PHONY += bindeb-pkg
 
 PHONY += bindeb-pkg

-bindeb-pkg:
-       $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian
+bindeb-pkg: debian

        +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -b -nc -uc
 
 PHONY += intdeb-pkg
        +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -b -nc -uc
 
 PHONY += intdeb-pkg


@@ -114,44 +138,65 @@ snap-pkg:
        cd $(objtree)/snap && \
        snapcraft --target-arch=$(UTS_MACHINE)
 
        cd $(objtree)/snap && \
        snapcraft --target-arch=$(UTS_MACHINE)
 

-# tarball targets
+# dir-pkg tar*-pkg - tarball targets

 # ---------------------------------------------------------------------------
 # ---------------------------------------------------------------------------

-tar-pkgs := dir-pkg tar-pkg targz-pkg tarbz2-pkg tarxz-pkg tarzst-pkg
-PHONY += $(tar-pkgs)
-$(tar-pkgs):
-       $(MAKE) -f $(srctree)/Makefile
-       +$(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@

 
 

-# perf-pkg - generate a source tarball with perf source
+tar-install: FORCE
+       $(Q)$(MAKE) -f $(srctree)/Makefile
+       +$(Q)$(srctree)/scripts/package/buildtar $@
+
+quiet_cmd_tar = TAR     $@
+      cmd_tar = cd $<; tar cf ../$@ --owner=root --group=root --sort=name *
+
+linux-$(KERNELRELEASE)-$(ARCH).tar: tar-install
+       $(call cmd,tar)
+
+PHONY += dir-pkg
+dir-pkg: tar-install
+       @echo "Kernel tree successfully created in $<"
+
+PHONY += tar-pkg
+tar-pkg: linux-$(KERNELRELEASE)-$(ARCH).tar
+       @:
+
+tar%-pkg: linux-$(KERNELRELEASE)-$(ARCH).tar.% FORCE
+       @:
+
+# perf-tar*-src-pkg - generate a source tarball with perf source

 # ---------------------------------------------------------------------------
 
 # ---------------------------------------------------------------------------
 

-perf-tar=perf-$(KERNELVERSION)
-
-quiet_cmd_perf_tar = TAR
-      cmd_perf_tar = \
-git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/         \
-       HEAD^{tree} $$(cd $(srctree);                               \
-                      echo $$(cat tools/perf/MANIFEST)) \
-       -o $(perf-tar).tar;                                         \
-mkdir -p $(perf-tar);                                               \
-git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD;    \
-(cd $(srctree)/tools/perf;                                          \
-util/PERF-VERSION-GEN $(CURDIR)/$(perf-tar)/);              \
-tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \
-rm -r $(perf-tar);                                                  \
-$(if $(findstring tar-src,$@),,                                     \
-$(if $(findstring bz2,$@),$(KBZIP2),                                 \
-$(if $(findstring gz,$@),$(KGZIP),                                  \
-$(if $(findstring xz,$@),$(XZ),                                     \
-$(if $(findstring zst,$@),$(ZSTD),                                  \
-$(error unknown target $@)))))                                      \
-       -f -9 $(perf-tar).tar)
-
-perf-tar-pkgs := perf-tar-src-pkg perf-targz-src-pkg perf-tarbz2-src-pkg \
-                perf-tarxz-src-pkg perf-tarzst-src-pkg
-PHONY += $(perf-tar-pkgs)
-$(perf-tar-pkgs):
-       $(call cmd,perf_tar)
+.tmp_perf:
+       $(Q)mkdir .tmp_perf
+
+.tmp_perf/HEAD: .tmp_HEAD | .tmp_perf
+       $(call cmd,copy)
+
+quiet_cmd_perf_version_file = GEN     $@
+      cmd_perf_version_file = cd $(srctree)/tools/perf; util/PERF-VERSION-GEN $(dir $(abspath $@))
+
+# PERF-VERSION-FILE and .tmp_HEAD are independent, but this avoids updating the
+# timestamp of PERF-VERSION-FILE.
+# The best is to fix tools/perf/util/PERF-VERSION-GEN.
+.tmp_perf/PERF-VERSION-FILE: .tmp_HEAD $(srctree)/tools/perf/util/PERF-VERSION-GEN | .tmp_perf
+       $(call cmd,perf_version_file)
+
+quiet_cmd_archive_perf = ARCHIVE $@
+      cmd_archive_perf = \
+       git -C $(srctree) archive --output=$$(realpath $@) --prefix=$(basename $@)/ \
+       --add-file=$$(realpath $(word 2, $^)) \
+       --add-file=$$(realpath $(word 3, $^)) \
+       $$(cat $(word 2, $^))^{tree} $$(cat $<)
+
+targets += perf-$(KERNELVERSION).tar
+perf-$(KERNELVERSION).tar: tools/perf/MANIFEST .tmp_perf/HEAD .tmp_perf/PERF-VERSION-FILE FORCE
+       $(call if_changed,archive_perf)
+
+PHONY += perf-tar-src-pkg
+perf-tar-src-pkg: perf-$(KERNELVERSION).tar
+       @:
+
+perf-tar%-src-pkg: perf-$(KERNELVERSION).tar.% FORCE
+       @:

 
 # Help text displayed when executing 'make help'
 # ---------------------------------------------------------------------------
 
 # Help text displayed when executing 'make help'
 # ---------------------------------------------------------------------------


@@ -170,10 +215,22 @@ help:
        @echo '  tarbz2-pkg          - Build the kernel as a bzip2 compressed tarball'
        @echo '  tarxz-pkg           - Build the kernel as a xz compressed tarball'
        @echo '  tarzst-pkg          - Build the kernel as a zstd compressed tarball'
        @echo '  tarbz2-pkg          - Build the kernel as a bzip2 compressed tarball'
        @echo '  tarxz-pkg           - Build the kernel as a xz compressed tarball'
        @echo '  tarzst-pkg          - Build the kernel as a zstd compressed tarball'

-       @echo '  perf-tar-src-pkg    - Build $(perf-tar).tar source tarball'
-       @echo '  perf-targz-src-pkg  - Build $(perf-tar).tar.gz source tarball'
-       @echo '  perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball'
-       @echo '  perf-tarxz-src-pkg  - Build $(perf-tar).tar.xz source tarball'
-       @echo '  perf-tarzst-src-pkg - Build $(perf-tar).tar.zst source tarball'
+       @echo '  perf-tar-src-pkg    - Build the perf source tarball with no compression'
+       @echo '  perf-targz-src-pkg  - Build the perf source tarball with gzip compression'
+       @echo '  perf-tarbz2-src-pkg - Build the perf source tarball with bz2 compression'
+       @echo '  perf-tarxz-src-pkg  - Build the perf source tarball with xz compression'
+       @echo '  perf-tarzst-src-pkg - Build the perf source tarball with zst compression'
+
+PHONY += FORCE
+FORCE:
+
+# Read all saved command lines and dependencies for the $(targets) we
+# may be building above, using $(if_changed{,_dep}). As an
+# optimization, we don't need to read them if the target does not
+# exist, we will rebuild anyway in that case.
+
+existing-targets := $(wildcard $(sort $(targets)))
+
+-include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd)

 
 .PHONY: $(PHONY)
 
 .PHONY: $(PHONY)