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

fix: vendored tarfile creation #634

Merged
merged 7 commits into from
Mar 13, 2024

Conversation

mmartinv
Copy link
Contributor

@mmartinv mmartinv commented Feb 28, 2024

  • fix: filter uneeded crates when vendoring
  • fix: add missing patch to SOURCES dir
  • fix: use %autosetup instead of %setup
  • fix: generate the vendor tar file only when needed
  • feat: install builddep before building
  • fix: add missing RPM build dependency
  • fix: file listed twice and absolute symlink rpm build warnings

Fixes: #514

@mmartinv mmartinv changed the title fix vendored tarfile creation fix: vendored tarfile creation Feb 28, 2024
@mmartinv mmartinv force-pushed the fix-vendored-tarfile-creation branch 2 times, most recently from 9c90237 to fcb6fbc Compare February 29, 2024 17:26
Copy link
Contributor

@nullr0ute nullr0ute left a comment

Choose a reason for hiding this comment

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

Mostly fine.

.packit.yaml Show resolved Hide resolved
@mmartinv mmartinv force-pushed the fix-vendored-tarfile-creation branch from fcb6fbc to f1d74cb Compare March 1, 2024 16:46
@mmartinv mmartinv requested a review from nullr0ute March 1, 2024 18:16
@mmartinv mmartinv force-pushed the fix-vendored-tarfile-creation branch from f1d74cb to a8cc4d9 Compare March 4, 2024 08:29
.packit.yaml Outdated Show resolved Hide resolved
make-vendored-tarfile.sh Outdated Show resolved Hide resolved
Use `cargo-vendor-filtering`[1] to filter uneeded
crates when vendoring.

[1] https://github.com/coreos/cargo-vendor-filterer

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
Add missing patch to `rpmbuild/SOURCES` dir that makes
the build to fail in Fedora and do not copy unneeded files.

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
Use %autosetup macro to uncompress all the sources
and apply patches automatically when needed.

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
@mmartinv mmartinv force-pushed the fix-vendored-tarfile-creation branch from a8cc4d9 to a931428 Compare March 12, 2024 11:05
Generate the vendor tar file only for RHEL/CentOS builds
and remove `Source1` and the comment above in fedora
as we don't need vendoring in this case.

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
Install the build depencencies for `fido-device-onboard`
package so the build does not fail.

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
Add the missing `sqlite-devel` RPM build dependency.

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
Fix RPM build warnings:
    File listed twice: /etc/fdo/keys
    absolute symlink: /usr/libexec/fdo/fdo-owner-tool -> /usr/bin/fdo-owner-tool
    absolute symlink: /usr/libexec/fdo/fdo-admin-tool -> /usr/bin/fdo-admin-tool

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
@mmartinv mmartinv force-pushed the fix-vendored-tarfile-creation branch from a931428 to e7f7d1f Compare March 12, 2024 14:44
@mmartinv mmartinv requested a review from 7flying March 12, 2024 15:27
Copy link
Contributor

@nullr0ute nullr0ute left a comment

Choose a reason for hiding this comment

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

LGTM

@mergify mergify bot merged commit 657fefb into fdo-rs:main Mar 13, 2024
21 checks passed
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.

Investigate how we can remove more windows related crates when vendoring
3 participants