sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop deprecated RPMTAG_RHNPLATFORM support

Browse Source
This commit is contained in:
Дмитрий Левин 2009-04-12 22:39:36 +00:00
parent 9d17c0b879
commit 26545f3846
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/parsePreamble.c
View File

@ -30,7 +30,6 @@ static rpmTag copyTagsDuringParse[] = {
RPMTAG_CHANGELOGTEXT, RPMTAG_CHANGELOGTEXT,
RPMTAG_PREFIXES, RPMTAG_PREFIXES,
RPMTAG_BUILDHOST, RPMTAG_BUILDHOST,
RPMTAG_RHNPLATFORM,
0 0
}; };
@ -506,7 +505,6 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, const char *macro,
case RPMTAG_VERSION: case RPMTAG_VERSION:
case RPMTAG_RELEASE: case RPMTAG_RELEASE:
case RPMTAG_URL: case RPMTAG_URL:
case RPMTAG_RHNPLATFORM:
SINGLE_TOKEN_ONLY; SINGLE_TOKEN_ONLY;
/* These macros are for backward compatibility */ /* These macros are for backward compatibility */
if (tag == RPMTAG_VERSION) { if (tag == RPMTAG_VERSION) {
@ -749,7 +747,6 @@ static struct PreambleRec_s preambleList[] = {
{RPMTAG_AUTOREQ, 0, 0, "autoreq"}, {RPMTAG_AUTOREQ, 0, 0, "autoreq"},
{RPMTAG_AUTOPROV, 0, 0, "autoprov"}, {RPMTAG_AUTOPROV, 0, 0, "autoprov"},
{RPMTAG_DOCDIR, 0, 0, "docdir"}, {RPMTAG_DOCDIR, 0, 0, "docdir"},
{RPMTAG_RHNPLATFORM, 0, 0, "rhnplatform"},
/*@-nullassign@*/ /* LCL: can't add null annotation */ /*@-nullassign@*/ /* LCL: can't add null annotation */
{0, 0, 0, 0} {0, 0, 0, 0}
/*@=nullassign@*/ /*@=nullassign@*/

3
build/parseSpec.c
View File

@ -870,9 +870,6 @@ fprintf(stderr, "*** PS buildRootURL(%s) %p macro set to %s\n", spec->buildRootU
headerAddEntry(pkg->header, RPMTAG_ARCH, RPM_STRING_TYPE, arch, 1); headerAddEntry(pkg->header, RPMTAG_ARCH, RPM_STRING_TYPE, arch, 1);
else else
assert(pkg != spec->packages); /* noarch subpackage */ assert(pkg != spec->packages); /* noarch subpackage */
if (!headerIsEntry(pkg->header, RPMTAG_RHNPLATFORM))
(void) headerAddEntry(pkg->header, RPMTAG_RHNPLATFORM,
RPM_STRING_TYPE, arch, 1);
(void) headerAddEntry(pkg->header, RPMTAG_PLATFORM, (void) headerAddEntry(pkg->header, RPMTAG_PLATFORM,
RPM_STRING_TYPE, platform, 1); RPM_STRING_TYPE, platform, 1);
} }

16
python/header-py.c
View File

@ -362,14 +362,6 @@ static PyObject * rhnUnload(hdrObject * s, PyObject * args) {
h = headerLink(s->h); h = headerLink(s->h);
/* Retrofit a RHNPlatform: tag. */
if (!headerIsEntry(h, RPMTAG_RHNPLATFORM)) {
const char * arch;
int_32 at;
if (headerGetEntry(h, RPMTAG_ARCH, &at, (void **)&arch, NULL))
headerAddEntry(h, RPMTAG_RHNPLATFORM, at, arch, 1);
}
/* Legacy headers are forced into immutable region. */ /* Legacy headers are forced into immutable region. */
if (!headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) { if (!headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
Header nh = headerReload(h, RPMTAG_HEADERIMMUTABLE); Header nh = headerReload(h, RPMTAG_HEADERIMMUTABLE);
@ -823,14 +815,6 @@ PyObject * rhnLoad(PyObject * self, PyObject * args) {
return NULL; return NULL;
} }
/* Retrofit a RHNPlatform: tag. */
if (!headerIsEntry(hdr, RPMTAG_RHNPLATFORM)) {
const char * arch;
int_32 at;
if (headerGetEntry(hdr, RPMTAG_ARCH, &at, (void **)&arch, NULL))
headerAddEntry(hdr, RPMTAG_RHNPLATFORM, at, arch, 1);
}
h = createHeaderObject(hdr); h = createHeaderObject(hdr);
return (PyObject *) h; return (PyObject *) h;