On Thursday 03 June 2004 01:08, Andrzej Krzysztofowicz wrote:
> Ta zmiana jest do cofniecia.
> bcond nie ma prawa wplywac na zawartosc src.rpm-a (powinien sie on
> przebudowac z lub bez dowolnych bcondow)
poprawione
--
Grzegorz Zebrowski
--- kernel.spec_old 2004-06-03 01:19:30.225933320 +0200
+++ kernel.spec 2004-06-03 01:19:09.305113768 +0200
@@ -16,6 +16,7 @@
%bcond_with verbose # verbose build (V=1)
%bcond_with preemptive # build preemptive kernel
%bcond_with bootsplash # build with bootsplash
+%bcond_without grsec # build without grsecurity
%{?debug:%define with_verbose 1}
@@ -652,7 +653,7 @@
#grsec
%ifarch alpha %{ix86} ia64 ppc sparc sparc64 amd64
-%patch94 -p1
+%{?with_grsec: %patch94 -p1}
%endif
%patch96 -p1
@@ -722,7 +723,7 @@
cat %{SOURCE80} >> arch/%{_target_base_arch}/defconfig
#grsec
-cat %{SOURCE90} >> arch/%{_target_base_arch}/defconfig
+%{?with_grsec: cat %{SOURCE90} >> arch/%{_target_base_arch}/defconfig}
ln -sf arch/%{_target_base_arch}/defconfig .config
@@ -979,7 +980,7 @@
cat %{SOURCE80} >> .config
#grsec
-cat %{SOURCE90} >> .config
+%{?with_grsec:cat %{SOURCE90} >> .config}
cp .config config-up
@@ -1009,7 +1010,7 @@
cat %{SOURCE80} >> .config
#grsec
-cat %{SOURCE90} >> .config
+%{?with_grsec:cat %{SOURCE90} >> .config}
cp .config config-smp
@@ -1411,7 +1412,7 @@
%{_prefix}/src/linux-%{version}/crypto
%{_prefix}/src/linux-%{version}/drivers
%{_prefix}/src/linux-%{version}/fs
-%{_prefix}/src/linux-%{version}/grsecurity
+%{?with_grsec: %{_prefix}/src/linux-%{version}/grsecurity}
%{_prefix}/src/linux-%{version}/init
%{_prefix}/src/linux-%{version}/ipc
%{_prefix}/src/linux-%{version}/kernel
_______________________________________________________
z�ota zasada - kto si� nie zna, niech si� nie wypowiada
