From cfdb9ae992bf4e218a9b8410205c46d4da749170 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 19 Jul 2008 14:07:55 +0000 Subject: conf/bitbake.conf: Merge in multimachine making it the standard layout as discussed on the mailing list. Anyone wanting the previous layout can INHERIT the new singlemachine class --- conf/distro/include/angstrom.inc | 3 --- conf/distro/include/oplinux.inc | 3 --- conf/distro/include/slugos.inc | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) (limited to 'conf/distro/include') diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index bbdbe7f80b..4ada4a89d4 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -35,9 +35,6 @@ MAINTAINER = "Angstrom Developers " #use debian style naming INHERIT += "debian" -#use multimachine buildrules -INHERIT += "multimachine" - #activate config checker INHERIT += "sanity" diff --git a/conf/distro/include/oplinux.inc b/conf/distro/include/oplinux.inc index a7eac524bc..36eca58241 100644 --- a/conf/distro/include/oplinux.inc +++ b/conf/distro/include/oplinux.inc @@ -9,9 +9,6 @@ BB_MIN_VERSION = "1.8.10" #OPLinux and OPLinux-uclibc source mirrors INHERIT += "oplinux-mirrors" -#oplinux is a multimachine distro -INHERIT += "multimachine" - # check for required tools and minimal BitBake version INHERIT += "sanity" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 8661e5b065..b149f65f11 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -42,7 +42,7 @@ TARGET_FPU = "soft" # glib-2.0 builds require USE_NLS to be overridden USE_NLS_glib-2.0 = "yes" -INHERIT += "package_ipk debian multimachine" +INHERIT += "package_ipk debian" # FULL_OPTIMIZATION # Optimization settings. Os works fine and is significantly better than O2. -- cgit v1.2.3