Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure binary and source headers are identified as such after parse #3012

Merged
merged 2 commits into from
Apr 3, 2024
Merged

Ensure binary and source headers are identified as such after parse #3012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2831368
Ensure source headers are identified as such after a spec parse
pmatilai Apr 2, 2024
f824484
Ensure binary pkg headers are identified as such after a spec parse
pmatilai Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions build/build.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,7 @@ static int buildSpec(rpmts ts, BTA_t buildArgs, rpmSpec spec, int what)
!(spec->flags & RPMSPEC_FORCE)) {
/* Create buildreqs package */
char *nvr = headerGetAsString(spec->packages->header, RPMTAG_NVR);
free(spec->sourceRpmName);
rasprintf(&spec->sourceRpmName, "%s.buildreqs.nosrc.rpm", nvr);
free(nvr);
/* free sources to not include them in the buildreqs package */
Expand Down
14 changes: 0 additions & 14 deletions build/files.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2661,16 +2661,6 @@ static rpmRC processPackageFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags,
return fl.processingFailed ? RPMRC_FAIL : RPMRC_OK;
}

static void genSourceRpmName(rpmSpec spec)
{
if (spec->sourceRpmName == NULL) {
char *nvr = headerGetAsString(spec->packages->header, RPMTAG_NVR);
rasprintf(&spec->sourceRpmName, "%s.%ssrc.rpm", nvr,
spec->noSource ? "no" : "");
free(nvr);
}
}

rpmRC processSourceFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags)
{
struct Source *srcPtr;
Expand All @@ -2688,7 +2678,6 @@ rpmRC processSourceFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags)
oneshot = 1;
}

genSourceRpmName(spec);
/* Construct the file list and source entries */
argvAdd(&files, spec->specFile);
for (srcPtr = spec->sources; srcPtr != NULL; srcPtr = srcPtr->next) {
Expand Down Expand Up @@ -3130,7 +3119,6 @@ rpmRC processBinaryFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags,
elf_version (EV_CURRENT);
#endif
check_fileList = newStringBuf();
genSourceRpmName(spec);
buildroot = rpmGenPath(spec->rootDir, spec->buildRoot, NULL);

if (rpmExpandNumeric("%{?_debuginfo_subpackages}")) {
Expand Down Expand Up @@ -3186,8 +3174,6 @@ rpmRC processBinaryFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags,
if (pkg->fileList == NULL)
continue;

headerPutString(pkg->header, RPMTAG_SOURCERPM, spec->sourceRpmName);

nvr = headerGetAsString(pkg->header, RPMTAG_NVRA);
rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr);
free(nvr);
Expand Down
2 changes: 0 additions & 2 deletions build/pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,13 +796,11 @@ rpmRC packageSources(rpmSpec spec, char **cookie)
{
Package sourcePkg = spec->sourcePackage;
rpmRC rc;
uint32_t one = 1;

/* Add some cruft */
headerPutString(sourcePkg->header, RPMTAG_RPMVERSION, VERSION);
headerPutString(sourcePkg->header, RPMTAG_BUILDHOST, spec->buildHost);
headerPutUint32(sourcePkg->header, RPMTAG_BUILDTIME, &(spec->buildTime), 1);
headerPutUint32(sourcePkg->header, RPMTAG_SOURCEPACKAGE, &one, 1);

/* Include spec in parsed and expanded form */
headerPutString(sourcePkg->header, RPMTAG_SPEC,
Expand Down
11 changes: 11 additions & 0 deletions build/parseSpec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,11 +731,20 @@ static void initSourceHeader(rpmSpec spec)
}
}
}
if (spec->sourceRpmName == NULL) {
char *nvr = headerGetAsString(spec->packages->header, RPMTAG_NVR);
rasprintf(&spec->sourceRpmName, "%s.%ssrc.rpm", nvr,
spec->noSource ? "no" : "");
free(nvr);
}
}

static void finalizeSourceHeader(rpmSpec spec)
{
uint32_t one = 1;

/* Only specific tags are added to the source package header */
headerPutUint32(spec->sourcePackage->header, RPMTAG_SOURCEPACKAGE, &one, 1);
headerCopyTags(spec->packages->header, spec->sourcePackage->header, sourceTags);

/* Provide all package NEVRs that would be built */
Expand Down Expand Up @@ -1306,6 +1315,8 @@ static rpmRC finalizeSpec(rpmSpec spec)
headerPutString(pkg->header, RPMTAG_OS, os);
headerPutString(pkg->header, RPMTAG_PLATFORM, platform);
headerPutString(pkg->header, RPMTAG_OPTFLAGS, optflags);
headerPutString(pkg->header, RPMTAG_SOURCERPM, spec->sourceRpmName);


if (pkg != spec->packages) {
copyInheritedTags(pkg->header, spec->packages->header);
Expand Down
9 changes: 8 additions & 1 deletion lib/headerutil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@

int headerIsSource(Header h)
{
return (!headerIsEntry(h, RPMTAG_SOURCERPM));
/* Positive identification of a source package */
if (headerIsEntry(h, RPMTAG_SOURCEPACKAGE))
return 1;
/* Positive identification of a binary package */
if (headerIsEntry(h, RPMTAG_SOURCERPM))
return 0;
/* Dunno, guess so (as per traditional behavior) */
return 1;
}

Header headerCopy(Header h)
Expand Down
2 changes: 2 additions & 0 deletions tests/rpmquery.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,6 +1317,7 @@ runroot rpmspec -q --qf "[[%{*:tagnum}\n]]" --srpm /data/SPECS/mini.spec
1016
1021
1022
1106
],
[])

Expand All @@ -1334,6 +1335,7 @@ License
Group
Os
Arch
Sourcepackage
],
[])
RPMTEST_CLEANUP
21 changes: 21 additions & 0 deletions tests/rpmspec.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,3 +361,24 @@ make DESTDIR=$RPM_BUILD_ROOT install
]],
[])
RPMTEST_CLEANUP

AT_SETUP([rpmspec -q --rpms and --srpm])
AT_KEYWORDS([rpmspec query])
RPMTEST_CHECK([
runroot rpmspec -q --rpms --target s390x \
/data/SPECS/hello.spec
],
[0],
[hello-1.0-1.s390x
],
[])

RPMTEST_CHECK([
runroot rpmspec -q --srpm \
/data/SPECS/hello.spec
],
[0],
[hello-1.0-1.src
],
[])
RPMTEST_CLEANUP