diff --git a/Dockerfile b/Dockerfile index 56b4a03..5297dfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # # Docker image to build Geniux images. -ARG base_image_version=1.8 +ARG base_image_version=1.9 FROM yocto-geniux-base:v${base_image_version} LABEL version="3.2" description="Geniux builder" maintainer="carles.fernandez@cttc.es" diff --git a/base-image/Dockerfile b/base-image/Dockerfile index b987543..9ccb4fe 100644 --- a/base-image/Dockerfile +++ b/base-image/Dockerfile @@ -4,7 +4,7 @@ # Yocto Geniux base image to help building Geniux. FROM ubuntu:18.04 -LABEL version="1.8" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es" +LABEL version="1.9" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es" # Install all Linux packages required for Yocto builds, plus other packages used # in this file below, and in the interactive mode @@ -77,6 +77,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ sudo \ tar \ texinfo \ + tmux \ ubuntu-keyring \ unzip \ util-linux \ diff --git a/base-image/Dockerfile2 b/base-image/Dockerfile2 index fcb385c..f970599 100644 --- a/base-image/Dockerfile2 +++ b/base-image/Dockerfile2 @@ -4,7 +4,7 @@ # Yocto Geniux base image to help building Geniux. FROM ubuntu:20.04 -LABEL version="2.2" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es" +LABEL version="2.3" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es" # Install all Linux packages required for Yocto builds, plus other packages used # in this file below, and in the interactive mode @@ -76,6 +76,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ sudo \ tar \ texinfo \ + tmux \ ubuntu-keyring \ unzip \ util-linux \ diff --git a/base-image/Dockerfile3 b/base-image/Dockerfile3 index 3d8cacf..2b557a0 100644 --- a/base-image/Dockerfile3 +++ b/base-image/Dockerfile3 @@ -4,7 +4,7 @@ # Yocto Geniux base image to help building Geniux. FROM ubuntu:22.04 -LABEL version="3.2" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es" +LABEL version="3.3" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es" RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ @@ -73,6 +73,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ tftpd \ tar \ texinfo \ + tmux \ ubuntu-keyring \ unzip \ util-linux \ diff --git a/geniux-builder.sh b/geniux-builder.sh index fb9b998..c6c5978 100755 --- a/geniux-builder.sh +++ b/geniux-builder.sh @@ -36,12 +36,12 @@ if [[ $GENIUX_VERSION == "rocko" || $GENIUX_VERSION == "sumo" || $GENIUX_VERSION $GENIUX_VERSION == "gatesgarth" || $GENIUX_VERSION == "hardknott" || $GENIUX_VERSION == "honister" || \ $GENIUX_VERSION == "kirkstone" || $GENIUX_VERSION == "langdale" ]] then - YOCTO_GENIUX_BASE_IMAGE_VERSION="1.8" + YOCTO_GENIUX_BASE_IMAGE_VERSION="1.9" elif [[ $GENIUX_VERSION == "mickledore" ]] then - YOCTO_GENIUX_BASE_IMAGE_VERSION="2.2" + YOCTO_GENIUX_BASE_IMAGE_VERSION="2.3" else - YOCTO_GENIUX_BASE_IMAGE_VERSION="3.2" + YOCTO_GENIUX_BASE_IMAGE_VERSION="3.3" fi YOCTO_GENIUX_BASE_IMAGE="yocto-geniux-base:v$YOCTO_GENIUX_BASE_IMAGE_VERSION"