From b4657c80a44ba5bb9965a28fbad027a9fe5e44dd Mon Sep 17 00:00:00 2001
From: bits <bigbits@hackx.cc>
Date: Thu, 5 Sep 2024 11:19:04 +0800
Subject: [PATCH] Add linux/riscv64 arch support

---
 .github/release-drafter.yml      |   2 +
 README.md                        |   3 ++
 go/Makefile.debian11             |   2 +-
 go/Makefile.debian12             |   2 +-
 go/riscv64/.dockerignore         |   1 +
 go/riscv64/Dockerfile.tmpl       |  76 +++++++++++++++++++++++++++++++
 go/riscv64/Makefile              |   1 +
 go/riscv64/rootfs/compilers.yaml |   6 +++
 go/riscv64/rootfs/helloWorld     | Bin 0 -> 8496 bytes
 go/riscv64/rootfs/helloWorld.c   |   5 ++
 10 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 go/riscv64/.dockerignore
 create mode 100644 go/riscv64/Dockerfile.tmpl
 create mode 100644 go/riscv64/Makefile
 create mode 100644 go/riscv64/rootfs/compilers.yaml
 create mode 100644 go/riscv64/rootfs/helloWorld
 create mode 100644 go/riscv64/rootfs/helloWorld.c

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 9361f77e..742066af 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -62,6 +62,8 @@ template: |
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-ppc-debian12` - linux/ppc64, linux/ppc64le
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-s390x-debian11` - linux/s390x
   - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-s390x-debian12` - linux/s390x
+  - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-riscv64-debian11` - linux/riscv64
+  - `docker.elastic.co/beats-dev/golang-crossbuild:$RESOLVED_VERSION-riscv64-debian12` - linux/riscv64
 
   ### Changes
 
diff --git a/README.md b/README.md
index ce7522b5..a8a2d46f 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ To do that the project provides a set of Docker images that can be used to build
 * linux/ppc64
 * linux/ppc64le
 * linux/s390x
+* linux/riscv64
 * windows/amd64
 * darwin/amd64
 * darwin/arm64
@@ -71,6 +72,8 @@ Replace `<GOLANG_VERSION>` with the version you would like to use, for instance:
 - `docker.elastic.co/beats-dev/golang-crossbuild:<GOLANG_VERSION>-ppc-debian12` - linux/ppc64, linux/ppc64le
 - `docker.elastic.co/beats-dev/golang-crossbuild:<GOLANG_VERSION>-s390x-debian11` - linux/s390x
 - `docker.elastic.co/beats-dev/golang-crossbuild:<GOLANG_VERSION>-s390x-debian12` - linux/s390x
+- `docker.elastic.co/beats-dev/golang-crossbuild:<GOLANG_VERSION>-riscv64-debian11` - linux/riscv64
+- `docker.elastic.co/beats-dev/golang-crossbuild:<GOLANG_VERSION>-riscv64-debian12` - linux/riscv64
 
 ### glibc
 
diff --git a/go/Makefile.debian11 b/go/Makefile.debian11
index 4270c11a..73c98190 100644
--- a/go/Makefile.debian11
+++ b/go/Makefile.debian11
@@ -1,4 +1,4 @@
-IMAGES         := base main darwin arm armhf armel mips ppc s390x darwin-arm64 npcap
+IMAGES         := base main darwin arm armhf armel mips ppc s390x darwin-arm64 npcap riscv64
 DEBIAN_VERSION := 11
 TAG_EXTENSION  := -debian11
 
diff --git a/go/Makefile.debian12 b/go/Makefile.debian12
index af003d66..cd530dbc 100644
--- a/go/Makefile.debian12
+++ b/go/Makefile.debian12
@@ -1,4 +1,4 @@
-IMAGES         := base main darwin arm armhf armel mips ppc s390x darwin-arm64 npcap
+IMAGES         := base main darwin arm armhf armel mips ppc s390x darwin-arm64 npcap riscv64
 DEBIAN_VERSION := 12
 TAG_EXTENSION  := -debian12
 
diff --git a/go/riscv64/.dockerignore b/go/riscv64/.dockerignore
new file mode 100644
index 00000000..f3c7a7c5
--- /dev/null
+++ b/go/riscv64/.dockerignore
@@ -0,0 +1 @@
+Makefile
diff --git a/go/riscv64/Dockerfile.tmpl b/go/riscv64/Dockerfile.tmpl
new file mode 100644
index 00000000..ae603d3e
--- /dev/null
+++ b/go/riscv64/Dockerfile.tmpl
@@ -0,0 +1,76 @@
+ARG REPOSITORY
+ARG VERSION
+ARG TAG_EXTENSION=''
+FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
+
+RUN dpkg --add-architecture riscv64 \
+    && apt update -y --no-install-recommends \
+    && apt upgrade -y --no-install-recommends \
+    && apt full-upgrade -y --no-install-recommends \
+    && apt install -qq -y --no-install-recommends \
+        g++-riscv64-linux-gnu \
+        gcc-riscv64-linux-gnu
+
+RUN apt install -qq -y \
+        libc-dev:riscv64 \
+        libpopt-dev:riscv64 \
+        linux-libc-dev:riscv64
+
+{{- if eq .DEBIAN_VERSION "9" }}
+RUN apt install -qq -y \
+        libelf1:riscv64 \
+        libicu-dev:riscv64 \
+        libicu57:riscv64 \
+        librpm-dev:riscv64 \
+        libxml2-dev:riscv64 \
+        libxml2:riscv64 \
+        librpm3:riscv64 \
+        librpmio3:riscv64 \
+        librpmbuild3:riscv64 \
+        librpmsign3:riscv64 \
+        libsqlite3-dev:riscv64 \
+        libnss3:riscv64 \
+        libsqlite3-0:riscv64
+
+# RUN apt install -y \
+#         libsystemd-dev:riscv64 libsystemd0:riscv64 liblz4-1:riscv64
+{{- end }}
+
+{{- if or (eq .DEBIAN_VERSION "10") (eq .DEBIAN_VERSION "11") (eq .DEBIAN_VERSION "12")}}
+# librpm-dev
+RUN apt install -y \
+        librpm-dev:riscv64
+
+# libsystemd-dev
+RUN apt install -y \
+        libsystemd-dev:riscv64
+{{- end }}
+
+RUN rm -rf /var/lib/apt/lists/*
+
+COPY rootfs /
+
+# Basic test
+RUN cd / \
+  && riscv64-linux-gnu-gcc helloWorld.c -o helloWorld \
+  && file helloWorld \
+  && readelf -h helloWorld \
+  && readelf -h helloWorld | grep -c 'RISC-V' \
+  && readelf -h helloWorld | grep -c 'ELF64' \
+  && readelf -h helloWorld | grep -c "little endian" \
+  && rm helloWorld.c helloWorld
+
+RUN cd /libpcap/libpcap-1.8.1 \
+	&& CC=riscv64-linux-gnu-gcc ./configure --enable-usb=no --enable-bluetooth=no --enable-dbus=no --host=riscv64-unknown-linux-gnu --with-pcap=linux \
+	&& make
+
+# Build-time metadata as defined at http://label-schema.org.
+ARG BUILD_DATE
+ARG IMAGE
+ARG VCS_REF
+ARG VCS_URL
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name=$IMAGE \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url=$VCS_URL \
+      org.label-schema.schema-version="1.0"
diff --git a/go/riscv64/Makefile b/go/riscv64/Makefile
new file mode 100644
index 00000000..0a42375f
--- /dev/null
+++ b/go/riscv64/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/go/riscv64/rootfs/compilers.yaml b/go/riscv64/rootfs/compilers.yaml
new file mode 100644
index 00000000..24498edb
--- /dev/null
+++ b/go/riscv64/rootfs/compilers.yaml
@@ -0,0 +1,6 @@
+---
+
+linux:
+  riscv64:
+    CC:  riscv64-linux-gnu-gcc
+    CXX: riscv64-linux-gnu-g++
diff --git a/go/riscv64/rootfs/helloWorld b/go/riscv64/rootfs/helloWorld
new file mode 100644
index 0000000000000000000000000000000000000000..77d39ac66a83310fbc50978307cd4ce9a9811992
GIT binary patch
literal 8496
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

literal 0
HcmV?d00001

diff --git a/go/riscv64/rootfs/helloWorld.c b/go/riscv64/rootfs/helloWorld.c
new file mode 100644
index 00000000..dcfb86bc
--- /dev/null
+++ b/go/riscv64/rootfs/helloWorld.c
@@ -0,0 +1,5 @@
+#include <stdio.h>
+int main() {
+   printf("Hello, World!");
+   return 0;
+}