qt5: use VFS pipe plugin

Fixes #3759
This commit is contained in:
Christian Prochaska 2020-05-12 08:10:00 +02:00 committed by Christian Helmuth
parent b078224753
commit 2f47bbde30
22 changed files with 51 additions and 29 deletions

View File

@ -70,12 +70,13 @@ append config {
<config>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
<tar name="qt5_dejavusans.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
</config>
<route>
<service name="Nitpicker"> <child name="wm"/> </service>

View File

@ -111,9 +111,10 @@ append config {
<start name="test-tiled_wm-panel" caps="250">
<resource name="RAM" quantum="32M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
@ -135,9 +136,10 @@ append config {
<start name="test-tiled_wm-overlay" caps="250">
<resource name="RAM" quantum="32M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
@ -156,9 +158,10 @@ append config {
<binary name="test-tiled_wm-app"/>
<resource name="RAM" quantum="32M"/>
<config name="app1">
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
@ -177,9 +180,10 @@ append config {
<binary name="test-tiled_wm-app"/>
<resource name="RAM" quantum="32M"/>
<config name="app2">
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
@ -197,9 +201,10 @@ append config {
<start name="textedit" caps="250">
<resource name="RAM" quantum="70M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>

View File

@ -22,6 +22,6 @@ include $(REP_DIR)/lib/mk/qt5.inc
SRC_CC += libc_dummies.cc
vpath libc_dummies.cc $(REP_DIR)/src/lib/qt5
LIBS += zlib qt5_pcre2 libc libm libc_pipe
LIBS += zlib qt5_pcre2 libc libm
CC_CXX_WARN_STRICT =

View File

@ -11,6 +11,7 @@ _/src/qt5_qjpeg
_/src/qt5_qpa_nitpicker
_/src/stdcxx
_/src/vfs
_/src/vfs_pipe
_/src/zlib
_/raw/qt5_textedit
_/src/qt5_component

View File

@ -19,7 +19,6 @@
<rom label="glapi.lib.so"/>
<rom label="jpeg.lib.so"/>
<rom label="libc.lib.so"/>
<rom label="libc_pipe.lib.so"/>
<rom label="libm.lib.so"/>
<rom label="libpng.lib.so"/>
<rom label="mesa.lib.so"/>
@ -30,6 +29,7 @@
<rom label="qt5_qpa_nitpicker.lib.so"/>
<rom label="stdcxx.lib.so"/>
<rom label="vfs.lib.so"/>
<rom label="vfs_pipe.lib.so"/>
<rom label="zlib.lib.so"/>
<!-- application -->

View File

@ -1,11 +1,12 @@
<config clipboard="yes">
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
<dir name="edit"> <fs label="rw"/> </dir>
<tar name="qt5_dejavusans.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
</config>

View File

@ -3,10 +3,7 @@ MIRROR_FROM_REP_DIR := lib/mk/qt5_core.mk \
lib/mk/qt5_pcre2.mk \
lib/mk/qt5_pcre2_generated.inc \
lib/mk/qt5.inc \
src/lib/qt5/libc_dummies.cc \
include/libc-plugin \
lib/mk/libc_pipe.mk \
src/lib/libc_pipe
src/lib/qt5/libc_dummies.cc
content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_core/target.mk

View File

@ -37,9 +37,10 @@ append config {
<start name="qt_launchpad" caps="600">
<resource name="RAM" quantum="80M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
@ -47,9 +48,10 @@ append config {
</vfs>
<launcher name="calculatorform" ram_quota="30M" caps="200">
<config>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
@ -59,9 +61,10 @@ append config {
</launcher>
<launcher name="tetrix" ram_quota="40M" caps="200">
<config>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>

View File

@ -36,12 +36,13 @@ append config {
<config>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
<tar name="qt5_dejavusans.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
</config>
<route>
<service name="Nitpicker"> <child name="wm"/> </service>

View File

@ -25,6 +25,7 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/report_rom \
[depot_user]/src/stdcxx \
[depot_user]/src/vfs \
[depot_user]/src/vfs_pipe \
[depot_user]/src/zlib \
[depot_user]/pkg/themed_wm \
[depot_user]/raw/qt5_dejavusans

View File

@ -42,12 +42,13 @@ append config {
<config>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
<tar name="qt5_dejavusans.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
</config>
</start>
</config>

View File

@ -62,12 +62,13 @@ append config {
<config>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
<tar name="qt5_dejavusans.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
</config>
<route>
<service name="Nitpicker"> <child name="wm"/> </service>

View File

@ -42,6 +42,7 @@ append config {
<config>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
@ -49,7 +50,7 @@ append config {
<tar name="qt5_qtquick2.tar"/>
<tar name="qt5_qtquick2plugin.tar" />
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
</config>
<route>
<service name="Nitpicker"> <child name="wm"/> </service>

View File

@ -42,6 +42,7 @@ append config {
<config>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
@ -50,7 +51,7 @@ append config {
<tar name="qt5_qtquick2plugin.tar"/>
<tar name="qt5_samegame.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
</config>
<route>
<service name="Nitpicker"> <child name="wm"/> </service>

View File

@ -37,12 +37,13 @@ append config {
<config>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
<tar name="qt5_dejavusans.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
</config>
<route>
<service name="Nitpicker"> <child name="wm"/> </service>

View File

@ -37,12 +37,13 @@ append config {
<config>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
<tar name="qt5_dejavusans.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
</config>
<route>
<service name="Nitpicker"> <child name="wm"/> </service>

View File

@ -55,9 +55,10 @@ append config {
<start name="textedit" caps="300">
<resource name="RAM" quantum="70M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
@ -76,9 +77,10 @@ append config {
<binary name="textedit" />
<resource name="RAM" quantum="70M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>

View File

@ -59,6 +59,7 @@ append config {
<config>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
</dir>
@ -81,7 +82,7 @@ append config {
<tar name="qt5_qtquickvirtualkeyboardstylesplugin.tar"/>
<tar name="qt5_windowplugin.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc"/>
</config>
<route>
<service name="Nitpicker"> <child name="wm"/> </service>

View File

@ -11,6 +11,7 @@ _/src/qt5_qjpeg
_/src/qt5_qpa_nitpicker
_/src/stdcxx
_/src/vfs
_/src/vfs_pipe
_/src/zlib
_/raw/arora
_/src/arora

View File

@ -21,7 +21,6 @@
<rom label="glapi.lib.so"/>
<rom label="jpeg.lib.so"/>
<rom label="libc.lib.so"/>
<rom label="libc_pipe.lib.so"/>
<rom label="libm.lib.so"/>
<rom label="libpng.lib.so"/>
<rom label="mesa.lib.so"/>
@ -32,6 +31,7 @@
<rom label="qt5_qpa_nitpicker.lib.so"/>
<rom label="stdcxx.lib.so"/>
<rom label="vfs.lib.so"/>
<rom label="vfs_pipe.lib.so"/>
<rom label="zlib.lib.so"/>
<!-- application -->

View File

@ -30,6 +30,7 @@
<config>
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<jitterentropy name="random"/>
<log/>
<rtc/>
@ -37,7 +38,7 @@
<fs/>
<tar name="qt5_dejavusans.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" socket="/socket"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc" socket="/socket"/>
</config>
<route>
<service name="File_system"> <child name="vfs"/> </service>

View File

@ -113,6 +113,7 @@ append config {
<config clipboard="yes">
<vfs>
<dir name="dev">
<dir name="pipe"> <pipe/> </dir>
<log/>
<jitterentropy name="random"/>
<inline name="rtc">2018-01-01 00:01</inline>
@ -120,7 +121,7 @@ append config {
<fs/>
<tar name="qt5_dejavusans.tar"/>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" socket="/socket"/>
<libc stdout="/dev/log" stderr="/dev/log" pipe="/dev/pipe" rtc="/dev/rtc" socket="/socket"/>
</config>
<route>
<service name="Nitpicker"> <child name="wm"/> </service>