shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-10-26 17:25:36 +03:00
Code Issues Projects Releases Wiki Activity
c8744beb17
ostree/Makefile-ostree.am

96 lines
3.2 KiB
Plaintext
Raw Normal View History

De-recursify source tree
2011-11-02 23:45:32 +04:00
# Makefile for C source code
#
# Copyright (C) 2011 Colin Walters <walters@verbum.org>
#
Switch to LGPLv2+ for most code Since we're making a shared library, it should be usable by non-GPL apps. To allow more code sharing between the core and the tests, move them to the LGPLv2+ too. A few bits of test and other code are still GPL. See the new COPYING file for more information.
2011-11-10 22:17:04 +04:00
# 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.
De-recursify source tree
2011-11-02 23:45:32 +04:00
#
Switch to LGPLv2+ for most code Since we're making a shared library, it should be usable by non-GPL apps. To allow more code sharing between the core and the tests, move them to the LGPLv2+ too. A few bits of test and other code are still GPL. See the new COPYING file for more information.
2011-11-10 22:17:04 +04:00
# This library is distributed in the hope that it will be useful,
De-recursify source tree
2011-11-02 23:45:32 +04:00
# but WITHOUT ANY WARRANTY; without even the implied warranty of
Switch to LGPLv2+ for most code Since we're making a shared library, it should be usable by non-GPL apps. To allow more code sharing between the core and the tests, move them to the LGPLv2+ too. A few bits of test and other code are still GPL. See the new COPYING file for more information.
2011-11-10 22:17:04 +04:00
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
De-recursify source tree
2011-11-02 23:45:32 +04:00
#
Switch to LGPLv2+ for most code Since we're making a shared library, it should be usable by non-GPL apps. To allow more code sharing between the core and the tests, move them to the LGPLv2+ too. A few bits of test and other code are still GPL. See the new COPYING file for more information.
2011-11-10 22:17:04 +04:00
# 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.
De-recursify source tree
2011-11-02 23:45:32 +04:00
bin_PROGRAMS += ostree
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
ostree_SOURCES = src/ostree/main.c \
Move "ostadmin" => "ostree admin" This helps us avoid polluting the global binary namespace.
2012-09-09 02:46:50 +04:00
src/ostree/ot-builtin-admin.c \
admin: Rework /ostree/deploy to support multiple independent operating systems The real vision of OSTree is to "multiple versions of multiple operating systems". Up until now, it's worked to install gnome-ostree inside a host distribution, but several things don't work quite right if you try to do completely different systems. In the new model, there's the concept of an "osname" which encompasses a few properties: 1) Its own /var 2) A set of trees deployed in /ostree/deploy/OSNAME/ 3) Its own "current" and "previous" links. Now it no longer really makes sense to boot with "ostree=current". Instead, you specify e.g. "ostree=gnome/current". This is an incompatible change to the deployment code - you will need to run init-os gnome and redeploy. All "ostree admin" subcommands now take an OSNAME argument.
2012-12-20 02:52:46 +04:00
src/ostree/ot-builtins.h \
core: Add 'cat' builtin
2012-03-05 20:32:48 +04:00
src/ostree/ot-builtin-cat.c \
core: Add ability for repositories to have a "parent" This will be useful for ostbuild; a user can create their own archive mode repository which transparently inherits objects from the root-owned one in /ostree.
2012-04-17 05:21:50 +04:00
src/ostree/ot-builtin-config.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-checkout.c \
core: Add checksum builtin This necessitated reworking things so that builtins can specify no --repo is required.
2011-11-18 16:29:13 +04:00
src/ostree/ot-builtin-checksum.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-commit.c \
src/ostree/ot-builtin-diff.c \
src/ostree/ot-builtin-fsck.c \
src/ostree/ot-builtin-init.c \
core: Rename local-clone to pull-local Also change it to copy selective refs, rather than enumerating all objects.
2012-05-02 01:43:26 +04:00
src/ostree/ot-builtin-pull-local.c \
Add 'ostree log' command Follows the parent of commits showing each in turn until it reaches the top of the commit tree. https://bugzilla.gnome.org/show_bug.cgi?id=705973
2013-08-14 13:47:30 +04:00
src/ostree/ot-builtin-log.c \
core: Add ls builtin
2011-11-28 05:10:48 +04:00
src/ostree/ot-builtin-ls.c \
core: Add "prune" builtin This should be useful on clients to trim old refs. For example, after an upgrade the system could do: ostree --repo=/ostree/repo prune --depth=2 gnomeos-3.4-i686-runtime This would remote all objects that aren't in the current build and the previous one.
2012-02-24 19:23:35 +04:00
src/ostree/ot-builtin-prune.c \
Add "refs" builtin This is just useful to look at before pruning, etc.
2013-06-29 22:51:08 +04:00
src/ostree/ot-builtin-refs.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-remote.c \
Add 'ostree reset' command to undo a bad commit Accepts the following arguments: ref checksum Checks that the checksum is a parent of the ref before rewriting the ref. https://bugzilla.gnome.org/show_bug.cgi?id=705979
2013-08-14 14:42:13 +04:00
src/ostree/ot-builtin-reset.c \
build: Move sources into src/ again This is necessary if we want to build when srcdir == builddir, otherwise we blow up because "ostree" is a source directory and a binary.
2011-11-15 00:39:38 +04:00
src/ostree/ot-builtin-rev-parse.c \
src/ostree/ot-builtin-show.c \
core: Add write-refs builtin This will be used by import-tree to pipe refs to write.
2012-05-15 04:46:41 +04:00
src/ostree/ot-builtin-write-refs.c \
core: Split pull functionality into separate ostree-pull binary This is to avoid everything depending on libsoup.
2011-11-30 18:21:14 +04:00
src/ostree/ot-main.h \
src/ostree/ot-main.c \
Intelligible display for 'ostree show' Show something similar to git metadata display. Show raw variant data when --raw is specified https://bugzilla.gnome.org/show_bug.cgi?id=705973
2013-08-14 13:25:32 +04:00
src/ostree/ot-dump.h \
src/ostree/ot-dump.c \
ostree: Support for using EDITOR to fill commit subject/body Behave similar to git when 'ostree commit' is run without a --subject or --body. Bring up an editor. The first line becomes the subject and following lines become the --body after an optional blank line. Use similar logic to git in determining EDITOR https://bugzilla.gnome.org/show_bug.cgi?id=707063
2013-08-29 19:23:20 +04:00
src/ostree/ot-editor.c \
src/ostree/ot-editor.h \
De-recursify source tree
2011-11-02 23:45:32 +04:00
$(NULL)
core: Support being built without libsoup-gnome While bootstrapping gnomeos, it's really handy if we can be built without pull support, because libsoup-gnome pulls in a huge set of dependencies.
2011-11-15 00:08:09 +04:00
Move "ostadmin" => "ostree admin" This helps us avoid polluting the global binary namespace.
2012-09-09 02:46:50 +04:00
# Admin subcommand
ostree_SOURCES += \
admin init-fs: New builtin Should be used when initializing a new root filesystem for a "pure OSTree" system; for example, what "ostbuild privhelper-deploy-qemu" does when creating a filesystem image loopback.
2012-12-10 02:01:51 +04:00
src/ostree/ot-admin-builtin-init-fs.c \
Move "ostadmin" => "ostree admin" This helps us avoid polluting the global binary namespace.
2012-09-09 02:46:50 +04:00
src/ostree/ot-admin-builtin-diff.c \
src/ostree/ot-admin-builtin-deploy.c \
admin: Add an "undeploy" command Otherwise it's really easy to keep accumulating deployments. Also, we may want to run this after rebooting, so we're back down to one operating system.
2013-07-23 17:19:24 +04:00
src/ostree/ot-admin-builtin-undeploy.c \
admin: Rename prune -> cleanup, avoid doing repo prune twice Calling it "cleanup" is better since it does more than repo pruning. We were also doing a prune twice; ot_admin_cleanup() already does one, so drop the bits to do it in cleanup.c.
2013-07-16 00:13:12 +04:00
src/ostree/ot-admin-builtin-cleanup.c \
admin: Rework /ostree/deploy to support multiple independent operating systems The real vision of OSTree is to "multiple versions of multiple operating systems". Up until now, it's worked to install gnome-ostree inside a host distribution, but several things don't work quite right if you try to do completely different systems. In the new model, there's the concept of an "osname" which encompasses a few properties: 1) Its own /var 2) A set of trees deployed in /ostree/deploy/OSNAME/ 3) Its own "current" and "previous" links. Now it no longer really makes sense to boot with "ostree=current". Instead, you specify e.g. "ostree=gnome/current". This is an incompatible change to the deployment code - you will need to run init-os gnome and redeploy. All "ostree admin" subcommands now take an OSNAME argument.
2012-12-20 02:52:46 +04:00
src/ostree/ot-admin-builtin-os-init.c \
[INCOMPATIBLE CHANGE] Implement new deployment model See https://wiki.gnome.org/OSTree/DeploymentModel2 This is a major rework of the on-disk filesystem layout, and the boot process. OSTree now explicitly supports upgrading kernels, and these upgrades are also atomic. The core concept of the new model is the "deployment list", which is an ordered list of bootable operating system trees. The deployment list is reflected in the bootloader configuration; which has a kernel argument that tells the initramfs (dracut) which operating system root to use. Invidiual notable changes that come along with this: 1) Operating systems should now come with their etc in usr/etc; OSTree will perform a 3-way merge at deployment time, and place etc in the actual root. This avoids the need for a bind mount, and is just a lot cleaner. 2) OSTree no longer bind mounts /root, /home, and /tmp. It is expected that the the OS/ has these as symbolic links into /var. At the moment, OSTree only supports managing syslinux; other bootloader backends will follow.
2013-06-29 19:45:53 +04:00
src/ostree/ot-admin-builtin-status.c \
admin: Rework /ostree/deploy to support multiple independent operating systems The real vision of OSTree is to "multiple versions of multiple operating systems". Up until now, it's worked to install gnome-ostree inside a host distribution, but several things don't work quite right if you try to do completely different systems. In the new model, there's the concept of an "osname" which encompasses a few properties: 1) Its own /var 2) A set of trees deployed in /ostree/deploy/OSNAME/ 3) Its own "current" and "previous" links. Now it no longer really makes sense to boot with "ostree=current". Instead, you specify e.g. "ostree=gnome/current". This is an incompatible change to the deployment code - you will need to run init-os gnome and redeploy. All "ostree admin" subcommands now take an OSNAME argument.
2012-12-20 02:52:46 +04:00
src/ostree/ot-admin-builtin-upgrade.c \
build: Add one header file missing from dist
2012-09-26 03:13:05 +04:00
src/ostree/ot-admin-builtins.h \
admin: Split up the monstrous ot-admin-functions.c Now util, cleanup, and functions.
2013-07-07 20:42:02 +04:00
src/ostree/ot-admin-cleanup.c \
src/ostree/ot-admin-util.c \
Move "ostadmin" => "ostree admin" This helps us avoid polluting the global binary namespace.
2012-09-09 02:46:50 +04:00
src/ostree/ot-admin-functions.h \
src/ostree/ot-admin-functions.c \
[INCOMPATIBLE CHANGE] Implement new deployment model See https://wiki.gnome.org/OSTree/DeploymentModel2 This is a major rework of the on-disk filesystem layout, and the boot process. OSTree now explicitly supports upgrading kernels, and these upgrades are also atomic. The core concept of the new model is the "deployment list", which is an ordered list of bootable operating system trees. The deployment list is reflected in the bootloader configuration; which has a kernel argument that tells the initramfs (dracut) which operating system root to use. Invidiual notable changes that come along with this: 1) Operating systems should now come with their etc in usr/etc; OSTree will perform a 3-way merge at deployment time, and place etc in the actual root. This avoids the need for a bind mount, and is just a lot cleaner. 2) OSTree no longer bind mounts /root, /home, and /tmp. It is expected that the the OS/ has these as symbolic links into /var. At the moment, OSTree only supports managing syslinux; other bootloader backends will follow.
2013-06-29 19:45:53 +04:00
src/ostree/ot-admin-deploy.h \
src/ostree/ot-admin-deploy.c \
src/ostree/ot-bootloader.h \
src/ostree/ot-bootloader.c \
src/ostree/ot-bootloader-syslinux.h \
src/ostree/ot-bootloader-syslinux.c \
main: Add U-Boot bootlader backend support This patch adds support to generate files that can be used by Universal Bootloader (U-Boot). U-Boot allows to modify boards default boot commands by reading and executing a bootscript file or importing a plain text file that contains environment variables that could parameterize the boot command or a bootscript. OSTree generates a uEnv.txt file that contains booting information that is taken from Boot Loader Specification snippets files as defined in the new OSTree deployment model: https://wiki.gnome.org/OSTree/DeploymentModel2 On deploy or upgrade an uEnv.txt env var file is created in the path /boot/loader.${bootversion}/uEnv.txt. Also, a /boot/uEnv.txt symbolic link to loader/uEnv.txt is created so U-Boot can always import the file from a fixed path. Since U-Boot does not support a menu to list a set of Operative Systems, the most recent bootloader configuration from the list is used. To boot an OSTree using the generated uEnv.txt file, a board has to parameterize its default boot command using the following variables defined by OSTree: ${kernel_image}: path to the Linux kernel image ${ramdisk_image}: path to the initial ramdisk image ${bootargs}: parameters passed to the kernel command line Alternatively, for boards that don't support this scheme, a bootscript that overrides the default boot command can be used. An example of such a bootscript could be: setenv scriptaddr 40008000 setenv kernel_addr 0x40007000 setenv ramdisk_addr 0x42000000 ext2load mmc 0:1 ${scriptaddr} uEnv.txt env import -t ${scriptaddr} ${filesize} ext2load mmc 0:1 ${kernel_addr} ${kernel_image} ext2load mmc 0:1 ${ramdisk_addr} ${ramdisk_image} bootm ${kernel_addr} ${ramdisk_addr} Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> https://bugzilla.gnome.org/show_bug.cgi?id=706370
2013-08-15 14:33:25 +04:00
src/ostree/ot-bootloader-uboot.h \
src/ostree/ot-bootloader-uboot.c \
[INCOMPATIBLE CHANGE] Implement new deployment model See https://wiki.gnome.org/OSTree/DeploymentModel2 This is a major rework of the on-disk filesystem layout, and the boot process. OSTree now explicitly supports upgrading kernels, and these upgrades are also atomic. The core concept of the new model is the "deployment list", which is an ordered list of bootable operating system trees. The deployment list is reflected in the bootloader configuration; which has a kernel argument that tells the initramfs (dracut) which operating system root to use. Invidiual notable changes that come along with this: 1) Operating systems should now come with their etc in usr/etc; OSTree will perform a 3-way merge at deployment time, and place etc in the actual root. This avoids the need for a bind mount, and is just a lot cleaner. 2) OSTree no longer bind mounts /root, /home, and /tmp. It is expected that the the OS/ has these as symbolic links into /var. At the moment, OSTree only supports managing syslinux; other bootloader backends will follow.
2013-06-29 19:45:53 +04:00
src/ostree/ot-config-parser.h \
src/ostree/ot-config-parser.c \
src/ostree/ot-deployment.h \
src/ostree/ot-deployment.c \
src/ostree/ot-ordered-hash.h \
src/ostree/ot-ordered-hash.c \
Move "ostadmin" => "ostree admin" This helps us avoid polluting the global binary namespace.
2012-09-09 02:46:50 +04:00
$(NULL)
Add libgsystem as git external Don't replace ot_lfree and stuff yet though...to much code churn.
2012-07-15 19:51:57 +04:00
ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(srcdir)/src/ostree -DLOCALEDIR=\"$(datadir)/locale\"
Install a shared library This required a fair bit of surgery because previously ostree.h included otutil.h, but that's supposed to be a private library.
2013-07-27 03:25:07 +04:00
ostree_bin_shared_ldadd = libotutil.la libostree-1.la
core: Split pull functionality into separate ostree-pull binary This is to avoid everything depending on libsoup.
2011-11-30 18:21:14 +04:00
Support building with embedded glib
2012-06-08 01:21:55 +04:00
ostree_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
ostree_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
core: Split pull functionality into separate ostree-pull binary This is to avoid everything depending on libsoup.
2011-11-30 18:21:14 +04:00
configure: Fix libsoup detection * The configure arg was named incorrectly; we don't rely on libsoup-gnome, just libsoup. * We need to use AS_IF
2012-08-14 21:11:45 +04:00
if USE_LIBSOUP
Build without libsoup again
2013-07-10 04:31:55 +04:00
ostree_SOURCES += \
src/ostree/ot-builtin-pull.c \
src/ostree/ot-builtin-trivial-httpd.c \
$(NULL)
Fold ostree-pull into main binary The rationale for the separation was always kind of weak; I want to refactor the command line argument parsing, and it was complicating things.
2013-05-31 02:32:46 +04:00
ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
ostree_LDADD += $(OT_INTERNAL_SOUP_LIBS)
core: Support being built without libsoup-gnome While bootstrapping gnomeos, it's really handy if we can be built without pull support, because libsoup-gnome pulls in a huge set of dependencies.
2011-11-15 00:08:09 +04:00
endif
Reference in New Issue Copy Permalink