[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [patch] kfreebsd-i386 config



Hi,

Please find my comments inline.

On Wed, Jul 15, 2009 at 03:08:47PM +0200, Luca Favatella wrote:
> This patch adds kfreebsd-i386 monolithic config files.
> 
> 
> Cheers,
> Luca Favatella

> Index: build/config/kfreebsd-i386.cfg
> ===================================================================
> --- build/config/kfreebsd-i386.cfg	(.../trunk/installer)	(revision 0)
> +++ build/config/kfreebsd-i386.cfg	(.../branches/d-i/kfreebsd/installer)	(revision 59360)
> @@ -0,0 +1,42 @@
> +MEDIUM_SUPPORTED = monolithic
> +
> +# The version of the kernel to use.
> +KERNELVERSION = 7.2-2-486

I think it should be 7.2-1-486 as we haven't bumped the ABI on
kfreebsd 7.2 yet.

> +KERNELMAJOR = 7
> +KERNEL_FLAVOUR = di
> +KERNELNAME = kfreebsd.gz
> +KERNELIMAGEVERSION = $(KERNELVERSION)
> +
> +MKLIBS = mklibs-copy
> +INITRD_FS = ufs2
> +LSB_DISTRIB_DESCRIPTION="Debian GNU/kFreeBSD installer"
> +EXTRAUDEBS = 
> +
> +
> +# Miniature CD image using kfreebsd-loader, with only an initrd, no udebs or debs.
> +.PHONY: arch_miniiso
> +arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
> +	-rm -f $(TEMP_CD_TREE)/*
> +	mkdir -p $(TEMP_CD_TREE)/boot/{kernel,defaults}
> +
> +	cp $(TEMP_KERNEL)			$(TEMP_CD_TREE)/boot/kernel/kernel.gz
> +	cp $(TEMP_INITRD)			$(TEMP_CD_TREE)/boot/mfsroot.gz
> +	cp $(TREE)/lib/modules/*/acpi.ko	$(TEMP_CD_TREE)/boot/kernel/
> +
> +	cp /boot/{cdboot,loader*,*.4th}		$(TEMP_CD_TREE)/boot/
> +	cp /boot/defaults/loader.conf		$(TEMP_CD_TREE)/boot/defaults/
> +	echo "hw.ata.atapi_dma=0"		>> $(TEMP_CD_TREE)/boot/loader.conf	# TODO: 1

Is it still needed? I think it was there to workaround a QEMU bug.

> +	echo "mfsroot_load=\"YES\""		>> $(TEMP_CD_TREE)/boot/loader.conf
> +	echo "mfsroot_type=\"mfs_root\""	>> $(TEMP_CD_TREE)/boot/loader.conf
> +	echo "mfsroot_name=\"/boot/mfsroot\""	>> $(TEMP_CD_TREE)/boot/loader.conf
> +
> +	genisoimage -r -J -b boot/cdboot -c boot.cat -no-emul-boot \
> +		-o $(TEMP_MINIISO) $(TEMP_CD_TREE)
> +
> +
> +.PHONY: arch_tree
> +arch_tree:
> +
> +
> +.PHONY: arch_boot_screens
> +arch_boot_screens:
> Index: build/config/kfreebsd-i386/monolithic.cfg
> ===================================================================
> --- build/config/kfreebsd-i386/monolithic.cfg	(.../trunk/installer)	(revision 0)
> +++ build/config/kfreebsd-i386/monolithic.cfg	(.../branches/d-i/kfreebsd/installer)	(revision 59360)
> @@ -0,0 +1,8 @@
> +MEDIA_TYPE = boot image
> +
> +TARGET = pkg-lists/kernel-module-udebs $(INITRD) $(KERNEL) $(MINIISO)
> +EXTRANAME = $(MEDIUM)/
> +
> +MANIFEST-INITRD = "initrd"
> +MANIFEST-KERNEL = "kernel image"
> +MANIFEST-MINIISO = "small bootable CD image for network install"
> Index: debian/changelog
> ===================================================================
> --- debian/changelog	(.../trunk/installer)	(revision 59351)
> +++ debian/changelog	(.../branches/d-i/kfreebsd/installer)	(revision 59360)
> @@ -77,6 +77,7 @@
>    [ Luca Favatella ]
>    * Handle libc0.1 (GNU/kFreeBSD) and libc0.3 (GNU/Hurd) as libc6/libc6.1.
>    * Add ufs2 initrd support. Thanks to Robert Millan.
> +  * Add kfreebsd-i386 monolithic config files. Thanks to Robert Millan.
>  
>   -- Frans Pop <fjp@debian.org>  Sat, 13 Jun 2009 16:35:46 +0200
>  

Otherwise looks fine to me :-).

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net


Reply to: