From 066142017317e55a3666c98de77eb701d4105508 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 7 Apr 2017 15:02:49 +0200 Subject: console-tdx-image: renamed from console-trdx-image Signed-off-by: Marcel Ziswiler Acked-by: Dominik Sliwa --- buildconf/export | 2 +- recipes-images/images/console-tdx-image.bb | 62 +++++++++++++++++++++++++++++ recipes-images/images/console-trdx-image.bb | 62 ----------------------------- 3 files changed, 63 insertions(+), 63 deletions(-) create mode 100644 recipes-images/images/console-tdx-image.bb delete mode 100644 recipes-images/images/console-trdx-image.bb diff --git a/buildconf/export b/buildconf/export index 5ee67ef..ca13ba1 100644 --- a/buildconf/export +++ b/buildconf/export @@ -12,7 +12,7 @@ fi echo "" echo "Toradex targets are:" echo " angstrom-lxde-image" -echo " console-trdx-image" +echo " console-tdx-image" echo " angstrom-qt-x11-image" if [ $FIRST_TIME -eq 1 ]; then diff --git a/recipes-images/images/console-tdx-image.bb b/recipes-images/images/console-tdx-image.bb new file mode 100644 index 0000000..2a562bc --- /dev/null +++ b/recipes-images/images/console-tdx-image.bb @@ -0,0 +1,62 @@ +SUMMARY = "Toradex Embedded Linux Console Demo" + +LICENSE = "MIT" + +PV = "${TDX_VER_INT}" + +#start of the resulting deployable tarball name +export IMAGE_BASENAME = "Console-Image" +IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" +IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}" +IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}" +IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}" +IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}" +IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" +IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" +IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}" +IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}" +IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}" +IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" + +SYSTEMD_DEFAULT_TARGET = "graphical.target" + +#create the deployment directory-tree +require recipes-images/images/tdx-image-fstype.inc + +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)}' + +CONMANPKGS ?= "connman connman-systemd connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" +CONMANPKGS_libc-uclibc = "" + +#don't install some id databases +#BAD_RECOMMENDATIONS_append_colibri-vf += " udev-hwdb cpufrequtils " + +#deploy the X server for the tegras +#this adds a few MB to the image, but all graphical HW acceleration is +#available only on top of X, this is not required for nouveau based build. +IMAGE_INSTALL_append_tegra = " ${XSERVER} xterm xclock" +IMAGE_INSTALL_append_tegra124 = " ${XSERVER} xterm xclock" + +IMAGE_INSTALL += " \ + angstrom-packagegroup-boot \ + packagegroup-basic \ + udev-extra-rules \ + ${CONMANPKGS} \ + ${ROOTFS_PKGMANAGE_PKGS} \ + timestamp-service \ + packagegroup-base-extended \ +" + +require recipes-images/images/tdx-extra.inc + +IMAGE_DEV_MANAGER = "udev" +IMAGE_INIT_MANAGER = "systemd" +IMAGE_INITSCRIPTS = " " +IMAGE_LOGIN_MANAGER = "busybox shadow" + +inherit image diff --git a/recipes-images/images/console-trdx-image.bb b/recipes-images/images/console-trdx-image.bb deleted file mode 100644 index 2a562bc..0000000 --- a/recipes-images/images/console-trdx-image.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Toradex Embedded Linux Console Demo" - -LICENSE = "MIT" - -PV = "${TDX_VER_INT}" - -#start of the resulting deployable tarball name -export IMAGE_BASENAME = "Console-Image" -IMAGE_NAME_apalis-imx6 = "Apalis-iMX6_${IMAGE_BASENAME}" -IMAGE_NAME_apalis-t30 = "Apalis-T30_${IMAGE_BASENAME}" -IMAGE_NAME_apalis-tk1 = "Apalis-TK1_${IMAGE_BASENAME}" -IMAGE_NAME_apalis-tk1-mainline = "Apalis-TK1-Mainline_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx6 = "Colibri-iMX6_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-imx7 = "Colibri-iMX7_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-pxa = "Colibri-PXA_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t20 = "Colibri-T20_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-t30 = "Colibri-T30_${IMAGE_BASENAME}" -IMAGE_NAME_colibri-vf = "Colibri-VF_${IMAGE_BASENAME}" -IMAGE_NAME = "${MACHINE}_${IMAGE_BASENAME}" - -SYSTEMD_DEFAULT_TARGET = "graphical.target" - -#create the deployment directory-tree -require recipes-images/images/tdx-image-fstype.inc - -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)}' - -CONMANPKGS ?= "connman connman-systemd connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" -CONMANPKGS_libc-uclibc = "" - -#don't install some id databases -#BAD_RECOMMENDATIONS_append_colibri-vf += " udev-hwdb cpufrequtils " - -#deploy the X server for the tegras -#this adds a few MB to the image, but all graphical HW acceleration is -#available only on top of X, this is not required for nouveau based build. -IMAGE_INSTALL_append_tegra = " ${XSERVER} xterm xclock" -IMAGE_INSTALL_append_tegra124 = " ${XSERVER} xterm xclock" - -IMAGE_INSTALL += " \ - angstrom-packagegroup-boot \ - packagegroup-basic \ - udev-extra-rules \ - ${CONMANPKGS} \ - ${ROOTFS_PKGMANAGE_PKGS} \ - timestamp-service \ - packagegroup-base-extended \ -" - -require recipes-images/images/tdx-extra.inc - -IMAGE_DEV_MANAGER = "udev" -IMAGE_INIT_MANAGER = "systemd" -IMAGE_INITSCRIPTS = " " -IMAGE_LOGIN_MANAGER = "busybox shadow" - -inherit image -- cgit v1.2.3