jgaunt/proxmox-backup-arm64
1
0
Fork 0
mirror of https://github.com/wofferl/proxmox-backup-arm64 synced 2025-12-06 00:13:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

enable cross compiling on unprivileged systems like lxc or docker container without binfmt_misc

Browse Source
This commit is contained in:
Wolfgang
2023-06-28 22:08:14 +00:00
parent 630ce02d4c
commit 23ab98e988
2 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.sh
View File

@@ -164,6 +164,7 @@ do
PACKAGE_ARCH=arm64 PACKAGE_ARCH=arm64
BUILD_PROFILES=${BUILD_PROFILES}",cross" BUILD_PROFILES=${BUILD_PROFILES}",cross"
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=/usr/bin/aarch64-linux-gnu-gcc export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=/usr/bin/aarch64-linux-gnu-gcc
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER=qemu-aarch64
export CARGO_BUILD_TARGET=aarch64-unknown-linux-gnu export CARGO_BUILD_TARGET=aarch64-unknown-linux-gnu
export TARGET=aarch64-unknown-linux-gnu export TARGET=aarch64-unknown-linux-gnu
export PKG_CONFIG=/usr/bin/aarch64-linux-gnu-pkg-config export PKG_CONFIG=/usr/bin/aarch64-linux-gnu-pkg-config

51
patches/proxmox-backup-cross.patch
View File

@@ -24,11 +24,41 @@ index b06badff..a5eb4ce2 100644
SPHINXOPTS += -t release SPHINXOPTS += -t release
else else
COMPILEDIR := ../target/debug COMPILEDIR := ../target/debug
@@ -98,16 +98,16 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(SPHINXOPTS) .
all: ${MAN1_PAGES} ${MAN5_PAGES}
config/%/config.rst: ${COMPILEDIR}/docgen
- ${COMPILEDIR}/docgen $*.cfg >$@
+ qemu-aarch64 ${COMPILEDIR}/docgen $*.cfg >$@
config/acl/roles.rst: ${COMPILEDIR}/docgen
- ${COMPILEDIR}/docgen "config::acl::Role" >$@
+ qemu-aarch64 ${COMPILEDIR}/docgen "config::acl::Role" >$@
%/synopsis.rst: ${COMPILEDIR}/%
- $< printdoc > $@
+ qemu-aarch64 $< printdoc > $@
proxmox-backup-client/catalog-shell-synopsis.rst: ${COMPILEDIR}/dump-catalog-shell-cli
- ${COMPILEDIR}/dump-catalog-shell-cli > proxmox-backup-client/catalog-shell-synopsis.rst
+ qemu-aarch64 ${COMPILEDIR}/dump-catalog-shell-cli > proxmox-backup-client/catalog-shell-synopsis.rst
${MAN1_PAGES} ${MAN5_PAGES}: man-pages
@@ -122,7 +122,7 @@ onlinehelpinfo:
@echo "Build finished. OnlineHelpInfo.js is in $(BUILDDIR)/scanrefs."
api-viewer/apidata.js: ${COMPILEDIR}/docgen
- ${COMPILEDIR}/docgen apidata.js >$@
+ qemu-aarch64 ${COMPILEDIR}/docgen apidata.js >$@
api-viewer/apidoc.js: ${API_VIEWER_FILES}
cat ${API_VIEWER_FILES} >$@.tmp
diff --git a/pxar-bin/tests/pxar.rs b/pxar-bin/tests/pxar.rs diff --git a/pxar-bin/tests/pxar.rs b/pxar-bin/tests/pxar.rs
index f2748598..7cbdcc7a 100644 index f2748598..0c31ee4f 100644
--- a/pxar-bin/tests/pxar.rs --- a/pxar-bin/tests/pxar.rs
+++ b/pxar-bin/tests/pxar.rs +++ b/pxar-bin/tests/pxar.rs
@@ -8,9 +8,9 @@ fn pxar_create_and_extract() { @@ -8,14 +8,15 @@ fn pxar_create_and_extract() {
let dest_dir = "../tests/catar_data/test_xattrs_dest/"; let dest_dir = "../tests/catar_data/test_xattrs_dest/";
let exec_path = if cfg!(debug_assertions) { let exec_path = if cfg!(debug_assertions) {
@@ -40,3 +70,20 @@ index f2748598..7cbdcc7a 100644
}; };
println!("run '{} create archive.pxar {}'", exec_path, src_dir); println!("run '{} create archive.pxar {}'", exec_path, src_dir);
- Command::new(exec_path)
+ Command::new("qemu-aarch64")
+ .arg(exec_path)
.arg("create")
.arg("./tests/archive.pxar")
.arg(src_dir)
@@ -24,7 +25,8 @@ fn pxar_create_and_extract() {
println!("run '{} extract archive.pxar {}'", exec_path, dest_dir);
- Command::new(exec_path)
+ Command::new("qemu-aarch64")
+ .arg(exec_path)
.arg("extract")
.arg("./tests/archive.pxar")
.arg("--target")