[PATCH 1/1] isar: Drop Debian Jessie support

["Maxim Yu. Osipov" <mosipov@ilbers.de>]

There are no products that use Isar with jessie -
drop it as obsoleted.

Suggested-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
---
 README.md                                          |  2 +-
 Supported_Configurations.md                        | 41 ++++++++++++++++++++++
 doc/edk2_build.md                                  |  2 +-
 doc/offline.md                                     |  4 +--
 doc/technical_overview.md                          |  6 ++--
 doc/user_manual.md                                 | 31 ++++------------
 meta-isar/conf/conf-notes.txt                      |  2 +-
 meta-isar/conf/distro/raspbian-jessie.conf         | 12 -------
 meta-isar/conf/distro/raspbian-jessie.list         |  2 --
 meta-isar/conf/local.conf.sample                   |  4 ---
 meta-isar/conf/multiconfig/qemuamd64-jessie.conf   | 18 ----------
 meta-isar/conf/multiconfig/qemuarm-jessie.conf     | 24 -------------
 meta-isar/conf/multiconfig/qemui386-jessie.conf    | 16 ---------
 meta-isar/conf/multiconfig/rpi-jessie.conf         | 33 -----------------
 meta-isar/recipes-app/hello/hello_2.9.bb           |  3 --
 meta/conf/distro/debian-jessie.conf                | 15 --------
 meta/conf/distro/debian-jessie.list                |  4 ---
 .../buildchroot/buildchroot-host.bb                |  5 +--
 meta/recipes-devtools/buildchroot/files/common.sh  |  9 +----
 scripts/ci_build.sh                                |  4 ---
 scripts/start_vm                                   |  2 +-
 scripts/vm_smoke_test                              |  3 --
 22 files changed, 58 insertions(+), 184 deletions(-)
 delete mode 100644 meta-isar/conf/distro/raspbian-jessie.conf
 delete mode 100644 meta-isar/conf/distro/raspbian-jessie.list
 delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-jessie.conf
 delete mode 100644 meta-isar/conf/multiconfig/qemuarm-jessie.conf
 delete mode 100644 meta-isar/conf/multiconfig/qemui386-jessie.conf
 delete mode 100644 meta-isar/conf/multiconfig/rpi-jessie.conf
 delete mode 100644 meta/conf/distro/debian-jessie.conf
 delete mode 100644 meta/conf/distro/debian-jessie.list

diff --git a/README.md b/README.md
index 7094c88..1954d57 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Instruction on how to build can be found in the [User Manual](doc/user_manual.md
 
 To test the QEMU image, run the following command:
 
-        $ start_vm -a arm -d jessie
+        $ start_vm -a arm -d stretch
 
 The default root password is 'root'.
 
diff --git a/Supported_Configurations.md b/Supported_Configurations.md
index 8767f38..4dedb28 100644
--- a/Supported_Configurations.md
+++ b/Supported_Configurations.md
@@ -1,6 +1,47 @@
 Supported Configurations
 ========================
 
+Release next
+------------
+
+### Host System : debian-jessie-amd64
+
+Not supported
+
+### Host System : debian-stretch-amd64
+
+|Target System         |Native Build |Cross Build  |QEMU test    |SDK Support  |Notes                        |
+|:--------------------:|:-----------:|:------------|:-----------:|:-----------:|:---------------------------:|
+| debian-jessie-i386   |UNKNOWN      |UNKNOWN      |UNKNOWN      |NO           | Not supported               |
+| debian-jessie-amd64  |UNKNOWN      |UNKNOWN      |UNKNOWN      |NO           | Not supported               |
+| debian-jessie-armhf  |UNKNOWN      |UNKNOWN      |UNKNOWM      |NO           | Not supported               |
+| debian-jessie-arm64  |UNKNOWN      |UNKNOWN      |UNKNOWN      |NO           | Not supported               |
+| debian-stretch-i386  |YES          |UNKNOWN      |YES          |UNKNOWN      |                             |
+| debian-stretch-amd64 |YES          |YES          |YES          |UNKNOWN      |                             |
+| debian-stretch-armhf |YES          |YES          |YES          |YES          |                             |
+| debian-stretch-arm64 |YES          |YES          |YES          |YES          |                             |
+| debian-buster-i386   |YES          |UNKWNOWN     |YES          |UNKNOWN      | supported since 4808430     |
+| debian-buster-amd64  |YES          |YES          |YES          |UNKNOWN      | supported since 4808430     |
+| debian-buster-armhf  |YES          |UNKNOWN      |YES          |UNKNOWN      | supported since 4808430     |
+| debian-buster-arm64  |YES          |UNKNOWN      |YES          |UNKNOWN      | supported since 4808430     |
+
+### Host System : debian-buster-amd64
+
+TBD
+
+### Host System : debian-jessie-i386
+
+Not supported
+
+### Host System : debian-stretch-i386
+
+TBD
+
+### Host System : debian-buster-i386
+TBD
+
+
+
 Release v0.7
 ------------
 
diff --git a/doc/edk2_build.md b/doc/edk2_build.md
index f33d381..b705f23 100644
--- a/doc/edk2_build.md
+++ b/doc/edk2_build.md
@@ -1,6 +1,6 @@
 # Building Tianocore UEFI Firmware
 
-A binary `ovmf` package is available in Debian Jessie, Stretch, and sid, but it
+A binary `ovmf` package is available in Debian Stretch, and Buster, but it
 doesn't seem to be recent enough for testing images generated by Isar.
 
 ## Get the Sources
diff --git a/doc/offline.md b/doc/offline.md
index d2256a5..11d1cc9 100644
--- a/doc/offline.md
+++ b/doc/offline.md
@@ -11,13 +11,13 @@ mkdir -p $WEB_HOME
 
 ```
 DST=$WEB_HOME/debian
-DISTROS=jessie,jessie-updates,stretch,stretch-updates,buster,buster-updates
+DISTROS=stretch,stretch-updates,buster,buster-updates
 time debmirror -p --getcontents -e http -h $HOST -d $DISTROS -a $ARCHES $DST
 ```
 
 ```
 DST=$WEB_HOME/debian-security
-DISTROS=jessie/updates,stretch/updates,buster/updates
+DISTROS=stretch/updates,buster/updates
 time debmirror -p --getcontents -e http -h $HOST -r /debian-security \
     -d $DISTROS -a $ARCHES $DST
 ```
diff --git a/doc/technical_overview.md b/doc/technical_overview.md
index 0ddcabc..bbd22b6 100644
--- a/doc/technical_overview.md
+++ b/doc/technical_overview.md
@@ -51,12 +51,12 @@ that include:
 
 Typical example, when Isar builds the following configurations:
 
- - Debian Jessie, amd64
-
- - Debian Jessie, i386
+ - Debian Stretch, amd64
 
  - Debian Stretch, i386
 
+ - Debian Buster, arm
+
 In this case there will be 3 different build subtrees. So the standard
 hello-isar demo application will be processed 3 times for each
 environment. Three different sets of stamps will be used to distinguish
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 7c59efc..5e00281 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -41,19 +41,14 @@ Isar provides:
 For demonstration purposes, Isar provides support for the following
 configurations:
 
- - QEMU ARM with Debian Jessie
  - QEMU ARM with Debian Stretch
  - QEMU ARM with Debian Buster
- - QEMU ARM64 with Debian Jessie
  - QEMU ARM64 with Debian Stretch
  - QEMU ARM64 with Debian Buster (for host >= buster)
- - QEMU i386 with Debian Jessie
  - QEMU i386 with Debian Stretch
  - QEMU i386 with Debian Buster
- - QEMU amd64 with Debian Jessie
  - QEMU amd64 with Debian Stretch
  - QEMU amd64 with Debian Buster
- - Raspberry Pi 1 Model B with Raspbian Jessie
  - Raspberry Pi 1 Model B with Raspbian Stretch
  - Banana Pi BPI-M1
  - LeMaker HiKey
@@ -158,18 +153,14 @@ a single call. List all configurations in `conf/local.conf`:
 
 ```
 BBMULTICONFIG = " \
-    qemuarm-jessie \
     qemuarm-stretch \
     qemuarm-buster \
     qemuarm64-stretch \
     qemuarm64-buster \
-    qemui386-jessie \
     qemui386-stretch \
     qemui386-buster \
-    qemuamd64-jessie \
     qemuamd64-stretch \
     qemuamd64-buster \
-    rpi-jessie \
     rpi-stretch \
 "
 ```
@@ -178,31 +169,24 @@ The following command will produce `isar-image-base` images for all targets:
 
 ```
 $ bitbake \
-    multiconfig:qemuarm-jessie:isar-image-base \
     multiconfig:qemuarm-stretch:isar-image-base \
     multiconfig:qemuarm-buster:isar-image-base \
     multiconfig:qemuarm64-stretch:isar-image-base \
-    multiconfig:qemui386-jessie:isar-image-base \
     multiconfig:qemui386-stretch:isar-image-base \
     multiconfig:qemui386-buster:isar-image-base \
-    multiconfig:qemuamd64-jessie:isar-image-base \
     multiconfig:qemuamd64-stretch:isar-image-base \
     multiconfig:qemuamd64-buster:isar-image-base \
-    multiconfig:rpi-jessie:isar-image-base \
     multiconfig:rpi-stretch:isar-image-base
 ```
 
 Created images are:
 
 ```
-tmp/deploy/images/qemuarm/isar-image-base-debian-jessie-qemuarm.ext4.img
 tmp/deploy/images/qemuarm/isar-image-base-debian-stretch-qemuarm.ext4.img
 tmp/deploy/images/qemuarm/isar-image-base-debian-buster-qemuarm.ext4.img
 tmp/deploy/images/qemuarm64/isar-image-base-debian-stretch-qemuarm64.ext4.img
-tmp/deploy/images/qemui386/isar-image-base-debian-jessie-qemui386.ext4.img
 tmp/deploy/images/qemui386/isar-image-base-debian-stretch-qemui386.wic.img
 tmp/deploy/images/qemui386/isar-image-base-debian-buster-qemui386.wic.img
-tmp/deploy/images/qemuamd64/isar-image-base-debian-jessie-qemuamd64.ext4.img
 tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img
 tmp/deploy/images/qemuamd64/isar-image-base-debian-buster-qemuamd64.wic.img
 tmp/deploy/images/rpi/isar-image-base.rpi-sdimg
@@ -223,7 +207,7 @@ Variables may be used in `.wks.in` files; Isar will expand them and generate a r
 In order to run the EFI images with `qemu`, an EFI firmware is required and available at the following address:
 https://github.com/tianocore/edk2/tree/3858b4a1ff09d3243fea8d07bd135478237cb8f7
 
-Note that the `ovmf` package in Debian jessie/stretch/sid contains a pre-compiled firmware, but doesn't seem to be recent
+Note that the `ovmf` package in Debian stretch/buster contains a pre-compiled firmware, but doesn't seem to be recent
 enough to allow images to be testable under `qemu`.
 
 ```
@@ -313,13 +297,13 @@ following variables define the default configuration to build for:
  - `MACHINE` - The board to build for (e.g., `qemuarm`, `rpi`). BitBake looks
    for conf/multiconfig/${MACHINE}.conf in every layer.
 
- - `DISTRO` - The distro to use (e.g. `raspbian-jessie`, `debian-stretch`).
+ - `DISTRO` - The distro to use (e.g. `raspbian-stretch`, `debian-stretch`).
    BitBake looks for conf/distro/${DISTRO}.conf in every layer.
 
  - `DISTRO_ARCH` - The Debian architecture to build for (e.g., `armhf`).
 
 If BitBake is called with multiconfig targets (e.g.,
-`multiconfig:qemuarm-jessie:isar-image-base`), the following variable defines
+`multiconfig:qemuarm-stretch:isar-image-base`), the following variable defines
 all supported configurations:
 
  - `BBMULTICONFIG` - The list of the complete configuration definition files.
@@ -346,10 +330,9 @@ Some other variables include:
 
 In Isar, each machine can use its specific Linux distro to generate `buildchroot` and target filesystem. By default, Isar provides configuration files for the following distros:
 
- - debian-jessie
  - debian-stretch
  - debian-buster
- - raspbian-jessie
+ - raspbian-stretch
 
 User can select appropriate distro for specific machine by setting the following variable in machine configuration file:
 ```
@@ -389,9 +372,9 @@ The distro is defined by the set of the following variables:
  - `DISTRO_APT_PREFERENCES` - List of apt preference files
  - `DISTRO_KERNELS` - List of supported kernel suffixes
 
-Below is an example for Raspbian Jessie:
+Below is an example for Raspbian Stretch:
 ```
-DISTRO_APT_SOURCES += "conf/distro/raspbian-jessie.list"
+DISTRO_APT_SOURCES += "conf/distro/raspbian-stretch.list"
 DISTRO_APT_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de"
 DISTRO_CONFIG_SCRIPT?= "raspbian-configscript.sh"
 DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv"
@@ -408,7 +391,6 @@ To add new distro, user should perform the following steps:
  - Create the `.conf` file in distro folder with the name of your distribution. We recommend to name distribution in the following format: `name`-`suite`, for example:
 
     ```
-    debian-jessie
     debian-stretch
     debian-buster
     ```
@@ -661,7 +643,6 @@ put into Isar apt.
 
 Debian cross-compilation works out of the box starting from Debian stretch distribution. Currently the following build configurations are supported in Isar:
 
- - qemuarm-jessie
  - qemuarm-stretch
  - qemuarm-buster
  - qemuarm64-stretch
diff --git a/meta-isar/conf/conf-notes.txt b/meta-isar/conf/conf-notes.txt
index 87bd2dc..ae9611e 100644
--- a/meta-isar/conf/conf-notes.txt
+++ b/meta-isar/conf/conf-notes.txt
@@ -1,4 +1,4 @@
 Common targets are:
     multiconfig:qemuarm-stretch:isar-image-base
     multiconfig:qemuamd64-stretch:isar-image-base
-    multiconfig:rpi-jessie:isar-image-base
+    multiconfig:rpi-stretch:isar-image-base
diff --git a/meta-isar/conf/distro/raspbian-jessie.conf b/meta-isar/conf/distro/raspbian-jessie.conf
deleted file mode 100644
index 5e907e5..0000000
--- a/meta-isar/conf/distro/raspbian-jessie.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# Raspbian stable distribution configuration
-#
-# This software is a part of ISAR.
-# Copyright (C) 2015-2016 ilbers GmbH
-
-BASE_DISTRO = "raspbian"
-BASE_DISTRO_CODENAME = "jessie"
-
-DISTRO_APT_SOURCES += "conf/distro/raspbian-jessie.list"
-DISTRO_APT_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de"
-DISTRO_CONFIG_SCRIPT ?= "${LAYERDIR_isar}/conf/distro/raspbian-configscript.sh"
-DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv"
diff --git a/meta-isar/conf/distro/raspbian-jessie.list b/meta-isar/conf/distro/raspbian-jessie.list
deleted file mode 100644
index 0a5af41..0000000
--- a/meta-isar/conf/distro/raspbian-jessie.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb	http://archive.raspbian.org/raspbian	jessie	main contrib non-free firmware
-deb-src	http://archive.raspbian.org/raspbian	jessie	main contrib non-free firmware
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index aaaa8ca..86e2384 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -38,15 +38,12 @@ DISTRO_ARCH ??= "armhf"
 #
 # This sets the default multiple configurations used:
 BBMULTICONFIG = " \
-    qemuarm-jessie \
     qemuarm-stretch \
     qemuarm-buster \
     qemuarm64-stretch \
     qemuarm64-buster \
-    qemui386-jessie \
     qemui386-stretch \
     qemui386-buster \
-    qemuamd64-jessie \
     qemuamd64-stretch \
     bananapi-stretch \
     de0-nano-soc-stretch \
@@ -54,7 +51,6 @@ BBMULTICONFIG = " \
     qemuamd64-buster \
     qemuamd64-buster-tgz \
     nand-ubi-demo-buster \
-    rpi-jessie \
     rpi-stretch \
 "
 
diff --git a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf b/meta-isar/conf/multiconfig/qemuamd64-jessie.conf
deleted file mode 100644
index d1335ff..0000000
--- a/meta-isar/conf/multiconfig/qemuamd64-jessie.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# This software is a part of ISAR.
-# Copyright (C) 2017 ilbers GmbH
-
-MACHINE ?= "qemuamd64"
-
-DISTRO ?= "debian-jessie"
-DISTRO_ARCH ?= "amd64"
-
-KERNEL_NAME ?= "amd64"
-
-QEMU_ROOTFS_DEV ?= "sda"
-
-QEMU_ARCH ?= "x86_64"
-QEMU_MACHINE ?= "pc"
-QEMU_CPU ?= ""
-QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##"
-
-DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = " apt-transport-https ca-certificates"
diff --git a/meta-isar/conf/multiconfig/qemuarm-jessie.conf b/meta-isar/conf/multiconfig/qemuarm-jessie.conf
deleted file mode 100644
index 7001b05..0000000
--- a/meta-isar/conf/multiconfig/qemuarm-jessie.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This software is a part of ISAR.
-# Copyright (C) 2015-2017 ilbers GmbH
-#
-# This configuration file is a part of bitbake multiconfig. Bitbake combines
-# these settings with local.conf ones and start task execution with this
-# environment.
-
-# This sets the default machine to be qemuarm in this configuration:
-MACHINE ?= "qemuarm"
-
-# This sets the default distribution configuration:
-DISTRO ?= "debian-jessie"
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "armmp"
-
-QEMU_ROOTFS_DEV ?= "vda"
-
-QEMU_ARCH ?= "arm"
-QEMU_MACHINE ?= "virt"
-QEMU_CPU ?= "cortex-a15"
-# TODO: start_vm doesn't support multiline vars
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
diff --git a/meta-isar/conf/multiconfig/qemui386-jessie.conf b/meta-isar/conf/multiconfig/qemui386-jessie.conf
deleted file mode 100644
index 9db9f8c..0000000
--- a/meta-isar/conf/multiconfig/qemui386-jessie.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# This software is a part of ISAR.
-# Copyright (C) 2017 ilbers GmbH
-
-MACHINE ?= "qemui386"
-
-DISTRO ?= "debian-jessie"
-DISTRO_ARCH ?= "i386"
-
-KERNEL_NAME ?= "686-pae"
-
-QEMU_ROOTFS_DEV ?= "sda"
-
-QEMU_ARCH ?= "i386"
-QEMU_MACHINE ?= "pc"
-QEMU_CPU ?= ""
-QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE##"
diff --git a/meta-isar/conf/multiconfig/rpi-jessie.conf b/meta-isar/conf/multiconfig/rpi-jessie.conf
deleted file mode 100644
index 03c32e2..0000000
--- a/meta-isar/conf/multiconfig/rpi-jessie.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# This software is a part of ISAR.
-# Copyright (C) 2015-2017 ilbers GmbH
-#
-# This configuration file is a part of bitbake multiconfig. Bitbake combines
-# these settings with local.conf ones and start task execution with this
-# environment.
-
-# This sets the default machine to be rpi in this configuration:
-MACHINE ?= "rpi"
-
-# This sets the default distribution configuration:
-DISTRO ?= "raspbian-jessie"
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "rpi-rpfv"
-
-IMAGE_PREINSTALL += " \
-    bind9-host \
-    dnsutils \
-    iproute2 \
-    iputils-ping \
-    isc-dhcp-client \
-    lrzsz \
-    net-tools \
-    netcat-openbsd \
-    openssh-client \
-    openssh-server \
-    raspberrypi-bootloader-nokernel \
-    telnet \
-    traceroute \
-    vim \
-    "
diff --git a/meta-isar/recipes-app/hello/hello_2.9.bb b/meta-isar/recipes-app/hello/hello_2.9.bb
index 63d1562..2fe59d1 100644
--- a/meta-isar/recipes-app/hello/hello_2.9.bb
+++ b/meta-isar/recipes-app/hello/hello_2.9.bb
@@ -6,6 +6,3 @@
 # SPDX-License-Identifier: MIT
 
 require hello.inc
-
-DEFAULT_PREFERENCE_debian-jessie = "1"
-DEFAULT_PREFERENCE_raspbian-jessie = "1"
diff --git a/meta/conf/distro/debian-jessie.conf b/meta/conf/distro/debian-jessie.conf
deleted file mode 100644
index 5a46afe..0000000
--- a/meta/conf/distro/debian-jessie.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Debian jessie distribution configuration
-#
-# This software is a part of ISAR.
-# Copyright (C) 2015-2016 ilbers GmbH
-
-require debian-common.conf
-
-BASE_DISTRO_CODENAME = "jessie"
-
-DISTRO_APT_SOURCES += "conf/distro/debian-jessie.list"
-DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
-DISTRO_KERNELS ?= "486 4kc-malta 586 5kc-malta 686-pae amd64 arm64 armmp \
-    armmp-lpae ixp4xx kirkwood loongson-2e loongson-2f loongson-3 octeon \
-    orion5x powerpc powerpc-smp powerpc64 powerpc64le r4k-ip22 r5k-ip32 \
-    s390x sb1-bcm91250a versatile"
diff --git a/meta/conf/distro/debian-jessie.list b/meta/conf/distro/debian-jessie.list
deleted file mode 100644
index 922c75a..0000000
--- a/meta/conf/distro/debian-jessie.list
+++ /dev/null
@@ -1,4 +0,0 @@
-deb	http://ftp.debian.org/debian	jessie	main contrib non-free
-deb-src	http://ftp.debian.org/debian	jessie	main contrib non-free
-deb	http://security.debian.org	jessie/updates	main contrib non-free
-deb-src	http://security.debian.org	jessie/updates	main contrib non-free
diff --git a/meta/recipes-devtools/buildchroot/buildchroot-host.bb b/meta/recipes-devtools/buildchroot/buildchroot-host.bb
index f6e95ed..c8c10c0 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot-host.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot-host.bb
@@ -19,11 +19,8 @@ BUILDCHROOT_PREINSTALL ?= "make \
                            equivs \
                            libc6:${DISTRO_ARCH}"
 
-# Please note: this works for Stretch distro only. According to the wiki page:
+# According to the wiki page:
 #     https://wiki.debian.org/CrossToolchains
-# Jessie doesn't contain toolchain. It should be fetched from the external
-# repository:
-#     http://emdebian.org/tools/debian/
 BUILDCHROOT_PREINSTALL_append_armhf += "binutils-arm-linux-gnueabihf \
                                         crossbuild-essential-armhf"
 BUILDCHROOT_PREINSTALL_append_arm64 += "binutils-aarch64-linux-gnu \
diff --git a/meta/recipes-devtools/buildchroot/files/common.sh b/meta/recipes-devtools/buildchroot/files/common.sh
index 01d3c57..f75a84e 100644
--- a/meta/recipes-devtools/buildchroot/files/common.sh
+++ b/meta/recipes-devtools/buildchroot/files/common.sh
@@ -18,15 +18,8 @@ fi
 # Create human-readable names
 target_arch=$2
 
-# Notes:
-#   mk-build-deps for jessie and jtretch has different parameter name to specify
-#   host architecture.
 debian_version=$(cut -c1 /etc/debian_version)
-if [ $(($debian_version)) -ge 9 ]; then
-    set_arch="--host-arch $target_arch"
-else
-    set_arch="-a $target_arch"
-fi
+set_arch="--host-arch $target_arch"
 
 # Go to build directory
 cd "$1"
diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
index 0ea5995..9dc56f3 100755
--- a/scripts/ci_build.sh
+++ b/scripts/ci_build.sh
@@ -21,19 +21,15 @@ BUILD_DIR=./build
 BB_ARGS="-v"
 
 TARGETS_SET="\
-            multiconfig:qemuarm-jessie:isar-image-base \
             multiconfig:qemuarm-stretch:isar-image-base \
             multiconfig:qemuarm-buster:isar-image-base \
             multiconfig:qemuarm64-stretch:isar-image-base \
-            multiconfig:qemui386-jessie:isar-image-base \
             multiconfig:qemui386-stretch:isar-image-base \
             multiconfig:qemui386-buster:isar-image-base \
-            multiconfig:qemuamd64-jessie:isar-image-base \
             multiconfig:qemuamd64-stretch:isar-image-base \
             multiconfig:qemuamd64-buster:isar-image-base \
             multiconfig:qemuamd64-buster-tgz:isar-image-base \
             multiconfig:nand-ubi-demo-buster:isar-image-ubi \
-            multiconfig:rpi-jessie:isar-image-base \
             multiconfig:rpi-stretch:isar-image-base"
           # qemu-user-static of <= buster too old to build that
           # multiconfig:qemuarm64-buster:isar-image-base
diff --git a/scripts/start_vm b/scripts/start_vm
index 1da0742..bf8163a 100755
--- a/scripts/start_vm
+++ b/scripts/start_vm
@@ -46,7 +46,7 @@ show_help() {
     echo "                          Supported: arm, i386, amd64, arm64."
     echo "    -b, --build BUILD     set path to build directory."
     echo "    -d, --distro DISTRO   set isar Debian distribution."
-    echo "                          Supported: jessie, stretch."
+    echo "                          Supported: stretch, buster"
     echo "    -o, --out FILE        Route QEMU console output to"
     echo "                          specified file."
     echo "    -p, --pid FILE        Store QEMU pid to file."
diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test
index d497653..6e28d54 100755
--- a/scripts/vm_smoke_test
+++ b/scripts/vm_smoke_test
@@ -147,21 +147,18 @@ done
 
 # ARM machine
 if [ -z "$FAST_BUILD" ]; then
-    run_test arm jessie
     run_test arm buster
 fi
 run_test arm stretch
 
 # AMD64 machine
 if [ -z "$FAST_BUILD" ]; then
-    run_test amd64 jessie
     run_test amd64 buster
 fi
 run_test amd64 stretch
 
 # i386 machine
 if [ -z "$FAST_BUILD" ]; then
-    run_test i386 jessie
     run_test i386 stretch
     run_test i386 buster
 fi
-- 
2.11.0