# adding some text to the end of the version number.
#
%define sublevel 22
-%define patchlevel 12
+%define patchlevel 14
%define kversion 2.6.%{sublevel}
%define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}}
%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}}
%endif
Patch010: linux-2.6-010-e1000e.patch
+Patch020: linux-2.6-020-build-id.patch
# These are patches picked up from Fedora/RHEL
Patch100: linux-2.6-100-build-nonintconfig.patch
%endif
%ApplyPatch 10
+%ApplyPatch 20
+
+# NetNS patch for VINI
+%if 0%{?_with_netns}
+%ApplyPatch 30
+%endif
%ApplyPatch 100
%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}