From f9dbb5e102dae510ef6edb8254445fc5216f26b2 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 14 Apr 2004 09:11:38 +0000 Subject: [PATCH] Clifford Wolf: Moved building isomd5sum to src/isomd5sum (the rock source tree should be kept read-only). [2004041122221206447] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2750 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- scripts/Cleanup | 2 -- scripts/Create-ISO | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/Cleanup b/scripts/Cleanup index f79bcc99d..ef1e5266e 100755 --- a/scripts/Cleanup +++ b/scripts/Cleanup @@ -42,8 +42,6 @@ while [ "$1" ] ; do esac done -make -C misc/isomd5sum clean || true - # Remove src* # for x in src src.* build/*/ROCK/src.*; do diff --git a/scripts/Create-ISO b/scripts/Create-ISO index 5000b83da..19fb3916f 100755 --- a/scripts/Create-ISO +++ b/scripts/Create-ISO @@ -54,9 +54,11 @@ done spacer=" " -if [ "$implantisomd5" = 1 -a ! -x ./misc/isomd5sum/implantisomd5 ] ; then +if [ "$implantisomd5" = 1 -a ! -x src/isomd5sum/implantisomd5 ] ; then echo ; date "+ [%X] Creating ISO-MD5 tools ..." - make -C misc/isomd5sum all + rm -rf src/isomd5sum; mkdir -p src/isomd5sum + cp misc/isomd5sum/* src/isomd5sum/ + make -C src/isomd5sum all fi echo ; date "+ [%X] Removing old files with same prefix ..." @@ -267,7 +269,7 @@ for x in $disks ; do if [ "$implantisomd5" = 1 -a -x ./misc/isomd5sum/implantisomd5 ] ; then echo "$spacer Calculating and implanting MD5 checksum ..." - ./misc/isomd5sum/implantisomd5 ${isoprefix}_cd$x.iso >/dev/null + ./src/isomd5sum/implantisomd5 ${isoprefix}_cd$x.iso >/dev/null fi if [ "$mkdebug" = 1 ] ; then