aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Muratov <gpm@hotplug.ru>2018-10-31 11:43:49 +0300
committerJo-Philipp Wich <jo@mein.io>2019-09-04 13:24:36 +0200
commit7580357dc0ab001c7f2a3f6f2a63e0780dc5814b (patch)
tree6971f9a32e38917bcfb98f7ea5a3f8a93d200ccc
parentc6698c7b34e90955f6073f66c5f7352f77227d88 (diff)
downloadupstream-7580357dc0ab001c7f2a3f6f2a63e0780dc5814b.tar.gz
upstream-7580357dc0ab001c7f2a3f6f2a63e0780dc5814b.tar.bz2
upstream-7580357dc0ab001c7f2a3f6f2a63e0780dc5814b.zip
zram-swap: Fix busybox dependency check
- fix dependency on BUSYBOX_CONFIG_SWAPONOFF (removed in 84da2a6) - add busybox defaults checking (fix zram-swap always installs swap-utils and libblkid as dependency, even if busybox includes mkswap by default) Signed-off-by: Emil Muratov <gpm@hotplug.ru> (cherry picked from commit c0d93432f2446fbf193ec15e4880cbafa9980779)
-rw-r--r--package/system/zram-swap/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/system/zram-swap/Makefile b/package/system/zram-swap/Makefile
index 99dd9a675f..527800501b 100644
--- a/package/system/zram-swap/Makefile
+++ b/package/system/zram-swap/Makefile
@@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/zram-swap
SECTION:=utils
CATEGORY:=Base system
- DEPENDS:=+kmod-zram +!BUSYBOX_CONFIG_MKSWAP:swap-utils +!BUSYBOX_CONFIG_SWAPONOFF:block-mount
+ DEPENDS:=+kmod-zram +!(BUSYBOX_DEFAULT_MKSWAP||BUSYBOX_CONFIG_MKSWAP):swap-utils +!((BUSYBOX_DEFAULT_SWAPON||BUSYBOX_CONFIG_SWAPON)&&(BUSYBOX_DEFAULT_SWAPOFF||BUSYBOX_CONFIG_SWAPOFF)):block-mount
TITLE:=ZRAM swap scripts
PKGARCH:=all
endef