On Wed, Oct 28, 2009 at 08:00:59AM +0100, Raffaele Recalcati wrote: > I'm starting the work with dm365. > First of all some tests on evm and, in a couple of months, with my > customized board. > I've found a little error in instructions. > > recalc...@recalcati-laptop:/app/opt/sources/DM365_TI_PSP/OE$ git clone > -n git://arago-project.org/git/arago.git > Initialized empty Git repository in > /app/opt/sources/DM365_TI_PSP/OE/arago/.git/ > remote: Counting objects: 5240, done. > remote: Compressing objects: 100% (3620/3620), done. > remote: Total 5240 (delta 3406), reused 2431 (delta 1474) > Receiving objects: 100% (5240/5240), 3.22 MiB | 72 KiB/s, done. > Resolving deltas: 100% (3406/3406), done. > recalc...@recalcati-laptop:/app/opt/sources/DM365_TI_PSP/OE$ cd arago/ > recalc...@recalcati-laptop:/app/opt/sources/DM365_TI_PSP/OE/arago$ git > checkout DEV.DaVinciPSP.03.01.00.26 > error: Entry 'recipes/arago/arago-feed-configs.bb' would be > overwritten by merge. Cannot merge.
Works here with latest PSP 03.01 tags and git 1.6.3.3 If git does not allow you to checkout a specific tag, you may want to reset your local tree first with "git reset --hard HEAD" and then checkout... > recalc...@recalcati-laptop:/app/opt/sources/DM365_TI_PSP/OE/arago$ git pull > Already up-to-date. > > So: > git checkout HEAD > > Than: > git log --follow recipes/arago/arago-feed-configs.bb > commit 9237bed772b1f43296a3512353817791ac170fd4 > Author: Denys Dmytriyenko <[email protected]> > Date: Tue Oct 20 21:26:04 2009 -0400 > > arago-feed-configs: fix generation of feeds for da850 > > commit ccc45369ac24677579cd7db7350375bac924d20c > Author: Denys Dmytriyenko <[email protected]> > Date: Sun Sep 20 00:46:26 2009 -0400 > > And: > git show DEV.DaVinciPSP.03.01.00.26:recipes/arago/arago-feed-configs.bb > .. > --> seems ok. > > > recalc...@recalcati-laptop:/app/opt/sources/DM365_TI_PSP/OE/arago$ git > checkout DEV.DaVinciPSP.03.01.00.26 > Note: moving to "DEV.DaVinciPSP.03.01.00.26" which isn't a local branch > If you want to create a new branch from this checkout, you may do so > (now or later) by using -b with the checkout command again. Example: > git checkout -b <new_branch_name> > HEAD is now at 0d171c3... linux-davinci-staging: update to the latest > r26 build (phase2 for dm3xx) -- Denys _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
