-----Original Message----- From: Dean Troyer <dtroyer@gmail.com> Sent: September 11, 2018 2:07 PM To: McKenna, Jason <Jason.McKenna@windriver.com> Cc: Cordoba Malibran, Erich <erich.cordoba.malibran@intel.com>; Waheed, Numan <Numan.Waheed@windriver.com>; Rasa, Nimalini <Nimalini.Rasa@windriver.com>; starlingx-discuss@lists.starlingx.io; Liu, ZhipengS <zhipengs.liu@intel.com>; Khalil, Ghada <Ghada.Khalil@windriver.com>; Lin, Shuicheng <shuicheng.lin@intel.com>; Xie, Cindy <cindy.xie@intel.com> Subject: Re: [Starlingx-discuss] CentOS 7.5 upgrade status update
On Tue, Sep 11, 2018 at 12:24 PM, Dean Troyer <dtroyer@gmail.com> wrote:
The f/centos75 branch is only periodically rebased on master, it sounds like this is what you need. I will do a test run to see if it is clean soon... (at PTG)
The only conflict is in stx-integ in .zuul.yaml, which I can clean up easily enough.
We need to do this before merging back in to master anyway...shall I go ahead with the rebase?
Hi Dean, It doesn't seem like the issue is a rebase. It's that code in some repos (stx-integ, for example) was updated to build against new versions of source rpms, but the .lst files currently (or at least as of when I sync'd) checked in in stx-tools call out old or different versions to be downloaded and put into the build environment. Most of the out-of-sync files can be downloaded manually, but some of them aren't accepting the checked in patches.
dt
--
Dean Troyer dtroyer@gmail.com