From 20bcd2216611a48522484a925cf371fee262ddf4 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Mon, 3 Dec 2007 19:56:58 +0000 Subject: [PATCH] Added some non-intrusive VINI stuff to the specfile. Gets enabled if you set the macro %with_netns, otherwise ignored. --- kernel-2.6-planetlab.spec | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/kernel-2.6-planetlab.spec b/kernel-2.6-planetlab.spec index be01bb477..6c743b91f 100644 --- a/kernel-2.6-planetlab.spec +++ b/kernel-2.6-planetlab.spec @@ -23,6 +23,10 @@ Summary: The Linux kernel (the core of the Linux operating system) %define vsversion 2.3.0.29 +# Will go away when VServer supports NetNS in mainline. Currently, it must be +# updated every time the PL kernel is updated. +%define vini_pl_patch 551 + %define specrelease 1 %define release vs%{vsversion}.%{specrelease}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -300,6 +304,11 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 10 %ApplyPatch 20 +# NetNS patch for VINI +%if 0%{?_with_netns} +%ApplyPatch 30 +%endif + %ApplyPatch 100 %ApplyPatch 200 @@ -313,6 +322,12 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 540 %ApplyPatch 550 +# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may +# break with later patches. + +%if 0%{?_with_netns} +%ApplyPatch %vini_pl_patch +%endif rm -fr linux-%{kversion} ln -sf $KERNEL_PREVIOUS linux-%{kversion} -- 2.43.0