Looks like the error is in the gen_source_archive function of the scripts/build.sh script. This function uses git checkout-index to create the source dir like so:

git checkout-index -a --prefix="$SOURCE_DIR/"

And then the source dir is tarred up and we're good. Or at least we were. The problem is the checkout-index command does not consider submodules, I don't think it is even aware of them, so the wsrep/src/ directory in the source dir remains empty.

We could use git submodule foreach to copy the submodule contents into the source dir, but this seems a bit hacky. I'm open to suggestions.

Since git 1.7.3

git submodule update --recursive

Your variant seems to be a valid solution for older Git. (not so hacky)

( I'm not that confident with Git, I just googled around. But without any other suggestions, I'd try this)

The checkout-index command creates a source dir suitable for tarring up and distributing (it strips out .git files & etc...). We already run the 'submodule update' command to populate the wsrep/ dir with the correct files before doing the checkout index to create the source dir, it just doesn't consider submodules when it does its copying.

I think the simplest solution will be to just copy all submodule files over manually after preparing the initial tarball with the build.sh script, gunzipping and updating the src tarball, and then gzipping it back up. The following additions to my prep-galera script should work:

diff --git a/release/prep-galera b/release/prep-galera

index 7da6535..2a8aab3 100755

--- a/release/prep-galera

+++ b/release/prep-galera

@@ -460,6 +460,10 @@ if [ "${create_source}" != "no" ]; then

   git submodule init

   git submodule update

   scripts/build.sh -a

+  git submodule foreach 'cp -vi * ../../galera-*/${path}/'

+  gunzip ${version}.tar.gz

+  tar --update -vf ${version}.tar ${version}/

+  gzip ${version}.tar

   mv -vi ${version}.tar.gz ${release_dir}/${dir_name}/src/

   rm -rf ~/src/galera

jplindst: Any thoughts on this? I don't think I should be the one to modify the scripts/build.sh script, better you or someone from Codership as it's part of the galera repository, so my 'solution' tackles the issue from the outside. It would be preferable for the build.sh script to create completely valid source tarballs by itself, so if you or Codership want to take that on, just let me know. Otherwise I'll go with my solution for now.

The severity can be probbably lowered.

Your galera 25.3.25 release has it fixed, no longer a major issue for me.

I worked around this issue by adding some steps after the source tarball is generated by the build.sh script to update the source tarball with the submodule files.

The changes were made to the prep-galera script as part of this commit (lines 500-503). The changes should have been made as a separate commit, but they were accidentally included in this larger set of updates to the prep-galera script.

The basic layout of the workaround is to:

1. pull out the submodule files using {{ git submodule foreach ...}} into a separate dir
2. take the source tar.gz file that the build.sh script produced and gunzip it
3. use tar --update -vf ... to add the submodule files we pulled out to the uncompressed tarball
4. compress the updated tarball with gzip
5. continue processing the now updated source tar.gz file as before

The changes were made just prior to doing the galera 25.3.25 update, and everything seemed to work. So the plan is to do the same for all future updates.

mschorm Let me know if it is OK to close this issue. Thanks.

Yes, you can close it whenever.
Thank you

Workaround in place and working, so closing.