On 7/22/15 12:15 AM, Mittal, AnujX wrote: > Hi Darren, > > Thank you for your comments. > >> -----Original Message----- >> From: Darren Hart [mailto:[email protected]] >> Sent: Tuesday, July 21, 2015 12:46 AM >> To: Mittal, AnujX; [email protected] >> Cc: Ong, Boon Leong >> Subject: Re: [meta-intel] [dizzy][PATCH 0/2] zlib-qat fixes for Highland >> Forest >> >> >> >> On 7/15/15 9:54 PM, Anuj Mittal wrote: >>> Dear Maintainer(s), >>> >>> This series introduces two changes for Highland Forest on dizzy: >>> >>> * Make sure that the right compiler is being used to >>> build qat_mem kernel module in zlib-qat. This fixes zlib-qat build errors >>> on dizzy. >>> >>> * Include version info in recipe name >>> >>> Please merge in dizzy if this looks okay. >> >> >> Hi Anuj, >> >> What about this fix is dizzy specific? > > Sorry, I should have put in more details in my cover letter. This fix is > already present in fido & master. Please see 9511d556 on master. > > I had cherry picked 3ee02a36 from dizzy and requested Saul to apply it on top > of master & merge in fido along with other commits. In the process, I had > fixed this particular problem (gcc -> ${CC}) in cherry picked commit on > master to avoid build failures. > > This is not introducing any new change that isn't already present and is > dizzy specific.
OK, so patch 1 of 2 is fine and I've applied. Patch 2 of 2 should still be a cherry-pick, so I've done that manually: $ git cherry-pick -x f4b345a [dizzy-next 1c1caed] meta-crystalforest: rename zlib-qat recipe Author: Anuj Mittal <[email protected]> Date: Fri Jul 10 18:57:42 2015 +0800 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-crystalforest/recipes-extended/zlib-qat/{zlib-qat.bb => zlib-qat_0.4.7-002.bb} (100%) Such that dizzy now looks like this: dvhart@wrath:~/source/yocto/meta-intel [dizzy-next] $ git log -2 commit 1c1caed414264561da2e2f8ca4946a99e7643369 (HEAD, refs/heads/dizzy-next) Author: Anuj Mittal <[email protected]> Date: 2015-07-10 meta-crystalforest: rename zlib-qat recipe Rename recipe to include version info. Signed-off-by: Anuj Mittal <[email protected]> Signed-off-by: Saul Wold <[email protected]> (cherry picked from commit f4b345aaf3a6fc65817bba2fb3eb053b98b4dade) Signed-off-by: Darren Hart <[email protected]> commit 0c2a5e135860356cf51d1477e6dca8a320841e90 Author: Anuj Mittal <[email protected]> Date: 2015-07-16 meta-crystalforest: use correct compiler for zlib Changed the qat_mem makefile to use $(CC) instead of gcc directly. This avoids build errors and makes sure that right options are being passed for cross-compile. Signed-off-by: Anuj Mittal <[email protected]> Signed-off-by: Darren Hart <[email protected]> I compared this with just applying your two patches and they are identical. I'll complete the test builds and push provided they are successful. > > Thanks! > > -Anuj > >> >> Proper software change workflow provides the change against the master >> branch and backports it to previous release branches as needed. New >> changes are not applied directly to stable release branches without >> first updating master. Otherwise you will have to reapply this change >> for each new release going forward. >> >> -- >> Darren Hart >> Intel Open Source Technology Center -- Darren Hart Intel Open Source Technology Center -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
