diff --git a/debian/changelog b/debian/changelog index d24b09e2..6c8095d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -ostree (2018.2-2) UNRELEASED; urgency=medium +ostree (2018.4-1) UNRELEASED; urgency=medium - * Mark all patches as applied upstream for 2018.3, including one - that was previously considered to be Debian-specific (moving to - Python 3 for tests) + * New upstream release + * Update symbols file + * Drop all patches, including one that was previously considered to + be Debian-specific (moving to Python 3 for tests) + * d/copyright: Update -- Simon McVittie Thu, 22 Feb 2018 22:55:11 +0000 diff --git a/debian/copyright b/debian/copyright index 56f3f06a..c07c7578 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,7 +9,7 @@ Copyright: © 1999-2000, 2002-2005 Free Software Foundation, Inc. © 1999-2003 Ximian, Inc. © 2008-2018 Red Hat, Inc - © 2011-2017 Colin Walters + © 2011-2018 Colin Walters © 2017 Georges Basile Stavracas Neto © 2011 Avery Pennarun © 2013 Collabora Ltd. diff --git a/debian/libostree-1-1.symbols b/debian/libostree-1-1.symbols index 0e02f5ee..24bb4a3f 100644 --- a/debian/libostree-1-1.symbols +++ b/debian/libostree-1-1.symbols @@ -23,6 +23,7 @@ libostree-1.so.1 libostree-1-1 #MINVER# LIBOSTREE_2017.15@LIBOSTREE_2017.15 2017.15 LIBOSTREE_2018.1@LIBOSTREE_2018.1 2018.1 LIBOSTREE_2018.2@LIBOSTREE_2018.2 2018.2 + LIBOSTREE_2018.3@LIBOSTREE_2018.3 2018.3 ostree_async_progress_finish@LIBOSTREE_2016.3 2016.4 ostree_async_progress_get@LIBOSTREE_2017.6 2017.6 ostree_async_progress_get_status@LIBOSTREE_2016.3 2016.4 @@ -92,7 +93,9 @@ libostree-1.so.1 libostree-1-1 #MINVER# ostree_deployment_get_type@LIBOSTREE_2016.3 2016.4 ostree_deployment_get_unlocked@LIBOSTREE_2016.4 2016.4 ostree_deployment_hash@LIBOSTREE_2016.3 2016.4 + ostree_deployment_is_pinned@LIBOSTREE_2018.3 2018.3 ostree_deployment_new@LIBOSTREE_2016.3 2016.4 + ostree_deployment_origin_remove_transient_state@LIBOSTREE_2018.3 2018.3 ostree_deployment_set_bootconfig@LIBOSTREE_2016.3 2016.4 ostree_deployment_set_bootserial@LIBOSTREE_2016.3 2016.4 ostree_deployment_set_index@LIBOSTREE_2016.3 2016.4 @@ -298,6 +301,7 @@ libostree-1.so.1 libostree-1-1 #MINVER# ostree_sysroot_deploy_tree@LIBOSTREE_2016.3 2016.4 ostree_sysroot_deployment_set_kargs@LIBOSTREE_2016.3 2016.4 ostree_sysroot_deployment_set_mutable@LIBOSTREE_2016.3 2016.4 + ostree_sysroot_deployment_set_pinned@LIBOSTREE_2018.3 2018.3 ostree_sysroot_deployment_unlock@LIBOSTREE_2016.4 2016.4 ostree_sysroot_ensure_initialized@LIBOSTREE_2016.3 2016.4 ostree_sysroot_get_booted_deployment@LIBOSTREE_2016.3 2016.4 diff --git a/debian/patches/Use-Python-3-for-tests.patch b/debian/patches/Use-Python-3-for-tests.patch deleted file mode 100644 index a2a23f56..00000000 --- a/debian/patches/Use-Python-3-for-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Simon McVittie -Date: Wed, 17 Jan 2018 14:07:32 +0000 -Subject: Use Python 3 for tests - -Signed-off-by: Simon McVittie -Closes: #1463 -Approved by: cgwalters -Forwarded: https://github.com/ostreedev/ostree/pull/1463 -[smcv: Remove ci/* changes: those files are not in tarball releases] -Applied-upstream: 2018.3, commit:971265e4e48f2ff512633b27c90569315ff168ff ---- - tests/bootloader-entries-crosscheck.py | 2 +- - tests/test-basic-user-only.sh | 2 +- - tests/test-concurrency.py | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/bootloader-entries-crosscheck.py b/tests/bootloader-entries-crosscheck.py -index 5faa548..41f6956 100755 ---- a/tests/bootloader-entries-crosscheck.py -+++ b/tests/bootloader-entries-crosscheck.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # - # Copyright (C) 2015 Red Hat - # -diff --git a/tests/test-basic-user-only.sh b/tests/test-basic-user-only.sh -index bea7b77..5f27014 100755 ---- a/tests/test-basic-user-only.sh -+++ b/tests/test-basic-user-only.sh -@@ -28,7 +28,7 @@ extra_basic_tests=5 - . $(dirname $0)/basic-test.sh - - $CMD_PREFIX ostree --version > version.yaml --python -c 'import yaml; yaml.safe_load(open("version.yaml"))' -+python3 -c 'import yaml; yaml.safe_load(open("version.yaml"))' - echo "ok yaml version" - - # Reset things so we don't inherit a lot of state from earlier tests -diff --git a/tests/test-concurrency.py b/tests/test-concurrency.py -index 3a0ce10..3ec3681 100755 ---- a/tests/test-concurrency.py -+++ b/tests/test-concurrency.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright (C) 2017 Colin Walters - # diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index d60a7cb8..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,5 +0,0 @@ -test-concurrency-Use-Python-3-syntax-for-octal.patch -test-concurrency-Replace-range-with-xrange.patch -test-concurrency-Explicitly-use-floor-division.patch -tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch -Use-Python-3-for-tests.patch diff --git a/debian/patches/test-concurrency-Explicitly-use-floor-division.patch b/debian/patches/test-concurrency-Explicitly-use-floor-division.patch deleted file mode 100644 index 5855a312..00000000 --- a/debian/patches/test-concurrency-Explicitly-use-floor-division.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Simon McVittie -Date: Wed, 17 Jan 2018 15:03:59 +0000 -Subject: test-concurrency: Explicitly use floor division - -Python 3 is pickier about this. Python 2.7 has Python 3-compatible -semantics for division when the division feature is imported from the -future. - -Signed-off-by: Simon McVittie -Applied-upstream: 2018.3, commit:98b597b465a556f3ad5b16478d7edee3037fbd4d ---- - tests/test-concurrency.py | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tests/test-concurrency.py b/tests/test-concurrency.py -index f16f696..3a0ce10 100755 ---- a/tests/test-concurrency.py -+++ b/tests/test-concurrency.py -@@ -17,6 +17,7 @@ - # Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. - -+from __future__ import division - from __future__ import print_function - import os - import sys -@@ -78,12 +79,12 @@ def run(n_committers, n_pruners): - pruners = set() - - print('n_committers', n_committers, 'n_pruners', n_pruners, file=sys.stderr) -- n_trees = n_committers / 2 -+ n_trees = n_committers // 2 - for v in range(n_trees): - mktree('tree{}'.format(v)) - - for v in range(n_committers): -- committers.add(commit(v / 2)) -+ committers.add(commit(v // 2)) - for v in range(n_pruners): - pruners.add(prune()) - -@@ -101,8 +102,8 @@ def run(n_committers, n_pruners): - shutil.rmtree('tree{}'.format(v)) - - # No concurrent pruning --run(cpu_count()/2 + 2, 0) -+run(cpu_count() // 2 + 2, 0) - print("ok no concurrent prunes") - --run(cpu_count()/2 + 4, 3) -+run(cpu_count() // 2 + 4, 3) - print("ok concurrent prunes") diff --git a/debian/patches/test-concurrency-Replace-range-with-xrange.patch b/debian/patches/test-concurrency-Replace-range-with-xrange.patch deleted file mode 100644 index f0753465..00000000 --- a/debian/patches/test-concurrency-Replace-range-with-xrange.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Simon McVittie -Date: Wed, 17 Jan 2018 14:42:20 +0000 -Subject: test-concurrency: Replace range with xrange - -range in Python 3 does what xrange did in Python 2. This still works in -Python 2, it just uses a bit more memory. - -Signed-off-by: Simon McVittie -Applied-upstream: 2018.3, commit:02dc5e2dd47d1be0eb73d2f7e5b588f04c572390 ---- - tests/test-concurrency.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/test-concurrency.py b/tests/test-concurrency.py -index 6fade24..f16f696 100755 ---- a/tests/test-concurrency.py -+++ b/tests/test-concurrency.py -@@ -34,7 +34,7 @@ def fatal(msg): - def mktree(dname, serial=0): - print('Creating tree', dname, file=sys.stderr) - os.mkdir(dname, 0o755) -- for v in xrange(20): -+ for v in range(20): - with open('{}/{}'.format(dname, v), 'w') as f: - f.write('{} {} {}\n'.format(dname, serial, v)) - -@@ -79,12 +79,12 @@ def run(n_committers, n_pruners): - - print('n_committers', n_committers, 'n_pruners', n_pruners, file=sys.stderr) - n_trees = n_committers / 2 -- for v in xrange(n_trees): -+ for v in range(n_trees): - mktree('tree{}'.format(v)) - -- for v in xrange(n_committers): -+ for v in range(n_committers): - committers.add(commit(v / 2)) -- for v in xrange(n_pruners): -+ for v in range(n_pruners): - pruners.add(prune()) - - failed = False -@@ -97,7 +97,7 @@ def run(n_committers, n_pruners): - if failed: - fatal('A child process exited abnormally') - -- for v in xrange(n_trees): -+ for v in range(n_trees): - shutil.rmtree('tree{}'.format(v)) - - # No concurrent pruning diff --git a/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch b/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch deleted file mode 100644 index 096bf2dc..00000000 --- a/debian/patches/test-concurrency-Use-Python-3-syntax-for-octal.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Simon McVittie -Date: Wed, 17 Jan 2018 14:25:26 +0000 -Subject: test-concurrency: Use Python 3 syntax for octal - -This also works in Python 2.7, and is a little clearer. - -Signed-off-by: Simon McVittie -Applied-upstream: 2018.3, commit:9933de232304f47e2be09c72906cc5183d9bbfda ---- - tests/test-concurrency.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test-concurrency.py b/tests/test-concurrency.py -index bdcc1d9..6fade24 100755 ---- a/tests/test-concurrency.py -+++ b/tests/test-concurrency.py -@@ -33,7 +33,7 @@ def fatal(msg): - # different files with different checksums. - def mktree(dname, serial=0): - print('Creating tree', dname, file=sys.stderr) -- os.mkdir(dname, 0755) -+ os.mkdir(dname, 0o755) - for v in xrange(20): - with open('{}/{}'.format(dname, v), 'w') as f: - f.write('{} {} {}\n'.format(dname, serial, v)) diff --git a/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch b/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch deleted file mode 100644 index 03568210..00000000 --- a/debian/patches/tests-bootloader-entries-crosscheck-Use-Python-3-friendly.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Simon McVittie -Date: Wed, 17 Jan 2018 15:19:12 +0000 -Subject: tests/bootloader-entries-crosscheck: Use Python 3-friendly sorting - -This is a little clearer than a strcmp()-style negative/zero/positive -return, and also works in Python 2. - -Signed-off-by: Simon McVittie -Applied-upstream: 2018.3, commit:6cabeaed3f45c8f3e05fb5e1152bfa5b96a3bc79 ---- - tests/bootloader-entries-crosscheck.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/bootloader-entries-crosscheck.py b/tests/bootloader-entries-crosscheck.py -index 38e8e45..5faa548 100755 ---- a/tests/bootloader-entries-crosscheck.py -+++ b/tests/bootloader-entries-crosscheck.py -@@ -38,8 +38,8 @@ def fatal(msg): - sys.stderr.write('\n') - sys.exit(1) - --def compare_entries_descending(a, b): -- return int(b['version']) - int(a['version']) -+def entry_get_version(entry): -+ return int(entry['version']) - - def get_ostree_option(optionstring): - for o in optionstring.split(): -@@ -65,7 +65,7 @@ for fname in os.listdir(loaderpath): - v = line[s+1:] - entry[k] = v - entries.append(entry) -- entries.sort(compare_entries_descending) -+ entries.sort(key=entry_get_version, reverse=True) - - # Parse SYSLINUX config - with open(syslinuxpath) as f: diff --git a/debian/rules b/debian/rules index 20965e12..8df9477f 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,7 @@ configure_options = \ --with-dracut \ --with-grub2 \ --with-grub2-mkconfig-path=/usr/sbin/grub-mkconfig \ + --with-libsystemd \ --with-systemdsystemgeneratordir=/lib/systemd/system-generators \ --with-systemdsystemunitdir=/lib/systemd/system \ $(NULL)