From e8cbc417310564564fb648388e5eaa14a80a5366 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 23 May 2016 23:03:41 +0100 Subject: [PATCH] [mips{,64}r6{,el}] Add kernel flavours for the Malta platform; build linux-libc-dev and tools packages Closes: #825024; thanks to YunQiang Su --- debian/changelog | 3 ++ debian/config/defines | 8 +++++ .../kernelarch-mips/config.4kc-malta-r6 | 10 +++++++ .../kernelarch-mips/config.5kc-malta-r6 | 10 +++++++ debian/config/mips64r6/config | 8 +++++ debian/config/mips64r6/defines | 20 +++++++++++++ debian/config/mips64r6el/config | 8 +++++ debian/config/mips64r6el/defines | 20 +++++++++++++ debian/config/mipsn32/defines | 4 +++ debian/config/mipsn32el/defines | 4 +++ debian/config/mipsn32r6/defines | 4 +++ debian/config/mipsn32r6el/defines | 4 +++ debian/config/mipsr6/config | 8 +++++ debian/config/mipsr6/defines | 30 +++++++++++++++++++ debian/config/mipsr6el/config | 8 +++++ debian/config/mipsr6el/defines | 30 +++++++++++++++++++ debian/installer/mips64r6/kernel-versions | 2 ++ debian/installer/mips64r6/modules/mips64r6 | 1 + debian/installer/mips64r6/package-list | 7 +++++ debian/installer/mips64r6el/kernel-versions | 2 ++ debian/installer/mips64r6el/modules/mips64r6 | 1 + debian/installer/mips64r6el/package-list | 7 +++++ debian/installer/mipsr6/kernel-versions | 2 ++ debian/installer/mipsr6/modules/mips32r6 | 1 + debian/installer/mipsr6/package-list | 7 +++++ debian/installer/mipsr6el/kernel-versions | 2 ++ debian/installer/mipsr6el/modules/mips32r6 | 1 + debian/installer/mipsr6el/package-list | 7 +++++ debian/templates/control.source.in | 2 +- debian/templates/control.tools.in | 2 +- 30 files changed, 221 insertions(+), 2 deletions(-) create mode 100644 debian/config/kernelarch-mips/config.4kc-malta-r6 create mode 100644 debian/config/kernelarch-mips/config.5kc-malta-r6 create mode 100644 debian/config/mips64r6/config create mode 100644 debian/config/mips64r6/defines create mode 100644 debian/config/mips64r6el/config create mode 100644 debian/config/mips64r6el/defines create mode 100644 debian/config/mipsn32/defines create mode 100644 debian/config/mipsn32el/defines create mode 100644 debian/config/mipsn32r6/defines create mode 100644 debian/config/mipsn32r6el/defines create mode 100644 debian/config/mipsr6/config create mode 100644 debian/config/mipsr6/defines create mode 100644 debian/config/mipsr6el/config create mode 100644 debian/config/mipsr6el/defines create mode 100644 debian/installer/mips64r6/kernel-versions create mode 120000 debian/installer/mips64r6/modules/mips64r6 create mode 100644 debian/installer/mips64r6/package-list create mode 100644 debian/installer/mips64r6el/kernel-versions create mode 120000 debian/installer/mips64r6el/modules/mips64r6 create mode 100644 debian/installer/mips64r6el/package-list create mode 100644 debian/installer/mipsr6/kernel-versions create mode 120000 debian/installer/mipsr6/modules/mips32r6 create mode 100644 debian/installer/mipsr6/package-list create mode 100644 debian/installer/mipsr6el/kernel-versions create mode 120000 debian/installer/mipsr6el/modules/mips32r6 create mode 100644 debian/installer/mipsr6el/package-list diff --git a/debian/changelog b/debian/changelog index efb597d85..bea8dd1c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ linux (4.6-1~exp2) UNRELEASED; urgency=medium to modules * 8139too: Use same configuration on all architectures: enable 8139TOO_TUNE_TWISTER, 8139TOO_8129 and disable 8139TOO_PIO + * [mipsn32{,r6}{,el}] Build a linux-libc-dev package + * [mips{,64}r6{,el}] Add kernel flavours for the Malta platform; build + linux-libc-dev and tools packages (Closes: #825024; thanks to YunQiang Su) [ Aurelien Jarno ] * [mips64el] Set CPU to MIPS64 R2. diff --git a/debian/config/defines b/debian/config/defines index a47ba453f..09ab45dca 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -13,8 +13,16 @@ arches: m68k mips mipsel + mipsn32 + mipsn32el mips64 mips64el + mipsr6 + mipsr6el + mipsn32r6 + mipsn32r6el + mips64r6 + mips64r6el or1k powerpc powerpcspe diff --git a/debian/config/kernelarch-mips/config.4kc-malta-r6 b/debian/config/kernelarch-mips/config.4kc-malta-r6 new file mode 100644 index 000000000..c95ffabb9 --- /dev/null +++ b/debian/config/kernelarch-mips/config.4kc-malta-r6 @@ -0,0 +1,10 @@ +## +## file: arch/mips/Kconfig +## +## choice: CPU type +CONFIG_CPU_MIPS32_R6=y +## end choice +## choice: Kernel code model +CONFIG_32BIT=y +## end choice + diff --git a/debian/config/kernelarch-mips/config.5kc-malta-r6 b/debian/config/kernelarch-mips/config.5kc-malta-r6 new file mode 100644 index 000000000..2cd32b0b5 --- /dev/null +++ b/debian/config/kernelarch-mips/config.5kc-malta-r6 @@ -0,0 +1,10 @@ +## +## file: arch/mips/Kconfig +## +## choice: CPU type +CONFIG_CPU_MIPS64_R6=y +## end choice +## choice: Kernel code model +CONFIG_64BIT=y +## end choice + diff --git a/debian/config/mips64r6/config b/debian/config/mips64r6/config new file mode 100644 index 000000000..5942c9ab9 --- /dev/null +++ b/debian/config/mips64r6/config @@ -0,0 +1,8 @@ +## +## file: arch/mips/Kconfig +## +## choice: Endianness selection +CONFIG_CPU_BIG_ENDIAN=y +# CONFIG_CPU_LITTLE_ENDIAN is not set +## end choice + diff --git a/debian/config/mips64r6/defines b/debian/config/mips64r6/defines new file mode 100644 index 000000000..5505030b9 --- /dev/null +++ b/debian/config/mips64r6/defines @@ -0,0 +1,20 @@ +[base] +flavours: + mips64r6 +kernel-arch: mips + +[build] +image-file: vmlinux + +[image] +install-stem: vmlinux + +[mips64r6_description] +hardware: MIPS R6 (64 bit, big endian) +hardware-long: MIPS R6 (64 bit, big endian) + +[mips64r6_image] +configs: + kernelarch-mips/config.malta + kernelarch-mips/config.5kc-malta-r6 + diff --git a/debian/config/mips64r6el/config b/debian/config/mips64r6el/config new file mode 100644 index 000000000..7f124deb6 --- /dev/null +++ b/debian/config/mips64r6el/config @@ -0,0 +1,8 @@ +## +## file: arch/mips/Kconfig +## +## choice: Endianness selection +# CONFIG_CPU_BIG_ENDIAN is not set +CONFIG_CPU_LITTLE_ENDIAN=y +## end choice + diff --git a/debian/config/mips64r6el/defines b/debian/config/mips64r6el/defines new file mode 100644 index 000000000..f6a2616e5 --- /dev/null +++ b/debian/config/mips64r6el/defines @@ -0,0 +1,20 @@ +[base] +flavours: + mips64r6el +kernel-arch: mips + +[build] +image-file: vmlinux + +[image] +install-stem: vmlinux + +[mips64r6el_description] +hardware: MIPS R6 (64 bit, little endian) +hardware-long: MIPS R6 (64 bit, little endian) + +[mips64r6el_image] +configs: + kernelarch-mips/config.malta + kernelarch-mips/config.5kc-malta-r6 + diff --git a/debian/config/mipsn32/defines b/debian/config/mipsn32/defines new file mode 100644 index 000000000..fa9b8af89 --- /dev/null +++ b/debian/config/mipsn32/defines @@ -0,0 +1,4 @@ +[base] +kernel-arch: mips +featuresets: +# empty; mipsn32 must be part of a multiarch installation with a mips64 kernel diff --git a/debian/config/mipsn32el/defines b/debian/config/mipsn32el/defines new file mode 100644 index 000000000..57d6f4922 --- /dev/null +++ b/debian/config/mipsn32el/defines @@ -0,0 +1,4 @@ +[base] +kernel-arch: mips +featuresets: +# empty; mipsn32el must be part of a multiarch installation with a mips64el kernel diff --git a/debian/config/mipsn32r6/defines b/debian/config/mipsn32r6/defines new file mode 100644 index 000000000..2ba5f42be --- /dev/null +++ b/debian/config/mipsn32r6/defines @@ -0,0 +1,4 @@ +[base] +kernel-arch: mips +featuresets: +# empty; mipsn32r6 must be part of a multiarch installation with a mips64r6 kernel diff --git a/debian/config/mipsn32r6el/defines b/debian/config/mipsn32r6el/defines new file mode 100644 index 000000000..f4c8a96d8 --- /dev/null +++ b/debian/config/mipsn32r6el/defines @@ -0,0 +1,4 @@ +[base] +kernel-arch: mips +featuresets: +# empty; mipsn32r6el must be part of a multiarch installation with a mips64r6el kernel diff --git a/debian/config/mipsr6/config b/debian/config/mipsr6/config new file mode 100644 index 000000000..5942c9ab9 --- /dev/null +++ b/debian/config/mipsr6/config @@ -0,0 +1,8 @@ +## +## file: arch/mips/Kconfig +## +## choice: Endianness selection +CONFIG_CPU_BIG_ENDIAN=y +# CONFIG_CPU_LITTLE_ENDIAN is not set +## end choice + diff --git a/debian/config/mipsr6/defines b/debian/config/mipsr6/defines new file mode 100644 index 000000000..9cd695d44 --- /dev/null +++ b/debian/config/mipsr6/defines @@ -0,0 +1,30 @@ +[base] +flavours: + mips32r6 + mips64r6 +kernel-arch: mips + +[build] +image-file: vmlinux + +[image] +install-stem: vmlinux + +[mips32r6_description] +hardware: MIPS R6 (32 bit, big endian) +hardware-long: MIPS R6 (32 bit, big endian) + +[mips32r6_image] +configs: + kernelarch-mips/config.malta + kernelarch-mips/config.4kc-malta-r6 + +[mips64r6_description] +hardware: MIPS R6 (64 bit, big endian) +hardware-long: MIPS R6 (64 bit, big endian) + +[mips64r6_image] +configs: + kernelarch-mips/config.malta + kernelarch-mips/config.5kc-malta-r6 + diff --git a/debian/config/mipsr6el/config b/debian/config/mipsr6el/config new file mode 100644 index 000000000..7f124deb6 --- /dev/null +++ b/debian/config/mipsr6el/config @@ -0,0 +1,8 @@ +## +## file: arch/mips/Kconfig +## +## choice: Endianness selection +# CONFIG_CPU_BIG_ENDIAN is not set +CONFIG_CPU_LITTLE_ENDIAN=y +## end choice + diff --git a/debian/config/mipsr6el/defines b/debian/config/mipsr6el/defines new file mode 100644 index 000000000..4ad5f1a42 --- /dev/null +++ b/debian/config/mipsr6el/defines @@ -0,0 +1,30 @@ +[base] +flavours: + mips32r6el + mips64r6el +kernel-arch: mips + +[build] +image-file: vmlinux + +[image] +install-stem: vmlinux + +[mips32r6el_description] +hardware: MIPS R6 (32 bit, little endian) +hardware-long: MIPS R6 (32 bit, little endian) + +[mips32r6el_image] +configs: + kernelarch-mips/config.malta + kernelarch-mips/config.4kc-malta-r6 + +[mips64r6el_description] +hardware: MIPS R6 (64 bit, little endian) +hardware-long: MIPS R6 (64 bit, little endian) + +[mips64r6el_image] +configs: + kernelarch-mips/config.malta + kernelarch-mips/config.5kc-malta-r6 + diff --git a/debian/installer/mips64r6/kernel-versions b/debian/installer/mips64r6/kernel-versions new file mode 100644 index 000000000..a4e378707 --- /dev/null +++ b/debian/installer/mips64r6/kernel-versions @@ -0,0 +1,2 @@ +# arch version flavour installedname suffix build-depends +mips64r6 - mips64r6 - y - diff --git a/debian/installer/mips64r6/modules/mips64r6 b/debian/installer/mips64r6/modules/mips64r6 new file mode 120000 index 000000000..d3bf739f6 --- /dev/null +++ b/debian/installer/mips64r6/modules/mips64r6 @@ -0,0 +1 @@ +../../mips/modules/mips \ No newline at end of file diff --git a/debian/installer/mips64r6/package-list b/debian/installer/mips64r6/package-list new file mode 100644 index 000000000..b7141bb20 --- /dev/null +++ b/debian/installer/mips64r6/package-list @@ -0,0 +1,7 @@ +# 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: kernel-image +Provides: rtc-modules diff --git a/debian/installer/mips64r6el/kernel-versions b/debian/installer/mips64r6el/kernel-versions new file mode 100644 index 000000000..426e2badb --- /dev/null +++ b/debian/installer/mips64r6el/kernel-versions @@ -0,0 +1,2 @@ +# arch version flavour installedname suffix build-depends +mips64r6el - mips64r6 - y - diff --git a/debian/installer/mips64r6el/modules/mips64r6 b/debian/installer/mips64r6el/modules/mips64r6 new file mode 120000 index 000000000..d3bf739f6 --- /dev/null +++ b/debian/installer/mips64r6el/modules/mips64r6 @@ -0,0 +1 @@ +../../mips/modules/mips \ No newline at end of file diff --git a/debian/installer/mips64r6el/package-list b/debian/installer/mips64r6el/package-list new file mode 100644 index 000000000..b7141bb20 --- /dev/null +++ b/debian/installer/mips64r6el/package-list @@ -0,0 +1,7 @@ +# 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: kernel-image +Provides: rtc-modules diff --git a/debian/installer/mipsr6/kernel-versions b/debian/installer/mipsr6/kernel-versions new file mode 100644 index 000000000..db5d2d2ca --- /dev/null +++ b/debian/installer/mipsr6/kernel-versions @@ -0,0 +1,2 @@ +# arch version flavour installedname suffix build-depends +mipsr6 - mips32r6 - y - diff --git a/debian/installer/mipsr6/modules/mips32r6 b/debian/installer/mipsr6/modules/mips32r6 new file mode 120000 index 000000000..d3bf739f6 --- /dev/null +++ b/debian/installer/mipsr6/modules/mips32r6 @@ -0,0 +1 @@ +../../mips/modules/mips \ No newline at end of file diff --git a/debian/installer/mipsr6/package-list b/debian/installer/mipsr6/package-list new file mode 100644 index 000000000..b7141bb20 --- /dev/null +++ b/debian/installer/mipsr6/package-list @@ -0,0 +1,7 @@ +# 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: kernel-image +Provides: rtc-modules diff --git a/debian/installer/mipsr6el/kernel-versions b/debian/installer/mipsr6el/kernel-versions new file mode 100644 index 000000000..330e1ed7b --- /dev/null +++ b/debian/installer/mipsr6el/kernel-versions @@ -0,0 +1,2 @@ +# arch version flavour installedname suffix build-depends +mipsr6el - mips32r6 - y - diff --git a/debian/installer/mipsr6el/modules/mips32r6 b/debian/installer/mipsr6el/modules/mips32r6 new file mode 120000 index 000000000..d3bf739f6 --- /dev/null +++ b/debian/installer/mipsr6el/modules/mips32r6 @@ -0,0 +1 @@ +../../mips/modules/mips \ No newline at end of file diff --git a/debian/installer/mipsr6el/package-list b/debian/installer/mipsr6el/package-list new file mode 100644 index 000000000..b7141bb20 --- /dev/null +++ b/debian/installer/mipsr6el/package-list @@ -0,0 +1,7 @@ +# 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: kernel-image +Provides: rtc-modules diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index cb0dce4f5..ca43f0306 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -34,7 +34,7 @@ Build-Depends: libelf-dev , libiberty-dev , libnewt-dev , - libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32] , + libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc powerpcspe ppc64 ppc64el sparc x32] , libperl-dev , libunwind8-dev [amd64 armel armhf arm64 i386] , python-dev , diff --git a/debian/templates/control.tools.in b/debian/templates/control.tools.in index ed2d9af30..97adb601f 100644 --- a/debian/templates/control.tools.in +++ b/debian/templates/control.tools.in @@ -41,7 +41,7 @@ Description: CPU frequency and voltage scaling tools for Linux (development file Package: linux-perf-@version@ Build-Profiles: Section: devel -Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 +Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends} Recommends: linux-base (>= 3.4~) Provides: linux-tools-@version@