[xen staging] mktarball: only archive Xen

[patchbot@xxxxxxx]

commit c5be91eb81403195643e8de287c86fbd728ad6cb
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed Sep 4 16:07:41 2024 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Sep 4 16:07:41 2024 +0200

    mktarball: only archive Xen
    
    As was basically decided already a while ago, remove - in the simplest
    possible way - the archiving of both qemu-s and mini-os from tarball
    generation.
    
    With this the subtree-force-update-all prereq isn't needed anymore in
    the top level Makefile. That goal, including the respective ones
    underneath tools/, then also are unreferenced and hence are being
    dropped, too.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 Makefile                |  8 ++------
 tools/Makefile          |  5 -----
 tools/Rules.mk          |  2 +-
 tools/firmware/Makefile |  4 ----
 tools/misc/mktarball    | 22 +---------------------
 5 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/Makefile b/Makefile
index a6ca348476..c9d80a6dc6 100644
--- a/Makefile
+++ b/Makefile
@@ -200,10 +200,6 @@ rpmball: dist
 subtree-force-update: mini-os-dir-force-update
        $(MAKE) -C tools subtree-force-update
 
-.PHONY: subtree-force-update-all
-subtree-force-update-all: mini-os-dir-force-update
-       $(MAKE) -C tools subtree-force-update-all
-
 # Make a source tarball, including qemu sub-trees.
 #
 # src-tarball will use "git describe" for the version number.  This
@@ -214,11 +210,11 @@ subtree-force-update-all: mini-os-dir-force-update
 # src-tarball-release will use "make xenversion" as the version
 # number.  This is suitable for release tarballs.
 .PHONY: src-tarball-release
-src-tarball-release: subtree-force-update-all
+src-tarball-release:
        bash ./tools/misc/mktarball $(XEN_ROOT) $$($(MAKE) -C xen xenversion 
--no-print-directory)
 
 .PHONY: src-tarball
-src-tarball: subtree-force-update-all
+src-tarball:
        bash ./tools/misc/mktarball $(XEN_ROOT) $$(git describe)
 
 .PHONY: clean
diff --git a/tools/Makefile b/tools/Makefile
index 7d17211782..e9e1cda305 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -282,8 +282,3 @@ endif
 ifeq ($(CONFIG_X86),y)
        $(MAKE) -C firmware subtree-force-update
 endif
-
-subtree-force-update-all:
-       $(MAKE) qemu-xen-dir-force-update
-       $(MAKE) qemu-xen-traditional-dir-force-update
-       $(MAKE) -C firmware subtree-force-update-all
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 18cf83f5be..e2289c25b4 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -206,7 +206,7 @@ subdir-all-% subdir-clean-% subdir-install-% 
subdir-uninstall-%: .phony
 subdir-distclean-%: .phony
        $(MAKE) -C $* distclean
 
-no-configure-targets := distclean subdir-distclean% clean subdir-clean% 
subtree-force-update-all %-dir-force-update
+no-configure-targets := distclean subdir-distclean% clean subdir-clean% 
%-dir-force-update
 ifeq (,$(filter $(no-configure-targets),$(MAKECMDGOALS)))
 $(XEN_ROOT)/config/Tools.mk:
        $(error You have to run ./configure before building or installing the 
tools)
diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index 345037b93b..d69f7c69ea 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -127,9 +127,5 @@ ifeq ($(CONFIG_OVMF),y)
        $(MAKE) ovmf-dir-force-update
 endif
 
-subtree-force-update-all:
-       $(MAKE) seabios-dir-force-update
-       $(MAKE) ovmf-dir-force-update
-
 subdir-all-seabios-dir: seabios-dir
        $(MAKE) -C $< CC=$(SEABIOSCC) LD=$(SEABIOSLD) PYTHON=$(PYTHON) 
EXTRAVERSION=$(SEABIOS_EXTRAVERSION) all;
diff --git a/tools/misc/mktarball b/tools/misc/mktarball
index 42d543073c..7f9b61da43 100755
--- a/tools/misc/mktarball
+++ b/tools/misc/mktarball
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# mktarball: Make a release tarball (including xen, qemu, and qemu-traditional)
+# mktarball: Make a release tarball (including just xen)
 #
 # Takes 2 arguments, the path to the dist directory and the version
 set -ex
@@ -29,26 +29,6 @@ mkdir -p $tdir
 
 git_archive_into $xen_root $tdir/xen-$desc
 
-# We can't use git_archive_into with qemu upstream because it uses
-# git-submodules.  git-submodules are an inherently broken git feature
-# which should never be used in any circumstance.  Unfortunately, qemu
-# upstream uses them.  Relevantly for us, git archive does not work
-# properly when there are submodules.
-(
-    cd $xen_root/tools/qemu-xen-dir-remote
-    # if it's not clean, the qemu script will call `git stash' !
-    git --no-pager diff --stat HEAD
-    scripts/archive-source.sh $tdir/xen-$desc/tools/qemu-xen.tar
-    cd $tdir/xen-$desc/tools
-    mkdir qemu-xen
-    tar <qemu-xen.tar Cxf qemu-xen -
-    rm qemu-xen.tar
-)
-
-git_archive_into $xen_root/tools/qemu-xen-traditional-dir-remote 
$tdir/xen-$desc/tools/qemu-xen-traditional
-
-git_archive_into $xen_root/extras/mini-os-remote $tdir/xen-$desc/extras/mini-os
-
 GZIP=-9v tar cz -f $xen_root/dist/xen-$desc.tar.gz -C $tdir xen-$desc
 
 echo "Source tarball in $xen_root/dist/xen-$desc.tar.gz"
--
generated by git-patchbot for /home/xen/git/xen.git#staging