diff --git a/PKGBUILD b/PKGBUILD index 7b7c06a..f34e4ca 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,13 +17,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' - 'change-default-console-loglevel.patch') -md5sums=('4f25cd5bec5f8d5a7d935b3f2ccb8481' - '6366a8d4b0429ab6836c296ba298fb0e' - '09aad29932fe0d1aa765b314800db9a8' - '4360abfcf235aec738a313cca0421932' - 'eb14dcfd80c00852ef81ded6e826826a' - 'f3def2cefdcbb954c21d8505d23cc83c') + 'change-default-console-loglevel.patch' + 'criu-no-expert.patch') _kernelname=${pkgbase#linux} @@ -47,6 +42,10 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # allow criu without expert option set + # patch from fedora + patch -Np1 -i "${srcdir}/criu-no-expert.patch" + if [ "${CARCH}" = "x86_64" ]; then cat "${srcdir}/config.x86_64" > ./.config else @@ -327,3 +326,16 @@ for _p in ${pkgname[@]}; do done # vim:set ts=8 sts=2 sw=2 et: +md5sums=('4f25cd5bec5f8d5a7d935b3f2ccb8481' + '6366a8d4b0429ab6836c296ba298fb0e' + '09aad29932fe0d1aa765b314800db9a8' + '1e3e8aaf0dd56131ccfcee05695b0109' + 'eb14dcfd80c00852ef81ded6e826826a' + 'f3def2cefdcbb954c21d8505d23cc83c') +md5sums=('4f25cd5bec5f8d5a7d935b3f2ccb8481' + '6366a8d4b0429ab6836c296ba298fb0e' + '09aad29932fe0d1aa765b314800db9a8' + '5ffd739d5b3e7c68bf07472aaceca400' + 'eb14dcfd80c00852ef81ded6e826826a' + 'f3def2cefdcbb954c21d8505d23cc83c' + 'd50c1ac47394e9aec637002ef3392bd1') diff --git a/config.x86_64 b/config.x86_64 index 44c0958..de9328c 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -164,7 +164,7 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set -# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_CHECKPOINT_RESTORE=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y diff --git a/criu-no-expert.patch b/criu-no-expert.patch new file mode 100644 index 0000000..2124427 --- /dev/null +++ b/criu-no-expert.patch @@ -0,0 +1,22 @@ +diff --git a/init/Kconfig b/init/Kconfig +index be8b7f5..7461760 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP + endif # CGROUPS + + config CHECKPOINT_RESTORE +- bool "Checkpoint/restore support" if EXPERT ++ bool "Checkpoint/restore support" + default n + help + Enables additional kernel features in a sake of checkpoint/restore. +@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE + If unsure, say N here. + + menuconfig NAMESPACES +- bool "Namespaces support" if EXPERT ++ bool "Namespaces support" + default !EXPERT + help + Provides the way to make tasks work with different objects using