projects
/
vuplus_openvuplus_3.0
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next
[vuplus_openvuplus_3.0]
/
meta-openvuplus
/
conf
/
distro
/
vuplus.conf
diff --git
a/meta-openvuplus/conf/distro/vuplus.conf
b/meta-openvuplus/conf/distro/vuplus.conf
index
129303a
..
8ee5c4f
100644
(file)
--- a/
meta-openvuplus/conf/distro/vuplus.conf
+++ b/
meta-openvuplus/conf/distro/vuplus.conf
@@
-2,15
+2,15
@@
#@NAME: OpenVuplus
#@DESCRIPTION: Distribution configuration for OpenVuplus
#@NAME: OpenVuplus
#@DESCRIPTION: Distribution configuration for OpenVuplus
-QA_LOG
= "1
"
+QA_LOG
FILE = "${TMPDIR}/qa.log
"
#USER_CLASSES += "image-prelink"
SANITY_REQUIRED_UTILITIES = "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio sshpass"
#USER_CLASSES += "image-prelink"
SANITY_REQUIRED_UTILITIES = "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio sshpass"
-INHERIT += "buildhistory recipe_sanity
testlab
"
+INHERIT += "buildhistory recipe_sanity"
BUILDHISTORY_COMMIT = "1"
DISTRO = "vuplus"
DISTRO_NAME = "vuplus"
BUILDHISTORY_COMMIT = "1"
DISTRO = "vuplus"
DISTRO_NAME = "vuplus"
-DISTRO_VERSION = "
2.1
.0"
+DISTRO_VERSION = "
3.0
.0"
DISTRO_PR ?= ""
# meta/conf/distro/include/default-distrovars.inc
DISTRO_PR ?= ""
# meta/conf/distro/include/default-distrovars.inc
@@
-19,7
+19,7
@@
DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
# extra packages needed if opkg is used
DISTRO_FEED_PREFIX ?= "official"
# extra packages needed if opkg is used
DISTRO_FEED_PREFIX ?= "official"
-DISTRO_FEED_URI = "http://code.vuplus.com/packages/openvuplus/${DISTRO_VERSION}/vuplus/feeds/
stable
"
+DISTRO_FEED_URI = "http://code.vuplus.com/packages/openvuplus/${DISTRO_VERSION}/vuplus/feeds/
experimental
"
EXTRAOPKGCONFIG = "distro-feed-configs"
# meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
EXTRAOPKGCONFIG = "distro-feed-configs"
# meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@
-28,21
+28,22
@@
SYSVINIT_ENABLED_GETTYS = ""
# meta/classes/image_types.bbclass
IMAGE_FSTYPES =+ "tar.bz2"
# meta/classes/image_types.bbclass
IMAGE_FSTYPES =+ "tar.bz2"
-
# package versions
# package versions
+GST_VERSION = "1.0"
PREFERRED_VERSION_pango ?= "1.28.4"
PREFERRED_VERSION_pango ?= "1.28.4"
-PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
-
PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
-#PREFERRED_VERSION_linux-libc-headers = "3.1"
-#PREFERRED_VERSION_linux-libc-headers-nativesdk = "3.1"
-#PREFERRED_VERSION_linux-libc-headers = "3.1.1"
-#PREFERRED_VERSION_linux-libc-headers-nativesdk = "3.1.1"
-# chang : udev_182 is not working with linux-libc-headers_2.6.31.
-PREFERRED_VERSION_udev ?= "124"
+PREFERRED_VERSION_freetype ?= "2.4.12"
+
+PREFERRED_VERSION_udev ?= "182"
+
+PREFERRED_VERSION_elfutils ?= "0.148"
+
+PREFERRED_VERSION_libmicrohttpd ?= "0.4.6"
+PREFERRED_VERSION_libdvdcss ?= "1.2.10"
+PREFERRED_VERSION_taglib ?= "1.8"
PREFERRED_PROVIDER_jpeg = "jpeg"
PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
PREFERRED_PROVIDER_jpeg = "jpeg"
PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
@@
-53,9
+54,8
@@
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inter
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
-LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec"
-COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
-COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
+LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec commercial_libav"
+LICENSE_FLAGS_WHITELIST += "commercial_gstreamer1.0-plugins-ugly"
FULL_OPTIMIZATION = "-Os -pipe ${DEBUG_FLAGS}"
# build some core libs with better compiler optimization for better performance
FULL_OPTIMIZATION = "-Os -pipe ${DEBUG_FLAGS}"
# build some core libs with better compiler optimization for better performance
@@
-90,7
+90,6
@@
PR_append_pn-zlib = "-opt1"
# Disable installing ldconfig
USE_LDCONFIG = "0"
# Disable installing ldconfig
USE_LDCONFIG = "0"
-TCLIBC = "eglibc"
TCLIBCAPPEND = ""
# Drop unused PACKAGE_EXTRA_ARCHS
TCLIBCAPPEND = ""
# Drop unused PACKAGE_EXTRA_ARCHS