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

add support for zstd compressed payload #297

Closed

Conversation

ignatenkobrain
Copy link
Contributor

No description provided.

Jeff Johnson and others added 2 commits August 2, 2017 12:21
v2 (Igor Gnatenko):
* Switch off from RPM_CHECK_LIB
* Reference zstd from rpm.pc
* Link rpmio with zstd

Closes: rpm-software-management#256
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
@@ -8,7 +8,7 @@ Name: RPM
Description: RPM Package Manager
Version: @VERSION@
URL: http://rpm.org
# Requires:
Requires.private: @ZSTD_REQUIRES@
Copy link
Member

Choose a reason for hiding this comment

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

If this is linked in from librpmio, there's no reason to add Requires.private, right? We never did this for any of the others...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

well, we do for Libraries.private... but since we use pkg-config for zstd, it is better to put into Requires.private..

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is mostly if you would like to do pkg-config --static --cflags --ldflags rpm to link RPM statically.. most likely it will not work at all due to some other issues, but this is not problem of this patchset ;)

@@ -351,6 +351,9 @@ int rpmFileIsCompressed(const char * file, rpmCompressedMagic * compressed)
(magic[4] == 0x5a) && (magic[5] == 0x00)) {
/* new style xz (lzma) with magic */
*compressed = COMPRESSED_XZ;
} else if ((magic[0] == 0x28) && (magic[1] == 0x85) &&
(magic[2] == 0x2f) ) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

seems like I overlooked this useless spaces in here, will fix in a bit

@ffesti ffesti closed this in 3684424 Aug 9, 2017
@ignatenkobrain ignatenkobrain deleted the zstd branch August 11, 2017 05:37
ydario pushed a commit to bitwiseworks/rpm that referenced this pull request Oct 21, 2017
  v2 (Igor Gnatenko):
    * Switch off from RPM_CHECK_LIB
    * Reference zstd from rpm.pc
    * Link rpmio with zstd
  v3 (Florian Festi):
    * move changes to cvtfmode into separate patches
    * do not error out on wrong compression levels
    * ifdef out zstdio
    Closes: rpm-software-management#256
    Closes: rpm-software-management#297
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
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.

None yet

3 participants