From 24dc832d0b8a3575df60dda41c994ce77afb1eca Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 22 Aug 2007 02:17:29 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++ pkg/suspend-0.5-Makefile.patch | 56 ++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 pkg/suspend-0.5-Makefile.patch diff --git a/ChangeLog b/ChangeLog index b49742e..e043581 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Aug 2007; Chris Gianelloni + +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 genkernel.8: Added a small patch from Tais M. Hansen to add doscsi to the genkernel man page for bug #183406. diff --git a/pkg/suspend-0.5-Makefile.patch b/pkg/suspend-0.5-Makefile.patch new file mode 100644 index 0000000..d74a10c --- /dev/null +++ b/pkg/suspend-0.5-Makefile.patch @@ -0,0 +1,56 @@ + +From: Daniel Drake + +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= + 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) -- 2.26.2