From 52918ed9f044e3b21fd4edb5c7a532c334680a12 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 30 Aug 2008 00:41:08 +0000 Subject: [PATCH] Only include atl2 packages on i386 and amd64 medias since d-i do not use them on all other arches --- debian/changelog | 3 +-- tools/generate_di+k_list | 36 ------------------------------------ 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/debian/changelog b/debian/changelog index 677c42c8..53b41c96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,8 +86,7 @@ debian-cd (3.0.5) UNRELEASED; urgency=low installation CDs. Closes: #486360. [ Otavio Salvador ] - * Include packages needed for systems using atl2 network adaptor. - * Include speakup modules for i386 and amd64 medias. + * Include speakup and atl2 modules for i386 and amd64 medias. -- Frans Pop Mon, 04 Aug 2008 18:59:31 +0200 diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list index eebce357..d5fe396e 100755 --- a/tools/generate_di+k_list +++ b/tools/generate_di+k_list @@ -151,8 +151,6 @@ linux-image-2.6-alpha-generic linux-image-2.6-alpha-smp loop-aes-modules-2.6-alpha-generic loop-aes-modules-2.6-alpha-smp -atl2-modules-2.6-alpha-generic -atl2-modules-2.6-alpha-smp #endif #ifdef ARCH_hppa @@ -168,10 +166,6 @@ loop-aes-modules-2.6-parisc loop-aes-modules-2.6-parisc-smp loop-aes-modules-2.6-parisc64 loop-aes-modules-2.6-parisc64-smp -atl2-modules-2.6-parisc -atl2-modules-2.6-parisc-smp -atl2-modules-2.6-parisc64 -atl2-modules-2.6-parisc64-smp palo #endif @@ -188,10 +182,6 @@ loop-aes-modules-2.6-itanium loop-aes-modules-2.6-itanium-smp loop-aes-modules-2.6-mckinley loop-aes-modules-2.6-mckinley-smp -atl2-modules-2.6-itanium -atl2-modules-2.6-itanium-smp -atl2-modules-2.6-mckinley -atl2-modules-2.6-mckinley-smp elilo #endif @@ -207,10 +197,6 @@ loop-aes-modules-2.6-r4k-ip22 loop-aes-modules-2.6-r5k-ip32 loop-aes-modules-2.6-sb1-bcm91250a loop-aes-modules-2.6-sb1a-bcm91480b -atl2-modules-2.6-r4k-ip22 -atl2-modules-2.6-r5k-ip32 -atl2-modules-2.6-sb1-bcm91250a -atl2-modules-2.6-sb1a-bcm91480b #endif #ifdef ARCH_mipsel @@ -228,11 +214,6 @@ loop-aes-modules-2.6-r4k-kn04 loop-aes-modules-2.6-r5k-cobalt loop-aes-modules-2.6-sb1-bcm91250a loop-aes-modules-2.6-sb1a-bcm91480b -atl2-modules-2.6-r3k-kn02 -atl2-modules-2.6-r4k-kn04 -atl2-modules-2.6-r5k-cobalt -atl2-modules-2.6-sb1-bcm91250a -atl2-modules-2.6-sb1a-bcm91480b #endif #ifdef ARCH_arm @@ -258,12 +239,6 @@ loop-aes-modules-2.6-ixp4xx loop-aes-modules-2.6-nslu2 loop-aes-modules-2.6-rpc loop-aes-modules-2.6-s3c2410 -atl2-modules-2.6-footbridge -atl2-modules-2.6-iop32x -atl2-modules-2.6-ixp4xx -atl2-modules-2.6-nslu2 -atl2-modules-2.6-rpc -atl2-modules-2.6-s3c2410 #endif #ifdef ARCH_armel @@ -281,9 +256,6 @@ linux-image-2.6-versatile loop-aes-modules-2.6-iop32x loop-aes-modules-2.6-ixp4xx loop-aes-modules-2.6-versatile -atl2-modules-2.6-iop32x -atl2-modules-2.6-ixp4xx -atl2-modules-2.6-versatile #endif #ifdef ARCH_sparc @@ -302,10 +274,6 @@ loop-aes-modules-2.6-sparc32 loop-aes-modules-2.6-sparc32-smp loop-aes-modules-2.6-sparc64 loop-aes-modules-2.6-sparc64-smp -atl2-modules-2.6-sparc32 -atl2-modules-2.6-sparc32-smp -atl2-modules-2.6-sparc64 -atl2-modules-2.6-sparc64-smp #endif #ifdef ARCH_powerpc @@ -328,10 +296,6 @@ loop-aes-modules-2.6-powerpc loop-aes-modules-2.6-powerpc-smp loop-aes-modules-2.6-powerpc64 loop-aes-modules-2.6-prep -atl2-modules-2.6-powerpc -atl2-modules-2.6-powerpc-smp -atl2-modules-2.6-powerpc64 -atl2-modules-2.6-prep #endif EOF