From: Dan Theisen <djt@isc.org>
Date: Wed, 29 Jun 2022 21:23:25 +0000 (-0700)
Subject: [#2491] Add hammer support for alpine 3.16
X-Git-Tag: Kea-2.2.0~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ca144242fbd2be718effdfd064d4c83533c537f;p=thirdparty%2Fkea.git

[#2491] Add hammer support for alpine 3.16
---

diff --git a/ChangeLog b/ChangeLog
index 92820d6976..e04efe9859 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2040.	[func]		djt
+	Added support for Alpine 3.16 in hammer.py.
+	(Gitlab #2491)
+
 2039.	[doc]		andrei
 	Updated limits hook library ARM documentation to reflect
 	support for lease limits.
diff --git a/hammer.py b/hammer.py
index 3414867f2f..aefefed65b 100755
--- a/hammer.py
+++ b/hammer.py
@@ -88,11 +88,12 @@ SYSTEMS = {
     ],
     'alpine': [
         #'3.10',   # EOLed
-        '3.11',
-        '3.12',
+        #'3.11',   # EOLed
+        #'3.12',   # EOLed
         '3.13',
         '3.14',
         '3.15',
+        '3.16',
     ],
     'arch': []
 }
@@ -162,6 +163,7 @@ IMAGE_TEMPLATES = {
     'alpine-3.13-lxc':         {'bare': 'isc/lxc-alpine-3.13',         'kea': 'isc/kea-alpine-3.13'},
     'alpine-3.14-lxc':         {'bare': 'isc/lxc-alpine-3.14',         'kea': 'isc/kea-alpine-3.14'},
     'alpine-3.15-lxc':         {'bare': 'isc/lxc-alpine-3.15',         'kea': 'isc/kea-alpine-3.15'},
+    'alpine-3.16-lxc':         {'bare': 'isc/lxc-alpine-3.16',         'kea': 'isc/kea-alpine-3.16'},
 }
 
 # NOTES
@@ -1814,7 +1816,7 @@ def prepare_system_local(features, check_times):
     elif system == 'alpine':
 
         packages = ['gcc', 'g++', 'make', 'autoconf', 'automake', 'libtool', 'openssl-dev',
-                    'boost-libs', 'boost-dev', 'procps', 'tar']
+                    'boost-libs', 'boost-dev', 'procps', 'tar', 'log4cplus', 'log4cplus-dev']
 
         if 'docs' in features:
             if revision == '3.10':
@@ -1856,10 +1858,6 @@ def prepare_system_local(features, check_times):
 
         install_pkgs(packages, env=env, timeout=6 * 60, check_times=check_times)
 
-        # log4cplus needs to be taken from extra repository, edge testing
-        execute('sudo apk add log4cplus log4cplus-dev --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted',
-                env=env, timeout=60, check_times=check_times)
-
         # check for existence of 'vagrant' user and 'abuild' group before adding him to the group
         try:
             pwd.getpwnam('vagrant')