From 684a96b7ff36e55a1d654d451c54ebb2b1d64a9c Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com>
Date: Wed, 5 Jan 2022 15:39:32 +0100
Subject: [PATCH] Move and export uapi headers

Move logger.h and kdbus.h uapi headers to a separate directory
and export them to /usr/include/linux and
/usr/src/linux-tizen-modules-source.

Change-Id: Ie3fd39f44baf33552cc742f0c13228b1e87b9333
---
 {kernel/kdbus => include/uapi/linux}/kdbus.h | 0
 {kernel => include/uapi/linux}/logger.h      | 0
 kernel/Makefile                              | 2 +-
 kernel/kdbus/bus.h                           | 2 +-
 kernel/kdbus/handle.h                        | 2 +-
 kernel/kdbus/item.h                          | 2 +-
 kernel/kdbus/message.h                       | 2 +-
 kernel/kdbus/util.h                          | 2 +-
 kernel/logger.c                              | 2 +-
 packaging/linux-tizen-modules-source.spec    | 8 +++++---
 10 files changed, 12 insertions(+), 10 deletions(-)
 rename {kernel/kdbus => include/uapi/linux}/kdbus.h (100%)
 rename {kernel => include/uapi/linux}/logger.h (100%)

diff --git a/kernel/kdbus/kdbus.h b/include/uapi/linux/kdbus.h
similarity index 100%
rename from kernel/kdbus/kdbus.h
rename to include/uapi/linux/kdbus.h
diff --git a/kernel/logger.h b/include/uapi/linux/logger.h
similarity index 100%
rename from kernel/logger.h
rename to include/uapi/linux/logger.h
diff --git a/kernel/Makefile b/kernel/Makefile
index 3e2f6cb..2f7ab69 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -17,7 +17,7 @@ obj-$(BUILD_proc_tsm) += proc-tsm.o
 obj-$(BUILD_kdbus) += kdbus/
 
 all:
-	make -C $(KERNELDIR) M=$(PWD) modules
+	make -C $(KERNELDIR) M=$(PWD) CFLAGS_MODULE=-I$(PWD)/include modules
 
 modules_install:
 	make -C $(KERNELDIR) M=$(PWD) INSTALL_MOD_STRIP=$(INSTALL_MOD_STRIP) INSTALL_MOD_PATH=$(PWD)/../$(INSTALL_MOD_PATH) modules_install
diff --git a/kernel/kdbus/bus.h b/kernel/kdbus/bus.h
index c67137e..8c2acae 100644
--- a/kernel/kdbus/bus.h
+++ b/kernel/kdbus/bus.h
@@ -20,7 +20,7 @@
 #include <linux/mutex.h>
 #include <linux/rwsem.h>
 #include <linux/spinlock.h>
-#include "kdbus.h"
+#include <uapi/linux/kdbus.h>
 
 #include "metadata.h"
 #include "names.h"
diff --git a/kernel/kdbus/handle.h b/kernel/kdbus/handle.h
index 376c7ec..5dde2c1 100644
--- a/kernel/kdbus/handle.h
+++ b/kernel/kdbus/handle.h
@@ -15,7 +15,7 @@
 #define __KDBUS_HANDLE_H
 
 #include <linux/fs.h>
-#include "kdbus.h"
+#include <uapi/linux/kdbus.h>
 
 extern const struct file_operations kdbus_handle_ops;
 
diff --git a/kernel/kdbus/item.h b/kernel/kdbus/item.h
index 6dee30a..3a7e6cc 100644
--- a/kernel/kdbus/item.h
+++ b/kernel/kdbus/item.h
@@ -16,7 +16,7 @@
 #define __KDBUS_ITEM_H
 
 #include <linux/kernel.h>
-#include "kdbus.h"
+#include <uapi/linux/kdbus.h>
 
 #include "util.h"
 
diff --git a/kernel/kdbus/message.h b/kernel/kdbus/message.h
index f35d5ef..298f9c9 100644
--- a/kernel/kdbus/message.h
+++ b/kernel/kdbus/message.h
@@ -16,7 +16,7 @@
 
 #include <linux/fs.h>
 #include <linux/kref.h>
-#include "kdbus.h"
+#include <uapi/linux/kdbus.h>
 
 struct kdbus_bus;
 struct kdbus_conn;
diff --git a/kernel/kdbus/util.h b/kernel/kdbus/util.h
index 0564c17..38c2ed5 100644
--- a/kernel/kdbus/util.h
+++ b/kernel/kdbus/util.h
@@ -19,7 +19,7 @@
 #include <linux/ioctl.h>
 #include <linux/stddef.h>
 
-#include "kdbus.h"
+#include <uapi/linux/kdbus.h>
 
 /* all exported addresses are 64 bit */
 #define KDBUS_PTR(addr) ((void __user *)(uintptr_t)(addr))
diff --git a/kernel/logger.c b/kernel/logger.c
index 4eb7103..a3fc5ed 100644
--- a/kernel/logger.c
+++ b/kernel/logger.c
@@ -44,7 +44,7 @@
 #include <linux/fdtable.h>
 #include <linux/file.h>
 
-#include "logger.h"
+#include <uapi/linux/logger.h>
 
 /**
  * struct logger_log - represents a specific log, such as 'main' or 'radio'
diff --git a/packaging/linux-tizen-modules-source.spec b/packaging/linux-tizen-modules-source.spec
index 2889542..63be4c6 100644
--- a/packaging/linux-tizen-modules-source.spec
+++ b/packaging/linux-tizen-modules-source.spec
@@ -27,24 +27,26 @@ cp %{SOURCE1} .
 mkdir -p %{buildroot}/usr/src/%{name}/kdbus
 mkdir -p %{buildroot}/%{_includedir}/linux
 
+cp -a include/ %{buildroot}/usr/src/%{name}
 cp kernel/*.[ch] kernel/Makefile COPYING %{buildroot}/usr/src/%{name}
 cp kernel/kdbus/*.[ch] kernel/kdbus/Makefile %{buildroot}/usr/src/%{name}/kdbus
 
-# TODO: Consider adding logger.h
-cp kernel/kdbus/kdbus.h %{buildroot}/%{_includedir}/linux
+cp include/uapi/linux/kdbus.h %{buildroot}/%{_includedir}/linux
+cp include/uapi/linux/logger.h %{buildroot}/%{_includedir}/linux
 
 %files
 %manifest %{name}.manifest
 %license COPYING
 /usr/src/%{name}/COPYING
 /usr/src/%{name}/*.c
-/usr/src/%{name}/*.h
 /usr/src/%{name}/Makefile
 /usr/src/%{name}/kdbus/*.c
 /usr/src/%{name}/kdbus/*.h
 /usr/src/%{name}/kdbus/Makefile
+/usr/src/%{name}/include/uapi/linux/*.h
 
 %files headers
 %manifest %{name}.manifest
 %license COPYING
 %{_includedir}/linux/kdbus.h
+%{_includedir}/linux/logger.h
-- 
2.34.1