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(24.04): add copyright slices for libgcc-s1 and libstdc++6 #168

Merged
merged 2 commits into from
May 30, 2024

Conversation

norrisjeremy
Copy link

Proposed changes

fix(24.04): add gcc-14-base slice and make essential for libgcc-s1 and libstdc++6 slices to ensure copyright file is included

Related issues/PRs

#156

Forward porting

Testing

$ chisel cut --release chisel-releases/ --root foo libgcc-s1_libs libstdc++6_libs
2024/02/29 15:02:15 Processing chisel-releases/ release...
2024/02/29 15:02:15 Selecting slices...
2024/02/29 15:02:15 Fetching ubuntu 24.04 noble suite details...
2024/02/29 15:02:16 Release date: Thu, 29 Feb 2024 19:12:16 UTC
2024/02/29 15:02:16 Fetching index for ubuntu 24.04 noble main component...
2024/02/29 15:02:16 Fetching index for ubuntu 24.04 noble universe component...
2024/02/29 15:02:16 Fetching ubuntu 24.04 noble-security suite details...
2024/02/29 15:02:16 Release date: Thu, 04 Jan 2024 18:43:12 UTC
2024/02/29 15:02:16 Fetching index for ubuntu 24.04 noble-security main component...
2024/02/29 15:02:16 Fetching index for ubuntu 24.04 noble-security universe component...
2024/02/29 15:02:16 Fetching ubuntu 24.04 noble-updates suite details...
2024/02/29 15:02:16 Release date: Thu, 04 Jan 2024 18:43:15 UTC
2024/02/29 15:02:16 Fetching index for ubuntu 24.04 noble-updates main component...
2024/02/29 15:02:16 Fetching index for ubuntu 24.04 noble-updates universe component...
2024/02/29 15:02:16 Fetching pool/main/g/gcc-14/gcc-14-base_14-20240201-3ubuntu1_amd64.deb...
2024/02/29 15:02:16 Fetching pool/main/g/glibc/libc6_2.39-0ubuntu2_amd64.deb...
2024/02/29 15:02:16 Fetching pool/main/g/gcc-14/libgcc-s1_14-20240201-3ubuntu1_amd64.deb...
2024/02/29 15:02:16 Fetching pool/main/g/gcc-14/libstdc++6_14-20240201-3ubuntu1_amd64.deb...
2024/02/29 15:02:16 Extracting files from package "gcc-14-base"...
2024/02/29 15:02:16 Extracting files from package "libc6"...
2024/02/29 15:02:16 Extracting files from package "libgcc-s1"...
2024/02/29 15:02:16 Extracting files from package "libstdc++6"...
$ find foo/usr/share/doc
foo/usr/share/doc
foo/usr/share/doc/libc6
foo/usr/share/doc/libc6/copyright
foo/usr/share/doc/libstdc++6
foo/usr/share/doc/libgcc-s1
foo/usr/share/doc/gcc-14-base
foo/usr/share/doc/gcc-14-base/copyright
$ readlink foo/usr/share/doc/libgcc-s1 foo/usr/share/doc/libstdc++6
gcc-14-base
gcc-14-base

Checklist

Additional Context

slices/libgcc-s1.yaml Outdated Show resolved Hide resolved
slices/libstdc++6.yaml Outdated Show resolved Hide resolved
@rebornplusplus
Copy link
Member

Hi Jeremy.

Let's first try to get this PR in. Once it does, backporting should be easy. I will let @cjdcordeiro take a look whenever he gets some free time. This PR may need some discussion since we haven't explicitly added copyright files previously.

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.

Looks good to me, thank you!

@rebornplusplus rebornplusplus changed the title fix(24.04): add gcc-14-base slice and make essential for libgcc-s1 and libstdc++6 slices to ensure copyright file is included feat(24.04): add copyright slices for libgcc-s1 and libstdc++6 Mar 1, 2024
@cjdcordeiro
Copy link
Collaborator

We are just finalizing an internal discussion about the handling of copyright files that may impact this PR, thus why its merging may be taking a bit longer. For now, it seems to be in the right direction but I'll review it once we've converged internally

@norrisjeremy
Copy link
Author

Ok, thanks for the update!

Copy link

github-actions bot commented Apr 3, 2024

Diff of dependencies:
None found.


@norrisjeremy
Copy link
Author

@cjdcordeiro @rebornplusplus What's the hold-up on getting this merged? It's been languishing for over a month.

Copy link
Collaborator

@cjdcordeiro cjdcordeiro left a comment

Choose a reason for hiding this comment

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

Thanks @norrisjeremy .

I'm leaving just a couple of comments here, but once those are in and the linting is passing, this should be good to go

slices/gcc-14-base.yaml Outdated Show resolved Hide resolved
slices/libgcc-s1.yaml Outdated Show resolved Hide resolved
slices/libstdc++6.yaml Outdated Show resolved Hide resolved
@cjdcordeiro cjdcordeiro self-assigned this May 16, 2024
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.

Looks good to me, danke! I added the pending changes. Sorry about the delay on this.

The CLA check is failing now. @norrisjeremy, you may need to sign the CLA form with proper email address.

@norrisjeremy
Copy link
Author

Looks good to me, danke! I added the pending changes. Sorry about the delay on this.

The CLA check is failing now. @norrisjeremy, you may need to sign the CLA form with proper email address.

I've already signed the CLA, and you have already merged other PRs I submitted.
Something is wrong with your CLA check.

@rebornplusplus rebornplusplus force-pushed the gcc-base_24.04 branch 2 times, most recently from 89e539a to b161f8f Compare May 30, 2024 11:46
Copy link
Collaborator

@cjdcordeiro cjdcordeiro left a comment

Choose a reason for hiding this comment

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

We have manually confirmed the CLA compliance, so let's follow up on the CLA action offline and merge the PR as is for now

thanks for the contribution

@cjdcordeiro cjdcordeiro merged commit c5dcdea into canonical:ubuntu-24.04 May 30, 2024
11 of 12 checks passed
@rebornplusplus
Copy link
Member

Something is wrong with your CLA check.

Can confirm there may be an issue with the CLA check. Sorry 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