[rds-commits] zab commits r91 - trunk
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Thu Jun 1 12:44:08 CDT 2006
Author: zab
Date: 2006-06-01 12:44:06 -0500 (Thu, 01 Jun 2006)
New Revision: 91
Added:
trunk/rds.spec.in
Removed:
trunk/rds-eth.spec.in
Modified:
trunk/
trunk/Makefile.in
trunk/configure.in
Log:
Update the rpm building infrastructure
Remove -eth from everything.
Rework the tarball generation so it doesn't use the broken symlink, don't
bother generating a .manifest as we don't have dependencies here anyway.
Put the kernel module in /lib/modules/$uname/kernel/net/rds/
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- configure
cscope.out
config.log
cscope.in.out
config.status
cscope.po.out
autom4te.cache
Makefile
.manifest
rds-eth.spec
svn-rev
rds-eth-*
+ configure
cscope.out
config.log
cscope.in.out
config.status
cscope.po.out
autom4te.cache
Makefile
rds.spec
svn-rev
rds-*
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2006-05-31 23:52:16 UTC (rev 90)
+++ trunk/Makefile.in 2006-06-01 17:44:06 UTC (rev 91)
@@ -2,7 +2,7 @@
EXTRA_CFLAGS = "@DEBUG_CFLAGS@ @KAPI_COMPAT_CFLAGS@ -g -I$(CURDIR)/linux/include"
SVN_REV := @SVN_REV@
-TAR_PREFIX := rds-eth-$(SVN_REV)
+TAR_PREFIX := rds-$(SVN_REV)
TAR_FILE := $(TAR_PREFIX).tar.gz
kbuild-%:
@@ -14,27 +14,29 @@
svn-rev:
Makefile: Makefile.in configure
-rds-eth.spec: rds-eth.spec.in configure
+rds.spec: rds.spec.in configure
./configure
+#
+# this doesn't have proper deps for now so it requies some manual intervention
+# to remove the svn-rev and tar before building rpms
+#
# use svn's notion of what's under revision control to figure out what
# to include in the tarball to use when making an rpm.. the deps catch
# generated files.
-.manifest: Makefile rds-eth.spec svn-rev
- @rm $@ || :
+$(TAR_FILE): Makefile rds.spec svn-rev
+ @rm -rf $@ $(TAR_PREFIX) || :
+ @mkdir $(TAR_PREFIX)
for a in $^ `svn stat -v | awk '($$1 != "?"){print $4}'`; do \
if [ ! -f $$a ]; then \
continue; \
fi; \
- echo $(TAR_PREFIX)/$$a >> $@; \
+ targ=$(TAR_PREFIX)/$$(dirname $$a); \
+ mkdir -p $$targ; \
+ cp $$a $$targ; \
done
+ tar -zcf $@ $(TAR_PREFIX)
-$(TAR_PREFIX):
- ln -s . $(TAR_PREFIX)
-
-$(TAR_FILE): .manifest $(TAR_PREFIX)
- tar -zc -f $@ --files-from=$^
-
.PHONY: rpm
rpm: $(TAR_FILE)
KERNEL_SRC=@KERNELSRC@ KERNEL_VERSION=@KERNELVER@ rpmbuild -ta $^
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2006-05-31 23:52:16 UTC (rev 90)
+++ trunk/configure.in 2006-06-01 17:44:06 UTC (rev 91)
@@ -139,4 +139,4 @@
AC_SUBST(KAPI_COMPAT_CFLAGS)
AC_SUBST(DEBUG_CFLAGS)
-AC_OUTPUT(Makefile rds-eth.spec)
+AC_OUTPUT(Makefile rds.spec)
Deleted: trunk/rds-eth.spec.in
===================================================================
--- trunk/rds-eth.spec.in 2006-05-31 23:52:16 UTC (rev 90)
+++ trunk/rds-eth.spec.in 2006-06-01 17:44:06 UTC (rev 91)
@@ -1,52 +0,0 @@
-Summary: kernel module for RDS/eth socket protocol
-Name: kernel-module-rds-eth
-# I would like to refer you to the section below named "percent"build. I
-# would like to use the character instead of spelling it out, but that
-# causes rpm to fail with:
-# error: line 4: Unknown tag: LANG=C
-# when the comment is on line 3. I couldn't make that up if I wanted to.
-#Version: %(echo $KERNEL_VERSION)
-#Release: @SVN_REV@
-Version: %(sh scripts/uname-for-spec.sh -u $KERNEL_VERSION -v)
-Release: %(sh scripts/uname-for-spec.sh -u $KERNEL_VERSION -r). at SVN_REV@
-License: GPL
-Group: System
-# we're using -ta
-Source0: rds-eth- at SVN_REV@.tar.gz
-BuildRoot: /var/tmp/rds-eth-%{version}.%{release}
-
-%description
-This is a kernel module that provides the RDS socket API over ethernet devices.
-The RDS socket API provides reliable, in-order datagram delivery to multiple
-destinations from one sending socket.
-
-%prep
-%setup -n rds-eth- at SVN_REV@
-
-# the idea is that someone with this source rpm should be able to rebuild
-# the module with
-# KERNEL_SRC=/whatever KERNEL_VERSION=2.6.9-whatever rpmbuild ..
-# I'm not thrilled about the env vars, hopefully there's a better way.
-%build
-autoconf
-./configure --with-kernel=$KERNEL_SRC
-make kbuild-modules
-
-%install
-rm -rf $RPM_BUILD_ROOT
-# I don't quite remember how modules get directed into /lib/modules paths,
-# normal modules_install drops rds.ko in extras/
-mkdir -p $RPM_BUILD_ROOT/lib/modules/$KERNEL_VERSION/net/rds
-cp linux/net/rds/rds.ko $RPM_BUILD_ROOT/lib/modules/$KERNEL_VERSION/net/rds
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%dir /lib/modules/%(echo $KERNEL_VERSION)/net/rds
-/lib/modules/%(echo $KERNEL_VERSION)/net/rds/*.ko
-
-%changelog
-* Fri Feb 10 2006 Zach Brown <zach.brown at oracle.com>
-- first pass
Copied: trunk/rds.spec.in (from rev 89, trunk/rds-eth.spec.in)
===================================================================
--- trunk/rds-eth.spec.in 2006-05-31 23:47:31 UTC (rev 89)
+++ trunk/rds.spec.in 2006-06-01 17:44:06 UTC (rev 91)
@@ -0,0 +1,49 @@
+Summary: kernel module for RDSv2 socket protocol
+Name: kernel-module-rds
+# I would like to refer you to the section below named "percent"build. I
+# would like to use the character instead of spelling it out, but that
+# causes rpm to fail with:
+# error: line 4: Unknown tag: LANG=C
+# when the comment is on line 3. I couldn't make that up if I wanted to.
+Version: %(sh scripts/uname-for-spec.sh -u $KERNEL_VERSION -v)
+Release: %(sh scripts/uname-for-spec.sh -u $KERNEL_VERSION -r). at SVN_REV@
+License: GPL
+Group: System
+# we're using -ta
+Source0: rds- at SVN_REV@.tar.gz
+BuildRoot: /var/tmp/rds-%{version}.%{release}
+
+%description
+This is a kernel module that provides the RDS socket API. The RDS socket API
+provides reliable, in-order datagram delivery to multiple destinations from one
+sending socket.
+
+%prep
+%setup -n rds- at SVN_REV@
+
+# the idea is that someone with this source rpm should be able to rebuild
+# the module with
+# KERNEL_SRC=/whatever KERNEL_VERSION=2.6.9-whatever rpmbuild ..
+# I'm not thrilled about the env vars, hopefully there's a better way.
+%build
+autoconf
+./configure --with-kernel=$KERNEL_SRC
+make kbuild-modules
+
+%install
+rm -rf $RPM_BUILD_ROOT
+# avoid modules_install and its irritating modules.* files
+mkdir -p $RPM_BUILD_ROOT/lib/modules/%(echo $KERNEL_VERSION)/kernel/net/rds
+cp linux/net/rds/rds.ko $RPM_BUILD_ROOT/lib/modules/%(echo $KERNEL_VERSION)/kernel/net/rds
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%dir /lib/modules/%(echo $KERNEL_VERSION)/kernel/net/rds/
+/lib/modules/%(echo $KERNEL_VERSION)/kernel/net/rds/*.ko
+
+%changelog
+* Fri Feb 10 2006 Zach Brown <zach.brown at oracle.com>
+- first pass
More information about the rds-commits
mailing list