Skip to content

Commit 6559de6

Browse files
committed
resources: Update Dockerfile for building kernel and modules for 22.04 disk image
1 parent 05d7bce commit 6559de6

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

src/ubuntu-generic-diskimages/kernel-and-modules/arm-ubuntu-22.04/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@ RUN mkdir /workspace
2323
RUN cd /workspace && apt source linux-image-unsigned-5.15.0-25-generic
2424

2525
RUN cd /workspace/linux-5.15.0 && \
26+
cd scripts && \
27+
chmod +x pahole-version.sh && \
28+
cd .. && \
2629
make defconfig && \
27-
make -j $(nproc) && \
30+
make -j 32 && \
2831
make INSTALL_MOD_PATH=/workspace/output modules_install
2932

3033
RUN git clone https://github.com/gem5/gem5.git --depth=1 --filter=blob:none --no-checkout --sparse --single-branch --branch=release-staging-v24-1-1-0 && \
@@ -37,7 +40,7 @@ RUN git clone https://github.com/gem5/gem5.git --depth=1 --filter=blob:none --no
3740
RUN cd gem5/util/gem5_bridge && \
3841
make KMAKEDIR=/workspace/linux-5.15.0 INSTALL_MOD_PATH=/workspace/output build install
3942

40-
RUN cd /workspace/output/lib/modules/5.15.* && \
43+
RUN cd /workspace/output/lib/modules/5.15.168 && \
4144
rm -rf build source
4245

4346
FROM scratch AS export-stage

src/ubuntu-generic-diskimages/kernel-and-modules/arm-ubuntu-22.04/copy_modules_to_host.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Copyright (c) 2025 The Regents of the University of California.
44
# SPDX-License-Identifier: BSD 3-Clause
55

6-
DOCKERFILE="./22.04-dockerfile/Dockerfile"
7-
OUTPUT="my-arm-5.15.167-kernel"
6+
DOCKERFILE="Dockerfile"
7+
OUTPUT="my-arm-5.15.168-kernel"
88

99
# Build the Docker image
1010
DOCKER_BUILDKIT=1 docker build --no-cache \

src/ubuntu-generic-diskimages/packer-scripts/arm-ubuntu.pkr.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ locals {
3838
iso_checksum = "sha256:c209ab013280d3cd26a344def60b7b19fbb427de904ea285057d94ca6ac82dd5"
3939
output_dir = "arm-disk-image-22-04"
4040
http_directory = "http/arm-22-04"
41-
modules_dir = "kernel-and-modules/arm-ubuntu-22.04/my-arm-5.15.167-kernel/5.15.167"
41+
modules_dir = "kernel-and-modules/arm-ubuntu-22.04/my-arm-5.15.168-kernel/5.15.168"
4242
}
4343
"24.04" = {
4444
iso_url = "https://cdimage.ubuntu.com/releases/24.04/release/ubuntu-24.04-live-server-arm64.iso"

src/ubuntu-generic-diskimages/scripts/update-modules-arm-22.04.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
echo "Updating modules."
77

88
# moving modules to the correct location
9-
mv /home/gem5/5.15.167 /lib/modules/5.15.167
10-
depmod --quick -a 5.15.167
11-
update-initramfs -u -k 5.15.167
9+
mv /home/gem5/5.15.168 /lib/modules/5.15.168
10+
depmod --quick -a 5.15.168
11+
update-initramfs -u -k 5.15.168
1212

1313
echo "Modules updated."

0 commit comments

Comments
 (0)