[Glibc-bsd-commits] r1803 - trunk/web/cdscripts
Aurelien Jarno
aurel32 at alioth.debian.org
Wed Dec 13 13:21:33 CET 2006
Author: aurel32
Date: 2006-12-13 13:21:32 +0100 (Wed, 13 Dec 2006)
New Revision: 1803
Modified:
trunk/web/cdscripts/netinst.sh
trunk/web/cdscripts/tarball.sh
Log:
Update the CD scripts for the new kernel packages
Modified: trunk/web/cdscripts/netinst.sh
===================================================================
--- trunk/web/cdscripts/netinst.sh 2006-12-13 09:39:21 UTC (rev 1802)
+++ trunk/web/cdscripts/netinst.sh 2006-12-13 12:21:32 UTC (rev 1803)
@@ -33,14 +33,7 @@
case ${distribution_lowcase} in
debian)
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_*_${DEB_HOST_ARCH}.deb`
- ;;
- *)
- kfreebsd_image=`echo ${tmp1}/var/cache/apt/archives/kfreebsd-image-6.*-${DEB_HOST_ARCH_CPU}-generic_*_${DEB_HOST_ARCH}.deb`
- ;;
- esac
+ kfreebsd_image=`echo ${tmp1}/var/cache/apt/archives/kfreebsd-image-6.*-*_${DEB_HOST_ARCH}.deb`
dpkg --extract ${kfreebsd_image} ${tmp}/
kfreebsd_version=`echo ${kfreebsd_image} | sed -e "s,.*/kfreebsd-image-,,g" -e "s,_.*,,g"`
;;
@@ -52,9 +45,8 @@
;;
esac
rm -rf ${tmp1} &
-if test -e ${tmp}/boot/kernel/kernel ; then
- gzip -9 ${tmp}/boot/kernel/kernel
-fi
+mv ${tmp}/boot/kfreebsd-${kfreebsd_version}.gz ${tmp}/boot/kernel/kernel.gz
+mv ${tmp}/lib/modules/${kfreebsd_version}/* ${tmp}/boot/kernel/
# put mfsroot and other extras
echo "CD_VERSION = ${kfreebsd_version}" > ${tmp}/cdrom.inf
Modified: trunk/web/cdscripts/tarball.sh
===================================================================
--- trunk/web/cdscripts/tarball.sh 2006-12-13 09:39:21 UTC (rev 1802)
+++ trunk/web/cdscripts/tarball.sh 2006-12-13 12:21:32 UTC (rev 1803)
@@ -22,7 +22,7 @@
tmp=`mktemp -d`
-for i in dhcp3-client popularity-contest ; do
+for i in dhcp3-client popularity-contest netbase ; do
if ! grep -qx $i /etc/crosshurd/packages/{common,kfreebsd-gnu} ; then
echo "Please add $i to /etc/crosshurd/packages/"
exit 1
@@ -44,6 +44,12 @@
dpkg --extract ${tmp}/var/cache/apt/archives/${i}_*.deb ${tmp}/
done
+# extract libraries needed by freebsd-utils. Dunno why crosshurd
+# does not do that itself
+for i in libbsd0 libfreebsd0 ; do
+ dpkg --extract ${tmp}/var/cache/apt/archives/${i}_*.deb ${tmp}/
+done
+
# this command is called by f-i after untarring, let's exploit that
cp startup ${tmp}/bin/mtree
chmod +x ${tmp}/bin/mtree
More information about the Glibc-bsd-commits
mailing list