--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: debian-cd: Add hurd-i386 support
- From: Samuel Thibault <sthibault@debian.org>
- Date: Tue, 22 Mar 2011 02:08:09 +0100
- Message-id: <20110322010809.GA28924@const.famille.thibault.fr>
Package: debian-cd
Version: 3.1.6
Severity: normal
Tags: patch
Hello,
The attached patch adds hurd-i386 support to debian-cd, could you please
apply it?
Thanks,
Samuel
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Index: tools/grab_md5
===================================================================
--- tools/grab_md5 (révision 2187)
+++ tools/grab_md5 (copie de travail)
@@ -49,7 +49,7 @@
DIR = ""
}' | sort | uniq >> $OUT
;;
- alpha|amd64|arm|armel|hppa|i386|ia64|m68k|mips|mipsel|powerpc|s390|sparc|kfreebsd-amd64|kfreebsd-i386)
+ alpha|amd64|arm|armel|hppa|i386|ia64|m68k|mips|mipsel|powerpc|s390|sparc|kfreebsd-amd64|kfreebsd-i386|hurd-i386)
FILES=`find $LOCATIONS -name Packages.gz | grep binary-$ARCH`
echo "Using MD5 sums from Packages files:"
echo $FILES
Index: tools/generate_di+k_list
===================================================================
--- tools/generate_di+k_list (révision 2187)
+++ tools/generate_di+k_list (copie de travail)
@@ -302,4 +302,14 @@
libc0.1-i686
#endif
+#ifdef ARCH_hurd_i386
+gnumach-image-1-486
+grub-pc
+libc0.3-i686
+#ifdef VARIANT_xen
+gnumach-image-1-xen-486
+libc0.3-xen
+#endif
+#endif
+
EOF
Index: tools/start_new_disc
===================================================================
--- tools/start_new_disc (révision 2187)
+++ tools/start_new_disc (copie de travail)
@@ -48,6 +48,8 @@
export VOLID="$VOLID_BASE f-i386 $DISKNUM" ;;
kfreebsd-amd64)
export VOLID="$VOLID_BASE f-amd64 $DISKNUM" ;;
+ hurd-i386)
+ export VOLID="$VOLID_BASE h-i386 $DISKNUM" ;;
*)
export VOLID="$VOLID_BASE $ARCHES $DISKNUM" ;;
esac
Index: tools/boot/wheezy/boot-hurd-i386
===================================================================
--- tools/boot/wheezy/boot-hurd-i386 (révision 0)
+++ tools/boot/wheezy/boot-hurd-i386 (révision 0)
@@ -0,0 +1,2 @@
+#!/bin/bash
+. $BASEDIR/tools/boot/$DI_CODENAME/boot-hurd
Modification de propriétés sur tools/boot/wheezy/boot-hurd-i386
___________________________________________________________________
Ajouté : svn:executable
+ *
Index: tools/boot/wheezy/boot-hurd
===================================================================
--- tools/boot/wheezy/boot-hurd (révision 0)
+++ tools/boot/wheezy/boot-hurd (révision 0)
@@ -0,0 +1,94 @@
+# This script gets sourced from boot-hurd-i386.
+#
+# Do install stuff for hurd, including making bootable CDs
+# Works with debian-installer
+#
+# $1 is the CD number
+# $2 is the temporary CD build dir
+
+. $BASEDIR/tools/boot/$DI_CODENAME/common.sh
+. $BASEDIR/tools/boot/$DI_CODENAME/x86-desktop.sh
+
+set -e
+#set -x
+
+N=$1
+CDDIR=$2
+BOOTDIR=
+if [ "$DI_WWW_HOME" = "default" ];then
+ DI_WWW_HOME="http://d-i.debian.org/daily-images/hurd-i386/daily/";
+ if [ -n "$DI_DIR" ];then
+ DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}";
+ DI_WWW_HOME=""
+ echo "Using images from $DI_DIR"
+ fi
+fi
+if [ ! "$DI_DIST" ]; then
+ DI_DIST="$DI_CODENAME"
+fi
+
+cd $CDDIR/..
+
+# Only disc 1 bootable
+if [ $N != 1 ]; then
+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+ exit 0
+fi
+
+# Download boot images.
+BOOT_IMAGES="cdrom/debian-cd_info.tar.gz cdrom/gnumach.gz cdrom/initrd.gz cdrom/ext2fs.static cdrom/ld.so.1"
+
+for image in $BOOT_IMAGES; do
+ if [ ! -e "$image" ]; then
+ dir=$(dirname $image)
+ mkdir -p $dir
+ if [ ! "$DI_WWW_HOME" ];then
+ if [ ! "$DI_DIR" ];then
+ DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+ fi
+ cp "$DI_DIR/$image" $image
+ else
+ wget "$DI_WWW_HOME/$image" -O $image
+ fi
+ fi
+done
+
+# Install kernel and initrd
+mkdir -p $CDDIR/boot/kernel/
+cp "cdrom/gnumach.gz" "$CDDIR/boot/kernel/gnumach.gz"
+cp "cdrom/initrd.gz" "$CDDIR/boot/initrd.gz"
+cp "cdrom/ext2fs.static" "$CDDIR/boot/kernel/ext2fs.static"
+cp "cdrom/ld.so.1" "$CDDIR/boot/kernel/ld.so.1"
+
+# Install bootloader
+mkdir -p boot$N
+tar -C boot$N -zxf cdrom/debian-cd_info.tar.gz
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/grub/grub_eltorito"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.cat"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size 4"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
+
+# Add autorun
+if [ -f $CDDIR/README.html ]; then
+ todos > $CDDIR/autorun.inf <<EOF
+[autorun]
+open=autorun.bat
+EOF
+ todos > $CDDIR/autorun.bat <<EOF
+@echo Starting "README.html"...
+@start README.html
+@exit
+EOF
+fi
+
+# Install languages
+install_languages $CDDIR
+
+# Cleanup
+rm -rf cdrom
+
+# done
Index: data/wheezy/hurd-i386_netinst_udeb_include
===================================================================
--- data/wheezy/hurd-i386_netinst_udeb_include (révision 0)
+++ data/wheezy/hurd-i386_netinst_udeb_include (révision 0)
@@ -0,0 +1 @@
+netcfg
Index: data/wheezy/hurd-i386_udeb_include
===================================================================
--- data/wheezy/hurd-i386_udeb_include (révision 0)
+++ data/wheezy/hurd-i386_udeb_include (révision 0)
@@ -0,0 +1 @@
+netcfg
Index: data/wheezy/hurd-i386_businesscard_udeb_include
===================================================================
--- data/wheezy/hurd-i386_businesscard_udeb_include (révision 0)
+++ data/wheezy/hurd-i386_businesscard_udeb_include (révision 0)
@@ -0,0 +1,2 @@
+choose-mirror
+netcfg
--- End Message ---
--- Begin Message ---
Source: debian-cd
Source-Version: 3.1.7
We believe that the bug you reported is fixed in the latest version of
debian-cd, which is due to be installed in the Debian FTP archive:
debian-cd_3.1.7.dsc
to main/d/debian-cd/debian-cd_3.1.7.dsc
debian-cd_3.1.7.tar.gz
to main/d/debian-cd/debian-cd_3.1.7.tar.gz
debian-cd_3.1.7_all.deb
to main/d/debian-cd/debian-cd_3.1.7_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 619211@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Steve McIntyre <93sam@debian.org> (supplier of updated debian-cd package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Tue, 07 Jun 2011 23:03:42 +0100
Source: debian-cd
Binary: debian-cd
Architecture: source all
Version: 3.1.7
Distribution: unstable
Urgency: low
Maintainer: Debian CD Group <debian-cd@lists.debian.org>
Changed-By: Steve McIntyre <93sam@debian.org>
Description:
debian-cd - Tools for building (Official) Debian CD set
Closes: 614583 619211 622622 630805
Changes:
debian-cd (3.1.7) unstable; urgency=low
.
[ Ben Hutchings ]
* In the boot prompt for powerpc, make install64 more prominent.
Closes: #614583
.
[ Steve McIntyre ]
* Merge update-cd changes back from the squeeze branch:
+ Remove the old non-US stuff from it, it's not been needed in years.
+ Cope with .bz2 source files too.
+ Merged and simplified the old functionality from scansources.old
and scanpackages.old into the new script create_control.
+ Run the mkisofs step *outside* of "set -e" so that we can actually
report errors instead of silently failing.
+ Split out the code for starting a new disc into a function.
+ Pick up on a potential bug: if we finish the last (expected) disc with
a backed-out file, make sure we create another image to include that
file too.
* Update make_disc_trees.pl and which_deb to cope with different
types of source file, and clean up the code in that area.
* tools/make_image: generate list files while we have the CD trees
available
* update the URL for downloading s390 d-i dailies.
* Add linux-image-2.6-686-bigmem to tasks/<release>/interesting-fromcd23
to try and put that on i386 image sets before linux-image-amd64.
Closes: #622622
* update the URL for downloading i386 d-i dailies.
* update the URL for downloading armel d-i dailies.
* tools/grab_md5:
+ Improve Packages and Sources file parsing;
+ Cope with differently-formed files that are still valid
(don't assume field ordering).
+ Switch from awk to perl makes things much faster too!
+ Make arch handling more generic - instead of having to list all
arches, allow a wildcard and then check for lack of Packages.gz files
* tools/make-firmware-image: Rather than use the firmware task which
gets out of date, look for firmware/microcode files directly in the
Packages file. Check for things installing in /lib/firmware, and add
those packages.
* Remove the checked-in firmware task altogether, as it's not
useful. Generate it when needed using the new script
tools/generate_firmware_task.
* Add apt-offline to tasks/wheezy/forcd1 to bring it onto CD#1.
Closes: #630805
* Add links to snapshot.debian.org into jigdo files.
.
[ Aurelien Jarno ]
* Add support for hurd-i386. Closes: #619211
Checksums-Sha1:
2b17d63c82af58d7322d13d4700a4d18763d59be 1628 debian-cd_3.1.7.dsc
82cd40d77368412c5c3ffb6cb298fe2bb679e0da 1198337 debian-cd_3.1.7.tar.gz
c7c504b125bbb79fb8c5619c38353a86fec051d3 1187796 debian-cd_3.1.7_all.deb
Checksums-Sha256:
8d934141ff9f0b08810fba4d5ca148173618bc5acb55c49f167473b60899a6b6 1628 debian-cd_3.1.7.dsc
8d39dff83840ecc733660f7b99b0823917225e62dc5a9cd2466723218d462c07 1198337 debian-cd_3.1.7.tar.gz
286f60901149df1faa497458b5b63905dc044fb857ec6aa6084418032eeb97b6 1187796 debian-cd_3.1.7_all.deb
Files:
46a076e717317414ca72db08dad399d9 1628 admin extra debian-cd_3.1.7.dsc
d269dc55313633d9aa980f76b693fdb3 1198337 admin extra debian-cd_3.1.7.tar.gz
617887c5e2679ea186b1b49f22cebb1c 1187796 admin extra debian-cd_3.1.7_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAEBCAAGBQJOE40nAAoJEFh5eVc0QmhO+WMP/RokCg0vPNiLPiSfoUlO86Ys
TXcYkQZIe5F75ydIKLzBWuY8OOZa+oG7ZmzCRTpFEmXE+i3oCC1AjcxiZAcq0Lzj
wPcuruI81s8c/93bhprrT65g94F6Bj8B4wfIsLzTZWuxrhKeL3QzCdnnpi/+yDj4
/LEaC9jAgrit7BMYT8+1fzYfBs7YuO4tSTP1t+SJ7MvTtCf9XtKMRtueKSm6knkL
1aFiRTCRQs/wT7o4Qf/oOOAtkdpgj+g3ziqUDSCMWycgXMEQH+IJ6/+jNOlo7zGz
5x76Ffm5bdRr/UhSaWs4Xg9QrnVmBqmFBsgGWhxo2/AERMX7UPTMB86U6qPvdZIx
/T9GvR+rQCzv8hr4EeRTfyA9H/Ln7DVy/xvLjxBq4dvIbZqTFWHxfG7XJtPe9I/q
jr6mwS78llWRIBYiGVg0VferzkfK93ejdhuKOGgATbIs6i6o4KN6McnS6sI3ffUg
5C3gFmq8gcx/iE0vsWdPqveDzBRkNSWXnmbefeehEKt5mNiz1yjq0frA1t/swWf+
OjuwIMYSx+ZSxPZEuzlxy+tBdb3xjy3LBSTWksKg8p4vBjFfRzCLWK+LQYxZR+Ym
bL09nc1k2TnDScSJXxd3hbjLUV/l8JeIKv0u+n+avWQx9k4lE7cry07Y/+TtKkM9
98w9iv8A5Q7ZuqNEMUJn
=cvMC
-----END PGP SIGNATURE-----
--- End Message ---