diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-01-08 00:09:23 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-08 00:09:23 +0000 |
| commit | 7ac9d52d1b2fb6008774f1267f707c7c6a7c4b06 (patch) | |
| tree | 5789a0a502e44441c84770ba2d98e50d7659ffef | |
| parent | 3345eb6dcb5a0025e693cfd9e5fda2e979947227 (diff) | |
| parent | 01a76ec4e5aaeba0834437a5b4268008a0826fc3 (diff) | |
merge of 259a4ccadefe0737612a849ff810ce6a4debd589
and 5f40addfed07ed4b104416c2d8464fe20c5ba399
| -rw-r--r-- | conf/distro/familiar.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | conf/distro/include/multimachine.conf (renamed from classes/multimachine.inc) | 0 | ||||
| -rw-r--r-- | conf/distro/openzaurus.conf | 2 |
4 files changed, 4 insertions, 0 deletions
diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf index 98807d63ab..0b31c3c5a3 100644 --- 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/distro/include/.mtn2git_empty diff --git a/classes/multimachine.inc b/conf/distro/include/multimachine.conf index 1f73ffd30f..1f73ffd30f 100644 --- a/classes/multimachine.inc +++ b/conf/distro/include/multimachine.conf diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf index 1a4fc7c3f8..b110ad84e9 100644 --- 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 |