Attachment 150212 Details for Bug 232602 – Patch for kernel-2.6.spec (2.6.18-8.1.1.el5)

[patch] Patch for kernel-2.6.spec (2.6.18-8.1.1.el5)

kernel-2.6.spec.patch (text/plain), 4.79 KB, created by Jos Vos on 2007-03-16 11:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jos Vos

Created: 2007-03-16 11:50:01 UTC

Size: 4.79 KB

patch

obsolete

>--- kernel-2.6.spec.orig	2007-02-27 02:04:14.000000000 +0100
>+++ kernel-2.6.spec	2007-03-16 00:27:58.000000000 +0100
>@@ -67,7 +67,7 @@
> %define builddoc 1
> %define buildup 0
> %define buildheaders 0
>-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
>+%define all_arch_configs kernel-%{kversion}-*.config
> %endif
> 
> # kdump only builds on i686, x86_64, ppc64 ...
>@@ -87,7 +87,7 @@
> %endif
> 
> %ifarch %{all_x86}
>-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
>+%define all_arch_configs kernel-%{kversion}-i?86*.config
> %define image_install_path boot
> %define signmodules 1
> %define hdrarch i386
>@@ -100,13 +100,13 @@
> %endif
> 
> %ifarch x86_64
>-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config
>+%define all_arch_configs kernel-%{kversion}-x86_64*.config
> %define image_install_path boot
> %define signmodules 1
> %endif
> 
> %ifarch ppc64 ppc64iseries
>-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config
>+%define all_arch_configs kernel-%{kversion}-ppc64*.config
> %define image_install_path boot
> %define signmodules 1
> %define make_target vmlinux
>@@ -116,14 +116,14 @@
> %endif
> 
> %ifarch s390
>-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390*.config
>+%define all_arch_configs kernel-%{kversion}-s390*.config
> %define image_install_path boot
> %define make_target image
> %define kernel_image arch/s390/boot/image
> %endif
> 
> %ifarch s390x
>-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-s390x.config
>+%define all_arch_configs kernel-%{kversion}-s390x.config
> %define image_install_path boot
> %define make_target image
> %define kernel_image arch/s390/boot/image
>@@ -131,20 +131,20 @@
> %endif
> 
> %ifarch sparc
>-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc.config
>+%define all_arch_configs kernel-%{kversion}-sparc.config
> %define make_target image
> %define kernel_image image
> %endif
> 
> %ifarch sparc64
> %define buildsmp 1
>-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-sparc64*.config
>+%define all_arch_configs kernel-%{kversion}-sparc64*.config
> %define make_target image
> %define kernel_image image
> %endif
> 
> %ifarch ppc
>-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc{-,.}*config
>+%define all_arch_configs kernel-%{kversion}-ppc{-,.}*config
> %define image_install_path boot
> %define make_target vmlinux
> %define kernel_image vmlinux
>@@ -154,7 +154,7 @@
> %endif
> 
> %ifarch ia64
>-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ia64*.config
>+%define all_arch_configs kernel-%{kversion}-ia64*.config
> %define image_install_path boot/efi/EFI/redhat
> %define signmodules 1
> %define make_target compressed
>@@ -1119,39 +1119,6 @@
> 
> 
> %prep
>-#if a rhel kernel, apply the rhel config options
>-%if 0%{?rhel}
>-  for i in %{all_arch_configs}
>-  do
>-    mv $i $i.tmp
>-    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i
>-    rm $i.tmp
>-  done
>-  for i in $RPM_SOURCE_DIR/kernel-%{kversion}-{i586,i686,i686-PAE,x86_64}*.config
>-  do
>-    echo i is this file  $i
>-    mv $i $i.tmp
>-    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-x86-generic $i.tmp > $i
>-    rm $i.tmp
>-  done
>-  for i in $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64.config
>-  do
>-    echo i is this file  $i
>-    mv $i $i.tmp
>-    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-ppc64-generic $i.tmp > $i
>-    rm $i.tmp
>-  done
>-%endif
>-#if a olpc kernel, apply the olpc config options
>-%if 0%{?olpc}
>-  for i in %{all_arch_configs}
>-  do
>-    mv $i $i.tmp
>-    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-olpc-generic $i.tmp > $i
>-    rm $i.tmp
>-  done
>-%endif
>-
> # First we unpack the kernel tarball.
> # If this isn't the first make prep, we use links to the existing clean tarball
> # which speeds things up quite a bit.
>@@ -1915,7 +1882,44 @@
> 
> mkdir configs
> 
>-cp -f %{all_arch_configs} .
>+cp -f $RPM_SOURCE_DIR/%{all_arch_configs} .
>+
>+#if a rhel kernel, apply the rhel config options
>+%if 0%{?rhel}
>+  for i in %{all_arch_configs}
>+  do
>+    mv $i $i.tmp
>+    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-generic $i.tmp > $i
>+    rm $i.tmp
>+  done
>+  for i in kernel-%{kversion}-{i586,i686,i686-PAE,x86_64}*.config
>+  do
>+    if [ -f "$i" ]; then
>+      echo i is this file  $i
>+      mv $i $i.tmp
>+      $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-x86-generic $i.tmp > $i
>+      rm $i.tmp
>+    fi
>+  done
>+  for i in kernel-%{kversion}-ppc64.config
>+  do
>+    if [ -f "$i" ]; then
>+      echo i is this file  $i
>+      mv $i $i.tmp
>+      $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-rhel-ppc64-generic $i.tmp > $i
>+      rm $i.tmp
>+    fi
>+  done
>+%endif
>+#if a olpc kernel, apply the olpc config options
>+%if 0%{?olpc}
>+  for i in %{all_arch_configs}
>+  do
>+    mv $i $i.tmp
>+    $RPM_SOURCE_DIR/merge.pl $RPM_SOURCE_DIR/config-olpc-generic $i.tmp > $i
>+    rm $i.tmp
>+  done
>+%endif
> 
> 
> %if 0%{?rhel}

Actions: View | Diff

Attachments on bug 232602: 150212