Menu
▾
▴
devil-linux-commit
|
From: <rap...@us...> - 2003-10-29 23:11:13
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv21195/build/scripts Modified Files: build-iso cd_cleanup devildoc Log Message: let's get fit Index: build-iso =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- build-iso 13 Oct 2003 17:36:07 -0000 1.42 +++ build-iso 29 Oct 2003 23:11:01 -0000 1.43 @@ -172,6 +172,22 @@ # go to the top directory of the future CD pushd $CDDIR > /dev/null + # some house cleaning + rm $CDDIR/usr/lib/*a + rm -rf $CDDIR/usr/include/* + pushd $CDDIR/usr/bin; strip_debug ; popd + pushd $CDDIR/bin; strip_debug ; popd + pushd $CDDIR/sbin; strip_debug ; popd + pushd $CDDIR/usr/sbin; strip_debug ; popd + if [ "$CONFIG_DEVIL_DOC_ISO" != "y" ]; then + rm -rf $CDDIR/cdtree/doc || exit 1 + fi + if [ "$CONFIG_DEVIL_MAN_ISO" != "y" ]; then + rm -rf $CDDIR/usr/share/man/* || exit 1 + rm -rf $CDDIR/usr/share/doc/* || exit 1 + rm -rf $CDDIR/usr/share/info/* || exit 1 + fi + echo "Creating the CD iso image, $WORKDIR/bootcd.iso... " mkisofs -b boot/isolinux.bin -c boot/boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ Index: cd_cleanup =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/cd_cleanup,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cd_cleanup 13 Oct 2003 17:36:07 -0000 1.2 +++ cd_cleanup 29 Oct 2003 23:11:01 -0000 1.3 @@ -28,6 +28,19 @@ install ) rm $CDDIR/usr/lib/*a rm -rf $CDDIR/usr/include/* + pushd $CDDIR/usr/bin; strip_debug ; popd + pushd $CDDIR/bin; strip_debug ; popd + pushd $CDDIR/sbin; strip_debug ; popd + pushd $CDDIR/usr/sbin; strip_debug ; popd + + if [ "$CONFIG_DEVIL_DOC_ISO" != "y" ]; then + rm -rf $ISODIR/cdtree/doc || exit 1 + fi + if [ "$CONFIG_DEVIL_MAN_ISO" != "y" ]; then + rm -rf $ISODIR/usr/share/man/* || exit 1 + rm -rf $ISODIR/usr/share/doc/* || exit 1 + rm -rf $ISODIR/usr/share/info/* || exit 1 + fi ;; * ) Index: devildoc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/devildoc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- devildoc 29 Oct 2003 14:46:23 -0000 1.8 +++ devildoc 29 Oct 2003 23:11:01 -0000 1.9 @@ -51,6 +51,7 @@ mkdir -p $ISODIR/cdtree/doc || exit 1 cp -dpR $CDDOCDIR/* $ISODIR/cdtree/doc || exit 1 fi + if [ "$CONFIG_DEVIL_MAN_ISO" != "y" ]; then rm -rf $ISODIR/usr/share/man/* || exit 1 rm -rf $ISODIR/usr/share/doc/* || exit 1 |
|
From: Diego T. <dt...@co...> - 2003-10-29 23:17:17
|
On Wed, Oct 29, 2003 at 03:11:03PM -0800, rap...@us... wrote: > --- build-iso 13 Oct 2003 17:36:07 -0000 1.42 > --- cd_cleanup 13 Oct 2003 17:36:07 -0000 1.2 so, which one is the correct fix? i think that the one on build-iso is correct, and why should get rid of cd_cleanup enterily. -- -- gnupg keyfingerprint -- 48AF 5BF9 8F54 2966 64CC 2327 7CD0 DD91 B09D 5799 -- Use of a keyboard or mouse may be linked to serious injuries or disorders. Diego Torres - dt...@co... - Madrid / España |
|
From: Heiko Z. <he...@zu...> - 2003-10-29 23:41:15
|
Diego Torres wrote: >On Wed, Oct 29, 2003 at 03:11:03PM -0800, rap...@us... wrote: > > >>--- build-iso 13 Oct 2003 17:36:07 -0000 1.42 >> >> >>--- cd_cleanup 13 Oct 2003 17:36:07 -0000 1.2 >> >> > >so, which one is the correct fix? i think that the one on build-iso is correct, and why should get rid of cd_cleanup enterily. > > Put it please in the cleanup script. I even have a reason: ;-) cleaning the stuff is actually part of the install On a later release we most likely support something else then "make iso" , like preparing a harddisk installation. So the "iso" part won't be executed. cya Heiko |
|
From: Heiko Z. <he...@zu...> - 2003-10-29 23:21:18
|
Hey, I would say that stuff would be better in the cd_cleanup script. Heiko rap...@us... wrote: > Update of /cvsroot/devil-linux/build/scripts > In directory sc8-pr-cvs1:/tmp/cvs-serv21195/build/scripts > > Modified Files: > build-iso cd_cleanup devildoc > Log Message: > let's get fit > > Index: build-iso > =================================================================== > RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v > retrieving revision 1.42 > retrieving revision 1.43 > diff -u -d -r1.42 -r1.43 > --- build-iso 13 Oct 2003 17:36:07 -0000 1.42 > +++ build-iso 29 Oct 2003 23:11:01 -0000 1.43 > @@ -172,6 +172,22 @@ > # go to the top directory of the future CD > pushd $CDDIR > /dev/null > > + # some house cleaning > + rm $CDDIR/usr/lib/*a > + rm -rf $CDDIR/usr/include/* > + pushd $CDDIR/usr/bin; strip_debug ; popd > + pushd $CDDIR/bin; strip_debug ; popd > + pushd $CDDIR/sbin; strip_debug ; popd > + pushd $CDDIR/usr/sbin; strip_debug ; popd > + if [ "$CONFIG_DEVIL_DOC_ISO" != "y" ]; then > + rm -rf $CDDIR/cdtree/doc || exit 1 > + fi > + if [ "$CONFIG_DEVIL_MAN_ISO" != "y" ]; then > + rm -rf $CDDIR/usr/share/man/* || exit 1 > + rm -rf $CDDIR/usr/share/doc/* || exit 1 > + rm -rf $CDDIR/usr/share/info/* || exit 1 > + fi > + > echo "Creating the CD iso image, $WORKDIR/bootcd.iso... " > mkisofs -b boot/isolinux.bin -c boot/boot.cat \ > -no-emul-boot -boot-load-size 4 -boot-info-table \ > > Index: cd_cleanup > =================================================================== > RCS file: /cvsroot/devil-linux/build/scripts/cd_cleanup,v > retrieving revision 1.2 > retrieving revision 1.3 > diff -u -d -r1.2 -r1.3 > --- cd_cleanup 13 Oct 2003 17:36:07 -0000 1.2 > +++ cd_cleanup 29 Oct 2003 23:11:01 -0000 1.3 > @@ -28,6 +28,19 @@ > install ) > rm $CDDIR/usr/lib/*a > rm -rf $CDDIR/usr/include/* > + pushd $CDDIR/usr/bin; strip_debug ; popd > + pushd $CDDIR/bin; strip_debug ; popd > + pushd $CDDIR/sbin; strip_debug ; popd > + pushd $CDDIR/usr/sbin; strip_debug ; popd > + > + if [ "$CONFIG_DEVIL_DOC_ISO" != "y" ]; then > + rm -rf $ISODIR/cdtree/doc || exit 1 > + fi > + if [ "$CONFIG_DEVIL_MAN_ISO" != "y" ]; then > + rm -rf $ISODIR/usr/share/man/* || exit 1 > + rm -rf $ISODIR/usr/share/doc/* || exit 1 > + rm -rf $ISODIR/usr/share/info/* || exit 1 > + fi > ;; > > * ) > > Index: devildoc > =================================================================== > RCS file: /cvsroot/devil-linux/build/scripts/devildoc,v > retrieving revision 1.8 > retrieving revision 1.9 > diff -u -d -r1.8 -r1.9 > --- devildoc 29 Oct 2003 14:46:23 -0000 1.8 > +++ devildoc 29 Oct 2003 23:11:01 -0000 1.9 > @@ -51,6 +51,7 @@ > mkdir -p $ISODIR/cdtree/doc || exit 1 > cp -dpR $CDDOCDIR/* $ISODIR/cdtree/doc || exit 1 > fi > + > if [ "$CONFIG_DEVIL_MAN_ISO" != "y" ]; then > rm -rf $ISODIR/usr/share/man/* || exit 1 > rm -rf $ISODIR/usr/share/doc/* || exit 1 > > > > > ------------------------------------------------------- > This SF.net email is sponsored by: SF.net Giveback Program. > Does SourceForge.net help you be more productive? Does it > help you create better code? SHARE THE LOVE, and help us help > YOU! Click Here: http://sourceforge.net/donate/ > _______________________________________________ > Devil-linux-commit mailing list > Dev...@li... > https://lists.sourceforge.net/lists/listinfo/devil-linux-commit > > |
|
From: Diego T. <dt...@co...> - 2003-10-30 00:17:39
|
On Wed, Oct 29, 2003 at 06:17:56PM -0500, Heiko Zuerker wrote: > I would say that stuff would be better in the cd_cleanup script. any clue about forcing the cd_cleanup script to execute *the last one* from all the available scripts? -- -- gnupg keyfingerprint -- 48AF 5BF9 8F54 2966 64CC 2327 7CD0 DD91 B09D 5799 -- Use of a keyboard or mouse may be linked to serious injuries or disorders. Diego Torres - dt...@co... - Madrid / España |
|
From: Heiko Z. <he...@zu...> - 2003-10-30 00:31:22
|
Diego Torres wrote: >On Wed, Oct 29, 2003 at 06:17:56PM -0500, Heiko Zuerker wrote: > > > >>I would say that stuff would be better in the cd_cleanup script. >> >> > >any clue about forcing the cd_cleanup script to execute *the last one* from all the available scripts? > > > It is one of the last ones ;-) Check out the folder build/scripts/.buildorder/rc2.d , this is the folder for "install" Heiko |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X