CVS: src/si/phase4/package-build kernel.xml,1.5,1.6

Update of /cvsroot/lsb/src/si/phase4/package-build
In directory sc8-pr-cvs1:/tmp/cvs-serv11339/phase4/package-build

Modified Files:
	kernel.xml 
Log Message:
First pass at adding s390 support.  Also, in a few places,
anticipating work and added the other three architectures
(s390x, ppc64, x86_64).  The xml in this checkin is untested!


Index: kernel.xml
===================================================================
RCS file: /cvsroot/lsb/src/si/phase4/package-build/kernel.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** kernel.xml	17 Jan 2003 03:48:50 -0000	1.5
--- kernel.xml	24 Apr 2003 20:23:42 -0000	1.6
***************
*** 14,18 ****
  		    <ia64>
  			<unpack>
! 			    <archive>&packages_dir;/&linux-ia64-package;</archive>
  			    <destination>&phase4_build_dir;</destination>
  			</unpack>
--- 14,19 ----
  		    <ia64>
  			<unpack>
! 			    <archive>&packages_dir;/&linux-ia64-package;
! 			    </archive>
  			    <destination>&phase4_build_dir;</destination>
  			</unpack>
***************
*** 37,42 ****
  			</search_replace>
  		    </ppc32>
! 		</cond>
  
  
  		<make>
--- 38,56 ----
  			</search_replace>
  		    </ppc32>
!                     <s390>
! 			<unpack>
! 			    <archive>&packages_dir;/&linux-s390-package;
! 			    </archive>
! 			    <destination>&phase4_build_dir;</destination>
! 			</unpack>
  
+ 			<patch>
+ 			    <base>&phase4_build_dir;/&linux-directory;</base>
+ 			    <param>-N</param>
+ 			    <param>-p1</param>
+ 			    <param>-i ../&linux-s390-diff;</param>
+ 			</patch>
+ 		    </s390>
+ 		</cond>
  
  		<make>
***************
*** 72,75 ****
--- 86,95 ----
  			</make>
  		    </ia64>
+ 		    <s390>
+ 			<make>
+ 			    <base>&phase4_build_dir;/&linux-directory;</base>
+ 			    <param>compressed</param>
+ 			</make>
+ 		    </s390>
  		    <default>
  			<make>
***************
*** 94,100 ****
  			    <!-- ia64 should really go in /boot/efi, but
  			         since this isn't a bootable setup without
! 				 manual intervention, bot in /boot -->
  			    <destination>
! 				&LSBsi-phase4-install;/boot/vmlinuz-&linux-version;
  			    </destination>
  			</copy>
--- 114,120 ----
  			    <!-- ia64 should really go in /boot/efi, but
  			         since this isn't a bootable setup without
! 				 manual intervention anyway, put in /boot -->
  			    <destination>
! 			    &LSBsi-phase4-install;/boot/vmlinuz-&linux-version;
  			    </destination>
  			</copy>
***************
*** 112,119 ****
  			    <source>arch/ppc/boot/bzImage</source>
  			    <destination>
! 				&LSBsi-phase4-install;/boot/vmlinuz-&linux-version;
  			    </destination>
  			</copy>
  		    </ppc32>
  		    <default>
  			<copy>
--- 132,148 ----
  			    <source>arch/ppc/boot/bzImage</source>
  			    <destination>
! 			    &LSBsi-phase4-install;/boot/vmlinuz-&linux-version;
  			    </destination>
  			</copy>
  		    </ppc32>
+ 		    <s390>
+ 			<copy>
+ 			    <base>&phase4_build_dir;/&linux-directory;</base>
+ 			    <source>arch/s390/boot/bzImage</source>
+ 			    <destination>
+ 			    &LSBsi-phase4-install;/boot/vmlinuz-&linux-version;
+ 			    </destination>
+ 			</copy>
+ 		    </s390>
  		    <default>
  			<copy>
***************
*** 121,125 ****
  			    <source>arch/i386/boot/bzImage</source>
  			    <destination>
! 				&LSBsi-phase4-install;/boot/vmlinuz-&linux-version;
  			    </destination>
  			</copy>
--- 150,154 ----
  			    <source>arch/i386/boot/bzImage</source>
  			    <destination>
! 			    &LSBsi-phase4-install;/boot/vmlinuz-&linux-version;
  			    </destination>
  			</copy>
***************
*** 148,151 ****
--- 177,183 ----
  			<remove>&phase4_build_dir;/&linux-ia64-diff;</remove>
  		    </ia64>
+ 		    <s390>
+ 			<remove>&phase4_build_dir;/&linux-s390-diff;</remove>
+ 		    </s390>
  		</cond>
  	</postbuild>