summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-yocto/conf/distro/poky.conf48
-rw-r--r--meta/conf/distro/defaultsetup.conf1
-rw-r--r--meta/conf/distro/include/default-distrovars.inc43
3 files changed, 46 insertions, 46 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 3a66a76e77..fd0a9360af 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -8,59 +8,13 @@ MAINTAINER = "Poky <poky@yoctoproject.org>"
8 8
9TARGET_VENDOR = "-poky" 9TARGET_VENDOR = "-poky"
10 10
11QA_LOGFILE = "${TMPDIR}/qa.log"
12
13IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
14
15LOCALCONF_VERSION = "1" 11LOCALCONF_VERSION = "1"
16 12
17OEINCLUDELOGS = "yes"
18KERNEL_CONSOLE = "ttyS0"
19
20SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}" 13SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
21SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" 14SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
22 15
23require conf/distro/include/preferred-xorg-versions.inc
24
25PCMCIA_MANAGER ?= "pcmciautils"
26
27IMAGE_LINGUAS ?= "en-us en-gb"
28LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
29ENABLE_BINARY_LOCALE_GENERATION ?= "1"
30LOCALE_UTF8_ONLY = "0"
31
32DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
33
34POKY_EXTRA_RDEPENDS = "task-core-boot"
35
36DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
37DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
38
39IMAGE_FEATURES ?= ""
40
41EXTRAOPKGCONFIG = "poky-feed-config-opkg" 16EXTRAOPKGCONFIG = "poky-feed-config-opkg"
42 17
43# This is a list of packages that are used by poky to build the distribution, they are not
44# directly part of the distribution.
45HOSTTOOLS_WHITELIST_GPLv3 ?= ""
46WHITELIST_GPLv3 ?= "less"
47LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime"
48
49# This is a list of packages that require a commercial license to ship
50# product. If shipped as part of an image these packages may have
51# implications so they are disabled by default
52COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
53COMMERCIAL_AUDIO_PLUGINS ?= ""
54# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
55COMMERCIAL_VIDEO_PLUGINS ?= ""
56# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
57COMMERCIAL_QT ?= ""
58# COMMERCIAL_QT ?= "qmmp"
59# Set of common licenses used for license.bbclass
60COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
61
62BB_GENERATE_MIRROR_TARBALLS ??= "0"
63
64QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64" 18QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64"
65# Other QEMU_TARGETS "mips64 mips64el sh4" 19# Other QEMU_TARGETS "mips64 mips64el sh4"
66 20
@@ -79,3 +33,5 @@ ftp://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
79http://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ 33http://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
80https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n" 34https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n"
81 35
36
37
diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf
index af5ef7b5a0..8da6c0a850 100644
--- a/meta/conf/distro/defaultsetup.conf
+++ b/meta/conf/distro/defaultsetup.conf
@@ -1,5 +1,6 @@
1include conf/distro/include/default-providers.inc 1include conf/distro/include/default-providers.inc
2include conf/distro/include/default-versions.inc 2include conf/distro/include/default-versions.inc
3include conf/distro/include/default-distrovars.inc
3include conf/distro/include/world-broken.inc 4include conf/distro/include/world-broken.inc
4 5
5TARGET_VENDOR ?= "-oecore" 6TARGET_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 0000000000..ab26a3058b
--- /dev/null
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -0,0 +1,43 @@
1QA_LOGFILE = "${TMPDIR}/qa.log"
2
3IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
4
5OEINCLUDELOGS ?= "yes"
6KERNEL_CONSOLE ?= "ttyS0"
7
8require conf/distro/include/preferred-xorg-versions.inc
9
10PCMCIA_MANAGER ?= "pcmciautils"
11
12IMAGE_LINGUAS ?= "en-us en-gb"
13LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
14ENABLE_BINARY_LOCALE_GENERATION ?= "1"
15LOCALE_UTF8_ONLY ?= "0"
16
17DISTRO_FEATURES ?= "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
18
19DISTRO_EXTRA_RDEPENDS += "task-core-boot"
20DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
21
22IMAGE_FEATURES ?= ""
23
24# This is a list of packages that are used by the build system to build the distribution, they are not
25# directly part of the distribution.
26HOSTTOOLS_WHITELIST_GPLv3 ?= ""
27WHITELIST_GPLv3 ?= "less"
28LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime"
29
30# This is a list of packages that require a commercial license to ship
31# product. If shipped as part of an image these packages may have
32# implications so they are disabled by default
33COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
34COMMERCIAL_AUDIO_PLUGINS ?= ""
35# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
36COMMERCIAL_VIDEO_PLUGINS ?= ""
37# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
38COMMERCIAL_QT ?= ""
39# COMMERCIAL_QT ?= "qmmp"
40# Set of common licenses used for license.bbclass
41COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
42
43BB_GENERATE_MIRROR_TARBALLS ??= "0"