@@ -1444,7 +1444,7 @@ CONFIG_MACVLAN=m

 # CONFIG_MACVTAP is not set

 # CONFIG_IPVLAN is not set

 CONFIG_VXLAN=m

-# CONFIG_GENEVE is not set

+CONFIG_GENEVE=m

 # CONFIG_NETCONSOLE is not set

 # CONFIG_NETPOLL is not set

 # CONFIG_NET_POLL_CONTROLLER is not set

@@ -1,56 +1,53 @@

 %global security_hardening none

-Summary:        Kernel

-Name:        linux-esx

-Version:    4.2.0

-Release:    5%{?dist}

-License:    GPLv2

-URL:        http://www.kernel.org/

-Group:        System Environment/Kernel

+Summary:       Kernel

+Name:          linux-esx

+Version:       4.2.0

+Release:       6%{?dist}

+License:       GPLv2

+URL:           http://www.kernel.org/

+Group:         System Environment/Kernel

 Vendor:        VMware, Inc.

-Distribution: Photon

-Source0:    http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.xz

+Distribution:  Photon

+Source0:       http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.xz

 %define sha1 linux=5e65d0dc94298527726fcd7458b6126e60fb2a8a

-Source1:	config-esx-%{version}

-patch1:		01-clear-linux.patch

-patch2:		02-pci-probe.patch

-patch3:		03-poweroff.patch

-patch4:		04-quiet-boot.patch

-patch5:		05-pv-ops.patch

-

-BuildRequires:    bc

-BuildRequires:    kbd

-BuildRequires:    kmod

-BuildRequires:     glib-devel

-BuildRequires:     xerces-c-devel

-BuildRequires:     xml-security-c-devel

-BuildRequires:     libdnet

-BuildRequires:     libmspack

-BuildRequires:    Linux-PAM

-BuildRequires:    openssl-devel

-BuildRequires:    procps-ng-devel

-Requires:    filesystem kmod coreutils

+Source1:       config-esx-%{version}

+patch1:        01-clear-linux.patch

+patch2:        02-pci-probe.patch

+patch3:        03-poweroff.patch

+patch4:        04-quiet-boot.patch

+patch5:        05-pv-ops.patch

+BuildRequires: bc 

+BuildRequires: kbd

+BuildRequires: kmod

+BuildRequires: glib-devel

+BuildRequires: xerces-c-devel

+BuildRequires: xml-security-c-devel

+BuildRequires: libdnet

+BuildRequires: libmspack

+BuildRequires: Linux-PAM

+BuildRequires: openssl-devel

+BuildRequires: procps-ng-devel

+Requires:      filesystem kmod coreutils

 %description

 The Linux kernel build for GOS for VMware hypervisor.

-

-

-%package dev

-Summary:    Kernel Dev

-Group:        System Environment/Kernel

-Requires:    python2

-%description dev

+%package devel

+Summary:       Kernel Dev

+Group:         System Environment/Kernel

+Requires:      python2

+Requires:      %{name} = %{version}-%{release}

+%description devel

 The Linux package contains the Linux kernel dev files

 %package docs

-Summary:    Kernel docs

-Group:        System Environment/Kernel

-Requires:    python2

+Summary:       Kernel docs

+Group:         System Environment/Kernel

+Requires:      python2

+Requires:      %{name} = %{version}-%{release}

 %description docs

 The Linux package contains the Linux kernel doc files

-

-

 %prep

 %setup -q -n linux-4.2

 %patch1 -p1

@@ -70,6 +67,7 @@ install -vdm 755 %{buildroot}/etc

 install -vdm 755 %{buildroot}/boot

 install -vdm 755 %{buildroot}%{_defaultdocdir}/linux-esx-%{version}

 install -vdm 755 %{buildroot}/etc/modprobe.d

+install -vdm 755 %{buildroot}/usr/src/%{name}-headers-%{version}-%{release}

 make INSTALL_MOD_PATH=%{buildroot} modules_install

 cp -v arch/x86/boot/bzImage    %{buildroot}/boot/vmlinuz-esx-%{version}

 cp -v System.map        %{buildroot}/boot/system.map-esx-%{version}

@@ -79,10 +77,25 @@ cp -r Documentation/*        %{buildroot}%{_defaultdocdir}/linux-esx-%{version}

 # TODO: noacpi acpi=off noapic pci=conf1,nodomains pcie_acpm=off pnpacpi=off

 cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"

 # GRUB Environment Block

-photon_cmdline=init=/lib/systemd/systemd no_timer_check rcupdate.rcu_expedited=1 rootfstype=ext4 rw systemd.show_status=0 quiet nordrand noreplace-smp cpu_init_udelay=0 plymouth.enable=0

+photon_cmdline=init=/lib/systemd/systemd rcupdate.rcu_expedited=1 rootfstype=ext4 rw systemd.show_status=0 quiet nordrand noreplace-smp cpu_init_udelay=0 plymouth.enable=0

 photon_linux=/boot/vmlinuz-esx-%{version}

 EOF

+# cleanup dangling symlinks

+rm -f %{buildroot}/lib/modules/%{version}-esx/source

+rm -f %{buildroot}/lib/modules/%{version}-esx/build

+

+# create /use/src/linux-esx-headers-*/ content

+find . -name Makefile* -o -name Kconfig* -o -name *.pl | xargs  sh -c 'cp --parents "$@" %{buildroot}/usr/src/%{name}-headers-%{version}-%{release}'

+find arch/x86/include include scripts -type f | xargs  sh -c 'cp --parents "$@" %{buildroot}/usr/src/%{name}-headers-%{version}-%{release}'

+find $(find arch/x86 -name include -o -name scripts -type d) -type f | xargs  sh -c 'cp --parents "$@" %{buildroot}/usr/src/%{name}-headers-%{version}-%{release}'

+find arch/x86/include Module.symvers include scripts -type f | xargs  sh -c 'cp --parents "$@" %{buildroot}/usr/src/%{name}-headers-%{version}-%{release}'

+

+# copy .config manually to be where it's expected to be

+cp .config %{buildroot}/usr/src/%{name}-headers-%{version}-%{release}

+# symling to the build folder

+ln -sf /usr/src/%{name}-headers-%{version}-%{release} %{buildroot}/lib/modules/%{version}-esx/build

+

 %post

 /sbin/depmod -aq %{version}-esx

 ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

@@ -95,18 +108,22 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 %config(noreplace) /boot/%{name}-%{version}-%{release}.cfg

 /lib/modules/*

 %exclude /lib/modules/%{version}-esx/build

+%exclude /usr/src

 %files docs

 %defattr(-,root,root)

 %{_defaultdocdir}/linux-esx-%{version}/*

-

-

-%files dev

+%files devel

 %defattr(-,root,root)

 /lib/modules/%{version}-esx/build

+/usr/src/%{name}-headers-%{version}-%{release}

 %changelog

+*   Mon Nov 09 2015 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-6

+-   Rename subpackage dev -> devel

+-   Added the build essential files in the devel subpackage.

+-   .config: added genede driver module.

 *   Wed Oct 28 2015 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-5

 -   Import patches from kernel2 repo.

 -   Added pv-ops patch (timekeeping related improvements).