summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2013-10-10 18:50:58 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2013-10-10 18:50:58 +0200
commitafdbf1da36adc445da552337f04b0b3ec54f7219 (patch)
tree9508b4eba24d70e01053c284c424d574d162126f /recipes
parenta2cd09d30816dd1142767dde895fc3b53ed52684 (diff)
images: cleanup, add colibri-vfxx module
- Add optimizations needed for the Colibri VFxx modules - Move common stuff to trdx-extra.inc, /etc/timestamp, CAN utils - Cleanup whitespace and commented stuff - Split out gstreamer packages, don't add them on Colibri VFxx angstrom-lxde-image: - Browser for Colibri VFxx is midori for size reasons console-image: - don't add X11 for Colibri VFxx
Diffstat (limited to 'recipes')
-rw-r--r--recipes/images/angstrom-lxde-image.bb203
-rw-r--r--recipes/images/angstrom-qt-x11-image.bb244
-rw-r--r--recipes/images/console-trdx-image.bb47
-rw-r--r--recipes/images/trdx-extra.inc34
4 files changed, 271 insertions, 257 deletions
diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb
index d1792f2..0744fda 100644
--- a/recipes/images/angstrom-lxde-image.bb
+++ b/recipes/images/angstrom-lxde-image.bb
@@ -12,31 +12,24 @@ IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxImage"
IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxImage"
IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxImage"
IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage"
+IMAGE_NAME_colibri-vf50 = "Colibri_VF50_LinuxImage"
+IMAGE_NAME_colibri-vf61 = "Colibri_VF61_LinuxImage"
IMAGE_NAME = "${MACHINE}_LinuxImage"
#create the deployment directory-tree
require trdx-image-fstype.inc
-#create the file /etc/timestamp
-IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
-
#remove interfering sysv scripts, connman systemd service
ROOTFS_POSTINSTALL_COMMAND = "for i in ${IMAGE_ROOTFS}/etc/rc0.d ${IMAGE_ROOTFS}/etc/rc1.d ${IMAGE_ROOTFS}/etc/rc2.d ${IMAGE_ROOTFS}/etc/rc3.d ${IMAGE_ROOTFS}/etc/rc4.d ${IMAGE_ROOTFS}/etc/rc5.d ${IMAGE_ROOTFS}/etc/rc6.d ${IMAGE_ROOTFS}/etc/rcS.d ; do rm -f $i/*dropbear $i/*avahi-daemon $i/*dbus-1 $i/*lxdm $i/*ntpd $i/*syslog $i/*ofono $i/*alsa-state $i/*networking $i/*udev-late-mount $i/*sendsigs $i/*save-rtc.sh $i/*umountnfs.sh $i/*portmap $i/*umountfs $i/*halt $i/*rmnologin.sh $i/*reboot; rm -f $i/*banner.sh $i/*sysfs.sh $i/*checkroot.sh $i/*alignment.sh $i/*mountall.sh $i/*populate-volatile.sh $i/*devpts.sh $i/*hostname.sh $i/*portmap $i/*mountnfs.sh $i/*bootmisc.sh ; done"
-#IMAGE_LINGUAS = ""
IMAGE_LINGUAS = "en-us"
#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
-#IMAGE_FEATURES += "package-management ssh-server-dropbear"
-
-#MAYBE WE WILL NEED THESE ALSO:
-# xorg-minimal-fonts xserver-xorg-multimedia-modules xserver-xorg-utils
DISTRO_UPDATE_ALTERNATIVES ??= ""
ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES} update-alternatives-cworth", d)}'
-#CONMANPKGS = ""
-CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client connman-gnome"
+CONMANPKGS ?= "connman connman-systemd connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client connman-gnome"
CONMANPKGS_libc-uclibc = ""
DEPENDS += "gst-plugins-good gst-plugins-bad gst-plugins-ugly"
@@ -44,111 +37,107 @@ DEPENDS += "gst-plugins-good gst-plugins-bad gst-plugins-ugly"
#deploy the OpenGL ES headers to the sysroot
DEPENDS_tegra += "nvsamples"
-#build some ipk which are needed together with CAN, but do not yet install them
-DEPENDS += "canutils libsocketcan iproute2"
+IMAGE_BROWSER = "firefox"
+#keep the rootfs size small
+IMAGE_BROWSER_colibri-vf50 = "midori"
-# Additional X libs not pulled in by any package
-# xtrans libxevie
+# this recommends from midori pulls in 8Meg of icons
+BAD_RECOMMENDATIONS += " gnome-icon-theme "
+#don't install some id databases
+BAD_RECOMMENDATIONS_VF_colibri_vf += " udev-hwdb "
+BAD_RECOMMENDATIONS += " ${BAD_RECOMMENDATIONS_VF} "
# this would pull in a large amount of gst-plugins, we only add a selected few
-# gst-plugins-base-meta
-# gst-plugins-good-meta
-# gst-plugins-bad-meta
-# gst-ffmpeg
-
-# needed by nvidia commandline player
-# libpcre
-
-# these were in the oe classic image
-IMAGE_INSTALL_CLASSIC = " \
-gconf \
-gnome-vfs \
-gnome-vfs-plugin-file \
-gvfs \
-gvfsd-trash \
-xdg-utils \
-xvinfo \
-\
-file \
-initscripts \
-libgsf \
-polkit-gnome \
-libwnck \
-libxres \
-makedevs \
-mime-support \
-xcursor-transparent-theme \
-zeroconf \
+# gst-plugins-base-meta
+# gst-plugins-good-meta
+# gst-plugins-bad-meta
+# gst-ffmpeg
+GSTREAMER = " \
+ gstreamer \
+ gst-plugins-base \
+ gst-plugins-base-alsa \
+ gst-plugins-base-audioconvert \
+ gst-plugins-base-audioresample \
+ gst-plugins-base-audiotestsrc \
+ gst-plugins-base-decodebin \
+ gst-plugins-base-decodebin2 \
+ gst-plugins-base-playbin \
+ gst-plugins-base-typefindfunctions \
+ gst-plugins-base-ivorbisdec \
+ gst-plugins-base-ogg \
+ gst-plugins-base-theora \
+ gst-plugins-base-videotestsrc \
+ gst-plugins-base-vorbis \
+ gst-plugins-good-audioparsers \
+ gst-plugins-good-autodetect \
+ gst-plugins-good-avi \
+ gst-plugins-good-deinterlace \
+ gst-plugins-good-id3demux \
+ gst-plugins-good-isomp4 \
+ gst-plugins-good-matroska \
+ gst-plugins-good-rtp \
+ gst-plugins-good-udp \
+ gst-plugins-good-video4linux2 \
+ gst-plugins-good-wavenc \
+ gst-plugins-good-wavparse \
+ gst-plugins-ugly-asf \
"
+GSTREAMER_colibri-vf50 = ""
IMAGE_INSTALL += " \
- ${IMAGE_INSTALL_CLASSIC} \
- angstrom-packagegroup-boot \
- task-basic \
- udev-extra-rules \
- ${CONMANPKGS} \
- ${ROOTFS_PKGMANAGE_PKGS} \
- timestamp-service \
- task-base-extended \
- ${XSERVER} \
- xserver-common \
- xserver-xorg-extension-dbe \
- xserver-xorg-extension-extmod \
- xserver-xorg-extension-extmod \
- xauth \
- xhost \
- xset \
- setxkbmap \
- \
- xrandr \
- xrdb \
- xorg-minimal-fonts xserver-xorg-multimedia-modules xserver-xorg-utils \
- scrot \
- \
- libxdamage libxvmc libxinerama \
- libxcursor \
- \
- florence \
- bash \
- tinylogin \
- \
- gstreamer \
- gst-plugins-base \
- gst-plugins-base-alsa \
- gst-plugins-base-audioconvert \
- gst-plugins-base-audioresample \
- gst-plugins-base-audiotestsrc \
- gst-plugins-base-decodebin \
- gst-plugins-base-decodebin2 \
- gst-plugins-base-playbin \
- gst-plugins-base-typefindfunctions \
- gst-plugins-base-ivorbisdec \
- gst-plugins-base-ogg \
- gst-plugins-base-theora \
- gst-plugins-base-videotestsrc \
- gst-plugins-base-vorbis \
- gst-plugins-good-audioparsers \
- gst-plugins-good-avi \
- gst-plugins-good-deinterlace \
- gst-plugins-good-id3demux \
- gst-plugins-good-isomp4 \
- gst-plugins-good-matroska \
- gst-plugins-good-rtp \
- gst-plugins-good-udp \
- gst-plugins-good-video4linux2 \
- gst-plugins-good-wavenc \
- gst-plugins-good-wavparse \
- gst-plugins-ugly-asf \
- v4l-utils \
- libpcre \
- libpcreposix \
- libxcomposite \
- alsa-states \
- firefox \
+ gconf \
+ gnome-vfs \
+ gnome-vfs-plugin-file \
+ gvfs \
+ gvfsd-trash \
+ xdg-utils \
+ xvinfo \
+ \
+ initscripts \
+ libgsf \
+ polkit-gnome \
+ libwnck \
+ libxres \
+ makedevs \
+ mime-support \
+ xcursor-transparent-theme \
+ zeroconf \
+ angstrom-packagegroup-boot \
+ task-basic \
+ udev-extra-rules \
+ ${CONMANPKGS} \
+ ${ROOTFS_PKGMANAGE_PKGS} \
+ timestamp-service \
+ task-base-extended \
+ ${XSERVER} \
+ xserver-common \
+ xserver-xorg-extension-dbe \
+ xserver-xorg-extension-extmod \
+ xauth \
+ xhost \
+ xset \
+ setxkbmap \
+ \
+ xrdb \
+ xorg-minimal-fonts xserver-xorg-multimedia-modules xserver-xorg-utils \
+ scrot \
+ \
+ libxdamage libxvmc libxinerama \
+ libxcursor \
+ \
+ florence \
+ bash \
+ tinylogin \
+ \
+ ${GSTREAMER} \
+ v4l-utils \
+ libpcre \
+ libpcreposix \
+ libxcomposite \
+ alsa-states \
+ ${IMAGE_BROWSER} \
"
-# gst-plugin-mpegdemux
-
require lx.inc
require trdx-extra.inc
diff --git a/recipes/images/angstrom-qt-x11-image.bb b/recipes/images/angstrom-qt-x11-image.bb
index 1bb2cc0..565c1ca 100644
--- a/recipes/images/angstrom-qt-x11-image.bb
+++ b/recipes/images/angstrom-qt-x11-image.bb
@@ -11,25 +11,23 @@ PR = "r3"
IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxImage-qt"
IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxImage-qt"
IMAGE_NAME_apalis-t30 = "ApalisT30_LinuxImage-qt"
-IMAGE_NAME_colibri-pxa = "PXA_LinuxImage-qt"
+IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage-qt"
IMAGE_NAME = "${MACHINE}_LinuxImage-qt"
#create the deployment directory-tree
require trdx-image-fstype.inc
-#create the file /etc/timestamp
-IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
-
#remove interfering sysv scripts, connman systemd service
ROOTFS_POSTINSTALL_COMMAND = "for i in ${IMAGE_ROOTFS}/etc/rc0.d ${IMAGE_ROOTFS}/etc/rc1.d ${IMAGE_ROOTFS}/etc/rc2.d ${IMAGE_ROOTFS}/etc/rc3.d ${IMAGE_ROOTFS}/etc/rc4.d ${IMAGE_ROOTFS}/etc/rc5.d ${IMAGE_ROOTFS}/etc/rc6.d ${IMAGE_ROOTFS}/etc/rcS.d ; do rm -f $i/*dropbear $i/*avahi-daemon $i/*dbus-1 $i/*lxdm $i/*ntpd $i/*syslog $i/*ofono $i/*alsa-state $i/*networking $i/*udev-late-mount $i/*sendsigs $i/*save-rtc.sh $i/*umountnfs.sh $i/*portmap $i/*umountfs $i/*halt $i/*rmnologin.sh $i/*reboot; rm -f $i/*banner.sh $i/*sysfs.sh $i/*checkroot.sh $i/*alignment.sh $i/*mountall.sh $i/*populate-volatile.sh $i/*devpts.sh $i/*hostname.sh $i/*portmap $i/*mountnfs.sh $i/*bootmisc.sh ; done"
-#IMAGE_LINGUAS = ""
IMAGE_LINGUAS = "en-us"
+#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
+#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
DISTRO_UPDATE_ALTERNATIVES ??= ""
-ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}'
+ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES} update-alternatives-cworth", d)}'
-CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi"
+CONMANPKGS ?= "connman connman-systemd connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client connman-gnome"
CONMANPKGS_libc-uclibc = ""
DEPENDS += "gst-plugins-good gst-plugins-bad gst-plugins-ugly"
@@ -37,131 +35,129 @@ DEPENDS += "gst-plugins-good gst-plugins-bad gst-plugins-ugly"
#deploy the OpenGL ES headers to the sysroot
DEPENDS_tegra += "nvsamples"
-#build some ipk which are needed together with CAN, but do not yet install them
-DEPENDS += "canutils libsocketcan iproute2"
+#don't install some id databases
+BAD_RECOMMENDATIONS_VF_colibri_vf += " udev-hwdb "
+BAD_RECOMMENDATIONS += " ${BAD_RECOMMENDATIONS_VF} "
# this would pull in a large amount of gst-plugins, we only add a selected few
-# gst-plugins-base-meta
-# gst-plugins-good-meta
-# gst-plugins-bad-meta
-# gst-ffmpeg
-
-# needed by nvidia commandline player
-# libpcre
-
-# these were in the oe classic image
-IMAGE_INSTALL_CLASSIC = " \
-xdg-utils \
-xvinfo \
-\
-file \
-initscripts \
-libgsf \
-polkit-gnome \
-libwnck \
-libxres \
-makedevs \
-mime-support \
-zeroconf \
+# gst-plugins-base-meta
+# gst-plugins-good-meta
+# gst-plugins-bad-meta
+# gst-ffmpeg
+GSTREAMER = " \
+ gstreamer \
+ gst-plugins-base \
+ gst-plugins-base-alsa \
+ gst-plugins-base-audioconvert \
+ gst-plugins-base-audioresample \
+ gst-plugins-base-audiotestsrc \
+ gst-plugins-base-decodebin \
+ gst-plugins-base-decodebin2 \
+ gst-plugins-base-playbin \
+ gst-plugins-base-typefindfunctions \
+ gst-plugins-base-ivorbisdec \
+ gst-plugins-base-ogg \
+ gst-plugins-base-theora \
+ gst-plugins-base-videotestsrc \
+ gst-plugins-base-vorbis \
+ gst-plugins-good-audioparsers \
+ gst-plugins-good-autodetect \
+ gst-plugins-good-avi \
+ gst-plugins-good-deinterlace \
+ gst-plugins-good-id3demux \
+ gst-plugins-good-isomp4 \
+ gst-plugins-good-matroska \
+ gst-plugins-good-rtp \
+ gst-plugins-good-udp \
+ gst-plugins-good-video4linux2 \
+ gst-plugins-good-wavenc \
+ gst-plugins-good-wavparse \
+ gst-plugins-ugly-asf \
"
IMAGE_INSTALL_QT4 = " \
- qt4-x11-free \
- qt4-xmlpatterns \
- libqt3support4 \
- libqtclucene4 \
- libqtcore4 \
- libqtdbus4 \
- libqtgui4 \
- libqthelp4 \
- libqtmultimedia4 \
- libqtnetwork4 \
- libqtscript4 \
- libqtscripttools4 \
- libqtsql4 \
- libqtsvg4 \
- libqttest4 \
- libqtwebkit4 \
- libqtxml4 \
- qt4-plugin-iconengine-svgicon \
- qt4-plugin-imageformat-gif \
- qt4-plugin-imageformat-ico \
- qt4-plugin-imageformat-jpeg \
- qt4-plugin-imageformat-mng \
- qt4-plugin-imageformat-svg \
- qt4-plugin-imageformat-tga \
- qt4-plugin-imageformat-tiff \
- qt4-plugin-phonon-backend-gstreamer \
- qt4-plugin-script-dbus \
- qt4-plugin-sqldriver-sqlite \
- qt4-demos \
- qt4-x11-free-systemd \
- qt4-examples \
- qt4-assistant \
- icu \
+ qt4-x11-free \
+ qt4-xmlpatterns \
+ libqt3support4 \
+ libqtclucene4 \
+ libqtcore4 \
+ libqtdbus4 \
+ libqtgui4 \
+ libqthelp4 \
+ libqtmultimedia4 \
+ libqtnetwork4 \
+ libqtscript4 \
+ libqtscripttools4 \
+ libqtsql4 \
+ libqtsvg4 \
+ libqttest4 \
+ libqtwebkit4 \
+ libqtxml4 \
+ qt4-plugin-iconengine-svgicon \
+ qt4-plugin-imageformat-gif \
+ qt4-plugin-imageformat-ico \
+ qt4-plugin-imageformat-jpeg \
+ qt4-plugin-imageformat-mng \
+ qt4-plugin-imageformat-svg \
+ qt4-plugin-imageformat-tga \
+ qt4-plugin-imageformat-tiff \
+ qt4-plugin-phonon-backend-gstreamer \
+ qt4-plugin-script-dbus \
+ qt4-plugin-sqldriver-sqlite \
+ qt4-demos \
+ qt4-x11-free-systemd \
+ qt4-examples \
+ qt4-assistant \
+ icu \
"
IMAGE_INSTALL += " \
- ${IMAGE_INSTALL_QT4} \
- ${IMAGE_INSTALL_CLASSIC} \
- angstrom-packagegroup-boot \
- task-basic \
- udev-extra-rules \
- ${CONMANPKGS} \
- ${ROOTFS_PKGMANAGE_PKGS} \
- timestamp-service \
- task-base-extended \
- ${XSERVER} \
- xserver-common \
- xserver-xorg-extension-dbe \
- xserver-xorg-extension-extmod \
- xserver-xorg-extension-extmod \
- xauth \
- xhost \
- xset \
- setxkbmap \
- \
- xrandr \
- xrdb \
- xorg-minimal-fonts xserver-xorg-multimedia-modules xserver-xorg-utils \
- \
- libxdamage libxvmc libxinerama \
- libxcursor \
- \
- bash \
- tinylogin \
- \
- gstreamer \
- gst-plugins-base \
- gst-plugins-base-alsa \
- gst-plugins-base-audioconvert \
- gst-plugins-base-audioresample \
- gst-plugins-base-audiotestsrc \
- gst-plugins-base-decodebin \
- gst-plugins-base-decodebin2 \
- gst-plugins-base-playbin \
- gst-plugins-base-typefindfunctions \
- gst-plugins-base-ivorbisdec \
- gst-plugins-base-ogg \
- gst-plugins-base-theora \
- gst-plugins-base-videotestsrc \
- gst-plugins-base-vorbis \
- gst-plugins-good-audioparsers \
- gst-plugins-good-autodetect \
- gst-plugins-good-avi \
- gst-plugins-good-id3demux \
- gst-plugins-good-isomp4 \
- gst-plugins-good-matroska \
- gst-plugins-good-rtp \
- gst-plugins-good-udp \
- gst-plugins-good-video4linux2 \
- gst-plugins-good-wavenc \
- gst-plugins-good-wavparse \
- gst-plugins-ugly-asf \
- libpcre \
- libpcreposix \
- libxcomposite \
- alsa-states \
+ ${IMAGE_INSTALL_QT4} \
+ \
+ xdg-utils \
+ xvinfo \
+ \
+ initscripts \
+ libgsf \
+ polkit-gnome \
+ libwnck \
+ libxres \
+ makedevs \
+ mime-support \
+ xcursor-transparent-theme \
+ zeroconf \
+ angstrom-packagegroup-boot \
+ task-basic \
+ udev-extra-rules \
+ ${CONMANPKGS} \
+ ${ROOTFS_PKGMANAGE_PKGS} \
+ timestamp-service \
+ task-base-extended \
+ ${XSERVER} \
+ xserver-common \
+ xserver-xorg-extension-dbe \
+ xserver-xorg-extension-extmod \
+ xauth \
+ xhost \
+ xset \
+ setxkbmap \
+ \
+ xrdb \
+ xorg-minimal-fonts xserver-xorg-multimedia-modules xserver-xorg-utils \
+ scrot \
+ \
+ libxdamage libxvmc libxinerama \
+ libxcursor \
+ \
+ bash \
+ tinylogin \
+ \
+ ${GSTREAMER} \
+ v4l-utils \
+ libpcre \
+ libpcreposix \
+ libxcomposite \
+ alsa-states \
"
require trdx-extra.inc
diff --git a/recipes/images/console-trdx-image.bb b/recipes/images/console-trdx-image.bb
index 1fd0dce..d7c4013 100644
--- a/recipes/images/console-trdx-image.bb
+++ b/recipes/images/console-trdx-image.bb
@@ -1,55 +1,56 @@
#Angstrom image
DESCRIPTION = "Image booting to a console"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+
+PV = "V2.1"
+PR = "r4"
+
#start of the resulting deployable tarball name
IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxConsoleImage"
IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxConsoleImage"
IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxConsoleImage"
IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxConsoleImage"
+IMAGE_NAME_colibri-vf50 = "Colibri_VF50_LinuxConsoleImage"
+IMAGE_NAME_colibri-vf61 = "Colibri_VF61_LinuxConsoleImage"
IMAGE_NAME = "${MACHINE}_LinuxConsoleImage"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-PV = "V2.1"
-PR = "r3"
-
#create the deployment directory-tree
require trdx-image-fstype.inc
-#create the file /etc/timestamp
-IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
-
#remove interfering sysv scripts, connman systemd service
ROOTFS_POSTINSTALL_COMMAND = "for i in ${IMAGE_ROOTFS}/etc/rc0.d ${IMAGE_ROOTFS}/etc/rc1.d ${IMAGE_ROOTFS}/etc/rc2.d ${IMAGE_ROOTFS}/etc/rc3.d ${IMAGE_ROOTFS}/etc/rc4.d ${IMAGE_ROOTFS}/etc/rc5.d ${IMAGE_ROOTFS}/etc/rc6.d ${IMAGE_ROOTFS}/etc/rcS.d ; do rm -f $i/*dropbear $i/*avahi-daemon $i/*dbus-1 $i/*lxdm $i/*ntpd $i/*syslog $i/*ofono $i/*alsa-state $i/*networking $i/*udev-late-mount $i/*sendsigs $i/*save-rtc.sh $i/*umountnfs.sh $i/*portmap $i/*umountfs $i/*halt $i/*rmnologin.sh $i/*reboot; rm -f $i/*banner.sh $i/*sysfs.sh $i/*checkroot.sh $i/*alignment.sh $i/*mountall.sh $i/*populate-volatile.sh $i/*devpts.sh $i/*hostname.sh $i/*portmap $i/*mountnfs.sh $i/*bootmisc.sh ; done"
-#IMAGE_LINGUAS = ""
IMAGE_LINGUAS = "en-us"
#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in"
#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; '
DISTRO_UPDATE_ALTERNATIVES ??= ""
-ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}'
+ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES} update-alternatives-cworth", d)}'
CONMANPKGS = ""
-#CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-gnome"
+#CONMANPKGS ?= "connman connman-systemd connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-client"
CONMANPKGS_libc-uclibc = ""
-#build some ipk which are needed together with CAN, but do not yet install them
-DEPENDS += "canutils libsocketcan iproute2"
+#don't install some id databases
+BAD_RECOMMENDATIONS += " udev-hwdb "
+
+#this adds a few MB to the image
+IMAGE_INSTALL_T20_T30_tegra += "${XSERVER} xterm xclock"
IMAGE_INSTALL += " \
- angstrom-packagegroup-boot \
- task-basic \
- udev-extra-rules \
- ${CONMANPKGS} \
- ${ROOTFS_PKGMANAGE_PKGS} \
- timestamp-service \
- task-base-extended \
- ${XSERVER} xterm xclock \
- file \
+ angstrom-packagegroup-boot \
+ task-basic \
+ udev-extra-rules \
+ ${CONMANPKGS} \
+ ${ROOTFS_PKGMANAGE_PKGS} \
+ timestamp-service \
+ task-base-extended \
+ ${IMAGE_INSTALL_T20_T30} \
"
+
require trdx-extra.inc
IMAGE_DEV_MANAGER = "udev"
diff --git a/recipes/images/trdx-extra.inc b/recipes/images/trdx-extra.inc
index 1e4f67f..0b6bac1 100644
--- a/recipes/images/trdx-extra.inc
+++ b/recipes/images/trdx-extra.inc
@@ -1,17 +1,44 @@
#additional packages to include in our Toradex images
+# Copy Licenses to image /usr/share/common-licenses, on tegra with individual licenses
+COPY_LIC_MANIFEST = "1"
+COPY_LIC_DIRS_tegra = "1"
+
+#build some ipk which are needed together with CAN, but do not yet install them
+DEPENDS += "canutils libsocketcan iproute2"
+
#the following builds cross gdb and gdbserver
DEPENDS += "gdb-cross"
+# angstrom and oe-core disagree on the format
+rootfs_update_timestamp_classic () {
+ date -u +%2m%2d%2H%2M%4Y >${IMAGE_ROOTFS}/etc/timestamp
+}
+#create the file /etc/timestamp
+IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp_classic"
+
IMAGE_INSTALL_T20_T30 = " \
gpioconfig \
tegrastats \
trdx-nv-binaries \
trdx-nv-binaries-nv-gstapps \
trdx-nv-binaries-restricted-codecs \
+ usb-rndis-systemd \
+ \
+ curl \
+ file \
+ aspell \
"
-IMAGE_INSTALL_MACHINE_colibri-t20 = "${IMAGE_INSTALL_T20_T30}"
+IMAGE_INSTALL_VF = " \
+ iproute2 \
+ canutils \
+ mtd-utils-ubifs \
+"
+
+IMAGE_INSTALL_MACHINE_colibri-t20 = "${IMAGE_INSTALL_T20_T30} \
+ u-boot-fw-utils \
+"
IMAGE_INSTALL_MACHINE_colibri-t30 = "${IMAGE_INSTALL_T20_T30} \
fs-init \
@@ -30,19 +57,20 @@ IMAGE_INSTALL_MACHINE_apalis-t30 = "${IMAGE_INSTALL_T20_T30} \
kernel-module-videobuf2-memops \
"
+IMAGE_INSTALL_MACHINE_colibri-vf50 = "${IMAGE_INSTALL_VF}"
+
+IMAGE_INSTALL_MACHINE_colibri-vf61 = "${IMAGE_INSTALL_VF}"
IMAGE_INSTALL_MACHINE = ""
IMAGE_INSTALL += " \
max9526-i2c \
linux-firmware-ralink \
- usb-rndis-systemd \
\
alsa-utils \
alsa-utils-aplay \
alsa-utils-amixer \
\
- aspell \
consolekit \
sqlite3 \
\