diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/angstrom/build-feeds.sh | 2 | ||||
| -rwxr-xr-x | contrib/mtn2git/mtn2git.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index bf640d872e..2b00692625 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -37,7 +37,7 @@ do_report_success() { echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log } -for machine in efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 +for machine in beagleboard efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 do BUILD_MACHINE=$machine BUILD_CLEAN="qmake-native qmake2-native qt-x11-free" diff --git a/contrib/mtn2git/mtn2git.py b/contrib/mtn2git/mtn2git.py index 1de3010756..a4b43721d9 100755 --- a/contrib/mtn2git/mtn2git.py +++ b/contrib/mtn2git/mtn2git.py @@ -255,6 +255,8 @@ def fast_import(ops, revision): # could probably happen if we have more than one parent (on a merge)? cmd = [] + if len(revision["parent"]) == 0: + cmd += ["reset refs/heads/%s" % branch] cmd += ["commit refs/heads/%s" % branch] cmd += ["mark :%s" % get_mark(revision["revision"])] cmd += ["author <%s> %s" % (revision["author"], get_git_date(revision))] |