From c24a91d307ea7f2a37e0a3858cab6ba69142761e Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 30 Aug 2007 18:27:35 +0000 Subject: [PATCH] Removing the suspend support that was added for bug #156445 until suspend is added to the tree and we can determine the proper way to support it. For more information, see bug #156431. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@531 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 8 + gen_cmdline.sh | 24 +-- gen_compile.sh | 64 +++---- gen_configkernel.sh | 8 +- gen_determineargs.sh | 16 +- gen_initramfs.sh | 36 ++-- generic/initrd.scripts | 18 +- generic/linuxrc | 2 +- genkernel | 2 +- genkernel.conf | 8 +- pkg/genkernel-svn-suspend.patch | 288 ++++++++++++++++++++++++++++++++ 11 files changed, 385 insertions(+), 89 deletions(-) create mode 100644 pkg/genkernel-svn-suspend.patch diff --git a/ChangeLog b/ChangeLog index 9101e11..1b7fd42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Aug 2007; Chris Gianelloni gen_cmdline.sh, + gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh, + gen_initramfs.sh, generic/initrd.scripts, generic/linuxrc, genkernel, + genkernel.conf, +pkg/genkernel-svn-suspend.patch: + Removing the suspend support that was added for bug #156445 until suspend is + added to the tree and we can determine the proper way to support it. For + more information, see bug #156431. + 22 Aug 2007; Chris Gianelloni x86/kernel-config-2.6, x86_64/kernel-config-2.6, genkernel: Removed CONFIG_PHYSICAL_START from the x86/amd64 kernel configs for bug diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 7a2a076..7d75d95 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -79,7 +79,7 @@ longusage() { echo " --lvm2 Include LVM2 support" # echo " --unionfs Include UNIONFS support" echo " --dmraid Include DMRAID support" - echo " --suspend Include userspace suspend/resume (uswsusp) support" +# echo " --suspend Include userspace suspend/resume (uswsusp) support" echo " --slowusb Enables extra pauses for slow USB CD boots" echo " --bootloader=grub Add new kernel to GRUB configuration" echo " --linuxrc= Specifies a user created linuxrc" @@ -231,17 +231,17 @@ parse_cmdline() { CMD_LVM2=1 print_info 2 "CMD_LVM2: $CMD_LVM2" ;; - --suspend) - if [ ! -e /etc/suspend.conf ] - then - echo 'Error: --suspend requires sys-power/suspend to be installed' - echo ' on the host system; try "emerge sys-power/suspend".' - echo ' Once installed, configure the resume settings in /etc/suspend.conf' - exit 1 - fi - CMD_SUSPEND=1 - print_info 2 "CMD_SUSPEND: $CMD_SUSPEND" - ;; +# --suspend) +# if [ ! -e /etc/suspend.conf ] +# then +# echo 'Error: --suspend requires sys-power/suspend to be installed' +# echo ' on the host system; try "emerge sys-power/suspend".' +# echo ' Once installed, configure the resume settings in /etc/suspend.conf' +# exit 1 +# fi +# CMD_SUSPEND=1 +# print_info 2 "CMD_SUSPEND: $CMD_SUSPEND" +# ;; --no-busybox) CMD_NO_BUSYBOX=1 print_info 2 "CMD_NO_BUSYBOX: $CMD_NO_BUSYBOX" diff --git a/gen_compile.sh b/gen_compile.sh index 665e2d1..0e3b319 100644 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -560,38 +560,38 @@ compile_dmraid() { fi } -compile_suspend() { - [ -f "${SUSPEND_BINCACHE}" ] && return - [ -f "${SUSPEND_SRCTAR}" ] || - gen_die "Could not find SUSPEND source tarball: ${SUSPEND_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!" - cd ${TEMP} - rm -rf ${SUSPEND_DIR} > /dev/null - /bin/tar -zxpf ${SUSPEND_SRCTAR} || - gen_die 'Could not extract SUSPEND source tarball!' - [ -d "${SUSPEND_DIR}" ] || - gen_die "SUSPEND directory ${DMRAID_DIR} is invalid!" - - cd "${SUSPEND_DIR}" - if [ -f "${GK_SHARE}/pkg/suspend-0.5-Makefile.patch" ] - then - patch -p1 -i \ - ${GK_SHARE}/pkg/suspend-0.5-Makefile.patch \ - || gen_die "Failed patching suspend" - fi - - print_info 1 'suspend: >> Compiling...' - compile_generic '' utils CC_FLAGS= LD_FLAGS= - - print_info 1 ' >> Copying to bincache...' - mkdir -p "${TEMP}/bincache/sbin" - cp -f resume "${TEMP}/bincache/sbin" || - gen_die 'Could not copy resume binary' - cd "${TEMP}/bincache" - /bin/tar -cjf "${SUSPEND_BINCACHE}" * || - gen_die 'Could not create suspend binary cache' - cd "${TEMP}" - rm -rf bincache suspend-0.5 -} +#compile_suspend() { +# [ -f "${SUSPEND_BINCACHE}" ] && return +# [ -f "${SUSPEND_SRCTAR}" ] || +# gen_die "Could not find SUSPEND source tarball: ${SUSPEND_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!" +# cd ${TEMP} +# rm -rf ${SUSPEND_DIR} > /dev/null +# /bin/tar -zxpf ${SUSPEND_SRCTAR} || +# gen_die 'Could not extract SUSPEND source tarball!' +# [ -d "${SUSPEND_DIR}" ] || +# gen_die "SUSPEND directory ${DMRAID_DIR} is invalid!" + +# cd "${SUSPEND_DIR}" +# if [ -f "${GK_SHARE}/pkg/suspend-0.5-Makefile.patch" ] +# then +# patch -p1 -i \ +# ${GK_SHARE}/pkg/suspend-0.5-Makefile.patch \ +# || gen_die "Failed patching suspend" +# fi + +# print_info 1 'suspend: >> Compiling...' +# compile_generic '' utils CC_FLAGS= LD_FLAGS= + +# print_info 1 ' >> Copying to bincache...' +# mkdir -p "${TEMP}/bincache/sbin" +# cp -f resume "${TEMP}/bincache/sbin" || +# gen_die 'Could not copy resume binary' +# cd "${TEMP}/bincache" +# /bin/tar -cjf "${SUSPEND_BINCACHE}" * || +# gen_die 'Could not create suspend binary cache' +# cd "${TEMP}" +# rm -rf bincache suspend-0.5 +#} compile_devfsd() { # I've disabled dietlibc support for the time being since the diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 44ed630..b984b8e 100644 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -122,9 +122,9 @@ config_kernel() { fi # This check isn't complete: SOFTWARE_SUSPEND has extra deps on some systems such as CPU hotplug - if isTrue ${CMD_SUSPEND} - then - sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_SOFTWARE_SUSPEND is.*/CONFIG_SOFTWARE_SUSPEND=y/g' - fi +# if isTrue ${CMD_SUSPEND} +# then +# sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_SOFTWARE_SUSPEND is.*/CONFIG_SOFTWARE_SUSPEND=y/g' +# fi } diff --git a/gen_determineargs.sh b/gen_determineargs.sh index 0938737..963e077 100644 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -209,7 +209,7 @@ determine_real_args() { UNIONFS_BINCACHE=`cache_replace "${UNIONFS_BINCACHE}"` UNIONFS_MODULES_BINCACHE=`cache_replace "${UNIONFS_MODULES_BINCACHE}"` BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"` - SUSPEND_BINCACHE=`cache_replace "${SUSPEND_BINCACHE}"` +# SUSPEND_BINCACHE=`cache_replace "${SUSPEND_BINCACHE}"` DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"` BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"` @@ -226,7 +226,7 @@ determine_real_args() { UNIONFS_BINCACHE=`arch_replace "${UNIONFS_BINCACHE}"` UNIONFS_MODULES_BINCACHE=`arch_replace "${UNIONFS_MODULES_BINCACHE}"` BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"` - SUSPEND_BINCACHE=`arch_replace "${SUSPEND_BINCACHE}"` +# SUSPEND_BINCACHE=`arch_replace "${SUSPEND_BINCACHE}"` if [ "${CMD_BOOTSPLASH}" != '' ] then @@ -433,12 +433,12 @@ determine_real_args() { LVM2=0 fi - if isTrue "${CMD_SUSPEND}" - then - SUSPEND=1 - else - SUSPEND=0 - fi +# if isTrue "${CMD_SUSPEND}" +# then +# SUSPEND=1 +# else +# SUSPEND=0 +# fi if isTrue "${CMD_EVMS2}" then diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 11376da..3cff7cc 100644 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -148,23 +148,23 @@ append_unionfs_tools(){ rm -r "${TEMP}/initramfs-unionfs-tools-temp/" } -append_suspend(){ - if [ -d "${TEMP}/initramfs-suspend-temp" ]; - then - rm -r "${TEMP}/initramfs-suspend-temp/" - fi - print_info 1 'SUSPEND: Adding support (compiling binaries)...' - compile_suspend - mkdir -p "${TEMP}/initramfs-suspend-temp/" - /bin/tar -jxpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initramfs-suspend-temp" || - gen_die "Could not extract suspend binary cache!" - mkdir -p "${TEMP}/initramfs-suspend-temp/etc" - cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" || - gen_die 'Could not copy /etc/suspend.conf' - cd "${TEMP}/initramfs-suspend-temp/" - find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" - rm -r "${TEMP}/initramfs-suspend-temp/" -} +#append_suspend(){ +# if [ -d "${TEMP}/initramfs-suspend-temp" ]; +# then +# rm -r "${TEMP}/initramfs-suspend-temp/" +# fi +# print_info 1 'SUSPEND: Adding support (compiling binaries)...' +# compile_suspend +# mkdir -p "${TEMP}/initramfs-suspend-temp/" +# /bin/tar -jxpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initramfs-suspend-temp" || +# gen_die "Could not extract suspend binary cache!" +# mkdir -p "${TEMP}/initramfs-suspend-temp/etc" +# cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" || +# gen_die 'Could not copy /etc/suspend.conf' +# cd "${TEMP}/initramfs-suspend-temp/" +# find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" +# rm -r "${TEMP}/initramfs-suspend-temp/" +#} append_dmraid(){ if [ -d "${TEMP}/initramfs-dmraid-temp" ] @@ -478,7 +478,7 @@ create_initramfs() { # append_data 'udev' "${UDEV}" append_data 'unionfs_modules' "${UNIONFS}" append_data 'unionfs_tools' "${UNIONFS}" - append_data 'suspend' "${SUSPEND}" +# append_data 'suspend' "${SUSPEND}" append_data 'lvm2' "${LVM2}" append_data 'dmraid' "${DMRAID}" append_data 'evms2' "${EVMS2}" diff --git a/generic/initrd.scripts b/generic/initrd.scripts index 2a03d81..dda77c8 100644 --- a/generic/initrd.scripts +++ b/generic/initrd.scripts @@ -847,17 +847,17 @@ setup_unionfs() { fi } -suspend_resume() { - [ -x /sbin/resume ] || return 0 - /sbin/resume - local ret=$? +#suspend_resume() { +# [ -x /sbin/resume ] || return 0 +# /sbin/resume +# local ret=$? - if [ "${ret}" -eq 0 ]; then - exit 0 - fi +# if [ "${ret}" -eq 0 ]; then +# exit 0 +# fi - return 0 -} +# return 0 +#} suspend2_resume() { if [ -d /proc/suspend2 ] || [ -d /sys/power/suspend2 ]; then diff --git a/generic/linuxrc b/generic/linuxrc index 269a27e..7d017e8 100644 --- a/generic/linuxrc +++ b/generic/linuxrc @@ -256,7 +256,7 @@ fi # Run debug shell if requested rundebugshell -suspend_resume +#suspend_resume suspend2_resume if [ "${CDROOT}" -eq '1' ] diff --git a/genkernel b/genkernel index 6fb88d0..bfacd64 100755 --- a/genkernel +++ b/genkernel @@ -2,7 +2,7 @@ # Genkernel v3 PATH="/bin:/usr/bin:/sbin:/usr/sbin" -GK_V='3.4.9_pre1' +GK_V='3.4.9_pre2' # Set the default for TMPDIR. May be modified by genkernel.conf or the # --tempdir command line option. diff --git a/genkernel.conf b/genkernel.conf index 2c01b55..b6ea102 100755 --- a/genkernel.conf +++ b/genkernel.conf @@ -132,8 +132,8 @@ E2FSPROGS_DIR="e2fsprogs-${E2FSPROGS_VER}" E2FSPROGS_SRCTAR="${GK_SHARE}/pkg/e2fsprogs-${E2FSPROGS_VER}.tar.gz" BLKID_BINCACHE="%%CACHE%%/blkid-${E2FSPROGS_VER}-%%ARCH%%.bz2" -SUSPEND_VER="VERSION_SUSPEND" -SUSPEND_DIR="suspend-${SUSPEND_VER}" -SUSPEND_SRCTAR="${GK_SHARE}/pkg/suspend-${SUSPEND_VER}.tar.gz" -SUSPEND_BINCACHE="%%CACHE%%/suspend-${SUSPEND_VER}-%%ARCH%%.tar.bz2" +#SUSPEND_VER="VERSION_SUSPEND" +#SUSPEND_DIR="suspend-${SUSPEND_VER}" +#SUSPEND_SRCTAR="${GK_SHARE}/pkg/suspend-${SUSPEND_VER}.tar.gz" +#SUSPEND_BINCACHE="%%CACHE%%/suspend-${SUSPEND_VER}-%%ARCH%%.tar.bz2" diff --git a/pkg/genkernel-svn-suspend.patch b/pkg/genkernel-svn-suspend.patch new file mode 100644 index 0000000..c057c0d --- /dev/null +++ b/pkg/genkernel-svn-suspend.patch @@ -0,0 +1,288 @@ +Index: gen_compile.sh +=================================================================== +--- gen_compile.sh (revision 528) ++++ gen_compile.sh (working copy) +@@ -560,38 +560,38 @@ + fi + } + +-compile_suspend() { +- [ -f "${SUSPEND_BINCACHE}" ] && return +- [ -f "${SUSPEND_SRCTAR}" ] || +- gen_die "Could not find SUSPEND source tarball: ${SUSPEND_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!" +- cd ${TEMP} +- rm -rf ${SUSPEND_DIR} > /dev/null +- /bin/tar -zxpf ${SUSPEND_SRCTAR} || +- gen_die 'Could not extract SUSPEND source tarball!' +- [ -d "${SUSPEND_DIR}" ] || +- gen_die "SUSPEND directory ${DMRAID_DIR} is invalid!" ++#compile_suspend() { ++# [ -f "${SUSPEND_BINCACHE}" ] && return ++# [ -f "${SUSPEND_SRCTAR}" ] || ++# gen_die "Could not find SUSPEND source tarball: ${SUSPEND_SRCTAR}! Please place it there, or place another version, changing /etc/genkernel.conf as necessary!" ++# cd ${TEMP} ++# rm -rf ${SUSPEND_DIR} > /dev/null ++# /bin/tar -zxpf ${SUSPEND_SRCTAR} || ++# gen_die 'Could not extract SUSPEND source tarball!' ++# [ -d "${SUSPEND_DIR}" ] || ++# gen_die "SUSPEND directory ${DMRAID_DIR} is invalid!" + +- cd "${SUSPEND_DIR}" +- if [ -f "${GK_SHARE}/pkg/suspend-0.5-Makefile.patch" ] +- then +- patch -p1 -i \ +- ${GK_SHARE}/pkg/suspend-0.5-Makefile.patch \ +- || gen_die "Failed patching suspend" +- fi ++# cd "${SUSPEND_DIR}" ++# if [ -f "${GK_SHARE}/pkg/suspend-0.5-Makefile.patch" ] ++# then ++# patch -p1 -i \ ++# ${GK_SHARE}/pkg/suspend-0.5-Makefile.patch \ ++# || gen_die "Failed patching suspend" ++# fi + +- print_info 1 'suspend: >> Compiling...' +- compile_generic '' utils CC_FLAGS= LD_FLAGS= ++# print_info 1 'suspend: >> Compiling...' ++# compile_generic '' utils CC_FLAGS= LD_FLAGS= + +- print_info 1 ' >> Copying to bincache...' +- mkdir -p "${TEMP}/bincache/sbin" +- cp -f resume "${TEMP}/bincache/sbin" || +- gen_die 'Could not copy resume binary' +- cd "${TEMP}/bincache" +- /bin/tar -cjf "${SUSPEND_BINCACHE}" * || +- gen_die 'Could not create suspend binary cache' +- cd "${TEMP}" +- rm -rf bincache suspend-0.5 +-} ++# print_info 1 ' >> Copying to bincache...' ++# mkdir -p "${TEMP}/bincache/sbin" ++# cp -f resume "${TEMP}/bincache/sbin" || ++# gen_die 'Could not copy resume binary' ++# cd "${TEMP}/bincache" ++# /bin/tar -cjf "${SUSPEND_BINCACHE}" * || ++# gen_die 'Could not create suspend binary cache' ++# cd "${TEMP}" ++# rm -rf bincache suspend-0.5 ++#} + + compile_devfsd() { + # I've disabled dietlibc support for the time being since the +Index: gen_configkernel.sh +=================================================================== +--- gen_configkernel.sh (revision 528) ++++ gen_configkernel.sh (working copy) +@@ -122,9 +122,9 @@ + fi + + # This check isn't complete: SOFTWARE_SUSPEND has extra deps on some systems such as CPU hotplug +- if isTrue ${CMD_SUSPEND} +- then +- sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_SOFTWARE_SUSPEND is.*/CONFIG_SOFTWARE_SUSPEND=y/g' +- fi ++# if isTrue ${CMD_SUSPEND} ++# then ++# sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_SOFTWARE_SUSPEND is.*/CONFIG_SOFTWARE_SUSPEND=y/g' ++# fi + + } +Index: gen_cmdline.sh +=================================================================== +--- gen_cmdline.sh (revision 528) ++++ gen_cmdline.sh (working copy) +@@ -79,7 +79,7 @@ + echo " --lvm2 Include LVM2 support" + # echo " --unionfs Include UNIONFS support" + echo " --dmraid Include DMRAID support" +- echo " --suspend Include userspace suspend/resume (uswsusp) support" ++# echo " --suspend Include userspace suspend/resume (uswsusp) support" + echo " --slowusb Enables extra pauses for slow USB CD boots" + echo " --bootloader=grub Add new kernel to GRUB configuration" + echo " --linuxrc= Specifies a user created linuxrc" +@@ -231,17 +231,17 @@ + CMD_LVM2=1 + print_info 2 "CMD_LVM2: $CMD_LVM2" + ;; +- --suspend) +- if [ ! -e /etc/suspend.conf ] +- then +- echo 'Error: --suspend requires sys-power/suspend to be installed' +- echo ' on the host system; try "emerge sys-power/suspend".' +- echo ' Once installed, configure the resume settings in /etc/suspend.conf' +- exit 1 +- fi +- CMD_SUSPEND=1 +- print_info 2 "CMD_SUSPEND: $CMD_SUSPEND" +- ;; ++# --suspend) ++# if [ ! -e /etc/suspend.conf ] ++# then ++# echo 'Error: --suspend requires sys-power/suspend to be installed' ++# echo ' on the host system; try "emerge sys-power/suspend".' ++# echo ' Once installed, configure the resume settings in /etc/suspend.conf' ++# exit 1 ++# fi ++# CMD_SUSPEND=1 ++# print_info 2 "CMD_SUSPEND: $CMD_SUSPEND" ++# ;; + --no-busybox) + CMD_NO_BUSYBOX=1 + print_info 2 "CMD_NO_BUSYBOX: $CMD_NO_BUSYBOX" +Index: gen_determineargs.sh +=================================================================== +--- gen_determineargs.sh (revision 528) ++++ gen_determineargs.sh (working copy) +@@ -209,7 +209,7 @@ + UNIONFS_BINCACHE=`cache_replace "${UNIONFS_BINCACHE}"` + UNIONFS_MODULES_BINCACHE=`cache_replace "${UNIONFS_MODULES_BINCACHE}"` + BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"` +- SUSPEND_BINCACHE=`cache_replace "${SUSPEND_BINCACHE}"` ++# SUSPEND_BINCACHE=`cache_replace "${SUSPEND_BINCACHE}"` + + DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"` + BUSYBOX_CONFIG=`arch_replace "${BUSYBOX_CONFIG}"` +@@ -226,7 +226,7 @@ + UNIONFS_BINCACHE=`arch_replace "${UNIONFS_BINCACHE}"` + UNIONFS_MODULES_BINCACHE=`arch_replace "${UNIONFS_MODULES_BINCACHE}"` + BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"` +- SUSPEND_BINCACHE=`arch_replace "${SUSPEND_BINCACHE}"` ++# SUSPEND_BINCACHE=`arch_replace "${SUSPEND_BINCACHE}"` + + if [ "${CMD_BOOTSPLASH}" != '' ] + then +@@ -433,12 +433,12 @@ + LVM2=0 + fi + +- if isTrue "${CMD_SUSPEND}" +- then +- SUSPEND=1 +- else +- SUSPEND=0 +- fi ++# if isTrue "${CMD_SUSPEND}" ++# then ++# SUSPEND=1 ++# else ++# SUSPEND=0 ++# fi + + if isTrue "${CMD_EVMS2}" + then +Index: genkernel.conf +=================================================================== +--- genkernel.conf (revision 528) ++++ genkernel.conf (working copy) +@@ -132,8 +132,8 @@ + E2FSPROGS_SRCTAR="${GK_SHARE}/pkg/e2fsprogs-${E2FSPROGS_VER}.tar.gz" + BLKID_BINCACHE="%%CACHE%%/blkid-${E2FSPROGS_VER}-%%ARCH%%.bz2" + +-SUSPEND_VER="VERSION_SUSPEND" +-SUSPEND_DIR="suspend-${SUSPEND_VER}" +-SUSPEND_SRCTAR="${GK_SHARE}/pkg/suspend-${SUSPEND_VER}.tar.gz" +-SUSPEND_BINCACHE="%%CACHE%%/suspend-${SUSPEND_VER}-%%ARCH%%.tar.bz2" ++#SUSPEND_VER="VERSION_SUSPEND" ++#SUSPEND_DIR="suspend-${SUSPEND_VER}" ++#SUSPEND_SRCTAR="${GK_SHARE}/pkg/suspend-${SUSPEND_VER}.tar.gz" ++#SUSPEND_BINCACHE="%%CACHE%%/suspend-${SUSPEND_VER}-%%ARCH%%.tar.bz2" + +Index: gen_initramfs.sh +=================================================================== +--- gen_initramfs.sh (revision 528) ++++ gen_initramfs.sh (working copy) +@@ -148,23 +148,23 @@ + rm -r "${TEMP}/initramfs-unionfs-tools-temp/" + } + +-append_suspend(){ +- if [ -d "${TEMP}/initramfs-suspend-temp" ]; +- then +- rm -r "${TEMP}/initramfs-suspend-temp/" +- fi +- print_info 1 'SUSPEND: Adding support (compiling binaries)...' +- compile_suspend +- mkdir -p "${TEMP}/initramfs-suspend-temp/" +- /bin/tar -jxpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initramfs-suspend-temp" || +- gen_die "Could not extract suspend binary cache!" +- mkdir -p "${TEMP}/initramfs-suspend-temp/etc" +- cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" || +- gen_die 'Could not copy /etc/suspend.conf' +- cd "${TEMP}/initramfs-suspend-temp/" +- find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" +- rm -r "${TEMP}/initramfs-suspend-temp/" +-} ++#append_suspend(){ ++# if [ -d "${TEMP}/initramfs-suspend-temp" ]; ++# then ++# rm -r "${TEMP}/initramfs-suspend-temp/" ++# fi ++# print_info 1 'SUSPEND: Adding support (compiling binaries)...' ++# compile_suspend ++# mkdir -p "${TEMP}/initramfs-suspend-temp/" ++# /bin/tar -jxpf "${SUSPEND_BINCACHE}" -C "${TEMP}/initramfs-suspend-temp" || ++# gen_die "Could not extract suspend binary cache!" ++# mkdir -p "${TEMP}/initramfs-suspend-temp/etc" ++# cp -f /etc/suspend.conf "${TEMP}/initramfs-suspend-temp/etc" || ++# gen_die 'Could not copy /etc/suspend.conf' ++# cd "${TEMP}/initramfs-suspend-temp/" ++# find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" ++# rm -r "${TEMP}/initramfs-suspend-temp/" ++#} + + append_dmraid(){ + if [ -d "${TEMP}/initramfs-dmraid-temp" ] +@@ -478,7 +478,7 @@ + # append_data 'udev' "${UDEV}" + append_data 'unionfs_modules' "${UNIONFS}" + append_data 'unionfs_tools' "${UNIONFS}" +- append_data 'suspend' "${SUSPEND}" ++# append_data 'suspend' "${SUSPEND}" + append_data 'lvm2' "${LVM2}" + append_data 'dmraid' "${DMRAID}" + append_data 'evms2' "${EVMS2}" +Index: generic/initrd.scripts +=================================================================== +--- generic/initrd.scripts (revision 528) ++++ generic/initrd.scripts (working copy) +@@ -847,17 +847,17 @@ + fi + } + +-suspend_resume() { +- [ -x /sbin/resume ] || return 0 +- /sbin/resume +- local ret=$? ++#suspend_resume() { ++# [ -x /sbin/resume ] || return 0 ++# /sbin/resume ++# local ret=$? + +- if [ "${ret}" -eq 0 ]; then +- exit 0 +- fi ++# if [ "${ret}" -eq 0 ]; then ++# exit 0 ++# fi + +- return 0 +-} ++# return 0 ++#} + + suspend2_resume() { + if [ -d /proc/suspend2 ] || [ -d /sys/power/suspend2 ]; then +Index: generic/linuxrc +=================================================================== +--- generic/linuxrc (revision 528) ++++ generic/linuxrc (working copy) +@@ -256,7 +256,7 @@ + # Run debug shell if requested + rundebugshell + +-suspend_resume ++#suspend_resume + suspend2_resume + + if [ "${CDROOT}" -eq '1' ] -- 2.26.2