From 3c78265e667430ae760076ace095096beb39f5b6 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Fri, 14 Aug 2020 12:07:04 +0200
Subject: [PATCH] Remove drivers/framebuffer/spec directory

Thanks to the unification of build directories, the sub directories
(rpi, sdl, imx53) do not depend on SPEC values.

Issue #2190
---
 repos/os/recipes/src/fb_sdl/content.mk                      | 2 +-
 repos/os/recipes/src/imx53_qsb_drivers/content.mk           | 6 +++---
 repos/os/recipes/src/rpi_fb_drv/content.mk                  | 2 +-
 repos/os/run/input.run                                      | 2 +-
 repos/os/src/drivers/framebuffer/{spec => }/imx53/driver.h  | 0
 repos/os/src/drivers/framebuffer/{spec => }/imx53/ipu.h     | 0
 repos/os/src/drivers/framebuffer/{spec => }/imx53/main.cc   | 0
 repos/os/src/drivers/framebuffer/{spec => }/imx53/pwm.h     | 0
 repos/os/src/drivers/framebuffer/{spec => }/imx53/target.mk | 0
 repos/os/src/drivers/framebuffer/{spec => }/rpi/README      | 0
 repos/os/src/drivers/framebuffer/{spec => }/rpi/main.cc     | 0
 repos/os/src/drivers/framebuffer/{spec => }/rpi/target.mk   | 0
 .../drivers/framebuffer/{spec => }/sdl/convert_keycode.h    | 0
 repos/os/src/drivers/framebuffer/{spec => }/sdl/main.cc     | 0
 repos/os/src/drivers/framebuffer/{spec => }/sdl/target.mk   | 0
 15 files changed, 6 insertions(+), 6 deletions(-)
 rename repos/os/src/drivers/framebuffer/{spec => }/imx53/driver.h (100%)
 rename repos/os/src/drivers/framebuffer/{spec => }/imx53/ipu.h (100%)
 rename repos/os/src/drivers/framebuffer/{spec => }/imx53/main.cc (100%)
 rename repos/os/src/drivers/framebuffer/{spec => }/imx53/pwm.h (100%)
 rename repos/os/src/drivers/framebuffer/{spec => }/imx53/target.mk (100%)
 rename repos/os/src/drivers/framebuffer/{spec => }/rpi/README (100%)
 rename repos/os/src/drivers/framebuffer/{spec => }/rpi/main.cc (100%)
 rename repos/os/src/drivers/framebuffer/{spec => }/rpi/target.mk (100%)
 rename repos/os/src/drivers/framebuffer/{spec => }/sdl/convert_keycode.h (100%)
 rename repos/os/src/drivers/framebuffer/{spec => }/sdl/main.cc (100%)
 rename repos/os/src/drivers/framebuffer/{spec => }/sdl/target.mk (100%)

diff --git a/repos/os/recipes/src/fb_sdl/content.mk b/repos/os/recipes/src/fb_sdl/content.mk
index b12f4ba1d7..efd634af7a 100644
--- a/repos/os/recipes/src/fb_sdl/content.mk
+++ b/repos/os/recipes/src/fb_sdl/content.mk
@@ -1,2 +1,2 @@
-SRC_DIR = src/drivers/framebuffer/spec/sdl
+SRC_DIR = src/drivers/framebuffer/sdl
 include $(GENODE_DIR)/repos/base/recipes/src/content.inc
diff --git a/repos/os/recipes/src/imx53_qsb_drivers/content.mk b/repos/os/recipes/src/imx53_qsb_drivers/content.mk
index 97899c910f..22340ee968 100644
--- a/repos/os/recipes/src/imx53_qsb_drivers/content.mk
+++ b/repos/os/recipes/src/imx53_qsb_drivers/content.mk
@@ -7,8 +7,8 @@ include/gpio:
 	cp -r $(REP_DIR)/include/gpio $@
 
 src/drivers:
-	mkdir -p $@/framebuffer/spec $@/gpio/spec
+	mkdir -p $@/framebuffer $@/gpio/spec
 	cp -r $(REP_DIR)/src/drivers/gpio/spec/imx $@/gpio/spec/
 	cp -r $(REP_DIR)/src/drivers/gpio/spec/imx53 $@/gpio/spec/
-	cp -r $(REP_DIR)/src/drivers/framebuffer/spec/imx53 $@/framebuffer/spec/
-	cp -r $(REP_DIR)/include/spec/imx53/imx_framebuffer_session $@/framebuffer/spec/imx53/
+	cp -r $(REP_DIR)/src/drivers/framebuffer/imx53 $@/framebuffer/
+	cp -r $(REP_DIR)/include/spec/imx53/imx_framebuffer_session $@/framebuffer/imx53/
diff --git a/repos/os/recipes/src/rpi_fb_drv/content.mk b/repos/os/recipes/src/rpi_fb_drv/content.mk
index 528e53fe2f..f8e7ab7468 100644
--- a/repos/os/recipes/src/rpi_fb_drv/content.mk
+++ b/repos/os/recipes/src/rpi_fb_drv/content.mk
@@ -1,2 +1,2 @@
-SRC_DIR = src/drivers/framebuffer/spec/rpi
+SRC_DIR = src/drivers/framebuffer/rpi
 include $(GENODE_DIR)/repos/base/recipes/src/content.inc
diff --git a/repos/os/run/input.run b/repos/os/run/input.run
index 916c734793..7535f3e34d 100644
--- a/repos/os/run/input.run
+++ b/repos/os/run/input.run
@@ -10,7 +10,7 @@ source ${genode_dir}/repos/base/run/platform_drv.inc
 append_platform_drv_build_components
 
 lappend_if [have_spec ps2] build_components drivers/ps2
-lappend_if [have_spec sdl] build_components drivers/framebuffer/spec/sdl
+lappend_if [have_spec sdl] build_components drivers/framebuffer/sdl
 lappend_if [have_spec sdl] build_components server/nitpicker
 
 build $build_components
diff --git a/repos/os/src/drivers/framebuffer/spec/imx53/driver.h b/repos/os/src/drivers/framebuffer/imx53/driver.h
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/imx53/driver.h
rename to repos/os/src/drivers/framebuffer/imx53/driver.h
diff --git a/repos/os/src/drivers/framebuffer/spec/imx53/ipu.h b/repos/os/src/drivers/framebuffer/imx53/ipu.h
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/imx53/ipu.h
rename to repos/os/src/drivers/framebuffer/imx53/ipu.h
diff --git a/repos/os/src/drivers/framebuffer/spec/imx53/main.cc b/repos/os/src/drivers/framebuffer/imx53/main.cc
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/imx53/main.cc
rename to repos/os/src/drivers/framebuffer/imx53/main.cc
diff --git a/repos/os/src/drivers/framebuffer/spec/imx53/pwm.h b/repos/os/src/drivers/framebuffer/imx53/pwm.h
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/imx53/pwm.h
rename to repos/os/src/drivers/framebuffer/imx53/pwm.h
diff --git a/repos/os/src/drivers/framebuffer/spec/imx53/target.mk b/repos/os/src/drivers/framebuffer/imx53/target.mk
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/imx53/target.mk
rename to repos/os/src/drivers/framebuffer/imx53/target.mk
diff --git a/repos/os/src/drivers/framebuffer/spec/rpi/README b/repos/os/src/drivers/framebuffer/rpi/README
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/rpi/README
rename to repos/os/src/drivers/framebuffer/rpi/README
diff --git a/repos/os/src/drivers/framebuffer/spec/rpi/main.cc b/repos/os/src/drivers/framebuffer/rpi/main.cc
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/rpi/main.cc
rename to repos/os/src/drivers/framebuffer/rpi/main.cc
diff --git a/repos/os/src/drivers/framebuffer/spec/rpi/target.mk b/repos/os/src/drivers/framebuffer/rpi/target.mk
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/rpi/target.mk
rename to repos/os/src/drivers/framebuffer/rpi/target.mk
diff --git a/repos/os/src/drivers/framebuffer/spec/sdl/convert_keycode.h b/repos/os/src/drivers/framebuffer/sdl/convert_keycode.h
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/sdl/convert_keycode.h
rename to repos/os/src/drivers/framebuffer/sdl/convert_keycode.h
diff --git a/repos/os/src/drivers/framebuffer/spec/sdl/main.cc b/repos/os/src/drivers/framebuffer/sdl/main.cc
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/sdl/main.cc
rename to repos/os/src/drivers/framebuffer/sdl/main.cc
diff --git a/repos/os/src/drivers/framebuffer/spec/sdl/target.mk b/repos/os/src/drivers/framebuffer/sdl/target.mk
similarity index 100%
rename from repos/os/src/drivers/framebuffer/spec/sdl/target.mk
rename to repos/os/src/drivers/framebuffer/sdl/target.mk