[Starlingx-discuss] Build Broken
Don.Penney at windriver.com
Tue Nov 27 19:50:13 UTC 2018
It looks like maybe the patch was manually modified to try to add a blank line, without rebuilding, which causes line counts and numbers to be incorrect. The following change fixes the malformation:
$ git diff
diff --git a/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch b/base/cluster-resource-agents/centos/meta_pat
index 19877b1..566c23c 100644
@@ -61,7 +61,6 @@ index a16660a..ec85fc2 100644
if [ ! -f configure ]; then
Is there a bug raised for it? I can just push this change to resolve the issue, rather than reverting
From: Rowsell, Brent
Sent: Tuesday, November 27, 2018 2:23 PM
To: Penney, Don; Mihai, Irina; starlingx-discuss at lists.starlingx.io
Subject: RE: Build Broken
Suggest we revert
From: Penney, Don
Sent: Tuesday, November 27, 2018 2:22 PM
To: Rowsell, Brent <Brent.Rowsell at windriver.com>; Mihai, Irina <Irina.Mihai at windriver.com>; starlingx-discuss at lists.starlingx.io
Subject: RE: Build Broken
I did a repo sync and built just that package:
$ build-pkgs --serial --no-descendants --no-required --no-build-info resource-agents
And the build failed with the same error. Reverting the commit Brent indicated resolves the build issue.
I don't know why the patch would be "malformed". Nothing jumps out at me. Should we just revert it via gerrit and let Zhipeng revisit it when he's online?
From: Rowsell, Brent [mailto:Brent.Rowsell at windriver.com]
Sent: Tuesday, November 27, 2018 1:08 PM
To: Mihai, Irina; starlingx-discuss at lists.starlingx.io<mailto:starlingx-discuss at lists.starlingx.io>
Subject: Re: [Starlingx-discuss] Build Broken
Not sure if this is the cause, but this was pushed this morning https://review.openstack.org/#/c/619398/
From: Mihai, Irina [mailto:Irina.Mihai at windriver.com]
Sent: Tuesday, November 27, 2018 1:02 PM
To: starlingx-discuss at lists.starlingx.io<mailto:starlingx-discuss at lists.starlingx.io>
Subject: [Starlingx-discuss] Build Broken
I've just pulled the latest code from master and see the error below in stx-integ.
It gets passed that if you checkout HEAD~
17:41:54 ============ Build failed =============
17:41:54 b2: ===== Build SRPM for 'resource-agents' =====
17:41:54 b2: PKG_BASE=/localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/stx/stx-integ/base/cluster-resource-agents
17:41:54 b2: BUILD_DIR=resource-agents/rpmbuild
17:41:54 b2: SRPM_DIR=/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild/SRPMS
17:41:54 b2: Wrote: /localdisk/loadbuild/wrsroot/starlingx-0-clean/std/rpmbuild/SOURCES/resource-agents/srpm_input.md5
17:41:54 b2: Rebuild required due to new or changed file: stx/stx-integ/base/cluster-resource-agents/centos/meta_patches/PATCH_ORDER
17:41:54 b2: Rebuild required due to missing directory: '/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild/SRPMS'
17:41:54 b2: clean_srpm_dir build_idx=2 DIR=/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild/SRPMS
17:41:54 b2: find: '/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild/SRPMS': No such file or directory
17:41:54 b2: resource-agents.spec
17:41:54 b2: resource-agents-3.9.5
17:41:54 b2: srpm_apply_meta_patches '/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild' '/localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/stx/stx-integ/base/cluster-resource-agents' 0 'centos' 'resource-agents-3.9.5-124.el7'
17:41:54 b2: Applying metadata patches
17:41:54 b2: srpm_apply_patch '/localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/stx/stx-integ/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch' '-p1' '/localdisk/loadbuild/wrsroot/starlingx-0-clean/std/srpm_assemble/resource-agents/rpmbuild' 0 'WRS: ' '0' '' '' '' '' 0 'resource-agents-3.9.5-124.el7' ''
17:41:54 b2: patch -p1 < /localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/stx/stx-integ/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch
17:41:54 b2: patching file SPECS/resource-agents.spec
17:41:54 b2: patch: **** malformed patch at line 67: ./autogen.sh
17:41:54 b2: failed to apply patch '/localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/stx/stx-integ/base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch'
17:41:54 b2: ERROR: srpm_apply_meta_patches (1420): failed to apply patch 'spec-include-TiS-patches.patch'
17:41:54 b2: ERROR: build_dir_srpm (785): failed to extract srpm '/localdisk/designer/wrsroot/starlingx-0-clean/cgcs-root/cgcs-centos-repo/Source/resource-agents-3.9.5-124.el7.src.rpm'
17:41:54 ERROR: reaper (1303): Failed to build src.rpm from source at 'b2'
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Starlingx-discuss