From bbecc35b17c9ba1e7274afe7aed61955132609e8 Mon Sep 17 00:00:00 2001 From: SangYoun Kwak Date: Mon, 24 Feb 2025 15:58:07 +0900 Subject: [PATCH] rs_resource: Integrate common and headed directories Resource xml files in rs_resource were separated into two directories (common, headed) to exclude unnecessary headed libraries to be included when the image is headless. But there was already a mechanism to exclude unnecessary libraries which can be used with an option '--as-needed' and it is used when the hal backends are built. This option is properly applied if any hal backend is built with cmake but not applied when built with libtool. This phenomenon has been revealed to be due to a bug in libtool. Please refer this for more information: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650 This bug was fixed with patch below: afe15dc(Change order of deplibs and compiler_flags) This bug was fixed so there is no reason to keep the separated two packages, so common and headed directoreis are integrated. Change-Id: Ieb0734d1a439554b4cae00f35ca9b66b70dd3e27 Signed-off-by: SangYoun Kwak --- packaging/hal-rootstrap-data-common.spec | 12 ++++++------ rs_resource/{common => }/HAL/hal-api-audio-rs.xml | 0 .../{common => }/HAL/hal-api-bluetooth-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-camera-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-common-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-device-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-location-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-nfc-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-power-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-radio-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-sensor-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-tbm-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-tdm-rs.xml | 0 rs_resource/{common => }/HAL/hal-api-wifi-rs.xml | 0 .../{common => }/NativeAPI/capi-base-common-rs.xml | 0 .../{common => }/NativeAPI/capi-system-info-rs.xml | 0 .../NativeAPI/capi-system-peripheral-io-rs.xml | 0 .../NativeAPI/capi-system-runtime-info-rs.xml | 0 rs_resource/{common => }/NativeAPI/libdlog-rs.xml | 0 rs_resource/{common => }/NativeAPI/libtbm-rs.xml | 0 rs_resource/{headed => }/NativeAPI/libtpl-egl-rs.xml | 0 .../NativeAPI/libtzplatform-config-rs.xml | 0 rs_resource/{common => }/NativeAPI/ttrace-rs.xml | 0 rs_resource/{headed => }/OSS/SDL2-rs.xml | 0 rs_resource/{common => }/OSS/alsa-rs.xml | 0 rs_resource/{common => }/OSS/baserpm/glibc-rs.xml | 0 rs_resource/{common => }/OSS/baserpm/libcurl-rs.xml | 0 rs_resource/{common => }/OSS/baserpm/libicu-rs.xml | 0 rs_resource/{common => }/OSS/baserpm/libxml2-rs.xml | 0 rs_resource/{common => }/OSS/baserpm/minizip-rs.xml | 0 rs_resource/{common => }/OSS/baserpm/openssl-rs.xml | 0 rs_resource/{common => }/OSS/baserpm/sqlite-rs.xml | 0 rs_resource/{common => }/OSS/baserpm/zlib-rs.xml | 0 rs_resource/{headed => }/OSS/coregl-rs.xml | 0 rs_resource/{headed => }/OSS/fontconfig-rs.xml | 0 rs_resource/{headed => }/OSS/freetype-rs.xml | 0 rs_resource/{common => }/OSS/glib2-rs.xml | 0 rs_resource/{headed => }/OSS/harfbuzz-rs.xml | 0 rs_resource/{common => }/OSS/json-glib-rs.xml | 0 rs_resource/{common => }/OSS/libdrm-rs.xml | 0 rs_resource/{headed => }/OSS/liboauth-rs.xml | 0 rs_resource/{common => }/OSS/libudev-rs.xml | 0 rs_resource/{common => }/OSS/libusb-1.0-rs.xml | 0 rs_resource/{common => }/OSS/openal-soft-rs.xml | 0 rs_resource/{headed => }/OSS/vulkan-loader-rs.xml | 0 45 files changed, 6 insertions(+), 6 deletions(-) rename rs_resource/{common => }/HAL/hal-api-audio-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-bluetooth-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-camera-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-common-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-device-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-location-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-nfc-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-power-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-radio-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-sensor-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-tbm-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-tdm-rs.xml (100%) rename rs_resource/{common => }/HAL/hal-api-wifi-rs.xml (100%) rename rs_resource/{common => }/NativeAPI/capi-base-common-rs.xml (100%) rename rs_resource/{common => }/NativeAPI/capi-system-info-rs.xml (100%) rename rs_resource/{common => }/NativeAPI/capi-system-peripheral-io-rs.xml (100%) rename rs_resource/{common => }/NativeAPI/capi-system-runtime-info-rs.xml (100%) rename rs_resource/{common => }/NativeAPI/libdlog-rs.xml (100%) rename rs_resource/{common => }/NativeAPI/libtbm-rs.xml (100%) rename rs_resource/{headed => }/NativeAPI/libtpl-egl-rs.xml (100%) rename rs_resource/{common => }/NativeAPI/libtzplatform-config-rs.xml (100%) rename rs_resource/{common => }/NativeAPI/ttrace-rs.xml (100%) rename rs_resource/{headed => }/OSS/SDL2-rs.xml (100%) rename rs_resource/{common => }/OSS/alsa-rs.xml (100%) rename rs_resource/{common => }/OSS/baserpm/glibc-rs.xml (100%) rename rs_resource/{common => }/OSS/baserpm/libcurl-rs.xml (100%) rename rs_resource/{common => }/OSS/baserpm/libicu-rs.xml (100%) rename rs_resource/{common => }/OSS/baserpm/libxml2-rs.xml (100%) rename rs_resource/{common => }/OSS/baserpm/minizip-rs.xml (100%) rename rs_resource/{common => }/OSS/baserpm/openssl-rs.xml (100%) rename rs_resource/{common => }/OSS/baserpm/sqlite-rs.xml (100%) rename rs_resource/{common => }/OSS/baserpm/zlib-rs.xml (100%) rename rs_resource/{headed => }/OSS/coregl-rs.xml (100%) rename rs_resource/{headed => }/OSS/fontconfig-rs.xml (100%) rename rs_resource/{headed => }/OSS/freetype-rs.xml (100%) rename rs_resource/{common => }/OSS/glib2-rs.xml (100%) rename rs_resource/{headed => }/OSS/harfbuzz-rs.xml (100%) rename rs_resource/{common => }/OSS/json-glib-rs.xml (100%) rename rs_resource/{common => }/OSS/libdrm-rs.xml (100%) rename rs_resource/{headed => }/OSS/liboauth-rs.xml (100%) rename rs_resource/{common => }/OSS/libudev-rs.xml (100%) rename rs_resource/{common => }/OSS/libusb-1.0-rs.xml (100%) rename rs_resource/{common => }/OSS/openal-soft-rs.xml (100%) rename rs_resource/{headed => }/OSS/vulkan-loader-rs.xml (100%) diff --git a/packaging/hal-rootstrap-data-common.spec b/packaging/hal-rootstrap-data-common.spec index bc7a849..d725fb4 100644 --- a/packaging/hal-rootstrap-data-common.spec +++ b/packaging/hal-rootstrap-data-common.spec @@ -217,12 +217,12 @@ mkdir -p %{buildroot}/tmp ls -al cp -R ./rs_resource %{buildroot}/tmp %if "%{WITH_VD}" == "1" || "%{WITH_VD_MV}" == "1" -rm -f %{buildroot}/tmp/rs_resource/common/NativeAPI/capi-system-peripheral-io-rs.xml -rm -f %{buildroot}/tmp/rs_resource/common/HAL/hal-api-bluetooth-rs.xml -rm -f %{buildroot}/tmp/rs_resource/common/HAL/hal-api-location-rs.xml -rm -f %{buildroot}/tmp/rs_resource/common/HAL/hal-api-power-rs.xml -rm -f %{buildroot}/tmp/rs_resource/common/HAL/hal-api-radio-rs.xml -rm -f %{buildroot}/tmp/rs_resource/common/HAL/hal-api-wifi-rs.xml +rm -f %{buildroot}/tmp/rs_resource/NativeAPI/capi-system-peripheral-io-rs.xml +rm -f %{buildroot}/tmp/rs_resource/HAL/hal-api-bluetooth-rs.xml +rm -f %{buildroot}/tmp/rs_resource/HAL/hal-api-location-rs.xml +rm -f %{buildroot}/tmp/rs_resource/HAL/hal-api-power-rs.xml +rm -f %{buildroot}/tmp/rs_resource/HAL/hal-api-radio-rs.xml +rm -f %{buildroot}/tmp/rs_resource/HAL/hal-api-wifi-rs.xml %endif %files diff --git a/rs_resource/common/HAL/hal-api-audio-rs.xml b/rs_resource/HAL/hal-api-audio-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-audio-rs.xml rename to rs_resource/HAL/hal-api-audio-rs.xml diff --git a/rs_resource/common/HAL/hal-api-bluetooth-rs.xml b/rs_resource/HAL/hal-api-bluetooth-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-bluetooth-rs.xml rename to rs_resource/HAL/hal-api-bluetooth-rs.xml diff --git a/rs_resource/common/HAL/hal-api-camera-rs.xml b/rs_resource/HAL/hal-api-camera-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-camera-rs.xml rename to rs_resource/HAL/hal-api-camera-rs.xml diff --git a/rs_resource/common/HAL/hal-api-common-rs.xml b/rs_resource/HAL/hal-api-common-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-common-rs.xml rename to rs_resource/HAL/hal-api-common-rs.xml diff --git a/rs_resource/common/HAL/hal-api-device-rs.xml b/rs_resource/HAL/hal-api-device-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-device-rs.xml rename to rs_resource/HAL/hal-api-device-rs.xml diff --git a/rs_resource/common/HAL/hal-api-location-rs.xml b/rs_resource/HAL/hal-api-location-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-location-rs.xml rename to rs_resource/HAL/hal-api-location-rs.xml diff --git a/rs_resource/common/HAL/hal-api-nfc-rs.xml b/rs_resource/HAL/hal-api-nfc-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-nfc-rs.xml rename to rs_resource/HAL/hal-api-nfc-rs.xml diff --git a/rs_resource/common/HAL/hal-api-power-rs.xml b/rs_resource/HAL/hal-api-power-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-power-rs.xml rename to rs_resource/HAL/hal-api-power-rs.xml diff --git a/rs_resource/common/HAL/hal-api-radio-rs.xml b/rs_resource/HAL/hal-api-radio-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-radio-rs.xml rename to rs_resource/HAL/hal-api-radio-rs.xml diff --git a/rs_resource/common/HAL/hal-api-sensor-rs.xml b/rs_resource/HAL/hal-api-sensor-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-sensor-rs.xml rename to rs_resource/HAL/hal-api-sensor-rs.xml diff --git a/rs_resource/common/HAL/hal-api-tbm-rs.xml b/rs_resource/HAL/hal-api-tbm-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-tbm-rs.xml rename to rs_resource/HAL/hal-api-tbm-rs.xml diff --git a/rs_resource/common/HAL/hal-api-tdm-rs.xml b/rs_resource/HAL/hal-api-tdm-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-tdm-rs.xml rename to rs_resource/HAL/hal-api-tdm-rs.xml diff --git a/rs_resource/common/HAL/hal-api-wifi-rs.xml b/rs_resource/HAL/hal-api-wifi-rs.xml similarity index 100% rename from rs_resource/common/HAL/hal-api-wifi-rs.xml rename to rs_resource/HAL/hal-api-wifi-rs.xml diff --git a/rs_resource/common/NativeAPI/capi-base-common-rs.xml b/rs_resource/NativeAPI/capi-base-common-rs.xml similarity index 100% rename from rs_resource/common/NativeAPI/capi-base-common-rs.xml rename to rs_resource/NativeAPI/capi-base-common-rs.xml diff --git a/rs_resource/common/NativeAPI/capi-system-info-rs.xml b/rs_resource/NativeAPI/capi-system-info-rs.xml similarity index 100% rename from rs_resource/common/NativeAPI/capi-system-info-rs.xml rename to rs_resource/NativeAPI/capi-system-info-rs.xml diff --git a/rs_resource/common/NativeAPI/capi-system-peripheral-io-rs.xml b/rs_resource/NativeAPI/capi-system-peripheral-io-rs.xml similarity index 100% rename from rs_resource/common/NativeAPI/capi-system-peripheral-io-rs.xml rename to rs_resource/NativeAPI/capi-system-peripheral-io-rs.xml diff --git a/rs_resource/common/NativeAPI/capi-system-runtime-info-rs.xml b/rs_resource/NativeAPI/capi-system-runtime-info-rs.xml similarity index 100% rename from rs_resource/common/NativeAPI/capi-system-runtime-info-rs.xml rename to rs_resource/NativeAPI/capi-system-runtime-info-rs.xml diff --git a/rs_resource/common/NativeAPI/libdlog-rs.xml b/rs_resource/NativeAPI/libdlog-rs.xml similarity index 100% rename from rs_resource/common/NativeAPI/libdlog-rs.xml rename to rs_resource/NativeAPI/libdlog-rs.xml diff --git a/rs_resource/common/NativeAPI/libtbm-rs.xml b/rs_resource/NativeAPI/libtbm-rs.xml similarity index 100% rename from rs_resource/common/NativeAPI/libtbm-rs.xml rename to rs_resource/NativeAPI/libtbm-rs.xml diff --git a/rs_resource/headed/NativeAPI/libtpl-egl-rs.xml b/rs_resource/NativeAPI/libtpl-egl-rs.xml similarity index 100% rename from rs_resource/headed/NativeAPI/libtpl-egl-rs.xml rename to rs_resource/NativeAPI/libtpl-egl-rs.xml diff --git a/rs_resource/common/NativeAPI/libtzplatform-config-rs.xml b/rs_resource/NativeAPI/libtzplatform-config-rs.xml similarity index 100% rename from rs_resource/common/NativeAPI/libtzplatform-config-rs.xml rename to rs_resource/NativeAPI/libtzplatform-config-rs.xml diff --git a/rs_resource/common/NativeAPI/ttrace-rs.xml b/rs_resource/NativeAPI/ttrace-rs.xml similarity index 100% rename from rs_resource/common/NativeAPI/ttrace-rs.xml rename to rs_resource/NativeAPI/ttrace-rs.xml diff --git a/rs_resource/headed/OSS/SDL2-rs.xml b/rs_resource/OSS/SDL2-rs.xml similarity index 100% rename from rs_resource/headed/OSS/SDL2-rs.xml rename to rs_resource/OSS/SDL2-rs.xml diff --git a/rs_resource/common/OSS/alsa-rs.xml b/rs_resource/OSS/alsa-rs.xml similarity index 100% rename from rs_resource/common/OSS/alsa-rs.xml rename to rs_resource/OSS/alsa-rs.xml diff --git a/rs_resource/common/OSS/baserpm/glibc-rs.xml b/rs_resource/OSS/baserpm/glibc-rs.xml similarity index 100% rename from rs_resource/common/OSS/baserpm/glibc-rs.xml rename to rs_resource/OSS/baserpm/glibc-rs.xml diff --git a/rs_resource/common/OSS/baserpm/libcurl-rs.xml b/rs_resource/OSS/baserpm/libcurl-rs.xml similarity index 100% rename from rs_resource/common/OSS/baserpm/libcurl-rs.xml rename to rs_resource/OSS/baserpm/libcurl-rs.xml diff --git a/rs_resource/common/OSS/baserpm/libicu-rs.xml b/rs_resource/OSS/baserpm/libicu-rs.xml similarity index 100% rename from rs_resource/common/OSS/baserpm/libicu-rs.xml rename to rs_resource/OSS/baserpm/libicu-rs.xml diff --git a/rs_resource/common/OSS/baserpm/libxml2-rs.xml b/rs_resource/OSS/baserpm/libxml2-rs.xml similarity index 100% rename from rs_resource/common/OSS/baserpm/libxml2-rs.xml rename to rs_resource/OSS/baserpm/libxml2-rs.xml diff --git a/rs_resource/common/OSS/baserpm/minizip-rs.xml b/rs_resource/OSS/baserpm/minizip-rs.xml similarity index 100% rename from rs_resource/common/OSS/baserpm/minizip-rs.xml rename to rs_resource/OSS/baserpm/minizip-rs.xml diff --git a/rs_resource/common/OSS/baserpm/openssl-rs.xml b/rs_resource/OSS/baserpm/openssl-rs.xml similarity index 100% rename from rs_resource/common/OSS/baserpm/openssl-rs.xml rename to rs_resource/OSS/baserpm/openssl-rs.xml diff --git a/rs_resource/common/OSS/baserpm/sqlite-rs.xml b/rs_resource/OSS/baserpm/sqlite-rs.xml similarity index 100% rename from rs_resource/common/OSS/baserpm/sqlite-rs.xml rename to rs_resource/OSS/baserpm/sqlite-rs.xml diff --git a/rs_resource/common/OSS/baserpm/zlib-rs.xml b/rs_resource/OSS/baserpm/zlib-rs.xml similarity index 100% rename from rs_resource/common/OSS/baserpm/zlib-rs.xml rename to rs_resource/OSS/baserpm/zlib-rs.xml diff --git a/rs_resource/headed/OSS/coregl-rs.xml b/rs_resource/OSS/coregl-rs.xml similarity index 100% rename from rs_resource/headed/OSS/coregl-rs.xml rename to rs_resource/OSS/coregl-rs.xml diff --git a/rs_resource/headed/OSS/fontconfig-rs.xml b/rs_resource/OSS/fontconfig-rs.xml similarity index 100% rename from rs_resource/headed/OSS/fontconfig-rs.xml rename to rs_resource/OSS/fontconfig-rs.xml diff --git a/rs_resource/headed/OSS/freetype-rs.xml b/rs_resource/OSS/freetype-rs.xml similarity index 100% rename from rs_resource/headed/OSS/freetype-rs.xml rename to rs_resource/OSS/freetype-rs.xml diff --git a/rs_resource/common/OSS/glib2-rs.xml b/rs_resource/OSS/glib2-rs.xml similarity index 100% rename from rs_resource/common/OSS/glib2-rs.xml rename to rs_resource/OSS/glib2-rs.xml diff --git a/rs_resource/headed/OSS/harfbuzz-rs.xml b/rs_resource/OSS/harfbuzz-rs.xml similarity index 100% rename from rs_resource/headed/OSS/harfbuzz-rs.xml rename to rs_resource/OSS/harfbuzz-rs.xml diff --git a/rs_resource/common/OSS/json-glib-rs.xml b/rs_resource/OSS/json-glib-rs.xml similarity index 100% rename from rs_resource/common/OSS/json-glib-rs.xml rename to rs_resource/OSS/json-glib-rs.xml diff --git a/rs_resource/common/OSS/libdrm-rs.xml b/rs_resource/OSS/libdrm-rs.xml similarity index 100% rename from rs_resource/common/OSS/libdrm-rs.xml rename to rs_resource/OSS/libdrm-rs.xml diff --git a/rs_resource/headed/OSS/liboauth-rs.xml b/rs_resource/OSS/liboauth-rs.xml similarity index 100% rename from rs_resource/headed/OSS/liboauth-rs.xml rename to rs_resource/OSS/liboauth-rs.xml diff --git a/rs_resource/common/OSS/libudev-rs.xml b/rs_resource/OSS/libudev-rs.xml similarity index 100% rename from rs_resource/common/OSS/libudev-rs.xml rename to rs_resource/OSS/libudev-rs.xml diff --git a/rs_resource/common/OSS/libusb-1.0-rs.xml b/rs_resource/OSS/libusb-1.0-rs.xml similarity index 100% rename from rs_resource/common/OSS/libusb-1.0-rs.xml rename to rs_resource/OSS/libusb-1.0-rs.xml diff --git a/rs_resource/common/OSS/openal-soft-rs.xml b/rs_resource/OSS/openal-soft-rs.xml similarity index 100% rename from rs_resource/common/OSS/openal-soft-rs.xml rename to rs_resource/OSS/openal-soft-rs.xml diff --git a/rs_resource/headed/OSS/vulkan-loader-rs.xml b/rs_resource/OSS/vulkan-loader-rs.xml similarity index 100% rename from rs_resource/headed/OSS/vulkan-loader-rs.xml rename to rs_resource/OSS/vulkan-loader-rs.xml -- 2.34.1