diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2006-09-28 23:02:04 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@rpsys.net> | 2006-09-28 23:02:04 +0000 |
commit | a3a71f5e3fc0577a91fec7acbd1649050adfec7b (patch) | |
tree | e636e74b423f62d02c284fd93381e7f91b1bd793 | |
parent | acdb7fd6db8abafa6552cdb747505b50577c168b (diff) | |
download | openembedded-a3a71f5e3fc0577a91fec7acbd1649050adfec7b.tar.gz |
conf/distro: partially sync with .dev
-rw-r--r-- | conf/distro/angstrom-2006.9.conf | 8 | ||||
-rw-r--r-- | conf/distro/generic.conf | 84 | ||||
-rw-r--r-- | conf/distro/include/angstrom.inc (renamed from conf/distro/angstrom.conf) | 0 | ||||
-rw-r--r-- | conf/distro/include/multimachine.conf | 3 | ||||
-rw-r--r-- | conf/distro/include/preferred-e-versions.inc (renamed from conf/distro/preferred-e-versions.inc) | 0 | ||||
-rw-r--r-- | conf/distro/include/preferred-gpe-versions-2.6.inc (renamed from conf/distro/preferred-gpe-versions-2.6.inc) | 0 | ||||
-rw-r--r-- | conf/distro/include/preferred-gpe-versions-2.7.inc (renamed from conf/distro/preferred-gpe-versions-2.7.inc) | 0 | ||||
-rw-r--r-- | conf/distro/include/preferred-gpe-versions-2.8.inc (renamed from conf/distro/preferred-gpe-versions-2.8.inc) | 0 | ||||
-rw-r--r-- | conf/distro/include/preferred-gpe-versions.inc (renamed from conf/distro/preferred-gpe-versions.inc) | 0 | ||||
-rw-r--r-- | conf/distro/include/preferred-opie-versions.inc (renamed from conf/distro/preferred-opie-versions.inc) | 0 |
10 files changed, 79 insertions, 16 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 77745484c1..95b49172e4 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -9,7 +9,7 @@ #DISTRO_VERSION = "2006.9" DISTRO_VERSION = "test-${DATE}" -include conf/distro/angstrom.conf +require conf/distro/include/angstrom.inc DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" @@ -34,16 +34,16 @@ http://www.oesources.org/source/current/" PALMTOP_USE_MULTITHREADED_QT = "yes" QTE_VERSION = "2.3.10" OPIE_VERSION = "1.2.2" -include conf/distro/preferred-opie-versions.inc +require conf/distro/include/preferred-opie-versions.inc # GPE -include conf/distro/preferred-gpe-versions-2.8.inc +require conf/distro/include/preferred-gpe-versions-2.8.inc #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" # E -include conf/distro/preferred-e-versions.inc +require conf/distro/include/preferred-e-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 59e003f9b3..d416842d9d 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -1,16 +1,82 @@ +#----------------------------------------------------------------------------- #@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" +# +# 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 & FPU system +# TARGET_OS = "linux" -# TARGET_FPU = "soft" -IMAGE_FSTYPES = "ext2.gz" +TARGET_FPU_arm = "soft" +TARGET_FPU_armeb = "soft" +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" +PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" -DISTRO_NAME = "GenericDistribution" -DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" +# +# Bootstrap & Init +# +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +require conf/distro/include/sane-srcdates.inc + +# +# Framebuffer & X +# +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +PREFERRED_PROVIDER_tslib ?= tslib +require conf/distro/include/preferred-x-versions-pre-X11R7.inc + +# +# GPE +# +require conf/distro/include/preferred-gpe-versions-2.7.inc -require conf/distro/preferred-gpe-versions.inc -require conf/distro/preferred-opie-versions.inc -require conf/distro/preferred-e-versions.inc +# +# Opie +# +QTE_VERSION = "2.3.10" +PALMTOP_USE_MULTITHREADED_QTE = "yes" +require conf/distro/include/preferred-opie-versions.inc +# +# Enlightenment +# +require conf/distro/include/preferred-e-versions.inc diff --git a/conf/distro/angstrom.conf b/conf/distro/include/angstrom.inc index 403b13934f..403b13934f 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/include/angstrom.inc 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/preferred-e-versions.inc b/conf/distro/include/preferred-e-versions.inc index 607acad858..607acad858 100644 --- a/conf/distro/preferred-e-versions.inc +++ b/conf/distro/include/preferred-e-versions.inc diff --git a/conf/distro/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc index 1d09ae6051..1d09ae6051 100644 --- a/conf/distro/preferred-gpe-versions-2.6.inc +++ b/conf/distro/include/preferred-gpe-versions-2.6.inc diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc index 933195977d..933195977d 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/include/preferred-gpe-versions-2.7.inc diff --git a/conf/distro/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index 9c9be528df..9c9be528df 100644 --- a/conf/distro/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc index 676e0ee9f9..676e0ee9f9 100644 --- a/conf/distro/preferred-gpe-versions.inc +++ b/conf/distro/include/preferred-gpe-versions.inc diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/include/preferred-opie-versions.inc index 51c9937628..51c9937628 100644 --- a/conf/distro/preferred-opie-versions.inc +++ b/conf/distro/include/preferred-opie-versions.inc |