From 88b0486ff8f09ce53d99ddd09981c29fe472d43c Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Tue, 26 Mar 2013 16:04:32 +0100 Subject: [PATCH 1/1] pandora-images: Renamed JAP to nowifi and optimized image creation. --- ...ge-jap.bb => pandora-xfce-image-nowifi.bb} | 2 +- ...ore-jap.bb => task-pandora-core-nowifi.bb} | 0 recipes/tasks/task-pandora-core.bb | 147 +------- ...fce-jap.bb => task-pandora-xfce-nowifi.bb} | 0 recipes/tasks/task-pandora-xfce.bb | 329 +----------------- 5 files changed, 7 insertions(+), 471 deletions(-) rename recipes/images/{pandora-xfce-image-jap.bb => pandora-xfce-image-nowifi.bb} (97%) rename recipes/tasks/{task-pandora-core-jap.bb => task-pandora-core-nowifi.bb} (100%) rename recipes/tasks/{task-pandora-xfce-jap.bb => task-pandora-xfce-nowifi.bb} (100%) diff --git a/recipes/images/pandora-xfce-image-jap.bb b/recipes/images/pandora-xfce-image-nowifi.bb similarity index 97% rename from recipes/images/pandora-xfce-image-jap.bb rename to recipes/images/pandora-xfce-image-nowifi.bb index 4f13dbf..2d4f843 100755 --- a/recipes/images/pandora-xfce-image-jap.bb +++ b/recipes/images/pandora-xfce-image-nowifi.bb @@ -8,7 +8,7 @@ inherit image PR = "r1" -export IMAGE_BASENAME = "pandora-xfce-image" +export IMAGE_BASENAME = "pandora-xfce-image-nowifi" SPLASH = "psplash-omap3pandora" diff --git a/recipes/tasks/task-pandora-core-jap.bb b/recipes/tasks/task-pandora-core-nowifi.bb similarity index 100% rename from recipes/tasks/task-pandora-core-jap.bb rename to recipes/tasks/task-pandora-core-nowifi.bb diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb index 2ecafca..b6dc3f7 100755 --- a/recipes/tasks/task-pandora-core.bb +++ b/recipes/tasks/task-pandora-core.bb @@ -1,162 +1,21 @@ -DESCRIPTION = "Task file for default core/console apps and libs in the Pandora image" +DESCRIPTION = "Task file for Pandora core/console image (with Wifi)" # Use this task as a base to ship all kernel modules and make sure firmware and drivers are installed for BT and WiFi. # Please see metadata/openpandora.oe.git/packages/pandora-system/pandora-firmware/pandora-firmware/readme.txt for info on the hacks for firmware. # Don't forget to bump the PR if you change it. -PR = "r38" +PR = "r39" inherit task -AUFS = " \ - aufs2-util \ -" - -BLUETOOTH = " \ - blueprobe \ - bluez4 gst-plugin-bluez \ - libsndfile1 libasound-module-bluez \ -" - -# Package up the boot scripts and bootchart to help us work to drop the startup time. -BOOT = " \ - pandora-uboot-scripts \ - bootchart \ - mtd-utils \ -" - -# Package BOOST libs so people can use them in apps. It will pull in the RRECOMENDS. -BOOST = " \ - boost \ -" - WIRELESS = " \ pandora-firmware \ wl1251-modules \ -# pandora-wifi pandora-wifi-tools \ - wireless-tools \ - wpa-supplicant \ - networkmanager netm-cli \ -" - -MEDIA_LIBS = " \ - libmodplug \ - libsdl-x11 libsdl-mixer libsdl-image \ - libsdl-gfx libsdl-net libsdl-ttf \ - libpng libpng12 libpng3 \ - faad2 \ - mikmod \ - speex \ - flac \ - audiofile \ -" -OPENGLES = " \ - omap3-sgx-modules devmem2 \ - libgles-omap3 \ -# libgles-omap3-rawdemos \ -" - -PAM = " \ - libpam \ - libpam-meta \ -" - -PANDORA_LIBS = " \ - pandora-libpnd lsof \ - omap3-deviceid \ - pandora-skel \ - pandora-state \ - pandora-usbhost \ -" - -SUDO = " \ - sudo sudo-enable-wheel-group \ - pandora-sudoers \ -" - -SSH = " \ - openssh-scp \ - openssh-ssh \ -" - -TOUCHSCREEN = " \ - tslib tslib-tests tslib-calibrate pointercal \ -" - -FS_SUPPORT = " \ -# nfs-utils \ - nfs-utils-client \ - fuse fuse-utils \ - sshfs-fuse gmailfs curlftpfs \ - ntfs-3g \ - squashfs-tools \ -" - -EXTRA_TOOLS = " \ - avahi \ - fbgrab fbset fbset-modes \ - portmap \ - file \ - socat \ - strace \ - screen \ - rsync \ - unrar \ - ksymoops \ - kexec-tools \ - zip \ - gzip \ - bash \ - bzip2 \ - minicom \ - nano \ - gdb \ - sessreg \ - lua5.1 \ - tzdata \ -" - -# Add extra util-linux-ng utils to image. -# TODO: Fix util-linux-ng to meta depend on all subpackages. -UTIL_LINUX_NG_EXTRAS = " \ - util-linux-ng-losetup util-linux-ng-mountall \ - util-linux-ng-swaponoff \ " RDEPENDS_${PN} = "\ - task-base-extended \ - task-proper-tools \ - ${AUFS} \ - ${BOOST} \ - ${WIRELESS} \ - ${BLUETOOTH} \ - ${BOOT} \ - ${MEDIA_LIBS} \ - ${OPENGLES} \ - ${PANDORA_LIBS} \ - ${PAM} \ - ${SSH} \ - ${SUDO} \ - ${TOUCHSCREEN} \ - ${FS_SUPPORT} \ - ${EXTRA_TOOLS} \ - ${UTIL_LINUX_NG_EXTRAS} \ -# packagekit \ - python-pygame \ - python-misc \ - python-modules \ - alsa-utils alsa-utils-alsactl alsa-utils-alsamixer alsa-utils-aplay \ - openal-soft \ - rdesktop \ - \ -# angstrom-zeroconf-audio \ - angstrom-led-config \ - ntpdate \ - omap3-pandora-kernel2 \ + task-pandora-core-nowifi \ " -# Make sure we install all kernel modules with the Pandora images -RRECOMMENDS_${PN} += "kernel-modules" - PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes/tasks/task-pandora-xfce-jap.bb b/recipes/tasks/task-pandora-xfce-nowifi.bb similarity index 100% rename from recipes/tasks/task-pandora-xfce-jap.bb rename to recipes/tasks/task-pandora-xfce-nowifi.bb diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb index 632b75b..0bbb03e 100755 --- a/recipes/tasks/task-pandora-xfce.bb +++ b/recipes/tasks/task-pandora-xfce.bb @@ -1,341 +1,18 @@ -DESCRIPTION = "Task file for the XFCE Pandora image" +DESCRIPTION = "Task file for the XFCE Pandora image incl. Wifi" # Don't forget to bump the PR if you change it. -PR = "r72" +PR = "r73" 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-task-xfce-nowifi \ pandora-scripts-wifi \ - pandora-wallpaper-official \ - pandora-xfce-defaults \ -# pandora-midori-defaults midori \ - libgles2d \ - pandora-misc \ - pandora-pndstore \ - pandora-configtray \ pandora-configtray-wifi \ " - -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 \ -" - 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 \ " -- 2.39.2