Skip to content

Commit

Permalink
Add new version of cdrkit that may compile.
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Lalancette <[email protected]>
  • Loading branch information
clalancette committed Mar 24, 2024
1 parent d5e45f7 commit f49f651
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 12 additions & 1 deletion vendor/README
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.

3 changes: 3 additions & 0 deletions vendor/cdrkit-1.1.11-fedora40-patched.tar.gz
Git LFS file not shown

0 comments on commit f49f651

Please sign in to comment.