Re: Dropping CDs entirely?! (was: Stretch Alpha 3 images)
On 2015-09-03 23:03, Steve McIntyre wrote: > On Thu, Sep 03, 2015 at 05:21:17PM +0200, Cyril Brulebois wrote: > >Steve McIntyre (2015-09-03): > >> All looked OK, *except* mips failures: > >> > >> install: cannot stat > >> '/org/cdbuilder.debian.org/src/ftp/debian/dists/stretch/main/installer-mips/current/images/r4k-ip22/cdrom-boot.img': > >> No such file or directory > >> > >> Looks like we need some fixes there... > > > >I suppose mipsel also fails? > > > > http://anonscm.debian.org/cgit/d-i/debian-installer.git/diff/?id=1b92647295e > 33ff66a46a5665e7f293d04fd2e19 > > You might think so, but no - the builds all worked for mipsel. > > >Changelog says: > >| [ Aurelien Jarno ] > >| * Drop r4k-ip22, r5k-ip32 and sb1-bcm91250a images on mips. > >| * Drop sb1-bcm91250a images on mipsel. > > > >But the diff has an extra miniiso removal: > > - The following subarchs got removed on mips: > > r4k-ip22 r5k-ip32 sb1-bcm91250a miniiso The miniiso was only containing boot support for r4k-ip22 which has been dropped. > Right. That means that we'll end up with no bootable options on mips > images. CCing debian-mips for guidance there. > Most of the flavours requires to pass the d-i kernel/initrd to uboot or similar bootloader to run d-i. The flavours we dropped were the only one with CD-ROM support. I guess however it still makes sense to continue producing the CD-ROM images, but without making them bootable. In the long term, we might want to add bootable support for the remaining flavours, but I have no idea if they support booting over a CD-ROM or USB image. Does someone known if we can do so on a Loongson 3 or Octeon machine? Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net
Re: Dropping CDs entirely?! (was: Stretch Alpha 3 images)
On 2015-09-06 14:25, Thomas Schmitt wrote: > Hi, > > Aurelien Jarno wrote: > > I have no idea if they support booting over a > > CD-ROM or USB image. Does someone known if we can do so on a Loongson 3 > > or Octeon machine? > > Maybe one should ask grub-de...@gnu.org mailing list or > Vladimir Serbinenko directly. GRUB only works on the Loongson 2 machines, not the Loongson 3 ones. Given we are going to drop the Loongson 2 support soon, there is no point trying to get it working for CD-ROM booting. -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net
Bug#497270: debian-cd: includes embedded copies of bootloaders
block 497270 by 496869 thanks On Sun, Aug 31, 2008 at 02:51:20PM +0200, Daniel Baumann wrote: > Package: debian-cd > Severity: serious > > Hi, > > debian-cd includes (at least) syslinux binaries without source. > > debian-cd should take the syslinux binaries out of the archive when > building images. > At least the embedded copy works on all machines. The version in the archive has problems with QEMU and Intel Macs (see bug#496869). -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' [EMAIL PROTECTED] | [EMAIL PROTECTED] `-people.debian.org/~aurel32 | www.aurel32.net -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#497270: debian-cd: includes embedded copies of bootloaders
On Sun, Aug 31, 2008 at 05:01:30PM +0200, Daniel Baumann wrote: > unblock 497270 by 496869 > thanks > > Aurelien Jarno wrote: > > At least the embedded copy works on all machines. The version in the > > archive has problems with QEMU and Intel Macs (see bug#496869). > > ...which is an entirely different problem and has nothing to do with the > legal promplem to comply with the syslinux license (GPL-2+). > Bug#496869 is a release blocker. We don't want to produce d-i images that do not work on some machines. -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' [EMAIL PROTECTED] | [EMAIL PROTECTED] `-people.debian.org/~aurel32 | www.aurel32.net -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Bug#593629: debian-cd: GNU/kFreeBSD support
Package: debian-cd
Version: 3.1.3
Severity: normal
Tags: patch
Hi,
The patch below add support for GNU/kFreeBSD. It's a mix of support
for kfreebsd-amd64 and kfreebsd-i386 with bug fixes to support a "-"
in the architecture name.
If you have any question, don't hesitate. If not, please apply this
patch for the next upload.
Thanks in advance,
Aurelien
Index: tools/grab_md5
===
--- tools/grab_md5 (révision 2043)
+++ 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)
+
alpha|amd64|arm|armel|hppa|i386|ia64|m68k|mips|mipsel|powerpc|s390|sparc|kfreebsd-amd64|kfreebsd-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 2043)
+++ tools/generate_di+k_list(copie de travail)
@@ -287,4 +287,17 @@
loop-aes-modules-2.6-prep
#endif
+#ifdef ARCH_kfreebsd_amd64
+kfreebsd-image-8-amd64
+grub-pc
+#endif
+
+#ifdef ARCH_kfreebsd_i386
+kfreebsd-image-8-486
+kfreebsd-image-8-686
+kfreebsd-image-8-686-smp
+grub-pc
+libc0.1-i686
+#endif
+
EOF
Index: tools/generate_di_list
===
--- tools/generate_di_list (révision 2043)
+++ tools/generate_di_list (copie de travail)
@@ -12,9 +12,9 @@
my @ARCHES;
if ( $ENV{ARCHES} ) {
-push @ARCHES, 'i386' if $ENV{ARCHES} =~ /i386/;
-push @ARCHES, 'amd64' if $ENV{ARCHES} =~ /amd64/;
-push @ARCHES, grep { !/source|i386|amd64/ } split /\s+/, $ENV{ARCHES};
+push @ARCHES, 'i386' if $ENV{ARCHES} =~ /[^\s]i386[\s\$]/;
+push @ARCHES, 'amd64' if $ENV{ARCHES} =~ /[^\s]amd64[\s\$]/;
+push @ARCHES, grep { !/^(source|i386|amd64)$/ } split /\s+/, $ENV{ARCHES};
}
@ARCHES = qw{i386 amd64} unless @ARCHES;
Index: tools/boot/squeeze/boot-kfreebsd
===
--- tools/boot/squeeze/boot-kfreebsd(révision 0)
+++ tools/boot/squeeze/boot-kfreebsd(révision 0)
@@ -0,0 +1,90 @@
+# This script gets sourced from boot-kfreebsd-i386 and boot-kfreebsd-amd64.
+#
+# Do install stuff for kfreebsd, 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/$ARCH/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/kfreebsd.gz cdrom/initrd.gz"
+
+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/kfreebsd.gz" "$CDDIR/boot/kernel/kfreebsd.gz"
+cp "cdrom/initrd.gz" "$CDDIR/boot/mfsroot.gz"
+
+# Install bootloader
+tar -C $CDDIR -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 autorun
+if [ -f $CDDIR/README.html ]; then
+ todos > $CDDIR/autorun.inf < $CDDIR/autorun.bat < Unix text files,
Versions of packages debian-cd recommends:
pn hfsutils (no description available)
ii netpbm 2:10.0-12.2 Graphics conversion tools between
pn syslinux-common(no des
Bug#593629: debian-cd: GNU/kFreeBSD support
On Fri, Aug 20, 2010 at 03:38:07PM +0100, Steve McIntyre wrote: > On Thu, Aug 19, 2010 at 07:58:14PM +0200, Aurelien Jarno wrote: > >Package: debian-cd > >Version: 3.1.3 > >Severity: normal > >Tags: patch > > > >Hi, > > > >The patch below add support for GNU/kFreeBSD. It's a mix of support > >for kfreebsd-amd64 and kfreebsd-i386 with bug fixes to support a "-" > >in the architecture name. > > > >If you have any question, don't hesitate. If not, please apply this > >patch for the next upload. > > All looks excellent, except: Thanks for the review. > >Index: data/squeeze/exclude-udebs > >=== > >--- data/squeeze/exclude-udebs (révision 2043) > >+++ data/squeeze/exclude-udebs (copie de travail) > >@@ -134,6 +134,8 @@ > > kbd-udeb > > console-setup-* > > # Currently unused > >+debian-ports-archive-keyring-udeb > >+emdebian-archive-keyring-udeb > > nbd-client-udeb > > pwgen-udeb > > # Eh? > > I don't understand why you're touching the generic exclude-udebs file > here. Is this just another local change that's got caught up in your > diff, or is this a generic change you think we should take anyway? Oh yes, it's a generic change that should not have ended in this patch, but I wanted to submit separately. I have reviewed the list of packages that are excluded to compute the kfreebsd specific one, and noticed these two packages. They are not necessary unless you install an architecture hosted on embdebian or debian-ports, and even in that case they should already be in the initrd. > Once that's fixed, I'll commit your changes and also add support for > the kfreebsd arches in the daily and weekly build scripts. > Thanks! Aurelien -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurel...@aurel32.net http://www.aurel32.net -- 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/20100820145509.gb14...@hall.aurel32.net
Bug#593972: debian-cd: Should not exclude reiserfsprogs-udeb
Package: debian-cd Version: 3.1.3 Severity: normal data/squeeze/exclude-udebs currently contains: | # Nothing currently depends on this, and it seems not useful on its own | reiserfsprogs-udeb I guess this is something outdated, as rescue-mode now depends on it. -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (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 -- 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/20100822185057.28790.22257.report...@volta.aurel32.net
Bug#593629: debian-cd: GNU/kFreeBSD support
On Thu, Aug 19, 2010 at 07:58:14PM +0200, Aurelien Jarno wrote: > Package: debian-cd > Version: 3.1.3 > Severity: normal > Tags: patch > > Hi, > > The patch below add support for GNU/kFreeBSD. It's a mix of support > for kfreebsd-amd64 and kfreebsd-i386 with bug fixes to support a "-" > in the architecture name. > > If you have any question, don't hesitate. If not, please apply this > patch for the next upload. > I am sorry but I have just found a small bug in the patch I send. Basically /boot/grub/grub_eltorito is modified by mkisofs, so the md5sum on the final ISO image is wrong. Please find attached a small patch (based on what is done on x86) to fix the issue. -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurel...@aurel32.net http://www.aurel32.net --- tools/boot/squeeze/boot-kfreebsd (révision 2048) +++ tools/boot/squeeze/boot-kfreebsd (copie de travail) @@ -63,7 +63,8 @@ cp "cdrom/initrd.gz" "$CDDIR/boot/mfsroot.gz" # Install bootloader -tar -C $CDDIR -zxf cdrom/debian-cd_info.tar.gz +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" @@ -71,6 +72,7 @@ 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
Re: Adding ppc64el support in debian-cd
On Mon, Sep 22, 2014 at 02:09:29PM +0100, Steve McIntyre wrote: > On Mon, Sep 22, 2014 at 09:57:44AM -0300, Mauricio Faria de Oliveira wrote: > >On 09/22/2014 12:00 AM, Lennart Sorensen wrote: > >>On Sun, Sep 21, 2014 at 06:19:43PM +0100, Steve McIntyre wrote: > >>>I'm adding support for new architectures at the moment. powerpc is one > >>>of the most awkward existing arches to add boot support for at the > >>>moment, due to the mess of older machines. I'm hoping that ppc64el is > >>>better, but I don't have much information to go on. What should we be > >>>doing to make bootable CD/DVD/USB images for ppc64el, please? > > > >Aurelien and Paulo know more about the bootable status/steps than me. > > > >I believe that w/ the grub2 and klibc uploads from this last weekend, > >it's almost there. There's powerpc-utils & util-linux coming in from > >DELAYED in 2 days & 5 days. > > OK, cool. Indeed bootable CD images are done with GRUB on ppc64el, but it is currently broken. debian-installer will provide a kernel, a vmlinux and a file called debian-cd_info.tar.gz containing the grub files. I have put an example of such a directory tree there: http://temp.aurel32.net/ppc64el/d-i/ The tarball should be decompressed in the root of the CD-ROM, while the kernel and initrd should be placed in the /install directory. The ISO image should be generated with the --chrp-boot argument. Beside that the default options of genisoimage should be used, there is no need to specify any strange HFS option like on powerpc (Note: I only tested that on a VM using SLOF, it will be nice if someone with access to bare metal can confirm that). Don't hesitate to ask more details if needed. I will tell you once GRUB is fixed and all these files are in place on d-i.debian.org. Thanks, Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140922204710.gb5...@hall.aurel32.net
Re: Adding ppc64el support in debian-cd
On Mon, Sep 22, 2014 at 10:47:10PM +0200, Aurelien Jarno wrote: > On Mon, Sep 22, 2014 at 02:09:29PM +0100, Steve McIntyre wrote: > > On Mon, Sep 22, 2014 at 09:57:44AM -0300, Mauricio Faria de Oliveira wrote: > > >On 09/22/2014 12:00 AM, Lennart Sorensen wrote: > > >>On Sun, Sep 21, 2014 at 06:19:43PM +0100, Steve McIntyre wrote: > > >>>I'm adding support for new architectures at the moment. powerpc is one > > >>>of the most awkward existing arches to add boot support for at the > > >>>moment, due to the mess of older machines. I'm hoping that ppc64el is > > >>>better, but I don't have much information to go on. What should we be > > >>>doing to make bootable CD/DVD/USB images for ppc64el, please? > > > > > >Aurelien and Paulo know more about the bootable status/steps than me. > > > > > >I believe that w/ the grub2 and klibc uploads from this last weekend, > > >it's almost there. There's powerpc-utils & util-linux coming in from > > >DELAYED in 2 days & 5 days. > > > > OK, cool. > > Indeed bootable CD images are done with GRUB on ppc64el, but it is > currently broken. debian-installer will provide a kernel, a vmlinux and > a file called debian-cd_info.tar.gz containing the grub files. I have > put an example of such a directory tree there: > > http://temp.aurel32.net/ppc64el/d-i/ > > The tarball should be decompressed in the root of the CD-ROM, while the > kernel and initrd should be placed in the /install directory. The ISO > image should be generated with the --chrp-boot argument. Beside that the > default options of genisoimage should be used, there is no need to > specify any strange HFS option like on powerpc (Note: I only tested that > on a VM using SLOF, it will be nice if someone with access to bare metal > can confirm that). > > Don't hesitate to ask more details if needed. I will tell you once GRUB > is fixed and all these files are in place on d-i.debian.org. GRUB is now fixed, and the latest daily build of d-i does have the CDROM files available: http://d-i.debian.org/daily-images/ppc64el/daily/cdrom/ Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20140927080234.gc3...@hall.aurel32.net
Re: Time for Jessie Beta 2?
On Mon, Sep 29, 2014 at 01:00:01AM +0200, Cyril Brulebois wrote: > > Since the kernel is now a candidate for migration, I'll probably start > > urgenting more packages into testing during the weekend (all l10n-only > > updates, for a start), try to figure out which packages to additionally > > migrate, and freeze udeb-producing packages. > > Besides partman-efi (uploaded today to drop armhf), brltty (stuck > because of llvm/clang issues), and the CJK issue (#762057), I don't > think I'm going to merge more things, so I've just frozen udebs. It might be interesting to also unblock netcfg 1.122 if we want to have a working d-i beta2 on s390x (and maybe on other architectures). The recent uploads have been built with gcc-4.9 instead of gcc-4.8, which triggers a bug that have been hidden for years. I have fixed this bug in 1.122. Also not fully necessary, but it might be a good idea to let util-linux to migrate to testing so that we can do testing installations on ppc64el. There is no code change, just one less file shipped on this architecture so the diff is quite small. Thanks, Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net signature.asc Description: Digital signature
Re: Adding ppc64el support in debian-cd
Hi Steve,
On Sat, Sep 27, 2014 at 10:02:34AM +0200, Aurelien Jarno wrote:
> On Mon, Sep 22, 2014 at 10:47:10PM +0200, Aurelien Jarno wrote:
> > The tarball should be decompressed in the root of the CD-ROM, while the
> > kernel and initrd should be placed in the /install directory. The ISO
> > image should be generated with the --chrp-boot argument. Beside that the
> > default options of genisoimage should be used, there is no need to
> > specify any strange HFS option like on powerpc (Note: I only tested that
> > on a VM using SLOF, it will be nice if someone with access to bare metal
> > can confirm that).
> >
> > Don't hesitate to ask more details if needed. I will tell you once GRUB
> > is fixed and all these files are in place on d-i.debian.org.
>
> GRUB is now fixed, and the latest daily build of d-i does have the CDROM
> files available:
>
> http://d-i.debian.org/daily-images/ppc64el/daily/cdrom/
Please find attached a patch to add ppc64el support to debian-cd. Could
you please merge it?
Thanks,
Aurelien
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://www.aurel32.net
From c7868964f5fb572fccbb7a00fd2f79bf612fadb5 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno
Date: Fri, 3 Oct 2014 00:11:47 +0200
Subject: [PATCH] Add initial support for ppc64el
---
build_all.sh | 2 +-
tools/boot/jessie/boot-ppc64el | 65 ++
tools/generate_di+k_list | 9 ++
3 files changed, 75 insertions(+), 1 deletion(-)
create mode 100755 tools/boot/jessie/boot-ppc64el
diff --git a/build_all.sh b/build_all.sh
index 70337ec..87d938d 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -40,7 +40,7 @@ if [ -z "$IMAGETARGET" ] ; then
IMAGETARGET="official_images"
fi
-for ARCHES in i386 amd64 armel armhf arm64 mips mipsel powerpc s390x kfreebsd-amd64 kfreebsd-i386 source
+for ARCHES in i386 amd64 armel armhf arm64 mips mipsel powerpc ppc64el s390x kfreebsd-amd64 kfreebsd-i386 source
do
export ARCHES
echo "Now we're going to build CD for $ARCHES !"
diff --git a/tools/boot/jessie/boot-ppc64el b/tools/boot/jessie/boot-ppc64el
new file mode 100755
index 000..0db3163
--- /dev/null
+++ b/tools/boot/jessie/boot-ppc64el
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Do install stuff for ppc64el, 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
+
+set -e
+#set -x
+
+N=$1
+CDDIR=$2
+INSTALLDIR=$CDDIR/install
+if [ "$DI_WWW_HOME" = "default" ];then
+DI_WWW_HOME="http://d-i.debian.org/daily-images/ppc64el/daily";
+try_di_image_cache
+fi
+
+# Common mkisofs options when creating CDs
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+
+# Only disc 1 bootable
+if [ $N != 1 ] ; then exit 0; fi
+
+cd $CDDIR/..
+
+BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinux cdrom/debian-cd_info.tar.gz"
+
+# Download boot images.
+for image in $BOOT_IMAGES; do
+if [ ! -e "$image" ]; then
+dir=$(dirname $image)
+mkdir -p $dir
+if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
+cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
+elif [ ! "$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
+
+# Boot setup including config and help files comes from d-i.
+mkdir -pv $PWD/CD$N
+cat cdrom/debian-cd_info.tar.gz | (cd CD$N/; tar zx)
+
+# Copy kernel and initrd
+mkdir -p $INSTALLDIR
+cp -lf cdrom/vmlinux $INSTALLDIR/
+cp -lf cdrom/initrd.gz $INSTALLDIR/
+
+# Add CHRP boot header
+if [ -d CD$N/ppc/bootinfo.txt ] ; then
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-chrp-boot"
+fi
+
+exit 0
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 7759e4b..2ecea4e 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -232,6 +232,15 @@ linux-image-powerpc64
linux-image-prep
#endif
+#ifdef ARCH_ppc64el
+initramfs-tools
+grub-ieee1275
+busybox
+powerpc-utils
+powerpc-ibm-utils
+linux-image-powerpc64el
+#endif
+
#ifdef ARCH_alpha
aboot
#endif
--
2.1.1
signature.asc
Description: Digital signature
Re: Adding ppc64el support in debian-cd
On Fri, Oct 03, 2014 at 01:00:04AM +0100, Steve McIntyre wrote: > On Fri, Oct 03, 2014 at 12:33:01AM +0200, Aurelien Jarno wrote: > >Hi Steve, > > > >On Sat, Sep 27, 2014 at 10:02:34AM +0200, Aurelien Jarno wrote: > >> On Mon, Sep 22, 2014 at 10:47:10PM +0200, Aurelien Jarno wrote: > >> > The tarball should be decompressed in the root of the CD-ROM, while the > >> > kernel and initrd should be placed in the /install directory. The ISO > >> > image should be generated with the --chrp-boot argument. Beside that the > >> > default options of genisoimage should be used, there is no need to > >> > specify any strange HFS option like on powerpc (Note: I only tested that > >> > on a VM using SLOF, it will be nice if someone with access to bare metal > >> > can confirm that). > >> > > >> > Don't hesitate to ask more details if needed. I will tell you once GRUB > >> > is fixed and all these files are in place on d-i.debian.org. > >> > >> GRUB is now fixed, and the latest daily build of d-i does have the CDROM > >> files available: > >> > >> http://d-i.debian.org/daily-images/ppc64el/daily/cdrom/ > > > >Please find attached a patch to add ppc64el support to debian-cd. Could > >you please merge it? > > Done, and pushed. > > I've also just added ppc64el to the daily and weekly build config - > let's see how well it works! Thanks! It seems the daily build has worked correctly. Unfortunately the d-i's cdrom flavour misses the SCSI modules to access the CD-ROM, so a full installation is not possible. I have fixed that in the d-i git, it has missed the beta2 release, but should be in tomorrow's daily. -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20141003093819.gr3...@hall.aurel32.net
Re: Adding ppc64el support in debian-cd
On Fri, Oct 03, 2014 at 02:34:42PM +0200, Thomas Schmitt wrote: > Hi, > > Steve McIntyre wrote: > > > > I've also just added ppc64el to the daily and weekly build config - > > > let's see how well it works! > > Aurelien Jarno wrote: > > > It seems the daily build has worked correctly. > > If you mean > > http://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/ppc64el/iso-cd/debian-testing-ppc64el-netinst.iso > then it lacks the CHRP (MBR) partition table. At least I was able to boot it, but maybe SLOF doesn't need it. > The xorriso command line in /.disk/mkisofs matches this. > It contains no boot options. > > In your patch of Fri, 3 Oct 2014 00:33:01 +0200 i see > > +if [ -d CD$N/ppc/bootinfo.txt ] ; then > +add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-chrp-boot" > +fi > > which did not come into effect or else would have sabotaged > the production run with message > xorriso : FAILURE : -as mkisofs: Unsupported option '-chrp-boot' -chrp-boot is an option supported by genisoimage, but it looks like it's not the case of xorriso. Note that this option is also use in the powerpc build. > The reason why it did not influence the production run is most > probably the test option -d for the data file ppc/bootinfo.txt. Oops. > How about this: > > if [ -f CD$N/ppc/bootinfo.txt ] ; then >add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-chrp-boot-part" > fi Looks fine. Thanks for the fix. Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20141003151211.gs3...@hall.aurel32.net
Re: Adding ppc64el support in debian-cd
Hi, On Sat, Oct 04, 2014 at 10:58:11AM +0200, Thomas Schmitt wrote: > Hi, > > the ISO > > http://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/ppc64el/iso-cd/debian-testing-ppc64el-netinst.iso > of 2014-10-04 10:17 (CEST) still has no CHRP partition table > and was not produced with -as mkisofs option -chrp-boot-part. > > It contains the data file /ppc/bootinfo.txt which should have > triggered the use of the option in tools/boot/jessie/boot-ppc64el > > if [ -f CD$N/ppc/bootinfo.txt ] ; then > add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-chrp-boot-part" > fi Thanks for the notice. The problem is that the test is still using -d instead of -f. You will find attached a patch to fix that. I have also notice that the first CD doesn't include the kernel due a typo. I have also attached a patch to fix that. Thanks, Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net >From 87f1295a408dea99cbe1d0b4d8a63233aafd8478 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 4 Oct 2014 13:36:33 +0200 Subject: [PATCH 1/2] Enable CHRP partition table on ppc64el boot CD The test is on a file, so it should use -f instead of -d. --- tools/boot/jessie/boot-ppc64el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/boot/jessie/boot-ppc64el b/tools/boot/jessie/boot-ppc64el index bc1320c..6f90e45 100755 --- a/tools/boot/jessie/boot-ppc64el +++ b/tools/boot/jessie/boot-ppc64el @@ -68,7 +68,7 @@ cp -lf cdrom/vmlinux $INSTALLDIR/ cp -lf cdrom/initrd.gz $INSTALLDIR/ # Add CHRP boot header -if [ -d CD$N/ppc/bootinfo.txt ] ; then +if [ -f CD$N/ppc/bootinfo.txt ] ; then add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-chrp-boot-part" fi -- 2.1.1 >From abb1cd44daf7898c165eb0e591fe42cf5ebff62b Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 4 Oct 2014 13:36:42 +0200 Subject: [PATCH 2/2] Add the ppc64el kernel on the first CD Due to a typo the ppc64el kernel wan't present on the first CD. --- tools/generate_di+k_list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list index 2ecea4e..0bf8681 100755 --- a/tools/generate_di+k_list +++ b/tools/generate_di+k_list @@ -238,7 +238,7 @@ grub-ieee1275 busybox powerpc-utils powerpc-ibm-utils -linux-image-powerpc64el +linux-image-powerpc64le #endif #ifdef ARCH_alpha -- 2.1.1
Re: Adding ppc64el support in debian-cd
On Sat, Oct 04, 2014 at 04:24:28PM +0100, Steve McIntyre wrote: > On Sat, Oct 04, 2014 at 01:44:48PM +0200, Aurelien Jarno wrote: > >Hi, > > > >On Sat, Oct 04, 2014 at 10:58:11AM +0200, Thomas Schmitt wrote: > >> Hi, > >> > >> the ISO > >> > >> http://cdimage.debian.org/cdimage/daily-builds/daily/arch-latest/ppc64el/iso-cd/debian-testing-ppc64el-netinst.iso > >> of 2014-10-04 10:17 (CEST) still has no CHRP partition table > >> and was not produced with -as mkisofs option -chrp-boot-part. > >> > >> It contains the data file /ppc/bootinfo.txt which should have > >> triggered the use of the option in tools/boot/jessie/boot-ppc64el > >> > >> if [ -f CD$N/ppc/bootinfo.txt ] ; then > >> add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-chrp-boot-part" > >> fi > > > >Thanks for the notice. The problem is that the test is still using -d > >instead of -f. You will find attached a patch to fix that. > > > >I have also notice that the first CD doesn't include the kernel due a > >typo. I have also attached a patch to fix that. > > Accepted and pushed. Aurelien: just ask and I'll give you push access > directly... :-) Thanks. I'll do that if I have more things to get committed, but so far everything looks fine. -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20141004191743.ga30...@hall.aurel32.net
Re: Adding ppc64el support in debian-cd
On Sat, Oct 04, 2014 at 07:52:59PM +0200, Thomas Schmitt wrote: > Hi, > > debian-testing-ppc64el-netinst.iso of 2014-10-04 18:41 CEST > is equipped with CHRP pseudo-MBR. > Everything should be ok now ... theoretically. > Yes, everything seems to be ok. I have just done an install using this image and everything went smoothly. The only remaining problem is that grub is not available to setup the bootloader, but it's a known issue. We just need to get the RC bugs fixed so that it can migrate to testing. Thanks for your help! Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20141004191925.gb30...@hall.aurel32.net
Re: Building Trixie Alpha 1 images
Hi, On 2024-12-28 11:12, Cyril Brulebois wrote: > Hello images team, > > This just happened: > > Copying installer version 20241227 from unstable to testing > > Will copy installer version 20241227 from suite unstable to > testing. > Architectures to copy: amd64, ppc64el, s390x, armhf, arm64, mips64el, > riscv64 > Architectures to skip: > Installer has been copied successfully. > Done > > As planned we're removing support for armel and i386. > > Looking at riscv64, it seems to have become an official release arch a > little while back[1]. Its images tarball features netboot stuff (hence > this question regarding d-i-n-i[2]), but also cdrom things: > > ./installer-riscv64/20241227/images/cdrom/ > ./installer-riscv64/20241227/images/cdrom/debian-cd_info.tar.gz > ./installer-riscv64/20241227/images/cdrom/initrd.gz > ./installer-riscv64/20241227/images/cdrom/vmlinux > > so I suppose debian-cd should do something with it. :) > > (I've cc'd Aurélien again, just in case…) riscv64 CD images are generated daily for some time, so I guess that should just work. Cheers Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://aurel32.net signature.asc Description: PGP signature
