From: Chang.H.S Date: Mon, 3 Dec 2012 08:29:24 +0000 (+0900) Subject: Merge branch 'master' of 192.168.102.71:/opt/project/openvuplus X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=commitdiff_plain;h=f0a0db4f3b4c47bea5174106c17782b265f0a93f;hp=ec6a310dd9ed81297b1331092879c05d566fff28 Merge branch 'master' of 192.168.102.71:/opt/project/openvuplus --- diff --git a/meta-bsp/bm750/conf/machine/bm750.conf b/meta-bsp/bm750/conf/machine/bm750.conf index 41b4522..f94f205 100644 --- a/meta-bsp/bm750/conf/machine/bm750.conf +++ b/meta-bsp/bm750/conf/machine/bm750.conf @@ -2,11 +2,6 @@ #@NAME: Vu+ Duo #@DESCRIPTION: Machine configuration for Vu+ Duo. -#MACHINE_FEATURES += "kernel26" -MACHINE_FEATURES += "pci" -MACHINE_FEATURES += "alsa" -MACHINE_FEATURES += "wifi" -MACHINE_FEATURES += "vuwlan" MACHINE_FEATURES += "display-text-vfd" VUPLUS_FEATURES = "fan_simple" diff --git a/meta-bsp/common/conf/machine/include/vuplus.inc b/meta-bsp/common/conf/machine/include/vuplus.inc index 1a5080b..a66dc11 100644 --- a/meta-bsp/common/conf/machine/include/vuplus.inc +++ b/meta-bsp/common/conf/machine/include/vuplus.inc @@ -2,11 +2,10 @@ GLIBC_EXTRA_OECONF = "--with-tls --with-__thread" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-bootlogo" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "vuplus-dvb-modules" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "task-vuplus-essential" -MACHINE_FEATURES += "alsa kernel26 wifi" +MACHINE_FEATURES += "kernel26 alsa pci wifi vuwlan" PREFERRED_PROVIDER_virtual/kernel = "linux-vuplus" diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_2.6.37.bb b/meta-bsp/common/recipes/linux/linux-vuplus_2.6.37.bb index 570ddeb..16e11f8 100644 --- a/meta-bsp/common/recipes/linux/linux-vuplus_2.6.37.bb +++ b/meta-bsp/common/recipes/linux/linux-vuplus_2.6.37.bb @@ -23,7 +23,8 @@ S = "${WORKDIR}/stblinux-2.6.37" inherit kernel -FILES_kernel-image = "/boot/vmlinux.gz /boot/autoexec.bat" +FILES_kernel-vmlinux = "/boot/vmlinux-*" +FILES_kernel-image = "/boot/vmlinux.gz" export OS = "Linux" KERNEL_IMAGETYPE = "vmlinux" diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb index 4648dc4..9ab8308 100644 --- a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb +++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.6.bb @@ -22,7 +22,8 @@ S = "${WORKDIR}/linux" inherit kernel -FILES_kernel-image = "/boot/vmlinux.gz /boot/autoexec.bat" +FILES_kernel-vmlinux = "/boot/vmlinux-*" +FILES_kernel-image = "/boot/vmlinux.gz" export OS = "Linux" KERNEL_IMAGETYPE = "vmlinux" diff --git a/meta-bsp/common/recipes/tasks/task-vuplus-essential.bb b/meta-bsp/common/recipes/tasks/task-vuplus-essential.bb deleted file mode 100644 index 74070a8..0000000 --- a/meta-bsp/common/recipes/tasks/task-vuplus-essential.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "Vuplus: Essential packages" -SECTION = "vuplus/base" -LICENSE = "CLOSED" -DEPENDS = "virtual/kernel" -RDEPENDS_${PN} = '${ESSENTIAL_RDEPENDS}' - -RRECOMMENDS_${PN} = '${ESSENTIAL_RRECOMMENDS}' - -#RDEPENDS_${PN} += '${KERNEL_3G_MODULES}' -RDEPENDS_${PN} += '${KERNEL_DVB_MODULES}' - -PR = "r0" - -inherit task - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ESSENTIAL_RDEPENDS = " \ - kernel-module-stv0299 \ -" - -ESSENTIAL_RRECOMMENDS = " \ - kernel-module-autofs4 \ - kernel-module-cdrom \ - kernel-module-cifs \ - kernel-module-nls-cp850 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-iso8859-15 \ - kernel-module-ntfs \ - kernel-module-reiserfs \ - kernel-module-sr-mod \ - kernel-module-usbhid \ - kernel-module-ext2 \ -" - -KERNEL_3G_MODULES = " \ - kernel-module-ppp-async \ - kernel-module-ppp-deflate \ - kernel-module-ppp-synctty \ - kernel-module-ppp-generic \ - kernel-module-slhc \ - kernel-module-usbserial \ -" - -KERNEL_DVB_MODULES = " \ - kernel-module-em28xx-dvb \ - kernel-module-dvb-usb-a800 \ - kernel-module-dvb-usb-af9005 \ - kernel-module-af9013 kernel-module-mt2060 kernel-module-qt1010 kernel-module-tda18271 kernel-module-mxl5005s kernel-module-mc44s803 kernel-module-tda18218 kernel-module-mxl5007t kernel-module-dvb-usb-af9015 \ - kernel-module-mxl5007t kernel-module-tda18218 \ - kernel-module-tda10021 kernel-module-tda10023 kernel-module-mt352 kernel-module-zl10353 kernel-module-tda18212 kernel-module-cx24116 kernel-module-stv0900 kernel-module-stv6110 kernel-module-stv6110x kernel-module-isl6423 kernel-module-dvb-usb-anysee \ - kernel-module-zl10353 kernel-module-qt1010 kernel-module-dvb-usb-au6610 \ - kernel-module-dvb-usb-az6027 \ - kernel-module-zl10353 kernel-module-mxl5005s kernel-module-dvb-usb-ce6230 \ - kernel-module-lgdt330x kernel-module-mt352 kernel-module-zl10353 kernel-module-tuner-xc2028 kernel-module-tuner-simple kernel-module-mxl5005s kernel-module-max2165 kernel-module-lgs8gxx kernel-module-atbm8830 kernel-module-dvb-usb-cxusb kernel-module-drxd \ - kernel-module-dvb-usb-cinergyt2 \ - kernel-module-mt352 kernel-module-nxt6000 kernel-module-dvb-usb-digitv \ - kernel-module-mt2060 kernel-module-mt2266 kernel-module-tuner-xc2028 kernel-module-xc5000 kernel-module-xc4000 kernel-module-s5h1411 kernel-module-lgdt3305 kernel-module-mxl5007t kernel-module-dvb-usb-dib0700 \ - kernel-module-dvb-usb-dibusb-mb \ - kernel-module-dvb-usb-dibusb-mc \ - kernel-module-zl10353 kernel-module-qt1010 kernel-module-dvb-usb-dtv5100 \ - kernel-module-dvb-usb-dtt200u \ - kernel-module-si21xx kernel-module-stv0299 kernel-module-stv0288 kernel-module-stb6000 kernel-module-cx24116 \ - kernel-module-mt312 kernel-module-zl10039 kernel-module-ds3000 kernel-module-stv0900 kernel-module-stv6110 kernel-module-dvb-usb-dw2102 \ - kernel-module-ec100 kernel-module-mxl5005s kernel-module-dvb-usb-ec168 \ - kernel-module-zl10353 kernel-module-qt1010 kernel-module-dvb-usb-gl861 \ - kernel-module-dvb-usb-gp8psk \ - kernel-module-mt352 kernel-module-qt1010 kernel-module-tda1004x kernel-module-tda827x kernel-module-dvb-usb-m920x \ - kernel-module-stv0299 kernel-module-dvb-usb-opera \ - kernel-module-stv090x kernel-module-dvb-usb-technisat-usb2 \ - kernel-module-tda826x kernel-module-tda10086 kernel-module-tda827x kernel-module-lnbp21 kernel-module-dvb-usb-ttusb2 \ - kernel-module-dvb-ttusb-budget \ - kernel-module-dvb-usb-nova-t-usb2 \ - kernel-module-mt352 kernel-module-dvb-usb-umt-010 \ - kernel-module-dvb-usb-vp702x \ - kernel-module-dvb-usb-vp7045 \ - kernel-module-smsdvb kernel-module-smsusb \ -" - diff --git a/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb b/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb index 93937b4..be6c53d 100755 --- a/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb +++ b/meta-bsp/common/recipes/vuplus/vuplus-dvb-modules.bb @@ -8,18 +8,11 @@ PR = "r19-${SRCDATE}" PREFERRED_GCC_VERSION = "4.4.3" -DEPENDS = "\ - linux-vuplus \ - module-init-tools \ -" - -RDEPENDS = "\ - linux-vuplus \ - module-init-tools-depmod \ -" - SRC_URI = "http://archive.vuplus.com/download/drivers/vuplus-dvb-modules-${MACHINE}-${PV}-${PREFERRED_GCC_VERSION}-${SRCDATE}.tar.gz " +DEPENDS += "virtual/kernel module-init-tools" +RDEPENDS += "module-init-tools-depmod" + S = "${WORKDIR}" inherit module-base diff --git a/meta-bsp/vuduo2/conf/machine/vuduo2.conf b/meta-bsp/vuduo2/conf/machine/vuduo2.conf index da58b70..c57f381 100644 --- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf +++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf @@ -2,11 +2,6 @@ #@NAME: Vu+ duo2 #@DESCRIPTION: Machine configuration for Vu+ duo2. -#MACHINE_FEATURES += "kernel26" -MACHINE_FEATURES += "pci" -MACHINE_FEATURES += "alsa" -MACHINE_FEATURES += "wifi" -MACHINE_FEATURES += "vuwlan" MACHINE_FEATURES += "display-graphic-vfd" MACHINE_FEATURES += "enable-rc-kbd" VUPLUS_FEATURES = "fan_manual rc_code " diff --git a/meta-bsp/vusolo/conf/machine/vusolo.conf b/meta-bsp/vusolo/conf/machine/vusolo.conf index 9e62deb..159106b 100644 --- a/meta-bsp/vusolo/conf/machine/vusolo.conf +++ b/meta-bsp/vusolo/conf/machine/vusolo.conf @@ -2,11 +2,6 @@ #@NAME: Vu+ Solo #@DESCRIPTION: Machine configuration for Vu+ Solo. -#MACHINE_FEATURES += "kernel26" -MACHINE_FEATURES += "pci" -MACHINE_FEATURES += "alsa" -MACHINE_FEATURES += "wifi" -MACHINE_FEATURES += "vuwlan" VUPLUS_FEATURES = "" IMAGE_UNPACK_PATH = "vuplus/solo" diff --git a/meta-bsp/vusolo2/conf/machine/vusolo2.conf b/meta-bsp/vusolo2/conf/machine/vusolo2.conf index 119b3e5..e9997ec 100644 --- a/meta-bsp/vusolo2/conf/machine/vusolo2.conf +++ b/meta-bsp/vusolo2/conf/machine/vusolo2.conf @@ -2,16 +2,8 @@ #@NAME: Vu+ solo2 #@DESCRIPTION: Machine configuration for Vu+ solo2. -#MACHINE_FEATURES += "kernel26" -MACHINE_FEATURES += "pci" -MACHINE_FEATURES += "alsa" -MACHINE_FEATURES += "wifi" -MACHINE_FEATURES += "vuwlan" -#MACHINE_FEATURES += "display-graphic-vfd" MACHINE_FEATURES += "display-text-vfd" -#MACHINE_FEATURES += "right-half-vfd-skin" MACHINE_FEATURES += "enable-rc-kbd" -#VUPLUS_FEATURES = "fan_manual rc_code led" VUPLUS_FEATURES = "fan_manual rc_code " IMAGE_UNPACK_PATH = "vuplus/solo2" diff --git a/meta-bsp/vuultimo/conf/machine/vuultimo.conf b/meta-bsp/vuultimo/conf/machine/vuultimo.conf index f42e7f3..416635c 100644 --- a/meta-bsp/vuultimo/conf/machine/vuultimo.conf +++ b/meta-bsp/vuultimo/conf/machine/vuultimo.conf @@ -2,11 +2,6 @@ #@NAME: Vu+ ultimo #@DESCRIPTION: Machine configuration for Vu+ ultimo. -#MACHINE_FEATURES += "kernel26" -MACHINE_FEATURES += "pci" -MACHINE_FEATURES += "alsa" -MACHINE_FEATURES += "wifi" -MACHINE_FEATURES += "vuwlan" MACHINE_FEATURES += "display-graphic-vfd" MACHINE_FEATURES += "right-half-vfd-skin" MACHINE_FEATURES += "enable-rc-kbd" diff --git a/meta-bsp/vuuno/conf/machine/vuuno.conf b/meta-bsp/vuuno/conf/machine/vuuno.conf index f425864..f6ba558 100644 --- a/meta-bsp/vuuno/conf/machine/vuuno.conf +++ b/meta-bsp/vuuno/conf/machine/vuuno.conf @@ -2,11 +2,6 @@ #@NAME: Vu+ Uno #@DESCRIPTION: Machine configuration for Vu+ Uno. -#MACHINE_FEATURES += "kernel26" -MACHINE_FEATURES += "pci" -MACHINE_FEATURES += "alsa" -MACHINE_FEATURES += "wifi" -MACHINE_FEATURES += "vuwlan" MACHINE_FEATURES += "display-text-vfd" VUPLUS_FEATURES = "fan_manual rc_code" diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf index 76fb9da..a4666be 100644 --- a/meta-openvuplus/conf/distro/vuplus.conf +++ b/meta-openvuplus/conf/distro/vuplus.conf @@ -18,7 +18,8 @@ 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://archive.vuplus.com/openembedded/${DISTRO_VERSION}/vuplus/feeds/stable" +DISTRO_FEED_URI = "http://192.168.102.71/ipk" EXTRAOPKGCONFIG = "distro-feed-configs" # meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb diff --git a/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc b/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc index 8aa051b..0d8fe06 100644 --- a/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc +++ b/meta-openvuplus/recipes-vuplus/images/vuplus-image.inc @@ -14,6 +14,7 @@ BAD_RECOMMENDATIONS += "libnss-mdns" TASK_CORE_BOOT ?= "task-core-boot" TASK_VUPLUS_BASE ?= "task-vuplus-base" TASK_VUPLUS_ENIGMA ?= "task-vuplus-enigma2" +TASK_ESSENCIAL ?= "task-vuplus-essential" # packages to drag into the image #IMAGE_INSTALL = " \ @@ -28,6 +29,7 @@ IMAGE_INSTALL = " \ ${TASK_CORE_BOOT} \ ${TASK_VUPLUS_BASE} \ ${TASK_VUPLUS_ENIGMA} \ + ${TASK_ESSENCIAL} \ " IMAGE_PKGTYPE = "ipk" diff --git a/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb new file mode 100644 index 0000000..74070a8 --- /dev/null +++ b/meta-openvuplus/recipes-vuplus/tasks/task-vuplus-essential.bb @@ -0,0 +1,79 @@ +SUMMARY = "Vuplus: Essential packages" +SECTION = "vuplus/base" +LICENSE = "CLOSED" +DEPENDS = "virtual/kernel" +RDEPENDS_${PN} = '${ESSENTIAL_RDEPENDS}' + +RRECOMMENDS_${PN} = '${ESSENTIAL_RRECOMMENDS}' + +#RDEPENDS_${PN} += '${KERNEL_3G_MODULES}' +RDEPENDS_${PN} += '${KERNEL_DVB_MODULES}' + +PR = "r0" + +inherit task + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ESSENTIAL_RDEPENDS = " \ + kernel-module-stv0299 \ +" + +ESSENTIAL_RRECOMMENDS = " \ + kernel-module-autofs4 \ + kernel-module-cdrom \ + kernel-module-cifs \ + kernel-module-nls-cp850 \ + kernel-module-nls-iso8859-1 \ + kernel-module-nls-iso8859-15 \ + kernel-module-ntfs \ + kernel-module-reiserfs \ + kernel-module-sr-mod \ + kernel-module-usbhid \ + kernel-module-ext2 \ +" + +KERNEL_3G_MODULES = " \ + kernel-module-ppp-async \ + kernel-module-ppp-deflate \ + kernel-module-ppp-synctty \ + kernel-module-ppp-generic \ + kernel-module-slhc \ + kernel-module-usbserial \ +" + +KERNEL_DVB_MODULES = " \ + kernel-module-em28xx-dvb \ + kernel-module-dvb-usb-a800 \ + kernel-module-dvb-usb-af9005 \ + kernel-module-af9013 kernel-module-mt2060 kernel-module-qt1010 kernel-module-tda18271 kernel-module-mxl5005s kernel-module-mc44s803 kernel-module-tda18218 kernel-module-mxl5007t kernel-module-dvb-usb-af9015 \ + kernel-module-mxl5007t kernel-module-tda18218 \ + kernel-module-tda10021 kernel-module-tda10023 kernel-module-mt352 kernel-module-zl10353 kernel-module-tda18212 kernel-module-cx24116 kernel-module-stv0900 kernel-module-stv6110 kernel-module-stv6110x kernel-module-isl6423 kernel-module-dvb-usb-anysee \ + kernel-module-zl10353 kernel-module-qt1010 kernel-module-dvb-usb-au6610 \ + kernel-module-dvb-usb-az6027 \ + kernel-module-zl10353 kernel-module-mxl5005s kernel-module-dvb-usb-ce6230 \ + kernel-module-lgdt330x kernel-module-mt352 kernel-module-zl10353 kernel-module-tuner-xc2028 kernel-module-tuner-simple kernel-module-mxl5005s kernel-module-max2165 kernel-module-lgs8gxx kernel-module-atbm8830 kernel-module-dvb-usb-cxusb kernel-module-drxd \ + kernel-module-dvb-usb-cinergyt2 \ + kernel-module-mt352 kernel-module-nxt6000 kernel-module-dvb-usb-digitv \ + kernel-module-mt2060 kernel-module-mt2266 kernel-module-tuner-xc2028 kernel-module-xc5000 kernel-module-xc4000 kernel-module-s5h1411 kernel-module-lgdt3305 kernel-module-mxl5007t kernel-module-dvb-usb-dib0700 \ + kernel-module-dvb-usb-dibusb-mb \ + kernel-module-dvb-usb-dibusb-mc \ + kernel-module-zl10353 kernel-module-qt1010 kernel-module-dvb-usb-dtv5100 \ + kernel-module-dvb-usb-dtt200u \ + kernel-module-si21xx kernel-module-stv0299 kernel-module-stv0288 kernel-module-stb6000 kernel-module-cx24116 \ + kernel-module-mt312 kernel-module-zl10039 kernel-module-ds3000 kernel-module-stv0900 kernel-module-stv6110 kernel-module-dvb-usb-dw2102 \ + kernel-module-ec100 kernel-module-mxl5005s kernel-module-dvb-usb-ec168 \ + kernel-module-zl10353 kernel-module-qt1010 kernel-module-dvb-usb-gl861 \ + kernel-module-dvb-usb-gp8psk \ + kernel-module-mt352 kernel-module-qt1010 kernel-module-tda1004x kernel-module-tda827x kernel-module-dvb-usb-m920x \ + kernel-module-stv0299 kernel-module-dvb-usb-opera \ + kernel-module-stv090x kernel-module-dvb-usb-technisat-usb2 \ + kernel-module-tda826x kernel-module-tda10086 kernel-module-tda827x kernel-module-lnbp21 kernel-module-dvb-usb-ttusb2 \ + kernel-module-dvb-ttusb-budget \ + kernel-module-dvb-usb-nova-t-usb2 \ + kernel-module-mt352 kernel-module-dvb-usb-umt-010 \ + kernel-module-dvb-usb-vp702x \ + kernel-module-dvb-usb-vp7045 \ + kernel-module-smsdvb kernel-module-smsusb \ +" +