diff --git a/glibc.spec b/glibc.spec index eb533f729d08d38d43fef5136c1a48bf80052917..8f9110453b53850c2b21e6dbba21fda2625d84f9 100644 --- a/glibc.spec +++ b/glibc.spec @@ -66,7 +66,7 @@ ############################################################################## Name: glibc Version: 2.34 -Release: 47 +Release: 48 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -211,10 +211,6 @@ BuildRequires: libselinux-devel >= 1.33.4-3 BuildRequires: valgrind %endif -%if 0%{?_enable_debug_packages} -BuildRequires: elfutils >= 0.72 rpm >= 4.2-0.56 -%endif - %if %{without bootstrap} %if %{with testsuite} BuildRequires: gcc-c++ libstdc++-static glibc-devel libidn2 @@ -434,39 +430,6 @@ Obsoletes: %{name}-utils = 2.28 This package provides memusage, a memory usage profiler, mtrace, a memory leak tracer and xtrace, a function call tracer, all of which is not necessory for you. -############################################################################## -# glibc debuginfo sub-package -############################################################################## -%if 0%{?_enable_debug_packages} -%define debug_package %{nil} -%define __debug_install_post %{nil} -%global __debug_package 1 - -%undefine _debugsource_packages -%undefine _debuginfo_subpackages -%undefine _unique_debug_names -%undefine _unique_debug_srcs - -%package debuginfo -Summary: Debug information for %{name} -AutoReqProv: no - -%description debuginfo -This package provides debug information for package %{name}. -Debug information is useful when developing applications that use this -package or when debugging this package. - -%package debugsource -Summary: Debug source for %{name} -AutoReqProv: no - -%description debugsource -This package provides debug sources for package %{name}. -Debug sources are useful when developing applications that use this -package or when debugging this package. - -%endif # 0%{?_enable_debug_packages} - ############################################################################## # glibc help sub-package ############################################################################## @@ -693,14 +656,6 @@ truncate -s 0 $RPM_BUILD_ROOT/etc/gai.conf truncate -s 0 $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache chmod 644 $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache -# Install debug copies of unstripped static libraries -%if 0%{?_enable_debug_packages} -mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir} -cp -a $RPM_BUILD_ROOT%{_libdir}/*.a \ - $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/ -rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/*_p.a -%endif - # Remove any zoneinfo files; they are maintained by tzdata. rm -rf $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo @@ -784,7 +739,6 @@ touch nss-devel.filelist touch libnsl.filelist touch debugutils.filelist touch benchtests.filelist -touch debuginfo.filelist %if %{with compat_2_17} touch compat-2.17.filelist %endif @@ -953,59 +907,6 @@ echo "%{_prefix}/libexec/glibc-benchtests/validate_benchout.py*" >> benchtests.f echo "%{_libdir}/libpthread-2.17.so" >> compat-2.17.filelist %endif -%if 0%{?_enable_debug_packages} -############################################################################## -# glibc debuginfo sub-package -############################################################################## -touch debuginfo_additional.filelist -find_debuginfo_args='--strict-build-id -i' -%ifarch %{x86_arches} -find_debuginfo_args="$find_debuginfo_args \ - -l common.filelist \ - -l debugutils.filelist \ - -l nscd.filelist \ - -p '.*/(sbin|libexec)/.*' \ - -o debuginfo_additional.filelist \ - -l nss_modules.filelist \ - -l libnsl.filelist \ - -l glibc.filelist \ -%if %{with benchtests} - -l benchtests.filelist -%endif -%if %{with compat_2_17} - -l compat-2.17.filelist \ -%endif - " -%endif - -if command -v find-debuginfo >/dev/null ; then - find_debuginfo=find-debuginfo -else - find_debuginfo=/usr/lib/rpm/find-debuginfo.sh -fi - -$find_debuginfo $find_debuginfo_args -o debuginfo.filelist - -%ifarch %{x86_arches} -sed -i '\#^$RPM_BUILD_ROOT%{_prefix}/src/debug/#d' debuginfo_additional.filelist -cat debuginfo_additional.filelist >> debuginfo.filelist -find $RPM_BUILD_ROOT%{_prefix}/src/debug \ - \( -type d -printf '%%%%dir ' \) , \ - -printf '%{_prefix}/src/debug/%%P\n' >> debuginfo.filelist - -add_dir=%{_prefix}/lib/debug%{_libdir} -find $RPM_BUILD_ROOT$add_dir -name "*.a" -printf "$add_dir/%%P\n" >> debuginfo.filelist -%endif # %{x86_arches} - -remove_dir="%{_prefix}/src/debug" -remove_dir="$remove_dir $(echo %{_prefix}/lib/debug{,/%{_lib},/bin,/sbin})" -remove_dir="$remove_dir $(echo %{_prefix}/lib/debug%{_prefix}{,/%{_lib},/libexec,/bin,/sbin})" - -for d in $(echo $remove_dir | sed 's/ /\n/g'); do - sed -i "\|^%%dir $d/\?$|d" debuginfo.filelist -done - -%endif # 0%{?_enable_debug_packages} ############################################################################## # Run the glibc testsuite ############################################################################## @@ -1356,13 +1257,6 @@ fi %files -f benchtests.filelist benchtests %endif -%if 0%{?_enable_debug_packages} -%files -f debuginfo.filelist debuginfo - -%files debugsource -%endif - - %files help #Doc of glibc package %doc README NEWS INSTALL elf/rtld-debugger-interface.txt @@ -1377,6 +1271,21 @@ fi %endif %changelog +* Thu Jan 27 2022 Yang Yanchao - 2.34-48 +- The default debuginfo management mechanism is deleted. + Instead, Use the default macro of RPM. + /usr/lib/rpm/openEuler/macros defines: + """ + %install% {?_Enable Debug Package:% {?Build subdirectory:% {debug package}\ + %%Install\ + %{nil} + """ + There are two changes: + 1. The source files in /usr/src are + correctly packed into the glibc-debuggingsource. + 2. The debugging file contains the glibc version number. + The CI detects the file change. However, I think this is caused by the CI. + * Tue Jan 25 2022 Chuang Fang - 2.34-47 - Disable debuginfod in printer tests [BZ #28757] - i386: Remove broken CAN_USE_REGISTER_ASM_EBP (bug 28771)