[openwrt/openwrt] zram-swap: correctly express the required dependencies

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 11 09:54:39 EDT 2020


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0b6155de0ba0aa9e6942522ec6666c56a2f5aff1

commit 0b6155de0ba0aa9e6942522ec6666c56a2f5aff1
Author: Rui Salvaterra <rsalvaterra at gmail.com>
AuthorDate: Wed Jul 8 17:20:28 2020 +0100

    zram-swap: correctly express the required dependencies
    
    The block-mount swapon implementation doesn't support discard, so make zram-swap
    depend only on the default BusyBox implementation or, when unavailable, on the
    one present in the swap-utils package.
    
    Signed-off-by: Rui Salvaterra <rsalvaterra at gmail.com>
---
 package/system/zram-swap/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/system/zram-swap/Makefile b/package/system/zram-swap/Makefile
index ee5e85927f..a6661ce5e9 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_DEFAULT_MKSWAP||BUSYBOX_CONFIG_MKSWAP):swap-utils +!((BUSYBOX_DEFAULT_SWAPON||BUSYBOX_CONFIG_SWAPON)&&(BUSYBOX_DEFAULT_SWAPOFF||BUSYBOX_CONFIG_SWAPOFF)):block-mount
+  DEPENDS:=+kmod-zram +!(BUSYBOX_CONFIG_MKSWAP&&BUSYBOX_CONFIG_SWAPON&&BUSYBOX_CONFIG_SWAPOFF):swap-utils
   TITLE:=ZRAM swap scripts
   PKGARCH:=all
 endef



More information about the lede-commits mailing list