Browse code

Disable interface renaming. Build Intel GigE, VMXNET3 in kernel.

Change-Id: I1419cfaa6b1c2a2321784a02c86ac75be1bcc64d
Reviewed-on: http://photon-jenkins.eng.vmware.com/798
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Mahmoud Bassiouny <mbassiouny@vmware.com>
(cherry picked from commit 2f6f1aaf87f0735466f7ddc5d160f170cc013186)
Reviewed-on: http://photon-jenkins.eng.vmware.com/874
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

Vinay Kulkarni authored on 2016/05/03 22:02:08
Showing 3 changed files
... ...
@@ -1895,8 +1895,8 @@ CONFIG_NET_VENDOR_HP=y
1895 1895
 CONFIG_HP100=m
1896 1896
 CONFIG_NET_VENDOR_INTEL=y
1897 1897
 CONFIG_E100=m
1898
-CONFIG_E1000=m
1899
-CONFIG_E1000E=m
1898
+CONFIG_E1000=y
1899
+CONFIG_E1000E=y
1900 1900
 CONFIG_IGB=m
1901 1901
 CONFIG_IGB_HWMON=y
1902 1902
 CONFIG_IGB_DCA=y
... ...
@@ -2025,7 +2025,7 @@ CONFIG_USB_NET_DRIVERS=m
2025 2025
 # CONFIG_WAN is not set
2026 2026
 CONFIG_XEN_NETDEV_FRONTEND=m
2027 2027
 # CONFIG_XEN_NETDEV_BACKEND is not set
2028
-CONFIG_VMXNET3=m
2028
+CONFIG_VMXNET3=y
2029 2029
 CONFIG_HYPERV_NET=m
2030 2030
 # CONFIG_ISDN is not set
2031 2031
 
... ...
@@ -2307,7 +2307,7 @@ CONFIG_I2C_PIIX4=m
2307 2307
 #
2308 2308
 # PPS support
2309 2309
 #
2310
-CONFIG_PPS=m
2310
+CONFIG_PPS=y
2311 2311
 # CONFIG_PPS_DEBUG is not set
2312 2312
 
2313 2313
 #
... ...
@@ -2324,7 +2324,7 @@ CONFIG_PPS=m
2324 2324
 #
2325 2325
 # PTP clock support
2326 2326
 #
2327
-CONFIG_PTP_1588_CLOCK=m
2327
+CONFIG_PTP_1588_CLOCK=y
2328 2328
 # CONFIG_DP83640_PHY is not set
2329 2329
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
2330 2330
 # CONFIG_GPIOLIB is not set
... ...
@@ -2,7 +2,7 @@
2 2
 Summary:        Kernel
3 3
 Name:           linux
4 4
 Version:    	4.2.0
5
-Release:    	26%{?dist}
5
+Release:    	27%{?dist}
6 6
 License:    	GPLv2
7 7
 URL:        	http://www.kernel.org/
8 8
 Group:        	System Environment/Kernel
... ...
@@ -178,6 +178,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg
178 178
 /lib/modules/%{version}/kernel/arch/x86/oprofile/
179 179
 
180 180
 %changelog
181
+*   Tue May 03 2016 Vinay Kulkarni <kulkarniv@vmware.com> 4.2.0-27
182
+-   Compile Intel GigE and VMXNET3 as part of kernel.
181 183
 *   Tue Apr 28 2016 Nick Shi <nshi@vmware.com> 4.2.0-26
182 184
 -   Compile cramfs.ko to allow mounting cramfs image
183 185
 *   Tue Apr 12 2016 Vinay Kulkarni <kulkarniv@vmware.com> 4.2.0-25
... ...
@@ -125,7 +125,7 @@ load_env -f "$BOOT_DIRECTORY"photon.cfg
125 125
 set_rootpartition
126 126
 
127 127
 menuentry "Photon" {
128
-    linux "$BOOT_DIRECTORY"\$photon_linux root=\$rootpartition \$photon_cmdline
128
+    linux "$BOOT_DIRECTORY"\$photon_linux root=\$rootpartition net.ifnames=0 \$photon_cmdline
129 129
     if [ "\$photon_initrd" ]; then
130 130
         initrd "$BOOT_DIRECTORY"\$photon_initrd
131 131
     fi