diff --git a/build/config/hurd-i386.cfg b/build/config/hurd-i386.cfg index df6a1c245..cf2d1bd91 100644 --- a/build/config/hurd-i386.cfg +++ b/build/config/hurd-i386.cfg @@ -1,4 +1,4 @@ -MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen +MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media MEDIUM_SUPPORTED_EXTRA = monolithic # The version of the kernel to use. diff --git a/build/config/hurd-i386/hd-media.cfg b/build/config/hurd-i386/hd-media.cfg new file mode 100644 index 000000000..c149f3b6d --- /dev/null +++ b/build/config/hurd-i386/hd-media.cfg @@ -0,0 +1,22 @@ +FLAVOUR_SUPPORTED = "" gtk + +# Not really a floppy, this is a 953 MiB image, large enough to put a +# netinst iso in (being able to fit the full CD on it is just a bonus..), +# and small enough to fit on a low-end memory stick, such as those +# advertised as being 1 gigabyte in size. +FLOPPY_SIZE = 976560 + +DISK_LABEL = "bootable drive" +MEDIA_TYPE = bootable drive + +GZIPPED = .gz +EXTRANAME = hd-media/ + +# Add the gtk images on to the bootable image. +EXTRATARGETS = build_hd-media_gtk +INITRD_GTK = dest/hd-media/gtk/initrd.gz +TARGET = $(KERNEL) $(INITRD) + +MANIFEST-BOOT = "1 gb image (compressed) for USB memory stick" +MANIFEST-INITRD = "for use on USB memory sticks" +MANIFEST-KERNEL = "for use on USB memory sticks" diff --git a/build/config/hurd-i386/hd-media/gtk.cfg b/build/config/hurd-i386/hd-media/gtk.cfg new file mode 100644 index 000000000..db193059b --- /dev/null +++ b/build/config/hurd-i386/hd-media/gtk.cfg @@ -0,0 +1,16 @@ +TYPE = hd-media/gtk + +EXTRANAME = gtk/ + +# Only build the gtk initrd and kernel, the bootable image is built by the +# main hd-media target and includes this initrd. +EXTRATARGETS = +TARGET = $(KERNEL) $(INITRD) + +KEEP_GI_LANGS = 1 + +VIDEO_MODE=$(VIDEO_MODE_GTK) + +# All images that include cdebconf should include symbols needed by these +# plugins. +EXTRAUDEBS += cdebconf-gtk-entropy diff --git a/build/config/hurd.cfg b/build/config/hurd.cfg index ad2fcdd0f..0a985b22b 100644 --- a/build/config/hurd.cfg +++ b/build/config/hurd.cfg @@ -44,8 +44,9 @@ XENCFG = $(SOME_DEST)/$(EXTRANAME)debian.cfg MKLIBS = mklibs-copy # Unsupported targets -arch_boot_screens: arch_tree: +arch_boot: +arch_boot_screens: # genisoimage CD info directory, including grub and configuration files # Note that the configuration is extensively manipulated by debian-cd to diff --git a/debian/changelog b/debian/changelog index 8a6621977..c28883d54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ debian-installer (2013XXXX) UNRELEASED; urgency=low * Fix boot beep. + * Add hd-media target for hurd-i386. -- Samuel Thibault Wed, 01 May 2013 14:18:04 +0200