From 3a4703fe6311f2d94c9657e18bb1d171280e1d8f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Jun 2013 02:27:05 +0000 Subject: [PATCH] [sparc64] udeb: Use symlinks to follow sparc configuration svn path=/dists/trunk/linux/; revision=20237 --- debian/changelog | 1 + debian/installer/sparc64/modules/sparc64 | 1 + .../sparc64/modules/sparc64/ata-modules | 1 - .../sparc64/modules/sparc64/btrfs-modules | 1 - .../modules/sparc64/cdrom-core-modules | 2 - .../sparc64/modules/sparc64/core-modules | 1 - .../sparc64/modules/sparc64/crc-modules | 1 - .../sparc64/modules/sparc64/crypto-dm-modules | 1 - .../sparc64/modules/sparc64/crypto-modules | 1 - .../sparc64/modules/sparc64/ext2-modules | 2 - .../sparc64/modules/sparc64/ext3-modules | 2 - .../sparc64/modules/sparc64/ext4-modules | 1 - .../sparc64/modules/sparc64/fat-modules | 2 - .../sparc64/modules/sparc64/fuse-modules | 1 - .../sparc64/modules/sparc64/input-modules | 1 - .../sparc64/modules/sparc64/isofs-modules | 1 - .../sparc64/modules/sparc64/jfs-modules | 1 - .../sparc64/modules/sparc64/kernel-image | 1 - .../sparc64/modules/sparc64/md-modules | 2 - .../sparc64/modules/sparc64/multipath-modules | 1 - .../sparc64/modules/sparc64/nbd-modules | 1 - .../sparc64/modules/sparc64/nic-modules | 50 ------------------- .../sparc64/modules/sparc64/pata-modules | 1 - .../sparc64/modules/sparc64/plip-modules | 2 - .../sparc64/modules/sparc64/ppp-modules | 2 - .../sparc64/modules/sparc64/reiserfs-modules | 2 - .../sparc64/modules/sparc64/sata-modules | 1 - .../modules/sparc64/scsi-common-modules | 9 ---- .../sparc64/modules/sparc64/scsi-core-modules | 8 --- .../sparc64/modules/sparc64/scsi-modules | 19 ------- .../sparc64/modules/sparc64/squashfs-modules | 1 - .../sparc64/modules/sparc64/udf-modules | 1 - .../sparc64/modules/sparc64/usb-modules | 1 - .../modules/sparc64/usb-storage-modules | 2 - .../sparc64/modules/sparc64/virtio-modules | 1 - .../sparc64/modules/sparc64/xfs-modules | 2 - .../sparc64/modules/sparc64/zlib-modules | 1 - debian/installer/sparc64/package-list | 16 +----- 38 files changed, 3 insertions(+), 142 deletions(-) create mode 120000 debian/installer/sparc64/modules/sparc64 delete mode 100644 debian/installer/sparc64/modules/sparc64/ata-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/btrfs-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/cdrom-core-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/core-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/crc-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/crypto-dm-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/crypto-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/ext2-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/ext3-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/ext4-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/fat-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/fuse-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/input-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/isofs-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/jfs-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/kernel-image delete mode 100644 debian/installer/sparc64/modules/sparc64/md-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/multipath-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/nbd-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/nic-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/pata-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/plip-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/ppp-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/reiserfs-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/sata-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/scsi-common-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/scsi-core-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/scsi-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/squashfs-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/udf-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/usb-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/usb-storage-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/virtio-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/xfs-modules delete mode 100644 debian/installer/sparc64/modules/sparc64/zlib-modules mode change 100644 => 120000 debian/installer/sparc64/package-list diff --git a/debian/changelog b/debian/changelog index e43c97f1c..281ea18dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ linux (3.10~rc5-1~exp1) UNRELEASED; urgency=low * udeb: Move i2c-algo-bit to i2c-modules * udeb: Remove redundant control file overrides * [s390] udeb: Use symlinks to follow s390x configuration + * [sparc64] udeb: Use symlinks to follow sparc configuration -- Ben Hutchings Mon, 03 Jun 2013 13:21:56 +0100 diff --git a/debian/installer/sparc64/modules/sparc64 b/debian/installer/sparc64/modules/sparc64 new file mode 120000 index 000000000..b3390c86d --- /dev/null +++ b/debian/installer/sparc64/modules/sparc64 @@ -0,0 +1 @@ +../../sparc/modules/sparc \ No newline at end of file diff --git a/debian/installer/sparc64/modules/sparc64/ata-modules b/debian/installer/sparc64/modules/sparc64/ata-modules deleted file mode 100644 index b81c0f38b..000000000 --- a/debian/installer/sparc64/modules/sparc64/ata-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/btrfs-modules b/debian/installer/sparc64/modules/sparc64/btrfs-modules deleted file mode 100644 index e261e1388..000000000 --- a/debian/installer/sparc64/modules/sparc64/btrfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/cdrom-core-modules b/debian/installer/sparc64/modules/sparc64/cdrom-core-modules deleted file mode 100644 index e264d7aa3..000000000 --- a/debian/installer/sparc64/modules/sparc64/cdrom-core-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc64/modules/sparc64/core-modules b/debian/installer/sparc64/modules/sparc64/core-modules deleted file mode 100644 index f05d06298..000000000 --- a/debian/installer/sparc64/modules/sparc64/core-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/crc-modules b/debian/installer/sparc64/modules/sparc64/crc-modules deleted file mode 100644 index 7e00de705..000000000 --- a/debian/installer/sparc64/modules/sparc64/crc-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/crypto-dm-modules b/debian/installer/sparc64/modules/sparc64/crypto-dm-modules deleted file mode 100644 index 4c8f2354c..000000000 --- a/debian/installer/sparc64/modules/sparc64/crypto-dm-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/crypto-modules b/debian/installer/sparc64/modules/sparc64/crypto-modules deleted file mode 100644 index 3a1e862b4..000000000 --- a/debian/installer/sparc64/modules/sparc64/crypto-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/ext2-modules b/debian/installer/sparc64/modules/sparc64/ext2-modules deleted file mode 100644 index bbaebc8f1..000000000 --- a/debian/installer/sparc64/modules/sparc64/ext2-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc64/modules/sparc64/ext3-modules b/debian/installer/sparc64/modules/sparc64/ext3-modules deleted file mode 100644 index 55ef7d7bc..000000000 --- a/debian/installer/sparc64/modules/sparc64/ext3-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc64/modules/sparc64/ext4-modules b/debian/installer/sparc64/modules/sparc64/ext4-modules deleted file mode 100644 index 394c577ce..000000000 --- a/debian/installer/sparc64/modules/sparc64/ext4-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/fat-modules b/debian/installer/sparc64/modules/sparc64/fat-modules deleted file mode 100644 index cce8fd30c..000000000 --- a/debian/installer/sparc64/modules/sparc64/fat-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc64/modules/sparc64/fuse-modules b/debian/installer/sparc64/modules/sparc64/fuse-modules deleted file mode 100644 index 0b6ba0c8c..000000000 --- a/debian/installer/sparc64/modules/sparc64/fuse-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/input-modules b/debian/installer/sparc64/modules/sparc64/input-modules deleted file mode 100644 index 5ecb595a4..000000000 --- a/debian/installer/sparc64/modules/sparc64/input-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/isofs-modules b/debian/installer/sparc64/modules/sparc64/isofs-modules deleted file mode 100644 index da4fa9a3c..000000000 --- a/debian/installer/sparc64/modules/sparc64/isofs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/jfs-modules b/debian/installer/sparc64/modules/sparc64/jfs-modules deleted file mode 100644 index 7e4d912b9..000000000 --- a/debian/installer/sparc64/modules/sparc64/jfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/kernel-image b/debian/installer/sparc64/modules/sparc64/kernel-image deleted file mode 100644 index 1bb8bf6d7..000000000 --- a/debian/installer/sparc64/modules/sparc64/kernel-image +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/debian/installer/sparc64/modules/sparc64/md-modules b/debian/installer/sparc64/modules/sparc64/md-modules deleted file mode 100644 index ade088ddb..000000000 --- a/debian/installer/sparc64/modules/sparc64/md-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc64/modules/sparc64/multipath-modules b/debian/installer/sparc64/modules/sparc64/multipath-modules deleted file mode 100644 index a8b69b253..000000000 --- a/debian/installer/sparc64/modules/sparc64/multipath-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/nbd-modules b/debian/installer/sparc64/modules/sparc64/nbd-modules deleted file mode 100644 index 3c9b3e5d4..000000000 --- a/debian/installer/sparc64/modules/sparc64/nbd-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/nic-modules b/debian/installer/sparc64/modules/sparc64/nic-modules deleted file mode 100644 index ed625047d..000000000 --- a/debian/installer/sparc64/modules/sparc64/nic-modules +++ /dev/null @@ -1,50 +0,0 @@ -3c59x -8139too -8390 -b44 -dl2k -epic100 -eql -fealnx -mii -natsemi -ne2k-pci -ns83820 -pcnet32 -sis900 -starfire -sundance -typhoon -via-rhine -yellowfin -e100 -e1000 -e1000e -skfp -tg3 -sungem -sungem_phy -tulip -winbond-840 -dmfe -sunhme -sunqe -sunlance -sunbmac -myri_sbus ? -cassini -cxgb -sis190 -skge -uli526x -qla3xxx -atl1 -niu -igb -igbvf - -# Support for virtual network devices under Sun Logical Domains. -sunvnet ? - -pps_core -ptp diff --git a/debian/installer/sparc64/modules/sparc64/pata-modules b/debian/installer/sparc64/modules/sparc64/pata-modules deleted file mode 100644 index b0cd6337a..000000000 --- a/debian/installer/sparc64/modules/sparc64/pata-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/plip-modules b/debian/installer/sparc64/modules/sparc64/plip-modules deleted file mode 100644 index eab43fa8f..000000000 --- a/debian/installer/sparc64/modules/sparc64/plip-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc64/modules/sparc64/ppp-modules b/debian/installer/sparc64/modules/sparc64/ppp-modules deleted file mode 100644 index f1ae9b3d1..000000000 --- a/debian/installer/sparc64/modules/sparc64/ppp-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc64/modules/sparc64/reiserfs-modules b/debian/installer/sparc64/modules/sparc64/reiserfs-modules deleted file mode 100644 index 372669677..000000000 --- a/debian/installer/sparc64/modules/sparc64/reiserfs-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc64/modules/sparc64/sata-modules b/debian/installer/sparc64/modules/sparc64/sata-modules deleted file mode 100644 index 01318c258..000000000 --- a/debian/installer/sparc64/modules/sparc64/sata-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/scsi-common-modules b/debian/installer/sparc64/modules/sparc64/scsi-common-modules deleted file mode 100644 index 2d8c1d95f..000000000 --- a/debian/installer/sparc64/modules/sparc64/scsi-common-modules +++ /dev/null @@ -1,9 +0,0 @@ -sun_esp -aic79xx -aic7xxx -aic7xxx_old -qlogicpti ? -sym53c8xx -mptsas -mptspi -mpt2sas diff --git a/debian/installer/sparc64/modules/sparc64/scsi-core-modules b/debian/installer/sparc64/modules/sparc64/scsi-core-modules deleted file mode 100644 index d1834e5af..000000000 --- a/debian/installer/sparc64/modules/sparc64/scsi-core-modules +++ /dev/null @@ -1,8 +0,0 @@ -#include -scsi_transport_spi -scsi_transport_sas - -# Support for virtual disk devices as a client under Sun Logical Domains. -# Does not really belong here, but it's better than adding a new kernel -# udeb just for this module. -sunvdc ? diff --git a/debian/installer/sparc64/modules/sparc64/scsi-modules b/debian/installer/sparc64/modules/sparc64/scsi-modules deleted file mode 100644 index e2f1eb89a..000000000 --- a/debian/installer/sparc64/modules/sparc64/scsi-modules +++ /dev/null @@ -1,19 +0,0 @@ -3w-9xxx -3w-xxxx -aacraid -aic94xx -arcmsr -atp870u ? -dc395x -dmx3191d -hptiop -initio -lpfc -megaraid -megaraid_sas -osst -ipr -stex -qla1280 ? -qla2xxx ? -qla4xxx ? diff --git a/debian/installer/sparc64/modules/sparc64/squashfs-modules b/debian/installer/sparc64/modules/sparc64/squashfs-modules deleted file mode 100644 index 42d77887a..000000000 --- a/debian/installer/sparc64/modules/sparc64/squashfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/udf-modules b/debian/installer/sparc64/modules/sparc64/udf-modules deleted file mode 100644 index b90d7ee9b..000000000 --- a/debian/installer/sparc64/modules/sparc64/udf-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/usb-modules b/debian/installer/sparc64/modules/sparc64/usb-modules deleted file mode 100644 index c598dedd8..000000000 --- a/debian/installer/sparc64/modules/sparc64/usb-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/usb-storage-modules b/debian/installer/sparc64/modules/sparc64/usb-storage-modules deleted file mode 100644 index 272d95e2e..000000000 --- a/debian/installer/sparc64/modules/sparc64/usb-storage-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc64/modules/sparc64/virtio-modules b/debian/installer/sparc64/modules/sparc64/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/sparc64/modules/sparc64/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/modules/sparc64/xfs-modules b/debian/installer/sparc64/modules/sparc64/xfs-modules deleted file mode 100644 index c020b5d39..000000000 --- a/debian/installer/sparc64/modules/sparc64/xfs-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/sparc64/modules/sparc64/zlib-modules b/debian/installer/sparc64/modules/sparc64/zlib-modules deleted file mode 100644 index e02ad64bf..000000000 --- a/debian/installer/sparc64/modules/sparc64/zlib-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/sparc64/package-list b/debian/installer/sparc64/package-list deleted file mode 100644 index 1e5e2f638..000000000 --- a/debian/installer/sparc64/package-list +++ /dev/null @@ -1,15 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# - -Package: nic-modules -Priority: standard -Description: Network card modules for Sparc kernels - This package contains the drivers for the Happy Meal/Big Mac 10/100BaseT, - Sun QuadEthernet and MyriCOM Gigabit Ethernet SBus devices for SPARC - systems, as well as various PCI NIC drivers (only on sparc64.) - . - Do not install this package on a real Debian system! You probably - want a kernel-image package instead. diff --git a/debian/installer/sparc64/package-list b/debian/installer/sparc64/package-list new file mode 120000 index 000000000..153e85af1 --- /dev/null +++ b/debian/installer/sparc64/package-list @@ -0,0 +1 @@ +../sparc/package-list \ No newline at end of file