@@ -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@'],
similarity index 100%
rename from include/linux/README
rename to include/linux/upstream/linux/README
similarity index 100%
rename from include/linux/bcm2835-isp.h
rename to include/linux/upstream/linux/bcm2835-isp.h
similarity index 100%
rename from include/linux/bits.h
rename to include/linux/upstream/linux/bits.h
similarity index 100%
rename from include/linux/dma-buf.h
rename to include/linux/upstream/linux/dma-buf.h
similarity index 100%
rename from include/linux/dma-heap.h
rename to include/linux/upstream/linux/dma-heap.h
similarity index 100%
rename from include/linux/drm.h
rename to include/linux/upstream/linux/drm.h
similarity index 100%
rename from include/linux/drm_fourcc.h
rename to include/linux/upstream/linux/drm_fourcc.h
similarity index 100%
rename from include/linux/drm_mode.h
rename to include/linux/upstream/linux/drm_mode.h
similarity index 100%
rename from include/linux/dw100.h
rename to include/linux/upstream/linux/dw100.h
similarity index 100%
rename from include/linux/intel-ipu3.h
rename to include/linux/upstream/linux/intel-ipu3.h
similarity index 100%
rename from include/linux/media-bus-format.h
rename to include/linux/upstream/linux/media-bus-format.h
similarity index 100%
rename from include/linux/media.h
rename to include/linux/upstream/linux/media.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
similarity index 100%
rename from include/linux/media/v4l2-isp.h
rename to include/linux/upstream/linux/media/v4l2-isp.h
similarity index 100%
rename from include/linux/rkisp1-config.h
rename to include/linux/upstream/linux/rkisp1-config.h
similarity index 100%
rename from include/linux/stddef.h
rename to include/linux/upstream/linux/stddef.h
similarity index 100%
rename from include/linux/udmabuf.h
rename to include/linux/upstream/linux/udmabuf.h
similarity index 100%
rename from include/linux/v4l2-common.h
rename to include/linux/upstream/linux/v4l2-common.h
similarity index 100%
rename from include/linux/v4l2-controls.h
rename to include/linux/upstream/linux/v4l2-controls.h
similarity index 100%
rename from include/linux/v4l2-mediabus.h
rename to include/linux/upstream/linux/v4l2-mediabus.h
similarity index 100%
rename from include/linux/v4l2-subdev.h
rename to include/linux/upstream/linux/v4l2-subdev.h
similarity index 100%
rename from include/linux/videodev2.h
rename to include/linux/upstream/linux/videodev2.h
@@ -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 = []
@@ -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
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%)