Skip to content

Commit bad3d66

Browse files
committed
We accidentally set SUBPACKAGES to an empty string, which breaks the "run" target in the root Makefile
- Use PROVIDERS in place of SUBPACKAGES if set - Use REPO in place of XPKG_REG_ORGS if set Signed-off-by: Alper Rifat Ulucinar <ulucinar@users.noreply.github.com>
1 parent fd398ae commit bad3d66

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,11 @@ DEP_CONSTRAINT ?= >= 0.0.0
324324
ifeq (-,$(findstring -,$(VERSION)))
325325
DEP_CONSTRAINT = >= 0.0.0-0
326326
endif
327-
# Define SUBPACKAGES variable and set its value from PROVIDERS
328-
SUBPACKAGES := $(PROVIDERS)
329-
# Define XPKG_REG_ORGS variable and set its value from REPO
330-
XPKG_REG_ORGS := $(REPO)
327+
328+
# use PROVIDERS in place of SUBPACKAGES if set
329+
SUBPACKAGES := $(if $(PROVIDERS),$(PROVIDERS),$(SUBPACKAGES))
330+
# use REPO in place of XPKG_REG_ORGS if set
331+
XPKG_REG_ORGS := $(if $(REPO),$(REPO),$(XPKG_REG_ORGS))
331332
load-pkg: $(UP) build.all
332333
@$(INFO) Loading the family providers into the Docker daemon: $(SUBPACKAGES)
333334
@for p in $(PLATFORMS); do \

0 commit comments

Comments
 (0)