From 6adbb9e438dbe71b2791ad3622d0f3842f66ece0 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Sat, 17 May 2014 00:57:41 +0200 Subject: [PATCH] ports: migrate to new ports mechanism Issue #1082 --- repos/ports/lib/mk/virtualbox-common.inc | 12 ++- repos/ports/mk/noux.mk | 2 +- repos/ports/ports/arora.hash | 1 + repos/ports/ports/arora.mk | 26 ------ repos/ports/ports/arora.port | 12 +++ repos/ports/ports/bash.hash | 1 + repos/ports/ports/bash.mk | 36 -------- repos/ports/ports/bash.port | 13 +++ repos/ports/ports/binutils.hash | 1 + repos/ports/ports/binutils.mk | 35 -------- repos/ports/ports/binutils.port | 12 +++ repos/ports/ports/coreutils.hash | 1 + repos/ports/ports/coreutils.mk | 34 -------- repos/ports/ports/coreutils.port | 9 ++ repos/ports/ports/dash.hash | 1 + repos/ports/ports/dash.mk | 24 ------ repos/ports/ports/dash.port | 9 ++ repos/ports/ports/dosbox.hash | 1 + repos/ports/ports/dosbox.inc | 4 - repos/ports/ports/dosbox.mk | 22 ----- repos/ports/ports/dosbox.port | 12 +++ repos/ports/ports/e2fsprogs.hash | 1 + repos/ports/ports/e2fsprogs.mk | 26 ------ repos/ports/ports/e2fsprogs.port | 9 ++ repos/ports/ports/etc.hash | 1 + repos/ports/ports/etc.mk | 25 ------ repos/ports/ports/etc.port | 7 ++ repos/ports/ports/findutils.hash | 1 + repos/ports/ports/findutils.mk | 35 -------- repos/ports/ports/findutils.port | 13 +++ repos/ports/ports/grep.hash | 1 + repos/ports/ports/grep.mk | 32 ------- repos/ports/ports/grep.port | 9 ++ repos/ports/ports/lighttpd.hash | 1 + repos/ports/ports/lighttpd.mk | 36 -------- repos/ports/ports/lighttpd.port | 11 +++ repos/ports/ports/lynx.hash | 1 + repos/ports/ports/lynx.mk | 39 --------- repos/ports/ports/lynx.port | 10 +++ repos/ports/ports/make.hash | 1 + repos/ports/ports/make.mk | 34 -------- repos/ports/ports/make.port | 9 ++ repos/ports/ports/netcat.hash | 1 + repos/ports/ports/netcat.mk | 23 ----- repos/ports/ports/netcat.port | 8 ++ repos/ports/ports/netperf.hash | 1 + repos/ports/ports/netperf.mk | 33 ------- repos/ports/ports/netperf.port | 13 +++ repos/ports/ports/openssh.hash | 1 + repos/ports/ports/openssh.mk | 37 -------- repos/ports/ports/openssh.port | 11 +++ repos/ports/ports/sed.hash | 1 + repos/ports/ports/sed.mk | 33 ------- repos/ports/ports/sed.port | 9 ++ repos/ports/ports/seoul.hash | 1 + repos/ports/ports/seoul.mk | 68 --------------- repos/ports/ports/seoul.port | 34 ++++++++ repos/ports/ports/vim.hash | 1 + repos/ports/ports/vim.mk | 45 ---------- repos/ports/ports/vim.port | 23 +++++ repos/ports/ports/virtualbox.hash | 1 + repos/ports/ports/virtualbox.inc | 5 -- repos/ports/ports/virtualbox.mk | 85 ------------------- repos/ports/ports/virtualbox.port | 49 +++++++++++ repos/ports/ports/which.hash | 1 + repos/ports/ports/which.mk | 34 -------- repos/ports/ports/which.port | 10 +++ repos/ports/run/seoul-auto.run | 6 +- repos/ports/run/seoul-disc.run | 4 +- repos/ports/run/seoul-fancy.run | 4 +- repos/ports/run/seoul-kernelbuild.run | 6 +- repos/ports/run/seoul-net.run | 4 +- repos/ports/run/seoul.inc | 18 ++-- repos/ports/src/app/arora/arora.pro | 2 +- .../src/app/arora/patches/arora_genode.patch | 56 ++++++------ .../patches/arora_nitpicker_plugin.patch | 2 +- .../arora/qwebplugins/nitpicker/nitpicker.pri | 2 +- repos/ports/src/app/arora/target.mk | 39 ++++----- repos/ports/src/app/dosbox/target.mk | 5 +- .../disable_gethostbyaddr_fcntl.patch | 12 +-- repos/ports/src/app/lighttpd/target.inc | 12 ++- repos/ports/src/app/netperf/netlib.patch | 5 +- repos/ports/src/app/netperf/omni.patch | 20 +---- repos/ports/src/app/netperf/target.inc | 4 +- .../{vancouver => app/seoul}/32bit/target.mk | 2 +- .../{vancouver => app/seoul}/64bit/target.mk | 2 +- .../ports/src/{vancouver => app/seoul}/README | 0 .../seoul}/boot_module_provider.h | 0 .../src/{vancouver => app/seoul}/console.cc | 10 ++- .../src/{vancouver => app/seoul}/console.h | 3 +- .../seoul}/device_model_registry.cc | 2 +- .../seoul}/device_model_registry.h | 0 .../src/{vancouver => app/seoul}/disk.cc | 2 +- .../ports/src/{vancouver => app/seoul}/disk.h | 3 +- .../seoul/include}/service/memory.h | 0 .../seoul/include}/service/profile.h | 0 .../src/{vancouver => app/seoul}/keyboard.cc | 2 +- .../src/{vancouver => app/seoul}/keyboard.h | 5 +- .../src/{vancouver => app/seoul}/main.cc | 12 +-- repos/ports/src/app/seoul/mono.tff | 1 + .../src/{vancouver => app/seoul}/network.cc | 2 +- .../src/{vancouver => app/seoul}/network.h | 2 +- .../{vancouver => app/seoul}/nova_user_env.cc | 0 .../seoul}/synced_motherboard.h | 0 repos/ports/src/app/seoul/target.inc | 33 +++++++ repos/ports/src/noux-pkg/binutils/target.inc | 2 +- repos/ports/src/noux-pkg/dash/build.patch | 4 +- .../e2fsprogs/patches/MCONFIG.in.patch | 5 +- .../e2fsprogs/patches/Makefile.in.patch | 45 ++-------- .../e2fsprogs/patches/Makefile.library.patch | 6 +- .../e2fsprogs/patches/configure.patch | 5 +- repos/ports/src/noux-pkg/gcc/target.inc | 2 + repos/ports/src/noux-pkg/lynx/build.patch | 3 +- repos/ports/src/noux-pkg/noux-etc/target.mk | 2 +- .../src/noux-pkg/openssh/includes_h.patch | 3 +- .../noux-pkg/openssh/monitor_fdpass.c.patch | 3 +- .../src/noux-pkg/openssh/sshconnect.h.patch | 3 +- repos/ports/src/noux-pkg/vim/build.patch | 10 +-- repos/ports/src/vancouver/mono.tff | 1 - repos/ports/src/vancouver/target.inc | 45 ---------- repos/ports/src/virtualbox/acpi_drv.patch | 2 +- .../src/virtualbox/fake_pci_vendor.patch | 4 +- repos/ports/src/virtualbox/hda.patch | 2 +- repos/ports/src/virtualbox/hwacc.patch | 2 +- .../virtualbox/include/version-generated.h | 9 +- .../ports/src/virtualbox/pdm_queue_irqs.patch | 2 +- repos/ports/src/virtualbox/serial.patch | 2 +- repos/ports/src/virtualbox/timer.patch | 2 +- .../ports/src/virtualbox/vbetables-gen.patch | 3 +- repos/ports/src/virtualbox/vboxbfe.patch | 4 +- repos/ports/src/virtualbox/vga_fb.patch | 2 +- repos/ports/src/virtualbox/vmdk.patch | 2 +- repos/ports/src/virtualbox/vmmdev.patch | 2 +- repos/ports/src/virtualbox/vmx_c++.patch | 2 +- 134 files changed, 515 insertions(+), 1044 deletions(-) create mode 100644 repos/ports/ports/arora.hash delete mode 100644 repos/ports/ports/arora.mk create mode 100644 repos/ports/ports/arora.port create mode 100644 repos/ports/ports/bash.hash delete mode 100644 repos/ports/ports/bash.mk create mode 100644 repos/ports/ports/bash.port create mode 100644 repos/ports/ports/binutils.hash delete mode 100644 repos/ports/ports/binutils.mk create mode 100644 repos/ports/ports/binutils.port create mode 100644 repos/ports/ports/coreutils.hash delete mode 100644 repos/ports/ports/coreutils.mk create mode 100644 repos/ports/ports/coreutils.port create mode 100644 repos/ports/ports/dash.hash delete mode 100644 repos/ports/ports/dash.mk create mode 100644 repos/ports/ports/dash.port create mode 100644 repos/ports/ports/dosbox.hash delete mode 100644 repos/ports/ports/dosbox.inc delete mode 100644 repos/ports/ports/dosbox.mk create mode 100644 repos/ports/ports/dosbox.port create mode 100644 repos/ports/ports/e2fsprogs.hash delete mode 100644 repos/ports/ports/e2fsprogs.mk create mode 100644 repos/ports/ports/e2fsprogs.port create mode 100644 repos/ports/ports/etc.hash delete mode 100644 repos/ports/ports/etc.mk create mode 100644 repos/ports/ports/etc.port create mode 100644 repos/ports/ports/findutils.hash delete mode 100644 repos/ports/ports/findutils.mk create mode 100644 repos/ports/ports/findutils.port create mode 100644 repos/ports/ports/grep.hash delete mode 100644 repos/ports/ports/grep.mk create mode 100644 repos/ports/ports/grep.port create mode 100644 repos/ports/ports/lighttpd.hash delete mode 100644 repos/ports/ports/lighttpd.mk create mode 100644 repos/ports/ports/lighttpd.port create mode 100644 repos/ports/ports/lynx.hash delete mode 100644 repos/ports/ports/lynx.mk create mode 100644 repos/ports/ports/lynx.port create mode 100644 repos/ports/ports/make.hash delete mode 100644 repos/ports/ports/make.mk create mode 100644 repos/ports/ports/make.port create mode 100644 repos/ports/ports/netcat.hash delete mode 100644 repos/ports/ports/netcat.mk create mode 100644 repos/ports/ports/netcat.port create mode 100644 repos/ports/ports/netperf.hash delete mode 100644 repos/ports/ports/netperf.mk create mode 100644 repos/ports/ports/netperf.port create mode 100644 repos/ports/ports/openssh.hash delete mode 100644 repos/ports/ports/openssh.mk create mode 100644 repos/ports/ports/openssh.port create mode 100644 repos/ports/ports/sed.hash delete mode 100644 repos/ports/ports/sed.mk create mode 100644 repos/ports/ports/sed.port create mode 100644 repos/ports/ports/seoul.hash delete mode 100644 repos/ports/ports/seoul.mk create mode 100644 repos/ports/ports/seoul.port create mode 100644 repos/ports/ports/vim.hash delete mode 100644 repos/ports/ports/vim.mk create mode 100644 repos/ports/ports/vim.port create mode 100644 repos/ports/ports/virtualbox.hash delete mode 100644 repos/ports/ports/virtualbox.inc delete mode 100644 repos/ports/ports/virtualbox.mk create mode 100644 repos/ports/ports/virtualbox.port create mode 100644 repos/ports/ports/which.hash delete mode 100644 repos/ports/ports/which.mk create mode 100644 repos/ports/ports/which.port rename repos/ports/src/{vancouver => app/seoul}/32bit/target.mk (50%) rename repos/ports/src/{vancouver => app/seoul}/64bit/target.mk (52%) rename repos/ports/src/{vancouver => app/seoul}/README (100%) rename repos/ports/src/{vancouver => app/seoul}/boot_module_provider.h (100%) rename repos/ports/src/{vancouver => app/seoul}/console.cc (99%) rename repos/ports/src/{vancouver => app/seoul}/console.h (97%) rename repos/ports/src/{vancouver => app/seoul}/device_model_registry.cc (98%) rename repos/ports/src/{vancouver => app/seoul}/device_model_registry.h (100%) rename repos/ports/src/{vancouver => app/seoul}/disk.cc (99%) rename repos/ports/src/{vancouver => app/seoul}/disk.h (98%) rename repos/ports/src/{vancouver => app/seoul/include}/service/memory.h (100%) rename repos/ports/src/{vancouver => app/seoul/include}/service/profile.h (100%) rename repos/ports/src/{vancouver => app/seoul}/keyboard.cc (99%) rename repos/ports/src/{vancouver => app/seoul}/keyboard.h (96%) rename repos/ports/src/{vancouver => app/seoul}/main.cc (99%) create mode 120000 repos/ports/src/app/seoul/mono.tff rename repos/ports/src/{vancouver => app/seoul}/network.cc (98%) rename repos/ports/src/{vancouver => app/seoul}/network.h (96%) rename repos/ports/src/{vancouver => app/seoul}/nova_user_env.cc (100%) rename repos/ports/src/{vancouver => app/seoul}/synced_motherboard.h (100%) create mode 100644 repos/ports/src/app/seoul/target.inc delete mode 120000 repos/ports/src/vancouver/mono.tff delete mode 100644 repos/ports/src/vancouver/target.inc diff --git a/repos/ports/lib/mk/virtualbox-common.inc b/repos/ports/lib/mk/virtualbox-common.inc index 23a46df17..65ecfb377 100644 --- a/repos/ports/lib/mk/virtualbox-common.inc +++ b/repos/ports/lib/mk/virtualbox-common.inc @@ -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_ASM_OPT_x86_64 = -f elf64 -include $(REP_DIR)/ports/virtualbox.inc - ifeq ($(shell which yasm),) REQUIRES += installation_of_yasm REQUIRES += installation_of_iasl endif -VIRTUALBOX_DIR = $(REP_DIR)/contrib/$(VIRTUALBOX) +VIRTUALBOX_DIR = $(call select_from_ports,virtualbox)/src/app/virtualbox VBOX_DIR = $(VIRTUALBOX_DIR)/src/VBox 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 + +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) \ -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 diff --git a/repos/ports/mk/noux.mk b/repos/ports/mk/noux.mk index c1c2cb471..52c45f93f 100644 --- a/repos/ports/mk/noux.mk +++ b/repos/ports/mk/noux.mk @@ -33,7 +33,7 @@ NOUX_PKG ?= $(TARGET) 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) diff --git a/repos/ports/ports/arora.hash b/repos/ports/ports/arora.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/arora.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/arora.mk b/repos/ports/ports/arora.mk deleted file mode 100644 index c65d3e7c1..000000000 --- a/repos/ports/ports/arora.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/arora.port b/repos/ports/ports/arora.port new file mode 100644 index 000000000..a12dc44ee --- /dev/null +++ b/repos/ports/ports/arora.port @@ -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 diff --git a/repos/ports/ports/bash.hash b/repos/ports/ports/bash.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/bash.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/bash.mk b/repos/ports/ports/bash.mk deleted file mode 100644 index 4e886bdfb..000000000 --- a/repos/ports/ports/bash.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/bash.port b/repos/ports/ports/bash.port new file mode 100644 index 000000000..8f16e92e8 --- /dev/null +++ b/repos/ports/ports/bash.port @@ -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 diff --git a/repos/ports/ports/binutils.hash b/repos/ports/ports/binutils.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/binutils.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/binutils.mk b/repos/ports/ports/binutils.mk deleted file mode 100644 index ffc89fb25..000000000 --- a/repos/ports/ports/binutils.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/binutils.port b/repos/ports/ports/binutils.port new file mode 100644 index 000000000..4ddca3dee --- /dev/null +++ b/repos/ports/ports/binutils.port @@ -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 diff --git a/repos/ports/ports/coreutils.hash b/repos/ports/ports/coreutils.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/coreutils.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/coreutils.mk b/repos/ports/ports/coreutils.mk deleted file mode 100644 index f57af88a9..000000000 --- a/repos/ports/ports/coreutils.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/coreutils.port b/repos/ports/ports/coreutils.port new file mode 100644 index 000000000..6c6b7bcc4 --- /dev/null +++ b/repos/ports/ports/coreutils.port @@ -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 diff --git a/repos/ports/ports/dash.hash b/repos/ports/ports/dash.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/dash.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/dash.mk b/repos/ports/ports/dash.mk deleted file mode 100644 index 55f1e8281..000000000 --- a/repos/ports/ports/dash.mk +++ /dev/null @@ -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) - diff --git a/repos/ports/ports/dash.port b/repos/ports/ports/dash.port new file mode 100644 index 000000000..a92afe904 --- /dev/null +++ b/repos/ports/ports/dash.port @@ -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 diff --git a/repos/ports/ports/dosbox.hash b/repos/ports/ports/dosbox.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/dosbox.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/dosbox.inc b/repos/ports/ports/dosbox.inc deleted file mode 100644 index 904998adc..000000000 --- a/repos/ports/ports/dosbox.inc +++ /dev/null @@ -1,4 +0,0 @@ -DOSBOX_REV := 3837 -DOSBOX_VERSION := svn-$(DOSBOX_REV) -DOSBOX := dosbox-$(DOSBOX_VERSION) - diff --git a/repos/ports/ports/dosbox.mk b/repos/ports/ports/dosbox.mk deleted file mode 100644 index 38b40edb7..000000000 --- a/repos/ports/ports/dosbox.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/dosbox.port b/repos/ports/ports/dosbox.port new file mode 100644 index 000000000..c0d20d086 --- /dev/null +++ b/repos/ports/ports/dosbox.port @@ -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 diff --git a/repos/ports/ports/e2fsprogs.hash b/repos/ports/ports/e2fsprogs.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/e2fsprogs.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/e2fsprogs.mk b/repos/ports/ports/e2fsprogs.mk deleted file mode 100644 index db11a0222..000000000 --- a/repos/ports/ports/e2fsprogs.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/e2fsprogs.port b/repos/ports/ports/e2fsprogs.port new file mode 100644 index 000000000..48f9938af --- /dev/null +++ b/repos/ports/ports/e2fsprogs.port @@ -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 diff --git a/repos/ports/ports/etc.hash b/repos/ports/ports/etc.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/etc.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/etc.mk b/repos/ports/ports/etc.mk deleted file mode 100644 index bb7e77865..000000000 --- a/repos/ports/ports/etc.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/etc.port b/repos/ports/ports/etc.port new file mode 100644 index 000000000..0efea2776 --- /dev/null +++ b/repos/ports/ports/etc.port @@ -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 diff --git a/repos/ports/ports/findutils.hash b/repos/ports/ports/findutils.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/findutils.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/findutils.mk b/repos/ports/ports/findutils.mk deleted file mode 100644 index fb7c6d8c9..000000000 --- a/repos/ports/ports/findutils.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/findutils.port b/repos/ports/ports/findutils.port new file mode 100644 index 000000000..4add0a7f0 --- /dev/null +++ b/repos/ports/ports/findutils.port @@ -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 + diff --git a/repos/ports/ports/grep.hash b/repos/ports/ports/grep.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/grep.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/grep.mk b/repos/ports/ports/grep.mk deleted file mode 100644 index 183e43b48..000000000 --- a/repos/ports/ports/grep.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/grep.port b/repos/ports/ports/grep.port new file mode 100644 index 000000000..2511fbaa4 --- /dev/null +++ b/repos/ports/ports/grep.port @@ -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 diff --git a/repos/ports/ports/lighttpd.hash b/repos/ports/ports/lighttpd.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/lighttpd.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/lighttpd.mk b/repos/ports/ports/lighttpd.mk deleted file mode 100644 index 71ed4daf8..000000000 --- a/repos/ports/ports/lighttpd.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/lighttpd.port b/repos/ports/ports/lighttpd.port new file mode 100644 index 000000000..950b6859e --- /dev/null +++ b/repos/ports/ports/lighttpd.port @@ -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 diff --git a/repos/ports/ports/lynx.hash b/repos/ports/ports/lynx.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/lynx.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/lynx.mk b/repos/ports/ports/lynx.mk deleted file mode 100644 index 2bb5e9a68..000000000 --- a/repos/ports/ports/lynx.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/lynx.port b/repos/ports/ports/lynx.port new file mode 100644 index 000000000..69843af10 --- /dev/null +++ b/repos/ports/ports/lynx.port @@ -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 diff --git a/repos/ports/ports/make.hash b/repos/ports/ports/make.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/make.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/make.mk b/repos/ports/ports/make.mk deleted file mode 100644 index 81682b7a7..000000000 --- a/repos/ports/ports/make.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/make.port b/repos/ports/ports/make.port new file mode 100644 index 000000000..d5ec227fa --- /dev/null +++ b/repos/ports/ports/make.port @@ -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 diff --git a/repos/ports/ports/netcat.hash b/repos/ports/ports/netcat.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/netcat.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/netcat.mk b/repos/ports/ports/netcat.mk deleted file mode 100644 index 00704a756..000000000 --- a/repos/ports/ports/netcat.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/netcat.port b/repos/ports/ports/netcat.port new file mode 100644 index 000000000..358306d83 --- /dev/null +++ b/repos/ports/ports/netcat.port @@ -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 + diff --git a/repos/ports/ports/netperf.hash b/repos/ports/ports/netperf.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/netperf.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/netperf.mk b/repos/ports/ports/netperf.mk deleted file mode 100644 index 01008ddb2..000000000 --- a/repos/ports/ports/netperf.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/netperf.port b/repos/ports/ports/netperf.port new file mode 100644 index 000000000..1bbbc1b3a --- /dev/null +++ b/repos/ports/ports/netperf.port @@ -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 diff --git a/repos/ports/ports/openssh.hash b/repos/ports/ports/openssh.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/openssh.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/openssh.mk b/repos/ports/ports/openssh.mk deleted file mode 100644 index c601af54b..000000000 --- a/repos/ports/ports/openssh.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/openssh.port b/repos/ports/ports/openssh.port new file mode 100644 index 000000000..97b9b6498 --- /dev/null +++ b/repos/ports/ports/openssh.port @@ -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 diff --git a/repos/ports/ports/sed.hash b/repos/ports/ports/sed.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/sed.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/sed.mk b/repos/ports/ports/sed.mk deleted file mode 100644 index d9e171fce..000000000 --- a/repos/ports/ports/sed.mk +++ /dev/null @@ -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) - diff --git a/repos/ports/ports/sed.port b/repos/ports/ports/sed.port new file mode 100644 index 000000000..4f6589c2a --- /dev/null +++ b/repos/ports/ports/sed.port @@ -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 diff --git a/repos/ports/ports/seoul.hash b/repos/ports/ports/seoul.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/seoul.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/seoul.mk b/repos/ports/ports/seoul.mk deleted file mode 100644 index 8d7b5b0a9..000000000 --- a/repos/ports/ports/seoul.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/seoul.port b/repos/ports/ports/seoul.port new file mode 100644 index 000000000..bd1169f10 --- /dev/null +++ b/repos/ports/ports/seoul.port @@ -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 diff --git a/repos/ports/ports/vim.hash b/repos/ports/ports/vim.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/vim.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/vim.mk b/repos/ports/ports/vim.mk deleted file mode 100644 index a88b81062..000000000 --- a/repos/ports/ports/vim.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/vim.port b/repos/ports/ports/vim.port new file mode 100644 index 000000000..0798e3063 --- /dev/null +++ b/repos/ports/ports/vim.port @@ -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 diff --git a/repos/ports/ports/virtualbox.hash b/repos/ports/ports/virtualbox.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/virtualbox.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/virtualbox.inc b/repos/ports/ports/virtualbox.inc deleted file mode 100644 index fd5cc38a4..000000000 --- a/repos/ports/ports/virtualbox.inc +++ /dev/null @@ -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) diff --git a/repos/ports/ports/virtualbox.mk b/repos/ports/ports/virtualbox.mk deleted file mode 100644 index 863045f6b..000000000 --- a/repos/ports/ports/virtualbox.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/virtualbox.port b/repos/ports/ports/virtualbox.port new file mode 100644 index 000000000..e4814ec59 --- /dev/null +++ b/repos/ports/ports/virtualbox.port @@ -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 diff --git a/repos/ports/ports/which.hash b/repos/ports/ports/which.hash new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/repos/ports/ports/which.hash @@ -0,0 +1 @@ +dummy diff --git a/repos/ports/ports/which.mk b/repos/ports/ports/which.mk deleted file mode 100644 index a310f5162..000000000 --- a/repos/ports/ports/which.mk +++ /dev/null @@ -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) diff --git a/repos/ports/ports/which.port b/repos/ports/ports/which.port new file mode 100644 index 000000000..1dcfc49b3 --- /dev/null +++ b/repos/ports/ports/which.port @@ -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 + diff --git a/repos/ports/run/seoul-auto.run b/repos/ports/run/seoul-auto.run index c8a8eaf69..8a7823640 100644 --- a/repos/ports/run/seoul-auto.run +++ b/repos/ports/run/seoul-auto.run @@ -1,9 +1,9 @@ # -# \brief Vancouver on Genode - for automated testing +# \brief Seoul on Genode - for automated testing # \author Alexander Boettcher # \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 '/bin/' # @@ -54,7 +54,7 @@ append qemu_args " -cpu phenom " append qemu_args " -net nic,model=e1000 " 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 { exec rm -f bin/$binary diff --git a/repos/ports/run/seoul-disc.run b/repos/ports/run/seoul-disc.run index 5bf7065c9..c0d719bd3 100644 --- a/repos/ports/run/seoul-disc.run +++ b/repos/ports/run/seoul-disc.run @@ -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 # \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 '/bin/' # diff --git a/repos/ports/run/seoul-fancy.run b/repos/ports/run/seoul-fancy.run index 2340bdd11..24ba9ce1f 100644 --- a/repos/ports/run/seoul-fancy.run +++ b/repos/ports/run/seoul-fancy.run @@ -1,11 +1,11 @@ # -# \brief Example for using Vancouver on Genode +# \brief Example for using Seoul on Genode # \author Norman Feske # \author Markus Partheymueller # \author Alexander Boettcher # \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 # are present at '/bin/' (see the 'boot_modules' variable). # diff --git a/repos/ports/run/seoul-kernelbuild.run b/repos/ports/run/seoul-kernelbuild.run index b7df9dd3d..1ff29bd0d 100644 --- a/repos/ports/run/seoul-kernelbuild.run +++ b/repos/ports/run/seoul-kernelbuild.run @@ -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 # \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 '/bin/' # @@ -61,6 +61,6 @@ append qemu_args " -m 1536 " append qemu_args " -cpu phenom " 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" diff --git a/repos/ports/run/seoul-net.run b/repos/ports/run/seoul-net.run index 4bd6e87cf..677aa4864 100644 --- a/repos/ports/run/seoul-net.run +++ b/repos/ports/run/seoul-net.run @@ -1,9 +1,9 @@ # -# \brief Vancouver on Genode - for testing network +# \brief Seoul on Genode - for testing network # \author Alexander Boettcher # \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 '/bin/' # diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc index 815ca68f7..ad0c274c7 100644 --- a/repos/ports/run/seoul.inc +++ b/repos/ports/run/seoul.inc @@ -18,7 +18,7 @@ set build_components { core init drivers/timer drivers/rtc - vancouver + app/seoul drivers/pci drivers/input } @@ -223,8 +223,8 @@ append_if $use_framebuffer config { if {!$use_fancy_stuff} { append config { - - } + + } append config " " append config { @@ -305,7 +305,7 @@ if {$use_fancy_stuff} { - + @@ -318,14 +318,14 @@ if {$use_fancy_stuff} { - - + + - - + + @@ -348,7 +348,7 @@ set boot_modules { pci_drv timer rtc_drv - vancouver + seoul vm_linux.cfg } diff --git a/repos/ports/src/app/arora/arora.pro b/repos/ports/src/app/arora/arora.pro index 9b1f8ec7d..fa1de0e8d 100644 --- a/repos/ports/src/app/arora/arora.pro +++ b/repos/ports/src/app/arora/arora.pro @@ -1 +1 @@ -include $(REP_DIR)/contrib/$(ARORA)/src/src.pro +include $(call select_from_ports,arora)/src/app/arora/src/src.pro diff --git a/repos/ports/src/app/arora/patches/arora_genode.patch b/repos/ports/src/app/arora/patches/arora_genode.patch index f8f051dae..ad506d575 100644 --- a/repos/ports/src/app/arora/patches/arora_genode.patch +++ b/repos/ports/src/app/arora/patches/arora_genode.patch @@ -29,7 +29,7 @@ index c373a68..ce18643 100644 --- a/src/adblock/adblock.pri +++ b/src/adblock/adblock.pri @@ -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 DEPENDPATH += $$PWD @@ -39,7 +39,7 @@ index ee03def..0debe73 100644 --- a/src/bookmarks/bookmarks.pri +++ b/src/bookmarks/bookmarks.pri @@ -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 DEPENDPATH += $$PWD @@ -49,13 +49,13 @@ index ee03def..0debe73 100644 bookmarksdialog.ui -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 index 02b0258..ffd181d 100644 --- a/src/bookmarks/xbel/xbel.pri +++ b/src/bookmarks/xbel/xbel.pri @@ -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 DEPENDPATH += $$PWD @@ -118,7 +118,7 @@ index 6ee163d..a3616e2 100644 --- a/src/history/history.pri +++ b/src/history/history.pri @@ -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 DEPENDPATH += $$PWD @@ -128,7 +128,7 @@ index ba33005..cace42b 100644 --- a/src/locationbar/locationbar.pri +++ b/src/locationbar/locationbar.pri @@ -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 DEPENDPATH += $$PWD @@ -161,7 +161,7 @@ index 8ecf533..4781160 100644 --- a/src/network/cookiejar/cookiejar.pri +++ b/src/network/cookiejar/cookiejar.pri @@ -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 DEPENDPATH += $$PWD @@ -171,7 +171,7 @@ index 8ecf533..4781160 100644 cookiesexceptions.ui -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 @@ -179,7 +179,7 @@ index 78ac273..f6ae783 100644 --- a/src/network/cookiejar/networkcookiejar/networkcookiejar.pri +++ b/src/network/cookiejar/networkcookiejar/networkcookiejar.pri @@ -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 DEPENDPATH += $$PWD @@ -189,7 +189,7 @@ index 5c912f4..ca3bdbf 100644 --- a/src/network/network.pri +++ b/src/network/network.pri @@ -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 DEPENDPATH += $$PWD @@ -199,13 +199,13 @@ index 5c912f4..ca3bdbf 100644 schemeaccesshandler.cpp -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 index dbace74..427cf2a 100644 --- a/src/opensearch/opensearch.pri +++ b/src/opensearch/opensearch.pri @@ -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 DEPENDPATH += $$PWD @@ -221,7 +221,7 @@ index 2033e59..193cc82 100644 --- a/src/qwebplugins/clicktoflash/clicktoflash.pri +++ b/src/qwebplugins/clicktoflash/clicktoflash.pri @@ -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 DEPENDPATH += $$PWD @@ -231,7 +231,7 @@ index d3d9cb7..26b19db 100644 --- a/src/qwebplugins/qwebplugins.pri +++ b/src/qwebplugins/qwebplugins.pri @@ -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 DEPENDPATH += $$PWD @@ -241,7 +241,7 @@ index d3d9cb7..26b19db 100644 webpluginfactory.cpp -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 index 7c1a0e3..5812c05 100644 @@ -251,7 +251,7 @@ index 7c1a0e3..5812c05 100644 -CONFIG += qt warn_on -contains(QT_BUILD_PARTS, tools): CONFIG += 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 @@ -290,15 +290,15 @@ index 7c1a0e3..5812c05 100644 -include(qwebplugins/qwebplugins.pri) -include(utils/utils.pri) -include(useragent/useragent.pri) -+include $(REP_DIR)/contrib/$(ARORA)/src/adblock/adblock.pri -+include $(REP_DIR)/contrib/$(ARORA)/src/bookmarks/bookmarks.pri -+include $(REP_DIR)/contrib/$(ARORA)/src/history/history.pri -+include $(REP_DIR)/contrib/$(ARORA)/src/locationbar/locationbar.pri -+include $(REP_DIR)/contrib/$(ARORA)/src/network/network.pri -+include $(REP_DIR)/contrib/$(ARORA)/src/opensearch/opensearch.pri -+include $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/qwebplugins.pri -+include $(REP_DIR)/contrib/$(ARORA)/src/utils/utils.pri -+include $(REP_DIR)/contrib/$(ARORA)/src/useragent/useragent.pri ++include $(call select_from_ports,arora)/src/app/arora/src/adblock/adblock.pri ++include $(call select_from_ports,arora)/src/app/arora/src/bookmarks/bookmarks.pri ++include $(call select_from_ports,arora)/src/app/arora/src/history/history.pri ++include $(call select_from_ports,arora)/src/app/arora/src/locationbar/locationbar.pri ++include $(call select_from_ports,arora)/src/app/arora/src/network/network.pri ++include $(call select_from_ports,arora)/src/app/arora/src/opensearch/opensearch.pri ++include $(call select_from_ports,arora)/src/app/arora/src/qwebplugins/qwebplugins.pri ++include $(call select_from_ports,arora)/src/app/arora/src/utils/utils.pri ++include $(call select_from_ports,arora)/src/app/arora/src/useragent/useragent.pri RESOURCES += \ - $$PWD/data/data.qrc \ @@ -361,7 +361,7 @@ index dab73ff..8460fd4 100644 -include(../install.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 @@ -417,7 +417,7 @@ index 78f1c48..50f6e1e 100644 --- a/src/useragent/useragent.pri +++ b/src/useragent/useragent.pri @@ -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 DEPENDPATH += $$PWD @@ -427,7 +427,7 @@ index fb10c55..489a51d 100644 --- a/src/utils/utils.pri +++ b/src/utils/utils.pri @@ -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 DEPENDPATH += $$PWD diff --git a/repos/ports/src/app/arora/patches/arora_nitpicker_plugin.patch b/repos/ports/src/app/arora/patches/arora_nitpicker_plugin.patch index c8cfe3abf..c77e20c98 100644 --- a/repos/ports/src/app/arora/patches/arora_nitpicker_plugin.patch +++ b/repos/ports/src/app/arora/patches/arora_nitpicker_plugin.patch @@ -15,7 +15,7 @@ index 26b19db..cc54090 100644 @@ -12,4 +12,4 @@ SOURCES += \ 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 diff --git a/src/qwebplugins/webpluginfactory.cpp b/src/qwebplugins/webpluginfactory.cpp diff --git a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpicker.pri b/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpicker.pri index 6f1f96d5a..3a707ac59 100644 --- a/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpicker.pri +++ b/repos/ports/src/app/arora/qwebplugins/nitpicker/nitpicker.pri @@ -1,5 +1,5 @@ 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 DEPENDPATH += $$PWD diff --git a/repos/ports/src/app/arora/target.mk b/repos/ports/src/app/arora/target.mk index 1092fcbd9..6a53a6adc 100644 --- a/repos/ports/src/app/arora/target.mk +++ b/repos/ports/src/app/arora/target.mk @@ -73,24 +73,25 @@ vpath % $(PRG_DIR)/qwebplugins/nitpicker vpath % $(PRG_DIR)/useragent vpath % $(PRG_DIR)/utils -vpath % $(REP_DIR)/contrib/$(ARORA)/src -vpath % $(REP_DIR)/contrib/$(ARORA)/src/adblock -vpath % $(REP_DIR)/contrib/$(ARORA)/src/bookmarks -vpath % $(REP_DIR)/contrib/$(ARORA)/src/bookmarks/xbel -vpath % $(REP_DIR)/contrib/$(ARORA)/src/network -vpath % $(REP_DIR)/contrib/$(ARORA)/src/network/cookiejar -vpath % $(REP_DIR)/contrib/$(ARORA)/src/network/cookiejar/networkcookiejar -vpath % $(REP_DIR)/contrib/$(ARORA)/src/data -vpath % $(REP_DIR)/contrib/$(ARORA)/src/data/graphics -vpath % $(REP_DIR)/contrib/$(ARORA)/src/data/searchengines -vpath % $(REP_DIR)/contrib/$(ARORA)/src/history -vpath % $(REP_DIR)/contrib/$(ARORA)/src/htmls -vpath % $(REP_DIR)/contrib/$(ARORA)/src/locationbar -vpath % $(REP_DIR)/contrib/$(ARORA)/src/opensearch -vpath % $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins -vpath % $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/clicktoflash -vpath % $(REP_DIR)/contrib/$(ARORA)/src/qwebplugins/nitpicker -vpath % $(REP_DIR)/contrib/$(ARORA)/src/useragent -vpath % $(REP_DIR)/contrib/$(ARORA)/src/utils +ARORA_PORT_DIR := $(call select_from_ports,arora) +vpath % $(ARORA_PORT_DIR)/src/app/arora/src +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/adblock +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/bookmarks +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/bookmarks/xbel +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/network +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/network/cookiejar +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/network/cookiejar/networkcookiejar +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/data +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/data/graphics +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/data/searchengines +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/history +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/htmls +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/locationbar +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/opensearch +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/qwebplugins +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/qwebplugins/clicktoflash +vpath % $(ARORA_PORT_DIR)/src/app/arora/src/qwebplugins/nitpicker +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 diff --git a/repos/ports/src/app/dosbox/target.mk b/repos/ports/src/app/dosbox/target.mk index e9fde95a4..202e5df5a 100644 --- a/repos/ports/src/app/dosbox/target.mk +++ b/repos/ports/src/app/dosbox/target.mk @@ -1,7 +1,6 @@ -TARGET = dosbox +TARGET := dosbox -include $(REP_DIR)/ports/dosbox.inc -DOSBOX_DIR = $(REP_DIR)/contrib/$(DOSBOX) +DOSBOX_DIR := $(call select_from_ports,dosbox)/src/app/dosbox SRC_CC_cpu = $(notdir $(wildcard $(DOSBOX_DIR)/src/cpu/*.cpp)) SRC_CC_debug = $(notdir $(wildcard $(DOSBOX_DIR)/src/debug/*.cpp)) diff --git a/repos/ports/src/app/lighttpd/disable_gethostbyaddr_fcntl.patch b/repos/ports/src/app/lighttpd/disable_gethostbyaddr_fcntl.patch index ec1cb1f4c..bf330956e 100644 --- a/repos/ports/src/app/lighttpd/disable_gethostbyaddr_fcntl.patch +++ b/repos/ports/src/app/lighttpd/disable_gethostbyaddr_fcntl.patch @@ -1,5 +1,4 @@ ---- a/contrib/lighttpd-1.4.31/src/fdevent_poll.c.orig -+++ b/contrib/lighttpd-1.4.31/src/fdevent_poll.c ++++ src/app/lighttpd/src/fdevent_poll.c @@ -193,7 +193,7 @@ int fdevent_poll_init(fdevents *ev) { int fdevent_poll_init(fdevents *ev) { UNUSED(ev); @@ -9,8 +8,7 @@ "s", "poll is not supported, try to set server.event-handler = \"select\""); return -1; ---- a/contrib/lighttpd-1.4.31/src/http-header-glue.c.orig -+++ b/contrib/lighttpd-1.4.31/src/http-header-glue.c ++++ src/app/lighttpd/src/http-header-glue.c @@ -175,6 +175,7 @@ int http_response_redirect_to_directory(server *srv, connection *con) { break; #endif @@ -28,8 +26,7 @@ break; default: log_error_write(srv, __FILE__, __LINE__, ---- a/contrib/lighttpd-1.4.31/src/network.c.orig -+++ b/contrib/lighttpd-1.4.31/src/network.c ++++ src/app/lighttpd/src/network.c @@ -301,6 +301,7 @@ static int network_server_init(server *srv, buffer *host_token, specific_config if (host == NULL) { srv_socket->addr.ipv4.sin_addr.s_addr = htonl(INADDR_ANY); @@ -46,8 +43,7 @@ } srv_socket->addr.ipv4.sin_port = htons(port); ---- a/contrib/lighttpd-1.4.31/src/fdevent.c.orig -+++ b/contrib/lighttpd-1.4.31/src/fdevent.c ++++ src/app/lighttpd/src/fdevent.c @@ -198,16 +198,23 @@ void * fdevent_get_context(fdevents *ev, int fd) { } diff --git a/repos/ports/src/app/lighttpd/target.inc b/repos/ports/src/app/lighttpd/target.inc index b24210f40..8a7edf108 100644 --- a/repos/ports/src/app/lighttpd/target.inc +++ b/repos/ports/src/app/lighttpd/target.inc @@ -1,11 +1,19 @@ -include $(REP_DIR)/ports/lighttpd.inc -LIGHTTPD_DIR = $(REP_DIR)/contrib/$(LIGHTTPD) +LIGHTTPD_DIR := $(call select_from_ports,lighttpd)/src/app/lighttpd FILTER_OUT = lempar.c lighttpd-angel.c lemon.c SRC_C = $(filter-out $(FILTER_OUT),$(notdir $(wildcard $(LIGHTTPD_DIR)/src/*.c))) 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_SYS_WAIT_H -DHAVE_SYS_UN_H -DHAVE_MMAP -DHAVE_SELECT CC_OPT += -DHAVE_WRITEV -DUSE_WRITEV diff --git a/repos/ports/src/app/netperf/netlib.patch b/repos/ports/src/app/netperf/netlib.patch index fe3d50441..360d7a855 100644 --- a/repos/ports/src/app/netperf/netlib.patch +++ b/repos/ports/src/app/netperf/netlib.patch @@ -1,7 +1,4 @@ -Index: src/netlib.c -=================================================================== ---- src/netlib.c (revision 644) -+++ src/netlib.c (working copy) ++++ src/app/netperf/src/netlib.c @@ -844,6 +844,10 @@ exit(1); } diff --git a/repos/ports/src/app/netperf/omni.patch b/repos/ports/src/app/netperf/omni.patch index afd95fc9f..43c1f4964 100644 --- a/repos/ports/src/app/netperf/omni.patch +++ b/repos/ports/src/app/netperf/omni.patch @@ -1,7 +1,4 @@ -Index: src/netserver.c -=================================================================== ---- src/netserver.c (revision 644) -+++ src/netserver.c (working copy) ++++ src/app/netperf/src/netserver.c @@ -567,7 +567,7 @@ int do_inet; int no_name = 0; @@ -11,10 +8,7 @@ Index: src/netserver.c #endif if (debug) { -Index: src/nettest_omni.c -=================================================================== ---- src/nettest_omni.c (revision 644) -+++ src/nettest_omni.c (working copy) ++++ src/app/netperf/src/nettest_omni.c (working copy) @@ -3348,7 +3348,7 @@ 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 /* this is for those systems which *INCORRECTLY* fail to pass attributes across an accept() call. Including this goes -Index: src/nettest_bsd.h -=================================================================== ---- src/nettest_bsd.h (revision 644) -+++ src/nettest_bsd.h (working copy) ++++ src/app/netperf/src/nettest_bsd.h @@ -617,7 +617,7 @@ extern int get_sockaddr_family_addr_port(struct sockaddr_storage *sockaddr, int family, @@ -90,10 +81,7 @@ Index: src/nettest_bsd.h extern void send_tcp_mss(char remote_host[]); extern void send_tcp_stream(char remote_host[]); extern void send_tcp_maerts(char remote_host[]); -Index: src/nettest_bsd.c -=================================================================== ---- src/nettest_bsd.c (revision 644) -+++ src/nettest_bsd.c (working copy) ++++ src/app/netperf/src/nettest_bsd.c @@ -1066,7 +1066,7 @@ /* pull the port and address out of the sockaddr in host format */ diff --git a/repos/ports/src/app/netperf/target.inc b/repos/ports/src/app/netperf/target.inc index 92631a50e..0b4dfcbeb 100644 --- a/repos/ports/src/app/netperf/target.inc +++ b/repos/ports/src/app/netperf/target.inc @@ -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 # plug-in to libc @@ -17,7 +17,7 @@ CC_OPT += -DHAVE_CONFIG_H -DGENODE_BUILD CC_WARN = -Wall -Wno-unused -vpath %.c $(CONTRIB_DIR)/src +vpath %.c $(NETPERF_DIR)/src vpath timer.cc $(PRG_DIR)/.. # vi: set ft=make : diff --git a/repos/ports/src/vancouver/32bit/target.mk b/repos/ports/src/app/seoul/32bit/target.mk similarity index 50% rename from repos/ports/src/vancouver/32bit/target.mk rename to repos/ports/src/app/seoul/32bit/target.mk index e95f2b356..cc15c9c37 100644 --- a/repos/ports/src/vancouver/32bit/target.mk +++ b/repos/ports/src/app/seoul/32bit/target.mk @@ -2,4 +2,4 @@ REQUIRES = 32bit LD_TEXT_ADDR = 0xbf800000 -include $(REP_DIR)/src/vancouver/target.inc +include $(REP_DIR)/src/app/seoul/target.inc diff --git a/repos/ports/src/vancouver/64bit/target.mk b/repos/ports/src/app/seoul/64bit/target.mk similarity index 52% rename from repos/ports/src/vancouver/64bit/target.mk rename to repos/ports/src/app/seoul/64bit/target.mk index 6652af337..5ca460ebd 100644 --- a/repos/ports/src/vancouver/64bit/target.mk +++ b/repos/ports/src/app/seoul/64bit/target.mk @@ -2,4 +2,4 @@ REQUIRES = 64bit LD_TEXT_ADDR = 0x7fffff800000 -include $(REP_DIR)/src/vancouver/target.inc +include $(REP_DIR)/src/app/seoul/target.inc diff --git a/repos/ports/src/vancouver/README b/repos/ports/src/app/seoul/README similarity index 100% rename from repos/ports/src/vancouver/README rename to repos/ports/src/app/seoul/README diff --git a/repos/ports/src/vancouver/boot_module_provider.h b/repos/ports/src/app/seoul/boot_module_provider.h similarity index 100% rename from repos/ports/src/vancouver/boot_module_provider.h rename to repos/ports/src/app/seoul/boot_module_provider.h diff --git a/repos/ports/src/vancouver/console.cc b/repos/ports/src/app/seoul/console.cc similarity index 99% rename from repos/ports/src/vancouver/console.cc rename to repos/ports/src/app/seoul/console.cc index f625ce707..e677ef35f 100644 --- a/repos/ports/src/vancouver/console.cc +++ b/repos/ports/src/app/seoul/console.cc @@ -19,10 +19,6 @@ * conditions of the GNU General Public License version 2. */ -/* local includes */ -#include -#include - /* Genode includes */ #include #include @@ -31,6 +27,12 @@ #include #include +#include + +/* local includes */ +#include "console.h" +#include "keyboard.h" + using Genode::env; using Genode::Dataspace_client; using Genode::Surface; diff --git a/repos/ports/src/vancouver/console.h b/repos/ports/src/app/seoul/console.h similarity index 97% rename from repos/ports/src/vancouver/console.h rename to repos/ports/src/app/seoul/console.h index 206f3b290..bb38f5d1e 100644 --- a/repos/ports/src/vancouver/console.h +++ b/repos/ports/src/app/seoul/console.h @@ -23,14 +23,13 @@ /* Genode includes */ #include -#include #include #include #include #include /* local includes */ -#include +#include "synced_motherboard.h" /* includes for I/O */ #include diff --git a/repos/ports/src/vancouver/device_model_registry.cc b/repos/ports/src/app/seoul/device_model_registry.cc similarity index 98% rename from repos/ports/src/vancouver/device_model_registry.cc rename to repos/ports/src/app/seoul/device_model_registry.cc index 4c0f7d90c..3d1a7fc4d 100644 --- a/repos/ports/src/vancouver/device_model_registry.cc +++ b/repos/ports/src/app/seoul/device_model_registry.cc @@ -20,7 +20,7 @@ */ /* local includes */ -#include +#include "device_model_registry.h" Device_model_registry *device_model_registry() diff --git a/repos/ports/src/vancouver/device_model_registry.h b/repos/ports/src/app/seoul/device_model_registry.h similarity index 100% rename from repos/ports/src/vancouver/device_model_registry.h rename to repos/ports/src/app/seoul/device_model_registry.h diff --git a/repos/ports/src/vancouver/disk.cc b/repos/ports/src/app/seoul/disk.cc similarity index 99% rename from repos/ports/src/vancouver/disk.cc rename to repos/ports/src/app/seoul/disk.cc index a6e397e1e..c53c87f86 100644 --- a/repos/ports/src/vancouver/disk.cc +++ b/repos/ports/src/app/seoul/disk.cc @@ -33,7 +33,7 @@ #include /* local includes */ -#include +#include "disk.h" /* Seoul includes */ #include diff --git a/repos/ports/src/vancouver/disk.h b/repos/ports/src/app/seoul/disk.h similarity index 98% rename from repos/ports/src/vancouver/disk.h rename to repos/ports/src/app/seoul/disk.h index 8879223f4..158f08b07 100644 --- a/repos/ports/src/vancouver/disk.h +++ b/repos/ports/src/app/seoul/disk.h @@ -25,14 +25,13 @@ /* Genode includes */ #include #include -#include #include #include #include #include /* local includes */ -#include +#include "synced_motherboard.h" class Vancouver_disk; diff --git a/repos/ports/src/vancouver/service/memory.h b/repos/ports/src/app/seoul/include/service/memory.h similarity index 100% rename from repos/ports/src/vancouver/service/memory.h rename to repos/ports/src/app/seoul/include/service/memory.h diff --git a/repos/ports/src/vancouver/service/profile.h b/repos/ports/src/app/seoul/include/service/profile.h similarity index 100% rename from repos/ports/src/vancouver/service/profile.h rename to repos/ports/src/app/seoul/include/service/profile.h diff --git a/repos/ports/src/vancouver/keyboard.cc b/repos/ports/src/app/seoul/keyboard.cc similarity index 99% rename from repos/ports/src/vancouver/keyboard.cc rename to repos/ports/src/app/seoul/keyboard.cc index 065c83e98..0e3601bd0 100644 --- a/repos/ports/src/vancouver/keyboard.cc +++ b/repos/ports/src/app/seoul/keyboard.cc @@ -19,7 +19,7 @@ */ /* local includes */ -#include +#include "keyboard.h" /* vancouver generic keyboard helper */ #include diff --git a/repos/ports/src/vancouver/keyboard.h b/repos/ports/src/app/seoul/keyboard.h similarity index 96% rename from repos/ports/src/vancouver/keyboard.h rename to repos/ports/src/app/seoul/keyboard.h index 7569a7d9f..d125d3d25 100644 --- a/repos/ports/src/vancouver/keyboard.h +++ b/repos/ports/src/app/seoul/keyboard.h @@ -21,14 +21,15 @@ #ifndef _KEYBOARD_H_ #define _KEYBOARD_H_ -/* local includes */ -#include /* includes for I/O */ #include #include #include +/* local includes */ +#include "synced_motherboard.h" + class Vancouver_keyboard { private: diff --git a/repos/ports/src/vancouver/main.cc b/repos/ports/src/app/seoul/main.cc similarity index 99% rename from repos/ports/src/vancouver/main.cc rename to repos/ports/src/app/seoul/main.cc index 4a689664c..05c01916d 100644 --- a/repos/ports/src/vancouver/main.cc +++ b/repos/ports/src/app/seoul/main.cc @@ -62,12 +62,12 @@ #include /* local includes */ -#include -#include -#include -#include -#include -#include +#include "synced_motherboard.h" +#include "device_model_registry.h" +#include "boot_module_provider.h" +#include "console.h" +#include "network.h" +#include "disk.h" enum { verbose_debug = false }; diff --git a/repos/ports/src/app/seoul/mono.tff b/repos/ports/src/app/seoul/mono.tff new file mode 120000 index 000000000..6d1584968 --- /dev/null +++ b/repos/ports/src/app/seoul/mono.tff @@ -0,0 +1 @@ +../../../../demo/src/server/nitlog/mono.tff \ No newline at end of file diff --git a/repos/ports/src/vancouver/network.cc b/repos/ports/src/app/seoul/network.cc similarity index 98% rename from repos/ports/src/vancouver/network.cc rename to repos/ports/src/app/seoul/network.cc index 9685efad2..d4f28d006 100644 --- a/repos/ports/src/vancouver/network.cc +++ b/repos/ports/src/app/seoul/network.cc @@ -19,7 +19,7 @@ */ /* local includes */ -#include +#include "network.h" extern const void * _forward_pkt; diff --git a/repos/ports/src/vancouver/network.h b/repos/ports/src/app/seoul/network.h similarity index 96% rename from repos/ports/src/vancouver/network.h rename to repos/ports/src/app/seoul/network.h index 197ecc9d8..42a97e67b 100644 --- a/repos/ports/src/vancouver/network.h +++ b/repos/ports/src/app/seoul/network.h @@ -25,7 +25,7 @@ #include /* local includes */ -#include +#include "synced_motherboard.h" using Genode::List; using Genode::Thread; diff --git a/repos/ports/src/vancouver/nova_user_env.cc b/repos/ports/src/app/seoul/nova_user_env.cc similarity index 100% rename from repos/ports/src/vancouver/nova_user_env.cc rename to repos/ports/src/app/seoul/nova_user_env.cc diff --git a/repos/ports/src/vancouver/synced_motherboard.h b/repos/ports/src/app/seoul/synced_motherboard.h similarity index 100% rename from repos/ports/src/vancouver/synced_motherboard.h rename to repos/ports/src/app/seoul/synced_motherboard.h diff --git a/repos/ports/src/app/seoul/target.inc b/repos/ports/src/app/seoul/target.inc new file mode 100644 index 000000000..75b671a28 --- /dev/null +++ b/repos/ports/src/app/seoul/target.inc @@ -0,0 +1,33 @@ +TARGET = seoul + +SEOUL_CONTRIB_DIR = $(call select_from_ports,seoul)/src/app/seoul +SEOUL_GENODE_DIR = $(SEOUL_CONTRIB_DIR)/genode + +REQUIRES += nova + +LIBS += base blit alarm seoul_libc_support config +SRC_CC = main.cc nova_user_env.cc device_model_registry.cc +SRC_CC += console.cc keyboard.cc network.cc disk.cc +SRC_BIN = mono.tff + +MODEL_SRC_CC += $(notdir $(wildcard $(SEOUL_CONTRIB_DIR)/model/*.cc)) +EXECUTOR_SRC_CC += $(notdir $(wildcard $(SEOUL_CONTRIB_DIR)/executor/*.cc)) + +ifneq ($(filter x86_64, $(SPECS)),) +CC_CXX_OPT += -mcmodel=large +endif + +SRC_CC += $(filter-out $(FILTER_OUT),$(addprefix model/,$(MODEL_SRC_CC))) +SRC_CC += $(filter-out $(FILTER_OUT),$(addprefix executor/,$(EXECUTOR_SRC_CC))) + +INC_DIR += $(SEOUL_CONTRIB_DIR)/include +INC_DIR += $(SEOUL_GENODE_DIR)/include +INC_DIR += $(PRG_DIR)/../include + +CC_WARN += -Wno-parentheses +CC_CXX_OPT += -march=core2 +CC_CXX_OPT += -mssse3 + +vpath %.cc $(SEOUL_CONTRIB_DIR) +vpath %.cc $(PRG_DIR)/.. +vpath %.tff $(PRG_DIR)/.. diff --git a/repos/ports/src/noux-pkg/binutils/target.inc b/repos/ports/src/noux-pkg/binutils/target.inc index 266403830..e946f0284 100644 --- a/repos/ports/src/noux-pkg/binutils/target.inc +++ b/repos/ports/src/noux-pkg/binutils/target.inc @@ -10,6 +10,6 @@ NOUX_CONFIGURE_ARGS = --disable-werror \ # NOUX_MAKE_ENV = $(NOUX_ENV) -NOUX_PKG_DIR = $(wildcard $(REP_DIR)/contrib/binutils-*) +NOUX_PKG_DIR = $(call select_from_ports,binutils)/src/noux-pkg/binutils include $(REP_DIR)/mk/noux.mk diff --git a/repos/ports/src/noux-pkg/dash/build.patch b/repos/ports/src/noux-pkg/dash/build.patch index 4a0e832b2..093f61437 100644 --- a/repos/ports/src/noux-pkg/dash/build.patch +++ b/repos/ports/src/noux-pkg/dash/build.patch @@ -1,6 +1,4 @@ -diff -u dash-0.5.6/config.h.in _dash-0.5.6/config.h.in ---- contrib/dash-0.5.6/config.h.in 2010-04-02 08:10:53.000000000 +0200 -+++ contrib/dash-0.5.6/config.h.in 2011-02-02 23:02:10.000000000 +0100 ++++ src/noux-pkg/dash/config.h.in @@ -116,6 +116,8 @@ # undef _GNU_SOURCE #endif diff --git a/repos/ports/src/noux-pkg/e2fsprogs/patches/MCONFIG.in.patch b/repos/ports/src/noux-pkg/e2fsprogs/patches/MCONFIG.in.patch index 86faf00c0..c80987db4 100644 --- a/repos/ports/src/noux-pkg/e2fsprogs/patches/MCONFIG.in.patch +++ b/repos/ports/src/noux-pkg/e2fsprogs/patches/MCONFIG.in.patch @@ -1,7 +1,4 @@ -diff --git a/MCONFIG.in b/MCONFIG.in -index 557b37a..bcdbfa7 100644 ---- a/MCONFIG.in -+++ b/MCONFIG.in ++++ src/noux-pkg/e2fsprogs/MCONFIG.in @@ -62,6 +62,8 @@ datadir = @datadir@ @ifGNUmake@ endif @ifGNUmake@ endif diff --git a/repos/ports/src/noux-pkg/e2fsprogs/patches/Makefile.in.patch b/repos/ports/src/noux-pkg/e2fsprogs/patches/Makefile.in.patch index 85304062e..32abe90ec 100644 --- a/repos/ports/src/noux-pkg/e2fsprogs/patches/Makefile.in.patch +++ b/repos/ports/src/noux-pkg/e2fsprogs/patches/Makefile.in.patch @@ -1,7 +1,4 @@ -diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in -index bf037e0..f9d71fa 100644 ---- a/debugfs/Makefile.in -+++ b/debugfs/Makefile.in ++++ src/noux-pkg/e2fsprogs/debugfs/Makefile.in @@ -31,7 +31,7 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.c $(srcdir)/ls.c \ $(srcdir)/filefrag.c $(srcdir)/extent_inode.c $(srcdir)/zap.c @@ -11,10 +8,7 @@ index bf037e0..f9d71fa 100644 DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(DEPLIBCOM_ERR) \ $(DEPLIBBLKID) $(DEPLIBUUID) -diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in -index 8e1c891..4073cf8 100644 ---- a/e2fsck/Makefile.in -+++ b/e2fsck/Makefile.in ++++ src/noux-pkg/e2fsprogs/e2fsck/Makefile.in @@ -16,7 +16,7 @@ MANPAGES= e2fsck.8 FMANPAGES= e2fsck.conf.5 @@ -24,10 +18,7 @@ index 8e1c891..4073cf8 100644 DEPLIBS= $(DEPLIBQUOTA) $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) \ $(DEPLIBUUID) $(DEPLIBE2P) -diff --git a/ext2ed/Makefile.in b/ext2ed/Makefile.in -index 290f06e..584f6a5 100644 ---- a/ext2ed/Makefile.in -+++ b/ext2ed/Makefile.in ++++ src/noux-pkg/e2fsprogs/ext2ed/Makefile.in @@ -16,7 +16,7 @@ MANPAGES= ext2ed.8 DOC_DIR = $datadir/doc/ext2ed @@ -37,10 +28,7 @@ index 290f06e..584f6a5 100644 SRCS= $(srcdir)/main.c $(srcdir)/init.c $(srcdir)/general_com.c \ $(srcdir)/inode_com.c $(srcdir)/dir_com.c $(srcdir)/super_com.c \ -diff --git a/intl/Makefile.in b/intl/Makefile.in -index bf24f63..3754ada 100644 ---- a/intl/Makefile.in -+++ b/intl/Makefile.in ++++ src/noux-pkg/e2fsprogs/intl/Makefile.in @@ -191,7 +191,7 @@ LTV_AGE=4 .c.o: $(E) " CC $<" @@ -50,10 +38,7 @@ index bf24f63..3754ada 100644 .y.c: $(YACC) $(YFLAGS) --output $@ $< -diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in -index 3f15c67..4623413 100644 ---- a/lib/blkid/Makefile.in -+++ b/lib/blkid/Makefile.in ++++ src/noux-pkg/e2fsprogs/lib/blkid/Makefile.in @@ -127,7 +127,7 @@ tst_types: tst_types.o blkid_types.h blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID) @@ -63,10 +48,7 @@ index 3f15c67..4623413 100644 test_probe: test_probe.in Makefile $(E) "Creating test_probe..." -diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in -index 14d08c1..4aaf40d 100644 ---- a/lib/uuid/Makefile.in -+++ b/lib/uuid/Makefile.in ++++ src/noux-pkg/e2fsprogs/lib/uuid/Makefile.in @@ -83,12 +83,12 @@ tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID) @@ -82,10 +64,7 @@ index 14d08c1..4aaf40d 100644 uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in $(E) " SUBST $@" -diff --git a/misc/Makefile.in b/misc/Makefile.in -index 553c361..819e301 100644 ---- a/misc/Makefile.in -+++ b/misc/Makefile.in ++++ src/noux-pkg/e2fsprogs/misc/Makefile.in @@ -84,7 +84,7 @@ SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \ $(srcdir)/ismounted.c $(srcdir)/../e2fsck/profile.c \ $(srcdir)/e2undo.c $(srcdir)/e2freefrag.c @@ -168,10 +147,7 @@ index 553c361..819e301 100644 filefrag.profiled: $(FILEFRAG_OBJS) $(E) " LD $@" -diff --git a/resize/Makefile.in b/resize/Makefile.in -index b8fb3ae..2850999 100644 ---- a/resize/Makefile.in -+++ b/resize/Makefile.in ++++ src/noux-pkg/e2fsprogs/resize/Makefile.in @@ -28,7 +28,7 @@ SRCS= $(srcdir)/extent.c \ $(srcdir)/resource_track.c \ $(srcdir)/sim_progress.c @@ -181,10 +157,7 @@ index b8fb3ae..2850999 100644 DEPLIBS= $(LIBE2P) $(LIBEXT2FS) $(DEPLIBCOM_ERR) STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) \ -diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in -index 37abf23..3aba8e0 100644 ---- a/tests/progs/Makefile.in -+++ b/tests/progs/Makefile.in ++++ src/noux-pkg/e2fsprogs/tests/progs/Makefile.in @@ -37,7 +37,7 @@ test_rel: $(TEST_REL_OBJS) $(DEPLIBS) crcsum: crcsum.o $(DEPLIBS) diff --git a/repos/ports/src/noux-pkg/e2fsprogs/patches/Makefile.library.patch b/repos/ports/src/noux-pkg/e2fsprogs/patches/Makefile.library.patch index abdd7fe59..bd7931561 100644 --- a/repos/ports/src/noux-pkg/e2fsprogs/patches/Makefile.library.patch +++ b/repos/ports/src/noux-pkg/e2fsprogs/patches/Makefile.library.patch @@ -1,7 +1,5 @@ -diff --git a/lib/Makefile.library b/lib/Makefile.library -index 1b86b02..264246a 100644 ---- a/lib/Makefile.library -+++ b/lib/Makefile.library +--- ++++ src/noux-pkg/e2fsprogs/lib/Makefile.library @@ -2,6 +2,8 @@ all:: subdirs $(LIBRARY).a install-shlibs:: diff --git a/repos/ports/src/noux-pkg/e2fsprogs/patches/configure.patch b/repos/ports/src/noux-pkg/e2fsprogs/patches/configure.patch index 062b5b351..08fc4463d 100644 --- a/repos/ports/src/noux-pkg/e2fsprogs/patches/configure.patch +++ b/repos/ports/src/noux-pkg/e2fsprogs/patches/configure.patch @@ -1,7 +1,4 @@ -diff --git a/configure b/configure -index 31ec8d3..1026463 100755 ---- a/configure -+++ b/configure ++++ src/noux-pkg/e2fsprogs/configure @@ -4225,10 +4225,10 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu diff --git a/repos/ports/src/noux-pkg/gcc/target.inc b/repos/ports/src/noux-pkg/gcc/target.inc index 3e62f0107..6eef8a2e4 100644 --- a/repos/ports/src/noux-pkg/gcc/target.inc +++ b/repos/ports/src/noux-pkg/gcc/target.inc @@ -1,5 +1,7 @@ PWD = $(shell pwd) +NOUX_PKG_DIR := $(REP_DIR)/contrib/gcc-4.7.2 + NOUX_CONFIGURE_ARGS = --program-prefix=$(PROGRAM_PREFIX) \ --target=$(GCC_TARGET) \ --with-gnu-as --with-gnu-ld --disable-tls --disable-threads --disable-lto \ diff --git a/repos/ports/src/noux-pkg/lynx/build.patch b/repos/ports/src/noux-pkg/lynx/build.patch index 80ca44d30..882675d59 100644 --- a/repos/ports/src/noux-pkg/lynx/build.patch +++ b/repos/ports/src/noux-pkg/lynx/build.patch @@ -1,5 +1,4 @@ ---- lynx-2.8.8.dev12.orig/src/makefile.in 2012-06-18 15:44:22.237274112 +0200 -+++ lynx-2.8.8.dev12/src/makefile.in 2012-06-18 15:44:37.774023653 +0200 ++++ src/noux-pkg/lynx/src/makefile.in @@ -102,7 +102,7 @@ lynx$x: message do_chartrans_stuff $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB) diff --git a/repos/ports/src/noux-pkg/noux-etc/target.mk b/repos/ports/src/noux-pkg/noux-etc/target.mk index 6a66a5bd0..4b640d6bf 100644 --- a/repos/ports/src/noux-pkg/noux-etc/target.mk +++ b/repos/ports/src/noux-pkg/noux-etc/target.mk @@ -6,7 +6,7 @@ BUILD_BIN_DIR = ../../bin TARGET_DIR = $(BUILD_BIN_DIR)/noux-etc/etc -ETC_CONTRIB_DIR = $(REP_DIR)/contrib/etc-8.2.0 +ETC_CONTRIB_DIR := $(call select_from_ports,etc)/src/noux-pkg/etc ETC_FILES = hosts \ nsswitch.conf \ diff --git a/repos/ports/src/noux-pkg/openssh/includes_h.patch b/repos/ports/src/noux-pkg/openssh/includes_h.patch index 3b8eba064..516939d49 100644 --- a/repos/ports/src/noux-pkg/openssh/includes_h.patch +++ b/repos/ports/src/noux-pkg/openssh/includes_h.patch @@ -1,5 +1,4 @@ ---- openssh-6.1p1/includes.h.orig 2012-11-14 16:18:25.970072293 +0100 -+++ openssh-6.1p1/includes.h 2012-11-14 16:18:48.860209365 +0100 ++++ src/noux-pkg/openssh/includes.h @@ -18,7 +18,8 @@ #include "config.h" diff --git a/repos/ports/src/noux-pkg/openssh/monitor_fdpass.c.patch b/repos/ports/src/noux-pkg/openssh/monitor_fdpass.c.patch index c8891c52b..13d489879 100644 --- a/repos/ports/src/noux-pkg/openssh/monitor_fdpass.c.patch +++ b/repos/ports/src/noux-pkg/openssh/monitor_fdpass.c.patch @@ -1,8 +1,7 @@ We do not have poll.h and since struct pollfd etc. pp is defined in sys/poll.h we use it instead. ---- openssh-6.1p1/monitor_fdpass.c.orig -+++ openssh-6.1p1/monitor_fdpass.c ++++ src/noux-pkg/openssh/monitor_fdpass.c @@ -36,6 +36,10 @@ #include #ifdef HAVE_POLL_H diff --git a/repos/ports/src/noux-pkg/openssh/sshconnect.h.patch b/repos/ports/src/noux-pkg/openssh/sshconnect.h.patch index 8c3c5c2b9..92f1c773c 100644 --- a/repos/ports/src/noux-pkg/openssh/sshconnect.h.patch +++ b/repos/ports/src/noux-pkg/openssh/sshconnect.h.patch @@ -1,8 +1,7 @@ set*uid() is not implemented but it does not matter anyway because there is only one user per noux instance. ---- openssh-6.1p1/sshconnect.h.orig -+++ openssh-6.1p1/sshconnect.h ++++ src/noux-pkg/openssh/sshconnect.h @@ -55,6 +55,7 @@ void ssh_userauth2(const char *, const char *, char *, Sensitive *); void ssh_put_password(char *); int ssh_local_cmd(const char *); diff --git a/repos/ports/src/noux-pkg/vim/build.patch b/repos/ports/src/noux-pkg/vim/build.patch index 4191db9c0..927b0efbe 100644 --- a/repos/ports/src/noux-pkg/vim/build.patch +++ b/repos/ports/src/noux-pkg/vim/build.patch @@ -8,10 +8,7 @@ From: Christian Prochaska src/xxd/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/Makefile b/src/Makefile -index e473ca2..52b75e4 100644 ---- a/src/Makefile -+++ b/src/Makefile ++++ src/noux-pkg/vim/src/Makefile @@ -1698,7 +1698,7 @@ $(VIMTARGET): auto/config.mk objects $(OBJ) version.c version.h MAKE="$(MAKE)" sh $(srcdir)/link.sh @@ -21,10 +18,7 @@ index e473ca2..52b75e4 100644 $(MAKE) -f Makefile # Build the language specific files if they were unpacked. -diff --git a/src/xxd/Makefile b/src/xxd/Makefile -index 97bbcc7..099330a 100644 ---- a/src/xxd/Makefile -+++ b/src/xxd/Makefile ++++ src/noux-pkg/vim/src/xxd/Makefile @@ -1,7 +1,7 @@ # The most simplistic Makefile diff --git a/repos/ports/src/vancouver/mono.tff b/repos/ports/src/vancouver/mono.tff deleted file mode 120000 index 110c35c00..000000000 --- a/repos/ports/src/vancouver/mono.tff +++ /dev/null @@ -1 +0,0 @@ -../../../demo/src/server/nitlog/mono.tff \ No newline at end of file diff --git a/repos/ports/src/vancouver/target.inc b/repos/ports/src/vancouver/target.inc deleted file mode 100644 index 15babd0e0..000000000 --- a/repos/ports/src/vancouver/target.inc +++ /dev/null @@ -1,45 +0,0 @@ -TARGET = vancouver - -CONTRIB_DIR = $(REP_DIR)/contrib/seoul-git -VANCOUVER_DIR = $(CONTRIB_DIR) -GENODE_DIR = $(CONTRIB_DIR)/genode -NOVA_INCLUDE_DIR = $(REP_DIR)/contrib/seoul-git/include - -REQUIRES += nova - -ifeq ($(wildcard $(VANCOUVER_DIR)),) -REQUIRES += prepare_ports_vancouver -endif - -LIBS += base blit alarm seoul_libc_support config -SRC_CC = main.cc nova_user_env.cc device_model_registry.cc -SRC_CC += console.cc keyboard.cc network.cc disk.cc -SRC_BIN = mono.tff - -MODEL_SRC_CC += $(notdir $(wildcard $(VANCOUVER_DIR)/model/*.cc)) -EXECUTOR_SRC_CC += $(notdir $(wildcard $(VANCOUVER_DIR)/executor/*.cc)) -SERVICE_SRC_CC += sink.cc - -ifneq ($(filter x86_64, $(SPECS)),) -CC_CXX_OPT += -mcmodel=large -endif - -SRC_CC += $(filter-out $(FILTER_OUT),$(addprefix model/,$(MODEL_SRC_CC))) -SRC_CC += $(filter-out $(FILTER_OUT),$(addprefix executor/,$(EXECUTOR_SRC_CC))) -SRC_CC += model/sink.cc - -INC_DIR += $(PRG_DIR)/.. -INC_DIR += $(PRG_DIR)/../executor -INC_DIR += $(VANCOUVER_DIR)/model -INC_DIR += $(VANCOUVER_DIR)/executor -INC_DIR += $(VANCOUVER_DIR)/include $(GENODE_DIR)/include -INC_DIR += $(NOVA_INCLUDE_DIR) - -CC_WARN += -Wno-parentheses -CC_CXX_OPT += -march=core2 -CC_CXX_OPT += -mssse3 - -vpath %.cc $(VANCOUVER_DIR) -vpath %.cc $(CONTRIB_DIR) -vpath %.cc $(PRG_DIR)/.. -vpath %.tff $(PRG_DIR)/.. diff --git a/repos/ports/src/virtualbox/acpi_drv.patch b/repos/ports/src/virtualbox/acpi_drv.patch index dc98e122a..536a97680 100644 --- a/repos/ports/src/virtualbox/acpi_drv.patch +++ b/repos/ports/src/virtualbox/acpi_drv.patch @@ -1,4 +1,4 @@ -+++ src/VBox/Devices/PC/DrvACPI.cpp ++++ src/app/virtualbox/src/VBox/Devices/PC/DrvACPI.cpp @@ -44,6 +44,7 @@ # include #endif diff --git a/repos/ports/src/virtualbox/fake_pci_vendor.patch b/repos/ports/src/virtualbox/fake_pci_vendor.patch index a9dc0946b..0fa3c3a62 100644 --- a/repos/ports/src/virtualbox/fake_pci_vendor.patch +++ b/repos/ports/src/virtualbox/fake_pci_vendor.patch @@ -1,4 +1,4 @@ -+++ src/VBox/Devices/Graphics/DevVGA.cpp 2013-12-09 10:33:02.168894689 +0100 ++++ src/app/virtualbox/src/VBox/Devices/Graphics/DevVGA.cpp @@ -5885,7 +5889,7 @@ vgaR3Reset(pDevIns); @@ -8,7 +8,7 @@ PCIDevSetDeviceId( &pThis->Dev, 0xbeef); PCIDevSetClassSub( &pThis->Dev, 0x00); /* VGA controller */ PCIDevSetClassBase( &pThis->Dev, 0x03); -+++ src/VBox/Devices/VMMDev/VMMDev.cpp 2013-12-09 10:33:15.164894199 +0100 ++++ src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp @@ -3429,7 +3431,7 @@ pThis->pDevIns = pDevIns; diff --git a/repos/ports/src/virtualbox/hda.patch b/repos/ports/src/virtualbox/hda.patch index 1dc374bbf..fd2191127 100644 --- a/repos/ports/src/virtualbox/hda.patch +++ b/repos/ports/src/virtualbox/hda.patch @@ -1,4 +1,4 @@ -+++ src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp ++++ src/app/virtualbox/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp @@ -158,6 +160,7 @@ static bool g_fReleaseLog = true; /**< Set if we should open the release. */ const char *g_pszProgressString; diff --git a/repos/ports/src/virtualbox/hwacc.patch b/repos/ports/src/virtualbox/hwacc.patch index a369e2e53..54c87ad07 100644 --- a/repos/ports/src/virtualbox/hwacc.patch +++ b/repos/ports/src/virtualbox/hwacc.patch @@ -1,4 +1,4 @@ -+++ src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp ++++ src/app/virtualbox/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp @@ -1273,6 +1279,14 @@ rc = CFGMR3InsertInteger(pRoot, "CSAMEnabled", 1); UPDATE_RC(); #endif diff --git a/repos/ports/src/virtualbox/include/version-generated.h b/repos/ports/src/virtualbox/include/version-generated.h index 6a79818c2..9cf630c5b 100644 --- a/repos/ports/src/virtualbox/include/version-generated.h +++ b/repos/ports/src/virtualbox/include/version-generated.h @@ -1,11 +1,4 @@ #ifndef ___version_generated_h___ #define ___version_generated_h___ - -#define VBOX_VERSION_MAJOR 4 -#define VBOX_VERSION_MINOR 2 -#define VBOX_VERSION_BUILD 16 -#define VBOX_VERSION_STRING_RAW "4.2.16" -#define VBOX_VERSION_STRING "4.2.16_OSE" -#define VBOX_API_VERSION_STRING "4_2" - +/* VBOX_VERSION_* set in lib/mk/virtualbox-common.inc */ #endif diff --git a/repos/ports/src/virtualbox/pdm_queue_irqs.patch b/repos/ports/src/virtualbox/pdm_queue_irqs.patch index 5097f6e2d..24bb84dc6 100644 --- a/repos/ports/src/virtualbox/pdm_queue_irqs.patch +++ b/repos/ports/src/virtualbox/pdm_queue_irqs.patch @@ -1,4 +1,4 @@ -+++ src/VBox/VMM/VMMAll/PDMAllQueue.cpp ++++ src/app/virtualbox/src/VBox/VMM/VMMAll/PDMAllQueue.cpp @@ -106,7 +106,7 @@ # ifdef VBOX_WITH_REM REMR3NotifyQueuePending(pVM); /** @todo r=bird: we can remove REMR3NotifyQueuePending and let VMR3NotifyFF do the work. */ diff --git a/repos/ports/src/virtualbox/serial.patch b/repos/ports/src/virtualbox/serial.patch index 597fb0dad..bdd1c338f 100644 --- a/repos/ports/src/virtualbox/serial.patch +++ b/repos/ports/src/virtualbox/serial.patch @@ -1,4 +1,4 @@ -+++ src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp ++++ src/app/virtualbox/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp @@ -1481,6 +1489,11 @@ rc = CFGMR3InsertInteger(pCfg, "IRQ", 4); UPDATE_RC(); rc = CFGMR3InsertInteger(pCfg, "IOBase", 0x3f8); UPDATE_RC(); diff --git a/repos/ports/src/virtualbox/timer.patch b/repos/ports/src/virtualbox/timer.patch index 7e546ed33..ec6c4d9a1 100644 --- a/repos/ports/src/virtualbox/timer.patch +++ b/repos/ports/src/virtualbox/timer.patch @@ -1,4 +1,4 @@ -+++ src/VBox/VMM/VMMR3/TM.cpp 2014-01-15 16:40:35 ++++ src/app/virtualbox/src/VBox/VMM/VMMR3/TM.cpp @@ -1901,7 +1901,7 @@ #ifdef VBOX_WITH_REM REMR3NotifyTimerPending(pVM, pVCpuDst); diff --git a/repos/ports/src/virtualbox/vbetables-gen.patch b/repos/ports/src/virtualbox/vbetables-gen.patch index 86ccd723a..8acd4dfb6 100644 --- a/repos/ports/src/virtualbox/vbetables-gen.patch +++ b/repos/ports/src/virtualbox/vbetables-gen.patch @@ -1,5 +1,4 @@ ---- src/VBox/Devices/Graphics/BIOS/vbetables-gen.c.orig 2013-11-19 16:09:24.844195101 +0100 -+++ src/VBox/Devices/Graphics/BIOS/vbetables-gen.c 2013-11-19 16:09:38.288364715 +0100 ++++ src/app/virtualbox/src/VBox/Devices/Graphics/BIOS/vbetables-gen.c @@ -13,6 +13,7 @@ ModeInfo modes[] = { diff --git a/repos/ports/src/virtualbox/vboxbfe.patch b/repos/ports/src/virtualbox/vboxbfe.patch index 3a91228ba..fab016c5f 100644 --- a/repos/ports/src/virtualbox/vboxbfe.patch +++ b/repos/ports/src/virtualbox/vboxbfe.patch @@ -1,4 +1,4 @@ -+++ src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h ++++ src/app/virtualbox/src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h @@ -24,10 +24,9 @@ # include #else @@ -11,7 +11,7 @@ #include #include #include -+++ src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp ++++ src/app/virtualbox/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp @@ -1765,19 +1779,19 @@ /* * VMM Device diff --git a/repos/ports/src/virtualbox/vga_fb.patch b/repos/ports/src/virtualbox/vga_fb.patch index cd4e72e5e..09dc15212 100644 --- a/repos/ports/src/virtualbox/vga_fb.patch +++ b/repos/ports/src/virtualbox/vga_fb.patch @@ -1,4 +1,4 @@ -+++ src/VBox/Devices/Graphics/DevVGA.cpp ++++ src/app/virtualbox/src/VBox/Devices/Graphics/DevVGA.cpp @@ -3468,9 +3475,15 @@ int rc; Assert(pThis); diff --git a/repos/ports/src/virtualbox/vmdk.patch b/repos/ports/src/virtualbox/vmdk.patch index 6679fd904..71267cb1b 100644 --- a/repos/ports/src/virtualbox/vmdk.patch +++ b/repos/ports/src/virtualbox/vmdk.patch @@ -1,4 +1,4 @@ -+++ src/VBox/Storage/VMDK.cpp 2013-11-25 14:15:48.171143505 +0100 ++++ src/app/virtualbox/src/VBox/Storage/VMDK.cpp @@ -6114,7 +6114,6 @@ } pExtent->uGrainSectorAbs = uSectorExtentAbs; diff --git a/repos/ports/src/virtualbox/vmmdev.patch b/repos/ports/src/virtualbox/vmmdev.patch index 80b2fb123..40e6ffe64 100644 --- a/repos/ports/src/virtualbox/vmmdev.patch +++ b/repos/ports/src/virtualbox/vmmdev.patch @@ -1,4 +1,4 @@ -+++ src/VBox/Devices/VMMDev/VMMDev.cpp 2013-10-17 13:02:16.787071776 +0200 ++++ src/app/virtualbox/src/VBox/Devices/VMMDev/VMMDev.cpp @@ -1854,7 +1854,6 @@ } break; diff --git a/repos/ports/src/virtualbox/vmx_c++.patch b/repos/ports/src/virtualbox/vmx_c++.patch index 7c9510285..1c8e4a8c0 100644 --- a/repos/ports/src/virtualbox/vmx_c++.patch +++ b/repos/ports/src/virtualbox/vmx_c++.patch @@ -1,4 +1,4 @@ -+++ include/VBox/vmm/hwacc_vmx.h ++++ src/app/virtualbox/include/VBox/vmm/hwacc_vmx.h @@ -1338,10 +1338,10 @@ ".byte 0xF3, 0x0F, 0xC7, 0x34, 0x24 # VMXON [esp] \n\t" "ja 2f \n\t"