1. photon
  2. Commit 9c699c931ba35b2cc0d7e19fbb906df9a61d5d1b
Browse code

update_linux.sh: Fix script to update kernel versions

Use sha512 instead of sha1 and fix whitespace issues in
update_linux.sh.

Fix miscellaneous issues (whitespace etc.) in linux-api-headers.spec
and linux.spec to get the update_linux.sh script to work.

Also, replace %{name} with linux where appropriate in linux.spec
(eg: replace %{name}-headers with linux-headers, to follow the same
convention used in the other kernel flavors). This helps avoid
mistakes when creating new kernel flavors based on linux.spec

Change-Id: I110cf795325bb653764fad347f5c466d3ac7816c
Signed-off-by: Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/18000
Tested-by: Srivatsa S. Bhat <srivatsab@vmware.com>
Reviewed-by: Ajay Kaher <akaher@vmware.com>

Srivatsa S. Bhat (VMware) authored on 2022/09/29 03:59:02
Showing 3 changed files
SPECS/linux-api-headers/linux-api-headers.spec
History View file @ 9c699c9
... ... 
@@ -40,137 +40,137 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de
40 40 
 %{_includedir}/*
41 41
42 42 
 %changelog
43 
-*   Wed Sep 28 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.142-1
44 
--   Update to version 5.10.142
45 
-*   Tue Sep 27 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.132-1
46 
--   Update to version 5.10.132
47 
-*   Fri Sep 23 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.118-1
48 
--   Update to version 5.10.118
49 
-*   Wed Sep 21 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.109-1
50 
--   Update to version 5.10.109
51 
-*   Thu Sep 15 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.103-1
52 
--   Update to version 5.10.103
53 
-*   Wed Sep 14 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.93-1
54 
--   Update to version 5.10.93
55 
-*   Mon Sep 12 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.83-1
56 
--   Update to version 5.10.83
57 
-*   Mon Nov 08 2021 Vikash Bansal <bvikas@vmware.com> 5.10.78-1
58 
--   Update to version 5.10.78
59 
-*   Thu Oct 28 2021 Sharan Turlapati <sturlapati@vmware.com> 5.10.75-1
60 
--   Update to version 5.10.75
61 
-*   Fri Aug 27 2021 Ankit Jain <ankitja@vmware.com> 5.10.61-1
62 
--   Update to version 5.10.61
63 
-*   Mon Jul 26 2021 Him Kalyan Bordoloi <bordoloih@vmware.com> 5.10.52-1
64 
--   Update to version 5.10.52
65 
-*   Mon Jun 28 2021 Sharan Turlapati <sturlapati@vmware.com> 5.10.46-1
66 
--   Update to version 5.10.46
67 
-*   Thu Jun 03 2021 Keerthana K <keerthanak@vmware.com> 5.10.42-1
68 
--   Update to version 5.10.42
69 
-*   Mon Mar 22 2021 Him Kalyan Bordoloi <bordoloih@vmware.com> 5.10.25-1
70 
--   Update to version 5.10.25
71 
-*   Mon Mar 08 2021 Vikash Bansal <bvikas@vmware.com> 5.10.21-1
72 
--   Update to version 5.10.21
73 
-*   Tue Oct 27 2020 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.9.0-1
74 
--   Update to version 5.9.0
75 
-*   Wed Sep 30 2020 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.9.0-rc7.1
76 
--   Update to version 5.9.0-rc7
77 
-*   Tue Jun 23 2020 Keerthana K <keerthanak@vmware.com> 4.19.127-1
78 
--   Update to version 4.19.127
79 
-*   Wed Apr 08 2020 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.112-1
80 
--   Update to version 4.19.112
81 
-*   Tue Feb 18 2020 Vikash Bansal <bvikas@vmware.com> 4.19.104-1
82 
--   Update to version 4.19.104
83 
-*   Fri Jan 17 2020 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.97-1
84 
--   Update to version 4.19.97
85 
-*   Mon Dec 09 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.87-2
86 
--   Make it arch specific
87 
-*   Fri Dec 06 2019 Ajay Kaher <akaher@vmware.com> 4.19.87-1
88 
--   Update to version 4.19.87
89 
-*   Tue Nov 12 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.84-1
90 
--   Update to version 4.19.84
91 
-*   Fri Nov 08 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.82-1
92 
--   Update to version 4.19.82
93 
-*   Tue Oct 15 2019 Ajay Kaher <akaher@vmware.com> 4.19.79-1
94 
--   Update to version 4.19.79
95 
-*   Wed Oct 02 2019 Ajay Kaher <akaher@vmware.com> 4.19.76-1
96 
--   Update to version 4.19.76
97 
-*   Wed Sep 11 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.72-1
98 
--   Update to version 4.19.72
99 
-*   Fri Aug 30 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.69-1
100 
--   Update to version 4.19.69
101 
-*   Tue Aug 06 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.65-1
102 
--   Update to version 4.19.65
103 
-*   Mon Jun 17 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-1
104 
--   Update to version 4.19.52
105 
-*   Tue May 07 2019 Ajay Kaher <akaher@vmware.com> 4.19.40-1
106 
--   Update to version 4.19.40
107 
-*   Wed Mar 27 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.32-1
108 
--   Update to version 4.19.32
109 
-*   Thu Mar 14 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.29-1
110 
--   Update to version 4.19.29
111 
-*   Tue Mar 05 2019 Ajay Kaher <akaher@vmware.com> 4.19.26-1
112 
--   Update to version 4.19.26
113 
-*   Tue Jan 15 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.15-1
114 
--   Update to version 4.19.15
115 
-*   Mon Dec 10 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.6-1
116 
--   Update to version 4.19.6
117 
-*   Mon Nov 05 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.1-1
118 
--   Update to version 4.19.1
119 
-*   Thu Sep 20 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.18.9-1
120 
--   Update to version 4.18.9
121 
-*   Wed Sep 19 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.14.67-1
122 
--   Update to version 4.14.67
123 
-*   Mon Jul 09 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 4.14.54-1
124 
--   Update to version 4.14.54
125 
-*   Fri Dec 22 2017 Alexey Makhalov <amakhalov@vmware.com> 4.14.8-1
126 
--   Version update
127 
-*   Mon Dec 04 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.66-1
128 
--   Version update
129 
-*   Tue Nov 21 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.64-1
130 
--   Version update
131 
-*   Mon Nov 06 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.60-1
132 
--   Version update
133 
-*   Thu Oct 05 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.53-1
134 
--   Version update
135 
-*   Mon Oct 02 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.52-1
136 
--   Version update
137 
-*   Mon Sep 04 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.47-1
138 
--   Version update
139 
-*   Mon Aug 14 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.43-1
140 
--   Version update
141 
-*   Wed Jun 28 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.34-1
142 
--   Version update
143 
-*   Fri May 26 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.30-1
144 
--   Version update
145 
-*   Tue May 16 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.28-1
146 
--   Version update
147 
-*   Wed May 10 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.27-1
148 
--   Update to linux-4.9.27
149 
-*   Sun May 7 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.26-1
150 
--   Update to linux-4.9.26
151 
-*   Tue Apr 25 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.24-1
152 
--   Update to linux-4.9.24
153 
-*   Tue Feb 28 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.13-1
154 
--   Update to linux-4.9.13
155 
-*   Thu Feb 09 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.9-1
156 
--   Update to linux-4.9.9
157 
-*   Tue Jan 10 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.2-1
158 
--   Update to linux-4.9.2
159 
-*   Mon Dec 12 2016 Alexey Makhalov <amakhalov@vmware.com> 4.9.0-1
160 
--   Update to linux-4.9.0
161 
-*   Mon Nov 28 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.35-1
162 
--   Update to linux-4.4.35
163 
-*   Thu Nov 10 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.31-1
164 
--   Update to linux-4.4.31
165 
-*   Wed Sep  7 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-1
166 
--   Update kernel version to 4.4.20
167 
-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.4.8-2
168 
--   GA - Bump release of all rpms
169 
-*   Thu Apr 28 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.8-1
170 
--   Update to linux-4.4.8
171 
-*   Wed Dec 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.0-1
172 
--   Upgrading kernel version to 4.2.0.
173 
-*   Wed Aug 12 2015 Sharath George <sharathg@vmware.com> 4.0.9-1
174 
--   Upgrading kernel version.
175 
-*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.13.3-1
176 
--   Initial build. First version
43 
+* Wed Sep 28 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.142-1
44 
+- Update to version 5.10.142
45 
+* Tue Sep 27 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.132-1
46 
+- Update to version 5.10.132
47 
+* Fri Sep 23 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.118-1
48 
+- Update to version 5.10.118
49 
+* Wed Sep 21 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.109-1
50 
+- Update to version 5.10.109
51 
+* Thu Sep 15 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.103-1
52 
+- Update to version 5.10.103
53 
+* Wed Sep 14 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.93-1
54 
+- Update to version 5.10.93
55 
+* Mon Sep 12 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.83-1
56 
+- Update to version 5.10.83
57 
+* Mon Nov 08 2021 Vikash Bansal <bvikas@vmware.com> 5.10.78-1
58 
+- Update to version 5.10.78
59 
+* Thu Oct 28 2021 Sharan Turlapati <sturlapati@vmware.com> 5.10.75-1
60 
+- Update to version 5.10.75
61 
+* Fri Aug 27 2021 Ankit Jain <ankitja@vmware.com> 5.10.61-1
62 
+- Update to version 5.10.61
63 
+* Mon Jul 26 2021 Him Kalyan Bordoloi <bordoloih@vmware.com> 5.10.52-1
64 
+- Update to version 5.10.52
65 
+* Mon Jun 28 2021 Sharan Turlapati <sturlapati@vmware.com> 5.10.46-1
66 
+- Update to version 5.10.46
67 
+* Thu Jun 03 2021 Keerthana K <keerthanak@vmware.com> 5.10.42-1
68 
+- Update to version 5.10.42
69 
+* Mon Mar 22 2021 Him Kalyan Bordoloi <bordoloih@vmware.com> 5.10.25-1
70 
+- Update to version 5.10.25
71 
+* Mon Mar 08 2021 Vikash Bansal <bvikas@vmware.com> 5.10.21-1
72 
+- Update to version 5.10.21
73 
+* Tue Oct 27 2020 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.9.0-1
74 
+- Update to version 5.9.0
75 
+* Wed Sep 30 2020 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.9.0-rc7.1
76 
+- Update to version 5.9.0-rc7
77 
+* Tue Jun 23 2020 Keerthana K <keerthanak@vmware.com> 4.19.127-1
78 
+- Update to version 4.19.127
79 
+* Wed Apr 08 2020 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.112-1
80 
+- Update to version 4.19.112
81 
+* Tue Feb 18 2020 Vikash Bansal <bvikas@vmware.com> 4.19.104-1
82 
+- Update to version 4.19.104
83 
+* Fri Jan 17 2020 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.97-1
84 
+- Update to version 4.19.97
85 
+* Mon Dec 09 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.87-2
86 
+- Make it arch specific
87 
+* Fri Dec 06 2019 Ajay Kaher <akaher@vmware.com> 4.19.87-1
88 
+- Update to version 4.19.87
89 
+* Tue Nov 12 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.84-1
90 
+- Update to version 4.19.84
91 
+* Fri Nov 08 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.82-1
92 
+- Update to version 4.19.82
93 
+* Tue Oct 15 2019 Ajay Kaher <akaher@vmware.com> 4.19.79-1
94 
+- Update to version 4.19.79
95 
+* Wed Oct 02 2019 Ajay Kaher <akaher@vmware.com> 4.19.76-1
96 
+- Update to version 4.19.76
97 
+* Wed Sep 11 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.72-1
98 
+- Update to version 4.19.72
99 
+* Fri Aug 30 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.69-1
100 
+- Update to version 4.19.69
101 
+* Tue Aug 06 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.65-1
102 
+- Update to version 4.19.65
103 
+* Mon Jun 17 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-1
104 
+- Update to version 4.19.52
105 
+* Tue May 07 2019 Ajay Kaher <akaher@vmware.com> 4.19.40-1
106 
+- Update to version 4.19.40
107 
+* Wed Mar 27 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.32-1
108 
+- Update to version 4.19.32
109 
+* Thu Mar 14 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.29-1
110 
+- Update to version 4.19.29
111 
+* Tue Mar 05 2019 Ajay Kaher <akaher@vmware.com> 4.19.26-1
112 
+- Update to version 4.19.26
113 
+* Tue Jan 15 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.15-1
114 
+- Update to version 4.19.15
115 
+* Mon Dec 10 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.6-1
116 
+- Update to version 4.19.6
117 
+* Mon Nov 05 2018 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.1-1
118 
+- Update to version 4.19.1
119 
+* Thu Sep 20 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.18.9-1
120 
+- Update to version 4.18.9
121 
+* Wed Sep 19 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.14.67-1
122 
+- Update to version 4.14.67
123 
+* Mon Jul 09 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 4.14.54-1
124 
+- Update to version 4.14.54
125 
+* Fri Dec 22 2017 Alexey Makhalov <amakhalov@vmware.com> 4.14.8-1
126 
+- Version update
127 
+* Mon Dec 04 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.66-1
128 
+- Version update
129 
+* Tue Nov 21 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.64-1
130 
+- Version update
131 
+* Mon Nov 06 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.60-1
132 
+- Version update
133 
+* Thu Oct 05 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.53-1
134 
+- Version update
135 
+* Mon Oct 02 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.52-1
136 
+- Version update
137 
+* Mon Sep 04 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.47-1
138 
+- Version update
139 
+* Mon Aug 14 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.43-1
140 
+- Version update
141 
+* Wed Jun 28 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.34-1
142 
+- Version update
143 
+* Fri May 26 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.30-1
144 
+- Version update
145 
+* Tue May 16 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.28-1
146 
+- Version update
147 
+* Wed May 10 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.27-1
148 
+- Update to linux-4.9.27
149 
+* Sun May 7 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.26-1
150 
+- Update to linux-4.9.26
151 
+* Tue Apr 25 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.24-1
152 
+- Update to linux-4.9.24
153 
+* Tue Feb 28 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.13-1
154 
+- Update to linux-4.9.13
155 
+* Thu Feb 09 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.9-1
156 
+- Update to linux-4.9.9
157 
+* Tue Jan 10 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.2-1
158 
+- Update to linux-4.9.2
159 
+* Mon Dec 12 2016 Alexey Makhalov <amakhalov@vmware.com> 4.9.0-1
160 
+- Update to linux-4.9.0
161 
+* Mon Nov 28 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.35-1
162 
+- Update to linux-4.4.35
163 
+* Thu Nov 10 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.31-1
164 
+- Update to linux-4.4.31
165 
+* Wed Sep  7 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.20-1
166 
+- Update kernel version to 4.4.20
167 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.4.8-2
168 
+- GA - Bump release of all rpms
169 
+* Thu Apr 28 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.8-1
170 
+- Update to linux-4.4.8
171 
+* Wed Dec 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.0-1
172 
+- Upgrading kernel version to 4.2.0.
173 
+* Wed Aug 12 2015 Sharath George <sharathg@vmware.com> 4.0.9-1
174 
+- Upgrading kernel version.
175 
+* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.13.3-1
176 
+- Initial build. First version
SPECS/linux/linux.spec
History View file @ 9c699c9
... ... 
@@ -23,7 +23,7 @@
23 23 
 Summary:        Kernel
24 24 
 Name:           linux
25 25 
 Version:        5.10.142
26 
-Release:        1%{?kat_build:.kat}%{?dist}
26 
+Release:        2%{?kat_build:.kat}%{?dist}
27 27 
 License:        GPLv2
28 28 
 URL:            http://www.kernel.org/
29 29 
 Group:          System Environment/Kernel
... ... 
@@ -34,7 +34,7 @@ Distribution:   Photon
34 34 
 %define _modulesdir /lib/modules/%{uname_r}
35 35
36 36 
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{version}.tar.xz
37 
-%define sha512 %{name}=06b8977654a2e2e1109398e617d4f253d204134182f3982e271abfda054805d56cb70ad8b26a3b3b5c821a127990da76529799810a95dbed442b894acedf867a
37 
+%define sha512 linux=06b8977654a2e2e1109398e617d4f253d204134182f3982e271abfda054805d56cb70ad8b26a3b3b5c821a127990da76529799810a95dbed442b894acedf867a
38 38 
 Source1:        config_%{_arch}
39 39 
 Source2:        initramfs.trigger
40 40
... ... 
@@ -515,8 +515,8 @@ done \
515 515 
 %install
516 516 
 install -vdm 755 %{buildroot}%{_sysconfdir}
517 517 
 install -vdm 755 %{buildroot}/boot
518 
-install -vdm 755 %{buildroot}%{_docdir}/%{name}-%{uname_r}
519 
-install -vdm 755 %{buildroot}%{_usrsrc}/%{name}-headers-%{uname_r}
518 
+install -vdm 755 %{buildroot}%{_docdir}/linux-%{uname_r}
519 
+install -vdm 755 %{buildroot}%{_usrsrc}/linux-headers-%{uname_r}
520 520 
 install -vdm 755 %{buildroot}%{_libdir}/debug/%{_modulesdir}
521 521 
 make %{?_smp_mflags} ARCH=%{arch} INSTALL_MOD_PATH=%{buildroot} modules_install
522 522
... ... 
@@ -549,7 +549,7 @@ pushd ../iavf-%{iavf_version}
549 549 
 make -C src KSRC=$bldroot INSTALL_MOD_PATH=%{buildroot} INSTALL_MOD_DIR=extra \
550 550 
     INSTALL_AUX_DIR=extra MANDIR=%{_mandir} modules_install mandocs_install %{?_smp_mflags}
551 551 
 install -Dvm 644 src/linux/auxiliary_bus.h \
552 
-       %{buildroot}%{_usrsrc}/%{name}-headers-%{uname_r}/include/linux/auxiliary_bus.h
552 
+       %{buildroot}%{_usrsrc}/linux-headers-%{uname_r}/include/linux/auxiliary_bus.h
553 553 
 popd
554 554
555 555 
 # install ice module
... ... 
@@ -583,7 +583,7 @@ install -vm 644 arch/arm64/boot/Image %{buildroot}/boot/vmlinuz-%{uname_r}
583 583 
 # Restrict the permission on System.map-X file
584 584 
 install -vm 400 System.map %{buildroot}/boot/System.map-%{uname_r}
585 585 
 install -vm 644 .config %{buildroot}/boot/config-%{uname_r}
586 
-cp -r Documentation/* %{buildroot}%{_docdir}/%{name}-%{uname_r}
586 
+cp -r Documentation/* %{buildroot}%{_docdir}/linux-%{uname_r}
587 587
588 588 
 %if 0%{?__debug_package}
589 589 
 install -vm 644 vmlinux %{buildroot}%{_libdir}/debug/%{_modulesdir}/vmlinux-%{uname_r}
... ... 
@@ -591,7 +591,7 @@ install -vm 644 vmlinux %{buildroot}%{_libdir}/debug/%{_modulesdir}/vmlinux-%{un
591 591 
 ln -s vmlinux-%{uname_r} %{buildroot}%{_libdir}/debug/%{_modulesdir}/vmlinux
592 592 
 %endif
593 593
594 
-cat > %{buildroot}/boot/%{name}-%{uname_r}.cfg << "EOF"
594 
+cat > %{buildroot}/boot/linux-%{uname_r}.cfg << "EOF"
595 595 
 # GRUB Environment Block
596 596 
 photon_cmdline=init=/lib/systemd/systemd ro loglevel=3 quiet
597 597 
 photon_linux=vmlinuz-%{uname_r}
... ... 
@@ -617,18 +617,18 @@ EOF
617 617 
 rm -rf %{buildroot}%{_modulesdir}/source \
618 618 
        %{buildroot}%{_modulesdir}/build
619 619
620 
-find . -name Makefile* -o -name Kconfig* -o -name *.pl | xargs sh -c 'cp --parents "$@" %{buildroot}%{_usrsrc}/%{name}-headers-%{uname_r}' copy
621 
-find arch/%{archdir}/include include scripts -type f | xargs sh -c 'cp --parents "$@" %{buildroot}%{_usrsrc}/%{name}-headers-%{uname_r}' copy
622 
-find $(find arch/%{archdir} -name include -o -name scripts -type d) -type f | xargs sh -c 'cp --parents "$@" %{buildroot}%{_usrsrc}/%{name}-headers-%{uname_r}' copy
623 
-find arch/%{archdir}/include Module.symvers include scripts -type f | xargs sh -c 'cp --parents "$@" %{buildroot}%{_usrsrc}/%{name}-headers-%{uname_r}' copy
620 
+find . -name Makefile* -o -name Kconfig* -o -name *.pl | xargs sh -c 'cp --parents "$@" %{buildroot}%{_usrsrc}/linux-headers-%{uname_r}' copy
621 
+find arch/%{archdir}/include include scripts -type f | xargs sh -c 'cp --parents "$@" %{buildroot}%{_usrsrc}/linux-headers-%{uname_r}' copy
622 
+find $(find arch/%{archdir} -name include -o -name scripts -type d) -type f | xargs sh -c 'cp --parents "$@" %{buildroot}%{_usrsrc}/linux-headers-%{uname_r}' copy
623 
+find arch/%{archdir}/include Module.symvers include scripts -type f | xargs sh -c 'cp --parents "$@" %{buildroot}%{_usrsrc}/linux-headers-%{uname_r}' copy
624 624 
 %ifarch x86_64
625 625 
 # CONFIG_STACK_VALIDATION=y requires objtool to build external modules
626 
-install -vsm 755 tools/objtool/objtool %{buildroot}%{_usrsrc}/%{name}-headers-%{uname_r}/tools/objtool/
627 
-install -vsm 755 tools/objtool/fixdep %{buildroot}%{_usrsrc}/%{name}-headers-%{uname_r}/tools/objtool/
626 
+install -vsm 755 tools/objtool/objtool %{buildroot}%{_usrsrc}/linux-headers-%{uname_r}/tools/objtool/
627 
+install -vsm 755 tools/objtool/fixdep %{buildroot}%{_usrsrc}/linux-headers-%{uname_r}/tools/objtool/
628 628 
 %endif
629 629
630 
-cp .config %{buildroot}%{_usrsrc}/%{name}-headers-%{uname_r} # copy .config manually to be where it's expected to be
631 
-ln -sf "%{_usrsrc}/%{name}-headers-%{uname_r}" "%{buildroot}%{_modulesdir}/build"
630 
+cp .config %{buildroot}%{_usrsrc}/linux-headers-%{uname_r} # copy .config manually to be where it's expected to be
631 
+ln -sf "%{_usrsrc}/linux-headers-%{uname_r}" "%{buildroot}%{_modulesdir}/build"
632 632 
 find %{buildroot}/lib/modules -name '*.ko' -print0 | xargs -0 chmod u+x
633 633
634 634 
 %ifarch aarch64
... ... 
@@ -653,7 +653,7 @@ make install %{?_smp_mflags} -C tools/bpf/bpftool prefix=%{_prefix} DESTDIR=%{bu
653 653
654 654 
 %post
655 655 
 /sbin/depmod -a %{uname_r}
656 
-ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
656 
+ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
657 657
658 658 
 %post drivers-gpu
659 659 
 /sbin/depmod -a %{uname_r}
... ... 
@@ -675,7 +675,7 @@ getent group sgx_prv >/dev/null || groupadd -r sgx_prv
675 675 
 /boot/System.map-%{uname_r}
676 676 
 /boot/config-%{uname_r}
677 677 
 /boot/vmlinuz-%{uname_r}
678 
-%config(noreplace) /boot/%{name}-%{uname_r}.cfg
678 
+%config(noreplace) /boot/linux-%{uname_r}.cfg
679 679 
 %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
680 680 
 %defattr(0644,root,root)
681 681 
 %{_modulesdir}/*
... ... 
@@ -695,7 +695,7 @@ getent group sgx_prv >/dev/null || groupadd -r sgx_prv
695 695
696 696 
 %files docs
697 697 
 %defattr(-,root,root)
698 
-%{_docdir}/%{name}-%{uname_r}/*
698 
+%{_docdir}/linux-%{uname_r}/*
699 699 
 # For out-of-tree Intel i40e driver.
700 700 
 %ifarch x86_64
701 701 
 %{_mandir}/*
... ... 
@@ -704,7 +704,7 @@ getent group sgx_prv >/dev/null || groupadd -r sgx_prv
704 704 
 %files devel
705 705 
 %defattr(-,root,root)
706 706 
 %{_modulesdir}/build
707 
-%{_usrsrc}/%{name}-headers-%{uname_r}
707 
+%{_usrsrc}/linux-headers-%{uname_r}
708 708
709 709 
 %files drivers-gpu
710 710 
 %defattr(-,root,root)
... ... 
@@ -766,6 +766,8 @@ getent group sgx_prv >/dev/null || groupadd -r sgx_prv
766 766 
 %{_datadir}/bash-completion/completions/bpftool
767 767
768 768 
 %changelog
769 
+* Wed Sep 28 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.142-2
770 
+- Replace rpm macro 'name' with 'linux' to be consistent with other flavors.
769 771 
 * Wed Sep 28 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.142-1
770 772 
 - Update to version 5.10.142
771 773 
 * Tue Sep 27 2022 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 5.10.132-1
tools/scripts/update_linux.sh
History View file @ 9c699c9
... ... 
@@ -8,11 +8,11 @@ version=`echo $tarball | sed 's/linux-//; s/.tar.xz//'`
8 8 
 echo latest linux version: $version
9 9 
 test -f stage/SOURCES/$tarball && echo up to date && exit 0
10 10 
 $(cd stage/SOURCES && wget $tarball_url)
11 
-sha1=`sha1sum stage/SOURCES/$tarball | awk '{print $1}'`
11 
+sha512=`sha512sum stage/SOURCES/$tarball | awk '{print $1}'`
12 12 
 changelog_entry=$(echo "`date +"%a %b %d %Y"` `git config user.name` <`git config user.email`> $version-1")
13 13 
 for spec in $specs; do
14 14 
 	sed -i '/^Version:/ s/5.10.[0-9]*/'$version'/' SPECS/$spec
15 15 
 	sed -i '/^Release:/ s/[0-9]*%/1%/' SPECS/$spec
16 
-	sed -i '/^%define sha1 linux/ s/=[0-9a-f]*$/='$sha1'/' SPECS/$spec
17 
-	sed -i '/^%changelog/a*   '"$changelog_entry"'\n-   Update to version '"$version"'' SPECS/$spec
16 
+	sed -i '/^%define sha512 linux/ s/=[0-9a-f]*$/='$sha512'/' SPECS/$spec
17 
+	sed -i '/^%changelog/a* '"$changelog_entry"'\n- Update to version '"$version"'' SPECS/$spec
18 18 
 done