diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-03-29 15:43:15 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-03-31 10:27:53 +0000 |
| commit | b0061b9fc37e18b81b231eb05215e53736d9a710 (patch) | |
| tree | bcded56b80a8d7d20bca853872c1e9b21475e362 /meta-renesas-extras | |
| parent | bd776cb94282d10ece0c31762c909ae56f86b2c9 (diff) | |
Remove support for Renesas R-Car H2 targets
H2 targets no longer build with morty branch and will be
replaced with H3.
Change-Id: Ibc6e60d4965537cffdc143801fb4ba32db7ffaee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-renesas-extras')
36 files changed, 0 insertions, 1444 deletions
diff --git a/meta-renesas-extras/classes/renesas-module.bbclass b/meta-renesas-extras/classes/renesas-module.bbclass deleted file mode 100644 index a0b50148..00000000 --- a/meta-renesas-extras/classes/renesas-module.bbclass +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -### Unfortunately the kernel module recipes in meta-renesas/meta-rcar-gen2 -### are fairly broken, as they tend to install their include files into the -### staging area. That breaks when recompiling the kernel and is just flaky -### in general. Try to make things work reliably. - -inherit module -addtask shared_workdir after do_compile - -EXTRA_OEMAKE += "ARCH=${ARCH}" - -export BUILDDIR = "${STAGING_DIR_HOST}" -export LIBSHARED = "${STAGING_LIBDIR}" -export KERNELSRC = "${STAGING_KERNEL_DIR}" -export CROSS_COMPILE = "${TARGET_PREFIX}" -export KERNELDIR = "${STAGING_KERNEL_BUILDDIR}" -export LDFLAGS = "" -export CP = "cp" - -MODULE_SOURCE_DIR ?= "${S}/drv/" - -do_compile() { - cd ${MODULE_SOURCE_DIR} - module_do_compile - cd - -} - -deploy_build_deps() { - targetdir="$1" - - install -d ${targetdir}/include - install ${MODULE_SOURCE_DIR}/Module.symvers $targetdir/include/${MODULE_NAME}.symvers - - for header in ${MODULE_HEADERS} ; do - install -t ${targetdir}/include ${S}/${header} - done -} - -do_shared_workdir () { - deploy_build_deps ${STAGING_KERNEL_BUILDDIR} -} - -do_install() { - install -D ${MODULE_SOURCE_DIR}/${MODULE_NAME}${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/extra/${MODULE_NAME}${KERNEL_OBJECT_SUFFIX} - deploy_build_deps ${D}/usr/src/kernel -} - -FILES_${PN}-dev = " \ - /usr/src/kernel/include/${MODULE_NAME}.symvers \ - /usr/src/kernel/include/*.h \ -" diff --git a/meta-renesas-extras/conf/layer.conf b/meta-renesas-extras/conf/layer.conf deleted file mode 100644 index 4ad824cd..00000000 --- a/meta-renesas-extras/conf/layer.conf +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -# We have a conf and classes directory, append to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ - ${LAYERDIR}/recipes*/*/*.bbappend \ - " - -BBFILE_COLLECTIONS += "b2qt_renesas" -BBFILE_PATTERN_b2qt_renesas := "^${LAYERDIR}/" -BBFILE_PRIORITY_b2qt_renesas = "20" diff --git a/meta-renesas-extras/recipes/adbd/adbd.bbappend b/meta-renesas-extras/recipes/adbd/adbd.bbappend deleted file mode 100644 index 6f7a3f5c..00000000 --- a/meta-renesas-extras/recipes/adbd/adbd.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" diff --git a/meta-renesas-extras/recipes/adbd/files/defaults b/meta-renesas-extras/recipes/adbd/files/defaults deleted file mode 100644 index d2a3cc0a..00000000 --- a/meta-renesas-extras/recipes/adbd/files/defaults +++ /dev/null @@ -1,4 +0,0 @@ -VENDOR=0x18d1 -PRODUCT=0x0000 -SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) -USE_ETHERNET=no diff --git a/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bb b/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bb deleted file mode 100755 index 6b48c831..00000000 --- a/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bb +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "\ -file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ -file://include/GPL-COPYING;md5=ffa10f40b98be2c2bc9608f56827ed23 \ -file://include/MIT-COPYING;md5=5526ef6e21dc96a1dd89fac4bde9f995 \ -" - -DEPENDS = "mmngr-kernel-module" -SRC_URI = "file://fdpm-kernel.tar.bz2" -S = "${WORKDIR}/fdpm" - -do_configure[depends] += "mmngr-kernel-module:do_shared_workdir" - -inherit renesas-module - -FDPM_CFG_r8a7790 = "H2CONFIG" -FDPM_CFG_r8a7791 = "M2CONFIG" -FDPM_CFG_r8a7793 = "M2CONFIG" -FDPM_CFG_r8a7794 = "E2CONFIG" - -MODULE_NAME = "fdpm" -MODULE_HEADERS = "include/fdpm_drv.h include/fdpm_public.h include/fdpm_api.h" - -do_compile_prepend() { - export FDPM_CONFIG=${FDPM_CFG} - export FDPM_MMNGRDIR=${STAGING_KERNEL_BUILDDIR}/include - export FDPM_MMNGRSYMVERS=mmngr.symvers -} diff --git a/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bbappend b/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bbappend deleted file mode 100644 index 4ffe8692..00000000 --- a/meta-renesas-extras/recipes/fdpm-module/fdpm-kernel-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/fdpm-module/files:" diff --git a/meta-renesas-extras/recipes/fdpm-module/fdpm-user-module.bbappend b/meta-renesas-extras/recipes/fdpm-module/fdpm-user-module.bbappend deleted file mode 100644 index 1704972f..00000000 --- a/meta-renesas-extras/recipes/fdpm-module/fdpm-user-module.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -do_compile[depends] += "\ - fdpm-kernel-module:do_shared_workdir \ - mmngr-kernel-module:do_shared_workdir" diff --git a/meta-renesas-extras/recipes/glibc/glibc_%.bbappend b/meta-renesas-extras/recipes/glibc/glibc_%.bbappend deleted file mode 100644 index e0d6c926..00000000 --- a/meta-renesas-extras/recipes/glibc/glibc_%.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -do_install_append() { - echo "/usr/local/lib" >> ${D}${sysconfdir}/ld.so.conf -} diff --git a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch deleted file mode 100644 index bc36d702..00000000 --- a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 54bba228ea52d01fd84941d97be23c03f9862b64 Mon Sep 17 00:00:00 2001 -From: Carlos Rafael Giani <dv@pseudoterminal.org> -Date: Sat, 6 Apr 2013 01:22:22 +0200 -Subject: [PATCH] Disable yasm for libav when --disable-yasm - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Shane Wang <shane.wang@intel.com> -Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 22ede88..ef3c050 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -305,6 +305,12 @@ else - emblibav_configure_args="$emblibav_configure_args --enable-gpl" - fi - -+ AC_ARG_ENABLE(yasm, -+ [AC_HELP_STRING([--disable-yasm], [disable use of yasm assembler])]) -+ if test "x$enable_yasm" = "xno"; then -+ emblibav_configure_args="$emblibav_configure_args --disable-yasm" -+ fi -+ - # if we are cross-compiling, tell libav so - case $host in - *android*) --- -1.8.2 - - diff --git a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav_1.2.3.bb b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav_1.2.3.bb deleted file mode 100644 index cfa9a669..00000000 --- a/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-libav_1.2.3.bb +++ /dev/null @@ -1,27 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -include recipes-multimedia/gstreamer/gstreamer1.0-libav.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ - file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \ - file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \ - file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \ - file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02" - -SRC_URI = " \ - http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \ - file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \ - " -SRC_URI[md5sum] = "58c7998a054d8d8ca041fa35738f72b6" -SRC_URI[sha256sum] = "ebc7fbe10955f40df6ccc4bf689075e7e296205fc7ecd8ff383d43c5cdf5bcd6" -LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \ - --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \ - --ranlib='${RANLIB}' \ - ${GSTREAMER_1_0_DEBUG}" - -S = "${WORKDIR}/gst-libav-${PV}" - - diff --git a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend b/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend deleted file mode 100644 index 2aec751a..00000000 --- a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -COMPATIBLE_MACHINE = "" - -FILESEXTRAPATHS_prepend := "${THISDIR}/../linux/linux-renesas:" - -SRC_URI += " \ - file://0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch \ - " diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch b/meta-renesas-extras/recipes/linux/linux-renesas/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch deleted file mode 100644 index b495d393..00000000 --- a/meta-renesas-extras/recipes/linux/linux-renesas/0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 57254b6ebce4ceca02d9c8b615f6059c56c19238 Mon Sep 17 00:00:00 2001 -From: Jan Schmidt <list.btrfs@jan-o-sch.net> -Date: Mon, 6 May 2013 19:14:17 +0000 -Subject: [PATCH] Btrfs: add ioctl to wait for qgroup rescan completion - -btrfs_qgroup_wait_for_completion waits until the currently running qgroup -operation completes. It returns immediately when no rescan process is in -progress. This is useful to automate things around the rescan process (e.g. -testing). - -Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net> -Signed-off-by: Josef Bacik <jbacik@fusionio.com> ---- - fs/btrfs/ctree.h | 2 ++ - fs/btrfs/ioctl.c | 12 ++++++++++++ - fs/btrfs/qgroup.c | 21 +++++++++++++++++++++ - include/uapi/linux/btrfs.h | 1 + - 4 files changed, 36 insertions(+) - -diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h -index a365400..e36e97b 100644 ---- a/fs/btrfs/ctree.h -+++ b/fs/btrfs/ctree.h -@@ -1613,6 +1613,7 @@ struct btrfs_fs_info { - struct mutex qgroup_rescan_lock; /* protects the progress item */ - struct btrfs_key qgroup_rescan_progress; - struct btrfs_workers qgroup_rescan_workers; -+ struct completion qgroup_rescan_completion; - - /* filesystem state */ - unsigned long fs_state; -@@ -3820,6 +3821,7 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans, - int btrfs_quota_disable(struct btrfs_trans_handle *trans, - struct btrfs_fs_info *fs_info); - int btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info); -+int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info); - int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, - struct btrfs_fs_info *fs_info, u64 src, u64 dst); - int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, -diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c -index 0f81d67..1e0dda1 100644 ---- a/fs/btrfs/ioctl.c -+++ b/fs/btrfs/ioctl.c -@@ -3937,6 +3937,16 @@ static long btrfs_ioctl_quota_rescan_status(struct file *file, void __user *arg) - return ret; - } - -+static long btrfs_ioctl_quota_rescan_wait(struct file *file, void __user *arg) -+{ -+ struct btrfs_root *root = BTRFS_I(fdentry(file)->d_inode)->root; -+ -+ if (!capable(CAP_SYS_ADMIN)) -+ return -EPERM; -+ -+ return btrfs_qgroup_wait_for_completion(root->fs_info); -+} -+ - static long btrfs_ioctl_set_received_subvol(struct file *file, - void __user *arg) - { -@@ -4179,6 +4189,8 @@ long btrfs_ioctl(struct file *file, unsigned int - return btrfs_ioctl_quota_rescan(file, argp); - case BTRFS_IOC_QUOTA_RESCAN_STATUS: - return btrfs_ioctl_quota_rescan_status(file, argp); -+ case BTRFS_IOC_QUOTA_RESCAN_WAIT: -+ return btrfs_ioctl_quota_rescan_wait(file, argp); - case BTRFS_IOC_DEV_REPLACE: - return btrfs_ioctl_dev_replace(root, argp); - case BTRFS_IOC_GET_FSLABEL: -diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c -index 7f38cce..d059d86 100644 ---- a/fs/btrfs/qgroup.c -+++ b/fs/btrfs/qgroup.c -@@ -2070,6 +2070,8 @@ out: - } else { - pr_err("btrfs: qgroup scan failed with %d\n", err); - } -+ -+ complete_all(&fs_info->qgroup_rescan_completion); - } - - static void -@@ -2110,6 +2112,7 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info) - fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_RESCAN; - memset(&fs_info->qgroup_rescan_progress, 0, - sizeof(fs_info->qgroup_rescan_progress)); -+ init_completion(&fs_info->qgroup_rescan_completion); - - /* clear all current qgroup tracking information */ - for (n = rb_first(&fs_info->qgroup_tree); n; n = rb_next(n)) { -@@ -2126,3 +2129,21 @@ btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info) - - return 0; - } -+ -+int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info) -+{ -+ int running; -+ int ret = 0; -+ -+ mutex_lock(&fs_info->qgroup_rescan_lock); -+ spin_lock(&fs_info->qgroup_lock); -+ running = fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN; -+ spin_unlock(&fs_info->qgroup_lock); -+ mutex_unlock(&fs_info->qgroup_rescan_lock); -+ -+ if (running) -+ ret = wait_for_completion_interruptible( -+ &fs_info->qgroup_rescan_completion); -+ -+ return ret; -+} -diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h -index 5ef0df5..5b683b5 100644 ---- a/include/uapi/linux/btrfs.h -+++ b/include/uapi/linux/btrfs.h -@@ -530,6 +530,7 @@ struct btrfs_ioctl_send_args { - struct btrfs_ioctl_quota_rescan_args) - #define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \ - struct btrfs_ioctl_quota_rescan_args) -+#define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46) - #define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \ - char[BTRFS_LABEL_SIZE]) - #define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \ diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg b/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg deleted file mode 100644 index 1c60d894..00000000 --- a/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg +++ /dev/null @@ -1,89 +0,0 @@ -# Drivers -CONFIG_USB_RCAR_PHY=m -CONFIG_USB_RCAR_GEN2_PHY=m -CONFIG_USB_RENESAS_USBHS=m -CONFIG_USB_RENESAS_USBHS_HCD=y -CONFIG_USB_RENESAS_USBHS_UDC=y -CONFIG_USB_OTG=y - -# FunctionFS for adb -CONFIG_USB_FUNCTIONFS=m -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_ETH=y - -# Enable USB serial support -CONFIG_USB_SERIAL=m -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_ACM=m - -# ConfigFS -CONFIG_USB_CONFIGFS=m -CONFIG_USB_CONFIGFS_SERIAL=y -CONFIG_USB_CONFIGFS_ACM=y -CONFIG_USB_CONFIGFS_OBEX=y -CONFIG_USB_CONFIGFS_NCM=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_ECM_SUBSET=y -CONFIG_USB_CONFIGFS_RNDIS=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_LB_SS=y -CONFIG_USB_CONFIGFS_F_FS=y - -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_G_NCM=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_MASS_STORAGE=m - -# Newer inits like systemd need cgroup support -CONFIG_CGROUP_SCHED=y -CONFIG_CGROUPS=y -CONFIG_CGROUP_NS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y -CONFIG_CPUSETS=y -CONFIG_PROC_PID_CPUSET=y -CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y - -# Bluetooth bits -CONFIG_BT_HIDP=y -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_RFKILL=m - -CONFIG_FHANDLE=y -CONFIG_USB_NAMESPACES=m - -# HID support -CONFIG_HID=m -CONFIG_HID_BATTERY_STRENGTH=y -CONFIG_HIDRAW=y -CONFIG_UHID=m -CONFIG_HID_GENERIC=m - -# USB HID support -CONFIG_USB_HID=m -CONFIG_HID_PID=y -CONFIG_USB_HIDDEV=y - -# needed for USB touchscreens -CONFIG_HID_MULTITOUCH=y - -# additional configs needed for Genivi compliance -CONFIG_EXPERIMENTAL=y -CONFIG_ECRYPT_FS=y -CONFIG_QUOTA=y -CONFIG_BT=y - -# add uinput for automated testing -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y - diff --git a/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend b/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend deleted file mode 100644 index 03098460..00000000 --- a/meta-renesas-extras/recipes/linux/linux-renesas_3.10%.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://b2qt.cfg \ - file://0001-Btrfs-add-ioctl-to-wait-for-qgroup-rescan-completion.patch \ - " diff --git a/meta-renesas-extras/recipes/mesa/mesa_%.bbappend b/meta-renesas-extras/recipes/mesa/mesa_%.bbappend deleted file mode 100644 index 0dd030a5..00000000 --- a/meta-renesas-extras/recipes/mesa/mesa_%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -PROVIDES_remove = "virtual/libgles2 virtual/egl libgbm libgbm-dev" diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bb b/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bb deleted file mode 100755 index b21afe42..00000000 --- a/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bb +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "\ -file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ -file://include/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -file://include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ -" - -SRC_URI = "file://mmngr.tar.bz2" -S = "${WORKDIR}/mmngr" - -inherit renesas-module - -MODULE_NAME = "mmngr" -MODULE_HEADERS = "include/mmngr_public.h include/mmngr_private.h" - -MMNGR_CFG_r8a7790 = "MMNGR_LAGER" -MMNGR_CFG_r8a7791 = "MMNGR_KOELSCH" -MMNGR_CFG_r8a7793 = "MMNGR_GOSE" -MMNGR_CFG_r8a7794 = "MMNGR_ALT" - -do_compile_prepend() { - export MMNGR_CONFIG=${MMNGR_CFG} - export MMNGR_SSP_CONFIG="MMNGR_SSP_DISABLE" -} diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bbappend deleted file mode 100644 index 23815b71..00000000 --- a/meta-renesas-extras/recipes/mmngr-module/mmngr-kernel-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/mmngr-module/files:" diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngr-user-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngr-user-module.bbappend deleted file mode 100644 index 411da42c..00000000 --- a/meta-renesas-extras/recipes/mmngr-module/mmngr-user-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -do_compile[depends] += "mmngr-kernel-module:do_shared_workdir" diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bb b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bb deleted file mode 100755 index 46718d40..00000000 --- a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bb +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -LICENSE = "GPLv2 & MIT" -SRC_URI = "file://mmngrbuf.tar.bz2" -LIC_FILES_CHKSUM = "file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ - file://include/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 " - -inherit renesas-module - -S = "${WORKDIR}/mmngrbuf" - -MODULE_NAME = "mmngrbuf" diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bbappend deleted file mode 100644 index 23815b71..00000000 --- a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-kernel-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/mmngr-module/files:" diff --git a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-user-module.bbappend b/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-user-module.bbappend deleted file mode 100644 index 840e770b..00000000 --- a/meta-renesas-extras/recipes/mmngr-module/mmngrbuf-user-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -do_compile[depends] += "mmngrbuf-kernel-module:do_shared_workdir" diff --git a/meta-renesas-extras/recipes/omx-module/omx-user-module.bbappend b/meta-renesas-extras/recipes/omx-module/omx-user-module.bbappend deleted file mode 100644 index 995d265e..00000000 --- a/meta-renesas-extras/recipes/omx-module/omx-user-module.bbappend +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -# The recipe adds an unpack_append where it creates the folder, but by then -# base.bbclass will have reported a non-existent directory warning. -do_unpack_prepend() { - bb.utils.mkdirhier(d.getVar('S', True)) -} - -do_configure[depends] += "\ - mmngr-kernel-module:do_shared_workdir \ - vspm-kernel-module:do_shared_workdir \ - s3ctl-kernel-module:do_shared_workdir \ - fdpm-kernel-module:do_shared_workdir \ - uvcs-kernel-module:do_shared_workdir" diff --git a/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch b/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch deleted file mode 100644 index af414ad3..00000000 --- a/meta-renesas-extras/recipes/qt5/qt3d/0001-Remove-qgltf.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9966e10f36876daa910ce301a175633771470e82 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@theqtcompany.com> -Date: Wed, 18 Nov 2015 10:14:18 +0200 -Subject: [PATCH] Remove qgltf - -assimp does not compile for ARM because of GCC bug -(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66964) - -Task-number: QTBUG-49153 ---- - tools/tools.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/tools.pro b/tools/tools.pro -index 09c7d8e..8f093ce 100644 ---- a/tools/tools.pro -+++ b/tools/tools.pro -@@ -1,3 +1,3 @@ - TEMPLATE = subdirs --!android:SUBDIRS += qgltf -+#!android:SUBDIRS += qgltf - qgltf.CONFIG += host_build diff --git a/meta-renesas-extras/recipes/qt5/qt3d_git.bbappend b/meta-renesas-extras/recipes/qt5/qt3d_git.bbappend deleted file mode 100644 index d32d0e6f..00000000 --- a/meta-renesas-extras/recipes/qt5/qt3d_git.bbappend +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI_append_class-target = " \ - file://0001-Remove-qgltf.patch \ - " diff --git a/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend b/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend deleted file mode 100644 index 8770c65d..00000000 --- a/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -PACKAGECONFIG += "kms" diff --git a/meta-renesas-extras/recipes/qt5/qtwayland_git.bbappend b/meta-renesas-extras/recipes/qt5/qtwayland_git.bbappend deleted file mode 100644 index f35b662d..00000000 --- a/meta-renesas-extras/recipes/qt5/qtwayland_git.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -DEPENDS_append_class-target = " virtual/mesa" diff --git a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bb b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bb deleted file mode 100755 index 6ff2fb81..00000000 --- a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bb +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378" -SRC_URI = "file://s3ctl-kernel.tar.bz2" - -S = "${WORKDIR}/s3ctl" - -inherit renesas-module - -MODULE_NAME = "s3ctl" -MODULE_HEADERS = "include/s3ctl_private.h" diff --git a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bbappend b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bbappend deleted file mode 100644 index 38f22a8d..00000000 --- a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-kernel-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/s3ctl-module/files:" diff --git a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-user-module.bbappend b/meta-renesas-extras/recipes/s3ctl-module/s3ctl-user-module.bbappend deleted file mode 100644 index 51b2f429..00000000 --- a/meta-renesas-extras/recipes/s3ctl-module/s3ctl-user-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -do_compile[depends] += "s3ctl-kernel-module:do_shared_workdir" diff --git a/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bb b/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bb deleted file mode 100755 index 0fe9aad3..00000000 --- a/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bb +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "\ -file://include/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -file://include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ -" - -SRC_URI = "file://uvcs-kernel.tar.bz2" -S = "${WORKDIR}/uvcs" - -inherit renesas-module - -export UVCS_DRV_SRC_DIR = "${S}/source/uvcs_lkm" -export UVCS_CMN_SRC_DIR = "${S}/source/uvcs_cmn" -export UVCS_CMN_INC_DIR = "${S}/include" -export DRV_CORE_SRC_DIR = "${S}/source/driver_core" - -MODULE_NAME = "uvcs_cmn" -MODULE_HEADERS = "include/uvcs_cmn.h include/uvcs_types.h" -MODULE_SOURCE_DIR = "${S}/source/makefile/linaro_4_7_3/" diff --git a/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bbappend b/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bbappend deleted file mode 100644 index f491bc13..00000000 --- a/meta-renesas-extras/recipes/uvcs-module/uvcs-kernel-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/uvcs-module/files:" diff --git a/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bb b/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bb deleted file mode 100755 index ff20028a..00000000 --- a/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bb +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = " \ -file://GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -file://MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ -" - -SRC_URI = " \ - git://github.com/renesas-devel/vsp2driver.git;protocol=git;branch=RCAR-GEN2/1.0.0 \ - file://vsp2drv-init \ -" -SRCREV = "8cc362a6c961661e4655904f8d7731e501529d6c" -S = "${WORKDIR}/git" - -DEPENDS = "vspm-kernel-module" -do_configure[depends] += "vspm-kernel-module:do_shared_workdir" - -MODULE_NAME = "vsp2" -INITSCRIPT_NAME = "vsp2drv" -INITSCRIPT_PARAMS = "start 8 5 2 . stop 61 0 1 6 ." - -inherit renesas-module update-rc.d - -do_compile_prepend() { - export VSP2_VSPMDIR=${STAGING_KERNEL_BUILDDIR}/include - export VSP2_VSPMSYMVERS=vspm.symvers -} - -do_install_append() { - install -D -m 0755 ${WORKDIR}/vsp2drv-init ${D}/${sysconfdir}/init.d/vsp2drv -} - -FILES_${PN} += "/etc/init.d/vsp2drv" diff --git a/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bbappend b/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bbappend deleted file mode 100644 index 509317af..00000000 --- a/meta-renesas-extras/recipes/vspm-module/vsp2-kernel-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/vspm-module/files:" diff --git a/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bb b/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bb deleted file mode 100755 index 05518fab..00000000 --- a/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bb +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -LICENSE = "GPLv2 & MIT" -LIC_FILES_CHKSUM = "\ -file://drv/GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -file://drv/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ -" - -SRC_URI = "file://vspm-kernel.tar.bz2" -S = "${WORKDIR}/vspm" - -inherit renesas-module - -MODULE_NAME = "vspm" -MODULE_HEADERS = " \ -include/vspm_public.h \ -include/vsp_drv.h \ -include/tddmac_drv.h \ -include/vspm_if.h \ -" - -VSPM_CFG_r8a7790 = "H2CONFIG" -VSPM_CFG_r8a7791 = "M2CONFIG" -VSPM_CFG_r8a7793 = "M2CONFIG" -VSPM_CFG_r8a7794 = "E2CONFIG" - -do_compile_prepend() { - export VSPM_CONFIG=${VSPM_CFG} -} - -do_install_append() { - # Copy for vspm-user-module - install -t ${STAGING_INCDIR} ${S}/include/vspm_if.h -} - -FILES_${PN}-dev += "/usr/include/vspm_if.h" diff --git a/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bbappend b/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bbappend deleted file mode 100644 index 509317af..00000000 --- a/meta-renesas-extras/recipes/vspm-module/vspm-kernel-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-renesas/meta-rcar-gen2/recipes-kernel/vspm-module/files:" diff --git a/meta-renesas-extras/recipes/vspm-module/vspm-user-module.bbappend b/meta-renesas-extras/recipes/vspm-module/vspm-user-module.bbappend deleted file mode 100644 index 2c0744f1..00000000 --- a/meta-renesas-extras/recipes/vspm-module/vspm-user-module.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -do_compile[depends] += "vspm-kernel-module:do_shared_workdir" |