[meego-packaging] 4879: Changes to Trunk:Testing/grubby

[Yi Yang]

Hi,
I have made the following changes to grubby in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Yi Yang

[This message was auto-generated]

---

Request #4879:

  submit:   home:yyang:branches:Trunk:Testing/grubby(r3)(cleanup) -> Trunk:Testing/grubby


Message:
    Use symbolic link for vmlinuz* (BMC #2946)

State:   new          2010-06-24T20:09:06 yyang
Comment: None



changes files:
--------------
--- grubby.changes
+++ grubby.changes
@@ -0,0 +1,3 @@
+* Wed Jun 23 2010 Yi Yang <yi.y.yang at intel.com> - 7.0.8
+- Use symbolic link instead of copy for kernel (BMC #2946)
+

new:
----
  symbolic-link-to-kernel.patch

spec files:
-----------
--- grubby.spec
+++ grubby.spec
@@ -1,6 +1,6 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.13
+# spectacle version 0.17
 # 
 # >> macros
 # << macros
@@ -17,11 +17,13 @@
 Patch0:     change-to-moblin-release.patch
 Patch1:     more-support-code-for-syslinux.patch
 Patch2:     set-default-kernel.patch
+Patch3:     symbolic-link-to-kernel.patch
 BuildRequires:  pkgconfig(blkid)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig
 BuildRequires:  popt-devel
 
+
 %description
 grubby  is  a command line tool for updating and displaying information about 
 the configuration files for the grub, lilo, elilo (ia64),  yaboot (powerpc)  
@@ -41,6 +43,8 @@
 %patch1 -p1
 # set-default-kernel.patch
 %patch2 -p1
+# symbolic-link-to-kernel.patch
+%patch3 -p1
 # >> setup
 # << setup
 
@@ -49,7 +53,6 @@
 # << build pre
 
 
-# Call make instruction with smp support
 make %{?jobs:-j%jobs}
 
 # >> build post

other changes:
--------------

++++++ grubby.yaml
--- grubby.yaml
+++ grubby.yaml
@@ -11,6 +11,7 @@
     - change-to-moblin-release.patch
     - more-support-code-for-syslinux.patch
     - set-default-kernel.patch
+    - symbolic-link-to-kernel.patch
 Description: |
     grubby  is  a command line tool for updating and displaying information about 
     the configuration files for the grub, lilo, elilo (ia64),  yaboot (powerpc)  

++++++ symbolic-link-to-kernel.patch (new)
--- symbolic-link-to-kernel.patch
+++ symbolic-link-to-kernel.patch
+diff --git a/new-kernel-pkg b/new-kernel-pkg
+index aec7cd6..900a6eb 100755
+--- a/new-kernel-pkg
++++ b/new-kernel-pkg
+@@ -227,11 +227,11 @@ install() {
+         #Change menu label
+ 	sed -i "s/^default .*$/default vesamenu.c32/" /boot/extlinux/extlinux.conf
+ 	sed -i "s/^default=.*$//" /boot/extlinux/extlinux.conf
+-	lineno=$(sed -n "/vmlinuz-${version}/=" /boot/extlinux/extlinux.conf)
++	lineno=$(sed -n "/vmlinuz-${version}/=;/vmlinuz-${version}/q" /boot/extlinux/extlinux.conf)
+ 	if [ -n "$lineno" ] ; then
+ 		lineno=$((lineno-1))
+ 		sed -i "${lineno} s/menu label.*$/menu label MeeGo (${version})/; s/\/vmlinuz/vmlinuz/" /boot/extlinux/extlinux.conf
+-		cp -f $bootPrefix/$kernelName-$version /boot/extlinux/
++		ln -sf ../$kernelName-$version /boot/extlinux/$kernelName-$version
+ 	fi
+ 
+         #Set as default menu