rpms/ostree
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream version

Browse Source
This commit is contained in:
Colin Walters 2016-02-26 12:44:15 -05:00
parent 9cb24f2d7e
commit 1041b0f484
4 changed files with 0 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-deltas-Fix-some-more-32-bit-warnings.patch
View File

@ -1,31 +0,0 @@
From ed7266b10ad75252b7d8026a4329d913a8ada8c1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 22 Feb 2016 22:07:02 -0500
Subject: [PATCH] deltas: Fix some more 32 bit warnings
---
src/libostree/ostree-repo-static-delta-core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c
index 6369f34..eb6de3b 100644
--- a/src/libostree/ostree-repo-static-delta-core.c
+++ b/src/libostree/ostree-repo-static-delta-core.c
@@ -640,10 +640,10 @@ show_one_part (OstreeRepo *self,
" opsize=%" G_GUINT64_FORMAT
"\n",
i,
- g_variant_n_children (modes),
- g_variant_n_children (xattrs),
- g_variant_n_children (blob),
- g_variant_n_children (ops));
+ (guint64)g_variant_n_children (modes),
+ (guint64)g_variant_n_children (xattrs),
+ (guint64)g_variant_n_children (blob),
+ (guint64)g_variant_n_children (ops));
if (!_ostree_static_delta_part_execute (self, objects,
part, TRUE, TRUE,
--
1.8.3.1

41
0001-lib-Two-more-compiler-warning-fixes.patch
View File

@ -1,41 +0,0 @@
From 61b4f268622e64610e14883367cbead18c716bc4 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 22 Feb 2016 21:11:10 -0500
Subject: [PATCH] lib: Two more compiler warning fixes
---
src/libostree/ostree-repo-libarchive.c | 2 +-
src/libostree/ostree-repo.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c
index b21e222..1c05159 100644
--- a/src/libostree/ostree-repo-libarchive.c
+++ b/src/libostree/ostree-repo-libarchive.c
@@ -640,7 +640,7 @@ write_directory_to_libarchive_recurse (OstreeRepo *self,
if (r != bytes_read)
{
propagate_libarchive_error (error, a);
- g_prefix_error (error, "Failed to write %" G_GUINT64_FORMAT " bytes (code %" G_GUINT64_FORMAT"): ", (guint64)bytes_read, r);
+ g_prefix_error (error, "Failed to write %" G_GUINT64_FORMAT " bytes (code %" G_GUINT64_FORMAT"): ", (guint64)bytes_read, (guint64)r);
goto out;
}
}
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 1e9673d..3b08d44 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -4604,8 +4604,8 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
gs_free char *from = NULL;
gs_free char *to = NULL;
gs_free guchar *csum = NULL;
- gs_free char *superblock;
- gs_fd_close int superblock_file_fd;
+ gs_free char *superblock = NULL;
+ gs_fd_close int superblock_file_fd = -1;
g_autoptr(GInputStream) in_stream = NULL;
_ostree_parse_delta_name (delta_names->pdata[i], &from, &to);
--
1.8.3.1

26
0001-libarchive-Fix-a-32-bit-format-warning.patch
View File

@ -1,26 +0,0 @@
From 88ae6f1b9e64926c47e5c1dae36027b8c46816f7 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 22 Feb 2016 20:52:33 -0500
Subject: [PATCH] libarchive: Fix a 32 bit format warning
This is actually an error by default with our default CFLAGS.
---
src/libostree/ostree-repo-libarchive.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c
index 82c8dd5..b21e222 100644
--- a/src/libostree/ostree-repo-libarchive.c
+++ b/src/libostree/ostree-repo-libarchive.c
@@ -640,7 +640,7 @@ write_directory_to_libarchive_recurse (OstreeRepo *self,
if (r != bytes_read)
{
propagate_libarchive_error (error, a);
- g_prefix_error (error, "Failed to write %" G_GUINT64_FORMAT " bytes (code %" G_GUINT64_FORMAT"): ", bytes_read, r);
+ g_prefix_error (error, "Failed to write %" G_GUINT64_FORMAT " bytes (code %" G_GUINT64_FORMAT"): ", (guint64)bytes_read, r);
goto out;
}
}
--
1.8.3.1

3
ostree.spec
View File

@ -37,9 +37,6 @@ Requires: /usr/bin/gpgv2
Requires: systemd-units
Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch
Patch3: 0001-libarchive-Fix-a-32-bit-format-warning.patch
Patch4: 0001-lib-Two-more-compiler-warning-fixes.patch
Patch5: 0001-deltas-Fix-some-more-32-bit-warnings.patch
%description
OSTree is a tool for managing bootable, immutable, versioned