1.1 --- a/scripts/build/debug/200-duma.sh	Mon Jan 05 21:09:37 2009 +0000
     1.2 +++ b/scripts/build/debug/200-duma.sh	Sun Feb 01 18:51:19 2009 +0000
     1.3 @@ -2,26 +2,23 @@
     1.4  
     1.5  do_debug_duma_get() {
     1.6      CT_GetFile "duma_${CT_DUMA_VERSION}" http://mesh.dl.sourceforge.net/sourceforge/duma/
     1.7 -    # D.U.M.A. doesn't separate its name from its version with a dash,
     1.8 -    # but with an underscore. Create a link so that crosstool-NG can
     1.9 -    # work correctly:
    1.10 -    CT_Pushd "${CT_TARBALLS_DIR}"
    1.11 -    duma_ext=$(CT_GetFileExtension "duma_${CT_DUMA_VERSION}")
    1.12 -    rm -f "duma-${CT_DUMA_VERSION}${duma_ext}"
    1.13 -    ln -sf "duma_${CT_DUMA_VERSION}${duma_ext}" "duma-${CT_DUMA_VERSION}${duma_ext}"
    1.14      # Downloading from sourceforge leaves garbage, cleanup
    1.15 -    rm -f showfiles.php\?group_id\=*
    1.16 -    CT_Popd
    1.17 +    CT_DoExecLog ALL rm -f "${CT_TARBALLS_DIR}/showfiles.php"*
    1.18  }
    1.19  
    1.20  do_debug_duma_extract() {
    1.21 -    CT_ExtractAndPatch "duma-${CT_DUMA_VERSION}"
    1.22 +    CT_Extract "duma_${CT_DUMA_VERSION}"
    1.23 +    CT_Pushd "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}"
    1.24 +    # Even if DUMA uses _ and not -, crosstool-NG uses the dash to split the
    1.25 +    # name from the version in order to find the appropriate patches
    1.26 +    # YEM: FIXME: make CT_Patch more intelligent, Eg.: CT_Patch duma _ "${CT_DUMA_VERSION}"
    1.27 +    CT_Patch "duma-${CT_DUMA_VERSION}" nochdir
    1.28 +    CT_Popd
    1.29  }
    1.30  
    1.31  do_debug_duma_build() {
    1.32      CT_DoStep INFO "Installing D.U.M.A."
    1.33      CT_DoLog EXTRA "Copying sources"
    1.34 -    # DUMA separates its name from the version with an underscore, not a dash
    1.35      cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}" "${CT_BUILD_DIR}/build-duma"
    1.36      CT_Pushd "${CT_BUILD_DIR}/build-duma"
    1.37