Skip to content

Commit 648979b

Browse files
committed
Assets now load on first boot!
1 parent 1eea155 commit 648979b

File tree

5 files changed

+18
-53
lines changed

5 files changed

+18
-53
lines changed

Makefile

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
APPLY_CONFIGS ?= false
22
CLEAN_AFTER_BUILD ?= false
33
ENV_FILES ?= "x86_64.json"
4-
EXIT_AFTER_BUILD ?= false
4+
EXIT_AFTER_BUILD ?= true
55
NO_BUILD ?= false
66
VERBOSE ?= false
77
TARGET ?= x86_64_kms
@@ -18,7 +18,8 @@ help:
1818
@printf "\tTARGET: Specify the target of which to run menuconfig. Default: x86_64_kms\n"
1919
@printf "\n"
2020
@printf "Targets:\n"
21-
@printf "\tbuild: build the docker container.\n"
21+
@printf "\tbuild-docker: build the docker container.\n"
22+
@printf "\tbuild: build the image"
2223
@printf "\tdown: Stop the dodcker container.\n"
2324
@printf "\tkill: kill the docker container forcefully.\n"
2425
@printf "\tmenuconfig: run menuconfig on a given target. Default: x86_64_kms\n"
@@ -30,9 +31,19 @@ help:
3031
@printf "x64-run: Run the x64 virtual image. Requires virbr0 and /dev/kvm to exist."
3132
@printf "\n\n"
3233

34+
.PHONY: build-docker
35+
build-docker:
36+
@docker compose build
37+
3338
.PHONY: build
3439
build:
35-
@docker compose build
40+
APPLY_CONFIGS=${APPLY_CONFIGS} \
41+
VERBOSE=${VERBOSE} \
42+
ENV_FILES=${ENV_FILES} \
43+
EXIT_AFTER_BUILD=${EXIT_AFTER_BUILD} \
44+
NO_BUILD=${NO_BUILD} \
45+
CLEAN_AFTER_BUILD=${CLEAN_AFTER_BUILD} \
46+
docker compose up --abort-on-container-exit
3647

3748
.PHONY: down
3849
down:

docker/x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"environment": [{
33
"buildroot_dir_name": "buildroot",
4-
"exit_after_build": false,
4+
"exit_after_build": true,
55
"update_buildroot": false,
66
"user": "br-user"
77
}],

retroroot/board/common/overlay/etc/retroarch.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ cursor_directory = "/data/retroarch/database/databases/cursors"
3030
dynamic_wallpapers_directory = "/data/retroarch/wallpapers/dynamic"
3131
input_remapping_directory = "/data/retroarch/config/remaps"
3232
joypad_autoconfig_dir = "/data/retroarch/config/autoconfig"
33-
libretro_directory = "/data/retroarch/cores/"
34-
libretro_info_path = "/data/retroarch/info/"
33+
libretro_directory = "/data/retroarch/cores"
34+
libretro_info_path = "/data/retroarch/info"
3535
log_dir = "/data/retroarch/logs"
3636
osk_overlay_directory = "/data/retroarch/config/overlays/keyboards"
3737
overlay_directory = "/data/retroarch/config/overlay"

retroroot/board/common/overlay/etc/ssh/sshd_config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ AuthorizedKeysFile /data/ssh/authorized_keys
1010
PasswordAuthentication yes
1111
PermitEmptyPasswords yes
1212
ChallengeResponseAuthentication no
13-
UsePAM yes
13+
1414
X11Forwarding no
1515
UseDNS no
1616
AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES

retroroot/board/x86_64/kms/overlay/etc/ssh/sshd_config

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)