On 11/12/2014 08:26 AM, Pat Riehecky wrote: > On 11/12/2014 02:42 AM, Johnny Hughes wrote: >> On 11/11/2014 04:42 PM, Pat Riehecky wrote: >>> From: Pat Riehecky <riehecky at fnal.gov> >>> >>> helps when I build the correct patch set.... >>> >>> This implements the second half of the fix, knew that patch seemed >>> incomplete..... >>> >>> Pat Riehecky (1): >>> updated into_srpm.sh with cleaner logic >>> >>> into_srpm.sh | 33 ++++++++++++++++++++++----------- >>> 1 files changed, 22 insertions(+), 11 deletions(-) >>> >> >> Pat, >> >> With both patches applied for testing, this is what I get with an SCL >> using into_srpm.sh: >> >> [jhughes at T520 php55-php]$ into_srpm.sh >> SOURCES/php-5.5.6-strip.tar.xz exists. skipping >> Warning: php55-php-5.5.6-13.el7 != php-5.5.6-13XXXjsdf9ur7qlkasdh4gygXXX >> Warning: Trying as a Software Collection >> Wrote: >> /home/jhughes/centos7-rpms/php55-php/SRPMS/php-5.5.6-13.el7.src.rpm >> >> ====== >> To me, it looks like it did not recognize it as an SCL .. the SRPM >> should have been: >> >> php55-php-5.5.6-13.el7.src.rpm >> >> Right? What am I missing. This is on an up2date c7 machine. >> > You'll have to pass into_srpm.sh a '-s' > > [riehecky at testify php55-php]# into_srpm.sh > SOURCES/php-5.5.6-strip.tar.xz exists. skipping > Warning: php55-php-5.5.6-13.el7 != php-5.5.6-13XXXjsdf9ur7qlkasdh4gygXXX > Warning: Trying as a Software Collection > Wrote: /tmp/php55-php/SRPMS/php-5.5.6-13.el7.src.rpm > > [riehecky at testify php55-php]# into_srpm.sh -s > SOURCES/php-5.5.6-strip.tar.xz exists. skipping > Warning: php55-php-5.5.6-13.el7 != php-5.5.6-13XXXjsdf9ur7qlkasdh4gygXXX > Warning: Trying as a Software Collection > Wrote: /tmp/php55-php/SRPMS/php55-php-5.5.6-13.el7.src.rpm > > The SCL logic is off by default, I've no objection to enabling it by > default, but when I put it in I was aiming to not disrupt anyone's > workflows with behavior changes. I'm not sure what the larger > community's expectation is of this script, particularly given the > optional parameters of SCL as a whole. > > Pat > that is perfect .. just wanted to make sure it was doing what we want. I'll commit it now -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.centos.org/pipermail/centos-devel/attachments/20141112/821fbdb2/attachment-0008.sig>