From ec37477e20637cd87fe74979974abab9118d9e06 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Wed, 22 Apr 2020 12:36:21 +0200
Subject: [PATCH] Fix base-hw-panda src package (Ref #202)

---
 lib/mk/spec/arm_v7/bootstrap-hw-panda.mk |  2 +-
 mk/spec/panda.mk                         |  2 +-
 recipes/src/base-hw-panda/content.mk     | 43 ++-------------------
 recipes/src/base-hw-panda/hash           |  2 +-
 recipes/src/base-hw_content.inc          | 48 ++++++++++++++++++++++++
 5 files changed, 54 insertions(+), 43 deletions(-)
 create mode 100644 recipes/src/base-hw_content.inc

diff --git a/lib/mk/spec/arm_v7/bootstrap-hw-panda.mk b/lib/mk/spec/arm_v7/bootstrap-hw-panda.mk
index 21edb7f..b54f6f0 100644
--- a/lib/mk/spec/arm_v7/bootstrap-hw-panda.mk
+++ b/lib/mk/spec/arm_v7/bootstrap-hw-panda.mk
@@ -12,6 +12,6 @@ SRC_S     += bootstrap/spec/arm/crt0.s
 
 CC_MARCH = -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=softfp
 
-include $(BASE_DIR)/../base-hw/lib/mk/bootstrap-hw.inc
+include $(call select_from_repositories,lib/mk/bootstrap-hw.inc)
 
 vpath bootstrap/spec/panda/platform.cc $(REP_DIR)/src
diff --git a/mk/spec/panda.mk b/mk/spec/panda.mk
index e696e96..478d44b 100644
--- a/mk/spec/panda.mk
+++ b/mk/spec/panda.mk
@@ -8,4 +8,4 @@ SPECS += omap4 usb panda gpio framebuffer
 #
 SPECS += arm_v7a
 
-include $(BASE_DIR)/mk/spec/arm_v7a.mk
+include $(call select_from_repositories,mk/spec/arm_v7a.mk)
diff --git a/recipes/src/base-hw-panda/content.mk b/recipes/src/base-hw-panda/content.mk
index db8aa59..519331b 100644
--- a/recipes/src/base-hw-panda/content.mk
+++ b/recipes/src/base-hw-panda/content.mk
@@ -1,41 +1,4 @@
-BOARD = panda
+ARCH  := arm_v7
+BOARD := panda
 
-content: src/include src/core src/lib src/timer lib/mk LICENSE
-
-src/include src/core src/lib src/timer lib/mk:
-	mkdir -p $@
-	cp -r $(GENODE_DIR)/repos/base/$@/* $@
-	cp -r $(GENODE_DIR)/repos/base-hw/$@/* $@
-
-LICENSE:
-	cp $(GENODE_DIR)/LICENSE $@
-
-content: lib/mk/spec/arm_v7/bootstrap-hw-panda.mk lib/mk/spec/arm_v7/core-hw-panda.mk
-
-lib/mk/spec/arm_v7/bootstrap-hw-panda.mk lib/mk/spec/arm_v7/core-hw-panda.mk: lib/mk
-	cp $(REP_DIR)/$@ $@
-
-content: etc/specs.conf src/bootstrap
-
-etc/specs.conf src/bootstrap:
-	mkdir -p etc
-	mkdir -p src
-	cp -r $(GENODE_DIR)/repos/base-hw/$@ $@
-
-content: generalize_target_names remove_other_board_libs
-
-generalize_target_names: lib/mk src/lib src/timer
-	for spec in arm riscv x86_64; do \
-	  mv lib/mk/spec/$$spec/ld-hw.mk lib/mk/spec/$$spec/ld.mk; \
-	  done;
-	sed -i "s/ld-hw/ld/"           src/lib/ld/hw/target.mk
-	sed -i "s/hw_timer_drv/timer/" src/timer/hw/target.mk
-
-remove_other_board_libs: lib/mk
-	find lib/mk/spec -name core-hw-*.mk -o -name bootstrap-hw-*.mk |\
-		grep -v "hw-$(BOARD).mk" | xargs rm -rf
-
-content: enable_board_spec
-
-enable_board_spec: etc/specs.conf
-	echo "SPECS += panda" >> etc/specs.conf
+include $(REP_DIR)/recipes/src/base-hw_content.inc
diff --git a/recipes/src/base-hw-panda/hash b/recipes/src/base-hw-panda/hash
index 4c29903..ade6e18 100644
--- a/recipes/src/base-hw-panda/hash
+++ b/recipes/src/base-hw-panda/hash
@@ -1 +1 @@
-2020-03-23-b 841ce3bb426e5685d1c08612acdd78b70eb5e7b8
+2020-04-22 66369cd91448ffcfbd62456d6393353068b3252f
diff --git a/recipes/src/base-hw_content.inc b/recipes/src/base-hw_content.inc
new file mode 100644
index 0000000..77a3bd9
--- /dev/null
+++ b/recipes/src/base-hw_content.inc
@@ -0,0 +1,48 @@
+content: src/include src/core src/lib src/timer lib/mk LICENSE
+
+src/lib src/timer lib/mk:
+	mkdir -p $@
+	cp -r $(GENODE_DIR)/repos/base/$@/* $@
+	cp -r $(GENODE_DIR)/repos/base-hw/$@/* $@
+
+src/include src/core:
+	mkdir -p $@
+	cp -r $(GENODE_DIR)/repos/base/$@/* $@
+	cp -r $(GENODE_DIR)/repos/base-hw/$@/* $@
+	cp -r $(REP_DIR)/$@/* $@
+
+LICENSE:
+	cp $(GENODE_DIR)/LICENSE $@
+
+content: lib/mk/spec/$(ARCH)/bootstrap-hw-$(BOARD).mk lib/mk/spec/$(ARCH)/core-hw-$(BOARD).mk
+
+lib/mk/spec/$(ARCH)/bootstrap-hw-$(BOARD).mk lib/mk/spec/$(ARCH)/core-hw-$(BOARD).mk: lib/mk
+	cp $(REP_DIR)/$@ $@
+
+content: etc/specs.conf src/bootstrap
+
+etc/specs.conf:
+	mkdir -p etc
+	cp -r $(GENODE_DIR)/repos/base-hw/$@ $@
+
+src/bootstrap:
+	cp -r $(GENODE_DIR)/repos/base-hw/$@ $@
+	cp -r $(REP_DIR)/$@/* $@/
+
+content: generalize_target_names remove_other_board_libs
+
+generalize_target_names: lib/mk src/lib src/timer
+	for spec in arm riscv x86_64; do \
+	  mv lib/mk/spec/$$spec/ld-hw.mk lib/mk/spec/$$spec/ld.mk; \
+	  done;
+	sed -i "s/ld-hw/ld/"           src/lib/ld/hw/target.mk
+	sed -i "s/hw_timer_drv/timer/" src/timer/hw/target.mk
+
+remove_other_board_libs: lib/mk
+	find lib/mk/spec -name core-hw-*.mk -o -name bootstrap-hw-*.mk |\
+		grep -v "hw-$(BOARD).mk" | xargs rm -rf
+
+content: enable_board_spec
+
+enable_board_spec: etc/specs.conf
+	echo "SPECS += $(BOARD)" >> etc/specs.conf