Author: baggins Date: Tue Aug 2 11:15:01 2005 GMT
Module: nps Tag: HEAD
---- Log message:
- remove rpm file list creation from makefiles
- add file list to spec, some bcond/BR cleanups
---- Files affected:
nps:
Makefile (1.6 -> 1.7) , nps.spec (1.5 -> 1.6)
nps/jnet:
makefile.common (1.1.1.1 -> 1.2)
nps/nws_mc:
makefile.common (1.1.1.1 -> 1.2)
nps/poci:
Makefile (1.4 -> 1.5)
---- Diffs:
================================================================
Index: nps/Makefile
diff -u nps/Makefile:1.6 nps/Makefile:1.7
--- nps/Makefile:1.6 Mon Aug 1 23:24:24 2005
+++ nps/Makefile Tue Aug 2 13:14:56 2005
@@ -31,7 +31,6 @@
< common/swinventory.xml > common/swinventory.new
mv common/swinventory.new common/swinventory.xml
install -D -m 644 common/swinventory.xml
$(INSTALL_MOD_PATH)/etc/newisys/swinventory.xml
- @echo "$(INSTALL_MOD_PATH)/etc/newisys/swinventory.xml" >> file.list
uninstall:
make uninstall -C poci
================================================================
Index: nps/nps.spec
diff -u nps/nps.spec:1.5 nps/nps.spec:1.6
--- nps/nps.spec:1.5 Wed Jul 27 23:35:44 2005
+++ nps/nps.spec Tue Aug 2 13:14:56 2005
@@ -1,6 +1,10 @@
# $Revision$, $Date$
-
+#
+# Conditional build:
+# _without_dist_kernel without distribution kernel
+#
%define _vendor_rel 0
+
Summary: Platform Linux components
Summary(pl): Komponenty platformy linuksowej
Name: nps
@@ -14,7 +18,7 @@
Source0: %{name}-V%{version}.tar.gz
# Source0-md5: 5c843ff779f10722b314433b7e8f1210
URL: http://www.newisys.com/
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{!?_without_dist_kernel:BuildRequires: kernel-headers }
# we only support linux
ExclusiveOS: Linux
BuildRequires: pciutils-devel
@@ -31,6 +35,7 @@
Summary: Linux driver for the
License: GPL
Group: Base/Kernel
+%{!?_without_dist_kernel:%requires_releq_kernel_up}
Requires(post,postun): /sbin/depmod
%prep
@@ -127,8 +132,28 @@
fi
fi
-%files -f file.list
+%post -n kernel-net-nps
+%depmod %{_kernel_ver}
+
+%postun -n kernel-net-nps
+%depmod %{_kernel_ver}
+
+%files
%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/nws_mc
+%attr(755,root,root) %{_sbindir}/nws_hb
+%attr(755,root,root) %{_sbindir}/nws_poci
+%attr(754,root,root) /etc/rc.d/init.d/poci
+/etc/newisys/swinventory.xml
+/etc/newisys/poci/swinventory.xml
+
+%files -n kernel-net-nps
+%defattr(644,root,root,755)
+/etc/newisys/jnet/swinventory.xml
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/jnet_prs.*o
+
+/etc/newisys/nws_mc/swinventory.xml
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/nws_mc.*o
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -136,6 +161,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2005/08/02 11:14:56 baggins
+- remove rpm file list creation from makefiles
+- add file list to spec, some bcond/BR cleanups
+
Revision 1.5 2005/07/27 21:35:44 qboosh
- some pl and cleanups
================================================================
Index: nps/jnet/makefile.common
diff -u nps/jnet/makefile.common:1.1.1.1 nps/jnet/makefile.common:1.2
--- nps/jnet/makefile.common:1.1.1.1 Mon Jul 25 21:42:56 2005
+++ nps/jnet/makefile.common Tue Aug 2 13:14:56 2005
@@ -65,10 +65,6 @@
|| true
@mkdir -p $(INSTALL_MOD_PATH)/lib/modules/$(KVER)
install -D -m 644 $(TARGET) $(INSTALL_MOD_PATH)$(INSTDIR)/$(TARGET)
- @if [ ! -f ../file.list ] ; then \
- echo "%defattr(-,root,root)" >../file.list ;\
- fi
- @echo "$(INSTDIR)/$(TARGET)" >> ../file.list
ifeq (,$(INSTALL_MOD_PATH))
/sbin/depmod -a || true
else
@@ -84,7 +80,6 @@
< swinventory.xml > swinventory.new
mv swinventory.new swinventory.xml
install -D -m 644 swinventory.xml
$(INSTALL_MOD_PATH)/etc/newisys/jnet/swinventory.xml
- @echo "$(INSTALL_MOD_PATH)/etc/newisys/jnet/swinventory.xml" >>
../file.list
make postinstall
uninstall:
@@ -143,4 +138,3 @@
rm -rf /etc/jnet
@sed /.*$(SP_HOSTNAME)/d < /etc/hosts > /etc/hosts.bak
@mv /etc/hosts.bak /etc/hosts
-
================================================================
Index: nps/nws_mc/makefile.common
diff -u nps/nws_mc/makefile.common:1.1.1.1 nps/nws_mc/makefile.common:1.2
--- nps/nws_mc/makefile.common:1.1.1.1 Mon Jul 25 21:42:56 2005
+++ nps/nws_mc/makefile.common Tue Aug 2 13:14:56 2005
@@ -63,10 +63,6 @@
|| true
@mkdir -p $(INSTALL_MOD_PATH)/lib/modules/$(KVER)
install -D -m 644 $(TARGET) $(INSTALL_MOD_PATH)$(INSTDIR)/$(TARGET)
- @if [ ! -f ../file.list ] ; then \
- echo "%defattr(-,root,root)" >../file.list ;\
- fi
- @echo "$(INSTDIR)/$(TARGET)" >> ../file.list
ifeq (,$(INSTALL_MOD_PATH))
/sbin/depmod -a || true
else
@@ -82,7 +78,6 @@
< swinventory.xml > swinventory.new
mv swinventory.new swinventory.xml
install -D -m 644 swinventory.xml
$(INSTALL_MOD_PATH)/etc/newisys/nws_mc/swinventory.xml
- @echo "$(INSTALL_MOD_PATH)/etc/newisys/nws_mc/swinventory.xml" >>
../file.list
uninstall:
if [ -e $(INSTDIR)/$(TARGET) ] ; then \
@@ -90,4 +85,3 @@
fi
/sbin/depmod -a
rm -rf /etc/newisys/nws_mc
-
================================================================
Index: nps/poci/Makefile
diff -u nps/poci/Makefile:1.4 nps/poci/Makefile:1.5
--- nps/poci/Makefile:1.4 Tue Aug 2 02:17:32 2005
+++ nps/poci/Makefile Tue Aug 2 13:14:56 2005
@@ -57,14 +57,6 @@
< swinventory.xml > swinventory.new
mv swinventory.new swinventory.xml
install -D -m 644 swinventory.xml
$(DESTDIR)/etc/newisys/poci/swinventory.xml
- @if [ ! -f ../file.list ] ; then \
- echo "%defattr(-,root,root)" >../file.list ;\
- fi
- @echo "/usr/sbin/nws_mc" >>../file.list
- @echo "/usr/sbin/nws_hb" >>../file.list
- @echo "/usr/sbin/nws_poci" >>../file.list
- @echo "/etc/init.d/poci" >>../file.list
- @echo "/etc/newisys/poci/swinventory.xml" >> ../file.list
make postinstall
uninstall: preuninstall
================================================================
---- CVS-web:
http://cvs.pld-linux.org/nps/Makefile?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/nps/nps.spec?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/nps/jnet/makefile.common?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/nws_mc/makefile.common?r1=1.1.1.1&r2=1.2&f=u
http://cvs.pld-linux.org/nps/poci/Makefile?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
