Commit Graph

6 Commits

Author SHA1 Message Date
Scott Little
cbc9c29c5c Incremental parallel build failure on drbd and drbd-kernel.
Background:
drbd-kernel compiles from source directory drbd.
drbd compiles from source directory drbd-tools.

In one cleanup path the build tools incorrectly assume
package name = source directory name.

As a result "build-pkgs --clean drbd" was incorrectly deleting
a temporary directory named 'drbd' that was in fact the temporary
directory for package drbd-kernel.

For incremental parallel builds this can lead to build failures
if drbd is cleaned in paraller with drbd-kernel being built.

Change-Id: Ia0f5e9e226ce3ea0f771c2a4dc899a2b606f561f
Story: 2002835
Task: 24519
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-21 14:57:23 -04:00
Scott Little
8744c5f598 Build hangs on macro resolution in spec file
Problem:
Hung on a spec file that contains a seemingly self referential macro ...
   Version: %{_version}

Normally 'Version: x.y.z' has the effect of setting macro %{_version}.
In effect we have 'x=x'.  Not sure how rpm handles this, but we need to
prevent a recursion in our evaluation scripts.

Solution:
1) Test for recursion in spec_evaluate() and fail rather than
entering into a recursion.

2) Record the version from the srpm file name into an environment variable.
If we fail to read the version from the spec file directly, substitute
the one from the environment variable, if defined.

Note: Tripped up on mismatched '`' during testing, so substituted
all occurances with $().  Now a good browser should be able to
highlight an future mismatches.

Story: 2002839
Task: 22778
Change-Id: Ib69f879e531d842ff007d473bd3ad34db46cabf1
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-13 13:52:35 -04:00
Scott Little
a39749ff68 Move content from stx-utils into stx-integ or stx-update
Package build-info is referenced in man build scripts.
It's relocation requires that the build scripts be modified
to reflect the new location.

from: stx/middleware/recipes-common/build-info/release-info.inc
to:   stx/stx-integ/utilities/build-info/release-info.inc

Change-Id: I82a9c12cd1e5607c1c903fc942a3c2007aca4920
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 16:12:17 -04:00
Scott Little
d2d96619a2 Shorten "addons/wr-cgcs/layers/cgcs" to just "stx"
Part of the project to remove cgcs references.
Replace and shorten the path the needlessly long and
complex "addons/wr-cgcs/layers/cgcs" path with just "stx".

This update just fixes up paths found in scripts, comments
and config files.

Depends-On: https://review.openstack.org/579954
Depends-On: https://review.openstack.org/579957
Depends-On: https://review.openstack.org/580170
Depends-On: https://review.openstack.org/579984
Change-Id: I04d653f740f17d8a9b2732f26d36907f635d8950
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-07-04 15:12:58 -04:00
Scott Little
de12eed9d1 Support PATCHES_BASE, GIT_BASE, STX_BASE in build_srpm.data
Define PATCHES_BASE, GIT_BASE and STX_BASE within the build tools,
so that the can be refereced within build_srpm.data files.

STX_BASE: Synonym for i$CGCS_BASE.
          CGCS_BASE will be obsoleted in a future update.
GIT_BASE: New, points to the root of the git that contains the package.
          This will facilitate inter-package references that are
          co-located in the same git.
PATCHES_BASE: New, same as $PKG_BASE/$DISTRO/patches

Change-Id: I0636bb38b347374fa5ffe03ea67fd9d3422e2eea
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-07-03 15:15:22 -04:00
Dean Troyer
cfe45dadae StarlingX open source release updates
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
2018-06-01 07:45:23 -07:00