Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: ZFS for coreos, GTS version coreos #207

Merged
merged 12 commits into from
Jun 28, 2024
Merged

feat: ZFS for coreos, GTS version coreos #207

merged 12 commits into from
Jun 28, 2024

Conversation

m2Giles
Copy link
Member

@m2Giles m2Giles commented Jun 27, 2024

chore(ci): Proper Excludes

chore: workaround Tar Bug

Thank you for contributing to the Universal Blue project!

Please read the Contributor's Guide before submitting a pull request.

chore(ci): Proper Excludes

chore: workaround Tar Bug
@m2Giles m2Giles requested a review from castrojo as a code owner June 27, 2024 15:01
@m2Giles m2Giles changed the title feat: Use ucore zfs build script for coreos kernel feat: ZFS for coreOS, GTS coreos Jun 27, 2024
@m2Giles m2Giles changed the title feat: ZFS for coreOS, GTS coreos feat: ZFS for coreos, GTS version coreos Jun 27, 2024
/tmp/build-kmod-xone.sh
/tmp/build-kmod-xone.sh && \
if grep -q "coreos" <<< "${KERNEL_FLAVOR}"; then \
curl -Lo /tmp/zfs-kmod-spec-in.patch "https://raw.githubusercontent.com/ublue-os/ucore-kmods/main/zfs-kmod-spec-in.patch" && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You shouldn't need this patch because we won't be building older versions

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The patch and logic was still in Ucore. The only reason I'm not just curling Ucore's install script is the rpm-ostree zlib-devel there causing issues with F40. My preference would be to just curl that script and not have to do the figure out which zfs version dance.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. Understood. We need to cleanup the ucore-kmods version of the script of the also.

fi
if [ "${DO_PATCH}" -eq "0" ]; then
patch -b -uN -i zfs-kmod-spec-in.patch zfs-${ZFS_VERSION}/rpm/generic/zfs-kmod.spec.in
fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as the earlier comment, we don't need this whole patching section because the ZFS versions old enough to need the patch won't even compile on 6.8 or 6.9

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still in the Ucore one. As a heads up

@m2Giles m2Giles added this pull request to the merge queue Jun 28, 2024
Merged via the queue into main with commit cbf9ff7 Jun 28, 2024
30 checks passed
@m2Giles m2Giles deleted the coreos branch June 28, 2024 01:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants