distcc: Handle upstream branch deletion for old releases

distcc upstream dropped the 3.2 branch which we reference in older project releases
the revisions are there, just the branch is not. In order to be able to continue
to build those old releases, adjust any mirror tarball to contain the missing branch.
We have updated the  newer point releases but the previous tags were failing to build.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/distcc/distcc_3.3.2.bb b/meta/recipes-devtools/distcc/distcc_3.3.2.bb
index 0d0696316531c5dda7c1c40c99d7cdfb2aaa676f..a93604bc4718d24e800df02d39da58b2fda8dccc 100644 (file)
--- a/meta/recipes-devtools/distcc/distcc_3.3.2.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.3.2.bb
@@ -69,3 +69,27 @@ FILES_${PN} = " ${sysconfdir} \
                ${systemd_unitdir}/system/distcc.service"
 FILES_distcc-distmon-gnome = "  ${bindir}/distccmon-gnome \
                                ${datadir}/distcc"
+
+
+#
+# distcc upstream dropped the 3.2 branch which we reference in older project releases
+# the revisions are there, just the branch is not. In order to be able to continue
+# to build those old releases, adjust any mirror tarball to contain the missing branch
+#
+fixup_distcc_mirror_tarball () {
+       TBALL=${DL_DIR}/git2_github.com.distcc.distcc.git.tar.gz
+       if [ -f $TBALL ]; then
+               TDIR=`mktemp -d`
+               cd $TDIR
+               tar -xzf $TBALL
+               set +e
+               git rev-parse --verify 3.2
+               if [ "$?" != "0" ]; then
+                       git branch 3.2 d8b18df3e9dcbe4f092bed565835d3975e99432c
+                       tar -czf $TBALL *
+               fi
+               set -e
+               rm -rf $TDIR/*
+       fi
+}
+do_fetch[postfuncs] += "fixup_distcc_mirror_tarball"