M-Labs
/
artiq-extrapkg
2
0
Fork 4
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Fix afws client certs #21

Merged
sb10q merged 2 commits from esavkin/artiq-extrapkg:fix-cacerts-and-package into master 2024-08-15 18:35:54 +08:00
Conversation 4 Commits 2 Files Changed 1 +4
esavkin commented 2024-08-13 17:50:24 +08:00
Member
Copy Link
  • reinstalls cacerts after msys2 is installed (works offline too) - better be backported to release-8
  • fixes wrong prefix in package which made it appear in C:\msys64\nix\store.... instead of normal installation - #22

Copies already extracted certs from base image into clang64 subenvironment.

Tested by installing and calling afws_client and checking that it successfully connects (and returns login failed in my case).

* ~~reinstalls cacerts after msys2 is installed (works offline too) - better be backported to release-8~~ * ~~fixes wrong prefix in package which made it appear in `C:\msys64\nix\store....` instead of normal installation~~ - #22 Copies already extracted certs from base image into clang64 subenvironment. Tested by installing and calling afws_client and checking that it successfully connects (and returns login failed in my case).
esavkin added 2 commits 2024-08-13 17:50:25 +08:00
a73be047fe Fix certs issue 
Signed-off-by: Egor Savkin <es@m-labs.hk>
d26ba7bbce Fix msys2 package 
Package appeared to have /nix/store... path instead of normal clang64

Signed-off-by: Egor Savkin <es@m-labs.hk>
sb10q reviewed 2024-08-14 13:05:29 +08:00
msys2/PKGBUILD.common Outdated
@ -16,3 +16,3 @@
package() {
cd source
wine-msys2-build python -m installer --destdir="${pkgdir}" dist/*.whl
wine-msys2-build python -m installer --destdir="${pkgdir}" --prefix="clang64/" dist/*.whl
sb10q commented 2024-08-14 13:05:29 +08:00
Owner
Copy Link

Shouldn't it be c:\clang64 or similar?

Again, please split PRs.

Shouldn't it be ``c:\clang64`` or similar? Again, please split PRs.
esavkin commented 2024-08-14 13:45:25 +08:00
Author
Member
Copy Link

Shouldn't it be c:\clang64 or similar?

No, [archive]/clang64 in the package is translated into /clang64 by pacman and it is translated to full\path\to\msys2\root\clang64 automatically in msys2 environment.

Overall seems like we could have packaged ARTIQ for the Arch same way, except dependencies names.

> Shouldn't it be c:\clang64 or similar? No, `[archive]/clang64` in the package is translated into `/clang64` by pacman and it is translated to `full\path\to\msys2\root\clang64` automatically in msys2 environment. Overall seems like we could have packaged ARTIQ for the Arch same way, except dependencies names.
esavkin force-pushed fix-cacerts-and-package from d26ba7bbce to a73be047fe 2024-08-14 13:49:32 +08:00 Compare
esavkin changed title from Fix afws client to Fix afws client certs 2024-08-14 13:50:39 +08:00
sb10q commented 2024-08-14 15:45:07 +08:00
Owner
Copy Link

reinstalls cacerts after msys2 is installed

Why is this not an issue when msys2 is installed normally (i.e. without the ARTIQ installer)?

> reinstalls cacerts after msys2 is installed Why is this not an issue when msys2 is installed normally (i.e. without the ARTIQ installer)?
esavkin commented 2024-08-14 15:47:56 +08:00
Author
Member
Copy Link

Why is this not an issue when msys2 is installed normally (i.e. without the ARTIQ installer)?

Because there are post-install hooks in cacert package, that are quite troublesome to make it working outside of windows environment.

> Why is this not an issue when msys2 is installed normally (i.e. without the ARTIQ installer)? Because there are post-install hooks in cacert package, that are quite troublesome to make it working outside of windows environment.
sb10q commented 2024-08-14 15:48:53 +08:00
Owner
Copy Link

There are lots of things you think are troublesome when they aren't really. What are the exact issues?

There are lots of things you think are troublesome when they aren't really. What are the exact issues?
esavkin force-pushed fix-cacerts-and-package from a73be047fe to f61fb65c84 2024-08-15 17:16:57 +08:00 Compare
esavkin force-pushed fix-cacerts-and-package from f61fb65c84 to d244efc689 2024-08-15 17:18:33 +08:00 Compare
esavkin commented 2024-08-15 17:23:28 +08:00
Author
Member
Copy Link

There are lots of things you think are troublesome when they aren't really. What are the exact issues?

p11-kit extract doesn't work as intended in isolated environment, and I couldn't make it work.

For now I made the builder copy certificates from base image into clang64.

> There are lots of things you think are troublesome when they aren't really. What are the exact issues? p11-kit extract doesn't work as intended in isolated environment, and I couldn't make it work. For now I made the builder copy certificates from base image into clang64.
sb10q merged commit 1002e0437a into master 2024-08-15 18:35:54 +08:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/artiq-extrapkg#21
No description provided.
Delete Branch "esavkin/artiq-extrapkg:fix-cacerts-and-package"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?