X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6-planetlab.spec;fp=kernel-2.6-planetlab.spec;h=b540da87387b07c556111dabf8e4d7355a6b31a0;hb=834011171785300288ed3b9eeea87161ff804da4;hp=f2db8db399814e8f0faa6956b3eb0d116f08d645;hpb=41c881f9a53bd80a3e2ff8d0791932192683b23f;p=linux-2.6.git diff --git a/kernel-2.6-planetlab.spec b/kernel-2.6-planetlab.spec index f2db8db39..b540da873 100644 --- a/kernel-2.6-planetlab.spec +++ b/kernel-2.6-planetlab.spec @@ -154,6 +154,9 @@ Patch570: linux-2.6-570-tagxid.patch Patch590: linux-2.6-590-trellis-mm1-netns.patch Patch591: linux-2.6-591-unshare-netns.patch Patch592: linux-2.6-592-ztun-sb.patch +Patch593: linux-2.6-593-egre.patch + +BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root %description The kernel package contains the Linux kernel (vmlinuz), the core of any @@ -330,6 +333,7 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 590 %ApplyPatch 591 %ApplyPatch 592 +%ApplyPatch 593 %endif # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may