From 938d05602642ef0512ad27f7380cc47fa0707edc Mon Sep 17 00:00:00 2001 From: Grigory Antsiferov Date: Fri, 19 Aug 2016 17:53:41 +0300 Subject: [PATCH] files/packer.sh: salt-2015.8.11 update. --- Makefile | 4 ++-- files/packer.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b7df635..7054283 100644 --- a/Makefile +++ b/Makefile @@ -29,13 +29,13 @@ repos: $(REPOS_TARGET) $(eval COMMIT := $(shell git rev-parse HEAD)) $(eval TAG := $(shell date +%s)-$(COMMIT)) $(eval BRANCH := $(shell \ - if [ "HEAD" != $(git rev-parse --abbrev-ref HEAD) ]; then \ + if [[ "HEAD" != $(git rev-parse --abbrev-ref HEAD) ]]; then \ echo $(git rev-parse --abbrev-ref HEAD); \ elif [ -n "$BRANCH_NAME" ]; then \ echo $BRANCH_NAME; \ else \ echo $(git name-rev --name-only HEAD); \ - fi)) + fi) $(eval STAGE3 := $(shell cat .latest-stage3)) $(DOCKER) run -v `pwd`:/tmp/pwd -w /tmp/repack busybox /bin/sh -c \ "tar xjf /tmp/pwd/$(STAGE3); tar cjf /tmp/pwd/$(STAGE3).repack ." diff --git a/files/packer.sh b/files/packer.sh index c4de8c2..48c00c8 100644 --- a/files/packer.sh +++ b/files/packer.sh @@ -44,7 +44,7 @@ eend $? "Failed" || exit $? ebegin "Setting bootstrap flags" mkdir -p /etc/portage/package.{accept_keywords,keywords,use,env} \ && cat <<'EOF'>> /etc/portage/package.keywords/bootstrap -=app-admin/salt-2015.8.8 ~amd64 +=app-admin/salt-2015.8.11 ~amd64 net-libs/zeromq:0/5 ~amd64