diff --git a/.gitignore b/.gitignore index 360c35d..6389b51 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /rpm-ostree-2015.7.tar.xz /rpm-ostree-2015.8.tar.xz /rpm-ostree-2015.9.tar.xz +/rpm-ostree-2015.10.tar.xz diff --git a/0001-compose-Ensure-we-ve-cleaned-up-references-to-tmpfs-.patch b/0001-compose-Ensure-we-ve-cleaned-up-references-to-tmpfs-.patch deleted file mode 100644 index 224ceef..0000000 --- a/0001-compose-Ensure-we-ve-cleaned-up-references-to-tmpfs-.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b7e8c7bdc573ed87aa0787b2c829db58d9697a65 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Fri, 30 Oct 2015 21:40:14 -0400 -Subject: [PATCH] compose: Ensure we've cleaned up references to tmpfs workdir - before umount - -Otherwise the `umount()` will always fail. This hasn't been a problem -so far while running in a external container (docker/systemd-nspawn), -but is when running in `mock` because it doesn't set its namespace to -be private. - -This should help Fedora's Bodhi, which uses rpm-ostree inside mock. ---- - src/app/rpmostree-compose-builtin-tree.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/app/rpmostree-compose-builtin-tree.c b/src/app/rpmostree-compose-builtin-tree.c -index 42691de..8cb6463 100644 ---- a/src/app/rpmostree-compose-builtin-tree.c -+++ b/src/app/rpmostree-compose-builtin-tree.c -@@ -945,11 +945,19 @@ rpmostree_compose_builtin_tree (int argc, - } - - out: -+ /* Move back out of the workding directory to ensure unmount works */ -+ (void )chdir ("/"); -+ -+ if (self->workdir_dfd != -1) -+ (void) close (self->workdir_dfd); - - if (workdir_is_tmp) - { - if (opt_workdir_tmpfs) -- (void) umount (gs_file_get_path_cached (self->workdir)); -+ if (umount (gs_file_get_path_cached (self->workdir)) != 0) -+ { -+ fprintf (stderr, "warning: umount failed: %m\n"); -+ } - (void) gs_shutil_rm_rf (self->workdir, NULL, NULL); - } - if (self) --- -1.8.3.1 - diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 48b1df4..d32f41e 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -1,7 +1,7 @@ Summary: Client side upgrade program and server side compose tool Name: rpm-ostree -Version: 2015.9 -Release: 4%{?dist} +Version: 2015.10 +Release: 1%{?dist} #VCS: https://github.com/cgwalters/rpm-ostree # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot" Source0: rpm-ostree-%{version}.tar.xz @@ -24,8 +24,6 @@ BuildRequires: libattr-devel Requires: ostree >= 2014.6 -Patch0: 0001-compose-Ensure-we-ve-cleaned-up-references-to-tmpfs-.patch - %description This tool binds together the world of RPM packages with the OSTree model of bootable filesystem trees. It provides commands usable both @@ -64,14 +62,15 @@ os.chdir(os.environ['RPM_BUILD_ROOT']) for line in sys.argv[1:]: if line == '': break - assert(line[0] == '/') - files = glob.glob(line[1:]) - if len(files) > 0: - sys.stderr.write('{0} matched {1} files\n'.format(line, len(files))) - sys.stdout.write(line) - sys.stdout.write('\n') + if line[0] != '/': + sys.stdout.write(line + '\n') else: - sys.stderr.write('{0} did not match any files\n'.format(line)) + files = glob.glob(line[1:]) + if len(files) > 0: + sys.stderr.write('{0} matched {1} files\n'.format(line, len(files))) + sys.stdout.write(line + '\n') + else: + sys.stderr.write('{0} did not match any files\n'.format(line)) EOF python autofiles.py > files \ '%{_bindir}/*' \ @@ -96,6 +95,9 @@ python autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Sat Nov 21 2015 Colin Walters - 2015.10-1 +- New upstream version + * Mon Nov 09 2015 Colin Walters - 2015.9-4 - Fix files list for -devel, which should in turn fix Anaconda builds which pull in rpm-ostree, but should not have devel bits. diff --git a/sources b/sources index 569b1b4..feff537 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4170d598b13a0cf224dba3a94d7a26c8 rpm-ostree-2015.9.tar.xz +9f1cf7f7dc808ed3de399df6cd71704c rpm-ostree-2015.10.tar.xz