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

Upstream Debian patches #1515

Merged
merged 10 commits into from
Apr 1, 2021
Merged

Conversation

dominiklohmann
Copy link
Member

@dominiklohmann dominiklohmann commented Apr 1, 2021

📔 Description

This takes the three patches made to VAST for Debian packaging by @satta and adapts them slightly.

📝 Checklist

  • All user-facing changes have changelog entries.
  • The changes are reflected on docs.tenzir.com/vast, if necessary.
  • The PR description contains instructions for the reviewer, if necessary.

🎯 Review Instructions

@satta it'd be lovely if you could test this locally (especially for the robin map change) and publicly comment that I am allowed to use your patches for this purpose, just to be on the safe side.

@tenzir/backend Commit-by-commit. The changes are quite simple.

This applies a modified version of this patch:
https://salsa.debian.org/debian/vast/-/blob/master/debian/patches/reproducible.patch

Co-authored-by: Sascha Steinbiss <satta@debian.org>
@dominiklohmann dominiklohmann requested a review from a team April 1, 2021 09:16
dominiklohmann and others added 3 commits April 1, 2021 11:21
This applies a modified version of this patch:
https://salsa.debian.org/debian/vast/-/blob/master/debian/patches/use-debian-robinmap.patch

Co-authored-by: Sascha Steinbiss <satta@debian.org>
This applies a modified version of this patch:
https://salsa.debian.org/debian/vast/-/blob/master/debian/mansrc/lsvast.1.adoc

Co-authored-by: Sascha Steinbiss <satta@debian.org>
@dominiklohmann dominiklohmann force-pushed the topic/debian-upstream-patches branch from d2eedab to 1de8084 Compare April 1, 2021 09:21
@dominiklohmann dominiklohmann force-pushed the topic/debian-upstream-patches branch from f81e1e1 to 5125c35 Compare April 1, 2021 09:35
@dominiklohmann dominiklohmann requested a review from tobim April 1, 2021 09:35
@satta
Copy link
Contributor

satta commented Apr 1, 2021

@satta it'd be lovely if you could test this locally (especially for the robin map change) and publicly comment that I am allowed to use your patches for this purpose, just to be on the safe side.

Surely you are, I'd be happy to see this upstream. Tested the robinmap patch, and building fine for me (I added -DVAST_ENABLE_BUNDLED_ROBIN_MAP=OFF to the build parameters in the package for the sake of completeness).

@dominiklohmann
Copy link
Member Author

I added -DVAST_ENABLE_BUNDLED_ROBIN_MAP=OFF to the build parameters in the package for the sake of completeness.

Good idea. It's the default, but it doesn't hurt to specify explicitly.

@dominiklohmann dominiklohmann force-pushed the topic/debian-upstream-patches branch from 7c06bfa to b575e67 Compare April 1, 2021 09:54
Copy link
Member

@tobim tobim left a comment

Choose a reason for hiding this comment

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

Thanks @satta for the generous contribution!

@dominiklohmann dominiklohmann enabled auto-merge April 1, 2021 13:51
@dominiklohmann
Copy link
Member Author

macOS CI seems to be hanging, merging regardless.

@dominiklohmann dominiklohmann disabled auto-merge April 1, 2021 13:59
@dominiklohmann dominiklohmann merged commit ff5581f into master Apr 1, 2021
@dominiklohmann dominiklohmann deleted the topic/debian-upstream-patches branch April 1, 2021 14:00
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