#8 closed defect (fixed)
Import 5.x source
| Reported by: | diver | Owned by: | dmik |
|---|---|---|---|
| Priority: | blocker | Milestone: | VBox driver |
| Component: | Common Tasks | Keywords: | |
| Cc: |
Description
Import latest VBox source code.
Rename current trunk to a branche for historical reason.
The old vendor part could be deleted and redone from scratch.
Change History (6)
comment:1 by , 9 years ago
comment:2 by , 9 years ago
| Summary: | Import Source → Import 5.x source |
|---|
comment:3 by , 9 years ago
| Owner: | set to |
|---|---|
| Status: | new → accepted |
comment:4 by , 9 years ago
Imported version 5.0.0 and started off the trunk with it. Note that the vendor was imported using the normal svn merge command which preserves all meta data such as all svn: properties and so on. This is really nice since it copies stuff like EOL policy and external repositories unchanged from the upstream.
One thing to note for further reintegration with the upstream. The first import was done using this command while being in the checked out (and empty) vendor tree:
svn merge http://www.virtualbox.org/svn/vbox -r 0:56895 .
However, further imports should be done using this command:
svn merge http://www.virtualbox.org/svn/vbox/trunk -r X:Y .
where X is the top upstream revision from the previous merge (56895 in this case) and Y is the new revision to update to.
The difference is that in the second (and all future merges) we take changes directly from vbox/trunk rather than from just vbox. For the first import an exception was made because trunk was created in upstream revision 1 together with adding initial files and it was simply impossible to add them via merge otherwise.
comment:5 by , 9 years ago
| Component: | Driver → Common Tasks |
|---|---|
| Resolution: | → fixed |
| Status: | accepted → closed |
Removed the external kBuild repo link in r6 as per discussed above. This task is done now.
The latest version of VirtualBox is 5.0.0 and it corresponds to this changeset https://www.virtualbox.org/changeset/56895/vbox. This will be the version that we will import here.
Another thing to note is that the current VirtualBox repository at http://www.virtualbox.org/svn/vbox/trunk contains references to external repositories (via
svn:externals) imported to the relative paths/kBuildand/src/libs/kStuff/kStuff. kBuild is what we can probably drop away completely as we have our own kBuild RPM package where we maintain OS/2 fixes that we need so that it is meant to be more suitable for OS/2 anyway. I will ask Valeriy to try the RPM version of kBuild to see if it makes any problems.As for kStuff, I think we will import it here at source level (i.e. not as an external reference as in the original repo) so that we could easily patch it in-place instead of contributing patches to Knut and waiting for them to appear in the external repo to get picked up.