Browse code
linux-debuginfo: keep PROGBITS sections in vmlinux
Change-Id: Ia754c07f92c5d6040d2e648b468b0508a2fcc2e8
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1474
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Alexey Makhalov authored on 2016/10/03 11:32:47Showing 2 changed files
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
Summary: Kernel |
| 3 | 3 |
Name: linux-esx |
| 4 | 4 |
Version: 4.4.20 |
| 5 |
-Release: 3%{?dist}
|
|
| 5 |
+Release: 4%{?dist}
|
|
| 6 | 6 |
License: GPLv2 |
| 7 | 7 |
URL: http://www.kernel.org/ |
| 8 | 8 |
Group: System Environment/Kernel |
| ... | ... |
@@ -104,8 +104,9 @@ make INSTALL_MOD_PATH=%{buildroot} modules_install
|
| 104 | 104 |
cp -v arch/x86/boot/bzImage %{buildroot}/boot/vmlinuz-esx-%{version}-%{release}
|
| 105 | 105 |
cp -v System.map %{buildroot}/boot/system.map-esx-%{version}-%{release}
|
| 106 | 106 |
cp -v .config %{buildroot}/boot/config-esx-%{version}-%{release}
|
| 107 |
-cp -v vmlinux %{buildroot}/lib/modules/%{version}-esx/vmlinux-esx-%{version}-%{release}
|
|
| 108 | 107 |
cp -r Documentation/* %{buildroot}%{_defaultdocdir}/linux-esx-%{version}
|
| 108 |
+install -vdm 755 %{buildroot}/usr/lib/debug/lib/modules/%{version}-esx
|
|
| 109 |
+cp -v vmlinux %{buildroot}/usr/lib/debug/lib/modules/%{version}-esx/vmlinux-esx-%{version}-%{release}
|
|
| 109 | 110 |
|
| 110 | 111 |
# TODO: noacpi acpi=off noapic pci=conf1,nodomains pcie_acpm=off pnpacpi=off |
| 111 | 112 |
cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"
|
| ... | ... |
@@ -142,7 +143,6 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg
|
| 142 | 142 |
%config(noreplace) /boot/%{name}-%{version}-%{release}.cfg
|
| 143 | 143 |
/lib/modules/* |
| 144 | 144 |
%exclude /lib/modules/%{version}-esx/build
|
| 145 |
-%exclude /lib/modules/%{version}-esx/vmlinux-%{version}-%{release}
|
|
| 146 | 145 |
%exclude /usr/src |
| 147 | 146 |
|
| 148 | 147 |
%files docs |
| ... | ... |
@@ -155,6 +155,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg
|
| 155 | 155 |
/usr/src/%{name}-headers-%{version}-%{release}
|
| 156 | 156 |
|
| 157 | 157 |
%changelog |
| 158 |
+* Mon Oct 3 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-4 |
|
| 159 |
+- Package vmlinux with PROGBITS sections in -debuginfo subpackage |
|
| 158 | 160 |
* Wed Sep 21 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-3 |
| 159 | 161 |
- Add PCIE hotplug support |
| 160 | 162 |
- Switch processor type to generic |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
Summary: Kernel |
| 3 | 3 |
Name: linux |
| 4 | 4 |
Version: 4.4.20 |
| 5 |
-Release: 3%{?dist}
|
|
| 5 |
+Release: 4%{?dist}
|
|
| 6 | 6 |
License: GPLv2 |
| 7 | 7 |
URL: http://www.kernel.org/ |
| 8 | 8 |
Group: System Environment/Kernel |
| ... | ... |
@@ -121,8 +121,10 @@ make INSTALL_MOD_PATH=%{buildroot} modules_install
|
| 121 | 121 |
cp -v arch/x86/boot/bzImage %{buildroot}/boot/vmlinuz-%{version}-%{release}
|
| 122 | 122 |
cp -v System.map %{buildroot}/boot/System.map-%{version}-%{release}
|
| 123 | 123 |
cp -v .config %{buildroot}/boot/config-%{version}-%{release}
|
| 124 |
-cp -v vmlinux %{buildroot}/lib/modules/%{version}/vmlinux-%{version}-%{release}
|
|
| 125 | 124 |
cp -r Documentation/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}
|
| 125 |
+install -vdm 755 %{buildroot}/usr/lib/debug/lib/modules/%{version}
|
|
| 126 |
+cp -v vmlinux %{buildroot}/usr/lib/debug/lib/modules/%{version}/vmlinux-%{version}-%{release}
|
|
| 127 |
+ |
|
| 126 | 128 |
cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"
|
| 127 | 129 |
# GRUB Environment Block |
| 128 | 130 |
photon_cmdline=init=/lib/systemd/systemd ro loglevel=3 quiet plymouth.enable=0 |
| ... | ... |
@@ -174,7 +176,6 @@ ln -s /usr/lib/debug/lib/modules/%{version}/vmlinux-%{version}-%{release}.debug
|
| 174 | 174 |
%exclude /lib/modules/%{version}/kernel/drivers/gpu
|
| 175 | 175 |
%exclude /lib/modules/%{version}/kernel/sound
|
| 176 | 176 |
%exclude /lib/modules/%{version}/kernel/arch/x86/oprofile/
|
| 177 |
-%exclude /lib/modules/%{version}/vmlinux-%{version}-%{release}
|
|
| 178 | 177 |
|
| 179 | 178 |
%files docs |
| 180 | 179 |
%defattr(-,root,root) |
| ... | ... |
@@ -199,6 +200,8 @@ ln -s /usr/lib/debug/lib/modules/%{version}/vmlinux-%{version}-%{release}.debug
|
| 199 | 199 |
/lib/modules/%{version}/kernel/arch/x86/oprofile/
|
| 200 | 200 |
|
| 201 | 201 |
%changelog |
| 202 |
+* Mon Oct 3 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-4 |
|
| 203 |
+- Package vmlinux with PROGBITS sections in -debuginfo subpackage |
|
| 202 | 204 |
* Tue Sep 27 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-3 |
| 203 | 205 |
- .config: CONFIG_IP_SET_HASH_{IPMARK,MAC}=m
|
| 204 | 206 |
* Tue Sep 20 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-2 |