Author: alexander
Date: 2006-07-09 22:18:23 -0600 (Sun, 09 Jul 2006)
New Revision: 1594
Added:
trunk/packages/hibernate-script/
trunk/packages/hibernate-script/Makefile
trunk/packages/vbetool/
trunk/packages/vbetool/Makefile
Modified:
trunk/Makefile
trunk/packages/linux/config.ppc
trunk/packages/linux/config.ppc.ata
trunk/packages/linux/config.x86
trunk/packages/linux/config.x86.ata
Log:
Added support for software suspend.
Now you can boot as "linux resume=/dev/swap_patition", build a part of LFS,
run "swapon /dev/swap_partition", run "hibernate", and it will turn your
computer off. Next time you boot with "linux resume=/dev/swap_partition",
it will resume from the point where you ran the "hibernate" script, as if
the computer was never powered off.
TODO: documentation
TODO: killing pppd and restoring console font
TODO: figure out when to enable vbetool
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-07-09 12:54:19 UTC (rev 1593)
+++ trunk/Makefile 2006-07-10 04:18:23 UTC (rev 1594)
@@ -257,7 +257,8 @@
ch-man-fr ch-man-pages-es ch-man-pages-it ch-manpages-de ch-manpages-ru
\
ch-anthy ch-scim ch-scim-tables ch-scim-anthy ch-scim-hangul \
ch-libchewing ch-scim-chewing ch-scim-pinyin ch-scim-input-pad \
- ch-bin86 ch-lilo ch-syslinux update-fontsdir
+ ch-bin86 ch-lilo ch-syslinux ch-vbetool ch-hibernate-script \
+ update-fontsdir
ifeq ($(LFS-ARCH),ppc)
make ch-yaboot
make ch-hfsutils
Added: trunk/packages/hibernate-script/Makefile
===================================================================
--- trunk/packages/hibernate-script/Makefile (rev 0)
+++ trunk/packages/hibernate-script/Makefile 2006-07-10 04:18:23 UTC (rev
1594)
@@ -0,0 +1,28 @@
+# hibernate-script Makefile
+
+NM= hibernate-script
+VRS= 1.91
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://www.suspend2.net/downloads/all/$(FILE)
+SHA-$(FILE)= b81808f499068937a9696e977ef1cfd499d21eee
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ $(std_build)
+
+compile-stage2:
+ PREFIX=/usr ./install.sh
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
Modified: trunk/packages/linux/config.ppc
===================================================================
--- trunk/packages/linux/config.ppc 2006-07-09 12:54:19 UTC (rev 1593)
+++ trunk/packages/linux/config.ppc 2006-07-10 04:18:23 UTC (rev 1594)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.14
-# Wed May 24 18:53:04 2006
+# Linux kernel version: 2.6.16.20
+# Sun Jul 9 18:12:38 2006
#
# CONFIG_PPC64 is not set
CONFIG_PPC32=y
@@ -160,7 +160,8 @@
CONFIG_PM=y
# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
-# CONFIG_SOFTWARE_SUSPEND is not set
+CONFIG_SOFTWARE_SUSPEND=y
+CONFIG_PM_STD_PARTITION=""
CONFIG_SECCOMP=y
CONFIG_ISA_DMA_API=y
Modified: trunk/packages/linux/config.ppc.ata
===================================================================
--- trunk/packages/linux/config.ppc.ata 2006-07-09 12:54:19 UTC (rev 1593)
+++ trunk/packages/linux/config.ppc.ata 2006-07-10 04:18:23 UTC (rev 1594)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16.14
-# Thu May 25 06:23:28 2006
+# Linux kernel version: 2.6.16.20
+# Sun Jul 9 18:12:38 2006
#
# CONFIG_PPC64 is not set
CONFIG_PPC32=y
@@ -158,7 +158,8 @@
CONFIG_PM=y
# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
-# CONFIG_SOFTWARE_SUSPEND is not set
+CONFIG_SOFTWARE_SUSPEND=y
+CONFIG_PM_STD_PARTITION=""
CONFIG_SECCOMP=y
CONFIG_ISA_DMA_API=y
Modified: trunk/packages/linux/config.x86
===================================================================
--- trunk/packages/linux/config.x86 2006-07-09 12:54:19 UTC (rev 1593)
+++ trunk/packages/linux/config.x86 2006-07-10 04:18:23 UTC (rev 1594)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16
-# Fri Mar 24 11:04:33 2006
+# Sun Jul 9 18:12:38 2006
#
CONFIG_X86_32=y
CONFIG_SEMAPHORE_SLEEPERS=y
@@ -196,7 +196,7 @@
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x100000
-# CONFIG_HOTPLUG_CPU is not set
+CONFIG_HOTPLUG_CPU=y
CONFIG_DOUBLEFAULT=y
#
@@ -205,29 +205,36 @@
CONFIG_PM=y
# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
+CONFIG_SOFTWARE_SUSPEND=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_SUSPEND_SMP=y
#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_HOTKEY=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_IBM=m
-CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_SLEEP_PROC_FS=y
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=y
+CONFIG_ACPI_HOTKEY=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_ASUS=y
+CONFIG_ACPI_IBM=y
+CONFIG_ACPI_TOSHIBA=y
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_EC=y
CONFIG_ACPI_POWER=y
CONFIG_ACPI_SYSTEM=y
CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_CONTAINER=y
#
# APM (Advanced Power Management) BIOS Support
Modified: trunk/packages/linux/config.x86.ata
===================================================================
--- trunk/packages/linux/config.x86.ata 2006-07-09 12:54:19 UTC (rev 1593)
+++ trunk/packages/linux/config.x86.ata 2006-07-10 04:18:23 UTC (rev 1594)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16
-# Fri Mar 24 11:07:28 2006
+# Sun Jul 9 18:12:38 2006
#
CONFIG_X86_32=y
CONFIG_SEMAPHORE_SLEEPERS=y
@@ -196,7 +196,7 @@
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x100000
-# CONFIG_HOTPLUG_CPU is not set
+CONFIG_HOTPLUG_CPU=y
CONFIG_DOUBLEFAULT=y
#
@@ -205,29 +205,36 @@
CONFIG_PM=y
# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
+CONFIG_SOFTWARE_SUSPEND=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_SUSPEND_SMP=y
#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_HOTKEY=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_IBM=m
-CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_SLEEP_PROC_FS=y
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=y
+CONFIG_ACPI_HOTKEY=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_ASUS=y
+CONFIG_ACPI_IBM=y
+CONFIG_ACPI_TOSHIBA=y
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_EC=y
CONFIG_ACPI_POWER=y
CONFIG_ACPI_SYSTEM=y
CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_CONTAINER=y
#
# APM (Advanced Power Management) BIOS Support
Added: trunk/packages/vbetool/Makefile
===================================================================
--- trunk/packages/vbetool/Makefile (rev 0)
+++ trunk/packages/vbetool/Makefile 2006-07-10 04:18:23 UTC (rev 1594)
@@ -0,0 +1,31 @@
+# vbetool Makefile
+
+NM= vbetool
+VRS= 0.6
+VRS1= 1.1
+DIR= $(NM)-$(VRS)
+
+FILE= $(NM)_$(VRS)-$(VRS1).tar.gz
+URL-$(FILE)= http://ftp.debian.org/debian/pool/main/v/$(NM)/$(FILE)
+SHA-$(FILE)= c291fbc3874b8c711fcba0564eb45ebb2652495f
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE) $(PATCH1)
+ $(std_build)
+
+compile-stage2:
+ ./configure --prefix=/usr
+ make
+ make install
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
