From dd16a42849c0e2f17d6b5ea49afdf92fa0420167 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Sat, 5 Dec 2020 23:55:37 +0100 Subject: Prepare the 9.0.4 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the distro config. Also adapt the renesas blob extraction. Signed-off-by: Jan-Simon Möller Change-Id: I01d89f0325376ab1adc774f42fd1976f9b131663 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25756 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh | 7 +++++++ meta-agl-distro/conf/distro/poky-agl.conf | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) 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 2fc3d9f1b..4a60c9de1 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 @@ -1,12 +1,19 @@ #!/bin/bash ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston5-20190802.zip" +ZIP_1_tmp="REN_R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston5-20190802__20190808.zip" ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston5-20191021.zip" +ZIP_2_tmp="REN_R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston5-20191021__20191031.zip" 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} + +if [ -f "${DOWNLOAD_DIR}/${ZIP_1_tmp}" ]; then mv "${DOWNLOAD_DIR}/${ZIP_1_tmp}" "${DOWNLOAD_DIR}/${ZIP_1}"; fi +if [ -f "${DOWNLOAD_DIR}/${ZIP_2_tmp}" ]; then mv "${DOWNLOAD_DIR}/${ZIP_2_tmp}" "${DOWNLOAD_DIR}/${ZIP_2}"; fi + + EXTRACT_DIR=$METADIR/binary-tmp stdout_in_terminal=1 diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index 01f45dd26..1aba1f490 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -8,10 +8,10 @@ DISTRO_NAME = "Automotive Grade Linux" # Release flags DISTRO_CODENAME = "icefish" AGL_BRANCH = "icefish" -AGLVERSION = "9.0.3" +AGLVERSION = "9.0.4" # switch devel/release -AGLRELEASETYPE ?= "agldevelopment" -#AGLRELEASETYPE ?= "aglrelease" +#AGLRELEASETYPE ?= "agldevelopment" +AGLRELEASETYPE ?= "aglrelease" OVERRIDES .= ":${AGLRELEASETYPE}" # -- cgit 1.2.3-korg