-
Notifications
You must be signed in to change notification settings - Fork 22
Conversation
42fbe16
to
7fae5bb
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.
Nice work, only had a few comments:
I tested the branch locally and it built fine for me, with a few lintian errors that made me think:
Now running lintian aad-auth_0.3_amd64.changes ...
E: libnss-aad: lacks-versioned-link-to-shared-library usr/lib/x86_64-linux-gnu/libnss_aad.so [usr/lib/x86_64-linux-gnu/libnss_aad.so.2]
W: aad-auth source: dependency-is-not-multi-archified libnss-aad depends on aad-common (multi-arch: no)
W: libnss-aad: shared-library-lacks-version usr/lib/x86_64-linux-gnu/libnss_aad.so.2 libnss_aad.so
W: aad-auth source: unknown-field Vendored-Sources-Rust
I think we can get rid of some of them by compiling the NSS library with the proper soname (libnss_aad.so.2
instead of libnss_aad.so
), like we did for Go.
For the dependency-is-not-multi-archified
one we may need to set Multi-Arch: same
on aad-common
as well. Can you remind me why we need the option on debian/control in the first place?
@@ -1,26 +1,15 @@ | |||
libnss_aad.so.2 libnss-aad #MINVER# |
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.
Just noting here that the lib name changed from libnss_aad.so.2
to libnss_aad.so
in case it was not intentional
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.
This is likely due to the cargo build
problem that I've mentioned in the general comment. I'm not sure how to evaluate this diff, tbh. Maybe you or @didrocks can provide me some insight whether this is a big problem or not?
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.
Mmm okay then. IMO it's fine to keep it as is - but it'd be nice to suppress the warnings by adding them to the lintian-overrides
file, adding the context you wrote in a PR as comments. There should be existing lintian-overrides files you can take inspiration from.
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.
actually, this is possible (rust-lang/cargo#5045 (comment)), but only with cargo from lunar, not kinetic or jammy. Still worth keeping it in the override file IMHO explicitely. The fact that is not important is not well described in the current override file IMHO.
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.
Yeah, it's possible using cargo rustc
(not cargo build
), but I'm not sure this works with the dh-cargo wrapper (that was my concern).
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 seems it does it, but then, we are back to what we do when we backport this to jammy as we won’t have a relevant version of Cargo for now. So, let’s do with a better lintian override comments, explaining exactly why we can’t (and don’t) need a soname anyway, with the link to the bug report.
Hey @GabrielNagy, thanks for the review. It is annoying to have this amount of warnings, I agree (I didn't see them, but it's probably because of a version diff since I'm still on Jammy). We have a few problems though:
|
7fae5bb
to
0754daf
Compare
Got it. Let's suppress the warning by adding it to lintian-overrides with a comment.
👍 - we should add |
b49c2b2
to
eb338fb
Compare
eb338fb
to
e830ab9
Compare
Adding dh-cargo and libsqlite3-dev as build dependencies and the required XS-Vendored-Sources-Rust field.
Removing line that installed the aad-auth aux binary.
e830ab9
to
7b5f7fd
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.
Some parts to adjust and look at.
@@ -1,26 +1,15 @@ | |||
libnss_aad.so.2 libnss-aad #MINVER# |
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 seems it does it, but then, we are back to what we do when we backport this to jammy as we won’t have a relevant version of Cargo for now. So, let’s do with a better lintian override comments, explaining exactly why we can’t (and don’t) need a soname anyway, with the link to the bug report.
413f58f
to
e24bbb6
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.
Good to me now., Trusting that you did some package build tests as well as autopkgtests :)
We can now override the binary responsible to build the library. This allows us to use the cargo wrapper (offered by dh-cargo) to build the library offline, without automatically querying crates.io for the dependencies.
Action to update the XS-Vendored-Sources-Rust in debian/control Action to update the fake checksum file in debian/cargo-checksum.json
16167d9
to
0d43c1d
Compare
Updating packaging for the aad-auth project.
DEENG-570