ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-30 02:28:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ports: migrate to new ports mechanism

Browse Source 
Issue #1082
This commit is contained in:
Norman Feske 2014-05-17 00:57:41 +02:00
parent e17f271ba6
commit 6adbb9e438
134 changed files with 515 additions and 1044 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
repos/ports/lib/mk/virtualbox-common.inc
View File

@ -5,14 +5,12 @@ VBOX_MACH_ASM_OPT_x86_32 = -f elf32
VBOX_MACH_CC_OPT_x86_64 = -DRT_ARCH_AMD64 -D__AMD64__ -DHC_ARCH_BITS=64 VBOX_MACH_CC_OPT_x86_64 = -DRT_ARCH_AMD64 -D__AMD64__ -DHC_ARCH_BITS=64
VBOX_MACH_ASM_OPT_x86_64 = -f elf64 VBOX_MACH_ASM_OPT_x86_64 = -f elf64
include $(REP_DIR)/ports/virtualbox.inc
ifeq ($(shell which yasm),) ifeq ($(shell which yasm),)
REQUIRES += installation_of_yasm REQUIRES += installation_of_yasm
REQUIRES += installation_of_iasl REQUIRES += installation_of_iasl
endif endif
VIRTUALBOX_DIR = $(REP_DIR)/contrib/$(VIRTUALBOX) VIRTUALBOX_DIR = $(call select_from_ports,virtualbox)/src/app/virtualbox
VBOX_DIR = $(VIRTUALBOX_DIR)/src/VBox VBOX_DIR = $(VIRTUALBOX_DIR)/src/VBox
VBOX_CC_OPT += -DIN_RING3 -DVBOX -DVBOX_OSE \ VBOX_CC_OPT += -DIN_RING3 -DVBOX -DVBOX_OSE \
@ -38,9 +36,15 @@ VBOX_CC_OPT += -DUSE_SDL
VBOX_CC_OPT += -DRTLOG_REL_ENABLED -DRT_STRICT -DVBOX_STRICT VBOX_CC_OPT += -DRTLOG_REL_ENABLED -DRT_STRICT -DVBOX_STRICT
VIRTUALBOX_VERSION_MAJOR := $(shell cat $(VIRTUALBOX_DIR)/Config.kmk | grep "VBOX_VERSION_MAJOR = " | grep -v "'VBOX_VERSION_MAJOR" | sed "s/^.*= //")
VIRTUALBOX_VERSION_MINOR := $(shell cat $(VIRTUALBOX_DIR)/Config.kmk | grep "VBOX_VERSION_MINOR = " | grep -v "'VBOX_VERSION_MINOR" | sed "s/^.*= //")
VIRTUALBOX_VERSION_BUILD := $(shell cat $(VIRTUALBOX_DIR)/Config.kmk | grep "VBOX_VERSION_BUILD = " | grep -v "'VBOX_VERSION_BUILD" | sed "s/^.*= //")
VBOX_CC_OPT += -DVBOX_VERSION_MAJOR=$(VIRTUALBOX_VERSION_MAJOR) \ VBOX_CC_OPT += -DVBOX_VERSION_MAJOR=$(VIRTUALBOX_VERSION_MAJOR) \
-DVBOX_VERSION_MINOR=$(VIRTUALBOX_VERSION_MINOR) \ -DVBOX_VERSION_MINOR=$(VIRTUALBOX_VERSION_MINOR) \
-DVBOX_VERSION_BUILD=$(VIRTUALBOX_VERSION_BUILD) -DVBOX_VERSION_BUILD=$(VIRTUALBOX_VERSION_BUILD) \
-DVBOX_VERSION_STRING=\"$(VIRTUALBOX_VERSION_MAJOR).$(VIRTUALBOX_VERSION_MINOR).$(VIRTUALBOX_VERSION_BUILD)_OSE\"
VBOX_CC_OPT += -DVBOX_HDD_NO_DYNAMIC_BACKENDS VBOX_CC_OPT += -DVBOX_HDD_NO_DYNAMIC_BACKENDS

2
repos/ports/mk/noux.mk
View File

@ -33,7 +33,7 @@ NOUX_PKG ?= $(TARGET)
LIBS += libc libm libc_noux LIBS += libc libm libc_noux
NOUX_PKG_DIR ?= $(wildcard $(REP_DIR)/contrib/$(NOUX_PKG)-*) NOUX_PKG_DIR ?= $(call select_from_ports,$(NOUX_PKG))/src/noux-pkg/$(NOUX_PKG)
PWD = $(shell pwd) PWD = $(shell pwd)

1
repos/ports/ports/arora.hash Normal file
View File

@ -0,0 +1 @@
dummy

26
repos/ports/ports/arora.mk
View File

@ -1,26 +0,0 @@
ARORA = arora-0.11.0
ARORA_TGZ = $(ARORA).tar.gz
ARORA_URL = http://arora.googlecode.com/files/$(ARORA_TGZ)
#
# Interface to top-level prepare Makefile
#
PORTS += $(ARORA)
prepare-arora: $(CONTRIB_DIR)/$(ARORA)
PATCHES_DIR = src/app/arora/patches
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(ARORA_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(ARORA_URL) && touch $@
$(CONTRIB_DIR)/$(ARORA): $(DOWNLOAD_DIR)/$(ARORA_TGZ)
$(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@
$(VERBOSE)for p in $(shell cat $(PATCHES_DIR)/series); do \
patch -d $@ -p1 -i ../../$(PATCHES_DIR)/$$p; done;
clean-arora:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(ARORA)

12
repos/ports/ports/arora.port Normal file
View File

@ -0,0 +1,12 @@
LICENSE := unknown
VERSION := 0.11.0
DOWNLOADS := arora.archive
URL(arora) := http://arora.googlecode.com/files/arora-$(VERSION).tar.gz
SHA(arora) := 480cfd7482cccbb7ece866fa10afe9acace29b31
DIR(arora) := src/app/arora
PATCHES := $(foreach P,$(shell cat $(REP_DIR)/src/app/arora/patches/series),\
src/app/arora/patches/$P)
PATCH_OPT := -p1 -d src/app/arora

1
repos/ports/ports/bash.hash Normal file
View File

@ -0,0 +1 @@
dummy

36
repos/ports/ports/bash.mk
View File

@ -1,36 +0,0 @@
BASH = bash-4.1
BASH_TGZ = $(BASH).tar.gz
BASH_SIG = $(BASH_TGZ).sig
BASH_BASE_URL = http://ftp.gnu.org/gnu/bash
BASH_URL = $(BASH_BASE_URL)/$(BASH_TGZ)
BASH_URL_SIG = $(BASH_BASE_URL)/$(BASH_SIG)
BASH_KEY = GNU
#
# Interface to top-level prepare Makefile
#
PORTS += $(BASH)
prepare-bash: $(CONTRIB_DIR)/$(BASH)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(BASH_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(BASH_URL) && touch $@
$(DOWNLOAD_DIR)/$(BASH_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(BASH_URL_SIG) && touch $@
$(DOWNLOAD_DIR)/$(BASH_TGZ).verified: $(DOWNLOAD_DIR)/$(BASH_TGZ) \
$(DOWNLOAD_DIR)/$(BASH_SIG)
$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(BASH_TGZ) $(DOWNLOAD_DIR)/$(BASH_SIG) $(BASH_KEY)
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(BASH): $(DOWNLOAD_DIR)/$(BASH_TGZ).verified
$(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
$(VERBOSE)patch -d $(CONTRIB_DIR)/$(BASH) -N -p1 < src/noux-pkg/bash/build.patch
$(VERBOSE)patch -d $(CONTRIB_DIR)/$(BASH) -N -p1 < src/noux-pkg/bash/check_dev_tty.patch
clean-bash:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(BASH)

13
repos/ports/ports/bash.port Normal file
View File

@ -0,0 +1,13 @@
LICENSE := GPLv3
VERSION := 4.1
DOWNLOADS := bash.archive
URL(bash) := http://ftp.gnu.org/gnu/bash/bash-$(VERSION).tar.gz
SHA(bash) := 3bd1ec9c66f3689f6b3495bdaaf9077b2e5dc150
SIG(bash) := ${URL(bash)}.sig
KEY(bash) := GNU
DIR(bash) := src/noux-pkg/bash
PATCHES := src/noux-pkg/bash/build.patch \
src/noux-pkg/bash/check_dev_tty.patch
PATCH_OPT := -p1 -d src/noux-pkg/bash

1
repos/ports/ports/binutils.hash Normal file
View File

@ -0,0 +1 @@
dummy

35
repos/ports/ports/binutils.mk
View File

@ -1,35 +0,0 @@
BINUTILS = binutils-2.22
BINUTILS_TBZ2 = $(BINUTILS).tar.bz2
BINUTILS_SIG = $(BINUTILS_TBZ2).sig
BINUTILS_BASE_URL = ftp://ftp.fu-berlin.de/gnu/binutils
BINUTILS_URL = $(BINUTILS_BASE_URL)/$(BINUTILS_TBZ2)
BINUTILS_URL_SIG = $(BINUTILS_BASE_URL)/$(BINUTILS_SIG)
BINUTILS_KEY = GNU
#
# Interface to top-level prepare Makefile
#
PORTS += $(BINUTILS)
prepare-binutils: $(CONTRIB_DIR)/$(BINUTILS)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(BINUTILS_TBZ2):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(BINUTILS_URL) && touch $@
$(DOWNLOAD_DIR)/$(BINUTILS_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(BINUTILS_URL_SIG) && touch $@
$(DOWNLOAD_DIR)/$(BINUTILS_TBZ2).verified: $(DOWNLOAD_DIR)/$(BINUTILS_TBZ2) \
$(DOWNLOAD_DIR)/$(BINUTILS_SIG)
$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(BINUTILS_TBZ2) $(DOWNLOAD_DIR)/$(BINUTILS_SIG) $(BINUTILS_KEY)
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(BINUTILS): $(DOWNLOAD_DIR)/$(BINUTILS_TBZ2).verified
$(VERBOSE)tar xfj $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
$(VERBOSE)patch -d $(CONTRIB_DIR)/$(BINUTILS) -N -p1 < src/noux-pkg/binutils/build.patch
clean-binutils:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(BINUTILS)

12
repos/ports/ports/binutils.port Normal file
View File

@ -0,0 +1,12 @@
LICENSE := GPLv2
VERSION := 2.22
DOWNLOADS := binutils.archive
URL(binutils) := ftp://ftp.fu-berlin.de/gnu/binutils/binutils-$(VERSION).tar.bz2
SHA(binutils) := 65b304a0b9a53a686ce50a01173d1f40f8efe404
SIG(binutils) := ${URL(binutils)}.sig
KEY(binutils) := GNU
DIR(binutils) := src/noux-pkg/binutils
PATCHES := src/noux-pkg/binutils/build.patch
PATCH_OPT := -p1 -d src/noux-pkg/binutils

1
repos/ports/ports/coreutils.hash Normal file
View File

@ -0,0 +1 @@
dummy

34
repos/ports/ports/coreutils.mk
View File

@ -1,34 +0,0 @@
COREUTILS = coreutils-8.9
COREUTILS_TGZ = $(COREUTILS).tar.gz
COREUTILS_SIG = $(COREUTILS_TGZ).sig
COREUTILS_BASE_URL = http://ftp.gnu.org/gnu/coreutils
COREUTILS_URL = $(COREUTILS_BASE_URL)/$(COREUTILS_TGZ)
COREUTILS_URL_SIG = $(COREUTILS_BASE_URL)/$(COREUTILS_SIG)
COREUTILS_KEY = GNU
#
# Interface to top-level prepare Makefile
#
PORTS += $(COREUTILS)
prepare-coreutils: $(CONTRIB_DIR)/$(COREUTILS)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(COREUTILS_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(COREUTILS_URL) && touch $@
$(DOWNLOAD_DIR)/$(COREUTILS_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(COREUTILS_URL_SIG) && touch $@
$(DOWNLOAD_DIR)/$(COREUTILS_TGZ).verified: $(DOWNLOAD_DIR)/$(COREUTILS_TGZ) \
$(DOWNLOAD_DIR)/$(COREUTILS_SIG)
$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(COREUTILS_TGZ) $(DOWNLOAD_DIR)/$(COREUTILS_SIG) $(COREUTILS_KEY)
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(COREUTILS): $(DOWNLOAD_DIR)/$(COREUTILS_TGZ)
$(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
clean-coreutils:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(COREUTILS)

9
repos/ports/ports/coreutils.port Normal file
View File

@ -0,0 +1,9 @@
LICENSE := GPLv3
VERSION := 8.9
DOWNLOADS := coreutils.archive
URL(coreutils) := http://ftp.gnu.org/gnu/coreutils/coreutils-$(VERSION).tar.gz
SHA(coreutils) := 1e7a4d012abf840684d3b769297721377ffc4743
SIG(coreutils) := ${URL(coreutils)}.sig
KEY(coreutils) := GNU
DIR(coreutils) := src/noux-pkg/coreutils

1
repos/ports/ports/dash.hash Normal file
View File

@ -0,0 +1 @@
dummy

24
repos/ports/ports/dash.mk
View File

@ -1,24 +0,0 @@
DASH = dash-0.5.6
DASH_TGZ = $(DASH).tar.gz
DASH_URL = http://gondor.apana.org.au/~herbert/dash/files/$(DASH_TGZ)
#
# Interface to top-level prepare Makefile
#
PORTS += $(DASH)
prepare-dash: $(CONTRIB_DIR)/$(DASH)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(DASH_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(DASH_URL) && touch $@
$(CONTRIB_DIR)/$(DASH): $(DOWNLOAD_DIR)/$(DASH_TGZ)
$(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@
$(VERBOSE)patch -N -p0 < src/noux-pkg/dash/build.patch
clean-dash:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(DASH)

9
repos/ports/ports/dash.port Normal file
View File

@ -0,0 +1,9 @@
LICENSE := BSD
VERSION := 0.5.6
DOWNLOADS := dash.archive
URL(dash) := http://gondor.apana.org.au/~herbert/dash/files/dash-$(VERSION).tar.gz
SHA(dash) := c62f94f09feb5eeb5e4b90793c5b6d5dad6ac003
DIR(dash) := src/noux-pkg/dash
PATCHES := src/noux-pkg/dash/build.patch

1
repos/ports/ports/dosbox.hash Normal file
View File

@ -0,0 +1 @@
dummy

4
repos/ports/ports/dosbox.inc
View File

@ -1,4 +0,0 @@
DOSBOX_REV := 3837
DOSBOX_VERSION := svn-$(DOSBOX_REV)
DOSBOX := dosbox-$(DOSBOX_VERSION)

22
repos/ports/ports/dosbox.mk
View File

@ -1,22 +0,0 @@
include ports/dosbox.inc
DOSBOX_SVN_URL = http://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk
#
# Interface to top-level prepare Makefile
#
PORTS += $(DOSBOX)
prepare-dosbox: $(CONTRIB_DIR)/$(DOSBOX)
#
# Port-specific local rules
#
$(CONTRIB_DIR)/$(DOSBOX):
$(ECHO) "checking out 'dosbox rev. $(DOSBOX_REV)' to '$@'"
$(VERBOSE)svn export $(DOSBOX_SVN_URL)@$(DOSBOX_REV) $@
$(VERBOSE)for i in src/app/dosbox/patches/*.patch; do \
patch -N -p0 < $$i; done || true
clean-dosbox:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(DOSBOX)

12
repos/ports/ports/dosbox.port Normal file
View File

@ -0,0 +1,12 @@
LICENSE := GPLv2
VERSION := svn
DOWNLOADS := dosbox.svn
URL(dosbox) := http://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk
DIR(dosbox) := src/app/dosbox
REV(dosbox) := 3837
PATCHES := $(addprefix src/app/dosbox/patches/,\
$(notdir $(wildcard $(REP_DIR)/src/app/dosbox/patches/*.patch)))
PATCH_OPT := -p2 -d src/app/dosbox

1
repos/ports/ports/e2fsprogs.hash Normal file
View File

@ -0,0 +1 @@
dummy

26
repos/ports/ports/e2fsprogs.mk
View File

@ -1,26 +0,0 @@
include ports/e2fsprogs.inc
#
# Check for tools
#
$(call check_tool,git)
#
# Interface to top-level prepare Makefile
#
PORTS += $(E2FSPROGS)
prepare-e2fsprogs: $(CONTRIB_DIR)/$(E2FSPROGS)
#
# Port-specific local rules
#
$(CONTRIB_DIR)/$(E2FSPROGS):
$(VERBOSE)git clone $(E2FSPROGS_URL) $(CONTRIB_DIR)/$(E2FSPROGS) && \
cd $(CONTRIB_DIR)/$(E2FSPROGS) && \
git checkout -b $(E2FSPROGS_BRANCH) $(E2FSPROGS_BRANCH)
$(VERBOSE)for i in src/noux-pkg/e2fsprogs/patches/*.patch; do \
patch -d $(CONTRIB_DIR)/$(E2FSPROGS) -N -p1 < $$i; done || true
clean-e2fsprogs:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(E2FSPROGS)

9
repos/ports/ports/e2fsprogs.port Normal file
View File

@ -0,0 +1,9 @@
LICENSE := GPLv2
VERSION := 1.42.9
DOWNLOADS := e2fsprogs.git
URL(e2fsprogs) := https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
REV(e2fsprogs) := v$(VERSION)
DIR(e2fsprogs) := src/noux-pkg/e2fsprogs
PATCHES := src/noux-pkg/e2fsprogs/patches/*.patch

1
repos/ports/ports/etc.hash Normal file
View File

@ -0,0 +1 @@
dummy

25
repos/ports/ports/etc.mk
View File

@ -1,25 +0,0 @@
ETC := etc-8.2.0
#
# Interface to top-level prepare Makefile
#
PORTS += $(ETC)
#
# Check for tools
#
$(call check_tool,svn)
#
# Subdirectories to check out from FreeBSD's Subversion repository
#
ETC_SVN_BASE = http://svn.freebsd.org/base/release/8.2.0
$(CONTRIB_DIR)/$(ETC):
$(ECHO) "checking out 'etc' to '$@'"
$(VERBOSE)svn export $(ETC_SVN_BASE)/etc $@
prepare-etc: $(CONTRIB_DIR)/$(ETC)
clean-etc:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(ETC)

7
repos/ports/ports/etc.port Normal file
View File

@ -0,0 +1,7 @@
LICENSE := BSD
VERSION := 8.2.0
DOWNLOADS := etc.svn
URL(etc) := http://svn.freebsd.org/base/release/$(VERSION)/etc
REV(etc) := HEAD
DIR(etc) := src/noux-pkg/etc

1
repos/ports/ports/findutils.hash Normal file
View File

@ -0,0 +1 @@
dummy

35
repos/ports/ports/findutils.mk
View File

@ -1,35 +0,0 @@
FINDUTILS = findutils-4.4.2
FINDUTILS_TGZ = $(FINDUTILS).tar.gz
FINDUTILS_SIG = $(FINDUTILS_TGZ).sig
FINDUTILS_BASE_URL = http://ftp.gnu.org/pub/gnu/findutils
FINDUTILS_URL = $(FINDUTILS_BASE_URL)/$(FINDUTILS_TGZ)
FINDUTILS_URL_SIG = $(FINDUTILS_BASE_URL)/$(FINDUTILS_SIG)
FINDUTILS_KEY = GNU
#
# Interface to top-level prepare Makefile
#
PORTS += $(FINDUTILS)
prepare-findutils: $(CONTRIB_DIR)/$(FINDUTILS)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(FINDUTILS_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FINDUTILS_URL) && touch $@
$(DOWNLOAD_DIR)/$(FINDUTILS_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(FINDUTILS_URL_SIG) && touch $@
$(DOWNLOAD_DIR)/$(FINDUTILS_TGZ).verified: $(DOWNLOAD_DIR)/$(FINDUTILS_TGZ) \
$(DOWNLOAD_DIR)/$(FINDUTILS_SIG)
$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(FINDUTILS_TGZ) $(DOWNLOAD_DIR)/$(FINDUTILS_SIG) $(FINDUTILS_KEY)
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(FINDUTILS): $(DOWNLOAD_DIR)/$(FINDUTILS_TGZ).verified
$(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
$(VERBOSE)patch -d $(CONTRIB_DIR)/$(FINDUTILS) -N -p1 < src/noux-pkg/findutils/build.patch
clean-findutils:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(FINDUTILS)

13
repos/ports/ports/findutils.port Normal file
View File

@ -0,0 +1,13 @@
LICENSE := GPLv3
VERSION := 4.4.2
DOWNLOADS := findutils.archive
URL(findutils) := http://ftp.gnu.org/pub/gnu/findutils/findutils-$(VERSION).tar.gz
SHA(findutils) := e8dd88fa2cc58abffd0bfc1eddab9020231bb024
SIG(findutils) := ${URL(findutils)}
KEY(findutils) := GNU
DIR(findutils) := src/noux-pkg/findutils
PATCHES := src/noux-pkg/findutils/build.patch
PATCH_OPT := -p1 -d src/noux-pkg/findutils

1
repos/ports/ports/grep.hash Normal file
View File

@ -0,0 +1 @@
dummy

32
repos/ports/ports/grep.mk
View File

@ -1,32 +0,0 @@
GNUGREP = grep-2.14
GNUGREP_TXZ = $(GNUGREP).tar.xz
GNUGREP_SIG = $(GNUGREP_TXZ).sig
GNUGREP_URL = http://ftp.gnu.org/pub/gnu/grep
GNUGREP_KEY = GNU
#
# Interface to top-level prepare Makefile
#
PORTS += $(GNUGREP)
prepare-grep: $(CONTRIB_DIR)/$(GNUGREP)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(GNUGREP_TXZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GNUGREP_URL)/$(GNUGREP_TXZ) && touch $@
$(DOWNLOAD_DIR)/$(GNUGREP_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GNUGREP_URL)/$(GNUGREP_SIG) && touch $@
$(CONTRIB_DIR)/$(GNUGREP): $(DOWNLOAD_DIR)/$(GNUGREP_TXZ).verified
$(VERBOSE)tar xfJ $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
$(DOWNLOAD_DIR)/$(GNUGREP_TXZ).verified: $(DOWNLOAD_DIR)/$(GNUGREP_TXZ) \
$(DOWNLOAD_DIR)/$(GNUGREP_SIG)
$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(GNUGREP_TXZ) $(DOWNLOAD_DIR)/$(GNUGREP_SIG) $(GNUGREP_KEY)
$(VERBOSE)touch $@
clean-grep:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(GNUGREP)

9
repos/ports/ports/grep.port Normal file
View File

@ -0,0 +1,9 @@
LICENSE := GPLv3
VERSION := 2.14
DOWNLOADS := grep.archive
URL(grep) := http://ftp.gnu.org/pub/gnu/grep/grep-$(VERSION).tar.xz
SHA(grep) := fb6ea404a0ef915334ca6212c7b517432ffe193e
SIG(grep) := ${URL(grep)}.sig
KEY(grep) := GNU
DIR(grep) := src/noux-pkg/grep

1
repos/ports/ports/lighttpd.hash Normal file
View File

@ -0,0 +1 @@
dummy

36
repos/ports/ports/lighttpd.mk
View File

@ -1,36 +0,0 @@
include ports/lighttpd.inc
LIGHTTPD_TGZ = $(LIGHTTPD).tar.gz
LIGHTTPD_SIG = $(LIGHTTPD_TGZ).asc
LIGHTTPD_BASE_URL = http://download.lighttpd.net/lighttpd/releases-1.4.x
LIGHTTPD_URL = $(LIGHTTPD_BASE_URL)/$(LIGHTTPD_TGZ)
LIGHTTPD_URL_SIG = $(LIGHTTPD_BASE_URL)/$(LIGHTTPD_SIG)
LIGHTTPD_KEY = stbuehler@lighttpd.net
#
# Interface to top-level prepare Makefile
#
PORTS += $(LIGHTTPD)
prepare-lighttpd: $(CONTRIB_DIR)/$(LIGHTTPD)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIGHTTPD_URL) && touch $@
$(DOWNLOAD_DIR)/$(LIGHTTPD_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LIGHTTPD_URL_SIG) && touch $@
$(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ).verified: $(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ) \
$(DOWNLOAD_DIR)/$(LIGHTTPD_SIG)
$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ) $(DOWNLOAD_DIR)/$(LIGHTTPD_SIG) $(LIGHTTPD_KEY)
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(LIGHTTPD): $(DOWNLOAD_DIR)/$(LIGHTTPD_TGZ).verified
$(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
$(VERBOSE)patch -N -p1 < src/app/lighttpd/disable_gethostbyaddr_fcntl.patch
clean-lighttpd:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LIGHTTPD)

11
repos/ports/ports/lighttpd.port Normal file
View File

@ -0,0 +1,11 @@
LICENSE := BSD
VERSION := 1.4.31
DOWNLOADS := lighttpd.archive
URL(lighttpd) := http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$(VERSION).tar.gz
SHA(lighttpd) := 6b3babc9df173cea5ae4756c2fd6b0e85e015f2a
SIG(lighttpd) := ${URL(lighttpd)}.asc
KEY(lighttpd) := stbuehler@lighttpd.net
DIR(lighttpd) := src/app/lighttpd
PATCHES := src/app/lighttpd/disable_gethostbyaddr_fcntl.patch

1
repos/ports/ports/lynx.hash Normal file
View File

@ -0,0 +1 @@
dummy

39
repos/ports/ports/lynx.mk
View File

@ -1,39 +0,0 @@
LYNX = lynx-2.8.8.dev12
LYNX_TGZ = $(LYNX).tar.gz
LYNX_SIG = $(LYNX_TGZ).asc
LYNX_URL = http://lynx.isc.org/gnumatic/$(LYNX_TGZ)
LYNX_URL_SIG = UNKOWN/$(LYNX_SIG)
LYNX_KEY = dickey@sf1.isc.org
#
# Interface to top-level prepare Makefile
#
PORTS += $(LYNX)
prepare-lynx: $(CONTRIB_DIR)/$(LYNX)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(LYNX_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) -O $@ $(LYNX_URL) && touch $@
$(DOWNLOAD_DIR)/$(LYNX_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(LYNX_URL_SIG) && touch $@
$(DOWNLOAD_DIR)/$(LYNX_TGZ).verified: $(DOWNLOAD_DIR)/$(LYNX_TGZ)
#
# XXX The current source of the lynx tarball does not contain the signature
# file. The official location contains the signature. Thus, upon
# switching to the official location, the signature check can be
# enabled.
#
#$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(LYNX_TGZ) $(DOWNLOAD_DIR)/$(LYNX_SIG) $(LYNX_KEY)
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(LYNX): $(DOWNLOAD_DIR)/$(LYNX_TGZ).verified
$(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
$(VERBOSE)patch -d contrib/ -N -p0 < src/noux-pkg/lynx/build.patch
clean-lynx:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LYNX)

10
repos/ports/ports/lynx.port Normal file
View File

@ -0,0 +1,10 @@
LICENSE := GPLv2
VERSION := 2.8.8.dev12
DOWNLOADS := lynx.archive
URL(lynx) := http://lynx.isc.org/gnumatic/lynx-$(VERSION).tar.gz
SHA(lynx) := 73cb60708e9746c74b3ee22ddcfe7d7a8fcb01b8
SIG(lynx) := ${URL(lynx)}.asc
DIR(lynx) := src/noux-pkg/lynx
PATCHES := src/noux-pkg/lynx/build.patch

1
repos/ports/ports/make.hash Normal file
View File

@ -0,0 +1 @@
dummy

34
repos/ports/ports/make.mk
View File

@ -1,34 +0,0 @@
GNUMAKE = make-3.82
GNUMAKE_TGZ = $(GNUMAKE).tar.gz
GNUMAKE_SIG = $(GNUMAKE_TGZ).sig
GNUMAKE_BASE_URL = http://ftp.gnu.org/pub/gnu/make
GNUMAKE_URL = $(GNUMAKE_BASE_URL)/$(GNUMAKE_TGZ)
GNUMAKE_URL_SIG = $(GNUMAKE_BASE_URL)/$(GNUMAKE_SIG)
GNUMAKE_KEY = GNU
#
# Interface to top-level prepare Makefile
#
PORTS += $(GNUMAKE)
prepare-make: $(CONTRIB_DIR)/$(GNUMAKE)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(GNUMAKE_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GNUMAKE_URL) && touch $@
$(DOWNLOAD_DIR)/$(GNUMAKE_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GNUMAKE_URL_SIG) && touch $@
$(DOWNLOAD_DIR)/$(GNUMAKE_TGZ).verified: $(DOWNLOAD_DIR)/$(GNUMAKE_TGZ) \
$(DOWNLOAD_DIR)/$(GNUMAKE_SIG)
$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(GNUMAKE_TGZ) $(DOWNLOAD_DIR)/$(GNUMAKE_SIG) $(GNUMAKE_KEY)
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(GNUMAKE): $(DOWNLOAD_DIR)/$(GNUMAKE_TGZ).verified
$(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
clean-make:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(GNUMAKE)

9
repos/ports/ports/make.port Normal file
View File

@ -0,0 +1,9 @@
LICENSE := GPLv3
VERSION := 3.82
DOWNLOADS := make.archive
URL(make) := http://ftp.gnu.org/pub/gnu/make/make-$(VERSION).tar.gz
SHA(make) := 92d1b87a30d1c9482e52fb4a68e8a355e7946331
SIG(make) := ${URL(make)}.sig
KEY(make) := GNU
DIR(make) := src/noux-pkg/make

1
repos/ports/ports/netcat.hash Normal file
View File

@ -0,0 +1 @@
dummy

23
repos/ports/ports/netcat.mk
View File

@ -1,23 +0,0 @@
GNUNETCAT = netcat-0.7.1
GNUNETCAT_VERSION = 0.7.1
GNUNETCAT_TBZ = netcat-$(GNUNETCAT_VERSION).tar.bz2
GNUNETCAT_URL = http://downloads.sourceforge.net/sourceforge/netcat/netcat-$(GNUNETCAT_VERSION).tar.bz2
#
# Interface to top-level prepare Makefile
#
PORTS += $(GNUNETCAT)
prepare-netcat: $(CONTRIB_DIR)/$(GNUNETCAT)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(GNUNETCAT_TBZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GNUNETCAT_URL) && touch $@
$(CONTRIB_DIR)/$(GNUNETCAT): $(DOWNLOAD_DIR)/$(GNUNETCAT_TBZ)
$(VERBOSE)tar xfj $< -C $(CONTRIB_DIR) && touch $@
clean-netcat:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(GNUNETCAT)

8
repos/ports/ports/netcat.port Normal file
View File

@ -0,0 +1,8 @@
LICENSE := GPLv2
VERSION := 0.7.1
DOWNLOADS := netcat.archive
URL(netcat) := http://downloads.sourceforge.net/sourceforge/netcat/netcat-$(VERSION).tar.bz2
SHA(netcat) := b761d70fe9e3e8b3fe33a329b9bc31300dc04d11
DIR(netcat) := src/noux-pkg/netcat

1
repos/ports/ports/netperf.hash Normal file
View File

@ -0,0 +1 @@
dummy

33
repos/ports/ports/netperf.mk
View File

@ -1,33 +0,0 @@
NETPERF_VERSION := 2.6.0
NETPERF := netperf
#
# Interface to top-level prepare Makefile
#
PORTS += $(NETPERF)-$(NETPERF_VERSION)
#
# Check for tools
#
$(call check_tool,svn)
#
# Subdirectories to check out
#
NETPERF_SVN_BASE = http://www.netperf.org/svn
$(CONTRIB_DIR)/$(NETPERF):
$(ECHO) "checking out 'netperf' to '$@'"
$(VERBOSE)svn export $(NETPERF_SVN_BASE)/netperf2/tags/$(NETPERF)-$(NETPERF_VERSION) $@
checkout-netperf: $(CONTRIB_DIR)/$(NETPERF)
apply_patches-netperf: checkout-netperf
$(VERBOSE)find $(CURDIR)/src/app/netperf/ -name "*.patch" |\
xargs -ixxx sh -c "patch -p0 -r - -N -d $(CONTRIB_DIR)/$(NETPERF) < xxx" || true
$(VERBOSE)echo '#define NETPERF_VERSION "$(NETPERF_VERSION)"' >$(CONTRIB_DIR)/$(NETPERF)/src/netperf_version.h
prepare-netperf: apply_patches-netperf
clean-netperf:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(NETPERF)

13
repos/ports/ports/netperf.port Normal file
View File

@ -0,0 +1,13 @@
LICENSE := netperf
VERSION := 2.6.0
DOWNLOADS := netperf.svn
URL(netperf) := http://www.netperf.org/svn/netperf2/tags/netperf-$(VERSION)
REV(netperf) := HEAD
DIR(netperf) := src/app/netperf
PATCHES := src/app/netperf/*.patch
default: apply_version
apply_version: $(DOWNLOADS)
$(VERBOSE)echo '#define NETPERF_VERSION "$(VERSION)"' > src/app/netperf/src/netperf_version.h

1
repos/ports/ports/openssh.hash Normal file
View File

@ -0,0 +1 @@
dummy

37
repos/ports/ports/openssh.mk
View File

@ -1,37 +0,0 @@
OPENSSH = openssh-6.1p1
OPENSSH_TGZ = $(OPENSSH).tar.gz
OPENSSH_SIG = $(OPENSSH_TGZ).asc
OPENSSH_BASE_URL = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
OPENSSH_URL = $(OPENSSH_BASE_URL)/$(OPENSSH_TGZ)
OPENSSH_URL_SIG = $(OPENSSH_BASE_URL)/$(OPENSSH_SIG)
OPENSSH_KEY = 3981992A1523ABA079DBFC66CE8ECB0386FF9C48
#
# Interface to top-level prepare Makefile
#
PORTS += $(OPENSSH)
prepare-openssh: $(CONTRIB_DIR)/$(OPENSSH)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(OPENSSH_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(OPENSSH_URL) && touch $@
$(DOWNLOAD_DIR)/$(OPENSSH_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(OPENSSH_URL_SIG) && touch $@
$(DOWNLOAD_DIR)/$(OPENSSH_TGZ).verified: $(DOWNLOAD_DIR)/$(OPENSSH_TGZ) \
$(DOWNLOAD_DIR)/$(OPENSSH_SIG)
$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(OPENSSH_TGZ) $(DOWNLOAD_DIR)/$(OPENSSH_SIG) $(OPENSSH_KEY)
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(OPENSSH): $(DOWNLOAD_DIR)/$(OPENSSH_TGZ).verified
$(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
$(VERBOSE)patch -d contrib/ -N -p0 < src/noux-pkg/openssh/monitor_fdpass.c.patch
$(VERBOSE)patch -d contrib/ -N -p0 < src/noux-pkg/openssh/sshconnect.h.patch
$(VERBOSE)patch -d contrib/ -N -p0 < src/noux-pkg/openssh/includes_h.patch
clean-openssh:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(OPENSSH)

11
repos/ports/ports/openssh.port Normal file
View File

@ -0,0 +1,11 @@
LICENSE := BSD
VERSION := 6.1p1
DOWNLOADS := openssh.archive
URL(openssh) := ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$(VERSION).tar.gz
SHA(openssh) := 751c92c912310c3aa9cadc113e14458f843fc7b3
SIG(openssh) := ${URL(openssh)}.asc
KEY(openssh) := 3981992A1523ABA079DBFC66CE8ECB0386FF9C48
DIR(openssh) := src/noux-pkg/openssh
PATCHES := src/noux-pkg/openssh/*.patch

1
repos/ports/ports/sed.hash Normal file
View File

@ -0,0 +1 @@
dummy

33
repos/ports/ports/sed.mk
View File

@ -1,33 +0,0 @@
GNUSED = sed-4.2.2
GNUSED_TGZ = $(GNUSED).tar.gz
GNUSED_SIG = $(GNUSED_TGZ).sig
GNUSED_URL = http://ftp.gnu.org/pub/gnu/sed
GNUSED_KEY = GNU
#
# Interface to top-level prepare Makefile
#
PORTS += $(GNUSED)
prepare-sed: $(CONTRIB_DIR)/$(GNUSED)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(GNUSED_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GNUSED_URL)/$(GNUSED_TGZ) && touch $@
$(DOWNLOAD_DIR)/$(GNUSED_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(GNUSED_URL)/$(GNUSED_SIG) && touch $@
$(CONTRIB_DIR)/$(GNUSED): $(DOWNLOAD_DIR)/$(GNUSED_TGZ).verified
$(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
$(DOWNLOAD_DIR)/$(GNUSED_TGZ).verified: $(DOWNLOAD_DIR)/$(GNUSED_TGZ) \
$(DOWNLOAD_DIR)/$(GNUSED_SIG)
$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(GNUSED_TGZ) $(DOWNLOAD_DIR)/$(GNUSED_SIG) $(GNUSED_KEY)
$(VERBOSE)touch $@
clean-sed:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(SED)

9
repos/ports/ports/sed.port Normal file
View File

@ -0,0 +1,9 @@
LICENSE := GPLv3
VERSION := 4.2.2
DOWNLOADS := sed.archive
URL(sed) := http://ftp.gnu.org/pub/gnu/sed/sed-$(VERSION).tar.gz
SHA(sed) := 2f24b4624d1a3080626b11610053996ec30ba0f1
SIG(sed) := ${URL(sed)}
KEY(sed) := GNU
DIR(sed) := src/noux-pkg/sed

1
repos/ports/ports/seoul.hash Normal file
View File

@ -0,0 +1 @@
dummy

68
repos/ports/ports/seoul.mk
View File

@ -1,68 +0,0 @@
SEOUL_BRANCH = genode_13_08
SEOUL = seoul-git
SEOUL_URL = https://github.com/alex-ab/seoul.git
#
# Check for tools
#
$(call check_tool,git)
#
# Interface to top-level prepare Makefile
#
PORTS += $(SEOUL)
#
# We need to execute some python scripts for preparing the i82576vf
# device model.
#
PYTHON2 := $(notdir $(lastword $(shell which python2 python2.{4,5,6,7,8})))
ifeq ($(PYTHON2),)
prepare: python_not_installed
python_not_installed:
$(ECHO) "Error: Seoul needs Python 2 to be installed"
@false;
endif
prepare-seoul: fetch-new-version $(CONTRIB_DIR)/$(SEOUL)/genode_prepared
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(SEOUL):
$(VERBOSE)git clone $(SEOUL_URL) $(DOWNLOAD_DIR)/$(SEOUL) && \
cd $(DOWNLOAD_DIR)/$(SEOUL) && \
git checkout $(SEOUL_BRANCH) && \
rm -f $(CURDIR)/$(CONTRIB_DIR)/$(SEOUL)/genode_prepared
fetch-new-version: $(DOWNLOAD_DIR)/$(SEOUL)
$(VERBOSE)(cd download/seoul-git && \
git fetch origin --dry-run 2>&1 | grep "$(SEOUL_BRANCH)" && \
git pull origin && \
rm -f $(CURDIR)/$(CONTRIB_DIR)/$(SEOUL)/genode_prepared) | true
I82576VF_DIR = $(CONTRIB_DIR)/$(SEOUL)/model/intel82576vf
EXECUTOR_DIR = $(CONTRIB_DIR)/$(SEOUL)/executor
$(CONTRIB_DIR)/$(SEOUL):
$(VERBOSE)git clone $(DOWNLOAD_DIR)/$(SEOUL) $(CONTRIB_DIR)/$(SEOUL) && \
cd $(CONTRIB_DIR)/$(SEOUL) && \
git checkout $(SEOUL_BRANCH)
$(CONTRIB_DIR)/$(SEOUL)/genode_prepared: $(CONTRIB_DIR)/$(SEOUL)
$(VERBOSE)cd $(CONTRIB_DIR)/$(SEOUL) && git checkout -f $(SEOUL_BRANCH)
$(VERBOSE)echo "fix python version in code generator scripts ..." && \
sed -i "s/env python2/env $(PYTHON2)/" $(I82576VF_DIR)/genreg.py $(EXECUTOR_DIR)/build_instructions.py && \
echo "call code generators ..." && \
cd $(EXECUTOR_DIR) && \
./build_instructions.py > instructions.inc && \
cd $(CURDIR)/$(I82576VF_DIR) && \
./genreg.py reg_pci.py ../../include/model/intel82576vfpci.inc && \
cd $(CURDIR)/$(I82576VF_DIR) && \
./genreg.py reg_mmio.py ../../include/model/intel82576vfmmio.inc && \
touch $(CURDIR)/$@
.PHONY: fetch-new-version
clean-seoul:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(SEOUL)

34
repos/ports/ports/seoul.port Normal file
View File

@ -0,0 +1,34 @@
LICENSE := GPLv2
VERSION := git
DOWNLOADS := seoul.git
URL(seoul) := https://github.com/alex-ab/seoul.git
REV(seoul) := genode_13_08
DIR(seoul) := src/app/seoul
#
# We need to execute some python scripts for preparing the i82576vf
# device model.
#
PYTHON2 := $(notdir $(lastword $(shell which python2 python2.{4,5,6,7,8})))
ifeq ($(PYTHON2),)
default : missing_tool
missing_tool:
$(ECHO) "Error: Seoul needs Python 2 to be installed"
@false;
endif
I82576VF_DIR = src/app/seoul/model/intel82576vf
EXECUTOR_DIR = src/app/seoul/executor
default : additional_steps
additional_steps : $(DOWNLOADS)
@echo "fix python version in code generator scripts ..." && \
sed -i "s/env python2/env $(PYTHON2)/" $(I82576VF_DIR)/genreg.py $(EXECUTOR_DIR)/build_instructions.py && \
echo "call code generators ... takes a while ..." && \
cd $(EXECUTOR_DIR) && \
./build_instructions.py > instructions.inc && \
cd $(CURDIR)/$(I82576VF_DIR) && \
./genreg.py reg_pci.py ../../include/model/intel82576vfpci.inc && \
cd $(CURDIR)/$(I82576VF_DIR) && \
./genreg.py reg_mmio.py ../../include/model/intel82576vfmmio.inc

1
repos/ports/ports/vim.hash Normal file
View File

@ -0,0 +1 @@
dummy

45
repos/ports/ports/vim.mk
View File

@ -1,45 +0,0 @@
VIM = vim-7.3
VIM_TBZ2 = $(VIM).tar.bz2
VIM_URL = ftp://ftp.vim.org/pub/vim/unix/$(VIM_TBZ2)
# from ftp://ftp.vim.org/pub/vim/unix/MD5SUMS
VIM_MD5 = 5b9510a17074e2b37d8bb38ae09edbf2
#
# Interface to top-level prepare Makefile
#
PORTS += $(VIM)
#
# Check for tools
#
$(call check_tool,sed)
prepare-vim: $(CONTRIB_DIR)/$(VIM)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(VIM_TBZ2):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(VIM_URL) && touch $@
$(DOWNLOAD_DIR)/$(VIM_TBZ2).verified: $(DOWNLOAD_DIR)/$(VIM_TBZ2)
$(VERBOSE)$(HASHVERIFIER) $(DOWNLOAD_DIR)/$(VIM_TBZ2) $(VIM_MD5) md5
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(VIM): $(DOWNLOAD_DIR)/$(VIM_TBZ2).verified
$(VERBOSE)tar xfj $(<:.verified=) -C $(CONTRIB_DIR)
$(VERBOSE)mv $(CONTRIB_DIR)/vim73 $@ && touch $@
@#
@# Prevent configure script from breaking unconditionally
@# because of cross compiling.
@#
$(VERBOSE)sed -i "/could not compile program using uint32_t/s/^/#/" $@/src/auto/configure
@#
@# Fix compiled-in VIM install location. Otherwise, the absolute path used
@# during the build will be compiled-in, which makes no sense in the Noux
@# environment
@#
$(VERBOSE)sed -i "/default_vim_dir/s/.(VIMRCLOC)/\/share\/vim/" $@/src/Makefile
$(VERBOSE)patch -d $(CONTRIB_DIR)/$(VIM) -N -p1 < src/noux-pkg/vim/build.patch
clean-vim:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(VIM)

23
repos/ports/ports/vim.port Normal file
View File

@ -0,0 +1,23 @@
LICENSE := Vim
VERSION := 7.3
DOWNLOADS := vim.archive
URL(vim) := ftp://ftp.vim.org/pub/vim/unix/vim-$(VERSION).tar.bz2
SHA(vim) := 46faa96c5fab639899b1c655c23d8755b62f036f
DIR(vim) := src/noux-pkg/vim
PATCHES := src/noux-pkg/vim/build.patch
default : additional_fixes
additional_fixes : $(DOWNLOADS)
@#
@# Prevent configure script from breaking unconditionally
@# because of cross compiling.
@#
$(VERBOSE)sed -i "/could not compile program using uint32_t/s/^/#/" src/noux-pkg/vim/src/auto/configure
@#
@# Fix compiled-in VIM install location. Otherwise, the absolute path used
@# during the build will be compiled-in, which makes no sense in the Noux
@# environment
@#
$(VERBOSE)sed -i "/default_vim_dir/s/.(VIMRCLOC)/\/share\/vim/" src/noux-pkg/vim/src/Makefile

1
repos/ports/ports/virtualbox.hash Normal file
View File

@ -0,0 +1 @@
dummy

5
repos/ports/ports/virtualbox.inc
View File

@ -1,5 +0,0 @@
VIRTUALBOX_VERSION_MAJOR := 4
VIRTUALBOX_VERSION_MINOR := 2
VIRTUALBOX_VERSION_BUILD := 16
VIRTUALBOX = virtualbox-$(VIRTUALBOX_VERSION_MAJOR).$(VIRTUALBOX_VERSION_MINOR).$(VIRTUALBOX_VERSION_BUILD)

85
repos/ports/ports/virtualbox.mk
View File

@ -1,85 +0,0 @@
include ports/virtualbox.inc
VIRTUALBOX = virtualbox-4.2.16
VIRTUALBOX_TBZ2 = VirtualBox-4.2.16.tar.bz2
VIRTUALBOX_URL = http://download.virtualbox.org/virtualbox/4.2.16/$(VIRTUALBOX_TBZ2)
VIRTUALBOX_MD5 = c4a36e2099a317f4715cd3861cdae238
VIRTUALBOX_CONTENT = src/VBox/VMM \
src/VBox/Devices \
src/VBox/Runtime \
src/VBox/GuestHost/HGSMI \
src/VBox/Frontends/VBoxBFE \
src/VBox/Storage \
src/VBox/Disassembler \
src/recompiler \
src/VBox/Main/include/MouseImpl.h \
src/VBox/Main/include/ConsoleEvents.h \
src/VBox/Main/src-client/MouseImpl.cpp \
src/libs/zlib-1.2.6 \
src/libs/liblzf-3.4 \
include/VBox/vmm \
include/iprt \
$(addprefix include/VBox/,types.h cdefs.h hgcmsvc.h \
err.h dis.h disopcode.h \
log.h sup.h pci.h param.h \
ostypes.h VMMDev.h VMMDev2.h \
vusb.h dbg.h version.h \
VBoxVideo.h Hardware bioslogo.h \
scsi.h HGSMI) \
include/VBox/msi.h \
include/VBox/DevPCNet.h \
include/VBox/asmdefs.mac \
include/VBox/err.mac \
include/VBox/vd.h \
include/VBox/vd-ifs.h \
include/VBox/vd-plugin.h \
include/VBox/vd-ifs-internal.h \
include/VBox/vd-cache-plugin.h
#
# Interface to top-level prepare Makefile
#
PORTS += $(VIRTUALBOX)
#
# Check for tools
#
$(call check_tool,iasl)
$(call check_tool,yasm)
PATCHES := $(shell find $(CURDIR)/src/virtualbox/ -name "*.patch")
apply_patches:
$(VERBOSE)set -e; for p in $(PATCHES); do \
echo $$p; \
patch -p0 -N -d $(CONTRIB_DIR)/$(VIRTUALBOX) -i $$p; \
done
prepare-virtualbox: $(CONTRIB_DIR)/$(VIRTUALBOX) apply_patches
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(VIRTUALBOX_TBZ2):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(VIRTUALBOX_URL) && touch $@
$(DOWNLOAD_DIR)/$(VIRTUALBOX_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(VIRTUALBOX_URL_SIG) && touch $@
$(DOWNLOAD_DIR)/$(VIRTUALBOX_TBZ2).verified: $(DOWNLOAD_DIR)/$(VIRTUALBOX_TBZ2)
$(VERBOSE)$(HASHVERIFIER) $(DOWNLOAD_DIR)/$(VIRTUALBOX_TBZ2) $(VIRTUALBOX_MD5) md5
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(VIRTUALBOX): $(DOWNLOAD_DIR)/$(VIRTUALBOX_TBZ2).verified
$(VERBOSE)tar xfj $(<:.verified=) \
--transform "s/$(VIRTUALBOX_TBZ2:.tar.bz2=)/$(VIRTUALBOX)/" \
-C $(CONTRIB_DIR) \
$(addprefix $(VIRTUALBOX_TBZ2:.tar.bz2=)/,$(VIRTUALBOX_CONTENT)) && \
rm $(CONTRIB_DIR)/$(VIRTUALBOX)/src/VBox/Frontends/VBoxBFE/SDLConsole.h && \
rm $(CONTRIB_DIR)/$(VIRTUALBOX)/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h; \
if [ $$? -ne 0 ]; then rm -r $(CONTRIB_DIR)/$(VIRTUALBOX); exit 1; fi
clean-virtualbox:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(VIRTUALBOx)

49
repos/ports/ports/virtualbox.port Normal file
View File

@ -0,0 +1,49 @@
LICENSE := GPLv2
VERSION := 4.2.16
DOWNLOADS := virtualbox.archive
VIRTUALBOX_TBZ2 := VirtualBox-$(VERSION).tar.bz2
URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2)
DIR(virtualbox) := src/app/virtualbox
SHA(virtualbox) := bf95d3c4004169ccde6254e4b72c1bed03cb31c6
PATCHES := src/virtualbox/*.patch
VIRTUALBOX_CONTENT = src/VBox/VMM \
src/VBox/Devices \
src/VBox/Runtime \
src/VBox/GuestHost/HGSMI \
src/VBox/Frontends/VBoxBFE \
src/VBox/Storage \
src/VBox/Disassembler \
src/recompiler \
src/VBox/Main/include/MouseImpl.h \
src/VBox/Main/include/ConsoleEvents.h \
src/VBox/Main/src-client/MouseImpl.cpp \
src/libs/zlib-1.2.6 \
src/libs/liblzf-3.4 \
include/VBox/vmm \
include/iprt \
$(addprefix include/VBox/,types.h cdefs.h hgcmsvc.h \
err.h dis.h disopcode.h \
log.h sup.h pci.h param.h \
ostypes.h VMMDev.h VMMDev2.h \
vusb.h dbg.h version.h \
VBoxVideo.h Hardware bioslogo.h \
scsi.h HGSMI) \
include/VBox/msi.h \
include/VBox/DevPCNet.h \
include/VBox/asmdefs.mac \
include/VBox/err.mac \
include/VBox/vd.h \
include/VBox/vd-ifs.h \
include/VBox/vd-plugin.h \
include/VBox/vd-ifs-internal.h \
include/VBox/vd-cache-plugin.h \
Config.kmk
TAR_OPT(virtualbox) := \
--strip-components 1 \
$(addprefix $(VIRTUALBOX_TBZ2:.tar.bz2=)/,$(VIRTUALBOX_CONTENT)) \
--exclude SDLConsole.h --exclude SDLFramebuffer.h

1
repos/ports/ports/which.hash Normal file
View File

@ -0,0 +1 @@
dummy

34
repos/ports/ports/which.mk
View File

@ -1,34 +0,0 @@
WHICH = which-2.20
WHICH_TGZ = $(WHICH).tar.gz
WHICH_SIG = $(WHICH_TGZ).sig
WHICH_BASE_URL = http://ftp.gnu.org/gnu/which
WHICH_URL = $(WHICH_BASE_URL)/$(WHICH_TGZ)
WHICH_URL_SIG = $(WHICH_BASE_URL)/$(WHICH_SIG)
WHICH_KEY = GNU
#
# Interface to top-level prepare Makefile
#
PORTS += $(WHICH)
prepare-which: $(CONTRIB_DIR)/$(WHICH)
#
# Port-specific local rules
#
$(DOWNLOAD_DIR)/$(WHICH_TGZ):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) -O $@ $(WHICH_URL) && touch $@
$(DOWNLOAD_DIR)/$(WHICH_SIG):
$(VERBOSE)wget -c -P $(DOWNLOAD_DIR) $(WHICH_URL_SIG) && touch $@
$(DOWNLOAD_DIR)/$(WHICH_TGZ).verified: $(DOWNLOAD_DIR)/$(WHICH_TGZ) \
$(DOWNLOAD_DIR)/$(WHICH_SIG)
$(VERBOSE)$(SIGVERIFIER) $(DOWNLOAD_DIR)/$(WHICH_TGZ) $(DOWNLOAD_DIR)/$(WHICH_SIG) $(WHICH_KEY)
$(VERBOSE)touch $@
$(CONTRIB_DIR)/$(WHICH): $(DOWNLOAD_DIR)/$(WHICH_TGZ).verified
$(VERBOSE)tar xfz $(<:.verified=) -C $(CONTRIB_DIR) && touch $@
clean-which:
$(VERBOSE)rm -rf $(CONTRIB_DIR)/$(WHICH)

10
repos/ports/ports/which.port Normal file
View File

@ -0,0 +1,10 @@
LICENSE := GPLv3
VERSION := 2.20
DOWNLOADS := which.archive
URL(which) := http://ftp.gnu.org/gnu/which/which-$(VERSION).tar.gz
SHA(which) := 3bcd6d87aa5231917ba7123319eedcae90cfa0fd
SIG(which) := ${URL(which)}.sig
KEY(which) := GNU
DIR(which) := src/noux-pkg/which

6
repos/ports/run/seoul-auto.run
View File

@ -1,9 +1,9 @@
# #
# \brief Vancouver on Genode - for automated testing # \brief Seoul on Genode - for automated testing
# \author Alexander Boettcher # \author Alexander Boettcher
# \date 2013-06-11 # \date 2013-06-11
# #
# This run script starts the Vancouver VMM booting from a multiboot image. # This run script starts the Seoul VMM booting from a multiboot image.
# It assumes that the module files are present at '<build-dir>/bin/' # It assumes that the module files are present at '<build-dir>/bin/'
# #
@ -54,7 +54,7 @@ append qemu_args " -cpu phenom "
append qemu_args " -net nic,model=e1000 " append qemu_args " -net nic,model=e1000 "
append qemu_args " -nographic " append qemu_args " -nographic "
run_genode_until {\[init -\> vancouver\] VMM: # Hello Genode world!} 300 run_genode_until {\[init -\> seoul\] VMM: # Hello Genode world!} 300
foreach binary $guest_os_binaries { foreach binary $guest_os_binaries {
exec rm -f bin/$binary exec rm -f bin/$binary

4
repos/ports/run/seoul-disc.run
View File

@ -1,9 +1,9 @@
# #
# \brief Vancouver on Genode - test to boot from a raw disk # \brief Seoul on Genode - test to boot from a raw disk
# \author Alexander Boettcher # \author Alexander Boettcher
# \date 2013-06-11 # \date 2013-06-11
# #
# This run script starts the Vancouver VMM booting from a disc image. # This run script starts the Seoul VMM booting from a disc image.
# It assumes that the module files are present at '<build-dir>/bin/' # It assumes that the module files are present at '<build-dir>/bin/'
# #

4
repos/ports/run/seoul-fancy.run
View File

@ -1,11 +1,11 @@
# #
# \brief Example for using Vancouver on Genode # \brief Example for using Seoul on Genode
# \author Norman Feske # \author Norman Feske
# \author Markus Partheymueller # \author Markus Partheymueller
# \author Alexander Boettcher # \author Alexander Boettcher
# \date 2011-11-21 # \date 2011-11-21
# #
# This run script starts the Vancouver VMM booting the multiboot modules # This run script starts the Seoul VMM booting the multiboot modules
# listed in the 'multiboot' config node. It assumes that the module files # listed in the 'multiboot' config node. It assumes that the module files
# are present at '<build-dir>/bin/' (see the 'boot_modules' variable). # are present at '<build-dir>/bin/' (see the 'boot_modules' variable).
# #

6
repos/ports/run/seoul-kernelbuild.run
View File

@ -1,9 +1,9 @@
# #
# \brief Seoul/Vancouver on Genode - build Linux kernel inside VM # \brief Seoul on Genode - build Linux kernel inside VM
# \author Alexander Boettcher # \author Alexander Boettcher
# \date 2013-06-11 # \date 2013-06-11
# #
# This run script starts the Vancouver VMM booting from a multiboot image. # This run script starts the Seoul VMM booting from a multiboot image.
# It assumes that the module files are present at '<build-dir>/bin/' # It assumes that the module files are present at '<build-dir>/bin/'
# #
@ -61,6 +61,6 @@ append qemu_args " -m 1536 "
append qemu_args " -cpu phenom " append qemu_args " -cpu phenom "
append qemu_args " -nographic " append qemu_args " -nographic "
run_genode_until {\[init -\> vancouver\] VMM: # ! PERF: kbuild [ 0-9]+ s ok} 2000 run_genode_until {\[init -\> seoul\] VMM: # ! PERF: kbuild [ 0-9]+ s ok} 2000
puts "Test succeeded" puts "Test succeeded"

4
repos/ports/run/seoul-net.run
View File

@ -1,9 +1,9 @@
# #
# \brief Vancouver on Genode - for testing network # \brief Seoul on Genode - for testing network
# \author Alexander Boettcher # \author Alexander Boettcher
# \date 2013-06-11 # \date 2013-06-11
# #
# This run script starts the Vancouver VMM booting from a multiboot image. # This run script starts the Seoul VMM booting from a multiboot image.
# It assumes that the module files are present at '<build-dir>/bin/' # It assumes that the module files are present at '<build-dir>/bin/'
# #

18
repos/ports/run/seoul.inc
View File

@ -18,7 +18,7 @@ set build_components {
core init core init
drivers/timer drivers/timer
drivers/rtc drivers/rtc
vancouver app/seoul
drivers/pci drivers/pci
drivers/input drivers/input
} }
@ -223,8 +223,8 @@ append_if $use_framebuffer config {
if {!$use_fancy_stuff} { if {!$use_fancy_stuff} {
append config { append config {
<start name="vancouver"> <start name="seoul">
<binary name="vancouver"/>} <binary name="seoul"/>}
append config " append config "
<resource name=\"RAM\" quantum=\"$memory_vmm_vm\"/>" <resource name=\"RAM\" quantum=\"$memory_vmm_vm\"/>"
append config { append config {
@ -305,7 +305,7 @@ if {$use_fancy_stuff} {
<service name="Rtc"/> <service name="Rtc"/>
</parent-provides> </parent-provides>
<start name="vancouver_fb"> <start name="fb.seoul">
<binary name="liquid_fb"/> <binary name="liquid_fb"/>
<resource name="RAM" quantum="16M"/> <resource name="RAM" quantum="16M"/>
<provides> <provides>
@ -318,14 +318,14 @@ if {$use_fancy_stuff} {
<config xpos="10" ypos="10" width="800" height="600" animate="off"/> <config xpos="10" ypos="10" width="800" height="600" animate="off"/>
</start> </start>
<start name="vancouver"> <start name="seoul">
<binary name="vancouver"/> <binary name="seoul"/>
<resource name="RAM" quantum="256M"/> <resource name="RAM" quantum="256M"/>
<route> <route>
<service name="Timer"><parent/></service> <service name="Timer"><parent/></service>
<service name="Nic"><parent/></service> <service name="Nic"><parent/></service>
<service name="Input"><child name="vancouver_fb"/></service> <service name="Input"><child name="fb.seoul"/></service>
<service name="Framebuffer"><child name="vancouver_fb"/></service> <service name="Framebuffer"><child name="fb.seoul"/></service>
<any-service><parent/></any-service> <any-service><parent/></any-service>
</route> </route>
<configfile name="vm_linux.cfg"/> <configfile name="vm_linux.cfg"/>
@ -348,7 +348,7 @@ set boot_modules {
pci_drv pci_drv
timer timer
rtc_drv rtc_drv
vancouver seoul
vm_linux.cfg vm_linux.cfg
} }

2
repos/ports/src/app/arora/arora.pro
View File

@ -1 +1 @@
include $(REP_DIR)/contrib/$(ARORA)/src/src.pro include $(call select_from_ports,arora)/src/app/arora/src/src.pro

56
repos/ports/src/app/arora/patches/arora_genode.patch
View File

@ -29,7 +29,7 @@ index c373a68..ce18643 100644
--- a/src/adblock/adblock.pri --- a/src/adblock/adblock.pri
+++ b/src/adblock/adblock.pri +++ b/src/adblock/adblock.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/adblock +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/adblock
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -39,7 +39,7 @@ index ee03def..0debe73 100644
--- a/src/bookmarks/bookmarks.pri --- a/src/bookmarks/bookmarks.pri
+++ b/src/bookmarks/bookmarks.pri +++ b/src/bookmarks/bookmarks.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/bookmarks +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/bookmarks
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -49,13 +49,13 @@ index ee03def..0debe73 100644
bookmarksdialog.ui bookmarksdialog.ui
-include(xbel/xbel.pri) -include(xbel/xbel.pri)
+include $(REP_DIR)/contrib/$(ARORA)/src/bookmarks/xbel/xbel.pri +include $(call select_from_ports,arora)/src/app/arora/src/bookmarks/xbel/xbel.pri
diff --git a/src/bookmarks/xbel/xbel.pri b/src/bookmarks/xbel/xbel.pri diff --git a/src/bookmarks/xbel/xbel.pri b/src/bookmarks/xbel/xbel.pri
index 02b0258..ffd181d 100644 index 02b0258..ffd181d 100644
--- a/src/bookmarks/xbel/xbel.pri --- a/src/bookmarks/xbel/xbel.pri
+++ b/src/bookmarks/xbel/xbel.pri +++ b/src/bookmarks/xbel/xbel.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/bookmarks/xbel +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/bookmarks/xbel
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -118,7 +118,7 @@ index 6ee163d..a3616e2 100644
--- a/src/history/history.pri --- a/src/history/history.pri
+++ b/src/history/history.pri +++ b/src/history/history.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/history +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/history
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -128,7 +128,7 @@ index ba33005..cace42b 100644
--- a/src/locationbar/locationbar.pri --- a/src/locationbar/locationbar.pri
+++ b/src/locationbar/locationbar.pri +++ b/src/locationbar/locationbar.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/locationbar +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/locationbar
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -161,7 +161,7 @@ index 8ecf533..4781160 100644
--- a/src/network/cookiejar/cookiejar.pri --- a/src/network/cookiejar/cookiejar.pri
+++ b/src/network/cookiejar/cookiejar.pri +++ b/src/network/cookiejar/cookiejar.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/network/cookiejar +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/network/cookiejar
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -171,7 +171,7 @@ index 8ecf533..4781160 100644
cookiesexceptions.ui cookiesexceptions.ui
-include($$PWD/networkcookiejar/networkcookiejar.pri) -include($$PWD/networkcookiejar/networkcookiejar.pri)
+include $(REP_DIR)/contrib/$(ARORA)/src/network/cookiejar/networkcookiejar/networkcookiejar.pri +include $(call select_from_ports,arora)/src/app/arora/src/network/cookiejar/networkcookiejar/networkcookiejar.pri
+ +
diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar.pri b/src/network/cookiejar/networkcookiejar/networkcookiejar.pri diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar.pri b/src/network/cookiejar/networkcookiejar/networkcookiejar.pri
@ -179,7 +179,7 @@ index 78ac273..f6ae783 100644
--- a/src/network/cookiejar/networkcookiejar/networkcookiejar.pri --- a/src/network/cookiejar/networkcookiejar/networkcookiejar.pri
+++ b/src/network/cookiejar/networkcookiejar/networkcookiejar.pri +++ b/src/network/cookiejar/networkcookiejar/networkcookiejar.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/network/cookiejar/networkcookiejar +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/network/cookiejar/networkcookiejar
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -189,7 +189,7 @@ index 5c912f4..ca3bdbf 100644
--- a/src/network/network.pri --- a/src/network/network.pri
+++ b/src/network/network.pri +++ b/src/network/network.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/network +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/network
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -199,13 +199,13 @@ index 5c912f4..ca3bdbf 100644
schemeaccesshandler.cpp schemeaccesshandler.cpp
-include(cookiejar/cookiejar.pri) -include(cookiejar/cookiejar.pri)
+include $(REP_DIR)/contrib/$(ARORA)/src/network/cookiejar/cookiejar.pri +include $(call select_from_ports,arora)/src/app/arora/src/network/cookiejar/cookiejar.pri
diff --git a/src/opensearch/opensearch.pri b/src/opensearch/opensearch.pri diff --git a/src/opensearch/opensearch.pri b/src/opensearch/opensearch.pri
index dbace74..427cf2a 100644 index dbace74..427cf2a 100644
--- a/src/opensearch/opensearch.pri --- a/src/opensearch/opensearch.pri
+++ b/src/opensearch/opensearch.pri +++ b/src/opensearch/opensearch.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/opensearch +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/opensearch
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -221,7 +221,7 @@ index 2033e59..193cc82 100644
--- a/src/qwebplugins/clicktoflash/clicktoflash.pri --- a/src/qwebplugins/clicktoflash/clicktoflash.pri
+++ b/src/qwebplugins/clicktoflash/clicktoflash.pri +++ b/src/qwebplugins/clicktoflash/clicktoflash.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/clicktoflash +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/clicktoflash
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -231,7 +231,7 @@ index d3d9cb7..26b19db 100644
--- a/src/qwebplugins/qwebplugins.pri --- a/src/qwebplugins/qwebplugins.pri
+++ b/src/qwebplugins/qwebplugins.pri +++ b/src/qwebplugins/qwebplugins.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/qwebplugins
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -241,7 +241,7 @@ index d3d9cb7..26b19db 100644
webpluginfactory.cpp webpluginfactory.cpp
-include(clicktoflash/clicktoflash.pri) -include(clicktoflash/clicktoflash.pri)
+include $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/clicktoflash/clicktoflash.pri +include $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/clicktoflash/clicktoflash.pri
diff --git a/src/src.pri b/src/src.pri diff --git a/src/src.pri b/src/src.pri
index 7c1a0e3..5812c05 100644 index 7c1a0e3..5812c05 100644
@ -251,7 +251,7 @@ index 7c1a0e3..5812c05 100644
-CONFIG += qt warn_on -CONFIG += qt warn_on
-contains(QT_BUILD_PARTS, tools): CONFIG += uitools -contains(QT_BUILD_PARTS, tools): CONFIG += uitools
-else : DEFINES += QT_NO_UITOOLS -else : DEFINES += QT_NO_UITOOLS
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src
+ +
+CC_CXX_OPT += -DGITVERSION=\"\\\"0\\\"\" -DGITCHANGENUMBER=\"\\\"0\\\"\" -include qhash.h -include quiloader.h +CC_CXX_OPT += -DGITVERSION=\"\\\"0\\\"\" -DGITCHANGENUMBER=\"\\\"0\\\"\" -include qhash.h -include quiloader.h
@ -290,15 +290,15 @@ index 7c1a0e3..5812c05 100644
-include(qwebplugins/qwebplugins.pri) -include(qwebplugins/qwebplugins.pri)
-include(utils/utils.pri) -include(utils/utils.pri)
-include(useragent/useragent.pri) -include(useragent/useragent.pri)
+include $(REP_DIR)/contrib/$(ARORA)/src/adblock/adblock.pri +include $(call select_from_ports,arora)/src/app/arora/src/adblock/adblock.pri
+include $(REP_DIR)/contrib/$(ARORA)/src/bookmarks/bookmarks.pri +include $(call select_from_ports,arora)/src/app/arora/src/bookmarks/bookmarks.pri
+include $(REP_DIR)/contrib/$(ARORA)/src/history/history.pri +include $(call select_from_ports,arora)/src/app/arora/src/history/history.pri
+include $(REP_DIR)/contrib/$(ARORA)/src/locationbar/locationbar.pri +include $(call select_from_ports,arora)/src/app/arora/src/locationbar/locationbar.pri
+include $(REP_DIR)/contrib/$(ARORA)/src/network/network.pri +include $(call select_from_ports,arora)/src/app/arora/src/network/network.pri
+include $(REP_DIR)/contrib/$(ARORA)/src/opensearch/opensearch.pri +include $(call select_from_ports,arora)/src/app/arora/src/opensearch/opensearch.pri
+include $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/qwebplugins.pri +include $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/qwebplugins.pri
+include $(REP_DIR)/contrib/$(ARORA)/src/utils/utils.pri +include $(call select_from_ports,arora)/src/app/arora/src/utils/utils.pri
+include $(REP_DIR)/contrib/$(ARORA)/src/useragent/useragent.pri +include $(call select_from_ports,arora)/src/app/arora/src/useragent/useragent.pri
RESOURCES += \ RESOURCES += \
- $$PWD/data/data.qrc \ - $$PWD/data/data.qrc \
@ -361,7 +361,7 @@ index dab73ff..8460fd4 100644
-include(../install.pri) -include(../install.pri)
- -
-include(src.pri) -include(src.pri)
+include $(REP_DIR)/contrib/$(ARORA)/src/src.pri +include $(call select_from_ports,arora)/src/app/arora/src/src.pri
SOURCES += main.cpp SOURCES += main.cpp
@ -417,7 +417,7 @@ index 78f1c48..50f6e1e 100644
--- a/src/useragent/useragent.pri --- a/src/useragent/useragent.pri
+++ b/src/useragent/useragent.pri +++ b/src/useragent/useragent.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/useragent +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/useragent
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
@ -427,7 +427,7 @@ index fb10c55..489a51d 100644
--- a/src/utils/utils.pri --- a/src/utils/utils.pri
+++ b/src/utils/utils.pri +++ b/src/utils/utils.pri
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/utils +INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/utils
+ +
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD

2
repos/ports/src/app/arora/patches/arora_nitpicker_plugin.patch
View File

@ -15,7 +15,7 @@ index 26b19db..cc54090 100644
@@ -12,4 +12,4 @@ SOURCES += \ @@ -12,4 +12,4 @@ SOURCES += \
webpluginfactory.cpp webpluginfactory.cpp
include $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/clicktoflash/clicktoflash.pri include $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/clicktoflash/clicktoflash.pri
- -
+include $(REP_DIR)/src/app/arora/qwebplugins/nitpicker/nitpicker.pri +include $(REP_DIR)/src/app/arora/qwebplugins/nitpicker/nitpicker.pri
diff --git a/src/qwebplugins/webpluginfactory.cpp b/src/qwebplugins/webpluginfactory.cpp diff --git a/src/qwebplugins/webpluginfactory.cpp b/src/qwebplugins/webpluginfactory.cpp

2
repos/ports/src/app/arora/qwebplugins/nitpicker/nitpicker.pri
View File

@ -1,5 +1,5 @@
INC_DIR += $(PRG_DIR)/qwebplugins/nitpicker INC_DIR += $(PRG_DIR)/qwebplugins/nitpicker
INC_DIR += $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/nitpicker INC_DIR += $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/nitpicker
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD

39
repos/ports/src/app/arora/target.mk
View File

@ -73,24 +73,25 @@ vpath % $(PRG_DIR)/qwebplugins/nitpicker
vpath % $(PRG_DIR)/useragent vpath % $(PRG_DIR)/useragent
vpath % $(PRG_DIR)/utils vpath % $(PRG_DIR)/utils
vpath % $(REP_DIR)/contrib/$(ARORA)/src ARORA_PORT_DIR := $(call select_from_ports,arora)
vpath % $(REP_DIR)/contrib/$(ARORA)/src/adblock vpath % $(ARORA_PORT_DIR)/src/app/arora/src
vpath % $(REP_DIR)/contrib/$(ARORA)/src/bookmarks vpath % $(ARORA_PORT_DIR)/src/app/arora/src/adblock
vpath % $(REP_DIR)/contrib/$(ARORA)/src/bookmarks/xbel vpath % $(ARORA_PORT_DIR)/src/app/arora/src/bookmarks
vpath % $(REP_DIR)/contrib/$(ARORA)/src/network vpath % $(ARORA_PORT_DIR)/src/app/arora/src/bookmarks/xbel
vpath % $(REP_DIR)/contrib/$(ARORA)/src/network/cookiejar vpath % $(ARORA_PORT_DIR)/src/app/arora/src/network
vpath % $(REP_DIR)/contrib/$(ARORA)/src/network/cookiejar/networkcookiejar vpath % $(ARORA_PORT_DIR)/src/app/arora/src/network/cookiejar
vpath % $(REP_DIR)/contrib/$(ARORA)/src/data vpath % $(ARORA_PORT_DIR)/src/app/arora/src/network/cookiejar/networkcookiejar
vpath % $(REP_DIR)/contrib/$(ARORA)/src/data/graphics vpath % $(ARORA_PORT_DIR)/src/app/arora/src/data
vpath % $(REP_DIR)/contrib/$(ARORA)/src/data/searchengines vpath % $(ARORA_PORT_DIR)/src/app/arora/src/data/graphics
vpath % $(REP_DIR)/contrib/$(ARORA)/src/history vpath % $(ARORA_PORT_DIR)/src/app/arora/src/data/searchengines
vpath % $(REP_DIR)/contrib/$(ARORA)/src/htmls vpath % $(ARORA_PORT_DIR)/src/app/arora/src/history
vpath % $(REP_DIR)/contrib/$(ARORA)/src/locationbar vpath % $(ARORA_PORT_DIR)/src/app/arora/src/htmls
vpath % $(REP_DIR)/contrib/$(ARORA)/src/opensearch vpath % $(ARORA_PORT_DIR)/src/app/arora/src/locationbar
vpath % $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins vpath % $(ARORA_PORT_DIR)/src/app/arora/src/opensearch
vpath % $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/clicktoflash vpath % $(ARORA_PORT_DIR)/src/app/arora/src/qwebplugins
vpath % $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/nitpicker vpath % $(ARORA_PORT_DIR)/src/app/arora/src/qwebplugins/clicktoflash
vpath % $(REP_DIR)/contrib/$(ARORA)/src/useragent vpath % $(ARORA_PORT_DIR)/src/app/arora/src/qwebplugins/nitpicker
vpath % $(REP_DIR)/contrib/$(ARORA)/src/utils vpath % $(ARORA_PORT_DIR)/src/app/arora/src/useragent
vpath % $(ARORA_PORT_DIR)/src/app/arora/src/utils
-include $(QT_TMPL_DIR)/target_final.inc -include $(QT_TMPL_DIR)/target_final.inc

5
repos/ports/src/app/dosbox/target.mk
View File

@ -1,7 +1,6 @@
TARGET = dosbox TARGET := dosbox
include $(REP_DIR)/ports/dosbox.inc DOSBOX_DIR := $(call select_from_ports,dosbox)/src/app/dosbox
DOSBOX_DIR = $(REP_DIR)/contrib/$(DOSBOX)
SRC_CC_cpu = $(notdir $(wildcard $(DOSBOX_DIR)/src/cpu/*.cpp)) SRC_CC_cpu = $(notdir $(wildcard $(DOSBOX_DIR)/src/cpu/*.cpp))
SRC_CC_debug = $(notdir $(wildcard $(DOSBOX_DIR)/src/debug/*.cpp)) SRC_CC_debug = $(notdir $(wildcard $(DOSBOX_DIR)/src/debug/*.cpp))

12
repos/ports/src/app/lighttpd/disable_gethostbyaddr_fcntl.patch
View File

@ -1,5 +1,4 @@
--- a/contrib/lighttpd-1.4.31/src/fdevent_poll.c.orig +++ src/app/lighttpd/src/fdevent_poll.c
+++ b/contrib/lighttpd-1.4.31/src/fdevent_poll.c
@@ -193,7 +193,7 @@ int fdevent_poll_init(fdevents *ev) { @@ -193,7 +193,7 @@ int fdevent_poll_init(fdevents *ev) {
int fdevent_poll_init(fdevents *ev) { int fdevent_poll_init(fdevents *ev) {
UNUSED(ev); UNUSED(ev);
@ -9,8 +8,7 @@
"s", "poll is not supported, try to set server.event-handler = \"select\""); "s", "poll is not supported, try to set server.event-handler = \"select\"");
return -1; return -1;
--- a/contrib/lighttpd-1.4.31/src/http-header-glue.c.orig +++ src/app/lighttpd/src/http-header-glue.c
+++ b/contrib/lighttpd-1.4.31/src/http-header-glue.c
@@ -175,6 +175,7 @@ int http_response_redirect_to_directory(server *srv, connection *con) { @@ -175,6 +175,7 @@ int http_response_redirect_to_directory(server *srv, connection *con) {
break; break;
#endif #endif
@ -28,8 +26,7 @@
break; break;
default: default:
log_error_write(srv, __FILE__, __LINE__, log_error_write(srv, __FILE__, __LINE__,
--- a/contrib/lighttpd-1.4.31/src/network.c.orig +++ src/app/lighttpd/src/network.c
+++ b/contrib/lighttpd-1.4.31/src/network.c
@@ -301,6 +301,7 @@ static int network_server_init(server *srv, buffer *host_token, specific_config @@ -301,6 +301,7 @@ static int network_server_init(server *srv, buffer *host_token, specific_config
if (host == NULL) { if (host == NULL) {
srv_socket->addr.ipv4.sin_addr.s_addr = htonl(INADDR_ANY); srv_socket->addr.ipv4.sin_addr.s_addr = htonl(INADDR_ANY);
@ -46,8 +43,7 @@
} }
srv_socket->addr.ipv4.sin_port = htons(port); srv_socket->addr.ipv4.sin_port = htons(port);
--- a/contrib/lighttpd-1.4.31/src/fdevent.c.orig +++ src/app/lighttpd/src/fdevent.c
+++ b/contrib/lighttpd-1.4.31/src/fdevent.c
@@ -198,16 +198,23 @@ void * fdevent_get_context(fdevents *ev, int fd) { @@ -198,16 +198,23 @@ void * fdevent_get_context(fdevents *ev, int fd) {
} }

12
repos/ports/src/app/lighttpd/target.inc
View File

@ -1,11 +1,19 @@
include $(REP_DIR)/ports/lighttpd.inc LIGHTTPD_DIR := $(call select_from_ports,lighttpd)/src/app/lighttpd
LIGHTTPD_DIR = $(REP_DIR)/contrib/$(LIGHTTPD)
FILTER_OUT = lempar.c lighttpd-angel.c lemon.c FILTER_OUT = lempar.c lighttpd-angel.c lemon.c
SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIGHTTPD_DIR)/src/*.c))) SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIGHTTPD_DIR)/src/*.c)))
vpath %.c $(LIGHTTPD_DIR)/src vpath %.c $(LIGHTTPD_DIR)/src
# read version information from configure script
LIGHTTPD_VERSION := $(subst ., ,$(shell cat $(LIGHTTPD_DIR)/configure |\
grep "PACKAGE_VERSION=" |\
sed "s/^.*='//;s/'//"))
LIGHTTPD_MAIN := $(word 1,$(LIGHTTPD_VERSION))
LIGHTTPD_MAJOR := $(word 2,$(LIGHTTPD_VERSION))
LIGHTTPD_MINOR := $(word 3,$(LIGHTTPD_VERSION))
CC_OPT += -DHAVE_SOCKLEN_T -DHAVE_SYSLOG_H -DHAVE_STDINT_H -DUSE_POLL CC_OPT += -DHAVE_SOCKLEN_T -DHAVE_SYSLOG_H -DHAVE_STDINT_H -DUSE_POLL
CC_OPT += -DHAVE_SYS_WAIT_H -DHAVE_SYS_UN_H -DHAVE_MMAP -DHAVE_SELECT CC_OPT += -DHAVE_SYS_WAIT_H -DHAVE_SYS_UN_H -DHAVE_MMAP -DHAVE_SELECT
CC_OPT += -DHAVE_WRITEV -DUSE_WRITEV CC_OPT += -DHAVE_WRITEV -DUSE_WRITEV

5
repos/ports/src/app/netperf/netlib.patch
View File

@ -1,7 +1,4 @@
Index: src/netlib.c +++ src/app/netperf/src/netlib.c
===================================================================
--- src/netlib.c (revision 644)
+++ src/netlib.c (working copy)
@@ -844,6 +844,10 @@ @@ -844,6 +844,10 @@
exit(1); exit(1);
} }

20
repos/ports/src/app/netperf/omni.patch
View File

@ -1,7 +1,4 @@
Index: src/netserver.c +++ src/app/netperf/src/netserver.c
===================================================================
--- src/netserver.c (revision 644)
+++ src/netserver.c (working copy)
@@ -567,7 +567,7 @@ @@ -567,7 +567,7 @@
int do_inet; int do_inet;
int no_name = 0; int no_name = 0;
@ -11,10 +8,7 @@ Index: src/netserver.c
#endif #endif
if (debug) { if (debug) {
Index: src/nettest_omni.c +++ src/app/netperf/src/nettest_omni.c (working copy)
===================================================================
--- src/nettest_omni.c (revision 644)
+++ src/nettest_omni.c (working copy)
@@ -3348,7 +3348,7 @@ @@ -3348,7 +3348,7 @@
get_transport_cong_control(SOCKET socket, int protocol, char cong_control[], int len) get_transport_cong_control(SOCKET socket, int protocol, char cong_control[], int len)
{ {
@ -77,10 +71,7 @@ Index: src/nettest_omni.c
#ifdef KLUDGE_SOCKET_OPTIONS #ifdef KLUDGE_SOCKET_OPTIONS
/* this is for those systems which *INCORRECTLY* fail to pass /* this is for those systems which *INCORRECTLY* fail to pass
attributes across an accept() call. Including this goes attributes across an accept() call. Including this goes
Index: src/nettest_bsd.h +++ src/app/netperf/src/nettest_bsd.h
===================================================================
--- src/nettest_bsd.h (revision 644)
+++ src/nettest_bsd.h (working copy)
@@ -617,7 +617,7 @@ @@ -617,7 +617,7 @@
extern int get_sockaddr_family_addr_port(struct sockaddr_storage *sockaddr, extern int get_sockaddr_family_addr_port(struct sockaddr_storage *sockaddr,
int family, int family,
@ -90,10 +81,7 @@ Index: src/nettest_bsd.h
extern void send_tcp_mss(char remote_host[]); extern void send_tcp_mss(char remote_host[]);
extern void send_tcp_stream(char remote_host[]); extern void send_tcp_stream(char remote_host[]);
extern void send_tcp_maerts(char remote_host[]); extern void send_tcp_maerts(char remote_host[]);
Index: src/nettest_bsd.c +++ src/app/netperf/src/nettest_bsd.c
===================================================================
--- src/nettest_bsd.c (revision 644)
+++ src/nettest_bsd.c (working copy)
@@ -1066,7 +1066,7 @@ @@ -1066,7 +1066,7 @@
/* pull the port and address out of the sockaddr in host format */ /* pull the port and address out of the sockaddr in host format */

4
repos/ports/src/app/netperf/target.inc
View File

@ -1,5 +1,5 @@
CONTRIB_DIR = $(REP_DIR)/contrib/netperf NETPERF_DIR := $(call select_from_ports,netperf)/src/app/netperf
LIBS += base libc libm libc-resolv libc-net libc-nameser libc-isc LIBS += base libc libm libc-resolv libc-net libc-nameser libc-isc
# plug-in to libc # plug-in to libc
@ -17,7 +17,7 @@ CC_OPT += -DHAVE_CONFIG_H -DGENODE_BUILD
CC_WARN = -Wall -Wno-unused CC_WARN = -Wall -Wno-unused
vpath %.c $(CONTRIB_DIR)/src vpath %.c $(NETPERF_DIR)/src
vpath timer.cc $(PRG_DIR)/.. vpath timer.cc $(PRG_DIR)/..
# vi: set ft=make : # vi: set ft=make :

2
repos/ports/src/vancouver/32bit/target.mk → repos/ports/src/app/seoul/32bit/target.mk
View File

@ -2,4 +2,4 @@ REQUIRES = 32bit
LD_TEXT_ADDR = 0xbf800000 LD_TEXT_ADDR = 0xbf800000
include $(REP_DIR)/src/vancouver/target.inc include $(REP_DIR)/src/app/seoul/target.inc

2
repos/ports/src/vancouver/64bit/target.mk → repos/ports/src/app/seoul/64bit/target.mk
View File

@ -2,4 +2,4 @@ REQUIRES = 64bit
LD_TEXT_ADDR = 0x7fffff800000 LD_TEXT_ADDR = 0x7fffff800000
include $(REP_DIR)/src/vancouver/target.inc include $(REP_DIR)/src/app/seoul/target.inc

0
repos/ports/src/vancouver/README → repos/ports/src/app/seoul/README
View File

0
repos/ports/src/vancouver/boot_module_provider.h → repos/ports/src/app/seoul/boot_module_provider.h
View File

10
repos/ports/src/vancouver/console.cc → repos/ports/src/app/seoul/console.cc
View File

@ -19,10 +19,6 @@
* conditions of the GNU General Public License version 2. * conditions of the GNU General Public License version 2.
*/ */
/* local includes */
#include <console.h>
#include <keyboard.h>
/* Genode includes */ /* Genode includes */
#include <base/snprintf.h> #include <base/snprintf.h>
#include <util/register.h> #include <util/register.h>
@ -31,6 +27,12 @@
#include <os/pixel_rgb565.h> #include <os/pixel_rgb565.h>
#include <nitpicker_gfx/text_painter.h> #include <nitpicker_gfx/text_painter.h>
#include <nul/motherboard.h>
/* local includes */
#include "console.h"
#include "keyboard.h"
using Genode::env; using Genode::env;
using Genode::Dataspace_client; using Genode::Dataspace_client;
using Genode::Surface; using Genode::Surface;

3
repos/ports/src/vancouver/console.h → repos/ports/src/app/seoul/console.h
View File

@ -23,14 +23,13 @@
/* Genode includes */ /* Genode includes */
#include <util/string.h> #include <util/string.h>
#include <base/sleep.h>
#include <framebuffer_session/connection.h> #include <framebuffer_session/connection.h>
#include <input_session/connection.h> #include <input_session/connection.h>
#include <timer_session/connection.h> #include <timer_session/connection.h>
#include <dataspace/client.h> #include <dataspace/client.h>
/* local includes */ /* local includes */
#include <synced_motherboard.h> #include "synced_motherboard.h"
/* includes for I/O */ /* includes for I/O */
#include <base/env.h> #include <base/env.h>

2
repos/ports/src/vancouver/device_model_registry.cc → repos/ports/src/app/seoul/device_model_registry.cc
View File

@ -20,7 +20,7 @@
*/ */
/* local includes */ /* local includes */
#include <device_model_registry.h> #include "device_model_registry.h"
Device_model_registry *device_model_registry() Device_model_registry *device_model_registry()

0
repos/ports/src/vancouver/device_model_registry.h → repos/ports/src/app/seoul/device_model_registry.h
View File

2
repos/ports/src/vancouver/disk.cc → repos/ports/src/app/seoul/disk.cc
View File

@ -33,7 +33,7 @@
#include <vmm/utcb_guard.h> #include <vmm/utcb_guard.h>
/* local includes */ /* local includes */
#include <disk.h> #include "disk.h"
/* Seoul includes */ /* Seoul includes */
#include <host/dma.h> #include <host/dma.h>

3
repos/ports/src/vancouver/disk.h → repos/ports/src/app/seoul/disk.h
View File

@ -25,14 +25,13 @@
/* Genode includes */ /* Genode includes */
#include <base/allocator_avl.h> #include <base/allocator_avl.h>
#include <base/printf.h> #include <base/printf.h>
#include <base/sleep.h>
#include <base/thread.h> #include <base/thread.h>
#include <block_session/connection.h> #include <block_session/connection.h>
#include <util/string.h> #include <util/string.h>
#include <base/sync_allocator.h> #include <base/sync_allocator.h>
/* local includes */ /* local includes */
#include <synced_motherboard.h> #include "synced_motherboard.h"
class Vancouver_disk; class Vancouver_disk;

0
repos/ports/src/vancouver/service/memory.h → repos/ports/src/app/seoul/include/service/memory.h
View File

0
repos/ports/src/vancouver/service/profile.h → repos/ports/src/app/seoul/include/service/profile.h
View File

2
repos/ports/src/vancouver/keyboard.cc → repos/ports/src/app/seoul/keyboard.cc
View File

@ -19,7 +19,7 @@
*/ */
/* local includes */ /* local includes */
#include <keyboard.h> #include "keyboard.h"
/* vancouver generic keyboard helper */ /* vancouver generic keyboard helper */
#include <host/keyboard.h> #include <host/keyboard.h>

5
repos/ports/src/vancouver/keyboard.h → repos/ports/src/app/seoul/keyboard.h
View File

@ -21,14 +21,15 @@
#ifndef _KEYBOARD_H_ #ifndef _KEYBOARD_H_
#define _KEYBOARD_H_ #define _KEYBOARD_H_
/* local includes */
#include <synced_motherboard.h>
/* includes for I/O */ /* includes for I/O */
#include <base/env.h> #include <base/env.h>
#include <input/event.h> #include <input/event.h>
#include <input/keycodes.h> #include <input/keycodes.h>
/* local includes */
#include "synced_motherboard.h"
class Vancouver_keyboard class Vancouver_keyboard
{ {
private: private:

12
repos/ports/src/vancouver/main.cc → repos/ports/src/app/seoul/main.cc
View File

@ -62,12 +62,12 @@
#include <sys/hip.h> #include <sys/hip.h>
/* local includes */ /* local includes */
#include <synced_motherboard.h> #include "synced_motherboard.h"
#include <device_model_registry.h> #include "device_model_registry.h"
#include <boot_module_provider.h> #include "boot_module_provider.h"
#include <console.h> #include "console.h"
#include <network.h> #include "network.h"
#include <disk.h> #include "disk.h"
enum { verbose_debug = false }; enum { verbose_debug = false };

1
repos/ports/src/app/seoul/mono.tff Symbolic link
View File

@ -0,0 +1 @@
../../../../demo/src/server/nitlog/mono.tff

Some files were not shown because too many files have changed in this diff Show More