From f5caf636a7241c4df7e40699ea37798465670223 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 31 Aug 2005 23:58:07 +0000 Subject: familiar distro files: make it harder to build unversioned distros and set preferences for iconv --- conf/distro/familiar-0.8.3.conf | 5 ++++- conf/distro/familiar-distro.conf | 11 +++++++++++ conf/distro/familiar.conf | 11 ----------- 3 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 conf/distro/familiar-distro.conf delete mode 100644 conf/distro/familiar.conf (limited to 'conf/distro') diff --git a/conf/distro/familiar-0.8.3.conf b/conf/distro/familiar-0.8.3.conf index 7247bdfa53..dc333a3332 100644 --- a/conf/distro/familiar-0.8.3.conf +++ b/conf/distro/familiar-0.8.3.conf @@ -1,4 +1,4 @@ -include conf/distro/familiar.conf +include conf/distro/familiar-distro.conf DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" @@ -17,6 +17,9 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_PROVIDER_virtual/libiconv=glibc +PREFERRED_PROVIDER_virtual/libintl=glibc +PREFERRED_PROVIDER_x11=diet-x11 # The CSL compiler is unusable because # 1) certain programs stop to compile diff --git a/conf/distro/familiar-distro.conf b/conf/distro/familiar-distro.conf new file mode 100644 index 0000000000..497ba6a89c --- /dev/null +++ b/conf/distro/familiar-distro.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" + diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf deleted file mode 100644 index 497ba6a89c..0000000000 --- a/conf/distro/familiar.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" - -- cgit v1.2.3