From b5b8f7fe92200ea3027c4675ff164e8e403fff67 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Fri, 7 Apr 2017 14:59:32 +0200 Subject: tdx-extra.inc: renamed from trdx-extra.inc While at it also reflect changed name of tdx-nv-binaries. Signed-off-by: Marcel Ziswiler Acked-by: Dominik Sliwa --- recipes-images/images/angstrom-lxde-image.bb | 2 +- recipes-images/images/angstrom-qt-x11-image.bb | 2 +- recipes-images/images/angstrom-qt5-x11-image.bb | 2 +- recipes-images/images/console-trdx-image.bb | 2 +- recipes-images/images/qt4e-demo-image.bb | 2 +- recipes-images/images/tdx-extra.inc | 199 ++++++++++++++++++++++++ recipes-images/images/trdx-extra.inc | 199 ------------------------ 7 files changed, 204 insertions(+), 204 deletions(-) create mode 100644 recipes-images/images/tdx-extra.inc delete mode 100644 recipes-images/images/trdx-extra.inc (limited to 'recipes-images') diff --git a/recipes-images/images/angstrom-lxde-image.bb b/recipes-images/images/angstrom-lxde-image.bb index 33a62bf..4866e36 100644 --- a/recipes-images/images/angstrom-lxde-image.bb +++ b/recipes-images/images/angstrom-lxde-image.bb @@ -250,7 +250,7 @@ IMAGE_INSTALL += " \ ${IMAGE_BROWSER} \ " require recipes-images/images/lx.inc -require recipes-images/images/trdx-extra.inc +require recipes-images/images/tdx-extra.inc IMAGE_DEV_MANAGER = "udev" IMAGE_INIT_MANAGER = "systemd" diff --git a/recipes-images/images/angstrom-qt-x11-image.bb b/recipes-images/images/angstrom-qt-x11-image.bb index ada83c1..fcccc70 100644 --- a/recipes-images/images/angstrom-qt-x11-image.bb +++ b/recipes-images/images/angstrom-qt-x11-image.bb @@ -249,7 +249,7 @@ IMAGE_INSTALL += " \ alsa-states \ " -require recipes-images/images/trdx-extra.inc +require recipes-images/images/tdx-extra.inc IMAGE_DEV_MANAGER = "udev" IMAGE_INIT_MANAGER = "systemd" diff --git a/recipes-images/images/angstrom-qt5-x11-image.bb b/recipes-images/images/angstrom-qt5-x11-image.bb index b3578fc..706ff5e 100644 --- a/recipes-images/images/angstrom-qt5-x11-image.bb +++ b/recipes-images/images/angstrom-qt5-x11-image.bb @@ -225,7 +225,7 @@ IMAGE_INSTALL += " \ alsa-states \ " -require recipes-images/images/trdx-extra.inc +require recipes-images/images/tdx-extra.inc IMAGE_DEV_MANAGER = "udev" IMAGE_INIT_MANAGER = "systemd" diff --git a/recipes-images/images/console-trdx-image.bb b/recipes-images/images/console-trdx-image.bb index 1e196d6..1c7d6b0 100644 --- a/recipes-images/images/console-trdx-image.bb +++ b/recipes-images/images/console-trdx-image.bb @@ -52,7 +52,7 @@ IMAGE_INSTALL += " \ packagegroup-base-extended \ " -require recipes-images/images/trdx-extra.inc +require recipes-images/images/tdx-extra.inc IMAGE_DEV_MANAGER = "udev" IMAGE_INIT_MANAGER = "systemd" diff --git a/recipes-images/images/qt4e-demo-image.bb b/recipes-images/images/qt4e-demo-image.bb index c851c67..034978b 100644 --- a/recipes-images/images/qt4e-demo-image.bb +++ b/recipes-images/images/qt4e-demo-image.bb @@ -51,7 +51,7 @@ IMAGE_INSTALL += " \ alsa-states \ " -require recipes-images/images/trdx-extra.inc +require recipes-images/images/tdx-extra.inc IMAGE_DEV_MANAGER = "udev" IMAGE_INIT_MANAGER = "systemd" diff --git a/recipes-images/images/tdx-extra.inc b/recipes-images/images/tdx-extra.inc new file mode 100644 index 0000000..a2cbb69 --- /dev/null +++ b/recipes-images/images/tdx-extra.inc @@ -0,0 +1,199 @@ +#additional packages to include in our Toradex images + +# Copy Licenses to image /usr/share/common-licenses, on vybrid for flash size reasons only the manifest +COPY_LIC_MANIFEST ?= "1" +#Bug with several MACHINES build, license files for all arch packages stored wrongly +COPY_LIC_DIRS ?= "0" +COPY_LIC_DIRS_colibri-vf = "0" + +#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-${TARGET_ARCH}" + +#create the file /etc/timestamp +IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp" + +IMAGE_INSTALL_append_tegra = " \ + u-boot-toradex-fw-utils \ + tegrastats \ + tdx-nv-binaries \ + tdx-nv-binaries-nv-gstapps \ + tdx-nv-binaries-restricted-codecs \ + usb-rndis-systemd \ + hdmi-hotplug \ + \ + curl \ + file \ + aspell \ + kernel-modules \ +" + +IMAGE_INSTALL_append_tegra3 = " \ + fs-init \ + e2fsprogs \ + e2fsprogs-mke2fs \ + e2fsprogs-resize2fs \ + e2fsprogs-tune2fs \ + nv-conf-systemd \ +" + +IMAGE_INSTALL_append_tegra124 = " \ + aspell \ + canutils \ + curl \ + e2fsprogs \ + e2fsprogs-mke2fs \ + e2fsprogs-tune2fs \ + file \ + fs-init \ + hdmi-hotplug \ + kernel-modules \ + linuxptp \ + lvds-tegra124 \ + pciutils \ + ptpd \ + tegrastats \ + u-boot-toradex-fw-utils \ + usb-rndis-systemd \ +" +IMAGE_INSTALL_append_tegra124m = " \ + aspell \ + canutils \ + curl \ + e2fsprogs \ + e2fsprogs-mke2fs \ + e2fsprogs-tune2fs \ + file \ + fs-init \ + hdmi-hotplug \ + kernel-modules \ + linuxptp \ + lvds-tegra124 \ + pciutils \ + ptpd \ + u-boot-toradex-fw-utils \ +" + +IMAGE_INSTALL_append_apalis-t30 = " \ + linuxptp \ + pciutils \ + ptpd \ + iproute2 \ + canutils \ + lvds-ctrl \ +" + +IMAGE_INSTALL_append_colibri-t20 = " \ + mtd-utils-ubifs \ +" + +#note that the kernel-modules meta package gets installed from +#meta-fsl-arm/conf/machine/include/imx-base.inc +IMAGE_INSTALL_append_mx6 = " \ + libusbgx \ + linuxptp \ + gpio-export \ + curl \ + file \ + aspell \ + ptpd \ + iproute2 \ + canutils \ + fs-init \ + e2fsprogs \ + e2fsprogs-mke2fs \ + e2fsprogs-resize2fs \ + e2fsprogs-tune2fs \ + mimetypes \ +" + +IMAGE_INSTALL_append_apalis-imx6 = " \ + u-boot-toradex-fsl-fw-utils \ +" +IMAGE_INSTALL_append_colibri-imx6 = " \ + u-boot-toradex-fsl-fw-utils \ +" + +#note that the kernel-modules meta package gets installed from +#meta-fsl-arm/conf/machine/include/imx-base.inc +IMAGE_INSTALL_append_apalis-imx6 = " \ + pciutils \ +" + +IMAGE_INSTALL_append_vf = " \ + linuxptp \ + libusbgx \ + ptpd \ + iproute2 \ + canutils \ + mtd-utils-ubifs \ + kernel-modules \ + usb-suspend-resume \ +" + +IMAGE_INSTALL_append_colibri-vf = " \ + u-boot-toradex-fsl-fw-utils \ +" + +IMAGE_INSTALL_append_mx7 = " \ + linuxptp \ + libusbgx \ + curl \ + file \ + aspell \ + ptpd \ + iproute2 \ + canutils \ + mtd-utils-ubifs \ +" + +IMAGE_INSTALL_append_colibri-imx7 = " \ + u-boot-toradex-fsl-fw-utils \ +" + +IMAGE_INSTALL += " \ + crda \ + linux-firmware-ralink \ + linux-firmware-rtl8192cu \ + \ + alsa-utils \ + alsa-utils-aplay \ + alsa-utils-amixer \ + \ + sqlite3 \ + \ + curl \ + nfs-utils-client \ + openssh-scp \ + openssh-sftp \ + \ + bzip2 \ + gdbserver \ + grep \ + joe \ + minicom \ + ldd \ + lsof \ + mtd-utils \ + dosfstools \ + util-linux-fstrim \ + \ + devmem2 \ + evtest \ + hdparm \ + iperf \ + iperf3 \ + i2c-tools \ + memtester \ + mmc-utils-cos \ + rt-tests \ + stress \ + lmbench \ + nbench-byte \ + tinymembench \ + ethtool \ + \ + tdx-oak-sensors \ +" diff --git a/recipes-images/images/trdx-extra.inc b/recipes-images/images/trdx-extra.inc deleted file mode 100644 index 1044c7b..0000000 --- a/recipes-images/images/trdx-extra.inc +++ /dev/null @@ -1,199 +0,0 @@ -#additional packages to include in our Toradex images - -# Copy Licenses to image /usr/share/common-licenses, on vybrid for flash size reasons only the manifest -COPY_LIC_MANIFEST ?= "1" -#Bug with several MACHINES build, license files for all arch packages stored wrongly -COPY_LIC_DIRS ?= "0" -COPY_LIC_DIRS_colibri-vf = "0" - -#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-${TARGET_ARCH}" - -#create the file /etc/timestamp -IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp" - -IMAGE_INSTALL_append_tegra = " \ - u-boot-toradex-fw-utils \ - tegrastats \ - trdx-nv-binaries \ - trdx-nv-binaries-nv-gstapps \ - trdx-nv-binaries-restricted-codecs \ - usb-rndis-systemd \ - hdmi-hotplug \ - \ - curl \ - file \ - aspell \ - kernel-modules \ -" - -IMAGE_INSTALL_append_tegra3 = " \ - fs-init \ - e2fsprogs \ - e2fsprogs-mke2fs \ - e2fsprogs-resize2fs \ - e2fsprogs-tune2fs \ - nv-conf-systemd \ -" - -IMAGE_INSTALL_append_tegra124 = " \ - aspell \ - canutils \ - curl \ - e2fsprogs \ - e2fsprogs-mke2fs \ - e2fsprogs-tune2fs \ - file \ - fs-init \ - hdmi-hotplug \ - kernel-modules \ - linuxptp \ - lvds-tegra124 \ - pciutils \ - ptpd \ - tegrastats \ - u-boot-toradex-fw-utils \ - usb-rndis-systemd \ -" -IMAGE_INSTALL_append_tegra124m = " \ - aspell \ - canutils \ - curl \ - e2fsprogs \ - e2fsprogs-mke2fs \ - e2fsprogs-tune2fs \ - file \ - fs-init \ - hdmi-hotplug \ - kernel-modules \ - linuxptp \ - lvds-tegra124 \ - pciutils \ - ptpd \ - u-boot-toradex-fw-utils \ -" - -IMAGE_INSTALL_append_apalis-t30 = " \ - linuxptp \ - pciutils \ - ptpd \ - iproute2 \ - canutils \ - lvds-ctrl \ -" - -IMAGE_INSTALL_append_colibri-t20 = " \ - mtd-utils-ubifs \ -" - -#note that the kernel-modules meta package gets installed from -#meta-fsl-arm/conf/machine/include/imx-base.inc -IMAGE_INSTALL_append_mx6 = " \ - libusbgx \ - linuxptp \ - gpio-export \ - curl \ - file \ - aspell \ - ptpd \ - iproute2 \ - canutils \ - fs-init \ - e2fsprogs \ - e2fsprogs-mke2fs \ - e2fsprogs-resize2fs \ - e2fsprogs-tune2fs \ - mimetypes \ -" - -IMAGE_INSTALL_append_apalis-imx6 = " \ - u-boot-toradex-fsl-fw-utils \ -" -IMAGE_INSTALL_append_colibri-imx6 = " \ - u-boot-toradex-fsl-fw-utils \ -" - -#note that the kernel-modules meta package gets installed from -#meta-fsl-arm/conf/machine/include/imx-base.inc -IMAGE_INSTALL_append_apalis-imx6 = " \ - pciutils \ -" - -IMAGE_INSTALL_append_vf = " \ - linuxptp \ - libusbgx \ - ptpd \ - iproute2 \ - canutils \ - mtd-utils-ubifs \ - kernel-modules \ - usb-suspend-resume \ -" - -IMAGE_INSTALL_append_colibri-vf = " \ - u-boot-toradex-fsl-fw-utils \ -" - -IMAGE_INSTALL_append_mx7 = " \ - linuxptp \ - libusbgx \ - curl \ - file \ - aspell \ - ptpd \ - iproute2 \ - canutils \ - mtd-utils-ubifs \ -" - -IMAGE_INSTALL_append_colibri-imx7 = " \ - u-boot-toradex-fsl-fw-utils \ -" - -IMAGE_INSTALL += " \ - crda \ - linux-firmware-ralink \ - linux-firmware-rtl8192cu \ - \ - alsa-utils \ - alsa-utils-aplay \ - alsa-utils-amixer \ - \ - sqlite3 \ - \ - curl \ - nfs-utils-client \ - openssh-scp \ - openssh-sftp \ - \ - bzip2 \ - gdbserver \ - grep \ - joe \ - minicom \ - ldd \ - lsof \ - mtd-utils \ - dosfstools \ - util-linux-fstrim \ - \ - devmem2 \ - evtest \ - hdparm \ - iperf \ - iperf3 \ - i2c-tools \ - memtester \ - mmc-utils-cos \ - rt-tests \ - stress \ - lmbench \ - nbench-byte \ - tinymembench \ - ethtool \ - \ - tdx-oak-sensors \ -" -- cgit v1.2.3