From 812761a1f8ff94e4913529840b905360ff843fc4 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Wed, 21 Jan 2009 16:26:54 -0800
Subject: [PATCH] Move waiter to library

Move the waiter routines into the petitboot library.  The waiter
routines are generic enough to be used for both server and
client.  Does not change the waiter source.

jk: move to lib/waiter/ instead of lib/

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 configure.ac                      | 3 ++-
 discover/discover-server.c        | 2 +-
 discover/pb-discover.c            | 3 ++-
 discover/udev.c                   | 2 +-
 {discover => lib/waiter}/waiter.c | 0
 {discover => lib/waiter}/waiter.h | 0
 rules.mk                          | 7 ++++---
 7 files changed, 10 insertions(+), 7 deletions(-)
 rename {discover => lib/waiter}/waiter.c (100%)
 rename {discover => lib/waiter}/waiter.h (100%)

diff --git a/configure.ac b/configure.ac
index 650d60b..f06ac80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ AC_PROG_INSTALL
 
 PKG_CHECK_MODULES([twin], [libtwin])
 
-mkdir -p discover ui/test ui/common lib/talloc lib/pb-protocol lib/list
+mkdir -p discover ui/test ui/common lib/talloc lib/pb-protocol lib/list \
+	      lib/waiter
 
 AC_OUTPUT
diff --git a/discover/discover-server.c b/discover/discover-server.c
index b2025cc..1fab303 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -11,12 +11,12 @@
 #include <asm/byteorder.h>
 
 #include <talloc/talloc.h>
+#include <waiter/waiter.h>
 
 #include "pb-protocol/pb-protocol.h"
 #include "list/list.h"
 
 #include "log.h"
-#include "waiter.h"
 #include "device-handler.h"
 #include "discover-server.h"
 
diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 56602d9..d11ab64 100644
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -2,10 +2,11 @@
 #include <stdlib.h>
 #include <signal.h>
 
+#include <waiter/waiter.h>
+
 #include "udev.h"
 #include "discover-server.h"
 #include "device-handler.h"
-#include "waiter.h"
 #include "log.h"
 
 static int running;
diff --git a/discover/udev.c b/discover/udev.c
index 6747e78..66d9544 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -10,10 +10,10 @@
 #include <sys/un.h>
 
 #include <talloc/talloc.h>
+#include <waiter/waiter.h>
 
 #include "udev.h"
 #include "log.h"
-#include "waiter.h"
 #include "pb-discover.h"
 #include "device-handler.h"
 
diff --git a/discover/waiter.c b/lib/waiter/waiter.c
similarity index 100%
rename from discover/waiter.c
rename to lib/waiter/waiter.c
diff --git a/discover/waiter.h b/lib/waiter/waiter.h
similarity index 100%
rename from discover/waiter.h
rename to lib/waiter/waiter.h
diff --git a/rules.mk b/rules.mk
index af6223b..607a25e 100644
--- a/rules.mk
+++ b/rules.mk
@@ -16,6 +16,7 @@ artwork = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz
 
 talloc_objs = lib/talloc/talloc.o
 list_objs = lib/list/list.o
+waiter_objs = lib/waiter/waiter.o
 server_objs = lib/pb-protocol/pb-protocol.o
 parser_objs = discover/parser.o discover/parser-utils.o \
 	      $(foreach p, $(parsers), discover/$(p)-parser.o)
@@ -46,9 +47,9 @@ ui/test/pb-test: $(pb_test_objs)
 #	      $(foreach p,$(parsers),discover/$(p)-parser.o)
 
 pb_discover_objs = discover/pb-discover.o discover/udev.o discover/log.o \
-		   discover/waiter.o discover/discover-server.o \
-		   discover/device-handler.o discover/paths.o \
-		   $(talloc_objs) $(server_objs) $(parser_objs) $(list_objs)
+		   discover/discover-server.o discover/device-handler.o \
+		   discover/paths.o $(talloc_objs) $(server_objs) \
+		   $(parser_objs) $(list_objs) $(waiter_objs)
 
 discover/pb-discover: $(pb_discover_objs)
 	$(LINK.o) -o $@ $^
-- 
2.39.5