From f49f651fb4e97e5e432ad892ba4a55b80ddcd3c0 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Sat, 23 Mar 2024 20:50:19 -0400 Subject: [PATCH] Add new version of cdrkit that may compile. Signed-off-by: Chris Lalancette --- .github/workflows/test.yml | 2 +- vendor/README | 13 ++++++++++++- vendor/cdrkit-1.1.11-fedora40-patched.tar.gz | 3 +++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 vendor/cdrkit-1.1.11-fedora40-patched.tar.gz diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5bb29ce..10b2ded8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,7 +39,7 @@ jobs: - name: Build patched cdrkit run: | pushd vendor - tar -xvf cdrkit-1.1.11-fedora29-patched.tar.gz + tar -xvf cdrkit-1.1.11-fedora40-patched.tar.gz pushd cdrkit-1.1.11 mkdir build pushd build diff --git a/vendor/README b/vendor/README index b1ef5de6..1f3daf13 100644 --- a/vendor/README +++ b/vendor/README @@ -1,6 +1,18 @@ This directory contains vendored files stored in Git-LFS (https://git-lfs.github.com/). In particular: +- cdrkit-1.1.11-fedora40-patched.tar.gz + A vendored version of cdrkit (and more specifically, genisoimage) used to + run the tests. We vendor this because the different versions of genisoimage + actually put things in different places on the ISO, and this messes with the + tests checking where things are in the ISO. This doesn't mean that pycdlib + can only open ISOs from genisoimage; it just means the tests expect that + particular layout. This file was created by downloading the cdrkit source + RPM from koji (https://kojipkgs.fedoraproject.org//packages/cdrkit/1.1.11/54.fc40/src/cdrkit-1.1.11-54.fc40.src.rpm, + though that URI may not exist anymore). The package was then installed + (rpm -ivh /path/to/*.src.rpm), and then the original source tarball with + patches was prepared (rpmbuild -bp cdrkit.spec). It was then tarred back up. + - cdrkit-1.1.11-fedora29-patched.tar.gz A vendored version of cdrkit (and more specifically, genisoimage) used to run the tests. We vendor this because the different versions of genisoimage @@ -14,4 +26,3 @@ Git-LFS (https://git-lfs.github.com/). In particular: exploded (tar -xvf ~/rpmbuild/cdrkit-1.1.11.tar.gz), and then the patches from the source RPM were applied in order. The "icedax" directory was also removed from CMakeLists.txt After all of that, it was tarred back up. - diff --git a/vendor/cdrkit-1.1.11-fedora40-patched.tar.gz b/vendor/cdrkit-1.1.11-fedora40-patched.tar.gz new file mode 100644 index 00000000..2a163e41 --- /dev/null +++ b/vendor/cdrkit-1.1.11-fedora40-patched.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a504460c5fbb16e3edbb4adbac9f2cc3ce33dd85f61d66f6f1af61397957456 +size 1928434