Author: blues Date: Sun Mar 12 11:03:01 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - adapt to new building system by Łukasz Maśko masko at ipipan dot waw dot pl
---- Files affected: SPECS: kernel-net-ieee80211.spec (1.15 -> 1.16) , ipw2200.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/kernel-net-ieee80211.spec diff -u SPECS/kernel-net-ieee80211.spec:1.15 SPECS/kernel-net-ieee80211.spec:1.16 --- SPECS/kernel-net-ieee80211.spec:1.15 Sat Mar 11 13:44:32 2006 +++ SPECS/kernel-net-ieee80211.spec Sun Mar 12 12:02:56 2006 @@ -73,29 +73,33 @@ 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 + 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 %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 include/asm + [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm + [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/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 + install -d o/include/config + touch o/include/config/MARKER + ln -sf %{_kernelsrcdir}/scripts o/scripts %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 \ + SYSSRC=%{_kernelsrcdir} \ + SYSOUT=$PWD/o \ + M=$PWD O=$PWD/o \ %{?with_verbose:V=1} %{__make} -C %{_kernelsrcdir} modules \ CC="%{__cc}" CPP="%{__cpp}" \ - M=$PWD O=$PWD \ + SYSSRC=%{_kernelsrcdir} \ + SYSOUT=$PWD/o \ + M=$PWD O=$PWD/o \ %{?with_verbose:V=1} mv *.ko built/$cfg done @@ -109,9 +113,9 @@ cd built for MOD in ieee80211 ieee80211_crypt ieee80211_crypt_wep \ ieee80211_crypt_ccmp ieee80211_crypt_tkip; do - install $MOD-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$MOD_current.ko - echo "alias $MOD $MOD_current" \ + install %{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}/$MOD.ko \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/${MOD}_current.ko + echo "alias $MOD ${MOD}_current" \ >> $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver}/ieee80211.conf done @@ -119,8 +123,8 @@ for MOD in ieee80211 ieee80211_crypt ieee80211_crypt_wep \ ieee80211_crypt_ccmp ieee80211_crypt_tkip; do install smp/$MOD.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/$MOD_current.ko - echo "alias $MOD $MOD_current" \ + $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/${MOD}_current.ko + echo "alias $MOD ${MOD}_current" \ >> $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver}smp/ieee80211.conf done %endif @@ -167,6 +171,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2006/03/12 11:02:56 blues +- adapt to new building system + by Łukasz Maśko masko at ipipan dot waw dot pl + Revision 1.15 2006/03/11 12:44:32 blues - do the aliases theRightWat(TM) ================================================================ Index: SPECS/ipw2200.spec diff -u SPECS/ipw2200.spec:1.38 SPECS/ipw2200.spec:1.39 --- SPECS/ipw2200.spec:1.38 Sat Mar 11 13:52:36 2006 +++ SPECS/ipw2200.spec Sun Mar 12 12:02:56 2006 @@ -82,24 +82,29 @@ 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 - %endif - touch include/config/MARKER + install -d o/include/linux + ln -sf %{_kernelsrcdir}/config-$cfg o/.config + ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h + ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers +%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 export IEEE80211_INC=%{_kernelsrcdir}/include %{__make} -C %{_kernelsrcdir} clean \ 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}" \ - M=$PWD O=$PWD \ + SYSSRC=%{_kernelsrcdir} \ + SYSOUT=$PWD/o \ + M=$PWD O=$PWD/o \ %{?with_verbose:V=1} mv *.ko built/$cfg done @@ -155,6 +160,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.39 2006/03/12 11:02:56 blues +- adapt to new building system + by Łukasz Maśko masko at ipipan dot waw dot pl + Revision 1.38 2006/03/11 12:52:36 blues - release 2 - do aliases play TheRightWay(TM) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel-net-ieee80211.spec?r1=1.15&r2=1.16&f=u http://cvs.pld-linux.org/SPECS/ipw2200.spec?r1=1.38&r2=1.39&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit