Compile error

[Mr_____T]

Howdy,

I’m in the midst fo trying to get older MacBookProz to pxe boot. In the mean time, I am attempting to recompile ipxe using the buildipxe.sh and I get an error:

./buildipxe.sh: line 83: syntax error near unexpected token `<<<'
./buildipxe.sh: line 83: `<<<<<<< HEAD'
root@fogserver:~/fogproject/utils/FOGiPXE#

My bash scripting skills are not. So I am relying on some input about how to fix this error.

Tia

[Tom Elliott]

@Mr_____T I’m not sure why you’ve got head. I check stable, dev-branch, and working-1.6 and this file does not have the merge conflict associated to it.

Can you please attempt:

git reset --hard
git pull

If you’ve edited the files, its possible those changes will be lost. Not sure what would’ve changed so please make sure to get a backup of the state if you need to keep those changes.

Thanks

[Mr_____T]

@Tom-Elliott Hi T

Here it is:

root@fogserver:~/fogproject# git reset --hard
HEAD is now at 3eaa83b73 FOG 1.5.10 re-release
root@fogserver:~/fogproject# git pull
remote: Enumerating objects: 7854, done.
remote: Counting objects: 100% (1340/1340), done.
remote: Compressing objects: 100% (79/79), done.
remote: Total 7854 (delta 1287), reused 1261 (delta 1261), pack-reused 6514 (from 4)
Receiving objects: 100% (7854/7854), 41.43 MiB | 20.48 MiB/s, done.
Resolving deltas: 100% (3764/3764), completed with 155 local objects.
From https://github.com/FOGProject/fogproject
   3eaa83b73..a4bb1bf39  master      -> origin/master
 + edb875c16...423a55d2e dev-branch  -> origin/dev-branch  (forced update)
 * [new branch]          stable      -> origin/stable
 + b8e076d37...4101c44b9 working-1.6 -> origin/working-1.6  (forced update)
 * [new tag]             1.5.10.1629 -> 1.5.10.1629
 * [new tag]             1.5.10.1565 -> 1.5.10.1565
 * [new tag]             1.5.10.1566 -> 1.5.10.1566
 * [new tag]             1.5.10.1593 -> 1.5.10.1593
 * [new tag]             1.5.10.1615 -> 1.5.10.1615
 * [new tag]             1.5.10.1622 -> 1.5.10.1622
 * [new tag]             1.5.10.41   -> 1.5.10.41
 * [new tag]             1.5.10.48   -> 1.5.10.48
 * [new tag]             1.5.10.74   -> 1.5.10.74
Updating 3eaa83b73..a4bb1bf39
Fast-forward
 SECURITY.md | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

Should I rerun the installer?

[Tom Elliott]

@Mr_____T I don’t know if you’re installing, but the buildipxe.sh script should be able to run through now.

[Mr_____T]

@Tom-Elliott

I am have a current installation and am trying to get early macbookpro efi 2009 to 2012 to pxe boot. I thought I’d try to recompile just ipxe but got that error message. I ran your commands as instructed.

I’m not sure if I should recompile the whole thing or try ipxe only.

oh btw. Have you ever compiled ipxe main branch before? How long should that take? normally…

tx
again