switch profile configs to HOCON

27 files changed, 216 insertions, 359 deletions

diff --git a/Makefile b/Makefile
index acfb9f2..82dd6ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,22 @@
 ALL_SCRIPTS := $(wildcard scripts/*)
-ALL_PROFILES := $(shell find profiles -name '*.yaml' -type f)
-CORE_PROFILES := $(shell for i in base version arch; do ls profiles/$$i/*.yaml | sort -V; done)
+CORE_PROFILES := $(wildcard profiles/*/*)
+TARGET_PROFILES := $(wildcard profiles/*.conf)
 PROFILE := default
 BUILD :=
 
-.PHONY: amis
+.PHONY: amis clean
+
 amis: build build/profile build/packer.json
         build/make-amis $(BUILD)
 
 build: $(SCRIPTS)
         [ -d build ] || mkdir build
         python3 -m venv build/.py3
-        build/.py3/bin/pip install pyyaml boto3
+        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 $(ALL_PROFILES)
-        cat $(CORE_PROFILES) profiles/$(PROFILE).yaml | build/resolve-profile.py $(PROFILE)
+build/profile: build build/resolve-profile.py $(CORE_PROFILES) $(TARGET_PROFILES)
+        build/resolve-profile.py $(PROFILE)
 
 build/packer.json: build build/yaml2json.py packer.yaml
         build/yaml2json.py packer.yaml > build/packer.json
diff --git a/profiles/alpine-amis.conf b/profiles/alpine-amis.conf
new file mode 100644
index 0000000..6ece5d4
--- /dev/null
+++ b/profiles/alpine-amis.conf
@@ -0,0 +1,36 @@
+### Profile for Building the Publically-Available Alpine Linux AMIs
+
+version_current { include "version/current" }
+arch_x86_64     { include "arch/x86_64" }
+
+# profile vars
+alpine-amis {
+  revision      = "1"
+  build_region  = "us-west-2"
+  build_subnet  = "subnet-b80c36e2"
+  ami_access    = [ "all" ]
+  ami_regions = [
+    "ap-northeast-1"
+    "ap-northeast-2"
+#    "ap-northeast-3" # skipped, available by subscription only
+    "ap-southeast-1"
+    "ap-southeast-2"
+    "ap-south-1"
+    "ca-central-1"
+    "eu-central-1"
+    "eu-north-1"
+    "eu-west-1"
+    "eu-west-2"
+    "eu-west-3"
+    "sa-east-1"
+    "us-east-1"
+    "us-east-2"
+    "us-west-1"
+    "us-west-2"
+  ]
+}
+
+# Build definitions
+builds {
+  current-x86_64 = ${version_current} ${arch_x86_64} ${alpine-amis}
+}
diff --git a/profiles/alpine-amis.yaml b/profiles/alpine-amis.yaml
deleted file mode 100644
index 119601f..0000000
--- a/profiles/alpine-amis.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-### Profile for Building the Publically-Available Alpine Linux AMIs
-
-# Profile overrides
-alpine-amis: &alpine-amis
-  revision: '1'
-  build_region: us-west-2
-  build_subnet: subnet-b80c36e2
-  ami_access:
-    - all
-  ami_regions:
-    - ap-northeast-1
-    - ap-northeast-2
-#    - ap-northeast-3 # skipped, available by subscription only
-    - ap-southeast-1
-    - ap-southeast-2
-    - ap-south-1
-    - ca-central-1
-    - eu-central-1
-    - eu-north-1
-    - eu-west-1
-    - eu-west-2
-    - eu-west-3
-    - sa-east-1
-    - us-east-1
-    - us-east-2
-    - us-west-1
-    - us-west-2
-
-# Build definitions
-builds:
-  current-x86_64:
-    <<: *_base-current
-    <<: *_version-current
-    <<: *_x86_64-current
-    <<: *alpine-amis
-    repos:
-      <<: *_base-current-repos
-      <<: *_version-current-repos
-      <<: *_x86_64-current-repos
-    pkgs:
-      <<: *_base-current-pkgs
-      <<: *_version-current-pkgs
-      <<: *_x86_64-current-pkgs
-    svcs:
-      <<: *_base-current-svcs
-      <<: *_version-current-svcs
-      <<: *_x86_64-current-svcs
-
diff --git a/profiles/arch/aarch64 b/profiles/arch/aarch64
new file mode 120000
index 0000000..f1b77e5
--- /dev/null
+++ b/profiles/arch/aarch64
@@ -0,0 +1 @@
+aarch64-1
\ No newline at end of file
diff --git a/profiles/arch/aarch64-1 b/profiles/arch/aarch64-1
new file mode 100644
index 0000000..083a744
--- /dev/null
+++ b/profiles/arch/aarch64-1
@@ -0,0 +1,6 @@
+### aarch64 vars, revision 1
+
+arch                = "aarch64"
+build_arch          = "arm64"
+build_instance_type = "a1.medium"
+bootloader          = "grub"
diff --git a/profiles/arch/aarch64-3.9.yaml b/profiles/arch/aarch64-3.9.yaml
deleted file mode 100644
index c7ec980..0000000
--- a/profiles/arch/aarch64-3.9.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-### aarch64 Version 3.9 Variables
-
-_aarch64-3.9: &_aarch64-3_9
-  # Architecture
-  arch:                 aarch64
-  build_arch:           arm64
-  build_instance_type:  a1.medium
-  bootloader:           grub
-
-  # aarch64 repos/pkgs/svcs for 3.9
-  repos: &_aarch64-3_9-repos {}
-  pkgs: &_aarch64-3_9-pkgs {}
-  svcs: &_aarch64-3_9-svcs {}
diff --git a/profiles/arch/aarch64-current.yaml b/profiles/arch/aarch64-current.yaml
deleted file mode 100644
index 1b4e624..0000000
--- a/profiles/arch/aarch64-current.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-### aarch64 Current Version Variables
-
-_aarch64-current: &_aarch64-current
-  # currently from 3.9
-  <<: *_aarch64-3_9
-  # re-anchor for current
-  repos: &_aarch64-current-repos
-    <<: *_aarch64-3_9-repos
-  pkgs: &_aarch64-current-pkgs
-    <<: *_aarch64-3_9-pkgs
-  svcs: &_aarch64-current-svcs
-    <<: *_aarch64-3_9-svcs
diff --git a/profiles/arch/aarch64-edge.yaml b/profiles/arch/aarch64-edge.yaml
deleted file mode 100644
index 97d76e2..0000000
--- a/profiles/arch/aarch64-edge.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-### aarch64 Edge Variables
-
-_aarch64-edge: &_aarch64-edge
-  # base on current (for now)
-  <<: *_aarch64-current
-  # overrides (if any)
-
-  # aarch64 repos/pkgs/svcs for edge
-  repos: &_aarch64-edge-repos
-    <<: *_aarch64-current-repos
-    # overrides (if any)
-  pkgs: &_aarch64-edge-pkgs
-    <<: *_aarch64-current-pkgs
-    # overrides (if any)
-  svcs: &_aarch64-edge-svcs
-    <<: *_aarch64-current-svcs
-    # overrides (if any)
-
diff --git a/profiles/arch/x86_64 b/profiles/arch/x86_64
new file mode 120000
index 0000000..f3c4f51
--- /dev/null
+++ b/profiles/arch/x86_64
@@ -0,0 +1 @@
+x86_64-1
\ No newline at end of file
diff --git a/profiles/arch/x86_64-1 b/profiles/arch/x86_64-1
new file mode 100644
index 0000000..ca4bcb9
--- /dev/null
+++ b/profiles/arch/x86_64-1
@@ -0,0 +1,5 @@
+### x86_64 vars, revision 1
+
+arch       = "x86_64"
+build_arch = "x86_64"
+bootloader = "syslinux"
diff --git a/profiles/arch/x86_64-3.9.yaml b/profiles/arch/x86_64-3.9.yaml
deleted file mode 100644
index 79b8908..0000000
--- a/profiles/arch/x86_64-3.9.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-### x86_64 Version 3.9 Variables
-
-_x86_64-3.9: &_x86_64-3_9
-  # Architecture
-  arch:       x86_64
-  build_arch: x86_64
-  bootloader: syslinux
-
-  # x86_64 repos/pkgs/svcs for 3.9
-  repos: &_x86_64-3_9-repos {}
-  pkgs: &_x86_64-3_9-pkgs {}
-  svcs: &_x86_64-3_9-svcs {}
-
diff --git a/profiles/arch/x86_64-current.yaml b/profiles/arch/x86_64-current.yaml
deleted file mode 100644
index 6dc5555..0000000
--- a/profiles/arch/x86_64-current.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-### x86_64 Current Version Variables
-
-_x86_64-current: &_x86_64-current
-  # Current is 3.9
-  <<: *_x86_64-3_9
-  # re-anchor for current
-  repos: &_x86_64-current-repos
-    <<: *_x86_64-3_9-repos
-  pkgs: &_x86_64-current-pkgs
-    <<: *_x86_64-3_9-pkgs
-  svcs: &_x86_64-current-svcs
-    <<: *_x86_64-3_9-svcs
-
diff --git a/profiles/arch/x86_64-edge.yaml b/profiles/arch/x86_64-edge.yaml
deleted file mode 100644
index 2e2f1d2..0000000
--- a/profiles/arch/x86_64-edge.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-### x86_64 Edge Variables
-
-_x86_64-edge: &_x86_64-edge
-  # base from current (at the moment)
-  <<: *_x86_64-current
-  # overrides (if any)
-
-  # x86_64 repos/pkgs/svcs for edge
-  repos: &_x86_64-edge-repos
-    <<: *_x86_64-current-repos
-    # overrides (if any)
-  pkgs: &_x86_64-edge-pkgs
-    <<: *_x86_64-current-pkgs
-    # overrides (if any)
-  svcs: &_x86_64-edge-svcs
-    <<: *_x86_64-current-pkgs
-    # overrides (if any)
-
diff --git a/profiles/base/1 b/profiles/base/1
new file mode 100644
index 0000000..8b88c2a
--- /dev/null
+++ b/profiles/base/1
@@ -0,0 +1,78 @@
+### base vars, revision 1
+
+# Profile/Build
+profile       = null
+profile_build = null
+
+# Versioning
+version     = null
+release     = null
+end_of_life = null
+revision    = null
+
+# Architecture
+arch        = null
+build_arch  = null
+
+# Builder-instance
+build_region          = null
+build_subnet          = null
+build_security_group  = null
+build_instance_type   = "t3.nano"
+build_public_ip       = null      # was ""
+build_user            = "ec2-user"
+build_ami_name        = "amzn2-ami-hvm-2.0.*-gp2"
+build_ami_owner       = "137112412989"
+build_ami_latest      = "true"
+
+# AMI build/deploy
+ami_name_prefix = "alpine-ami-"
+ami_name_suffix = ""
+ami_desc_prefix = "Alpine Linux "
+ami_desc_suffix = " - https://github.com/mcrute/alpine-ec2-ami"
+ami_volume_size = "1"
+ami_encrypt     = "false"
+ami_user        = "alpine"
+ami_access      = null
+ami_regions     = null
+
+# AMI configuration
+bootloader = null
+repos {}
+pkgs {
+  linux-virt          = true
+  alpine-mirrors      = true
+  chrony              = true
+  haveged             = true
+  nvme-cli            = true
+  openssh             = true
+  sudo                = true
+  tiny-ec2-bootstrap  = true
+  tzdata              = true
+}
+svcs {
+  # sysinit
+  devfs      = "sysinit"
+  dmesg      = "sysinit"
+  hwdrivers  = "sysinit"
+  mdev       = "sysinit"
+  # boot
+  acpid     = "boot"
+  bootmisc  = "boot"
+  haveged   = "boot"
+  hostname  = "boot"
+  hwclock   = "boot"
+  modules   = "boot"
+  swap      = "boot"
+  sysctl    = "boot"
+  syslog    = "boot"
+  # default
+  chronyd     = "default"
+  networking  = "default"
+  sshd        = "default"
+  tiny-ec2-bootstrap = "default"
+  # shutdown
+  killprocs = "shutdown"
+  mount-ro  = "shutdown"
+  savecache = "shutdown"
+}
diff --git a/profiles/base/1.yaml b/profiles/base/1.yaml
deleted file mode 100644
index 29c7354..0000000
--- a/profiles/base/1.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-### Base Variables, Revsion #1
-
-_base-1: &_base-1
-  # Profile/Build
-  profile:
-  profile_build:
-
-  # Versioning
-  version:
-  release:
-  end_of_life:
-  revision:
-
-  # Architecture
-  arch:
-  build_arch:
-
-  # Builder-instance
-  build_region:
-  build_subnet:
-  build_security_group:
-  build_instance_type:  t3.nano
-  build_public_ip:      ''
-  build_user:           ec2-user
-  build_ami_name:       amzn2-ami-hvm-2.0.*-gp2
-  build_ami_owner:      '137112412989'
-  build_ami_latest:     'true'
-
-  # AMI build/deploy
-  ami_name_prefix:  alpine-ami-
-  ami_name_suffix:  ''
-  ami_desc_prefix:  'Alpine Linux '
-  ami_desc_suffix:  ' - https://github.com/mcrute/alpine-ec2-ami'
-  ami_volume_size:  '1'
-  ami_encrypt:      'false'
-  ami_user:         alpine
-  ami_access:
-  ami_regions:
-
-  # AMI configuration
-  bootloader:
-  repos: &_base-1-repos {}
-  pkgs: &_base-1-pkgs
-    linux-virt:
-    alpine-mirrors:
-    chrony:
-    haveged:
-    nvme-cli:
-    openssh:
-    sudo:
-    tiny-ec2-bootstrap:
-    tzdata:
-  svcs: &_base-1-svcs
-    # sysinit
-    devfs:     sysinit
-    dmesg:     sysinit
-    hwdrivers: sysinit
-    mdev:      sysinit
-    # boot
-    acpid:    boot
-    bootmisc: boot
-    haveged:  boot
-    hostname: boot
-    hwclock:  boot
-    modules:  boot
-    swap:     boot
-    sysctl:   boot
-    syslog:   boot
-    # default
-    chronyd:
-    networking:
-    sshd:
-    tiny-ec2-bootstrap:
-    # shutdown
-    killprocs: shutdown
-    mount-ro:  shutdown
-    savecache: shutdown
-
diff --git a/profiles/base/current b/profiles/base/current
new file mode 120000
index 0000000..56a6051
--- /dev/null
+++ b/profiles/base/current
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/profiles/base/current.yaml b/profiles/base/current.yaml
deleted file mode 100644
index 7f5e33d..0000000
--- a/profiles/base/current.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-### Current Revision Base Variables
-
-_base-current: &_base-current
-  # Current base revision
-  <<: *_base-1
-  # re-anchor for current
-  repos: &_base-current-repos
-    <<: *_base-1-repos
-  pkgs: &_base-current-pkgs
-    <<: *_base-1-pkgs
-  svcs: &_base-current-svcs
-    <<: *_base-1-svcs
-
diff --git a/profiles/base/edge.yaml b/profiles/base/edge.yaml
deleted file mode 100644
index efd3442..0000000
--- a/profiles/base/edge.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-### Edge Base Variables
-
-_base-edge: &_base-edge
-  # base from current (at the moment)
-  <<: *_base-current
-  # overrides (if any)
-
-  # base repos/pkgs/svcs for edge
-  repos: &_base-edge-repos
-    <<: *_base-current-repos
-    # overrides (if any)
-  pkgs: &_base-edge-pkgs
-    <<: *_base-current-pkgs
-    # overrides (if any)
-  svcs: &_base-edge-svcs
-    <<: *_base-current-svcs
-    # overrides (if any)
-
diff --git a/profiles/test.conf b/profiles/test.conf
new file mode 100644
index 0000000..3a44458
--- /dev/null
+++ b/profiles/test.conf
@@ -0,0 +1,28 @@
+### Profile for Testing Builds
+
+version_current { include "version/current" }
+version_edge    { include "version/edge" }
+arch_x86_64     { include "arch/x86_64" }
+
+# specific to this profile's builds
+test {
+  build_region = "us-west-2"
+  build_subnet = "subnet-033a30d7b5220d177"
+  ami_regions = [
+    "us-east-1"
+    "us-west-2"
+  ]
+}
+
+# Build definitions
+builds {
+  # merge version, arch, and profile vars
+  test-current-x86_64 = ${version_current} ${arch_x86_64} ${test}
+  # build-specific override
+  test-current-x86_64 {
+    revision = "test"
+  }
+
+  # merge version, arch, and profile vars
+  test-edge-x86_64 = ${version_edge} ${arch_x86_64} ${test}
+}
diff --git a/profiles/test.yaml b/profiles/test.yaml
deleted file mode 100644
index bcb21e1..0000000
--- a/profiles/test.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-### Profile for Testing Builds
-
-# Profile overrides
-test: &test
-  build_region: us-west-2
-  build_subnet: subnet-033a30d7b5220d177
-  ami_regions:
-    - us-east-1
-    - us-west-2
-
-# Build definitions
-builds:
-  test-current-x86_64:
-    <<: *_base-current
-    <<: *_version-current
-    <<: *_x86_64-current
-    repos:
-      <<: *_base-current-repos
-      <<: *_version-current-repos
-      <<: *_x86_64-current-repos
-    pkgs:
-      <<: *_base-current-pkgs
-      <<: *_version-current-pkgs
-      <<: *_x86_64-current-pkgs
-    svcs:
-      <<: *_base-current-svcs
-      <<: *_version-current-svcs
-      <<: *_x86_64-current-svcs
-    <<: *test
-    revision: 'test'
-  test-edge-x86_64:
-    <<: *_base-edge
-    <<: *_version-edge
-    <<: *_x86_64-edge
-    repos:
-      <<: *_base-edge-repos
-      <<: *_version-edge-repos
-      <<: *_x86_64-edge-repos
-    pkgs:
-      <<: *_base-edge-pkgs
-      <<: *_version-edge-pkgs
-      <<: *_x86_64-edge-pkgs
-    svcs:
-      <<: *_base-edge-svcs
-      <<: *_version-edge-svcs
-      <<: *_x86_64-edge-svcs
-    <<: *test
-
diff --git a/profiles/version/3.9 b/profiles/version/3.9
new file mode 100644
index 0000000..7c98ba1
--- /dev/null
+++ b/profiles/version/3.9
@@ -0,0 +1,13 @@
+### version 3.9 vars
+
+# start with base vars
+include "../base/current"
+
+# set version-specific vars
+version =     "3.9"
+release =     "3.9.3"
+end_of_life = null    # set to YYYY-MM-DD when known
+repos {
+  "http://dl-cdn.alpinelinux.org/alpine/v3.9/main":       true
+  "http://dl-cdn.alpinelinux.org/alpine/v3.9/community":  true
+}
diff --git a/profiles/version/3.9.yaml b/profiles/version/3.9.yaml
deleted file mode 100644
index 40c2307..0000000
--- a/profiles/version/3.9.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-### Version 3.9 Variables
-
-_version-3.9: &_version-3_9
-  # Versioning
-  version:      '3.9'
-  release:      '3.9.3'
-  #end_of_life:  'YYYY-MM-DD'  # set when known
-
-  # version repos/pkgs/svcs for 3.9
-  repos: &_version-3_9-repos
-    "http://dl-cdn.alpinelinux.org/alpine/v3.9/main":
-    "http://dl-cdn.alpinelinux.org/alpine/v3.9/community":
-  pkgs: &_version-3_9-pkgs {}
-  svcs: &_version-3_9-svcs {}
-
diff --git a/profiles/version/current b/profiles/version/current
new file mode 120000
index 0000000..a02597f
--- /dev/null
+++ b/profiles/version/current
@@ -0,0 +1 @@
+3.9
\ No newline at end of file
diff --git a/profiles/version/current.yaml b/profiles/version/current.yaml
deleted file mode 100644
index 855972c..0000000
--- a/profiles/version/current.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-### Current Version Variables
-
-_version-current: &_version-current
-  # from latest version
-  <<: *_version-3_9
-  # re-anchor for current
-  repos: &_version-current-repos
-    <<: *_version-3_9-repos
-  pkgs: &_version-current-pkgs
-    <<: *_version-3_9-pkgs
-  svcs: &_version-current-svcs
-    <<: *_version-3_9-svcs
-
diff --git a/profiles/version/edge b/profiles/version/edge
new file mode 100644
index 0000000..248d31c
--- /dev/null
+++ b/profiles/version/edge
@@ -0,0 +1,16 @@
+### edge vars
+
+# based on current
+include "current"
+
+# add edge-specific tweaks...
+version =     edge
+release =     edge
+end_of_life = "@TODAY@"
+revision =    "@NOW@"
+repos = null
+repos {
+  "http://dl-cdn.alpinelinux.org/alpine/edge/main":       true
+  "http://dl-cdn.alpinelinux.org/alpine/edge/community":  true
+  "http://dl-cdn.alpinelinux.org/alpine/edge/testing":    true
+}
diff --git a/profiles/version/edge.yaml b/profiles/version/edge.yaml
deleted file mode 100644
index 528d56c..0000000
--- a/profiles/version/edge.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-### Edge Version Variables
-
-_version-edge: &_version-edge
-  # from current version
-  <<: *_version-current
-  # overrides
-  version:      edge
-  release:      edge
-  end_of_life:  '@TODAY@'
-  revision:     '@NOW@'
-
-  # version repos/pkgs/svcs for edge
-  repos: &_version-edge-repos
-    http://dl-cdn.alpinelinux.org/alpine/edge/main:
-    http://dl-cdn.alpinelinux.org/alpine/edge/community:
-    http://dl-cdn.alpinelinux.org/alpine/edge/testing:
-  pkgs: &_version-edge-pkgs
-    <<: *_version-current-pkgs
-    # overrides (if any)
-  svcs: &_version-edge-svcs
-    <<: *_version-current-svcs
-    # overrides (if any)
-
diff --git a/scripts/resolve-profile.py.in b/scripts/resolve-profile.py.in
index 7312957..daae31f 100644
--- a/scripts/resolve-profile.py.in
+++ b/scripts/resolve-profile.py.in
@@ -1,19 +1,26 @@
 @PYTHON@
 
-import json, os, shutil, sys, time, yaml
+import json, os, shutil, sys, time
+from pyhocon import ConfigFactory
+
+script_dir = os.path.dirname(os.path.realpath(__file__))
 
 profile = sys.argv[1]
 
+# path to the profile config file
+profile_conf = os.path.join(script_dir, '..', 'profiles', profile + '.conf')
+
 # where we store profile's builds
-profile_dir = os.path.join( os.path.dirname(os.path.realpath(__file__)), 'profile')
+profile_dir = os.path.join(script_dir, 'profile')
 
+# TODO? make these dicts instead?
 # fold these list vars down to scalar
 fold_list_keys = [
     'ami_access', 'ami_regions'
 ]
 
-# parse stdin yaml and resolve refs
-builds = yaml.full_load(sys.stdin.read())['builds']
+# parse/resolve HOCON profile config, we need just the 'builds' portion
+builds = ConfigFactory.parse_file(profile_conf)['builds']
 
 # clean out any old builds
 if os.path.exists(profile_dir):
@@ -46,9 +53,11 @@ for bk, b in builds.items():
     # fold 'repos' hash to scalar
     repos = []
     for repo, v in b['repos'].items():
-        if v == None:                   # repo without alias
+        if v == True:
+            # repo without alias
             repos.append(repo)
-        elif v != False:                # repo with alias (False == skip repo)
+        elif not (v == False or v == None):
+            # repo with alias (skip repo when false/null)
             v.lstrip('@')
             repos.append(f"@{v} {repo}")
     b['repos'] = ','.join(str(x) for x in repos)
@@ -56,9 +65,11 @@ for bk, b in builds.items():
     # fold 'pkgs' hash to scalar
     pkgs = []
     for pkg, v in b['pkgs'].items():
-        if v == None:                   # unpinned package
+        if v == True:
+            # unpinned package
             pkgs.append(pkg)
-        elif v != False:                # repo-pinned package (False == skip package)
+        elif not (v == False or v == None):
+            # repo-pinned package (skip pkg when false/null)
             v.lstrip('@')
             pkgs.append(f'{pkg}@{v}')
     b['pkgs'] = ','.join(str(x) for x in pkgs)
@@ -71,9 +82,11 @@ for bk, b in builds.items():
         'shutdown': []
     }
     for svc, v in b['svcs'].items():
-        if v == None:                   # service in default runlevel
+        if v == True:
+            # service in default runlevel
             svcs['default'].append(svc)
-        elif v != False:                # service in specified runlevel (False == skip service)
+        elif not (v == False or v == None):
+            # service in specified runlevel (skip svc when false/null)
             svcs[v].append(svc)
     b['svcs'] = ':'.join(str(l) + '=' + ','.join(str(s) for s in ss) for l, ss in svcs.items())