Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12:Update
rpm-python.9354
debugsubpkg.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File debugsubpkg.diff of Package rpm-python.9354
Create a debuginfo package for each subpackage. --- ./build/files.c.orig 2014-08-18 12:37:19.151934240 +0000 +++ ./build/files.c 2014-08-18 12:48:48.106395561 +0000 @@ -21,6 +21,10 @@ #include <rpm/rpmlog.h> #include <rpm/rpmbase64.h> +#if HAVE_GELF_H +#include <gelf.h> +#endif + #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ #include "misc/fts.h" #include "lib/cpio.h" @@ -2084,13 +2088,241 @@ exit: return rc; } +#if HAVE_GELF_H && HAVE_LIBELF +/* Query the build-id from the ELF file NAME and store it in the newly + allocated *build_id array of size *build_id_size. Returns -1 on + error. */ + +int +getELFBuildId (const char *name, + unsigned char **id, size_t *id_size) +{ + int fd, i; + Elf *elf; + GElf_Ehdr ehdr; + Elf_Data *build_id = NULL; + size_t build_id_offset = 0, build_id_size = 0; + + /* Now query the build-id of the file and add the + corresponding links in the .build-id tree. + The following code is based on tools/debugedit.c. */ + fd = open (name, O_RDONLY); + if (fd < 0) + return -1; + elf = elf_begin (fd, ELF_C_READ_MMAP, NULL); + if (elf == NULL) + { + fprintf (stderr, "cannot open ELF file: %s", + elf_errmsg (-1)); + close (fd); + return -1; + } + if (elf_kind (elf) != ELF_K_ELF + || gelf_getehdr (elf, &ehdr) == NULL + || (ehdr.e_type != ET_DYN + && ehdr.e_type != ET_EXEC + && ehdr.e_type != ET_REL)) + { + elf_end (elf); + close (fd); + return -1; + } + for (i = 0; i < ehdr.e_shnum; ++i) + { + Elf_Scn *s = elf_getscn (elf, i); + GElf_Shdr shdr; + Elf_Data *data; + Elf32_Nhdr nh; + Elf_Data dst = + { + .d_version = EV_CURRENT, .d_type = ELF_T_NHDR, + .d_buf = &nh, .d_size = sizeof nh + }; + Elf_Data src = dst; + + gelf_getshdr (s, &shdr); + if (shdr.sh_type != SHT_NOTE + || !(shdr.sh_flags & SHF_ALLOC)) + continue; + + /* Look for a build-ID note here. */ + data = elf_rawdata (s, NULL); + src.d_buf = data->d_buf; + assert (sizeof (Elf32_Nhdr) == sizeof (Elf64_Nhdr)); + while (data->d_buf + data->d_size - src.d_buf > (int) sizeof nh + && elf32_xlatetom (&dst, &src, ehdr.e_ident[EI_DATA])) + { + Elf32_Word len = sizeof nh + nh.n_namesz; + len = (len + 3) & ~3; + + if (nh.n_namesz == sizeof "GNU" && nh.n_type == 3 + && !memcmp (src.d_buf + sizeof nh, "GNU", sizeof "GNU")) + { + build_id = data; + build_id_offset = src.d_buf + len - data->d_buf; + build_id_size = nh.n_descsz; + break; + } + + len += nh.n_descsz; + len = (len + 3) & ~3; + src.d_buf += len; + } + + if (build_id != NULL) + break; + } + + if (build_id == NULL) + return -1; + + *id = malloc (build_id_size); + *id_size = build_id_size; + memcpy (*id, build_id->d_buf + build_id_offset, build_id_size); + + elf_end (elf); + close (fd); + + return 0; +} + + +static rpmTag copyTagsForDebug[] = { + RPMTAG_EPOCH, + RPMTAG_VERSION, + RPMTAG_RELEASE, + RPMTAG_LICENSE, + RPMTAG_PACKAGER, + RPMTAG_DISTRIBUTION, + RPMTAG_DISTURL, + RPMTAG_VENDOR, + RPMTAG_ICON, + RPMTAG_URL, + RPMTAG_CHANGELOGTIME, + RPMTAG_CHANGELOGNAME, + RPMTAG_CHANGELOGTEXT, + RPMTAG_PREFIXES, + RPMTAG_RHNPLATFORM, + RPMTAG_OS, + RPMTAG_DISTTAG, + RPMTAG_CVSID, + RPMTAG_ARCH, + 0 +}; + +static void addDebuginfoPackage(rpmSpec spec, Package pkg, char *buildroot) +{ + const char *a; + + elf_version(EV_CURRENT); + a = headerGetString(pkg->header, RPMTAG_ARCH); + if (strcmp(a, "noarch") != 0 && strcmp(a, "src") != 0 && strcmp(a, "nosrc") != 0) + { + Package dbg; + rpmfi fi = pkg->cpioList; + char tmp[1024]; + const char *name; + ARGV_t files = NULL; + int seen_build_id = 0; + + /* Check if the current package has files with debug info + and record them. */ + fi = rpmfiInit (fi, 0); + while (rpmfiNext (fi) >= 0) + { + const char *base; + int i; + unsigned char *build_id; + size_t build_id_size = 0; + struct stat sbuf; + + name = rpmfiFN (fi); + /* Skip leading buildroot. */ + base = name + strlen (buildroot); + /* Pre-pend %buildroot/usr/lib/debug and append .debug. */ + snprintf (tmp, 1024, "%s/usr/lib/debug%s.debug", + buildroot, base); + /* If that file exists we have debug information for it. */ + if (access (tmp, F_OK) != 0) + continue; + + /* Append the file list preamble. */ + if (!files) + { + argvAdd(&files, "%defattr(-,root,root)"); + argvAdd(&files, "%dir /usr/lib/debug"); + } + /* Add the files main debug-info file. */ + snprintf (tmp, 1024, "/usr/lib/debug/%s.debug", base); + argvAdd(&files, tmp); + + /* Do not bother to check build-ids for symbolic links. + We'll handle them for the link target. */ + if (lstat (name, &sbuf) == -1 + || S_ISLNK (sbuf.st_mode)) + continue; + + /* Try to gather the build-id from the binary. */ + if (getELFBuildId (name, &build_id, &build_id_size) == -1) + continue; + + /* If we see build-id links for the first time add the + directory. */ + if (!seen_build_id) + argvAdd(&files, "%dir /usr/lib/debug/.build-id"); + + /* From the build-id construct the two links pointing back + to the debug information file and the binary. */ + snprintf (tmp, 1024, "/usr/lib/debug/.build-id/%02x/", + build_id[0]); + for (i = 1; i < build_id_size; ++i) + sprintf (tmp + strlen (tmp), "%02x", build_id[i]); + argvAdd(&files, tmp); + sprintf (tmp + strlen (tmp), ".debug"); + argvAdd(&files, tmp); + + free (build_id); + } + + /* If there are debuginfo files for this package add a + new debuginfo package. */ + if (files) + { + dbg = newPackage(NULL, spec->pool, &spec->packages); + headerNVR (pkg->header, &name, NULL, NULL); + /* Set name, summary and group. */ + snprintf (tmp, 1024, "%s-debuginfo", name); + headerPutString(dbg->header, RPMTAG_NAME, tmp); + snprintf (tmp, 1024, "Debug information for package %s", name); + headerPutString(dbg->header, RPMTAG_SUMMARY, tmp); + snprintf (tmp, 1024, "This package provides debug information for package %s.\n" + "Debug information is useful when developing applications that use this\n" + "package or when debugging this package.", name); + headerPutString(dbg->header, RPMTAG_DESCRIPTION, tmp); + headerPutString(dbg->header, RPMTAG_GROUP, "Development/Debug"); + /* Inherit other tags from parent. */ + headerCopyTags (pkg->header, dbg->header, copyTagsForDebug); + + /* Add self-provides */ + dbg->ds = rpmdsThis(dbg->header, RPMTAG_REQUIRENAME, RPMSENSE_EQUAL); + addPackageProvides(dbg); + + /* Build up the files list. */ + dbg->fileList = files; + } + } +} +#endif + rpmRC processBinaryFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags, int installSpecialDoc, int test) { Package pkg; rpmRC rc = RPMRC_OK; + char *buildroot; check_fileList = newStringBuf(); + buildroot = rpmGenPath(spec->rootDir, spec->buildRoot, NULL); genSourceRpmName(spec); for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) { @@ -2108,8 +2340,12 @@ rpmRC processBinaryFiles(rpmSpec spec, r rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr); free(nvr); - if ((rc = processPackageFiles(spec, pkgFlags, pkg, installSpecialDoc, test)) != RPMRC_OK || - (rc = rpmfcGenerateDepends(spec, pkg)) != RPMRC_OK) + if ((rc = processPackageFiles(spec, pkgFlags, pkg, installSpecialDoc, test)) != RPMRC_OK) + goto exit; +#if HAVE_GELF_H && HAVE_LIBELF + addDebuginfoPackage(spec, pkg, buildroot); +#endif + if ((rc = rpmfcGenerateDepends(spec, pkg)) != RPMRC_OK) goto exit; a = headerGetString(pkg->header, RPMTAG_ARCH); --- ./build/parseSpec.c.orig 2014-08-18 12:44:49.564619395 +0000 +++ ./build/parseSpec.c 2014-08-18 12:44:59.187569649 +0000 @@ -503,7 +503,7 @@ static void initSourceHeader(rpmSpec spe } /* Add extra provides to package. */ -static void addPackageProvides(Package pkg) +void addPackageProvides(Package pkg) { const char *arch, *name; char *evr, *isaprov; --- ./build/rpmbuild_internal.h.orig 2014-08-18 12:43:17.461092324 +0000 +++ ./build/rpmbuild_internal.h 2014-08-18 12:44:25.578739914 +0000 @@ -425,6 +425,13 @@ int addReqProv(Package pkg, rpmTagVal ta uint32_t index); /** \ingroup rpmbuild + * Add self-provides to package. + * @param pkg package + */ +RPM_GNUC_INTERNAL +void addPackageProvides(Package pkg); + +/** \ingroup rpmbuild * Add rpmlib feature dependency. * @param pkg package * @param feature rpm feature name (i.e. "rpmlib(Foo)" for feature Foo) --- ./macros.in.orig 2014-08-18 12:37:19.206933957 +0000 +++ ./macros.in 2014-08-18 12:37:30.648875217 +0000 @@ -186,24 +186,10 @@ # Template for debug information sub-package. %debug_package \ %global __debug_package 1\ -%package debuginfo\ -Summary: Debug information for package %{name}\ -Group: Development/Debug\ -AutoReq: 0\ -AutoProv: 1\ -#Requires: %{?!debug_package_requires:%{name} = %{version}-%{release}}%{?debug_package_requires}\ -%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.\ -%files debuginfo -f debugfiles.list\ -%defattr(-,root,root)\ -\ %package debugsource\ Summary: Debug sources for package %{name}\ Group: Development/Debug\ AutoReqProv: 0\ -Requires: %{name}-debuginfo = %{version}-%{release}\ %description debugsource\ This package provides debug sources for package %{name}.\ Debug sources are useful when developing applications that use this\ --- ./scripts/find-debuginfo.sh.orig 2014-08-18 12:37:19.201933983 +0000 +++ ./scripts/find-debuginfo.sh 2014-08-18 12:37:30.648875217 +0000 @@ -149,6 +149,11 @@ debug_link() # Provide .2, .3, ... symlinks to all filename instances of this build-id. make_id_dup_link() { + # See https://bugzilla.redhat.com/show_bug.cgi?id=641377 for the reasoning, + # but it has seveal drawbacks as we would need to split the .1 suffixes into + # different subpackages and it's about impossible to predict the number + # -> perhaps later + return local id="$1" file="$2" idfile local n=1 @@ -311,19 +316,11 @@ while read nlinks inum f; do fi done || exit -# For each symlink whose target has a .debug file, -# make a .debug symlink to that file. -find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*" -type l -print | -while read f -do - t=$(readlink -m "$f").debug - f=${f#$RPM_BUILD_ROOT} - t=${t#$RPM_BUILD_ROOT} - if [ -f "$debugdir$t" ]; then - echo "symlinked /usr/lib/debug$t to /usr/lib/debug${f}.debug" - debug_link "/usr/lib/debug$t" "${f}.debug" - fi -done +# We used to make a .debug symlink for each symlink whose target +# has a .debug file to that file. This is not necessary because +# the debuglink section contains only the destination of those links. +# Creating those links anyway results in debuginfo packages for +# devel packages just because of the .so symlinks in them. if [ -s "$SOURCEFILE" ]; then mkdir -p "${RPM_BUILD_ROOT}/usr/src/debug"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
