mirror of
https://review.haiku-os.org/buildtools
synced 2024-11-23 07:18:49 +01:00
a484705173
This merge is made using the "ours" strategy so it does not change anything to the master branch content. This is here only to make it easier to do the next updates of binutils. The process to update the binutils vendor branch is: git checkout vendor-binutils # Work on the vendor branch git rm -rf binutils # Delete the previous binutils version wget http://.../binutils.tar # Download the new binutils version tar xvf binutils.tar # Extract the new binutils version mv binutils-2.36 binutils # Move the extracted directory in the correct place git add binutils # Add the new files git status # Make sure everything is ok git commit -m "import binutils 2.36" # Commit the new version git checkout master git merge vendor-binutils # Merge the changes in the master branch # Resolve conflicts as needed When this process is followed, it is a lot easier to compare our branch with the original sources: git diff binutils/ vendor-binutils # Compare the binutils directory with the upstream version There is also less risk to miss a patch when merging the changes, because Git will keep track of the changes. This process is named "vendor branches" and originates from SVN. It had been used until binutils 2.28.1, but the next two updates were not done this way. This commits sets us up to use this workflow again. |
||
|---|---|---|
| autoconf | ||
| binutils | ||
| gcc | ||
| jam | ||
| legacy | ||
| libtool | ||
| .gitignore | ||