diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..69aad76 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/ostree-2014.9.tar.xz diff --git a/.ostree.metadata b/.ostree.metadata new file mode 100644 index 0000000..3092eb9 --- /dev/null +++ b/.ostree.metadata @@ -0,0 +1 @@ +6c3907b4b10f6d0d42914e5faa60d76eb10a30c8 SOURCES/ostree-2014.9.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-grub2-Fix-bad-substitution-in-review-followup.patch b/SOURCES/0001-grub2-Fix-bad-substitution-in-review-followup.patch new file mode 100644 index 0000000..3796569 --- /dev/null +++ b/SOURCES/0001-grub2-Fix-bad-substitution-in-review-followup.patch @@ -0,0 +1,26 @@ +From fb3ad0037f36e982c8fc04342615399794b65857 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 27 Oct 2014 12:19:32 -0400 +Subject: [PATCH] grub2: Fix bad substitution in review followup + +This caused GRUB2+EFI installations to fail. +--- + src/libostree/ostree-bootloader-grub2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c +index 19d0492..a9fc9f7 100644 +--- a/src/libostree/ostree-bootloader-grub2.c ++++ b/src/libostree/ostree-bootloader-grub2.c +@@ -320,7 +320,7 @@ rm -f ${grub_cfg}.new + /* NOTE: NON-ATOMIC REPLACEMENT; WE can't do anything else on FAT; + * see https://bugzilla.gnome.org/show_bug.cgi?id=724246 + */ +- if (!ot_gfile_ensure_unlinked (new_config_path, cancellable, error)) ++ if (!ot_gfile_ensure_unlinked (self->config_path_efi, cancellable, error)) + goto out; + if (!gs_file_rename (new_config_path, self->config_path_efi, + cancellable, error)) +-- +1.8.3.1 + diff --git a/SOURCES/91-ostree.preset b/SOURCES/91-ostree.preset new file mode 100644 index 0000000..ad0970b --- /dev/null +++ b/SOURCES/91-ostree.preset @@ -0,0 +1 @@ +enable ostree-remount.service diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec new file mode 100644 index 0000000..c5453c4 --- /dev/null +++ b/SPECS/ostree.spec @@ -0,0 +1,219 @@ +Summary: Tool for managing bootable, immutable filesystem trees +Name: ostree +Version: 2014.9 +Release: 3.atomic%{?dist} +#VCS: git:git://git.gnome.org/ostree +Source0: http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/ostree-%{version}.tar.xz +Source1: 91-ostree.preset +Patch1: 0001-grub2-Fix-bad-substitution-in-review-followup.patch +License: LGPLv2+ +URL: http://live.gnome.org/OSTree + +# For autosetup +BuildRequires: git +# We always run autogen.sh +BuildRequires: autoconf automake libtool +# For docs +BuildRequires: gtk-doc +# Core requirements +BuildRequires: pkgconfig(libgsystem) +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: libattr-devel +# Extras +BuildRequires: pkgconfig(libarchive) +BuildRequires: pkgconfig(libselinux) +BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(e2p) +BuildRequires: gpgme-devel +BuildRequires: pkgconfig(systemd) +BuildRequires: /usr/bin/g-ir-scanner +BuildRequires: dracut + +# Runtime requirements +Requires: dracut +Requires: systemd-units + +%description +OSTree is a tool for managing bootable, immutable, versioned +filesystem trees. While it takes over some of the roles of tradtional +"package managers" like dpkg and rpm, it is not a package system; nor +is it a tool for managing full disk images. Instead, it sits between +those levels, offering a blend of the advantages (and disadvantages) +of both. + +%package devel +Summary: Development headers for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package includes the header files for the %{name} library. + +%package grub2 +Summary: GRUB2 integration for OSTree +Group: Development/Libraries +Requires: grub2 + +%description grub2 +GRUB2 integration for OSTree + +%prep +%autosetup -n ostree-%{version} -Sgit + +%build +env NOCONFIGURE=1 ./autogen.sh +%configure --disable-silent-rules \ + --enable-gtk-doc \ + --with-selinux \ + --enable-libsoup-client-certs \ + --with-dracut +make %{?_smp_mflags} + +%install +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c" +find $RPM_BUILD_ROOT -name '*.la' -delete +install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system-preset/91-ostree.preset + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +%systemd_post ostree-remount.service + +%preun +%systemd_preun ostree-remount.service + +%files +%doc COPYING README.md +%{_bindir}/ostree +%{_sbindir}/ostree-prepare-root +%{_sbindir}/ostree-remount +%{_datadir}/ostree/trusted.gpg.d +%{_sysconfdir}/ostree +%{_sysconfdir}/dracut.conf.d/ostree.conf +%dir %{_prefix}/lib/dracut/modules.d/98ostree +%{_prefix}/lib/systemd/system/ostree*.service +%{_prefix}/lib/dracut/modules.d/98ostree/* +%{_libdir}/*.so.1* +%{_libdir}/girepository-1.0/OSTree-1.0.typelib +%{_mandir}/man1/*.gz +%{_prefix}/lib/systemd/system-preset/91-ostree.preset + +%files devel +%{_libdir}/lib*.so +%{_includedir}/* +%{_libdir}/pkgconfig/* +%dir %{_datadir}/gtk-doc/html/ostree +%{_datadir}/gtk-doc/html/ostree +%{_datadir}/gir-1.0/OSTree-1.0.gir + +%files grub2 +%{_sysconfdir}/grub.d/*ostree +%{_libexecdir}/ostree/grub2* + +%changelog +* Mon Oct 27 2014 Colin Walters - 2014.9-3.atomic +- Add patch to fix crasher on UEFI + +* Fri Oct 24 2014 Colin Walters - 2014.9-2.atomic +- New upstream release + +* Fri Oct 17 2014 Colin Walters - 2014.8-2.atomic +- Add patch for anaconda work + +* Thu Oct 16 2014 Colin Walters - 2014.8-1.atomic +- New upstream source + +* Fri Oct 03 2014 Colin Walters - 2014.7-1.atomic +- New upstream source + +* Sat Sep 20 2014 Colin Walters - 2014.6-3.atomic +- Backport patches for /etc merging + +* Mon Sep 08 2014 Colin Walters - 2014.6-2.atomic +- New upstream release + +* Fri Jun 27 2014 Colin Walters +- Add patch for tls-ca-path to enable restricting to Red Hat CDN CA + +* Thu Jun 26 2014 Colin Walters +- Add patch to hard require client certs, use it. This ensures + that the functionality is available in the buildroot, and we + do not silently compile without it. + +* Thu Jun 26 2014 Colin Walters +- Rebuild to pick up tagged libsoup for client-side certs + +* Thu Jun 12 2014 Colin Walters +- New atomic build + +* Sat Mar 22 2014 Colin Walters - 2014.3-1.collider.0 +- New upstream release + +* Sat Mar 01 2014 Colin Walters - 2014.2-1 +- New upstream release +- Depend on libselinux +- Explicitly depend on libarchive too, we were actually failing + to disable it before + +* Fri Jan 24 2014 Colin Walters - 2014.1-1 +- New upstream release + +* Mon Jan 13 2014 Colin Walters - 2013.7-2 +- Add preset file so ostree-remount is enabled by default, since + it needs to be. + +* Tue Oct 15 2013 Colin Walters - 2013.7-1 +- New upstream release +- Now LGPLv2+ only +- Enable libarchive since it might be useful for people +- Enable new gpgme dependency + +* Thu Sep 12 2013 Colin Walters - 2013.6-3 +- Enable introspection + +* Mon Sep 09 2013 Colin Walters - 2013.6-2 +- Tweak description + +* Mon Sep 09 2013 Colin Walters - 2013.6-1 +- New upstream release + +* Sat Aug 25 2013 Colin Walters - 2013.5-3 +- And actually while we are here, drop all the embedded dependency + goop from this spec file; it may live on in the EPEL branch. + +* Sat Aug 25 2013 Colin Walters - 2013.5-2 +- Drop requirement on linux-user-chroot + We now require triggers to be processed on the build server + by default, so ostree does not runtime-depend on linux-user-chroot. + +* Sat Aug 17 2013 Colin Walters - 2013.5-1 +- New upstream release +- Add devel package + +* Sat Aug 03 2013 Fedora Release Engineering - 2013.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 16 2013 Colin Walters - 2013.4-1 +- New upstream release + +* Sun Jul 07 2013 Colin Walters - 2013.3-1 +- New upstream release + +* Mon Apr 01 2013 Colin Walters - 2013.1-1 +- New upstream release + +* Thu Feb 14 2013 Fedora Release Engineering - 2012.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Dec 23 2012 Colin Walters - 2012.13-1 +- New upstream release + +* Tue Dec 18 2012 Colin Walters - 2012.12-2 +- Explicitly enable grub2 hook; otherwise we pick up whatever + the buildroot has, which is not what we want. + +* Mon Nov 19 2012 Colin Walters - 2012.12-1 +- Initial import; thanks to Michel Alexandre Salim for review + https://bugzilla.redhat.com/show_bug.cgi?id=819951 +