From: Chanwoo Choi Date: Tue, 9 Apr 2024 12:52:43 +0000 (+0900) Subject: packaging: Change install path to /opt/data/hal-rootstrap and use rpm macro X-Git-Tag: accepted/tizen/unified/20240529.123503~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56fcfa2212c68a89faffd7093094136bb9891e5b;p=platform%2Fhal%2Fbackend%2Frootstrap.git packaging: Change install path to /opt/data/hal-rootstrap and use rpm macro Signed-off-by: Chanwoo Choi --- diff --git a/copy_required_files.sh b/copy_required_files.sh index 37bb76a..4e4e34f 100755 --- a/copy_required_files.sh +++ b/copy_required_files.sh @@ -28,7 +28,7 @@ while [[ ${INDEX} -lt ${#XML_DIRECTORIES[@]} ]]; do else NECESSARY_FILES=($(xmlstarlet sel -t -m "//necessary/file" -v "text()" -o " " -n ${ENTITY_PATH})) for NECESSARY_FILE in ${NECESSARY_FILES[@]}; do - THIS_COPY_DEST="${COPY_DEST}/opt/data/hal/${NECESSARY_FILE}" + THIS_COPY_DEST="${COPY_DEST}/opt/data/hal-rootstrap${NECESSARY_FILE}" THIS_COPY_DEST_PARENT=$(dirname ${THIS_COPY_DEST}) if [[ ! -d ${THIS_COPY_DEST_PARENT} ]]; then mkdir -p ${THIS_COPY_DEST_PARENT} diff --git a/packaging/hal-rootstrap.pc.in b/packaging/hal-rootstrap.pc.in index cf9b679..47071bd 100644 --- a/packaging/hal-rootstrap.pc.in +++ b/packaging/hal-rootstrap.pc.in @@ -1,10 +1,10 @@ # Package Information for pkg-config package_name=hal-rootstrap -prefix=/opt/data/hal@PREFIX@ -exec_prefix=/opt/data/hal@EXEC_PREFIX@ -hal_rootstrap_libdir=/opt/data/hal/usr/lib -hal_rootstrap_include_dir=/opt/data/hal/usr/include +prefix=/opt/data/hal-rootstrap@PREFIX@ +exec_prefix=/opt/data/hal-rootstrap@EXEC_PREFIX@ +hal_rootstrap_libdir=/opt/data/hal-rootstrap@LIBDIR@ +hal_rootstrap_include_dir=/opt/data/hal-rootstrap@INCLUDEDIR@ Name: ${package_name} Description: ${package_name} interface diff --git a/packaging/hal-rootstrap.spec b/packaging/hal-rootstrap.spec index 7995afc..68ec244 100644 --- a/packaging/hal-rootstrap.spec +++ b/packaging/hal-rootstrap.spec @@ -421,7 +421,7 @@ Package for rootstrap of hal %prep %setup -q -%cmake +%cmake . -DCMAKE_LIBDIR_PREFIX=%{_libdir} %build make %{?jobs:-j%jobs} @@ -435,10 +435,10 @@ mkdir -p %{buildroot}%{_libdir}/pkgconfig/ cp packaging/hal-rootstrap.pc %{buildroot}%{_libdir}/pkgconfig/ %files -/opt/data/hal/lib/* -/opt/data/hal/usr/lib/* +/opt/data/hal-rootstrap/lib/* +/opt/data/hal-rootstrap/%{_libdir}/* %files -n %{devel_name} %defattr(-,root,root,-) -/opt/data/hal/usr/include/* +/opt/data/hal-rootstrap/%{_includedir}/* %{_libdir}/pkgconfig/*.pc