From 755d6f51d10293a03d850db927052df35f42e23c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 15 Aug 2012 18:11:34 +0200 Subject: L4T R15, oe-core Image V2.0Beta1 --- recipes/base-files/base-files_3.0.14.bbappend | 5 ++--- recipes/images/angstrom-lxde-image.bb | 31 +++++++++++++++++---------- recipes/images/console-trdx-image.bb | 11 ++++++++-- recipes/images/trdx-extra.inc | 1 + recipes/images/trdx-image-fstype.inc | 26 ++++++++++++++++++++++ 5 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 recipes/images/trdx-image-fstype.inc (limited to 'recipes') diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend index ca35824..6772d6b 100644 --- a/recipes/base-files/base-files_3.0.14.bbappend +++ b/recipes/base-files/base-files_3.0.14.bbappend @@ -1,4 +1,3 @@ -PRINC = "3" +PRINC = "4" -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb index f875074..fc936db 100644 --- a/recipes/images/angstrom-lxde-image.bb +++ b/recipes/images/angstrom-lxde-image.bb @@ -4,7 +4,11 @@ DESCRIPTION = "Image based on the LXDE desktop" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r1" +PV = "V2.0" +PR = "r3" + +#create the deployment directory-tree +require trdx-image-fstype.inc #create the file /etc/timestamp IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp" @@ -18,19 +22,19 @@ IMAGE_LINGUAS = "en-us" #MAYBE WE WILL NEED THESE ALSO: # xorg-minimal-fonts xserver-xorg-multimedia-modules xserver-xorg-utils -IMAGE_SPLASH = "psplash-angstrom" -PREFERRED_PROVIDER_psplash-support = "psplash-angstrom" -PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom" - DISTRO_UPDATE_ALTERNATIVES ??= "" ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' -CONMANPKGS = "" -#CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-gnome" +#CONMANPKGS = "" +CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-gnome" CONMANPKGS_libc-uclibc = "" DEPENDS += "gst-plugins-good gst-plugins-bad gst-plugins-ugly" +#deploy the OpenGL ES headers to the sysroot +DEPENDS += "nvsamples" + + # Additional X libs not pulled in by any package \ # xtrans libxevie \ @@ -68,8 +72,10 @@ zeroconf \ IMAGE_INSTALL += " \ ${IMAGE_INSTALL_CLASSIC} \ + virtual-psplash \ angstrom-task-boot \ task-basic \ + udev-extra-rules \ ${CONMANPKGS} \ ${ROOTFS_PKGMANAGE_PKGS} \ timestamp-service \ @@ -86,7 +92,6 @@ IMAGE_INSTALL += " \ xhost \ xset \ \ - ${IMAGE_SPLASH} \ ${XSERVER} \ xrandr \ xrdb \ @@ -113,6 +118,7 @@ IMAGE_INSTALL += " \ gst-plugins-base-theora \ gst-plugins-base-videotestsrc \ gst-plugins-base-vorbis \ + gst-plugins-good-isomp4 \ gst-plugins-good-matroska \ gst-plugins-good-rtp \ gst-plugins-good-udp \ @@ -121,12 +127,15 @@ IMAGE_INSTALL += " \ gst-plugins-good-wavparse \ gst-plugins-ugly-asf \ libpcre \ + libpcreposix \ libxcomposite \ - firefox \ - flash-plugins \ + alsa-states \ " -# gst-plugin-qtdemux +# firefox at the moment segfaults +# firefox \ +# flash-plugins \ + # gst-plugin-mpegdemux require lx.inc diff --git a/recipes/images/console-trdx-image.bb b/recipes/images/console-trdx-image.bb index 5531579..5425dc9 100644 --- a/recipes/images/console-trdx-image.bb +++ b/recipes/images/console-trdx-image.bb @@ -4,11 +4,17 @@ DESCRIPTION = "Image booting to a console" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" +PV = "ConsoleV2.0" +PR = "r3" + +#create the deployment directory-tree +require trdx-image-fstype.inc + #create the file /etc/timestamp IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp" #IMAGE_LINGUAS = "" -#IMAGE_LINGUAS = "en-us" +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; ' @@ -17,7 +23,8 @@ ZZAPSPLASH = ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "", DISTRO_UPDATE_ALTERNATIVES ??= "" ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' -CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd" +CONMANPKGS = "" +#CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd connman-gnome" CONMANPKGS_libc-uclibc = "" diff --git a/recipes/images/trdx-extra.inc b/recipes/images/trdx-extra.inc index ed0c367..6058ffc 100644 --- a/recipes/images/trdx-extra.inc +++ b/recipes/images/trdx-extra.inc @@ -29,6 +29,7 @@ IMAGE_INSTALL += " \ joe \ minicom \ ldd \ + lsof \ mtd-utils \ update-modules \ \ diff --git a/recipes/images/trdx-image-fstype.inc b/recipes/images/trdx-image-fstype.inc new file mode 100644 index 0000000..2ffb8f4 --- /dev/null +++ b/recipes/images/trdx-image-fstype.inc @@ -0,0 +1,26 @@ +#create the deployment directory-tree + +BURNFLASH := "${THISDIR}/files/burnflash.tar.bz2" +S = "${WORKDIR}/burnflash" +IMAGE_ROOTFS = "${WORKDIR}/T20_LinuxImage${PV}/rootfs" + +do_rootfs_prepend() { + tar -C ${WORKDIR} -xf ${BURNFLASH} + mkdir -p ${IMAGE_ROOTFS} + cp -pPr ${S}/* ${IMAGE_ROOTFS}/../ +} + +do_rootfs_append() { + # put u-boot, kernel into the bin directories, remove the kernel from the rootfs/boot + rm ${IMAGE_ROOTFS}/boot/uImage* + cp -pP ${DEPLOY_DIR_IMAGE}/uImage* ${IMAGE_ROOTFS}/../bin/ + mv ${IMAGE_ROOTFS}/../bin/uImage-${MACHINE}.bin ${IMAGE_ROOTFS}/../bin/uImage + + cp -pP ${DEPLOY_DIR_IMAGE}/u-boot* ${IMAGE_ROOTFS}/../bin/ + rm ${IMAGE_ROOTFS}/../bin/u-boot-hsmmc-${MACHINE}.bin + mv ${IMAGE_ROOTFS}/../bin/u-boot-${MACHINE}.bin ${IMAGE_ROOTFS}/../bin/u-boot.bin + + #create tarball + DATE=`date +%Y%m%d` + cd ${WORKDIR}; tar -cjvf ${DEPLOY_DIR_IMAGE}/T20_LinuxImage${PV}_${DATE}.tar.bz2 T20_LinuxImage${PV} +} -- cgit v1.2.3