On Wed, Oct 22, 2008 at 05:18:39PM +0200, Martin Michlmayr wrote: > * Matthew Palmer <[EMAIL PROTECTED]> [2008-10-22 11:38]: > > and kernel uBoot files, and a complete firmware image, for the DNS-323 and > > CH3SNAS devices. The patch requires a new package dns323-firmware-tools, > > which is currently sitting in NEW. > > Some comments: > > + #util/pad $(TEMP)/dns323/kernel.uboot 2097152 # 2 MB > > Either you need it or you don't, but then please remove it.
Whups. Insufficient pre-submission review. > + mkimage -A arm -O linux -T ramdisk -C gzip -e 0x00800000 -a 0x00800000 > -n "netboot image" -d $(TEMP_INITRD) $(TEMP)/dns323/initrd.uboot > + mkdns323fw -k $(TEMP)/dns323/kernel.uboot -i > $(TEMP)/dns323/initrd.uboot -p 7 -c 1 -m 1 -o > $(SOME_DEST)/$(EXTRANAME)/dlink/dns323/netboot.img > > Please also update the manifest file. Done. > Also, I think the directory should be named d-link/dns-323 Agreed. > +++ b/installer/build/config/armel/orion5x/netboot.cfg > @@ -1,6 +1,6 @@ > MEDIA_TYPE = netboot image > > -TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) kuroboxpro mv2120 ts209 ts409 > +TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) kuroboxpro mv2120 ts209 ts409 dns323 > > I'd put dns323 at the beginning since this is alphabetical. Done. Also updated the make target to be 'dns-323', for consistency. > You also have to update > installer/build/pkg-lists/netboot/network-console/arm/orion5x.cfg and > add the minix udeb. As you noted, I added minix-modules for in the oldsys-preseed patch (since that's where the need for the minix modules is added, technically speaking), but you've reminded me of something I wanted to ask about anyway: arm vs armel. I've only added DNS-323 build support for armel, and not arm; should I duplicate the patch for the arm architecture as well? In the meantime, updated patch as per your suggestions is attached. - Matt
unchanged: --- b/installer/build/config/armel/orion5x/netboot.cfg +++ b/installer/build/config/armel/orion5x/netboot.cfg @@ -68,0 +69,11 @@ +# Dlink DNS-323 / Conceptronic CH3SNAS +dns-323: + mkdir -p $(SOME_DEST)/$(EXTRANAME)/d-link/dns-323 + mkdir -p $(TEMP)/dns-323 + # Set machine id 1542 (0x0606) + devio > $(TEMP)/dns-323/kernel 'wl 0xe3a01c06,4' 'wl 0xe3811006,4' + cat $(TEMP_KERNEL) >> $(TEMP)/dns-323/kernel + mkimage -A arm -O linux -T kernel -C none -e 0x00008000 -a 0x00008000 -n "Debian kernel" -d $(TEMP)/dns-323/kernel $(TEMP)/dns-323/kernel.uboot + mkimage -A arm -O linux -T ramdisk -C gzip -e 0x00800000 -a 0x00800000 -n "netboot image" -d $(TEMP_INITRD) $(TEMP)/dns-323/initrd.uboot + mkdns323fw -k $(TEMP)/dns-323/kernel.uboot -i $(TEMP)/dns-323/initrd.uboot -p 7 -c 1 -m 1 -o $(SOME_DEST)/$(EXTRANAME)/d-link/dns-323/netboot.img + update-manifest $(SOME_DEST)/$(EXTRANAME)/d-link/dns-323/netboot.img "Netboot image for D-Link DNS-323/Conceptronic CH3SNAS" unchanged: --- a/installer/debian/control +++ b/installer/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 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-xsl, libbogl-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], glibc-pic, libslang2-pic (>= 2.0.6-4), libnewt-pic [!mipsel], libnewt-dev [mipsel], libgcc1 [i386 amd64], cramfsprogs [powerpc ppc64 ia64 mips mipsel arm armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), mklibs-copy [mips mipsel], genisoimage [!s390 !s390x], genromfs [sparc], hfsutils [powerpc ppc64], dosfstools [i386 ia64 m68k amd64], cpio, devio [arm armeb armel], slugimage (>= 0.10+r58-6) [arm armeb armel], nwutil [arm], uboot-mkimage [arm armel], syslinux (>= 2:3.63+dfsg-2) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc ppc64], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc], genisovh [mips], tip22 [mips], colo (>= 1.21-1) [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], apex-nslu2 [arm 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 arm armeb armel amd64 alpha hppa ia64 m68k mips mipsel powerpc ppc64 s390 sparc], bf-utf-source [!s390 !s390x], upx-ucl (>= 3) [i386], mkvmlinuz [powerpc ppc64], openssl [arm 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-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 ppc64 ia64 mips mipsel arm armeb armel], genext2fs (>= 1.3-7.1), e2fsprogs, mklibs (>= 0.1.25), mklibs-copy [mips mipsel], genisoimage [!s390 !s390x], genromfs [sparc], hfsutils [powerpc ppc64], dosfstools [i386 ia64 m68k amd64], cpio, devio [arm armeb armel], slugimage (>= 0.10+r58-6) [arm armeb armel], dns323-firmware-tools [armel], nwutil [arm], uboot-mkimage [arm armel], syslinux (>= 2:3.63+dfsg-2) [i386 amd64], palo [hppa], elilo [ia64], yaboot [powerpc ppc64], aboot (>= 0.9b-2) [alpha], silo [sparc], sparc-utils [sparc], genisovh [mips], tip22 [mips], colo (>= 1.21-1) [mipsel], sibyl [mips mipsel], atari-bootstrap [m68k], vmelilo [m68k], m68k-vme-tftplilo [m68k], amiboot [m68k], emile [m68k], emile-bootblocks [m68k], apex-nslu2 [arm 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 arm armeb armel amd64 alpha hppa ia64 m68k mips mipsel powerpc ppc64 s390 sparc], bf-utf-source [!s390 !s390x], upx-ucl (>= 3) [i386], mkvmlinuz [powerpc ppc64], openssl [arm 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. @@ -94,6 +94,8 @@ Build-Depends: debhelper (>= 4), apt, apt-utils, gnupg, debian-archive-keyring ( # kernels and add nslu2 boot magic. # - slugimage (>= 0.10+r58-6) [arm armeb armel] # For building nslu2 firmware images. +# - dns323-firmware-tools [armel] +# For building DNS-323/CH3SNAS firmware images. # - nwutil [arm] # For building netwinder netinst images. # - uboot-mkimage [arm armel] only in patch2: unchanged: --- a/installer/build/config/armel/orion5x/netboot.cfg +++ b/installer/build/config/armel/orion5x/netboot.cfg @@ -1,6 +1,6 @@ MEDIA_TYPE = netboot image -TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) kuroboxpro mv2120 ts209 ts409 +TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) dns-323 kuroboxpro mv2120 ts209 ts409 EXTRANAME = $(MEDIUM) TYPE = netboot/network-console
