Re: patch to simple-cdd-0.3.5/tools/build/debian-cd

[vagrant@freegeek.org]

On Fri, Oct 26, 2007 at 09:03:50AM -0700, Bruce Korb wrote:
> Sorry, but it would be troublesome to reconstruct some of the changes
> because once I've solved my problems, I go back to the distributed version
> of things.  

you realize if it's troublesome for you to reconstruct the changes, it's
even more troublesome for me to review? :P

that said, thanks for the patch(es) :)

> I don't want to diverge :).

good :)

> This patch represents some work I did
> because I needed to figure out how to edit isolinux.cfg.  So, actually, I
> will need to keep the changes to the "debian-cd" script.  Hopefully, you will
> be more disposed to incorporate the stuff.  

i incorporated the commandline improvements, with some smallish
modifications.  also applied the changes in debian-cd to not use
$TASK.cache, with a slight modification (also sort -u on the $includes).

available in the simple-cdd-devel bzr branch:

 bzr get http://cdd.alioth.debian.org/bzr/simple-cdd/simple-cdd-devel/

> Attached is a patch against the current release.  

it seems the debian-cd patch doesn't apply cleanly to the current
simple-cdd release, 0.3.6, uploaded on october 24th.

> "build-simple-cdd" has some debugability tweaks and
> tools/build/debian-cd has some needed functionality.  The patch is annotated.

i'm a little clueless how to get the annotations displayed in a
meaningfuol way...

so the remaining portions of the patches:
 
> === modified file 'build-simple-cdd'
> --- build-simple-cdd	2007-09-17 01:21:30 +0000
> +++ build-simple-cdd	2007-10-26 15:51:11 +0000
> @@ -228,7 +235,10 @@
>    file="$(find_files profiles/$p.conf)"
>    if [ -f "$file" ]; then
>      echo "including configuration values for: $file"
> +    svps4=${PS4}
> +    PS4=">$(basename ${file})> "
>      . "$file"
> +    PS4=${svps4}
>    fi
>  done
>  }
> @@ -379,7 +389,10 @@
>      for tool in $mirror_tools ; do
>          file="$(find_files tools/mirror/$tool)"
>          if [ -f "$file" ]; then
> +            svps4=${PS4}
> +            PS4=">$(basename ${file})> "
>              . "$file"
> +            PS4=${svps4}
>          fi
>      done
>  fi
> @@ -456,14 +469,20 @@
>  for buildtool in $build_tools ; do
>      file="$(find_files tools/build/$buildtool)"
>      if [ -f "$file" ]; then
> +        svps4=${PS4}
> +        PS4=">$(basename ${file})> "
>          . "$file"
> +        PS4=${svps4}
>      fi
>  done
>  
>  if [ "true" = "$use_qemu" ]; then
>    file="$(find_files tools/testing/qemu)"
>    if [ -f "$file" ] ; then
> +    svps4=${PS4}
> +    PS4=">$(basename ${file})> "
>      . "$file"
> +    PS4=${svps4}
>    else
>      echo "Warning: unable to find qemu testing script"
>    fi

what's all the PS4 stuff do?

> === modified file 'tools/build/debian-cd'
> --- tools/build/debian-cd	2007-03-30 22:21:46 +0000
> +++ tools/build/debian-cd	2007-10-25 22:34:38 +0000
> @@ -34,12 +32,19 @@
>  
>  isolinuxcfg="$TDIR/$CODENAME/boot1/isolinux/isolinux.cfg"
>  if [ -f "$isolinuxcfg" ]; then
> +    : configure isolinux.cfg
>      if [ "true" = "$use_serial_console" ] && [ -n "$serial_console_speed" ]; then
>          echo "SERIAL 0 $serial_console_speed 0" >> $isolinuxcfg
>      fi
> +
>      if [ -n "$BOOT_TIMEOUT" ]; then
>          sed -ie "s,TIMEOUT.*,TIMEOUT $BOOT_TIMEOUT,g" $isolinuxcfg
>      fi
> +
> +    case $(type edit_isolinuxcfg 2>/dev/null) in
> +    'edit_isolinuxcfg is a function'* )
> +       edit_isolinuxcfg ${isolinuxcfg} ;;
> +    esac
>  fi
>  
>  for dir in etc install ; do

that's the part that didn't apply cleanly, what's it good for?

live well,
  vagrant