diff options
| author | Paul Spooren <mail@aparcar.org> | 2024-04-08 08:05:29 +0200 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2024-04-08 21:53:05 +0200 |
| commit | d997477775bf5447000f1d300a027878b566f5d1 (patch) | |
| tree | 182215d7e6843ec0d4e02a53d8af567005f0411e /target/imagebuilder | |
| parent | 3ce1e4c3d3da3885c2f42e1aa5bc97e0d421445b (diff) | |
| download | openwrt-d997477775bf5447000f1d300a027878b566f5d1.tar.gz openwrt-d997477775bf5447000f1d300a027878b566f5d1.tar.bz2 openwrt-d997477775bf5447000f1d300a027878b566f5d1.zip | |
treewide: remove implicit SUBTARGET
Historically it's possible to leave the `SUBTARGETS` undefined and
automatically fallback to a "generic" subtarget. This however breaks
various downstream scripts which may have expectations around filenames:
While some targets with an explicit generic subtarget contain `generic`
in the filenames of artifacts, implicit "subtargets" don't.
Right now this breaks the CI[1], possibly also scripts using the ImageBuilders.
This commit removes all code that support implicit handling of
subtargets and instead requires every target to define "SUBTARGETS".
[1]: https://github.com/openwrt/openwrt/actions/runs/8592821105/job/23548273630
Signed-off-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'target/imagebuilder')
| -rw-r--r-- | target/imagebuilder/Makefile | 2 | ||||
| -rw-r--r-- | target/imagebuilder/files/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 799ac3be55..c768c992ea 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/feeds.mk override MAKEFLAGS= -IB_NAME:=$(VERSION_DIST_SANITIZED)-imagebuilder-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)).$(HOST_OS)-$(HOST_ARCH) +IB_NAME:=$(VERSION_DIST_SANITIZED)-imagebuilder-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)-$(SUBTARGET).$(HOST_OS)-$(HOST_ARCH) PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME) IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR)) IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR)) diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 0466fc7dcc..78a75e96a8 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -103,7 +103,7 @@ PROFILE_LIST = $(foreach p,$(PROFILE_NAMES), \ .profiles.mk: .targetinfo - @$(SCRIPT_DIR)/target-metadata.pl profile_mk $< '$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))' > $@ + @$(SCRIPT_DIR)/target-metadata.pl profile_mk $< '$(BOARD)/$(SUBTARGET)' > $@ staging_dir/host/.prereq-build: include/prereq-build.mk mkdir -p tmp |