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

The Skolelinux d-i patches



I just updated the build tree we use in Skolelinux to build our d-i
floppies.  They are so small I started to wunder it the changes are
still neded.  Anyone know more?

  This one is to make sure our sources.list.udeb.local isn't ignored
  by our CVS.  Is using that file how I am supposed to add udeb
  sources?

Index: .cvsignore
===================================================================
RCS file: /var/lib/cvs/skolelinux/src/debian-installer-skolelinux/build/.cvsignore,v
retrieving revision 1.1.1.8
retrieving revision 1.11
diff -u -3 -p -u -r1.1.1.8 -r1.11
--- .cvsignore	17 Nov 2003 08:40:13 -0000	1.1.1.8
+++ .cvsignore	17 Nov 2003 08:41:33 -0000	1.11
@@ -1,6 +1,6 @@
 udebs
 debian-installer
-sources.list*
+sources.list
 dest
 *-stamp
 mnt


  Our CD build script expect the image to have this name.  It is the
  old name used by d-i, and I didn't want to spend the time modifying
  our debian-cd patches.  I guess we should just keep it in our tree,
  and not try to modify the official d-i source.  Eventually, we will
  update debian-cd to use the new names, and drop this change. :)

Index: config/dir
===================================================================
RCS file: /var/lib/cvs/skolelinux/src/debian-installer-skolelinux/build/config/dir,v
retrieving revision 1.1.1.4
retrieving revision 1.4
diff -u -3 -p -u -r1.1.1.4 -r1.4
--- config/dir	1 Nov 2003 09:15:13 -0000	1.1.1.4
+++ config/dir	1 Nov 2003 09:23:57 -0000	1.4
@@ -50,7 +50,7 @@ ifdef FLOPPY_SIZE
 # XXX This should be TEMP, but is DEST temporarily until we get our act
 # together.
 INITRD=$(DEST)/$(TYPE)-initrd.gz
-IMAGE=$(DEST)/$(TYPE)-image.img
+IMAGE=$(DEST)/$(TYPE)-$(FLOPPY_SIZE).img
 else
 INITRD=$(DEST)/$(TYPE)-initrd.gz
 IMAGE=$(INITRD)


  The brltty-udeb was dropped, but I wanted to be reminded that it
  should go back in sometime.

  Also, the autopartkit package want to use ext3 file systems, and I
  had to add the modules manually at one time to make sure that they
  were available.  Not sure if this is needed any more.

Index: pkg-lists/cdrom/i386
===================================================================
RCS file: /var/lib/cvs/skolelinux/src/debian-installer-skolelinux/build/pkg-lists/cdrom/i386,v
retrieving revision 1.1.1.10
retrieving revision 1.31
diff -u -3 -p -u -r1.1.1.10 -r1.31
--- pkg-lists/cdrom/i386	5 Jan 2004 22:03:48 -0000	1.1.1.10
+++ pkg-lists/cdrom/i386	5 Jan 2004 22:05:31 -0000	1.31
@@ -1,5 +1,7 @@
 isa-pnp-modules-${kernel:Version}
 socket-modules-${kernel:Version}
+# Removed while symbol timeout_yet is missing
+#brltty-udeb
 console-keymaps-at
 console-keymaps-usb
 discover-data-udeb
@@ -14,6 +16,8 @@ input-modules-${kernel:Version}
 fb-modules-${kernel:Version}
 kbd-chooser
 usb-modules-${kernel:Version}
+
+ext3-modules-${kernel:Version}
 
 # Support for firewire cdroms (and disks, I think)
 firewire-core-modules-${kernel:Version}

That was all.

In addition to these patches to the build system, we use a patched
version of languagechooser (with a shorter list of options), a
skolelinux-specifict package debian-edu-profile-udeb to select the
installation profile, and a skolelinux-specifict package
debian-edu-install-udeb to make sure main-menu select the menu entries
in the order we want them.

I really like d-i. :)



Reply to: