Skip to content

Expand build targets to include Debian11 #5593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 7 commits into from
Sep 29, 2021
Merged

Expand build targets to include Debian11 #5593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5106062
Adding Debian 11 to tier 2 for iotedge
Sep 22, 2021
da0d8cc
Updating documentation for expanding build targets
Sep 28, 2021
8c7ff18
Merge branch 'master' into debian11-tier2-iotedge
mountainsandstarrynights Sep 28, 2021
ec55650
Update minimum version of debhelper and fix typo in doc
Sep 28, 2021
04fa8c7
Round off Debhelper version
Sep 29, 2021
9c57f08
Merge branch 'master' into debian11-tier2-iotedge
mountainsandstarrynights Sep 29, 2021
2a09e6d
Merge branch 'master' into debian11-tier2-iotedge
mountainsandstarrynights Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions builds/misc/packages-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,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
Expand Down
13 changes: 13 additions & 0 deletions builds/misc/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,19 @@ jobs:
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
arch: amd64
Expand Down
10 changes: 7 additions & 3 deletions edgelet/build/linux/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
;;
Expand Down Expand Up @@ -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 &&
'
Expand All @@ -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 &&
Expand All @@ -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 &&
Expand Down
3 changes: 1 addition & 2 deletions edgelet/contrib/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://github.com/azure/iotedge

Expand Down
13 changes: 11 additions & 2 deletions edgelet/doc/devguide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down Expand Up @@ -81,7 +81,16 @@ 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
Expand Down