X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=b04bb250fc6ae1936902215243e6c605b01b92a5;hb=3b456c265cce29d8c70456641a3afb9594ed836b;hp=51ed317e679a3591663d6b50d0af2ec80915767a;hpb=e431b8314aba2b7550412383f78e0ef9a147dd4f;p=build.git diff --git a/onelab.mk b/onelab.mk index 51ed317e..b04bb250 100644 --- a/onelab.mk +++ b/onelab.mk @@ -46,8 +46,10 @@ ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \ kernel_release=$(kernel.rpm-release) \ kernel_arch=$(kernel.rpm-arch) +ifneq ($(DISTRONAME),f14) ALL += ipfwroot IN_BOOTSTRAPFS += ipfwroot +endif ipfwslice-MODULES := ipfw ipfwslice-SPEC := planetlab/ipfwslice.spec @@ -56,9 +58,6 @@ ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \ kernel_arch=$(kernel.rpm-arch) ALL += ipfwslice -# this doesn't build on f12 - weird all right - I suspect gcc to be smarter but that needs investigation -# is madwifi still current anyway ? should we move to ath5k instead ? -#ifneq "$(DISTRONAME)" "f12" # # madwifi # @@ -71,7 +70,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \ kernel_arch=$(kernel.rpm-arch) ALL += madwifi IN_BOOTSTRAPFS += madwifi -#endif # # nozomi