valitydev/image-riak-base
14
0
Fork 0
mirror of https://github.com/valitydev/image-riak-base.git synced 2024-11-06 10:15:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update stage3 image, salt version and build-utils. (#8)

Browse Source
This commit is contained in:
niku64 2017-04-26 19:39:32 +03:00 committed by GitHub
parent b25c91fed4
commit 8fb3101a2c
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.latest-stage3
View File

@ -1 +1 @@
releases/amd64/autobuilds/20160915/hardened/stage3-amd64-hardened+nomultilib-20160915.tar.bz2
releases/amd64/autobuilds/20170420/hardened/stage3-amd64-hardened+nomultilib-20170420.tar.bz2

6
Makefile
View File

@ -35,10 +35,12 @@ submodules: $(SUBTARGETS)
repos: $(REPOS_TARGET)
update-latest-stage3: $(UTILS_PATH)/sh/getstage3.sh .git
$(UTILS_PATH)/sh/getstage3.sh find-latest amd64 -hardened+nomultilib | tail -n 1 > .latest-stage3
$(UTILS_PATH)/sh/getstage3.sh find-latest -D "http://gentoo.bakka.su/gentoo-distfiles" \
amd64 -hardened+nomultilib | tail -n 1 > .latest-stage3
.latest-stage3.loaded: .latest-stage3
$(UTILS_PATH)/sh/getstage3.sh get-path $(shell cat .latest-stage3) | tail -n 1 > $@
$(UTILS_PATH)/sh/getstage3.sh get-path -D "http://gentoo.bakka.su/gentoo-distfiles" \
$(shell cat .latest-stage3) | tail -n 1 > $@
.state: .latest-stage3.loaded $(PACKER) $(REPOS_TARGET) packer.json files/packer.sh files/portage.make.conf
$(eval STAGE3 := $(shell cat .latest-stage3.loaded))

2
build-utils

@ -1 +1 @@
Subproject commit 3666c968f672d791c3b0f58ec465cdd5473142a5
Subproject commit 877ae1c8299675fff8c4d445657b60064176b077

7
files/packer.sh
View File

@ -2,6 +2,7 @@
source /lib/gentoo/functions.sh
export EMERGE="emerge -q"
SALT_VERSION="2015.8.13"
ebegin "Setting locales to generate"
cat <<EOF> /etc/locale.gen
@ -51,8 +52,8 @@ 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.11 ~amd64
&& cat <<EOF>> /etc/portage/package.keywords/bootstrap
=app-admin/salt-${SALT_VERSION} ~amd64
net-libs/zeromq:0/5 ~amd64
<dev-python/pyzmq-16 ~amd64
dev-python/cffi ~amd64
@ -72,7 +73,7 @@ sed -i "s|\# sed-remove||g" /etc/portage/make.conf
eend $? "Failed" || exit $?
ebegin "Emerging localepurge salt qemacs nvi openssh"
${EMERGE} --verbose=n ">=zeromq-4.1" salt qemacs nvi app-admin/localepurge
${EMERGE} --verbose=n ">=zeromq-4.1" "=app-admin/salt-${SALT_VERSION}" qemacs nvi app-admin/localepurge
eend $? "Failed" || exit $?
ebegin "Selecting python2.7 as default python interpreter"