diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-06-06 13:41:26 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-06-06 13:44:50 +0200 |
| commit | 6734f32d91cd31ec5c2cc44a021a9839232fe587 (patch) | |
| tree | 5025ceffb199bdcd97403013851c56cf88e90d66 | |
| parent | aaac9e82aa60e11ea76a9f606cc68a8bd399365b (diff) | |
| download | upstream-6734f32d91cd31ec5c2cc44a021a9839232fe587.tar.gz upstream-6734f32d91cd31ec5c2cc44a021a9839232fe587.tar.bz2 upstream-6734f32d91cd31ec5c2cc44a021a9839232fe587.zip | |
mtd: add build hack to reintroduce shared mtd for older releases
When running in SDK context, treat the mtd package as shared to reintroduce
the common repository binary package for older released IBs.
When building outside of the SDK, create a nonshared package with a higher
PKG_REVISION to let opkg prefer that over the shared one in the common repo.
Ref: https://forum.lede-project.org/t/17-01-4-opkg-install-cmd-cannot-install-package-mtd/15312
Fixes: aaac9e82aa ("mtd: mark as nonshared to fix FS#484")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | package/system/mtd/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/system/mtd/Makefile b/package/system/mtd/Makefile index 9ae03a77a9..ecb440061e 100644 --- a/package/system/mtd/Makefile +++ b/package/system/mtd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mtd -PKG_RELEASE:=21 +PKG_RELEASE:=21$(if $(SDK),,.1) PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME) STAMP_PREPARED := $(STAMP_PREPARED)_$(call confvar,CONFIG_MTD_REDBOOT_PARTS) @@ -17,7 +17,7 @@ STAMP_PREPARED := $(STAMP_PREPARED)_$(call confvar,CONFIG_MTD_REDBOOT_PARTS) PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:= -PKG_FLAGS:=nonshared +PKG_FLAGS:=$(if $(SDK),,nonshared) include $(INCLUDE_DIR)/package.mk |