[linux] 01/01: [sparc] Remove linux-image, linux-header and udeb packages
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Wed Aug 26 17:16:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit ef829fca1610f0d99ce27cbe136f46f80a722480
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Wed Aug 26 18:14:11 2015 +0100
[sparc] Remove linux-image, linux-header and udeb packages
They are redundant with sparc64 and neither is an official port.
---
debian/changelog | 2 ++
debian/config/sparc/defines | 31 ++--------------------
debian/installer/sparc/kernel-versions | 2 --
debian/installer/sparc/package-list | 15 -----------
debian/installer/sparc64/modules/sparc64 | 1 -
.../sparc => sparc64/modules/sparc64}/ata-modules | 0
.../modules/sparc64}/btrfs-modules | 0
.../modules/sparc64}/cdrom-core-modules | 0
.../sparc => sparc64/modules/sparc64}/core-modules | 0
.../sparc => sparc64/modules/sparc64}/crc-modules | 0
.../modules/sparc64}/crypto-dm-modules | 0
.../modules/sparc64}/crypto-modules | 0
.../sparc => sparc64/modules/sparc64}/ext4-modules | 0
.../sparc => sparc64/modules/sparc64}/fat-modules | 0
.../sparc => sparc64/modules/sparc64}/fuse-modules | 0
.../modules/sparc64}/input-modules | 0
.../modules/sparc64}/isofs-modules | 0
.../sparc => sparc64/modules/sparc64}/jfs-modules | 0
.../sparc => sparc64/modules/sparc64}/kernel-image | 0
.../sparc => sparc64/modules/sparc64}/md-modules | 0
.../modules/sparc64}/multipath-modules | 0
.../sparc => sparc64/modules/sparc64}/nbd-modules | 0
.../sparc => sparc64/modules/sparc64}/nic-modules | 0
.../sparc => sparc64/modules/sparc64}/pata-modules | 0
.../sparc => sparc64/modules/sparc64}/ppp-modules | 0
.../sparc => sparc64/modules/sparc64}/sata-modules | 0
.../modules/sparc64}/scsi-common-modules | 0
.../modules/sparc64}/scsi-core-modules | 0
.../sparc => sparc64/modules/sparc64}/scsi-modules | 0
.../modules/sparc64}/squashfs-modules | 0
.../sparc => sparc64/modules/sparc64}/udf-modules | 0
.../sparc => sparc64/modules/sparc64}/usb-modules | 0
.../modules/sparc64}/usb-storage-modules | 0
.../modules/sparc64}/virtio-modules | 0
.../sparc => sparc64/modules/sparc64}/xfs-modules | 0
.../sparc => sparc64/modules/sparc64}/zlib-modules | 0
debian/installer/sparc64/package-list | 16 ++++++++++-
37 files changed, 19 insertions(+), 48 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 15494bf..87b04b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ linux (4.2~rc8-1~exp2) UNRELEASED; urgency=medium
- SUNRPC_XPRT_RDMA replaced SUNRPC_XPRT_RDMA_{CLIENT,SERVER}
- [mips*el/loongson*] LOONGSON64 replaced LOONGSON
- [x86] COMEDI_8255_SA replaced COMEDI_8255
+ * [sparc] Remove linux-image, linux-header and udeb packages, as they
+ are redundant with sparc64 and neither is an official port
-- Ben Hutchings <ben at decadent.org.uk> Tue, 25 Aug 2015 18:50:57 +0100
diff --git a/debian/config/sparc/defines b/debian/config/sparc/defines
index ee452b3..c7e0119 100644
--- a/debian/config/sparc/defines
+++ b/debian/config/sparc/defines
@@ -1,31 +1,4 @@
[base]
-flavours:
- sparc64
- sparc64-smp
kernel-arch: sparc
-
-[build]
-image-file: arch/sparc/boot/zImage
-
-[image]
-configs:
-suggests: silo, fdutils
-install-stem: vmlinuz
-
-[sparc32_description]
-hardware: uniprocessor sparc32 (sun4m)
-
-[sparc32_image]
-image-postproc: sparc32-image-postproc
-
-[sparc64_description]
-hardware: uniprocessor 64-bit UltraSPARC
-
-[sparc64_image]
-configs: kernelarch-sparc/config-up
-
-[sparc64-smp_description]
-hardware: multiprocessor 64-bit UltraSPARC
-
-[sparc64-smp_image]
-configs: kernelarch-sparc/config-smp
+featuresets:
+# empty; sparc must be part of a multiarch installation with a sparc64 kernel
diff --git a/debian/installer/sparc/kernel-versions b/debian/installer/sparc/kernel-versions
deleted file mode 100644
index 4a9ad56..0000000
--- a/debian/installer/sparc/kernel-versions
+++ /dev/null
@@ -1,2 +0,0 @@
-# arch version flavour installedname suffix build-depends
-sparc - sparc64 - y -
diff --git a/debian/installer/sparc/package-list b/debian/installer/sparc/package-list
deleted file mode 100644
index 1e5e2f6..0000000
--- a/debian/installer/sparc/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/modules/sparc64 b/debian/installer/sparc64/modules/sparc64
deleted file mode 120000
index b3390c8..0000000
--- a/debian/installer/sparc64/modules/sparc64
+++ /dev/null
@@ -1 +0,0 @@
-../../sparc/modules/sparc
\ No newline at end of file
diff --git a/debian/installer/sparc/modules/sparc/ata-modules b/debian/installer/sparc64/modules/sparc64/ata-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/ata-modules
rename to debian/installer/sparc64/modules/sparc64/ata-modules
diff --git a/debian/installer/sparc/modules/sparc/btrfs-modules b/debian/installer/sparc64/modules/sparc64/btrfs-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/btrfs-modules
rename to debian/installer/sparc64/modules/sparc64/btrfs-modules
diff --git a/debian/installer/sparc/modules/sparc/cdrom-core-modules b/debian/installer/sparc64/modules/sparc64/cdrom-core-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/cdrom-core-modules
rename to debian/installer/sparc64/modules/sparc64/cdrom-core-modules
diff --git a/debian/installer/sparc/modules/sparc/core-modules b/debian/installer/sparc64/modules/sparc64/core-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/core-modules
rename to debian/installer/sparc64/modules/sparc64/core-modules
diff --git a/debian/installer/sparc/modules/sparc/crc-modules b/debian/installer/sparc64/modules/sparc64/crc-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/crc-modules
rename to debian/installer/sparc64/modules/sparc64/crc-modules
diff --git a/debian/installer/sparc/modules/sparc/crypto-dm-modules b/debian/installer/sparc64/modules/sparc64/crypto-dm-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/crypto-dm-modules
rename to debian/installer/sparc64/modules/sparc64/crypto-dm-modules
diff --git a/debian/installer/sparc/modules/sparc/crypto-modules b/debian/installer/sparc64/modules/sparc64/crypto-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/crypto-modules
rename to debian/installer/sparc64/modules/sparc64/crypto-modules
diff --git a/debian/installer/sparc/modules/sparc/ext4-modules b/debian/installer/sparc64/modules/sparc64/ext4-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/ext4-modules
rename to debian/installer/sparc64/modules/sparc64/ext4-modules
diff --git a/debian/installer/sparc/modules/sparc/fat-modules b/debian/installer/sparc64/modules/sparc64/fat-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/fat-modules
rename to debian/installer/sparc64/modules/sparc64/fat-modules
diff --git a/debian/installer/sparc/modules/sparc/fuse-modules b/debian/installer/sparc64/modules/sparc64/fuse-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/fuse-modules
rename to debian/installer/sparc64/modules/sparc64/fuse-modules
diff --git a/debian/installer/sparc/modules/sparc/input-modules b/debian/installer/sparc64/modules/sparc64/input-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/input-modules
rename to debian/installer/sparc64/modules/sparc64/input-modules
diff --git a/debian/installer/sparc/modules/sparc/isofs-modules b/debian/installer/sparc64/modules/sparc64/isofs-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/isofs-modules
rename to debian/installer/sparc64/modules/sparc64/isofs-modules
diff --git a/debian/installer/sparc/modules/sparc/jfs-modules b/debian/installer/sparc64/modules/sparc64/jfs-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/jfs-modules
rename to debian/installer/sparc64/modules/sparc64/jfs-modules
diff --git a/debian/installer/sparc/modules/sparc/kernel-image b/debian/installer/sparc64/modules/sparc64/kernel-image
similarity index 100%
rename from debian/installer/sparc/modules/sparc/kernel-image
rename to debian/installer/sparc64/modules/sparc64/kernel-image
diff --git a/debian/installer/sparc/modules/sparc/md-modules b/debian/installer/sparc64/modules/sparc64/md-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/md-modules
rename to debian/installer/sparc64/modules/sparc64/md-modules
diff --git a/debian/installer/sparc/modules/sparc/multipath-modules b/debian/installer/sparc64/modules/sparc64/multipath-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/multipath-modules
rename to debian/installer/sparc64/modules/sparc64/multipath-modules
diff --git a/debian/installer/sparc/modules/sparc/nbd-modules b/debian/installer/sparc64/modules/sparc64/nbd-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/nbd-modules
rename to debian/installer/sparc64/modules/sparc64/nbd-modules
diff --git a/debian/installer/sparc/modules/sparc/nic-modules b/debian/installer/sparc64/modules/sparc64/nic-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/nic-modules
rename to debian/installer/sparc64/modules/sparc64/nic-modules
diff --git a/debian/installer/sparc/modules/sparc/pata-modules b/debian/installer/sparc64/modules/sparc64/pata-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/pata-modules
rename to debian/installer/sparc64/modules/sparc64/pata-modules
diff --git a/debian/installer/sparc/modules/sparc/ppp-modules b/debian/installer/sparc64/modules/sparc64/ppp-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/ppp-modules
rename to debian/installer/sparc64/modules/sparc64/ppp-modules
diff --git a/debian/installer/sparc/modules/sparc/sata-modules b/debian/installer/sparc64/modules/sparc64/sata-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/sata-modules
rename to debian/installer/sparc64/modules/sparc64/sata-modules
diff --git a/debian/installer/sparc/modules/sparc/scsi-common-modules b/debian/installer/sparc64/modules/sparc64/scsi-common-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/scsi-common-modules
rename to debian/installer/sparc64/modules/sparc64/scsi-common-modules
diff --git a/debian/installer/sparc/modules/sparc/scsi-core-modules b/debian/installer/sparc64/modules/sparc64/scsi-core-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/scsi-core-modules
rename to debian/installer/sparc64/modules/sparc64/scsi-core-modules
diff --git a/debian/installer/sparc/modules/sparc/scsi-modules b/debian/installer/sparc64/modules/sparc64/scsi-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/scsi-modules
rename to debian/installer/sparc64/modules/sparc64/scsi-modules
diff --git a/debian/installer/sparc/modules/sparc/squashfs-modules b/debian/installer/sparc64/modules/sparc64/squashfs-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/squashfs-modules
rename to debian/installer/sparc64/modules/sparc64/squashfs-modules
diff --git a/debian/installer/sparc/modules/sparc/udf-modules b/debian/installer/sparc64/modules/sparc64/udf-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/udf-modules
rename to debian/installer/sparc64/modules/sparc64/udf-modules
diff --git a/debian/installer/sparc/modules/sparc/usb-modules b/debian/installer/sparc64/modules/sparc64/usb-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/usb-modules
rename to debian/installer/sparc64/modules/sparc64/usb-modules
diff --git a/debian/installer/sparc/modules/sparc/usb-storage-modules b/debian/installer/sparc64/modules/sparc64/usb-storage-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/usb-storage-modules
rename to debian/installer/sparc64/modules/sparc64/usb-storage-modules
diff --git a/debian/installer/sparc/modules/sparc/virtio-modules b/debian/installer/sparc64/modules/sparc64/virtio-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/virtio-modules
rename to debian/installer/sparc64/modules/sparc64/virtio-modules
diff --git a/debian/installer/sparc/modules/sparc/xfs-modules b/debian/installer/sparc64/modules/sparc64/xfs-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/xfs-modules
rename to debian/installer/sparc64/modules/sparc64/xfs-modules
diff --git a/debian/installer/sparc/modules/sparc/zlib-modules b/debian/installer/sparc64/modules/sparc64/zlib-modules
similarity index 100%
rename from debian/installer/sparc/modules/sparc/zlib-modules
rename to debian/installer/sparc64/modules/sparc64/zlib-modules
diff --git a/debian/installer/sparc64/package-list b/debian/installer/sparc64/package-list
deleted file mode 120000
index 153e85a..0000000
--- a/debian/installer/sparc64/package-list
+++ /dev/null
@@ -1 +0,0 @@
-../sparc/package-list
\ No newline at end of file
diff --git a/debian/installer/sparc64/package-list b/debian/installer/sparc64/package-list
new file mode 100644
index 0000000..1e5e2f6
--- /dev/null
+++ b/debian/installer/sparc64/package-list
@@ -0,0 +1,15 @@
+# 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.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list