Re: broken kfreebsd cdimage building
Cyril Brulebois: > Robert Millan (2013-09-26): >>> so you broke cdimage building for kfreebsd-*: >>> http://anonscm.debian.org/gitweb/?p=d-i/debian-installer.git;a=commitdiff;h=c5a8de108e7828cc3e2694309cbb045eb8db521c >>> >>> >> http://anonscm.debian.org/gitweb/?p=d-i/debian-installer.git;a=commitdiff;h=c5a8de108e7828cc3e2694309cbb045eb8db521c >> >> No, this is correct. kfreebsd-8 is considered obsolete and won't be >> included in Jessie. See: >> >> https://lists.debian.org/debian-bsd/2013/08/msg00175.html > > You're missing the point. I'm not saying the changes are incorrect. I'm > saying they broke cdimage building, which you get to fix by sending > patches. > > That's called coordinating changes. You really should have done that… Oh yes. I have to admit, despite my best efforts I can't always keep track with every detail. It's fortunate that we can rely on you to send reminders, I really appreciate that. Here, attached patch should get jessie builds working again. Would you be kind enough to commit it? -- Robert Millan Index: tools/boot/jessie/boot-kfreebsd === --- 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
Re: broken kfreebsd cdimage building
Robert Millan (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. signature.asc Description: Digital signature
Re: broken kfreebsd cdimage building
On 28/09/13 11:07, Cyril Brulebois wrote: > [...] 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? Yes that seems right, kfreebsd-10 isn't available yet in sid, but it may be in a few months, and then it can be included on the CDs. Only kfreebsd-9 CD builds are needed currently. Regards, -- Steven Chamberlain ste...@pyro.eu.org -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/5246b21e.5030...@pyro.eu.org
