aya/myos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipfs on arm

Browse Source
This commit is contained in:
Yann Autissier
2022-05-09 02:32:23 +02:00
parent 027c39c367
commit ba3727c5cd
9 changed files with 58 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
make/apps/common.mk
+3 -18
View File
@@ -3,28 +3,13 @@
# target bootstrap: Update application files and start dockers
# on local host
.PHONY: bootstrap
bootstrap: bootstrap-app bootstrap-host bootstrap-user app-bootstrap ## Update application files and start dockers
.PHONY: bootstrap app-bootstrap
bootstrap: bootstrap-app app-bootstrap ## Update application files and start dockers
# target bootstrap-app: Fire install-bin-git
.PHONY: bootstrap-app
bootstrap-app: install-bin-git
# target bootstrap-docker: Install and configure docker
# on local host
.PHONY: bootstrap-docker
bootstrap-docker: install-bin-docker setup-docker-group setup-sysctl
# target bootstrap-host: Fire node target
# on local host
.PHONY: bootstrap-host
bootstrap-host: node
# target bootstrap-user: Fire User target
# on local host
.PHONY: bootstrap-user
bootstrap-user: User
# target build: Build application docker images to run
# on local host
.PHONY: build
@@ -180,7 +165,7 @@ stack:
# target stack-%: Call docker-compose-% target on STACK
## it splits % on dashes and extracts stack from the beginning and command from
## the last part of %
## ex: stack-User-up will fire the docker-compose-up target in the User stack
## ex: stack-node-up will fire the docker-compose-up target in the node stack
.PHONY: stack-%
stack-%:
$(eval stack := $(subst -$(lastword $(subst -, ,$*)),,$*))
make/apps/myos/def.setup.mk
+1 -1
View File
@@ -1,5 +1,5 @@
ENV_VARS += SETUP_SYSCTL_CONFIG
SETUP_BINFMT ?= false
SETUP_BINFMT ?= $(if $(filter-out amd64 x86_64,$(PROCESSOR_ARCHITECTURE)),true,false)
SETUP_BINFMT_ARCH ?= all
SETUP_NFSD ?= false
SETUP_NFSD_OSX_CONFIG ?= nfs.server.bonjour=0 nfs.server.mount.regular_files=1 nfs.server.mount.require_resv_port=0 nfs.server.nfsd_threads=16 nfs.server.async=1
make/apps/myos/setup.mk
+1 -1
View File
@@ -27,7 +27,7 @@ endif
.PHONY: setup-sysctl
setup-sysctl:
ifeq ($(SETUP_SYSCTL),true)
$(SUDO) sysctl -q -w $(SETUP_SYSCTL_CONFIG)
$(RUN) $(SUDO) sysctl -q -w $(SETUP_SYSCTL_CONFIG)
endif
# target setup-binfmt: Install binfmt abstraction layer
make/def.mk
+3 -8
View File
@@ -69,7 +69,7 @@ GIT_VERSION ?= $(shell git describe --tags $(BRANCH) 2>/dev/
HOSTNAME ?= $(shell hostname 2>/dev/null |sed 's/\..*//')
IGNORE_DRYRUN ?= false
IGNORE_VERBOSE ?= false
INSTALL ?= $(SUDO) $(subst &&,&& $(SUDO),$(INSTALL_CMD))
INSTALL ?= $(RUN) $(SUDO) $(subst &&,&& $(RUN) $(SUDO),$(INSTALL_CMD))
INSTALL_CMDS ?= APK_INSTALL APT_INSTALL
$(foreach cmd,$(INSTALL_CMDS),$(if $(CMD_$(cmd)),$(eval INSTALL_CMD ?= $(CMD_$(cmd)))))
LOG_LEVEL ?= $(if $(DEBUG),debug,$(if $(VERBOSE),info,error))
@@ -126,13 +126,8 @@ OPERATING_SYSTEM := cygwin
else ifeq ($(OS),Windows_NT)
OPERATING_SYSTEM := Windows_NT
else
UNAME_S := $(shell uname -s 2>/dev/null)
ifeq ($(UNAME_S),Linux)
OPERATING_SYSTEM := Linux
endif
ifeq ($(UNAME_S),Darwin)
OPERATING_SYSTEM := Darwin
endif
PROCESSOR_ARCHITECTURE := $(shell uname -m 2>/dev/null)
OPERATING_SYSTEM := $(shell uname -s 2>/dev/null)
endif
ifeq ($(OPERATING_SYSTEM),Darwin)