Author: zbyniu Date: Fri May 19 22:27:10 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- patch1 is back; updated kernel modules build; use %service
- builds with 2.6.14.7-5
---- Files affected:
SPECS:
linux-wlan-ng.spec (1.37 -> 1.38)
---- Diffs:
================================================================
Index: SPECS/linux-wlan-ng.spec
diff -u SPECS/linux-wlan-ng.spec:1.37 SPECS/linux-wlan-ng.spec:1.38
--- SPECS/linux-wlan-ng.spec:1.37 Wed Apr 12 14:15:40 2006
+++ SPECS/linux-wlan-ng.spec Sat May 20 00:27:05 2006
@@ -135,13 +135,14 @@
%prep
%setup -q
%patch0 -p1
-#%patch1 -p0
+%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
sed -i "s#PCMCIA_SRC=.*#PCMCIA_SRC=%{_kernelsrcdir}#g;
s#PRISM2_\([^=]*\)=[yn]#PRISM2_\1=y#;
s#TARGET_ROOT_ON_HOST=#TARGET_ROOT_ON_HOST=$RPM_BUILD_ROOT#" config.in
-%{__make} auto_config
+%{__make} auto_config \
+ LINUX_SRC=%{_kernelsrcdir}
cd src
ln -sf ../config.mk config.mk
cd prism2
@@ -171,18 +172,33 @@
for d in p80211 prism2/driver; do
cd $w/$d
- rm -rf include
- install -d include/{config,linux}
- ln -sf %{_kernelsrcdir}/config-$cfg .config
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h
include/linux/autoconf.h
- ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch}
include/asm
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
- touch include/config/MARKER
- %{__make} -C %{_kernelsrcdir} clean modules \
+ rm -rf o
+ install -d o/include/linux
+ ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+ ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+ ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h
o/include/linux/autoconf.h
+%if %{with dist_kernel}
+ %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+ install -d o/include/config
+ touch o/include/config/MARKER
+ ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
+ %{__make} -C %{_kernelsrcdir} clean \
WLAN_SRC="$PWD/" \
RCS_FIND_IGNORE="-name '*.ko' -o" \
- M=$PWD O=$PWD \
+ SYSSRC=%{_kernelsrcdir} \
+ SYSOUT=$PWD/o \
+ M=$PWD O=$PWD/o \
+ %{?with_verbose:V=1}
+ %{__make} -C %{_kernelsrcdir} modules \
+ CC="%{__cc}" CPP="%{__cpp}" \
+ WLAN_SRC="$PWD/" \
+ SYSSRC=%{_kernelsrcdir} \
+ SYSOUT=$PWD/o \
+ M=$PWD O=$PWD/o \
%{?with_verbose:V=1}
+
mv *.ko $w/built-$cfg
cd ../..
done
@@ -193,7 +209,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-%{?with_userspace:%{__make} install}
+%if %{with userspace}
+%{__make} install
+install -D etc/rc.wlan $RPM_BUILD_ROOT/etc/rc.d/init.d/wlan
+%endif
%if %{with kernel}
cd src
@@ -210,31 +229,21 @@
rm -rf $RPM_BUILD_ROOT
%post
-if [ -f /var/lock/subsys/wlan ]; then
- /etc/rc.d/init.d/wlan restart 2> /dev/null
-else
- echo "Tape \"/etc/rc.d/init.d/wlan start to start wland daemon."
-fi
/sbin/chkconfig --add wlan
+%service wlan restart
%preun
-if [ -f /var/lock/subsys/wlan ]; then
- /etc/rc.d/init.d/wlan stop 2> /dev/null
-fi
-/sbin/chkconfig --del wlan
+if [ "$1" = "0" ]; then
+ %service -q wlan stop
+ /sbin/chkconfig --del wlan
+fi
%post pcmcia
-if [ -f /var/lock/subsys/pcmcia ]; then
- /etc/rc.d/init.d/pcmcia restart 2> /dev/null
-else
- echo "Run \"/rc.d/init.d/pcmcia start\" to start pcmcia cardbus daemon."
-fi
+%service pcmcia restart
%postun pcmcia
if [ "$1" = "0" ]; then
- if [ -f /var/state/run/pcmcia ]; then
- /etc/rc.d/init.d/pcmcia restart 2> /dev/null
- fi
+ %service pcmcia restart
fi
%post -n kernel-net-wlan-ng
@@ -307,6 +316,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.38 2006/05/19 22:27:05 zbyniu
+- patch1 is back; updated kernel modules build; use %service
+- builds with 2.6.14.7-5
+
Revision 1.37 2006/04/12 12:15:40 glen
- add kernel epoch, adapterized
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/linux-wlan-ng.spec?r1=1.37&r2=1.38&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
