Added suspend-0.5-Makefile.patch to pkg directory for suspend capabilities, bringing it into the repository, from the tree.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@527 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 18 years ago
parent 739fc53353
commit 24dc832d0b

@ -2,6 +2,11 @@
# Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
22 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+pkg/suspend-0.5-Makefile.patch:
Added suspend-0.5-Makefile.patch to pkg directory for suspend capabilities,
bringing it into the repository, from the tree.
22 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.8: 22 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.8:
Added a small patch from Tais M. Hansen <tais.hansen@osd.dk> to add doscsi Added a small patch from Tais M. Hansen <tais.hansen@osd.dk> to add doscsi
to the genkernel man page for bug #183406. to the genkernel man page for bug #183406.

@ -0,0 +1,56 @@
From: Daniel Drake <ddrake@brontes3d.com>
Index: suspend-0.5/Makefile
===================================================================
--- suspend-0.5.orig/Makefile
+++ suspend-0.5/Makefile
@@ -1,14 +1,14 @@
#CONFIG_COMPRESS=yes
#CONFIG_ENCRYPT=yes
#CONFIG_SPLASHY=yes
-#CONFIG_UDEV=yes
+CONFIG_UDEV=yes
ARCH:=$(shell uname -m)
-CC_FLAGS=-I/usr/local/include
-LD_FLAGS=-L/usr/local/lib
+CC_FLAGS?=-I/usr/local/include
+LD_FLAGS?=-L/usr/local/lib
-CFLAGS := -O2 -Wall
+CFLAGS ?= -O2 -Wall
ifdef CONFIG_COMPRESS
CC_FLAGS += -DCONFIG_COMPRESS
@@ -22,7 +22,7 @@ CC_FLAGS += $(GCRYPT_CC_FLAGS)
LD_FLAGS += $(GCRYPT_LD_FLAGS)
endif
-SUSPEND_DIR=/usr/local/sbin
+SUSPEND_DIR?=/usr/local/sbin
CONFIG_DIR=/etc
RESUME_DEVICE=<path_to_resume_device_file>
BOOT_DIR=/boot
@@ -31,7 +31,7 @@ S2BOTH=s2both
S2DISK=s2disk
CONFIGFILE=suspend.conf
-ifndef CONFIG_UDEV
+ifneq ($(CONFIG_UDEV), yes)
SNAPSHOT=$(DESTDIR)/dev/snapshot
endif
@@ -145,9 +145,9 @@ install-s2disk: $(S2DISK) swap-offset co
if [ -f $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE) ]; then install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE).new; else install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR); fi
install: $(S2DISK) $(S2BOTH) swap-offset conf/$(CONFIGFILE) $(SNAPSHOT)
- install --mode=755 $(S2DISK) $(DESTDIR)$(SUSPEND_DIR)
+ install -D --mode=755 $(S2DISK) $(DESTDIR)$(SUSPEND_DIR)/$(S2DISK)
install --mode=755 $(S2BOTH) $(DESTDIR)$(SUSPEND_DIR)
- if [ -f $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE) ]; then install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE).new; else install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR); fi
+ if [ -f $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE) ]; then install --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE).new; else install -D --mode=644 conf/$(CONFIGFILE) $(DESTDIR)$(CONFIG_DIR)/$(CONFIGFILE); fi
install --mode=755 s2ram $(DESTDIR)$(SUSPEND_DIR)
install --mode=755 resume $(DESTDIR)$(SUSPEND_DIR)
install --mode=755 swap-offset $(DESTDIR)$(SUSPEND_DIR)
Loading…
Cancel
Save