tee-supplicant: fix build with kernel < 4.16

[ffontaine]

Commit 3ac968e moved linux/tee.h from libteec/include to libteec/src resulting in the following build failure with any kernel < 4.16 (i.e before torvalds/linux@033ddf1):

/home/buildroot/autobuild/instance-3/output-1/build/optee-client-4.0.0/tee-supplicant/src/tee_supplicant.c: In function 'register_local_shm': /home/buildroot/autobuild/instance-3/output-1/build/optee-client-4.0.0/tee-supplicant/src/tee_supplicant.c:356:44: error: storage size of 'data' isn't known
  356 |         struct tee_ioctl_shm_register_data data;
      |                                            ^~~~

To fix this build failure, update CMakeLists.txt and Makefile of tee-supplicant to add libteec/src to the include directories.

Fixes: 3ac968e ("Makefile, cmake: move teec related headers")

[jenswi-linaro]

Wouldn't that mean exporting that .h file to other packages?

[ffontaine]

I'm not an expert in optee-client, I don't even understand why a local copy of linux/tee.h is embedded instead of using the one provided by the kernel. An other option on buildroot side would be to add a dependency on kernel >= 4.16 to optee-client.

[jenswi-linaro]

The copy is there to provide early access to new features. It needs to be put somewhere reachable by tee-supplicant too, but it should at the same time not be exported to other packages.

[ffontaine]

Then, I would suggest to replace

optee_client/tee-supplicant/CMakeLists.txt

Line 96 in 98dc4f4

target_include_directories(${PROJECT_NAME} PRIVATE src)

by

target_include_directories(${PROJECT_NAME}
	PRIVATE src
	PRIVATE ../libteec/src
)

Makefile will also have to be updated. Does it seems acceptable?

[jenswi-linaro]

Works for me.

[ffontaine]

PR updated

[jenswi-linaro]

Please add a fixes tag Fixes: 3ac968ee7c92 ("Makefile, cmake: move teec related headers")

It would be nice with a short description of what the patch does also apart from all the trouble that the offending commit caused.

[ffontaine]

I updated the PR as requested

[jforissier]

Acked-by: Jerome Forissier <[email protected]>

[jenswi-linaro]

Acked-by: Jens Wiklander <[email protected]>

[ffontaine]

I updated the PR to also fix tee_supplicant_android.mk

[jforissier]

I updated the PR to also fix tee_supplicant_android.mk

Good. Please add the Acked-by: tags, thanks.