fix CHECKPOINT_RESTORE

This commit is contained in:
Tobias Powalowski 2013-08-09 11:03:30 +00:00
parent f7ecf66c63
commit a8d14f78a1
3 changed files with 42 additions and 8 deletions

View File

@ -17,13 +17,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
'config' 'config.x86_64' 'config' 'config.x86_64'
# standard config files for mkinitcpio ramdisk # standard config files for mkinitcpio ramdisk
'linux.preset' 'linux.preset'
'change-default-console-loglevel.patch') 'change-default-console-loglevel.patch'
md5sums=('4f25cd5bec5f8d5a7d935b3f2ccb8481' 'criu-no-expert.patch')
'6366a8d4b0429ab6836c296ba298fb0e'
'09aad29932fe0d1aa765b314800db9a8'
'4360abfcf235aec738a313cca0421932'
'eb14dcfd80c00852ef81ded6e826826a'
'f3def2cefdcbb954c21d8505d23cc83c')
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
@ -47,6 +42,10 @@ prepare() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" 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 if [ "${CARCH}" = "x86_64" ]; then
cat "${srcdir}/config.x86_64" > ./.config cat "${srcdir}/config.x86_64" > ./.config
else else
@ -327,3 +326,16 @@ for _p in ${pkgname[@]}; do
done done
# vim:set ts=8 sts=2 sw=2 et: # vim:set ts=8 sts=2 sw=2 et:
md5sums=('4f25cd5bec5f8d5a7d935b3f2ccb8481'
'6366a8d4b0429ab6836c296ba298fb0e'
'09aad29932fe0d1aa765b314800db9a8'
'1e3e8aaf0dd56131ccfcee05695b0109'
'eb14dcfd80c00852ef81ded6e826826a'
'f3def2cefdcbb954c21d8505d23cc83c')
md5sums=('4f25cd5bec5f8d5a7d935b3f2ccb8481'
'6366a8d4b0429ab6836c296ba298fb0e'
'09aad29932fe0d1aa765b314800db9a8'
'5ffd739d5b3e7c68bf07472aaceca400'
'eb14dcfd80c00852ef81ded6e826826a'
'f3def2cefdcbb954c21d8505d23cc83c'
'd50c1ac47394e9aec637002ef3392bd1')

View File

@ -164,7 +164,7 @@ CONFIG_CFS_BANDWIDTH=y
CONFIG_RT_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y
CONFIG_BLK_CGROUP=y CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_DEBUG_BLK_CGROUP is not set
# CONFIG_CHECKPOINT_RESTORE is not set CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y CONFIG_UTS_NS=y
CONFIG_IPC_NS=y CONFIG_IPC_NS=y

22
criu-no-expert.patch Normal file
View File

@ -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