diff options
author | Koen Kooi <koen@openembedded.org> | 2006-05-29 13:38:10 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-29 13:38:10 +0000 |
commit | 9ad7da861459bf8b1a42c04de819c1bc9c44534d (patch) | |
tree | ee95cfa04eab679c762b8533c2aef3f16749d3a5 /conf | |
parent | 2db3499796223578d281d5503997e9716cf7421a (diff) | |
parent | bc8b949cfbab0654d2818894c1c22c0002a6c010 (diff) |
merge of 1c17f3bc992735c3812d224e4eec728fd12650f3
and 9c65cea979ed9596cf0a6ec6776d094ce174ea6a
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/angstrom.conf | 4 | ||||
-rw-r--r-- | conf/distro/familiar.conf | 4 | ||||
-rw-r--r-- | conf/distro/generic-uclibc.conf | 24 | ||||
-rw-r--r-- | conf/distro/generic.conf | 67 | ||||
-rw-r--r-- | conf/distro/include/.mtn2git_empty | 0 | ||||
-rw-r--r-- | conf/distro/include/multimachine.conf | 3 | ||||
-rw-r--r-- | conf/distro/jlime-donkey.conf | 12 | ||||
-rw-r--r-- | conf/distro/openzaurus.conf | 4 |
8 files changed, 92 insertions, 26 deletions
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index 403b13934f..100017410d 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -12,10 +12,8 @@ ANGSTROM_URI = "http://www.angstrom-distribution.org/" MAINTAINER = "Angstrom Developers <angstrom-dev@handhelds.org>" #use ipkg package format with debian style naming -INHERIT += "package_ipk debian" - #use multimachine buildrules -include conf/distro/include/multimachine.conf +INHERIT += "package_ipk debian multimachine" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-qop-nogfx-native" diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf index da5caa7998..2646fe78a6 100644 --- a/conf/distro/familiar.conf +++ b/conf/distro/familiar.conf @@ -4,7 +4,7 @@ MAINTAINER ?= "Familiar Developers <familiar-dev@handhelds.org>" -INHERIT += "package_ipk debian" +INHERIT += "package_ipk debian multimachine" TARGET_OS = "linux" BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" @@ -15,5 +15,3 @@ 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')}" - -include conf/distro/include/multimachine.conf diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf new file mode 100644 index 0000000000..d9ace6d629 --- /dev/null +++ b/conf/distro/generic-uclibc.conf @@ -0,0 +1,24 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Generic uClibC +#@DESCRIPTION: Generic uClibC Embedded Linux Distribution Configuration +# +#@COMMENT: This distribution configuration serves as a starting point for +#@COMMENT: the integration of new target platforms, machines, or distributions. +#@COMMENT: It bases on conservative settings and should always be buildable. +#----------------------------------------------------------------------------- + +require conf/distro/generic.conf + +# +# Header +# +DISTRO_NAME = "generic-uClibC" + +# +# Target OS and FPU system +# +TARGET_OS = "linux-uclibc" +TARGET_FPU = "soft" +PREFERRED_PROVIDER_virtual/libiconv = "libiconv" +PREFERRED_PROVIDER_virtual/libintl = "libintl" diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 59e003f9b3..e6671d1337 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -1,16 +1,69 @@ +#----------------------------------------------------------------------------- #@TYPE: Distribution #@NAME: Generic -#@DESCRIPTION: Generic Linux Distribution Configuration +#@DESCRIPTION: Generic Embedded Linux Distribution Configuration +# +#@COMMENT: This distribution configuration serves as a starting point for +#@COMMENT: the integration of new target platforms, machines, or distributions. +#@COMMENT: It bases on conservative settings and should always be buildable. +#----------------------------------------------------------------------------- -INHERIT += " package_ipk debian" -TARGET_OS = "linux" -# TARGET_FPU = "soft" -IMAGE_FSTYPES = "ext2.gz" - -DISTRO_NAME = "GenericDistribution" +# +# Header +# +DISTRO_NAME = "generic-glibc" DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" + +# +# Naming schemes +# +PARALLEL_INSTALL_MODULES = "1" +INHERIT += "debian multimachine" + +# +# Packaging and output format +# +INHERIT += "package_ipk" +IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" + +# +# Binutils & Compiler +# +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_VERSION_gcc = "3.4.4" +PREFERRED_VERSION_gcc-cross = "3.4.4" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4" +PREFERRED_VERSION_binutils-cross = "2.15.94.0.1" +PREFERRED_VERSION_binutils = "2.15.94.0.1" + +# +# Target OS and FPU system +# +TARGET_OS = "linux" +TARGET_FPU = "soft" +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" +PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" + +# +# GPE +# require conf/distro/preferred-gpe-versions.inc + +# +# Opie +# +QTE_VERSION = "2.3.10" +PALMTOP_USE_MULTITHREADED_QTE = "yes" require conf/distro/preferred-opie-versions.inc + +# +# Enlightenment +# require conf/distro/preferred-e-versions.inc diff --git a/conf/distro/include/.mtn2git_empty b/conf/distro/include/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/conf/distro/include/.mtn2git_empty +++ /dev/null diff --git a/conf/distro/include/multimachine.conf b/conf/distro/include/multimachine.conf deleted file mode 100644 index 1f73ffd30f..0000000000 --- a/conf/distro/include/multimachine.conf +++ /dev/null @@ -1,3 +0,0 @@ -STAMP = "${TMPDIR}/stamps/${PACKAGE_ARCH}-${HOST_OS}/${PF}" -WORKDIR = "${TMPDIR}/work/${PACKAGE_ARCH}-${HOST_OS}/${PF}" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${PACKAGE_ARCH}-${HOST_OS}/kernel" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 01c90a5b26..dfdbe19e46 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -53,7 +53,11 @@ PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312" #<> #<>Other Specific stuff. #<> -INHERIT += "package_tar package_ipk" +#<> +#<>We want to be able to build this for all jornadas so +#<>to not mess up the folders we need to make them dynamic. +#<>It will use different folders depending on Arch (set in local.conf) +INHERIT += "package_tar package_ipk multimachine" BBINCLUDELOGS = "yes" IMAGE_FSTYPES = "tar.bz2" TARGET_OS = "linux" @@ -76,12 +80,6 @@ include conf/distro/preferred-opie-versions.inc PCMCIA_MANAGER = "pcmciautils" #<> -#<>We want to be able to build this for all jornadas so -#<>to not mess up the folders we need to make them dynamic. -#<>It will use different folders depending on Arch (set in local.conf) -include conf/distro/include/multimachine.conf - -#<> #<> Dont wanna break stuff when "some" packages do -O3, so lets set it at -O2 #<> FULL_OPTIMIZATION = "-O2" diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf index edcbacc80e..b7f456320f 100644 --- a/conf/distro/openzaurus.conf +++ b/conf/distro/openzaurus.conf @@ -5,7 +5,7 @@ DISTRO = "openzaurus" DISTRO_NAME = "OpenZaurus" -INHERIT += " package_ipk debian" +INHERIT += " package_ipk debian multimachine" # For some reason, this doesn't work # TARGET_OS ?= "linux" TARGET_OS = "linux" @@ -16,5 +16,3 @@ BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version" PARALLEL_INSTALL_MODULES = "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')}" - -include conf/distro/include/multimachine.conf |