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

Ignore RPMTAG_BUILDROOT completely.

Browse Source
This commit is contained in:
Дмитрий Левин 2006-01-11 13:53:32 +00:00
parent aa495191e6
commit b397ca0085
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
build/parsePreamble.c
View File

@ -542,37 +542,8 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, const char *macro,
break;
case RPMTAG_BUILDROOT:
SINGLE_TOKEN_ONLY;
{ const char * buildRoot = NULL;
const char * buildRootURL = spec->buildRootURL;
/*
* Note: rpmGenPath should guarantee a "canonical" path. That means
* that the following pathologies should be weeded out:
* //bin//sh
* //usr//bin/
* /.././../usr/../bin//./sh
*/
if (buildRootURL == NULL) {
buildRootURL = rpmGenPath(NULL, "%{?buildroot:%{buildroot}}", NULL);
if (strcmp(buildRootURL, "/")) {
spec->buildRootURL = buildRootURL;
spec->gotBuildRootURL = 1;
}
}
macro = NULL;
buildRootURL = rpmGenPath(NULL, spec->buildRootURL, NULL);
(void) urlPath(buildRootURL, &buildRoot);
/*@-branchstate@*/
if (*buildRoot == '\0') buildRoot = "/";
/*@=branchstate@*/
if (!strcmp(buildRoot, "/")) {
rpmError(RPMERR_BADSPEC,
_("BuildRoot can not be \"/\": %s\n"), spec->buildRootURL);
buildRootURL = _free(buildRootURL);
return RPMERR_BADSPEC;
}
buildRootURL = _free(buildRootURL);
} break;
/* Just ignore legacy tag. */
break;
case RPMTAG_PREFIXES:
addOrAppendListEntry(pkg->header, tag, field);
xx = hge(pkg->header, tag, &type, (void **)&array, &num);