mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-23 00:54:26 +01:00
Fix ARMv8 and ARMv7, add psn00bsdk, and improve github action
This commit is contained in:
parent
2979dfd782
commit
f37486cc8a
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@ -50,7 +50,7 @@ jobs:
|
|||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
max-parallel: 8
|
max-parallel: 6
|
||||||
# manylinux2014-aarch64 cc65 pvsneslib
|
# manylinux2014-aarch64 cc65 pvsneslib
|
||||||
matrix:
|
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]
|
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]
|
||||||
|
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -4,3 +4,6 @@
|
|||||||
[submodule "cc65"]
|
[submodule "cc65"]
|
||||||
path = cc65
|
path = cc65
|
||||||
url = https://github.com/Bensuperpc/cc65-docker.git
|
url = https://github.com/Bensuperpc/cc65-docker.git
|
||||||
|
[submodule "psn00bsdk"]
|
||||||
|
path = psn00bsdk
|
||||||
|
url = https://github.com/Bensuperpc/psn00bsdk-docker.git
|
||||||
|
20
Makefile
20
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))
|
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
|
# 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
|
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 \
|
$(DOCKER) build -t $(ORG)/pvsneslib:latest \
|
||||||
pvsneslib
|
pvsneslib
|
||||||
|
|
||||||
|
#
|
||||||
|
# psn00bsdk
|
||||||
|
#
|
||||||
|
psn00bsdk: psn00bsdk/Dockerfile
|
||||||
|
$(DOCKER) build -t $(ORG)/psn00bsdk:latest \
|
||||||
|
psn00bsdk
|
||||||
|
|
||||||
|
psn00bsdk.test: psn00bsdk
|
||||||
|
$(DOCKER) build -t $(ORG)/psn00bsdk:latest \
|
||||||
|
psn00bsdk
|
||||||
|
|
||||||
#
|
#
|
||||||
# web-wasm
|
# web-wasm
|
||||||
#
|
#
|
||||||
@ -283,4 +294,9 @@ test.prerequisites:
|
|||||||
|
|
||||||
$(addsuffix .test,base $(IMAGES)): 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
|
||||||
|
@ -26,16 +26,4 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
|
|||||||
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
|
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
|
||||||
ENV ARCH arm
|
ENV ARCH arm
|
||||||
|
|
||||||
# Build-time metadata as defined at http://label-schema.org
|
#include "common.label-and-env"
|
||||||
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}
|
|
||||||
|
@ -38,9 +38,4 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
|
|||||||
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
|
ENV CROSS_COMPILE ${CROSS_TRIPLE}-
|
||||||
ENV ARCH arm64
|
ENV ARCH arm64
|
||||||
|
|
||||||
ENV OPENSSL_ARCH linux-aarch64
|
|
||||||
ENV OPENSSL_TARGET armv8-a
|
|
||||||
|
|
||||||
#include "common.lib"
|
|
||||||
|
|
||||||
#include "common.label-and-env"
|
#include "common.label-and-env"
|
||||||
|
1
psn00bsdk
Submodule
1
psn00bsdk
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 9b3e9642c8ec78788ea91395668b35edd17351f8
|
Loading…
Reference in New Issue
Block a user