Skip to content

Commit

Permalink
live-iso: switch from squashfs to erofs
Browse files Browse the repository at this point in the history
  • Loading branch information
nikita-dubrovskii committed Jan 30, 2025
1 parent 575a172 commit 4bf53a4
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
18 changes: 9 additions & 9 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -158,28 +158,28 @@ write_archive_info() {
}

patch_osbuild() {
return # we have no patches right now
# return # we have no patches right now

## Add a few patches that either haven't made it into a release or
## that will be obsoleted with other work that will be done soon.

## To make it easier to apply patches we'll move around the osbuild
## code on the system first:
#rmdir /usr/lib/osbuild/osbuild
#mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
#mkdir /usr/lib/osbuild/tools
#mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
rmdir /usr/lib/osbuild/osbuild
mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
mkdir /usr/lib/osbuild/tools
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/

## Now all the software is under the /usr/lib/osbuild dir and we can patch
#cat patch1.patch \
cat src/0001-stages-coreos.live-artifacts-add-erofs-support.patch | patch -d /usr/lib/osbuild -p1
# patch2.patch \
# | patch -d /usr/lib/osbuild -p1

## And then move the files back; supermin appliance creation will need it back
## in the places delivered by the RPM.
#mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
#mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
#mkdir /usr/lib/osbuild/osbuild
mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
mkdir /usr/lib/osbuild/osbuild
}

if [ $# -ne 0 ]; then
Expand Down
3 changes: 3 additions & 0 deletions src/deps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,6 @@ fedora-repos-ostree

# For graphing manifest includes using `manifest_graph`
python-anytree

# For mkfs.erofs
erofs-utils
1 change: 1 addition & 0 deletions src/osbuild-manifests/platform.live.ipp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ pipelines:
file:
mpp-format-string: '/{artifact_name_prefix}-metal4k.{arch}.raw'
options:
erofs: true
filenames:
live-iso:
mpp-format-string: '{artifact_name_prefix}-live-iso.{arch}.iso'
Expand Down
2 changes: 1 addition & 1 deletion src/vmdeps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
bash vim-minimal coreutils util-linux procps-ng kmod kernel-modules

# For generating ISO images
genisoimage squashfs-tools
genisoimage squashfs-tools erofs-utils

# for composes
rpm-ostree distribution-gpg-keys jq
Expand Down

0 comments on commit 4bf53a4

Please sign in to comment.