1. photon
  2. Commit 678bc40f3b890a252f7bc68f5c749390582d5b05
Browse code

kernels: version update

Extras:
- linux-esx: .config: use =y for vmxnet3 instead of =m, use lz4 for bzImage.

Change-Id: I4a2abc8cf05e74dd13e5b8e22aaff95a2a14ff88
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5325
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Srivatsa S. Bhat <srivatsab@vmware.com>

Alexey Makhalov authored on 2018/07/07 11:42:55
Showing 6 changed files
SPECS/linux-api-headers/linux-api-headers.spec
History View file @ 678bc40
... ... 
@@ -1,6 +1,6 @@
1 1 
 Summary:	Linux API header files
2 2 
 Name:		linux-api-headers
3 
-Version:	4.9.109
3 
+Version:	4.9.111
4 4 
 Release:	1%{?dist}
5 5 
 License:	GPLv2
6 6 
 URL:		http://www.kernel.org/
... ... 
@@ -8,7 +8,7 @@ Group:		System Environment/Kernel
8 8 
 Vendor:		VMware, Inc.
9 9 
 Distribution: Photon
10 10 
 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
11 
-%define sha1 linux=9d3af34a31661b2c7f6bea5682deb131c406f3d6
11 
+%define sha1 linux=4130f2b7979e04c94bef21755d413560961311a3
12 12 
 BuildArch:	noarch
13 13 
 Patch0:         Implement-the-f-xattrat-family-of-functions.patch
14 14 
 %description
... ... 
@@ -27,6 +27,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de
27 27 
 %defattr(-,root,root)
28 28 
 %{_includedir}/*
29 29 
 %changelog
30 
+*   Sat Jul 07 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.111-1
31 
+-   Update to version 4.9.111
30 32 
 *   Thu Jun 21 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-1
31 33 
 -   Update to version 4.9.109
32 34 
 *   Mon May 21 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.101-2
SPECS/linux/config-esx
History View file @ 678bc40
... ... 
@@ -64,9 +64,9 @@ CONFIG_HAVE_KERNEL_LZ4=y
64 64 
 # CONFIG_KERNEL_GZIP is not set
65 65 
 # CONFIG_KERNEL_BZIP2 is not set
66 66 
 # CONFIG_KERNEL_LZMA is not set
67 
-CONFIG_KERNEL_XZ=y
67 
+# CONFIG_KERNEL_XZ is not set
68 68 
 # CONFIG_KERNEL_LZO is not set
69 
-# CONFIG_KERNEL_LZ4 is not set
69 
+CONFIG_KERNEL_LZ4=y
70 70 
 CONFIG_DEFAULT_HOSTNAME=""
71 71 
 CONFIG_SWAP=y
72 72 
 CONFIG_SYSVIPC=y
... ... 
@@ -1720,7 +1720,7 @@ CONFIG_E1000E=m
1720 1720 
 # Enable WiMAX (Networking options) to see the WiMAX drivers
1721 1721 
 #
1722 1722 
 # CONFIG_WAN is not set
1723 
-CONFIG_VMXNET3=m
1723 
+CONFIG_VMXNET3=y
1724 1724 
 # CONFIG_FUJITSU_ES is not set
1725 1725 
 # CONFIG_ISDN is not set
1726 1726 
 # CONFIG_NVM is not set
SPECS/linux/linux-aws.spec
History View file @ 678bc40
... ... 
@@ -1,15 +1,15 @@
1 1 
 %global security_hardening none
2 2 
 Summary:        Kernel
3 3 
 Name:           linux-aws
4 
-Version:        4.9.109
5 
-Release:        2%{?kat_build:.%kat_build}%{?dist}
4 
+Version:        4.9.111
5 
+Release:        1%{?kat_build:.%kat_build}%{?dist}
6 6 
 License:    	GPLv2
7 7 
 URL:        	http://www.kernel.org/
8 8 
 Group:        	System Environment/Kernel
9 9 
 Vendor:         VMware, Inc.
10 10 
 Distribution: 	Photon
11 11 
 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
12 
-%define sha1 linux=9d3af34a31661b2c7f6bea5682deb131c406f3d6
12 
+%define sha1 linux=4130f2b7979e04c94bef21755d413560961311a3
13 13 
 Source1:	config-aws
14 14 
 Source2:	initramfs.trigger
15 15 
 # common
... ... 
@@ -451,6 +451,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
451 451 
 /usr/share/doc/*
452 452
453 453 
 %changelog
454 
+*   Sat Jul 07 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.111-1
455 
+-   Update to version 4.9.111
454 456 
 *   Wed Jun 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-2
455 457 
 -   Add rdrand-based RNG driver to enhance kernel entropy.
456 458 
 *   Thu Jun 21 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-1
SPECS/linux/linux-esx.spec
History View file @ 678bc40
... ... 
@@ -1,15 +1,15 @@
1 1 
 %global security_hardening none
2 2 
 Summary:        Kernel
3 3 
 Name:           linux-esx
4 
-Version:        4.9.109
5 
-Release:        4%{?dist}
4 
+Version:        4.9.111
5 
+Release:        1%{?dist}
6 6 
 License:        GPLv2
7 7 
 URL:            http://www.kernel.org/
8 8 
 Group:          System Environment/Kernel
9 9 
 Vendor:         VMware, Inc.
10 10 
 Distribution:   Photon
11 11 
 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
12 
-%define sha1 linux=9d3af34a31661b2c7f6bea5682deb131c406f3d6
12 
+%define sha1 linux=4130f2b7979e04c94bef21755d413560961311a3
13 13 
 Source1:        config-esx
14 14 
 Source2:        initramfs.trigger
15 15 
 # common
... ... 
@@ -85,6 +85,7 @@ BuildRequires: libmspack-devel
85 85 
 BuildRequires: Linux-PAM-devel
86 86 
 BuildRequires: openssl-devel
87 87 
 BuildRequires: procps-ng-devel
88 
+BuildRequires: lz4
88 89 
 Requires:      filesystem kmod
89 90 
 Requires(post):(coreutils or toybox)
90 91 
 %define uname_r %{version}-%{release}-esx
... ... 
@@ -258,6 +259,9 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
258 258 
 /usr/src/linux-headers-%{uname_r}
259 259
260 260 
 %changelog
261 
+*   Sat Jul 07 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.111-1
262 
+-   Update to version 4.9.111.
263 
+-   .config: use =y for vmxnet3 instead of =m, use lz4 for bzImage.
261 264 
 *   Sun Jul 01 2018 Ron Jaegers <ron.jaegers@gmail.com> 4.9.109-4
262 265 
 -   Enable USB_ACM support in the config.
263 266 
 *   Wed Jun 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-3
SPECS/linux/linux-secure.spec
History View file @ 678bc40
... ... 
@@ -1,15 +1,15 @@
1 1 
 %global security_hardening none
2 2 
 Summary:        Kernel
3 3 
 Name:           linux-secure
4 
-Version:        4.9.109
5 
-Release:        2%{?kat_build:.%kat_build}%{?dist}
4 
+Version:        4.9.111
5 
+Release:        1%{?kat_build:.%kat_build}%{?dist}
6 6 
 License:        GPLv2
7 7 
 URL:            http://www.kernel.org/
8 8 
 Group:          System Environment/Kernel
9 9 
 Vendor:         VMware, Inc.
10 10 
 Distribution:   Photon
11 11 
 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
12 
-%define sha1 linux=9d3af34a31661b2c7f6bea5682deb131c406f3d6
12 
+%define sha1 linux=4130f2b7979e04c94bef21755d413560961311a3
13 13 
 Source1:        config-secure
14 14 
 Source2:        aufs4.9.tar.gz
15 15 
 %define sha1 aufs=ebe716ce4b638a3772c7cd3161abbfe11d584906
... ... 
@@ -346,6 +346,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
346 346 
 /usr/src/linux-headers-%{uname_r}
347 347
348 348 
 %changelog
349 
+*   Sat Jul 07 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.111-1
350 
+-   Update to version 4.9.111
349 351 
 *   Wed Jun 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-2
350 352 
 -   Add rdrand-based RNG driver to enhance kernel entropy.
351 353 
 *   Thu Jun 21 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-1
SPECS/linux/linux.spec
History View file @ 678bc40
... ... 
@@ -1,15 +1,15 @@
1 1 
 %global security_hardening none
2 2 
 Summary:        Kernel
3 3 
 Name:           linux
4 
-Version:        4.9.109
5 
-Release:        3%{?kat_build:.%kat_build}%{?dist}
4 
+Version:        4.9.111
5 
+Release:        1%{?kat_build:.%kat_build}%{?dist}
6 6 
 License:    	GPLv2
7 7 
 URL:        	http://www.kernel.org/
8 8 
 Group:        	System Environment/Kernel
9 9 
 Vendor:         VMware, Inc.
10 10 
 Distribution: 	Photon
11 11 
 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
12 
-%define sha1 linux=9d3af34a31661b2c7f6bea5682deb131c406f3d6
12 
+%define sha1 linux=4130f2b7979e04c94bef21755d413560961311a3
13 13 
 Source1:	config
14 14 
 Source2:	initramfs.trigger
15 15 
 %define ena_version 1.1.3
... ... 
@@ -373,6 +373,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
373 373 
 /usr/share/doc/*
374 374
375 375 
 %changelog
376 
+*   Sat Jul 07 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.111-1
377 
+-   Update to version 4.9.111
376 378 
 *   Sun Jul 01 2018 Ron Jaegers <ron.jaegers@gmail.com> 4.9.109-3
377 379 
 -   Enable USB_ACM support in the config.
378 380 
 *   Wed Jun 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-2