CVS: src/si/phase4/package-build bootscripts4b.xml,NONE,1.1 bootscripts4c.xml,NONE,1.1 config-sysvinit4c.xml,NONE,1.1 package-build4a.xml,1.4,1.5 package-build4b.xml,1.4,1.5 package-build4c.xml,1.4,1.5 util-linux.xml,1.2,1.3
Mats Wichmann <[email protected]>
| Newsgroups | gmane.linux.lsb.implementation |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/lsb/src/si/phase4/package-build In directory sc8-pr-cvs1:/tmp/cvs-serv26622/phase4/package-build Modified Files: package-build4a.xml package-build4b.xml package-build4c.xml util-linux.xml Added Files: bootscripts4b.xml bootscripts4c.xml config-sysvinit4c.xml Log Message: Added files and configuration to set up phase 4c (uml). Where applicable, similar changes were made to 4b (bootable), but these are not tested. --- NEW FILE --- <package> <name>lfs-bootscripts</name> <version>&bootscripts-version;</version> <prebuild> <unpack> <archive>&packages_dir;/&bootscripts-package;</archive> <destination>&phase4_build_dir;</destination> </unpack> <execute> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/init.d</base> <command>sed</command> <param>-e 's/loadproc/loadproc inetd/' </param> <param>-e 's/killproc/killproc inetd/'</param> <param>-e 's/\.\.\./ inetd .../'</param> <param>template</param> <param> > inetd</param> </execute> <permissions> <mode>755</mode> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/init.d</base> <name>inetd</name> </permissions> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc0.d</base> <target>../init.d/inetd</target> <name>K35inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc1.d</base> <target>../init.d/inetd</target> <name>K35inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc2.d</base> <target>../init.d/inetd</target> <name>S75inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc3.d</base> <target>../init.d/inetd</target> <name>S75inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc4.d</base> <target>../init.d/inetd</target> <name>S75inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc5.d</base> <target>../init.d/inetd</target> <name>S75inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc6.d</base> <target>../init.d/inetd</target> <name>K35inetd</name> </link> </prebuild> <postbuild> <copy> <options>archive</options> <base>&phase4_build_dir;/&bootscripts-directory;</base> <source>rc.d sysconfig</source> <destination>&LSBsi-phase4-install;/etc</destination> </copy> <!-- checkfs is okay for bootable, not for uml <move> <base>&LSBsi-phase4-install;/etc/rc.d/rcsysinit.d</base> <source>S30checkfs</source> <destination>xS30checkfs</destination> </move> --> <move> <base>&LSBsi-phase4-install;/etc/rc.d/rcsysinit.d</base> <source>S60setclock</source> <destination>xS60setclock</destination> </move> <move> <base>&LSBsi-phase4-install;/etc/rc.d/rcsysinit.d</base> <source>S70loadkeys</source> <destination>xS70loadkeys</destination> </move> <remove>&phase4_build_dir;/&bootscripts-directory;</remove> </postbuild> </package> --- NEW FILE --- <package> <name>lfs-bootscripts</name> <version>&bootscripts-version;</version> <prebuild> <unpack> <archive>&packages_dir;/&bootscripts-package;</archive> <destination>&phase4_build_dir;</destination> </unpack> <execute> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/init.d</base> <command>sed</command> <param>-e 's/loadproc/loadproc inetd/' </param> <param>-e 's/killproc/killproc inetd/'</param> <param>-e 's/\.\.\./ inetd .../'</param> <param>template</param> <param> > inetd</param> </execute> <permissions> <mode>755</mode> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/init.d</base> <name>inetd</name> </permissions> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc0.d</base> <target>../init.d/inetd</target> <name>K35inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc1.d</base> <target>../init.d/inetd</target> <name>K35inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc2.d</base> <target>../init.d/inetd</target> <name>S75inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc3.d</base> <target>../init.d/inetd</target> <name>S75inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc4.d</base> <target>../init.d/inetd</target> <name>S75inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc5.d</base> <target>../init.d/inetd</target> <name>S75inetd</name> </link> <link type="symbolic"> <options>force</options> <base>&phase4_build_dir;/&bootscripts-directory;/rc.d/rc6.d</base> <target>../init.d/inetd</target> <name>K35inetd</name> </link> </prebuild> <postbuild> <copy> <options>archive</options> <base>&phase4_build_dir;/&bootscripts-directory;</base> <source>rc.d sysconfig</source> <destination>&LSBsi-phase4-install;/etc</destination> </copy> <!-- checkfs is okay for bootable, not for uml --> <move> <base>&LSBsi-phase4-install;/etc/rc.d/rcsysinit.d</base> <source>S30checkfs</source> <destination>xS30checkfs</destination> </move> <move> <base>&LSBsi-phase4-install;/etc/rc.d/rcsysinit.d</base> <source>S60setclock</source> <destination>xS60setclock</destination> </move> <move> <base>&LSBsi-phase4-install;/etc/rc.d/rcsysinit.d</base> <source>S70loadkeys</source> <destination>xS70loadkeys</destination> </move> <remove>&phase4_build_dir;/&bootscripts-directory;</remove> </postbuild> </package> --- NEW FILE --- <textdump> <base>&LSBsi-phase4-install;/etc</base> <file>inittab</file> <content> =# Begin /etc/inittab = =id:3:initdefault: = =si::sysinit:/etc/rc.d/init.d/rc sysinit = =l0:0:wait:/etc/rc.d/init.d/rc 0 =l1:S1:wait:/etc/rc.d/init.d/rc 1 =l2:2:wait:/etc/rc.d/init.d/rc 2 =l3:3:wait:/etc/rc.d/init.d/rc 3 =l4:4:wait:/etc/rc.d/init.d/rc 4 =l5:5:wait:/etc/rc.d/init.d/rc 5 =l6:6:wait:/etc/rc.d/init.d/rc 6 = =ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now = =su:S016:respawn:/sbin/sulogin = =co:2345:respawn:/sbin/agetty console 9600 =1:2345:respawn:/sbin/agetty tty1 9600 =2:2345:respawn:/sbin/agetty tty2 9600 =3:2345:off:/sbin/agetty tty3 9600 =4:2345:off:/sbin/agetty tty4 9600 =5:2345:off:/sbin/agetty tty5 9600 =6:2345:off:/sbin/agetty tty6 9600 = =# End /etc/inittab </content> </textdump> Index: package-build4a.xml =================================================================== RCS file: /cvsroot/lsb/src/si/phase4/package-build/package-build4a.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** package-build4a.xml 16 Jan 2003 15:44:22 -0000 1.4 --- package-build4a.xml 24 Jan 2003 20:25:47 -0000 1.5 *************** *** 15,19 **** &phase4a-build-telnetd; &phase4a-build-util-linux; ! ! <!--&phase4a-build-configure; --> </chroot> --- 15,18 ---- &phase4a-build-telnetd; &phase4a-build-util-linux; ! <!-- &phase4a-build-bootscripts; --> </chroot> Index: package-build4b.xml =================================================================== RCS file: /cvsroot/lsb/src/si/phase4/package-build/package-build4b.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** package-build4b.xml 16 Jan 2003 15:44:22 -0000 1.4 --- package-build4b.xml 24 Jan 2003 20:25:47 -0000 1.5 *************** *** 15,19 **** &phase4b-build-telnetd; &phase4b-build-util-linux; ! ! <!--&phase4b-build-configure; --> </chroot> --- 15,18 ---- &phase4b-build-telnetd; &phase4b-build-util-linux; ! &phase4b-build-bootscripts; </chroot> Index: package-build4c.xml =================================================================== RCS file: /cvsroot/lsb/src/si/phase4/package-build/package-build4c.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** package-build4c.xml 16 Jan 2003 15:44:22 -0000 1.4 --- package-build4c.xml 24 Jan 2003 20:25:47 -0000 1.5 *************** *** 8,12 **** <!-- &phase4c-build-kbd; --> <!-- &phase4c-build-kernel; --> ! <!-- &phase4c-build-modutils; --> &phase4c-build-pax; &phase4c-build-syslog; --- 8,12 ---- <!-- &phase4c-build-kbd; --> <!-- &phase4c-build-kernel; --> ! &phase4c-build-modutils; &phase4c-build-pax; &phase4c-build-syslog; *************** *** 15,19 **** &phase4c-build-telnetd; &phase4c-build-util-linux; ! ! <!--&phase4c-build-configure; --> </chroot> --- 15,19 ---- &phase4c-build-telnetd; &phase4c-build-util-linux; ! &phase4c-build-bootscripts; ! &phase4c-build-config-sysvinit; </chroot> Index: util-linux.xml =================================================================== RCS file: /cvsroot/lsb/src/si/phase4/package-build/util-linux.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** util-linux.xml 16 Jan 2003 15:21:30 -0000 1.2 --- util-linux.xml 24 Jan 2003 20:25:47 -0000 1.3 *************** *** 37,47 **** </make> <move> ! <base>&LSBsi-phase4-install;/tmp/util-linux</base> ! <source>sbin/losetup</source> ! <destination>&LSBsi-phase4-install;/sbin</destination> ! </move> ! <move> ! <base>&LSBsi-phase4-install;/tmp/util-linux</base> ! <source>sbin/agetty</source> <destination>&LSBsi-phase4-install;/sbin</destination> </move> --- 37,42 ---- </make> <move> ! <base>&LSBsi-phase4-install;/tmp/util-linux/sbin</base> ! <source>losetup agetty swapon swapoff</source> <destination>&LSBsi-phase4-install;/sbin</destination> </move>