dde_rump: migrate to new ports mechanism

Issue #1082
This commit is contained in:
Josef Söntgen 2014-05-23 17:54:04 +02:00 committed by Norman Feske
parent db89c85954
commit 9e443c78db
5 changed files with 48 additions and 60 deletions

View File

@ -1,67 +1,25 @@
#
# \brief Checkout rump kernel source code
# \author Sebastian Sumpf
# \date 2013-11-27
# \brief Download, and unpack rumpkernel
# \author Josef Soentgen
# \date 2014-05-20
#
VERBOSE ?= @
CONTRIB_DIR = contrib
ECHO = @echo
PATCHES := $(shell find patches -name \*.patch)
GIT_RUMP_URI = https://github.com/anttikantee/buildrump.sh.git
GIT_RUMP_COMMIT = d604845baafa110945cb54a2d9607e6f435c6027
GIT_LIBS_URI = https://github.com/anttikantee/xen-nblibc.git
GIT_LIBS_COMMIT = b86122315f338042d06ad83ac5bd763a5dbd0c00
GIT_NETBSD_COMMIT = ff70642c9d7a8fb4b3242b30de2efc1fd8ad9ad4
RUMP_SRC = src
VERBOSE ?= @
ECHO := @echo
#
# Utility to check if a tool is installed
# Print help information by default
#
check_tool = $(if $(shell which $(1)),,$(error Need to have '$(1)' installed.))
help::
$(call check_tool,git)
$(CONTRIB_DIR)/.git:
$(VERBOSE) git clone $(GIT_RUMP_URI) $(CONTRIB_DIR)
$(CONTRIB_DIR)/nblibs:
$(VERBOSE) git clone $(GIT_LIBS_URI) $(CONTRIB_DIR)/nblibs
cd $(CONTRIB_DIR)/nblibs ; ln -sf ../$(RUMP_SRC)/common
$(CONTRIB_DIR)/$(RUMP_SRC):
$(VERBOSE) cd $(CONTRIB_DIR); ./buildrump.sh -s $(RUMP_SRC) checkout
$(VERBOSE) cd $(CONTRIB_DIR)/src; git reset --hard $(GIT_NETBSD_COMMIT)
commit:
$(VERBOSE) cd $(CONTRIB_DIR); git fetch origin
$(VERBOSE) cd $(CONTRIB_DIR); git reset --hard $(GIT_RUMP_COMMIT)
$(VERBOSE) cd $(CONTRIB_DIR)/nblibs; git fetch origin
$(VERBOSE) cd $(CONTRIB_DIR)/nblibs; git reset --hard $(GIT_LIBS_COMMIT)
$(ECHO) "applying patches to '$(CONTRIB_DIR)/'"
$(VERBOSE)for i in $(PATCHES); do patch -N -d $(CONTRIB_DIR) -p1 < $$i; done
prepare: $(CONTRIB_DIR)/.git $(CONTRIB_DIR)/nblibs $(CONTRIB_DIR)/$(RUMP_SRC) commit
$(VERBOSE)mkdir -p include
$(VERBOSE)ln -sf ../$(CONTRIB_DIR)/$(RUMP_SRC)/sys/rump/include/rump include/rump
clean:
$(VERBOSE) rm -rf $(CONTRIB_DIR)
prepare:
$(VERBOSE)../../tool/ports/prepare_port dde_rump CHECK_HASH=no
help::
$(ECHO)
$(ECHO) "Check out rump kernel sources"
$(ECHO)
$(ECHO) "The source code will be located at the '$(CONTRIB_DIR)/' directory."
$(ECHO) "Prepare the dde_rump repository"
$(ECHO)
$(ECHO) "--- available commands ---"
$(ECHO) "prepare - checkout source codes"
$(ECHO) "clean - remove source codes"
$(ECHO) "prepare - checkout upstream source codes"
$(ECHO)
.NOTPARALLEL:

View File

@ -4,9 +4,9 @@
# \date 2013-12-12
#
CONTRIB_DIR = $(REP_DIR)/contrib
RUMP_BASE = $(BUILD_BASE_DIR)/var/libcache/rump
RUMP_LIB = $(RUMP_BASE)/lib
RUMP_CONTRIB_DIR := $(call select_from_ports,dde_rump)/src/lib/dde_rump
RUMP_BASE = $(BUILD_BASE_DIR)/var/libcache/rump
RUMP_LIB = $(RUMP_BASE)/lib
SHARED_LIB = yes

View File

@ -3,7 +3,7 @@ include $(REP_DIR)/lib/mk/rump.inc
include $(REP_DIR)/lib/import/import-rump.mk
RUMP_OBJ = $(RUMP_BASE)/obj
RUMP_SRC = $(CONTRIB_DIR)/src
RUMP_SRC = $(RUMP_CONTRIB_DIR)/src
RUMP_TOOLS = $(RUMP_BASE)/tools
RMAKE = $(RUMP_TOOLS)/rumpmake
@ -26,7 +26,7 @@ SOURCE = $(addprefix $(REP_DIR)/src/lib/rump/,$(SRC_CC))
# Rump build script
#
BUILD_CMD = AR=$(AR) NM=$(NM) OBJCOPY=$(OBJCOPY) \
$(CONTRIB_DIR)/buildrump.sh -k -V'MAKEVERBOSE=$(VERBOSE_LEVEL)' \
$(RUMP_CONTRIB_DIR)/buildrump.sh -k -V'MAKEVERBOSE=$(VERBOSE_LEVEL)' \
$(RUMP_OPT) -s $(RUMP_SRC) -T $(RUMP_TOOLS) -o $(RUMP_OBJ) \
-d $(RUMP_BASE)
@ -83,8 +83,8 @@ $(RUMP_BASE)/include/.prepared: $(ARCHIVE)
@cd $(RUMP_SRC)/sys; $(RMAKE) -k obj >/dev/null 2>&1
@cd $(RUMP_SRC)/sys; $(RMAKE) -k includes >/dev/null 2>&1
@cd $(RUMP_SRC)/include; $(RMAKE) -k includes > /dev/null 2>&1
@cd $(CONTRIB_DIR)/nblibs/lib/libc; $(RMAKE) includes >/dev/null 2>&1
@cd $(CONTRIB_DIR)/nblibs/lib/libpthread; $(RMAKE) includes >/dev/null 2>&1
@cd $(RUMP_CONTRIB_DIR)/nblibs/lib/libc; $(RMAKE) includes
@cd $(RUMP_CONTRIB_DIR)/nblibs/lib/libpthread; $(RMAKE) includes >/dev/null 2>&1
@touch $(RUMP_BASE)/include/.prepared
#

View File

@ -0,0 +1 @@
dummy

View File

@ -0,0 +1,29 @@
LICENSE := BSD
VERSION := git
DOWNLOADS := rump.git nblibs.git
URL(rump) := https://github.com/anttikantee/buildrump.sh.git
REV(rump) := d604845baafa110945cb54a2d9607e6f435c6027
DIR(rump) := src/lib/dde_rump
URL(nblibs) := https://github.com/rumpkernel/netbsd-userspace-src.git
REV(nblibs) := b86122315f338042d06ad83ac5bd763a5dbd0c00
DIR(nblibs) := src/lib/dde_rump/nblibs
PATCHES := $(shell find $(REP_DIR)/patches/*.patch)
PATCH_OPT := -N -d ${DIR(rump)} -p1
GIT_NETBSD_COMMIT := ff70642c9d7a8fb4b3242b30de2efc1fd8ad9ad4
# checkout NetBSD sources
default: checkout_src
checkout_src: $(DOWNLOADS)
@$(MSG_PREFIX)"checkout NetBSD src "
$(VERBOSE)src/lib/dde_rump/checkout.sh git src/lib/dde_rump/src
$(VERBOSE)cd src/lib/dde_rump/src && git reset --hard $(GIT_NETBSD_COMMIT)
$(VERBOSE)ln -s ../src/common src/lib/dde_rump/nblibs/common
DIRS := include/rump
DIR_CONTENT(include/rump) := src/lib/dde_rump/src/sys/rump/include/rump/*.h
# vi: set ft=make :