Move multimachine.inc to conf/distro/include/multimachine.conf and include it by...

diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf
index 98807d6..0b31c3c 100644 (file)
--- a/conf/distro/familiar.conf
+++ b/conf/distro/familiar.conf
@@ -12,3 +12,5 @@ BOOTSTRAP_EXTRA_DEPENDS += "familiar-version"
 BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version"
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+include conf/distro/include/multimachine.conf
\ No newline at end of file

diff --git a/conf/distro/include/.mtn2git_empty b/conf/distro/include/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/classes/multimachine.inc b/conf/distro/include/multimachine.conf
similarity index 100%
rename from classes/multimachine.inc
rename to conf/distro/include/multimachine.conf

diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf
index 1a4fc7c..b110ad8 100644 (file)
--- a/conf/distro/openzaurus.conf
+++ b/conf/distro/openzaurus.conf
@@ -14,3 +14,5 @@ TARGET_FPU = "soft"
 PARALLEL_INSTALL_MODULES = "1"
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
+
+include conf/distro/include/multimachine.conf
\ No newline at end of file