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

cryptsetup: update to 2.5.0. #39446

Merged
merged 1 commit into from
Nov 16, 2022

Conversation

motorto
Copy link
Contributor

@motorto motorto commented Sep 24, 2022

Testing the changes

  • I tested the changes in this PR: YES, using it on my full disk encrypted system boot included (x86_64-glibc), and its working fine.

I have also went ahead and compiled it on a VM with musl glibc (x86_64-musl) and cross compiled it with armv6l.

Local build testing

  • I built this PR locally for my native architecture, x86_64-{musl,glibc}
  • I built this PR locally for these architectures (if supported. mark crossbuilds):
    • armv6l

Probably should be marked as tests needed as other people might have different setups than mine. ( and this update broke something).

@motorto motorto force-pushed the cryptsetup-2.5.0 branch 5 times, most recently from 68b0135 to 4c2ee1c Compare September 29, 2022 18:06
checksum=fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507
make_check=extended
checksum=9184a6ebbd9ce7eb211152e7f741a6c82f2d1cc0e24a84ec9c52939eee0f0542
make_check=ci-skip # tests depend on acessing /dev/mapper/control fails on CI
Copy link
Member

Choose a reason for hiding this comment

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

some tests fail in local builds too

Copy link
Contributor Author

@motorto motorto Oct 17, 2022

Choose a reason for hiding this comment

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

Replied below, but if you want I can add the make_check=no because they require root to run and are skipped locally.

=======================
All 9 tests passed
(22 tests were not run)
=======================

Copy link
Member

Choose a reason for hiding this comment

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

$ grep CHECK etc/conf
XBPS_CHECK_PKGS=full

$ ./xbps-src binary-bootstrap x86_64-musl && ./xbps-src pkg cryptsetup
...
FAIL: luks2-reencryption-mangle-test
WARNING: You must be root to run this test, test skipped.
SKIP: verity-compat-test
WARNING: You must be root to run this test, test skipped.
SKIP: integrity-compat-test
WARNING: You must be root to run this test, test skipped.
SKIP: ssh-test-plugin
=======================
2 of 10 tests failed
(21 tests were not run)
=======================
make[2]: *** [Makefile:900: check-TESTS] Error 1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reported upstream (https://gitlab.com/cryptsetup/cryptsetup/-/issues/781)

Are you okay with adding make_check=no if libc is musl on the template ?

@motorto
Copy link
Contributor Author

motorto commented Oct 17, 2022 via email

@motorto motorto force-pushed the cryptsetup-2.5.0 branch 3 times, most recently from 04f35b6 to f68c618 Compare October 27, 2022 17:49
@leahneukirchen
Copy link
Member

I'd prefer we use --disable-asciidoc and use the included man pages to not pull in even more deps to a quite core package.

@motorto
Copy link
Contributor Author

motorto commented Nov 16, 2022

Thanks, I am pretty sure that enabling --disable-asciidoc still copies the man pages ... Could you verify xls says so.

@leahneukirchen leahneukirchen merged commit ea9285b into void-linux:master Nov 16, 2022
@motorto motorto deleted the cryptsetup-2.5.0 branch November 16, 2022 23:24
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