ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-08 11:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Vancouver: use github version

Browse Source 
Fixes #361
This commit is contained in:
Alexander Boettcher 2012-10-02 14:53:27 +02:00 committed by Norman Feske
parent 56243820ee
commit 2f460b4638
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ports/ports/vancouver.mk
View File

@ -1,7 +1,11 @@
VANCOUVER_VERSION = 0.4
VANCOUVER = vancouver-$(VANCOUVER_VERSION)
VANCOUVER_TBZ2 = $(VANCOUVER).tar.bz2
VANCOUVER_URL = http://os.inf.tu-dresden.de/~jsteckli/nova/nova-userland-$(VANCOUVER_VERSION).tar.bz2
VANCOUVER_REV = a7f4c2de42247e7a7c6ddb27a48f8a7d93d469ba
VANCOUVER = vancouver-git
VANCOUVER_URL = git://github.com/TUD-OS/NUL.git
#
# Check for tools
#
$(call check_tool,git)
#
# Interface to top-level prepare Makefile
@ -13,9 +17,13 @@ prepare:: $(CONTRIB_DIR)/$(VANCOUVER)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(VANCOUVER_TBZ2):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) -O $@ $(VANCOUVER_URL) && touch $@
$(DOWNLOAD_DIR)/$(VANCOUVER)/.git:
$(VERBOSE)git clone $(VANCOUVER_URL) $(DOWNLOAD_DIR)/$(VANCOUVER) && \
cd download/vancouver-git && \
git reset --hard $(VANCOUVER_REV) && \
cd ../.. && touch $@
$(CONTRIB_DIR)/$(VANCOUVER): $(DOWNLOAD_DIR)/$(VANCOUVER_TBZ2)
$(VERBOSE)tar xfj $< --transform "s/nova-userland/vancouver/" -C $(CONTRIB_DIR)
$(CONTRIB_DIR)/$(VANCOUVER)/.git: $(DOWNLOAD_DIR)/$(VANCOUVER)/.git
$(VERBOSE)git clone $(DOWNLOAD_DIR)/$(VANCOUVER) $(CONTRIB_DIR)/$(VANCOUVER)
$(CONTRIB_DIR)/$(VANCOUVER): $(CONTRIB_DIR)/$(VANCOUVER)/.git

2
ports/src/vancouver/boot_module_provider.h
View File

@ -93,7 +93,7 @@ class Boot_module_provider
/*
* Copy content to destination buffer
*/
memcpy(dst, src, src_len);
Genode::memcpy(dst, src, src_len);
/*
* Detach ROM dataspace from local address space. The ROM

11
ports/src/vancouver/main.cc
View File

@ -47,7 +47,6 @@
/* NOVA userland includes */
#include <nul/vcpu.h>
#include <nul/motherboard.h>
#include <sys/semaphore.h>
#include <sys/hip.h>
/* local includes */
@ -950,13 +949,6 @@ class Machine : public StaticReceiver<Machine>
return false;
}
bool receive(MessageVirtualNet &msg)
{
if (verbose_debug)
PDBG("MessageVirtualNet");
return false;
}
bool receive(MessagePciConfig &msg)
{
if (verbose_debug)
@ -1001,8 +993,7 @@ class Machine : public StaticReceiver<Machine>
_motherboard.bus_timer.add (this, receive_static<MessageTimer>);
_motherboard.bus_time.add (this, receive_static<MessageTime>);
_motherboard.bus_network.add (this, receive_static<MessageNetwork>);
_motherboard.bus_vnet.add (this, receive_static<MessageVirtualNet>);
_motherboard.bus_hwpcicfg.add(this, receive_static<MessagePciConfig>);
_motherboard.bus_hwpcicfg.add(this, receive_static<MessageHwPciConfig>);
_motherboard.bus_acpi.add (this, receive_static<MessageAcpi>);
_motherboard.bus_legacy.add (this, receive_static<MessageLegacy>);
}

6
ports/src/vancouver/target.mk
View File

@ -1,8 +1,8 @@
TARGET = vancouver
CONTRIB_DIR = $(REP_DIR)/contrib/vancouver-0.4
CONTRIB_DIR = $(REP_DIR)/contrib/vancouver-git
VANCOUVER_DIR = $(CONTRIB_DIR)/vancouver
NOVA_INCLUDE_DIR = $(REP_DIR)/contrib/vancouver-0.4/base/include
NOVA_INCLUDE_DIR = $(REP_DIR)/contrib/vancouver-git/base/include
REQUIRES = nova x86_32
@ -25,7 +25,7 @@ SERVICE_SRC_CC += hostsink.cc
SRC_CC += $(filter-out $(FILTER_OUT),$(addprefix model/,$(MODEL_SRC_CC)))
SRC_CC += $(filter-out $(FILTER_OUT),$(addprefix executor/,$(EXECUTOR_SRC_CC)))
SRC_CC += base/service/hostsink.cc
SRC_CC += base/service/hostsink.cc base/lib/runtime/string.cc
INC_DIR += $(PRG_DIR)
INC_DIR += $(VANCOUVER_DIR)/model