Skip to content

Commit

Permalink
Merge branch 'ubuntu-24.04' into ffmpeg-deps-5
Browse files Browse the repository at this point in the history
  • Loading branch information
cjdcordeiro authored Nov 7, 2024
2 parents d078427 + c2a9c42 commit f05621b
Show file tree
Hide file tree
Showing 55 changed files with 2,163 additions and 19 deletions.
1 change: 1 addition & 0 deletions chisel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ format: v1

archives:
ubuntu:
default: true
version: 24.04
components: [main, universe]
suites: [noble, noble-security, noble-updates]
Expand Down
19 changes: 17 additions & 2 deletions slices/coreutils.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ slices:

bins:
essential:
- coreutils_expr
- coreutils_libs
- coreutils_mkdir
- libacl1_libs
- libattr1_libs
- libc6_libs
Expand Down Expand Up @@ -49,7 +51,6 @@ slices:
/usr/bin/echo:
/usr/bin/env:
/usr/bin/expand:
/usr/bin/expr:
/usr/bin/factor:
/usr/bin/false:
/usr/bin/fmt:
Expand All @@ -66,7 +67,6 @@ slices:
/usr/bin/ls:
/usr/bin/md5sum:
/usr/bin/md5sum.textutils:
/usr/bin/mkdir:
/usr/bin/mkfifo:
/usr/bin/mknod:
/usr/bin/mktemp:
Expand Down Expand Up @@ -129,6 +129,21 @@ slices:
/usr/bin/yes:
/usr/sbin/chroot:

expr:
essential:
- libc6_libs
- libgmp10_libs
contents:
/usr/bin/expr:

mkdir:
essential:
- libc6_libs
- libpcre2-8-0_libs
- libselinux1_libs
contents:
/usr/bin/mkdir:

copyright:
contents:
/usr/share/doc/coreutils/copyright:
33 changes: 33 additions & 0 deletions slices/fontconfig.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package: fontconfig

essential:
- fontconfig_copyright

slices:
bins:
essential:
- fontconfig-config_config
- fontconfig_cache
- libc6_libs
- libfontconfig1_libs
- libfreetype6_libs
contents:
/usr/bin/fc-cache:
/usr/bin/fc-cat:
/usr/bin/fc-conflist:
/usr/bin/fc-list:
/usr/bin/fc-match:
/usr/bin/fc-pattern:
/usr/bin/fc-query:
/usr/bin/fc-scan:
/usr/bin/fc-validate:

cache:
contents:
# The postinst script runs fc-cache to regenerate
# the fonts cache and populate that directory
/var/cache/fontconfig/: {make: true}

copyright:
contents:
/usr/share/doc/fontconfig/copyright:
162 changes: 162 additions & 0 deletions slices/openjdk-11-jdk-headless.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
package: openjdk-11-jdk-headless

essential:
- openjdk-11-jdk-headless_copyright

slices:

# OpenJDK binaries slice
core:
essential:
- libc6_libs
- openjdk-11-jre-headless_core
- openjdk-11-jre-headless_javac
- zlib1g_libs
contents:
/usr/lib/jvm/java-11-openjdk-*/bin/javac:
/usr/lib/jvm/java-11-openjdk-*/bin/javadoc:
/usr/lib/jvm/java-11-openjdk-*/bin/javap:
/usr/lib/jvm/java-11-openjdk-*/bin/jdeprscan:
/usr/lib/jvm/java-11-openjdk-*/bin/jdeps:
/usr/lib/jvm/java-11-openjdk-*/bin/jimage:
/usr/lib/jvm/java-11-openjdk-*/bin/serialver:

# excludes jaotc - this requires binutils
standard:
essential:
- openjdk-11-jdk-headless_core
- openjdk-11-jre-headless_standard
contents:
/usr/lib/jvm/java-11-openjdk-*/bin/jar:
/usr/lib/jvm/java-11-openjdk-*/bin/jarsigner:
/usr/lib/jvm/java-11-openjdk-*/bin/jcmd:
/usr/lib/jvm/java-11-openjdk-*/bin/jdb:
/usr/lib/jvm/java-11-openjdk-*/bin/jfr:
/usr/lib/jvm/java-11-openjdk-*/bin/jhsdb:
arch:
- amd64
- arm64
/usr/lib/jvm/java-11-openjdk-*/bin/jinfo:
/usr/lib/jvm/java-11-openjdk-*/bin/jmap:
/usr/lib/jvm/java-11-openjdk-*/bin/jps:
/usr/lib/jvm/java-11-openjdk-*/bin/jrunscript:
/usr/lib/jvm/java-11-openjdk-*/bin/jshell:
/usr/lib/jvm/java-11-openjdk-*/bin/jstack:
/usr/lib/jvm/java-11-openjdk-*/bin/jstat:
/usr/lib/jvm/java-11-openjdk-*/bin/jstatd:
/usr/lib/jvm/java-11-openjdk-*/bin/rmic:

# OpenJDK modules required to build the runtime image
modules:
essential:
- openjdk-11-jdk-headless_core
contents:
/usr/lib/jvm/java-11-openjdk-*/bin/jlink:
/usr/lib/jvm/java-11-openjdk-*/bin/jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.base.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.compiler.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.datatransfer.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.desktop.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.instrument.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.logging.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.management.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.management.rmi.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.naming.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.net.http.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.prefs.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.rmi.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.scripting.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.se.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.security.jgss.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.security.sasl.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.smartcardio.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.sql.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.sql.rowset.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.transaction.xa.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.xml.crypto.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/java.xml.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.accessibility.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.aot.jmod:
arch:
- amd64
- arm64
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.attach.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.charsets.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.compiler.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.crypto.cryptoki.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.crypto.ec.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.dynalink.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.editpad.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.hotspot.agent.jmod:
arch:
- amd64
- arm64
- ppc64el
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.httpserver.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.internal.ed.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.internal.jvmstat.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.internal.le.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.internal.opt.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.internal.vm.ci.jmod:
arch:
- amd64
- arm64
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.internal.vm.compiler.jmod:
arch:
- amd64
- arm64
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.internal.vm.compiler.management.jmod:
arch:
- amd64
- arm64
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jartool.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.javadoc.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jcmd.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jconsole.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jdeps.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jdi.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jdwp.agent.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jfr.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jlink.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jshell.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jsobject.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.jstatd.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.localedata.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.management.agent.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.management.jfr.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.management.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.naming.dns.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.naming.ldap.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.naming.rmi.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.net.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.pack.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.rmic.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.scripting.nashorn.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.scripting.nashorn.shell.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.sctp.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.security.auth.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.security.jgss.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.unsupported.desktop.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.unsupported.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.xml.dom.jmod:
/usr/lib/jvm/java-11-openjdk-*/jmods/jdk.zipfs.jmod:

# OpenJDK headers for JNI
headers:
contents:
/usr/lib/jvm/java-11-openjdk-*/include/classfile_constants.h:
/usr/lib/jvm/java-11-openjdk-*/include/jni.h:
/usr/lib/jvm/java-11-openjdk-*/include/jvmti.h:
/usr/lib/jvm/java-11-openjdk-*/include/jvmticmlr.h:
/usr/lib/jvm/java-11-openjdk-*/include/linux/jni_md.h:

# OpenJDK headers for the debug agent development
debug-headers:
contents:
/usr/lib/jvm/java-11-openjdk-*/include/jdwpTransport.h:

copyright:
essential:
- openjdk-11-jre-headless_copyright
contents:
/usr/share/doc/openjdk-11-jdk-headless:
Loading

0 comments on commit f05621b

Please sign in to comment.