forked from vmware/photon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Change-Id: Ib237e436cbb1f606f0dbe29211e227f1310f6881 Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/11529 Tested-by: Srivatsa S. Bhat <[email protected]> Reviewed-by: Srivatsa S. Bhat <[email protected]>
- Loading branch information
Showing
2 changed files
with
20 additions
and
24 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
| Summary: Kernel | ||
| Name: linux-esx | ||
| Version: 5.9.0 | ||
| Release: rc7.2%{?kat_build:.kat}%{?dist} | ||
| Release: 1%{?kat_build:.kat}%{?dist} | ||
| License: GPLv2 | ||
| URL: http://www.kernel.org/ | ||
| Group: System Environment/Kernel | ||
|
|
@@ -12,12 +12,8 @@ Distribution: Photon | |
|
|
||
| %define uname_r %{version}-%{release}-esx | ||
|
|
||
| #TODO: remove rcN after 5.9 goes out of rc | ||
| %define lnx_rc_ver 5.9.0-rc7 | ||
| %define lnx_rc_local_ver .2%{?kat_build:.kat}%{?dist} | ||
|
|
||
| Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{lnx_rc_ver}.tar.xz | ||
| %define sha1 linux=b8809bb16a9591303ac2bb84e19a597e26b69c4c | ||
| Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{version}.tar.xz | ||
| %define sha1 linux=26fefa389c711da70543092fbb121a023f1b0fb8 | ||
| Source1: config-esx | ||
| Source2: initramfs.trigger | ||
| Source3: pre-preun-postun-tasks.inc | ||
|
|
@@ -209,8 +205,8 @@ Enhances: %{name} | |
| This Linux package contains hmac sha generator kernel module. | ||
|
|
||
| %prep | ||
| %setup -q -n linux-%{lnx_rc_ver} | ||
| %setup -D -b 5 -n linux-%{lnx_rc_ver} | ||
| %setup -q -n linux-%{version} | ||
| %setup -D -b 5 -n linux-%{version} | ||
|
|
||
| %patch0 -p1 | ||
| %patch1 -p1 | ||
|
|
@@ -342,7 +338,7 @@ This Linux package contains hmac sha generator kernel module. | |
| %build | ||
| make mrproper | ||
| cp %{SOURCE1} .config | ||
| sed -i 's/CONFIG_LOCALVERSION="-esx"/CONFIG_LOCALVERSION="%{lnx_rc_local_ver}-esx"/' .config | ||
| sed -i 's/CONFIG_LOCALVERSION="-esx"/CONFIG_LOCALVERSION="-%{release}-esx"/' .config | ||
|
|
||
| %include %{SOURCE4} | ||
|
|
||
|
|
@@ -460,6 +456,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg | |
| /lib/modules/%{uname_r}/extra/.hmac_generator.ko.xz.hmac | ||
|
|
||
| %changelog | ||
| * Mon Oct 19 2020 Bo Gan <[email protected]> 5.9.0-1 | ||
| - Update to 5.9.0 | ||
| * Wed Oct 08 2020 Ankit Jain <[email protected]> 5.9.0-rc7.2 | ||
| - Added vtar Support. | ||
| - Disabled by default, Enable CONFIG_VTAR as builtin only | ||
|
|
||
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,7 @@ | |
| Summary: Kernel | ||
| Name: linux | ||
| Version: 5.9.0 | ||
| Release: rc7.1%{?kat_build:.kat}%{?dist} | ||
| Release: 1%{?kat_build:.kat}%{?dist} | ||
| License: GPLv2 | ||
| URL: http://www.kernel.org/ | ||
| Group: System Environment/Kernel | ||
|
|
@@ -23,12 +23,8 @@ Distribution: Photon | |
|
|
||
| %define uname_r %{version}-%{release} | ||
|
|
||
| #TODO: remove rcN after 5.9 goes out of rc | ||
| %define lnx_rc_ver 5.9.0-rc7 | ||
| %define lnx_rc_local_ver .1%{?kat_build:.kat}%{?dist} | ||
|
|
||
| Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{lnx_rc_ver}.tar.xz | ||
| %define sha1 linux=b8809bb16a9591303ac2bb84e19a597e26b69c4c | ||
| Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{version}.tar.xz | ||
| %define sha1 linux=26fefa389c711da70543092fbb121a023f1b0fb8 | ||
| Source1: config_%{_arch} | ||
| Source2: initramfs.trigger | ||
| %define ena_version 2.2.11 | ||
|
|
@@ -286,14 +282,14 @@ This Linux package contains hmac sha generator kernel module. | |
|
|
||
| %prep | ||
| #TODO: remove rcN after 5.9 goes out of rc | ||
| %setup -q -n linux-%{lnx_rc_ver} | ||
| %setup -q -n linux-%{version} | ||
| %ifarch x86_64 | ||
| %setup -D -b 3 -n linux-%{lnx_rc_ver} | ||
| %setup -D -b 4 -n linux-%{lnx_rc_ver} | ||
| %setup -D -b 5 -n linux-%{lnx_rc_ver} | ||
| %setup -D -b 10 -n linux-%{lnx_rc_ver} | ||
| %setup -D -b 3 -n linux-%{version} | ||
| %setup -D -b 4 -n linux-%{version} | ||
| %setup -D -b 5 -n linux-%{version} | ||
| %setup -D -b 10 -n linux-%{version} | ||
| %endif | ||
| %setup -D -b 8 -n linux-%{lnx_rc_ver} | ||
| %setup -D -b 8 -n linux-%{version} | ||
|
|
||
| %patch0 -p1 | ||
| %patch1 -p1 | ||
|
|
@@ -417,7 +413,7 @@ This Linux package contains hmac sha generator kernel module. | |
| make mrproper | ||
| cp %{SOURCE1} .config | ||
|
|
||
| sed -i 's/CONFIG_LOCALVERSION=""/CONFIG_LOCALVERSION="%{lnx_rc_local_ver}"/' .config | ||
| sed -i 's/CONFIG_LOCALVERSION=""/CONFIG_LOCALVERSION="-%{release}"/' .config | ||
|
|
||
| %include %{SOURCE7} | ||
|
|
||
|
|
@@ -722,6 +718,8 @@ getent group sgx_prv >/dev/null || groupadd -r sgx_prv | |
| %{python3_sitelib}/* | ||
|
|
||
| %changelog | ||
| * Mon Oct 19 2020 Bo Gan <[email protected]> 5.9.0-1 | ||
| - Update to 5.9.0 | ||
| * Wed Sep 30 2020 Srivatsa S. Bhat (VMware) <[email protected]> 5.9.0-rc7.1 | ||
| - Update to version 5.9.0-rc7 | ||
| * Mon Sep 21 2020 Bo Gan <[email protected]> 5.9.0-rc4.1 | ||
|
|
||