[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-xen staging-4.13] make-release: pull in edk2 submodules so we can build it from tarballs

commit c5c9b1362d1652a9d0f79f6d9ae2f80d4b5fe432
Author:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
AuthorDate: Thu Sep 12 18:12:01 2019 -0500
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Oct 30 11:38:57 2019 -0500

    make-release: pull in edk2 submodules so we can build it from tarballs
    The `make efi` target added by 536d2173 is built from the roms/edk2
    submodule, which in turn relies on additional submodules nested under
    The make-release script currently only pulls in top-level submodules,
    so these nested submodules are missing in the resulting tarball.
    We could try to address this situation more generally by recursively
    pulling in all submodules, but this doesn't necessarily ensure the
    end-result will build properly (this case also required other changes).
    Additionally, due to the nature of submodules, we may not always have
    control over how these sorts of things are dealt with, so for now we
    continue to handle it on a case-by-case in the make-release script.
    Cc: Laszlo Ersek <lersek@xxxxxxxxxx>
    Cc: Bruce Rogers <brogers@xxxxxxxx>
    Cc: qemu-stable@xxxxxxxxxx # v4.1.0
    Reported-by: Bruce Rogers <brogers@xxxxxxxx>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Tested-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
    Message-Id: <20190912231202.12327-2-mdroth@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
    (cherry picked from commit 45c61c6c23918e3b05ed9ecac5b2328ebae5f774)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
 scripts/make-release | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/make-release b/scripts/make-release
index b4af9c9e52..a2a8cda33c 100755
--- a/scripts/make-release
+++ b/scripts/make-release
@@ -20,6 +20,14 @@ git checkout "v${version}"
 git submodule update --init
 (cd roms/seabios && git describe --tags --long --dirty > .version)
 (cd roms/skiboot && ./make_version.sh > .version)
+# Fetch edk2 submodule's submodules, since it won't have access to them via
+# the tarball later.
+# A more uniform way to handle this sort of situation would be nice, but we
+# don't necessarily have much control over how a submodule handles its
+# submodule dependencies, so we continue to handle these on a case-by-case
+# basis for now.
+(cd roms/edk2 && git submodule update --init)
 tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination}
 rm -rf ${destination}
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.13



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.