From 0de82378b98b118208cee91ed04c45dbe8809315 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 12 Nov 2011 17:47:12 -0500
Subject: [PATCH] Move debian based bits to debian/ subdirectory

This is in preparation for introducing a Yocto-based variant.
---
 gnomeos/{ => debian}/0001-Support-OSTree.patch | 0
 gnomeos/{ => debian}/debian-setup.sh           | 0
 gnomeos/{ => debian}/gnomeos-install.sh        | 0
 gnomeos/{ => debian}/gnomeos-make-base.sh      | 4 +++-
 gnomeos/{ => debian}/gnomeos-run.sh            | 0
 5 files changed, 3 insertions(+), 1 deletion(-)
 rename gnomeos/{ => debian}/0001-Support-OSTree.patch (100%)
 rename gnomeos/{ => debian}/debian-setup.sh (100%)
 rename gnomeos/{ => debian}/gnomeos-install.sh (100%)
 rename gnomeos/{ => debian}/gnomeos-make-base.sh (98%)
 rename gnomeos/{ => debian}/gnomeos-run.sh (100%)

diff --git a/gnomeos/0001-Support-OSTree.patch b/gnomeos/debian/0001-Support-OSTree.patch
similarity index 100%
rename from gnomeos/0001-Support-OSTree.patch
rename to gnomeos/debian/0001-Support-OSTree.patch
diff --git a/gnomeos/debian-setup.sh b/gnomeos/debian/debian-setup.sh
similarity index 100%
rename from gnomeos/debian-setup.sh
rename to gnomeos/debian/debian-setup.sh
diff --git a/gnomeos/gnomeos-install.sh b/gnomeos/debian/gnomeos-install.sh
similarity index 100%
rename from gnomeos/gnomeos-install.sh
rename to gnomeos/debian/gnomeos-install.sh
diff --git a/gnomeos/gnomeos-make-base.sh b/gnomeos/debian/gnomeos-make-base.sh
similarity index 98%
rename from gnomeos/gnomeos-make-base.sh
rename to gnomeos/debian/gnomeos-make-base.sh
index 235808c7..50e29d5e 100755
--- a/gnomeos/gnomeos-make-base.sh
+++ b/gnomeos/debian/gnomeos-make-base.sh
@@ -182,7 +182,9 @@ if ! test -d ${OBJ}; then
 fi
 
 cd ${WORKDIR}
-cp ${SRCDIR}/ostree_switch_root ${WORKDIR}
+(cd ${SRCDIR}/..;
+ make ostree_switch_root;
+ cp ostree_switch_root ${WORKDIR})
 
 kv=`uname -r`
 kernel=/boot/vmlinuz-${kv}
diff --git a/gnomeos/gnomeos-run.sh b/gnomeos/debian/gnomeos-run.sh
similarity index 100%
rename from gnomeos/gnomeos-run.sh
rename to gnomeos/debian/gnomeos-run.sh