[gnome-ostree] Move ostbuild to src/



commit 1ea89231b3576bf94f4a70c0e3d2f678d6ffd4e4
Author: Colin Walters <walters verbum org>
Date:   Tue Jun 12 19:34:12 2012 -0400

    Move ostbuild to src/
    
    This fixes the build when srcdir == builddir, because the name
    "ostbuild" was both a directory and a binary.

 Makefile-ostbuild.am                               |   64 ++++++++++----------
 {ostbuild => src/ostbuild}/ostbuild.in             |    0
 {ostbuild => src/ostbuild}/pyostbuild/__init__.py  |    0
 {ostbuild => src/ostbuild}/pyostbuild/buildutil.py |    0
 .../ostbuild}/pyostbuild/builtin_build.py          |    0
 .../ostbuild}/pyostbuild/builtin_checkout.py       |    0
 .../pyostbuild/builtin_chroot_compile_one.py       |    0
 .../ostbuild}/pyostbuild/builtin_compile_one.py    |    0
 .../ostbuild}/pyostbuild/builtin_deploy_qemu.py    |    0
 .../ostbuild}/pyostbuild/builtin_deploy_root.py    |    0
 .../ostbuild}/pyostbuild/builtin_git_mirror.py     |    0
 .../ostbuild}/pyostbuild/builtin_import_tree.py    |    0
 .../ostbuild}/pyostbuild/builtin_init.py           |    0
 .../ostbuild}/pyostbuild/builtin_prefix.py         |    0
 .../pyostbuild/builtin_privhelper_deploy_qemu.py   |    0
 .../pyostbuild/builtin_privhelper_run_qemu.py      |    0
 .../ostbuild}/pyostbuild/builtin_resolve.py        |    0
 .../ostbuild}/pyostbuild/builtin_run_qemu.py       |    0
 .../ostbuild}/pyostbuild/builtin_source_diff.py    |    0
 {ostbuild => src/ostbuild}/pyostbuild/builtins.py  |    0
 .../ostbuild}/pyostbuild/filemonitor.py            |    0
 {ostbuild => src/ostbuild}/pyostbuild/fileutil.py  |    0
 {ostbuild => src/ostbuild}/pyostbuild/jsondb.py    |    0
 {ostbuild => src/ostbuild}/pyostbuild/kvfile.py    |    0
 {ostbuild => src/ostbuild}/pyostbuild/main.py      |    0
 {ostbuild => src/ostbuild}/pyostbuild/mainloop.py  |    0
 {ostbuild => src/ostbuild}/pyostbuild/odict.py     |    0
 .../ostbuild}/pyostbuild/ostbuildlog.py            |    0
 .../ostbuild}/pyostbuild/ostbuildrc.py             |    0
 .../ostbuild}/pyostbuild/privileged_subproc.py     |    0
 .../ostbuild}/pyostbuild/subprocess_helpers.py     |    0
 {ostbuild => src/ostbuild}/pyostbuild/vcs.py       |    0
 .../ostbuild}/pyostbuild/warningfilter.py          |    0
 33 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/Makefile-ostbuild.am b/Makefile-ostbuild.am
index 7f28fd1..a08441f 100644
--- a/Makefile-ostbuild.am
+++ b/Makefile-ostbuild.am
@@ -15,43 +15,43 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-ostbuild: ostbuild/ostbuild.in Makefile
+ostbuild: src/ostbuild/ostbuild.in Makefile
 	sed -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), $< > $  tmp && mv $  tmp $@
 bin_SCRIPTS += ostbuild 
 EXTRA_DIST += ostbuild/ostbuild.in
 
 pyostbuilddir=$(libdir)/ostbuild/pyostbuild
 pyostbuild_PYTHON =					\
-	ostbuild/pyostbuild/buildutil.py		\
-	ostbuild/pyostbuild/builtin_build.py	\
-	ostbuild/pyostbuild/builtin_checkout.py	\
-	ostbuild/pyostbuild/builtin_chroot_compile_one.py	\
-	ostbuild/pyostbuild/builtin_compile_one.py	\
-	ostbuild/pyostbuild/builtin_deploy_qemu.py	\
-	ostbuild/pyostbuild/builtin_deploy_root.py	\
-	ostbuild/pyostbuild/builtin_run_qemu.py	\
-	ostbuild/pyostbuild/builtin_import_tree.py	\
-	ostbuild/pyostbuild/builtin_privhelper_deploy_qemu.py	\
-	ostbuild/pyostbuild/builtin_privhelper_run_qemu.py	\
-	ostbuild/pyostbuild/builtin_git_mirror.py	\
-	ostbuild/pyostbuild/builtin_prefix.py	\
-	ostbuild/pyostbuild/builtin_resolve.py	\
-	ostbuild/pyostbuild/builtin_init.py	\
-	ostbuild/pyostbuild/builtin_source_diff.py	\
-	ostbuild/pyostbuild/builtins.py		\
-	ostbuild/pyostbuild/filemonitor.py		\
-	ostbuild/pyostbuild/fileutil.py		\
-	ostbuild/pyostbuild/__init__.py		\
-	ostbuild/pyostbuild/jsondb.py		\
-	ostbuild/pyostbuild/kvfile.py		\
-	ostbuild/pyostbuild/main.py			\
-	ostbuild/pyostbuild/mainloop.py		\
-	ostbuild/pyostbuild/odict.py		\
-	ostbuild/pyostbuild/ostbuildlog.py		\
-	ostbuild/pyostbuild/ostbuildrc.py		\
-	ostbuild/pyostbuild/privileged_subproc.py	\
-	ostbuild/pyostbuild/warningfilter.py	\
-	ostbuild/pyostbuild/subprocess_helpers.py	\
-	ostbuild/pyostbuild/vcs.py			\
+	src/ostbuild/pyostbuild/buildutil.py		\
+	src/ostbuild/pyostbuild/builtin_build.py	\
+	src/ostbuild/pyostbuild/builtin_checkout.py	\
+	src/ostbuild/pyostbuild/builtin_chroot_compile_one.py	\
+	src/ostbuild/pyostbuild/builtin_compile_one.py	\
+	src/ostbuild/pyostbuild/builtin_deploy_qemu.py	\
+	src/ostbuild/pyostbuild/builtin_deploy_root.py	\
+	src/ostbuild/pyostbuild/builtin_run_qemu.py	\
+	src/ostbuild/pyostbuild/builtin_import_tree.py	\
+	src/ostbuild/pyostbuild/builtin_privhelper_deploy_qemu.py	\
+	src/ostbuild/pyostbuild/builtin_privhelper_run_qemu.py	\
+	src/ostbuild/pyostbuild/builtin_git_mirror.py	\
+	src/ostbuild/pyostbuild/builtin_prefix.py	\
+	src/ostbuild/pyostbuild/builtin_resolve.py	\
+	src/ostbuild/pyostbuild/builtin_init.py	\
+	src/ostbuild/pyostbuild/builtin_source_diff.py	\
+	src/ostbuild/pyostbuild/builtins.py		\
+	src/ostbuild/pyostbuild/filemonitor.py		\
+	src/ostbuild/pyostbuild/fileutil.py		\
+	src/ostbuild/pyostbuild/__init__.py		\
+	src/ostbuild/pyostbuild/jsondb.py		\
+	src/ostbuild/pyostbuild/kvfile.py		\
+	src/ostbuild/pyostbuild/main.py			\
+	src/ostbuild/pyostbuild/mainloop.py		\
+	src/ostbuild/pyostbuild/odict.py		\
+	src/ostbuild/pyostbuild/ostbuildlog.py		\
+	src/ostbuild/pyostbuild/ostbuildrc.py		\
+	src/ostbuild/pyostbuild/privileged_subproc.py	\
+	src/ostbuild/pyostbuild/warningfilter.py	\
+	src/ostbuild/pyostbuild/subprocess_helpers.py	\
+	src/ostbuild/pyostbuild/vcs.py			\
 	$(NULL)
 
diff --git a/ostbuild/ostbuild.in b/src/ostbuild/ostbuild.in
similarity index 100%
rename from ostbuild/ostbuild.in
rename to src/ostbuild/ostbuild.in
diff --git a/ostbuild/pyostbuild/__init__.py b/src/ostbuild/pyostbuild/__init__.py
similarity index 100%
rename from ostbuild/pyostbuild/__init__.py
rename to src/ostbuild/pyostbuild/__init__.py
diff --git a/ostbuild/pyostbuild/buildutil.py b/src/ostbuild/pyostbuild/buildutil.py
similarity index 100%
rename from ostbuild/pyostbuild/buildutil.py
rename to src/ostbuild/pyostbuild/buildutil.py
diff --git a/ostbuild/pyostbuild/builtin_build.py b/src/ostbuild/pyostbuild/builtin_build.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_build.py
rename to src/ostbuild/pyostbuild/builtin_build.py
diff --git a/ostbuild/pyostbuild/builtin_checkout.py b/src/ostbuild/pyostbuild/builtin_checkout.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_checkout.py
rename to src/ostbuild/pyostbuild/builtin_checkout.py
diff --git a/ostbuild/pyostbuild/builtin_chroot_compile_one.py b/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_chroot_compile_one.py
rename to src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
diff --git a/ostbuild/pyostbuild/builtin_compile_one.py b/src/ostbuild/pyostbuild/builtin_compile_one.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_compile_one.py
rename to src/ostbuild/pyostbuild/builtin_compile_one.py
diff --git a/ostbuild/pyostbuild/builtin_deploy_qemu.py b/src/ostbuild/pyostbuild/builtin_deploy_qemu.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_deploy_qemu.py
rename to src/ostbuild/pyostbuild/builtin_deploy_qemu.py
diff --git a/ostbuild/pyostbuild/builtin_deploy_root.py b/src/ostbuild/pyostbuild/builtin_deploy_root.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_deploy_root.py
rename to src/ostbuild/pyostbuild/builtin_deploy_root.py
diff --git a/ostbuild/pyostbuild/builtin_git_mirror.py b/src/ostbuild/pyostbuild/builtin_git_mirror.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_git_mirror.py
rename to src/ostbuild/pyostbuild/builtin_git_mirror.py
diff --git a/ostbuild/pyostbuild/builtin_import_tree.py b/src/ostbuild/pyostbuild/builtin_import_tree.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_import_tree.py
rename to src/ostbuild/pyostbuild/builtin_import_tree.py
diff --git a/ostbuild/pyostbuild/builtin_init.py b/src/ostbuild/pyostbuild/builtin_init.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_init.py
rename to src/ostbuild/pyostbuild/builtin_init.py
diff --git a/ostbuild/pyostbuild/builtin_prefix.py b/src/ostbuild/pyostbuild/builtin_prefix.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_prefix.py
rename to src/ostbuild/pyostbuild/builtin_prefix.py
diff --git a/ostbuild/pyostbuild/builtin_privhelper_deploy_qemu.py b/src/ostbuild/pyostbuild/builtin_privhelper_deploy_qemu.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_privhelper_deploy_qemu.py
rename to src/ostbuild/pyostbuild/builtin_privhelper_deploy_qemu.py
diff --git a/ostbuild/pyostbuild/builtin_privhelper_run_qemu.py b/src/ostbuild/pyostbuild/builtin_privhelper_run_qemu.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_privhelper_run_qemu.py
rename to src/ostbuild/pyostbuild/builtin_privhelper_run_qemu.py
diff --git a/ostbuild/pyostbuild/builtin_resolve.py b/src/ostbuild/pyostbuild/builtin_resolve.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_resolve.py
rename to src/ostbuild/pyostbuild/builtin_resolve.py
diff --git a/ostbuild/pyostbuild/builtin_run_qemu.py b/src/ostbuild/pyostbuild/builtin_run_qemu.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_run_qemu.py
rename to src/ostbuild/pyostbuild/builtin_run_qemu.py
diff --git a/ostbuild/pyostbuild/builtin_source_diff.py b/src/ostbuild/pyostbuild/builtin_source_diff.py
similarity index 100%
rename from ostbuild/pyostbuild/builtin_source_diff.py
rename to src/ostbuild/pyostbuild/builtin_source_diff.py
diff --git a/ostbuild/pyostbuild/builtins.py b/src/ostbuild/pyostbuild/builtins.py
similarity index 100%
rename from ostbuild/pyostbuild/builtins.py
rename to src/ostbuild/pyostbuild/builtins.py
diff --git a/ostbuild/pyostbuild/filemonitor.py b/src/ostbuild/pyostbuild/filemonitor.py
similarity index 100%
rename from ostbuild/pyostbuild/filemonitor.py
rename to src/ostbuild/pyostbuild/filemonitor.py
diff --git a/ostbuild/pyostbuild/fileutil.py b/src/ostbuild/pyostbuild/fileutil.py
similarity index 100%
rename from ostbuild/pyostbuild/fileutil.py
rename to src/ostbuild/pyostbuild/fileutil.py
diff --git a/ostbuild/pyostbuild/jsondb.py b/src/ostbuild/pyostbuild/jsondb.py
similarity index 100%
rename from ostbuild/pyostbuild/jsondb.py
rename to src/ostbuild/pyostbuild/jsondb.py
diff --git a/ostbuild/pyostbuild/kvfile.py b/src/ostbuild/pyostbuild/kvfile.py
similarity index 100%
rename from ostbuild/pyostbuild/kvfile.py
rename to src/ostbuild/pyostbuild/kvfile.py
diff --git a/ostbuild/pyostbuild/main.py b/src/ostbuild/pyostbuild/main.py
similarity index 100%
rename from ostbuild/pyostbuild/main.py
rename to src/ostbuild/pyostbuild/main.py
diff --git a/ostbuild/pyostbuild/mainloop.py b/src/ostbuild/pyostbuild/mainloop.py
similarity index 100%
rename from ostbuild/pyostbuild/mainloop.py
rename to src/ostbuild/pyostbuild/mainloop.py
diff --git a/ostbuild/pyostbuild/odict.py b/src/ostbuild/pyostbuild/odict.py
similarity index 100%
rename from ostbuild/pyostbuild/odict.py
rename to src/ostbuild/pyostbuild/odict.py
diff --git a/ostbuild/pyostbuild/ostbuildlog.py b/src/ostbuild/pyostbuild/ostbuildlog.py
similarity index 100%
rename from ostbuild/pyostbuild/ostbuildlog.py
rename to src/ostbuild/pyostbuild/ostbuildlog.py
diff --git a/ostbuild/pyostbuild/ostbuildrc.py b/src/ostbuild/pyostbuild/ostbuildrc.py
similarity index 100%
rename from ostbuild/pyostbuild/ostbuildrc.py
rename to src/ostbuild/pyostbuild/ostbuildrc.py
diff --git a/ostbuild/pyostbuild/privileged_subproc.py b/src/ostbuild/pyostbuild/privileged_subproc.py
similarity index 100%
rename from ostbuild/pyostbuild/privileged_subproc.py
rename to src/ostbuild/pyostbuild/privileged_subproc.py
diff --git a/ostbuild/pyostbuild/subprocess_helpers.py b/src/ostbuild/pyostbuild/subprocess_helpers.py
similarity index 100%
rename from ostbuild/pyostbuild/subprocess_helpers.py
rename to src/ostbuild/pyostbuild/subprocess_helpers.py
diff --git a/ostbuild/pyostbuild/vcs.py b/src/ostbuild/pyostbuild/vcs.py
similarity index 100%
rename from ostbuild/pyostbuild/vcs.py
rename to src/ostbuild/pyostbuild/vcs.py
diff --git a/ostbuild/pyostbuild/warningfilter.py b/src/ostbuild/pyostbuild/warningfilter.py
similarity index 100%
rename from ostbuild/pyostbuild/warningfilter.py
rename to src/ostbuild/pyostbuild/warningfilter.py



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]