Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: remove dependency on pull/43987/head to track zephyr main directly #129

Closed
cfriedt opened this issue Aug 11, 2022 · 0 comments · Fixed by #130
Closed

ci: remove dependency on pull/43987/head to track zephyr main directly #129

cfriedt opened this issue Aug 11, 2022 · 0 comments · Fixed by #130
Assignees

Comments

@cfriedt
Copy link
Member

cfriedt commented Aug 11, 2022

Is your enhancement proposal related to a problem? Please describe.
Currently, in west.yml, we are tracking zephyrproject-rtos/zephyr#43987 rather than HEAD in the zephyr repository.

In the interest of reducing the number of moving parts for integration, I think it would make sense to simply track HEAD in the zephyr repository.

However, that comes at the cost of reintroducing dozens (hundreds?) of changes back into the Thrift fork of the form

#ifdef __ZEPHYR__
#include <zephyr/posix/unistd.h>
#else
#include <unistd.h>
#endif

Describe the solution you'd like
The nice thing about doing the above, is that we can simply use and benefit from zephyrproject-rtos/zephyr#43987 when it is eventually merged upstream. Additionally, since zephyrproject-rtos/zephyr#43987 still needs work to separate it into separate commits, and since there are likely some architectural mistakes that need to be changed upstream, and furthermore, since all of this is "evening and weekend work" as it has not been prioritized by my employer, it could be a while until all of it is finished.

At least the .upstream Thrift changes can be pinned to v0.16.0 and can be relatively self-contained.

Describe alternatives you've considered
Making gsoc-2022-thrift depend on long-lived changes in branch is not a great idea.

Additional context

@cfriedt cfriedt self-assigned this Aug 11, 2022
cfriedt added a commit to cfriedt/thrift that referenced this issue Aug 11, 2022
This is a temporary workaround until the mountain of
tech-debt is flattened w.r.t the following:

zephyrproject-rtos/zephyr#43987
zephyrproject-rtos/gsoc-2022-thrift#62
zephyrproject-rtos/zephyr#43998
zephyrproject-rtos/zephyr#46910
zephyrproject-rtos/zephyr#45100

but also around the mountain of tech-debt as a result of
poor arch/posix software architecture, CONFIG_ARCH_POSIX
and CONFIG_POSIX_API incompatibility, and the resultant
spillover of moving POSIX definitions into the network
subsystem as a result.

Fixes zephyrproject-rtos/gsoc-2022-thrift#129

Signed-off-by: Christopher Friedt <chrisfriedt@gmail.com>
cfriedt added a commit that referenced this issue Aug 11, 2022
This is a temporary workaround until the mountain of
tech-debt is flattened w.r.t the following:

zephyrproject-rtos/zephyr#43987
#62
zephyrproject-rtos/zephyr#43998
zephyrproject-rtos/zephyr#46910
zephyrproject-rtos/zephyr#45100

but also around the mountain of tech-debt as a result of
poor arch/posix software architecture, CONFIG_ARCH_POSIX
and CONFIG_POSIX_API incompatibility, and the resultant
spillover of moving POSIX definitions into the network
subsystem as a result.

Fixes #129

Signed-off-by: Christopher Friedt <cfriedt@fb.com>
cfriedt added a commit that referenced this issue Aug 11, 2022
This is a temporary workaround until the mountain of
tech-debt is flattened w.r.t the following:

zephyrproject-rtos/zephyr#43987
#62
zephyrproject-rtos/zephyr#43998
zephyrproject-rtos/zephyr#46910
zephyrproject-rtos/zephyr#45100

but also around the mountain of tech-debt as a result of
poor arch/posix software architecture, CONFIG_ARCH_POSIX
and CONFIG_POSIX_API incompatibility, and the resultant
spillover of moving POSIX definitions into the network
subsystem as a result.

Fixes #129

Signed-off-by: Christopher Friedt <cfriedt@fb.com>
cfriedt added a commit that referenced this issue Aug 11, 2022
This is a temporary workaround until the mountain of
tech-debt is flattened w.r.t the following:

zephyrproject-rtos/zephyr#43987
#62
zephyrproject-rtos/zephyr#43998
zephyrproject-rtos/zephyr#46910
zephyrproject-rtos/zephyr#45100

but also around the mountain of tech-debt as a result of
poor arch/posix software architecture, CONFIG_ARCH_POSIX
and CONFIG_POSIX_API incompatibility, and the resultant
spillover of moving POSIX definitions into the network
subsystem as a result.

Fixes #129

Signed-off-by: Christopher Friedt <cfriedt@fb.com>
cfriedt added a commit that referenced this issue Aug 11, 2022
This is a temporary workaround until the mountain of
tech-debt is flattened w.r.t the following:

zephyrproject-rtos/zephyr#43987
#62
zephyrproject-rtos/zephyr#43998
zephyrproject-rtos/zephyr#46910
zephyrproject-rtos/zephyr#45100

but also around the mountain of tech-debt as a result of
poor arch/posix software architecture, CONFIG_ARCH_POSIX
and CONFIG_POSIX_API incompatibility, and the resultant
spillover of moving POSIX definitions into the network
subsystem as a result.

Fixes #129

Signed-off-by: Christopher Friedt <cfriedt@fb.com>
cfriedt added a commit to cfriedt/thrift that referenced this issue Oct 1, 2022
This is a temporary workaround until the mountain of
tech-debt is flattened w.r.t the following:

zephyrproject-rtos/zephyr#43987
zephyrproject-rtos/gsoc-2022-thrift#62
zephyrproject-rtos/zephyr#43998
zephyrproject-rtos/zephyr#46910
zephyrproject-rtos/zephyr#45100

but also around the mountain of tech-debt as a result of
poor arch/posix software architecture, CONFIG_ARCH_POSIX
and CONFIG_POSIX_API incompatibility, and the resultant
spillover of moving POSIX definitions into the network
subsystem as a result.

Fixes zephyrproject-rtos/gsoc-2022-thrift#129

Signed-off-by: Christopher Friedt <cfriedt@meta.com>
cfriedt added a commit to cfriedt/thrift that referenced this issue Oct 1, 2022
This is a temporary workaround until the mountain of
tech-debt is flattened w.r.t the following:

zephyrproject-rtos/zephyr#43987
zephyrproject-rtos/gsoc-2022-thrift#62
zephyrproject-rtos/zephyr#43998
zephyrproject-rtos/zephyr#46910
zephyrproject-rtos/zephyr#45100

but also around the mountain of tech-debt as a result of
poor arch/posix software architecture, CONFIG_ARCH_POSIX
and CONFIG_POSIX_API incompatibility, and the resultant
spillover of moving POSIX definitions into the network
subsystem as a result.

Fixes zephyrproject-rtos/gsoc-2022-thrift#129

Signed-off-by: Christopher Friedt <cfriedt@meta.com>
cfriedt added a commit to cfriedt/thrift that referenced this issue Oct 25, 2022
This is a temporary workaround until the mountain of
tech-debt is flattened w.r.t the following:

zephyrproject-rtos/zephyr#43987
zephyrproject-rtos/gsoc-2022-thrift#62
zephyrproject-rtos/zephyr#43998
zephyrproject-rtos/zephyr#46910
zephyrproject-rtos/zephyr#45100

but also around the mountain of tech-debt as a result of
poor arch/posix software architecture, CONFIG_ARCH_POSIX
and CONFIG_POSIX_API incompatibility, and the resultant
spillover of moving POSIX definitions into the network
subsystem as a result.

Fixes zephyrproject-rtos/gsoc-2022-thrift#129

Signed-off-by: Christopher Friedt <chrisfriedt@gmail.com>
cfriedt added a commit to cfriedt/thrift that referenced this issue Oct 27, 2022
This is a temporary workaround until the mountain of
tech-debt is flattened w.r.t the following:

zephyrproject-rtos/zephyr#43987
zephyrproject-rtos/gsoc-2022-thrift#62
zephyrproject-rtos/zephyr#43998
zephyrproject-rtos/zephyr#46910
zephyrproject-rtos/zephyr#45100

but also around the mountain of tech-debt as a result of
poor arch/posix software architecture, CONFIG_ARCH_POSIX
and CONFIG_POSIX_API incompatibility, and the resultant
spillover of moving POSIX definitions into the network
subsystem as a result.

Fixes zephyrproject-rtos/gsoc-2022-thrift#129

Signed-off-by: Christopher Friedt <cfriedt@meta.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant