Bump securedrop-grsec-focal metapackage to 5.4.88 #5772
Conversation
| @@ -4,7 +4,10 @@ | |||
| import testutils | |||
|
|
|||
| sdvars = testutils.securedrop_test_vars | |||
| KERNEL_VERSION = sdvars.grsec_version | |||
| if host.system_info.codename == "xenial": | |||
There was a problem hiding this comment.
host isn't available outside function scope, will need a refactor.
This will pull in and install 5.4 series kernels for Focal installs, thanks to the split metapackage logic introduced in #5691
KERNEL_VERSION is defined for each function as required.
kushaldas
force-pushed
the
5479-focal-54
branch
from
6cd8770
to
026f254
Compare
There was a problem hiding this comment.
I have updated the test code to make sure it goes through CI.
Also verified that:
- Focal metapackage pulls in 5.4.88 kernel image
- Xenial metapackage pulls in 4.14.188 kernel image
But, the IRDA tests are failing for the kernel: https://app.circleci.com/pipelines/github/freedomofpress/securedrop/1812/workflows/411763ec-cf39-43d3-a77b-ab89388a6b36/jobs/49865 @emkll what do you think?
CONFIG_IRDA is simply not present in the kernel configuration for 5.4 series kernels, in previous kernel configurations it was commented out.
|
There's currently an issue with the split logic for the config and grsec metapackages (introduced in #5684 and #5691 respectively do not produce the expected package contents due to filepath not being the same as the package name, resulting in some unwanted subfolders within the package: |
|
Looks like that extraneous dir only appears in the Focal metapackage, not in the Xenial one. It's empty, but should certainly be removed. Digging a bit now. |
Discovered by @emkll in [0]. The forked package build logic was including an empty dir based on the distro string. Update the path munging logic to use the proper var to avoid. [0] #5772 (comment)
|
@emkll I pushed a fix that appears to resolve for both Focal & Xenial. |
|
@kushaldas This looks good to my eye, any concerns with merging? |
|
I have an alternative that simplifies the distribution branching that I've been hoping to share for review. It's just been hard to test because of all the other Focal problems on develop right now. Fingers crossed it'll be ready for a look by midday, and obviously I think it's worth trying to dig out from under this a bit now, but if you'd rather just cross this one off and move on, please go ahead and merge, and maybe we can clean it up later, in any event when we remove the Xenial logic. |
Nope, I think it is good to merge when you want to. |
Indeed, some folks are blocked on Focal hardware installs, so proceeding with merge. Happy to revisit any additional logic you've got queued up, @rmol, just point me to a branch! |
conorsch
dismissed
kushaldas’s stale review
@kushaldas explicitly stated no concerns with merge, given recent changes
Status
Ready for review
Description of Changes
Fixes #5479 and towards #4768
Updates the kernel metapackage version to 5.4.88 for Focal installs.
See freedomofpress/securedrop-apt-test#89
Testing
Deployment
For new and existing installs, these changes will be distributed via deb packages through apt.
Checklist
If you made changes to the server application code:
make lint) and tests (make test) pass in the development containerIf you made changes to
securedrop-admin:make -C admin test) pass in the admin development containerIf you made changes to the system configuration:
If you added or removed a file deployed with the application:
If you made non-trivial code changes: