Skip to content

Commit

Permalink
Merge branch 'ubuntu-24.04' into slices/util-linux
Browse files Browse the repository at this point in the history
  • Loading branch information
cjdcordeiro authored Dec 19, 2024
2 parents e67679d + 3801300 commit 9bf19e6
Show file tree
Hide file tree
Showing 122 changed files with 3,916 additions and 27 deletions.
93 changes: 92 additions & 1 deletion chisel.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,34 @@
format: v1

archives:
# archive.ubuntu.com/ubuntu/ (amd64, i386)
# ports.ubuntu.com/ubuntu-ports/ (other arch)
ubuntu:
default: true
priority: 10
version: 24.04
components: [main, universe]
suites: [noble, noble-security, noble-updates]
public-keys: [ubuntu-archive-key-2018]

v2-archives:
# esm.ubuntu.com/apps/ubuntu/
ubuntu-esm-apps:
pro: esm-apps
priority: 16
version: 24.04
components: [main]
suites: [noble-apps-security, noble-apps-updates]
public-keys: [ubuntu-apps-key]

# esm.ubuntu.com/infra/ubuntu/
ubuntu-esm-infra:
pro: esm-infra
priority: 15
version: 24.04
components: [main]
suites: [noble-infra-security, noble-infra-updates]
public-keys: [ubuntu-esm-key-v2]

public-keys:
# Ubuntu Archive Automatic Signing Key (2018) <[email protected]>
# rsa4096/f6ecb3762474eda9d21b7022871920d1991bc93c 2018-09-17T15:01:46Z
Expand Down Expand Up @@ -43,3 +64,73 @@ public-keys:
uOgcXny1UlwtCUzlrSaP
=9AdM
-----END PGP PUBLIC KEY BLOCK-----
# Ubuntu Apps Automatic Signing Key <[email protected]>.
# rsa4096/e8a443ce358113d187bee0e6ab01a101db53907b 2019-11-21T09:08:30Z
ubuntu-apps-key:
id: "AB01A101DB53907B"
armor: |
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBF3WVA4BEAC7MDr8HClfKptSd4VeB12Vy+Ao/4NpY2ITdkRed4vfh/4eBWWn
3+in6So2ekweifACSxScB/M9zVObsI1cab7QPMkIiATNUfIyOEP7iNWLX4+AytM1
LP3bZo8OpghnLZNstCGbiRUO4CDNmCI04DOPCu9EVEO4WWNuWIMRwCLShDSf7Cid
J2fn2TT/7vsmA4eI3YnAne+u8g4X2zMHQFkHANhylB0lPyThXo5jaxHImzm4wf/2
LF8f1Y1nRQObS2jcvYc3fm9B7iOGpyNAw3h6hrPKH5T9tY/ZoMtFHqn66J1CBSHb
hDkEvA46X50su4yAHeSiEG/hMYG7SoHzmAsjEXnvkTIE41WhmxlidQnRs2uWy34U
7VmOpaidWn3R99fNHYOtSOB6bpIvls8snWSQ63jcFXnt05nVZsp/Ixzl0Oqitynx
DFwoxEwt3ZuCHwxbx2vZ+FiZXVFN7I0IyBDOEL6XS27FNaMCZ7Q/6z/ckdWto55E
264OWf9lnw31bXFXHWSusRXWzD6FK8dqWgjtrWwRxlvF4jm688lqpjac6fFES3UK
BhjyHXFGL/+HHZ9CNxlLYF5QnXq1mGR0Ykw975u8KoOFSLBqsx+1a21m6dfzujY7
2Gq6Sju+9Yo1aOF+CNvTMYdRBoDL4sFj6VAmUsszMA5aAb+82pOCaDvGJQARAQAB
tDVVYnVudHUgQXBwcyBBdXRvbWF0aWMgU2lnbmluZyBLZXkgPGVzbUBjYW5vbmlj
YWwuY29tPokCOAQTAQIAIgUCXdZUDgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgEC
F4AACgkQqwGhAdtTkHuTOw/8Czv42TSpwHz+eNtl3ZFyxta9rR/qWC3h+vMu0R/l
5KU3aQQOygWOoUcr1QTPSSg3v/H+v/8vqVq2UuUxSIfpMxBj2kIX2vqskv6Roez7
xR8lVDa0a47z/NYMfKpxrEJxOLh/c7I6aAsa597bTqDHtucHL/22BvfUJJqw6jq1
7SswP5lqKPBFz7x+E2hgfJE7Vn7h0ICm29FkWnOeTKfj8VwTAeKXKUI9Hw6+aqr9
29Y2NdLsYZ57mpivRLNM9sBZoF3avP1pUC2k0IwP3dwh4AxUMXjRRPh173iXBfR2
yAf1lWET/5+8dSBrfFIZSo+FF/EEBmqIVtJpHkq8+YxUbCLbkoikRi2kwrgyXLEn
FqxSU2Ab0xurFHiHcJoCGVD38xjznO5cQl7H4K9+B/rFpTTowOHbOcFpKAzpYqB5
8rnR1yRSsB33zac8xesUIfzYWRtLc5/VIb5mOkWlb62d8emILx2XuRFVjKq6mKki
oGckhDUOuEFrjW1cQq+PWBBxyJoXcy6wGSoPJ/ELeaf9zg8SF0jwuN6BPHVBeJ/E
W53zR5iV0N9fRT+M2JN5tc5HenO92xLgPAh+GPWLYmPdTmHu+kFozqsHx/NUw2iP
PBL6Q1VZytt2Uf6qLPUx7GpYMKf42Vldb0feFo/YA/lzOgPlY29pDLKXbse6o+Sr
kmk=
=AEEr
-----END PGP PUBLIC KEY BLOCK-----
# Ubuntu Extended Security Maintenance Automatic Signing Key v2 <[email protected]>.
# rsa4096/56f7650a24c9e9ecf87c4d8d4067e40313cb4b13 2019-04-17T02:33:33Z
ubuntu-esm-key-v2:
id: "4067E40313CB4B13"
armor: |
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBFy2kH0BEADl/2e2pULZaSRovd3E1i1cVk3zebzndHZm/hK8/Srx69ivw3pY
680gFE/N3s3R/C5Jh9ThdD1zpGmxVdqcABSPmW1FczdFZY2E37HMH7Uijs4CsnFs
8nrNGQaqX/T1g2fQqjia3zkabMeehUEZC5GPYjpeeFW6Wy1O1A1Tzu7/Wjc+uF/t
YYe/ZPXea74QZphu/N+8dy/ts/IzL2VtXuxiegGLfBFqzgZuBmlxXHVhftKvcis9
t2ko65uVyDcLtItMhSJokKBsIYJliqOXjUbQf5dz8vLXkku94arBMgsxDWT4K/xI
OTsaI/GMlSIKQ6Ucd/GKrBEsy5O8RDtD9A2klV7YeEwPEgqL+RhpdxAs/xUeTOZG
JKwuvlBjzIhJF9bIfbyzx7DdcGFqRE+a8eBIUMQjVkt9Yk7jj0eV3oVTE7XNhb53
rHuPL+zJVkiharxiTgYvkow3Nlbg3oURx9Ln67ni9pUtI1HbortGZsAkyOcpep58
K9cYvUePJWzjkY+bjcGKR19CWPl7KaUalIf2Tao5OwtqjrblTsXdtV7eG45ys0MT
Kl/DeqTJ0w6+i4eq4ZUfOCL/DIwS5zUB9j1KMUgEfocjYIdHWI8TSrA8jLYNPbVE
6+WjekHMB9liNrEQoESWBddS+bglPxuVwy2paGTUYJW1GnRZOTD+CG4ETQARAQAB
tFFVYnVudHUgRXh0ZW5kZWQgU2VjdXJpdHkgTWFpbnRlbmFuY2UgQXV0b21hdGlj
IFNpZ25pbmcgS2V5IHYyIDxlc21AY2Fub25pY2FsLmNvbT6JAjgEEwECACIFAly2
kH0CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEEBn5AMTy0sTo/8QAJ1C
NhAkZ+Xq/BZ8UzAFCQn6GlIYg/ueY216xcQdDX1uN8hNOlPTNmftroIvohFAfFtB
m5galzY3DBPU8eZr8Y8XgiGD97wkR4zfhfh1EK/6diMG/HG00kdcWquFXMRB7E7S
nDTpyuPfkAzm9n6l69UB3UA53CaEUuVJ7qFfZsWgiQeUJpvqD0MIVsWr+T/paSx7
1JE9BVatFefq0egErv1sa2uYgcH9TRZMLw6gYxWtXeGA08Cpp0+OEvIzmJOHo5/F
EpJ3hGk87Of77BC7FbqSDpeYkcjnlI2i0QAxxFygKhPOMLuA4XVn3TDuqCgTFIFC
puupzIX/Up51FJmo64V9GZ/uF0jZy4tDxsCRJnEV+4Kv2sU5uMlmNchZMBjXYGiG
tpH9CqJkSZjFvB6bk+Ot98KI6+CuNWn1N0sXFKpEUGdJLuOKfJ9+xI5plo8Bct5C
DM9s4l0IuAPCsyayXrSmlyOAHzxDUeRMCEUnXWfycCUyqdyYIcCMPLV44Ccg9NyS
89dEauSCPuyCSxm5UYEHQdsSI/+rxRdS9IzoKs4za2L7fhY8PfdPlmghmXc/chz1
RtgjPfAsUHUPRr0h//TzxRm5dbYdUyqMPzZcDO8wYBT/4xrwnFkSHZhnVxpw7PDi
JYK4SVVc4ZO20PE1+RZc5oSbt4hRbFTCSb31Pydc
=KWLs
-----END PGP PUBLIC KEY BLOCK-----
8 changes: 7 additions & 1 deletion slices/coreutils.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ slices:

bins:
essential:
- coreutils_env
- coreutils_expr
- coreutils_libs
- coreutils_mkdir
Expand Down Expand Up @@ -49,7 +50,6 @@ slices:
/usr/bin/dirname:
/usr/bin/du:
/usr/bin/echo:
/usr/bin/env:
/usr/bin/expand:
/usr/bin/factor:
/usr/bin/false:
Expand Down Expand Up @@ -129,6 +129,12 @@ slices:
/usr/bin/yes:
/usr/sbin/chroot:

env:
essential:
- libc6_libs
contents:
/usr/bin/env:

expr:
essential:
- libc6_libs
Expand Down
22 changes: 22 additions & 0 deletions slices/erlang-asn1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package: erlang-asn1

essential:
- erlang-asn1_copyright

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/erlang/lib/asn1-*/priv/**:

modules:
essential:
- erlang-base_bins
- erlang-base_modules
contents:
/usr/lib/erlang/lib/asn1-*/ebin/**:

copyright:
contents:
/usr/share/doc/erlang-asn1/copyright:
44 changes: 44 additions & 0 deletions slices/erlang-base.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package: erlang-base

essential:
- erlang-base_copyright

slices:
bins:
essential:
- bash_bins
- coreutils_env
- erlang-base_modules
- libc6_libs
- libgcc-s1_libs
- libstdc++6_libs
- libsystemd0_libs
- libtinfo6_libs
- zlib1g_libs
contents:
/usr/bin/epmd:
/usr/bin/erl:
/usr/bin/erl_call:
/usr/bin/erlc:
/usr/bin/escript:
/usr/bin/run_erl:
/usr/bin/start_embedded:
/usr/bin/to_erl:
/usr/lib/erlang/bin/**:
/usr/lib/erlang/erts-*/bin/**:
/usr/lib/erlang/lib/erl_interface-*/bin/erl_call:

modules:
contents:
/usr/lib/erlang/lib/compiler-*/ebin/**:
/usr/lib/erlang/lib/erts-*/ebin/**:
/usr/lib/erlang/lib/kernel-*/ebin/**:
/usr/lib/erlang/lib/kernel-*/include/**:
/usr/lib/erlang/lib/sasl-*/ebin/**:
/usr/lib/erlang/lib/stdlib-*/ebin/**:
/usr/lib/erlang/lib/stdlib-*/include/**:
/usr/lib/erlang/releases/**:

copyright:
contents:
/usr/share/doc/erlang-base/copyright:
23 changes: 23 additions & 0 deletions slices/erlang-crypto.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package: erlang-crypto

essential:
- erlang-crypto_copyright

slices:
libs:
essential:
- libc6_libs
- libssl3t64_libs
contents:
/usr/lib/erlang/lib/crypto-*/priv/lib/**:

modules:
essential:
- erlang-base_bins
- erlang-base_modules
contents:
/usr/lib/erlang/lib/crypto-*/ebin/**:

copyright:
contents:
/usr/share/doc/erlang-crypto/copyright:
19 changes: 19 additions & 0 deletions slices/erlang-eldap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package: erlang-eldap

essential:
- erlang-eldap_copyright

slices:
modules:
essential:
- erlang-asn1_libs
- erlang-asn1_modules
- erlang-base_bins
- erlang-base_modules
- erlang-ssl_modules
contents:
/usr/lib/erlang/lib/eldap-*/ebin/**:

copyright:
contents:
/usr/share/doc/erlang-eldap/copyright:
19 changes: 19 additions & 0 deletions slices/erlang-ftp.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package: erlang-ftp

essential:
- erlang-ftp_copyright

slices:
modules:
essential:
- erlang-base_bins
- erlang-base_modules
- erlang-runtime-tools_libs
- erlang-runtime-tools_modules
- erlang-ssl_modules
contents:
/usr/lib/erlang/lib/ftp-*/ebin/**:

copyright:
contents:
/usr/share/doc/erlang-ftp/copyright:
27 changes: 27 additions & 0 deletions slices/erlang-inets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package: erlang-inets

essential:
- erlang-inets_copyright

slices:
scripts:
contents:
/usr/lib/erlang/lib/inets-*/priv/bin/runcgi.sh:

modules:
essential:
- erlang-base_bins
- erlang-base_modules
- erlang-ftp_modules
- erlang-mnesia_modules
- erlang-runtime-tools_libs
- erlang-runtime-tools_modules
- erlang-ssl_modules
- erlang-tftp_modules
contents:
/usr/lib/erlang/lib/inets-*/ebin/**:
/usr/lib/erlang/lib/inets-*/include/**:

copyright:
contents:
/usr/share/doc/erlang-inets/copyright:
16 changes: 16 additions & 0 deletions slices/erlang-mnesia.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package: erlang-mnesia

essential:
- erlang-mnesia_copyright

slices:
modules:
essential:
- erlang-base_bins
- erlang-base_modules
contents:
/usr/lib/erlang/lib/mnesia-*/ebin/**:

copyright:
contents:
/usr/share/doc/erlang-mnesia/copyright:
25 changes: 25 additions & 0 deletions slices/erlang-os-mon.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package: erlang-os-mon

essential:
- erlang-os-mon_copyright

slices:
bins:
essential:
- erlang-os-mon_modules
contents:
/usr/lib/erlang/lib/os_mon-*/priv/**:

modules:
essential:
- erlang-base_bins
- erlang-base_modules
- erlang-mnesia_modules
- erlang-snmp_bins
- libc6_libs
contents:
/usr/lib/erlang/lib/os_mon-*/ebin/**:

copyright:
contents:
/usr/share/doc/erlang-os-mon/copyright:
16 changes: 16 additions & 0 deletions slices/erlang-parsetools.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package: erlang-parsetools

essential:
- erlang-parsetools_copyright

slices:
modules:
essential:
- erlang-base_bins
- erlang-base_modules
contents:
/usr/lib/erlang/lib/parsetools-*/ebin/**:

copyright:
contents:
/usr/share/doc/erlang-parsetools/copyright:
20 changes: 20 additions & 0 deletions slices/erlang-public-key.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package: erlang-public-key

essential:
- erlang-public-key_copyright

slices:
modules:
essential:
- erlang-asn1_libs
- erlang-asn1_modules
- erlang-base_bins
- erlang-base_modules
- erlang-crypto_libs
- erlang-crypto_modules
contents:
/usr/lib/erlang/lib/public_key-*/ebin/**:

copyright:
contents:
/usr/share/doc/erlang-public-key/copyright:
Loading

0 comments on commit 9bf19e6

Please sign in to comment.