-
Notifications
You must be signed in to change notification settings - Fork 521
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
3p packages update 1.19.3 #3832
3p packages update 1.19.3 #3832
Conversation
Also delete the patch as the changes are available in upstream
6dbab0c
to
ce51bd8
Compare
eade60c
to
5da0642
Compare
@@ -85,6 +85,7 @@ cp third_party/forked/golang/LICENSE LICENSE.golang | |||
cp third_party/forked/golang/PATENTS PATENTS.golang | |||
|
|||
%build | |||
export FORCE_HOST_GO=1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: I'd like to see the addition of these as their own commit and down by the rest of the exports (probably after export %{kube_cc}
along with a comment explaining that we want to override the Go specification since we bring our own Go toolchain.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed about putting them in their own commit (kubelet: set FORCE_HOST_GO=1 in environment
).
But it does need to be set here, before make generated_files
is invoked, or it will try again to download the Go toolchain for codegen.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh interesting, I didn't realize they used go in the codegen :| Ok, then I agree that is where it should be.
@@ -12,8 +12,8 @@ path = "../packages.rs" | |||
releases-url = "/~https://github.com/linux-audit/audit-userspace/releases" | |||
|
|||
[[package.metadata.build-package.external-files]] | |||
url = "/~https://github.com/linux-audit/audit-userspace/archive/v3.1.2/audit-userspace-3.1.2.tar.gz" | |||
sha512 = "d5b05686aedd6eaaced000778580bd3e96e38c020534038d6b1ee6de96dd7687c2f3a52a2ae75be8b93c173b286a56dbc92231906c68fda79b113dfcaad6da84" | |||
url = "/~https://github.com/linux-audit/audit-userspace/archive/v3.1.3/audit-userspace-3.1.3.tar.gz" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's fine to stay on 3.x for now, but it should also be possible to move up to audit 4 - or if it's not, we should at least have tried it and have a sense of what's broken.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes.
packages/libselinux/libselinux.spec
Outdated
@@ -89,6 +90,7 @@ export USE_PCRE2='y' \\\ | |||
%exclude %{_cross_sbindir}/togglesebool | |||
%exclude %{_cross_sbindir}/validatetrans | |||
|
|||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: don't need a new newline
5da0642
to
c9c311d
Compare
c9c311d
to
bfd44a8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Issue number:
Closes #
Description of changes:
Testing done:
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.