Build packages for Ubuntu 21.04 (Hirsute)

Author: rojer

tools/deploy_mos.py

@@ -37,7 +37,7 @@
 GPG_KEY_PATH = os.path.join(os.environ["HOME"], ".gnupg-cesantabot")
 BUILD_DEB_PATH = os.path.join("tools", "ubuntu", "build-deb.sh")
 UPLOAD_DEB_PATH = os.path.join("tools", "ubuntu", "upload-deb.sh")
-UBUNTU_VERSIONS = ["xenial", "bionic", "focal", "groovy"]
+UBUNTU_VERSIONS = ["xenial", "bionic", "focal", "groovy", "hirsute"]
 
 deb_package = "mos-latest"
 tag_effective = "latest"

tools/docker/golang/Makefile

@@ -1,6 +1,6 @@
 all: build-all
 
-UBUNTU_DISTRS := xenial bionic focal groovy
+UBUNTU_DISTRS := xenial bionic focal groovy hirsute
 
 build-all: $(foreach u,$(UBUNTU_DISTRS),docker-build-ubuntu-golang-$(u)) docker-build-ubuntu32-golang-bionic docker-build-golang-mingw
 

tools/ubuntu/mos-hirsute.recipe

@@ -0,0 +1,6 @@
+# git-build-recipe format 0.4 deb-version {latest-tag}+{git-commit}~hirsute0
+
+# Build from local repo (volume-mount a clone of https://github.com/mongoose-os/mos.git to /src):
+/src 1.11_CHANGE_ME
+merge deb-release https://github.com/mongoose-os/mos.git deb-release
+run rsync -a /src/vendor/ vendor/

tools/ubuntu/mos-latest-hirsute.recipe

@@ -0,0 +1,6 @@
+# git-build-recipe format 0.4 deb-version {revtime}+{git-commit}~hirsute0
+
+# Build from local repo (volume-mount a clone of https://github.com/mongoose-os/mos.git to /src):
+/src master
+merge deb-latest https://github.com/mongoose-os/mos.git deb-latest
+run rsync -a /src/vendor/ vendor/

version/version_util.go

@@ -44,7 +44,7 @@ var (
 	regexpVersionNumber = regexp.MustCompile(`^\d+\.[0-9.]*$`)
 	regexpBuildIdDistr  = regexp.MustCompile(`^(?P<version>[^+]+)\+(?P<hash>[^~]+)\~(?P<distr>[^\d]+)\d+$`)
 
-	ubuntuDistrNames = []string{"xenial", "bionic", "focal", "groovy"}
+	ubuntuDistrNames = []string{"xenial", "bionic", "focal", "groovy", "hirsute"}
 )
 
 // GetMosVersion returns this binary's version, or "latest" if it's not a release build.