Merge branch 'ubuntu-22.04' into rework_add-networking-lib

chisel.yaml

@@ -2,6 +2,7 @@ format: v1
 
 archives:
   ubuntu:
+    default: true
     version: 22.04
     components: [main, universe]
     suites: [jammy, jammy-security, jammy-updates]

slices/base-files.yaml

@@ -64,6 +64,13 @@ slices:
       /etc/os-release:
       /usr/lib/os-release:
 
+  # Dedicated slice for generating the Chisel manifest.
+  chisel:
+    essential:
+      - base-files_var
+    contents:
+      /var/lib/chisel/**: {generate: manifest}
+
   copyright:
     contents:
       /usr/share/doc/base-files/copyright:

slices/crun.yaml

@@ -0,0 +1,22 @@
+package: crun
+
+essential:
+  - crun_copyright
+
+slices:
+  bins:
+    essential:
+      - crun_libs
+      - libc6_libs
+      - libcap2_libs
+      - libseccomp2_libs
+      - libsystemd0_libs
+      - libyajl2_libs
+    contents:
+      /usr/bin/crun:
+  libs:
+    contents:
+      /usr/lib/*-linux-*/libcrun.a:
+  copyright:
+    contents:
+      /usr/share/doc/crun/copyright:

slices/libaudit-common.yaml

@@ -0,0 +1,12 @@
+package: libaudit-common
+
+essential:
+  - libaudit-common_copyright
+
+slices:
+  config:
+    contents:
+      /etc/libaudit.conf:
+  copyright:
+    contents:
+      /usr/share/doc/libaudit-common/copyright:

slices/libaudit1.yaml

@@ -0,0 +1,16 @@
+package: libaudit1
+
+essential:
+  - libaudit1_copyright
+
+slices:
+  libs:
+    essential:
+      - libaudit-common_config
+      - libc6_libs
+      - libcap-ng0_libs
+    contents:
+      /lib/*-linux-*/libaudit.so.1*:
+  copyright:
+    contents:
+      /usr/share/doc/libaudit1/copyright:

slices/libcap-ng0.yaml

@@ -0,0 +1,14 @@
+package: libcap-ng0
+
+essential:
+  - libcap-ng0_copyright
+
+slices:
+  libs:
+    essential:
+      - libc6_libs
+    contents:
+      /lib/*-linux-*/libcap-ng.so.0*:
+  copyright:
+    contents:
+      /usr/share/doc/libcap-ng0/copyright:

slices/libcap2.yaml

@@ -0,0 +1,14 @@
+package: libcap2
+
+essential:
+  - libcap2_copyright
+
+slices:
+  libs:
+    essential:
+      - libc6_libs
+    contents:
+      /lib/*-linux-*/libcap.so.2*:
+  copyright:
+    contents:
+      /usr/share/doc/libcap2/copyright:

slices/liblz4-1.yaml

@@ -0,0 +1,14 @@
+package: liblz4-1
+
+essential:
+  - liblz4-1_copyright
+
+slices:
+  libs:
+    essential:
+      - libc6_libs
+    contents:
+      /usr/lib/*-linux-*/liblz4.so.1*:
+  copyright:
+    contents:
+      /usr/share/doc/liblz4-1/copyright:

slices/libseccomp2.yaml

@@ -0,0 +1,14 @@
+package: libseccomp2
+
+essential:
+  - libseccomp2_copyright
+
+slices:
+  libs:
+    essential:
+      - libc6_libs
+    contents:
+      /usr/lib/*-linux-*/libseccomp.so.2*:
+  copyright:
+    contents:
+      /usr/share/doc/libseccomp2/copyright:

slices/libsystemd0.yaml

@@ -0,0 +1,19 @@
+package: libsystemd0
+
+essential:
+  - libsystemd0_copyright
+
+slices:
+  libs:
+    essential:
+      - libc6_libs
+      - libcap2_libs
+      - libgcrypt20_libs
+      - liblz4-1_libs
+      - liblzma5_libs
+      - libzstd1_libs
+    contents:
+      /usr/lib/*-linux-*/libsystemd.so.0*:
+  copyright:
+    contents:
+      /usr/share/doc/libsystemd0/copyright:

slices/libyajl2.yaml

@@ -0,0 +1,14 @@
+package: libyajl2
+
+essential:
+  - libyajl2_copyright
+
+slices:
+  libs:
+    essential:
+      - libc6_libs
+    contents:
+      /usr/lib/*-linux-*/libyajl.so.2*:
+  copyright:
+    contents:
+      /usr/share/doc/libyajl2/copyright:

slices/openjdk-8-jre-headless.yaml

@@ -10,6 +10,8 @@ slices:
       - libc6_libs
       - libgcc-s1_libs
       - libstdc++6_libs
+      - openjdk-8-jre-headless_client-vm
+      - openjdk-8-jre-headless_server-vm
       - zlib1g_libs
     contents:
       /etc/java-8-openjdk/calendars.properties:
@@ -20,8 +22,6 @@ slices:
       # various classes and how they can interact with the system.
       /etc/java-8-openjdk/security/java.policy:
       /usr/lib/jvm/java-8-openjdk-*/jre/bin/java:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/client/libjsig.so: {arch: armhf}
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/client/libjvm.so: {arch: armhf}
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/jli/libjli.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/jvm.cfg-default:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libjava.so:
@@ -30,17 +30,6 @@ slices:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libnio.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libverify.so:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/libzip.so:
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/server/libjsig.so:
-        arch:
-          - amd64
-          - arm64
-          - ppc64el
-      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/server/libjvm.so:
-        arch:
-          - amd64
-          - arm64
-          - ppc64el
-          - s390x
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/calendars.properties:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/content-types.properties:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/currency.data:
@@ -53,6 +42,33 @@ slices:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/security/java.policy:
       /usr/lib/jvm/java-8-openjdk-*/jre/lib/tzdb.dat:
 
+  client-vm:
+    essential:
+      - libc6_libs
+      - libgcc-s1_libs
+      - libstdc++6_libs
+    contents:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/client/libjsig.so: {arch: armhf}
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/client/libjvm.so: {arch: armhf}
+
+  server-vm:
+    essential:
+      - libc6_libs
+      - libgcc-s1_libs
+      - libstdc++6_libs
+    contents:
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/server/libjsig.so:
+        arch:
+          - amd64
+          - arm64
+          - ppc64el
+      /usr/lib/jvm/java-8-openjdk-*/jre/lib/*/server/libjvm.so:
+        arch:
+          - amd64
+          - arm64
+          - ppc64el
+          - s390x
+
   locale:
     essential:
       - openjdk-8-jre-headless_core

slices/uidmap.yaml

@@ -0,0 +1,17 @@
+package: uidmap
+
+essential:
+  - uidmap_copyright
+
+slices:
+  bins:
+    essential:
+      - libaudit1_libs
+      - libc6_libs
+      - libselinux1_libs
+    contents:
+      /usr/bin/newgidmap:
+      /usr/bin/newuidmap:
+  copyright:
+    contents:
+      /usr/share/doc/uidmap/copyright:

spread.yaml

@@ -86,16 +86,16 @@ backends:
 prepare: |
   # Deb arch to GOARCH
   arch="$(dpkg --print-architecture | sed -e 's/armhf/arm/g' -e 's/ppc64el/ppc64le/g')"
-  chisel_tar="chisel.tar.gz"
 
   apt install -y curl wget
   curl -s https://api.github.com/repos/canonical/chisel/releases/latest \
     | awk "/browser_download_url/ && /chisel_v/ && /$arch/" \
     | cut -d : -f 2,3 \
     | tr -d \" \
-    | xargs wget -O $chisel_tar
+    | xargs wget
 
-  tar -xf $chisel_tar -C /usr/local/bin
+  sha384sum -c chisel_v*sha384
+  tar -xf chisel_v*tar.gz -C /usr/local/bin
 
 prepare-each: chisel version
 

tests/spread/integration/crun/task.yaml

@@ -0,0 +1,14 @@
+summary: Integration tests for crun
+
+execute: |
+  rootfs="$(install-slices crun_bins)"
+
+  # crun needs proc mounted
+  mkdir "${rootfs}"/proc
+  mount --bind /proc "${rootfs}"/proc
+
+  chroot "$rootfs" crun --help
+  chroot "$rootfs" crun list 
+
+  chroot "$rootfs" crun spec
+  test -f "$rootfs"/config.json