[PATCH 1/2][F] UBUNTU: [Packaging] Produce linux-libc-dev package for riscv64

[Seth Forshee]

BugLink: https://bugs.launchpad.net/bugs/1886188

Having linux-libc-dev for riscv64 built from a different source
package with potentially different version numbers breaks cross-
building and multi-arch. Move building of linux-libc-dev back
to the primary kernel package to fix this.

Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 debian.master/control.d/linux-libc-dev.stub |  2 +-
 debian.master/rules.d/riscv64.mk            | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 debian.master/rules.d/riscv64.mk

diff --git a/debian.master/control.d/linux-libc-dev.stub b/debian.master/control.d/linux-libc-dev.stub
index 47ef2e1b521c..fb045233d401 100644
--- a/debian.master/control.d/linux-libc-dev.stub
+++ b/debian.master/control.d/linux-libc-dev.stub
@@ -1,5 +1,5 @@
 Package: linux-libc-dev
-Architecture: amd64 armhf arm64 i386 ppc64el s390x
+Architecture: amd64 armhf arm64 i386 ppc64el riscv64 s390x
 Depends: ${misc:Depends}
 Conflicts: linux-kernel-headers
 Replaces: linux-kernel-headers
diff --git a/debian.master/rules.d/riscv64.mk b/debian.master/rules.d/riscv64.mk
new file mode 100644
index 000000000000..66c75adf329e
--- /dev/null
+++ b/debian.master/rules.d/riscv64.mk
@@ -0,0 +1,21 @@
+human_arch	= RISC-V
+build_arch	= riscv
+header_arch	= $(build_arch)
+defconfig	= defconfig
+flavours        = generic
+build_image	= Image
+kernel_file	= arch/$(build_arch)/boot/Image
+install_file	= vmlinuz
+
+loader		= grub
+vdso		= vdso_install
+no_dumpfile	= true
+
+do_flavour_image_package = false
+do_tools	= false
+do_tools_common	= false
+do_extras_package = false
+do_source_package = false
+do_doc_package	= false
+do_flavour_header_package = false
+do_common_headers_indep = false
-- 
2.27.0