Fix edge builds (#78)

alpine-mirrors package removed after 3.12

also add profile for 3.12

8 files changed, 123 insertions, 7 deletions

diff --git a/profiles/base/2 b/profiles/base/2
new file mode 100644
index 0000000..ae58f06
--- /dev/null
+++ b/profiles/base/2
@@ -0,0 +1,103 @@
+### base vars, revision 1
+# vim: ts=2 et:
+
+# Profile/Build
+profile       = null
+profile_build = null
+revision      = "r0"
+
+# Versioning
+version     = null
+release     = null
+end_of_life = null
+
+# Architecture
+arch        = null
+build_arch  = null
+
+# Builder-instance
+build_region          = "us-west-2"
+build_subnet          = null
+build_instance_type   = "t3.nano"
+build_public_ip       = null
+build_user            = "ec2-user"
+build_ami_name        = "amzn2-ami-hvm-2.0.*-gp2"
+build_ami_owner       = "137112412989"
+build_ami_latest      = "true"
+
+# AMI build/deploy
+aws_profile     = null  # AWS profile to build AMI
+aws_accounts    = null  # comma-separated AWS accounts allowed to launch AMI
+ami_name_prefix = "alpine-ami-"
+ami_name_suffix = ""
+ami_desc_prefix = "Alpine Linux "
+ami_desc_suffix = ""
+ami_volume_size = "1"
+ami_encrypt     = "false"
+ami_user        = "alpine"  # modification currently not supported
+
+# NOTE: the following are python format strings, resolved in resolve-profile.py
+ami_name        = "{var.ami_name_prefix}{var.release}-{var.arch}-{var.revision}{var.ami_name_suffix}"
+ami_desc        = "{var.ami_desc_prefix}{var.release} {var.arch} {var.revision}{var.ami_desc_suffix}"
+
+# AMI configuration
+apk_tools           = null
+apk_tools_sha256    = null
+alpine_keys         = null
+alpine_keys_sha256  = null
+repos {}
+pkgs {
+  linux-virt          = true
+  chrony              = true
+  nvme-cli            = true
+  openssh             = true
+  sudo                = true
+  tiny-ec2-bootstrap  = true
+  tzdata              = true
+}
+svcs {
+  sysinit {
+    devfs               = true
+    dmesg               = true
+    hwdrivers           = true
+    mdev                = true
+  }
+  boot {
+    acpid               = true
+    bootmisc            = true
+    hostname            = true
+    hwclock             = true
+    modules             = true
+    swap                = true
+    sysctl              = true
+    syslog              = true
+  }
+  default {
+    chronyd             = true
+    networking          = true
+    sshd                = true
+    tiny-ec2-bootstrap  = true
+  }
+  shutdown {
+    killprocs           = true
+    mount-ro            = true
+    savecache           = true
+  }
+}
+kernel_modules {
+  sd-mod      = true
+  usb-storage = true
+  ext4        = true
+  nvme        = true
+  ena         = true
+}
+kernel_options {
+  "console=ttyS0,115200n8"          = true
+  "nvme_core.io_timeout=4294967295" = true
+}
+# NOTE: nvme and ena are critical for i3, a1, m6g, and anything in the 5 series
+# forward. Without them these instances will not boot.
+initfs_features {
+  nvme        = true
+  ena         = true
+}
diff --git a/profiles/base/current b/profiles/base/current
index 56a6051..d8263ee 120000
--- a/profiles/base/current
+++ b/profiles/base/current
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file
diff --git a/profiles/version/3.10 b/profiles/version/3.10
index a83dff2..17a657f 100644
--- a/profiles/version/3.10
+++ b/profiles/version/3.10
@@ -2,7 +2,7 @@
 # vim: ts=2 et:
 
 # start with base vars
-include required("../base/current")
+include required("../base/1")
 
 # set version-specific vars
 version     = "3.10"
diff --git a/profiles/version/3.11 b/profiles/version/3.11
index 4f0a55d..f46a210 100644
--- a/profiles/version/3.11
+++ b/profiles/version/3.11
@@ -2,7 +2,7 @@
 # vim: ts=2 et:
 
 # start with base vars
-include required("../base/current")
+include required("../base/1")
 
 # set version-specific vars
 version     = "3.11"
diff --git a/profiles/version/3.12 b/profiles/version/3.12
new file mode 100644
index 0000000..c51bb39
--- /dev/null
+++ b/profiles/version/3.12
@@ -0,0 +1,14 @@
+### version 3.12 vars
+# vim: ts=2 et:
+
+# start with base vars
+include required("../base/1")
+
+# set version-specific vars
+version     = "3.12"
+release     = "3.12.0"
+end_of_life = "2022-06-01"
+repos {
+  "http://dl-cdn.alpinelinux.org/alpine/v3.12/main"      = true
+  "http://dl-cdn.alpinelinux.org/alpine/v3.12/community" = true
+}
diff --git a/profiles/version/3.9 b/profiles/version/3.9
index 7f5a7e8..f129b58 100644
--- a/profiles/version/3.9
+++ b/profiles/version/3.9
@@ -2,7 +2,7 @@
 # vim: ts=2 et:
 
 # start with base vars
-include required("../base/current")
+include required("../base/1")
 
 # set version-specific vars
 version     = "3.9"
diff --git a/profiles/version/current b/profiles/version/current
index 902b2c9..fdcfcfd 120000
--- a/profiles/version/current
+++ b/profiles/version/current
@@ -1 +1 @@
-3.11
\ No newline at end of file
+3.12
\ No newline at end of file
diff --git a/profiles/version/edge b/profiles/version/edge
index 07a04b0..07c583d 100644
--- a/profiles/version/edge
+++ b/profiles/version/edge
@@ -2,7 +2,7 @@
 # vim: ts=2 et:
 
 # based on current
-include required("current")
+include required("../base/current")
 
 # add edge-specific tweaks...
 version     = "edge"
@@ -10,7 +10,6 @@ release     = "edge"
 end_of_life = "@TOMORROW@"
 revision    = "@NOW@"
 
-repos = null  # remove all values from 'current'
 repos {
   "http://dl-cdn.alpinelinux.org/alpine/edge/main"      = true
   "http://dl-cdn.alpinelinux.org/alpine/edge/community" = true