Skip to content
Permalink
Browse files

OS/2 personality enhancements

- Fix building depot packages.
- Update package hashes.
  • Loading branch information...
valerius2k committed Mar 18, 2019
1 parent 0356dfe commit 63d350c7533f0efa7003acc81bbb4a05f1efba1d
@@ -1,5 +1,23 @@
<?xml version="1.0"?>
<index>

<index name="osFree">
<pkg path="valerius/pkg/os2" info="OS/2 personality prototype">
<pkg path="valerius/pkg/os2/2019-03-16-a" info="OS/2 personality prototype"/>
</index>

<index name="Demos">
<pkg path="valerius/bin/demo/2019-02-25" info="Genode demo scenario"/>
</index>

<index name="Games">
<pkg path="valerius/pkg/chocolate-doom/2019-03-13" info="Chocolate DOOM(tm)"/>
<pkg path="valerius/pkg/supertux/2019-03-16" info="Supertux"/>
<pkg path="valerius/pkg/tyrian/2019-03-13" info="OpenTyrian"/>
</index>

<index name="VM's">
<pkg path="valerius/pkg/vbox5-nova-sculpt/2019-02-27" info="VirtualBox 5"/>
<pkg path="valerius/pkg/templeos/2019-03-14-c" info="TempleOS"/>
</index>

</index>
@@ -1,10 +1,18 @@
_/src/memmgr
_/src/compat
_/src/handle
_/src/libos2srv
_/src/libos2fs
_/src/libos2exec
_/src/libos2app
_/src/lx
_/src/ne
_/src/os2exec
_/src/os2fs
_/src/os2srv
_/src/os2app
_/raw/os2_fs
_/src/libc
_/src/vfs
_/src/stdcxx
_/src/tar_rom
@@ -1 +1 @@
2019-03-12-c 9386dbac15d0f5167b945c3bdf8b2ca87975bf1e
2019-03-16-z-x-x-x-x-x-x bb2c34411331ef1f4a2f79d3c895ca8d786746a1
@@ -0,0 +1,103 @@
<runtime ram="256M" caps="768" binary="init">

<requires>
<timer/>
</requires>

<content>
<rom label="os2.tar"/>
<rom label="config.sys"/>
<rom label="kal.map"/>
<rom label="core"/>
<rom label="init"/>
<rom label="timer"/>
<rom label="tar_rom"/>
<rom label="ld.lib.so"/>
<rom label="libc.lib.so"/>
<rom label="libm.lib.so"/>
<rom label="vfs.lib.so"/>
<rom label="compat.lib.so"/>
<rom label="memmgr.lib.so"/>
<rom label="handle.lib.so"/>
<rom label="lx.ixf"/>
<rom label="ne.ixf"/>
<rom label="os2fs"/>
<rom label="os2exec"/>
<rom label="os2srv"/>
<rom label="os2app"/>
<rom label="os2fs.lib.so"/>
<rom label="os2exec.lib.so"/>
<rom label="os2srv.lib.so"/>
<rom label="os2app.lib.so"/>
</content>

<config>
<parent-provides>
<service name="ROM"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="Timer"/>
</parent-provides>
<default-route>
<service name="CPI" label="exec"> <child name="os2exec"/> </service>
<service name="CPI" label="fs"> <child name="os2fs"/> </service>
<service name="CPI"> <child name="os2srv"/> </service>
<service name="ROM" label_prefix="file/system">
<child name="tar_rom"/>
</service>
<service name="ROM"> <parent/> </service>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="120"/>
<start name="tar_rom">
<resource name="RAM" quantum="6M"/>
<provides><service name="ROM"/></provides>
<config>
<archive name="os2.tar"/>
</config>
</start>
<start name="os2srv">
<provides>
<service name="CPI"/>
</provides>
<resource name="RAM" quantum="3M"/>
<config verbose="yes">
<config-file value="config.sys"/>
</config>
</start>
<start name="os2exec">
<provides>
<service name="CPI"/>
</provides>
<resource name="RAM" quantum="100M"/>
<config verbose="yes">
<config-file value="config.sys"/>
</config>
</start>
<start name="os2fs">
<provides>
<service name="CPI"/>
<service name="ROM"/>
</provides>
<resource name="RAM" quantum="14M"/>
<config verbose="yes">
<vfs>
<tar name="os2.tar"/>
</vfs>
</config>
<route>
<service name="File_system"> <child name="ram_fs"/> </service>
<service name="CPI"> <child name="os2srv"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="os2app">
<resource name="RAM" quantum="2M"/>
<config verbose="yes">
<arg value="file/system/mini33.exe"/>
</config>
</start>
</config>
</runtime>
@@ -1 +1 @@
2019-03-12-c 0ae9df1db1d6cedcc0a12caebe98a3da0ec52be8
2019-03-16-z-x-x-x-x-x-x d56a8e742b32dd26869f43f9ff3998963d736948
@@ -1 +1 @@
2019-03-12-c 50ca917da722517e3a1fc2cfdce2d61c6165dab3
2019-03-12-d cd0f7f481d62cc94819fea44e6df43d76083d285
@@ -1 +1 @@
2019-03-12-c 82eba1fc993b2bf0b494b3d332b50d2d3da199e3
2019-03-12-d cd1213596e053e94b64dbedcad13689998236db9
@@ -1 +1 @@
2019-03-10-c 015b0001350be5ca60addbb0f4501d18733663db
2019-03-16-z-x 609c654368142dc530643ce93434632abcc9dc26
@@ -20,9 +20,6 @@ append build_components {
install_config {
<config>
<parent-provides>
<service name="IRQ"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="ROM"/>
<service name="PD"/>
<service name="RM"/>
@@ -22,15 +22,16 @@ vpath %.c $(OS3_DIR)/shared/app/os2app
all: map

.PHONY: map
map: app/os2app bin app app/os2app
@(cd app/os2app && \
if [ -f os2app ]; then \
nm os2app | grep 'Kal' | awk '{printf "0x%s %s\n", $$1, $$3}' >os2app.1; \
else touch os2app; touch os2app.1; fi && \
wc -l os2app.1 | awk '{print $$1}' >kal.map && \
cat os2app.1 >>kal.map)
@cd ../..
@cd bin && ln -sf $(CURDIR)/app/os2app/kal.map kal.map
map: $(CURDIR)/app/os2app/os2app bin app
echo $(CURDIR)
@(if [ -f $(CURDIR)/os2app ]; then \
nm $(CURDIR)/os2app | grep 'Kal' | awk '{printf "0x%s %s\n", $$1, $$3}' >$(CURDIR)/os2app.1; \
else \
touch $(CURDIR)/os2app; touch $(CURDIR)/os2app.1; \
fi && wc -l $(CURDIR)/os2app.1 | awk '{print $$1}' >$(CURDIR)/kal.map && \
cat $(CURDIR)/os2app.1 >>$(CURDIR)/kal.map)
# @cd ../..
@cd bin && ln -sf $(CURDIR)/kal.map kal.map

bin:
@if [ ! -d $@ ]; then \
@@ -42,7 +43,7 @@ app:
mkdir -p $@; \
fi

app/os2app:
@if [ ! -d $@ ]; then \
mkdir -p $@; \
$(CURDIR)/app/os2app/os2app:
@if [ ! -d $(dir $@) ]; then \
mkdir -p $(dir $@); \
fi

0 comments on commit 63d350c

Please sign in to comment.
You can’t perform that action at this time.