Skip to content
This repository was archived by the owner on May 11, 2026. It is now read-only.

Commit 7bcf956

Browse files
brod-intelbrod-intel
committed
v2.5.1
1 parent 38aeceb commit 7bcf956

14 files changed

Lines changed: 109 additions & 101 deletions

‎CHANGELOG.md‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
129129
- Fixed missing DOCKER_RUN_ARGS
130130
- Fixed Miscellaneous typos
131131

132+
## [2.0.4] - 2021-12-03
133+
### Changed
134+
- Fixed /dev/null permissions
135+
- Fixed BASH syntax between distro versions
136+
- Fixed builder-docker runtime detection
137+
- Fixed Miscellaneous bugs
138+
132139
## [2.5.0] - 2022-06-17
133140
### Added
134141
- Dynamic Profiles - The Dynamic Profile feature allows ESP to install software on a target machine without any user interaction. See https://github.com/intel/Edge-Software-Provisioner#dynamic-profile
@@ -151,6 +158,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
151158
### Known Issue
152159
- Virtual PXE (vpxe.sh) may cause a kernel panic under a nested VM. Work around is to build a different kernel. For example, `./build.sh -k ubuntu -P`
153160

161+
## [2.5.1] - 2022-06-24
162+
### Changed
163+
- Fixed default initrd size being to big
164+
- Fixed Miscellaneous bugs
165+
154166

155167

156168

@@ -162,4 +174,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
162174
[2.0.1]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.0...v2.0.1
163175
[2.0.2]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.0.1...v2.0.2
164176
[2.0.3]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.0.2...v2.0.3
165-
[2.5.0]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.0.3...v2.5
177+
[2.0.4]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.0.3...v2.0.4
178+
[2.5.0]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.0.3...v2.5
179+
[2.5.1]: https://github.com/intel/Edge-Software-Provisioner/compare/v2.5...v2.5.1

‎dockerfiles/uos/Dockerfile‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,26 @@ LABEL maintainer "Bryan J Rodriguez <bryan.j.rodriguez@intel.com>"
66

77
RUN apk update && apk add --no-cache \
88
bash \
9+
cpio \
10+
coreutils \
11+
curl \
12+
e2fsprogs \
13+
lsblk \
14+
findutils \
15+
gzip \
916
dnsmasq \
1017
dumb-init \
1118
iptables \
1219
ovmf \
20+
parted \
21+
pv \
1322
qemu \
1423
qemu-img \
15-
qemu-system-x86_64
24+
qemu-system-x86_64 \
25+
rsync \
26+
syslinux \
27+
util-linux \
28+
xz
1629

1730
COPY /bin/linuxkit /usr/bin/linuxkit
1831

‎dockerfiles/uos/Dockerfile.intel‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
FROM alpine:3.12 as kernel-builder
55
LABEL maintainer "Bryan J Rodriguez <bryan.j.rodriguez@intel.com>"
66

7-
ARG UBUNTU_RELEASE=5.17.0-1011-oem
8-
ARG KERNEL_VERSION=5.17.0-1011.12_amd64
7+
ARG UBUNTU_RELEASE=5.15.0-1010-intel-iotg
8+
ARG KERNEL_VERSION=5.15.0-1010.14~20.04.1_amd64
99
ARG KERNEL_PREFIX
10-
ARG KERNEL_PATH=linux-oem-5.17
11-
ARG KERNEL_MODULE_PATH=linux-oem-5.17
10+
ARG KERNEL_PATH=linux-intel-iotg-5.15
11+
ARG KERNEL_MODULE_PATH=linux-intel-iotg-5.15
1212

1313
RUN apk update && apk add --no-cache \
1414
bash \
@@ -26,12 +26,15 @@ RUN mkdir /out
2626
# wget -qO - https://mirrors.kernel.org/ubuntu/pool/main/l/linux/ | sed -n 's/.*href="\([^"]*\).*/\1/p' | grep -o "linux-image-unsigned-[0-9]\.[0-9]\+\.[0-9]\+-[0-9]\+-generic_[^ ]\+amd64\.deb"
2727

2828
RUN wget http://mirrors.edge.kernel.org/ubuntu/pool/main/l/${KERNEL_PATH}/linux-image-unsigned-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
29-
wget http://mirrors.edge.kernel.org/ubuntu/pool/main/l/${KERNEL_MODULE_PATH}/linux-modules-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb
29+
wget http://mirrors.edge.kernel.org/ubuntu/pool/main/l/${KERNEL_MODULE_PATH}/linux-modules-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
30+
wget http://mirrors.edge.kernel.org/ubuntu/pool/main/l/${KERNEL_MODULE_PATH}/linux-modules-extra-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb
3031

3132
RUN ar x linux-image-unsigned-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
3233
tar -xf data.tar && \
3334
ar x linux-modules-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
34-
tar -xf data.tar.zst && \
35+
tar -xf data.tar.xz && \
36+
ar x linux-modules-extra-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
37+
tar -xf data.tar.xz ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/net/ethernet/ ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/gpu/ ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/net/phy/ ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/net/wireless/ && \
3538
for d in lib/modules/*; do depmod -b . $(basename $d); done && \
3639
cp boot/vmlinuz* /out/kernel && \
3740
cp boot/config* /out/kernel_config && \

‎dockerfiles/uos/Dockerfile.intel.signed‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
FROM alpine:3.12 as kernel-builder
55
LABEL maintainer "Bryan J Rodriguez <bryan.j.rodriguez@intel.com>"
66

7-
ARG UBUNTU_RELEASE=5.17.0-1011-oem
8-
ARG KERNEL_VERSION=5.17.0-1011.12_amd64
7+
ARG UBUNTU_RELEASE=5.15.0-1010-intel-iotg
8+
ARG KERNEL_VERSION=5.15.0-1010.14~20.04.1_amd64
99
ARG KERNEL_PREFIX
10-
ARG KERNEL_PATH=linux-signed-oem-5.17
11-
ARG KERNEL_MODULE_PATH=linux-oem-5.17
10+
ARG KERNEL_PATH=linux-signed-intel-iotg-5.15
11+
ARG KERNEL_MODULE_PATH=linux-intel-iotg-5.15
1212

1313
RUN apk update && apk add --no-cache \
1414
bash \
@@ -25,13 +25,16 @@ RUN mkdir /out
2525
# List of kernels
2626
# wget -qO - https://mirrors.kernel.org/ubuntu/pool/main/l/linux/ | sed -n 's/.*href="\([^"]*\).*/\1/p' | grep -o "linux-image-unsigned-[0-9]\.[0-9]\+\.[0-9]\+-[0-9]\+-generic_[^ ]\+amd64\.deb"
2727

28-
RUN wget http://mirrors.edge.kernel.org/ubuntu/pool/main/l/${KERNEL_PATH}/linux-image-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
29-
wget http://mirrors.edge.kernel.org/ubuntu/pool/main/l/${KERNEL_MODULE_PATH}/linux-modules-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb
28+
RUN wget http://mirrors.edge.kernel.org/ubuntu/pool/main/l/${KERNEL_PATH}/linux-image-unsigned-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
29+
wget http://mirrors.edge.kernel.org/ubuntu/pool/main/l/${KERNEL_MODULE_PATH}/linux-modules-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
30+
wget http://mirrors.edge.kernel.org/ubuntu/pool/main/l/${KERNEL_MODULE_PATH}/linux-modules-extra-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb
3031

31-
RUN ar x linux-image-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
32-
tar -xf data.tar.zst && \
32+
RUN ar x linux-image-unsigned-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
33+
tar -xf data.tar && \
3334
ar x linux-modules-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
34-
tar -xf data.tar.zst && \
35+
tar -xf data.tar.xz && \
36+
ar x linux-modules-extra-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
37+
tar -xf data.tar.xz ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/net/ethernet/ ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/net/phy/ ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/net/wireless/ && \
3538
for d in lib/modules/*; do depmod -b . $(basename $d); done && \
3639
cp boot/vmlinuz* /out/kernel && \
3740
cp boot/config* /out/kernel_config && \

‎dockerfiles/uos/Dockerfile.ubuntu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN ar x linux-image-unsigned-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
3232
ar x linux-modules-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
3333
tar -xf data.tar.zst && \
3434
ar x linux-modules-extra-${UBUNTU_RELEASE}_${KERNEL_VERSION}.deb && \
35-
tar -xf data.tar.zst ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/net/ethernet/ && \
35+
tar -xf data.tar.zst ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/net/ethernet/ ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/net/phy/ ./lib/modules/${UBUNTU_RELEASE}/kernel/drivers/net/wireless/ && \
3636
for d in lib/modules/*; do depmod -b . $(basename $d); done && \
3737
cp boot/vmlinuz* /out/kernel && \
3838
cp boot/config* /out/kernel_config && \

‎dockerfiles/uos/dockerfiles/firmware/Dockerfile.fedora‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ FROM scratch
2727
ENTRYPOINT []
2828
CMD []
2929
WORKDIR /
30-
COPY --from=kernel-builder /out/* /
30+
COPY --from=kernel-builder /out/* /lib/

‎dockerfiles/uos/dockerfiles/firmware/Dockerfile.intel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Copyright (C) 2020 Intel Corporation
1+
# Copyright (C) 2022 Intel Corporation
22
# SPDX-License-Identifier: BSD-3-Clause
33

44
FROM alpine:3.12 as kernel-builder
55
LABEL maintainer "Bryan J Rodriguez <bryan.j.rodriguez@intel.com>"
66

7-
ARG FIRMWARE=1.201.5_all
7+
ARG FIRMWARE=1.187.32_all
88

99
RUN apk update && apk add --no-cache \
1010
bash \
@@ -25,11 +25,11 @@ RUN mkdir /out
2525
RUN wget https://mirrors.edge.kernel.org/ubuntu/pool/main/l/linux-firmware/linux-firmware_${FIRMWARE}.deb
2626

2727
RUN ar x linux-firmware_${FIRMWARE}.deb && \
28-
tar -xf data.tar.zst && \
28+
tar -xf data.tar.xz && \
2929
mv ./lib /out/
3030

3131
FROM scratch
3232
ENTRYPOINT []
3333
CMD []
3434
WORKDIR /
35-
COPY --from=kernel-builder /out/* /
35+
COPY --from=kernel-builder /out/* /lib/

‎dockerfiles/uos/dockerfiles/firmware/Dockerfile.intel.signed‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Copyright (C) 2020 Intel Corporation
1+
# Copyright (C) 2022 Intel Corporation
22
# SPDX-License-Identifier: BSD-3-Clause
33

44
FROM alpine:3.12 as kernel-builder
55
LABEL maintainer "Bryan J Rodriguez <bryan.j.rodriguez@intel.com>"
66

7-
ARG FIRMWARE=1.201.5_all
7+
ARG FIRMWARE=1.187.32_all
88

99
RUN apk update && apk add --no-cache \
1010
bash \
@@ -13,7 +13,7 @@ RUN apk update && apk add --no-cache \
1313
rpm \
1414
cpio \
1515
binutils \
16-
zstd
16+
zstd
1717

1818
WORKDIR /build
1919
RUN mkdir /out
@@ -25,11 +25,11 @@ RUN mkdir /out
2525
RUN wget https://mirrors.edge.kernel.org/ubuntu/pool/main/l/linux-firmware/linux-firmware_${FIRMWARE}.deb
2626

2727
RUN ar x linux-firmware_${FIRMWARE}.deb && \
28-
tar -xf data.tar.zst && \
28+
tar -xf data.tar.xz && \
2929
mv ./lib /out/
3030

3131
FROM scratch
3232
ENTRYPOINT []
3333
CMD []
3434
WORKDIR /
35-
COPY --from=kernel-builder /out/* /
35+
COPY --from=kernel-builder /out/* /lib/

‎dockerfiles/uos/dockerfiles/firmware/Dockerfile.redhat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ FROM scratch
2525
ENTRYPOINT []
2626
CMD []
2727
WORKDIR /
28-
COPY --from=kernel-builder /out/* /
28+
COPY --from=kernel-builder /out/* /lib/

‎dockerfiles/uos/dockerfiles/firmware/Dockerfile.ubuntu‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM alpine:3.12 as kernel-builder
55
LABEL maintainer "Bryan J Rodriguez <bryan.j.rodriguez@intel.com>"
66

77
ARG UBUNTU_RELEASE=5.15.0-23-generic
8-
ARG FIRMWARE=1.201.5_all
8+
ARG FIRMWARE=1.187.32_all
99

1010
RUN apk update && apk add --no-cache \
1111
bash \
@@ -14,7 +14,7 @@ RUN apk update && apk add --no-cache \
1414
rpm \
1515
cpio \
1616
binutils \
17-
zstd
17+
zstd
1818

1919
WORKDIR /build
2020
RUN mkdir /out
@@ -26,11 +26,11 @@ RUN mkdir /out
2626
RUN wget https://mirrors.edge.kernel.org/ubuntu/pool/main/l/linux-firmware/linux-firmware_${FIRMWARE}.deb
2727

2828
RUN ar x linux-firmware_${FIRMWARE}.deb && \
29-
tar -xf data.tar.zst && \
29+
tar -xf data.tar.xz && \
3030
mv ./lib /out/
3131

3232
FROM scratch
3333
ENTRYPOINT []
3434
CMD []
3535
WORKDIR /
36-
COPY --from=kernel-builder /out/* /
36+
COPY --from=kernel-builder /out/* /lib/

0 commit comments

Comments
 (0)