Browse code

linux-aws: Remove 'Obsoletes' label to fix upgrade issues

When upgrading a Photon OS 1.0 installation to 2.0 using the
photon-upgrade.sh script, it seems to be pulling in linux-aws and
linux-aws-devel packages from 2.0 even if the corresponding packages
were not installed in 1.0; and that is undesirable.

Fix it by removing the 'Obsoletes: linux-dev' field in linux-aws.spec,
which was (unintentionally) carried over from linux.spec during the
first build.

Change-Id: I97efb0c3a954c24c045c49d2c9e5f11a5878f14a
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4845
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

Srivatsa S. Bhat authored on 2018/03/01 17:13:57
Showing 1 changed files
... ...
@@ -2,7 +2,7 @@
2 2
 Summary:        Kernel
3 3
 Name:           linux-aws
4 4
 Version:        4.9.80
5
-Release:        2%{?kat_build:.%kat_build}%{?dist}
5
+Release:        3%{?kat_build:.%kat_build}%{?dist}
6 6
 License:    	GPLv2
7 7
 URL:        	http://www.kernel.org/
8 8
 Group:        	System Environment/Kernel
... ...
@@ -137,7 +137,6 @@ The Linux package contains the Linux kernel.
137 137
 %package devel
138 138
 Summary:        Kernel Dev
139 139
 Group:          System Environment/Kernel
140
-Obsoletes:      linux-dev
141 140
 Requires:       %{name} = %{version}-%{release}
142 141
 Requires:       python2 gawk
143 142
 %description devel
... ...
@@ -430,6 +429,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
430 430
 /usr/share/doc/*
431 431
 
432 432
 %changelog
433
+*   Thu Mar 1 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.80-3
434
+-   Fix upgrade issue by removing 'Obsoletes: linux-dev'.
433 435
 *   Mon Feb 19 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.80-2
434 436
 -   Add enhancements from Amazon.
435 437
 *   Mon Feb 05 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.80-1