UBUNTU: [Packaging] Add riscv64 arch support

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/control.d/linux-libc-dev.stub b/debian.master/control.d/linux-libc-dev.stub
index 47ef2e1b521cb2828f6c01017d868f8f6a3cdea9..fb045233d40178a93f0a75ab77063e3c1ca23854 100644 (file)
--- 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/control.d/vars.generic b/debian.master/control.d/vars.generic
index cd3698688d2dc61b691f85531976e4ef7f42b225..04a4169ff54d9f2921d3ede741de20b7b95131c8 100644 (file)
--- a/debian.master/control.d/vars.generic
+++ b/debian.master/control.d/vars.generic
@@ -1,4 +1,4 @@
-arch="amd64 armhf arm64 ppc64el s390x"
+arch="amd64 armhf arm64 ppc64el riscv64 s390x"
 supported="Generic"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index cd4b89b24f681553ceb990bc3d2a44d1324ee621..ec6b47c93da94d3437fb203304b09b9513415e47 100644 (file)
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -103,7 +103,7 @@ Description: Linux kernel version specific tools for version PKGVER
 
 Package: SRCPKGNAME-tools-PKGVER-ABINUM
 Build-Profiles: <!stage1>
-Architecture: amd64 armhf arm64 ppc64el s390x
+Architecture: amd64 armhf arm64 ppc64el riscv64 s390x
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common

diff --git a/debian.master/d-i/kernel-versions b/debian.master/d-i/kernel-versions
index 6cd90edd02588a260ac4009366c609bdd7b94186..de5eed4e13d9059c5b887184e07133cccd40cb7f 100644 (file)
--- a/debian.master/d-i/kernel-versions
+++ b/debian.master/d-i/kernel-versions
@@ -10,6 +10,8 @@ arm64 -               generic         -                               -       -
 
 ppc64el        -               generic         -                               -       -
 
+riscv64        -               generic         -                               -       -
+
 s390x  -               generic         -                               -       -
 
 # Ports

diff --git a/debian.master/d-i/modules/riscv64/block-modules b/debian.master/d-i/modules/riscv64/block-modules
new file mode 100644 (file)
index 0000000..f937d0e
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/block-modules
@@ -0,0 +1 @@
+#include <block-modules>

diff --git a/debian.master/d-i/modules/riscv64/crypto-modules b/debian.master/d-i/modules/riscv64/crypto-modules
new file mode 100644 (file)
index 0000000..3a1e862
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>

diff --git a/debian.master/d-i/modules/riscv64/fat-modules b/debian.master/d-i/modules/riscv64/fat-modules
new file mode 100644 (file)
index 0000000..274584e
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>

diff --git a/debian.master/d-i/modules/riscv64/firewire-core-modules b/debian.master/d-i/modules/riscv64/firewire-core-modules
new file mode 100644 (file)
index 0000000..dcac80a
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/firewire-core-modules
@@ -0,0 +1 @@
+#include <firewire-core-modules>

diff --git a/debian.master/d-i/modules/riscv64/fs-core-modules b/debian.master/d-i/modules/riscv64/fs-core-modules
new file mode 100644 (file)
index 0000000..024c2d7
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/fs-core-modules
@@ -0,0 +1 @@
+#include <fs-core-modules>

diff --git a/debian.master/d-i/modules/riscv64/fs-secondary-modules b/debian.master/d-i/modules/riscv64/fs-secondary-modules
new file mode 100644 (file)
index 0000000..3689f18
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/fs-secondary-modules
@@ -0,0 +1 @@
+#include <fs-secondary-modules>

diff --git a/debian.master/d-i/modules/riscv64/input-modules b/debian.master/d-i/modules/riscv64/input-modules
new file mode 100644 (file)
index 0000000..5ecb595
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/input-modules
@@ -0,0 +1 @@
+#include <input-modules>

diff --git a/debian.master/d-i/modules/riscv64/ipmi-modules b/debian.master/d-i/modules/riscv64/ipmi-modules
new file mode 100644 (file)
index 0000000..d0fc979
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/ipmi-modules
@@ -0,0 +1 @@
+#include <ipmi-modules>

diff --git a/debian.master/d-i/modules/riscv64/kernel-image b/debian.master/d-i/modules/riscv64/kernel-image
new file mode 100644 (file)
index 0000000..1d11b19
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>

diff --git a/debian.master/d-i/modules/riscv64/md-modules b/debian.master/d-i/modules/riscv64/md-modules
new file mode 100644 (file)
index 0000000..26115e1
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/md-modules
@@ -0,0 +1 @@
+#include <md-modules>

diff --git a/debian.master/d-i/modules/riscv64/message-modules b/debian.master/d-i/modules/riscv64/message-modules
new file mode 100644 (file)
index 0000000..9b060b3
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/message-modules
@@ -0,0 +1 @@
+#include <message-modules>

diff --git a/debian.master/d-i/modules/riscv64/mouse-modules b/debian.master/d-i/modules/riscv64/mouse-modules
new file mode 100644 (file)
index 0000000..15fcb00
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/mouse-modules
@@ -0,0 +1 @@
+#include <mouse-modules>

diff --git a/debian.master/d-i/modules/riscv64/multipath-modules b/debian.master/d-i/modules/riscv64/multipath-modules
new file mode 100644 (file)
index 0000000..a8b69b2
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>

diff --git a/debian.master/d-i/modules/riscv64/nfs-modules b/debian.master/d-i/modules/riscv64/nfs-modules
new file mode 100644 (file)
index 0000000..946fb8e
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/nfs-modules
@@ -0,0 +1 @@
+#include <nfs-modules>

diff --git a/debian.master/d-i/modules/riscv64/nic-modules b/debian.master/d-i/modules/riscv64/nic-modules
new file mode 100644 (file)
index 0000000..2512e83
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/nic-modules
@@ -0,0 +1 @@
+#include <nic-modules>

diff --git a/debian.master/d-i/modules/riscv64/nic-shared-modules b/debian.master/d-i/modules/riscv64/nic-shared-modules
new file mode 100644 (file)
index 0000000..cc84b14
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>

diff --git a/debian.master/d-i/modules/riscv64/nic-usb-modules b/debian.master/d-i/modules/riscv64/nic-usb-modules
new file mode 100644 (file)
index 0000000..c479669
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>

diff --git a/debian.master/d-i/modules/riscv64/parport-modules b/debian.master/d-i/modules/riscv64/parport-modules
new file mode 100644 (file)
index 0000000..83966f7
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/parport-modules
@@ -0,0 +1 @@
+#include <parport-modules>

diff --git a/debian.master/d-i/modules/riscv64/pata-modules b/debian.master/d-i/modules/riscv64/pata-modules
new file mode 100644 (file)
index 0000000..b0cd633
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/pata-modules
@@ -0,0 +1 @@
+#include <pata-modules>

diff --git a/debian.master/d-i/modules/riscv64/plip-modules b/debian.master/d-i/modules/riscv64/plip-modules
new file mode 100644 (file)
index 0000000..ca7a41b
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/plip-modules
@@ -0,0 +1 @@
+#include <plip-modules>

diff --git a/debian.master/d-i/modules/riscv64/ppp-modules b/debian.master/d-i/modules/riscv64/ppp-modules
new file mode 100644 (file)
index 0000000..1f26aa1
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/ppp-modules
@@ -0,0 +1 @@
+#include <ppp-modules>

diff --git a/debian.master/d-i/modules/riscv64/sata-modules b/debian.master/d-i/modules/riscv64/sata-modules
new file mode 100644 (file)
index 0000000..01318c2
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/sata-modules
@@ -0,0 +1 @@
+#include <sata-modules>

diff --git a/debian.master/d-i/modules/riscv64/scsi-modules b/debian.master/d-i/modules/riscv64/scsi-modules
new file mode 100644 (file)
index 0000000..c5e6593
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/scsi-modules
@@ -0,0 +1,2 @@
+#include <scsi-modules>
+ipr ?

diff --git a/debian.master/d-i/modules/riscv64/speakup-modules b/debian.master/d-i/modules/riscv64/speakup-modules
new file mode 100644 (file)
index 0000000..2959272
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/speakup-modules
@@ -0,0 +1 @@
+#include <speakup-modules>

diff --git a/debian.master/d-i/modules/riscv64/storage-core-modules b/debian.master/d-i/modules/riscv64/storage-core-modules
new file mode 100644 (file)
index 0000000..cb5278e
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/storage-core-modules
@@ -0,0 +1 @@
+#include <storage-core-modules>

diff --git a/debian.master/d-i/modules/riscv64/usb-modules b/debian.master/d-i/modules/riscv64/usb-modules
new file mode 100644 (file)
index 0000000..c598ded
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>

diff --git a/debian.master/d-i/modules/riscv64/virtio-modules b/debian.master/d-i/modules/riscv64/virtio-modules
new file mode 100644 (file)
index 0000000..61da396
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/virtio-modules
@@ -0,0 +1 @@
+#include <virtio-modules>

diff --git a/debian.master/d-i/modules/riscv64/vlan-modules b/debian.master/d-i/modules/riscv64/vlan-modules
new file mode 100644 (file)
index 0000000..a8947e0
--- /dev/null
+++ b/debian.master/d-i/modules/riscv64/vlan-modules
@@ -0,0 +1 @@
+#include <vlan-modules>

diff --git a/debian.master/d-i/package-list b/debian.master/d-i/package-list
index 10759109995426f9ae24f6472589ccd0e95c9fe4..09b887e9932b8fa7135d9216c48ee98c45989533 100644 (file)
--- a/debian.master/d-i/package-list
+++ b/debian.master/d-i/package-list
@@ -3,6 +3,7 @@ Provides: ext3-modules, ext4-modules, squashfs-modules
 Provides_amd64: efi-modules, ext3-modules, ext4-modules, squashfs-modules
 Provides_i386: efi-modules, ext3-modules, ext4-modules, squashfs-modules
 Provides_ppc64el: ext3-modules, ext4-modules, fat-modules, squashfs-modules
+Provides_riscv64: ext3-modules, ext4-modules, fat-modules, squashfs-modules
 Provides_s390x: ext3-modules, ext4-modules, ppp-modules, squashfs-modules
 Description: kernel image and system map
 

diff --git a/debian.master/etc/getabis b/debian.master/etc/getabis
index 3346da2bc0b153706dcd20eccf2ba86d30f2971f..1a2cbe24812f126936e8ef63fe59f89eec1d2526 100644 (file)
--- a/debian.master/etc/getabis
+++ b/debian.master/etc/getabis
@@ -15,4 +15,5 @@ getall armhf generic-lpae
 getall amd64 generic lowlatency
 getall arm64 generic
 getall ppc64el generic
+getall riscv64 generic
 getall s390x generic

diff --git a/debian.master/etc/kernelconfig b/debian.master/etc/kernelconfig
index f1f2b878a5cf247728bf35d3dc516f97dc3bed11..b86de3e750a538110590fdfac7ef265c8dbe45a4 100644 (file)
--- a/debian.master/etc/kernelconfig
+++ b/debian.master/etc/kernelconfig
@@ -2,6 +2,6 @@ if [ "$variant" = "ports" ]; then
        archs=""
        family='ports'
 else
-       archs="amd64 i386 armhf arm64 ppc64el s390x"
+       archs="amd64 i386 armhf arm64 ppc64el riscv64 s390x"
        family='ubuntu'
 fi

diff --git a/debian.master/rules.d/riscv64.mk b/debian.master/rules.d/riscv64.mk
new file mode 100644 (file)
index 0000000..88b9b1e
--- /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_extras_package   = true
+do_tools_usbip      = true
+do_tools_cpupower   = true
+do_tools_perf       = true
+do_tools_perf_jvmti = true
+do_tools_bpftool    = true
+
+do_dkms_wireguard = true

diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index 9231fb1dfb2c36e3e9ec4d584bf8ce927123d17b..8fc1de62ab150f176cc55163f0e1f256b389735e 100755 (executable)
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -51,6 +51,7 @@ for arch in $archs; do
                sparc)          kernarch="sparc64"      ;;
                armel|armhf)    kernarch="arm"          ;;
                s390x)          kernarch="s390"         ;;
+               riscv64)        kernarch="riscv"        ;;
                *)              kernarch="$arch"        ;;
        esac