Robert Millan <rmh@debian.org> (2013-09-28): > Here, attached patch should get jessie builds working again. Would you > be kind enough to commit it? Steve (from debian-cd@) is likely the one who's going to check it. I wonder, however, if the -boot/-cd changes are actually correct. When removing kfreebsd 8 support, supported cdrom settings went from kfreebsd + kfreebsd-9 to kfreebsd-9 only; when adding kfreebsd-10 support, the cdrom settings weren't added kfreebsd-10, and the patch below isn't adding it either (so the build should be OK since that part would be missing from the d-i build). Is that expected though? No kfreebsd-10 in there? (I didn't check the bootloader configuration part at all, BTW.) > --- tools/boot/jessie/boot-kfreebsd (revision 2572) > +++ tools/boot/jessie/boot-kfreebsd (working copy) > @@ -40,7 +40,7 @@ > fi > > # Download boot images. > -BOOT_IMAGES="cdrom/debian-cd_info.tar.gz cdrom/kfreebsd.gz cdrom/kfreebsd-9.gz cdrom/initrd.gz" > +BOOT_IMAGES="cdrom/debian-cd_info.tar.gz cdrom/kfreebsd-9.gz cdrom/initrd.gz" > > if [ "$ARCH" = kfreebsd-amd64 ]; then > BOOT_IMAGES="$BOOT_IMAGES cdrom/gtk/initrd.gz" > @@ -63,10 +63,7 @@ > > # Install kernel and initrd > mkdir -p $CDDIR/boot/kernel/ > -cp "cdrom/kfreebsd.gz" "$CDDIR/boot/kernel/kfreebsd.gz" > -if [ -f cdrom/kfreebsd-9.gz ] ; then > - cp "cdrom/kfreebsd-9.gz" "$CDDIR/boot/kernel/kfreebsd-9.gz" > -fi > +cp "cdrom/kfreebsd-9.gz" "$CDDIR/boot/kernel/kfreebsd-9.gz" > cp "cdrom/initrd.gz" "$CDDIR/boot/mfsroot.gz" > > if [ "$ARCH" = kfreebsd-amd64 ] && [ -f cdrom/gtk/initrd.gz ] ; then Mraw, KiBi.
Attachment:
signature.asc
Description: Digital signature