Remove all patches, applied upstream
This commit is contained in:
parent
401e2c2faf
commit
1bd12183ee
|
|
@ -1,6 +1,7 @@
|
|||
ostree (2016.4-1) UNRELEASED; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Remove all patches, applied upstream
|
||||
* debian/gbp.conf: use DEP-14 branch names
|
||||
|
||||
-- Simon McVittie <smcv@debian.org> Mon, 28 Mar 2016 12:02:59 +0100
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Fri, 11 Mar 2016 09:09:48 +0000
|
||||
Subject: Skip test_libarchive_ignore_device_file if we cannot write xattrs
|
||||
|
||||
The test tries to get a filesystem that supports xattrs by writing
|
||||
to /var/tmp, but in some automated build environments the entire
|
||||
build chroot is on a tmpfs.
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||
---
|
||||
tests/test-libarchive-import.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/tests/test-libarchive-import.c b/tests/test-libarchive-import.c
|
||||
index 928b149..877fa77 100644
|
||||
--- a/tests/test-libarchive-import.c
|
||||
+++ b/tests/test-libarchive-import.c
|
||||
@@ -193,6 +193,15 @@ test_libarchive_ignore_device_file (gconstpointer data)
|
||||
glnx_unref_object GFile *root = NULL;
|
||||
g_autofree char *commit_checksum = NULL;
|
||||
|
||||
+ if (setxattr (td->tmpd, "user.test-xattr-support", "yes", 4, 0) != 0)
|
||||
+ {
|
||||
+ int saved_errno = errno;
|
||||
+ g_autofree gchar *message = g_strdup_printf ("unable to setxattr on \"%s\": %s", td->tmpd, g_strerror (saved_errno));
|
||||
+
|
||||
+ g_test_skip (message);
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
g_assert_cmpint (0, ==, lseek (td->fd, 0, SEEK_SET));
|
||||
g_assert_cmpint (0, ==, archive_read_support_format_all (a));
|
||||
g_assert_cmpint (0, ==, archive_read_support_filter_all (a));
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
test-libarchive-fix-underlinking.patch
|
||||
Skip-test_libarchive_ignore_device_file-if-we-cannot-writ.patch
|
||||
tests-admin-test.sh-add-bin-sh.patch
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Fri, 11 Mar 2016 08:46:27 +0000
|
||||
Subject: test-libarchive: fix underlinking
|
||||
|
||||
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||
---
|
||||
Makefile-tests.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile-tests.am b/Makefile-tests.am
|
||||
index 6ec5835..4b0a526 100644
|
||||
--- a/Makefile-tests.am
|
||||
+++ b/Makefile-tests.am
|
||||
@@ -179,8 +179,8 @@ tests_test_checksum_CFLAGS = $(TESTS_CFLAGS) $(libglnx_cflags)
|
||||
tests_test_checksum_LDADD = $(TESTS_LDADD)
|
||||
|
||||
tests_test_libarchive_import_SOURCES = tests/test-libarchive-import.c
|
||||
-tests_test_libarchive_import_CFLAGS = $(TESTS_CFLAGS) $(libglnx_cflags)
|
||||
-tests_test_libarchive_import_LDADD = $(TESTS_LDADD)
|
||||
+tests_test_libarchive_import_CFLAGS = $(TESTS_CFLAGS) $(libglnx_cflags) $(OT_DEP_LIBARCHIVE_CFLAGS)
|
||||
+tests_test_libarchive_import_LDADD = $(TESTS_LDADD) $(OT_DEP_LIBARCHIVE_LIBS)
|
||||
|
||||
tests_test_keyfile_utils_CFLAGS = $(TESTS_CFLAGS)
|
||||
tests_test_keyfile_utils_LDADD = $(TESTS_LDADD)
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Sat, 19 Mar 2016 17:54:38 +0000
|
||||
Subject: tests/admin-test.sh: add #!/bin/sh
|
||||
|
||||
This is executable and appears to be intended to be executed directly,
|
||||
so it should have a #! line.
|
||||
---
|
||||
tests/admin-test.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/admin-test.sh b/tests/admin-test.sh
|
||||
index c4644d3..531cf99 100755
|
||||
--- a/tests/admin-test.sh
|
||||
+++ b/tests/admin-test.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#
|
||||
+#!/bin/sh
|
||||
# Copyright (C) 2011,2014 Colin Walters <walters@verbum.org>
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
Loading…
Reference in New Issue