From ddbf17b3ee18c12a51950109e8728de65fb9ac0b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 10 May 2011 14:41:05 +0100 Subject: conf/distro/include/default-distrovars.inc: Create set of default 'distro' variable values Signed-off-by: Richard Purdie --- meta/conf/distro/defaultsetup.conf | 1 + meta/conf/distro/include/default-distrovars.inc | 43 ++++++++++++++++++++++ meta/conf/distro/poky.conf | 48 ++----------------------- 3 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 meta/conf/distro/include/default-distrovars.inc diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index af5ef7b5a..8da6c0a85 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf @@ -1,5 +1,6 @@ include conf/distro/include/default-providers.inc include conf/distro/include/default-versions.inc +include conf/distro/include/default-distrovars.inc include conf/distro/include/world-broken.inc TARGET_VENDOR ?= "-oecore" diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc new file mode 100644 index 000000000..ab26a3058 --- /dev/null +++ b/meta/conf/distro/include/default-distrovars.inc @@ -0,0 +1,43 @@ +QA_LOGFILE = "${TMPDIR}/qa.log" + +IMAGE_ROOTFS_SIZE_ext2 ?= "131072" + +OEINCLUDELOGS ?= "yes" +KERNEL_CONSOLE ?= "ttyS0" + +require conf/distro/include/preferred-xorg-versions.inc + +PCMCIA_MANAGER ?= "pcmciautils" + +IMAGE_LINGUAS ?= "en-us en-gb" +LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB" +ENABLE_BINARY_LOCALE_GENERATION ?= "1" +LOCALE_UTF8_ONLY ?= "0" + +DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" + +DISTRO_EXTRA_RDEPENDS += "task-core-boot" +DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" + +IMAGE_FEATURES ?= "" + +# This is a list of packages that are used by the build system to build the distribution, they are not +# directly part of the distribution. +HOSTTOOLS_WHITELIST_GPLv3 ?= "" +WHITELIST_GPLv3 ?= "less" +LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime" + +# This is a list of packages that require a commercial license to ship +# product. If shipped as part of an image these packages may have +# implications so they are disabled by default +COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp" +COMMERCIAL_AUDIO_PLUGINS ?= "" +# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" +COMMERCIAL_VIDEO_PLUGINS ?= "" +# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" +COMMERCIAL_QT ?= "" +# COMMERCIAL_QT ?= "qmmp" +# Set of common licenses used for license.bbclass +COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" + +BB_GENERATE_MIRROR_TARBALLS ??= "0" diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 3a66a76e7..fd0a9360a 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -8,59 +8,13 @@ MAINTAINER = "Poky " TARGET_VENDOR = "-poky" -QA_LOGFILE = "${TMPDIR}/qa.log" - -IMAGE_ROOTFS_SIZE_ext2 ?= "131072" - LOCALCONF_VERSION = "1" -OEINCLUDELOGS = "yes" -KERNEL_CONSOLE = "ttyS0" - SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" -require conf/distro/include/preferred-xorg-versions.inc - -PCMCIA_MANAGER ?= "pcmciautils" - -IMAGE_LINGUAS ?= "en-us en-gb" -LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB" -ENABLE_BINARY_LOCALE_GENERATION ?= "1" -LOCALE_UTF8_ONLY = "0" - -DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" - -POKY_EXTRA_RDEPENDS = "task-core-boot" - -DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}" -DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" - -IMAGE_FEATURES ?= "" - EXTRAOPKGCONFIG = "poky-feed-config-opkg" -# This is a list of packages that are used by poky to build the distribution, they are not -# directly part of the distribution. -HOSTTOOLS_WHITELIST_GPLv3 ?= "" -WHITELIST_GPLv3 ?= "less" -LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime" - -# This is a list of packages that require a commercial license to ship -# product. If shipped as part of an image these packages may have -# implications so they are disabled by default -COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp" -COMMERCIAL_AUDIO_PLUGINS ?= "" -# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" -COMMERCIAL_VIDEO_PLUGINS ?= "" -# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" -COMMERCIAL_QT ?= "" -# COMMERCIAL_QT ?= "qmmp" -# Set of common licenses used for license.bbclass -COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" - -BB_GENERATE_MIRROR_TARBALLS ??= "0" - QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64" # Other QEMU_TARGETS "mips64 mips64el sh4" @@ -79,3 +33,5 @@ ftp://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ http://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n" + + -- cgit v1.2.3