Move the fips toolchain-go-ubuntu back to ubuntu (#761)

packages/system/immucore/build.yaml

@@ -2,7 +2,7 @@
 requires:
   - name: "toolchain-go-ubuntu"
     category: "fips"
-    version: ">=0"
+    version: ">=1.19.10+1"
 {{else}}
 requires:
   - name: "toolchain-go-ubuntu"
@@ -36,8 +36,8 @@ steps:
 {{end}}
   - mkdir -p /usr/lib/dracut/modules.d
   - mkdir -p /etc/dracut.conf.d/
-  - cp -r {{.Values.name}}/dracut/28immucore /usr/lib/dracut/modules.d/28immucore
-  - cp {{.Values.name}}/dracut/10-immucore.conf /etc/dracut.conf.d/10-immucore.conf
+  - cp -r go/src/github.com/${GITHUB_ORG}/{{.Values.name}}/dracut/28immucore /usr/lib/dracut/modules.d/28immucore
+  - cp go/src/github.com/${GITHUB_ORG}/{{.Values.name}}/dracut/10-immucore.conf /etc/dracut.conf.d/10-immucore.conf
 includes:
   - /usr/bin/{{.Values.name}}
   - /usr/lib/dracut/modules.d/28immucore

packages/system/immucore/collection.yaml

@@ -1,7 +1,7 @@
 packages:
   - name: "immucore"
     category: "system"
-    version: "0.1.21+1"
+    version: "0.1.21+2"
     labels:
       github.repo: "immucore"
       autobump.revdeps: "true"
@@ -12,7 +12,7 @@ packages:
     description: "The Kairos immutability management interface"
   - name: "immucore"
     category: "fips"
-    version: "0.1.21+1"
+    version: "0.1.21+2"
     labels:
       github.repo: "immucore"
       autobump.revdeps: "true"

packages/toolchain-go/build.yaml

@@ -16,4 +16,7 @@ prelude:
 - mv upx-4.2.2-{{ .Values.arch }}_linux/upx /usr/bin/
 - rm -rf upx-4.2.2-{{ .Values.arch }}_linux
 - chmod +x /usr/bin/upx
+{{ end }}
+{{ if eq .Values.variant "bullseye" }}
+- apt-get update && apt-get install -y curl xz-utils upx
 {{ end }}

packages/toolchain-go/collection.yaml

@@ -67,12 +67,6 @@ packages:
     version: "1.19.10"
     tag: "1.19.10"
     hidden: true
-  - name: toolchain-go-ubuntu
-    variant: "bookworm"
-    category: fips
-    version: "1.19.10"
-    tag: "1.19.10"
-    hidden: true
   - name: toolchain-go
     category: fips
     variant: "alpine"
@@ -80,8 +74,8 @@ packages:
     tag: "1.19.10"
     hidden: true
   - name: toolchain-go-ubuntu
-    variant: "bookworm"
+    variant: "bullseye"
     category: fips
-    version: "1.19.10"
+    version: "1.19.10+1"
     tag: "1.19.10"
     hidden: true