From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Thu, 22 Jul 2010 11:42:22 +0000 (+0200)
Subject: handle kernel-debug rpm before removing the rpm database
X-Git-Tag: 5.0-rc14~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=524f94cca7cbdc864dee59a8af862988b70fd3d3;p=build.git

handle kernel-debug rpm before removing the rpm database
---

diff --git a/build.common b/build.common
index 63956ca4..198499ff 100644
--- a/build.common
+++ b/build.common
@@ -408,6 +408,24 @@ fi
 
     # Clean yum cache
     echo "* Cleaning up"
+
+    # NOTE: this hack is for Fedora >= 12. we'll let kernel-debug
+    # pakcage satisfy dependencies to install a base system. Then
+    # we'll link to our version of kernel/initrd and clean up
+    # kernel-debug.
+    pushd $vroot/boot/
+    # we let kernel-debug to be installed to satisfy dependencies. it's time to clean up.
+    rpm --root $vroot -q kernel-debug >& /dev/null
+    if [ $? -eq 0 ]; then 
+        rm -rf kernel-boot kernel-bootsmp initrd-boot initrd-bootsmp
+        ln -s vmlinuz-*${pldistro}* kernel-boot
+        ln -s vmlinuz-*${pldistro}* kernel-bootsmp
+        ln -s initrd-*${pldistro}* initrd-boot
+        ln -s initrd-*${pldistro}* initrd-bootsmp
+        rpm -e --nodeps --root $vroot kernel-debug
+    fi
+    popd
+
     # ignore yum's return code that is basically undefined
     yum $yum_options clean all || :
 
@@ -429,18 +447,6 @@ fi
     # Clean up
     mkfedora_cleanup
 
-    # link to our version of kernel/initrd
-    pushd $vroot/boot/
-    rm -rf kernel-boot kernel-bootsmp initrd-boot initrd-bootsmp
-    ln -s vmlinuz-*${pldistro}* kernel-boot
-    ln -s vmlinuz-*${pldistro}* kernel-bootsmp
-    ln -s initrd-*${pldistro}* initrd-boot
-    ln -s initrd-*${pldistro}* initrd-bootsmp
-    # we let kernel-debug to be installed to satisfy dependencies. it's time to clean up.
-    rpm --root $vroot -q kernel-debug >& /dev/null
-    if [ $? -eq 0 ]; then rpm -e --nodeps --root $vroot kernel-debug; fi
-    popd
-
     return 0
 }