iMX8MP-SOM-4GB-IND/

[Sam Rossiter]

For this board https://www.olimex.com/Products/SOM/NXP-iMX8/iMX8MP-SOM-4GB-IND/open-source-hardware

 

It looks like Olimex have forked Armbian-build and done the board bringup: https://github.com/OLIMEX/imx8mp-build/commit/a3cb5ad2710cd3edf6a4c6c067b049af48b03fa5#diff-1b53368896f4902ddbb5db1fa206835ccbb04445cd8bcaa5fef353655794665a

 

How could I bring that code back into the main https://github.com/armbian/build/tree/main

 

I think I need to rebase the Olimex fork back to the main Armbian Repo?

 

Or should I fork the Armbian repo and then re-apply the Olimex changes to the fork?

[Igor]

1 hour ago, Sam Rossiter said:

I think I need to rebase the Olimex fork back to the main Armbian Repo?

Recommended. It looks like its not that far away.
 

1 hour ago, Sam Rossiter said:

Or should I fork the Armbian repo and then re-apply the Olimex changes to the fork?

With rebase you will see the diff and if this is all you need to apply.

[Sam Rossiter]

I looked at this for an hour and unfortunately can't figure it out.

 

It seems that Olimex didn't 'fork' from Armbian, instead did something else to make their clone of your code.

Edited September 10 by Sam Rossiter
typo

[laibsch]

They certainly did fork armbian, apparently at tag v24.11.1 AKA dd379da888f7d114f9f954d94a7ebcf261d179e5
 

$ git merge-base dd379da888f7d114f9f954d94a7ebcf261d179e5 main
017549347bb8c278a067d1be14c2f1b3538690c2

 

Add the Olimex repo as a remote and then rebase the latest armbian/build HEAD to their HEAD.

[cuker]

Something like

git clone https://github.com/armbian/build.git -b main
cd build
git remote add -f imx8mp-build https://github.com/OLIMEX/imx8mp-build.git
git remote update
git fetch origin
git fetch imx8mp-build
git checkout main
git rebase imx8mp-build/bookworm

# fix conflict
vi VERSION 
git add VERSION 

git rebase --continue

# fix conflict
vi .github/dependabot.yml 
git add .github/dependabot.yml 

git rebase --continue

git log