Skip to content

Commit

Permalink
Merge branch 'ubuntu-20.04' into ubuntu-20.04
Browse files Browse the repository at this point in the history
  • Loading branch information
cjdcordeiro authored Feb 28, 2024
2 parents aff8574 + 4adcac2 commit f4c7de2
Show file tree
Hide file tree
Showing 8 changed files with 222 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ jobs:
if: github.event_name == 'pull_request'
name: CLA check
uses: canonical/chisel-releases/.github/workflows/cla-check.yaml@main

installability-tests:
name: Installability tests
uses: canonical/chisel-releases/.github/workflows/install-slices.yaml@main
37 changes: 37 additions & 0 deletions chisel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,40 @@ archives:
version: 20.04
components: [main, universe]
suites: [focal, focal-security, focal-updates]
v1-public-keys: [ubuntu-archive-key-2018]

v1-public-keys:
# Ubuntu Archive Automatic Signing Key (2018) <[email protected]>
# rsa4096/f6ecb3762474eda9d21b7022871920d1991bc93c 2018-09-17T15:01:46Z
ubuntu-archive-key-2018:
id: "871920D1991BC93C"
armor: |
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBFufwdoBEADv/Gxytx/LcSXYuM0MwKojbBye81s0G1nEx+lz6VAUpIUZnbkq
dXBHC+dwrGS/CeeLuAjPRLU8AoxE/jjvZVp8xFGEWHYdklqXGZ/gJfP5d3fIUBtZ
HZEJl8B8m9pMHf/AQQdsC+YzizSG5t5Mhnotw044LXtdEEkx2t6Jz0OGrh+5Ioxq
X7pZiq6Cv19BohaUioKMdp7ES6RYfN7ol6HSLFlrMXtVfh/ijpN9j3ZhVGVeRC8k
KHQsJ5PkIbmvxBiUh7SJmfZUx0IQhNMaDHXfdZAGNtnhzzNReb1FqNLSVkrS/Pns
AQzMhG1BDm2VOSF64jebKXffFqM5LXRQTeqTLsjUbbrqR6s/GCO8UF7jfUj6I7ta
LygmsHO/JD4jpKRC0gbpUBfaiJyLvuepx3kWoqL3sN0LhlMI80+fA7GTvoOx4tpq
VlzlE6TajYu+jfW3QpOFS5ewEMdL26hzxsZg/geZvTbArcP+OsJKRmhv4kNo6Ayd
yHQ/3ZV/f3X9mT3/SPLbJaumkgp3Yzd6t5PeBu+ZQk/mN5WNNuaihNEV7llb1Zhv
Y0Fxu9BVd/BNl0rzuxp3rIinB2TX2SCg7wE5xXkwXuQ/2eTDE0v0HlGntkuZjGow
DZkxHZQSxZVOzdZCRVaX/WEFLpKa2AQpw5RJrQ4oZ/OfifXyJzP27o03wQARAQAB
tEJVYnVudHUgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTgpIDxm
dHBtYXN0ZXJAdWJ1bnR1LmNvbT6JAjgEEwEKACIFAlufwdoCGwMGCwkIBwMCBhUI
AgkKCwQWAgMBAh4BAheAAAoJEIcZINGZG8k8LHMQAKS2cnxz/5WaoCOWArf5g6UH
beOCgc5DBm0hCuFDZWWv427aGei3CPuLw0DGLCXZdyc5dqE8mvjMlOmmAKKlj1uG
g3TYCbQWjWPeMnBPZbkFgkZoXJ7/6CB7bWRht1sHzpt1LTZ+SYDwOwJ68QRp7DRa
Zl9Y6QiUbeuhq2DUcTofVbBxbhrckN4ZteLvm+/nG9m/ciopc66LwRdkxqfJ32Cy
q+1TS5VaIJDG7DWziG+Kbu6qCDM4QNlg3LH7p14CrRxAbc4lvohRgsV4eQqsIcdF
kuVY5HPPj2K8TqpY6STe8Gh0aprG1RV8ZKay3KSMpnyV1fAKn4fM9byiLzQAovC0
LZ9MMMsrAS/45AvC3IEKSShjLFn1X1dRCiO6/7jmZEoZtAp53hkf8SMBsi78hVNr
BumZwfIdBA1v22+LY4xQK8q4XCoRcA9G+pvzU9YVW7cRnDZZGl0uwOw7z9PkQBF5
KFKjWDz4fCk+K6+YtGpovGKekGBb8I7EA6UpvPgqA/QdI0t1IBP0N06RQcs1fUaA
QEtz6DGy5zkRhR4pGSZn+dFET7PdAjEK84y7BdY4t+U1jcSIvBj0F2B7LwRL7xGp
SpIKi/ekAXLs117bvFHaCvmUYN7JVp1GMmVFxhIdx6CFm3fxG8QjNb5tere/YqK+
uOgcXny1UlwtCUzlrSaP
=9AdM
-----END PGP PUBLIC KEY BLOCK-----
21 changes: 21 additions & 0 deletions slices/bash.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package: bash

slices:
config:
contents:
/etc/bash.bashrc:
/etc/skel/.bash_logout:
/etc/skel/.bashrc:
/etc/skel/.profile:

bins:
essential:
- bash_config
- libc6_libs
- libtinfo6_libs
contents:
# user should manually link /bin/sh to /bin/bash
/bin/bash:
/bin/rbash:
/usr/bin/clear_console:
/usr/bin/bashbug:
122 changes: 122 additions & 0 deletions slices/coreutils.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
package: coreutils

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/coreutils/libstdbuf.so:

bins:
essential:
- coreutils_libs
- libacl1_libs
- libattr1_libs
- libc6_libs
- libselinux1_libs
contents:
/bin/cat:
/bin/chgrp:
/bin/chmod:
/bin/chown:
/bin/cp:
/bin/date:
/bin/dd:
/bin/df:
/bin/dir:
/bin/echo:
/bin/false:
/bin/ln:
/bin/ls:
/bin/mkdir:
/bin/mknod:
/bin/mktemp:
/bin/mv:
/bin/pwd:
/bin/readlink:
/bin/rm:
/bin/rmdir:
/bin/sleep:
/bin/stty:
/bin/sync:
/bin/touch:
/bin/true:
/bin/uname:
/bin/vdir:
/usr/bin/[:
/usr/bin/arch:
/usr/bin/b2sum:
/usr/bin/base32:
/usr/bin/base64:
/usr/bin/basename:
/usr/bin/chcon:
/usr/bin/cksum:
/usr/bin/comm:
/usr/bin/csplit:
/usr/bin/cut:
/usr/bin/dircolors:
/usr/bin/dirname:
/usr/bin/du:
/usr/bin/env:
/usr/bin/expand:
/usr/bin/expr:
/usr/bin/factor:
/usr/bin/fmt:
/usr/bin/fold:
/usr/bin/groups:
/usr/bin/head:
/usr/bin/hostid:
/usr/bin/id:
/usr/bin/install:
/usr/bin/join:
/usr/bin/link:
/usr/bin/logname:
/usr/bin/md5sum:
/usr/bin/md5sum.textutils:
/usr/bin/mkfifo:
/usr/bin/nice:
/usr/bin/nl:
/usr/bin/nohup:
/usr/bin/nproc:
/usr/bin/numfmt:
/usr/bin/od:
/usr/bin/paste:
/usr/bin/pathchk:
/usr/bin/pinky:
/usr/bin/pr:
/usr/bin/printenv:
/usr/bin/printf:
/usr/bin/ptx:
/usr/bin/realpath:
/usr/bin/runcon:
/usr/bin/seq:
/usr/bin/sha1sum:
/usr/bin/sha224sum:
/usr/bin/sha256sum:
/usr/bin/sha384sum:
/usr/bin/sha512sum:
/usr/bin/shred:
/usr/bin/shuf:
/usr/bin/sort:
/usr/bin/split:
/usr/bin/stat:
/usr/bin/stdbuf:
/usr/bin/sum:
/usr/bin/tac:
/usr/bin/tail:
/usr/bin/tee:
/usr/bin/test:
/usr/bin/timeout:
/usr/bin/tr:
/usr/bin/truncate:
/usr/bin/tsort:
/usr/bin/tty:
/usr/bin/unexpand:
/usr/bin/uniq:
/usr/bin/unlink:
/usr/bin/users:
/usr/bin/wc:
/usr/bin/who:
/usr/bin/whoami:
/usr/bin/yes:
/usr/sbin/chroot:
8 changes: 8 additions & 0 deletions slices/libacl1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libacl1

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libacl.so.1*:
13 changes: 13 additions & 0 deletions slices/libattr1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package: libattr1

slices:
config:
contents:
/etc/xattr.conf:

libs:
essential:
- libattr1_config
- libc6_libs
contents:
/usr/lib/*-linux-*/libattr.so.1*:
15 changes: 15 additions & 0 deletions slices/openjdk-8-jre-headless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,18 @@ slices:
/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/*/libjsig.so:
/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/*/server/libjsig.so:
arch:
- amd64
- arm64
- ppc64el
/usr/lib/jvm/java-8-openjdk-*/jre/lib/*/server/libjvm.so:
arch:
- amd64
- arm64
- ppc64el
/usr/lib/jvm/java-8-openjdk-*/jre/lib/hijrah-config-umalqura.properties:
/usr/lib/jvm/java-8-openjdk-*/jre/lib/calendars.properties:
/usr/lib/jvm/java-8-openjdk-*/jre/lib/content-types.properties:
Expand Down Expand Up @@ -121,6 +131,11 @@ slices:
- openjdk-8-jre-headless_core
contents:
/usr/lib/jvm/java-8-openjdk-*/jre/lib/jfr.jar:
arch:
- amd64
- arm64
- armhf
- ppc64el

# Shared libraries for supporting heap profilling.
hprof:
Expand Down
3 changes: 2 additions & 1 deletion slices/openssl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ slices:

config:
contents:
/etc/ssl/private/:
/etc/ssl/certs/:
/etc/ssl/openssl.cnf:
/etc/ssl/private/:
/usr/lib/ssl/certs:
/usr/lib/ssl/openssl.cnf:
/usr/lib/ssl/private:

0 comments on commit f4c7de2

Please sign in to comment.