pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=339
This commit is contained in:
Michael Schröder 2014-09-17 11:05:07 +00:00 committed by Git OBS Bridge
parent a406c1d81a
commit 2f047d4098
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
debugsubpkg.diff
View File

@ -1,7 +1,7 @@
Create a debuginfo package for each subpackage. Create a debuginfo package for each subpackage.
--- ./build/files.c.orig 2014-06-30 08:47:13.928503700 +0000 --- ./build/files.c.orig 2014-06-30 08:47:13.928503700 +0000
+++ ./build/files.c 2014-09-16 11:52:51.708609583 +0000 +++ ./build/files.c 2014-09-17 11:03:25.001860575 +0000
@@ -21,6 +21,10 @@ @@ -21,6 +21,10 @@
#include <rpm/rpmlog.h> #include <rpm/rpmlog.h>
#include <rpm/rpmbase64.h> #include <rpm/rpmbase64.h>
@ -13,7 +13,7 @@ Create a debuginfo package for each subpackage.
#include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */ #include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */
#include "misc/fts.h" #include "misc/fts.h"
#include "lib/rpmfi_internal.h" /* XXX fi->apath */ #include "lib/rpmfi_internal.h" /* XXX fi->apath */
@@ -2031,13 +2035,236 @@ exit: @@ -2031,13 +2035,238 @@ exit:
return rc; return rc;
} }
@ -228,6 +228,8 @@ Create a debuginfo package for each subpackage.
+ headerPutString(dbg->header, RPMTAG_GROUP, "Development/Debug"); + headerPutString(dbg->header, RPMTAG_GROUP, "Development/Debug");
+ /* Inherit other tags from parent. */ + /* Inherit other tags from parent. */
+ headerCopyTags(pkg->header, dbg->header, copyTagsForDebug); + headerCopyTags(pkg->header, dbg->header, copyTagsForDebug);
+
+ /* Add self-provides */
+ dbg->ds = rpmdsThis(dbg->header, RPMTAG_REQUIRENAME, RPMSENSE_EQUAL); + dbg->ds = rpmdsThis(dbg->header, RPMTAG_REQUIRENAME, RPMSENSE_EQUAL);
+ addPackageProvides(dbg); + addPackageProvides(dbg);
+ +
@ -250,7 +252,7 @@ Create a debuginfo package for each subpackage.
genSourceRpmName(spec); genSourceRpmName(spec);
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) { for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
@@ -2055,8 +2282,12 @@ rpmRC processBinaryFiles(rpmSpec spec, r @@ -2055,8 +2284,12 @@ rpmRC processBinaryFiles(rpmSpec spec, r
rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr); rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr);
free(nvr); free(nvr);
@ -265,8 +267,35 @@ Create a debuginfo package for each subpackage.
goto exit; goto exit;
a = headerGetString(pkg->header, RPMTAG_ARCH); a = headerGetString(pkg->header, RPMTAG_ARCH);
--- ./macros.in.orig 2014-09-16 11:44:58.450834101 +0000 --- ./build/parseSpec.c.orig 2014-09-17 11:00:45.295614365 +0000
+++ ./macros.in 2014-09-16 11:45:01.185821119 +0000 +++ ./build/parseSpec.c 2014-09-17 11:01:56.371278963 +0000
@@ -507,7 +507,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 06:59:55.487105642 +0000
+++ ./build/rpmbuild_internal.h 2014-09-17 11:01:45.138331580 +0000
@@ -433,6 +433,13 @@ int addReqProv(Package pkg, rpmTagVal ta
/** \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-09-17 11:00:45.299614345 +0000
+++ ./macros.in 2014-09-17 11:00:50.013592123 +0000
@@ -186,24 +186,10 @@ @@ -186,24 +186,10 @@
# Template for debug information sub-package. # Template for debug information sub-package.
%debug_package \ %debug_package \
@ -292,8 +321,8 @@ Create a debuginfo package for each subpackage.
%description debugsource\ %description debugsource\
This package provides debug sources for package %{name}.\ This package provides debug sources for package %{name}.\
Debug sources are useful when developing applications that use this\ Debug sources are useful when developing applications that use this\
--- ./scripts/find-debuginfo.sh.orig 2014-09-16 11:44:58.444834129 +0000 --- ./scripts/find-debuginfo.sh.orig 2014-09-17 11:00:45.293614374 +0000
+++ ./scripts/find-debuginfo.sh 2014-09-16 11:45:01.186821129 +0000 +++ ./scripts/find-debuginfo.sh 2014-09-17 11:00:50.014592113 +0000
@@ -149,6 +149,11 @@ debug_link() @@ -149,6 +149,11 @@ debug_link()
# Provide .2, .3, ... symlinks to all filename instances of this build-id. # Provide .2, .3, ... symlinks to all filename instances of this build-id.
make_id_dup_link() make_id_dup_link()