summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-08 14:24:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-14 11:14:39 +0000
commit44ffe76f3724959e0f3bcaf5c059f20ec528b9b1 (patch)
tree83dda0fe8dd4ccf0332568ca991d5381f1a630cf /meta/recipes-devtools
parent9b7c0760324e72fb3bb653bde90182c4ea3bc787 (diff)
downloadpoky-44ffe76f3724959e0f3bcaf5c059f20ec528b9b1.tar.gz
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. (From OE-Core rev: 5a1a322cfca2a514707eeb48f4c3dce5e4c1ad48) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/distcc/distcc_3.3.2.bb24
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_3.3.2.bb b/meta/recipes-devtools/distcc/distcc_3.3.2.bb
index 0d06963165..a93604bc47 100644
--- 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} \
69 ${systemd_unitdir}/system/distcc.service" 69 ${systemd_unitdir}/system/distcc.service"
70FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ 70FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
71 ${datadir}/distcc" 71 ${datadir}/distcc"
72
73
74#
75# distcc upstream dropped the 3.2 branch which we reference in older project releases
76# the revisions are there, just the branch is not. In order to be able to continue
77# to build those old releases, adjust any mirror tarball to contain the missing branch
78#
79fixup_distcc_mirror_tarball () {
80 TBALL=${DL_DIR}/git2_github.com.distcc.distcc.git.tar.gz
81 if [ -f $TBALL ]; then
82 TDIR=`mktemp -d`
83 cd $TDIR
84 tar -xzf $TBALL
85 set +e
86 git rev-parse --verify 3.2
87 if [ "$?" != "0" ]; then
88 git branch 3.2 d8b18df3e9dcbe4f092bed565835d3975e99432c
89 tar -czf $TBALL *
90 fi
91 set -e
92 rm -rf $TDIR/*
93 fi
94}
95do_fetch[postfuncs] += "fixup_distcc_mirror_tarball"