projects / librecmc / librecmc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d86fae1)
zram-swap: Fix busybox dependency check
authorEmil Muratov <gpm@hotplug.ru>
Wed, 31 Oct 2018 08:43:49 +0000 (11:43 +0300)
committerRISCi_ATOM <bob@bobcall.me>
Fri, 13 Sep 2019 19:56:10 +0000 (15:56 -0400)
   - 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)

package/system/zram-swap/Makefile patch | blob | history

diff --git a/package/system/zram-swap/Makefile b/package/system/zram-swap/Makefile
index 99dd9a675f2c3228382ad27e674e01aee2e60db4..527800501b4e2fee4209d235179ddd2028b67fce 100644 (file)
--- 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