Skip to content

Commit

Permalink
feat: add jre8 slices for Jammy (#31)
Browse files Browse the repository at this point in the history
* feat: add jre8 slices for Jammy

* feat: slice openjdk-8-jre-headless by functional unit

* fix: add comments and split profiledebug in JRE8

* feat: replace 'gnu' with glob for multi-arch

* fix: stcp -> sctp (typo)

* fix: remove globs for fonts-dejavu-core

The previous use of globs was dangerous as a
future introduction of fonts-dejavu-extra would
automatically introduce an unnecessary conflict.

* feat: add libnpt for arm64 in openjdk-8-jre-headless

---------

Co-authored-by: Vladimir Petko <[email protected]>
  • Loading branch information
cjdcordeiro and vpa1977 authored Jun 15, 2023
1 parent 7559337 commit b78d1b0
Show file tree
Hide file tree
Showing 24 changed files with 481 additions and 0 deletions.
13 changes: 13 additions & 0 deletions slices/ca-certificates-java.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package: ca-certificates-java

slices:
data:
essential:
- ca-certificates_data
- libnss3_libs
contents:
/etc/default/cacerts:
/etc/ssl/certs/java/:

# we need to run `keytool` in postinst, but we can't yet do
# this from a mutation script
67 changes: 67 additions & 0 deletions slices/fontconfig-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package: fontconfig-config

slices:
config:
essential:
- fonts-dejavu-core_config
- fonts-dejavu-core_fonts
contents:
/etc/fonts/conf.avail/10-antialias.conf:
/etc/fonts/conf.avail/10-autohint.conf:
/etc/fonts/conf.avail/10-hinting-full.conf:
/etc/fonts/conf.avail/10-hinting-medium.conf:
/etc/fonts/conf.avail/10-hinting-none.conf:
/etc/fonts/conf.avail/10-hinting-slight.conf:
/etc/fonts/conf.avail/10-no-sub-pixel.conf:
/etc/fonts/conf.avail/10-scale-bitmap-fonts.conf:
/etc/fonts/conf.avail/10-sub-pixel-bgr.conf:
/etc/fonts/conf.avail/10-sub-pixel-rgb.conf:
/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf:
/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf:
/etc/fonts/conf.avail/10-unhinted.conf:
/etc/fonts/conf.avail/11-lcdfilter-default.conf:
/etc/fonts/conf.avail/11-lcdfilter-legacy.conf:
/etc/fonts/conf.avail/11-lcdfilter-light.conf:
/etc/fonts/conf.avail/20-unhint-small-vera.conf:
/etc/fonts/conf.avail/25-unhint-nonlatin.conf:
/etc/fonts/conf.avail/30-metric-aliases.conf:
/etc/fonts/conf.avail/40-nonlatin.conf:
/etc/fonts/conf.avail/45-generic.conf:
/etc/fonts/conf.avail/45-latin.conf:
/etc/fonts/conf.avail/49-sansserif.conf:
/etc/fonts/conf.avail/50-user.conf:
/etc/fonts/conf.avail/51-local.conf:
/etc/fonts/conf.avail/53-monospace-lcd-filter.conf:
/etc/fonts/conf.avail/60-generic.conf:
/etc/fonts/conf.avail/60-latin.conf:
/etc/fonts/conf.avail/65-fonts-persian.conf:
/etc/fonts/conf.avail/65-khmer.conf:
/etc/fonts/conf.avail/65-nonlatin.conf:
/etc/fonts/conf.avail/69-unifont.conf:
/etc/fonts/conf.avail/70-force-bitmaps.conf:
/etc/fonts/conf.avail/70-no-bitmaps.conf:
/etc/fonts/conf.avail/70-yes-bitmaps.conf:
/etc/fonts/conf.avail/80-delicious.conf:
/etc/fonts/conf.avail/90-synthetic.conf:
/etc/fonts/conf.d/10-antialias.conf:
/etc/fonts/conf.d/10-hinting-slight.conf:
/etc/fonts/conf.d/10-scale-bitmap-fonts.conf:
/etc/fonts/conf.d/11-lcdfilter-default.conf:
/etc/fonts/conf.d/20-unhint-small-vera.conf:
/etc/fonts/conf.d/30-metric-aliases.conf:
/etc/fonts/conf.d/40-nonlatin.conf:
/etc/fonts/conf.d/45-generic.conf:
/etc/fonts/conf.d/45-latin.conf:
/etc/fonts/conf.d/49-sansserif.conf:
/etc/fonts/conf.d/50-user.conf:
/etc/fonts/conf.d/51-local.conf:
/etc/fonts/conf.d/60-generic.conf:
/etc/fonts/conf.d/60-latin.conf:
/etc/fonts/conf.d/65-fonts-persian.conf:
/etc/fonts/conf.d/65-nonlatin.conf:
/etc/fonts/conf.d/69-unifont.conf:
/etc/fonts/conf.d/70-no-bitmaps.conf:
/etc/fonts/conf.d/80-delicious.conf:
/etc/fonts/conf.d/90-synthetic.conf:
/etc/fonts/fonts.conf:
/usr/share/xml/fontconfig/fonts.dtd:
38 changes: 38 additions & 0 deletions slices/fonts-dejavu-core.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package: fonts-dejavu-core

slices:
fonts:
contents:
/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf:
/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf:
/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf:
/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf:
/usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf:
/usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf:

config:
contents:
/etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf:
/etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans.conf:
/etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-serif.conf:
/etc/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf:
/etc/fonts/conf.avail/20-unhint-small-dejavu-sans.conf:
/etc/fonts/conf.avail/20-unhint-small-dejavu-serif.conf:
/etc/fonts/conf.avail/57-dejavu-sans-mono.conf:
/etc/fonts/conf.avail/57-dejavu-sans.conf:
/etc/fonts/conf.avail/57-dejavu-serif.conf:
/etc/fonts/conf.avail/58-dejavu-lgc-sans-mono.conf:
/etc/fonts/conf.avail/58-dejavu-lgc-sans.conf:
/etc/fonts/conf.avail/58-dejavu-lgc-serif.conf:
/etc/fonts/conf.d/20-unhint-small-dejavu-lgc-sans-mono.conf:
/etc/fonts/conf.d/20-unhint-small-dejavu-lgc-sans.conf:
/etc/fonts/conf.d/20-unhint-small-dejavu-lgc-serif.conf:
/etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf:
/etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf:
/etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf:
/etc/fonts/conf.d/57-dejavu-sans-mono.conf:
/etc/fonts/conf.d/57-dejavu-sans.conf:
/etc/fonts/conf.d/57-dejavu-serif.conf:
/etc/fonts/conf.d/58-dejavu-lgc-sans-mono.conf:
/etc/fonts/conf.d/58-dejavu-lgc-sans.conf:
/etc/fonts/conf.d/58-dejavu-lgc-serif.conf:
8 changes: 8 additions & 0 deletions slices/libblkid1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libblkid1

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

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libbrotlicommon.so.1*:
/usr/lib/*-linux-*/libbrotlidec.so.1*:
/usr/lib/*-linux-*/libbrotlienc.so.1*:
9 changes: 9 additions & 0 deletions slices/libexpat1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package: libexpat1

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

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

slices:
libs:
essential:
- libc6_libs
- libexpat1_libs
- libfreetype6_libs
- libuuid1_libs
- fontconfig-config_config
contents:
/usr/lib/*-linux-*/libfontconfig.so.1*:
11 changes: 11 additions & 0 deletions slices/libfreetype6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package: libfreetype6

slices:
libs:
essential:
- libc6_libs
- zlib1g_libs
- libbrotli1_libs
- libpng16-16_libs
contents:
/usr/lib/*-linux-*/libfreetype.so.6*:
17 changes: 17 additions & 0 deletions slices/libglib2.0-0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package: libglib2.0-0

slices:
libs:
essential:
- libc6_libs
- libffi8_libs
- libmount1_libs
- libpcre3_libs
- libselinux1_libs
- zlib1g_libs
contents:
/usr/lib/*-linux-*/libgio-2.0.so.0*:
/usr/lib/*-linux-*/libglib-2.0.so.0*:
/usr/lib/*-linux-*/libgmodule-2.0.so.0*:
/usr/lib/*-linux-*/libgobject-2.0.so.0*:
/usr/lib/*-linux-*/libgthread-2.0.so.0*:
8 changes: 8 additions & 0 deletions slices/libjpeg-turbo8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libjpeg-turbo8

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

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

slices:
libs:
essential:
- libc6_libs
- libselinux1_libs
- libblkid1_libs
contents:
/usr/lib/*-linux-*/libmount.so.1*:
10 changes: 10 additions & 0 deletions slices/libnspr4.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package: libnspr4

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/libnspr4.so:
/usr/lib/*-linux-*/libplc4.so:
/usr/lib/*-linux-*/libplds4.so:
11 changes: 11 additions & 0 deletions slices/libnss3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package: libnss3

slices:
libs:
essential:
- libc6_libs
- libnspr4_libs
- libsqlite3-0_libs
contents:
/usr/lib/*-linux-*/libnssutil3.so:
/usr/lib/*-linux-*/libnss3.so:
8 changes: 8 additions & 0 deletions slices/libpcre2-8-0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libpcre2-8-0

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

slices:
libs:
essential:
- libc6_libs
contents:
/lib/*-linux-*/libpcre.so.3*:
/usr/lib/*-linux-*/libpcreposix.so.3*:
8 changes: 8 additions & 0 deletions slices/libpcsclite1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libpcsclite1

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

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

slices:
libs:
essential:
- libc6_libs
- libpcre2-8-0_libs
contents:
/lib/*-linux-*/libselinux.so.1:
8 changes: 8 additions & 0 deletions slices/libsqlite3-0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package: libsqlite3-0

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

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

slices:
data:
contents:
/etc/mime.types:
Loading

0 comments on commit b78d1b0

Please sign in to comment.