From f18661145bcacd7adca80e31cf3ee214f3ad7078 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 28 May 2006 18:49:08 +0000 Subject: multimachine: Change from an include to a .bblass (and update distros using multimachine accordingly). Add code to find packages with machine specific subpackages and build these in a multimachine compatible way. --- conf/distro/angstrom.conf | 4 +--- conf/distro/familiar.conf | 4 +--- conf/distro/include/.mtn2git_empty | 0 conf/distro/include/multimachine.conf | 3 --- conf/distro/jlime-donkey.conf | 12 +++++------- conf/distro/openzaurus.conf | 4 +--- 6 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 conf/distro/include/.mtn2git_empty delete mode 100644 conf/distro/include/multimachine.conf (limited to 'conf') 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 " #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 " -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/include/.mtn2git_empty b/conf/distro/include/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 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" @@ -75,12 +79,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 #<> 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 -- cgit v1.2.3 From 130a448a3293d3918a26c573c3317315c5d8187a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 28 May 2006 20:43:09 +0000 Subject: generic(-uclibc).conf: add 'reference' distribution configuration this should serve as a starting point for people adding new models and new distributions. It should always be buildable, so please use it for regression tests and keep it up to date! Be sure to comment everything you add. --- conf/distro/generic-uclibc.conf | 24 +++++++++++++++ conf/distro/generic.conf | 67 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 conf/distro/generic-uclibc.conf (limited to '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 -- cgit v1.2.3 From 1e42b4d30cf60f6b546e4464e307ba5ee97a5fad Mon Sep 17 00:00:00 2001 From: Jonathan McDowell Date: Wed, 31 May 2006 07:29:32 +0000 Subject: amsdelta: Limit size of ext2 images to 8M so we can use them as an initrd. --- conf/machine/amsdelta.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf index 193048ae52..443b70c5de 100644 --- a/conf/machine/amsdelta.conf +++ b/conf/machine/amsdelta.conf @@ -23,4 +23,6 @@ PREFERRED_VERSION_u-boot = 1.1.4 TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" +IMAGE_ROOTFS_SIZE_ext2 = "8192" +IMAGE_ROOTFS_SIZE_ext2.gz = "8192" IMAGE_FSTYPES = "ext2.gz tar.bz2" -- cgit v1.2.3