diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2024-05-31 13:08:02 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2024-05-31 15:48:00 +0200 |
| commit | a39d9693e66dea73d9753c7c0bae1378c2e97fed (patch) | |
| tree | 295ed6f85f4fee4763dd5a53d3909c951c3d7021 /target | |
| parent | b1bddb1d355553527c12985ae4c048ffddacbd0d (diff) | |
| download | openwrt-a39d9693e66dea73d9753c7c0bae1378c2e97fed.tar.gz openwrt-a39d9693e66dea73d9753c7c0bae1378c2e97fed.tar.bz2 openwrt-a39d9693e66dea73d9753c7c0bae1378c2e97fed.zip | |
imagebuilder: fix broken IB_STANDALONE option
Fix broken IB_STANDALONE option for OPKG due to an error in ifdef logic
where we weren't adding the required entry to reference the local files
in repositories.conf
Rework the ifdef to more explicit and restore original functionality of
this option.
While at it also provide different README for APK or OPKG.
Fixes: d788ab376f85 ("build: add APK package build capabilities")
Link: https://github.com/openwrt/openwrt/pull/15599
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/imagebuilder/Makefile | 11 | ||||
| -rw-r--r-- | target/imagebuilder/files/README.apk.md | 10 | ||||
| -rw-r--r-- | target/imagebuilder/files/README.opkg.md (renamed from target/imagebuilder/files/README.md) | 0 |
3 files changed, 18 insertions, 3 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index ef32d2cf7c..7fd2aa0920 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -43,24 +43,29 @@ $(BIN_DIR)/$(IB_NAME).tar.zst: clean $(INSTALL_DIR) $(PKG_BUILD_DIR)/packages -ifeq ($(CONFIG_IB_STANDALONE),) ifneq ($(CONFIG_USE_APK),) + ifeq ($(CONFIG_IB_STANDALONE),) $(call FeedSourcesAppendAPK,$(PKG_BUILD_DIR)/repositories) $(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories + endif + + $(INSTALL_DATA) ./files/README.apk.md $(PKG_BUILD_DIR)/packages/README.md else + ifeq ($(CONFIG_IB_STANDALONE),) echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf $(call FeedSourcesAppendOPKG,$(PKG_BUILD_DIR)/repositories.conf) $(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf + endif + # create an empty package index so `opkg` doesn't report an error touch $(PKG_BUILD_DIR)/packages/Packages - $(INSTALL_DATA) ./files/README.md $(PKG_BUILD_DIR)/packages/ + $(INSTALL_DATA) ./files/README.opkg.md $(PKG_BUILD_DIR)/packages/README.md echo '' >> $(PKG_BUILD_DIR)/repositories.conf echo '## This is the local package repository, do not remove!' >> $(PKG_BUILD_DIR)/repositories.conf echo 'src imagebuilder file:packages' >> $(PKG_BUILD_DIR)/repositories.conf endif -endif ifeq ($(CONFIG_BUILDBOT),) ifeq ($(CONFIG_IB_STANDALONE),) diff --git a/target/imagebuilder/files/README.apk.md b/target/imagebuilder/files/README.apk.md new file mode 100644 index 0000000000..e82a937e37 --- /dev/null +++ b/target/imagebuilder/files/README.apk.md @@ -0,0 +1,10 @@ +# ./packages folder + +Add `.apk` packages to this folder will allow the ImageBuilder to install them. + +For more complex setups consider adding a custom feed containing packages. + + file:///path/to/Packages.adb + +Whenever the ImageBuilder builds a firmware image this folder will be reloaded +and a new package index created. diff --git a/target/imagebuilder/files/README.md b/target/imagebuilder/files/README.opkg.md index 9a9616d06d..9a9616d06d 100644 --- a/target/imagebuilder/files/README.md +++ b/target/imagebuilder/files/README.opkg.md |