diff --git a/vm/alpine/alpine_seoul_nova/Tupfile b/vm/alpine/alpine_seoul_nova/Tupfile index a48a01c2b..87b78198b 100644 --- a/vm/alpine/alpine_seoul_nova/Tupfile +++ b/vm/alpine/alpine_seoul_nova/Tupfile @@ -1,16 +1,11 @@ TARGET_NAME = alpine_seoul_nova include_rules -: vm_seoul.cfg |> !collect_raw |> - PKG_DEPENDS += \ @(PUBLIC_SRC_BASE_NOVA) \ @(PUBLIC_SRC_INIT) \ - @(PUBLIC_SRC_NIT_FB) \ - local/src/seoul-nova \ - _/src/fs_block \ - _/raw/$(TARGET_NAME) \ + @(PUBLIC_SRC_SEOUL_NOVA) \ : runtime |> !collect_pkg_runtime |> -include $(RAW_RULES) +include $(PKG_RULES) diff --git a/vm/alpine/alpine_seoul_nova/installer/Tupfile b/vm/alpine/alpine_seoul_nova/installer/Tupfile index 33f968064..3d34c6fcb 100644 --- a/vm/alpine/alpine_seoul_nova/installer/Tupfile +++ b/vm/alpine/alpine_seoul_nova/installer/Tupfile @@ -5,7 +5,7 @@ PKG_DEPENDS += \ @(PUBLIC_SRC_BASE_NOVA) \ @(PUBLIC_SRC_INIT) \ @(PUBLIC_SRC_ROM_BLOCK) \ - local/src/seoul-nova \ + @(PUBLIC_SRC_SEOUL_NOVA) \ _/raw/alpine-standard-x86 \ IMAGE_NAME = alpine-standard-$(ALPINE_VERSION)-x86.iso diff --git a/vm/alpine/alpine_seoul_nova/runtime b/vm/alpine/alpine_seoul_nova/runtime index 17d985012..9a57a99fc 100644 --- a/vm/alpine/alpine_seoul_nova/runtime +++ b/vm/alpine/alpine_seoul_nova/runtime @@ -1,6 +1,7 @@ + @@ -10,7 +11,6 @@ - @@ -26,6 +26,7 @@ + @@ -51,18 +52,6 @@ - - - - - - - - - - - - @@ -75,12 +64,46 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vm/alpine/alpine_seoul_nova/vm_seoul.cfg b/vm/alpine/alpine_seoul_nova/vm_seoul.cfg deleted file mode 100644 index af17c3137..000000000 --- a/vm/alpine/alpine_seoul_nova/vm_seoul.cfg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -