diff --git a/scripts/Download b/scripts/Download index 41769edbe..b7fa48f03 100755 --- a/scripts/Download +++ b/scripts/Download @@ -672,6 +672,7 @@ list_dtags() { { descparser package/*/*/*.desc | grep '^\[D\] ' grep -h '^[X0-9]' target/*/download.txt | sed 's,^,[D] ,' + grep -h '^[X0-9]' target/*/*/download.txt | sed 's,^,[D] ,' } | column_clean } @@ -763,11 +764,16 @@ required() { target=`grep '^export ROCKCFG_TARGET=' config/$config/config | \ cut -f2 -d= | tr -d "'"` - if [ -f target/$target/download.txt ] ; then - while read cksum file url flags ; do - download_file "`source_file cksum $file url $flags`" "$url" "$cksum" "$target" - done < target/$target/download.txt - fi + + arch=`grep '^export ROCKCFG_ARCH=' config/$config/config | \ + cut -f2 -d= | tr -d "'"` + for targetdl in target/$target/{,$arch/}download.txt ; do + if [ -f $targetdl ] ; then + while read cksum file url flags ; do + download_file "`source_file cksum $file url $flags`" "$url" "$cksum" "$target" + done < $targetdl + fi + done } all() { diff --git a/target/livecd/download.txt b/target/livecd/download.txt index 0ce2c6d58..5a765fca3 100644 --- a/target/livecd/download.txt +++ b/target/livecd/download.txt @@ -1,2 +1 @@ -2125465292 syslinux-2.11.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/ 1044314075 squashfs2.0-r2.tar.gz http://dl.sourceforge.net/sourceforge/squashfs/ diff --git a/target/livecd/powerpc/download.txt b/target/livecd/powerpc/download.txt new file mode 100644 index 000000000..1a1b7b566 --- /dev/null +++ b/target/livecd/powerpc/download.txt @@ -0,0 +1 @@ +655936802 BootX_1.2.2.sit http://penguinppc.org/~benh/ diff --git a/target/livecd/x86/download.txt b/target/livecd/x86/download.txt new file mode 100644 index 000000000..b716baef3 --- /dev/null +++ b/target/livecd/x86/download.txt @@ -0,0 +1 @@ +2125465292 syslinux-2.11.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/