From: Emil Muratov Date: Wed, 31 Oct 2018 08:43:49 +0000 (+0300) Subject: zram-swap: Fix busybox dependency check X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c0d93432f2446fbf193ec15e4880cbafa9980779;p=openwrt%2Fstaging%2Fblogic.git 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 --- diff --git a/package/system/zram-swap/Makefile b/package/system/zram-swap/Makefile index 99dd9a675f2c..527800501b4e 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