From fd8ab851f647f58265fbee3a5d06096d6599f1ca Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 25 Sep 2005 17:38:35 +0000 Subject: distro configurations: revert unversioned distro configurations back to standard names and add a warning if they're chosen --- conf/distro/familiar-distro.conf | 11 ----------- conf/distro/familiar.conf | 11 +++++++++++ conf/distro/opensimpad.conf | 5 +++++ conf/distro/openzaurus.conf | 14 ++++++++++++++ conf/distro/openzaurus.inc | 12 ------------ 5 files changed, 30 insertions(+), 23 deletions(-) delete mode 100644 conf/distro/familiar-distro.conf create mode 100644 conf/distro/familiar.conf create mode 100644 conf/distro/openzaurus.conf delete mode 100644 conf/distro/openzaurus.inc (limited to 'conf') diff --git a/conf/distro/familiar-distro.conf b/conf/distro/familiar-distro.conf deleted file mode 100644 index 497ba6a89c..0000000000 --- a/conf/distro/familiar-distro.conf +++ /dev/null @@ -1,11 +0,0 @@ -#@TYPE: Distribution -#@NAME: Familiar Linux -#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) - -INHERIT += "package_ipk debian" -TARGET_OS = "linux" - -PARALLEL_INSTALL_MODULES = "1" - -UDEV_DEVFS_RULES = "1" - diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf new file mode 100644 index 0000000000..32dd8f9d11 --- /dev/null +++ b/conf/distro/familiar.conf @@ -0,0 +1,11 @@ +#@TYPE: Distribution +#@NAME: Familiar Linux +#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) + +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.conf b/conf/distro/openzaurus.conf new file mode 100644 index 0000000000..9020d55217 --- /dev/null +++ b/conf/distro/openzaurus.conf @@ -0,0 +1,14 @@ +#@TYPE: Distribution +#@NAME: OpenZaurus +#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) + +INHERIT += " package_ipk debian" +# For some reason, this doesn't work +# TARGET_OS ?= "linux" +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.inc deleted file mode 100644 index 9208aeda09..0000000000 --- a/conf/distro/openzaurus.inc +++ /dev/null @@ -1,12 +0,0 @@ -#@TYPE: Distribution -#@NAME: OpenZaurus -#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org) - -INHERIT += " package_ipk debian" -# For some reason, this doesn't work -# TARGET_OS ?= "linux" -TARGET_OS = "linux" -TARGET_FPU = "soft" - -PARALLEL_INSTALL_MODULES = "1" - -- cgit v1.2.3