[catfish] Upstream update to meta-smartphone breaks multiple watch builds

[beroset]

The bug

I pulled the latest source code using . ./prepare-build.sh update and then used . ./prepare-build.sh catfish and started a build using bitbake -k asteroid-image, but got an error:

patching file hybris/include/EGL/eglplatform.h
Hunk #1 FAILED at 103.
1 out of 1 hunk FAILED -- rejects in file hybris/include/EGL/eglplatform.h
Patch 0001-eglplatform.h-take-MESA_EGL_NO_X11_HEADERS-into-acco.patch does not apply (enforce with -f)

To reproduce

Steps to reproduce the behavior:

1. Clone the asteroid repository
2. run . ./prepare-build.sh update
3. run . ./prepare-build.sh catfish
4. run bitbake -k asteroid-image
5. Observe error message mentioned above

Expected result

What should happen is that the catfish image should build with no errors.

Device information

• Watch Codename: catfish, but probably affects others
• AsteroidOS Builddate: 12 Feb 2023
• Version: very latest code as of 12 Feb 2023

Additional context

It appears that this upstream commit broke things. In discussion on matrix with @MagneFire, he noted:

Seems we can do a couple of things:

1. Use a fixed commit for the meta-smartphone layer.
2. Accept the change and force all ports to update.

After a bit of discussion, we seemed to converge on option 2. I started on a "quick fix" by doing catfish version of fixes along the lines of this recent patch but was not successful.

[beroset]

Thanks for the fix!