From f37486cc8a3c9a7c210d645b26245284883329e3 Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Sun, 16 May 2021 08:05:29 +0200
Subject: [PATCH] Fix ARMv8 and ARMv7, add psn00bsdk, and improve github action

---
 .github/workflows/main.yml      |  2 +-
 .gitmodules                     |  3 +++
 Makefile                        | 20 ++++++++++++++++++--
 linux-armv7l-musl/Dockerfile.in | 14 +-------------
 linux-armv8-rpi3/Dockerfile.in  |  5 -----
 psn00bsdk                       |  1 +
 6 files changed, 24 insertions(+), 21 deletions(-)
 create mode 160000 psn00bsdk

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a744371..5534e6e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-      max-parallel: 8
+      max-parallel: 6
 # manylinux2014-aarch64 cc65 pvsneslib
       matrix:
         arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-armv8, linux-armv8-musl, linux-armv8-rpi3, linux-armv8-rpi4, linux-armv5, linux-armv5-musl, linux-armv6-rpi1, linux-armv7-rpi2, linux-armv6-musl, linux-armv6-rpi-old, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-mips, linux-mips64, linux-mips64el-n64, linux-mipsel, linux-m68k, linux-ppc32, linux-ppc64, linux-s390x, linux-x64, linux-x64-clang, linux-x86, linux-riscv64, manylinux2014-x64, manylinux2014-x86, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
diff --git a/.gitmodules b/.gitmodules
index 13cb466..7cfc6ef 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "cc65"]
 	path = cc65
 	url = https://github.com/Bensuperpc/cc65-docker.git
+[submodule "psn00bsdk"]
+	path = psn00bsdk
+	url = https://github.com/Bensuperpc/psn00bsdk-docker.git
diff --git a/Makefile b/Makefile
index b1977bf..5717caf 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ EXT_GEN_IMAGES = linux-armv8-rpi4.full linux-armv8-rpi3.full linux-armv7-rpi2.fu
 GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(EXT_GEN_IMAGES)) $(addsuffix /Dockerfile,$(GEN_IMAGES))
 
 # These images are expected to have explicit rules for *both* build and testing
-NON_STANDARD_IMAGES = web-wasm manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 pvsneslib cc65
+NON_STANDARD_IMAGES = web-wasm manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 pvsneslib cc65 psn00bsdk
 
 DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows common-manylinux.crosstool common.dockcross common.lib common.label-and-env
 
@@ -99,6 +99,17 @@ pvsneslib.test: pvsneslib
 	$(DOCKER) build -t $(ORG)/pvsneslib:latest \
 	pvsneslib
 
+#
+# psn00bsdk
+#
+psn00bsdk: psn00bsdk/Dockerfile
+	$(DOCKER) build -t $(ORG)/psn00bsdk:latest \
+	psn00bsdk
+
+psn00bsdk.test: psn00bsdk
+	$(DOCKER) build -t $(ORG)/psn00bsdk:latest \
+	psn00bsdk
+
 #
 # web-wasm
 #
@@ -283,4 +294,9 @@ test.prerequisites:
 
 $(addsuffix .test,base $(IMAGES)): test.prerequisites
 
-.PHONY: base images $(IMAGES) test %.test %.full
+clean:
+	for d in $(STANDARD_IMAGES) ; do rm -rf $$d/imagefiles ; done
+	for d in $(GEN_IMAGE_DOCKERFILES) ; do rm -rf $$d/Dockerfile ; done
+	rm -f Dockerfile
+
+.PHONY: base images $(IMAGES) test %.test %.full clean
diff --git a/linux-armv7l-musl/Dockerfile.in b/linux-armv7l-musl/Dockerfile.in
index d3adb61..978963c 100644
--- a/linux-armv7l-musl/Dockerfile.in
+++ b/linux-armv7l-musl/Dockerfile.in
@@ -26,16 +26,4 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm
 
-# Build-time metadata as defined at http://label-schema.org
-ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-armv7l-musl
-ARG VERSION=latest
-ARG VCS_REF
-ARG VCS_URL
-LABEL org.label-schema.build-date=$BUILD_DATE \
-      org.label-schema.name=$IMAGE \
-      org.label-schema.version=$VERSION \
-      org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url=$VCS_URL \
-      org.label-schema.schema-version="1.0"
-ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION}
+#include "common.label-and-env"
diff --git a/linux-armv8-rpi3/Dockerfile.in b/linux-armv8-rpi3/Dockerfile.in
index f386c60..91b365f 100644
--- a/linux-armv8-rpi3/Dockerfile.in
+++ b/linux-armv8-rpi3/Dockerfile.in
@@ -38,9 +38,4 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm64
 
-ENV OPENSSL_ARCH linux-aarch64
-ENV OPENSSL_TARGET armv8-a
-
-#include "common.lib"
-
 #include "common.label-and-env"
diff --git a/psn00bsdk b/psn00bsdk
new file mode 160000
index 0000000..9b3e964
--- /dev/null
+++ b/psn00bsdk
@@ -0,0 +1 @@
+Subproject commit 9b3e9642c8ec78788ea91395668b35edd17351f8