From 9a463166d35f28a834c32d60ba767f1ed0c08369 Mon Sep 17 00:00:00 2001
From: Ben LaHaise <bcrl@kvack.org>
Date: Fri, 12 Apr 2002 22:38:23 +0000
Subject: install the dummy stub as libredhat-kernel.so.1.0.0

---
 libaio.spec          | 12 +++++++-----
 src/lib/src/Makefile |  7 +++++--
 src/libaio.h         |  1 +
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libaio.spec b/libaio.spec
index e2dc955..43752cc 100644
--- a/libaio.spec
+++ b/libaio.spec
@@ -41,11 +41,9 @@ make install prefix=$RPM_BUILD_ROOT/usr root=$RPM_BUILD_ROOT
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %post
-# if no libredhat-kernel.so is in place, temporarily use our stub
-# so that programs will link correctly
-if [ ! -f /lib/libredhat-kernel.so ] ; then
-	ln -sf /lib/kernel/stub/* /lib/
-fi
+# if no libredhat-kernel.so is in place, the stub's version of 1.0.0
+# will link correctly for apps.  This requires that the kernel's 
+# libredhat-kernel.so be 1.0.1 or higher.
 /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -64,6 +62,10 @@ fi
 %attr(0755,root,root) /usr/lib/libredhat-kernel.so
 
 %changelog
+* Fri Apr 12 2002 Benjamin LaHaise <bcrl@redhat.com>
+- make the dummy install as /lib/libredhat-kernel.so.1.0.0 so 
+  that ldconfig will link against it if no other is installed.
+
 * Tue Jan 22 2002 Benjamin LaHaise <bcrl@redhat.com>
 - add io_getevents
 
diff --git a/src/lib/src/Makefile b/src/lib/src/Makefile
index dfc26da..74b4717 100644
--- a/src/lib/src/Makefile
+++ b/src/lib/src/Makefile
@@ -4,6 +4,8 @@ all: libredhat-kernel.so
 ASFLAGS=-D__KERNEL__ -D__ASSEMBLY__ -I../include -nostdlib -nostartfiles
 CFLAGS=-D__KERNEL__ -I../include -nostdlib -nostartfiles
 soname=libredhat-kernel.so.1
+dummyver=.0.0
+extraver=.0.1
 
 so_objs=vsysaddr.o kso_init.o
 
@@ -24,8 +26,9 @@ libredhat-kernel.so: $(soname)
 	cp -f $< $@
 
 install:
-	install -D -m 755 $(soname) $(root)/lib/kernel/stub/$(soname)
-	ln -sf $(soname) $(root)/lib/kernel/stub/libredhat-kernel.so
+	install -D -m 755 $(soname) $(root)/lib/kernel/stub/$(soname)$(extraver)
+	install -D -m 755 $(soname) $(root)/lib/$(soname)$(dummyver)
+	ln -sf $(soname)$(extraver) $(root)/lib/kernel/stub/libredhat-kernel.so
 	mkdir -p $(root)/usr/lib
 	ln -sf /lib/libredhat-kernel.so $(root)/usr/lib/libredhat-kernel.so
 
diff --git a/src/libaio.h b/src/libaio.h
index 161c7b0..20b581c 100644
--- a/src/libaio.h
+++ b/src/libaio.h
@@ -40,6 +40,7 @@ typedef enum io_iocb_cmd {
 	IO_CMD_FDSYNC = 3,
 
 	IO_CMD_POLL = 5,
+	IO_CMD_NOOP = 6,
 } io_iocb_cmd_t;
 
 #if defined(__i386__) /* little endian, 32 bits */
-- 
cgit v1.2.1