Update release & fix a couple bugsfeature/build_profiles

* 3.9.4 is released, update core profiles
* fix consecutive make with different profiles
+ 'make PROFILE=a; make PROFILE=b' would make 'a' builds twice
+ build/profile --> build/profile/$PROFILE
* 'make PACKER=path-to-packer-bin ...' allows use of alternate packer, defaults to what's in $PATH
+ needed this to test out pre-1.4.1 packer binaries

7 files changed, 31 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 2eded08..ecd467e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,23 +4,27 @@ TARGET_PROFILES := $(wildcard profiles/*.conf)
 PROFILE := default
 BUILD :=
 
+# by default, use the 'packer' in the path
+PACKER := packer
+export PACKER
+
 .PHONY: amis clean
 
-amis: build build/profile build/packer.json
-        build/make-amis $(BUILD)
+amis: build build/packer.json build/profile/$(PROFILE)
+        build/make-amis $(PROFILE) $(BUILD)
 
 build: $(SCRIPTS)
-        [ -d build ] || mkdir build
+        [ -d build/profile ] || mkdir -p build/profile
         python3 -m venv build/.py3
         build/.py3/bin/pip install pyhocon pyyaml boto3
         (cd build; for i in $(ALL_SCRIPTS); do ln -sf ../$$i .; done)
 
-build/profile: build build/resolve-profile.py $(CORE_PROFILES) $(TARGET_PROFILES)
-        build/resolve-profile.py $(PROFILE)
-
 build/packer.json: build packer.conf
         build/.py3/bin/pyhocon -i packer.conf -f json > build/packer.json
 
+build/profile/$(PROFILE): build build/resolve-profile.py $(CORE_PROFILES) $(TARGET_PROFILES)
+        build/resolve-profile.py $(PROFILE)
+
 %.py: %.py.in build
         sed "s|@PYTHON@|#!`pwd`/build/.py3/bin/python|" $< > $@
         chmod +x $@
diff --git a/packer.conf b/packer.conf
index 685c9e1..dd669c4 100644
--- a/packer.conf
+++ b/packer.conf
@@ -91,7 +91,7 @@ provisioners = [
 post-processors = [
   {
     type    = "manifest"
-    output  = "profile/{{user `profile_build`}}/manifest.json"
+    output  = "profile/{{user `profile`}}/{{user `profile_build`}}/manifest.json"
     custom_data {
       profile       = "{{user `profile`}}"
       build         = "{{user `profile_build`}}"
diff --git a/profiles/base/1 b/profiles/base/1
index abd1413..17b66b2 100644
--- a/profiles/base/1
+++ b/profiles/base/1
@@ -45,7 +45,6 @@ pkgs {
   linux-virt          = true
   alpine-mirrors      = true
   chrony              = true
-  haveged             = true
   nvme-cli            = true
   openssh             = true
   sudo                = true
@@ -59,7 +58,6 @@ svcs {
   mdev      = "sysinit"
   acpid     = "boot"
   bootmisc  = "boot"
-  haveged   = "boot"
   hostname  = "boot"
   hwclock   = "boot"
   modules   = "boot"
diff --git a/profiles/version/3.9 b/profiles/version/3.9
index 3d950e0..5288c16 100644
--- a/profiles/version/3.9
+++ b/profiles/version/3.9
@@ -5,7 +5,7 @@ include "../base/current"
 
 # set version-specific vars
 version     = "3.9"
-release     = "3.9.3"
+release     = "3.9.4"
 end_of_life = null      # set to "YYYY-MM-DD" when known
 repos {
   "http://dl-cdn.alpinelinux.org/alpine/v3.9/main":       true
diff --git a/profiles/version/edge b/profiles/version/edge
index 13195fe..5fe3da7 100644
--- a/profiles/version/edge
+++ b/profiles/version/edge
@@ -15,6 +15,3 @@ repos {
   "http://dl-cdn.alpinelinux.org/alpine/edge/community":  true
   "http://dl-cdn.alpinelinux.org/alpine/edge/testing":    true
 }
-# haveged/rngd no longer needed with Alpine kernels >= 4.19.36
-pkgs { haveged = false }
-svcs { haveged = false }
diff --git a/scripts/make-amis b/scripts/make-amis
index e0a699e..0f18add 100755
--- a/scripts/make-amis
+++ b/scripts/make-amis
@@ -1,13 +1,27 @@
 #!/bin/sh
 
+export PACKER=${PACKER:-packer}
+
 cd build
 
-# if no build(s) specified, do all profile's builds!
-[ $# -gt 0 ] && BUILDS="$@" || BUILDS=$(ls profile)
+# we need a profile
+if [ $# -eq 0 ]; then
+  echo "Usage: $(basename $0) <profile> [ <build> ... ]" >&2
+  exit 1
+fi
+
+PROFILE=$1; shift
+
+# no build(s) specified?  do all the builds!
+[ $# -gt 0 ] && BUILDS="$@" || BUILDS=$(ls profile/$PROFILE)
 
 for B in $BUILDS
 do
-  BUILD="profile/$B"
-  ( packer build -var-file=$BUILD/vars.json packer.json; echo $? >$BUILD/exit ) | tee $BUILD/output
+  BUILD="profile/$PROFILE/$B"
+  ( "$PACKER" build -var-file=$BUILD/vars.json packer.json; echo $? >$BUILD/exit ) | tee $BUILD/output
   echo "=-> $(cat $BUILD/exit) <-="
+  # TODO: check exit & output
+  #  - AMI already exist?  continue in case other builds need building
+  #  - New release for version?  maybe update release var and try again?
+  #  - SIGINT or unknown issue?  cleanup / exit
 done
diff --git a/scripts/resolve-profile.py.in b/scripts/resolve-profile.py.in
index 050da00..433a72e 100644
--- a/scripts/resolve-profile.py.in
+++ b/scripts/resolve-profile.py.in
@@ -11,7 +11,7 @@ profile = sys.argv[1]
 profile_conf = os.path.join(script_dir, '..', 'profiles', profile + '.conf')
 
 # where we store profile's builds
-profile_dir = os.path.join(script_dir, 'profile')
+profile_dir = os.path.join(script_dir, 'profile', profile)
 
 builds = ConfigFactory.parse_file(profile_conf)['builds']