Bug#761275: Remove 5kc-malta loongson-2e/f and octeon from flavor list of mips64el
Package: src:linux
Version: 3.16.2-2
After talking on Debconf14, we are planning switch mips64el back to
mips64r2 ISA.
So 5kc-malta, and loongson-2e/f don't support mips64r2 ISA, and
octeon need patch for little endian.
In this patch, we also fix a ftbfs problem, due to lacking of a
newline at end of defines file.
--
YunQiang Su
diff --git a/debian/config/mips64/defines b/debian/config/mips64/defines
index 6558f0d..5ff622c 100644
--- a/debian/config/mips64/defines
+++ b/debian/config/mips64/defines
@@ -30,3 +30,4 @@ hardware-long: Cavium Networks Octeon
[octeon_image]
configs: kernelarch-mips/config.octeon
+
diff --git a/debian/config/mips64el/defines b/debian/config/mips64el/defines
index 41bc336..0911e9e 100644
--- a/debian/config/mips64el/defines
+++ b/debian/config/mips64el/defines
@@ -1,10 +1,7 @@
[base]
flavours:
sb1-bcm91250a
- loongson-2e
- loongson-2f
loongson-3
- octeon
kernel-arch: mips
[build]
@@ -20,28 +17,6 @@ hardware-long: Broadcom BCM91250A systems (aka SWARM)
[sb1-bcm91250a_image]
configs: kernelarch-mips/config.sb1-bcm91250a
-[5kc-malta_description]
-hardware: MIPS Malta
-hardware-long: MIPS Malta boards
-
-[5kc-malta_image]
-configs: kernelarch-mips/config.5kc-malta
-
-[loongson-2e_description]
-hardware: Loongson 2E
-hardware-long: Lemote Loongson 2E systems
-
-[loongson-2e_image]
-configs: kernelarch-mips/config.loongson-2e
-
-[loongson-2f_description]
-hardware: Loongson 2F
-hardware-long: Lemote Loongson 2F systems
-
-[loongson-2f_image]
-recommends: libc6-loongson2f
-configs: kernelarch-mips/config.loongson-2f
-
[loongson-3_description]
hardware: Loongson 3A/3B
hardware-long: Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)
@@ -49,9 +24,3 @@ hardware-long: Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)
[loongson-3_image]
configs: kernelarch-mips/config.loongson-3
-[octeon_description]
-hardware: Octeon
-hardware-long: Cavium Networks Octeon
-
-[octeon_image]
-configs: kernelarch-mips/config.octeon
diff --git a/debian/installer/mips64el/kernel-versions b/debian/installer/mips64el/kernel-versions
index 0759981..d0e38a8 100644
--- a/debian/installer/mips64el/kernel-versions
+++ b/debian/installer/mips64el/kernel-versions
@@ -1,7 +1,3 @@
# arch version flavour installedname suffix build-depends
mips64el - sb1-bcm91250a - y -
-mips64el - 5kc-malta - y -
-mips64el - loongson-2e - y -
-mips64el - loongson-2f - y -
mips64el - loongson-3 - y -
-mips64el - octeon - y -
diff --git a/debian/installer/mips64el/modules/mips64el-5kc-malta b/debian/installer/mips64el/modules/mips64el-5kc-malta
deleted file mode 120000
index 84b512e..0000000
--- a/debian/installer/mips64el/modules/mips64el-5kc-malta
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips-4kc-malta
\ No newline at end of file
diff --git a/debian/installer/mips64el/modules/mips64el-loongson-2e b/debian/installer/mips64el/modules/mips64el-loongson-2e
deleted file mode 120000
index b62930d..0000000
--- a/debian/installer/mips64el/modules/mips64el-loongson-2e
+++ /dev/null
@@ -1 +0,0 @@
-../../mipsel/modules/mipsel-loongson-2e
\ No newline at end of file
diff --git a/debian/installer/mips64el/modules/mips64el-loongson-2f b/debian/installer/mips64el/modules/mips64el-loongson-2f
deleted file mode 120000
index 58388bb..0000000
--- a/debian/installer/mips64el/modules/mips64el-loongson-2f
+++ /dev/null
@@ -1 +0,0 @@
-../../mipsel/modules/mipsel-loongson-2f
\ No newline at end of file
diff --git a/debian/installer/mips64el/modules/mips64el-octeon b/debian/installer/mips64el/modules/mips64el-octeon
deleted file mode 120000
index da584c6..0000000
--- a/debian/installer/mips64el/modules/mips64el-octeon
+++ /dev/null
@@ -1 +0,0 @@
-../../mips/modules/mips-octeon
\ No newline at end of file
Reply to: