From: Chris Larson <kergoth@openedhand.com>
Date: Wed, 20 Sep 2006 16:40:07 +0000 (+0000)
Subject: Package.bbclass: sync with upstream oe legitimize_package_name.
X-Git-Tag: 2011-1~12679
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=dd9ff71de45785a4a38b5ce6c017161655f7db3e;p=openembedded-core.git

Package.bbclass: sync with upstream oe legitimize_package_name.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@730 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 8a7760724e..d39a1afb70 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1,4 +1,15 @@
 def legitimize_package_name(s):
+	import re
+
+	def fixutf(m):
+		cp = m.group(1)
+		if cp:
+			return ('\u%s' % cp).decode('unicode_escape').encode('utf-8')
+
+	# Handle unicode codepoints encoded as <U0123>, as in glibc locale files.
+	s = re.sub('<U([0-9A-Fa-f]{1,4})>', fixutf, s)
+
+	# Remaining package name validity fixes
 	return s.lower().replace('_', '-').replace('@', '+').replace(',', '+').replace('/', '-')
 
 STAGING_PKGMAPS_DIR ?= "${STAGING_DIR}/pkgmaps"