Add Debian11 to release/1.2 build targets (#5594)

- This PR adds Debian 11 as a build target - It also addresses an issue related to missing packages: Debian build fails due missing dh-systemd package on Bullseye Debian build fails due missing dh-systemd package on Bullseye matrix-org/synapse#9073 by removing dh-systemd from the installation list. It hasn't been needed since Debian 8. **Testing notes:** - verified build passes and artifacts are created.
Azure · Oct 1, 2021 · 2f62d62 · 2f62d62
1 parent a295c94
commit 2f62d62
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 7 deletions.
diff --git a/builds/misc/packages-release.yaml b/builds/misc/packages-release.yaml
@@ -41,6 +41,19 @@ jobs:
  os: debian10
  arch: aarch64
  target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
+
+ Debian11-amd64:
+ os: debian11
+ arch: amd64
+ target.iotedged: edgelet/target/release
+ Debian11-arm32v7:
+ os: debian11
+ arch: arm32v7
+ target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release
+ Debian11-aarch64:
+ os: debian11
+ arch: aarch64
+ target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
 
  Ubuntu1804-amd64:
  os: ubuntu18.04
@@ -54,6 +67,7 @@ jobs:
  os: ubuntu18.04
  arch: aarch64
  target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
+
  Ubuntu2004-amd64:
  arch: amd64
  os: ubuntu20.04

diff --git a/builds/misc/packages.yaml b/builds/misc/packages.yaml
@@ -48,6 +48,19 @@ jobs:
  os: debian10
  arch: aarch64
  target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
+
+ Debian11-amd64:
+ os: debian11
+ arch: amd64
+ target.iotedged: edgelet/target/release
+ Debian11-arm32v7:
+ os: debian11
+ arch: arm32v7
+ target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release
+ Debian11-aarch64:
+ os: debian11
+ arch: aarch64
+ target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
 
  Ubuntu1804-amd64:
  os: ubuntu18.04
@@ -61,6 +74,7 @@ jobs:
  os: ubuntu18.04
  arch: aarch64
  target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
+
  Ubuntu2004-amd64:
  arch: amd64
  os: ubuntu20.04

diff --git a/edgelet/build/linux/package.sh b/edgelet/build/linux/package.sh
@@ -41,6 +41,10 @@ case "$PACKAGE_OS" in
  DOCKER_IMAGE='debian:10-slim'
  ;;
 
+ 'debian11')
+ DOCKER_IMAGE='debian:11-slim'
+ ;;
+
  'ubuntu18.04')
  DOCKER_IMAGE='ubuntu:18.04'
  ;;
@@ -92,7 +96,7 @@ case "$PACKAGE_OS.$PACKAGE_ARCH" in
  apt-get update &&
  apt-get upgrade -y &&
  apt-get install -y --no-install-recommends \
- binutils build-essential ca-certificates curl debhelper dh-systemd file git make \
+ binutils build-essential ca-certificates curl debhelper file git make \
  gcc g++ pkg-config \
  libcurl4-openssl-dev libssl-dev uuid-dev &&
  '
@@ -106,7 +110,7 @@ case "$PACKAGE_OS.$PACKAGE_ARCH" in
  apt-get update &&
  apt-get upgrade -y &&
  apt-get install -y --no-install-recommends \
- binutils build-essential ca-certificates curl debhelper dh-systemd file git make \
+ binutils build-essential ca-certificates curl debhelper file git make \
  gcc g++ \
  gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
  libcurl4-openssl-dev:armhf libssl-dev:armhf uuid-dev:armhf &&
@@ -127,7 +131,7 @@ case "$PACKAGE_OS.$PACKAGE_ARCH" in
  apt-get update &&
  apt-get upgrade -y &&
  apt-get install -y --no-install-recommends \
- binutils build-essential ca-certificates curl debhelper dh-systemd file git make \
+ binutils build-essential ca-certificates curl debhelper file git make \
  gcc g++ \
  gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
  libcurl4-openssl-dev:arm64 libssl-dev:arm64 uuid-dev:arm64 &&

diff --git a/edgelet/contrib/debian/control b/edgelet/contrib/debian/control
@@ -2,8 +2,7 @@ Source: aziot-edge
 Section: admin
 Priority: extra
 Maintainer: Azure IoT Edge Devs
-Build-Depends: debhelper (>=9),
- dh-systemd
+Build-Depends: debhelper (>=10)
 Standards-Version: 3.9.6
 Homepage: https:/azure/iotedge
 

diff --git a/edgelet/doc/devguide.md b/edgelet/doc/devguide.md
@@ -13,7 +13,7 @@ There are two options for building the IoT Edge Security Daemon.
 
 Linux packages are built using the `edgelet/build/linux/package.sh` script. Set the following environment variables, then invoke the script:
 
-1. `PACKAGE_OS`: This is the OS on which the resulting packages will be installed. It should be one of `centos7`, `debian9`, `debian10`, `ubuntu18.04` or `ubuntu20.04`
+1. `PACKAGE_OS`: This is the OS on which the resulting packages will be installed. It should be one of `centos7`, `debian9`, `debian10`, `debian11`, `ubuntu18.04`, or `ubuntu20.04`
 
 1. `PACKAGE_ARCH`: This is the architecture of the OS on which the resulting packages will be installed. It should be one of `amd64`, `arm32v7` or `aarch64`.
 
@@ -81,7 +81,17 @@ yum install \
  libcurl-devel libuuid-devel openssl-devel
 ```
 
-#### Debian 8-10, Ubuntu 18.04
+#### Debian 9-11
+
+```sh
+apt-get update
+apt-get install \
+ binutils build-essential ca-certificates curl cmake debhelper file git make \
+ gcc g++ pkg-config \
+ libcurl4-openssl-dev libssl-dev uuid-dev
+```
+
+#### Ubuntu 18.04, 20.04
 
 ```sh
 apt-get update