From: Grazvydas Ignotas Date: Tue, 26 Mar 2013 18:26:54 +0000 (+0200) Subject: task-pandora-xfce*: try to make it work X-Git-Tag: sz_154~5 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=e86f82f8edcc194448bea9303906459ba1045fde task-pandora-xfce*: try to make it work --- diff --git a/recipes/images/pandora-xfce-image-nowifi.bb b/recipes/images/pandora-xfce-image-nowifi.bb index e97566f..85d6fea 100755 --- a/recipes/images/pandora-xfce-image-nowifi.bb +++ b/recipes/images/pandora-xfce-image-nowifi.bb @@ -6,7 +6,7 @@ IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es" inherit image -PR = "r4" +PR = "r5" export IMAGE_BASENAME = "pandora-xfce-image-nowifi" @@ -16,7 +16,7 @@ DEPENDS = "task-base" IMAGE_INSTALL += " \ task-pandora-core \ - task-pandora-xfce \ + task-pandora-xfce-nowifi \ ${SPLASH} \ " diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb index d669a5f..a139d16 100755 --- a/recipes/images/pandora-xfce-image.bb +++ b/recipes/images/pandora-xfce-image.bb @@ -6,7 +6,7 @@ IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es" inherit image -PR = "r30" +PR = "r31" export IMAGE_BASENAME = "pandora-xfce-image" @@ -17,10 +17,6 @@ DEPENDS = "task-base" IMAGE_INSTALL += " \ task-pandora-core \ task-pandora-xfce \ - pandora-scripts-wifi \ - pandora-configtray-wifi \ - pandora-firmware \ - wl1251-modules \ ${SPLASH} \ " diff --git a/recipes/tasks/task-pandora-xfce-nowifi.bb b/recipes/tasks/task-pandora-xfce-nowifi.bb new file mode 100644 index 0000000..7cd5067 --- /dev/null +++ b/recipes/tasks/task-pandora-xfce-nowifi.bb @@ -0,0 +1,9 @@ +require task-pandora-xfce.inc + +# bump PR in task-pandora-xfce.inc if you change this + +# this is done this way to not break existing installations + +RDEPENDS_${PN} = " \ + ${PANDORA_XFCE} \ +" diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb old mode 100755 new mode 100644 index 889040f..f59cb1a --- a/recipes/tasks/task-pandora-xfce.bb +++ b/recipes/tasks/task-pandora-xfce.bb @@ -1,339 +1,13 @@ -DESCRIPTION = "Task file for the XFCE Pandora image" +require task-pandora-xfce.inc -# Don't forget to bump the PR if you change it. +# bump PR in task-pandora-xfce.inc if you change this -PR = "r77" - -inherit task - -ANGSTROM_EXTRA_INSTALL ?= "" - -APPS = " \ - avahi-ui \ -# abiword \ - evince \ -# claws-mail \ - swfdec swfdec-gnome swfdec-mozilla \ -# gnumeric \ - networkmanager network-manager-applet \ - vnc x11vnc angstrom-x11vnc-xinit \ - openvpn networkmanager-openvpn \ - modemmanager \ - xchat \ - links-x11 \ - enchant \ - aspell \ - xwininfo \ - curl \ - dosfstools \ - netkit-ftp \ -# xournal \ -# arora \ -" - -BLUETOOTH_GUI = " \ - gnome-bluetooth \ -" - -IM_CLIENT = " \ -# pidgin \ -# libpurple-protocol-msn \ -# libpurple-protocol-yahoo \ -# libpurple-protocol-icq \ -# libpurple-protocol-aim \ -" - -DISPMAN = " \ - slim \ - slim-op-themes \ -" - -FONTS = " \ - font-adobe-75dpi \ - fontconfig fontconfig-utils font-util \ - ttf-arphic-uming \ - ttf-dejavu-common \ - ttf-dejavu-sans \ - ttf-dejavu-serif \ - ttf-dejavu-sans-mono \ - ttf-liberation-sans \ - ttf-liberation-serif \ - ttf-liberation-mono \ - xorg-minimal-fonts \ -" - -# Any default games we want to ship. -GAMES = " \ -# scummvm \ -# frozen-bubble \ -# gnome-games \ -# numptyphysics \ -" - -GNOME_APPS = " \ -# gnome-mplayer \ - gcalctool \ - gnome-keyring gnome-keyring-pam-plugin \ - gksu \ -" - -GSTREAMER = " \ -# gstreamer-ti \ - gst-ffmpeg \ - gst-omapfb \ -# gst-plugin-pulse \ - gst-plugin-xvimagesink \ - gst-plugins-base-meta \ -# gst-plugins-good-meta \ -# gst-plugins-bad-meta \ -# gst-plugins-ugly-meta \ - gst-plugin-gles \ -" - -ICON_THEME = " \ - hicolor-icon-theme \ - elementary-icon-theme \ - elementary-icon-theme-enable \ -" - -LAUNCHERS = " \ -# netbook-launcher-efl \ - pandora-libpnd-minimenu \ -# pandora-pmenu \ -" - -PANDORA = " \ - pandora-first-run-wizard hsetroot \ - pandora-scripts \ - pandora-wallpaper-official \ - pandora-xfce-defaults \ -# pandora-midori-defaults midori \ - libgles2d \ - pandora-misc \ - pandora-pndstore \ - pandora-configtray \ -" - -PERL = " \ - perl \ - task-perl-module-all \ - libnet-dbus-perl \ - libxml-parser-perl \ - libxml-twig-perl \ -" - -PULSEAUDIO = " \ -# pulseaudio-alsa-wrapper \ -# pulseaudio-esd-wrapper \ -# pulseaudio-module-gconf \ -# libasound-module-ctl-pulse \ -# libasound-module-pcm-pulse \ -" - -PYTHON_LIBS = " \ - python-shell \ - python-pygtk \ - python-pycairo \ - gnome-vfs-plugin-http \ - gnome-vfs-plugin-ftp \ -" - -QT_SUPPORT = " \ - libqt3support4 \ - libqtassistantclient4 \ - libqtclucene4 \ - libqtcore4 \ - libqtdbus4 \ - libqtdesigner4 \ - libqtdesignercomponents4 \ - libqtgui4 \ - libqthelp4 \ - libqtnetwork4 \ - libqtscript4 \ - libqtscripttools4 \ - libqtsql4 \ - libqtsvg4 \ - libqttest4 \ - libqtwebkit4 \ - libqtxml4 \ - qt4-tools \ - qt4-assistant \ - qt4-common \ - qt4-dbus \ - qt4-designer \ - qt4-fonts \ - qt4-linguist \ - qt4-mkspecs \ - qt4-pixeltool \ - qt4-qt3to4 \ - qt4-plugin-imageformat-jpeg \ - qt4-plugin-imageformat-gif \ -" - - -TOTEM = " \ -# totem \ -# totem-browser-plugin \ -# totem-plugin-bemused \ -# totem-plugin-gromit \ -# totem-plugin-media-player-keys \ -# totem-plugin-ontop \ -# totem-plugin-properties \ -# totem-plugin-screensaver \ -# totem-plugin-skipto \ -# totem-plugin-thumbnail \ -" - -TOUCHSCREEN = " \ -# gtk-touchscreen-mode-enable \ - libgtkstylus \ -# xinput-calibrator \ -" - -XFCE46_BASE = " \ - xfce4-dev-tools \ - xfwm4 \ - xfwm4-theme-default \ - xfce-utils \ - xfce4-session \ - xfconf \ - xfdesktop \ - xfce4-panel \ - xfce4-power-manager \ - \ - gtk-xfce-engine \ - \ - xfce4-panel-plugin-actions \ - xfce4-panel-plugin-clock \ - xfce4-panel-plugin-iconbox \ - xfce4-panel-plugin-launcher \ - xfce4-panel-plugin-pager \ - xfce4-panel-plugin-separator \ - xfce4-panel-plugin-showdesktop \ - xfce4-panel-plugin-systray \ - xfce4-panel-plugin-tasklist \ - xfce4-panel-plugin-windowlist \ - xfce4-settings \ - xfce-terminal \ - thunar \ -" - -XFCE46_EXTRAS = " \ - xfce4-notifyd \ - xfce4-mixer \ - xfce4-appfinder \ - xfce4-battery-plugin \ - xfprint \ - orage \ - squeeze \ - ristretto \ - mousepad \ - gigolo \ - xdotool \ -" - -XFCE_THEMES = " \ - xfwm4-theme-daloa \ - xfwm4-theme-moheli \ - xfwm4-theme-kokodi \ - xfwm4-theme-sassandra \ - xfwm4-themes \ -" - -XSERVER_BASE = " \ - ${XSERVER} \ - dbus-x11 \ - desktop-file-utils \ - iso-codes \ - mime-support \ - notification-daemon inotify-tools \ - xauth \ - xdg-utils \ - xhost \ - xinetd \ - xinit \ - xlsfonts \ - xrdb \ - xrefresh \ - xset \ - xvinfo \ - devilspie \ - encodings \ - xterm \ - xmodmap \ -" - -ADD_LIBS = " \ - libbonobo \ - libetpan \ - libfribidi \ - libgsf \ - libidn \ - libxslt \ - wv \ - libsamplerate0 \ - glibc-gconv-cp1252 \ - glibc-gconv-ibm850 \ - glibc-gconv-iso8859-15 \ - glibc-gconv-cp1250 \ - glibc-gconv-koi8-r \ - glibc-gconv-unicode \ - glibc-gconv-utf-16 \ - gvfsd-sftp \ - sshfs-fuse \ - directfb \ - rtl8712-module \ - rtl8192u-module \ -" - -DSP = " \ - ti-dsplink-module \ - ti-cmem-module \ - ti-lpm-module \ - ti-sdma-module \ - ti-codecs-omap3530-server \ -" +# this is done this way to not break existing installations RDEPENDS_${PN} = " \ - task-pandora-core \ - angstrom-x11-base-depends \ - ${ANGSTROM_EXTRA_INSTALL} \ - ${APPS} \ - ${BLUETOOTH_GUI} \ - ${IM_CLIENT} \ - ${DISPMAN} \ - ${FONTS} \ - ${GAMES} \ - ${GNOME_APPS} \ - ${GSTREAMER} \ - ${ICON_THEME} \ - ${LAUNCHERS} \ - ${PANDORA} \ - ${PERL} \ - ${PULSEAUDIO} \ - ${PYTHON_LIBS} \ - ${QT_SUPPORT} \ - ${TOTEM} \ - ${TOUCHSCREEN} \ - ${XSERVER_BASE} \ - ${XFCE46_BASE} \ - ${XFCE46_EXTRAS} \ - ${XFCE_THEMES} \ - ${ADD_LIBS} \ - ${DSP} \ - \ - rxvt-unicode \ -# xst \ -# suspend-desktop \ -# teleport \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-xpm \ - gdk-pixbuf-loader-jpeg \ - pango-module-basic-x \ - pango-module-basic-fc \ - xcursor-transparent-theme \ - xterm \ - jaaa nmap iperf \ - xf86-video-udlfb \ -# gnuplot \ + ${PANDORA_XFCE} \ + pandora-firmware \ + wl1251-modules \ + pandora-scripts-wifi \ + pandora-configtray-wifi \ " diff --git a/recipes/tasks/task-pandora-xfce.inc b/recipes/tasks/task-pandora-xfce.inc new file mode 100755 index 0000000..bbd4ece --- /dev/null +++ b/recipes/tasks/task-pandora-xfce.inc @@ -0,0 +1,339 @@ +DESCRIPTION = "Task file for the XFCE Pandora image" + +# Don't forget to bump the PR if you change it. + +PR = "r78" + +inherit task + +ANGSTROM_EXTRA_INSTALL ?= "" + +APPS = " \ + avahi-ui \ +# abiword \ + evince \ +# claws-mail \ + swfdec swfdec-gnome swfdec-mozilla \ +# gnumeric \ + networkmanager network-manager-applet \ + vnc x11vnc angstrom-x11vnc-xinit \ + openvpn networkmanager-openvpn \ + modemmanager \ + xchat \ + links-x11 \ + enchant \ + aspell \ + xwininfo \ + curl \ + dosfstools \ + netkit-ftp \ +# xournal \ +# arora \ +" + +BLUETOOTH_GUI = " \ + gnome-bluetooth \ +" + +IM_CLIENT = " \ +# pidgin \ +# libpurple-protocol-msn \ +# libpurple-protocol-yahoo \ +# libpurple-protocol-icq \ +# libpurple-protocol-aim \ +" + +DISPMAN = " \ + slim \ + slim-op-themes \ +" + +FONTS = " \ + font-adobe-75dpi \ + fontconfig fontconfig-utils font-util \ + ttf-arphic-uming \ + ttf-dejavu-common \ + ttf-dejavu-sans \ + ttf-dejavu-serif \ + ttf-dejavu-sans-mono \ + ttf-liberation-sans \ + ttf-liberation-serif \ + ttf-liberation-mono \ + xorg-minimal-fonts \ +" + +# Any default games we want to ship. +GAMES = " \ +# scummvm \ +# frozen-bubble \ +# gnome-games \ +# numptyphysics \ +" + +GNOME_APPS = " \ +# gnome-mplayer \ + gcalctool \ + gnome-keyring gnome-keyring-pam-plugin \ + gksu \ +" + +GSTREAMER = " \ +# gstreamer-ti \ + gst-ffmpeg \ + gst-omapfb \ +# gst-plugin-pulse \ + gst-plugin-xvimagesink \ + gst-plugins-base-meta \ +# gst-plugins-good-meta \ +# gst-plugins-bad-meta \ +# gst-plugins-ugly-meta \ + gst-plugin-gles \ +" + +ICON_THEME = " \ + hicolor-icon-theme \ + elementary-icon-theme \ + elementary-icon-theme-enable \ +" + +LAUNCHERS = " \ +# netbook-launcher-efl \ + pandora-libpnd-minimenu \ +# pandora-pmenu \ +" + +PANDORA = " \ + pandora-first-run-wizard hsetroot \ + pandora-scripts \ + pandora-wallpaper-official \ + pandora-xfce-defaults \ +# pandora-midori-defaults midori \ + libgles2d \ + pandora-misc \ + pandora-pndstore \ + pandora-configtray \ +" + +PERL = " \ + perl \ + task-perl-module-all \ + libnet-dbus-perl \ + libxml-parser-perl \ + libxml-twig-perl \ +" + +PULSEAUDIO = " \ +# pulseaudio-alsa-wrapper \ +# pulseaudio-esd-wrapper \ +# pulseaudio-module-gconf \ +# libasound-module-ctl-pulse \ +# libasound-module-pcm-pulse \ +" + +PYTHON_LIBS = " \ + python-shell \ + python-pygtk \ + python-pycairo \ + gnome-vfs-plugin-http \ + gnome-vfs-plugin-ftp \ +" + +QT_SUPPORT = " \ + libqt3support4 \ + libqtassistantclient4 \ + libqtclucene4 \ + libqtcore4 \ + libqtdbus4 \ + libqtdesigner4 \ + libqtdesignercomponents4 \ + libqtgui4 \ + libqthelp4 \ + libqtnetwork4 \ + libqtscript4 \ + libqtscripttools4 \ + libqtsql4 \ + libqtsvg4 \ + libqttest4 \ + libqtwebkit4 \ + libqtxml4 \ + qt4-tools \ + qt4-assistant \ + qt4-common \ + qt4-dbus \ + qt4-designer \ + qt4-fonts \ + qt4-linguist \ + qt4-mkspecs \ + qt4-pixeltool \ + qt4-qt3to4 \ + qt4-plugin-imageformat-jpeg \ + qt4-plugin-imageformat-gif \ +" + + +TOTEM = " \ +# totem \ +# totem-browser-plugin \ +# totem-plugin-bemused \ +# totem-plugin-gromit \ +# totem-plugin-media-player-keys \ +# totem-plugin-ontop \ +# totem-plugin-properties \ +# totem-plugin-screensaver \ +# totem-plugin-skipto \ +# totem-plugin-thumbnail \ +" + +TOUCHSCREEN = " \ +# gtk-touchscreen-mode-enable \ + libgtkstylus \ +# xinput-calibrator \ +" + +XFCE46_BASE = " \ + xfce4-dev-tools \ + xfwm4 \ + xfwm4-theme-default \ + xfce-utils \ + xfce4-session \ + xfconf \ + xfdesktop \ + xfce4-panel \ + xfce4-power-manager \ + \ + gtk-xfce-engine \ + \ + xfce4-panel-plugin-actions \ + xfce4-panel-plugin-clock \ + xfce4-panel-plugin-iconbox \ + xfce4-panel-plugin-launcher \ + xfce4-panel-plugin-pager \ + xfce4-panel-plugin-separator \ + xfce4-panel-plugin-showdesktop \ + xfce4-panel-plugin-systray \ + xfce4-panel-plugin-tasklist \ + xfce4-panel-plugin-windowlist \ + xfce4-settings \ + xfce-terminal \ + thunar \ +" + +XFCE46_EXTRAS = " \ + xfce4-notifyd \ + xfce4-mixer \ + xfce4-appfinder \ + xfce4-battery-plugin \ + xfprint \ + orage \ + squeeze \ + ristretto \ + mousepad \ + gigolo \ + xdotool \ +" + +XFCE_THEMES = " \ + xfwm4-theme-daloa \ + xfwm4-theme-moheli \ + xfwm4-theme-kokodi \ + xfwm4-theme-sassandra \ + xfwm4-themes \ +" + +XSERVER_BASE = " \ + ${XSERVER} \ + dbus-x11 \ + desktop-file-utils \ + iso-codes \ + mime-support \ + notification-daemon inotify-tools \ + xauth \ + xdg-utils \ + xhost \ + xinetd \ + xinit \ + xlsfonts \ + xrdb \ + xrefresh \ + xset \ + xvinfo \ + devilspie \ + encodings \ + xterm \ + xmodmap \ +" + +ADD_LIBS = " \ + libbonobo \ + libetpan \ + libfribidi \ + libgsf \ + libidn \ + libxslt \ + wv \ + libsamplerate0 \ + glibc-gconv-cp1252 \ + glibc-gconv-ibm850 \ + glibc-gconv-iso8859-15 \ + glibc-gconv-cp1250 \ + glibc-gconv-koi8-r \ + glibc-gconv-unicode \ + glibc-gconv-utf-16 \ + gvfsd-sftp \ + sshfs-fuse \ + directfb \ + rtl8712-module \ + rtl8192u-module \ +" + +DSP = " \ + ti-dsplink-module \ + ti-cmem-module \ + ti-lpm-module \ + ti-sdma-module \ + ti-codecs-omap3530-server \ +" + +PANDORA_XFCE = " \ + task-pandora-core \ + angstrom-x11-base-depends \ + ${ANGSTROM_EXTRA_INSTALL} \ + ${APPS} \ + ${BLUETOOTH_GUI} \ + ${IM_CLIENT} \ + ${DISPMAN} \ + ${FONTS} \ + ${GAMES} \ + ${GNOME_APPS} \ + ${GSTREAMER} \ + ${ICON_THEME} \ + ${LAUNCHERS} \ + ${PANDORA} \ + ${PERL} \ + ${PULSEAUDIO} \ + ${PYTHON_LIBS} \ + ${QT_SUPPORT} \ + ${TOTEM} \ + ${TOUCHSCREEN} \ + ${XSERVER_BASE} \ + ${XFCE46_BASE} \ + ${XFCE46_EXTRAS} \ + ${XFCE_THEMES} \ + ${ADD_LIBS} \ + ${DSP} \ + \ + rxvt-unicode \ +# xst \ +# suspend-desktop \ +# teleport \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-xpm \ + gdk-pixbuf-loader-jpeg \ + pango-module-basic-x \ + pango-module-basic-fc \ + xcursor-transparent-theme \ + xterm \ + jaaa nmap iperf \ + xf86-video-udlfb \ +# gnuplot \ +"