folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rpmbuild: Do not create a %_sourcedir / %_specdir 

Those should be created by user, no RPM.

Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
This commit is contained in:
Igor Raits 2020-06-01 10:59:05 +02:00 committed by Panu Matilainen
parent af746846c0
commit acf5e00281
1 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
rpmbuild.c
View File

@ -337,18 +337,14 @@ static int isSpecFile(const char * specfile)
static char * getTarSpec(const char *arg)
{
char *specFile = NULL;
char *specDir;
char *specBase;
char *tmpSpecFile;
const char **spec;
char tarbuf[BUFSIZ];
int gotspec = 0, res;
int gotspec = 0;
FD_t fd = NULL;
static const char *tryspec[] = { "Specfile", "\\*.spec", NULL };
specDir = rpmGetPath("%{_specdir}", NULL);
tmpSpecFile = rpmGetPath("%{_specdir}/", "rpm-spec.XXXXXX", NULL);
(void) close(mkstemp(tmpSpecFile));
if (!(fd = rpmMkTempFile(NULL, &specFile)))
goto exit;
for (spec = tryspec; *spec != NULL; spec++) {
FILE *fp;
@ -357,7 +353,7 @@ static char * getTarSpec(const char *arg)
cmd = rpmExpand("%{uncompress: ", arg, "} | ",
"%{__tar} xOvof - --wildcards ", *spec,
" 2>&1 > ", tmpSpecFile, NULL);
" 2>&1 > ", specFile, NULL);
if (!(fp = popen(cmd, "r"))) {
rpmlog(RPMLOG_ERR, _("Failed to open tar pipe: %m\n"));
@ -373,46 +369,25 @@ static char * getTarSpec(const char *arg)
specfiles++;
}
pclose(fp);
gotspec = (specfiles == 1) && isSpecFile(tmpSpecFile);
gotspec = (specfiles == 1) && isSpecFile(specFile);
if (specfiles > 1) {
rpmlog(RPMLOG_ERR, _("Found more than one spec file in %s\n"), arg);
goto exit;
}
}
if (!gotspec)
unlink(tmpSpecFile);
if (!gotspec)
unlink(specFile);
free(cmd);
}
if (!gotspec) {
rpmlog(RPMLOG_ERR, _("Failed to read spec file from %s\n"), arg);
goto exit;
}
specBase = basename(tarbuf);
/* remove trailing \n */
specBase[strlen(specBase)-1] = '\0';
rasprintf(&specFile, "%s/%s", specDir, specBase);
res = rename(tmpSpecFile, specFile);
if (res) {
rpmlog(RPMLOG_ERR, _("Failed to rename %s to %s: %m\n"),
tmpSpecFile, specFile);
free(specFile);
specFile = NULL;
} else {
/* mkstemp() can give unnecessarily strict permissions, fixup */
mode_t mask;
umask(mask = umask(0));
(void) chmod(specFile, 0666 & ~mask);
}
exit:
(void) unlink(tmpSpecFile);
free(tmpSpecFile);
free(specDir);
Fclose(fd);
return specFile;
}
@ -437,9 +412,6 @@ static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
const char *rootdir = rpmtsRootDir(ts);
const char *root = !rstreq(rootdir, "/") ? rootdir : NULL;
/* Create minimal build tree if necessary */
if (rpmMkdirs(root, "%{_topdir}:%{_specdir}"))
goto exit;
if (buildMode == 't') {
char *srcdir = NULL, *dir;
@ -508,7 +480,7 @@ static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
}
/* Create build tree if necessary */
if (rpmMkdirs(root, "%{_sourcedir}:%{_builddir}:%{_rpmdir}:%{_srcrpmdir}:%{_buildrootdir}"))
if (rpmMkdirs(root, "%{_topdir}:%{_builddir}:%{_rpmdir}:%{_srcrpmdir}:%{_buildrootdir}"))
goto exit;
if ((rc = rpmSpecBuild(ts, spec, ba))) {