summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro/poky.conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/distro/poky.conf')
-rw-r--r--meta/conf/distro/poky.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 82a5e022f4..6326eeae60 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -12,7 +12,7 @@ USER_CLASSES ?= ""
12 12
13PACKAGE_CLASSES ?= "package_ipk" 13PACKAGE_CLASSES ?= "package_ipk"
14INHERIT_INSANE ?= "insane" 14INHERIT_INSANE ?= "insane"
15INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian devshell ${INHERIT_INSANE} sstate" 15INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian devshell ${INHERIT_INSANE} sstate license"
16# For some reason, this doesn't work 16# For some reason, this doesn't work
17# TARGET_OS ?= "linux" 17# TARGET_OS ?= "linux"
18# TARGET_VENDOR ?= "-poky" 18# TARGET_VENDOR ?= "-poky"
@@ -143,6 +143,8 @@ COMMERCIAL_VIDEO_PLUGINS ?= ""
143# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" 143# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
144COMMERCIAL_QT ?= "" 144COMMERCIAL_QT ?= ""
145# COMMERCIAL_QT ?= "qmmp" 145# COMMERCIAL_QT ?= "qmmp"
146# Set of common licenses used for license.bbclass
147COMMON_LICENSE_DIR ??= "${POKYBASE}/meta/files/common-licenses"
146 148
147 149
148require conf/distro/include/world-broken.inc 150require conf/distro/include/world-broken.inc