packaging: Support vendoring the Rust sources #1391
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This ends up being different than what landed in librsvg (that was imported into ostree) because in rpm-ostree we've basically been using `git archive`-based tarball generation rather than `make dist` for a long time. And supporting `make dist` looks like it'd get into handling the `libdnf` bits and walking into `cmake` land so...yeah let's not do that. The canonical sources are in git (recursively via submodule), except for the Rust sources, which cargo can download dynamically, and with this patch we support glomming all of that together into a tarball. (And turn off `make dist` so people understand how we do it) Tested by `make -f Makefile.dist-packaging dist-snapshot`, then copying the resulting tarball into a container with `--net=none` and building there.
jlebon
reviewed
Jun 6, 2018
packaging/make-git-snapshot.sh
Outdated
| @@ -29,4 +29,15 @@ ls -al ${TARFILE_TMP} | |||
| tar -A -f ${TARFILE_TMP} submodule.tar | |||
| rm submodule.tar | |||
| done | |||
| tmpd=$(mktemp -d) | |||
There was a problem hiding this comment.
Let's add a trap to nuke this for good measure? (I just tried this patch locally, and it died on some local config issue and left the directory behind!)
packaging/make-git-snapshot.sh
Outdated
| cargo vendor -q --sync ${TOP}/rust/Cargo.toml vendor | ||
| cp ${TOP}/rust/Cargo.lock . | ||
| cp ${TOP}/rust/cargo-vendor-config .cargo/config | ||
| tar --transform='s,^,rust/,' -vrf ${TARFILE_TMP} . |
There was a problem hiding this comment.
Though let's drop the -v? Seems inconsistent to be printing these when we're not printing anything else during dist-snapshot.
|
LGTM! Though that last fixup looks like it's targeting the wrong commit, right? |
|
Yep, fixed the fixup. |
rh-atomic-bot
pushed a commit
that referenced
this pull request
Jun 6, 2018
This ends up being different than what landed in librsvg (that was imported into ostree) because in rpm-ostree we've basically been using `git archive`-based tarball generation rather than `make dist` for a long time. And supporting `make dist` looks like it'd get into handling the `libdnf` bits and walking into `cmake` land so...yeah let's not do that. The canonical sources are in git (recursively via submodule), except for the Rust sources, which cargo can download dynamically, and with this patch we support glomming all of that together into a tarball. (And turn off `make dist` so people understand how we do it) Tested by `make -f Makefile.dist-packaging dist-snapshot`, then copying the resulting tarball into a container with `--net=none` and building there. Closes: #1391 Approved by: jlebon
rh-atomic-bot
pushed a commit
that referenced
this pull request
Jun 6, 2018
Closes: #1391 Approved by: jlebon
|
💔 Test failed - status-atomicjenkins |
|
@rh-atomic-bot retry |
|
⚡ Test exempted: merge already tested. |
rh-atomic-bot
pushed a commit
that referenced
this pull request
Jun 6, 2018
Closes: #1391 Approved by: jlebon
LorbusChris
pushed a commit
to LorbusChris/rpm-ostree-spec
that referenced
this pull request
Oct 22, 2018
rpm-ostree now includes some Rust code. See coreos/rpm-ostree#1377 and coreos/rpm-ostree#1391
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This ends up being different than what landed in librsvg (that
was imported into ostree) because in rpm-ostree we've basically
been using
git archive-based tarball generation rather thanmake distfor a long time. And supporting
make distlooks like it'd get intohandling the
libdnfbits and walking intocmakeland so...yeahlet's not do that.
The canonical sources are in git (recursively via submodule),
except for the Rust sources, which cargo can download dynamically,
and with this patch we support glomming all of that together
into a tarball.
(And turn off
make distso people understand how we do it)Tested by
make -f Makefile.dist-packaging dist-snapshot, thencopying the resulting tarball into a container with
--net=noneand building there.