Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add basic slice definitions files for Focal #41

Closed
wants to merge 5 commits into from

Conversation

cjdcordeiro
Copy link
Collaborator

@cjdcordeiro cjdcordeiro commented Jul 12, 2023

This PR backports (from 22.04) and fits a few (the most basic and essential) slice definitions files into the new Focal Chisel release.

The affected packages are:

  • base-files
  • base-passwd
  • ca-certificates
  • libc6
  • libgcc-s1

The choice of packages was driven by our Chiselled Ubuntu base image.

Moved to #42

@cjdcordeiro cjdcordeiro self-assigned this Jul 12, 2023
Copy link

@woky woky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cjdcordeiro Did you just copy it from other release? AFAIK some libc6 libraries in jammy are not in focal?

@cjdcordeiro
Copy link
Collaborator Author

cjdcordeiro commented Jul 12, 2023

@cjdcordeiro Did you just copy it from other release? AFAIK some libc6 libraries in jammy are not in focal?

@woky copied and changed. libc6 had to be completely changed yes. The libraries diff isn't that significant, but the main difference is the naming convention.

diff --git a/slices/libc6.yaml b/slices/libc6.yaml
index 49c5c40..4351620 100644
--- a/slices/libc6.yaml
+++ b/slices/libc6.yaml
@@ -7,24 +7,26 @@ slices:
 
   libs:
     contents:
-      /lib/*-linux-*/ld*.so.*:
-      /lib/*-linux-*/libBrokenLocale.so.*:
-      /lib/*-linux-*/libanl.so.*:
-      /lib/*-linux-*/libc.so.*:
-      /lib/*-linux-*/libc_malloc_debug.so.*:
-      /lib/*-linux-*/libdl.so.*:
-      /lib/*-linux-*/libm.so.*:
+      /lib/*-linux-*/ld*.so*:
+      /lib/*-linux-*/libBrokenLocale*.so*:
+      /lib/*-linux-*/libSegFault.so:
+      /lib/*-linux-*/libanl*.so*:
+      /lib/*-linux-*/libc*.so*:
+      /lib/*-linux-*/libdl*.so*:
+      /lib/*-linux-*/libm*.so*:
       /lib/*-linux-*/libmemusage.so:
-      /lib/*-linux-*/libmvec.so.*: {arch: amd64}
-      /lib/*-linux-*/libnsl.so.*:
-      /lib/*-linux-*/libnss_compat.so.*:
-      /lib/*-linux-*/libnss_dns.so.*:
-      /lib/*-linux-*/libnss_files.so.*:
-      /lib/*-linux-*/libnss_hesiod.so.*:
+      /lib/*-linux-*/libmvec*.so*: {arch: amd64}
+      /lib/*-linux-*/libnsl*.so*:
+      /lib/*-linux-*/libnss_compat*.so*:
+      /lib/*-linux-*/libnss_dns*.so*:
+      /lib/*-linux-*/libnss_files*.so*:
+      /lib/*-linux-*/libnss_hesiod*.so*:
+      /lib/*-linux-*/libnss_nis*.so*:
+      /lib/*-linux-*/libnss_nisplus*.so*:
       /lib/*-linux-*/libpcprofile.so:
-      /lib/*-linux-*/libpthread.so.*:
-      /lib/*-linux-*/libresolv.so.*:
-      /lib/*-linux-*/librt.so.*:
-      /lib/*-linux-*/libthread_db.so.*:
-      /lib/*-linux-*/libutil.so.*:
+      /lib/*-linux-*/libpthread*.so*:
+      /lib/*-linux-*/libresolv*.so*:
+      /lib/*-linux-*/librt*.so*:
+      /lib/*-linux-*/libthread_db*.so*:
+      /lib/*-linux-*/libutil*.so*:
       /lib*/ld*.so.*:

Copy link
Member

@rebornplusplus rebornplusplus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have only briefly taken a look at libc6. Will be thorough with the new changes. :)

PS. This reminded me. Perhaps we should have a basic test action in this repo which runs Chisel on the proposed slices and gives out a preliminary verdict.

slices/libc6.yaml Outdated Show resolved Hide resolved
@cjdcordeiro
Copy link
Collaborator Author

@rebornplusplus @woky this was moved to #42 since I had to edit the base branch. Please continue the review in there ;) (sry about that)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants