Tup refactor
This commit is contained in:
parent
debb4fabd0
commit
33a7ad99c2
2
Tupfile
2
Tupfile
|
@ -55,7 +55,7 @@ SHORT_SUM = b2sum -l24
|
|||
|> public/@(PUBLIC_USER)/index/@(SCULPT_VERSION).xz
|
||||
|
||||
AWK_RUNTIME_PATH = awk -v RS=' ' -F '/' \
|
||||
'/runtime/ {print " <pkg path=\"local/pkg/"$4"/current\"/>"}'
|
||||
'/runtime/ {print " <pkg path=\"local/pkg/"$3"/current\"/>"}'
|
||||
|
||||
: $(DEPOT_DIR)/<packages> |> ^ generate local index^ \
|
||||
echo '<index>' > %o; \
|
||||
|
|
|
@ -18,12 +18,12 @@ ifeq ($(RAW_VERSION),)
|
|||
RAW_VERSION=$(GIT_VERSION)
|
||||
endif
|
||||
|
||||
DEPOT_DIR = $(TUP_CWD)/depot/local
|
||||
DEPOT_DIR = $(TUP_CWD)/depot
|
||||
DEPOT_RAW_DIR = $(DEPOT_DIR)/raw
|
||||
DEPOT_BIN_DIR = $(DEPOT_DIR)/bin/@(TUP_ARCH)
|
||||
DEPOT_PKG_DIR = $(DEPOT_DIR)/pkg
|
||||
|
||||
PUBLIC_DIR = $(TUP_CWD)/public/@(PUBLIC_USER)
|
||||
PUBLIC_DIR = $(TUP_CWD)/public
|
||||
PUBLIC_RAW_DIR = $(PUBLIC_DIR)/raw
|
||||
PUBLIC_BIN_DIR = $(PUBLIC_DIR)/bin
|
||||
PUBLIC_PKG_DIR = $(PUBLIC_DIR)/pkg
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
CONFIG_TUP_ARCH=x86_64
|
||||
|
||||
CONFIG_CC_WRAPPER = ccache
|
||||
|
||||
CONFIG_SCULPT_VERSION=19.02
|
||||
CONFIG_SDK_USER=ehmry
|
||||
CONFIG_SDK_VERSION=19.02
|
||||
|
@ -20,18 +22,21 @@ CONFIG_PUBLIC_SRC_INIT=genodelabs/src/init/2019-03-17
|
|||
CONFIG_PUBLIC_SRC_LIBC=genodelabs/src/libc/2019-03-17
|
||||
CONFIG_PUBLIC_SRC_LIBCRYPTO=genodelabs/src/libcrypto/2019-03-17
|
||||
CONFIG_PUBLIC_SRC_LIBICONV=genodelabs/src/libiconv/2019-02-25
|
||||
CONFIG_PUBLIC_SRC_LIBMPG123=ehmry/src/libmpg123/19.02
|
||||
CONFIG_PUBLIC_SRC_LIBPNG=genodelabs/src/libpng/2019-02-25
|
||||
CONFIG_PUBLIC_SRC_LIBSSH=genodelabs/src/libssh/2019-03-17
|
||||
CONFIG_PUBLIC_SRC_LIBSSL=genodelabs/src/libssl/2019-03-17
|
||||
CONFIG_PUBLIC_SRC_MENU_VIEW=genodelabs/src/menu_view/2019-03-17
|
||||
CONFIG_PUBLIC_SRC_MESA=nfeske/src/mesa/2019-02-19
|
||||
CONFIG_PUBLIC_SRC_MOTIF_DECORATOR=genodelabs/src/decorator/2019-03-17
|
||||
CONFIG_PUBLIC_SRC_MP3_AUDIO_SINK=ehmry/src/mp3_audio_sink/19.02
|
||||
CONFIG_PUBLIC_SRC_NIC_BRIDGE=ehmry/src/nic_bridge/2019-04-12
|
||||
CONFIG_PUBLIC_SRC_NIT_FB=genodelabs/src/nit_fb/2019-03-17
|
||||
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=alex-ab/src/seoul-nova/2019-04-05
|
||||
CONFIG_PUBLIC_SRC_SEOUL_NOVA=ehmry/src/seoul-nova/2019-04-16
|
||||
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
|
||||
|
@ -41,7 +46,6 @@ 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_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
|
||||
CONFIG_PUBLIC_SRC_ZLIB=genodelabs/src/zlib/2019-02-25
|
||||
|
||||
CONFIG_PUBLIC_SRC_MP3_AUDIO_SINK=ehmry/src/mp3_audio_sink/19.02
|
||||
CONFIG_PUBLIC_SRC_LIBMPG123=ehmry/src/libmpg123/19.02
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
ifndef CONFIG_NO_NETWORK
|
||||
|
||||
TARGET_NAME = streemerz
|
||||
RAW_VERSION = 02
|
||||
include_rules
|
||||
|
@ -16,3 +18,5 @@ PKG_DEPENDS += \
|
|||
_/raw/$(TARGET_NAME) \
|
||||
|
||||
: runtime |> !collect_pkg_runtime |>
|
||||
|
||||
endif
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
TARGET_NAME = ssh_client
|
||||
|
||||
PKG_DEPENDS += \
|
||||
@(SDK_USER)/src/libc/@(SDK_VERSION) \
|
||||
@(SDK_USER)/src/vfs/@(SDK_VERSION) \
|
||||
@(PUBLIC_SRC_LIBC) \
|
||||
@(PUBLIC_SRC_VFS) \
|
||||
@(PUBLIC_SRC_INIT) \
|
||||
@(PUBLIC_SRC_LIBCRYPTO) \
|
||||
@(PUBLIC_SRC_LIBSSH) \
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
<rom label="libssh.lib.so"/>
|
||||
<rom label="ssh_client"/>
|
||||
<rom label="terminal"/>
|
||||
<rom label="vfs.lib.so"/>
|
||||
<rom label="vfs_jitterentropy.lib.so"/>
|
||||
<rom label="vfs.lib.so"/>
|
||||
<rom label="vfs_lwip.lib.so"/>
|
||||
<rom label="zlib.lib.so"/>
|
||||
</content>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
ifndef CONFIG_NO_NETWORK
|
||||
|
||||
include ../version.tup
|
||||
TARGET_NAME = alpine-$(RELEASE_TYPE)-$(RELEASE_ARCH)
|
||||
RAW_VERSION = $(ALPINE_VERSION)
|
||||
|
@ -22,3 +24,5 @@ PKG_DEPENDS += \
|
|||
|
||||
: $(TUP_CWD)/runtime.in |> sed 's/@ISO_NAME@/$(ISO_NAME)/' %f > %o |> runtime
|
||||
: runtime |> !collect_pkg_runtime |>
|
||||
|
||||
endif
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
ifndef CONFIG_NO_NETWORK
|
||||
|
||||
TARGET_NAME = ReactOS-live
|
||||
RAW_VERSION = 0.4.11
|
||||
include_rules
|
||||
|
@ -18,3 +20,5 @@ PKG_DEPENDS += \
|
|||
|
||||
: runtime.in |> sed 's/@ISO_NAME@/$(ISO_NAME)/' %f > %o |> runtime
|
||||
: runtime |> !collect_pkg_runtime |>
|
||||
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue