[RFC,v1,1/3] include: linux: Move to subdir
diff mbox series

Message ID 20261117161149.1423792-2-barnabas.pocze@ideasonboard.com
State New
Headers show
Series
  • include: linux: Split local changes
Related show

Commit Message

Barnabás Pőcze Nov. 17, 2026, 4:11 p.m. UTC
Move the current linux headers to the "upstream" subdirectory. This is done
because the local changes will appear separately in a different directory.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
---
 include/libcamera/meson.build                                | 2 +-
 include/linux/{ => upstream/linux}/README                    | 0
 include/linux/{ => upstream/linux}/bcm2835-isp.h             | 0
 include/linux/{ => upstream/linux}/bits.h                    | 0
 include/linux/{ => upstream/linux}/dma-buf.h                 | 0
 include/linux/{ => upstream/linux}/dma-heap.h                | 0
 include/linux/{ => upstream/linux}/drm.h                     | 0
 include/linux/{ => upstream/linux}/drm_fourcc.h              | 0
 include/linux/{ => upstream/linux}/drm_mode.h                | 0
 include/linux/{ => upstream/linux}/dw100.h                   | 0
 include/linux/{ => upstream/linux}/intel-ipu3.h              | 0
 include/linux/{ => upstream/linux}/media-bus-format.h        | 0
 include/linux/{ => upstream/linux}/media.h                   | 0
 .../linux/{ => upstream/linux}/media/arm/mali-c55-config.h   | 0
 include/linux/{ => upstream/linux}/media/v4l2-isp.h          | 0
 include/linux/{ => upstream/linux}/rkisp1-config.h           | 0
 include/linux/{ => upstream/linux}/stddef.h                  | 0
 include/linux/{ => upstream/linux}/udmabuf.h                 | 0
 include/linux/{ => upstream/linux}/v4l2-common.h             | 0
 include/linux/{ => upstream/linux}/v4l2-controls.h           | 0
 include/linux/{ => upstream/linux}/v4l2-mediabus.h           | 0
 include/linux/{ => upstream/linux}/v4l2-subdev.h             | 0
 include/linux/{ => upstream/linux}/videodev2.h               | 0
 meson.build                                                  | 5 ++++-
 utils/update-kernel-headers.sh                               | 2 +-
 25 files changed, 6 insertions(+), 3 deletions(-)
 rename include/linux/{ => upstream/linux}/README (100%)
 rename include/linux/{ => upstream/linux}/bcm2835-isp.h (100%)
 rename include/linux/{ => upstream/linux}/bits.h (100%)
 rename include/linux/{ => upstream/linux}/dma-buf.h (100%)
 rename include/linux/{ => upstream/linux}/dma-heap.h (100%)
 rename include/linux/{ => upstream/linux}/drm.h (100%)
 rename include/linux/{ => upstream/linux}/drm_fourcc.h (100%)
 rename include/linux/{ => upstream/linux}/drm_mode.h (100%)
 rename include/linux/{ => upstream/linux}/dw100.h (100%)
 rename include/linux/{ => upstream/linux}/intel-ipu3.h (100%)
 rename include/linux/{ => upstream/linux}/media-bus-format.h (100%)
 rename include/linux/{ => upstream/linux}/media.h (100%)
 rename include/linux/{ => upstream/linux}/media/arm/mali-c55-config.h (100%)
 rename include/linux/{ => upstream/linux}/media/v4l2-isp.h (100%)
 rename include/linux/{ => upstream/linux}/rkisp1-config.h (100%)
 rename include/linux/{ => upstream/linux}/stddef.h (100%)
 rename include/linux/{ => upstream/linux}/udmabuf.h (100%)
 rename include/linux/{ => upstream/linux}/v4l2-common.h (100%)
 rename include/linux/{ => upstream/linux}/v4l2-controls.h (100%)
 rename include/linux/{ => upstream/linux}/v4l2-mediabus.h (100%)
 rename include/linux/{ => upstream/linux}/v4l2-subdev.h (100%)
 rename include/linux/{ => upstream/linux}/videodev2.h (100%)

Patch
diff mbox series

diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 30ea76f947..4038ee1059 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -103,7 +103,7 @@  formats_h = custom_target('formats_h',
                           input : files(
                               '../../src/libcamera/formats.yaml',
                               'formats.h.in',
-                              '../linux/drm_fourcc.h'
+                              '../linux/upstream/linux/drm_fourcc.h'
                           ),
                           output : 'formats.h',
                           command : [gen_formats, '-o', '@OUTPUT@', '@INPUT@'],
diff --git a/include/linux/README b/include/linux/upstream/linux/README
similarity index 100%
rename from include/linux/README
rename to include/linux/upstream/linux/README
diff --git a/include/linux/bcm2835-isp.h b/include/linux/upstream/linux/bcm2835-isp.h
similarity index 100%
rename from include/linux/bcm2835-isp.h
rename to include/linux/upstream/linux/bcm2835-isp.h
diff --git a/include/linux/bits.h b/include/linux/upstream/linux/bits.h
similarity index 100%
rename from include/linux/bits.h
rename to include/linux/upstream/linux/bits.h
diff --git a/include/linux/dma-buf.h b/include/linux/upstream/linux/dma-buf.h
similarity index 100%
rename from include/linux/dma-buf.h
rename to include/linux/upstream/linux/dma-buf.h
diff --git a/include/linux/dma-heap.h b/include/linux/upstream/linux/dma-heap.h
similarity index 100%
rename from include/linux/dma-heap.h
rename to include/linux/upstream/linux/dma-heap.h
diff --git a/include/linux/drm.h b/include/linux/upstream/linux/drm.h
similarity index 100%
rename from include/linux/drm.h
rename to include/linux/upstream/linux/drm.h
diff --git a/include/linux/drm_fourcc.h b/include/linux/upstream/linux/drm_fourcc.h
similarity index 100%
rename from include/linux/drm_fourcc.h
rename to include/linux/upstream/linux/drm_fourcc.h
diff --git a/include/linux/drm_mode.h b/include/linux/upstream/linux/drm_mode.h
similarity index 100%
rename from include/linux/drm_mode.h
rename to include/linux/upstream/linux/drm_mode.h
diff --git a/include/linux/dw100.h b/include/linux/upstream/linux/dw100.h
similarity index 100%
rename from include/linux/dw100.h
rename to include/linux/upstream/linux/dw100.h
diff --git a/include/linux/intel-ipu3.h b/include/linux/upstream/linux/intel-ipu3.h
similarity index 100%
rename from include/linux/intel-ipu3.h
rename to include/linux/upstream/linux/intel-ipu3.h
diff --git a/include/linux/media-bus-format.h b/include/linux/upstream/linux/media-bus-format.h
similarity index 100%
rename from include/linux/media-bus-format.h
rename to include/linux/upstream/linux/media-bus-format.h
diff --git a/include/linux/media.h b/include/linux/upstream/linux/media.h
similarity index 100%
rename from include/linux/media.h
rename to include/linux/upstream/linux/media.h
diff --git a/include/linux/media/arm/mali-c55-config.h b/include/linux/upstream/linux/media/arm/mali-c55-config.h
similarity index 100%
rename from include/linux/media/arm/mali-c55-config.h
rename to include/linux/upstream/linux/media/arm/mali-c55-config.h
diff --git a/include/linux/media/v4l2-isp.h b/include/linux/upstream/linux/media/v4l2-isp.h
similarity index 100%
rename from include/linux/media/v4l2-isp.h
rename to include/linux/upstream/linux/media/v4l2-isp.h
diff --git a/include/linux/rkisp1-config.h b/include/linux/upstream/linux/rkisp1-config.h
similarity index 100%
rename from include/linux/rkisp1-config.h
rename to include/linux/upstream/linux/rkisp1-config.h
diff --git a/include/linux/stddef.h b/include/linux/upstream/linux/stddef.h
similarity index 100%
rename from include/linux/stddef.h
rename to include/linux/upstream/linux/stddef.h
diff --git a/include/linux/udmabuf.h b/include/linux/upstream/linux/udmabuf.h
similarity index 100%
rename from include/linux/udmabuf.h
rename to include/linux/upstream/linux/udmabuf.h
diff --git a/include/linux/v4l2-common.h b/include/linux/upstream/linux/v4l2-common.h
similarity index 100%
rename from include/linux/v4l2-common.h
rename to include/linux/upstream/linux/v4l2-common.h
diff --git a/include/linux/v4l2-controls.h b/include/linux/upstream/linux/v4l2-controls.h
similarity index 100%
rename from include/linux/v4l2-controls.h
rename to include/linux/upstream/linux/v4l2-controls.h
diff --git a/include/linux/v4l2-mediabus.h b/include/linux/upstream/linux/v4l2-mediabus.h
similarity index 100%
rename from include/linux/v4l2-mediabus.h
rename to include/linux/upstream/linux/v4l2-mediabus.h
diff --git a/include/linux/v4l2-subdev.h b/include/linux/upstream/linux/v4l2-subdev.h
similarity index 100%
rename from include/linux/v4l2-subdev.h
rename to include/linux/upstream/linux/v4l2-subdev.h
diff --git a/include/linux/videodev2.h b/include/linux/upstream/linux/videodev2.h
similarity index 100%
rename from include/linux/videodev2.h
rename to include/linux/upstream/linux/videodev2.h
diff --git a/meson.build b/meson.build
index 6d54fc7a93..e6c2987320 100644
--- a/meson.build
+++ b/meson.build
@@ -200,7 +200,10 @@  add_project_arguments(c_arguments, language : 'c')
 add_project_arguments(cpp_arguments, language : 'cpp')
 add_project_link_arguments(cpp_arguments, language : 'cpp')
 
-libcamera_includes = include_directories('include')
+libcamera_includes = include_directories(
+    'include',
+    'include/linux/upstream',
+)
 
 # Sub-directories fill py_modules with their dependencies.
 py_modules = []
diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh
index 3fdea5f1eb..f9da81451f 100755
--- a/utils/update-kernel-headers.sh
+++ b/utils/update-kernel-headers.sh
@@ -8,7 +8,7 @@  if [ $# != 1 ] ; then
 	exit 1
 fi
 
-header_dir="$(dirname "$(realpath "$0")")/../include/linux"
+header_dir="$(dirname "$(realpath "$0")")/../include/linux/upstream/linux"
 kernel_dir="$(realpath "$1")"
 
 # Bail out if the directory doesn't contain kernel sources