CVS: src/si/entities general.in,1.15,1.16 package,1.38,1.39

Mats Wichmann <[email protected]> Thu, 24 Apr 2003 13:24:13 -0700
Newsgroups gmane.linux.lsb.implementation
Message-ID <[email protected]>
Update of /cvsroot/lsb/src/si/entities
In directory sc8-pr-cvs1:/tmp/cvs-serv11339/entities

Modified Files:
	general.in package 
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: general.in
===================================================================
RCS file: /cvsroot/lsb/src/si/entities/general.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** general.in	25 Jan 2003 17:04:52 -0000	1.15
--- general.in	24 Apr 2003 20:23:39 -0000	1.16
***************
*** 31,34 ****
--- 31,35 ----
  <!ENTITY phase4_build_dir "&LSBsi-phase4-install;&build_dir;">
  
+ <!-- standard and LSB dynamic linker names for each architecture -->
  <!ENTITY linux-dynlinker "ld-linux.so.2">
  <!ENTITY lsb-dynlinker "ld-lsb.so.1">
***************
*** 37,40 ****
--- 38,49 ----
  <!ENTITY linux-ppc-dynlinker "ld.so.1">
  <!ENTITY lsb-ppc-dynlinker "ld-lsb-ppc32.so.1">
+ <!ENTITY linux-ppc64-dynlinker "ld64.so.1">
+ <!ENTITY lsb-ppc64-dynlinker "ld-lsb-ppc64.so.1">
+ <!ENTITY linux-s390-dynlinker "ld.so.1">
+ <!ENTITY lsb-s390-dynlinker "ld-lsb-s390.so.1">
+ <!ENTITY linux-s390x-dynlinker "ld64.so.1">
+ <!ENTITY lsb-s390x-dynlinker "ld-lsb-s390x.so.1">
+ <!ENTITY linux-x86_64-dynlinker "ld-linux-x86-64.so.1">
+ <!ENTITY lsb-x86_64-dynlinker "ld-lsb-x86-64.so.1">
  
  <!-- these settings configure the created fstab and nothing else -->

Index: package
===================================================================
RCS file: /cvsroot/lsb/src/si/entities/package,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** package	11 Feb 2003 21:01:59 -0000	1.38
--- package	24 Apr 2003 20:23:39 -0000	1.39
***************
*** 84,87 ****
--- 84,88 ----
  <!ENTITY gcc-ia64-machdep "/usr/lib/gcc-lib/ia64-unknown-linux-gnu/3.2.2">
  <!ENTITY gcc-ppc-machdep "/usr/lib/gcc-lib/powerpc-unknown-linux-gnu/3.2.2">
+ <!ENTITY gcc-s390-machdep "/usr/lib/gcc-lib/s390-ibm-linux/3.2.2/">
  
  <!ENTITY gettext-version "0.11.5">
***************
*** 101,104 ****
--- 102,107 ----
  <!ENTITY glibc-ia64-machdep "/sysdeps/unix/sysv/linux/ia64">
  <!ENTITY glibc-ppc-machdep "/sysdeps/unix/sysv/linux/powerpc">
+ <!ENTITY glibc-ia64-patch "glibc-2.2.5.s390.patch">
+ <!ENTITY glibc-s390-machdep "/sysdeps/unix/sysv/linux/s390">
  
  <!ENTITY grep-version "2.5">
***************
*** 278,282 ****
  <!ENTITY telnetd-directory "netkit-telnet-0.17">
  
! <!ENTITY lsbrpm-i386-package "lsb-1.3.0-1.i386.rpm">
! <!ENTITY lsbrpm-ia64-package "lsb-1.3.0-1.ia64.rpm">
  <!ENTITY lsbrpm-ppc32-package "lsb-1.3.0-1.ppc.rpm">
--- 281,286 ----
  <!ENTITY telnetd-directory "netkit-telnet-0.17">
  
! <!ENTITY lsbrpm-i386-package  "lsb-1.3.0-1.i386.rpm">
! <!ENTITY lsbrpm-ia64-package  "lsb-1.3.0-1.ia64.rpm">
  <!ENTITY lsbrpm-ppc32-package "lsb-1.3.0-1.ppc.rpm">
+ <!ENTITY lsbrpm-s390-package  "lsb-1.3.0-1.s390.rpm">