Browse code
Use photon.cfg as a symlink.
YustasSwamp authored on 2015/08/15 05:21:40Showing 2 changed files
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Kernel |
| 5 | 5 |
Name: linux-esx |
| 6 | 6 |
Version: 4.1.3 |
| 7 |
-Release: 3%{?dist}
|
|
| 7 |
+Release: 4%{?dist}
|
|
| 8 | 8 |
License: GPLv2 |
| 9 | 9 |
URL: http://www.kernel.org/ |
| 10 | 10 |
Group: System Environment/Kernel |
| ... | ... |
@@ -100,20 +100,22 @@ cp -v arch/x86/boot/bzImage %{buildroot}/boot/vmlinuz-esx-%{version}
|
| 100 | 100 |
cp -v System.map %{buildroot}/boot/system.map-esx-%{version}
|
| 101 | 101 |
cp -v .config %{buildroot}/boot/config-esx-%{version}
|
| 102 | 102 |
cp -r Documentation/* %{buildroot}%{_defaultdocdir}/linux-esx-%{version}
|
| 103 |
- |
|
| 104 |
-%post |
|
| 105 |
-/sbin/depmod -aq %{version}-esx
|
|
| 106 |
-cat > /boot/photon.cfg << "EOF" |
|
| 103 |
+cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"
|
|
| 107 | 104 |
# GRUB Environment Block |
| 108 | 105 |
photon_cmdline=init=/lib/systemd/systemd tsc=reliable no_timer_check rcupdate.rcu_expedited=1 rootfstype=ext4 rw systemd.show_status=0 elevator=noop quiet |
| 109 | 106 |
photon_linux=/boot/vmlinuz-esx-%{version}
|
| 110 | 107 |
EOF |
| 111 | 108 |
|
| 109 |
+%post |
|
| 110 |
+/sbin/depmod -aq %{version}-esx
|
|
| 111 |
+ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg
|
|
| 112 |
+ |
|
| 112 | 113 |
%files |
| 113 | 114 |
%defattr(-,root,root) |
| 114 | 115 |
/boot/system.map-esx-%{version}
|
| 115 | 116 |
/boot/config-esx-%{version}
|
| 116 | 117 |
/boot/vmlinuz-esx-%{version}
|
| 118 |
+%config(noreplace) /boot/%{name}-%{version}-%{release}.cfg
|
|
| 117 | 119 |
#/lib/firmware/* |
| 118 | 120 |
/lib/modules/* |
| 119 | 121 |
%exclude /lib/modules/%{version}-esx/build
|
| ... | ... |
@@ -129,8 +131,10 @@ EOF |
| 129 | 129 |
/lib/modules/%{version}-esx/build
|
| 130 | 130 |
|
| 131 | 131 |
%changelog |
| 132 |
+* Fri Aug 14 2015 Alexey Makhalov <amakhalov@vmware.com> 4.1.3-4 |
|
| 133 |
+- Use photon.cfg as a symlink. |
|
| 132 | 134 |
* Thu Aug 13 2015 Alexey Makhalov <amakhalov@vmware.com> 4.1.3-3 |
| 133 |
-- Added environment file for grub. |
|
| 135 |
+- Added environment file(photon.cfg) for grub. |
|
| 134 | 136 |
* Tue Aug 11 2015 Alexey Makhalov <amakhalov@vmware.com> 4.1.3-2 |
| 135 | 137 |
Added pci-probe-vmware.patch. Removed unused modules. Decreased boot time. |
| 136 | 138 |
* Tue Jul 28 2015 Alexey Makhalov <amakhalov@vmware.com> 4.1.3-1 |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Kernel |
| 5 | 5 |
Name: linux |
| 6 | 6 |
Version: 4.0.9 |
| 7 |
-Release: 2%{?dist}
|
|
| 7 |
+Release: 3%{?dist}
|
|
| 8 | 8 |
License: GPLv2 |
| 9 | 9 |
URL: http://www.kernel.org/ |
| 10 | 10 |
Group: System Environment/Kernel |
| ... | ... |
@@ -88,6 +88,12 @@ cp -v arch/x86/boot/bzImage %{buildroot}/boot/vmlinuz-%{version}
|
| 88 | 88 |
cp -v System.map %{buildroot}/boot/system.map-%{version}
|
| 89 | 89 |
cp -v .config %{buildroot}/boot/config-%{version}
|
| 90 | 90 |
cp -r Documentation/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}
|
| 91 |
+cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"
|
|
| 92 |
+# GRUB Environment Block |
|
| 93 |
+photon_cmdline=init=/lib/systemd/systemd rootfstype=ext4 ro loglevel=3 quiet |
|
| 94 |
+photon_linux=/boot/vmlinuz-%{version}
|
|
| 95 |
+photon_initrd=/boot/initrd.img-no-kmods |
|
| 96 |
+EOF |
|
| 91 | 97 |
|
| 92 | 98 |
# Cleanup dangling symlinks |
| 93 | 99 |
rm -rf %{buildroot}/lib/modules/%{version}/source
|
| ... | ... |
@@ -125,12 +131,7 @@ EOF |
| 125 | 125 |
|
| 126 | 126 |
%post |
| 127 | 127 |
/sbin/depmod -aq %{version}
|
| 128 |
-cat > /boot/photon.cfg << "EOF" |
|
| 129 |
-# GRUB Environment Block |
|
| 130 |
-photon_cmdline=init=/lib/systemd/systemd rootfstype=ext4 ro loglevel=3 quiet |
|
| 131 |
-photon_linux=/boot/vmlinuz-%{version}
|
|
| 132 |
-photon_initrd=/boot/initrd.img-no-kmods |
|
| 133 |
-EOF |
|
| 128 |
+ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg
|
|
| 134 | 129 |
|
| 135 | 130 |
%post drivers-gpu |
| 136 | 131 |
/sbin/depmod -aq %{version}
|
| ... | ... |
@@ -143,6 +144,7 @@ EOF |
| 143 | 143 |
/boot/system.map-%{version}
|
| 144 | 144 |
/boot/config-%{version}
|
| 145 | 145 |
/boot/vmlinuz-%{version}
|
| 146 |
+%config(noreplace) /boot/%{name}-%{version}-%{release}.cfg
|
|
| 146 | 147 |
%config(noreplace) /etc/modules-load.d/vmhgfs.conf |
| 147 | 148 |
/lib/firmware/* |
| 148 | 149 |
/lib/modules/* |
| ... | ... |
@@ -170,8 +172,10 @@ EOF |
| 170 | 170 |
/lib/modules/%{version}/kernel/sound
|
| 171 | 171 |
|
| 172 | 172 |
%changelog |
| 173 |
+* Fri Aug 14 2015 Alexey Makhalov <amakhalov@vmware.com> 4.0.9-3 |
|
| 174 |
+- Use photon.cfg as a symlink. |
|
| 173 | 175 |
* Thu Aug 13 2015 Alexey Makhalov <amakhalov@vmware.com> 4.0.9-2 |
| 174 |
-- Added environment file for grub. |
|
| 176 |
+- Added environment file(photon.cfg) for grub. |
|
| 175 | 177 |
* Wed Aug 12 2015 Sharath George <sharathg@vmware.com> 4.0.9-1 |
| 176 | 178 |
- Upgrading kernel version. |
| 177 | 179 |
* Wed Aug 12 2015 Alexey Makhalov <amakhalov@vmware.com> 3.19.2-5 |