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

[PATCH] Basic Openmoko GTA02 support



Hi there!

DebCamp9 hacking produced these patches which add a basic support for
building netboot images for the Openmoko GTA02 Neo FreeRunner.

General notes
=============

- You need the Debian unofficial kernel from the pkg-fso repository at

    deb http://pkg-fso.alioth.debian.org/debian sid main

  Some drivers the official Debian kernels compile as modules are
  compiled in in the Openmoko kernel instead, thus I am working on
  syncing the latter with the former.

- The d-i files generated in build/dest/openmoko-gta02/netboot/gta02 are
  the following:

  * rootfs.tar   -- root archive for Openmoko GTA02 Neo FreeRunner

    This must be decompressed on the microSD.  Since there are too many
    way to partition the microSD and/or booting, ATM you need to
    manually prepare it.

    I have not checked the latest GTA02, but in the "old" ones U-Boot
    supported booting from an ext2 microSD card with partition 1 as vfat
    for /boot.  In this case, partition the microSD (8MB vfat + ext2),
    decompress root.tar into the ext2 and then copy /boot/uImage$ETC in
    /boot/.  Since U-Boot usually expects an image named "uImage.bin",
    creates the symlink.

  * rootfs.jffs2 -- root jffs2 image for Openmoko GTA02 Neo FreeRunner

    This must be flashed to mtd6, but it does not work as expected ATM:

      $ dfu-util -d 0x1d50:0x5119 -a rootfs -R -D uImage.bin

  * uImage.bin   -- U-Boot image for Openmoko GTA02 Neo FreeRunner

    Nothing more than the U-Boot image shipped by the Debian Openmoko
    kernel, again to be flashed to mtd3:

      $ dfu-util -d 0x1d50:0x5119 -a kernel -R -D uImage.bin

  * flash-debian -- Script to flash debian-installer

    This does not work ATM, but the idea is quite simple: the basic
    command should prepare the microSD card (partition and everything
    needed to decompress rootfs.tar on it) and then have an option to
    flash the mtds.


Comments
========

[PATCH 1/3] kernel-wedge: add support for U-Boot uImage.bin

  The Debian Linux kernel for the Openmoko GTA02 Neo FreeRunner does not
  provide a vmlinuz image, but instead it ships a U-Boot one, thus
  kernel-wedge/commands/install-files needs to look for uImage.bin also.

[PATCH 2/3] linux-kernel-di-armel-2.6: add openmoko-gta02 kernel

  The Debian Linux kernel for the Openmoko GTA02 Neo FreeRunner is not
  yet official and thus it does not follow the Debian official kernel
  naming (I know this is ugly, sorry).

  NB, there are still some problems with the various modules, which will
  be soon corrected.  Moreover, hunting down which module are useful and
  which not is another thing to do.

[PATCH 3/3] installer: add openmoko-gta02 netboot image

  This adds add the basic infrastructure to produce a netboot image.

  While cleaning the patch I seems to be unable to produce a correct
  netboot image (package ai-choosers not found).  I am quite sure that
  just after dinner Gaudenz succeded with the same patch (or a very
  similar one, just minor modifications).  Thus I think it is worth
  submitting it now.


I do not think these stuff are at a point for inclusion, but maybe it
would be better for other (hint: Gaudenz) that works on them.

Thx, bye,
Gismo / Luca

diff -Naur debian-installer-trunk.ORG/packages/kernel/kernel-wedge/commands/install-files debian-installer-trunk/packages/kernel/kernel-wedge/commands/install-files
--- debian-installer-trunk.ORG/packages/kernel/kernel-wedge/commands/install-files	2009-07-23 23:11:37.000000000 +0200
+++ debian-installer-trunk/packages/kernel/kernel-wedge/commands/install-files	2009-07-23 22:48:19.000000000 +0200
@@ -63,6 +63,11 @@
 			"$sourcedir/boot/vmlinuz-$installedname",
 			"debian/kernel-image-$kernelversion-$flavour-di/boot/vmlinuz$extraname");
 	}
+	elsif (-e "$sourcedir/boot/uImage.bin-$installedname") {
+		doit("install", "-D", "-m", 644,
+			"$sourcedir/boot/uImage.bin-$installedname",
+			"debian/kernel-image-$kernelversion-$flavour-di/boot/uImage.bin$extraname");
+	}
 	elsif (-e "$sourcedir/boot/kfreebsd-$installedname.gz") {
 		doit("install", "-D", "-m", 644,
 			"$sourcedir/boot/kfreebsd-$installedname.gz",
diff -Naur debian-installer-trunk.ORG/packages/kernel/kernel-wedge/debian/changelog debian-installer-trunk/packages/kernel/kernel-wedge/debian/changelog
--- debian-installer-trunk.ORG/packages/kernel/kernel-wedge/debian/changelog	2009-07-23 18:53:08.000000000 +0200
+++ debian-installer-trunk/packages/kernel/kernel-wedge/debian/changelog	2009-07-24 04:45:54.000000000 +0200
@@ -1,3 +1,9 @@
+kernel-wedge (2.59~openmoko.gta02.1) UNRELEASED; urgency=low
+
+  * Add support for U-Boot uImage.bin.
+
+ --
+
 kernel-wedge (2.59) unstable; urgency=low
 
   [ Samuel Thibault ]
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/debian/changelog debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/debian/changelog
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/debian/changelog	2009-07-23 18:53:07.000000000 +0200
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/debian/changelog	2009-07-24 04:45:47.000000000 +0200
@@ -1,3 +1,9 @@
+linux-kernel-di-armel-2.6 (1.36~openmoko.gta02.1) UNRELEASED; urgency=low
+
+  * Add support for Openmoko GTA02 Neo FreeRunner.
+
+ --
+
 linux-kernel-di-armel-2.6 (1.35) unstable; urgency=low
 
   * Update to 2.6.30:
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/kernel-versions debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/kernel-versions
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/kernel-versions	2009-07-23 18:53:08.000000000 +0200
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/kernel-versions	2009-07-24 01:25:28.000000000 +0200
@@ -4,3 +4,4 @@
 armel   2.6.30-1  kirkwood    2.6.30-1-kirkwood    y       linux-image-2.6.30-1-kirkwood
 armel   2.6.30-1  orion5x     2.6.30-1-orion5x     y       linux-image-2.6.30-1-orion5x
 armel   2.6.30-1  versatile   2.6.30-1-versatile   y       linux-image-2.6.30-1-versatile
+armel	2.6.29-2  openmoko-gta02  2.6.29-20090702.gitd1c828aa  y  linux-image-2.6.29-openmoko-gta02
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/core-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/core-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/core-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/core-modules	2009-07-24 04:33:20.000000000 +0200
@@ -0,0 +1,2 @@
+#include <core-modules>
+mbcache
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/crc-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/crc-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/crc-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/crc-modules	2009-07-24 01:23:38.000000000 +0200
@@ -0,0 +1 @@
+#include <crc-modules>
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/ext4-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/ext4-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/ext4-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/ext4-modules	2009-07-24 01:23:39.000000000 +0200
@@ -0,0 +1 @@
+#include <ext4-modules>
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/fat-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/fat-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/fat-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/fat-modules	2009-07-24 01:23:40.000000000 +0200
@@ -0,0 +1,2 @@
+#include <fat-modules>
+vfat -
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/input-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/input-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/input-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/input-modules	2009-07-24 01:23:38.000000000 +0200
@@ -0,0 +1,2 @@
+evdev
+gpio_keys
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/isofs-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/isofs-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/isofs-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/isofs-modules	2009-07-24 01:23:40.000000000 +0200
@@ -0,0 +1 @@
+#include <isofs-modules>
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/kernel-image debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/kernel-image
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/kernel-image	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/kernel-image	2009-07-24 04:50:43.000000000 +0200
@@ -0,0 +1 @@
+# kernel-image
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/loop-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/loop-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/loop-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/loop-modules	2009-07-24 01:23:38.000000000 +0200
@@ -0,0 +1 @@
+#include <loop-modules>
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/md-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/md-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/md-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/md-modules	2009-07-24 01:23:41.000000000 +0200
@@ -0,0 +1,7 @@
+#include <md-modules>
+linear -
+multipath -
+raid0 -
+raid1 -
+raid10 -
+xor -
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/nic-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/nic-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/nic-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/nic-modules	2009-07-24 01:23:39.000000000 +0200
@@ -0,0 +1 @@
+ar6000
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/nic-usb-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/nic-usb-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/nic-usb-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/nic-usb-modules	2009-07-24 01:33:31.000000000 +0200
@@ -0,0 +1,3 @@
+#include <nic-usb-modules>
+g_ether
+usbnet
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/scsi-core-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/scsi-core-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/scsi-core-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/scsi-core-modules	2009-07-24 01:23:39.000000000 +0200
@@ -0,0 +1,2 @@
+#include <scsi-core-modules>
+scsi_dh -
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/squashfs-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/squashfs-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/squashfs-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/squashfs-modules	2009-07-24 01:23:41.000000000 +0200
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/usb-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/usb-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/usb-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/usb-modules	2009-07-24 01:23:38.000000000 +0200
@@ -0,0 +1 @@
+#include <usb-modules>
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/usb-storage-modules debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/usb-storage-modules
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/usb-storage-modules	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/modules/armel-openmoko-gta02/usb-storage-modules	2009-07-24 01:23:40.000000000 +0200
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff -Naur debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/package-list debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/package-list
--- debian-installer-trunk.ORG/packages/kernel/linux-kernel-di-armel-2.6/package-list	2009-07-23 18:53:08.000000000 +0200
+++ debian-installer-trunk/packages/kernel/linux-kernel-di-armel-2.6/package-list	2009-07-24 01:28:51.000000000 +0200
@@ -7,6 +7,7 @@
 Provides_iop32x: socket-modules, rtc-modules
 Provides_ixp4xx: socket-modules, rtc-modules
 Provides_kirkwood: socket-modules, rtc-modules, jffs2-modules, zlib-modules
+Provides_openmoko-gta02: socket-modules, rtc-modules, ext2-modules, ext3-modules, jffs2-modules, nls-core-modules
 Provides_orion5x: socket-modules, rtc-modules
 Provides_versatile: socket-modules, rtc-modules
 
diff -Naur debian-installer-trunk.ORG/installer/build/boot/arm/openmoko-gta02-flash-debian debian-installer-trunk/installer/build/boot/arm/openmoko-gta02-flash-debian
--- debian-installer-trunk.ORG/installer/build/boot/arm/openmoko-gta02-flash-debian	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/installer/build/boot/arm/openmoko-gta02-flash-debian	2009-07-24 03:12:02.000000000 +0200
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# This code is covered by the GNU General Public License (GPLv2 or higher)
+
+if [ ! -e kernel ]; then
+	echo "You have to download the kernel file from the debian-installer for Openmoko"
+	exit 1
+fi
+
+
+if [ ! -e rootfs.tar ]; then
+	echo "You have to download the rootfs.tar file from the debian-installer for Openmoko"
+	exit 1
+fi
+
+
+if [ ! - /dev/mmcblk0 ]; then
+        echo "You have to insert a microSD to install on the debian-installer for Openmoko"
+	exit 1
+fi
+        
+
+printf "Writing debian-installer kernel to flash... "
+cat kernel > /dev/mtdblock3
+echo "done."
+printf "Writing debian-insaller rootfs to "
+tar xf rootfs.tar /media/card/
+echo "done."
+echo "Please reboot your Openmoko device."
diff -Naur debian-installer-trunk.ORG/installer/build/config/armel/openmoko-gta02/netboot.cfg debian-installer-trunk/installer/build/config/armel/openmoko-gta02/netboot.cfg
--- debian-installer-trunk.ORG/installer/build/config/armel/openmoko-gta02/netboot.cfg	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/installer/build/config/armel/openmoko-gta02/netboot.cfg	2009-07-24 03:13:26.000000000 +0200
@@ -0,0 +1,20 @@
+MEDIA_TYPE = netboot image
+
+TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) gta02
+EXTRANAME = $(MEDIUM)
+TYPE = netboot/network-console
+
+# Openmoko GTA02 Neo FreeRunner
+gta02:
+	mkdir -p $(SOME_DEST)/$(EXTRANAME)/gta02
+	echo "HERE*** Set machine ID?"
+#	# Set machine id 1601 (0x0641)
+#	devio > $(TEMP)/ts-409/kernel 'wl 0xe3a01c06,4' 'wl 0xe3811041,4'
+	cp $(TREE)/boot/uImage.bin-2.6.29-2-openmoko-gta02 $(SOME_DEST)/$(EXTRANAME)/gta02/uImage.bin
+	cp $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/gta02/rootfs.jffs2
+	tar cf $(SOME_DEST)/$(EXTRANAME)/gta02/rootfs.tar -C $(TREE)/ .
+	install -m 744 boot/arm/openmoko-gta02-flash-debian $(SOME_DEST)/$(EXTRANAME)/gta02/flash-debian
+	update-manifest $(SOME_DEST)/$(EXTRANAME)/gta02/flash-debian "Script to flash debian-installer"
+	update-manifest $(SOME_DEST)/$(EXTRANAME)/gta02/uImage.bin "U-Boot image for Openmoko GTA02 Neo FreeRunner"
+	update-manifest $(SOME_DEST)/$(EXTRANAME)/gta02/rootfs.jffs2 "root jffs2 image for Openmoko GTA02 Neo FreeRunner"
+	update-manifest $(SOME_DEST)/$(EXTRANAME)/gta02/rootfs.tar "root archive for Openmoko GTA02 Neo FreeRunner"
diff -Naur debian-installer-trunk.ORG/installer/build/config/armel/openmoko-gta02.cfg debian-installer-trunk/installer/build/config/armel/openmoko-gta02.cfg
--- debian-installer-trunk.ORG/installer/build/config/armel/openmoko-gta02.cfg	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/installer/build/config/armel/openmoko-gta02.cfg	2009-07-23 23:18:05.000000000 +0200
@@ -0,0 +1,10 @@
+MEDIUM_SUPPORTED = netboot
+
+# The version of the kernel to use.
+# FIXME: no kernel in Debian yet for Openmoko boards, but available
+#        at http://pkg-fso.alioth.debian.org
+KERNELVERSION = 2.6.29-2
+KERNELVERSION := $(KERNELVERSION)-openmoko-gta02
+
+INITRD_FS = jffs2
+MKFS_JFFS2 = mkfs.jffs2 -f -p -b -e 0x20000
diff -Naur debian-installer-trunk.ORG/installer/build/config/armel.cfg debian-installer-trunk/installer/build/config/armel.cfg
--- debian-installer-trunk.ORG/installer/build/config/armel.cfg	2009-07-23 18:50:39.000000000 +0200
+++ debian-installer-trunk/installer/build/config/armel.cfg	2009-07-23 23:13:46.000000000 +0200
@@ -1,4 +1,4 @@
-SUBARCH_SUPPORTED = iop32x ixp4xx kirkwood orion5x versatile ads
+SUBARCH_SUPPORTED = iop32x ixp4xx kirkwood openmoko-gta02 orion5x versatile ads
 
 KERNELMAJOR = 2.6
 KERNELVERSION = 2.6.30-1
diff -Naur debian-installer-trunk.ORG/installer/build/Makefile debian-installer-trunk/installer/build/Makefile
--- debian-installer-trunk.ORG/installer/build/Makefile	2009-07-23 18:50:41.000000000 +0200
+++ debian-installer-trunk/installer/build/Makefile	2009-07-23 23:22:09.000000000 +0200
@@ -412,9 +412,12 @@
 
 ifdef KERNELNAME
 	# Move the kernel image out of the way.
-	$(foreach name,$(KERNELNAME), \
-		mv -f $(TREE)/boot/$(name) $(TEMP)/$(name);)
-	rmdir $(TREE)/boot/
+	# The openmoko-gta02 kernels do not contain a vmlinuz image
+ifneq ("$(SUBARCH)","openmoko-gta02")
+		$(foreach name,$(KERNELNAME), \
+			mv -f $(TREE)/boot/$(name) $(TEMP)/$(name);)
+		rmdir $(TREE)/boot/
+endif
 endif
 
 ifdef PRESEED
diff -Naur debian-installer-trunk.ORG/installer/build/sources.list.udeb.local debian-installer-trunk/installer/build/sources.list.udeb.local
--- debian-installer-trunk.ORG/installer/build/sources.list.udeb.local	1970-01-01 01:00:00.000000000 +0100
+++ debian-installer-trunk/installer/build/sources.list.udeb.local	2009-07-24 04:40:41.000000000 +0200
@@ -0,0 +1 @@
+deb http://pkg-fso.alioth.debian.org/debian unstable main
diff -Naur debian-installer-trunk.ORG/installer/debian/control debian-installer-trunk/installer/debian/control
--- debian-installer-trunk.ORG/installer/debian/control	2009-07-23 18:50:41.000000000 +0200
+++ debian-installer-trunk/installer/debian/control	2009-07-23 23:23:06.000000000 +0200
@@ -7,7 +7,7 @@
 Vcs-Svn: svn://svn.debian.org/d-i/trunk/installer
 Build-Conflicts: libnewt-pic [mipsel]
 # NOTE: Do not edit the next line by hand. See comment below.
-Build-Depends: debhelper (>= 4), apt, apt-utils, gnupg, debian-archive-keyring (>= 2006.11.22), dpkg (>= 1.13.9), dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage [!s390 !s390x], genromfs [sparc], hfsutils [powerpc], dosfstools [i386 ia64 m68k amd64], cpio, devio [armeb armel], slugimage (>= 0.10+r58-6) [armeb armel], dns323-firmware-tools [armel], uboot-mkimage [armel], syslinux (>= 2:3.63+dfsg-2) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc], genisovh [mips], tip22 [mips], colo [mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], apex-nslu2 [armeb armel], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools (>= 3.9.9-1) [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64], module-init-tools [i386 armeb armel amd64 alpha hppa ia64 m68k mips mipsel powerpc s390 sparc], bf-utf-source [!s390 !s390x], upx-ucl (>= 3) [i386], mkvmlinuz [powerpc], openssl [armel], win32-loader [i386 amd64 kfreebsd-i386 kfreebsd-amd64]
+Build-Depends: debhelper (>= 4), apt, apt-utils, gnupg, debian-archive-keyring (>= 2006.11.22), dpkg (>= 1.13.9), dctrl-tools, wget, bc, debiandoc-sgml, xsltproc, docbook-xml, docbook-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic (>= 0.52.2-11.3) [!mipsel], libnewt-dev (>= 0.52.2-11.3) [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ia64 mips mipsel armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), genisoimage [!s390 !s390x], genromfs [sparc], hfsutils [powerpc], dosfstools [i386 ia64 m68k amd64], cpio, devio [armeb armel], slugimage (>= 0.10+r58-6) [armeb armel], dns323-firmware-tools [armel], uboot-mkimage [armel], mtd-utils [armel], syslinux (>= 2:3.63+dfsg-2) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc], genisovh [mips], tip22 [mips], colo [mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], apex-nslu2 [armeb armel], tofrodos [i386 amd64 kfreebsd-i386 kfreebsd-amd64], mtools (>= 3.9.9-1) [i386 ia64 m68k amd64 kfreebsd-i386 kfreebsd-amd64], module-init-tools [i386 armeb armel amd64 alpha hppa ia64 m68k mips mipsel powerpc s390 sparc], bf-utf-source [!s390 !s390x], upx-ucl (>= 3) [i386], mkvmlinuz [powerpc], openssl [armel], win32-loader [i386 amd64 kfreebsd-i386 kfreebsd-amd64]
 # This package has the worst Build-Depends in Debian, so it deserves some
 # explanation. Note that this comment can also be used to generate a
 # Build-Depends line, by running the debian/genbuilddeps program.
@@ -97,6 +97,8 @@
 #		For building firmware images for the D-Link DNS-323.
 #	- uboot-mkimage [armel]
 #		For creating u-boot images
+#	- mtd-utils [armel]
+#		For creating a root jffs2 image for the Openmoko GTA02 Neo FreeRunner.
 #
 # Boot loaders:
 #	On many arches boot loaders are copied onto or ran on the boot

Attachment: pgpPTwZrZ9paB.pgp
Description: PGP signature


Reply to: