From 01a76ec4e5aaeba0834437a5b4268008a0826fc3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 8 Jan 2006 00:04:32 +0000 Subject: Move multimachine.inc to conf/distro/include/multimachine.conf and include it by default for familiar/openzaurus --- classes/multimachine.inc | 3 --- conf/distro/familiar.conf | 2 ++ conf/distro/include/.mtn2git_empty | 0 conf/distro/include/multimachine.conf | 3 +++ conf/distro/openzaurus.conf | 2 ++ 5 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 classes/multimachine.inc create mode 100644 conf/distro/include/.mtn2git_empty create mode 100644 conf/distro/include/multimachine.conf diff --git a/classes/multimachine.inc b/classes/multimachine.inc deleted file mode 100644 index 1f73ffd30f..0000000000 --- a/classes/multimachine.inc +++ /dev/null @@ -1,3 +0,0 @@ -STAMP = "${TMPDIR}/stamps/${PACKAGE_ARCH}-${HOST_OS}/${PF}" -WORKDIR = "${TMPDIR}/work/${PACKAGE_ARCH}-${HOST_OS}/${PF}" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${PACKAGE_ARCH}-${HOST_OS}/kernel" 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 diff --git a/conf/distro/include/multimachine.conf b/conf/distro/include/multimachine.conf new file mode 100644 index 0000000000..1f73ffd30f --- /dev/null +++ b/conf/distro/include/multimachine.conf @@ -0,0 +1,3 @@ +STAMP = "${TMPDIR}/stamps/${PACKAGE_ARCH}-${HOST_OS}/${PF}" +WORKDIR = "${TMPDIR}/work/${PACKAGE_ARCH}-${HOST_OS}/${PF}" +STAGING_KERNEL_DIR = "${STAGING_DIR}/${PACKAGE_ARCH}-${HOST_OS}/kernel" 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 -- cgit v1.2.3