CVS: src/si/rpm Configure.sh,1.1,1.2 Makefile,1.1,1.2 umlsi.sh,1.1,1.2

Update of /cvsroot/lsb/src/si/rpm
In directory sc8-pr-cvs1:/tmp/cvs-serv3791/rpm

Modified Files:
	Configure.sh Makefile umlsi.sh 
Log Message:
Tweaks to uml-build: a custome MAKEDEV patch is used to build the /dev/ubd?
entries, and these are now used by fstab and the Configure script and the
startup (umlsi). rpm/Makefile no longer uses special macros.


Index: Configure.sh
===================================================================
RCS file: /cvsroot/lsb/src/si/rpm/Configure.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Configure.sh	25 Jan 2003 17:07:46 -0000	1.1
--- Configure.sh	27 Jan 2003 22:17:23 -0000	1.2
***************
*** 96,100 ****
  	mkswap ${swapdev}
      fi
!     echo "/dev/ubd/1      none            swap    sw" >> $FSTAB
  fi
  
--- 96,100 ----
  	mkswap ${swapdev}
      fi
!     echo "/dev/ubd1       none            swap    sw" >> $FSTAB
  fi
  
***************
*** 139,143 ****
  	losetup -d ${LOOPDEV2}
      fi
!     echo "/dev/ubd/2      /home           ext3    defaults 1 2" >> $FSTAB
  fi
  
--- 139,143 ----
  	losetup -d ${LOOPDEV2}
      fi
!     echo "/dev/ubd2       /home           ext3    defaults 1 2" >> $FSTAB
  fi
  
***************
*** 182,186 ****
  	losetup -d ${LOOPDEV2}
      fi
!     echo "/dev/ubd/3      /opt            ext3    defaults 1 2" >> $FSTAB
  fi
  
--- 182,186 ----
  	losetup -d ${LOOPDEV2}
      fi
!     echo "/dev/ubd3       /opt            ext3    defaults 1 2" >> $FSTAB
  fi
  

Index: Makefile
===================================================================
RCS file: /cvsroot/lsb/src/si/rpm/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile	25 Jan 2003 17:07:46 -0000	1.1
--- Makefile	27 Jan 2003 22:17:23 -0000	1.2
***************
*** 28,34 ****
  	@echo -n "Making rpm... "
  	@if test -f /usr/bin/rpmbuild; then \
! 	     rpmbuild --rcfile rpmrc -bb ${specf}; \
  	else \
! 	     rpm --rcfile rpmrc -bb ${specf}; \
  	fi
  	@echo "Done."
--- 28,34 ----
  	@echo -n "Making rpm... "
  	@if test -f /usr/bin/rpmbuild; then \
! 	     rpmbuild -bb ${specf}; \
  	else \
! 	     rpm -bb ${specf}; \
  	fi
  	@echo "Done."

Index: umlsi.sh
===================================================================
RCS file: /cvsroot/lsb/src/si/rpm/umlsi.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** umlsi.sh	25 Jan 2003 17:07:46 -0000	1.1
--- umlsi.sh	27 Jan 2003 22:17:23 -0000	1.2
***************
*** 15,21 ****
  fi
  
! CMD="linux ubd0=${LIB}/root_fs root=/dev/ubd/0"
  if [ ${use_swap} = 'y' ] ; then
!     CMD="${CMD} ubd1=${swapdev} swap=/dev/ubd/1"
  fi
  if [ ${use_home} = 'y' ] ; then
--- 15,21 ----
  fi
  
! CMD="linux ubd0=${LIB}/root_fs root=/dev/ubd0"
  if [ ${use_swap} = 'y' ] ; then
!     CMD="${CMD} ubd1=${swapdev} swap=/dev/ubd1"
  fi
  if [ ${use_home} = 'y' ] ; then