From fd8ab851f647f58265fbee3a5d06096d6599f1ca Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 25 Sep 2005 17:38:35 +0000 Subject: [PATCH] distro configurations: revert unversioned distro configurations back to standard names and add a warning if they're chosen --- conf/distro/{familiar-distro.conf => familiar.conf} | 2 +- conf/distro/opensimpad.conf | 5 +++++ conf/distro/{openzaurus.inc => openzaurus.conf} | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) rename conf/distro/{familiar-distro.conf => familiar.conf} (57%) rename conf/distro/{openzaurus.inc => openzaurus.conf} (60%) diff --git a/conf/distro/familiar-distro.conf b/conf/distro/familiar.conf similarity index 57% rename from conf/distro/familiar-distro.conf rename to conf/distro/familiar.conf index 497ba6a89c..32dd8f9d11 100644 --- a/conf/distro/familiar-distro.conf +++ b/conf/distro/familiar.conf @@ -6,6 +6,6 @@ INHERIT += "package_ipk debian" TARGET_OS = "linux" PARALLEL_INSTALL_MODULES = "1" - UDEV_DEVFS_RULES = "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')}" diff --git a/conf/distro/opensimpad.conf b/conf/distro/opensimpad.conf index f49a97576d..f6f8c18976 100644 --- a/conf/distro/opensimpad.conf +++ b/conf/distro/opensimpad.conf @@ -5,3 +5,8 @@ INHERIT += " package_ipk debian" TARGET_OS ?= "linux" TARGET_FPU ?= "soft" + +PARALLEL_INSTALL_MODULES = "1" +UDEV_DEVFS_RULES = "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')}" diff --git a/conf/distro/openzaurus.inc b/conf/distro/openzaurus.conf similarity index 60% rename from conf/distro/openzaurus.inc rename to conf/distro/openzaurus.conf index 9208aeda09..9020d55217 100644 --- a/conf/distro/openzaurus.inc +++ b/conf/distro/openzaurus.conf @@ -9,4 +9,6 @@ TARGET_OS = "linux" TARGET_FPU = "soft" PARALLEL_INSTALL_MODULES = "1" +UDEV_DEVFS_RULES = "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')}" -- 2.39.5