diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-06-10 19:25:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2019-06-10 19:25:13 +0000 |
| commit | 7489fa14eee5819f8fd965c3f8f53e62ce7fcfd2 (patch) | |
| tree | 1f6fff325d9377d2e6dd3e79252ff231d11bde6f /meta-agl-bsp | |
| parent | 9ab1047679978070b4c0647ec1c9f9846c179570 (diff) | |
| parent | d04f0793f5e06e23268a6025632bfd7abd113fb5 (diff) | |
Merge "Changes to support the repo clone rework"
Diffstat (limited to 'meta-agl-bsp')
| -rw-r--r-- | meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf | 4 | ||||
| -rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf b/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf index 277186f29..45fef2c73 100644 --- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf +++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/layer.conf @@ -3,8 +3,8 @@ BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES BBFILES += " \ - ${LAYERDIR}/../../../meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bb \ - ${LAYERDIR}/../../../meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bbappend \ + ${LAYERDIR}/../../../bsp/meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bb \ + ${LAYERDIR}/../../../bsp/meta-rcar/meta-rcar-gen3-adas/recipes-*/*/*.bbappend \ ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend \ " diff --git a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh index 739a5c6d9..798ebfb8a 100644 --- a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh +++ b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh @@ -8,7 +8,7 @@ ARCHIVE_PREFIX_NAME="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux" ZIP_BUGFIX=$ARCHIVE_PREFIX_NAME"-weston5-20190516.zip" TAR_BUGFIX=$ARCHIVE_PREFIX_NAME"-20190516.tar.gz" -COPY_SCRIPT="$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh" +COPY_SCRIPT="$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh" test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs DOWNLOAD_DIR=${XDG_DOWNLOAD_DIR:-$HOME/Downloads} @@ -63,7 +63,7 @@ function copy_mm_packages() { fi if [ -f $COPY_SCRIPT ]; then - cd $METADIR/meta-renesas-rcar-gen3/ + cd $METADIR/bsp/meta-renesas-rcar-gen3/ $COPY_SCRIPT -d -f $EXTRACT_DIR cd .. else @@ -105,7 +105,7 @@ function copy_mm_packages() { find $EXTRACT_DIR -name "$GFX_BINARIES_NAME" -exec mv -t $EXTRACT_DIR {} \; for f in `find $EXTRACT_DIR -name "$GFX_BINARIES_NAME" -exec basename {} \;` do - mv $EXTRACT_DIR/${f} "$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module"/${f:4} + mv $EXTRACT_DIR/${f} "$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module"/${f:4} done; #Clean |