From eeb15959c90315dc8512f159d99953feef0d4c21 Mon Sep 17 00:00:00 2001 From: Francisco Alecrim Date: Mon, 1 Feb 2010 16:41:37 -0400 Subject: [PATCH 052/118] task-mamona-* : update tasks related to mamona distro Signed-off-by: Aloisio Almeida Jr Signed-off-by: Felipe Zimmerle Signed-off-by: Francisco Alecrim Signed-off-by: Lauro Ramos Venancio Signed-off-by: Ricardo Salveti de Araujo Signed-off-by: Willer Moreira --- recipes/tasks/mamona-sdk.inc | 15 ++--- recipes/tasks/task-mamona-base.bb | 89 +++++++++++++++-------------- recipes/tasks/task-mamona-devel.bb | 33 ++++------- recipes/tasks/task-mamona-e-wm.bb | 84 ++++++++++++++++++++++++++ recipes/tasks/task-mamona-linux.bb | 32 ++++++++++ recipes/tasks/task-mamona-qt-wm.bb | 54 +++++++++++++++++ recipes/tasks/task-mamona-sdk-noemu.bb | 4 +- recipes/tasks/task-mamona-sdk.bb | 4 +- recipes/tasks/task-mamona-sound.bb | 41 +++++++++++++ recipes/tasks/task-mamona-videoplay.bb | 30 ++++++++++ recipes/tasks/task-mamona-x11.bb | 31 ++++++++++ recipes/tasks/task-mamona.bb | 100 ++++++++++++++----------------- recipes/tasks/task-python-efl.bb | 3 +- 13 files changed, 388 insertions(+), 132 deletions(-) create mode 100644 recipes/tasks/task-mamona-e-wm.bb create mode 100644 recipes/tasks/task-mamona-linux.bb create mode 100644 recipes/tasks/task-mamona-qt-wm.bb create mode 100644 recipes/tasks/task-mamona-sound.bb create mode 100644 recipes/tasks/task-mamona-videoplay.bb create mode 100644 recipes/tasks/task-mamona-x11.bb diff --git a/recipes/tasks/mamona-sdk.inc b/recipes/tasks/mamona-sdk.inc index fb54eab..b83208d 100644 --- a/recipes/tasks/mamona-sdk.inc +++ b/recipes/tasks/mamona-sdk.inc @@ -4,22 +4,19 @@ ALLOW_EMPTY = "1" PACKAGES = "${PN}" +# A, B, C, D... you know? + RDEPENDS = "\ task-mamona \ automake \ bison \ - cmake \ - fakeroot \ flex \ - git \ - gdb \ - gettext \ + cdbs \ + cmake \ groff \ libc6-dev \ libstdc++-dev \ + libtool \ make \ - cvs \ - subversion \ - pkgconfig \ - diffutils \ + gdb \ " diff --git a/recipes/tasks/task-mamona-base.bb b/recipes/tasks/task-mamona-base.bb index c3f867f..bf563ea 100644 --- a/recipes/tasks/task-mamona-base.bb +++ b/recipes/tasks/task-mamona-base.bb @@ -1,48 +1,51 @@ -DESCRIPTION = "task mamona base" +DESCRIPTION = "Mamona Basic package depending on machine features." LICENSE = "MIT" -PR = "r2" -ALLOW_EMPTY = "1" +PR = "r10" -PACKAGES = "${PN}" +inherit task + +PROVIDES = "${PACKAGES}" +PACKAGES = '${PN} \ + ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \ + ' RDEPENDS = "\ - apt \ - base-files \ - base-passwd \ - bash | bash-noemu \ - busybox \ - bzip2 \ - coreutils \ - dpkg \ - e2fsprogs \ - e2fsprogs-badblocks \ - e2fsprogs-blkid \ - e2fsprogs-uuidgen \ - file \ - gawk \ - gawk-common \ - initscripts \ - libgcc \ - libstdc++ \ - makedevs \ - ncurses \ - netbase \ - patch \ - perl \ - pkgconfig \ - procps \ - sed \ - sudo \ - sysvinit \ - sysvinit-inittab \ - tar \ - tinylogin \ - udev \ - update-alternatives-dpkg \ - update-rc.d \ - util-linux \ - util-linux-losetup \ - util-linux-swaponoff \ - util-linux-umount \ - zlib \ + task-mamona-linux \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ + ${MACHINE_EXTRA_RDEPENDS} \ + \ + apt \ + base-files \ + base-passwd \ + busybox \ + busybox-syslog \ + dpkg \ + initscripts \ + libgcc \ + libstdc++ \ + kernel \ + makedevs \ + modutils-initscripts \ + ncurses \ + netbase \ + perl \ + sudo \ + sysvinit \ + sysvinit-inittab \ + udev \ + update-alternatives \ + update-rc.d \ + zlib \ + ${@base_contains('MACHINE_FEATURES', 'uboot', 'task-base-uboot', '',d)} \ + ${@base_contains('MACHINE_FEATURES', 'touchscreen', 'task-base-touchscreen', '',d)} \ " + +RDEPENDS_task-base-uboot = "\ + u-boot" + +RDEPENDS_task-base-touchscreen = "\ + pointercal \ + tslib \ + tslib-tests \ + tslib-calibrate" diff --git a/recipes/tasks/task-mamona-devel.bb b/recipes/tasks/task-mamona-devel.bb index a330834..d832bae 100644 --- a/recipes/tasks/task-mamona-devel.bb +++ b/recipes/tasks/task-mamona-devel.bb @@ -1,26 +1,17 @@ -DESCRIPTION = "Necessary packages for development at runtime environment" +DESCRIPTION = "Mamona packages for development at runtime environment" LICENSE = "MIT" -PR = "r3" -ALLOW_EMPTY = "1" +PR = "r6" -PACKAGES = "${PN}" +inherit task RDEPENDS = "\ - task-mamona \ - gdb \ - strace \ - udev-usbserial \ - usbnet \ - openssh-sshd \ - openssh-scp \ + task-mamona \ + \ + ${DISTRO_SSH_DAEMON} \ + gdb \ + oprofile \ + powertop \ + strace \ + udev-usbserial \ + usbnet \ " - -pkg_postinst () { - echo; echo - echo " ########################################################## " - echo " # WARNING: Please set your root password before use your # " - echo " # usbnet package. It's required for ssh login. # " - echo " ########################################################## " - echo; echo -} - diff --git a/recipes/tasks/task-mamona-e-wm.bb b/recipes/tasks/task-mamona-e-wm.bb new file mode 100644 index 0000000..eda5dc8 --- /dev/null +++ b/recipes/tasks/task-mamona-e-wm.bb @@ -0,0 +1,84 @@ +DESCRIPTION = "Task mamona: Enlightment Window Manager" +LICENSE = "MIT" +PR = "r3" + +inherit task + +## +## Features +## + +## Basic Packages +BASIC_PACKS = "\ + task-mamona-x11 \ +" + +## Windown Manager +WM_PACKS = "\ + e-wm \ + e-wm-config-illume \ + e-wm-config-standard \ + e-wm-theme-illume \ + e-wm-menu-shr \ + hicolor-icon-theme \ + gnome-icon-theme \ +" + +## Env Utils +ENV_PACKS = "\ + libmamona-im-ecore \ + libmamona-im-gtk \ + pango-module-basic-x \ + pango-module-basic-fc \ +" + +## Browser +BROWSER_PACKS = "\ + eve \ +" + +## Multimedia +MULTIMEDIA_PACKS = "\ + mime-support \ + ${MPLAYER} \ + xmms \ + xmms-plugin-output-alsa \ +" +MULTIMEDIA_PACKS_append_beagleboard = "\ + omapfbplay \ +" + +## IM +IM_PACKS = "\ + pidgin \ +" + +## Connectivity +CONNECTIVITY_PACKS = "\ + network-manager-applet \ + gnome-bluetooth \ +" + +## Utils +UTILS_PACKS = "\ + aterm \ + dropbear \ +" +UTILS_PACKS_append_nokiait = "\ + mamonaim-e-applet \ +" + +## +## RDEPENDS +## + +RDEPENDS = "\ + ${BASIC_PACKS} \ + ${WM_PACKS} \ + ${ENV_PACKS} \ + ${BROWSER_PACKS} \ + ${MULTIMEDIA_PACKS} \ + ${IM_PACKS} \ + ${CONNECTIVITY_PACKS} \ + ${UTILS_PACKS} \ +" diff --git a/recipes/tasks/task-mamona-linux.bb b/recipes/tasks/task-mamona-linux.bb new file mode 100644 index 0000000..63d4157 --- /dev/null +++ b/recipes/tasks/task-mamona-linux.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Task Mamona Linux: Build and Install Linux Kernel and Modules" +LICENSE = "MIT" +PR = "r3" + +inherit task + +# Make sure we build the kernel +DEPENDS = "virtual/kernel" + +RDEPENDS = "\ + kernel \ + modutils-initscripts \ + module-init-tools \ +" + +# +## Machine specific modules +# + +RDEPENDS_append_nokia770 = " \ + ${@base_contains('COMBINED_FEATURES', 'wifi', 'cx3110x-770he', '', d)} \ +" + +RDEPENDS_append_nokia8xx = " \ + ${@base_contains('COMBINED_FEATURES', 'wifi', 'stlc45xx', '', d)} \ +" + +RDEPENDS_append_beagleboard = " \ + kernel-modules \ + rt73-firmware \ + zd1211-firmware \ +" diff --git a/recipes/tasks/task-mamona-qt-wm.bb b/recipes/tasks/task-mamona-qt-wm.bb new file mode 100644 index 0000000..9589815 --- /dev/null +++ b/recipes/tasks/task-mamona-qt-wm.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Task mamona: Qt" +LICENSE = "MIT" +PR = "r5" + +inherit task + +## +## Features +## + +## Basic Packages +BASIC_PACKS = "\ + task-mamona-x11 \ +" + +## Windown Manager +WM_PACKS = "\ + antico \ + qt4-x11-free \ +" + +## Multimedia +MULTIMEDIA_PACKS = "\ + mime-support \ + ${MPLAYER} \ + xmms \ + xmms-plugin-output-alsa \ +" +MULTIMEDIA_PACKS_append_beagleboard = "\ + omapfbplay \ +" + +## Utils +UTILS_PACKS = "\ + aterm \ + dropbear \ +" + +## Browser +BROWSER_PACKS = "\ + eve \ +" + +## +## RDEPENDS +## + +RDEPENDS = "\ + ${BASIC_PACKS} \ + ${BROWSER_PACKS} \ + ${WM_PACKS} \ + ${MULTIMEDIA_PACKS} \ + ${UTILS_PACKS} \ +" diff --git a/recipes/tasks/task-mamona-sdk-noemu.bb b/recipes/tasks/task-mamona-sdk-noemu.bb index 0ef65b9..34bd04f 100644 --- a/recipes/tasks/task-mamona-sdk-noemu.bb +++ b/recipes/tasks/task-mamona-sdk-noemu.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r4" require mamona-sdk.inc @@ -9,6 +9,8 @@ RDEPENDS += "\ bash-noemu \ binutils-noemu \ binutils-noemu-symlinks \ + cpp-noemu \ + cpp-noemu-symlinks \ gcc-noemu \ gcc-noemu-symlinks \ g++-noemu \ diff --git a/recipes/tasks/task-mamona-sdk.bb b/recipes/tasks/task-mamona-sdk.bb index 6e57865..3e36f28 100644 --- a/recipes/tasks/task-mamona-sdk.bb +++ b/recipes/tasks/task-mamona-sdk.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r7" include mamona-sdk.inc @@ -9,6 +9,8 @@ RDEPENDS += "\ bash \ binutils \ binutils-symlinks \ + cpp \ + cpp-symlinks \ gcc \ gcc-symlinks \ g++ \ diff --git a/recipes/tasks/task-mamona-sound.bb b/recipes/tasks/task-mamona-sound.bb new file mode 100644 index 0000000..34dd3ab --- /dev/null +++ b/recipes/tasks/task-mamona-sound.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Task mamona sound: Build and install sound packages" +LICENSE = "MIT" +PR = "r4" + +inherit task + +# ATTENTION: As gst-plugins-* providers create their packages DYNAMICALLY, the +# RPROVIDES variable is NOT defined to ANY gst-plugin-* package. +# The solution is find out the provider manually and include it in DEPENDS +DEPENDS = " \ + gst-plugins-base \ + gst-plugins-ugly \ + gst-plugins-good \ + " + +RDEPENDS = " \ + alsa-conf-base \ + alsa-lib \ + alsa-utils-alsactl \ + gstreamer \ + gst-plugin-alsa \ + gst-plugin-mad \ + gst-plugin-audioconvert \ + gst-plugin-audioresample \ + gst-plugin-decodebin \ + gst-plugin-decodebin2 \ + gst-plugin-id3demux \ + gst-plugin-mpegaudioparse \ + gst-plugin-ogg \ + gst-plugin-playbin \ + gst-plugin-typefindfunctions \ + gst-plugin-volume \ + gst-plugin-wavparse \ + " + +RDEPENDS_append_nokiait = " \ + alsa-state \ + alsa-states \ + alsa-utils-alsamixer \ + alsa-utils-aplay \ + " diff --git a/recipes/tasks/task-mamona-videoplay.bb b/recipes/tasks/task-mamona-videoplay.bb new file mode 100644 index 0000000..f960baa --- /dev/null +++ b/recipes/tasks/task-mamona-videoplay.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Task mamona video play: Build and install packages to enable video play in Mamona" +LICENSE = "MIT" +PR = "r1" + +inherit task + +# ATTENTION: As gst-plugins-* providers create their packages DYNAMICALLY, the +# RPROVIDES variable is NOT defined to ANY gst-plugin-* package. +# The solution is find out the provider manually and include it in DEPENDS +DEPENDS = " \ + gst-plugins-base \ + gst-plugins-ugly \ + gst-plugins-bad \ + gst-plugins-good \ + " + +RDEPENDS = " \ + gstreamer \ + gst-plugin-asf \ + gst-plugin-avi \ + gst-plugin-decodebin \ + gst-plugin-decodebin2 \ + gst-plugin-ffmpegcolorspace \ + gst-plugin-flv \ + gst-plugin-jpeg \ + gst-plugin-playbin \ + gst-plugin-qtdemux \ + gst-plugin-typefindfunctions \ + gst-plugin-ximagesink \ + " diff --git a/recipes/tasks/task-mamona-x11.bb b/recipes/tasks/task-mamona-x11.bb new file mode 100644 index 0000000..ed19992 --- /dev/null +++ b/recipes/tasks/task-mamona-x11.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Task Mamona X11: Build and Install the X11 Platform" +SECTION = "x11/server" +LICENSE = "MIT" +PR = "r1" + +inherit task + +XSERVER ?= "xserver-kdrive-fbdev" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +DEPENDS = "virtual/xserver" + +RDEPENDS = "\ + task-mamona \ + ${XSERVER} \ + dbus-x11 \ + ttf-dejavu-sans \ + ttf-dejavu-sans-mono \ + xserver-kdrive-common \ + xserver-nodm-init \ + xauth \ + xhost \ + xset \ + xrandr \ +" + +RDEPENDS_append_nokiait = "\ + libmamona-im0 \ + matchbox-keyboard \ +" diff --git a/recipes/tasks/task-mamona.bb b/recipes/tasks/task-mamona.bb index 372af29..718f55f 100644 --- a/recipes/tasks/task-mamona.bb +++ b/recipes/tasks/task-mamona.bb @@ -1,70 +1,60 @@ DESCRIPTION = "Task mamona: Build and Install Mamona Platform" LICENSE = "MIT" -PR = "r5" -ALLOW_EMPTY = "1" +PR = "r13" -PACKAGES = "${PN}" +inherit task + +## +## RDEPENDS +## RDEPENDS = "\ task-mamona-base \ - alsa-conf-base \ - alsa-utils-alsamixer \ - alsa-lib \ - alsa-utils-alsactl \ - alsa-state \ - alsa-utils-alsamixer \ - bluez-utils \ - bluez-utils-compat \ dbus \ dbus-glib \ - expat \ - freetype \ + hal \ glib-2.0 \ glibc \ - glibc-utils \ - hal \ - intltool \ - libfontenc \ - libmamona-im0 \ - libusb \ - libx11 \ - libxau \ - libxdmcp \ - libxext \ - libxfont \ - libxkbfile \ - libxrandr \ - libxrender \ - matchbox-keyboard \ netm-cli \ networkmanager \ - pointercal \ - python-core \ - tslib \ - tslib-calibrate \ - udev \ - wireless-tools \ - wpa-supplicant \ - wpa-supplicant-passphrase \ - xserver-kdrive-xomap \ - xserver-kdrive-common \ - xserver-nodm-init \ - libxcalibrate \ - xinit \ - xsp \ -" + ${@base_contains('MACHINE_FEATURES', 'alsa', '${SOUND_PACKS}', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'bluetooth', '${BLUETOOTH_PACKS}', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'phone', '${PHONE_PACKS}', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'screen', '${SCREEN_PACKS}', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'usbgadget', '${USBGADGET_PACKS}', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'usbhost', '${USBHOST_PACKS}', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'wifi', '${WIFI_PACKS}', '', d)} \ + " + +## +## Specific features per Machine +## -RDEPENDS_append_nokia770 = " \ - cx3110x-770he \ - libasound-module-ctl-dsp-ctl \ - libasound-module-pcm-alsa-dsp \ - mamona-sound-n770 \ -" +BLUETOOTH_PACKS = " \ + bluez4 \ + obexd \ + " -RDEPENDS_append_nokia800 = " \ - cx3110x-chinooke \ - libasound-module-ctl-dsp-ctl \ - libasound-module-pcm-alsa-dsp \ - mamona-sound-n800 \ -" +PHONE_PACKS = " \ + ofono \ + " +SCREEN_PACKS = " \ + task-mamona-videoplay \ + " + +SOUND_PACKS = " \ + task-mamona-sound \ + " + +USBGADGET_PACKS = " \ + usb-gadget-mode \ + " + +USBHOST_PACKS = " \ + usbutils \ + " + +WIFI_PACKS = " \ + wireless-tools \ + " diff --git a/recipes/tasks/task-python-efl.bb b/recipes/tasks/task-python-efl.bb index 70c1adf..6500eca 100644 --- a/recipes/tasks/task-python-efl.bb +++ b/recipes/tasks/task-python-efl.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" -PR = "ml4" +PR = "ml5" ALLOW_EMPTY = "1" @@ -12,7 +12,6 @@ RDEPENDS = "\ python-elementary \ python-emotion \ python-etk \ - python-epsilon \ python-edbus \ " -- 1.6.3.3