diff --git a/repos/libports/lib/import/import-jitterentropy.mk b/repos/libports/lib/import/import-jitterentropy.mk index 847f4fd68e..a0b5140527 100644 --- a/repos/libports/lib/import/import-jitterentropy.mk +++ b/repos/libports/lib/import/import-jitterentropy.mk @@ -8,7 +8,12 @@ else ifeq ($(filter-out $(SPECS),arm_v7),) TARGET_CPUARCH=arm_v7 endif +ifeq ($(CONTRIB_DIR),) +REP_INC_DIR += include/jitterentropy +else INC_DIR += $(call select_from_ports,jitterentropy)/include/jitterentropy +endif + INC_DIR += $(call select_from_repositories,src/lib/jitterentropy) INC_DIR += $(call select_from_repositories,src/lib/jitterentropy/spec/$(TARGET_CPUARCH)) diff --git a/repos/libports/recipes/api/jitterentropy/content.mk b/repos/libports/recipes/api/jitterentropy/content.mk new file mode 100644 index 0000000000..0567c222fe --- /dev/null +++ b/repos/libports/recipes/api/jitterentropy/content.mk @@ -0,0 +1,25 @@ +MIRROR_FROM_REP_DIR := lib/mk/jitterentropy.inc \ + lib/import/import-jitterentropy.mk \ + $(foreach SPEC,arm_v6 arm_v7 x86_32 x86_64,\ + lib/mk/spec/$(SPEC)/jitterentropy.mk) \ + src/lib/jitterentropy + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/jitterentropy) +MIRROR_FROM_PORT_DIR := src/lib/jitterentropy/jitterentropy-base.c \ + include/jitterentropy/jitterentropy.h + +content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR) LICENSE + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $@ + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +LICENSE: + ( echo "The contrib sources"; \ + echo " include/jitterentropy/jitterentropy.h"; \ + echo " src/lib/jitterentropy/jitterentropy-base.c"; \ + echo "by Stephan Mueller are licensed under a BSD-style license (please"; \ + echo "see the corresponding copyright header in the files)." ) > $@ diff --git a/repos/libports/recipes/api/jitterentropy/hash b/repos/libports/recipes/api/jitterentropy/hash new file mode 100644 index 0000000000..2d95e50fb4 --- /dev/null +++ b/repos/libports/recipes/api/jitterentropy/hash @@ -0,0 +1 @@ +2018-05-18 f226ebc41dc260f4b3506870061d6f67c1fa34ec diff --git a/repos/libports/recipes/src/vfs_jitterentropy/content.mk b/repos/libports/recipes/src/vfs_jitterentropy/content.mk index be4dd39e1e..dcc9e131f0 100644 --- a/repos/libports/recipes/src/vfs_jitterentropy/content.mk +++ b/repos/libports/recipes/src/vfs_jitterentropy/content.mk @@ -1,29 +1,9 @@ -MIRROR_FROM_REP_DIR := lib/mk/jitterentropy.inc \ - lib/import/import-jitterentropy.mk \ - $(foreach SPEC,arm_v6 arm_v7 x86_32 x86_64,\ - lib/mk/spec/$(SPEC)/jitterentropy.mk) \ - src/lib/jitterentropy \ - lib/mk/vfs_jitterentropy.mk src/lib/vfs/jitterentropy +MIRROR_FROM_REP_DIR := lib/mk/vfs_jitterentropy.mk src/lib/vfs/jitterentropy -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/jitterentropy) -MIRROR_FROM_PORT_DIR := src/lib/jitterentropy/jitterentropy-base.c \ - include/jitterentropy/jitterentropy.h - -content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR) LICENSE - -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $@ +content: $(MIRROR_FROM_REP_DIR) LICENSE $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) LICENSE: - ( echo "The contrib sources"; \ - echo " include/jitterentropy/jitterentropy.h"; \ - echo " src/lib/jitterentropy/jitterentropy-base.c"; \ - echo "by Stephan Mueller are licensed under a BSD-style license (please"; \ - echo "see the corresponding copyright header in the files)."; \ - echo ; \ - echo "The remaining source files are subject to the Genode license: "; \ - cat $(GENODE_DIR)/LICENSE; ) > $@ + cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/src/vfs_jitterentropy/used_apis b/repos/libports/recipes/src/vfs_jitterentropy/used_apis index 81d3f4c012..9593aa9496 100644 --- a/repos/libports/recipes/src/vfs_jitterentropy/used_apis +++ b/repos/libports/recipes/src/vfs_jitterentropy/used_apis @@ -3,3 +3,4 @@ os so libc vfs +jitterentropy