diff --git a/config/kernel/linux-cubox-default.config b/config/kernel/linux-cubox-default.config index d4fe11860..1b1300cf2 100644 --- a/config/kernel/linux-cubox-default.config +++ b/config/kernel/linux-cubox-default.config @@ -1515,6 +1515,7 @@ CONFIG_BLK_DEV_NULL_BLK=m # CONFIG_PARIDE is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=m +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_ZRAM_DEBUG is not set CONFIG_BLK_CPQ_CISS_DA=m CONFIG_CISS_SCSI_TAPE=y diff --git a/config/kernel/linux-cubox-dev.config b/config/kernel/linux-cubox-dev.config index 30f520c72..f792d7352 100644 --- a/config/kernel/linux-cubox-dev.config +++ b/config/kernel/linux-cubox-dev.config @@ -1521,6 +1521,7 @@ CONFIG_BLK_DEV_NULL_BLK=m # CONFIG_PARIDE is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=m +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_ZRAM_DEBUG is not set CONFIG_BLK_CPQ_CISS_DA=m CONFIG_CISS_SCSI_TAPE=y diff --git a/config/kernel/linux-cubox-next.config b/config/kernel/linux-cubox-next.config index a3df02c17..54ddcc477 100644 --- a/config/kernel/linux-cubox-next.config +++ b/config/kernel/linux-cubox-next.config @@ -656,7 +656,10 @@ CONFIG_ZSWAP=y CONFIG_ZPOOL=y # CONFIG_ZBUD is not set CONFIG_Z3FOLD=m -# CONFIG_ZSMALLOC is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y +CONFIG_ZSMALLOC=y CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_FRAME_VECTOR=y @@ -6235,7 +6238,7 @@ CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_842=m -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=m # CONFIG_CRYPTO_LZ4HC is not set # diff --git a/config/kernel/linux-meson-default.config b/config/kernel/linux-meson-default.config index c288470d0..25a009c74 100644 --- a/config/kernel/linux-meson-default.config +++ b/config/kernel/linux-meson-default.config @@ -3854,7 +3854,7 @@ CONFIG_RTS5139_DEBUG=y CONFIG_USB_SERIAL_QUATECH2=m CONFIG_ZSMALLOC=y CONFIG_ZRAM=m -CONFIG_ZRAM_DEBUG=y +# CONFIG_ZRAM_DEBUG is not set CONFIG_USB_ENESTORAGE=m # CONFIG_BCM_WIMAX is not set # CONFIG_FT1000 is not set diff --git a/config/kernel/linux-meson64-default.config b/config/kernel/linux-meson64-default.config index c6bb9843f..84c3b1a89 100644 --- a/config/kernel/linux-meson64-default.config +++ b/config/kernel/linux-meson64-default.config @@ -1513,6 +1513,7 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-meson64-dev.config b/config/kernel/linux-meson64-dev.config index ef27655aa..08f8cc50e 100644 --- a/config/kernel/linux-meson64-dev.config +++ b/config/kernel/linux-meson64-dev.config @@ -1538,6 +1538,8 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_ZRAM_WRITEBACK is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set diff --git a/config/kernel/linux-meson64-next.config b/config/kernel/linux-meson64-next.config index 9ba20f649..f3166bed4 100644 --- a/config/kernel/linux-meson64-next.config +++ b/config/kernel/linux-meson64-next.config @@ -1619,6 +1619,8 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set diff --git a/config/kernel/linux-mvebu-next.config b/config/kernel/linux-mvebu-next.config index b7e4dfd94..6e954364f 100644 --- a/config/kernel/linux-mvebu-next.config +++ b/config/kernel/linux-mvebu-next.config @@ -1689,6 +1689,8 @@ CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set diff --git a/config/kernel/linux-mvebu64-default.config b/config/kernel/linux-mvebu64-default.config index a56476189..d503f8c67 100644 --- a/config/kernel/linux-mvebu64-default.config +++ b/config/kernel/linux-mvebu64-default.config @@ -1601,7 +1601,8 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=m -# CONFIG_ZRAM_LZ4_COMPRESS is not set +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set diff --git a/config/kernel/linux-mvebu64-dev.config b/config/kernel/linux-mvebu64-dev.config index 2972b8dae..06dc19f51 100644 --- a/config/kernel/linux-mvebu64-dev.config +++ b/config/kernel/linux-mvebu64-dev.config @@ -1779,6 +1779,8 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set @@ -4954,7 +4956,7 @@ CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=m # CONFIG_CRYPTO_LZ4HC is not set # diff --git a/config/kernel/linux-mvebu64-next.config b/config/kernel/linux-mvebu64-next.config index d96b7e91d..5e0d436f1 100644 --- a/config/kernel/linux-mvebu64-next.config +++ b/config/kernel/linux-mvebu64-next.config @@ -1793,6 +1793,8 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set @@ -5192,7 +5194,7 @@ CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=m # CONFIG_CRYPTO_LZ4HC is not set # diff --git a/config/kernel/linux-odroidc1-default.config b/config/kernel/linux-odroidc1-default.config index 0befb2530..f07208734 100644 --- a/config/kernel/linux-odroidc1-default.config +++ b/config/kernel/linux-odroidc1-default.config @@ -3822,7 +3822,7 @@ CONFIG_RTS5139_DEBUG=y CONFIG_USB_SERIAL_QUATECH2=m CONFIG_ZSMALLOC=y CONFIG_ZRAM=m -CONFIG_ZRAM_DEBUG=y +# CONFIG_ZRAM_DEBUG is not set CONFIG_USB_ENESTORAGE=m # CONFIG_BCM_WIMAX is not set # CONFIG_FT1000 is not set diff --git a/config/kernel/linux-odroidc2-dev.config b/config/kernel/linux-odroidc2-dev.config index 22bf03e9f..ba5673b0c 100644 --- a/config/kernel/linux-odroidc2-dev.config +++ b/config/kernel/linux-odroidc2-dev.config @@ -505,7 +505,7 @@ CONFIG_ZSWAP=y CONFIG_ZPOOL=y # CONFIG_ZBUD is not set CONFIG_Z3FOLD=m -# CONFIG_ZSMALLOC is not set +CONFIG_ZSMALLOC=y CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_FRAME_VECTOR=y @@ -1518,6 +1518,9 @@ CONFIG_OF_RESERVED_MEM=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-odroidc2-next.config b/config/kernel/linux-odroidc2-next.config index 9ae9545a8..16bb6cfb8 100644 --- a/config/kernel/linux-odroidc2-next.config +++ b/config/kernel/linux-odroidc2-next.config @@ -1556,6 +1556,8 @@ CONFIG_OF_RESERVED_MEM=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-odroidxu4-default.config b/config/kernel/linux-odroidxu4-default.config index b9bbeeb0a..86e6e9aea 100644 --- a/config/kernel/linux-odroidxu4-default.config +++ b/config/kernel/linux-odroidxu4-default.config @@ -3533,7 +3533,7 @@ CONFIG_RTS5139=m # CONFIG_IIO_SIMPLE_DUMMY is not set CONFIG_ZSMALLOC=y CONFIG_ZRAM=m -CONFIG_ZRAM_DEBUG=y +# CONFIG_ZRAM_DEBUG is not set CONFIG_USB_ENESTORAGE=m # CONFIG_BCM_WIMAX is not set # CONFIG_FT1000 is not set diff --git a/config/kernel/linux-odroidxu4-dev.config b/config/kernel/linux-odroidxu4-dev.config index b6a657962..6a392b4f9 100644 --- a/config/kernel/linux-odroidxu4-dev.config +++ b/config/kernel/linux-odroidxu4-dev.config @@ -1611,6 +1611,8 @@ CONFIG_PARPORT=m CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_ZRAM_WRITEBACK is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y diff --git a/config/kernel/linux-odroidxu4-next.config b/config/kernel/linux-odroidxu4-next.config index fa745a5cd..9b31884b7 100644 --- a/config/kernel/linux-odroidxu4-next.config +++ b/config/kernel/linux-odroidxu4-next.config @@ -1624,6 +1624,8 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-rda8810-default.config b/config/kernel/linux-rda8810-default.config index ba58874ec..c37c8dd5d 100644 --- a/config/kernel/linux-rda8810-default.config +++ b/config/kernel/linux-rda8810-default.config @@ -2608,7 +2608,7 @@ CONFIG_STAGING=y # CONFIG_USB_SERIAL_QUATECH2 is not set # CONFIG_VT6656 is not set CONFIG_ZSMALLOC=y -CONFIG_ZRAM=y +CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set # CONFIG_USB_ENESTORAGE is not set # CONFIG_BCM_WIMAX is not set diff --git a/config/kernel/linux-rk3328-default.config b/config/kernel/linux-rk3328-default.config index 11aecf18b..9055879d0 100644 --- a/config/kernel/linux-rk3328-default.config +++ b/config/kernel/linux-rk3328-default.config @@ -1345,7 +1345,7 @@ CONFIG_OF_OVERLAY=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set -CONFIG_ZRAM=y +CONFIG_ZRAM=m CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y diff --git a/config/kernel/linux-rk3328-dev.config b/config/kernel/linux-rk3328-dev.config index bcf5c94e6..719b5d8cc 100644 --- a/config/kernel/linux-rk3328-dev.config +++ b/config/kernel/linux-rk3328-dev.config @@ -508,7 +508,7 @@ CONFIG_ZSWAP=y CONFIG_ZPOOL=y CONFIG_ZBUD=m CONFIG_Z3FOLD=m -CONFIG_ZSMALLOC=m +CONFIG_ZSMALLOC=y # CONFIG_PGTABLE_MAPPING is not set # CONFIG_ZSMALLOC_STAT is not set CONFIG_GENERIC_EARLY_IOREMAP=y @@ -1199,7 +1199,9 @@ CONFIG_OF_NUMA=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set -# CONFIG_ZRAM is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 @@ -4565,7 +4567,7 @@ CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_DEFLATE is not set CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=m # CONFIG_CRYPTO_LZ4HC is not set # diff --git a/config/kernel/linux-rockchip-default.config b/config/kernel/linux-rockchip-default.config index 728f7a379..6be4d178c 100644 --- a/config/kernel/linux-rockchip-default.config +++ b/config/kernel/linux-rockchip-default.config @@ -1244,8 +1244,9 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set -CONFIG_ZRAM=y -# CONFIG_ZRAM_LZ4_COMPRESS is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 @@ -4808,7 +4809,7 @@ CONFIG_CRYPTO_DEFLATE=y # CONFIG_CRYPTO_ZLIB is not set # CONFIG_CRYPTO_LZO is not set # CONFIG_CRYPTO_842 is not set -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=m # CONFIG_CRYPTO_LZ4HC is not set # diff --git a/config/kernel/linux-rockchip-dev.config b/config/kernel/linux-rockchip-dev.config index 7233438ab..9606a8fca 100644 --- a/config/kernel/linux-rockchip-dev.config +++ b/config/kernel/linux-rockchip-dev.config @@ -1320,7 +1320,8 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set -CONFIG_ZRAM=y +CONFIG_ZRAM=m +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_ZRAM_WRITEBACK is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y @@ -5187,7 +5188,7 @@ CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=y # CONFIG_CRYPTO_LZ4HC is not set # diff --git a/config/kernel/linux-rockchip-next.config b/config/kernel/linux-rockchip-next.config index 1be8b1ac9..9125af0c4 100644 --- a/config/kernel/linux-rockchip-next.config +++ b/config/kernel/linux-rockchip-next.config @@ -1397,7 +1397,9 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set -CONFIG_ZRAM=y +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 @@ -5299,7 +5301,7 @@ CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=m # CONFIG_CRYPTO_LZ4HC is not set # diff --git a/config/kernel/linux-s500-default.config b/config/kernel/linux-s500-default.config index a01364b31..5791f4b94 100644 --- a/config/kernel/linux-s500-default.config +++ b/config/kernel/linux-s500-default.config @@ -1101,7 +1101,7 @@ CONFIG_OF_NET=y CONFIG_OF_MDIO=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y -CONFIG_ZRAM=y +CONFIG_ZRAM=m # CONFIG_ZRAM_LZ4_COMPRESS is not set # CONFIG_ZRAM_DEBUG is not set # CONFIG_BLK_DEV_COW_COMMON is not set diff --git a/config/kernel/linux-s5p6818-dev.config b/config/kernel/linux-s5p6818-dev.config index 8766ea874..bbb940c7d 100644 --- a/config/kernel/linux-s5p6818-dev.config +++ b/config/kernel/linux-s5p6818-dev.config @@ -451,7 +451,7 @@ CONFIG_TRANSPARENT_HUGE_PAGECACHE=y # CONFIG_CMA is not set # CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set -# CONFIG_ZSMALLOC is not set +CONFIG_ZSMALLOC=y CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_FRAME_VECTOR=y @@ -1480,6 +1480,9 @@ CONFIG_OF_RESERVED_MEM=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-sun5i-default.config b/config/kernel/linux-sun5i-default.config index c960070e4..35c0c9746 100644 --- a/config/kernel/linux-sun5i-default.config +++ b/config/kernel/linux-sun5i-default.config @@ -1980,6 +1980,9 @@ CONFIG_STAGING=y # CONFIG_LINE6_USB is not set # CONFIG_VT6656 is not set # CONFIG_IIO is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZSMALLOC=y # CONFIG_FB_SM7XX is not set # CONFIG_USB_ENESTORAGE is not set # CONFIG_BCM_WIMAX is not set diff --git a/config/kernel/linux-sun8i-default.config b/config/kernel/linux-sun8i-default.config index e98fb297e..408abdd2c 100644 --- a/config/kernel/linux-sun8i-default.config +++ b/config/kernel/linux-sun8i-default.config @@ -3427,7 +3427,9 @@ CONFIG_R8712U=m # CONFIG_USB_SERIAL_QUATECH_USB2 is not set # CONFIG_VT6656 is not set # CONFIG_IIO is not set -# CONFIG_ZSMALLOC is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZSMALLOC=y # CONFIG_FB_SM7XX is not set # CONFIG_USB_ENESTORAGE is not set # CONFIG_BCM_WIMAX is not set diff --git a/config/kernel/linux-sun8i-dev.config b/config/kernel/linux-sun8i-dev.config index a42c8778d..71ea0430e 100644 --- a/config/kernel/linux-sun8i-dev.config +++ b/config/kernel/linux-sun8i-dev.config @@ -1713,6 +1713,8 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-sunxi-dev.config b/config/kernel/linux-sunxi-dev.config index ef000c09c..8ea630057 100644 --- a/config/kernel/linux-sunxi-dev.config +++ b/config/kernel/linux-sunxi-dev.config @@ -1748,6 +1748,8 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-sunxi-next.config b/config/kernel/linux-sunxi-next.config index 3c655ff47..1e88b098e 100644 --- a/config/kernel/linux-sunxi-next.config +++ b/config/kernel/linux-sunxi-next.config @@ -1778,6 +1778,8 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-sunxi64-dev.config b/config/kernel/linux-sunxi64-dev.config index a71b7dabc..580a75035 100644 --- a/config/kernel/linux-sunxi64-dev.config +++ b/config/kernel/linux-sunxi64-dev.config @@ -1547,6 +1547,8 @@ CONFIG_OF_NUMA=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-sunxi64-next.config b/config/kernel/linux-sunxi64-next.config index af8c0ba81..894717d9f 100644 --- a/config/kernel/linux-sunxi64-next.config +++ b/config/kernel/linux-sunxi64-next.config @@ -1581,6 +1581,8 @@ CONFIG_OF_NUMA=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-udoo-default.config b/config/kernel/linux-udoo-default.config index b53813a07..7559e067a 100644 --- a/config/kernel/linux-udoo-default.config +++ b/config/kernel/linux-udoo-default.config @@ -1233,6 +1233,7 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 @@ -4082,7 +4083,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y CONFIG_CRYPTO_DEFLATE=m # CONFIG_CRYPTO_ZLIB is not set CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=y # CONFIG_CRYPTO_LZ4HC is not set # diff --git a/config/kernel/linux-udoo-dev.config b/config/kernel/linux-udoo-dev.config index b67b99171..8ae6f947b 100644 --- a/config/kernel/linux-udoo-dev.config +++ b/config/kernel/linux-udoo-dev.config @@ -1416,7 +1416,9 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set -# CONFIG_ZRAM is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/config/kernel/linux-udoo-neo-default.config b/config/kernel/linux-udoo-neo-default.config index a9067f9cb..e4ac7b724 100644 --- a/config/kernel/linux-udoo-neo-default.config +++ b/config/kernel/linux-udoo-neo-default.config @@ -1192,6 +1192,7 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 @@ -4025,7 +4026,7 @@ CONFIG_CRYPTO_TWOFISH_COMMON=y CONFIG_CRYPTO_DEFLATE=m # CONFIG_CRYPTO_ZLIB is not set CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_LZ4 is not set +CONFIG_CRYPTO_LZ4=y # CONFIG_CRYPTO_LZ4HC is not set # diff --git a/config/kernel/linux-udoo-next.config b/config/kernel/linux-udoo-next.config index ef1eb808d..b8de00795 100644 --- a/config/kernel/linux-udoo-next.config +++ b/config/kernel/linux-udoo-next.config @@ -1307,7 +1307,9 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set -# CONFIG_ZRAM is not set +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZRAM_LZ4_COMPRESS=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 diff --git a/lib/configuration.sh b/lib/configuration.sh index 3d8383c20..56be743df 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -148,7 +148,7 @@ case $RELEASE in PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mozo pluma iceweasel policykit-1-gnome eject" ;; xenial) - PACKAGE_LIST_RELEASE="man-db wget nano linux-firmware" + PACKAGE_LIST_RELEASE="man-db wget nano linux-firmware zram-config" PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP thunderbird chromium-browser gnome-icon-theme-full tango-icon-theme language-selector-gnome paprefs numix-gtk-theme" [[ $ARCH == armhf ]] && PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP mate-utils ubuntu-mate-welcome mate-settings-daemon" ;; diff --git a/lib/main.sh b/lib/main.sh index 70c9e1bb2..917ed6aea 100644 --- a/lib/main.sh +++ b/lib/main.sh @@ -213,7 +213,7 @@ fi if [[ $KERNEL_ONLY != yes && -z $RELEASE ]]; then options=() options+=("jessie" "Debian 8 Jessie") - [[ $EXPERT == yes && $CAN_BUILD_STRETCH == yes ]] && options+=("stretch" "Debian 9 Stretch") + [[ $CAN_BUILD_STRETCH == yes ]] && options+=("stretch" "Debian 9 Stretch") options+=("xenial" "Ubuntu Xenial 16.04 LTS") RELEASE=$(dialog --stdout --title "Choose a release" --backtitle "$backtitle" --menu "Select the target OS release" \ $TTY_Y $TTY_X $(($TTY_Y - 8)) "${options[@]}") diff --git a/packages/bsp/common/etc/init.d/firstrun b/packages/bsp/common/etc/init.d/firstrun index 9558d937e..c6be80813 100755 --- a/packages/bsp/common/etc/init.d/firstrun +++ b/packages/bsp/common/etc/init.d/firstrun @@ -193,6 +193,7 @@ case "$1" in # update console info setupcon --save + # SSH Keys creation rm -f /etc/ssh/ssh_host* read entropy_before >${Log} - FREESIZE=$(( $(findmnt --target / -n -o AVAIL -b) / 1048576 )) # MiB - SWAPFILE=/var/swap - if [[ ! -f $SWAPFILE && $FREESIZE -gt 132 ]]; then - fallocate -l 128M $SWAPFILE || dd if=/dev/zero of=$SWAPFILE bs=1M count=128 status=noxfer - chown root:root $SWAPFILE - chmod 0600 $SWAPFILE - mkswap $SWAPFILE - swapon $SWAPFILE - grep -q swap /etc/fstab || echo "$SWAPFILE none swap sw 0 0" >> /etc/fstab - echo -e "\n### [firstrun] Created 128MB emergency swap as $SWAPFILE" >>${Log} - fi - # set vm.swappiness to 0 (even with a btrfs rootfs) - grep -q 'vm.swappiness' /etc/sysctl.conf || echo "vm.swappiness=0" >> /etc/sysctl.conf + + # set up swap preferring zram if available over swapfile + dpkg -l | grep -q 'zram-config' + case $? in + 0) + echo -e "\n### [firstrun] Skipped swapfile creation since zram is available" >>${Log} + ;; + *) + FREESIZE=$(( $(findmnt --target / -n -o AVAIL -b) / 1048576 )) # MiB + SWAPFILE=/var/swap + if [[ ! -f $SWAPFILE && $FREESIZE -gt 132 ]]; then + fallocate -l 128M $SWAPFILE || dd if=/dev/zero of=$SWAPFILE bs=1M count=128 status=noxfer + chown root:root $SWAPFILE + chmod 0600 $SWAPFILE + mkswap $SWAPFILE + swapon $SWAPFILE + grep -q swap /etc/fstab || echo "$SWAPFILE none swap sw 0 0" >> /etc/fstab + echo -e "\n### [firstrun] Created 128MB emergency swap as $SWAPFILE" >>${Log} + fi + # set vm.swappiness to 0 (even with a btrfs rootfs) + grep -q 'vm.swappiness' /etc/sysctl.conf || echo "vm.swappiness=0" >> /etc/sysctl.conf + ;; + esac # get rid of purple background color in newt apps whiptail, partimage, debconf ... Reverting to Debian look. sed -e 's/magenta/blue/g' -i /etc/newt/palette diff --git a/packages/bsp/common/usr/sbin/nand-sata-install b/packages/bsp/common/usr/sbin/nand-sata-install index ede0b1996..0483cd36e 100755 --- a/packages/bsp/common/usr/sbin/nand-sata-install +++ b/packages/bsp/common/usr/sbin/nand-sata-install @@ -210,8 +210,8 @@ create_armbian() if [[ $eMMCFilesystemChoosen == "btrfs" ]]; then echo "$targetuuid / $choosen_fs ${mountopts[$choosen_fs]}" >> ${TempDir}/rootfs/etc/fstab - # swap file not supported under btrfs, we made a partition - sed -e 's,/var/swap.*,'$emmcswapuuid' none swap sw 0 0,g' -i ${TempDir}/rootfs/etc/fstab + # swap file not supported under btrfs but we might have made a partition + [[ -n ${emmcswapuuid} ]] && sed -e 's,/var/swap.*,'$emmcswapuuid' none swap sw 0 0,g' -i ${TempDir}/rootfs/etc/fstab sed -e 's,rootfstype=.*,rootfstype='$eMMCFilesystemChoosen',g' -i ${TempDir}/bootfs/boot/armbianEnv.txt else sed -e 's,rootfstype=.*,rootfstype='$choosen_fs',g' -i ${TempDir}/bootfs/boot/armbianEnv.txt @@ -249,9 +249,11 @@ create_armbian() echo "${root_uuid} /media/mmcboot ext4 ${mountopts[ext4]}" >> ${TempDir}/rootfs/etc/fstab echo "/media/mmcboot/boot /boot none bind 0 0" >> ${TempDir}/rootfs/etc/fstab echo "$satauuid / $FilesystemChoosen ${mountopts[$FilesystemChoosen]}" >> ${TempDir}/rootfs/etc/fstab - # recreate swap file - fallocate -l 128M ${TempDir}/rootfs/var/swap || dd if=/dev/zero of=${TempDir}/rootfs/var/swap bs=1M count=128 status=noxfer - mkswap ${TempDir}/rootfs/var/swap + # recreate swap file if already existing (might be missing since zram only) + if [ -f /var/swap ]; then + fallocate -l 128M ${TempDir}/rootfs/var/swap || dd if=/dev/zero of=${TempDir}/rootfs/var/swap bs=1M count=128 status=noxfer + mkswap ${TempDir}/rootfs/var/swap + fi fi # recreate OMV mounts at destination if needed @@ -363,17 +365,33 @@ formatemmc() dialog --title "$title" --backtitle "$backtitle" --infobox "\nFormating $1 to $eMMCFilesystemChoosen ... please wait." 5 60 # we can't boot from btrfs if [[ $eMMCFilesystemChoosen == "btrfs" ]]; then - parted -s $1 -- mkpart primary $eMMCFilesystemChoosen 8192s 139263s - parted -s $1 -- mkpart primary $eMMCFilesystemChoosen 139264s 401407s - parted -s $1 -- mkpart primary $eMMCFilesystemChoosen 401408s ${LASTSECTOR}s - partprobe $1 - mkfs.ext4 ${mkopts[ext4]} $1"p1" >> $logfile 2>&1 - mkswap $1"p2" >> $logfile 2>&1 - mkfs.btrfs $1"p3" ${mkopts[$eMMCFilesystemChoosen]} >> $logfile 2>&1 - emmcbootuuid=$(blkid -o export $1"p1" | grep -w UUID) - emmcswapuuid=$(blkid -o export $1"p2" | grep -w UUID) - emmcuuid=$(blkid -o export $1"p3" | grep -w UUID) - dest_root=$emmccheck"p3" + # check whether swap is currently defined and a new swap partition is needed + grep -q swap /etc/fstab + case $? in + 0) + parted -s $1 -- mkpart primary $eMMCFilesystemChoosen 8192s 139263s + parted -s $1 -- mkpart primary $eMMCFilesystemChoosen 139264s 401407s + parted -s $1 -- mkpart primary $eMMCFilesystemChoosen 401408s ${LASTSECTOR}s + partprobe $1 + mkfs.ext4 ${mkopts[ext4]} $1"p1" >> $logfile 2>&1 + mkswap $1"p2" >> $logfile 2>&1 + mkfs.btrfs $1"p3" ${mkopts[$eMMCFilesystemChoosen]} >> $logfile 2>&1 + emmcbootuuid=$(blkid -o export $1"p1" | grep -w UUID) + emmcswapuuid=$(blkid -o export $1"p2" | grep -w UUID) + emmcuuid=$(blkid -o export $1"p3" | grep -w UUID) + dest_root=$emmccheck"p3" + ;; + *) + parted -s $1 -- mkpart primary $eMMCFilesystemChoosen 8192s 139263s + parted -s $1 -- mkpart primary $eMMCFilesystemChoosen 139264s ${LASTSECTOR}s + partprobe $1 + mkfs.ext4 ${mkopts[ext4]} $1"p1" >> $logfile 2>&1 + mkfs.btrfs $1"p2" ${mkopts[$eMMCFilesystemChoosen]} >> $logfile 2>&1 + emmcbootuuid=$(blkid -o export $1"p1" | grep -w UUID) + emmcuuid=$(blkid -o export $1"p2" | grep -w UUID) + dest_root=$emmccheck"p2" + ;; + esac else parted -s $1 -- mkpart primary $eMMCFilesystemChoosen 8192s ${LASTSECTOR}s partprobe $1