Skip to content

Commit

Permalink
Assets now load on first boot!
Browse files Browse the repository at this point in the history
  • Loading branch information
aduskett committed Jan 7, 2025
1 parent 1eea155 commit 648979b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 53 deletions.
17 changes: 14 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APPLY_CONFIGS ?= false
CLEAN_AFTER_BUILD ?= false
ENV_FILES ?= "x86_64.json"
EXIT_AFTER_BUILD ?= false
EXIT_AFTER_BUILD ?= true
NO_BUILD ?= false
VERBOSE ?= false
TARGET ?= x86_64_kms
Expand All @@ -18,7 +18,8 @@ help:
@printf "\tTARGET: Specify the target of which to run menuconfig. Default: x86_64_kms\n"
@printf "\n"
@printf "Targets:\n"
@printf "\tbuild: build the docker container.\n"
@printf "\tbuild-docker: build the docker container.\n"
@printf "\tbuild: build the image"
@printf "\tdown: Stop the dodcker container.\n"
@printf "\tkill: kill the docker container forcefully.\n"
@printf "\tmenuconfig: run menuconfig on a given target. Default: x86_64_kms\n"
Expand All @@ -30,9 +31,19 @@ help:
@printf "x64-run: Run the x64 virtual image. Requires virbr0 and /dev/kvm to exist."
@printf "\n\n"

.PHONY: build-docker
build-docker:
@docker compose build

.PHONY: build
build:
@docker compose build
APPLY_CONFIGS=${APPLY_CONFIGS} \
VERBOSE=${VERBOSE} \
ENV_FILES=${ENV_FILES} \
EXIT_AFTER_BUILD=${EXIT_AFTER_BUILD} \
NO_BUILD=${NO_BUILD} \
CLEAN_AFTER_BUILD=${CLEAN_AFTER_BUILD} \
docker compose up --abort-on-container-exit

.PHONY: down
down:
Expand Down
2 changes: 1 addition & 1 deletion docker/x86_64.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"environment": [{
"buildroot_dir_name": "buildroot",
"exit_after_build": false,
"exit_after_build": true,
"update_buildroot": false,
"user": "br-user"
}],
Expand Down
4 changes: 2 additions & 2 deletions retroroot/board/common/overlay/etc/retroarch.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ cursor_directory = "/data/retroarch/database/databases/cursors"
dynamic_wallpapers_directory = "/data/retroarch/wallpapers/dynamic"
input_remapping_directory = "/data/retroarch/config/remaps"
joypad_autoconfig_dir = "/data/retroarch/config/autoconfig"
libretro_directory = "/data/retroarch/cores/"
libretro_info_path = "/data/retroarch/info/"
libretro_directory = "/data/retroarch/cores"
libretro_info_path = "/data/retroarch/info"
log_dir = "/data/retroarch/logs"
osk_overlay_directory = "/data/retroarch/config/overlays/keyboards"
overlay_directory = "/data/retroarch/config/overlay"
Expand Down
2 changes: 1 addition & 1 deletion retroroot/board/common/overlay/etc/ssh/sshd_config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ AuthorizedKeysFile /data/ssh/authorized_keys
PasswordAuthentication yes
PermitEmptyPasswords yes
ChallengeResponseAuthentication no
UsePAM yes

X11Forwarding no
UseDNS no
AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
Expand Down
46 changes: 0 additions & 46 deletions retroroot/board/x86_64/kms/overlay/etc/ssh/sshd_config

This file was deleted.

0 comments on commit 648979b

Please sign in to comment.