kFreeBSD 9.0 in D-I
Hi,
Now that kFreeBSD 9.0 finally works in D-I (many thanks to Michael
Tokarev who polished the missing bits in busybox), I think it would be
a good time to begin wider testing of kFreeBSD 9.0 in D-I environment.
I've done some quick tests and it basically works, but it surely
needs more exposure before it's in releasable state.
I propose enabling build of kfreebsd-9 images alongside standard 8.2
ones, similarly how it's been done with Linux before (e.g. 2.4 vs 2.6
in sarge), with addition of netboot-9, monolithic-9, etc targets.
See attached patch.
--
Robert Millan
commit 10be441904c8b0d51c2e0e40bc89807cb4f9b36d
Author: Robert Millan <rmh@debian.org>
Date: Tue Nov 22 23:24:13 2011 +0100
Add alternate kFreeBSD 9.0 targets
diff --git a/build/config/kfreebsd-amd64.cfg b/build/config/kfreebsd-amd64.cfg
index a7818f5..c9d71cf 100644
--- a/build/config/kfreebsd-amd64.cfg
+++ b/build/config/kfreebsd-amd64.cfg
@@ -1,8 +1,9 @@
-MEDIUM_SUPPORTED = cdrom netboot netboot-gtk
-MEDIUM_SUPPORTED_EXTRA = monolithic
+MEDIUM_SUPPORTED = cdrom netboot netboot-9 netboot-gtk netboot-gtk-9
+MEDIUM_SUPPORTED_EXTRA = monolithic monolithic-9
# The version of the kernel to use.
KERNELVERSION = 8.2-1-amd64
+KERNELVERSION_9 = 9.0-0-amd64
KERNELMAJOR = 8
KERNEL_FLAVOUR = di
KERNELNAME = kfreebsd.gz
diff --git a/build/config/kfreebsd-amd64/monolithic-9.cfg b/build/config/kfreebsd-amd64/monolithic-9.cfg
new file mode 100644
index 0000000..ff593c3
--- /dev/null
+++ b/build/config/kfreebsd-amd64/monolithic-9.cfg
@@ -0,0 +1,14 @@
+MEDIA_TYPE = boot image
+
+KERNELVERSION = $(KERNELVERSION_9)
+KERNELMAJOR = 9
+KERNELIMAGEVERSION = $(KERNELVERSION_9)
+
+TYPE = monolithic
+
+TARGET = pkg-lists/standard-udebs 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"
diff --git a/build/config/kfreebsd-amd64/netboot-9.cfg b/build/config/kfreebsd-amd64/netboot-9.cfg
new file mode 100644
index 0000000..6de1d0a
--- /dev/null
+++ b/build/config/kfreebsd-amd64/netboot-9.cfg
@@ -0,0 +1,18 @@
+MEDIA_TYPE = netboot image
+
+KERNELVERSION = $(KERNELVERSION_9)
+KERNELMAJOR = 9
+KERNELIMAGEVERSION = $(KERNELVERSION_9)
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+NETBOOT_DIR_LINKS = grub2pxe
+
+TYPE = netboot
+
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
+MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
+
diff --git a/build/config/kfreebsd-amd64/netboot-gtk-9.cfg b/build/config/kfreebsd-amd64/netboot-gtk-9.cfg
new file mode 100644
index 0000000..07ceba5
--- /dev/null
+++ b/build/config/kfreebsd-amd64/netboot-gtk-9.cfg
@@ -0,0 +1,23 @@
+MEDIA_TYPE = netboot image
+
+KERNELVERSION = $(KERNELVERSION_9)
+KERNELMAJOR = 9
+KERNELIMAGEVERSION = $(KERNELVERSION_9)
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+NETBOOT_DIR_LINKS = grub2pxe
+
+TYPE = netboot/gtk/9
+
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = netboot/gtk/
+
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server (graphical installer)"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory (graphical installer)"
+MANIFEST-MINIISO = "not so tiny CD image that boots the graphical netboot installer"
+
+KEEP_GI_LANGS = 1
+
+# All images that include cdebconf should include symbols needed by these
+# plugins.
+EXTRAUDEBS += cdebconf-gtk-entropy
diff --git a/build/config/kfreebsd-i386.cfg b/build/config/kfreebsd-i386.cfg
index ab5f05d..8b3b434 100644
--- a/build/config/kfreebsd-i386.cfg
+++ b/build/config/kfreebsd-i386.cfg
@@ -1,8 +1,9 @@
-MEDIUM_SUPPORTED = cdrom netboot
-MEDIUM_SUPPORTED_EXTRA = monolithic
+MEDIUM_SUPPORTED = cdrom netboot netboot-9
+MEDIUM_SUPPORTED_EXTRA = monolithic monolithic-9
# The version of the kernel to use.
KERNELVERSION = 8.2-1-486
+KERNELVERSION_9 = 9.0-0-486
KERNELMAJOR = 8
KERNEL_FLAVOUR = di
KERNELNAME = kfreebsd.gz
diff --git a/build/config/kfreebsd-i386/monolithic-9.cfg b/build/config/kfreebsd-i386/monolithic-9.cfg
new file mode 100644
index 0000000..ff593c3
--- /dev/null
+++ b/build/config/kfreebsd-i386/monolithic-9.cfg
@@ -0,0 +1,14 @@
+MEDIA_TYPE = boot image
+
+KERNELVERSION = $(KERNELVERSION_9)
+KERNELMAJOR = 9
+KERNELIMAGEVERSION = $(KERNELVERSION_9)
+
+TYPE = monolithic
+
+TARGET = pkg-lists/standard-udebs 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"
diff --git a/build/config/kfreebsd-i386/netboot-9.cfg b/build/config/kfreebsd-i386/netboot-9.cfg
new file mode 100644
index 0000000..6de1d0a
--- /dev/null
+++ b/build/config/kfreebsd-i386/netboot-9.cfg
@@ -0,0 +1,18 @@
+MEDIA_TYPE = netboot image
+
+KERNELVERSION = $(KERNELVERSION_9)
+KERNELMAJOR = 9
+KERNELIMAGEVERSION = $(KERNELVERSION_9)
+
+NETBOOT_DIR_TARGETS = $(TEMP_INITRD) $(TEMP_KERNEL)
+NETBOOT_DIR_LINKS = grub2pxe
+
+TYPE = netboot
+
+TARGET = $(NETBOOT_DIR) $(NETBOOT_TAR) $(MINIISO)
+EXTRANAME = $(MEDIUM)/
+
+MANIFEST-NETBOOT_DIR = "PXE boot directory for tftp server"
+MANIFEST-NETBOOT_TAR = "tarball of PXE boot directory"
+MANIFEST-MINIISO = "tiny CD image that boots the netboot installer"
+
Reply to: