[Glibc-bsd-commits] r2080 - in trunk/type-handling: . debian

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2007-12-10 14:46:41 +0000 (Mon, 10 Dec 2007)
New Revision: 2080

Modified:
   trunk/type-handling/debian/changelog
   trunk/type-handling/type-handling
Log:
  * Fix type-handling for armel (Closes: bug#455486). 



Modified: trunk/type-handling/debian/changelog
===================================================================
--- trunk/type-handling/debian/changelog	2007-12-10 14:42:51 UTC (rev 2079)
+++ trunk/type-handling/debian/changelog	2007-12-10 14:46:41 UTC (rev 2080)
@@ -1,3 +1,9 @@
+type-handling (0.2.23) unstable; urgency=low
+
+  * Fix type-handling for armel (Closes: bug#455486). 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 10 Dec 2007 15:43:31 +0100
+
 type-handling (0.2.22) unstable; urgency=low
 
   * Replace '_' by '-' in the Provides: line (Closes: bug# 452279). 

Modified: trunk/type-handling/type-handling
===================================================================
--- trunk/type-handling/type-handling	2007-12-10 14:42:51 UTC (rev 2079)
+++ trunk/type-handling/type-handling	2007-12-10 14:46:41 UTC (rev 2080)
@@ -1,7 +1,8 @@
 #!/bin/sh -e
 
-all_cpus=`grep -v ^# /usr/share/dpkg/cputable | (while read debian gnu regex ; do echo ${debian} ; done)`
-all_systems=`grep -v ^# /usr/share/dpkg/ostable | (while read debian gnu regex ; do echo ${debian} ; done) | cut -f2 -d-  | sort -u`
+all_systems_cpus="`dpkg-architecture -L | sed -e '/^$/d' -e '/.*-.*/!s/^/linux-/'`"
+all_cpus="`echo "$all_systems_cpus" | sed -e "s/.*-//" | sort -u`"
+all_systems="`echo "$all_systems_cpus" | sed -e "s/-.*//" | sort -u`"
 
 if [ "$#" = "0" ] ; then
   echo "Known cpus: `for i in ${all_cpus} ; do echo -n $i\  ; done`"
@@ -30,17 +31,13 @@
 done
 
 # Some ugly conversions
-systems="`echo ${systems} | sed "s/linux-gnu/linux/g" | sed "s/hurd/gnu/g"`"
-cpus="`echo ${cpus} | sed "s/amd64/x86_64/g"`"
+systems="`echo ${systems} | sed "s/linux-gnu/linux/g" | sed "s/\bgnu/hurd/g"`"
+cpus="`echo ${cpus} | sed "s/x86_64/amd64/g" | sed "s/arm\b/arm,armel/g"`"
 
-all_cpus="`echo ${all_cpus} | sed "s/amd64/x86_64/g"`"
-all_systems="`echo ${all_systems} | sed "s/hurd/gnu/g"`"
-
-
 # check if we have a cached result for this
 if test -e "/usr/share/type-handling/${cpus}:${systems}" \
   && [ ":${TYPE_HANDLING_BOOTSTRAP}" = ":" ] \
-  && [ "${negated}:${reverted}" = "0:0" ] ; then
+  && [ "${negated}:${reverted}" = ":" ] ; then
   cat "/usr/share/type-handling/${cpus}:${systems}"
   exit
 fi
@@ -79,16 +76,16 @@
   case "${match}${negated}${reverted}" in
     010|100)
       # make sure it exists..
-      if arch=`dpkg-architecture -f -t${cpu}-${system} -qDEB_HOST_ARCH 2>/dev/null` ; then
-        echo -n " ${arch}"
+      if echo "${all_systems_cpus}" | grep -q "${system}-${cpu}" ; then
+        echo -n " ${system}-${cpu}"
       fi
     ;;
     001|111)
       # make sure it exists..
-      if arch=`dpkg-architecture -f -t${cpu}-${system} -qDEB_HOST_ARCH 2>/dev/null` ; then
-        echo -n " !${arch}"
+      if echo "${all_systems_cpus}" | grep -q "${system}-${cpu}" ; then
+        echo -n " !${system}-${cpu}"
       fi
     ;;
   esac
-done ; done) | cut -c 2-
+done ; done) | cut -c 2- | sed -e "s/linux-//g"
 echo