diff options
author | Koen Kooi <koen@openembedded.org> | 2006-03-11 18:51:17 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-11 18:51:17 +0000 |
commit | e2c415e2d5816bee9ac4c15e2443023877aec027 (patch) | |
tree | 10f9a160f94f238621985caae152f37bf195499b /conf | |
parent | 913e783b3be3463462e767e810121750b67b880e (diff) | |
parent | 4d7864b69c443fa8810bc6407d160e994b75ac67 (diff) |
merge of 5de21ce1146b76cf25440eddc66aaa8a9a984df9
and 97dd2ea8547ce10b119dbe5649f9504851b72a0a
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/familiar-unstable.conf | 6 | ||||
-rw-r--r-- | conf/distro/familiar.conf | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 1b5d6ba2bf..734d33db3c 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -43,9 +43,9 @@ PREFERRED_VERSION_orinoco-modules_ipaq-pxa270 ?= "0.15" # The CSL compiler is unusable because # 1) certain programs stop to compile # 2) more programs segfault -#PREFERRED_VERSION_gcc ?= "3.4.4" -#PREFERRED_VERSION_gcc-cross ?= "3.4.4" -#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" +PREFERRED_VERSION_gcc ?= "3.4.4" +PREFERRED_VERSION_gcc-cross ?= "3.4.4" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" # # Opie diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf index 99e501589f..da5caa7998 100644 --- a/conf/distro/familiar.conf +++ b/conf/distro/familiar.conf @@ -2,14 +2,17 @@ #@NAME: Familiar Linux #@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org) +MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>" + INHERIT += "package_ipk debian" TARGET_OS = "linux" -PARALLEL_INSTALL_MODULES = "1" -UDEV_DEVFS_RULES = "1" +BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" -BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" +ENABLE_BINARY_LOCALE_GENERATION ?= "1" +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')}" |