Skip to content

Commit

Permalink
cleanup dtb file references
Browse files Browse the repository at this point in the history
  • Loading branch information
ptrsr committed Aug 18, 2024
1 parent 11604f1 commit 05be2aa
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Free up disk space on github runner
uses: jlumbroso/free-disk-space@main
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
test:
needs: build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
publish: ${{ steps.check.outputs.publish }}
steps:
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
publish:
if: needs.test.outputs.publish == 'true'
needs: test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
environment: docker-hub
steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ Example use cases:

Key features:
- Pi 3, 4 and **5** support
- 64 bit (ARMv8) Raspberry PI OS (Bookworm, latest) included
- 64 bit (ARMv8) Raspberry PI OS (Bookworm) included
- image: **[2024-07-04-raspios-bookworm-arm64-lite](https://downloads.raspberrypi.com/raspios_lite_arm64/images/raspios_lite_arm64-2024-07-04/)**
- kernel: **[6.6-y](https://github.com/raspberrypi/linux/tree/rpi-6.6.y)**
- Internet access
- No root required
- Safe, fully reproducible from source
- Configurable kernel
- Wireguard module included
- Tested and stable

## Usage
Expand Down Expand Up @@ -120,7 +120,7 @@ ansible-playbook -i ./test/hosts.yml ./test/main.yml
- Make sure to regularly back up the `distro.qcow2` image.

## Versions
PI-CI should work on Ubuntu 18.04. It has automatically been tested on Ubuntu 20.04 using GitHub Actions. Any other distro should work with the following software versions (or higher, perhaps):
PI-CI has automatically been tested on Ubuntu 24.04 using GitHub Actions. Any other distro should work with the following software versions (or higher, perhaps):

| Software | Version |
| ----------| -------- |
Expand Down
1 change: 0 additions & 1 deletion dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ ENV APP_DIR=/app/

ENV IMAGE_FILE_NAME=distro.qcow2
ENV KERNEL_FILE_NAME=kernel.img
ENV DTB_FILE_NAME=pi3.dtb

# Copy build files
RUN mkdir $BASE_DIR
Expand Down
3 changes: 1 addition & 2 deletions src/app/func/init.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ def start(opts):

base_files = [
opts.IMAGE_FILE_NAME,
opts.KERNEL_FILE_NAME,
opts.DTB_FILE_NAME
opts.KERNEL_FILE_NAME
]

# Check and resolve required files for running emulator
Expand Down
4 changes: 1 addition & 3 deletions src/app/func/start.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ def start(opts):

base_files = [
opts.IMAGE_FILE_NAME,
opts.KERNEL_FILE_NAME,
opts.DTB_FILE_NAME
opts.KERNEL_FILE_NAME
]

# Check and resolve required files for running emulator
Expand All @@ -37,7 +36,6 @@ def start(opts):
run_dir = opts.DIST_DIR if has_volume else opts.BASE_DIR
image_path = f'{run_dir}/{opts.IMAGE_FILE_NAME}'
kernel_path = f'{run_dir}/{opts.KERNEL_FILE_NAME}'
dtb_path = f'{run_dir}/{opts.DTB_FILE_NAME}'

# Start emulator
log.info("Starting the emulator ...")
Expand Down

0 comments on commit 05be2aa

Please sign in to comment.