commit 958dfa435e4e4a3e44a232b7c0d5480e1b143fc1 Author: Colin Walters Date: Sat Dec 21 19:41:30 2013 -0500 Initial import from pkgsys-ostree diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..bf50f20d --- /dev/null +++ b/COPYING @@ -0,0 +1,482 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307 USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am new file mode 100644 index 00000000..a68f2d2f --- /dev/null +++ b/Makefile-rpm-ostree.am @@ -0,0 +1,29 @@ +# Copyright (C) 2013 Colin Walters +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +bin_SCRIPTS += rpm-ostree + +rpm-ostree: fedora/rpm-ostree.in Makefile + $(AM_V_GEN) sed -e s,@PYTHON\@,$(PYTHON), -e s,@pkglibdir\@,$(pkglibdir), $< > $@.tmp && mv $@.tmp $@ + @chmod a+x $@ + +pyrpmostreedir = $(pkglibdir)/rpm-ostree +pyrpmostree_DATA = src/rpmostree.py \ + $(NULL) + +privdatadir=$(pkglibdir) +privdata_DATA = src/tmpfiles-ostree-integration.conf diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 00000000..77fd35bc --- /dev/null +++ b/Makefile.am @@ -0,0 +1,59 @@ +# Copyright (C) 2011,2013 Colin Walters +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +AM_CPPFLAGS = -DDATADIR='"$(datadir)"' \ + -DLIBEXECDIR='"$(libexecdir)"' \ + -DLOCALEDIR=\"$(datadir)/locale\" \ + -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_34 +AM_CFLAGS = $(WARN_CFLAGS) +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-maintainer-mode + +# Subdirectories +SUBDIRS = . + +#if ENABLE_GTK_DOC +#SUBDIRS += doc +#endif + +# Common variables +NULL = +INSTALL_DATA_HOOKS = +BUILT_SOURCES = +MANPAGES = +CLEANFILES = +EXTRA_DIST = +bin_PROGRAMS = +sbin_PROGRAMS = +bin_SCRIPTS = +lib_LTLIBRARIES = +libexec_PROGRAMS = +noinst_LTLIBRARIES = +noinst_PROGRAMS = +privlibdir = $(pkglibdir) +privlib_LTLIBRARIES = +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = +INTROSPECTION_GIRS = +girdir = $(datadir)/gir-1.0 +gir_DATA = +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = + +EXTRA_DIST += autogen.sh COPYING + +include Makefile-rpm-ostree.am diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 00000000..9cb5b9f2 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec autoreconf --force --install --verbose diff --git a/configure.ac b/configure.ac new file mode 100644 index 00000000..b929d9fc --- /dev/null +++ b/configure.ac @@ -0,0 +1,45 @@ +AC_PREREQ([2.63]) +AC_INIT([fedora-ostree], [2013.1], [walters@verbum.org]) +AC_CONFIG_HEADER([config.h]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) + +AM_INIT_AUTOMAKE([1.11 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz]) +AM_MAINTAINER_MODE([enable]) +AM_SILENT_RULES([yes]) +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE + +AC_PROG_CC +AM_PROG_CC_C_O + +changequote(,)dnl +if test "x$GCC" = "xyes"; then + WARN_CFLAGS="-Wall -Wstrict-prototypes -Werror=missing-prototypes \ + -Werror=implicit-function-declaration \ + -Werror=pointer-arith -Werror=init-self -Werror=format=2 \ + -Werror=format-security \ + -Werror=missing-include-dirs -Werror=aggregate-return \ + -Werror=declaration-after-statement" +fi +changequote([,])dnl +AC_SUBST(WARN_CFLAGS) + +# Initialize libtool +LT_PREREQ([2.2.4]) +LT_INIT([disable-static]) + +PKG_PROG_PKG_CONFIG + +PKG_CHECK_MODULES(PKGDEP_GIO_UNIX, [gio-unix-2.0]) +PKG_CHECK_MODULES(PKGDEP_OSTREE, [ostree-1]) +AC_PATH_PROG([XSLTPROC], [xsltproc]) + +AC_CONFIG_FILES([ +Makefile +]) +AC_OUTPUT + +echo " + $PACKAGE $VERSION +" diff --git a/src/README.md b/src/README.md new file mode 100644 index 00000000..5dbf1d0f --- /dev/null +++ b/src/README.md @@ -0,0 +1,90 @@ +Using yum-ostree +================ + +This tool takes a set of packages, and commits them to an OSTree +repository. At the moment, it is intended for use on build servers. +For example, this invocation: + + # yum-ostree --repo=repo --enablerepo=fedora --os=fedora --os-version=20 create my-server-packages @minimal kernel ostree fedora-release lvm2 e2fsprogs btrfs-progs passwd httpd + +Will create a ref named "fedora/20/my-server-packages", containing a +complete bootable root filesystem of those packages. As you can see +from the example above, the package set is quite minimal, we're just +adding on "httpd". + +Now, if you export the repo via any plain HTTP server, clients using +OSTree can then replicate this tree, and boot it, tracking updates you +make over time. + +Pulling and booting from a client machine +========================================= + +First, install the ostree package, of course; make sure you have +ostree 2013.7 or newer. + + # yum install ostree + +Now, this bit of one time initialization will both +create `/ostree` for you, as well as `/ostree/deploy/fedora`. + + # ostree admin os-init fedora + +This step tells OSTree how to find the repository you built on +the server. You only need to do this once. + + # ostree remote add myserver https://mycorp.example.com/repo + +Now, since we did not GPG sign our repo above, we need to disable GPG +verification. Add `gpg-verify=false` in the `[remote]` section. + + # nano /ostree/repo/config + +This step downloads that ref into `/ostree/repo`: + + # ostree pull myserver fedora/20/my-server-packages + +This step extracts the root filesystem, and updates the bootloader +configuration: + + # ostree admin deploy --os=fedora fedora/20/my-server-packages + +We need to do some initial setup before we actually boot the system. +Copy in the storage configuration: + + # cp /etc/fstab /ostree/deploy/fedora/current + +And set a root password: + + # chroot /ostree/deploy/fedora/current passwd + +And there is one final (manual) step: You must copy your system's +kernel arguments from `/boot/grub2/grub.cfg` and add them to +`/boot/loader/entries/ostree-fedora-0.conf`, on the `options` +line. This step may be automated further in the future. + +Booting the system +================== + +Remember, at this point there is no impact on your installed system +except for additional disk space in the `/boot/loader` and `/ostree` +directories. + +Reboot, and get a GRUB prompt. At the prompt, press `c`. Now, enter: + + insmod blscfg + bls_import + +Then press `Esc`. You should have an additional boot menu entry, +named `ostree:fedora:0`. Nagivate to it and press `Enter`. + + +Inside the system +================= + +To upgrade, run as root: + +# ostree admin upgrade + +Note that in our demo so far, we did not install `yum` (or even +`rpm`). Getting these to work fully is the next phase of the +`yum-ostree` development. diff --git a/src/ostree-nspawn b/src/ostree-nspawn new file mode 100644 index 00000000..d6c70dda --- /dev/null +++ b/src/ostree-nspawn @@ -0,0 +1,24 @@ +#!/usr/bin/env sh +# +# Copyright (C) 2013 Colin Walters +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +root=$1 +deploydir=$(dirname $root) +osgroupdir=$(dirname $deploydir) + +exec systemd-nspawn --bind=${osgroupdir}/var:/var --bind=/:/sysroot --bind=/boot:/boot --bind-ro=${root}/usr:/usr -D ${root} "$@" diff --git a/src/rpm-ostree-make-vm-image b/src/rpm-ostree-make-vm-image new file mode 100755 index 00000000..889aa0ff --- /dev/null +++ b/src/rpm-ostree-make-vm-image @@ -0,0 +1,59 @@ +#!/usr/bin/env python +# +# Copyright (C) 2012,2013 Colin Walters +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +import os +import sys +import subprocess +import tempfile +import StringIO + +sizeMb = 8 * 1024; +bootMb = 200; +swapMb = 500; + +refname = sys.argv[1]; +diskname = refname.replace('/', '-') + '.qcow2'; + +if not os.path.exists(diskname): + tmpname = diskname + '.tmp' + if os.path.exists(tmpname): os.unlink(tmpname) + partconfig_path = 'partconfig.txt' + f = open(partconfig_path, 'w') + f.write('''launch +part-add /dev/sda p 64 409663 +part-add /dev/sda p 409664 540735 +part-add /dev/sda p 540736 16777215 +part-set-bootable /dev/sda 1 true +mkfs ext4 /dev/sda1 +set-e2label /dev/sda1 gnostree-boot +mkswap-L gnostree-swap /dev/sda2 +mkfs ext4 /dev/sda3 +set-e2label /dev/sda3 gnostree-root +mount /dev/sda3 / +mkdir /boot''') + f.close() + subprocess.check_call(['qemu-img', 'create', '-f', 'qcow2', tmpname, '' + str(sizeMb) + 'M']) + subprocess.check_call(['guestfish', '-a', tmpname, '--rw'], stdin=open(partconfig_path)) + +if not os.path.isdir('mnt'): + os.mkdir('mnt') +subprocess.check_call(['guestmount', '-a', tmpname, '--rw', '-m', '/dev/sda3', '-m', '/dev/sda1:/boot', 'mnt']) + +admin_cmd = ['ostree', 'admin', '--sysroot=mnt'] +subprocess.check_call(admin_cmd + ['init-fs', 'mnt']) diff --git a/src/rpm-ostree.in b/src/rpm-ostree.in new file mode 100644 index 00000000..84937f64 --- /dev/null +++ b/src/rpm-ostree.in @@ -0,0 +1,31 @@ +#!@PYTHON@ +# +# Copyright (C) 2013 Colin Walters +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +import os +import sys +import __builtin__ + +__builtin__.__dict__['PKGLIBDIR'] = "@pkglibdir@" + +path = os.path.join('@pkglibdir@', 'rpm-ostree') +sys.path.insert(0, path) + +import rpmrpmrpmostree + +sys.exit(rpmostree.main()) diff --git a/src/rpm-ostree.py b/src/rpm-ostree.py new file mode 100755 index 00000000..3aa907f1 --- /dev/null +++ b/src/rpm-ostree.py @@ -0,0 +1,390 @@ +#!/usr/bin/env python +# +# Copyright (C) 2012,2013 Colin Walters +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +import os +import re +import sys +import optparse +import time +import shutil +import subprocess + +from gi.repository import GLib +from gi.repository import Gio +from gi.repository import OSTree + +os_release_data = {} +opts = None +args = None + +def ensuredir(path): + if not os.path.isdir(path): + os.makedirs(path) + +def rmrf(path): + shutil.rmtree(path, ignore_errors=True) + +def feed_checksum(checksum, stream): + b = stream.read(8192) + while b != '': + checksum.update(b) + b = stream.read(8192) + +def _find_current_origin_refspec(): + dpath = '/ostree/deploy/%s/deploy' % (os_release_data['ID'], ) + for name in os.listdir(dpath): + if name.endswith('.origin'): + for line in open(os.path.join(dpath, name)): + if line.startswith('refspec='): + return line[len('refspec='):] + return None + +def _initfs(targetroot): + os.makedirs(targetroot) + for d in ['dev', 'proc', 'run', 'sys', 'var']: + os.mkdir(os.path.join(targetroot, d)) + + # Special ostree mount + os.mkdir(os.path.join(targetroot, 'sysroot')) + + # Some FHS targets; these all live in /var + for (target, name) in [('var/opt', 'opt'), + ('var/srv', 'srv'), + ('var/mnt', 'mnt'), + ('var/roothome', 'root'), + ('var/home', 'home'), + ('run/media', 'media'), + ('sysroot/ostree', 'ostree'), + ('sysroot/tmp', 'tmp')]: + os.symlink(target, os.path.join(targetroot, name)) + + +def _clone_current_root_to_yumroot(yumroot): + _initfs(yumroot) + for d in ['boot', 'usr', 'etc', 'var/lib/rpm', 'var/cache/yum']: + destdir = os.path.join(yumroot, d) + rmrf(destdir) + ensuredir(os.path.dirname(destdir)) + subprocess.check_call(['cp', '--reflink=auto', '-a', + '/' + d, + destdir]) + +def replace_nsswitch(target_usretc): + nsswitch_conf = os.path.join(target_usretc, 'nsswitch.conf') + f = open(nsswitch_conf) + newf = open(nsswitch_conf + '.tmp', 'w') + passwd_re = re.compile(r'^passwd:\s+files(.*)$') + group_re = re.compile(r'^group:\s+files(.*)$') + for line in f: + match = passwd_re.match(line) + if match and line.find('altfiles') == -1: + newf.write('passwd: files altfiles' + match.group(1) + '\n') + continue + match = group_re.match(line) + if match and line.find('altfiles') == -1: + newf.write('group: files altfiles' + match.group(1) + '\n') + continue + newf.write(line) + f.close() + newf.close() + os.rename(nsswitch_conf + '.tmp', nsswitch_conf) + +def do_kernel_prep(yumroot, logs_lookaside): + bootdir = os.path.join(yumroot, 'boot') + kernel_path = None + for name in os.listdir(bootdir): + if name.startswith('vmlinuz-'): + kernel_path = os.path.join(bootdir, name) + break + elif name.startswith('initramfs-'): + # If somehow the %post generated an initramfs, blow it + # away - we take over that role. + initramfs_path = os.path.join(bootdir, name) + print "Removing RPM-generated " + initramfs_path + rmrf(initramfs_path) + + if kernel_path is None: + raise ValueError("Failed to find vmlinuz- in " + yum_boot) + + kname = os.path.basename(kernel_path) + kver = kname[kname.find('-') + 1:] + print "Kernel version is " + kver + + # OSTree will take care of this + loaderdir = os.path.join(bootdir, 'loader') + rmrf(loaderdir) + + args = ['chroot', yumroot, 'depmod', kver] + print "Running: %s" % (subprocess.list2cmdline(args), ) + subprocess.check_call(args) + + # Copy of code from gnome-continuous; yes, we hardcode + # the machine id for now, because distributing pre-generated + # initramfs images with dracut/systemd at the moment + # effectively requires this. + # http://lists.freedesktop.org/archives/systemd-devel/2013-July/011770.html + print "Hardcoding machine-id" + f = open(os.path.join(yumroot, 'etc', 'machine-id'), 'w') + f.write('45bb3b96146aa94f299b9eb43646eb35\n') + f.close() + + args = ['chroot', yumroot, + 'dracut', '-v', '--tmpdir=/tmp', + '-f', '/tmp/initramfs.img', kver]; + print "Running: %s" % (subprocess.list2cmdline(args), ) + subprocess.check_call(args) + + initramfs_path = os.path.join(yumroot, 'tmp', 'initramfs.img') + if not os.path.exists(initramfs_path): + raise ValueError("Failed to find " + initramfs_path) + + os.rename(initramfs_path, os.path.join(bootdir, 'initramfs-yumostree.img')) + varlog_dracut_path = os.path.join(yumroot, 'var', 'log', 'dracut.log') + if os.path.exists(varlog_dracut_path): + os.rename(varlog_dracut_path, os.path.join(logs_lookaside, 'dracut.log')) + +def _create_rootfs_from_yumroot_content(targetroot, yumroot): + """Prepare a root filesystem, taking mainly the contents of /usr from yumroot""" + + _initfs(targetroot) + + # We take /usr from the yum content + os.rename(os.path.join(yumroot, 'usr'), os.path.join(targetroot, 'usr')) + # Plus the RPM database goes in usr/share/rpm + legacyrpm_path = os.path.join(yumroot, 'var/lib/rpm') + newrpm_path = os.path.join(targetroot, 'usr/share/rpm') + if not os.path.isdir(newrpm_path): + os.rename(legacyrpm_path, newrpm_path) + + # Except /usr/local -> ../var/usrlocal + target_usrlocal = os.path.join(targetroot, 'usr/local') + if not os.path.islink(target_usrlocal): + rmrf(target_usrlocal) + os.symlink('../var/usrlocal', target_usrlocal) + target_usretc = os.path.join(targetroot, 'usr/etc') + rmrf(target_usretc) + os.rename(os.path.join(yumroot, 'etc'), target_usretc) + + # Move boot, but rename the kernel/initramfs to have a checksum + targetboot = os.path.join(targetroot, 'boot') + os.rename(os.path.join(yumroot, 'boot'), targetboot) + kernel = None + initramfs = None + for name in os.listdir(targetboot): + if name.startswith('vmlinuz-'): + kernel = os.path.join(targetboot, name) + elif name.startswith('initramfs-'): + initramfs = os.path.join(targetboot, name) + + assert (kernel is not None and initramfs is not None) + + checksum = GLib.Checksum.new(GLib.ChecksumType.SHA256) + f = open(kernel) + feed_checksum(checksum, f) + f.close() + f = open(initramfs) + feed_checksum(checksum, f) + f.close() + + bootcsum = checksum.get_string() + + os.rename(kernel, kernel + '-' + bootcsum) + os.rename(initramfs, initramfs + '-' + bootcsum) + + # Also carry along toplevel compat links + for name in ['lib', 'lib64', 'bin', 'sbin']: + src = os.path.join(yumroot, name) + if os.path.islink(src): + os.rename(src, os.path.join(targetroot, name)) + + target_tmpfilesd = os.path.join(targetroot, 'usr/lib/tmpfiles.d') + ensuredir(target_tmpfilesd) + shutil.copy(os.path.join(PKGLIBDIR, 'tmpfiles-gnome-ostree.conf'), target_tmpfilesd) + +def yuminstall(yumroot, packages): + yumargs = ['yum', '-y', '--releasever=%s' % (opts.os_version, ), '--nogpg', '--setopt=keepcache=1', '--installroot=' + yumroot, '--disablerepo=*'] + yumargs.extend(map(lambda x: '--enablerepo=' + x, opts.enablerepo)) + yumargs.append('install') + yumargs.extend(packages) + print "Running: %s" % (subprocess.list2cmdline(yumargs), ) + yum_env = dict(os.environ) + yum_env['KERNEL_INSTALL_NOOP'] = 'yes' + proc = subprocess.Popen(yumargs, env=yum_env) + rcode = proc.wait() + if rcode != 0: + raise ValueError("Yum exited with code %d" % (rcode, )) + +def main(): + parser = optparse.OptionParser('%prog ACTION PACKAGE1 [PACKAGE2...]') + parser.add_option('', "--repo", + action='store', dest='repo_path', + default=None, + help="Path to OSTree repository (default=/ostree)") + parser.add_option('', "--deploy", + action='store_true', + default=False, + help="Do a deploy if true") + parser.add_option('', "--breakpoint", + action='store', + default=None, + help="Stop at given phase") + parser.add_option('', "--os", + action='store', dest='os', + default=None, + help="OS Name (default from /etc/os-release)") + parser.add_option('', "--os-version", + action='store', dest='os_version', + default=None, + help="OS version (default from /etc/os-release)") + parser.add_option('', "--enablerepo", + action='append', dest='enablerepo', + default=[], + help="Enable this yum repo") + parser.add_option('', "--local-ostree-package", + action='store', dest='local_ostree_package', + default='ostree', + help="Path to local OSTree RPM") + + global opts + global args + (opts, args) = parser.parse_args(sys.argv[1:]) + + if (opts.os is None or + opts.os_version is None): + f = open('/etc/os-release') + for line in f.readlines(): + if line == '': continue + (k,v) = line.split('=', 1) + os_release_data[k.strip()] = v.strip() + f.close() + + if opts.os is None: + opts.os = os_release_data['ID'] + if opts.os_version is None: + opts.os_version = os_release_data['VERSION_ID'] + + print "Targeting os=%s version=%s" % (opts.os, opts.os_version) + + action = args[0] + if action == 'create': + branchname = args[1] + ref = '%s/%s/%s' % (opts.os, opts.os_version, branchname) + packages = args[2:] + commit_message = 'Commit of %d packages' % (len(packages), ) + else: + print >>sys.stderr, "Unknown action %s" % (action, ) + sys.exit(1) + + if opts.repo_path is not None: + repo = OSTree.Repo.new(Gio.File.new_for_path(opts.repo_path)) + else: + repo = OSTree.Repo.new_default() + + repo.open(None) + + cachedir = '/var/cache/rpm-ostree/work' + ensuredir(cachedir) + + yumroot = os.path.join(cachedir, 'yum') + targetroot = os.path.join(cachedir, 'rootfs') + yumcachedir = os.path.join(yumroot, 'var/cache/yum') + yumcache_lookaside = os.path.join(cachedir, 'yum-cache') + logs_lookaside = os.path.join(cachedir, 'logs') + + rmrf(logs_lookaside) + ensuredir(logs_lookaside) + + shutil.rmtree(yumroot, ignore_errors=True) + if action == 'create': + yumroot_varcache = os.path.join(yumroot, 'var/cache') + if os.path.isdir(yumcache_lookaside): + print "Reusing cache: " + yumroot_varcache + ensuredir(yumroot_varcache) + subprocess.check_call(['cp', '-a', yumcache_lookaside, yumcachedir]) + else: + print "No cache found at: " + yumroot_varcache + else: + print "Cloning active root" + _clone_current_root_to_yumroot(yumroot) + print "...done" + time.sleep(3) + + # Ensure we have enough to modify NSS + yuminstall(yumroot, ['filesystem', 'glibc', 'nss-altfiles']) + + if opts.breakpoint == 'post-yum-phase1': + return + + # Prepare NSS configuration; this needs to be done + # before any invocations of "useradd" in %post + for n in ['passwd', 'group']: + open(os.path.join(yumroot, 'usr/lib', n), 'w').close() + replace_nsswitch(os.path.join(yumroot, 'etc')) + + yuminstall(yumroot, packages) + + if opts.breakpoint == 'post-yum-phase2': + return + + do_kernel_prep(yumroot, logs_lookaside) + + if opts.breakpoint == 'post-yum': + return + + # Attempt to cache stuff between runs + rmrf(yumcache_lookaside) + print "Saving yum cache " + yumcache_lookaside + os.rename(yumcachedir, yumcache_lookaside) + + yumroot_rpmlibdir = os.path.join(yumroot, 'var/lib/rpm') + rpmtextlist = os.path.join(cachedir, 'rpm-manifest.txt') + manifest = subprocess.check_call(['rpm', '-qa', '--dbpath=' + yumroot_rpmlibdir], + stdout=open(rpmtextlist, 'w')) + + rmrf(targetroot) + _create_rootfs_from_yumroot_content(targetroot, yumroot) + + yumroot_varlog = os.path.join(yumroot, 'var/log') + for name in os.listdir(yumroot_varlog): + shutil.move(os.path.join(yumroot_varlog, name), logs_lookaside) + + # To make SELinux work, we need to do the labeling right before this. + # This really needs some sort of API, so we can apply the xattrs as + # we're committing into the repo, rather than having to label the + # physical FS. + # For now, no xattrs (and hence no SELinux =( ) + print "Committing " + targetroot + "..." + repo.prepare_transaction(None) + mtree = OSTree.MutableTree.new() + modifier = OSTree.RepoCommitModifier.new(OSTree.RepoCommitModifierFlags.SKIP_XATTRS, None, None) + repo.write_directory_to_mtree(Gio.File.new_for_path(targetroot), + mtree, modifier, None) + [success, parent] = repo.resolve_rev(ref, True) + [success, tree] = repo.write_mtree(mtree, None) + [success, commit] = repo.write_commit(parent, '', commit_message, None, tree, None) + repo.transaction_set_ref(None, ref, commit) + repo.commit_transaction(None) + + print "%s => %s" % (ref, commit) + + rmrf(yumroot) + rmrf(targetroot) + + if opts.deploy: + subprocess.check_call(['ostree', 'admin', 'deploy', '--os=' + opts.os, ref]) diff --git a/src/tmpfiles-ostree-integration.conf b/src/tmpfiles-ostree-integration.conf new file mode 100644 index 00000000..c9b13246 --- /dev/null +++ b/src/tmpfiles-ostree-integration.conf @@ -0,0 +1,19 @@ +d /var/log/journal 0755 root root - +L /var/home - - - - ../sysroot/home +d /var/opt 0755 root root - +d /var/srv 0755 root root - +d /var/roothome 0700 root root - +d /var/usrlocal 0755 root root - +d /var/usrlocal/bin 0755 root root - +d /var/usrlocal/etc 0755 root root - +d /var/usrlocal/games 0755 root root - +d /var/usrlocal/include 0755 root root - +d /var/usrlocal/lib 0755 root root - +d /var/usrlocal/man 0755 root root - +d /var/usrlocal/sbin 0755 root root - +d /var/usrlocal/share 0755 root root - +d /var/usrlocal/src 0755 root root - +d /var/mnt 0755 root root - +d /run/media 0755 root root - +d /var/lib 0755 root root - +L /var/lib/rpm - - - - ../../usr/share/rpm