Załączam diff-y do powyższych speców - dopasowanie do nowego sposobu
budowania modułów. Poprawkę zrobiłem bazując na zmianach ze speca
sterownika NVidii, więc może nie wszystko jest w 100% OK.
Uwaga odnoścnie kernel-net-ieee80211.spec: w oryginalnym specu było kilka
linijek warunkowego budowania dla arch ppc64. Patrząc przez analogię,
według mnie powinny one być usunięte z nowego speca, ale ponieważ nie
jestem tego pewien, to tylko je zakomentowałem.
Pakiety z takimi specami się budują i działają, przynajmniej na moim i686 z
kernelem 2.6.14.7-2. Prosiłbym kogoś o zerknięcie do tego i ewentualne
wrzucenie do CVS-u (najlepiej przebudowanie i wrzucenie do ready, bo wkurza
mnie trochę to, że nie mogę sobie spokojnie zrobić update'u systemu).
Pozdrawiam.
--
Łukasz Maśko GG: 2441498 _o)
Lukasz.Masko(at)ipipan.waw.pl ICQ: 146553537 /\\
Registered Linux User #61028 JID: [EMAIL PROTECTED] _\_V
Index: kernel-net-ieee80211.spec
===================================================================
RCS file: /cvsroot/SPECS/kernel-net-ieee80211.spec,v
retrieving revision 1.12
diff -u -r1.12 kernel-net-ieee80211.spec
--- kernel-net-ieee80211.spec 8 Feb 2006 23:02:58 -0000 1.12
+++ kernel-net-ieee80211.spec 11 Feb 2006 21:00:00 -0000
@@ -73,29 +73,30 @@
if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
exit 1
fi
- rm -rf include
- install -d include/{linux,config}
- ln -sf %{_kernelsrcdir}/config-$cfg .config
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-%ifarch ppc ppc64
- install -d include/asm
- [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm
- [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
+ install -d o/include/{linux,config}
+ 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
+#%ifarch ppc ppc64
+# install -d include/asm
+# [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm
+# [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
+#%else
+# ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+#%endif
+%if %{with dist_kernel}
+ %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
%else
- ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+ ln -sf %{_kernelsrcdir}/scripts o/scripts
+ touch o/include/config/MARKER
%endif
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
- %if %{without dist_kernel}
- ln -sf %{_kernelsrcdir}/scripts
- %endif
- touch include/config/MARKER
%{__make} -C %{_kernelsrcdir} clean \
RCS_FIND_IGNORE="-name '*.ko' -o" \
- M=$PWD O=$PWD \
+ M=$PWD O=$PWD/o \
%{?with_verbose:V=1}
%{__make} -C %{_kernelsrcdir} modules \
CC="%{__cc}" CPP="%{__cpp}" \
- M=$PWD O=$PWD \
+ M=$PWD O=$PWD/o \
%{?with_verbose:V=1}
mv *.ko built/$cfg
done
Index: ipw2200.spec
===================================================================
RCS file: /cvsroot/SPECS/ipw2200.spec,v
retrieving revision 1.34
diff -u -r1.34 ipw2200.spec
--- ipw2200.spec 15 Jan 2006 23:58:38 -0000 1.34
+++ ipw2200.spec 11 Feb 2006 21:43:57 -0000
@@ -82,24 +82,24 @@
if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
exit 1
fi
- rm -rf include
- install -d include/{linux,config}
- 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
- %if %{without dist_kernel}
- ln -sf %{_kernelsrcdir}/scripts
+ install -d o/include/{linux,config}
+ 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
+ ln -sf %{_kernelsrcdir}/scripts o/scripts
+ touch o/include/config/MARKER
%endif
- touch include/config/MARKER
export IEEE80211_INC=%{_kernelsrcdir}/include
%{__make} -C %{_kernelsrcdir} clean \
RCS_FIND_IGNORE="-name '*.ko' -o" \
- M=$PWD O=$PWD \
+ M=$PWD O=$PWD/o \
%{?with_verbose:V=1}
%{__make} -C %{_kernelsrcdir} modules \
CC="%{__cc}" CPP="%{__cpp}" \
- M=$PWD O=$PWD \
+ M=$PWD O=$PWD/o \
%{?with_verbose:V=1}
mv *.ko built/$cfg
done
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
