On Wed, 27 Sep 2006 23:13:01 +0200 Pepe <[EMAIL PROTECTED]> wrote: > Łatka w załączniku. Przy okazji dodałem P: kernel(netfilter).
Oops. Troszkę za dużo "localversion" się mi usunęło. Teraz już na pewno jest OK. Sprawdzone na UP i SMP, VMware-workstation buduje się i działa na SMP (ładują się moduły). -- Pepe
Index: kernel-desktop.spec =================================================================== RCS file: /cvsroot/SPECS/kernel-desktop.spec,v retrieving revision 1.61 diff -u -r1.61 kernel-desktop.spec --- kernel-desktop.spec 13 Sep 2006 17:28:00 -0000 1.61 +++ kernel-desktop.spec 28 Sep 2006 08:39:58 -0000 @@ -194,6 +194,7 @@ Requires: module-init-tools >= 0.9.9 Provides: %{name}-up = %{epoch}:%{version}-%{release} Provides: kernel = %{epoch}:%{version}-%{release} +Provides: kernel(netfilter) = %{_netfilter_snap} Provides: kernel(realtime-lsm) = 0.1.1 Provides: kernel-misc-fuse Provides: kernel-net-hostap = 0.4.4 @@ -349,6 +350,7 @@ Requires: geninitrd >= 2.26 Requires: module-init-tools >= 0.9.9 Provides: kernel = %{epoch}:%{version}-%{release} +Provides: kernel(netfilter) = %{_netfilter_snap} Provides: kernel(realtime-lsm) = 0.1.1 Provides: kernel-smp-misc-fuse Provides: kernel-smp-net-hostap = 0.4.4 @@ -751,16 +753,13 @@ [ "$1" = "smp" -o "$2" = "smp" ] && smp="yes" if [ "$smp" = "yes" ]; then cfg="smp" - echo "-%{release}smp" > localversion Config="%{_target_base_arch}-smp" else - echo "-%{release}" > localversion Config="%{_target_base_arch}" fi KernelVer=%{ver_rel}$1 echo "Building config file [using $Config.conf] for KERNEL $1..." - cat %{SOURCE20} > arch/%{_target_base_arch}/defconfig cat $RPM_SOURCE_DIR/kernel-desktop-$Config.config >> arch/%{_target_base_arch}/defconfig @@ -802,6 +801,11 @@ %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" arch/%{_target_base_arch}/defconfig} %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" arch/%{_target_base_arch}/defconfig} + if [ "$smp" = "yes" ]; then + sed -e 's:CONFIG_LOCALVERSION="":CONFIG_LOCALVERSION="smp":' \ + -i arch/%{_target_base_arch}/defconfig + fi + ln -sf arch/%{_target_base_arch}/defconfig .config install -d $KERNEL_INSTALL_DIR/usr/src/linux-%{ver}/include/linux rm -f include/linux/autoconf.h @@ -873,6 +877,7 @@ } KERNEL_BUILD_DIR=`pwd` +echo "-%{release}" > localversion # UP KERNEL KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-UP" @@ -958,7 +963,6 @@ %endif %{__make} $CrossOpts mrproper -echo "-%{release}" > localversion %{__make} $CrossOpts include/linux/version.h install %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}/include/linux/autoconf.h install %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}/include/linux/config.h
_______________________________________________ pld-devel-pl mailing list pld-devel-pl@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl