From 5914452b9eefccb294bc31323ebea8b7e6d97f1a Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Mon, 30 Jun 2008 19:52:52 +0000
Subject: [PATCH] [uclibc] changed to translate -s in package name to _ to
 avoid conflicts when patching packages which first part is the name of
 another package

---
 base/uclibc/parse-config-9                                              | 2 +-
 .../pkg_patch/{alsa-utils-uclibc.patch => alsa_utils-uclibc.patch}      | 0
 base/uclibc/pkg_patch/{boehm-gc-uclibc.patch => boehm_gc-uclibc.patch}  | 0
 .../uclibc/pkg_patch/{bsd-games-uclibc.patch => bsd_games-uclibc.patch} | 0
 .../{module-init-tools-index.patch => module_init_tools-index.patch}    | 0
 .../{xorg-server-backtrace.patch => xorg_server-backtrace.patch}        | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename base/uclibc/pkg_patch/{alsa-utils-uclibc.patch => alsa_utils-uclibc.patch} (100%)
 rename base/uclibc/pkg_patch/{boehm-gc-uclibc.patch => boehm_gc-uclibc.patch} (100%)
 rename base/uclibc/pkg_patch/{bsd-games-uclibc.patch => bsd_games-uclibc.patch} (100%)
 rename base/uclibc/pkg_patch/{module-init-tools-index.patch => module_init_tools-index.patch} (100%)
 rename base/uclibc/pkg_patch/{xorg-server-backtrace.patch => xorg_server-backtrace.patch} (100%)

diff --git a/base/uclibc/parse-config-9 b/base/uclibc/parse-config-9
index c5b2d52e..f7be4475 100644
--- a/base/uclibc/parse-config-9
+++ b/base/uclibc/parse-config-9
@@ -184,7 +184,7 @@ if [ "$SDECFG_LIBC" == "uclibc" ]; then
 		linux26*|linux-header)
 			pkg_uclibc_pkg=linux26 ;;
 		*)
-			pkg_uclibc_pkg=$pkg ;;
+			pkg_uclibc_pkg=${pkg//-/_} ;;
 	esac
 
 	pkg_uclubc_patches=$( ls -1 $pkg_uclibc_dir/pkg_patch/$pkg_uclibc_pkg-*.patch 2> /dev/null | tr '\n' ' ' )
diff --git a/base/uclibc/pkg_patch/alsa-utils-uclibc.patch b/base/uclibc/pkg_patch/alsa_utils-uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/alsa-utils-uclibc.patch
rename to base/uclibc/pkg_patch/alsa_utils-uclibc.patch
diff --git a/base/uclibc/pkg_patch/boehm-gc-uclibc.patch b/base/uclibc/pkg_patch/boehm_gc-uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/boehm-gc-uclibc.patch
rename to base/uclibc/pkg_patch/boehm_gc-uclibc.patch
diff --git a/base/uclibc/pkg_patch/bsd-games-uclibc.patch b/base/uclibc/pkg_patch/bsd_games-uclibc.patch
similarity index 100%
rename from base/uclibc/pkg_patch/bsd-games-uclibc.patch
rename to base/uclibc/pkg_patch/bsd_games-uclibc.patch
diff --git a/base/uclibc/pkg_patch/module-init-tools-index.patch b/base/uclibc/pkg_patch/module_init_tools-index.patch
similarity index 100%
rename from base/uclibc/pkg_patch/module-init-tools-index.patch
rename to base/uclibc/pkg_patch/module_init_tools-index.patch
diff --git a/base/uclibc/pkg_patch/xorg-server-backtrace.patch b/base/uclibc/pkg_patch/xorg_server-backtrace.patch
similarity index 100%
rename from base/uclibc/pkg_patch/xorg-server-backtrace.patch
rename to base/uclibc/pkg_patch/xorg_server-backtrace.patch
-- 
2.11.4.GIT