Skip to content

Commit fedc8ad

Browse files
authored
chore: switch to fully external buildroot tree (#20013)
This is the monorepo side of switching to having all our buildroot changes managed in a so-called "external tree", as opposed to just committed to a fork of the upstream buildroot repo. The changes here are not compatible with the current kind of setup. In this repo, all that has to be done is switching the package builders to use our backports of future hatch tooling from upstream. When we update buildroot, we'll be able to switch this back. For this PR and its buildroot partner, there should be no functional difference on a running OT-2 before and after the change - this does not include any package upgrades or behavior changes. It's all about how we store our customizations and how we build. This is the monorepo side of Opentrons/buildroot#266 and isn't really reviewable without that context. ## testing - [x] put the builds of this on an ot-2 and see if it works
1 parent 2b138fb commit fedc8ad

File tree

8 files changed

+8
-20
lines changed

8 files changed

+8
-20
lines changed

api/buildroot.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,4 @@ export OPENTRONS_GIT_DIR=$(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)
3737
# Calling inner-python-package directly instead of using python-package macro
3838
# because our directory layout doesn’t conform to buildroot’s expectation of
3939
# having the directory name be the package name
40-
$(eval $(call inner-python-package,$(ot_api_name),$(call UPPERCASE,$(ot_api_name)),$(call UPPERCASE,$(ot_api_name)),target))
41-
40+
$(eval $(call inner-python-hatch-package,$(ot_api_name),$(call UPPERCASE,$(ot_api_name)),$(call UPPERCASE,$(ot_api_name)),target))

external.mk

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,2 @@
11
# Makefile inclusions for buildroot integration
2-
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/api/buildroot.mk
3-
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/update-server/buildroot.mk
4-
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/robot-server/buildroot.mk
5-
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/shared-data/buildroot.mk
6-
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/system-server/buildroot.mk
7-
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/server-utils/buildroot.mk
8-
include $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/hardware/buildroot.mk
2+
include $(sort $(wildcard $(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)/*/buildroot.mk))

hardware/buildroot.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ export OPENTRONS_GIT_DIR=$(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)
3333
# Calling inner-python-package directly instead of using python-package macro
3434
# because our directory layout doesn’t conform to buildroot’s expectation of
3535
# having the directory name be the package name
36-
$(eval $(call inner-python-package,$(ot_hardware_name),$(call UPPERCASE,$(ot_hardware_name)),$(call UPPERCASE,$(ot_hardware_name)),target))
37-
36+
$(eval $(call inner-python-hatch-package,$(ot_hardware_name),$(call UPPERCASE,$(ot_hardware_name)),$(call UPPERCASE,$(ot_hardware_name)),target))

robot-server/buildroot.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,4 @@ export OPENTRONS_GIT_DIR=$(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)
4343
# Calling inner-python-package directly instead of using python-package macro
4444
# because our directory layout doesn’t conform to buildroot’s expectation of
4545
# having the directory name be the package name
46-
$(eval $(call inner-python-package,$(ot_robot_server_name),$(call UPPERCASE,$(ot_robot_server_name)),$(call UPPERCASE,$(ot_robot_server_name)),target))
47-
46+
$(eval $(call inner-python-hatch-package,$(ot_robot_server_name),$(call UPPERCASE,$(ot_robot_server_name)),$(call UPPERCASE,$(ot_robot_server_name)),target))

server-utils/buildroot.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ ot_server_utils_name := python-opentrons-server-utils
3232
# Calling inner-python-package directly instead of using python-package macro
3333
# because our directory layout doesn’t conform to buildroot’s expectation of
3434
# having the directory name be the package name
35-
$(eval $(call inner-python-package,$(ot_server_utils_name),$(call UPPERCASE,$(ot_server_utils_name)),$(call UPPERCASE,$(ot_server_utils_name)),target))
36-
35+
$(eval $(call inner-python-hatch-package,$(ot_server_utils_name),$(call UPPERCASE,$(ot_server_utils_name)),$(call UPPERCASE,$(ot_server_utils_name)),target))

shared-data/buildroot.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ export OPENTRONS_GIT_DIR=$(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)
3232
# Calling inner-python-package directly instead of using python-package macro
3333
# because our directory layout doesn’t conform to buildroot’s expectation of
3434
# having the directory name be the package name
35-
$(eval $(call inner-python-package,$(ot_sd_name),$(call UPPERCASE,$(ot_sd_name)),$(call UPPERCASE,$(ot_sd_name)),target))
35+
$(eval $(call inner-python-hatch-package,$(ot_sd_name),$(call UPPERCASE,$(ot_sd_name)),$(call UPPERCASE,$(ot_sd_name)),target))

system-server/buildroot.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,4 @@ export OPENTRONS_GIT_DIR=$(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)
4444
# Calling inner-python-package directly instead of using python-package macro
4545
# because our directory layout doesn’t conform to buildroot’s expectation of
4646
# having the directory name be the package name
47-
$(eval $(call inner-python-package,$(ot_system_server_name),$(call UPPERCASE,$(ot_system_server_name)),$(call UPPERCASE,$(ot_system_server_name)),target))
48-
47+
$(eval $(call inner-python-hatch-package,$(ot_system_server_name),$(call UPPERCASE,$(ot_system_server_name)),$(call UPPERCASE,$(ot_system_server_name)),target))

update-server/buildroot.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,4 @@ export OPENTRONS_GIT_DIR=$(BR2_EXTERNAL_OPENTRONS_MONOREPO_PATH)
4646
# Calling inner-python-package directly instead of using python-package macro
4747
# because our directory layout doesn’t conform to buildroot’s expectation of
4848
# having the directory name be the package name
49-
$(eval $(call inner-python-package,$(otupdate_name),$(call UPPERCASE,$(otupdate_name)),$(call UPPERCASE,$(otupdate_name)),target))
50-
49+
$(eval $(call inner-python-hatch-package,$(otupdate_name),$(call UPPERCASE,$(otupdate_name)),$(call UPPERCASE,$(otupdate_name)),target))

0 commit comments

Comments
 (0)