Bug#751716: [debian-installer] Patch

2014-07-21 Thread Ian Campbell 
On Sun, 2014-07-13 at 12:26 +0200, Bastien ROUCARIES wrote:

Sorry the delay, I was procrastinating on responding because I'm wasn't
really sure what to suggest.

 On Sun, Jul 13, 2014 at 9:39 AM, Ian Campbell i...@hellion.org.uk wrote:
  On Sun, 2014-07-13 at 00:58 +0200, Bastien ROUCARIES wrote:
  On Sun, Jul 13, 2014 at 12:14 AM, Martin Michlmayr t...@cyrius.com wrote:
   * Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-12 19:05]:
   Hi UImage is too big to get into mtd :S You said that it it is a
   trimmed down version ? Any idea to trim more ?
  
   I believe we said the initramfs generated by initramfs-tools is
   trimmed down.  How big is the uimage and how much space do you have?
 
  5242880 byte or 5M

How big is the current uImage you are building? Looking at other similar
installer images I'm guessing it's a little over 5M, so I'm wondering
how much space we need to be clawing back.

You will probably need to take a look through
debian-installer.git/build/pkg-lists/* and the resulting list of udebs
which are included in this image to see if there is anything which can
be dropped to save some space.

It might also be useful to unpack the initrd and see if you can spot
anything which is unnecessary.

Given that the kernels can now (I think) handle xz compressed initrd
perhaps that might also be something to investigate?

  I always thought that this was the default behaviour of the
  network-console flavour images, is it not?
 
 No it is not. It ask for hostaname and password for ssh

I didn't know this. As Martin says though it looks like oldsys-preseed
is the fix. 

Looks at the code it looks like even without the machine specific hooks
it should be enough to preseed the networking (letting DHCP take
precedence) and set a default password, but it will be aborting because
it doesn't recognise the platform.

So at a minimum you will need to make it recognise your platform
allowing it to take the default actions, but since there is a stanza
there for DNS-323 though you might want to consider adding full support
for grabbing the existing firmware cfg for DNS-320 too.

Ian.


-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/1405932019.21027.10.ca...@kazak.uk.xensource.com

Bug#751716: [debian-installer] Patch

2014-07-20 Thread Bastien ROUCARIES 
On Sun, Jul 13, 2014 at 12:26 PM, Bastien ROUCARIES
roucaries.bast...@gmail.com wrote:
 On Sun, Jul 13, 2014 at 9:39 AM, Ian Campbell i...@hellion.org.uk wrote:
 On Sun, 2014-07-13 at 00:58 +0200, Bastien ROUCARIES wrote:
 On Sun, Jul 13, 2014 at 12:14 AM, Martin Michlmayr t...@cyrius.com wrote:
  * Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-12 19:05]:
  Hi UImage is too big to get into mtd :S You said that it it is a
  trimmed down version ? Any idea to trim more ?
 
  I believe we said the initramfs generated by initramfs-tools is
  trimmed down.  How big is the uimage and how much space do you have?

 5242880 byte or 5M

 The kirkwood kernel is just under 2MB, so there's no way the uImage
 could be 5M. This is enforced at kernel build time see
 linux/debian/config/armel/defines which has:
 [kirkwood_image]
 recommends: uboot-mkimage
 # SheevaPlug: 4194304 - 8 - 64 = 4194232
 # QNAP TS-119/TS-219: 2097152 - 8 - 64 = 2097080
 check-size: 2097080

 Maybe we are talking about uInitrd/uRamdisk?

 Yes it is uInitrd
  BTW it seems that this config need  a serial console in order to set
  ssh password. Do you have pointer about documentation of how to set it
  without serial. I plan to document dns-320 on the wiki.
 
  Take a look at oldsys-preseed.  You could just generate a dummy stanza
  that will do DHCP with a fallback IP address (instead of actually
  reading the network config from the device).

 I always thought that this was the default behaviour of the
 network-console flavour images, is it not?

 No it is not. It ask for hostaname and password for ssh

 Bastien
 Ian.

Ping


-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/cae2spay2bobjrkhczcb5podi4dczsmxplxxqlsd2id6o3qz...@mail.gmail.com

Bug#751716: [debian-installer] Patch

2014-07-13 Thread Ian Campbell 
On Sun, 2014-07-13 at 00:58 +0200, Bastien ROUCARIES wrote:
 On Sun, Jul 13, 2014 at 12:14 AM, Martin Michlmayr t...@cyrius.com wrote:
  * Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-12 19:05]:
  Hi UImage is too big to get into mtd :S You said that it it is a
  trimmed down version ? Any idea to trim more ?
 
  I believe we said the initramfs generated by initramfs-tools is
  trimmed down.  How big is the uimage and how much space do you have?
 
 5242880 byte or 5M

The kirkwood kernel is just under 2MB, so there's no way the uImage
could be 5M. This is enforced at kernel build time see
linux/debian/config/armel/defines which has:
[kirkwood_image]
recommends: uboot-mkimage
# SheevaPlug: 4194304 - 8 - 64 = 4194232
# QNAP TS-119/TS-219: 2097152 - 8 - 64 = 2097080
check-size: 2097080

Maybe we are talking about uInitrd/uRamdisk?

  BTW it seems that this config need  a serial console in order to set
  ssh password. Do you have pointer about documentation of how to set it
  without serial. I plan to document dns-320 on the wiki.
 
  Take a look at oldsys-preseed.  You could just generate a dummy stanza
  that will do DHCP with a fallback IP address (instead of actually
  reading the network config from the device).

I always thought that this was the default behaviour of the
network-console flavour images, is it not?

Ian.


-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1405237159.11981.56.ca...@dagon.hellion.org.uk

Bug#751716: [debian-installer] Patch

2014-07-13 Thread Bastien ROUCARIES 
On Sun, Jul 13, 2014 at 9:39 AM, Ian Campbell i...@hellion.org.uk wrote:
 On Sun, 2014-07-13 at 00:58 +0200, Bastien ROUCARIES wrote:
 On Sun, Jul 13, 2014 at 12:14 AM, Martin Michlmayr t...@cyrius.com wrote:
  * Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-12 19:05]:
  Hi UImage is too big to get into mtd :S You said that it it is a
  trimmed down version ? Any idea to trim more ?
 
  I believe we said the initramfs generated by initramfs-tools is
  trimmed down.  How big is the uimage and how much space do you have?

 5242880 byte or 5M

 The kirkwood kernel is just under 2MB, so there's no way the uImage
 could be 5M. This is enforced at kernel build time see
 linux/debian/config/armel/defines which has:
 [kirkwood_image]
 recommends: uboot-mkimage
 # SheevaPlug: 4194304 - 8 - 64 = 4194232
 # QNAP TS-119/TS-219: 2097152 - 8 - 64 = 2097080
 check-size: 2097080

 Maybe we are talking about uInitrd/uRamdisk?

Yes it is uInitrd
  BTW it seems that this config need  a serial console in order to set
  ssh password. Do you have pointer about documentation of how to set it
  without serial. I plan to document dns-320 on the wiki.
 
  Take a look at oldsys-preseed.  You could just generate a dummy stanza
  that will do DHCP with a fallback IP address (instead of actually
  reading the network config from the device).

 I always thought that this was the default behaviour of the
 network-console flavour images, is it not?

No it is not. It ask for hostaname and password for ssh

Bastien
 Ian.



-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/cae2spaalnev4yexezuse1jjbz_wu+qx_ut+jw3cczh3ycul...@mail.gmail.com

Bug#751716: [debian-installer] Patch

2014-07-12 Thread Bastien ROUCARIES 
On Wed, Jul 9, 2014 at 9:58 AM, Ian Campbell i...@hellion.org.uk wrote:
 On Tue, 2014-07-08 at 23:28 +0200, Bastien ROUCARIES wrote:
 On Tue, Jul 8, 2014 at 9:39 PM, Ian Campbell i...@hellion.org.uk wrote:
  On Mon, 2014-07-07 at 17:05 +0200, Martin Michlmayr wrote:
  * Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-06 22:10]:
You combine the kernel and the DTB in 
$(TEMP)/dns-320/vmlinuz-dns320.  But then
instead of using this file to generate the kernel.uboot, you use the 
original
kernel.
  
   Corrected thank
 
  Looks good.
 
  I went to apply this but:
 
  mkdir -p ./tmp/kirkwood_network-console/dns-320
  cat ./tmp/kirkwood_network-console/vmlinuz-3.14-1-kirkwood 
  ./tmp/kirkwood_network-console/lib/kirkwood-dns320.dtb  
  ./tmp/kirkwood_network-console/dns-320/vmlinuz-dns320
  mkimage -A arm -O linux -T kernel -C none -e 0x8000 -a 0x8000 -n 
  Debian kernel -d ./tmp/kirkwood_network-console/dns-320/kernel 
  ./tmp/kirkwood_network-console/dns-320/vmlinuz-dns320
  /usr/bin/mkimage: Can't open 
  ./tmp/kirkwood_network-console/dns-320/kernel: No such file or directory
  config/armel/kirkwood/network-console.cfg:9: recipe for target 'dns-320' 
  failed

 My fault here updated version

 Thanks, pushed. It should show up in the dailies tomorrow.


Hi UImage is too big to get into mtd :S You said that it it is a
trimmed down version ? Any idea to trim more ?

BTW it seems that this config need  a serial console in order to set
ssh password. Do you have pointer about documentation of how to set it
without serial. I plan to document dns-320 on the wiki.

Bastien


 Ian.



-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/cae2spaasjnzpe3q8iv8z_2h9udarv8qrgsfoq5ur0ngcbcq...@mail.gmail.com

Bug#751716: [debian-installer] Patch

2014-07-12 Thread Bastien ROUCARIES 
On Sat, Jul 12, 2014 at 7:05 PM, Bastien ROUCARIES
roucaries.bast...@gmail.com wrote:
 On Wed, Jul 9, 2014 at 9:58 AM, Ian Campbell i...@hellion.org.uk wrote:
 On Tue, 2014-07-08 at 23:28 +0200, Bastien ROUCARIES wrote:
 On Tue, Jul 8, 2014 at 9:39 PM, Ian Campbell i...@hellion.org.uk wrote:
  On Mon, 2014-07-07 at 17:05 +0200, Martin Michlmayr wrote:
  * Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-06 22:10]:
You combine the kernel and the DTB in 
$(TEMP)/dns-320/vmlinuz-dns320.  But then
instead of using this file to generate the kernel.uboot, you use 
the original
kernel.
  
   Corrected thank
 
  Looks good.
 
  I went to apply this but:
 
  mkdir -p ./tmp/kirkwood_network-console/dns-320
  cat ./tmp/kirkwood_network-console/vmlinuz-3.14-1-kirkwood 
  ./tmp/kirkwood_network-console/lib/kirkwood-dns320.dtb  
  ./tmp/kirkwood_network-console/dns-320/vmlinuz-dns320
  mkimage -A arm -O linux -T kernel -C none -e 0x8000 -a 0x8000 -n 
  Debian kernel -d ./tmp/kirkwood_network-console/dns-320/kernel 
  ./tmp/kirkwood_network-console/dns-320/vmlinuz-dns320
  /usr/bin/mkimage: Can't open 
  ./tmp/kirkwood_network-console/dns-320/kernel: No such file or directory
  config/armel/kirkwood/network-console.cfg:9: recipe for target 'dns-320' 
  failed

 My fault here updated version

 Thanks, pushed. It should show up in the dailies tomorrow.


 Hi UImage is too big to get into mtd :S You said that it it is a
 trimmed down version ? Any idea to trim more ?

 BTW it seems that this config need  a serial console in order to set
 ssh password. Do you have pointer about documentation of how to set it
 without serial. I plan to document dns-320 on the wiki.

Could you also push the following patch ?

The first help me to debug and is the only stuff needed in order to
use uboot booting from serial console

The second one, will document the limit.

BTW it need to include  sata_mv module in order to see disk. How can I do ?

Bastien


 Bastien


 Ian.

From b1214924d0914165af5dfde92b8a149495dc0378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= roucaries.bast...@gmail.com
Date: Sat, 12 Jul 2014 19:22:55 +0200
Subject: [PATCH 1/2] Add kernel and initrd to debian installer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It help to restore from serial console, when flashing from dlink fail.

Signed-off-by: Bastien ROUCARIÈS roucaries.bast...@gmail.com
---
 build/config/armel/kirkwood/network-console.cfg | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build/config/armel/kirkwood/network-console.cfg b/build/config/armel/kirkwood/network-console.cfg
index 1489ec4..6bf1ef5 100644
--- a/build/config/armel/kirkwood/network-console.cfg
+++ b/build/config/armel/kirkwood/network-console.cfg
@@ -10,9 +10,13 @@ dns-320:
 	mkdir -p $(TEMP)/dns-320
 	cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-dns320.dtb  $(TEMP)/dns-320/vmlinuz-dns320
 	mkimage -A arm -O linux -T kernel -C none -e 0x8000 -a 0x8000 -n Debian kernel -d $(TEMP)/dns-320/vmlinuz-dns320 $(TEMP)/dns-320/kernel.uboot
+	cp $(TEMP)/dns-320/vmlinuz-dns320 $(TEMP)/dns-320/kernel.uboot $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320/uImage
 	mkimage -A arm -O linux -T ramdisk -C gzip -e 0x00e0 -a 0x00e0 -n debian-installer ramdisk -d $(TEMP_INITRD) $(TEMP)/dns-320/initrd.uboot
-	mkdns323fw -k $(TEMP)/dns-320/kernel.uboot -i $(TEMP)/dns-320/initrd.uboot -t DNS-320 -o $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320/netboot.img
-	update-manifest $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320/netboot.img installer image (dlink firmware) for D-Link DNS-320
+	cp $(TEMP)/dns-320/vmlinuz-dns320 $(TEMP)/dns-320/initrd.uboot $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320/uInitrd
+	mkdns323fw -k $(TEMP)/dns-320/kernel.uboot -i $(TEMP)/dns-320/initrd.uboot -t DNS-320 -o $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320/flash-debian
+	update-manifest $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320/flash-debian installer image (dlink firmware) for D-Link DNS-320
+	update-manifest $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320/uImage kernel for D-Link DNS-320
+	update-manifest $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320/uInitrd initrd for D-Link DNS-320
 
 
 # QNAP TS-119, TS-219 and TS-219P
-- 
2.0.0

From d2a941f53ff7722b450c5e0a578b08b575462228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= roucaries.bast...@gmail.com
Date: Sat, 12 Jul 2014 19:35:19 +0200
Subject: [PATCH 2/2] Fail if dns-320 is too big
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Dns 320 image are less than 5M due to flash constraint

Signed-off-by: Bastien ROUCARIÈS roucaries.bast...@gmail.com
---
 build/config/armel/kirkwood/network-console.cfg | 4 
 1 file changed, 4 insertions(+)

diff --git a/build/config/armel/kirkwood/network-console.cfg b/build/config/armel/kirkwood/network-console.cfg
index 6bf1ef5..2d34652 100644
---

Bug#751716: [debian-installer] Patch

2014-07-12 Thread Martin Michlmayr 
* Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-12 19:05]:
 Hi UImage is too big to get into mtd :S You said that it it is a
 trimmed down version ? Any idea to trim more ?

I believe we said the initramfs generated by initramfs-tools is
trimmed down.  How big is the uimage and how much space do you have?

 BTW it seems that this config need  a serial console in order to set
 ssh password. Do you have pointer about documentation of how to set it
 without serial. I plan to document dns-320 on the wiki.

Take a look at oldsys-preseed.  You could just generate a dummy stanza
that will do DHCP with a fallback IP address (instead of actually
reading the network config from the device).

-- 
Martin Michlmayr
http://www.cyrius.com/


-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20140712221443.go12...@jirafa.cyrius.com

Bug#751716: [debian-installer] Patch

2014-07-12 Thread Bastien ROUCARIES 
On Sun, Jul 13, 2014 at 12:14 AM, Martin Michlmayr t...@cyrius.com wrote:
 * Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-12 19:05]:
 Hi UImage is too big to get into mtd :S You said that it it is a
 trimmed down version ? Any idea to trim more ?

 I believe we said the initramfs generated by initramfs-tools is
 trimmed down.  How big is the uimage and how much space do you have?

5242880 byte or 5M

 BTW it seems that this config need  a serial console in order to set
 ssh password. Do you have pointer about documentation of how to set it
 without serial. I plan to document dns-320 on the wiki.

 Take a look at oldsys-preseed.  You could just generate a dummy stanza
 that will do DHCP with a fallback IP address (instead of actually
 reading the network config from the device).

Ok will do

 --
 Martin Michlmayr
 http://www.cyrius.com/


-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/cae2spaaxowfvocyydyhyov8entar4dtqw+wn7y6vmr_039h...@mail.gmail.com

Bug#751716: [debian-installer] Patch

2014-07-09 Thread Ian Campbell 
On Tue, 2014-07-08 at 23:28 +0200, Bastien ROUCARIES wrote:
 On Tue, Jul 8, 2014 at 9:39 PM, Ian Campbell i...@hellion.org.uk wrote:
  On Mon, 2014-07-07 at 17:05 +0200, Martin Michlmayr wrote:
  * Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-06 22:10]:
You combine the kernel and the DTB in $(TEMP)/dns-320/vmlinuz-dns320. 
 But then
instead of using this file to generate the kernel.uboot, you use the 
original
kernel.
  
   Corrected thank
 
  Looks good.
 
  I went to apply this but:
 
  mkdir -p ./tmp/kirkwood_network-console/dns-320
  cat ./tmp/kirkwood_network-console/vmlinuz-3.14-1-kirkwood 
  ./tmp/kirkwood_network-console/lib/kirkwood-dns320.dtb  
  ./tmp/kirkwood_network-console/dns-320/vmlinuz-dns320
  mkimage -A arm -O linux -T kernel -C none -e 0x8000 -a 0x8000 -n 
  Debian kernel -d ./tmp/kirkwood_network-console/dns-320/kernel 
  ./tmp/kirkwood_network-console/dns-320/vmlinuz-dns320
  /usr/bin/mkimage: Can't open ./tmp/kirkwood_network-console/dns-320/kernel: 
  No such file or directory
  config/armel/kirkwood/network-console.cfg:9: recipe for target 'dns-320' 
  failed
 
 My fault here updated version

Thanks, pushed. It should show up in the dailies tomorrow.

Ian.


-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1404892688.11981.5.ca...@dagon.hellion.org.uk

Bug#751716: [debian-installer] Patch

2014-07-08 Thread Ian Campbell 
On Mon, 2014-07-07 at 17:05 +0200, Martin Michlmayr wrote:
 * Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-06 22:10]:
   You combine the kernel and the DTB in $(TEMP)/dns-320/vmlinuz-dns320.  
   But then
   instead of using this file to generate the kernel.uboot, you use the 
   original
   kernel.
  
  Corrected thank
 
 Looks good.

I went to apply this but:

mkdir -p ./tmp/kirkwood_network-console/dns-320
cat ./tmp/kirkwood_network-console/vmlinuz-3.14-1-kirkwood 
./tmp/kirkwood_network-console/lib/kirkwood-dns320.dtb  
./tmp/kirkwood_network-console/dns-320/vmlinuz-dns320
mkimage -A arm -O linux -T kernel -C none -e 0x8000 -a 0x8000 -n 
Debian kernel -d ./tmp/kirkwood_network-console/dns-320/kernel 
./tmp/kirkwood_network-console/dns-320/vmlinuz-dns320
/usr/bin/mkimage: Can't open ./tmp/kirkwood_network-console/dns-320/kernel: No 
such file or directory
config/armel/kirkwood/network-console.cfg:9: recipe for target 'dns-320' failed

Ian.


-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: 
https://lists.debian.org/1404848355.11945.22.ca...@hastur.hellion.org.uk

Bug#751716: [debian-installer] Patch

2014-07-08 Thread Bastien ROUCARIES 
On Tue, Jul 8, 2014 at 9:39 PM, Ian Campbell i...@hellion.org.uk wrote:
 On Mon, 2014-07-07 at 17:05 +0200, Martin Michlmayr wrote:
 * Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-06 22:10]:
   You combine the kernel and the DTB in $(TEMP)/dns-320/vmlinuz-dns320.  
   But then
   instead of using this file to generate the kernel.uboot, you use the 
   original
   kernel.
 
  Corrected thank

 Looks good.

 I went to apply this but:

 mkdir -p ./tmp/kirkwood_network-console/dns-320
 cat ./tmp/kirkwood_network-console/vmlinuz-3.14-1-kirkwood 
 ./tmp/kirkwood_network-console/lib/kirkwood-dns320.dtb  
 ./tmp/kirkwood_network-console/dns-320/vmlinuz-dns320
 mkimage -A arm -O linux -T kernel -C none -e 0x8000 -a 0x8000 -n 
 Debian kernel -d ./tmp/kirkwood_network-console/dns-320/kernel 
 ./tmp/kirkwood_network-console/dns-320/vmlinuz-dns320
 /usr/bin/mkimage: Can't open ./tmp/kirkwood_network-console/dns-320/kernel: 
 No such file or directory
 config/armel/kirkwood/network-console.cfg:9: recipe for target 'dns-320' 
 failed

My fault here updated version

 Ian.

From afa66cf670632e226ac9a2560fbcfd1b5dc40544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= roucaries.bast...@gmail.com
Date: Sun, 22 Jun 2014 20:08:10 +0200
Subject: [PATCH] Add dns-320 to debian installer list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Will allow to install debian on dns-320

Signed-off-by: Bastien ROUCARIÈS roucaries.bast...@gmail.com
---
 build/config/armel/kirkwood/network-console.cfg | 13 -
 debian/control  |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/build/config/armel/kirkwood/network-console.cfg b/build/config/armel/kirkwood/network-console.cfg
index 24f8803..1489ec4 100644
--- a/build/config/armel/kirkwood/network-console.cfg
+++ b/build/config/armel/kirkwood/network-console.cfg
@@ -1,9 +1,20 @@
 MEDIA_TYPE = netboot image (SSH)
 
-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) ts219 ts41x lacie
+TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) dns-320 ts219 ts41x lacie
 EXTRANAME = $(MEDIUM)
 TYPE = netboot/network-console
 
+# D-Link DNS-320
+dns-320:
+	mkdir -p $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320
+	mkdir -p $(TEMP)/dns-320
+	cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-dns320.dtb  $(TEMP)/dns-320/vmlinuz-dns320
+	mkimage -A arm -O linux -T kernel -C none -e 0x8000 -a 0x8000 -n Debian kernel -d $(TEMP)/dns-320/vmlinuz-dns320 $(TEMP)/dns-320/kernel.uboot
+	mkimage -A arm -O linux -T ramdisk -C gzip -e 0x00e0 -a 0x00e0 -n debian-installer ramdisk -d $(TEMP_INITRD) $(TEMP)/dns-320/initrd.uboot
+	mkdns323fw -k $(TEMP)/dns-320/kernel.uboot -i $(TEMP)/dns-320/initrd.uboot -t DNS-320 -o $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320/netboot.img
+	update-manifest $(SOME_DEST)/$(EXTRANAME)/d-link/dns-320/netboot.img installer image (dlink firmware) for D-Link DNS-320
+
+
 # QNAP TS-119, TS-219 and TS-219P
 ts219:
 	mkdir -p $(SOME_DEST)/$(EXTRANAME)/qnap/ts-219
diff --git a/debian/control b/debian/control
index 6c9551c..535f33f 100644
--- a/debian/control
+++ b/debian/control
@@ -82,8 +82,8 @@ Build-Depends:
 #		kernels and add nslu2 boot magic.
 	slugimage (= 0.10+r58-6) [armeb armel],
 #		For building nslu2 firmware images.
-	dns323-firmware-tools [armel],
-#		For building firmware images for the D-Link DNS-323.
+	dns323-firmware-tools (= 0.3-2) [armel],
+#		For building firmware images for the D-Link DNS-32(0|3).
 	u-boot-tools [armel armhf],
 #		For creating u-boot images
 # 
-- 
2.0.0

Bug#751716: [debian-installer] Patch

2014-07-07 Thread Martin Michlmayr 
* Bastien ROUCARIES roucaries.bast...@gmail.com [2014-07-06 22:10]:
  You combine the kernel and the DTB in $(TEMP)/dns-320/vmlinuz-dns320.  But 
  then
  instead of using this file to generate the kernel.uboot, you use the 
  original
  kernel.
 
 Corrected thank

Looks good.

-- 
Martin Michlmayr
http://www.cyrius.com/


-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20140707150536.gd11...@jirafa.cyrius.com

Bug#751716: [debian-installer] Patch

2014-07-06 Thread Bastien ROUCARIES 
On Sun, Jun 22, 2014 at 8:35 PM, Martin Michlmayr t...@cyrius.com wrote:
 * bastien ROUCARIES roucaries.bast...@gmail.com [2014-06-22 20:18]:
 Package: debian-installer
 control: tags -1 + patch

 This is not correct.  You're adding a Kirkwood image to the Orion
 build file.

This time I believe it is correct.

 --
 Martin Michlmayr
 http://www.cyrius.com/


0001-Add-dns-320-to-debian-installer-list.patch
Description: application/download

Bug#751716: [debian-installer] Patch

2014-07-06 Thread Martin Michlmayr 
+   cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-dns320.dtb  
$(TEMP)/dns-320/vmlinuz-dns320
+   mkimage -A arm -O linux -T kernel -C none -e 0x8000 -a 0x8000 
-n Debian kernel -d $(TEMP)/dns-320/kernel $(TEMP)/dns-320/kernel.uboot

You combine the kernel and the DTB in $(TEMP)/dns-320/vmlinuz-dns320.  But then
instead of using this file to generate the kernel.uboot, you use the original
kernel.

Otherwise look fine.
-- 
Martin Michlmayr
http://www.cyrius.com/


0001-Add-dns-320-to-debian-installer-list.patch
Description: application/download

Bug#751716: [debian-installer] Patch

2014-07-06 Thread Bastien ROUCARIES 
On Sun, Jul 6, 2014 at 10:10 PM, Bastien ROUCARIES
roucaries.bast...@gmail.com wrote:
 On Sun, Jul 6, 2014 at 9:35 PM, Martin Michlmayr t...@cyrius.com wrote:
 +   cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-dns320.dtb  
 $(TEMP)/dns-320/vmlinuz-dns320
 +   mkimage -A arm -O linux -T kernel -C none -e 0x8000 -a 
 0x8000 -n Debian kernel -d $(TEMP)/dns-320/kernel 
 $(TEMP)/dns-320/kernel.uboot

 You combine the kernel and the DTB in $(TEMP)/dns-320/vmlinuz-dns320.  But 
 then
 instead of using this file to generate the kernel.uboot, you use the original
 kernel.

Corrected thank
 Otherwise look fine.
 --
 Martin Michlmayr
 http://www.cyrius.com/


0001-Add-dns-320-to-debian-installer-list.patch
Description: application/download

Bug#751716: [debian-installer] Patch

2014-07-06 Thread Bastien ROUCARIES 
On Sun, Jul 6, 2014 at 9:35 PM, Martin Michlmayr t...@cyrius.com wrote:
 +   cat $(TEMP_KERNEL) $(TEMP_DTBS)/kirkwood-dns320.dtb  
 $(TEMP)/dns-320/vmlinuz-dns320
 +   mkimage -A arm -O linux -T kernel -C none -e 0x8000 -a 0x8000 
 -n Debian kernel -d $(TEMP)/dns-320/kernel $(TEMP)/dns-320/kernel.uboot

 You combine the kernel and the DTB in $(TEMP)/dns-320/vmlinuz-dns320.  But 
 then
 instead of using this file to generate the kernel.uboot, you use the original
 kernel.

 Otherwise look fine.
 --
 Martin Michlmayr
 http://www.cyrius.com/


0001-Add-dns-320-to-debian-installer-list.patch
Description: application/download

Bug#751716: [debian-installer] Patch

2014-06-22 Thread Martin Michlmayr 
* bastien ROUCARIES roucaries.bast...@gmail.com [2014-06-22 20:18]:
 Package: debian-installer
 control: tags -1 + patch

This is not correct.  You're adding a Kirkwood image to the Orion
build file.

-- 
Martin Michlmayr
http://www.cyrius.com/


-- 
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/20140622183545.ga1...@jirafa.cyrius.com