commit fc7aaae093dc333112507933374fdd4d56babc93 Author: Till Maas opensource@till.name Date: Mon Nov 10 16:43:13 2014 +0100
buildbranched/buildrawhide: Use $DIST for kojipkgs URL
scripts/buildbranched | 2 +- scripts/buildrawhide | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/scripts/buildbranched b/scripts/buildbranched index 2032860..8ff6035 100755 --- a/scripts/buildbranched +++ b/scripts/buildbranched @@ -155,7 +155,7 @@ $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 && pushd $ATOMIC && git checkout ${GIT_BRANCH}" -$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist.*$|baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os/%7Cg' fedora*repo" +$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist=.*$|baseurl=http://kojipkgs.fedoraproject.org/mash/$%7BDIST%7D/x86_64/os/%7Cg' fedora*repo" $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICDEST $ATOMIC/fedora-atomic-docker-host.json >$logdir/atomic" log "finished atomic tree creation" } diff --git a/scripts/buildrawhide b/scripts/buildrawhide index ed06a5b..8b4628f 100755 --- a/scripts/buildrawhide +++ b/scripts/buildrawhide @@ -146,7 +146,7 @@ $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 && pushd $ATOMIC && git checkout ${GIT_BRANCH}" -$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist=.*$|baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/x86_64/os/%7Cg' fedora*repo" +$MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "cd $ATOMIC && sed -i -e 's|mirrorlist=.*$|baseurl=http://kojipkgs.fedoraproject.org/mash/$%7BDIST%7D/x86_64/os/%7Cg' fedora*repo" $MOCK -r $MOCKCONFIG --uniqueext=$DATE --shell "rpm-ostree compose tree --repo=$ATOMICDEST $ATOMIC/fedora-atomic-docker-host.json >$logdir/atomic" log "finished atomic tree creation" }
rel-eng@lists.fedoraproject.org