From 0f004a7a54a2053cf419ab8e6029fc1edc10dc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 7 May 2013 11:36:12 +0400 Subject: [PATCH] Update changes for kernel config --- .../3.8/zzz-config-desktop-bfq-tuxonice | 18 ++++++++ .../3.8/zzz-config-desktop-bfq-tuxonice.patch | 44 ------------------- 2 files changed, 18 insertions(+), 44 deletions(-) create mode 100644 profiles/templates/3.1/6_ac_install_patch/sys-kernel/calculate-sources/3.8/zzz-config-desktop-bfq-tuxonice delete mode 100644 profiles/templates/3.1/6_ac_install_patch/sys-kernel/calculate-sources/3.8/zzz-config-desktop-bfq-tuxonice.patch diff --git a/profiles/templates/3.1/6_ac_install_patch/sys-kernel/calculate-sources/3.8/zzz-config-desktop-bfq-tuxonice b/profiles/templates/3.1/6_ac_install_patch/sys-kernel/calculate-sources/3.8/zzz-config-desktop-bfq-tuxonice new file mode 100644 index 000000000..b1454c479 --- /dev/null +++ b/profiles/templates/3.1/6_ac_install_patch/sys-kernel/calculate-sources/3.8/zzz-config-desktop-bfq-tuxonice @@ -0,0 +1,18 @@ +# Calculate format=openrc os_linux_system==desktop name=.config +CONFIG_IOSCHED_BFQ=y +CONFIG_CGROUP_BFQIO=y +CONFIG_DEFAULT_BFQ=n +CONFIG_TOI_CORE=y +CONFIG_TOI_FILE=y +CONFIG_TOI_SWAP=y +CONFIG_TOI_CRYPTO=y +CONFIG_TOI_USERUI=n +CONFIG_TOI_DEFAULT_IMAGE_SIZE_LIMIT=-2 +CONFIG_TOI_KEEP_IMAGE=n +CONFIG_TOI_REPLACE_SWSUSP=y +CONFIG_TOI_IGNORE_LATE_INITCALL=y +CONFIG_TOI_DEFAULT_WAIT=25 +CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=2000 +CONFIG_TOI_CHECKSUM=y +CONFIG_TOI=y +CONFIG_TOI_ZRAM_SUPPORT=y diff --git a/profiles/templates/3.1/6_ac_install_patch/sys-kernel/calculate-sources/3.8/zzz-config-desktop-bfq-tuxonice.patch b/profiles/templates/3.1/6_ac_install_patch/sys-kernel/calculate-sources/3.8/zzz-config-desktop-bfq-tuxonice.patch deleted file mode 100644 index 28d71e4a2..000000000 --- a/profiles/templates/3.1/6_ac_install_patch/sys-kernel/calculate-sources/3.8/zzz-config-desktop-bfq-tuxonice.patch +++ /dev/null @@ -1,44 +0,0 @@ -# Calculate format=diff os_linux_system==desktop ---- .config.orig 2013-02-18 14:27:13.773480200 +0400 -+++ .config 2013-02-27 16:37:47.238816225 +0400 -@@ -288,8 +289,11 @@ - CONFIG_IOSCHED_NOOP=y - CONFIG_IOSCHED_DEADLINE=y - CONFIG_IOSCHED_CFQ=y -+CONFIG_IOSCHED_BFQ=y -+CONFIG_CGROUP_BFQIO=y - # CONFIG_DEFAULT_DEADLINE is not set - CONFIG_DEFAULT_CFQ=y -+# CONFIG_DEFAULT_BFQ is not set - # CONFIG_DEFAULT_NOOP is not set - CONFIG_DEFAULT_IOSCHED="cfq" - CONFIG_PREEMPT_NOTIFIERS=y -@@ -461,6 +465,28 @@ - CONFIG_HIBERNATE_CALLBACKS=y - CONFIG_HIBERNATION=y - CONFIG_PM_STD_PARTITION="" -+CONFIG_TOI_CORE=y -+ -+# -+# Image Storage (you need at least one allocator) -+# -+CONFIG_TOI_FILE=y -+CONFIG_TOI_SWAP=y -+ -+# -+# General Options -+# -+CONFIG_TOI_CRYPTO=y -+# CONFIG_TOI_USERUI is not set -+CONFIG_TOI_DEFAULT_IMAGE_SIZE_LIMIT=-2 -+# CONFIG_TOI_KEEP_IMAGE is not set -+CONFIG_TOI_REPLACE_SWSUSP=y -+CONFIG_TOI_IGNORE_LATE_INITCALL=y -+CONFIG_TOI_DEFAULT_WAIT=25 -+CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=2000 -+CONFIG_TOI_CHECKSUM=y -+CONFIG_TOI=y -+CONFIG_TOI_ZRAM_SUPPORT=y - CONFIG_PM_SLEEP=y - CONFIG_PM_SLEEP_SMP=y - # CONFIG_PM_AUTOSLEEP is not set