Last active
January 23, 2017 19:40
-
-
Save salekseev/b5ad2a7dd436733dddbe28f9aa9c112f to your computer and use it in GitHub Desktop.
Patches for ZfsOnLinux to build packages on OracleLinux with UEK kernels
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -Naur spl-0.6.5.8.orig/rpm/generic/spl-dkms.spec.in spl-0.6.5.8/rpm/generic/spl-dkms.spec.in | |
| --- spl-0.6.5.8.orig/rpm/generic/spl-dkms.spec.in 2017-01-23 14:36:09.403082000 -0500 | |
| +++ spl-0.6.5.8/rpm/generic/spl-dkms.spec.in 2017-01-23 14:36:23.151812000 -0500 | |
| @@ -18,7 +18,7 @@ | |
| Requires: dkms >= 2.2.0.2 | |
| Requires: gcc, make, perl | |
| -Requires: kernel-devel | |
| +Requires: kernel-uek-devel | |
| Provides: %{module}-kmod = %{version} | |
| %description | |
| diff -Naur spl-0.6.5.8.orig/rpm/generic/spl-kmod.spec.in spl-0.6.5.8/rpm/generic/spl-kmod.spec.in | |
| --- spl-0.6.5.8.orig/rpm/generic/spl-kmod.spec.in 2017-01-23 14:36:09.406080000 -0500 | |
| +++ spl-0.6.5.8/rpm/generic/spl-kmod.spec.in 2017-01-23 14:36:23.153810000 -0500 | |
| @@ -33,15 +33,15 @@ | |
| %if %{defined repo} | |
| # Building for a repository use the proper build-sysbuild package | |
| -# to determine which kernel-devel packages should be installed. | |
| +# to determine which kernel-uek-devel packages should be installed. | |
| BuildRequires: %{_bindir}/kmodtool | |
| %{!?kernels:BuildRequires: buildsys-build-%{repo}-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu}} | |
| %else | |
| # Building local packages attempt to to use the installed kernel. | |
| -%{?rhel:BuildRequires: kernel-devel} | |
| -%{?fedora:BuildRequires: kernel-devel} | |
| +%{?rhel:BuildRequires: kernel-uek-devel} | |
| +%{?fedora:BuildRequires: kernel-uek-devel} | |
| %{?suse_version:BuildRequires: kernel-source} | |
| %if !%{defined kernels} && !%{defined build_src_rpm} | |
| diff -Naur spl-0.6.5.8.orig/rpm/redhat/spl-dkms.spec.in spl-0.6.5.8/rpm/redhat/spl-dkms.spec.in | |
| --- spl-0.6.5.8.orig/rpm/redhat/spl-dkms.spec.in 2017-01-23 14:36:09.411074000 -0500 | |
| +++ spl-0.6.5.8/rpm/redhat/spl-dkms.spec.in 2017-01-23 14:36:23.154812000 -0500 | |
| @@ -18,7 +18,7 @@ | |
| Requires: dkms >= 2.2.0.2 | |
| Requires: gcc, make, perl | |
| -Requires: kernel-devel | |
| +Requires: kernel-uek-devel | |
| Provides: %{module}-kmod = %{version} | |
| %description | |
| diff -Naur spl-0.6.5.8.orig/scripts/kmodtool spl-0.6.5.8/scripts/kmodtool | |
| --- spl-0.6.5.8.orig/scripts/kmodtool 2017-01-23 14:36:09.416079000 -0500 | |
| +++ spl-0.6.5.8/scripts/kmodtool 2017-01-23 14:36:23.157809000 -0500 | |
| @@ -165,8 +165,8 @@ | |
| # second part | |
| if [[ ! "${customkernel}" ]]; then | |
| cat <<EOF | |
| -Requires: kernel-uname-r = ${kernel_uname_r} | |
| -BuildRequires: kernel-devel-uname-r = ${kernel_uname_r} | |
| +Requires: kernel-uek-uname-r = ${kernel_uname_r} | |
| +BuildRequires: kernel-uek-devel-uname-r = ${kernel_uname_r} | |
| %{?KmodsRequires:Requires: %{KmodsRequires}-uname-r = ${kernel_uname_r}} | |
| %{?KmodsRequires:BuildRequires: %{KmodsRequires}-uname-r = ${kernel_uname_r}} | |
| %post -n kmod-${kmodname}-${kernel_uname_r} | |
| @@ -279,8 +279,8 @@ | |
| # second part | |
| if [[ ! "${customkernel}" ]]; then | |
| cat <<EOF | |
| -Requires: kernel-devel-uname-r = ${kernel_uname_r} | |
| -BuildRequires: kernel-devel-uname-r = ${kernel_uname_r} | |
| +Requires: kernel-uek-devel-uname-r = ${kernel_uname_r} | |
| +BuildRequires: kernel-uek-devel-uname-r = ${kernel_uname_r} | |
| %{?KmodsDevelRequires:Requires: %{KmodsDevelRequires}-uname-r = ${kernel_uname_r}} | |
| %{?KmodsDevelRequires:BuildRequires: %{KmodsDevelRequires}-uname-r = ${kernel_uname_r}} | |
| EOF |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -Naur zfs-0.6.5.8.orig/rpm/generic/zfs-dkms.spec.in zfs-0.6.5.8/rpm/generic/zfs-dkms.spec.in | |
| --- zfs-0.6.5.8.orig/rpm/generic/zfs-dkms.spec.in 2017-01-23 14:39:24.445359000 -0500 | |
| +++ zfs-0.6.5.8/rpm/generic/zfs-dkms.spec.in 2017-01-23 14:39:30.693239000 -0500 | |
| @@ -19,7 +19,7 @@ | |
| Requires: dkms >= 2.2.0.3-20 | |
| Requires: spl-dkms = %{version} | |
| Requires: gcc, make, perl | |
| -Requires: kernel-devel | |
| +Requires: kernel-uek-devel | |
| Provides: %{module}-kmod = %{version} | |
| %description | |
| diff -Naur zfs-0.6.5.8.orig/rpm/generic/zfs-kmod.spec.in zfs-0.6.5.8/rpm/generic/zfs-kmod.spec.in | |
| --- zfs-0.6.5.8.orig/rpm/generic/zfs-kmod.spec.in 2017-01-23 14:39:24.447363000 -0500 | |
| +++ zfs-0.6.5.8/rpm/generic/zfs-kmod.spec.in 2017-01-23 14:39:30.694240000 -0500 | |
| @@ -59,15 +59,15 @@ | |
| %if %{defined repo} | |
| # Building for a repository use the proper build-sysbuild package | |
| -# to determine which kernel-devel packages should be installed. | |
| +# to determine which kernel-uek-devel packages should be installed. | |
| BuildRequires: %{_bindir}/kmodtool | |
| %{!?kernels:BuildRequires: buildsys-build-%{repo}-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu}} | |
| %else | |
| # Building local packages attempt to to use the installed kernel. | |
| -%{?rhel:BuildRequires: kernel-devel} | |
| -%{?fedora:BuildRequires: kernel-devel} | |
| +%{?rhel:BuildRequires: kernel-uek-devel} | |
| +%{?fedora:BuildRequires: kernel-uek-devel} | |
| %{?suse_version:BuildRequires: kernel-source} | |
| %if !%{defined kernels} && !%{defined build_src_rpm} | |
| diff -Naur zfs-0.6.5.8.orig/rpm/redhat/zfs-dkms.spec.in zfs-0.6.5.8/rpm/redhat/zfs-dkms.spec.in | |
| --- zfs-0.6.5.8.orig/rpm/redhat/zfs-dkms.spec.in 2017-01-23 14:39:24.441366000 -0500 | |
| +++ zfs-0.6.5.8/rpm/redhat/zfs-dkms.spec.in 2017-01-23 14:39:30.691239000 -0500 | |
| @@ -19,7 +19,7 @@ | |
| Requires: dkms >= 2.2.0.3-20 | |
| Requires: spl-dkms = %{version} | |
| Requires: gcc, make, perl | |
| -Requires: kernel-devel | |
| +Requires: kernel-uek-devel | |
| Provides: %{module}-kmod = %{version} | |
| %description | |
| diff -Naur zfs-0.6.5.8.orig/scripts/kmodtool zfs-0.6.5.8/scripts/kmodtool | |
| --- zfs-0.6.5.8.orig/scripts/kmodtool 2017-01-23 14:39:24.453364000 -0500 | |
| +++ zfs-0.6.5.8/scripts/kmodtool 2017-01-23 14:39:30.697239000 -0500 | |
| @@ -165,8 +165,8 @@ | |
| # second part | |
| if [[ ! "${customkernel}" ]]; then | |
| cat <<EOF | |
| -Requires: kernel-uname-r = ${kernel_uname_r} | |
| -BuildRequires: kernel-devel-uname-r = ${kernel_uname_r} | |
| +Requires: kernel-uek-uname-r = ${kernel_uname_r} | |
| +BuildRequires: kernel-uek-devel-uname-r = ${kernel_uname_r} | |
| %{?KmodsRequires:Requires: %{KmodsRequires}-uname-r = ${kernel_uname_r}} | |
| %{?KmodsRequires:BuildRequires: %{KmodsRequires}-uname-r = ${kernel_uname_r}} | |
| %post -n kmod-${kmodname}-${kernel_uname_r} | |
| @@ -279,8 +279,8 @@ | |
| # second part | |
| if [[ ! "${customkernel}" ]]; then | |
| cat <<EOF | |
| -Requires: kernel-devel-uname-r = ${kernel_uname_r} | |
| -BuildRequires: kernel-devel-uname-r = ${kernel_uname_r} | |
| +Requires: kernel-uek-devel-uname-r = ${kernel_uname_r} | |
| +BuildRequires: kernel-uek-devel-uname-r = ${kernel_uname_r} | |
| %{?KmodsDevelRequires:Requires: %{KmodsDevelRequires}-uname-r = ${kernel_uname_r}} | |
| %{?KmodsDevelRequires:BuildRequires: %{KmodsDevelRequires}-uname-r = ${kernel_uname_r}} | |
| EOF |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment