From 7feb1d065690f9988171eba89d6885aa71f645b2 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 14 May 2019 10:04:56 +0200 Subject: [PATCH] Move Seoul packages, index update --- build-x86_64/tup.config | 4 +- index.xml | 45 ++++---- runtimes/alpine/alpine_seoul_nova/Tupfile | 16 --- .../alpine_seoul_nova/installer/Tupfile | 23 ---- .../alpine_seoul_nova/installer/runtime.in | 101 ------------------ .../alpine_seoul_nova/installer/vm_seoul.cfg | 39 ------- runtimes/alpine/alpine_seoul_nova/runtime | 87 --------------- .../alpine/alpine_seoul_nova/vm_seoul.cfg | 38 ------- vm/seoul-nova/Tupfile | 3 +- vm/seoul-nova/runtime | 2 +- vm/seoul-nova/vm_seoul.cfg | 2 +- 11 files changed, 31 insertions(+), 329 deletions(-) delete mode 100644 runtimes/alpine/alpine_seoul_nova/Tupfile delete mode 100644 runtimes/alpine/alpine_seoul_nova/installer/Tupfile delete mode 100644 runtimes/alpine/alpine_seoul_nova/installer/runtime.in delete mode 100644 runtimes/alpine/alpine_seoul_nova/installer/vm_seoul.cfg delete mode 100644 runtimes/alpine/alpine_seoul_nova/runtime delete mode 100644 runtimes/alpine/alpine_seoul_nova/vm_seoul.cfg diff --git a/build-x86_64/tup.config b/build-x86_64/tup.config index 4efa6eed5..1a1a03c90 100644 --- a/build-x86_64/tup.config +++ b/build-x86_64/tup.config @@ -39,7 +39,8 @@ CONFIG_PUBLIC_SRC_POSIX=genodelabs/src/posix/2019-03-17 CONFIG_PUBLIC_SRC_RAM_BLOCK=alex-ab/src/ram_block/2019-02-25 CONFIG_PUBLIC_SRC_REPORT_ROM=genodelabs/src/report_rom/2019-03-17 CONFIG_PUBLIC_SRC_ROM_BLOCK=ehmry/src/rom_block/2019-04-05-a -CONFIG_PUBLIC_SRC_SEOUL_NOVA=ehmry/src/seoul-nova/2019-04-16 +CONFIG_PUBLIC_SRC_SDL=ehmry/src/sdl/19.02 +CONFIG_PUBLIC_SRC_SEOUL_NOVA=ehmry/src/seoul-nova/2019-05-01-a CONFIG_PUBLIC_SRC_SHOW_INPUT=ehmry/src/show_input/2019-04-07 CONFIG_PUBLIC_SRC_SSH_CLIENT=ehmry/src/ssh_client/2019-04-08 CONFIG_PUBLIC_SRC_STDCXX=genodelabs/src/stdcxx/2019-02-25 @@ -49,6 +50,7 @@ CONFIG_PUBLIC_SRC_VFS_AUDIT=ehmry/src/vfs_audit/2019-04-20 CONFIG_PUBLIC_SRC_VFS=genodelabs/src/vfs/2019-03-18 CONFIG_PUBLIC_SRC_VFS_JITTERENTROPY=ehmry/src/vfs_jitterentropy/2019-03-17 CONFIG_PUBLIC_SRC_VFS_LWIP=ehmry/src/vfs_lwip/2019-04-01 +CONFIG_PUBLIC_SRC_VFS_LXIP=cproc/src/vfs_lxip/2019-03-18 CONFIG_PUBLIC_SRC_VFS_TTF=ehmry/src/vfs_ttf/2019-03-17 CONFIG_PUBLIC_SRC_WINDOW_LAYOUTER=genodelabs/src/window_layouter/2019-03-17 CONFIG_PUBLIC_SRC_WM=genodelabs/src/wm/2019-03-17 diff --git a/index.xml b/index.xml index 8943ee86e..f8c7f3cdd 100644 --- a/index.xml +++ b/index.xml @@ -12,7 +12,6 @@ - @@ -20,47 +19,55 @@ - + + - + - - + + + - - - - + + + - - + + + + + + + + + @@ -71,14 +78,12 @@ - - - - - - - - + + + + + + @@ -86,6 +91,7 @@ + @@ -93,7 +99,6 @@ - diff --git a/runtimes/alpine/alpine_seoul_nova/Tupfile b/runtimes/alpine/alpine_seoul_nova/Tupfile deleted file mode 100644 index dcfcf4f11..000000000 --- a/runtimes/alpine/alpine_seoul_nova/Tupfile +++ /dev/null @@ -1,16 +0,0 @@ -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) \ - @(PUBLIC_SRC_SEOUL_NOVA) \ - _/src/fs_block \ - _/raw/$(TARGET_NAME) \ - -: runtime |> !collect_pkg_runtime |> - -include $(RAW_RULES) diff --git a/runtimes/alpine/alpine_seoul_nova/installer/Tupfile b/runtimes/alpine/alpine_seoul_nova/installer/Tupfile deleted file mode 100644 index 113533561..000000000 --- a/runtimes/alpine/alpine_seoul_nova/installer/Tupfile +++ /dev/null @@ -1,23 +0,0 @@ -TARGET_NAME = installer-alpine_seoul_nova -include ../../../../vm/alpine/version.tup -include_rules - -: vm_seoul.cfg |> !collect_raw |> - - -PKG_DEPENDS += \ - @(PUBLIC_SRC_BASE_NOVA) \ - @(PUBLIC_SRC_INIT) \ - @(PUBLIC_SRC_NIT_FB) \ - @(PUBLIC_SRC_ROM_BLOCK) \ - @(PUBLIC_SRC_SEOUL_NOVA) \ - _/src/fs_block \ - _/raw/alpine-standard-x86 \ - _/raw/$(TARGET_NAME) \ - -ISO_NAME = alpine-standard-$(ALPINE_VERSION)-x86.iso - -: runtime.in |> sed 's/@ISO_NAME@/$(ISO_NAME)/' %f > %o |> runtime -: runtime |> !collect_pkg_runtime |> - -include $(RAW_RULES) diff --git a/runtimes/alpine/alpine_seoul_nova/installer/runtime.in b/runtimes/alpine/alpine_seoul_nova/installer/runtime.in deleted file mode 100644 index 8c6a1453c..000000000 --- a/runtimes/alpine/alpine_seoul_nova/installer/runtime.in +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/runtimes/alpine/alpine_seoul_nova/installer/vm_seoul.cfg b/runtimes/alpine/alpine_seoul_nova/installer/vm_seoul.cfg deleted file mode 100644 index 35bcefe13..000000000 --- a/runtimes/alpine/alpine_seoul_nova/installer/vm_seoul.cfg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/runtimes/alpine/alpine_seoul_nova/runtime b/runtimes/alpine/alpine_seoul_nova/runtime deleted file mode 100644 index 17d985012..000000000 --- a/runtimes/alpine/alpine_seoul_nova/runtime +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/runtimes/alpine/alpine_seoul_nova/vm_seoul.cfg b/runtimes/alpine/alpine_seoul_nova/vm_seoul.cfg deleted file mode 100644 index 0d6e7f805..000000000 --- a/runtimes/alpine/alpine_seoul_nova/vm_seoul.cfg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vm/seoul-nova/Tupfile b/vm/seoul-nova/Tupfile index e2ad09a4b..98bdb23a3 100644 --- a/vm/seoul-nova/Tupfile +++ b/vm/seoul-nova/Tupfile @@ -1,9 +1,8 @@ -TARGET_NAME = seoul_nova +TARGET_NAME = seoul-nova include_rules : vm_seoul.cfg |> !collect_raw |> - PKG_DEPENDS += \ @(PUBLIC_SRC_BASE_NOVA) \ @(PUBLIC_SRC_INIT) \ diff --git a/vm/seoul-nova/runtime b/vm/seoul-nova/runtime index 4320b828d..9ee01bb52 100644 --- a/vm/seoul-nova/runtime +++ b/vm/seoul-nova/runtime @@ -51,7 +51,7 @@ - + diff --git a/vm/seoul-nova/vm_seoul.cfg b/vm/seoul-nova/vm_seoul.cfg index 35bcefe13..a0f3569d0 100644 --- a/vm/seoul-nova/vm_seoul.cfg +++ b/vm/seoul-nova/vm_seoul.cfg @@ -33,7 +33,7 @@ - +