Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (0c8fbe68f35a0148b0f0afacc3faddba78c5f78e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (0c8fbe68f35a0148b0f0afacc3faddba78c5f78e)
  • Date: Fri, 15 Dec 2006 16:07:06 -0600

GIT changes to master grimoire by Eric Sandall <sandalle@moby.(none)>:

dev/null |binary
kernels/suspend/CONFIGURE | 12 ------------
kernels/suspend/DEPENDS | 16 ++++++++++------
kernels/suspend/DETAILS | 2 +-
kernels/suspend/HISTORY | 13 +++++++++++++
kernels/suspend/INSTALL | 2 +-
kernels/suspend/PRE_BUILD | 14 ++++++++++++--
kernels/suspend/suspend-0.2.tar.gz.sig | 0
kernels/suspend/suspend-0.5.tar.gz.sig |binary
kernels/suspend/zlib.patch | 21 +++++++++++++++++++++
10 files changed, 58 insertions(+), 22 deletions(-)

New commits:
commit 0c8fbe68f35a0148b0f0afacc3faddba78c5f78e
Author: Eric Sandall <sandalle@moby.(none)>
Commit: Eric Sandall <sandalle@moby.(none)>

Use is_depends_enabled and proper optional dependencies for suspend

commit 0641940e25a22e0f5b48a4f07405d225f18bce2d
Author: Eric Sandall <sandalle@moby.(none)>
Commit: Eric Sandall <sandalle@moby.(none)>

Updated suspend to 0.5, properly links against zlib, now uses libgcrypt
for encryption

diff --git a/kernels/suspend/CONFIGURE b/kernels/suspend/CONFIGURE
index a9cd313..8d9af6e 100755
--- a/kernels/suspend/CONFIGURE
+++ b/kernels/suspend/CONFIGURE
@@ -1,15 +1,3 @@
-if spell_ok liblzf; then
- config_query SUSPEND_COMPRESS "Enable LZF suspend image compression?" y
-else
- config_query SUSPEND_COMPRESS "Enable LZF suspend image compression?" n
-fi &&
-
-if spell_ok openssl; then
- config_query SUSPEND_ENCRYPT "Enable SSL suspend image encryption?" y
-else
- config_query SUSPEND_ENCRYPT "Enable SSL suspend image encryption?" n
-fi &&
-
local TMP_SWAP &&
TMP_SWAP=$(grep swap $TRACK_ROOT/etc/fstab|grep -v ^#|awk '{print $1}') &&

diff --git a/kernels/suspend/DEPENDS b/kernels/suspend/DEPENDS
index a210668..b4b5da7 100755
--- a/kernels/suspend/DEPENDS
+++ b/kernels/suspend/DEPENDS
@@ -1,7 +1,11 @@
-if [ "$SUSPEND_COMPRESS" == "y" ]; then
- depends liblzf
-fi &&
+depends zlib &&

-if [ "$SUSPEND_ENCRYPT" == "y" ]; then
- depends openssl
-fi
+optional_depends liblzf \
+ '' \
+ '' \
+ 'for compression support' &&
+
+optional_depends libgcrypt \
+ '' \
+ '' \
+ 'for encryption support'
diff --git a/kernels/suspend/DETAILS b/kernels/suspend/DETAILS
index 10e15cf..2a09e34 100755
--- a/kernels/suspend/DETAILS
+++ b/kernels/suspend/DETAILS
@@ -1,5 +1,5 @@
SPELL=suspend
- VERSION=0.2
+ VERSION=0.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/kernels/suspend/HISTORY b/kernels/suspend/HISTORY
index 7c6efa6..e5df1bf 100644
--- a/kernels/suspend/HISTORY
+++ b/kernels/suspend/HISTORY
@@ -1,3 +1,16 @@
+2006-12-15 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 0.5
+ * CONFIGURE: Removed queries for compression and encryption
+ * DEPENDS: Uses libgcrypt for encryption instead of openssl
+ Depends on zlib
+ Use optional dependencies on liblzf and libgcrypt
+ * PRE_BUILD: Apply zlib.patch
+ Use is_depends_enabled to check if we should enable compression or
encryption,
+ otherwise explicitly disable it.
+ * INSTALL: Install target is now 'install-s2disk', not
'install-suspend'
+ * zlib.patch: Added zlib linker patch modified from
+
http://www.mail-archive.com/suspend-devel AT lists.sourceforge.net/msg00684.html
+
2006-09-08 Eric Sandall <eric AT sandall.us>
* DETAILS: Updated to 0.2
Removed BUILD_API=2 (grimoire-wide)
diff --git a/kernels/suspend/INSTALL b/kernels/suspend/INSTALL
index 178c46c..4e75474 100755
--- a/kernels/suspend/INSTALL
+++ b/kernels/suspend/INSTALL
@@ -1,4 +1,4 @@
-make install-suspend &&
+make install-s2disk &&

#
# Resume needs loop device
diff --git a/kernels/suspend/PRE_BUILD b/kernels/suspend/PRE_BUILD
index d37c5f6..0a0cc80 100755
--- a/kernels/suspend/PRE_BUILD
+++ b/kernels/suspend/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
+patch $SOURCE_DIRECTORY/Makefile \
+ $SCRIPT_DIRECTORY/zlib.patch &&
sedit "s:<path_to_resume_device_file>:$SUSPEND_SWAP:" \
$SOURCE_DIRECTORY/conf/suspend.conf &&
sedit "s:<path_to_resume_device_file>:$SUSPEND_SWAP:" \
@@ -6,12 +8,20 @@ sedit "s:<path_to_resume_device_file>:$
sedit "s:/usr/local/sbin:$INSTALL_ROOT/usr/sbin:" \
$SOURCE_DIRECTORY/Makefile &&

-if [ "$SUSPEND_COMPRESS" == "y" ]; then
+source $GRIMOIRE/is_depends_enabled.function &&
+
+if is_depends_enabled $SPELL liblzf ; then
sedit "s:#CONFIG_COMPRESS=yes:CONFIG_COMPRESS=yes:" \
$SOURCE_DIRECTORY/Makefile
+else
+ sedit "s:#CONFIG_COMPRESS=yes:CONFIG_COMPRESS=no:" \
+ $SOURCE_DIRECTORY/Makefile
fi &&

-if [ "$SUSPEND_ENCRYPT" == "y" ]; then
+if is_depends_enabled $SPELL libgcrypt ; then
sedit "s:#CONFIG_ENCRYPT=yes:CONFIG_ENCRYPT=yes:" \
$SOURCE_DIRECTORY/Makefile
+else
+ sedit "s:#CONFIG_ENCRYPT=yes:CONFIG_ENCRYPT=no:" \
+ $SOURCE_DIRECTORY/Makefile
fi
diff --git a/kernels/suspend/suspend-0.2.tar.gz.sig
b/kernels/suspend/suspend-0.2.tar.gz.sig
deleted file mode 100644
index ecf5352..0000000
Binary files a/kernels/suspend/suspend-0.2.tar.gz.sig and /dev/null differ
diff --git a/kernels/suspend/suspend-0.5.tar.gz.sig
b/kernels/suspend/suspend-0.5.tar.gz.sig
new file mode 100644
index 0000000..3a53ec4
Binary files /dev/null and b/kernels/suspend/suspend-0.5.tar.gz.sig differ
diff --git a/kernels/suspend/zlib.patch b/kernels/suspend/zlib.patch
new file mode 100644
index 0000000..6d3d903
--- /dev/null
+++ b/kernels/suspend/zlib.patch
@@ -0,0 +1,21 @@
+diff -Naur suspend-0.5.orig/Makefile suspend-0.5/Makefile
+--- suspend-0.5.orig/Makefile 2006-12-15 13:40:59.414314247 -0800
++++ suspend-0.5/Makefile 2006-12-15 13:42:29.999494911 -0800
+@@ -66,7 +66,7 @@
+ rm -f $(S2DISK) $(S2BOTH) swap-offset suspend-keygen suspend.keys
resume s2ram *.o vbetool/*.o vbetool/x86emu/*.o vbetool/x86emu/*.a
+
+ s2ram: s2ram.c dmidecode.c whitelist.c radeontool.c $(S2RAMOBJ)
+- $(CC) $(CFLAGS) -g s2ram.c $(S2RAMOBJ) -lpci -o s2ram
++ $(CC) $(CFLAGS) -g s2ram.c $(S2RAMOBJ) -lpci -lz -o s2ram
+
+ vbetool/vbetool.o: vbetool/vbetool.c
+ $(CC) $(CFLAGS) -DS2RAM -c vbetool/vbetool.c -o vbetool/vbetool.o
+@@ -114,7 +114,7 @@
+ $(CC) -g $(CFLAGS) $(CC_FLAGS) vt.o md5.o encrypt.o config.o
suspend.c -o $@ $(SPLASHOBJ) $(LD_FLAGS)
+
+ $(S2BOTH): md5.o encrypt.o config.o suspend.c swsusp.h config.h
encrypt.h md5.h s2ram.c dmidecode.c whitelist.c radeontool.c $(S2RAMOBJ)
$(SPLASHOBJ)
+- $(CC) -g $(CFLAGS) -DCONFIG_BOTH $(CC_FLAGS) md5.o encrypt.o config.o
suspend.c s2ram.c -o $@ $(S2RAMOBJ) $(SPLASHOBJ) $(LD_FLAGS) -lpci
++ $(CC) -g $(CFLAGS) -DCONFIG_BOTH $(CC_FLAGS) md5.o encrypt.o config.o
suspend.c s2ram.c -o $@ $(S2RAMOBJ) $(SPLASHOBJ) $(LD_FLAGS) -lpci -lz
+
+ resume: md5.o encrypt.o config.o resume.c swsusp.h config.h encrypt.h
md5.h $(SPLASHOBJ)
+ $(CC) $(CFLAGS) $(CC_FLAGS) $(STATIC_CC_FLAGS) md5.o encrypt.o
config.o vt.o resume.c $(SPLASHOBJ) -static -o resume $(LD_FLAGS)
$(STATIC_LD_FLAGS)



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (0c8fbe68f35a0148b0f0afacc3faddba78c5f78e), Eric Sandall, 12/15/2006

Archive powered by MHonArc 2.6.24.

Top of Page