commit 827434fc5b468d993b534dab60ac4dfb1e7e13ba Author: Dennis Gilmore dennis@ausil.us Date: Fri Nov 7 19:27:47 2014 -0600
make sure we use the right branche in git for making the atomic tree
scripts/buildbranched | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/scripts/buildbranched b/scripts/buildbranched index 63391e5..fef30c3 100755 --- a/scripts/buildbranched +++ b/scripts/buildbranched @@ -154,8 +154,8 @@ MOCKCONFIG="fedora-${DIST}-compose-x86_64" $MOCK -r $MOCKCONFIG --uniqueext=$DATE --init $MOCK -r $MOCKCONFIG --uniqueext=$DATE --install rpm-ostree git $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "if [ ! -d $ATOMICDEST ]; then ostree init --repo=$ATOMICDEST ;fi" -$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/fedora-atomic.git $ATOMIC" -$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-21&arch=$basearch...' fedora*repo" +$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "git clone https://git.fedorahosted.org/git/fedora-atomic.git $ATOMIC&& pushd $ATOMIC&& git checkout f$VERSION" +$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist.*$|baseurl=http://kojipkgs.fedoraproject.org/mash/branched/$basearch/os/%7Cg' fedora*repo" $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICDEST $ATOMIC/fedora-atomic-docker-host.json" log "finished atomic tree creation" }