denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 12:32:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

noux: install tar archive as build result

Browse Source 
This patch changes the noux build rules to produce a tar archive in
'bin/', alleviating the need for this step from the run scripts.
This way, the visible result of a built noux package is a single (tar)
file in '<build-dir>bin/', which is suited for the use as a ROM module.
This commit is contained in:
Norman Feske
2017-05-14 22:00:40 +02:00
committed by Christian Helmuth
parent ae3664f4a0
commit c4002e6e23
19 changed files with 79 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
repos/ports/mk/gnu_build.mk
View File

@@ -30,6 +30,15 @@
TARGET ?= $(lastword $(subst /, ,$(PRG_DIR)))
PKG ?= $(TARGET)
#
# Select how to make the build result available at Genode's 'INSTALL_DIR'.
# By default, a single tar archive containing the results of the package's
# 'make install' rule is created. By setting the 'INSTALL_TREE' variable
# to a non-empty value, a symlink to the actual file tree is created.
#
INSTALL_TREE ?=
INSTALL_TAR_ARCHIVE ?= yes
LIBS += posix
PWD = $(shell pwd)
@@ -158,16 +167,45 @@ built.tag: env.sh Makefile
INSTALL_TARGET ?= install-strip
#
# Install result of the build in an 'install/' directory local to the target's
# build directory
#
installed.tag: built.tag
@$(MSG_INST)$(TARGET)
$(VERBOSE)source env.sh && $(MAKE) $(MAKE_ENV) $(MAKE_VERBOSE) $(INSTALL_TARGET) DESTDIR=$(PWD)/install MAN= >> stdout.log 2>> stderr.log
$(VERBOSE)rm -f $(INSTALL_DIR)/$(TARGET)
$(VERBOSE)ln -sf $(PWD)/install $(INSTALL_DIR)/$(TARGET)
@touch $@
$(TARGET): installed.tag
@touch $@
#
# Trigger creation of symlinks to the build results at '<build-dir>/bin/'
#
ifneq ($(INSTALL_TAR_ARCHIVE),)
$(TARGET): installed_tar.tag
endif
ifneq ($(INSTALL_TREE),)
$(TARGET): installed_tree.tag
endif
#
# Install symlink to the install directory
#
installed_tree.tag: installed.tag
$(VERBOSE)rm -f $(INSTALL_DIR)/$(TARGET)
$(VERBOSE)ln -sf $(PWD)/install $(INSTALL_DIR)/$(TARGET)
#
# Install symlink to the archived install directory, ready to by mounted
# via the VFS tar file system
#
installed_tar.tag: installed.tag
$(VERBOSE)tar cf $(TARGET).tar -h -C $(PWD)/install .
$(VERBOSE)rm -f $(INSTALL_DIR)/$(TARGET)
$(VERBOSE)ln -sf $(PWD)/$(TARGET).tar $(INSTALL_DIR)/$(TARGET).tar
#
# The clean rule is expected to be executed within the 3rd-party build
# directory. The check should prevent serious damage if this condition
@@ -175,7 +213,7 @@ $(TARGET): installed.tag
#
ifeq ($(notdir $(PWD)),$(notdir $(PRG_DIR)))
clean_dir:
$(VERBOSE)rm -rf $(PWD)/* $(PWD)/.*
$(VERBOSE)find $(PWD) -mindepth 1 -delete
clean_prg_objects: clean_dir
endif

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

@@ -5,4 +5,3 @@ LIBS += libc_noux
PKG_DIR ?= $(call select_from_ports,$(PKG))/src/noux-pkg/$(PKG)
include $(GNU_BUILD_MK)