From e1dfd092554e997fcb1e70fcf5a2ff8ae09e426b7189c4b7e75747977ff3f834 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 4 Feb 2020 13:52:28 +0000 Subject: [PATCH] Accepting request 769973 from home:marxin:branches:Base:System-split - Exclude debuginfod sub-packages and move them to elfutils-debuginfod. - Package debuginfod of elfutils for version 0.178. OBS-URL: https://build.opensuse.org/request/show/769973 OBS-URL: https://build.opensuse.org/package/show/Base:System/elfutils?expand=0&rev=149 --- elfutils-debuginfod.changes | 4 + elfutils-debuginfod.spec | 200 ++++++++++++++++++++++++++++++++++++ elfutils.changes | 5 + elfutils.spec | 100 +----------------- 4 files changed, 211 insertions(+), 98 deletions(-) create mode 100644 elfutils-debuginfod.changes create mode 100644 elfutils-debuginfod.spec diff --git a/elfutils-debuginfod.changes b/elfutils-debuginfod.changes new file mode 100644 index 0000000..85cd652 --- /dev/null +++ b/elfutils-debuginfod.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Tue Feb 4 09:06:00 UTC 2020 - Martin Liška + +- Package debuginfod of elfutils for version 0.178. diff --git a/elfutils-debuginfod.spec b/elfutils-debuginfod.spec new file mode 100644 index 0000000..54997e8 --- /dev/null +++ b/elfutils-debuginfod.spec @@ -0,0 +1,200 @@ +# +# spec file for package elfutils-debuginfod +# +# Copyright (c) 2020 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: elfutils-debuginfod +Version: 0.178 +Release: 0 +Summary: debuginfod part of elfutils +License: GPL-3.0-or-later +Group: Development/Tools/Building +URL: https://sourceware.org/elfutils/ + +#Git-Clone: git://sourceware.org/git/elfutils +Source: https://fedorahosted.org/releases/e/l/elfutils/%{version}/elfutils-%{version}.tar.bz2 +Source1: https://fedorahosted.org/releases/e/l/elfutils/%{version}/elfutils-%{version}.tar.bz2.sig +Source2: elfutils.changes +Source3: elfutils.keyring +Patch0: remove-run-large-elf-file.sh.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bison +BuildRequires: flex +BuildRequires: gcc-c++ +BuildRequires: libbz2-devel +BuildRequires: xz-devel +BuildRequires: zlib-devel +# For debuginfod +BuildRequires: pkgconfig(libarchive) >= 3.1.2 +BuildRequires: pkgconfig(libcurl) >= 7.29.0 +BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 +BuildRequires: pkgconfig(sqlite3) >= 3.7.17 +# For the run-debuginfod-find.sh test case in %check for /usr/sbin/ss +BuildRequires: curl +BuildRequires: iproute +Requires: debuginfod-client = %{version} +Requires: elfutils = %{version} +BuildRequires: pkgconfig(systemd) +Requires: sysconfig +Requires(post): %fillup_prereq +%{?systemd_requires} + +%description +The elfutils-debuginfod package contains the debuginfod binary +and control files for a service that can provide ELF/DWARF +files to remote clients, based on build-id identification. +The ELF/DWARF file searching functions in libdwfl can query +such servers to download those files on demand. + +%package -n libdebuginfod1 +Summary: Library for build-id HTTP ELF/DWARF server +Group: System/Libraries + +%description -n libdebuginfod1 +The libdebuginfod1 package contains shared libraries +dynamically loaded from -ldw, which use a debuginfod service +to look up debuginfo and associated data. Also includes a +command-line frontend. + +%package -n libdebuginfod-devel +Summary: Libraries and headers to build debuginfod client applications +Group: Development/Libraries/C and C++ + +%description -n libdebuginfod-devel +The libdebuginfod-devel package contains the libraries +to create applications to use the debuginfod service. + +%package -n debuginfod-client +Summary: Command line client for build-id HTTP ELF/DWARF server +Group: Development/Tools/Building + +%description -n debuginfod-client +The elfutils-debuginfod-client package contains a command-line frontend. + +%lang_package + +%prep +%setup -q -n elfutils-%version +%patch0 -p1 + +%build +%define _lto_cflags %{nil} +# Change DATE/TIME macros to use last change time of elfutils.changes +# See http://lists.opensuse.org/opensuse-factory/2011-05/msg00304.html +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" +TIME="\"$(date -d "${modified}" "+%%R")\"" +find . -type f -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + +# Set modversion used to verify dynamically loaded ebl backend matches to +# similarly predictable value [upstream default is hostname + date] +MODVERSION="suse-build `eval echo ${DATE} ${TIME}`" +sed --in-place "s/^MODVERSION=.*\$/MODVERSION=\"${MODVERSION}\"/" configure.ac +export CFLAGS="%optflags" +CFLAGS+=" -g" # make tests pass when user does not want debuginfo (boo#1031556) +%ifarch %sparc +# Small PIC model not sufficient +CFLAGS+=" -fPIC" +%endif +autoreconf -fi +# some patches create new test scripts, which are created 644 by default +chmod a+x tests/run*.sh +%configure --program-prefix=eu- +%make_build + +%install +%make_install +# remove unneeded files +rm -f %{buildroot}/%{_libdir}/*.la +ls -lR %{buildroot}/%{_libdir}/libelf* + +rm -f %{buildroot}/%{_bindir}/eu* +rm -f %{buildroot}/%{_libdir}/libasm* +rm -f %{buildroot}/%{_includedir}/elfutils/lib*.h +rm -f %{buildroot}/%{_includedir}/elfutils/elf-knowledge.h +rm -f %{buildroot}/%{_includedir}/elfutils/known-dwarf.h +rm -f %{buildroot}/%{_includedir}/elfutils/version.h +rm -f %{buildroot}/%{_libdir}/libelf* +rm -f %{buildroot}/%{_includedir}/libelf.h +rm -f %{buildroot}/%{_includedir}/gelf.h +rm -f %{buildroot}/%{_includedir}/nlist.h +rm -f %{buildroot}/%{_includedir}/dwarf.h +rm -f %{buildroot}/%{_libdir}/libdw* +rm -f %{buildroot}/%{_mandir}/man3/elf_*.3* +rm -f %{buildroot}/%{_mandir}/man1/eu-*.1* +rm -rf %{buildroot}/usr/share/locale/ +rm -f %{buildroot}/%{_libdir}/pkgconfig/libdw.pc +rm -f %{buildroot}/%{_libdir}/pkgconfig/libelf.pc + +install -Dm0644 config/debuginfod.service %{buildroot}%{_unitdir}/debuginfod.service +install -d -m 755 %{buildroot}%{_fillupdir} +cp config/debuginfod.sysconfig %{buildroot}%{_fillupdir}/sysconfig.debuginfod + +mkdir -p %{buildroot}%{_localstatedir}/cache/debuginfod +touch %{buildroot}%{_localstatedir}/cache/debuginfod/debuginfod.sqlite + +%post -n libdebuginfod1 -p /sbin/ldconfig +%postun -n libdebuginfod1 -p /sbin/ldconfig + +%check +%if 0%{?qemu_user_space_build} +# qemu-linux-user does not support ptrace and a few other process details +export XFAIL_TESTS="dwfl-proc-attach run-backtrace-dwarf.sh run-backtrace-native.sh run-deleted.sh" +%endif +%make_build check + +%files +%license COPYING +%doc AUTHORS ChangeLog NEWS NOTES README THANKS TODO +%{_bindir}/debuginfod +%{_unitdir}/debuginfod.service +%{_mandir}/man8/debuginfod.8* +%{_fillupdir}/sysconfig.debuginfod + +%dir %attr(0700,debuginfod,debuginfod) %{_localstatedir}/cache/debuginfod +%verify(not md5 size mtime) %attr(0600,debuginfod,debuginfod) %{_localstatedir}/cache/debuginfod/debuginfod.sqlite + +%files -n libdebuginfod1 +%{_libdir}/libdebuginfod.so.* +%{_libdir}/libdebuginfod-%{version}.so + +%files -n libdebuginfod-devel +%{_libdir}/pkgconfig/libdebuginfod.pc +%{_mandir}/man3/debuginfod_*.3* +%dir %{_includedir}/elfutils +%{_includedir}/elfutils/debuginfod.h +%{_libdir}/libdebuginfod.so + +%files -n debuginfod-client +%{_bindir}/debuginfod-find +%{_mandir}/man1/debuginfod-find.1* + +%pre +getent group debuginfod >/dev/null || %{_sbindir}/groupadd -r debuginfod +getent passwd debuginfod >/dev/null || %{_sbindir}/useradd -r -g debuginfod -d %{_localstatedir}/cache/debuginfod -s /bin/false -c "elfutils debuginfo server" debuginfod +%service_add_pre debuginfod.service + +%post +%service_add_post debuginfod.service +%{fillup_only -n debuginfod} + +%preun +%service_del_preun debuginfod.service + +%postun +%service_del_postun debuginfod.service + +%changelog diff --git a/elfutils.changes b/elfutils.changes index 733dce7..af101ae 100644 --- a/elfutils.changes +++ b/elfutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 4 09:34:24 UTC 2020 - Martin Liška + +- Exclude debuginfod sub-packages and move them to elfutils-debuginfod. + ------------------------------------------------------------------- Thu Jan 23 09:09:10 UTC 2020 - Jan Engelhardt diff --git a/elfutils.spec b/elfutils.spec index 1fd91e8..2adfc2f 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -37,19 +37,9 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: flex -BuildRequires: gcc-c++ BuildRequires: libbz2-devel BuildRequires: xz-devel BuildRequires: zlib-devel -# For debuginfod -BuildRequires: pkgconfig(libarchive) >= 3.1.2 -BuildRequires: pkgconfig(libcurl) >= 7.29.0 -BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 -BuildRequires: pkgconfig(sqlite3) >= 3.7.17 -# For the run-debuginfod-find.sh test case in %check for /usr/sbin/ss -BuildRequires: curl -BuildRequires: iproute -Requires: debuginfod-client = %{version} %description elfutils is a collection of utilities and libraries to read, create @@ -113,46 +103,6 @@ Requires: libelf-devel = %{version} This package contains the headers and libraries needed to build applications that require libdw. -%package -n libdebuginfod1 -Summary: Library for build-id HTTP ELF/DWARF server -Group: System/Libraries - -%description -n libdebuginfod1 -The libdebuginfod1 package contains shared libraries -dynamically loaded from -ldw, which use a debuginfod service -to look up debuginfo and associated data. Also includes a -command-line frontend. - -%package -n libdebuginfod-devel -Summary: Libraries and headers to build debuginfod client applications -Group: Development/Libraries/C and C++ - -%description -n libdebuginfod-devel -The libdebuginfod-devel package contains the libraries -to create applications to use the debuginfod service. - -%package -n debuginfod-client -Summary: Command line client for build-id HTTP ELF/DWARF server -Group: Development/Tools/Building - -%description -n debuginfod-client -The elfutils-debuginfod-client package contains a command-line frontend. - -%package -n debuginfod -Summary: HTTP ELF/DWARF file server addressed by build-id -Group: Development/Tools/Building -BuildRequires: pkgconfig(systemd) -Requires: sysconfig -Requires(post): %fillup_prereq -%{?systemd_requires} - -%description -n debuginfod -The elfutils-debuginfod package contains the debuginfod binary -and control files for a service that can provide ELF/DWARF -files to remote clients, based on build-id identification. -The ELF/DWARF file searching functions in libdwfl can query -such servers to download those files on demand. - %lang_package %prep @@ -181,7 +131,7 @@ CFLAGS+=" -fPIC" autoreconf -fi # some patches create new test scripts, which are created 644 by default chmod a+x tests/run*.sh -%configure --program-prefix=eu- +%configure --program-prefix=eu- --disable-debuginfod %make_build %install @@ -189,23 +139,15 @@ chmod a+x tests/run*.sh # remove unneeded files rm -f %{buildroot}/%{_libdir}/*.la ls -lR %{buildroot}/%{_libdir}/libelf* +rm %{buildroot}/%{_libdir}/pkgconfig/libdebuginfod.pc %find_lang %{name} -install -Dm0644 config/debuginfod.service %{buildroot}%{_unitdir}/debuginfod.service -install -d -m 755 %{buildroot}%{_fillupdir} -cp config/debuginfod.sysconfig %{buildroot}%{_fillupdir}/sysconfig.debuginfod - -mkdir -p %{buildroot}%{_localstatedir}/cache/debuginfod -touch %{buildroot}%{_localstatedir}/cache/debuginfod/debuginfod.sqlite - %post -n libasm1 -p /sbin/ldconfig %post -n libelf1 -p /sbin/ldconfig %post -n libdw1 -p /sbin/ldconfig -%post -n libdebuginfod1 -p /sbin/ldconfig %postun -n libasm1 -p /sbin/ldconfig %postun -n libelf1 -p /sbin/ldconfig %postun -n libdw1 -p /sbin/ldconfig -%postun -n libdebuginfod1 -p /sbin/ldconfig %check %if 0%{?qemu_user_space_build} @@ -279,42 +221,4 @@ export XFAIL_TESTS="dwfl-proc-attach run-backtrace-dwarf.sh run-backtrace-native %files lang -f %{name}.lang -%files -n libdebuginfod1 -%{_libdir}/libdebuginfod.so.* -%{_libdir}/libdebuginfod-%{version}.so - -%files -n libdebuginfod-devel -%{_libdir}/pkgconfig/libdebuginfod.pc -%{_mandir}/man3/debuginfod_*.3* -%{_includedir}/elfutils/debuginfod.h -%{_libdir}/libdebuginfod.so - -%files -n debuginfod-client -%{_bindir}/debuginfod-find -%{_mandir}/man1/debuginfod-find.1* - -%files -n debuginfod -%{_bindir}/debuginfod -%{_unitdir}/debuginfod.service -%{_mandir}/man8/debuginfod.8* -%{_fillupdir}/sysconfig.debuginfod - -%dir %attr(0700,debuginfod,debuginfod) %{_localstatedir}/cache/debuginfod -%verify(not md5 size mtime) %attr(0600,debuginfod,debuginfod) %{_localstatedir}/cache/debuginfod/debuginfod.sqlite - -%pre -n debuginfod -getent group debuginfod >/dev/null || %{_sbindir}/groupadd -r debuginfod -getent passwd debuginfod >/dev/null || %{_sbindir}/useradd -r -g debuginfod -d %{_localstatedir}/cache/debuginfod -s /bin/false -c "elfutils debuginfo server" debuginfod -%service_add_pre debuginfod.service - -%post -n debuginfod -%service_add_post debuginfod.service -%{fillup_only -n debuginfod} - -%preun -n debuginfod -%service_del_preun debuginfod.service - -%postun -n debuginfod -%service_del_postun debuginfod.service - %changelog