From 8c5bf0bf548a10d84d5e4ac63606db1069d2559f Mon Sep 17 00:00:00 2001 From: Kohei Watanabe Date: Wed, 1 Jun 2022 11:02:43 +0900 Subject: [PATCH] move apkovl to src/rootfs --- bin/build | 4 ++-- compose.yml | 8 ++++---- src/{ => bootfs}/setup-yama | 0 src/{ => bootfs}/usercfg.txt | 0 {apkovl => src/rootfs}/etc/.default_boot_services | 0 {apkovl => src/rootfs}/etc/apk/cache | 0 {apkovl => src/rootfs}/etc/apk/repositories | 0 {apkovl => src/rootfs}/etc/apk/world | 0 {apkovl => src/rootfs}/etc/fstab | 0 {apkovl => src/rootfs}/etc/init.d/setup-yama | 0 {apkovl => src/rootfs}/etc/network/interfaces | 0 {apkovl => src/rootfs}/etc/runlevels/boot/networking | 0 {apkovl => src/rootfs}/etc/runlevels/boot/wpa_supplicant | 0 {apkovl => src/rootfs}/etc/runlevels/default/ntpd | 0 {apkovl => src/rootfs}/etc/runlevels/default/setup-yama | 0 {apkovl => src/rootfs}/etc/runlevels/default/sshd | 0 {apkovl => src/rootfs}/etc/ssh/sshd_config | 0 17 files changed, 6 insertions(+), 6 deletions(-) rename src/{ => bootfs}/setup-yama (100%) rename src/{ => bootfs}/usercfg.txt (100%) rename {apkovl => src/rootfs}/etc/.default_boot_services (100%) rename {apkovl => src/rootfs}/etc/apk/cache (100%) rename {apkovl => src/rootfs}/etc/apk/repositories (100%) rename {apkovl => src/rootfs}/etc/apk/world (100%) rename {apkovl => src/rootfs}/etc/fstab (100%) rename {apkovl => src/rootfs}/etc/init.d/setup-yama (100%) rename {apkovl => src/rootfs}/etc/network/interfaces (100%) rename {apkovl => src/rootfs}/etc/runlevels/boot/networking (100%) rename {apkovl => src/rootfs}/etc/runlevels/boot/wpa_supplicant (100%) rename {apkovl => src/rootfs}/etc/runlevels/default/ntpd (100%) rename {apkovl => src/rootfs}/etc/runlevels/default/setup-yama (100%) rename {apkovl => src/rootfs}/etc/runlevels/default/sshd (100%) rename {apkovl => src/rootfs}/etc/ssh/sshd_config (100%) diff --git a/bin/build b/bin/build index 59047b3..31f78f8 100755 --- a/bin/build +++ b/bin/build @@ -10,9 +10,9 @@ rm -rf dist mkdir dist bin/download "${version}" dist docker compose run --rm minirootfs sh -c 'apk update && apk add' -cp -a src/* cache -t dist +cp -a src/bootfs/* cache -t dist bin/overlay-gen dist/overlay.img docker compose run --rm builder -tar czf dist/localhost.apkovl.tar.gz --owner=0 --group=0 -C apkovl . +tar czf dist/localhost.apkovl.tar.gz --owner=0 --group=0 -C src/rootfs . tar czf yama-armhf.tar.gz --owner=0 --group=0 -C dist . bin/img-gen yama-armhf.img diff --git a/compose.yml b/compose.yml index c5b98a2..b14dd61 100644 --- a/compose.yml +++ b/compose.yml @@ -3,14 +3,14 @@ services: image: ghcr.io/kou029w/yama/minirootfs volumes: - ./cache:/etc/apk/cache - - ./apkovl/etc/apk/repositories:/etc/apk/repositories - - ./apkovl/etc/apk/world:/etc/apk/world + - ./src/rootfs/etc/apk/repositories:/etc/apk/repositories + - ./src/rootfs/etc/apk/world:/etc/apk/world builder: image: ghcr.io/kou029w/yama/minirootfs volumes: - ./cache:/etc/apk/cache - - ./apkovl/etc/apk/repositories:/etc/apk/repositories - - ./apkovl/etc/apk/world:/etc/apk/world + - ./src/rootfs/etc/apk/repositories:/etc/apk/repositories + - ./src/rootfs/etc/apk/world:/etc/apk/world - ./fstab:/etc/fstab - ./dist/overlay.img:/overlay.img privileged: true diff --git a/src/setup-yama b/src/bootfs/setup-yama similarity index 100% rename from src/setup-yama rename to src/bootfs/setup-yama diff --git a/src/usercfg.txt b/src/bootfs/usercfg.txt similarity index 100% rename from src/usercfg.txt rename to src/bootfs/usercfg.txt diff --git a/apkovl/etc/.default_boot_services b/src/rootfs/etc/.default_boot_services similarity index 100% rename from apkovl/etc/.default_boot_services rename to src/rootfs/etc/.default_boot_services diff --git a/apkovl/etc/apk/cache b/src/rootfs/etc/apk/cache similarity index 100% rename from apkovl/etc/apk/cache rename to src/rootfs/etc/apk/cache diff --git a/apkovl/etc/apk/repositories b/src/rootfs/etc/apk/repositories similarity index 100% rename from apkovl/etc/apk/repositories rename to src/rootfs/etc/apk/repositories diff --git a/apkovl/etc/apk/world b/src/rootfs/etc/apk/world similarity index 100% rename from apkovl/etc/apk/world rename to src/rootfs/etc/apk/world diff --git a/apkovl/etc/fstab b/src/rootfs/etc/fstab similarity index 100% rename from apkovl/etc/fstab rename to src/rootfs/etc/fstab diff --git a/apkovl/etc/init.d/setup-yama b/src/rootfs/etc/init.d/setup-yama similarity index 100% rename from apkovl/etc/init.d/setup-yama rename to src/rootfs/etc/init.d/setup-yama diff --git a/apkovl/etc/network/interfaces b/src/rootfs/etc/network/interfaces similarity index 100% rename from apkovl/etc/network/interfaces rename to src/rootfs/etc/network/interfaces diff --git a/apkovl/etc/runlevels/boot/networking b/src/rootfs/etc/runlevels/boot/networking similarity index 100% rename from apkovl/etc/runlevels/boot/networking rename to src/rootfs/etc/runlevels/boot/networking diff --git a/apkovl/etc/runlevels/boot/wpa_supplicant b/src/rootfs/etc/runlevels/boot/wpa_supplicant similarity index 100% rename from apkovl/etc/runlevels/boot/wpa_supplicant rename to src/rootfs/etc/runlevels/boot/wpa_supplicant diff --git a/apkovl/etc/runlevels/default/ntpd b/src/rootfs/etc/runlevels/default/ntpd similarity index 100% rename from apkovl/etc/runlevels/default/ntpd rename to src/rootfs/etc/runlevels/default/ntpd diff --git a/apkovl/etc/runlevels/default/setup-yama b/src/rootfs/etc/runlevels/default/setup-yama similarity index 100% rename from apkovl/etc/runlevels/default/setup-yama rename to src/rootfs/etc/runlevels/default/setup-yama diff --git a/apkovl/etc/runlevels/default/sshd b/src/rootfs/etc/runlevels/default/sshd similarity index 100% rename from apkovl/etc/runlevels/default/sshd rename to src/rootfs/etc/runlevels/default/sshd diff --git a/apkovl/etc/ssh/sshd_config b/src/rootfs/etc/ssh/sshd_config similarity index 100% rename from apkovl/etc/ssh/sshd_config rename to src/rootfs/etc/ssh/sshd_config