From 5c3d6e428d21cf33e234db533c3b64dcec2ab4a7 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Tue, 10 Aug 2004 19:40:59 +0000 Subject: [PATCH] - too many problems cross-building this on Mandrake and RH9. Restore all the FC2 prereqs, and require that this RPM be built on FC2 (build on jeeves in the /export0/fedora chroot jail) - build in BUILD/linux-2.6.7 instead of BUILD/kernel-2.6.7/linux-2.6.7 --- scripts/kernel-2.6-planetlab.spec | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec index ddfa35073..b780ec720 100644 --- a/scripts/kernel-2.6-planetlab.spec +++ b/scripts/kernel-2.6-planetlab.spec @@ -89,14 +89,11 @@ AutoReqProv: no # # List the packages used during the kernel build # -BuildPreReq: patch >= 2.5.4, bash >= 2.03, sh-utils, tar -#BuildPreReq: module-init-tools -BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg -#BuildPreReq: kernel-utils >= 2.4-12.1.139 +BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar +BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, gnupg, kernel-utils >= 2.4-12.1.139 # temporary req since modutils changed output format #BuildPreReq: modutils >= 2.4.26-14 -BuildRequires: gcc >= 2.96-98, binutils >= 2.12 -#BuildRequires: redhat-rpm-config +BuildRequires: gcc >= 2.96-98, binutils >= 2.12, redhat-rpm-config BuildConflicts: rhbuildsys(DiskFree) < 500Mb @@ -185,8 +182,7 @@ This package includes a user mode version of the Linux kernel. %prep -%setup -q -n %{name}-%{version} -c -cd linux-%{kversion} +%setup -n linux-%{kversion} # make sure the kernel has the sublevel we know it has. This looks weird # but for -pre and -rc versions we need it since we only want to use @@ -203,10 +199,6 @@ find . -name "*~" -exec rm -fv {} \; ### %build -cd linux-%{kversion} - - - BuildKernel() { # Pick the right config file for the kernel we're building @@ -340,8 +332,6 @@ BuildKernel uml %install -cd linux-%{kversion} - # architectures that don't get kernel-source (i586/i686/athlon) dont need # much of an install because the build phase already copied the needed files -- 2.47.0