| stekern | juliusb: it's up to you, if you have some good plan how to organize them, I'd say merge them now | 05:23 |
|---|---|---|
| stekern | if not, just push it, I can take a look at merging it in with main later on then | 05:25 |
| juliusb | stekern: ah I've just merged them | 11:35 |
| juliusb | no problems | 11:35 |
| juliusb | I'll make the default "fourstage" pipeline your cappuccino one | 11:36 |
| juliusb | now that there's a 'smaller' pipeline in the espresso one, there's no point having the fourstage guy | 11:36 |
| stekern | ok, cool | 11:37 |
| stekern | there are some caveats still in cappuccino though, you can't disable icache for example | 11:39 |
| juliusb | oh hehe | 11:41 |
| juliusb | too bad, use espresso then | 11:41 |
| juliusb | mmmm espresso | 11:41 |
| juliusb | it's that time :) | 11:41 |
| stekern | yeah, and eventually you'll be able to disable it, so it's just a phase | 11:42 |
| juliusb | :) | 11:42 |
| juliusb | i'm curious about rdiez's new core in orbuild | 11:43 |
| juliusb | i'm wondering how he verifies it | 11:43 |
| juliusb | i like the idea of a systemc testbench | 11:43 |
| juliusb | ultimately is more powerful than Verilog | 11:43 |
| juliusb | as a verification environment | 11:44 |
| stekern | mmm | 11:46 |
| stekern | isn't he "just" running these? https://github.com/rdiez/orbuild/tree/master/Scripts/Projects/OpenRISC/TestSuite/AsmTestCases | 11:47 |
| juliusb | OK, not sure. | 11:47 |
| juliusb | I assumed he was also running against the GNU testsuite? | 11:47 |
| juliusb | can you give me a bit of guidance on some git stuff | 11:48 |
| juliusb | i've got a local branch called "doc" which I want to become the master on the github | 11:48 |
| juliusb | i've got the github in there | 11:48 |
| juliusb | as a remote, called github | 11:48 |
| juliusb | can I just go: git push -u origin:master doc | 11:49 |
| juliusb | ? | 11:49 |
| juliusb | and that'll rename the doc branch as master? | 11:49 |
| juliusb | you can do something like this if I recall | 11:49 |
| stekern | git push doc origin:master | 11:49 |
| stekern | I think | 11:50 |
| juliusb | or i should just update my local master to the doc head i think | 11:50 |
| juliusb | that's probably easier | 11:50 |
| juliusb | yeah i think that's done it better | 11:51 |
| stekern | no, it's git push origin doc:master | 11:52 |
| stekern | yeah, I try to keep my local branches named the same as the remote ones, I'd just mix everything up otherwise | 11:53 |
| juliusb | and it's live: push | 11:55 |
| juliusb | https://github.com/juliusbaxter/mor1kx | 11:55 |
| juliusb | shit, no licenses on the files | 11:56 |
| juliusb | i completely forgot about that | 11:56 |
| juliusb | :P | 11:56 |
| juliusb | snap decision to be taken | 11:56 |
| juliusb | what do you reckon for license? | 11:56 |
| stekern | heh, you pick one ;) | 11:58 |
| juliusb | yea | 11:58 |
| juliusb | mmmm | 11:58 |
| juliusb | i want my one | 11:58 |
| juliusb | I can always change it later | 11:58 |
| stekern | so use yours then :) | 12:00 |
| stekern | but very nice that it finally has surfaced from the dark corners of your harddrive =) | 12:12 |
| juliusb | i know | 12:14 |
| juliusb | sorry it took like 3 months | 12:14 |
| stekern | ah, well, what do they say, better late than never | 12:16 |
| juliusb | indeed | 12:16 |
| stekern | I'll steer my attention back to it as soon as I've got this toolchain/compiler business out of my system ;) | 12:17 |
| juliusb | NP | 12:17 |
| juliusb | OK licenses updated | 12:26 |
| juliusb | didn't change your i/d cache files | 12:26 |
| juliusb | I'll add you with commit privileges on that account actually | 12:26 |
| stekern | cool | 12:28 |
| stekern | would it be a bad idea to start an openrisc organisation on github? | 12:31 |
| juliusb | not sure what that means | 12:32 |
| juliusb | gotta run off, bbl | 12:32 |
| stekern | well, essentially it's the same as an github account | 12:33 |
| stekern | look at milkymist as an example: https://github.com/milkymist | 12:33 |
| stekern | just as a way to tie together all the people around using github, like me, you, rdiez, pgavin, franck, antmicro etc | 12:37 |
| jeremybennett | stekern: An organization is a good idea. It's a shame that Marcus won't set up OpenCores git repo, because it is when we move from individual to collective effort that maintaining the OpenCores community becomes important. | 12:39 |
| jeremybennett | Something to discuss when we meet next month. There is some admin overhead to running an organization on GitHub. | 12:40 |
| jeremybennett | We use one for the Synopsys ARC Linux and GNU tool chains. | 12:40 |
| jeremybennett | stekern: Will you set it up on GitHub? | 12:41 |
| stekern | sure, I can do that if it's something we want | 12:42 |
| jeremybennett | Well, in the absence of anything from OpenCores it makes sense. | 12:42 |
| jeremybennett | The downside is that it again splits the OpenCores community, because we'll end up with an organization Wiki, mailing list, etc, etc on GitHub. | 12:43 |
| jeremybennett | You start to wonder what is the point of OpenCores! | 12:43 |
| jeremybennett | IIRC you can control which members of the organization have write access to which repos. | 12:46 |
| stekern | yes, I'm a member of the milkymist organisation, but I only have write access to clang and llvm repos | 12:46 |
| jeremybennett | That will be useful for us, so we can manage who maintains different components. | 12:46 |
| jeremybennett | Will you make it an OpenRISC organization or an OpenCores organization. Probably makes sense to do the former. | 12:47 |
| jeremybennett | I'll move Or1ksim there - I've asked for months to do that on OpenCores with no luck! | 12:48 |
| jeremybennett | back later | 12:49 |
| stekern | ok, openrisc organization added, now I just need to figure out how this works ;) | 12:56 |
| stekern | I put up me, jeremybennett and juliusb as owners for now | 13:02 |
| juliusb | cool | 13:08 |
| juliusb | is there some link? | 13:09 |
| juliusb | oh yeah, just github.com/openrisc | 13:09 |
| stekern | yup | 13:09 |
| stekern | I choose lower case for the name to avoid having the address as github.com/OpenRISC | 13:10 |
| juliusb | ya | 13:10 |
| juliusb | all good | 13:10 |
| juliusb | how do I list the mor1kx guy on the organisation? | 13:13 |
| stekern | as I understand it, there are two options: 1. you can just go to your page and press the fork button and choose openrisc. 2. you can transfer the repo control to openrisc, but then it will disappear from your repo list | 13:14 |
| juliusb | ahh OK | 13:14 |
| juliusb | hmm | 13:14 |
| juliusb | so I have to fork it? | 13:14 |
| stekern | ultimately, I like option 1 better, since if I would transfer control to openrisc, I'd probably would like to keep a personal fork where I do more experimental hacking | 13:15 |
| stekern | +still | 13:15 |
| juliusb | OK | 13:15 |
| jeremybennett | stekern: Excellent - I see it there | 13:16 |
| stekern | I mean, you can still push to the forked openrisc one at the same time you push to your own if you wish | 13:16 |
| jeremybennett | juliusb: you might want to transfer your repo to openrisc and then fork back. Semantically it is exactly the same thing, but it means that the repo won't show in openrisc as a fork from your personal repo. | 13:19 |
| stekern | yeah, true | 13:19 |
| juliusb | that sounds fine | 13:19 |
| juliusb | but what are the rules, everyone who's an owner of the openrisc group can commit to anything repo there? | 13:20 |
| stekern | yes, but you can create "teams" with more fine-grained permissions | 13:20 |
| juliusb | well for now I'm happy to have anyone there capable of committing to it | 13:21 |
| jeremybennett | New or1ksim repo created. Now I just need to add the code... | 13:25 |
| stekern | given that you have a commit history from svn for it, it might be a good idea to import it with git svn and then push it | 13:27 |
| jeremybennett | Oh yes - I know how, it just needs the time to actually do it! Watch this space. | 13:28 |
| stekern | =) | 13:28 |
| jeremybennett | Arrggh - now my local SVN is version 1.7 and I need to run svn upgrade over the entire tree! | 13:32 |
| jeremybennett | I may be some time... | 13:32 |
| stekern | huh? can't you just do: git svn clone http://opencores.org/ocsvn/openrisc/openrisc/trunk/or1ksim | 13:42 |
| juliusb | stekern: so I have something I want to push to both my newly forked mor1kx repo and the normal one (a README.pod file) | 13:43 |
| juliusb | all I have done is cloned my newly forked repo | 13:43 |
| juliusb | how do I push to both? do I have to do 2 individual things? | 13:43 |
| stekern | and then git add remote <github/openrisc/or1ksim> and push to that? | 13:43 |
| juliusb | ok | 13:44 |
| stekern | that was for jeremybennett ;) | 13:44 |
| juliusb | ah | 13:44 |
| juliusb | :) | 13:44 |
| stekern | I don't know if you can simultaneously push to 2 places in the same command, but add a seperate remote and then do 2 pushes | 13:45 |
| juliusb | yep cool | 13:45 |
| stekern | http://jeetworks.org/node/22 | 13:46 |
| stekern | seems to be a guide how to save you from having to do 2 pushes | 13:46 |
| juliusb | ah, already did the first | 13:46 |
| juliusb | OK cool | 13:49 |
| juliusb | man github is really nice! | 13:57 |
| juliusb | i never really knew everything it had | 13:57 |
| juliusb | a wiki, graphs | 13:57 |
| juliusb | ability to annotate commits | 13:57 |
| stekern | heh, yeah. I hadn't noticed the graphs earlier | 14:03 |
| jeremybennett | stekern: that is a good point - using the source repo. It's a bit more complex because of the structure of trunk and branches, but it's the right idea. | 14:04 |
| stekern | looking at mor1kx, I have deleted more lines than I have added ;) | 14:04 |
| juliusb | :) | 14:06 |
| juliusb | i've just realised mor1kx-defines has a heap of implementation `defines which aren't used | 14:07 |
| juliusb | so i'll delete them to avoid confusion | 14:07 |
| juliusb | they're all parameters now | 14:07 |
| jeremybennett | stekern: Just tried the following: | 14:07 |
| jeremybennett | git svn clone --trunk=http://opencores.org/ocsvn/openrisc/openrisc/trunk/or1ksim --branches=http://opencores.org/ocsvn/openrisc/openrisc/branches/or1ksim --tags=http://opencores.org/ocsvn/openrisc/openrisc/tags/or1ksim | 14:07 |
| jeremybennett | I got an immediate failure: | 14:08 |
| jeremybennett | Use of uninitialized value $url in pattern match (m//) at /usr/libexec/git-core/git-svn line 491. | 14:08 |
| jeremybennett | Use of uninitialized value $_[0] in substitution (s///) at /usr/share/perl5/File/Basename.pm line 341. | 14:08 |
| jeremybennett | fileparse(): need a valid pathname at /usr/libexec/git-core/git-svn line 497 | 14:08 |
| simoncook | do you need to give it a directory to clone into? | 14:09 |
| jeremybennett | It should clone into the current directory if not specified. However I think I have misunderstood the meaning of --trunk etc. | 14:09 |
| simoncook | is it init instead of clone? | 14:09 |
| jeremybennett | clone should be the equivalent of git svn init followed by git svn fetch | 14:10 |
| stekern | I've never tried getting the branches and tags, so you're on your own there ;) | 14:10 |
| jeremybennett | Just checked - I haven't misunderstood, those do seem to be good args. | 14:10 |
| jeremybennett | Well I really want at least the tags because we have been assiduous in tagging releases! | 14:11 |
| jeremybennett | Unfortunately this has been my general experience of git svn. Something breaks in the PERL for anything but an absolutely standard SVN repo layout. | 14:12 |
| stekern | I read up on, I don't think git-svn will do what you want like that | 14:16 |
| stekern | https://help.github.com/articles/importing-from-subversion | 14:16 |
| stekern | the svn2git seems to do what you want, create local branches and tags from the svn branches and tags | 14:17 |
| jeremybennett | Ah yes - I think I've been here before. | 14:17 |
| stekern | git-svn will set-up references to the svn | 14:17 |
| jeremybennett | The problem seems to be with the svn git --trunk arg - it doesn't seem to work as advertised. | 14:18 |
| simoncook | jeremybennett, ive done a search, try using git svn init instead, then edit the .git/config to remove // replacing with / in the branches and tags, then try git svn fetch, that at least is pulling svn commits | 14:25 |
| jeremybennett | simoncook: Thanks for that. | 14:26 |
| jeremybennett | Lunch is now calling loud and clear! | 14:26 |
| stekern | jeremybennett: something like this should work: svn2git -v http://opencores.org/ocsvn/openrisc/openrisc --trunk trunk/or1ksim --tags tags/or1ksim --branches branches/or1ksim | 14:36 |
| stekern | make sure to make a or1ksim directory and cd into it first... | 14:37 |
| stekern | I didn't and it made a mess in my ~/openrisc/ directory :( | 14:37 |
| stekern | you might want to use an authors.txt file too to map the users | 14:44 |
| stekern | svn2git -v http://opencores.org/ocsvn/openrisc/openrisc --trunk trunk/or1ksim --tags tags/or1ksim --branches branches/or1ksim --authors ../authors.txt | 14:56 |
| stekern | with authors.txt being something like this: http://pastebin.com/1Qmk1BcS | 14:56 |
| stekern | jeremybennett: since I already did all this, I can spare you the trouble, you can clone from this temp repo :) git://git.chokladfabriken.org/or1ksim.git | 15:04 |
| jeremybennett | stekern: Thanks - I'll pick that up | 15:24 |
| jeremybennett | I ran svn2git here, but it didn't get the tags | 15:27 |
| stekern | strange, I got them | 15:30 |
| jeremybennett | stekern: My mistake. No use using git br -a to list the tags. They did all come over. I've cloned your temporary repo. | 16:14 |
| jeremybennett | Just tidying up stuff now. | 16:14 |
| jeremybennett | o1ksim now fully on GitHub with all the SVN history, tags and branches. Thanks to stekern and simoncook for assistance. | 17:07 |
| juliusb | Great news! | 17:20 |
| jeremybennett | I suppose at some time I ought to roll in the outstanding patches and make a new release | 17:27 |
| juliusb | stekern: have changed all references to fourstage to cappuccino | 20:33 |
| stekern | juliusb: nice one! I thought about doing that, but obviously you beat me to it =) | 20:54 |
| _franck_ | cappuccino, espresso, cool names :) | 22:00 |
Generated by irclog2html.py 2.15.2 by Marius Gedminas - find it at mg.pov.lt!