From: SangYoun Kwak Date: Mon, 20 May 2024 06:20:44 +0000 (+0900) Subject: Add file_32, file_64 to of .xml files X-Git-Tag: accepted/tizen/unified/20240719.080553~33 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fac85345952e9bbc0b7e9a9e1f8cce70dfcd89b;p=platform%2Fhal%2Fbackend%2Frootstrap-data-common.git Add file_32, file_64 to of .xml files To distinguish 32-bit only files and 64-bit only files, file_32 and file_64 are added to the section of .xml files(glibc, glib2) Also, these sections should not be modified by convert32.sh and convert64.sh scripts, these scripts are modified not to manipulate the file_32 and file_64 sections. Since file_32 is only for 32-bit build and file_64 is only for 64-bit build, the rootstrap generation scripts is also modified. Change-Id: I4a67918986ad9925f369a36fe60926c07d6c04f7 Signed-off-by: SangYoun Kwak --- diff --git a/packaging/hal-rootstrap.spec b/packaging/hal-rootstrap.spec index 09e6902..bd085d3 100644 --- a/packaging/hal-rootstrap.spec +++ b/packaging/hal-rootstrap.spec @@ -439,6 +439,7 @@ cp packaging/hal-rootstrap.pc %{buildroot}%{_libdir}/pkgconfig/ %files %{hal_rootstrap_install_path}/etc/* +%{hal_rootstrap_install_path}/lib/* %{hal_rootstrap_install_path}/%{_lib}/* %{hal_rootstrap_install_path}/usr/share/* %{hal_rootstrap_install_path}/%{_libdir}/* diff --git a/rs_resource/OSS/baserpm/glibc-rs.xml b/rs_resource/OSS/baserpm/glibc-rs.xml index 8901c1b..26bbec6 100644 --- a/rs_resource/OSS/baserpm/glibc-rs.xml +++ b/rs_resource/OSS/baserpm/glibc-rs.xml @@ -20,11 +20,10 @@ + /etc/ld.so.conf /lib/ld-2.30.so - /lib/ld-linux.so.3 - /lib/ld-linux-aarch64.so.1 /lib/libanl-2.30.so /lib/libanl.so.1 /lib/libBrokenLocale-2.30.so @@ -66,7 +65,6 @@ /lib/libthread_db.so.1 /lib/libutil-2.30.so /lib/libutil.so.1 - /lib/ld-linux-aarch64.so.1 /usr/include/aio.h /usr/include/aliases.h /usr/include/alloca.h @@ -313,11 +311,7 @@ /usr/include/glob.h /usr/include/gnu/libc-version.h /usr/include/gnu/lib-names.h - /usr/include/gnu/lib-names-soft.h - /usr/include/gnu/lib-names-lp64.h /usr/include/gnu/stubs.h - /usr/include/gnu/stubs-soft.h - /usr/include/gnu/stubs-lp64.h /usr/include/gnu-versions.h /usr/include/grp.h /usr/include/gshadow.h @@ -471,7 +465,6 @@ /usr/include/sys/fsuid.h /usr/include/sys/gmon.h /usr/include/sys/gmon_out.h - /usr/include/sys/ifunc.h /usr/include/sys/inotify.h /usr/include/sys/ioctl.h /usr/include/sys/ipc.h @@ -859,7 +852,18 @@ /usr/lib/libutil.so /usr/lib/Mcrt1.o /usr/lib/Scrt1.o + + /lib/ld-linux.so.3 + /usr/include/gnu/lib-names-soft.h + /usr/include/gnu/stubs-soft.h + + /lib64/ld-linux-aarch64.so.1 + /lib/ld-linux-aarch64.so.1 + /usr/include/gnu/lib-names-lp64.h + /usr/include/gnu/stubs-lp64.h + /usr/include/sys/ifunc.h$ + /usr/include diff --git a/rs_resource/OSS/glib2-rs.xml b/rs_resource/OSS/glib2-rs.xml index 92e02a0..313f017 100644 --- a/rs_resource/OSS/glib2-rs.xml +++ b/rs_resource/OSS/glib2-rs.xml @@ -334,8 +334,12 @@ /usr/lib/libgthread-2.0.so /usr/lib/libgthread-2.0.so.0 /usr/lib/libgthread-2.0.so.0.7800.4 - /usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7800.4-gdb.py - /usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7800.4-gdb.py + + /usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7800.4-gdb.py + /usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7800.4-gdb.py + + /usr/share/gdb/auto-load/usr/lib64/libglib-2.0.so.0.7800.4-gdb.py + /usr/share/gdb/auto-load/usr/lib64/libgobject-2.0.so.0.7800.4-gdb.py /usr/include/gio-unix-2.0 diff --git a/script/convert32.sh b/script/convert32.sh index cebb9d1..644e2ab 100755 --- a/script/convert32.sh +++ b/script/convert32.sh @@ -6,7 +6,6 @@ find ./ \( -name "*-rs.xml" ! -iname "setup-rs.xml" \) \ -exec xmlstarlet ed -L -u //rootstrap/target/rpm/@arch -v "armv7l" {} \; \ -exec xmlstarlet ed -L -u //rootstrap/library_path -v "/usr/lib" {} \; \ -exec sed -i "s@/usr/lib64/@/usr/lib/@" {} \; \ --exec sed -i "s@/usr/share/gdb/auto-load/usr/lib64/@/usr/share/gdb/auto-load/usr/lib/@" {} \; \ -exec sed -i "s@/lib64/@/lib32/@" {} \; \ -exec sed -i "s@/usr/lib64/@/usr/lib32/@" {} \; diff --git a/script/convert64.sh b/script/convert64.sh index de8b286..548926e 100755 --- a/script/convert64.sh +++ b/script/convert64.sh @@ -6,7 +6,6 @@ find ./ \( -name "*-rs.xml" ! -iname "setup-rs.xml" \) \ -exec xmlstarlet ed -L -u //rootstrap/target/rpm/@arch -v "aarch64" {} \; \ -exec xmlstarlet ed -L -u //rootstrap/library_path -v "/usr/lib64" {} \; \ -exec sed -i "s@/usr/lib/@/usr/lib64/@" {} \; \ --exec sed -i "s@/usr/share/gdb/auto-load/usr/lib/@/usr/share/gdb/auto-load/usr/lib64/@" {} \; \ -exec sed -i "s@/lib/@/lib64/@" {} \; \ -exec sed -i "s@/usr/lib/@/usr/lib64/@" {} \; @@ -26,7 +25,7 @@ sed -i "s@SNAPSHOT_URL_POSTFIX_TARGET=.*@SNAPSHOT_URL_POSTFIX_TARGET=\"${SNAPSHO # Post Script #git checkout ./make_rootstrap_64.sh #sed -i "s/asm-arm/asm-arm64/g" make_rootstrap_64.sh -sed -i "s/asm-x86/asm-ia64/g" make_rootstrap_64.sh +#sed -i "s/asm-x86/asm-ia64/g" make_rootstrap_64.sh #git checkout ./script/rootstrap_gen_1.0_64.sh #POSTLINKER_PATH=${PWD_BACKUP}"/script/postlinker" diff --git a/script/rootstrap_gen_1.0.sh b/script/rootstrap_gen_1.0.sh index e868a74..4b08ad7 100755 --- a/script/rootstrap_gen_1.0.sh +++ b/script/rootstrap_gen_1.0.sh @@ -182,8 +182,9 @@ function copy_header_and_so() local dest_dir=$2 local xml_file=$3 local copy_error=0 - local files=() local dest_path="" + local -a files + local -a necessary_files log "***************** $FUNCNAME *****************" ALL=$(xmlstarlet sel -t -m "//necessary[count(file)=1]" -v "./file/text()" ${xml_file}) @@ -196,7 +197,9 @@ function copy_header_and_so() return 1 else log "+ copy necessary files .." - for i in $(xmlstarlet sel -t -m "//necessary/file" -o "." -v "text()" -o " " -n ${xml_file}); do + necessary_files=($(xmlstarlet sel -t -m "//necessary/file" -o "." -v "text()" -o " " -n ${xml_file})) + necessary_files+=($(xmlstarlet sel -t -m "//necessary/file_32" -o "." -v "text()" -o " " -n ${xml_file})) + for i in ${necessary_files[@]}; do cd ${src_dir} log "+ copy file from [${i}]" files=($(ls ${i})) diff --git a/script/rootstrap_gen_1.0_64.sh b/script/rootstrap_gen_1.0_64.sh index 49fc024..c6bcb10 100755 --- a/script/rootstrap_gen_1.0_64.sh +++ b/script/rootstrap_gen_1.0_64.sh @@ -182,8 +182,9 @@ function copy_header_and_so() local dest_dir=$2 local xml_file=$3 local copy_error=0 - local files=() local dest_path="" + local -a files + local -a necessary_files log "***************** $FUNCNAME *****************" ALL=$(xmlstarlet sel -t -m "//necessary[count(file)=1]" -v "./file/text()" ${xml_file}) @@ -196,7 +197,9 @@ function copy_header_and_so() return 1 else log "+ copy necessary files .." - for i in $(xmlstarlet sel -t -m "//necessary/file" -o "." -v "text()" -o " " -n ${xml_file}); do + necessary_files=($(xmlstarlet sel -t -m "//necessary/file" -o "." -v "text()" -o " " -n ${xml_file})) + necessary_files+=($(xmlstarlet sel -t -m "//necessary/file_64" -o "." -v "text()" -o " " -n ${xml_file})) + for i in ${necessary_files[@]}; do cd ${src_dir} log "+ copy file from [${i}]" files=($(ls ${i}))