From: David F. <df...@gm...> - 2014-10-29 03:41:42
|
Yes, that seemed to fix it .. updating via c:\edk2 worked (no issue reported). On Tue, Oct 28, 2014 at 7:49 PM, David F. <df...@gm...> wrote: > Well, I may have gotten around it for now. First I tried just > changing the path in wc.db - but it wouldn't update (previous > operation has not finished) - cleanup did no good, had to do the > "delete from work_queue" (using sqllite3 - against wc.db in > c:\edk2\basetools\bin\win32\.svn. Then right click on > c:\edk2\basetools\bin\win32 and choose clean up. Now right click > that same directory and choose svn update - finished. Now I'm off to > fix the items that need merging. I'll try svn update off of c:\edk2 > to see if it still does it? > > On Tue, Oct 28, 2014 at 7:09 PM, David F. <df...@gm...> wrote: >> More details - this is what it has for the subversion properties of >> c:\edk2\basetools\bin\win32 folder (right click, properties, >> subversion tab) >> >> URL: http://svn.code.sf.net/p/edk2/code/trunk/edk2/BaseTools/Bin/Win32 >> >> Last Changed Revision: 15189 9:36:53 PM, Sunday, January 26, 2014 >> >> >> On Tue, Oct 28, 2014 at 6:53 PM, David F. <df...@gm...> wrote: >>> It was doing it with an older version so I upgraded but it was still >>> doing it. This is the version I use now: >>> >>> TortoiseSVN 1.8.8, Build 25755 - 64 Bit , 2014/08/10 14:44:06 >>> Subversion 1.8.10, -release >>> apr 1.5.1 >>> apr-util 1.5.3 >>> serf 1.3.7 >>> OpenSSL 1.0.1i 6 Aug 2014 >>> zlib 1.2.8 >>> >>> I started with the original EDK2 release zip, then started doing svn >>> updates. Updating was working fine up to the prior update (Feb >>> 2014). Then this latest update has the EDK2 main items (source) >>> updating with no problem. It's when it went to deal with the >>> externals, stuff in BaseTools, when the problem showed up. Dumping >>> the data base shows why - the name it has for those two libraries are >>> relative to c:\edk2 instead of the c:\edk2\basetools\bin\win32 folder >>> (like all those other files are). So it builds the path relative to >>> that you end up with >>> c:\edk2\basetools\bin\win32\BASETOOLS\BIN\WIN32\ARM\... (I don't >>> even need the ARM stuff). I have source that needs to be merged due >>> to changes so not sure how to start clean? It's only those two >>> libraries as you can see by the dump of the SVN database that is >>> causing the problem. Can they be taken out and reapplied ? They >>> should be in there with the relative path being >>> "Arm/RELEASE_RVCT31/CompilerIntrinsicsLib.lib" and >>> "Arm/DEBUG_RVCT31/CompilerIntrinsicsLib.lib" >>> >>> >>> >>> On Tue, Oct 28, 2014 at 6:10 PM, Liu, Yingke D <yin...@in...> wrote: >>>> David, >>>> >>>> We didn't see the same problem when updating, the path must be incorrect: 'C:\edk2\BaseTools\Bin\Win32\BaseTools\Bin\Win32\Arm\RELEASE_RVCT31\CompilerIntrinsicsLib.lib'. >>>> Please try a clean check out, and the version of my local TortoiseSVN is 1.8.4. >>>> >>>> >>>> Dennis >>>> >>>> -----Original Message----- >>>> From: David F. [mailto:df...@gm...] >>>> Sent: Tuesday, October 28, 2014 8:04 AM >>>> To: edk...@li... >>>> Subject: [edk2-buildtools] SVN Update Fails >>>> >>>> Hi, >>>> >>>> Last updated c:\edk2 in Feb 2014 - try to update now and fails - caused by the update in external reference to the BaseTool ARM library (which I actually don't even need). It's a path problem. How can I fix? Using TortoiseSVN on Win7 Pro x64. >>>> >>>>> Update >>>>> C:\edk2 >>>> <snip> >>>>> C:\edk2\BaseTools\Bin\Win32\TianoCompress.exe >>>>> C:\edk2\BaseTools\Bin\Win32\GenPatchPcdTable.exe >>>>> C:\edk2\BaseTools\Bin\Win32\_sqlite3.pyd >>>>> C:\edk2\BaseTools\Bin\Win32 >>>>> Failed to run the WC DB work queue associated with >>>>> 'C:\edk2\BaseTools\Bin\Win32', work item 26 (file-install >>>>> BaseTools/Bin/Win32/Arm/RELEASE_RVCT31/CompilerIntrinsicsLib.lib 1 0 1 >>>>> 1) The node >>>>> 'C:\edk2\BaseTools\Bin\Win32\BaseTools\Bin\Win32\Arm\RELEASE_RVCT31\CompilerIntrinsicsLib.lib' >>>>> is not installable >>>> >>>> >>>> Note that there is a difference in what svn thinks the path is - used the sqlite command line tool to dump the database shows below. Note how all the other items are relatlive and the win32 folder and then the first two are relative but off the root of c:\edk2 - so something is weird about those??: >>>> >>>> C:\Users\david\Desktop\sqlite- >>>> shell-win32-x86-3080600>sqlite3.exe c:\edk2 >>>> \basetools\bin\win32\.svn\wc.db "select * from work_queue" >>>> 26|(file-install >>>> 26|BaseTools/Bin/Win32/Arm/RELEASE_RVCT31/CompilerIntrinsicsLib.li >>>> b 1 0 1 1) >>>> 27|(file-install >>>> 27|BaseTools/Bin/Win32/Arm/DEBUG_RVCT31/CompilerIntrinsicsLib.lib >>>> 1 0 1 1) >>>> 28|(file-install 11 _socket.pyd 1 0 1 1) >>>> 29|(file-install GenSec.exe 1 0 1 1) >>>> 30|(file-install pyexpat.pyd 1 0 1 1) >>>> 31|(file-install GenFv.exe 1 0 1 1) >>>> 32|(file-install GenFw.exe 1 0 1 1) >>>> 33|(file-install UPT.exe 1 0 1 1) >>>> 34|(file-install Trim.exe 1 0 1 1) >>>> 35|(file-install VolInfo.exe 1 0 1 1) >>>> 36|(file-install Rsa2048Sha256Sign.exe 1 0 1 1) >>>> 37|(file-install GenBootSector.exe 1 0 1 1) >>>> 38|(file-install Common.PyUtility.pyd 1 0 1 1) >>>> 39|(file-install Eot.LzmaCompressor.pyd 1 0 1 1) >>>> 40|(file-install 11 _ctypes.pyd 1 0 1 1) >>>> 41|(file-install PatchPcdValue.exe 1 0 1 1) >>>> 42|(file-install TargetTool.exe 1 0 1 1) >>>> 43|(file-install 12 _hashlib.pyd 1 0 1 1) >>>> 44|(file-install BootSectImage.exe 1 0 1 1) >>>> 45|(file-install TianoCompress.exe 1 0 1 1) >>>> 46|(file-install GenPatchPcdTable.exe 1 0 1 1) >>>> 47|(file-install 12 _sqlite3.pyd 1 0 1 1) >>>> >>>> ------------------------------------------------------------------------------ >>>> _______________________________________________ >>>> edk2-buildtools-devel mailing list >>>> edk...@li... >>>> https://lists.sourceforge.net/lists/listinfo/edk2-buildtools-devel |