From f50971b6a9ec0100f8302268161280bc92390605 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 1 Sep 2022 15:03:32 +0200 Subject: [PATCH] os: src/lib/trace/policy -> src/trace/policy The target.mk files for building the trace policies are no longer reachable under src/lib/ by the build system. Issue #4599 --- repos/os/recipes/src/test-trace/content.mk | 2 +- repos/os/recipes/src/test-trace_logger/content.mk | 2 +- repos/os/recipes/src/trace_policy/content.mk | 2 +- repos/os/src/{lib => }/trace/policy/div_zero/policy.cc | 0 repos/os/src/{lib => }/trace/policy/div_zero/target.mk | 0 repos/os/src/{lib => }/trace/policy/log_output/policy.cc | 0 repos/os/src/{lib => }/trace/policy/log_output/target.mk | 0 repos/os/src/{lib => }/trace/policy/null/policy.cc | 0 repos/os/src/{lib => }/trace/policy/null/target.mk | 0 repos/os/src/{lib => }/trace/policy/policy.inc | 2 +- repos/os/src/{lib => }/trace/policy/policy.ld | 0 repos/os/src/{lib => }/trace/policy/rpc_name/policy.cc | 0 repos/os/src/{lib => }/trace/policy/rpc_name/target.mk | 0 repos/os/src/{lib => }/trace/policy/table.cc | 0 14 files changed, 4 insertions(+), 4 deletions(-) rename repos/os/src/{lib => }/trace/policy/div_zero/policy.cc (100%) rename repos/os/src/{lib => }/trace/policy/div_zero/target.mk (100%) rename repos/os/src/{lib => }/trace/policy/log_output/policy.cc (100%) rename repos/os/src/{lib => }/trace/policy/log_output/target.mk (100%) rename repos/os/src/{lib => }/trace/policy/null/policy.cc (100%) rename repos/os/src/{lib => }/trace/policy/null/target.mk (100%) rename repos/os/src/{lib => }/trace/policy/policy.inc (95%) rename repos/os/src/{lib => }/trace/policy/policy.ld (100%) rename repos/os/src/{lib => }/trace/policy/rpc_name/policy.cc (100%) rename repos/os/src/{lib => }/trace/policy/rpc_name/target.mk (100%) rename repos/os/src/{lib => }/trace/policy/table.cc (100%) diff --git a/repos/os/recipes/src/test-trace/content.mk b/repos/os/recipes/src/test-trace/content.mk index 95d2225c4a..0cd6e68718 100644 --- a/repos/os/recipes/src/test-trace/content.mk +++ b/repos/os/recipes/src/test-trace/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/test/trace src/lib/trace/policy include/trace +SRC_DIR = src/test/trace src/trace/policy include/trace include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/test-trace_logger/content.mk b/repos/os/recipes/src/test-trace_logger/content.mk index f7c5989277..ad62486cae 100644 --- a/repos/os/recipes/src/test-trace_logger/content.mk +++ b/repos/os/recipes/src/test-trace_logger/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/test/trace_logger src/lib/trace/policy include/trace +SRC_DIR = src/test/trace_logger src/trace/policy include/trace include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/trace_policy/content.mk b/repos/os/recipes/src/trace_policy/content.mk index 78f22f88da..86757241f5 100644 --- a/repos/os/recipes/src/trace_policy/content.mk +++ b/repos/os/recipes/src/trace_policy/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/lib/trace/policy +SRC_DIR = src/trace/policy include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/src/lib/trace/policy/div_zero/policy.cc b/repos/os/src/trace/policy/div_zero/policy.cc similarity index 100% rename from repos/os/src/lib/trace/policy/div_zero/policy.cc rename to repos/os/src/trace/policy/div_zero/policy.cc diff --git a/repos/os/src/lib/trace/policy/div_zero/target.mk b/repos/os/src/trace/policy/div_zero/target.mk similarity index 100% rename from repos/os/src/lib/trace/policy/div_zero/target.mk rename to repos/os/src/trace/policy/div_zero/target.mk diff --git a/repos/os/src/lib/trace/policy/log_output/policy.cc b/repos/os/src/trace/policy/log_output/policy.cc similarity index 100% rename from repos/os/src/lib/trace/policy/log_output/policy.cc rename to repos/os/src/trace/policy/log_output/policy.cc diff --git a/repos/os/src/lib/trace/policy/log_output/target.mk b/repos/os/src/trace/policy/log_output/target.mk similarity index 100% rename from repos/os/src/lib/trace/policy/log_output/target.mk rename to repos/os/src/trace/policy/log_output/target.mk diff --git a/repos/os/src/lib/trace/policy/null/policy.cc b/repos/os/src/trace/policy/null/policy.cc similarity index 100% rename from repos/os/src/lib/trace/policy/null/policy.cc rename to repos/os/src/trace/policy/null/policy.cc diff --git a/repos/os/src/lib/trace/policy/null/target.mk b/repos/os/src/trace/policy/null/target.mk similarity index 100% rename from repos/os/src/lib/trace/policy/null/target.mk rename to repos/os/src/trace/policy/null/target.mk diff --git a/repos/os/src/lib/trace/policy/policy.inc b/repos/os/src/trace/policy/policy.inc similarity index 95% rename from repos/os/src/lib/trace/policy/policy.inc rename to repos/os/src/trace/policy/policy.inc index b10ab253b3..ce8169e47a 100644 --- a/repos/os/src/lib/trace/policy/policy.inc +++ b/repos/os/src/trace/policy/policy.inc @@ -38,4 +38,4 @@ clean_policy: $(VERBOSE)$(RM) ../*.o ../*.d *.o *.d $(TARGET_POLICY).elf \ $(BUILD_BASE_DIR)/bin/$(TARGET_POLICY) -vpath table.cc $(REP_DIR)/src/lib/trace/policy +vpath table.cc $(REP_DIR)/src/trace/policy diff --git a/repos/os/src/lib/trace/policy/policy.ld b/repos/os/src/trace/policy/policy.ld similarity index 100% rename from repos/os/src/lib/trace/policy/policy.ld rename to repos/os/src/trace/policy/policy.ld diff --git a/repos/os/src/lib/trace/policy/rpc_name/policy.cc b/repos/os/src/trace/policy/rpc_name/policy.cc similarity index 100% rename from repos/os/src/lib/trace/policy/rpc_name/policy.cc rename to repos/os/src/trace/policy/rpc_name/policy.cc diff --git a/repos/os/src/lib/trace/policy/rpc_name/target.mk b/repos/os/src/trace/policy/rpc_name/target.mk similarity index 100% rename from repos/os/src/lib/trace/policy/rpc_name/target.mk rename to repos/os/src/trace/policy/rpc_name/target.mk diff --git a/repos/os/src/lib/trace/policy/table.cc b/repos/os/src/trace/policy/table.cc similarity index 100% rename from repos/os/src/lib/trace/policy/table.cc rename to repos/os/src/trace/policy/table.cc