Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (6fc279ef4f6c7088e394b96b5af4c2d6c3f56bc7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Mathieu Lonjaret <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (6fc279ef4f6c7088e394b96b5af4c2d6c3f56bc7)
  • Date: Fri, 6 Jun 2008 10:14:07 -0500

GIT changes to master grimoire by Mathieu Lonjaret <lejatorn AT sourcemage.org>:

dev/null |binary
kernels/suspend/BUILD | 3 ++-
kernels/suspend/DEPENDS | 11 ++++++-----
kernels/suspend/DETAILS | 5 +++--
kernels/suspend/HISTORY | 5 +++++
kernels/suspend/INSTALL | 14 +++-----------
kernels/suspend/PRE_BUILD | 31 +++++++++----------------------
kernels/suspend/suspend-0.5.tar.gz.sig | 0
kernels/suspend/zlib.patch | 21 ---------------------
9 files changed, 28 insertions(+), 62 deletions(-)

New commits:
commit 297d61e05fc6cf0838039251a4df7ff7b4064516
Author: Mathieu Lonjaret <lejatorn AT sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn AT sourcemage.org>

suspend: update to 0.8 and clean out. add libx86 dep, replace liblzf with
lzo.

diff --git a/kernels/suspend/BUILD b/kernels/suspend/BUILD
index 8f58e6d..e3880ba 100755
--- a/kernels/suspend/BUILD
+++ b/kernels/suspend/BUILD
@@ -1 +1,2 @@
-make
+OPTS="--with-resume-device=$SUSPEND_SWAP $OPTS" &&
+default_build
diff --git a/kernels/suspend/DEPENDS b/kernels/suspend/DEPENDS
index 4c56bab..06b40f7 100755
--- a/kernels/suspend/DEPENDS
+++ b/kernels/suspend/DEPENDS
@@ -1,12 +1,13 @@
depends pciutils &&
depends zlib &&
+depends libx86 &&

-optional_depends liblzf \
- '' \
- '' \
+optional_depends lzo \
+ '--enable-compress' \
+ '--disable-compress' \
'for compression support' &&

optional_depends libgcrypt \
- '' \
- '' \
+ '--enable-encrypt' \
+ '--disable-encrypt' \
'for encryption support'
diff --git a/kernels/suspend/DETAILS b/kernels/suspend/DETAILS
index 2a09e34..e080a23 100755
--- a/kernels/suspend/DETAILS
+++ b/kernels/suspend/DETAILS
@@ -1,9 +1,10 @@
SPELL=suspend
- VERSION=0.5
+ VERSION=0.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ #SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:eb5d5ea7a4ee5544200de18531b4033a0bc8cdf191b6340128628292b2cb36423c9a17158a9d13911385eedd4ba019aa6258672ba823062798c2cd48df818803
LICENSE[0]=GPL
KEYWORDS="kernels"
WEB_SITE=http://$SPELL.sourceforge.net/
diff --git a/kernels/suspend/HISTORY b/kernels/suspend/HISTORY
index c26a905..2711e9b 100644
--- a/kernels/suspend/HISTORY
+++ b/kernels/suspend/HISTORY
@@ -1,3 +1,8 @@
+2008-06-06 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * BUILD, DETAILS, PRE_BUILD, INSTALL: update to 0.8 and clean
+ out accordingly
+ * DEPENDS: add libx86, replace liblzf with lzo
+
2008-05-09 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* PRE_BUILD: CONFIG_* stuff need to stay commented to disable features
(like compression or encryption), =no does not work.
diff --git a/kernels/suspend/INSTALL b/kernels/suspend/INSTALL
index 4e75474..4f30690 100755
--- a/kernels/suspend/INSTALL
+++ b/kernels/suspend/INSTALL
@@ -1,17 +1,9 @@
-make install-s2disk &&
+default_install &&

-#
-# Resume needs loop device
-#
if [ ! -e /dev/loop0 ]; then
modprobe -q loop
fi &&

if [ -e /dev/loop0 ]; then
- make install-resume-initrd
-fi &&
-
-#
-# Makefile doesn't install s2ram...
-#
-install -m 0755 s2ram $INSTALL_ROOT/usr/sbin
+ make install-resume-new-initrd
+fi
diff --git a/kernels/suspend/PRE_BUILD b/kernels/suspend/PRE_BUILD
index 8d10243..db5303c 100755
--- a/kernels/suspend/PRE_BUILD
+++ b/kernels/suspend/PRE_BUILD
@@ -1,26 +1,13 @@
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:" \
- $SOURCE_DIRECTORY/Makefile &&
-sedit "s:/usr/local/sbin:$INSTALL_ROOT/usr/sbin:" \
- $SOURCE_DIRECTORY/Makefile &&
-
-
-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 &&
+ $SOURCE_DIRECTORY/conf/suspend.conf
+
+if is_depends_enabled $SPELL lzo ; then
+ sedit "s:#compress:compress:" \
+ $SOURCE_DIRECTORY/conf/suspend.conf
+fi &&

-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
+if is_depends_enabled $SPELL libgcrypt ; then
+ sedit "s:#encrypt:encrypt:" \
+ $SOURCE_DIRECTORY/conf/suspend.conf
fi
diff --git a/kernels/suspend/suspend-0.5.tar.gz.sig
b/kernels/suspend/suspend-0.5.tar.gz.sig
deleted file mode 100644
index 3a53ec4..0000000
Binary files a/kernels/suspend/suspend-0.5.tar.gz.sig and /dev/null differ
diff --git a/kernels/suspend/zlib.patch b/kernels/suspend/zlib.patch
deleted file mode 100644
index 6d3d903..0000000
--- a/kernels/suspend/zlib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 Mathieu Lonjaret (6fc279ef4f6c7088e394b96b5af4c2d6c3f56bc7), Mathieu Lonjaret, 06/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page