]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
Add a diff with local changes to the upload dir.
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 30 Aug 2008 21:44:55 +0000 (21:44 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 30 Aug 2008 21:44:55 +0000 (21:44 +0000)
tools/make-git
tools/make-include

index 23b4ac8fc30b1983f0aafec71517dbec52730230..8104efd2b2992fdf970fcc25644b49cd2e23a95a 100644 (file)
@@ -109,7 +109,7 @@ git_commit() {
 }
 
 git_diff() {
-       DIFF_NAME="ipfire-diff-$(date '+%Y%m%d-%0k%0M').diff"
+       DIFF_NAME="${BASEDIR}/ipfire-diff-$(date '+%Y%m%d-%0k%0M').diff"
 
        check_sanity --fix
 
@@ -121,6 +121,7 @@ git_diff() {
                git diff HEAD --stat
        else
                rm -f $DIFF_NAME
+               return 1
        fi
 }
 
index c1e2a94f08922f849aebc330b9f622e4996c841f..9621123e4ffe9f889eea335f6b5112c944ee5f67 100644 (file)
@@ -761,6 +761,7 @@ puttarget() {
        [ -e "${BATCHLOG}" ] && \
                python ${BASEDIR}/tools/alog2html < ${BATCHLOG} > ${DIR}/build_log.html
        git_export; cp -l ${BASEDIR}/${SNAME}-${VERSION}.source.tar.gz ${DIR}
+       git_diff >/dev/null && cp -l ${DIFF_NAME} ${DIR}
        cp -l ${BASEDIR}/${SNAME}-${VERSION}.${MACHINE}.iso ${DIR}
 
        cd $BASEDIR && \