[Glibc-bsd-commits] r1329 - trunk/web/cdscripts

[Robert Millan]

Author: rmh
Date: 2006-03-15 14:52:36 +0000 (Wed, 15 Mar 2006)
New Revision: 1329

Modified:
   trunk/web/cdscripts/config
   trunk/web/cdscripts/netinst.sh
   trunk/web/cdscripts/tarball.sh
Log:
Argh.  Use the right variable in each place, from all the gazillon of DEB_HOST_* options we've been blessed with.

Modified: trunk/web/cdscripts/config
===================================================================
--- trunk/web/cdscripts/config	2006-03-15 14:44:25 UTC (rev 1328)
+++ trunk/web/cdscripts/config	2006-03-15 14:52:36 UTC (rev 1329)
@@ -1,10 +1,14 @@
 # stuff you might want to override
-cpu=`dpkg-architecture -qDEB_HOST_GNU_CPU`
+DEB_HOST_ARCH=`dpkg-architecture -qDEB_HOST_ARCH`
 distribution=Debian
 
 # common stuff
+DEB_HOST_ARCH_CPU=`dpkg-architecture -a${DEB_HOST_ARCH} -qDEB_HOST_ARCH_CPU`
+DEB_HOST_ARCH_OS=`dpkg-architecture -a${DEB_HOST_ARCH} -qDEB_HOST_ARCH_OS`
+DEB_HOST_GNU_CPU=`dpkg-architecture -a${DEB_HOST_ARCH} -qDEB_HOST_GNU_CPU`
+DEB_HOST_GNU_SYSTEM=`dpkg-architecture -a${DEB_HOST_ARCH} -qDEB_HOST_GNU_SYSTEM`
 pwd=`pwd`
 export GZIP=--best
 distribution_lowcase=`echo ${distribution} | tr [A-Z] [a-z] | tr " " "_"`
 version=`date +%Y%m%d`
-cdname=${distribution_lowcase}-${version}-kfreebsd-${cpu}-install.iso
+cdname=${distribution_lowcase}-${version}-${DEB_HOST_ARCH}-install.iso

Modified: trunk/web/cdscripts/netinst.sh
===================================================================
--- trunk/web/cdscripts/netinst.sh	2006-03-15 14:44:25 UTC (rev 1328)
+++ trunk/web/cdscripts/netinst.sh	2006-03-15 14:52:36 UTC (rev 1329)
@@ -32,13 +32,13 @@
 tar -C ${tmp1} -xzf base.tgz
 case ${distribution_lowcase} in
   debian)
-    dpkg --extract ${tmp1}/var/cache/apt/archives/kfreebsd-loader_*_kfreebsd-${cpu}.deb ${tmp}/
-    case ${cpu} in
+    dpkg --extract ${tmp1}/var/cache/apt/archives/kfreebsd-loader_*_${DEB_HOST_ARCH}.deb ${tmp}/
+    case ${DEB_HOST_ARCH_CPU} in
       i386)
-        kfreebsd_image=`echo ${tmp1}/var/cache/apt/archives/kfreebsd-image-5.*-486_*_kfreebsd-${cpu}.deb`
+        kfreebsd_image=`echo ${tmp1}/var/cache/apt/archives/kfreebsd-image-5.*-${DEB_HOST_GNU_CPU}_*_${DEB_HOST_ARCH}.deb`
       ;;
       *)
-        kfreebsd_image=`echo ${tmp1}/var/cache/apt/archives/kfreebsd-image-6.*-${cpu}-generic_*_kfreebsd-${cpu}.deb`
+        kfreebsd_image=`echo ${tmp1}/var/cache/apt/archives/kfreebsd-image-6.*-${DEB_HOST_ARCH_CPU}-generic_*_${DEB_HOST_ARCH}.deb`
       ;;
     esac
     dpkg --extract ${kfreebsd_image} ${tmp}/
@@ -81,7 +81,7 @@
 #################################
 # -V argument *must* be 32 char long at most, we have 18 chars for $version + $cpu
 (cd ${tmp} && mkisofs -b boot/cdboot -no-emul-boot \
-  -r -J -V "${distribution} ${version} ${cpu} Bin-1" \
+  -r -J -V "${distribution} ${version} ${DEB_HOST_ARCH_CPU} Bin-1" \
   -o ${pwd}/${cdname} .)
 
 rm -rf ${tmp} &

Modified: trunk/web/cdscripts/tarball.sh
===================================================================
--- trunk/web/cdscripts/tarball.sh	2006-03-15 14:44:25 UTC (rev 1328)
+++ trunk/web/cdscripts/tarball.sh	2006-03-15 14:52:36 UTC (rev 1329)
@@ -32,7 +32,7 @@
 if test -e base.tgz ; then
   tar --same-owner -xzpf base.tgz -C ${tmp}
 else
-  /usr/share/crosshurd/makehurddir.sh ${tmp} ${cpu} kfreebsd-gnu
+  /usr/share/crosshurd/makehurddir.sh ${tmp} ${DEB_HOST_GNU_CPU} kfreebsd-gnu
 fi
 
 if test -e native-install ; then