X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Fconf%2Fdistro%2Fvuplus.conf;h=3d11c6648aac31c851035368b13ea10b5908df23;hp=3a0e6b364dd45914e2f7d56b34bf33ec0e98a084;hb=38875c9b5c043e066ed208f4d2ac79c1bd5b4c83;hpb=9ee8333445ef0abb65e95279e899dc0f98f27bd7

diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf
index 3a0e6b3..3d11c66 100644
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -1,15 +1,16 @@
 #@TYPE: Distribution
-#@NAME: OpenDreambox
-#@DESCRIPTION: Distribution configuration for OpenDreambox
+#@NAME: OpenVuplus
+#@DESCRIPTION: Distribution configuration for OpenVuplus
 
-QA_LOG = "1"
+QA_LOGFILE = "${TMPDIR}/qa.log"
 #USER_CLASSES += "image-prelink"
-INHERIT += "buildhistory recipe_sanity testlab"
+SANITY_REQUIRED_UTILITIES = "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio sshpass"
+INHERIT += "buildhistory recipe_sanity"
 BUILDHISTORY_COMMIT = "1"
 
 DISTRO = "vuplus"
 DISTRO_NAME = "vuplus"
-DISTRO_VERSION = "2.2.0"
+DISTRO_VERSION = "3.0.0"
 DISTRO_PR ?= ""
 
 # meta/conf/distro/include/default-distrovars.inc
@@ -18,7 +19,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 # extra packages needed if opkg is used
 DISTRO_FEED_PREFIX ?= "official"
-DISTRO_FEED_URI = "http://archive.vuplus.com/openembedded/${DISTRO_VERSION}/vuplus/feeds/stable"
+DISTRO_FEED_URI = "http://code.vuplus.com/packages/openvuplus/${DISTRO_VERSION}/vuplus/feeds/stable"
 EXTRAOPKGCONFIG = "distro-feed-configs"
 
 # meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -31,15 +32,22 @@ IMAGE_FSTYPES =+ "tar.bz2"
 # package versions
 PREFERRED_VERSION_pango ?= "1.28.4"
 
-PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
+PREFERRED_VERSION_wpa-supplicant ?= "2.1"
 
-#PREFERRED_VERSION_linux-libc-headers = "2.6.31"
-#PREFERRED_VERSION_linux-libc-headers-nativesdk = "2.6.31"
-PREFERRED_VERSION_linux-libc-headers = "3.1.1"
-PREFERRED_VERSION_linux-libc-headers-nativesdk = "3.1.1"
+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"
+
+PREFERRED_VERSION_orc ?= "0.4.14"
+PREFERRED_VERSION_freetype ?= "2.4.12"
 
 # chang : udev_182 is not working with linux-libc-headers_2.6.31.
-#PREFERRED_VERSION_udev ?= "124"
+PREFERRED_VERSION_udev ?= "124"
+
+PREFERRED_VERSION_libpng ?= "1.6.8"
 
 PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
@@ -50,7 +58,7 @@ 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"
 
-LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec"
+LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec commercial_libav"
 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"
 
@@ -96,14 +104,14 @@ PACKAGE_EXTRA_ARCHS = "${TUNE_PKGARCH}"
 QEMU_TARGETS ?= "mipsel"
 
 PREMIRRORS ?= "\
-bzr://.*/.*   http://dreamboxupdate.com/sources-mirror/ \n \
-cvs://.*/.*   http://dreamboxupdate.com/sources-mirror/ \n \
-git://.*/.*   http://dreamboxupdate.com/sources-mirror/ \n \
-hg://.*/.*    http://dreamboxupdate.com/sources-mirror/ \n \
-osc://.*/.*   http://dreamboxupdate.com/sources-mirror/ \n \
-p4://.*/.*    http://dreamboxupdate.com/sources-mirror/ \n \
-svk://.*/.*   http://dreamboxupdate.com/sources-mirror/ \n \
-svn://.*/.*   http://dreamboxupdate.com/sources-mirror/ \n \
+bzr://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
+cvs://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
+git://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
+hg://.*/.*    http://archive.vuplus.com/openvuplus_mirror/ \n \
+osc://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
+p4://.*/.*    http://archive.vuplus.com/openvuplus_mirror/ \n \
+svk://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
+svn://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
 bzr://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 cvs://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 git://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
@@ -114,9 +122,9 @@ svk://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 svn://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n"
 
 MIRRORS =+ "\
-ftp://.*/.*    http://dreamboxupdate.com/sources-mirror/ \n \
-http://.*/.*   http://dreamboxupdate.com/sources-mirror/ \n \
-https://.*/.*  http://dreamboxupdate.com/sources-mirror/ \n \
+ftp://.*/.*    http://archive.vuplus.com/openvuplus_mirror/ \n \
+http://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
+https://.*/.*  http://archive.vuplus.com/openvuplus_mirror/ \n \
 ftp://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n \
 http://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 https://.*/.*  http://autobuilder.yoctoproject.org/sources/ \n"