[davedina-commit] CVS: DD-OS DD-OS.spec.in,1.4,1.5

[Thomas V. S. <tho...@us...>]

Update of /cvsroot/davedina/DD-OS
In directory usw-pr-cvs1:/tmp/cvs-serv7347

Modified Files:
	DD-OS.spec.in 
Log Message:
changes


Index: DD-OS.spec.in
===================================================================
RCS file: /cvsroot/davedina/DD-OS/DD-OS.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DD-OS.spec.in	28 May 2002 15:12:19 -0000	1.4
--- DD-OS.spec.in	28 May 2002 15:53:25 -0000	1.5
***************
*** 6,9 ****
--- 6,10 ----
  Release: 	@DD_OS_RELEASE@
  
+ %define		RHkernel	2.4.7-10
  %define		DDkernel	2.4.7-DD
  
***************
*** 11,14 ****
--- 12,16 ----
  Url: 		http://davedina.apestaart.org/
  Source: 	%{name}-%{version}.tar.gz
+ Source1:	ftp://ftp.kernel.org/pub/linux/kernel/v2.4/
  Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root
  
***************
*** 16,19 ****
--- 18,22 ----
  Summary: 	Dave/Dina OS Kernel, custom 2.4.7 based on red hat 7.2 kernel
  Group: 		Dave Dina/Operating System
+ BuildRequires:  kernel-source = 2.4.7
  
  %package modules
***************
*** 47,66 ****
  %prep
  ## FIXME: this shouldn't be necessary, can't we use Sources: tag ?
! if test ! -f /usr/src/redhat/SOURCES/linux-@KERNEL@.tar.gz
  then
!   echo Please put linux-@KERNEL@.tar.gz in /usr/src/redhat/SOURCES !
    exit 1
  fi
  
  %setup
! tar xzf /usr/src/redhat/SOURCES/linux-@KERNEL@.tar.gz
! cp config linux-@KERNEL@/.config
! perl -i -p -e 's/^(EXTRAVERSION = )-10custom$/$1-DD/' linux-@KERNEL@/Makefile
! cd linux-@KERNEL@
  rm -f include/asm # throw this out
  ( cd include ; ln -sf asm-i386 asm) # throw this out
  
  %build
! cd linux-@KERNEL@
  make oldconfig dep clean bzImage modules
  %install
--- 50,70 ----
  %prep
  ## FIXME: this shouldn't be necessary, can't we use Sources: tag ?
! if test ! -d /usr/src/%{RHkernel}
  then
!   echo Please check if kernel-sources is installed
    exit 1
  fi
  
  %setup
! mkdir -p %{DDkernel}
! cp -r /usr/src/%{RHkernel} %{DDkernel}
! cp config %{DDkernel}/.config
! perl -i -p -e 's/^(EXTRAVERSION = )-10custom$/$1-DD/' %{DDkernel}/Makefile
! cd %{DDkernel} 
  rm -f include/asm # throw this out
  ( cd include ; ln -sf asm-i386 asm) # throw this out
  
  %build
! cd  %{DDkernel}
  make oldconfig dep clean bzImage modules
  %install
***************
*** 70,74 ****
  # modules
  mkdir -p $RPM_BUILD_ROOT/lib/modules
! cd linux-@KERNEL@
  INSTALL_MOD_PATH=$RPM_BUILD_ROOT make modules_install
  
--- 74,78 ----
  # modules
  mkdir -p $RPM_BUILD_ROOT/lib/modules
! cd %{DDkernel} 
  INSTALL_MOD_PATH=$RPM_BUILD_ROOT make modules_install